diff -Nru scite-4.3.3/debian/changelog scite-4.4.4/debian/changelog
--- scite-4.3.3/debian/changelog	2020-04-27 02:06:52.000000000 +0000
+++ scite-4.4.4/debian/changelog	2020-07-21 18:50:44.000000000 +0000
@@ -1,3 +1,22 @@
+scite (4.4.4-1) unstable; urgency=medium
+
+  * New upstream version 4.4.4
+  * Refresh patches
+  * Update lintian override spelling-error-in-binary moved to
+    /usr/lib/scite/liblexilla.so
+  * Add forwarded not-needed to
+    0007-Build-with-Debian-packaged-Lua.patch
+  * Add Forwarded fields to 0006-cross.patch
+  * Clean up liblexilla and more files with clean
+
+ -- Andreas Rönnquist <gusnan@debian.org>  Tue, 21 Jul 2020 20:50:44 +0200
+
+scite (4.3.3-2) unstable; urgency=medium
+
+  * Remove removed files from debian/copyright
+
+ -- Andreas Rönnquist <gusnan@debian.org>  Wed, 29 Apr 2020 16:04:11 +0200
+
 scite (4.3.3-1) unstable; urgency=medium
 
   * New upstream version 4.3.3
diff -Nru scite-4.3.3/debian/copyright scite-4.4.4/debian/copyright
--- scite-4.3.3/debian/copyright	2020-04-27 02:06:52.000000000 +0000
+++ scite-4.4.4/debian/copyright	2020-07-21 18:50:44.000000000 +0000
@@ -203,9 +203,6 @@
 License: scintilla
 
 Files: scite/src/JobQueue.cxx
-       scite/src/Mutex.h
-       scite/gtk/GTKMutex.cxx
-       scite/win32/WinMutex.cxx
 Copyright: 1998-2003 Neil Hodgson <neilh@scintilla.org>
            2007 Neil Hodgson <neilh@scintilla.org>,
                 April White <april_white@sympatico.ca>
diff -Nru scite-4.3.3/debian/patches/0001-hardening_flags.patch scite-4.4.4/debian/patches/0001-hardening_flags.patch
--- scite-4.3.3/debian/patches/0001-hardening_flags.patch	2020-04-27 02:06:52.000000000 +0000
+++ scite-4.4.4/debian/patches/0001-hardening_flags.patch	2020-07-21 18:50:44.000000000 +0000
@@ -9,12 +9,10 @@
  scite/gtk/makefile     | 6 +++---
  2 files changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/scintilla/gtk/makefile b/scintilla/gtk/makefile
-index 00f9025..0a882d2 100644
 --- a/scintilla/gtk/makefile
 +++ b/scintilla/gtk/makefile
-@@ -89,9 +89,9 @@ clean:
- 	$(DEL) *.o $(call normalize,$(COMPLIB)) *.plist
+@@ -105,9 +105,9 @@
+ 	$(DEL) *.o $(call normalize,$(COMPLIB)) $(call normalize,$(COMPONENT)) *.plist
  
  %.o: %.cxx
 -	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -c $<
@@ -25,11 +23,9 @@
  
  GLIB_GENMARSHAL = glib-genmarshal
  GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal
-diff --git a/scite/gtk/makefile b/scite/gtk/makefile
-index 28c1ee1..33001a7 100644
 --- a/scite/gtk/makefile
 +++ b/scite/gtk/makefile
-@@ -79,7 +79,7 @@ INCLUDES += -I$(srcdir)/../lua/src
+@@ -85,7 +85,7 @@
  LUA_DEFINES = -DLUA_USE_POSIX -DLUA_USE_DLOPEN
  
  %.o: %.c
@@ -38,7 +34,7 @@
  
  else
  DEFINES += -DNO_LUA
-@@ -96,7 +96,7 @@ LIBS += -ldl
+@@ -102,7 +102,7 @@
  endif
  
  %.o: %.cxx
@@ -47,12 +43,3 @@
  
  clean:
  	rm -f *.o *.plist $(PROG)
-@@ -143,7 +143,7 @@ SRC_OBJS = \
- 	Utf8_16.o
- 
- $(PROG): SciTEGTK.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(COMPLIB) $(LUA_OBJS)
--	$(CXX) $(BASE_FLAGS) -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers $^ -o $@ $(CONFIGLIB) $(LIBS) $(LDLIBS)
-+	$(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers $^ -o $@ $(CONFIGLIB) $(LIBS) $(LDLIBS)
- 
- # Automatically generate header dependencies with "make deps"
- include deps.mak
diff -Nru scite-4.3.3/debian/patches/0002-do_not_use_remote_logo.patch scite-4.4.4/debian/patches/0002-do_not_use_remote_logo.patch
--- scite-4.3.3/debian/patches/0002-do_not_use_remote_logo.patch	2020-04-27 02:06:52.000000000 +0000
+++ scite-4.4.4/debian/patches/0002-do_not_use_remote_logo.patch	2020-07-21 18:50:44.000000000 +0000
@@ -8,11 +8,9 @@
  scite/doc/SciTE.html     | 15 +--------------
  2 files changed, 2 insertions(+), 28 deletions(-)
 
-diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html
-index c760bd1..18eea13 100644
 --- a/scintilla/doc/index.html
 +++ b/scintilla/doc/index.html
-@@ -176,20 +176,7 @@ if (!IsRemote()) { //if NOT remote...
+@@ -180,20 +180,7 @@
      </p>
  There is a <a href="https://sourceforge.net/projects/scintilla/">Scintilla project page</a>
  hosted on
@@ -34,11 +32,9 @@
    </body>
  </html>
  
-diff --git a/scite/doc/SciTE.html b/scite/doc/SciTE.html
-index 3433cb4..1eeb6cb 100644
 --- a/scite/doc/SciTE.html
 +++ b/scite/doc/SciTE.html
-@@ -136,20 +136,7 @@ if (IsRemote()) {
+@@ -139,20 +139,7 @@
        <br />
      </p>
  There is a <a href="https://sourceforge.net/projects/scintilla/">Scintilla project page</a> hosted on
diff -Nru scite-4.3.3/debian/patches/0003-reproducible_build.patch scite-4.4.4/debian/patches/0003-reproducible_build.patch
--- scite-4.3.3/debian/patches/0003-reproducible_build.patch	2020-04-27 02:06:52.000000000 +0000
+++ scite-4.4.4/debian/patches/0003-reproducible_build.patch	2020-07-21 18:50:44.000000000 +0000
@@ -7,11 +7,9 @@
  scite/src/Credits.cxx | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/scite/src/Credits.cxx b/scite/src/Credits.cxx
-index 1d8e7d9..e9c82b4 100644
 --- a/scite/src/Credits.cxx
 +++ b/scite/src/Credits.cxx
-@@ -561,7 +561,7 @@ void SciTEBase::SetAboutMessage(GUI::ScintillaWindow &wsci, const char *appTitle
+@@ -566,7 +566,7 @@
  		}
  		AddStyledText(wsci, GetTranslationToAbout("Version").c_str(), trsSty);
  		AddStyledText(wsci, sVersion.c_str(), 1);
diff -Nru scite-4.3.3/debian/patches/0004-spelling.patch scite-4.4.4/debian/patches/0004-spelling.patch
--- scite-4.3.3/debian/patches/0004-spelling.patch	2020-04-27 02:06:52.000000000 +0000
+++ scite-4.4.4/debian/patches/0004-spelling.patch	2020-07-21 18:50:44.000000000 +0000
@@ -8,11 +8,9 @@
  scintilla/test/unit/catch.hpp | 2 +-
  2 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/scintilla/lexers/LexNsis.cxx b/scintilla/lexers/LexNsis.cxx
-index 3b2b8a3..c1177f9 100644
 --- a/scintilla/lexers/LexNsis.cxx
 +++ b/scintilla/lexers/LexNsis.cxx
-@@ -183,7 +183,7 @@ static int classifyWordNsis(Sci_PositionU start, Sci_PositionU end, WordList *ke
+@@ -183,7 +183,7 @@
  
  	WordList &Functions = *keywordLists[0];
  	WordList &Variables = *keywordLists[1];
@@ -21,7 +19,7 @@
  	WordList &UserDefined = *keywordLists[3];
  
  	for (Sci_PositionU i = 0; i < end - start + 1 && i < 99; i++)
-@@ -229,7 +229,7 @@ static int classifyWordNsis(Sci_PositionU start, Sci_PositionU end, WordList *ke
+@@ -229,7 +229,7 @@
  	if ( Variables.InList(s) )
  		return SCE_NSIS_VARIABLE;
  
@@ -30,7 +28,7 @@
  		return SCE_NSIS_LABEL;
  
  	if( UserDefined.InList(s) )
-@@ -651,7 +651,7 @@ static void FoldNsisDoc(Sci_PositionU startPos, Sci_Position length, int, WordLi
+@@ -651,7 +651,7 @@
  static const char * const nsisWordLists[] = {
  	"Functions",
  	"Variables",
@@ -39,11 +37,9 @@
  	"UserDefined",
  	0, };
  
-diff --git a/scintilla/test/unit/catch.hpp b/scintilla/test/unit/catch.hpp
-index 362f869..3b8989f 100644
 --- a/scintilla/test/unit/catch.hpp
 +++ b/scintilla/test/unit/catch.hpp
-@@ -8206,7 +8206,7 @@ namespace Catch {
+@@ -8206,7 +8206,7 @@
          if ( !exceptions.empty() ) {
              m_startupExceptions = true;
              Colour colourGuard( Colour::Red );
diff -Nru scite-4.3.3/debian/patches/0005-scite-desktop.patch scite-4.4.4/debian/patches/0005-scite-desktop.patch
--- scite-4.3.3/debian/patches/0005-scite-desktop.patch	2020-04-27 02:06:52.000000000 +0000
+++ scite-4.4.4/debian/patches/0005-scite-desktop.patch	2020-07-21 18:50:44.000000000 +0000
@@ -7,11 +7,9 @@
  scite/gtk/SciTE.desktop | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/scite/gtk/SciTE.desktop b/scite/gtk/SciTE.desktop
-index e47c178..585ef41 100755
 --- a/scite/gtk/SciTE.desktop
 +++ b/scite/gtk/SciTE.desktop
-@@ -21,3 +21,4 @@ Terminal=false
+@@ -21,3 +21,4 @@
  StartupNotify=true
  Categories=TextEditor;Development;GTK;
  MimeType=text/plain;
diff -Nru scite-4.3.3/debian/patches/0006-cross.patch scite-4.4.4/debian/patches/0006-cross.patch
--- scite-4.3.3/debian/patches/0006-cross.patch	2020-04-27 02:06:52.000000000 +0000
+++ scite-4.4.4/debian/patches/0006-cross.patch	2020-07-21 18:50:44.000000000 +0000
@@ -1,5 +1,6 @@
 From: Helmut Grohne <helmut@subdivi.de>
 Date: Thu, 24 May 2018 17:39:13 +0000
+Forwarded: https://sourceforge.net/p/scintilla/bugs/2189/
 Subject: cross
 
 ---
@@ -7,11 +8,9 @@
  scite/gtk/makefile     | 7 ++++---
  2 files changed, 6 insertions(+), 4 deletions(-)
 
-diff --git a/scintilla/gtk/makefile b/scintilla/gtk/makefile
-index 0a882d2..a3adcf8 100644
 --- a/scintilla/gtk/makefile
 +++ b/scintilla/gtk/makefile
-@@ -39,6 +39,7 @@ BASE_FLAGS += -fsanitize=$(SANITIZE)
+@@ -39,6 +39,7 @@
  endif
  ARFLAGS = rc
  RANLIB ?= ranlib
@@ -19,20 +18,20 @@
  
  GTK_VERSION = $(if $(GTK3),gtk+-3.0,gtk+-2.0)
  
-@@ -80,7 +81,7 @@ BASE_FLAGS += $(if $(DEBUG),-g,-Os)
+@@ -88,8 +89,8 @@
  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)
 +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)
-diff --git a/scite/gtk/makefile b/scite/gtk/makefile
-index 33001a7..dde8170 100644
+ all: $(COMPLIB) $(COMPONENT) $(LEXILLA)
 --- a/scite/gtk/makefile
 +++ b/scite/gtk/makefile
-@@ -26,15 +26,16 @@ WARNINGS += -Wno-empty-body
+@@ -26,15 +26,16 @@
  else
  WARNINGS += -Wno-misleading-indentation
  endif
diff -Nru scite-4.3.3/debian/patches/0007-Build-with-Debian-packaged-Lua.patch scite-4.4.4/debian/patches/0007-Build-with-Debian-packaged-Lua.patch
--- scite-4.3.3/debian/patches/0007-Build-with-Debian-packaged-Lua.patch	2020-04-27 02:06:52.000000000 +0000
+++ scite-4.4.4/debian/patches/0007-Build-with-Debian-packaged-Lua.patch	2020-07-21 18:50:44.000000000 +0000
@@ -1,17 +1,16 @@
 From: =?utf-8?q?Andreas_R=C3=B6nnquist?= <gusnan@debian.org>
 Date: Tue, 19 Jun 2018 15:34:57 +0200
 Subject: Build with Debian packaged Lua
+Forwarded: not-needed
 
 ---
  scite/gtk/deps.mak |  6 +-----
  scite/gtk/makefile | 30 ++++--------------------------
  2 files changed, 5 insertions(+), 31 deletions(-)
 
-diff --git a/scite/gtk/deps.mak b/scite/gtk/deps.mak
-index 13dc030..050c544 100644
 --- a/scite/gtk/deps.mak
 +++ b/scite/gtk/deps.mak
-@@ -249,11 +249,7 @@ LuaExtension.o: \
+@@ -248,11 +248,7 @@
  	../src/Extender.h \
  	../src/IFaceTable.h \
  	../src/SciTEKeys.h \
@@ -24,11 +23,9 @@
  MatchMarker.o: \
  	../src/MatchMarker.cxx \
  	../src/ScintillaTypes.h \
-diff --git a/scite/gtk/makefile b/scite/gtk/makefile
-index dde8170..00b2122 100644
 --- a/scite/gtk/makefile
 +++ b/scite/gtk/makefile
-@@ -32,9 +32,9 @@ GTK_VERSION = $(if $(GTK3),gtk+-3.0,gtk+-2.0)
+@@ -32,9 +32,9 @@
  
  PYTHON = $(if $(windir),pyw,python3)
  
@@ -41,7 +38,7 @@
  gnomeprefix:=$(shell $(PKG_CONFIG) --variable=prefix $(GTK_VERSION) 2>/dev/null)
  ifndef prefix
  ifdef gnomeprefix
-@@ -64,28 +64,6 @@ DEFINES += -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
+@@ -70,28 +70,6 @@
  DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
  BASE_FLAGS += $(if $(DEBUG),-g,-Os)
  
@@ -70,12 +67,12 @@
  LIBS += -lm -lstdc++
  
  UNAME:=$(shell uname -s)
-@@ -143,7 +121,7 @@ SRC_OBJS = \
+@@ -149,7 +127,7 @@
  	StyleWriter.o \
  	Utf8_16.o
  
--$(PROG): SciTEGTK.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(COMPLIB) $(LUA_OBJS)
-+$(PROG): SciTEGTK.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(COMPLIB) LuaExtension.o
- 	$(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers $^ -o $@ $(CONFIGLIB) $(LIBS) $(LDLIBS)
+-$(PROG): SciTEGTK.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)
++$(PROG): SciTEGTK.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) LuaExtension.o
+ 	$(CXX) $(BASE_FLAGS) -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"
diff -Nru scite-4.3.3/debian/rules scite-4.4.4/debian/rules
--- scite-4.3.3/debian/rules	2020-04-27 02:06:52.000000000 +0000
+++ scite-4.4.4/debian/rules	2020-07-21 18:50:44.000000000 +0000
@@ -17,6 +17,10 @@
 	$(MAKE) -C scintilla/gtk clean
 	rm -f scintilla/bin/scintilla.a
 	$(MAKE) -C scite/gtk clean
+	$(MAKE) -C scintilla/lexilla/src clean
+	rm -f scite/bin/liblexilla.so
+	rm -f scite/bin/libscintilla.so
+
 
 override_dh_auto_install:
 	dh_auto_install
diff -Nru scite-4.3.3/debian/scite.lintian-overrides scite-4.4.4/debian/scite.lintian-overrides
--- scite-4.3.3/debian/scite.lintian-overrides	2020-04-27 02:06:52.000000000 +0000
+++ scite-4.4.4/debian/scite.lintian-overrides	2020-07-21 18:50:44.000000000 +0000
@@ -1 +1 @@
-scite: spelling-error-in-binary usr/bin/SciTE afe safe
+scite: spelling-error-in-binary usr/lib/scite/liblexilla.so afe safe
diff -Nru scite-4.3.3/scintilla/cocoa/Scintilla/module.modulemap scite-4.4.4/scintilla/cocoa/Scintilla/module.modulemap
--- scite-4.3.3/scintilla/cocoa/Scintilla/module.modulemap	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/cocoa/Scintilla/module.modulemap	2020-05-31 23:08:11.000000000 +0000
@@ -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 -Nru scite-4.3.3/scintilla/cocoa/Scintilla/Scintilla/Info.plist scite-4.4.4/scintilla/cocoa/Scintilla/Scintilla/Info.plist
--- scite-4.3.3/scintilla/cocoa/Scintilla/Scintilla/Info.plist	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/cocoa/Scintilla/Scintilla/Info.plist	2020-07-18 05:40:21.000000000 +0000
@@ -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>4.4.4</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2020 Neil Hodgson. All rights reserved.</string>
+</dict>
+</plist>
diff -Nru scite-4.3.3/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj scite-4.4.4/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
--- scite-4.3.3/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj	2020-07-18 05:40:21.000000000 +0000
@@ -0,0 +1,819 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		287F3C5C246F8F220040E76F /* InfoBarCommunicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C50246F8F220040E76F /* InfoBarCommunicator.h */; };
+		287F3C5D246F8F220040E76F /* QuartzTextStyleAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C51246F8F220040E76F /* QuartzTextStyleAttribute.h */; };
+		287F3C5E246F8F220040E76F /* QuartzTextLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C52246F8F220040E76F /* QuartzTextLayout.h */; };
+		287F3C5F246F8F220040E76F /* ScintillaCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C53246F8F220040E76F /* ScintillaCocoa.mm */; };
+		287F3C60246F8F220040E76F /* InfoBar.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C54246F8F220040E76F /* InfoBar.h */; };
+		287F3C61246F8F220040E76F /* PlatCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C55246F8F220040E76F /* PlatCocoa.h */; };
+		287F3C62246F8F220040E76F /* PlatCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C56246F8F220040E76F /* PlatCocoa.mm */; };
+		287F3C63246F8F220040E76F /* ScintillaView.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C57246F8F220040E76F /* ScintillaView.h */; };
+		287F3C64246F8F220040E76F /* ScintillaView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C58246F8F220040E76F /* ScintillaView.mm */; };
+		287F3C65246F8F220040E76F /* InfoBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C59246F8F220040E76F /* InfoBar.mm */; };
+		287F3C66246F8F220040E76F /* ScintillaCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C5A246F8F220040E76F /* ScintillaCocoa.h */; };
+		287F3C67246F8F220040E76F /* QuartzTextStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C5B246F8F220040E76F /* QuartzTextStyle.h */; };
+		287F3C6A246F90240040E76F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 287F3C69246F90240040E76F /* Cocoa.framework */; };
+		287F3C6C246F90300040E76F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 287F3C6B246F90300040E76F /* QuartzCore.framework */; };
+		287F3CB0246F90930040E76F /* RunStyles.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C6D246F908F0040E76F /* RunStyles.cxx */; };
+		287F3CB1246F90930040E76F /* CaseConvert.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C6E246F908F0040E76F /* CaseConvert.h */; };
+		287F3CB2246F90930040E76F /* SparseVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C6F246F908F0040E76F /* SparseVector.h */; };
+		287F3CB3246F90930040E76F /* ElapsedPeriod.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C70246F908F0040E76F /* ElapsedPeriod.h */; };
+		287F3CB4246F90930040E76F /* Indicator.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C71246F908F0040E76F /* Indicator.cxx */; };
+		287F3CB5246F90930040E76F /* RunStyles.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C72246F908F0040E76F /* RunStyles.h */; };
+		287F3CB6246F90930040E76F /* PerLine.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C73246F908F0040E76F /* PerLine.cxx */; };
+		287F3CB7246F90930040E76F /* CaseConvert.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C74246F908F0040E76F /* CaseConvert.cxx */; };
+		287F3CB8246F90930040E76F /* CharClassify.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C75246F908F0040E76F /* CharClassify.cxx */; };
+		287F3CB9246F90930040E76F /* Style.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C76246F908F0040E76F /* Style.cxx */; };
+		287F3CBA246F90930040E76F /* CaseFolder.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C77246F908F0040E76F /* CaseFolder.h */; };
+		287F3CBB246F90930040E76F /* Decoration.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C78246F90900040E76F /* Decoration.h */; };
+		287F3CBC246F90930040E76F /* SplitVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C79246F90900040E76F /* SplitVector.h */; };
+		287F3CBD246F90930040E76F /* DBCS.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C7A246F90900040E76F /* DBCS.h */; };
+		287F3CBE246F90930040E76F /* RESearch.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C7B246F90900040E76F /* RESearch.cxx */; };
+		287F3CBF246F90930040E76F /* AutoComplete.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C7C246F90900040E76F /* AutoComplete.cxx */; };
+		287F3CC0246F90930040E76F /* Decoration.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C7D246F90900040E76F /* Decoration.cxx */; };
+		287F3CC1246F90930040E76F /* CallTip.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C7E246F90900040E76F /* CallTip.cxx */; };
+		287F3CC2246F90930040E76F /* LineMarker.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C7F246F90900040E76F /* LineMarker.cxx */; };
+		287F3CC3246F90930040E76F /* UniConversion.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C80246F90900040E76F /* UniConversion.cxx */; };
+		287F3CC4246F90930040E76F /* Editor.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C81246F90900040E76F /* Editor.h */; };
+		287F3CC5246F90930040E76F /* UniConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C82246F90900040E76F /* UniConversion.h */; };
+		287F3CC6246F90930040E76F /* Document.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C83246F90900040E76F /* Document.cxx */; };
+		287F3CC7246F90930040E76F /* UniqueString.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C84246F90900040E76F /* UniqueString.cxx */; };
+		287F3CC8246F90930040E76F /* CallTip.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C85246F90900040E76F /* CallTip.h */; };
+		287F3CC9246F90930040E76F /* CellBuffer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C86246F90900040E76F /* CellBuffer.cxx */; };
+		287F3CCA246F90930040E76F /* XPM.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C87246F90900040E76F /* XPM.h */; };
+		287F3CCB246F90930040E76F /* MarginView.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C88246F90900040E76F /* MarginView.h */; };
+		287F3CCC246F90930040E76F /* ContractionState.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C89246F90900040E76F /* ContractionState.cxx */; };
+		287F3CCD246F90930040E76F /* CellBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C8A246F90900040E76F /* CellBuffer.h */; };
+		287F3CCE246F90930040E76F /* Position.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C8B246F90900040E76F /* Position.h */; };
+		287F3CCF246F90930040E76F /* Partitioning.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C8C246F90900040E76F /* Partitioning.h */; };
+		287F3CD0246F90930040E76F /* CaseFolder.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C8D246F90910040E76F /* CaseFolder.cxx */; };
+		287F3CD1246F90930040E76F /* ContractionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C8E246F90910040E76F /* ContractionState.h */; };
+		287F3CD2246F90930040E76F /* KeyMap.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C8F246F90910040E76F /* KeyMap.cxx */; };
+		287F3CD3246F90930040E76F /* EditView.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C90246F90910040E76F /* EditView.cxx */; };
+		287F3CD4246F90930040E76F /* PerLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C91246F90910040E76F /* PerLine.h */; };
+		287F3CD5246F90930040E76F /* UniqueString.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C92246F90910040E76F /* UniqueString.h */; };
+		287F3CD6246F90930040E76F /* Catalogue.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C93246F90910040E76F /* Catalogue.cxx */; };
+		287F3CD7246F90930040E76F /* PositionCache.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C94246F90910040E76F /* PositionCache.cxx */; };
+		287F3CD8246F90930040E76F /* Style.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C95246F90910040E76F /* Style.h */; };
+		287F3CD9246F90930040E76F /* LineMarker.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C96246F90910040E76F /* LineMarker.h */; };
+		287F3CDA246F90930040E76F /* DBCS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C97246F90910040E76F /* DBCS.cxx */; };
+		287F3CDB246F90930040E76F /* EditModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C98246F90910040E76F /* EditModel.h */; };
+		287F3CDC246F90930040E76F /* ExternalLexer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C99246F90910040E76F /* ExternalLexer.cxx */; };
+		287F3CDD246F90930040E76F /* IntegerRectangle.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C9A246F90910040E76F /* IntegerRectangle.h */; };
+		287F3CDE246F90930040E76F /* Selection.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C9B246F90920040E76F /* Selection.h */; };
+		287F3CDF246F90930040E76F /* RESearch.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C9C246F90920040E76F /* RESearch.h */; };
+		287F3CE0246F90930040E76F /* Editor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C9D246F90920040E76F /* Editor.cxx */; };
+		287F3CE1246F90930040E76F /* AutoComplete.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3C9E246F90920040E76F /* AutoComplete.h */; };
+		287F3CE2246F90930040E76F /* EditModel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3C9F246F90920040E76F /* EditModel.cxx */; };
+		287F3CE3246F90930040E76F /* ScintillaBase.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3CA0246F90920040E76F /* ScintillaBase.cxx */; };
+		287F3CE4246F90930040E76F /* ScintillaBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3CA1246F90920040E76F /* ScintillaBase.h */; };
+		287F3CE5246F90930040E76F /* KeyMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3CA2246F90920040E76F /* KeyMap.h */; };
+		287F3CE6246F90930040E76F /* ExternalLexer.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3CA3246F90920040E76F /* ExternalLexer.h */; };
+		287F3CE7246F90930040E76F /* ViewStyle.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3CA4246F90920040E76F /* ViewStyle.cxx */; };
+		287F3CE8246F90930040E76F /* XPM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3CA5246F90920040E76F /* XPM.cxx */; };
+		287F3CE9246F90930040E76F /* Document.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3CA6246F90920040E76F /* Document.h */; };
+		287F3CEA246F90930040E76F /* Indicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3CA7246F90920040E76F /* Indicator.h */; };
+		287F3CEB246F90930040E76F /* Catalogue.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3CA8246F90920040E76F /* Catalogue.h */; };
+		287F3CEC246F90930040E76F /* MarginView.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3CA9246F90920040E76F /* MarginView.cxx */; };
+		287F3CED246F90930040E76F /* FontQuality.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3CAA246F90920040E76F /* FontQuality.h */; };
+		287F3CEE246F90930040E76F /* CharClassify.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3CAB246F90920040E76F /* CharClassify.h */; };
+		287F3CEF246F90930040E76F /* Selection.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3CAC246F90930040E76F /* Selection.cxx */; };
+		287F3CF0246F90930040E76F /* ViewStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3CAD246F90930040E76F /* ViewStyle.h */; };
+		287F3CF1246F90930040E76F /* EditView.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3CAE246F90930040E76F /* EditView.h */; };
+		287F3CF2246F90930040E76F /* PositionCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3CAF246F90930040E76F /* PositionCache.h */; };
+		287F3D0F246F9A040040E76F /* OptionSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3CF3246F9A010040E76F /* OptionSet.h */; };
+		287F3D10246F9A040040E76F /* LexerModule.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3CF4246F9A010040E76F /* LexerModule.cxx */; };
+		287F3D11246F9A040040E76F /* CharacterSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3CF5246F9A010040E76F /* CharacterSet.h */; };
+		287F3D12246F9A040040E76F /* LexerModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3CF6246F9A010040E76F /* LexerModule.h */; };
+		287F3D13246F9A040040E76F /* Accessor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3CF7246F9A020040E76F /* Accessor.cxx */; };
+		287F3D14246F9A040040E76F /* CatalogueModules.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3CF8246F9A020040E76F /* CatalogueModules.h */; };
+		287F3D15246F9A040040E76F /* WordList.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3CF9246F9A020040E76F /* WordList.h */; };
+		287F3D16246F9A040040E76F /* PropSetSimple.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3CFA246F9A020040E76F /* PropSetSimple.cxx */; };
+		287F3D17246F9A040040E76F /* LexerNoExceptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3CFB246F9A020040E76F /* LexerNoExceptions.h */; };
+		287F3D18246F9A040040E76F /* WordList.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3CFC246F9A020040E76F /* WordList.cxx */; };
+		287F3D19246F9A040040E76F /* CharacterCategory.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3CFD246F9A020040E76F /* CharacterCategory.cxx */; };
+		287F3D1A246F9A040040E76F /* Accessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3CFE246F9A020040E76F /* Accessor.h */; };
+		287F3D1B246F9A040040E76F /* LexerSimple.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3CFF246F9A020040E76F /* LexerSimple.cxx */; };
+		287F3D1C246F9A040040E76F /* LexerNoExceptions.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3D00246F9A020040E76F /* LexerNoExceptions.cxx */; };
+		287F3D1D246F9A040040E76F /* StringCopy.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3D01246F9A030040E76F /* StringCopy.h */; };
+		287F3D1E246F9A040040E76F /* LexerBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3D02246F9A030040E76F /* LexerBase.h */; };
+		287F3D1F246F9A040040E76F /* DefaultLexer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3D03246F9A030040E76F /* DefaultLexer.cxx */; };
+		287F3D20246F9A040040E76F /* SubStyles.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3D04246F9A030040E76F /* SubStyles.h */; };
+		287F3D21246F9A040040E76F /* CharacterSet.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3D05246F9A030040E76F /* CharacterSet.cxx */; };
+		287F3D22246F9A040040E76F /* SparseState.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3D06246F9A030040E76F /* SparseState.h */; };
+		287F3D23246F9A040040E76F /* LexerBase.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3D07246F9A030040E76F /* LexerBase.cxx */; };
+		287F3D24246F9A040040E76F /* LexAccessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3D08246F9A030040E76F /* LexAccessor.h */; };
+		287F3D25246F9A040040E76F /* StyleContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3D09246F9A030040E76F /* StyleContext.h */; };
+		287F3D26246F9A040040E76F /* StyleContext.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 287F3D0A246F9A030040E76F /* StyleContext.cxx */; };
+		287F3D27246F9A040040E76F /* CharacterCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3D0B246F9A030040E76F /* CharacterCategory.h */; };
+		287F3D28246F9A040040E76F /* DefaultLexer.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3D0C246F9A040040E76F /* DefaultLexer.h */; };
+		287F3D29246F9A040040E76F /* LexerSimple.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3D0D246F9A040040E76F /* LexerSimple.h */; };
+		287F3D2A246F9A040040E76F /* PropSetSimple.h in Headers */ = {isa = PBXBuildFile; fileRef = 287F3D0E246F9A040040E76F /* PropSetSimple.h */; };
+		287F3E11246F9B150040E76F /* res in Resources */ = {isa = PBXBuildFile; fileRef = 287F3E10246F9B150040E76F /* res */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		287F3C41246F8DC70040E76F /* Scintilla.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Scintilla.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		287F3C45246F8DC70040E76F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		287F3C50246F8F220040E76F /* InfoBarCommunicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InfoBarCommunicator.h; path = ../../InfoBarCommunicator.h; sourceTree = "<group>"; };
+		287F3C51246F8F220040E76F /* QuartzTextStyleAttribute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuartzTextStyleAttribute.h; path = ../../QuartzTextStyleAttribute.h; sourceTree = "<group>"; };
+		287F3C52246F8F220040E76F /* QuartzTextLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuartzTextLayout.h; path = ../../QuartzTextLayout.h; sourceTree = "<group>"; };
+		287F3C53246F8F220040E76F /* ScintillaCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ScintillaCocoa.mm; path = ../../ScintillaCocoa.mm; sourceTree = "<group>"; };
+		287F3C54246F8F220040E76F /* InfoBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InfoBar.h; path = ../../InfoBar.h; sourceTree = "<group>"; };
+		287F3C55246F8F220040E76F /* PlatCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlatCocoa.h; path = ../../PlatCocoa.h; sourceTree = "<group>"; };
+		287F3C56246F8F220040E76F /* PlatCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PlatCocoa.mm; path = ../../PlatCocoa.mm; sourceTree = "<group>"; };
+		287F3C57246F8F220040E76F /* ScintillaView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScintillaView.h; path = ../../ScintillaView.h; sourceTree = "<group>"; };
+		287F3C58246F8F220040E76F /* ScintillaView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ScintillaView.mm; path = ../../ScintillaView.mm; sourceTree = "<group>"; };
+		287F3C59246F8F220040E76F /* InfoBar.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = InfoBar.mm; path = ../../InfoBar.mm; sourceTree = "<group>"; };
+		287F3C5A246F8F220040E76F /* ScintillaCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScintillaCocoa.h; path = ../../ScintillaCocoa.h; sourceTree = "<group>"; };
+		287F3C5B246F8F220040E76F /* QuartzTextStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuartzTextStyle.h; path = ../../QuartzTextStyle.h; sourceTree = "<group>"; };
+		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; };
+		287F3C6D246F908F0040E76F /* RunStyles.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RunStyles.cxx; path = ../../../src/RunStyles.cxx; sourceTree = "<group>"; };
+		287F3C6E246F908F0040E76F /* CaseConvert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CaseConvert.h; path = ../../../src/CaseConvert.h; sourceTree = "<group>"; };
+		287F3C6F246F908F0040E76F /* SparseVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SparseVector.h; path = ../../../src/SparseVector.h; sourceTree = "<group>"; };
+		287F3C70246F908F0040E76F /* ElapsedPeriod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ElapsedPeriod.h; path = ../../../src/ElapsedPeriod.h; sourceTree = "<group>"; };
+		287F3C71246F908F0040E76F /* Indicator.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Indicator.cxx; path = ../../../src/Indicator.cxx; sourceTree = "<group>"; };
+		287F3C72246F908F0040E76F /* RunStyles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RunStyles.h; path = ../../../src/RunStyles.h; sourceTree = "<group>"; };
+		287F3C73246F908F0040E76F /* PerLine.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PerLine.cxx; path = ../../../src/PerLine.cxx; sourceTree = "<group>"; };
+		287F3C74246F908F0040E76F /* CaseConvert.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CaseConvert.cxx; path = ../../../src/CaseConvert.cxx; sourceTree = "<group>"; };
+		287F3C75246F908F0040E76F /* CharClassify.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CharClassify.cxx; path = ../../../src/CharClassify.cxx; sourceTree = "<group>"; };
+		287F3C76246F908F0040E76F /* Style.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Style.cxx; path = ../../../src/Style.cxx; sourceTree = "<group>"; };
+		287F3C77246F908F0040E76F /* CaseFolder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CaseFolder.h; path = ../../../src/CaseFolder.h; sourceTree = "<group>"; };
+		287F3C78246F90900040E76F /* Decoration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Decoration.h; path = ../../../src/Decoration.h; sourceTree = "<group>"; };
+		287F3C79246F90900040E76F /* SplitVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SplitVector.h; path = ../../../src/SplitVector.h; sourceTree = "<group>"; };
+		287F3C7A246F90900040E76F /* DBCS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DBCS.h; path = ../../../src/DBCS.h; sourceTree = "<group>"; };
+		287F3C7B246F90900040E76F /* RESearch.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RESearch.cxx; path = ../../../src/RESearch.cxx; sourceTree = "<group>"; };
+		287F3C7C246F90900040E76F /* AutoComplete.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AutoComplete.cxx; path = ../../../src/AutoComplete.cxx; sourceTree = "<group>"; };
+		287F3C7D246F90900040E76F /* Decoration.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Decoration.cxx; path = ../../../src/Decoration.cxx; sourceTree = "<group>"; };
+		287F3C7E246F90900040E76F /* CallTip.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CallTip.cxx; path = ../../../src/CallTip.cxx; sourceTree = "<group>"; };
+		287F3C7F246F90900040E76F /* LineMarker.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LineMarker.cxx; path = ../../../src/LineMarker.cxx; sourceTree = "<group>"; };
+		287F3C80246F90900040E76F /* UniConversion.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UniConversion.cxx; path = ../../../src/UniConversion.cxx; sourceTree = "<group>"; };
+		287F3C81246F90900040E76F /* Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Editor.h; path = ../../../src/Editor.h; sourceTree = "<group>"; };
+		287F3C82246F90900040E76F /* UniConversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UniConversion.h; path = ../../../src/UniConversion.h; sourceTree = "<group>"; };
+		287F3C83246F90900040E76F /* Document.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Document.cxx; path = ../../../src/Document.cxx; sourceTree = "<group>"; };
+		287F3C84246F90900040E76F /* UniqueString.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UniqueString.cxx; path = ../../../src/UniqueString.cxx; sourceTree = "<group>"; };
+		287F3C85246F90900040E76F /* CallTip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CallTip.h; path = ../../../src/CallTip.h; sourceTree = "<group>"; };
+		287F3C86246F90900040E76F /* CellBuffer.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CellBuffer.cxx; path = ../../../src/CellBuffer.cxx; sourceTree = "<group>"; };
+		287F3C87246F90900040E76F /* XPM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XPM.h; path = ../../../src/XPM.h; sourceTree = "<group>"; };
+		287F3C88246F90900040E76F /* MarginView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MarginView.h; path = ../../../src/MarginView.h; sourceTree = "<group>"; };
+		287F3C89246F90900040E76F /* ContractionState.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ContractionState.cxx; path = ../../../src/ContractionState.cxx; sourceTree = "<group>"; };
+		287F3C8A246F90900040E76F /* CellBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CellBuffer.h; path = ../../../src/CellBuffer.h; sourceTree = "<group>"; };
+		287F3C8B246F90900040E76F /* Position.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Position.h; path = ../../../src/Position.h; sourceTree = "<group>"; };
+		287F3C8C246F90900040E76F /* Partitioning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Partitioning.h; path = ../../../src/Partitioning.h; sourceTree = "<group>"; };
+		287F3C8D246F90910040E76F /* CaseFolder.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CaseFolder.cxx; path = ../../../src/CaseFolder.cxx; sourceTree = "<group>"; };
+		287F3C8E246F90910040E76F /* ContractionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ContractionState.h; path = ../../../src/ContractionState.h; sourceTree = "<group>"; };
+		287F3C8F246F90910040E76F /* KeyMap.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KeyMap.cxx; path = ../../../src/KeyMap.cxx; sourceTree = "<group>"; };
+		287F3C90246F90910040E76F /* EditView.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EditView.cxx; path = ../../../src/EditView.cxx; sourceTree = "<group>"; };
+		287F3C91246F90910040E76F /* PerLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PerLine.h; path = ../../../src/PerLine.h; sourceTree = "<group>"; };
+		287F3C92246F90910040E76F /* UniqueString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UniqueString.h; path = ../../../src/UniqueString.h; sourceTree = "<group>"; };
+		287F3C93246F90910040E76F /* Catalogue.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Catalogue.cxx; path = ../../../src/Catalogue.cxx; sourceTree = "<group>"; };
+		287F3C94246F90910040E76F /* PositionCache.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PositionCache.cxx; path = ../../../src/PositionCache.cxx; sourceTree = "<group>"; };
+		287F3C95246F90910040E76F /* Style.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Style.h; path = ../../../src/Style.h; sourceTree = "<group>"; };
+		287F3C96246F90910040E76F /* LineMarker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LineMarker.h; path = ../../../src/LineMarker.h; sourceTree = "<group>"; };
+		287F3C97246F90910040E76F /* DBCS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DBCS.cxx; path = ../../../src/DBCS.cxx; sourceTree = "<group>"; };
+		287F3C98246F90910040E76F /* EditModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EditModel.h; path = ../../../src/EditModel.h; sourceTree = "<group>"; };
+		287F3C99246F90910040E76F /* ExternalLexer.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ExternalLexer.cxx; path = ../../../src/ExternalLexer.cxx; sourceTree = "<group>"; };
+		287F3C9A246F90910040E76F /* IntegerRectangle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IntegerRectangle.h; path = ../../../src/IntegerRectangle.h; sourceTree = "<group>"; };
+		287F3C9B246F90920040E76F /* Selection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Selection.h; path = ../../../src/Selection.h; sourceTree = "<group>"; };
+		287F3C9C246F90920040E76F /* RESearch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RESearch.h; path = ../../../src/RESearch.h; sourceTree = "<group>"; };
+		287F3C9D246F90920040E76F /* Editor.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Editor.cxx; path = ../../../src/Editor.cxx; sourceTree = "<group>"; };
+		287F3C9E246F90920040E76F /* AutoComplete.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AutoComplete.h; path = ../../../src/AutoComplete.h; sourceTree = "<group>"; };
+		287F3C9F246F90920040E76F /* EditModel.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EditModel.cxx; path = ../../../src/EditModel.cxx; sourceTree = "<group>"; };
+		287F3CA0246F90920040E76F /* ScintillaBase.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ScintillaBase.cxx; path = ../../../src/ScintillaBase.cxx; sourceTree = "<group>"; };
+		287F3CA1246F90920040E76F /* ScintillaBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScintillaBase.h; path = ../../../src/ScintillaBase.h; sourceTree = "<group>"; };
+		287F3CA2246F90920040E76F /* KeyMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KeyMap.h; path = ../../../src/KeyMap.h; sourceTree = "<group>"; };
+		287F3CA3246F90920040E76F /* ExternalLexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExternalLexer.h; path = ../../../src/ExternalLexer.h; sourceTree = "<group>"; };
+		287F3CA4246F90920040E76F /* ViewStyle.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ViewStyle.cxx; path = ../../../src/ViewStyle.cxx; sourceTree = "<group>"; };
+		287F3CA5246F90920040E76F /* XPM.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XPM.cxx; path = ../../../src/XPM.cxx; sourceTree = "<group>"; };
+		287F3CA6246F90920040E76F /* Document.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Document.h; path = ../../../src/Document.h; sourceTree = "<group>"; };
+		287F3CA7246F90920040E76F /* Indicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Indicator.h; path = ../../../src/Indicator.h; sourceTree = "<group>"; };
+		287F3CA8246F90920040E76F /* Catalogue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Catalogue.h; path = ../../../src/Catalogue.h; sourceTree = "<group>"; };
+		287F3CA9246F90920040E76F /* MarginView.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MarginView.cxx; path = ../../../src/MarginView.cxx; sourceTree = "<group>"; };
+		287F3CAA246F90920040E76F /* FontQuality.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FontQuality.h; path = ../../../src/FontQuality.h; sourceTree = "<group>"; };
+		287F3CAB246F90920040E76F /* CharClassify.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CharClassify.h; path = ../../../src/CharClassify.h; sourceTree = "<group>"; };
+		287F3CAC246F90930040E76F /* Selection.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Selection.cxx; path = ../../../src/Selection.cxx; sourceTree = "<group>"; };
+		287F3CAD246F90930040E76F /* ViewStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ViewStyle.h; path = ../../../src/ViewStyle.h; sourceTree = "<group>"; };
+		287F3CAE246F90930040E76F /* EditView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EditView.h; path = ../../../src/EditView.h; sourceTree = "<group>"; };
+		287F3CAF246F90930040E76F /* PositionCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PositionCache.h; path = ../../../src/PositionCache.h; sourceTree = "<group>"; };
+		287F3CF3246F9A010040E76F /* OptionSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OptionSet.h; path = ../../../lexlib/OptionSet.h; sourceTree = "<group>"; };
+		287F3CF4246F9A010040E76F /* LexerModule.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexerModule.cxx; path = ../../../lexlib/LexerModule.cxx; sourceTree = "<group>"; };
+		287F3CF5246F9A010040E76F /* CharacterSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CharacterSet.h; path = ../../../lexlib/CharacterSet.h; sourceTree = "<group>"; };
+		287F3CF6246F9A010040E76F /* LexerModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LexerModule.h; path = ../../../lexlib/LexerModule.h; sourceTree = "<group>"; };
+		287F3CF7246F9A020040E76F /* Accessor.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Accessor.cxx; path = ../../../lexlib/Accessor.cxx; sourceTree = "<group>"; };
+		287F3CF8246F9A020040E76F /* CatalogueModules.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CatalogueModules.h; path = ../../../lexlib/CatalogueModules.h; sourceTree = "<group>"; };
+		287F3CF9246F9A020040E76F /* WordList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WordList.h; path = ../../../lexlib/WordList.h; sourceTree = "<group>"; };
+		287F3CFA246F9A020040E76F /* PropSetSimple.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PropSetSimple.cxx; path = ../../../lexlib/PropSetSimple.cxx; sourceTree = "<group>"; };
+		287F3CFB246F9A020040E76F /* LexerNoExceptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LexerNoExceptions.h; path = ../../../lexlib/LexerNoExceptions.h; sourceTree = "<group>"; };
+		287F3CFC246F9A020040E76F /* WordList.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WordList.cxx; path = ../../../lexlib/WordList.cxx; sourceTree = "<group>"; };
+		287F3CFD246F9A020040E76F /* CharacterCategory.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CharacterCategory.cxx; path = ../../../lexlib/CharacterCategory.cxx; sourceTree = "<group>"; };
+		287F3CFE246F9A020040E76F /* Accessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Accessor.h; path = ../../../lexlib/Accessor.h; sourceTree = "<group>"; };
+		287F3CFF246F9A020040E76F /* LexerSimple.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexerSimple.cxx; path = ../../../lexlib/LexerSimple.cxx; sourceTree = "<group>"; };
+		287F3D00246F9A020040E76F /* LexerNoExceptions.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexerNoExceptions.cxx; path = ../../../lexlib/LexerNoExceptions.cxx; sourceTree = "<group>"; };
+		287F3D01246F9A030040E76F /* StringCopy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StringCopy.h; path = ../../../lexlib/StringCopy.h; sourceTree = "<group>"; };
+		287F3D02246F9A030040E76F /* LexerBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LexerBase.h; path = ../../../lexlib/LexerBase.h; sourceTree = "<group>"; };
+		287F3D03246F9A030040E76F /* DefaultLexer.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DefaultLexer.cxx; path = ../../../lexlib/DefaultLexer.cxx; sourceTree = "<group>"; };
+		287F3D04246F9A030040E76F /* SubStyles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SubStyles.h; path = ../../../lexlib/SubStyles.h; sourceTree = "<group>"; };
+		287F3D05246F9A030040E76F /* CharacterSet.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CharacterSet.cxx; path = ../../../lexlib/CharacterSet.cxx; sourceTree = "<group>"; };
+		287F3D06246F9A030040E76F /* SparseState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SparseState.h; path = ../../../lexlib/SparseState.h; sourceTree = "<group>"; };
+		287F3D07246F9A030040E76F /* LexerBase.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexerBase.cxx; path = ../../../lexlib/LexerBase.cxx; sourceTree = "<group>"; };
+		287F3D08246F9A030040E76F /* LexAccessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LexAccessor.h; path = ../../../lexlib/LexAccessor.h; sourceTree = "<group>"; };
+		287F3D09246F9A030040E76F /* StyleContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleContext.h; path = ../../../lexlib/StyleContext.h; sourceTree = "<group>"; };
+		287F3D0A246F9A030040E76F /* StyleContext.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleContext.cxx; path = ../../../lexlib/StyleContext.cxx; sourceTree = "<group>"; };
+		287F3D0B246F9A030040E76F /* CharacterCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CharacterCategory.h; path = ../../../lexlib/CharacterCategory.h; sourceTree = "<group>"; };
+		287F3D0C246F9A040040E76F /* DefaultLexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultLexer.h; path = ../../../lexlib/DefaultLexer.h; sourceTree = "<group>"; };
+		287F3D0D246F9A040040E76F /* LexerSimple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LexerSimple.h; path = ../../../lexlib/LexerSimple.h; sourceTree = "<group>"; };
+		287F3D0E246F9A040040E76F /* PropSetSimple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PropSetSimple.h; path = ../../../lexlib/PropSetSimple.h; sourceTree = "<group>"; };
+		287F3E0F246F9AE50040E76F /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = SOURCE_ROOT; };
+		287F3E10246F9B150040E76F /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; name = res; path = ../../res; 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 */,
+				287F3C43246F8DC70040E76F /* Scintilla */,
+				287F3C4F246F8E6E0040E76F /* Resources */,
+				287F3C42246F8DC70040E76F /* Products */,
+				287F3C68246F90240040E76F /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		287F3C42246F8DC70040E76F /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				287F3C41246F8DC70040E76F /* Scintilla.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		287F3C43246F8DC70040E76F /* Scintilla */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Scintilla;
+			sourceTree = "<group>";
+		};
+		287F3C4D246F8E4A0040E76F /* Backend */ = {
+			isa = PBXGroup;
+			children = (
+				287F3CF7246F9A020040E76F /* Accessor.cxx */,
+				287F3C7C246F90900040E76F /* AutoComplete.cxx */,
+				287F3C7E246F90900040E76F /* CallTip.cxx */,
+				287F3C74246F908F0040E76F /* CaseConvert.cxx */,
+				287F3C8D246F90910040E76F /* CaseFolder.cxx */,
+				287F3C93246F90910040E76F /* Catalogue.cxx */,
+				287F3C86246F90900040E76F /* CellBuffer.cxx */,
+				287F3CFD246F9A020040E76F /* CharacterCategory.cxx */,
+				287F3D05246F9A030040E76F /* CharacterSet.cxx */,
+				287F3C75246F908F0040E76F /* CharClassify.cxx */,
+				287F3C89246F90900040E76F /* ContractionState.cxx */,
+				287F3C97246F90910040E76F /* DBCS.cxx */,
+				287F3C7D246F90900040E76F /* Decoration.cxx */,
+				287F3D03246F9A030040E76F /* DefaultLexer.cxx */,
+				287F3C83246F90900040E76F /* Document.cxx */,
+				287F3C9F246F90920040E76F /* EditModel.cxx */,
+				287F3C9D246F90920040E76F /* Editor.cxx */,
+				287F3C90246F90910040E76F /* EditView.cxx */,
+				287F3C99246F90910040E76F /* ExternalLexer.cxx */,
+				287F3C71246F908F0040E76F /* Indicator.cxx */,
+				287F3C8F246F90910040E76F /* KeyMap.cxx */,
+				287F3D07246F9A030040E76F /* LexerBase.cxx */,
+				287F3CF4246F9A010040E76F /* LexerModule.cxx */,
+				287F3D00246F9A020040E76F /* LexerNoExceptions.cxx */,
+				287F3CFF246F9A020040E76F /* LexerSimple.cxx */,
+				287F3C7F246F90900040E76F /* LineMarker.cxx */,
+				287F3CA9246F90920040E76F /* MarginView.cxx */,
+				287F3C73246F908F0040E76F /* PerLine.cxx */,
+				287F3C94246F90910040E76F /* PositionCache.cxx */,
+				287F3CFA246F9A020040E76F /* PropSetSimple.cxx */,
+				287F3C7B246F90900040E76F /* RESearch.cxx */,
+				287F3C6D246F908F0040E76F /* RunStyles.cxx */,
+				287F3CA0246F90920040E76F /* ScintillaBase.cxx */,
+				287F3CAC246F90930040E76F /* Selection.cxx */,
+				287F3C76246F908F0040E76F /* Style.cxx */,
+				287F3D0A246F9A030040E76F /* StyleContext.cxx */,
+				287F3C80246F90900040E76F /* UniConversion.cxx */,
+				287F3C84246F90900040E76F /* UniqueString.cxx */,
+				287F3CA4246F90920040E76F /* ViewStyle.cxx */,
+				287F3CFC246F9A020040E76F /* WordList.cxx */,
+				287F3CA5246F90920040E76F /* XPM.cxx */,
+				287F3CFE246F9A020040E76F /* Accessor.h */,
+				287F3C9E246F90920040E76F /* AutoComplete.h */,
+				287F3C85246F90900040E76F /* CallTip.h */,
+				287F3C6E246F908F0040E76F /* CaseConvert.h */,
+				287F3C77246F908F0040E76F /* CaseFolder.h */,
+				287F3CA8246F90920040E76F /* Catalogue.h */,
+				287F3CF8246F9A020040E76F /* CatalogueModules.h */,
+				287F3C8A246F90900040E76F /* CellBuffer.h */,
+				287F3D0B246F9A030040E76F /* CharacterCategory.h */,
+				287F3CF5246F9A010040E76F /* CharacterSet.h */,
+				287F3CAB246F90920040E76F /* CharClassify.h */,
+				287F3C8E246F90910040E76F /* ContractionState.h */,
+				287F3C7A246F90900040E76F /* DBCS.h */,
+				287F3C78246F90900040E76F /* Decoration.h */,
+				287F3D0C246F9A040040E76F /* DefaultLexer.h */,
+				287F3CA6246F90920040E76F /* Document.h */,
+				287F3C98246F90910040E76F /* EditModel.h */,
+				287F3C81246F90900040E76F /* Editor.h */,
+				287F3CAE246F90930040E76F /* EditView.h */,
+				287F3C70246F908F0040E76F /* ElapsedPeriod.h */,
+				287F3CA3246F90920040E76F /* ExternalLexer.h */,
+				287F3CAA246F90920040E76F /* FontQuality.h */,
+				287F3CA7246F90920040E76F /* Indicator.h */,
+				287F3C9A246F90910040E76F /* IntegerRectangle.h */,
+				287F3CA2246F90920040E76F /* KeyMap.h */,
+				287F3D08246F9A030040E76F /* LexAccessor.h */,
+				287F3D02246F9A030040E76F /* LexerBase.h */,
+				287F3CF6246F9A010040E76F /* LexerModule.h */,
+				287F3CFB246F9A020040E76F /* LexerNoExceptions.h */,
+				287F3D0D246F9A040040E76F /* LexerSimple.h */,
+				287F3C96246F90910040E76F /* LineMarker.h */,
+				287F3C88246F90900040E76F /* MarginView.h */,
+				287F3CF3246F9A010040E76F /* OptionSet.h */,
+				287F3C8C246F90900040E76F /* Partitioning.h */,
+				287F3C91246F90910040E76F /* PerLine.h */,
+				287F3C8B246F90900040E76F /* Position.h */,
+				287F3CAF246F90930040E76F /* PositionCache.h */,
+				287F3D0E246F9A040040E76F /* PropSetSimple.h */,
+				287F3C9C246F90920040E76F /* RESearch.h */,
+				287F3C72246F908F0040E76F /* RunStyles.h */,
+				287F3CA1246F90920040E76F /* ScintillaBase.h */,
+				287F3C9B246F90920040E76F /* Selection.h */,
+				287F3D06246F9A030040E76F /* SparseState.h */,
+				287F3C6F246F908F0040E76F /* SparseVector.h */,
+				287F3C79246F90900040E76F /* SplitVector.h */,
+				287F3D01246F9A030040E76F /* StringCopy.h */,
+				287F3C95246F90910040E76F /* Style.h */,
+				287F3D09246F9A030040E76F /* StyleContext.h */,
+				287F3D04246F9A030040E76F /* SubStyles.h */,
+				287F3C82246F90900040E76F /* UniConversion.h */,
+				287F3C92246F90910040E76F /* UniqueString.h */,
+				287F3CAD246F90930040E76F /* ViewStyle.h */,
+				287F3CF9246F9A020040E76F /* WordList.h */,
+				287F3C87246F90900040E76F /* XPM.h */,
+			);
+			path = Backend;
+			sourceTree = "<group>";
+		};
+		287F3C4E246F8E560040E76F /* Classes */ = {
+			isa = PBXGroup;
+			children = (
+				287F3E0F246F9AE50040E76F /* module.modulemap */,
+				287F3C54246F8F220040E76F /* InfoBar.h */,
+				287F3C59246F8F220040E76F /* InfoBar.mm */,
+				287F3C50246F8F220040E76F /* InfoBarCommunicator.h */,
+				287F3C55246F8F220040E76F /* PlatCocoa.h */,
+				287F3C56246F8F220040E76F /* PlatCocoa.mm */,
+				287F3C52246F8F220040E76F /* QuartzTextLayout.h */,
+				287F3C5B246F8F220040E76F /* QuartzTextStyle.h */,
+				287F3C51246F8F220040E76F /* QuartzTextStyleAttribute.h */,
+				287F3C5A246F8F220040E76F /* ScintillaCocoa.h */,
+				287F3C53246F8F220040E76F /* ScintillaCocoa.mm */,
+				287F3C57246F8F220040E76F /* ScintillaView.h */,
+				287F3C58246F8F220040E76F /* ScintillaView.mm */,
+			);
+			path = Classes;
+			sourceTree = "<group>";
+		};
+		287F3C4F246F8E6E0040E76F /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				287F3E10246F9B150040E76F /* res */,
+				287F3C45246F8DC70040E76F /* Info.plist */,
+			);
+			path = 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 = (
+				287F3C61246F8F220040E76F /* PlatCocoa.h in Headers */,
+				287F3C63246F8F220040E76F /* ScintillaView.h in Headers */,
+				287F3CEE246F90930040E76F /* CharClassify.h in Headers */,
+				287F3CDB246F90930040E76F /* EditModel.h in Headers */,
+				287F3CCE246F90930040E76F /* Position.h in Headers */,
+				287F3CDD246F90930040E76F /* IntegerRectangle.h in Headers */,
+				287F3CB5246F90930040E76F /* RunStyles.h in Headers */,
+				287F3CEB246F90930040E76F /* Catalogue.h in Headers */,
+				287F3D2A246F9A040040E76F /* PropSetSimple.h in Headers */,
+				287F3CC4246F90930040E76F /* Editor.h in Headers */,
+				287F3D12246F9A040040E76F /* LexerModule.h in Headers */,
+				287F3D25246F9A040040E76F /* StyleContext.h in Headers */,
+				287F3CDE246F90930040E76F /* Selection.h in Headers */,
+				287F3D1A246F9A040040E76F /* Accessor.h in Headers */,
+				287F3CD9246F90930040E76F /* LineMarker.h in Headers */,
+				287F3C66246F8F220040E76F /* ScintillaCocoa.h in Headers */,
+				287F3CB1246F90930040E76F /* CaseConvert.h in Headers */,
+				287F3D14246F9A040040E76F /* CatalogueModules.h in Headers */,
+				287F3C60246F8F220040E76F /* InfoBar.h in Headers */,
+				287F3D11246F9A040040E76F /* CharacterSet.h in Headers */,
+				287F3CD4246F90930040E76F /* PerLine.h in Headers */,
+				287F3CE6246F90930040E76F /* ExternalLexer.h in Headers */,
+				287F3CE5246F90930040E76F /* KeyMap.h in Headers */,
+				287F3CBA246F90930040E76F /* CaseFolder.h in Headers */,
+				287F3CDF246F90930040E76F /* RESearch.h in Headers */,
+				287F3CEA246F90930040E76F /* Indicator.h in Headers */,
+				287F3D17246F9A040040E76F /* LexerNoExceptions.h in Headers */,
+				287F3CD8246F90930040E76F /* Style.h in Headers */,
+				287F3D22246F9A040040E76F /* SparseState.h in Headers */,
+				287F3CBC246F90930040E76F /* SplitVector.h in Headers */,
+				287F3D27246F9A040040E76F /* CharacterCategory.h in Headers */,
+				287F3CD1246F90930040E76F /* ContractionState.h in Headers */,
+				287F3CBD246F90930040E76F /* DBCS.h in Headers */,
+				287F3C67246F8F220040E76F /* QuartzTextStyle.h in Headers */,
+				287F3CF1246F90930040E76F /* EditView.h in Headers */,
+				287F3CCF246F90930040E76F /* Partitioning.h in Headers */,
+				287F3CE9246F90930040E76F /* Document.h in Headers */,
+				287F3CF2246F90930040E76F /* PositionCache.h in Headers */,
+				287F3CBB246F90930040E76F /* Decoration.h in Headers */,
+				287F3C5C246F8F220040E76F /* InfoBarCommunicator.h in Headers */,
+				287F3CB2246F90930040E76F /* SparseVector.h in Headers */,
+				287F3C5E246F8F220040E76F /* QuartzTextLayout.h in Headers */,
+				287F3CC5246F90930040E76F /* UniConversion.h in Headers */,
+				287F3CD5246F90930040E76F /* UniqueString.h in Headers */,
+				287F3CF0246F90930040E76F /* ViewStyle.h in Headers */,
+				287F3D0F246F9A040040E76F /* OptionSet.h in Headers */,
+				287F3D20246F9A040040E76F /* SubStyles.h in Headers */,
+				287F3D1D246F9A040040E76F /* StringCopy.h in Headers */,
+				287F3CCA246F90930040E76F /* XPM.h in Headers */,
+				287F3CE1246F90930040E76F /* AutoComplete.h in Headers */,
+				287F3D15246F9A040040E76F /* WordList.h in Headers */,
+				287F3CE4246F90930040E76F /* ScintillaBase.h in Headers */,
+				287F3CC8246F90930040E76F /* CallTip.h in Headers */,
+				287F3CED246F90930040E76F /* FontQuality.h in Headers */,
+				287F3D29246F9A040040E76F /* LexerSimple.h in Headers */,
+				287F3CB3246F90930040E76F /* ElapsedPeriod.h in Headers */,
+				287F3CCB246F90930040E76F /* MarginView.h in Headers */,
+				287F3CCD246F90930040E76F /* CellBuffer.h in Headers */,
+				287F3D1E246F9A040040E76F /* LexerBase.h in Headers */,
+				287F3D28246F9A040040E76F /* DefaultLexer.h in Headers */,
+				287F3C5D246F8F220040E76F /* QuartzTextStyleAttribute.h in Headers */,
+				287F3D24246F9A040040E76F /* LexAccessor.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 */,
+				287F3C3D246F8DC70040E76F /* Sources */,
+				287F3C3E246F8DC70040E76F /* Frameworks */,
+				287F3C3F246F8DC70040E76F /* Resources */,
+			);
+			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 = 1140;
+				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 = (
+				287F3E11246F9B150040E76F /* res in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		287F3C3D246F8DC70040E76F /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				287F3CD3246F90930040E76F /* EditView.cxx in Sources */,
+				287F3CB6246F90930040E76F /* PerLine.cxx in Sources */,
+				287F3D1B246F9A040040E76F /* LexerSimple.cxx in Sources */,
+				287F3CC7246F90930040E76F /* UniqueString.cxx in Sources */,
+				287F3CD6246F90930040E76F /* Catalogue.cxx in Sources */,
+				287F3CC1246F90930040E76F /* CallTip.cxx in Sources */,
+				287F3C62246F8F220040E76F /* PlatCocoa.mm in Sources */,
+				287F3D26246F9A040040E76F /* StyleContext.cxx in Sources */,
+				287F3CD7246F90930040E76F /* PositionCache.cxx in Sources */,
+				287F3CEC246F90930040E76F /* MarginView.cxx in Sources */,
+				287F3CDC246F90930040E76F /* ExternalLexer.cxx in Sources */,
+				287F3D18246F9A040040E76F /* WordList.cxx in Sources */,
+				287F3CC0246F90930040E76F /* Decoration.cxx in Sources */,
+				287F3CC6246F90930040E76F /* Document.cxx in Sources */,
+				287F3CCC246F90930040E76F /* ContractionState.cxx in Sources */,
+				287F3CC3246F90930040E76F /* UniConversion.cxx in Sources */,
+				287F3C5F246F8F220040E76F /* ScintillaCocoa.mm in Sources */,
+				287F3CBF246F90930040E76F /* AutoComplete.cxx in Sources */,
+				287F3D23246F9A040040E76F /* LexerBase.cxx in Sources */,
+				287F3CC9246F90930040E76F /* CellBuffer.cxx in Sources */,
+				287F3CD0246F90930040E76F /* CaseFolder.cxx in Sources */,
+				287F3CE7246F90930040E76F /* ViewStyle.cxx in Sources */,
+				287F3D1F246F9A040040E76F /* DefaultLexer.cxx in Sources */,
+				287F3D1C246F9A040040E76F /* LexerNoExceptions.cxx in Sources */,
+				287F3CEF246F90930040E76F /* Selection.cxx in Sources */,
+				287F3D19246F9A040040E76F /* CharacterCategory.cxx in Sources */,
+				287F3D16246F9A040040E76F /* PropSetSimple.cxx in Sources */,
+				287F3C64246F8F220040E76F /* ScintillaView.mm in Sources */,
+				287F3CB4246F90930040E76F /* Indicator.cxx in Sources */,
+				287F3CE0246F90930040E76F /* Editor.cxx in Sources */,
+				287F3CB8246F90930040E76F /* CharClassify.cxx in Sources */,
+				287F3CE3246F90930040E76F /* ScintillaBase.cxx in Sources */,
+				287F3CE2246F90930040E76F /* EditModel.cxx in Sources */,
+				287F3CB7246F90930040E76F /* CaseConvert.cxx in Sources */,
+				287F3CD2246F90930040E76F /* KeyMap.cxx in Sources */,
+				287F3D10246F9A040040E76F /* LexerModule.cxx in Sources */,
+				287F3C65246F8F220040E76F /* InfoBar.mm in Sources */,
+				287F3CDA246F90930040E76F /* DBCS.cxx in Sources */,
+				287F3CB0246F90930040E76F /* RunStyles.cxx in Sources */,
+				287F3CC2246F90930040E76F /* LineMarker.cxx in Sources */,
+				287F3D21246F9A040040E76F /* CharacterSet.cxx in Sources */,
+				287F3D13246F9A040040E76F /* Accessor.cxx in Sources */,
+				287F3CE8246F90930040E76F /* XPM.cxx in Sources */,
+				287F3CB9246F90930040E76F /* Style.cxx in Sources */,
+				287F3CBE246F90930040E76F /* RESearch.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_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 = 4.4.4;
+				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=1",
+					"$(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.7;
+				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_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 = 4.4.4;
+				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_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.7;
+				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 = 4.4.4;
+				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = "";
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREPROCESSOR_DEFINITIONS = SCI_EMPTYCATALOGUE;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					../../src,
+					../../lexlib,
+				);
+				INFOPLIST_FILE = Scintilla/Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/Frameworks",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				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 = 4.4.4;
+				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = "";
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREPROCESSOR_DEFINITIONS = SCI_EMPTYCATALOGUE;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					../../src,
+					../../lexlib,
+				);
+				INFOPLIST_FILE = Scintilla/Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/Frameworks",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				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 -Nru scite-4.3.3/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.xcworkspace/contents.xcworkspacedata scite-4.4.4/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.xcworkspace/contents.xcworkspacedata
--- scite-4.3.3/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.xcworkspace/contents.xcworkspacedata	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.xcworkspace/contents.xcworkspacedata	2020-05-31 23:08:11.000000000 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:Scintilla.xcodeproj">
+   </FileRef>
+</Workspace>
diff -Nru scite-4.3.3/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist scite-4.4.4/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
--- scite-4.3.3/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist	2020-05-31 23:08:11.000000000 +0000
@@ -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 -Nru scite-4.3.3/scintilla/cocoa/ScintillaFramework/Info.plist scite-4.4.4/scintilla/cocoa/ScintillaFramework/Info.plist
--- scite-4.3.3/scintilla/cocoa/ScintillaFramework/Info.plist	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/cocoa/ScintillaFramework/Info.plist	2020-07-18 05:40:21.000000000 +0000
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.3.3</string>
+	<string>4.4.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.3.3</string>
+	<string>4.4.4</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff -Nru scite-4.3.3/scintilla/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist scite-4.4.4/scintilla/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
--- scite-4.3.3/scintilla/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist	2020-05-31 23:08:11.000000000 +0000
@@ -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 -Nru scite-4.3.3/scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist scite-4.4.4/scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
--- scite-4.3.3/scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist	2020-05-31 23:08:11.000000000 +0000
@@ -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 -Nru scite-4.3.3/scintilla/cppcheck.suppress scite-4.4.4/scintilla/cppcheck.suppress
--- scite-4.3.3/scintilla/cppcheck.suppress	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/cppcheck.suppress	2020-07-18 05:40:21.000000000 +0000
@@ -1,10 +1,6 @@
 // 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.
 
-// unreadVariable has expanded in cppcheck 1.90 to match assigning a struct then reading
-// only from members which is a common idiom
-unreadVariable
-
 // Coding style is to use assignments in constructor when there are many
 // members to initialize or the initialization is complex or has comments.
 useInitializationList
@@ -14,19 +10,25 @@
 // produces same result on empty collections
 useStlAlgorithm
 
-// Currently shift by word size is implementation defined but is OK on all used compilers
-// In C++20, it will be well-defined.
-shiftTooManyBitsSigned
+// Written with variable for consistency
+knownArgument:scintilla/src/SparseVector.h
+knownArgument:scintilla/src/RESearch.cxx
 
 // The two sections are for different purposes: C1 control set and UTF-8 invalid bytes
 duplicateCondition:scintilla/src/Editor.cxx
 
+// Appears to not understand lambda
+knownConditionTrueFalse:scintilla/src/PerLine.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
 
+// 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
 
@@ -53,9 +55,12 @@
 constParameter:scintilla/lexers/LexBash.cxx
 uninitMemberVar:scintilla/lexers/LexBash.cxx
 variableScope:scintilla/lexers/LexBash.cxx
+knownConditionTrueFalse:scintilla/lexers/LexBash.cxx
 variableScope:scintilla/lexers/LexBatch.cxx
 constParameter:scintilla/lexers/LexBullant.cxx
 variableScope:scintilla/lexers/LexCmake.cxx
+constParameter:scintilla/lexers/LexCmake.cxx
+knownConditionTrueFalse:scintilla/lexers/LexCmake.cxx
 constParameter:scintilla/lexers/LexCLW.cxx
 constParameter:scintilla/lexers/LexCOBOL.cxx
 constParameter:scintilla/lexers/LexCoffeeScript.cxx
@@ -68,6 +73,7 @@
 variableScope:scintilla/lexers/LexErlang.cxx
 knownConditionTrueFalse:scintilla/lexers/LexEScript.cxx
 constParameter:scintilla/lexers/LexFortran.cxx
+constParameter:scintilla/lexers/LexGap.cxx
 variableScope:scintilla/lexers/LexGui4Cli.cxx
 constParameter:scintilla/lexers/LexHaskell.cxx
 constParameter:scintilla/lexers/LexHex.cxx
@@ -78,6 +84,7 @@
 constParameter:scintilla/lexers/LexLaTeX.cxx
 constParameter:scintilla/lexers/LexLisp.cxx
 constParameter:scintilla/lexers/LexMagik.cxx
+knownArgument:scintilla/lexers/LexMarkdown.cxx
 constParameter:scintilla/lexers/LexMatlab.cxx
 unreadVariable:scintilla/lexers/LexMatlab.cxx
 variableScope:scintilla/lexers/LexMetapost.cxx
@@ -89,7 +96,10 @@
 constParameter:scintilla/lexers/LexNimrod.cxx
 variableScope:scintilla/lexers/LexNimrod.cxx
 variableScope:scintilla/lexers/LexNsis.cxx
+constParameter:scintilla/lexers/LexNsis.cxx
+knownConditionTrueFalse:scintilla/lexers/LexNsis.cxx
 variableScope:scintilla/lexers/LexOpal.cxx
+constParameter:scintilla/lexers/LexOpal.cxx
 constParameter:scintilla/lexers/LexOScript.cxx
 constParameter:scintilla/lexers/LexPascal.cxx
 variableScope:scintilla/lexers/LexPB.cxx
@@ -97,6 +107,7 @@
 constParameter:scintilla/lexers/LexPLM.cxx
 constParameter:scintilla/lexers/LexPython.cxx
 shadowVariable:scintilla/lexers/LexPowerPro.cxx
+knownConditionTrueFalse:scintilla/lexers/LexPowerPro.cxx
 constParameter:scintilla/lexers/LexProgress.cxx
 variableScope:scintilla/lexers/LexProgress.cxx
 constParameter:scintilla/lexers/LexRaku.cxx
@@ -106,6 +117,7 @@
 variableScope:scintilla/lexers/LexRuby.cxx
 uninitMemberVar:scintilla/lexers/LexRuby.cxx
 constParameter:scintilla/lexers/LexRust.cxx
+knownConditionTrueFalse:scintilla/lexers/LexRust.cxx
 constParameter:scintilla/lexers/LexScriptol.cxx
 variableScope:scintilla/lexers/LexSpecman.cxx
 constParameter:scintilla/lexers/LexSpice.cxx
@@ -117,12 +129,11 @@
 constParameter:scintilla/lexers/LexTADS3.cxx
 constParameter:scintilla/lexers/LexTAL.cxx
 invalidscanf:scintilla/lexers/LexTCMD.cxx
-knownConditionTrueFalse:scintilla/lexers/LexTCMD.cxx
 constParameter:scintilla/lexers/LexTeX.cxx
 variableScope:scintilla/lexers/LexTeX.cxx
+knownArgument:scintilla/lexers/LexTxt2tags.cxx
 constParameter:scintilla/lexers/LexVB.cxx
-knownConditionTrueFalse:scintilla/lexers/LexVerilog.cxx
-constArgument:scintilla/lexers/LexVerilog.cxx
+knownArgument:scintilla/lexers/LexVerilog.cxx
 constParameter:scintilla/lexers/LexVerilog.cxx
 constParameter:scintilla/lexers/LexVHDL.cxx
 shadowVariable:scintilla/lexers/LexVHDL.cxx
diff -Nru scite-4.3.3/scintilla/delbin.bat scite-4.4.4/scintilla/delbin.bat
--- scite-4.3.3/scintilla/delbin.bat	2018-04-27 10:42:00.000000000 +0000
+++ scite-4.4.4/scintilla/delbin.bat	2020-07-18 05:40:21.000000000 +0000
@@ -1 +1 @@
-@del /S /Q *.a *.aps *.bsc *.dll *.dsw *.exe *.idb *.ilc *.ild *.ilf *.ilk *.ils *.lib *.map *.ncb *.obj *.o *.opt *.pdb *.plg *.res *.sbr *.tds *.exp *.tlog >NUL:
+@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:
Binary files /tmp/tmpKug0su/L26cWPHcFd/scite-4.3.3/scintilla/doc/eolannotation.png and /tmp/tmpKug0su/pTjLcP82ze/scite-4.4.4/scintilla/doc/eolannotation.png differ
diff -Nru scite-4.3.3/scintilla/doc/index.html scite-4.4.4/scintilla/doc/index.html
--- scite-4.3.3/scintilla/doc/index.html	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/doc/index.html	2020-07-18 05:40:21.000000000 +0000
@@ -9,7 +9,7 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20200427" />
+    <meta name="Date.Modified" content="20200721" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
         #versionlist {
@@ -56,8 +56,8 @@
           GTK, and OS X</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 4.3.3<br />
-           Site last modified April 27 2020</font>
+          <font color="#FFCC99" size="3"> Release version 4.4.4<br />
+           Site last modified July 21 2020</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -72,11 +72,12 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 4.4.4 implements end of line annotations.</li>
+      <li>Version 4.4.3 was released just to fix SciTE.</li>
+      <li>Version 4.4.2 fixes Lexilla build problems with Xcode and as a static library on Win32.</li>
+      <li>Version 4.4.0 builds Scintilla without lexers as a shared library for GTK,
+      and adds Xcode projects for Scintilla without lexers and Lexilla on macOS.</li>
       <li>Version 4.3.3 adds methods for iterating marker handles and marker numbers on a line.</li>
-      <li>Version 4.3.2 fixes dragging text that contains a new line on Win32.</li>
-      <li>Version 4.3.1 automatically scrolls when dragging text near window border.</li>
-      <li>Version 4.3.0 makes lexers available as Lexilla library.
-      SCI_SETILEXER can use Lexilla or application-provided lexers</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
diff -Nru scite-4.3.3/scintilla/doc/SciCoding.html scite-4.4.4/scintilla/doc/SciCoding.html
--- scite-4.3.3/scintilla/doc/SciCoding.html	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/doc/SciCoding.html	2020-05-31 23:08:11.000000000 +0000
@@ -134,7 +134,6 @@
 	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.
-	Run-time type information adds to memory use so is turned off.
 	A 'Scintilla' name space is used. This helps with name clashes on OS X.
 	</p>
 	<p>
diff -Nru scite-4.3.3/scintilla/doc/ScintillaDoc.html scite-4.4.4/scintilla/doc/ScintillaDoc.html
--- scite-4.3.3/scintilla/doc/ScintillaDoc.html	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/doc/ScintillaDoc.html	2020-07-18 05:40:21.000000000 +0000
@@ -457,6 +457,8 @@
         <tr>
           <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>
@@ -3321,9 +3323,9 @@
     <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
-    0, 1, 2 or 3 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 (added at version
-    1.50), similar to setting the caret style to CARETSTYLE_INVISIBLE (though not interchangeable).
+    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>
 
@@ -3725,6 +3727,99 @@
     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>.
+     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> or each character may be individually styled with
+     of the corresponding text byte similar to <code>SCI_SETSTYLINGEX</code>. The text must be set first as it
+     specifies how long the end of line annotation is so how many bytes of styling to read.
+     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>0</td>
+
+          <td>End of Line Annotations are not displayed.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>EOLANNOTATION_STANDARD</code></th>
+
+          <td>1</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>2</td>
+
+          <td>End of Line Annotations are indented to match the text and are surrounded by a box.</td>
+        </tr>
+
+      </tbody>
+    </table>
+
+    <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>
+    or <code>SCI_EOLANNOTATIONSETSTYLES</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 />
@@ -3752,10 +3847,10 @@
     <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>While we are on the subject of forwarding messages in Windows, the top level window should
-    forward any <code>WM_SETTINGCHANGE</code> messages to Scintilla (this is currently used to
-    collect changes to mouse settings, but could be used for other user interface items in the
-    future).</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 />
@@ -3911,6 +4006,7 @@
      <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 />
@@ -3946,6 +4042,10 @@
     <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
diff -Nru scite-4.3.3/scintilla/doc/ScintillaDownload.html scite-4.4.4/scintilla/doc/ScintillaDownload.html
--- scite-4.3.3/scintilla/doc/ScintillaDownload.html	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/doc/ScintillaDownload.html	2020-07-21 10:08:38.000000000 +0000
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://www.scintilla.org/scintilla433.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scintilla444.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scintilla433.tgz">
+	<a href="https://www.scintilla.org/scintilla444.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 4.3.3
+       Release 4.4.4
     </h3>
     <h4>
        Source Code
@@ -50,8 +50,8 @@
        The source code package contains all of the source code for Scintilla but no binary
 	executable code and is available in
        <ul>
-       <li><a href="https://www.scintilla.org/scintilla433.zip">zip format</a> (1.7M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla433.tgz">tgz format</a> (1.4M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/scintilla444.zip">zip format</a> (1.8M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scintilla444.tgz">tgz format</a> (1.6M) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>
diff -Nru scite-4.3.3/scintilla/doc/ScintillaHistory.html scite-4.4.4/scintilla/doc/ScintillaHistory.html
--- scite-4.3.3/scintilla/doc/ScintillaHistory.html	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/doc/ScintillaHistory.html	2020-07-18 05:40:21.000000000 +0000
@@ -551,6 +551,13 @@
 	<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>
     </tr>
     </table>
     <p>
@@ -563,7 +570,164 @@
       </li>
     </ul>
     <h3>
-       <a href="https://www.scintilla.org/scite432.zip">Release 4.3.3</a>
+       <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>
diff -Nru scite-4.3.3/scintilla/doc/ScintillaRelated.html scite-4.4.4/scintilla/doc/ScintillaRelated.html
--- scite-4.3.3/scintilla/doc/ScintillaRelated.html	2018-04-27 10:42:00.000000000 +0000
+++ scite-4.4.4/scintilla/doc/ScintillaRelated.html	2020-07-18 05:40:21.000000000 +0000
@@ -128,6 +128,14 @@
        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>
diff -Nru scite-4.3.3/scintilla/gtk/makefile scite-4.4.4/scintilla/gtk/makefile
--- scite-4.3.3/scintilla/gtk/makefile	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/gtk/makefile	2020-05-31 23:08:11.000000000 +0000
@@ -7,7 +7,7 @@
 # Builds for GTK+ 2 and 3. GTK 3 requires GTK3=1 on command line.
 # Also works with ming32-make on Windows.
 
-.PHONY: all clean analyze depend
+.PHONY: static shared all clean analyze depend
 
 .SUFFIXES: .cxx .c .o .h .a .list
 
@@ -49,18 +49,26 @@
 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
+LEXILLA = lexilla.dll
 else
 DEL = rm -f
+LEXILLA = liblexilla.so
 endif
 COMPLIB=$(basedir)/bin/scintilla.a
+COMPONENT=$(basedir)/bin/libscintilla.$(SHAREDEXTENSION)
 
 vpath %.h $(srcdir) $(basedir)/src $(basedir)/include $(basedir)/lexlib
 vpath %.c $(srcdir)
@@ -81,12 +89,20 @@
 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)
+all: $(COMPLIB) $(COMPONENT) $(LEXILLA)
+
+static: $(COMPLIB)
+
+shared: $(COMPONENT)
+
+$(LEXILLA):
+	$(MAKE) --directory=../lexilla/src
 
 clean:
-	$(DEL) *.o $(call normalize,$(COMPLIB)) *.plist
+	$(DEL) *.o $(call normalize,$(COMPLIB)) $(call normalize,$(COMPONENT)) *.plist
 
 %.o: %.cxx
 	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -c $<
@@ -154,15 +170,27 @@
 	StyleContext.o \
 	WordList.o
 
+LEXLIBL_OBJS = $(LEXLIB_OBJS) CatalogueL.o
+LEXLIBS_OBJS = $(LEXLIB_OBJS) Catalogue.o
+
 GTK_OBJS = \
 	ScintillaBase.o \
 	PlatGTK.o \
 	ScintillaGTK.o \
 	ScintillaGTKAccessible.o
 
-$(COMPLIB): $(SRC_OBJS) $(LEXLIB_OBJS) $(GTK_OBJS) $(MARSHALLER) $(LEX_OBJS)
+$(COMPLIB): $(SRC_OBJS) $(LEXLIBL_OBJS) $(GTK_OBJS) $(MARSHALLER) $(LEX_OBJS)
 	$(AR) $(ARFLAGS) $@ $^
 	$(RANLIB) $@
 
+$(COMPONENT): $(SRC_OBJS) $(LEXLIBS_OBJS) $(GTK_OBJS) $(MARSHALLER)
+	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(CONFIGLIB)
+
+Catalogue.o: Catalogue.cxx
+	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -D SCI_LEXER -D SCI_EMPTYCATALOGUE -c $< -o $@
+
+CatalogueL.o: Catalogue.cxx
+	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@
+
 # Automatically generate header dependencies with "make deps"
 include deps.mak
diff -Nru scite-4.3.3/scintilla/gtk/PlatGTK.cxx scite-4.4.4/scintilla/gtk/PlatGTK.cxx
--- scite-4.3.3/scintilla/gtk/PlatGTK.cxx	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/gtk/PlatGTK.cxx	2020-05-31 23:08:11.000000000 +0000
@@ -931,7 +931,7 @@
 	if (PFont(font_)->pfd) {
 		PangoFontMetrics *metrics = pango_context_get_metrics(pcontext,
 					    PFont(font_)->pfd, pango_context_get_language(pcontext));
-		ascent = std::floor(floatFromPangoUnits(
+		ascent = std::round(floatFromPangoUnits(
 					    pango_font_metrics_get_ascent(metrics)));
 		pango_font_metrics_unref(metrics);
 	}
@@ -947,7 +947,7 @@
 	if (PFont(font_)->pfd) {
 		PangoFontMetrics *metrics = pango_context_get_metrics(pcontext,
 					    PFont(font_)->pfd, pango_context_get_language(pcontext));
-		const XYPOSITION descent = std::floor(floatFromPangoUnits(
+		const XYPOSITION descent = std::round(floatFromPangoUnits(
 				pango_font_metrics_get_descent(metrics)));
 		pango_font_metrics_unref(metrics);
 		return descent;
diff -Nru scite-4.3.3/scintilla/gtk/ScintillaGTK.cxx scite-4.4.4/scintilla/gtk/ScintillaGTK.cxx
--- scite-4.3.3/scintilla/gtk/ScintillaGTK.cxx	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/gtk/ScintillaGTK.cxx	2020-05-31 23:08:11.000000000 +0000
@@ -157,7 +157,7 @@
 	atomSought(nullptr),
 	preeditInitialized(false),
 	im_context(nullptr),
-	lastNonCommonScript(PANGO_SCRIPT_INVALID_CODE),
+	lastNonCommonScript(G_UNICODE_SCRIPT_INVALID_CODE),
 	lastWheelMouseTime(0),
 	lastWheelMouseDirection(0),
 	wheelMouseIntensity(0),
@@ -413,13 +413,13 @@
 	gboolean validUTF8;
 	glong uniStrLen;
 	gunichar *uniStr;
-	PangoScript pscript;
+	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, strlen(str), &uniStrLen);
-		pscript = pango_script_for_unichar(uniStr[0]);
+		pscript = g_unichar_get_script(uniStr[0]);
 	}
 	// Deleted so PreEditString objects can not be copied.
 	PreEditString(const PreEditString&) = delete;
@@ -1278,10 +1278,10 @@
 		sci(sci_) {
 	}
 
-	static void ClipboardReceived(GtkClipboard *, GtkSelectionData *selection_data, gpointer data) {
+	static void ClipboardReceived(GtkClipboard *clipboard, GtkSelectionData *selection_data, gpointer data) {
 		SelectionReceiver *self = static_cast<SelectionReceiver *>(data);
 		if (self->sci) {
-			self->sci->ReceivedClipboard(selection_data);
+			self->sci->ReceivedClipboard(clipboard, selection_data);
 		}
 		delete self;
 	}
@@ -1373,6 +1373,10 @@
 	}
 }
 
+bool ScintillaGTK::IsStringAtom(GdkAtom type) {
+	return (type == GDK_TARGET_STRING) || (type == atomUTF8) || (type == atomUTF8Mime);
+}
+
 static const guchar *DataOfGSD(GtkSelectionData *sd) noexcept { return gtk_selection_data_get_data(sd); }
 static gint LengthOfGSD(GtkSelectionData *sd) noexcept { return gtk_selection_data_get_length(sd); }
 static GdkAtom TypeOfGSD(GtkSelectionData *sd) noexcept { return gtk_selection_data_get_data_type(sd); }
@@ -1385,7 +1389,7 @@
 	GdkAtom selectionTypeData = TypeOfGSD(selectionData);
 
 	// Return empty string if selection is not a string
-	if ((selectionTypeData != GDK_TARGET_STRING) && (selectionTypeData != atomUTF8)) {
+	if (!IsStringAtom(selectionTypeData)) {
 		selText.Clear();
 		return;
 	}
@@ -1431,7 +1435,7 @@
 	}
 }
 
-void ScintillaGTK::InsertSelection(GtkSelectionData *selectionData) {
+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);
@@ -1446,6 +1450,15 @@
 		InsertPasteShape(selText.Data(), selText.Length(),
 				 selText.rectangular ? pasteRectangular : pasteStream);
 		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();
 }
@@ -1454,9 +1467,9 @@
 	return G_OBJECT(PWidget(wMain));
 }
 
-void ScintillaGTK::ReceivedClipboard(GtkSelectionData *selection_data) noexcept {
+void ScintillaGTK::ReceivedClipboard(GtkClipboard *clipBoard, GtkSelectionData *selection_data) noexcept {
 	try {
-		InsertSelection(selection_data);
+		InsertSelection(clipBoard, selection_data);
 	} catch (...) {
 		errorStatus = SC_STATUS_FAILURE;
 	}
@@ -1470,9 +1483,9 @@
 				atomSought = atomString;
 				gtk_selection_convert(GTK_WIDGET(PWidget(wMain)),
 						      SelectionOfGSD(selection_data), atomSought, GDK_CURRENT_TIME);
-			} else if ((LengthOfGSD(selection_data) > 0) &&
-					((TypeOfGSD(selection_data) == GDK_TARGET_STRING) || (TypeOfGSD(selection_data) == atomUTF8))) {
-				InsertSelection(selection_data);
+			} 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),
@@ -1489,7 +1502,7 @@
 		std::vector<char> drop(data, data + LengthOfGSD(selection_data));
 		drop.push_back('\0');
 		NotifyURIDropped(&drop[0]);
-	} else if ((TypeOfGSD(selection_data) == GDK_TARGET_STRING) || (TypeOfGSD(selection_data) == atomUTF8)) {
+	} else if (IsStringAtom(TypeOfGSD(selection_data))) {
 		if (LengthOfGSD(selection_data) > 0) {
 			SelectionText selText;
 			GetGtkSelectionText(selection_data, selText);
@@ -2235,9 +2248,9 @@
 
 bool ScintillaGTK::KoreanIME() {
 	PreEditString pes(im_context);
-	if (pes.pscript != PANGO_SCRIPT_COMMON)
+	if (pes.pscript != G_UNICODE_SCRIPT_COMMON)
 		lastNonCommonScript = pes.pscript;
-	return lastNonCommonScript == PANGO_SCRIPT_HANGUL;
+	return lastNonCommonScript == G_UNICODE_SCRIPT_HANGUL;
 }
 
 void ScintillaGTK::MoveImeCarets(int pos) {
@@ -3041,6 +3054,7 @@
 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);
diff -Nru scite-4.3.3/scintilla/gtk/ScintillaGTK.h scite-4.4.4/scintilla/gtk/ScintillaGTK.h
--- scite-4.3.3/scintilla/gtk/ScintillaGTK.h	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/gtk/ScintillaGTK.h	2020-05-31 23:08:11.000000000 +0000
@@ -37,6 +37,7 @@
 	GtkWidgetClass *parentClass;
 
 	static inline GdkAtom atomUTF8 {};
+	static inline GdkAtom atomUTF8Mime {};
 	static inline GdkAtom atomString {};
 	static inline GdkAtom atomUriList {};
 	static inline GdkAtom atomDROPFILES_DND {};
@@ -50,7 +51,7 @@
 	Window wPreedit;
 	Window wPreeditDraw;
 	GtkIMContext *im_context;
-	PangoScript lastNonCommonScript;
+	GUnicodeScript lastNonCommonScript;
 
 	// Wheel mouse support
 	unsigned int linesPerScroll;
@@ -133,11 +134,12 @@
 	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(GtkSelectionData *selectionData);
+	void InsertSelection(GtkClipboard *clipBoard, GtkSelectionData *selectionData);
 public:	// Public for SelectionReceiver
 	GObject *MainObject() const noexcept;
-	void ReceivedClipboard(GtkSelectionData *selection_data) noexcept;
+	void ReceivedClipboard(GtkClipboard *clipBoard, GtkSelectionData *selection_data) noexcept;
 private:
 	void ReceivedSelection(GtkSelectionData *selection_data);
 	void ReceivedDrop(GtkSelectionData *selection_data);
diff -Nru scite-4.3.3/scintilla/include/Platform.h scite-4.4.4/scintilla/include/Platform.h
--- scite-4.3.3/scintilla/include/Platform.h	2020-03-03 21:50:30.000000000 +0000
+++ scite-4.4.4/scintilla/include/Platform.h	2020-07-18 05:40:21.000000000 +0000
@@ -108,15 +108,15 @@
 		return Point(static_cast<XYPOSITION>(x_), static_cast<XYPOSITION>(y_));
 	}
 
-	bool operator!=(Point other) const noexcept {
+	constexpr bool operator!=(Point other) const noexcept {
 		return (x != other.x) || (y != other.y);
 	}
 
-	Point operator+(Point other) const noexcept {
+	constexpr Point operator+(Point other) const noexcept {
 		return Point(x + other.x, y + other.y);
 	}
 
-	Point operator-(Point other) const noexcept {
+	constexpr Point operator-(Point other) const noexcept {
 		return Point(x - other.x, y - other.y);
 	}
 
@@ -146,24 +146,24 @@
 
 	// Other automatically defined methods (assignment, copy constructor, destructor) are fine
 
-	bool operator==(const PRectangle &rc) const noexcept {
+	constexpr bool operator==(const PRectangle &rc) const noexcept {
 		return (rc.left == left) && (rc.right == right) &&
 			(rc.top == top) && (rc.bottom == bottom);
 	}
-	bool Contains(Point pt) const noexcept {
+	constexpr bool Contains(Point pt) const noexcept {
 		return (pt.x >= left) && (pt.x <= right) &&
 			(pt.y >= top) && (pt.y <= bottom);
 	}
-	bool ContainsWholePixel(Point pt) const noexcept {
+	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);
 	}
-	bool Contains(PRectangle rc) const noexcept {
+	constexpr bool Contains(PRectangle rc) const noexcept {
 		return (rc.left >= left) && (rc.right <= right) &&
 			(rc.top >= top) && (rc.bottom <= bottom);
 	}
-	bool Intersects(PRectangle other) const noexcept {
+	constexpr bool Intersects(PRectangle other) const noexcept {
 		return (right > other.left) && (left < other.right) &&
 			(bottom > other.top) && (top < other.bottom);
 	}
@@ -173,9 +173,9 @@
 		right += xDelta;
 		bottom += yDelta;
 	}
-	XYPOSITION Width() const noexcept { return right - left; }
-	XYPOSITION Height() const noexcept { return bottom - top; }
-	bool Empty() const noexcept {
+	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);
 	}
 };
@@ -187,40 +187,40 @@
 class ColourDesired {
 	int co;
 public:
-	explicit ColourDesired(int co_=0) noexcept : co(co_) {
+	constexpr explicit ColourDesired(int co_=0) noexcept : co(co_) {
 	}
 
-	ColourDesired(unsigned int red, unsigned int green, unsigned int blue) noexcept :
+	constexpr ColourDesired(unsigned int red, unsigned int green, unsigned int blue) noexcept :
 		co(red | (green << 8) | (blue << 16)) {
 	}
 
-	bool operator==(const ColourDesired &other) const noexcept {
+	constexpr bool operator==(const ColourDesired &other) const noexcept {
 		return co == other.co;
 	}
 
-	int AsInteger() const noexcept {
+	constexpr int AsInteger() const noexcept {
 		return co;
 	}
 
 	// Red, green and blue values as bytes 0..255
-	unsigned char GetRed() const noexcept {
+	constexpr unsigned char GetRed() const noexcept {
 		return co & 0xff;
 	}
-	unsigned char GetGreen() const noexcept {
+	constexpr unsigned char GetGreen() const noexcept {
 		return (co >> 8) & 0xff;
 	}
-	unsigned char GetBlue() const noexcept {
+	constexpr unsigned char GetBlue() const noexcept {
 		return (co >> 16) & 0xff;
 	}
 
 	// Red, green and blue values as float 0..1.0
-	float GetRedComponent() const noexcept {
+	constexpr float GetRedComponent() const noexcept {
 		return GetRed() / componentMaximum;
 	}
-	float GetGreenComponent() const noexcept {
+	constexpr float GetGreenComponent() const noexcept {
 		return GetGreen() / componentMaximum;
 	}
-	float GetBlueComponent() const noexcept {
+	constexpr float GetBlueComponent() const noexcept {
 		return GetBlue() / componentMaximum;
 	}
 };
@@ -230,34 +230,34 @@
 */
 class ColourAlpha : public ColourDesired {
 public:
-	explicit ColourAlpha(int co_ = 0) noexcept : ColourDesired(co_) {
+	constexpr explicit ColourAlpha(int co_ = 0) noexcept : ColourDesired(co_) {
 	}
 
-	ColourAlpha(unsigned int red, unsigned int green, unsigned int blue) noexcept :
+	constexpr ColourAlpha(unsigned int red, unsigned int green, unsigned int blue) noexcept :
 		ColourDesired(red | (green << 8) | (blue << 16)) {
 	}
 
-	ColourAlpha(unsigned int red, unsigned int green, unsigned int blue, unsigned int alpha) noexcept :
+	constexpr ColourAlpha(unsigned int red, unsigned int green, unsigned int blue, unsigned int alpha) noexcept :
 		ColourDesired(red | (green << 8) | (blue << 16) | (alpha << 24)) {
 	}
 
-	ColourAlpha(ColourDesired cd, unsigned int alpha) noexcept :
+	constexpr ColourAlpha(ColourDesired cd, unsigned int alpha) noexcept :
 		ColourDesired(cd.AsInteger() | (alpha << 24)) {
 	}
 
-	ColourDesired GetColour() const noexcept {
+	constexpr ColourDesired GetColour() const noexcept {
 		return ColourDesired(AsInteger() & 0xffffff);
 	}
 
-	unsigned char GetAlpha() const noexcept {
+	constexpr unsigned char GetAlpha() const noexcept {
 		return (AsInteger() >> 24) & 0xff;
 	}
 
-	float GetAlphaComponent() const noexcept {
+	constexpr float GetAlphaComponent() const noexcept {
 		return GetAlpha() / componentMaximum;
 	}
 
-	ColourAlpha MixedWith(ColourAlpha other) const noexcept {
+	constexpr ColourAlpha MixedWith(ColourAlpha 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;
diff -Nru scite-4.3.3/scintilla/include/SciLexer.h scite-4.4.4/scintilla/include/SciLexer.h
--- scite-4.3.3/scintilla/include/SciLexer.h	2020-01-15 20:16:06.000000000 +0000
+++ scite-4.4.4/scintilla/include/SciLexer.h	2020-05-31 23:08:11.000000000 +0000
@@ -516,6 +516,7 @@
 #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
diff -Nru scite-4.3.3/scintilla/include/Scintilla.h scite-4.4.4/scintilla/include/Scintilla.h
--- scite-4.3.3/scintilla/include/Scintilla.h	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/include/Scintilla.h	2020-07-18 05:40:21.000000000 +0000
@@ -38,6 +38,8 @@
 
 typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam);
 
+#ifndef SCI_DISABLE_AUTOGENERATED
+
 /* ++Autogenerated -- start of section automatically generated from Scintilla.iface */
 #define INVALID_POSITION -1
 #define SCI_START 2000
@@ -683,6 +685,7 @@
 #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
@@ -1003,6 +1006,18 @@
 #define SCI_SETREPRESENTATION 2665
 #define SCI_GETREPRESENTATION 2666
 #define SCI_CLEARREPRESENTATION 2667
+#define SCI_EOLANNOTATIONSETTEXT 2740
+#define SCI_EOLANNOTATIONGETTEXT 2741
+#define SCI_EOLANNOTATIONSETSTYLE 2742
+#define SCI_EOLANNOTATIONGETSTYLE 2743
+#define SCI_EOLANNOTATIONCLEARALL 2744
+#define EOLANNOTATION_HIDDEN 0
+#define EOLANNOTATION_STANDARD 1
+#define EOLANNOTATION_BOXED 2
+#define SCI_EOLANNOTATIONSETVISIBLE 2745
+#define SCI_EOLANNOTATIONGETVISIBLE 2746
+#define SCI_EOLANNOTATIONSETSTYLEOFFSET 2747
+#define SCI_EOLANNOTATIONGETSTYLEOFFSET 2748
 #define SCI_STARTRECORD 3001
 #define SCI_STOPRECORD 3002
 #define SCI_SETLEXER 4001
@@ -1063,7 +1078,8 @@
 #define SC_MOD_LEXERSTATE 0x80000
 #define SC_MOD_INSERTCHECK 0x100000
 #define SC_MOD_CHANGETABSTOPS 0x200000
-#define SC_MODEVENTMASKALL 0x3FFFFF
+#define SC_MOD_CHANGEEOLANNOTATION 0x400000
+#define SC_MODEVENTMASKALL 0x7FFFFF
 #define SC_UPDATE_CONTENT 0x1
 #define SC_UPDATE_SELECTION 0x2
 #define SC_UPDATE_V_SCROLL 0x4
@@ -1154,6 +1170,8 @@
 #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. */
diff -Nru scite-4.3.3/scintilla/include/Scintilla.iface scite-4.4.4/scintilla/include/Scintilla.iface
--- scite-4.3.3/scintilla/include/Scintilla.iface	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/include/Scintilla.iface	2020-07-18 05:40:21.000000000 +0000
@@ -1876,6 +1876,9 @@
 # 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(,)
 
@@ -2837,6 +2840,38 @@
 # Remove a character representation.
 fun void ClearRepresentation=2667(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=0
+val EOLANNOTATION_STANDARD=1
+val EOLANNOTATION_BOXED=2
+
+# 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(,)
+
 # Start notifying the container of all key presses and commands.
 fun void StartRecord=3001(,)
 
@@ -2987,7 +3022,8 @@
 val SC_MOD_LEXERSTATE=0x80000
 val SC_MOD_INSERTCHECK=0x100000
 val SC_MOD_CHANGETABSTOPS=0x200000
-val SC_MODEVENTMASKALL=0x3FFFFF
+val SC_MOD_CHANGEEOLANNOTATION=0x400000
+val SC_MODEVENTMASKALL=0x7FFFFF
 
 ali SC_MOD_INSERTTEXT=INSERT_TEXT
 ali SC_MOD_DELETETEXT=DELETE_TEXT
@@ -3007,6 +3043,7 @@
 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_
@@ -3637,6 +3674,7 @@
 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
diff -Nru scite-4.3.3/scintilla/lexers/LexBatch.cxx scite-4.4.4/scintilla/lexers/LexBatch.cxx
--- scite-4.3.3/scintilla/lexers/LexBatch.cxx	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/lexers/LexBatch.cxx	2020-05-31 23:08:11.000000000 +0000
@@ -543,17 +543,22 @@
 			// 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 and an empty line
-			if (!continueProcessing && (i<startPos + length-1) && linePos>2) {
-				Sci_PositionU lineContinuationPos;
-				if (lineBuffer[linePos-2]=='\r') // Windows EOL
-					lineContinuationPos=linePos-3;
-				else
-					lineContinuationPos=linePos-2; // Unix or Mac EOL
-				if ((lineBuffer[lineContinuationPos]!='^') ||  // handle '^' line continuation
-					IsEscaped(lineBuffer, lineContinuationPos)
-					|| textQuoted(lineBuffer, lineContinuationPos))
+			// 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;
diff -Nru scite-4.3.3/scintilla/lexers/LexCPP.cxx scite-4.4.4/scintilla/lexers/LexCPP.cxx
--- scite-4.3.3/scintilla/lexers/LexCPP.cxx	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/lexers/LexCPP.cxx	2020-05-31 23:08:11.000000000 +0000
@@ -831,7 +831,7 @@
 		ppDefineHistory.clear();
 
 	std::vector<PPDefinition>::iterator itInvalid = std::find_if(ppDefineHistory.begin(), ppDefineHistory.end(),
-		[lineCurrent](const PPDefinition &p) { return p.line >= lineCurrent; });
+		[lineCurrent](const PPDefinition &p) noexcept { return p.line >= lineCurrent; });
 	if (itInvalid != ppDefineHistory.end()) {
 		ppDefineHistory.erase(itInvalid, ppDefineHistory.end());
 		definitionsChanged = true;
diff -Nru scite-4.3.3/scintilla/lexers/LexErrorList.cxx scite-4.4.4/scintilla/lexers/LexErrorList.cxx
--- scite-4.3.3/scintilla/lexers/LexErrorList.cxx	2019-06-28 23:50:36.000000000 +0000
+++ scite-4.4.4/scintilla/lexers/LexErrorList.cxx	2020-05-31 23:08:11.000000000 +0000
@@ -12,6 +12,8 @@
 #include <assert.h>
 #include <ctype.h>
 
+#include <string>
+
 #include "ILexer.h"
 #include "Scintilla.h"
 #include "SciLexer.h"
@@ -48,6 +50,19 @@
 	       ((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
@@ -132,6 +147,11 @@
 		// Microsoft linker warning:
 		// {<object> : } warning 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>
@@ -301,17 +321,17 @@
 }
 
 void ColouriseErrorListLine(
-    char *lineBuffer,
-    Sci_PositionU lengthLine,
+    const std::string &lineBuffer,
     Sci_PositionU endPos,
     Accessor &styler,
 	bool valueSeparate,
 	bool escapeSequences) {
 	Sci_Position startValue = -1;
-	const int style = RecogniseErrorListLine(lineBuffer, lengthLine, startValue);
-	if (escapeSequences && strstr(lineBuffer, CSI)) {
+	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;
+		const char *linePortion = lineBuffer.c_str();
 		Sci_Position startPortion = startPos;
 		int portionStyle = style;
 		while (const char *startSeq = strstr(linePortion, CSI)) {
@@ -352,10 +372,9 @@
 }
 
 void ColouriseErrorListDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
-	char lineBuffer[10000];
+	std::string lineBuffer;
 	styler.StartAt(startPos);
 	styler.StartSegment(startPos);
-	Sci_PositionU linePos = 0;
 
 	// property lexer.errorlist.value.separate
 	//	For lines in the output pane that are matches from Find in Files or GCC-style
@@ -369,17 +388,15 @@
 	const bool escapeSequences = styler.GetPropertyInt("lexer.errorlist.escape.sequences") != 0;
 
 	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';
-			ColouriseErrorListLine(lineBuffer, linePos, i, styler, valueSeparate, escapeSequences);
-			linePos = 0;
+		lineBuffer.push_back(styler[i]);
+		if (AtEOL(styler, i)) {
+			// End of line met, colourise it
+			ColouriseErrorListLine(lineBuffer, i, styler, valueSeparate, escapeSequences);
+			lineBuffer.clear();
 		}
 	}
-	if (linePos > 0) {	// Last line does not have ending characters
-		lineBuffer[linePos] = '\0';
-		ColouriseErrorListLine(lineBuffer, linePos, startPos + length - 1, styler, valueSeparate, escapeSequences);
+	if (!lineBuffer.empty()) {	// Last line does not have ending characters
+		ColouriseErrorListLine(lineBuffer, startPos + length - 1, styler, valueSeparate, escapeSequences);
 	}
 }
 
diff -Nru scite-4.3.3/scintilla/lexers/LexLaTeX.cxx scite-4.4.4/scintilla/lexers/LexLaTeX.cxx
--- scite-4.3.3/scintilla/lexers/LexLaTeX.cxx	2020-01-02 00:45:04.000000000 +0000
+++ scite-4.4.4/scintilla/lexers/LexLaTeX.cxx	2020-07-18 05:40:21.000000000 +0000
@@ -305,6 +305,8 @@
 				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) {
@@ -453,6 +455,9 @@
 						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;
 						}
 					}
 				}
diff -Nru scite-4.3.3/scintilla/lexers/LexMagik.cxx scite-4.4.4/scintilla/lexers/LexMagik.cxx
--- scite-4.3.3/scintilla/lexers/LexMagik.cxx	2018-04-27 10:42:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexers/LexMagik.cxx	2020-05-31 23:08:11.000000000 +0000
@@ -82,7 +82,7 @@
  * \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  keywordslists The keywordslists, currently, number 5 is used
+ * \param  keywordlists The keywordslists, currently, number 5 is used
  * \param  styler The styler
  */
 static void ColouriseMagikDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
@@ -328,7 +328,7 @@
  *
  * \param  keywordslist The list of keywords that are scanned, they should only
  *         contain the start keywords, not the end keywords
- * \param  The actual keyword
+ * \param  keyword The actual keyword
  * \return 1 if it is a folding start-keyword, -1 if it is a folding end-keyword
  *         0 otherwise
  */
diff -Nru scite-4.3.3/scintilla/lexers/LexMMIXAL.cxx scite-4.4.4/scintilla/lexers/LexMMIXAL.cxx
--- scite-4.3.3/scintilla/lexers/LexMMIXAL.cxx	2018-04-27 10:42:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexers/LexMMIXAL.cxx	2020-05-31 23:08:11.000000000 +0000
@@ -33,7 +33,7 @@
 	return (ch < 0x80) && (isalnum(ch) || ch == ':' || ch == '_');
 }
 
-inline bool isMMIXALOperator(char ch) {
+static inline bool isMMIXALOperator(char ch) {
 	if (IsASCII(ch) && isalnum(ch))
 		return false;
 	if (ch == '+' || ch == '-' || ch == '|' || ch == '^' ||
@@ -85,8 +85,6 @@
 		} else if (sc.state == SCE_MMIXAL_NUMBER) {		// NUMBER
 			if (!isdigit(sc.ch)) {
 				if (IsAWordChar(sc.ch)) {
-					char s[100];
-					sc.GetCurrent(s, sizeof(s));
 					sc.ChangeState(SCE_MMIXAL_REF);
 					sc.SetState(SCE_MMIXAL_REF);
 				} else {
@@ -99,12 +97,11 @@
 			}
 		} else if (sc.state == SCE_MMIXAL_REF) {			// REF
 			if (!IsAWordChar(sc.ch) ) {
-				char s[100];
-				sc.GetCurrent(s, sizeof(s));
+				char s0[100];
+				sc.GetCurrent(s0, sizeof(s0));
+				const char *s = s0;
 				if (*s == ':') {	// ignore base prefix for match
-					for (size_t i = 0; i != sizeof(s); ++i) {
-						*(s+i) = *(s+i+1);
-					}
+					++s;
 				}
 				if (special_register.InList(s)) {
 					sc.ChangeState(SCE_MMIXAL_REGISTER);
@@ -154,9 +151,7 @@
 		if (sc.state == SCE_MMIXAL_OPCODE_POST ||		// OPCODE_POST
 			sc.state == SCE_MMIXAL_OPERANDS) {			// OPERANDS
 			if (sc.state == SCE_MMIXAL_OPERANDS && isspace(sc.ch)) {
-				if (!sc.atLineEnd) {
-					sc.SetState(SCE_MMIXAL_COMMENT);
-				}
+				sc.SetState(SCE_MMIXAL_COMMENT);
 			} else if (isdigit(sc.ch)) {
 				sc.SetState(SCE_MMIXAL_NUMBER);
 			} else if (IsAWordChar(sc.ch) || sc.Match('@')) {
diff -Nru scite-4.3.3/scintilla/lexers/LexVHDL.cxx scite-4.4.4/scintilla/lexers/LexVHDL.cxx
--- scite-4.3.3/scintilla/lexers/LexVHDL.cxx	2018-04-27 10:42:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexers/LexVHDL.cxx	2020-05-31 23:08:11.000000000 +0000
@@ -252,8 +252,8 @@
   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 levelMinCurrentElse = levelCurrent;   ///< Used for folding at 'else'
+  int levelMinCurrentBegin = levelCurrent;  ///< Used for folding at 'begin'
   int levelNext         = levelCurrent;
 
   /***************************************/
diff -Nru scite-4.3.3/scintilla/lexilla/scripts/LexillaGen.py scite-4.4.4/scintilla/lexilla/scripts/LexillaGen.py
--- scite-4.3.3/scintilla/lexilla/scripts/LexillaGen.py	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/scripts/LexillaGen.py	2020-05-31 23:08:11.000000000 +0000
@@ -8,38 +8,127 @@
 # Files are regenerated in place with templates stored in comments.
 # The format of generation comments is documented in FileGenerator.py.
 
-import os, sys
+import os, pathlib, sys, uuid
 
-sys.path.append(os.path.join("..", "..", "scripts"))
+thisPath = pathlib.Path(__file__).resolve()
+
+sys.path.append(str(thisPath.parent.parent.parent / "scripts"))
 
 from FileGenerator import Regenerate, UpdateLineInFile, \
     ReplaceREInFile, UpdateLineInPlistFile, ReadFileAsList, UpdateFileFromLines, \
     FindSectionInList
 import ScintillaData
 
-def RegenerateAll(root):
+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
 
-    scintillaBase = os.path.abspath(root)
+    sli = FindSectionInList(lines, markersPBXFileReference)
+    lines[sli.stop:sli.stop] = sectionPBXFileReference
 
-    sci = ScintillaData.ScintillaData(root + os.sep)
+    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
 
-    lexillaDir = os.path.join(root, "lexilla")
-    srcDir = os.path.join(lexillaDir, "src")
+    sli = FindSectionInList(lines, markersPBXSourcesBuildPhase)
+    lines[sli.stop:sli.stop] = sectionPBXSourcesBuildPhase
 
-    Regenerate(os.path.join(srcDir, "Lexilla.cxx"), "//", sci.lexerModules)
-    Regenerate(os.path.join(srcDir, "lexilla.mak"), "#", sci.lexFiles)
+    UpdateFileFromLines(path, lines, "\n")
+
+def RegenerateAll(rootDirectory):
+
+    root = pathlib.Path(rootDirectory)
+
+    scintillaBase = root.resolve()
+
+    sci = ScintillaData.ScintillaData(scintillaBase)
+
+    lexillaDir = scintillaBase / "lexilla"
+    srcDir = lexillaDir / "src"
+
+    Regenerate(srcDir / "Lexilla.cxx", "//", sci.lexerModules)
+    Regenerate(srcDir / "lexilla.mak", "#", sci.lexFiles)
 
     # Discover version information
-    with open(os.path.join(lexillaDir, "version.txt")) as f:
-        version = f.read().strip()
+    version = (lexillaDir / "version.txt").read_text().strip()
     versionDotted = version[0] + '.' + version[1] + '.' + version[2]
     versionCommad = versionDotted.replace(".", ", ") + ', 0'
 
-    rcPath = os.path.join(srcDir, "LexillaVersion.rc")
+    rcPath = srcDir / "LexillaVersion.rc"
     UpdateLineInFile(rcPath, "#define VERSION_LEXILLA",
         "#define VERSION_LEXILLA \"" + versionDotted + "\"")
     UpdateLineInFile(rcPath, "#define VERSION_WORDS",
         "#define VERSION_WORDS " + versionCommad)
 
+    lexillaXcode = lexillaDir / "src" / "Lexilla"
+    lexillaXcodeProject = lexillaXcode / "Lexilla.xcodeproj" / "project.pbxproj"
+
+    lexerReferences = ScintillaData.FindLexersInXcode(lexillaXcodeProject)
+
+    UpdateLineInPlistFile(lexillaXcode / "Lexilla" / "Info.plist",
+        "CFBundleShortVersionString", versionDotted)
+
+    ReplaceREInFile(lexillaXcodeProject, "CURRENT_PROJECT_VERSION = [0-9.]+;",
+        f'CURRENT_PROJECT_VERSION = {versionDotted};')
+
+    RegenerateXcodeProject(lexillaXcodeProject, sci.lexFiles, lexerReferences)
+
+    currentDirectory = pathlib.Path.cwd()
+    os.chdir(srcDir)
+    DepGen.Generate()
+    os.chdir(currentDirectory)
+
 if __name__=="__main__":
-    RegenerateAll(os.path.join("..", ".."))
+    RegenerateAll(pathlib.Path(__file__).resolve().parent.parent.parent)
diff -Nru scite-4.3.3/scintilla/lexilla/scripts/RunTest.sh scite-4.4.4/scintilla/lexilla/scripts/RunTest.sh
--- scite-4.3.3/scintilla/lexilla/scripts/RunTest.sh	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/scripts/RunTest.sh	2020-05-31 23:08:11.000000000 +0000
@@ -0,0 +1,7 @@
+# Test lexers
+# build lexilla.so and TestLexers then run TestLexers
+cd ../src
+make
+cd ../test
+make
+make test
diff -Nru scite-4.3.3/scintilla/lexilla/src/Lexilla/Lexilla/Info.plist scite-4.4.4/scintilla/lexilla/src/Lexilla/Lexilla/Info.plist
--- scite-4.3.3/scintilla/lexilla/src/Lexilla/Lexilla/Info.plist	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/src/Lexilla/Lexilla/Info.plist	2020-06-02 23:19:05.000000000 +0000
@@ -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>4.4.3</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2020 Neil Hodgson. All rights reserved.</string>
+</dict>
+</plist>
diff -Nru scite-4.3.3/scintilla/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj scite-4.4.4/scintilla/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
--- scite-4.3.3/scintilla/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj	2020-06-02 23:19:05.000000000 +0000
@@ -0,0 +1,888 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		280262B5246DF6B0000DF3B8 /* Lexilla.h in Headers */ = {isa = PBXBuildFile; fileRef = 280262B3246DF6B0000DF3B8 /* Lexilla.h */; };
+		280262B6246DF6B0000DF3B8 /* Lexilla.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262B4246DF6B0000DF3B8 /* Lexilla.cxx */; };
+		280262D2246DF809000DF3B8 /* CharacterCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 280262B9246DF808000DF3B8 /* CharacterCategory.h */; };
+		280262D3246DF809000DF3B8 /* LexerModule.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262BA246DF808000DF3B8 /* LexerModule.cxx */; };
+		280262D4246DF809000DF3B8 /* SparseState.h in Headers */ = {isa = PBXBuildFile; fileRef = 280262BB246DF808000DF3B8 /* SparseState.h */; };
+		280262D5246DF809000DF3B8 /* LexerSimple.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262BC246DF808000DF3B8 /* LexerSimple.cxx */; };
+		280262D6246DF809000DF3B8 /* CharacterCategory.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262BD246DF808000DF3B8 /* CharacterCategory.cxx */; };
+		280262D7246DF809000DF3B8 /* OptionSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 280262BE246DF808000DF3B8 /* OptionSet.h */; };
+		280262D8246DF809000DF3B8 /* StyleContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 280262BF246DF808000DF3B8 /* StyleContext.h */; };
+		280262D9246DF809000DF3B8 /* LexerBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 280262C0246DF808000DF3B8 /* LexerBase.h */; };
+		280262DA246DF809000DF3B8 /* SubStyles.h in Headers */ = {isa = PBXBuildFile; fileRef = 280262C1246DF808000DF3B8 /* SubStyles.h */; };
+		280262DB246DF809000DF3B8 /* Accessor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262C2246DF808000DF3B8 /* Accessor.cxx */; };
+		280262DC246DF809000DF3B8 /* DefaultLexer.h in Headers */ = {isa = PBXBuildFile; fileRef = 280262C3246DF808000DF3B8 /* DefaultLexer.h */; };
+		280262DD246DF809000DF3B8 /* LexAccessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 280262C4246DF808000DF3B8 /* LexAccessor.h */; };
+		280262DE246DF809000DF3B8 /* PropSetSimple.h in Headers */ = {isa = PBXBuildFile; fileRef = 280262C5246DF808000DF3B8 /* PropSetSimple.h */; };
+		280262DF246DF809000DF3B8 /* LexerSimple.h in Headers */ = {isa = PBXBuildFile; fileRef = 280262C6246DF808000DF3B8 /* LexerSimple.h */; };
+		280262E0246DF809000DF3B8 /* PropSetSimple.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262C7246DF808000DF3B8 /* PropSetSimple.cxx */; };
+		280262E1246DF809000DF3B8 /* WordList.h in Headers */ = {isa = PBXBuildFile; fileRef = 280262C8246DF808000DF3B8 /* WordList.h */; };
+		280262E2246DF809000DF3B8 /* CharacterSet.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262C9246DF808000DF3B8 /* CharacterSet.cxx */; };
+		280262E3246DF809000DF3B8 /* LexerBase.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262CA246DF808000DF3B8 /* LexerBase.cxx */; };
+		280262E4246DF809000DF3B8 /* StringCopy.h in Headers */ = {isa = PBXBuildFile; fileRef = 280262CB246DF808000DF3B8 /* StringCopy.h */; };
+		280262E5246DF809000DF3B8 /* LexerModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 280262CC246DF808000DF3B8 /* LexerModule.h */; };
+		280262E6246DF809000DF3B8 /* DefaultLexer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262CD246DF808000DF3B8 /* DefaultLexer.cxx */; };
+		280262E7246DF809000DF3B8 /* Accessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 280262CE246DF808000DF3B8 /* Accessor.h */; };
+		280262E8246DF809000DF3B8 /* WordList.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262CF246DF808000DF3B8 /* WordList.cxx */; };
+		280262E9246DF809000DF3B8 /* CharacterSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 280262D0246DF808000DF3B8 /* CharacterSet.h */; };
+		280262EA246DF809000DF3B8 /* StyleContext.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262D1246DF808000DF3B8 /* StyleContext.cxx */; };
+		2802635F246DF84A000DF3B8 /* LexHex.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262EB246DF844000DF3B8 /* LexHex.cxx */; };
+		28026360246DF84A000DF3B8 /* LexTCL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262EC246DF845000DF3B8 /* LexTCL.cxx */; };
+		28026361246DF84A000DF3B8 /* LexCrontab.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262ED246DF845000DF3B8 /* LexCrontab.cxx */; };
+		28026362246DF84A000DF3B8 /* LexTACL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262EE246DF845000DF3B8 /* LexTACL.cxx */; };
+		28026363246DF84A000DF3B8 /* LexVHDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262EF246DF845000DF3B8 /* LexVHDL.cxx */; };
+		28026364246DF84A000DF3B8 /* LexBullant.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262F0246DF845000DF3B8 /* LexBullant.cxx */; };
+		28026365246DF84A000DF3B8 /* LexPLM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262F1246DF845000DF3B8 /* LexPLM.cxx */; };
+		28026366246DF84A000DF3B8 /* LexRaku.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262F2246DF845000DF3B8 /* LexRaku.cxx */; };
+		28026367246DF84A000DF3B8 /* LexLout.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262F3246DF845000DF3B8 /* LexLout.cxx */; };
+		28026368246DF84A000DF3B8 /* LexPerl.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262F4246DF845000DF3B8 /* LexPerl.cxx */; };
+		28026369246DF84A000DF3B8 /* LexR.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262F5246DF845000DF3B8 /* LexR.cxx */; };
+		2802636A246DF84A000DF3B8 /* LexErrorList.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262F6246DF845000DF3B8 /* LexErrorList.cxx */; };
+		2802636B246DF84A000DF3B8 /* LexVerilog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262F7246DF845000DF3B8 /* LexVerilog.cxx */; };
+		2802636C246DF84A000DF3B8 /* LexCSS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262F8246DF845000DF3B8 /* LexCSS.cxx */; };
+		2802636D246DF84A000DF3B8 /* LexScriptol.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262F9246DF845000DF3B8 /* LexScriptol.cxx */; };
+		2802636E246DF84A000DF3B8 /* LexPS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262FA246DF845000DF3B8 /* LexPS.cxx */; };
+		2802636F246DF84A000DF3B8 /* LexAsm.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262FB246DF845000DF3B8 /* LexAsm.cxx */; };
+		28026370246DF84A000DF3B8 /* LexVisualProlog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262FC246DF845000DF3B8 /* LexVisualProlog.cxx */; };
+		28026371246DF84A000DF3B8 /* LexMatlab.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262FD246DF845000DF3B8 /* LexMatlab.cxx */; };
+		28026372246DF84A000DF3B8 /* LexOpal.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262FE246DF845000DF3B8 /* LexOpal.cxx */; };
+		28026373246DF84A000DF3B8 /* LexModula.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 280262FF246DF845000DF3B8 /* LexModula.cxx */; };
+		28026374246DF84A000DF3B8 /* LexNsis.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026300246DF845000DF3B8 /* LexNsis.cxx */; };
+		28026375246DF84A000DF3B8 /* LexMagik.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026301246DF845000DF3B8 /* LexMagik.cxx */; };
+		28026376246DF84A000DF3B8 /* LexJSON.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026302246DF845000DF3B8 /* LexJSON.cxx */; };
+		28026377246DF84A000DF3B8 /* LexRegistry.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026303246DF845000DF3B8 /* LexRegistry.cxx */; };
+		28026378246DF84A000DF3B8 /* LexSQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026304246DF845000DF3B8 /* LexSQL.cxx */; };
+		28026379246DF84A000DF3B8 /* LexCIL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026305246DF845000DF3B8 /* LexCIL.cxx */; };
+		2802637A246DF84A000DF3B8 /* LexPOV.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026306246DF845000DF3B8 /* LexPOV.cxx */; };
+		2802637B246DF84A000DF3B8 /* LexA68k.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026307246DF845000DF3B8 /* LexA68k.cxx */; };
+		2802637C246DF84A000DF3B8 /* LexMetapost.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026308246DF845000DF3B8 /* LexMetapost.cxx */; };
+		2802637D246DF84A000DF3B8 /* LexProgress.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026309246DF845000DF3B8 /* LexProgress.cxx */; };
+		2802637E246DF84A000DF3B8 /* LexFlagship.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802630A246DF845000DF3B8 /* LexFlagship.cxx */; };
+		2802637F246DF84A000DF3B8 /* LexX12.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802630C246DF846000DF3B8 /* LexX12.cxx */; };
+		28026380246DF84A000DF3B8 /* LexAVE.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802630D246DF846000DF3B8 /* LexAVE.cxx */; };
+		28026381246DF84A000DF3B8 /* LexRuby.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802630E246DF846000DF3B8 /* LexRuby.cxx */; };
+		28026382246DF84A000DF3B8 /* LexOScript.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802630F246DF846000DF3B8 /* LexOScript.cxx */; };
+		28026383246DF84A000DF3B8 /* LexDiff.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026310246DF846000DF3B8 /* LexDiff.cxx */; };
+		28026384246DF84A000DF3B8 /* LexVB.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026311246DF846000DF3B8 /* LexVB.cxx */; };
+		28026385246DF84A000DF3B8 /* LexGui4Cli.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026312246DF846000DF3B8 /* LexGui4Cli.cxx */; };
+		28026386246DF84A000DF3B8 /* LexASY.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026313246DF846000DF3B8 /* LexASY.cxx */; };
+		28026387246DF84A000DF3B8 /* LexCOBOL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026314246DF846000DF3B8 /* LexCOBOL.cxx */; };
+		28026388246DF84A000DF3B8 /* LexStata.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026315246DF846000DF3B8 /* LexStata.cxx */; };
+		28026389246DF84A000DF3B8 /* LexCaml.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026316246DF846000DF3B8 /* LexCaml.cxx */; };
+		2802638A246DF84A000DF3B8 /* LexIndent.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026317246DF846000DF3B8 /* LexIndent.cxx */; };
+		2802638B246DF84A000DF3B8 /* LexTeX.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026318246DF846000DF3B8 /* LexTeX.cxx */; };
+		2802638C246DF84A000DF3B8 /* LexEScript.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026319246DF846000DF3B8 /* LexEScript.cxx */; };
+		2802638D246DF84A000DF3B8 /* LexSAS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802631A246DF846000DF3B8 /* LexSAS.cxx */; };
+		2802638E246DF84A000DF3B8 /* LexTAL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802631B246DF846000DF3B8 /* LexTAL.cxx */; };
+		2802638F246DF84A000DF3B8 /* LexDMAP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802631C246DF846000DF3B8 /* LexDMAP.cxx */; };
+		28026390246DF84A000DF3B8 /* LexLisp.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802631D246DF846000DF3B8 /* LexLisp.cxx */; };
+		28026391246DF84A000DF3B8 /* LexErlang.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802631E246DF846000DF3B8 /* LexErlang.cxx */; };
+		28026392246DF84A000DF3B8 /* LexSTTXT.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802631F246DF846000DF3B8 /* LexSTTXT.cxx */; };
+		28026393246DF84A000DF3B8 /* LexRust.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026320246DF846000DF3B8 /* LexRust.cxx */; };
+		28026394246DF84A000DF3B8 /* LexCPP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026321246DF846000DF3B8 /* LexCPP.cxx */; };
+		28026395246DF84A000DF3B8 /* LexDataflex.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026322246DF846000DF3B8 /* LexDataflex.cxx */; };
+		28026396246DF84A000DF3B8 /* LexSmalltalk.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026323246DF846000DF3B8 /* LexSmalltalk.cxx */; };
+		28026397246DF84A000DF3B8 /* LexCoffeeScript.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026324246DF846000DF3B8 /* LexCoffeeScript.cxx */; };
+		28026398246DF84A000DF3B8 /* LexBatch.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026325246DF847000DF3B8 /* LexBatch.cxx */; };
+		28026399246DF84A000DF3B8 /* LexPO.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026326246DF847000DF3B8 /* LexPO.cxx */; };
+		2802639A246DF84A000DF3B8 /* LexPython.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026327246DF847000DF3B8 /* LexPython.cxx */; };
+		2802639B246DF84A000DF3B8 /* LexMSSQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026328246DF847000DF3B8 /* LexMSSQL.cxx */; };
+		2802639C246DF84A000DF3B8 /* LexTADS3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802632A246DF847000DF3B8 /* LexTADS3.cxx */; };
+		2802639D246DF84A000DF3B8 /* LexTCMD.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802632B246DF847000DF3B8 /* LexTCMD.cxx */; };
+		2802639E246DF84A000DF3B8 /* LexMMIXAL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802632C246DF847000DF3B8 /* LexMMIXAL.cxx */; };
+		2802639F246DF84A000DF3B8 /* LexLaTeX.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802632D246DF847000DF3B8 /* LexLaTeX.cxx */; };
+		280263A0246DF84A000DF3B8 /* LexConf.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802632E246DF847000DF3B8 /* LexConf.cxx */; };
+		280263A1246DF84A000DF3B8 /* LexHollywood.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802632F246DF847000DF3B8 /* LexHollywood.cxx */; };
+		280263A2246DF84A000DF3B8 /* LexECL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026330246DF847000DF3B8 /* LexECL.cxx */; };
+		280263A3246DF84A000DF3B8 /* LexAda.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026331246DF847000DF3B8 /* LexAda.cxx */; };
+		280263A4246DF84A000DF3B8 /* LexBaan.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026332246DF847000DF3B8 /* LexBaan.cxx */; };
+		280263A5246DF84A000DF3B8 /* LexSML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026333246DF848000DF3B8 /* LexSML.cxx */; };
+		280263A6246DF84A000DF3B8 /* LexBibTeX.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026334246DF848000DF3B8 /* LexBibTeX.cxx */; };
+		280263A7246DF84A000DF3B8 /* LexRebol.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026335246DF848000DF3B8 /* LexRebol.cxx */; };
+		280263A8246DF84A000DF3B8 /* LexMaxima.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026336246DF848000DF3B8 /* LexMaxima.cxx */; };
+		280263A9246DF84A000DF3B8 /* LexAU3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026337246DF848000DF3B8 /* LexAU3.cxx */; };
+		280263AA246DF84A000DF3B8 /* LexForth.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026338246DF848000DF3B8 /* LexForth.cxx */; };
+		280263AB246DF84A000DF3B8 /* LexMake.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026339246DF848000DF3B8 /* LexMake.cxx */; };
+		280263AC246DF84A000DF3B8 /* LexCsound.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802633A246DF848000DF3B8 /* LexCsound.cxx */; };
+		280263AD246DF84A000DF3B8 /* LexAsn1.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802633B246DF848000DF3B8 /* LexAsn1.cxx */; };
+		280263AE246DF84A000DF3B8 /* LexNimrod.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802633C246DF848000DF3B8 /* LexNimrod.cxx */; };
+		280263AF246DF84A000DF3B8 /* LexGAP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802633D246DF848000DF3B8 /* LexGAP.cxx */; };
+		280263B0246DF84A000DF3B8 /* LexEDIFACT.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802633E246DF848000DF3B8 /* LexEDIFACT.cxx */; };
+		280263B1246DF84A000DF3B8 /* LexProps.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802633F246DF848000DF3B8 /* LexProps.cxx */; };
+		280263B2246DF84A000DF3B8 /* LexSorcus.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026340246DF848000DF3B8 /* LexSorcus.cxx */; };
+		280263B3246DF84A000DF3B8 /* LexLua.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026341246DF848000DF3B8 /* LexLua.cxx */; };
+		280263B4246DF84A000DF3B8 /* LexBasic.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026342246DF848000DF3B8 /* LexBasic.cxx */; };
+		280263B5246DF84A000DF3B8 /* LexNull.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026343246DF848000DF3B8 /* LexNull.cxx */; };
+		280263B6246DF84A000DF3B8 /* LexD.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026344246DF848000DF3B8 /* LexD.cxx */; };
+		280263B7246DF84A000DF3B8 /* LexAVS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026345246DF848000DF3B8 /* LexAVS.cxx */; };
+		280263B8246DF84A000DF3B8 /* LexHaskell.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026346246DF849000DF3B8 /* LexHaskell.cxx */; };
+		280263B9246DF84A000DF3B8 /* LexInno.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026347246DF849000DF3B8 /* LexInno.cxx */; };
+		280263BA246DF84A000DF3B8 /* LexDMIS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026348246DF849000DF3B8 /* LexDMIS.cxx */; };
+		280263BB246DF84A000DF3B8 /* LexPowerShell.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026349246DF849000DF3B8 /* LexPowerShell.cxx */; };
+		280263BC246DF84A000DF3B8 /* LexMPT.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802634A246DF849000DF3B8 /* LexMPT.cxx */; };
+		280263BD246DF84A000DF3B8 /* LexAbaqus.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802634B246DF849000DF3B8 /* LexAbaqus.cxx */; };
+		280263BE246DF84A000DF3B8 /* LexHTML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802634C246DF849000DF3B8 /* LexHTML.cxx */; };
+		280263BF246DF84A000DF3B8 /* LexAPDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802634D246DF849000DF3B8 /* LexAPDL.cxx */; };
+		280263C0246DF84A000DF3B8 /* LexEiffel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802634E246DF849000DF3B8 /* LexEiffel.cxx */; };
+		280263C1246DF84A000DF3B8 /* LexTxt2tags.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802634F246DF849000DF3B8 /* LexTxt2tags.cxx */; };
+		280263C2246DF84A000DF3B8 /* LexMySQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026350246DF849000DF3B8 /* LexMySQL.cxx */; };
+		280263C3246DF84A000DF3B8 /* LexPowerPro.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026351246DF849000DF3B8 /* LexPowerPro.cxx */; };
+		280263C4246DF84A000DF3B8 /* LexPascal.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026352246DF849000DF3B8 /* LexPascal.cxx */; };
+		280263C5246DF84A000DF3B8 /* LexCLW.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026353246DF849000DF3B8 /* LexCLW.cxx */; };
+		280263C6246DF84A000DF3B8 /* LexPB.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026354246DF849000DF3B8 /* LexPB.cxx */; };
+		280263C7246DF84A000DF3B8 /* LexMarkdown.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026355246DF849000DF3B8 /* LexMarkdown.cxx */; };
+		280263C8246DF84A000DF3B8 /* LexKix.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026356246DF849000DF3B8 /* LexKix.cxx */; };
+		280263C9246DF84A000DF3B8 /* LexSpecman.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026357246DF849000DF3B8 /* LexSpecman.cxx */; };
+		280263CA246DF84A000DF3B8 /* LexCmake.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026358246DF84A000DF3B8 /* LexCmake.cxx */; };
+		280263CB246DF84A000DF3B8 /* LexBash.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28026359246DF84A000DF3B8 /* LexBash.cxx */; };
+		280263CC246DF84A000DF3B8 /* LexSpice.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802635A246DF84A000DF3B8 /* LexSpice.cxx */; };
+		280263CD246DF84A000DF3B8 /* LexKVIrc.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802635B246DF84A000DF3B8 /* LexKVIrc.cxx */; };
+		280263CE246DF84A000DF3B8 /* LexFortran.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802635C246DF84A000DF3B8 /* LexFortran.cxx */; };
+		280263CF246DF84A000DF3B8 /* LexYAML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802635D246DF84A000DF3B8 /* LexYAML.cxx */; };
+		280263D0246DF84A000DF3B8 /* LexNim.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2802635E246DF84A000DF3B8 /* LexNim.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; };
+		280262B3246DF6B0000DF3B8 /* Lexilla.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Lexilla.h; path = ../../Lexilla.h; sourceTree = "<group>"; };
+		280262B4246DF6B0000DF3B8 /* Lexilla.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Lexilla.cxx; path = ../../Lexilla.cxx; sourceTree = "<group>"; };
+		280262B9246DF808000DF3B8 /* CharacterCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CharacterCategory.h; path = ../../../../lexlib/CharacterCategory.h; sourceTree = "<group>"; };
+		280262BA246DF808000DF3B8 /* LexerModule.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexerModule.cxx; path = ../../../../lexlib/LexerModule.cxx; sourceTree = "<group>"; };
+		280262BB246DF808000DF3B8 /* SparseState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SparseState.h; path = ../../../../lexlib/SparseState.h; sourceTree = "<group>"; };
+		280262BC246DF808000DF3B8 /* LexerSimple.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexerSimple.cxx; path = ../../../../lexlib/LexerSimple.cxx; sourceTree = "<group>"; };
+		280262BD246DF808000DF3B8 /* CharacterCategory.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CharacterCategory.cxx; path = ../../../../lexlib/CharacterCategory.cxx; sourceTree = "<group>"; };
+		280262BE246DF808000DF3B8 /* OptionSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OptionSet.h; path = ../../../../lexlib/OptionSet.h; sourceTree = "<group>"; };
+		280262BF246DF808000DF3B8 /* StyleContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleContext.h; path = ../../../../lexlib/StyleContext.h; sourceTree = "<group>"; };
+		280262C0246DF808000DF3B8 /* LexerBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LexerBase.h; path = ../../../../lexlib/LexerBase.h; sourceTree = "<group>"; };
+		280262C1246DF808000DF3B8 /* SubStyles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SubStyles.h; path = ../../../../lexlib/SubStyles.h; sourceTree = "<group>"; };
+		280262C2246DF808000DF3B8 /* Accessor.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Accessor.cxx; path = ../../../../lexlib/Accessor.cxx; sourceTree = "<group>"; };
+		280262C3246DF808000DF3B8 /* DefaultLexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultLexer.h; path = ../../../../lexlib/DefaultLexer.h; sourceTree = "<group>"; };
+		280262C4246DF808000DF3B8 /* LexAccessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LexAccessor.h; path = ../../../../lexlib/LexAccessor.h; sourceTree = "<group>"; };
+		280262C5246DF808000DF3B8 /* PropSetSimple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PropSetSimple.h; path = ../../../../lexlib/PropSetSimple.h; sourceTree = "<group>"; };
+		280262C6246DF808000DF3B8 /* LexerSimple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LexerSimple.h; path = ../../../../lexlib/LexerSimple.h; sourceTree = "<group>"; };
+		280262C7246DF808000DF3B8 /* PropSetSimple.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PropSetSimple.cxx; path = ../../../../lexlib/PropSetSimple.cxx; sourceTree = "<group>"; };
+		280262C8246DF808000DF3B8 /* WordList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WordList.h; path = ../../../../lexlib/WordList.h; sourceTree = "<group>"; };
+		280262C9246DF808000DF3B8 /* CharacterSet.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CharacterSet.cxx; path = ../../../../lexlib/CharacterSet.cxx; sourceTree = "<group>"; };
+		280262CA246DF808000DF3B8 /* LexerBase.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexerBase.cxx; path = ../../../../lexlib/LexerBase.cxx; sourceTree = "<group>"; };
+		280262CB246DF808000DF3B8 /* StringCopy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StringCopy.h; path = ../../../../lexlib/StringCopy.h; sourceTree = "<group>"; };
+		280262CC246DF808000DF3B8 /* LexerModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LexerModule.h; path = ../../../../lexlib/LexerModule.h; sourceTree = "<group>"; };
+		280262CD246DF808000DF3B8 /* DefaultLexer.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DefaultLexer.cxx; path = ../../../../lexlib/DefaultLexer.cxx; sourceTree = "<group>"; };
+		280262CE246DF808000DF3B8 /* Accessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Accessor.h; path = ../../../../lexlib/Accessor.h; sourceTree = "<group>"; };
+		280262CF246DF808000DF3B8 /* WordList.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WordList.cxx; path = ../../../../lexlib/WordList.cxx; sourceTree = "<group>"; };
+		280262D0246DF808000DF3B8 /* CharacterSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CharacterSet.h; path = ../../../../lexlib/CharacterSet.h; sourceTree = "<group>"; };
+		280262D1246DF808000DF3B8 /* StyleContext.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleContext.cxx; path = ../../../../lexlib/StyleContext.cxx; sourceTree = "<group>"; };
+		280262EB246DF844000DF3B8 /* LexHex.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexHex.cxx; path = ../../../../lexers/LexHex.cxx; sourceTree = "<group>"; };
+		280262EC246DF845000DF3B8 /* LexTCL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTCL.cxx; path = ../../../../lexers/LexTCL.cxx; sourceTree = "<group>"; };
+		280262ED246DF845000DF3B8 /* LexCrontab.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCrontab.cxx; path = ../../../../lexers/LexCrontab.cxx; sourceTree = "<group>"; };
+		280262EE246DF845000DF3B8 /* LexTACL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTACL.cxx; path = ../../../../lexers/LexTACL.cxx; sourceTree = "<group>"; };
+		280262EF246DF845000DF3B8 /* LexVHDL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexVHDL.cxx; path = ../../../../lexers/LexVHDL.cxx; sourceTree = "<group>"; };
+		280262F0246DF845000DF3B8 /* LexBullant.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexBullant.cxx; path = ../../../../lexers/LexBullant.cxx; sourceTree = "<group>"; };
+		280262F1246DF845000DF3B8 /* LexPLM.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPLM.cxx; path = ../../../../lexers/LexPLM.cxx; sourceTree = "<group>"; };
+		280262F2246DF845000DF3B8 /* LexRaku.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexRaku.cxx; path = ../../../../lexers/LexRaku.cxx; sourceTree = "<group>"; };
+		280262F3246DF845000DF3B8 /* LexLout.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexLout.cxx; path = ../../../../lexers/LexLout.cxx; sourceTree = "<group>"; };
+		280262F4246DF845000DF3B8 /* LexPerl.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPerl.cxx; path = ../../../../lexers/LexPerl.cxx; sourceTree = "<group>"; };
+		280262F5246DF845000DF3B8 /* LexR.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexR.cxx; path = ../../../../lexers/LexR.cxx; sourceTree = "<group>"; };
+		280262F6246DF845000DF3B8 /* LexErrorList.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexErrorList.cxx; path = ../../../../lexers/LexErrorList.cxx; sourceTree = "<group>"; };
+		280262F7246DF845000DF3B8 /* LexVerilog.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexVerilog.cxx; path = ../../../../lexers/LexVerilog.cxx; sourceTree = "<group>"; };
+		280262F8246DF845000DF3B8 /* LexCSS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCSS.cxx; path = ../../../../lexers/LexCSS.cxx; sourceTree = "<group>"; };
+		280262F9246DF845000DF3B8 /* LexScriptol.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexScriptol.cxx; path = ../../../../lexers/LexScriptol.cxx; sourceTree = "<group>"; };
+		280262FA246DF845000DF3B8 /* LexPS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPS.cxx; path = ../../../../lexers/LexPS.cxx; sourceTree = "<group>"; };
+		280262FB246DF845000DF3B8 /* LexAsm.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAsm.cxx; path = ../../../../lexers/LexAsm.cxx; sourceTree = "<group>"; };
+		280262FC246DF845000DF3B8 /* LexVisualProlog.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexVisualProlog.cxx; path = ../../../../lexers/LexVisualProlog.cxx; sourceTree = "<group>"; };
+		280262FD246DF845000DF3B8 /* LexMatlab.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMatlab.cxx; path = ../../../../lexers/LexMatlab.cxx; sourceTree = "<group>"; };
+		280262FE246DF845000DF3B8 /* LexOpal.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexOpal.cxx; path = ../../../../lexers/LexOpal.cxx; sourceTree = "<group>"; };
+		280262FF246DF845000DF3B8 /* LexModula.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexModula.cxx; path = ../../../../lexers/LexModula.cxx; sourceTree = "<group>"; };
+		28026300246DF845000DF3B8 /* LexNsis.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexNsis.cxx; path = ../../../../lexers/LexNsis.cxx; sourceTree = "<group>"; };
+		28026301246DF845000DF3B8 /* LexMagik.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMagik.cxx; path = ../../../../lexers/LexMagik.cxx; sourceTree = "<group>"; };
+		28026302246DF845000DF3B8 /* LexJSON.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexJSON.cxx; path = ../../../../lexers/LexJSON.cxx; sourceTree = "<group>"; };
+		28026303246DF845000DF3B8 /* LexRegistry.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexRegistry.cxx; path = ../../../../lexers/LexRegistry.cxx; sourceTree = "<group>"; };
+		28026304246DF845000DF3B8 /* LexSQL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSQL.cxx; path = ../../../../lexers/LexSQL.cxx; sourceTree = "<group>"; };
+		28026305246DF845000DF3B8 /* LexCIL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCIL.cxx; path = ../../../../lexers/LexCIL.cxx; sourceTree = "<group>"; };
+		28026306246DF845000DF3B8 /* LexPOV.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPOV.cxx; path = ../../../../lexers/LexPOV.cxx; sourceTree = "<group>"; };
+		28026307246DF845000DF3B8 /* LexA68k.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexA68k.cxx; path = ../../../../lexers/LexA68k.cxx; sourceTree = "<group>"; };
+		28026308246DF845000DF3B8 /* LexMetapost.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMetapost.cxx; path = ../../../../lexers/LexMetapost.cxx; sourceTree = "<group>"; };
+		28026309246DF845000DF3B8 /* LexProgress.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexProgress.cxx; path = ../../../../lexers/LexProgress.cxx; sourceTree = "<group>"; };
+		2802630A246DF845000DF3B8 /* LexFlagship.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexFlagship.cxx; path = ../../../../lexers/LexFlagship.cxx; sourceTree = "<group>"; };
+		2802630C246DF846000DF3B8 /* LexX12.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexX12.cxx; path = ../../../../lexers/LexX12.cxx; sourceTree = "<group>"; };
+		2802630D246DF846000DF3B8 /* LexAVE.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAVE.cxx; path = ../../../../lexers/LexAVE.cxx; sourceTree = "<group>"; };
+		2802630E246DF846000DF3B8 /* LexRuby.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexRuby.cxx; path = ../../../../lexers/LexRuby.cxx; sourceTree = "<group>"; };
+		2802630F246DF846000DF3B8 /* LexOScript.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexOScript.cxx; path = ../../../../lexers/LexOScript.cxx; sourceTree = "<group>"; };
+		28026310246DF846000DF3B8 /* LexDiff.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexDiff.cxx; path = ../../../../lexers/LexDiff.cxx; sourceTree = "<group>"; };
+		28026311246DF846000DF3B8 /* LexVB.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexVB.cxx; path = ../../../../lexers/LexVB.cxx; sourceTree = "<group>"; };
+		28026312246DF846000DF3B8 /* LexGui4Cli.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexGui4Cli.cxx; path = ../../../../lexers/LexGui4Cli.cxx; sourceTree = "<group>"; };
+		28026313246DF846000DF3B8 /* LexASY.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexASY.cxx; path = ../../../../lexers/LexASY.cxx; sourceTree = "<group>"; };
+		28026314246DF846000DF3B8 /* LexCOBOL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCOBOL.cxx; path = ../../../../lexers/LexCOBOL.cxx; sourceTree = "<group>"; };
+		28026315246DF846000DF3B8 /* LexStata.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexStata.cxx; path = ../../../../lexers/LexStata.cxx; sourceTree = "<group>"; };
+		28026316246DF846000DF3B8 /* LexCaml.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCaml.cxx; path = ../../../../lexers/LexCaml.cxx; sourceTree = "<group>"; };
+		28026317246DF846000DF3B8 /* LexIndent.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexIndent.cxx; path = ../../../../lexers/LexIndent.cxx; sourceTree = "<group>"; };
+		28026318246DF846000DF3B8 /* LexTeX.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTeX.cxx; path = ../../../../lexers/LexTeX.cxx; sourceTree = "<group>"; };
+		28026319246DF846000DF3B8 /* LexEScript.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexEScript.cxx; path = ../../../../lexers/LexEScript.cxx; sourceTree = "<group>"; };
+		2802631A246DF846000DF3B8 /* LexSAS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSAS.cxx; path = ../../../../lexers/LexSAS.cxx; sourceTree = "<group>"; };
+		2802631B246DF846000DF3B8 /* LexTAL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTAL.cxx; path = ../../../../lexers/LexTAL.cxx; sourceTree = "<group>"; };
+		2802631C246DF846000DF3B8 /* LexDMAP.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexDMAP.cxx; path = ../../../../lexers/LexDMAP.cxx; sourceTree = "<group>"; };
+		2802631D246DF846000DF3B8 /* LexLisp.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexLisp.cxx; path = ../../../../lexers/LexLisp.cxx; sourceTree = "<group>"; };
+		2802631E246DF846000DF3B8 /* LexErlang.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexErlang.cxx; path = ../../../../lexers/LexErlang.cxx; sourceTree = "<group>"; };
+		2802631F246DF846000DF3B8 /* LexSTTXT.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSTTXT.cxx; path = ../../../../lexers/LexSTTXT.cxx; sourceTree = "<group>"; };
+		28026320246DF846000DF3B8 /* LexRust.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexRust.cxx; path = ../../../../lexers/LexRust.cxx; sourceTree = "<group>"; };
+		28026321246DF846000DF3B8 /* LexCPP.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCPP.cxx; path = ../../../../lexers/LexCPP.cxx; sourceTree = "<group>"; };
+		28026322246DF846000DF3B8 /* LexDataflex.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexDataflex.cxx; path = ../../../../lexers/LexDataflex.cxx; sourceTree = "<group>"; };
+		28026323246DF846000DF3B8 /* LexSmalltalk.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSmalltalk.cxx; path = ../../../../lexers/LexSmalltalk.cxx; sourceTree = "<group>"; };
+		28026324246DF846000DF3B8 /* LexCoffeeScript.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCoffeeScript.cxx; path = ../../../../lexers/LexCoffeeScript.cxx; sourceTree = "<group>"; };
+		28026325246DF847000DF3B8 /* LexBatch.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexBatch.cxx; path = ../../../../lexers/LexBatch.cxx; sourceTree = "<group>"; };
+		28026326246DF847000DF3B8 /* LexPO.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPO.cxx; path = ../../../../lexers/LexPO.cxx; sourceTree = "<group>"; };
+		28026327246DF847000DF3B8 /* LexPython.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPython.cxx; path = ../../../../lexers/LexPython.cxx; sourceTree = "<group>"; };
+		28026328246DF847000DF3B8 /* LexMSSQL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMSSQL.cxx; path = ../../../../lexers/LexMSSQL.cxx; sourceTree = "<group>"; };
+		2802632A246DF847000DF3B8 /* LexTADS3.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTADS3.cxx; path = ../../../../lexers/LexTADS3.cxx; sourceTree = "<group>"; };
+		2802632B246DF847000DF3B8 /* LexTCMD.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTCMD.cxx; path = ../../../../lexers/LexTCMD.cxx; sourceTree = "<group>"; };
+		2802632C246DF847000DF3B8 /* LexMMIXAL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMMIXAL.cxx; path = ../../../../lexers/LexMMIXAL.cxx; sourceTree = "<group>"; };
+		2802632D246DF847000DF3B8 /* LexLaTeX.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexLaTeX.cxx; path = ../../../../lexers/LexLaTeX.cxx; sourceTree = "<group>"; };
+		2802632E246DF847000DF3B8 /* LexConf.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexConf.cxx; path = ../../../../lexers/LexConf.cxx; sourceTree = "<group>"; };
+		2802632F246DF847000DF3B8 /* LexHollywood.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexHollywood.cxx; path = ../../../../lexers/LexHollywood.cxx; sourceTree = "<group>"; };
+		28026330246DF847000DF3B8 /* LexECL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexECL.cxx; path = ../../../../lexers/LexECL.cxx; sourceTree = "<group>"; };
+		28026331246DF847000DF3B8 /* LexAda.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAda.cxx; path = ../../../../lexers/LexAda.cxx; sourceTree = "<group>"; };
+		28026332246DF847000DF3B8 /* LexBaan.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexBaan.cxx; path = ../../../../lexers/LexBaan.cxx; sourceTree = "<group>"; };
+		28026333246DF848000DF3B8 /* LexSML.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSML.cxx; path = ../../../../lexers/LexSML.cxx; sourceTree = "<group>"; };
+		28026334246DF848000DF3B8 /* LexBibTeX.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexBibTeX.cxx; path = ../../../../lexers/LexBibTeX.cxx; sourceTree = "<group>"; };
+		28026335246DF848000DF3B8 /* LexRebol.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexRebol.cxx; path = ../../../../lexers/LexRebol.cxx; sourceTree = "<group>"; };
+		28026336246DF848000DF3B8 /* LexMaxima.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMaxima.cxx; path = ../../../../lexers/LexMaxima.cxx; sourceTree = "<group>"; };
+		28026337246DF848000DF3B8 /* LexAU3.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAU3.cxx; path = ../../../../lexers/LexAU3.cxx; sourceTree = "<group>"; };
+		28026338246DF848000DF3B8 /* LexForth.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexForth.cxx; path = ../../../../lexers/LexForth.cxx; sourceTree = "<group>"; };
+		28026339246DF848000DF3B8 /* LexMake.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMake.cxx; path = ../../../../lexers/LexMake.cxx; sourceTree = "<group>"; };
+		2802633A246DF848000DF3B8 /* LexCsound.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCsound.cxx; path = ../../../../lexers/LexCsound.cxx; sourceTree = "<group>"; };
+		2802633B246DF848000DF3B8 /* LexAsn1.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAsn1.cxx; path = ../../../../lexers/LexAsn1.cxx; sourceTree = "<group>"; };
+		2802633C246DF848000DF3B8 /* LexNimrod.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexNimrod.cxx; path = ../../../../lexers/LexNimrod.cxx; sourceTree = "<group>"; };
+		2802633D246DF848000DF3B8 /* LexGAP.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexGAP.cxx; path = ../../../../lexers/LexGAP.cxx; sourceTree = "<group>"; };
+		2802633E246DF848000DF3B8 /* LexEDIFACT.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexEDIFACT.cxx; path = ../../../../lexers/LexEDIFACT.cxx; sourceTree = "<group>"; };
+		2802633F246DF848000DF3B8 /* LexProps.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexProps.cxx; path = ../../../../lexers/LexProps.cxx; sourceTree = "<group>"; };
+		28026340246DF848000DF3B8 /* LexSorcus.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSorcus.cxx; path = ../../../../lexers/LexSorcus.cxx; sourceTree = "<group>"; };
+		28026341246DF848000DF3B8 /* LexLua.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexLua.cxx; path = ../../../../lexers/LexLua.cxx; sourceTree = "<group>"; };
+		28026342246DF848000DF3B8 /* LexBasic.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexBasic.cxx; path = ../../../../lexers/LexBasic.cxx; sourceTree = "<group>"; };
+		28026343246DF848000DF3B8 /* LexNull.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexNull.cxx; path = ../../../../lexers/LexNull.cxx; sourceTree = "<group>"; };
+		28026344246DF848000DF3B8 /* LexD.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexD.cxx; path = ../../../../lexers/LexD.cxx; sourceTree = "<group>"; };
+		28026345246DF848000DF3B8 /* LexAVS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAVS.cxx; path = ../../../../lexers/LexAVS.cxx; sourceTree = "<group>"; };
+		28026346246DF849000DF3B8 /* LexHaskell.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexHaskell.cxx; path = ../../../../lexers/LexHaskell.cxx; sourceTree = "<group>"; };
+		28026347246DF849000DF3B8 /* LexInno.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexInno.cxx; path = ../../../../lexers/LexInno.cxx; sourceTree = "<group>"; };
+		28026348246DF849000DF3B8 /* LexDMIS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexDMIS.cxx; path = ../../../../lexers/LexDMIS.cxx; sourceTree = "<group>"; };
+		28026349246DF849000DF3B8 /* LexPowerShell.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPowerShell.cxx; path = ../../../../lexers/LexPowerShell.cxx; sourceTree = "<group>"; };
+		2802634A246DF849000DF3B8 /* LexMPT.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMPT.cxx; path = ../../../../lexers/LexMPT.cxx; sourceTree = "<group>"; };
+		2802634B246DF849000DF3B8 /* LexAbaqus.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAbaqus.cxx; path = ../../../../lexers/LexAbaqus.cxx; sourceTree = "<group>"; };
+		2802634C246DF849000DF3B8 /* LexHTML.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexHTML.cxx; path = ../../../../lexers/LexHTML.cxx; sourceTree = "<group>"; };
+		2802634D246DF849000DF3B8 /* LexAPDL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAPDL.cxx; path = ../../../../lexers/LexAPDL.cxx; sourceTree = "<group>"; };
+		2802634E246DF849000DF3B8 /* LexEiffel.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexEiffel.cxx; path = ../../../../lexers/LexEiffel.cxx; sourceTree = "<group>"; };
+		2802634F246DF849000DF3B8 /* LexTxt2tags.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTxt2tags.cxx; path = ../../../../lexers/LexTxt2tags.cxx; sourceTree = "<group>"; };
+		28026350246DF849000DF3B8 /* LexMySQL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMySQL.cxx; path = ../../../../lexers/LexMySQL.cxx; sourceTree = "<group>"; };
+		28026351246DF849000DF3B8 /* LexPowerPro.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPowerPro.cxx; path = ../../../../lexers/LexPowerPro.cxx; sourceTree = "<group>"; };
+		28026352246DF849000DF3B8 /* LexPascal.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPascal.cxx; path = ../../../../lexers/LexPascal.cxx; sourceTree = "<group>"; };
+		28026353246DF849000DF3B8 /* LexCLW.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCLW.cxx; path = ../../../../lexers/LexCLW.cxx; sourceTree = "<group>"; };
+		28026354246DF849000DF3B8 /* LexPB.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPB.cxx; path = ../../../../lexers/LexPB.cxx; sourceTree = "<group>"; };
+		28026355246DF849000DF3B8 /* LexMarkdown.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMarkdown.cxx; path = ../../../../lexers/LexMarkdown.cxx; sourceTree = "<group>"; };
+		28026356246DF849000DF3B8 /* LexKix.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexKix.cxx; path = ../../../../lexers/LexKix.cxx; sourceTree = "<group>"; };
+		28026357246DF849000DF3B8 /* LexSpecman.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpecman.cxx; path = ../../../../lexers/LexSpecman.cxx; sourceTree = "<group>"; };
+		28026358246DF84A000DF3B8 /* LexCmake.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCmake.cxx; path = ../../../../lexers/LexCmake.cxx; sourceTree = "<group>"; };
+		28026359246DF84A000DF3B8 /* LexBash.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexBash.cxx; path = ../../../../lexers/LexBash.cxx; sourceTree = "<group>"; };
+		2802635A246DF84A000DF3B8 /* LexSpice.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpice.cxx; path = ../../../../lexers/LexSpice.cxx; sourceTree = "<group>"; };
+		2802635B246DF84A000DF3B8 /* LexKVIrc.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexKVIrc.cxx; path = ../../../../lexers/LexKVIrc.cxx; sourceTree = "<group>"; };
+		2802635C246DF84A000DF3B8 /* LexFortran.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexFortran.cxx; path = ../../../../lexers/LexFortran.cxx; sourceTree = "<group>"; };
+		2802635D246DF84A000DF3B8 /* LexYAML.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexYAML.cxx; path = ../../../../lexers/LexYAML.cxx; sourceTree = "<group>"; };
+		2802635E246DF84A000DF3B8 /* LexNim.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexNim.cxx; path = ../../../../lexers/LexNim.cxx; sourceTree = "<group>"; };
+		282587352478D12500F78504 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Lexilla/Info.plist; sourceTree = "<group>"; };
+/* 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 = (
+				282587352478D12500F78504 /* 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 = (
+				280262B4246DF6B0000DF3B8 /* Lexilla.cxx */,
+				280262B3246DF6B0000DF3B8 /* Lexilla.h */,
+			);
+			path = Lexilla;
+			sourceTree = "<group>";
+		};
+		280262B7246DF765000DF3B8 /* Lexers */ = {
+			isa = PBXGroup;
+			children = (
+				28026307246DF845000DF3B8 /* LexA68k.cxx */,
+				2802634B246DF849000DF3B8 /* LexAbaqus.cxx */,
+				28026331246DF847000DF3B8 /* LexAda.cxx */,
+				2802634D246DF849000DF3B8 /* LexAPDL.cxx */,
+				280262FB246DF845000DF3B8 /* LexAsm.cxx */,
+				2802633B246DF848000DF3B8 /* LexAsn1.cxx */,
+				28026313246DF846000DF3B8 /* LexASY.cxx */,
+				28026337246DF848000DF3B8 /* LexAU3.cxx */,
+				2802630D246DF846000DF3B8 /* LexAVE.cxx */,
+				28026345246DF848000DF3B8 /* LexAVS.cxx */,
+				28026332246DF847000DF3B8 /* LexBaan.cxx */,
+				28026359246DF84A000DF3B8 /* LexBash.cxx */,
+				28026342246DF848000DF3B8 /* LexBasic.cxx */,
+				28026325246DF847000DF3B8 /* LexBatch.cxx */,
+				28026334246DF848000DF3B8 /* LexBibTeX.cxx */,
+				280262F0246DF845000DF3B8 /* LexBullant.cxx */,
+				28026316246DF846000DF3B8 /* LexCaml.cxx */,
+				28026305246DF845000DF3B8 /* LexCIL.cxx */,
+				28026353246DF849000DF3B8 /* LexCLW.cxx */,
+				28026358246DF84A000DF3B8 /* LexCmake.cxx */,
+				28026314246DF846000DF3B8 /* LexCOBOL.cxx */,
+				28026324246DF846000DF3B8 /* LexCoffeeScript.cxx */,
+				2802632E246DF847000DF3B8 /* LexConf.cxx */,
+				28026321246DF846000DF3B8 /* LexCPP.cxx */,
+				280262ED246DF845000DF3B8 /* LexCrontab.cxx */,
+				2802633A246DF848000DF3B8 /* LexCsound.cxx */,
+				280262F8246DF845000DF3B8 /* LexCSS.cxx */,
+				28026344246DF848000DF3B8 /* LexD.cxx */,
+				28026322246DF846000DF3B8 /* LexDataflex.cxx */,
+				28026310246DF846000DF3B8 /* LexDiff.cxx */,
+				2802631C246DF846000DF3B8 /* LexDMAP.cxx */,
+				28026348246DF849000DF3B8 /* LexDMIS.cxx */,
+				28026330246DF847000DF3B8 /* LexECL.cxx */,
+				2802633E246DF848000DF3B8 /* LexEDIFACT.cxx */,
+				2802634E246DF849000DF3B8 /* LexEiffel.cxx */,
+				2802631E246DF846000DF3B8 /* LexErlang.cxx */,
+				280262F6246DF845000DF3B8 /* LexErrorList.cxx */,
+				28026319246DF846000DF3B8 /* LexEScript.cxx */,
+				2802630A246DF845000DF3B8 /* LexFlagship.cxx */,
+				28026338246DF848000DF3B8 /* LexForth.cxx */,
+				2802635C246DF84A000DF3B8 /* LexFortran.cxx */,
+				2802633D246DF848000DF3B8 /* LexGAP.cxx */,
+				28026312246DF846000DF3B8 /* LexGui4Cli.cxx */,
+				28026346246DF849000DF3B8 /* LexHaskell.cxx */,
+				280262EB246DF844000DF3B8 /* LexHex.cxx */,
+				2802632F246DF847000DF3B8 /* LexHollywood.cxx */,
+				2802634C246DF849000DF3B8 /* LexHTML.cxx */,
+				28026317246DF846000DF3B8 /* LexIndent.cxx */,
+				28026347246DF849000DF3B8 /* LexInno.cxx */,
+				28026302246DF845000DF3B8 /* LexJSON.cxx */,
+				28026356246DF849000DF3B8 /* LexKix.cxx */,
+				2802635B246DF84A000DF3B8 /* LexKVIrc.cxx */,
+				2802632D246DF847000DF3B8 /* LexLaTeX.cxx */,
+				2802631D246DF846000DF3B8 /* LexLisp.cxx */,
+				280262F3246DF845000DF3B8 /* LexLout.cxx */,
+				28026341246DF848000DF3B8 /* LexLua.cxx */,
+				28026301246DF845000DF3B8 /* LexMagik.cxx */,
+				28026339246DF848000DF3B8 /* LexMake.cxx */,
+				28026355246DF849000DF3B8 /* LexMarkdown.cxx */,
+				280262FD246DF845000DF3B8 /* LexMatlab.cxx */,
+				28026336246DF848000DF3B8 /* LexMaxima.cxx */,
+				28026308246DF845000DF3B8 /* LexMetapost.cxx */,
+				2802632C246DF847000DF3B8 /* LexMMIXAL.cxx */,
+				280262FF246DF845000DF3B8 /* LexModula.cxx */,
+				2802634A246DF849000DF3B8 /* LexMPT.cxx */,
+				28026328246DF847000DF3B8 /* LexMSSQL.cxx */,
+				28026350246DF849000DF3B8 /* LexMySQL.cxx */,
+				2802635E246DF84A000DF3B8 /* LexNim.cxx */,
+				2802633C246DF848000DF3B8 /* LexNimrod.cxx */,
+				28026300246DF845000DF3B8 /* LexNsis.cxx */,
+				28026343246DF848000DF3B8 /* LexNull.cxx */,
+				280262FE246DF845000DF3B8 /* LexOpal.cxx */,
+				2802630F246DF846000DF3B8 /* LexOScript.cxx */,
+				28026352246DF849000DF3B8 /* LexPascal.cxx */,
+				28026354246DF849000DF3B8 /* LexPB.cxx */,
+				280262F4246DF845000DF3B8 /* LexPerl.cxx */,
+				280262F1246DF845000DF3B8 /* LexPLM.cxx */,
+				28026326246DF847000DF3B8 /* LexPO.cxx */,
+				28026306246DF845000DF3B8 /* LexPOV.cxx */,
+				28026351246DF849000DF3B8 /* LexPowerPro.cxx */,
+				28026349246DF849000DF3B8 /* LexPowerShell.cxx */,
+				28026309246DF845000DF3B8 /* LexProgress.cxx */,
+				2802633F246DF848000DF3B8 /* LexProps.cxx */,
+				280262FA246DF845000DF3B8 /* LexPS.cxx */,
+				28026327246DF847000DF3B8 /* LexPython.cxx */,
+				280262F5246DF845000DF3B8 /* LexR.cxx */,
+				280262F2246DF845000DF3B8 /* LexRaku.cxx */,
+				28026335246DF848000DF3B8 /* LexRebol.cxx */,
+				28026303246DF845000DF3B8 /* LexRegistry.cxx */,
+				2802630E246DF846000DF3B8 /* LexRuby.cxx */,
+				28026320246DF846000DF3B8 /* LexRust.cxx */,
+				2802631A246DF846000DF3B8 /* LexSAS.cxx */,
+				280262F9246DF845000DF3B8 /* LexScriptol.cxx */,
+				28026323246DF846000DF3B8 /* LexSmalltalk.cxx */,
+				28026333246DF848000DF3B8 /* LexSML.cxx */,
+				28026340246DF848000DF3B8 /* LexSorcus.cxx */,
+				28026357246DF849000DF3B8 /* LexSpecman.cxx */,
+				2802635A246DF84A000DF3B8 /* LexSpice.cxx */,
+				28026304246DF845000DF3B8 /* LexSQL.cxx */,
+				28026315246DF846000DF3B8 /* LexStata.cxx */,
+				2802631F246DF846000DF3B8 /* LexSTTXT.cxx */,
+				280262EE246DF845000DF3B8 /* LexTACL.cxx */,
+				2802632A246DF847000DF3B8 /* LexTADS3.cxx */,
+				2802631B246DF846000DF3B8 /* LexTAL.cxx */,
+				280262EC246DF845000DF3B8 /* LexTCL.cxx */,
+				2802632B246DF847000DF3B8 /* LexTCMD.cxx */,
+				28026318246DF846000DF3B8 /* LexTeX.cxx */,
+				2802634F246DF849000DF3B8 /* LexTxt2tags.cxx */,
+				28026311246DF846000DF3B8 /* LexVB.cxx */,
+				280262F7246DF845000DF3B8 /* LexVerilog.cxx */,
+				280262EF246DF845000DF3B8 /* LexVHDL.cxx */,
+				280262FC246DF845000DF3B8 /* LexVisualProlog.cxx */,
+				2802630C246DF846000DF3B8 /* LexX12.cxx */,
+				2802635D246DF84A000DF3B8 /* LexYAML.cxx */,
+			);
+			path = Lexers;
+			sourceTree = "<group>";
+		};
+		280262B8246DF776000DF3B8 /* LexLib */ = {
+			isa = PBXGroup;
+			children = (
+				280262C2246DF808000DF3B8 /* Accessor.cxx */,
+				280262CE246DF808000DF3B8 /* Accessor.h */,
+				280262BD246DF808000DF3B8 /* CharacterCategory.cxx */,
+				280262B9246DF808000DF3B8 /* CharacterCategory.h */,
+				280262C9246DF808000DF3B8 /* CharacterSet.cxx */,
+				280262D0246DF808000DF3B8 /* CharacterSet.h */,
+				280262CD246DF808000DF3B8 /* DefaultLexer.cxx */,
+				280262C3246DF808000DF3B8 /* DefaultLexer.h */,
+				280262C4246DF808000DF3B8 /* LexAccessor.h */,
+				280262CA246DF808000DF3B8 /* LexerBase.cxx */,
+				280262C0246DF808000DF3B8 /* LexerBase.h */,
+				280262BA246DF808000DF3B8 /* LexerModule.cxx */,
+				280262CC246DF808000DF3B8 /* LexerModule.h */,
+				280262BC246DF808000DF3B8 /* LexerSimple.cxx */,
+				280262C6246DF808000DF3B8 /* LexerSimple.h */,
+				280262BE246DF808000DF3B8 /* OptionSet.h */,
+				280262C7246DF808000DF3B8 /* PropSetSimple.cxx */,
+				280262C5246DF808000DF3B8 /* PropSetSimple.h */,
+				280262BB246DF808000DF3B8 /* SparseState.h */,
+				280262CB246DF808000DF3B8 /* StringCopy.h */,
+				280262D1246DF808000DF3B8 /* StyleContext.cxx */,
+				280262BF246DF808000DF3B8 /* StyleContext.h */,
+				280262C1246DF808000DF3B8 /* SubStyles.h */,
+				280262CF246DF808000DF3B8 /* WordList.cxx */,
+				280262C8246DF808000DF3B8 /* WordList.h */,
+			);
+			path = LexLib;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		280262A1246DF655000DF3B8 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				280262DE246DF809000DF3B8 /* PropSetSimple.h in Headers */,
+				280262D2246DF809000DF3B8 /* CharacterCategory.h in Headers */,
+				280262E4246DF809000DF3B8 /* StringCopy.h in Headers */,
+				280262DC246DF809000DF3B8 /* DefaultLexer.h in Headers */,
+				280262B5246DF6B0000DF3B8 /* Lexilla.h in Headers */,
+				280262E7246DF809000DF3B8 /* Accessor.h in Headers */,
+				280262E1246DF809000DF3B8 /* WordList.h in Headers */,
+				280262D7246DF809000DF3B8 /* OptionSet.h in Headers */,
+				280262E5246DF809000DF3B8 /* LexerModule.h in Headers */,
+				280262DA246DF809000DF3B8 /* SubStyles.h in Headers */,
+				280262DD246DF809000DF3B8 /* LexAccessor.h in Headers */,
+				280262DF246DF809000DF3B8 /* LexerSimple.h in Headers */,
+				280262D4246DF809000DF3B8 /* SparseState.h in Headers */,
+				280262E9246DF809000DF3B8 /* CharacterSet.h in Headers */,
+				280262D9246DF809000DF3B8 /* LexerBase.h in Headers */,
+				280262D8246DF809000DF3B8 /* StyleContext.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 = 1140;
+				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 = (
+				28026392246DF84A000DF3B8 /* LexSTTXT.cxx in Sources */,
+				28026389246DF84A000DF3B8 /* LexCaml.cxx in Sources */,
+				28026379246DF84A000DF3B8 /* LexCIL.cxx in Sources */,
+				280263CB246DF84A000DF3B8 /* LexBash.cxx in Sources */,
+				2802636E246DF84A000DF3B8 /* LexPS.cxx in Sources */,
+				280262EA246DF809000DF3B8 /* StyleContext.cxx in Sources */,
+				28026361246DF84A000DF3B8 /* LexCrontab.cxx in Sources */,
+				280263CC246DF84A000DF3B8 /* LexSpice.cxx in Sources */,
+				280263C2246DF84A000DF3B8 /* LexMySQL.cxx in Sources */,
+				280263C3246DF84A000DF3B8 /* LexPowerPro.cxx in Sources */,
+				280263C1246DF84A000DF3B8 /* LexTxt2tags.cxx in Sources */,
+				280263BF246DF84A000DF3B8 /* LexAPDL.cxx in Sources */,
+				280263B6246DF84A000DF3B8 /* LexD.cxx in Sources */,
+				2802638C246DF84A000DF3B8 /* LexEScript.cxx in Sources */,
+				280263BD246DF84A000DF3B8 /* LexAbaqus.cxx in Sources */,
+				280263BB246DF84A000DF3B8 /* LexPowerShell.cxx in Sources */,
+				28026364246DF84A000DF3B8 /* LexBullant.cxx in Sources */,
+				2802639A246DF84A000DF3B8 /* LexPython.cxx in Sources */,
+				28026387246DF84A000DF3B8 /* LexCOBOL.cxx in Sources */,
+				280262D5246DF809000DF3B8 /* LexerSimple.cxx in Sources */,
+				280263C8246DF84A000DF3B8 /* LexKix.cxx in Sources */,
+				2802639D246DF84A000DF3B8 /* LexTCMD.cxx in Sources */,
+				28026368246DF84A000DF3B8 /* LexPerl.cxx in Sources */,
+				280263AA246DF84A000DF3B8 /* LexForth.cxx in Sources */,
+				2802639C246DF84A000DF3B8 /* LexTADS3.cxx in Sources */,
+				28026377246DF84A000DF3B8 /* LexRegistry.cxx in Sources */,
+				28026396246DF84A000DF3B8 /* LexSmalltalk.cxx in Sources */,
+				2802637A246DF84A000DF3B8 /* LexPOV.cxx in Sources */,
+				2802637E246DF84A000DF3B8 /* LexFlagship.cxx in Sources */,
+				280263AB246DF84A000DF3B8 /* LexMake.cxx in Sources */,
+				280263AD246DF84A000DF3B8 /* LexAsn1.cxx in Sources */,
+				280263A6246DF84A000DF3B8 /* LexBibTeX.cxx in Sources */,
+				280263BA246DF84A000DF3B8 /* LexDMIS.cxx in Sources */,
+				2802637C246DF84A000DF3B8 /* LexMetapost.cxx in Sources */,
+				280263B4246DF84A000DF3B8 /* LexBasic.cxx in Sources */,
+				2802638B246DF84A000DF3B8 /* LexTeX.cxx in Sources */,
+				2802637F246DF84A000DF3B8 /* LexX12.cxx in Sources */,
+				28026363246DF84A000DF3B8 /* LexVHDL.cxx in Sources */,
+				28026365246DF84A000DF3B8 /* LexPLM.cxx in Sources */,
+				280263A8246DF84A000DF3B8 /* LexMaxima.cxx in Sources */,
+				28026383246DF84A000DF3B8 /* LexDiff.cxx in Sources */,
+				280263CE246DF84A000DF3B8 /* LexFortran.cxx in Sources */,
+				280263B5246DF84A000DF3B8 /* LexNull.cxx in Sources */,
+				2802639B246DF84A000DF3B8 /* LexMSSQL.cxx in Sources */,
+				280263C7246DF84A000DF3B8 /* LexMarkdown.cxx in Sources */,
+				280262E3246DF809000DF3B8 /* LexerBase.cxx in Sources */,
+				28026397246DF84A000DF3B8 /* LexCoffeeScript.cxx in Sources */,
+				2802636B246DF84A000DF3B8 /* LexVerilog.cxx in Sources */,
+				280262D6246DF809000DF3B8 /* CharacterCategory.cxx in Sources */,
+				280263A7246DF84A000DF3B8 /* LexRebol.cxx in Sources */,
+				28026386246DF84A000DF3B8 /* LexASY.cxx in Sources */,
+				28026390246DF84A000DF3B8 /* LexLisp.cxx in Sources */,
+				280263C6246DF84A000DF3B8 /* LexPB.cxx in Sources */,
+				2802638E246DF84A000DF3B8 /* LexTAL.cxx in Sources */,
+				28026376246DF84A000DF3B8 /* LexJSON.cxx in Sources */,
+				28026388246DF84A000DF3B8 /* LexStata.cxx in Sources */,
+				28026378246DF84A000DF3B8 /* LexSQL.cxx in Sources */,
+				28026391246DF84A000DF3B8 /* LexErlang.cxx in Sources */,
+				2802638F246DF84A000DF3B8 /* LexDMAP.cxx in Sources */,
+				280262DB246DF809000DF3B8 /* Accessor.cxx in Sources */,
+				2802638D246DF84A000DF3B8 /* LexSAS.cxx in Sources */,
+				28026367246DF84A000DF3B8 /* LexLout.cxx in Sources */,
+				28026375246DF84A000DF3B8 /* LexMagik.cxx in Sources */,
+				28026393246DF84A000DF3B8 /* LexRust.cxx in Sources */,
+				280263C5246DF84A000DF3B8 /* LexCLW.cxx in Sources */,
+				2802637D246DF84A000DF3B8 /* LexProgress.cxx in Sources */,
+				280263B2246DF84A000DF3B8 /* LexSorcus.cxx in Sources */,
+				280263B9246DF84A000DF3B8 /* LexInno.cxx in Sources */,
+				280263A1246DF84A000DF3B8 /* LexHollywood.cxx in Sources */,
+				28026384246DF84A000DF3B8 /* LexVB.cxx in Sources */,
+				2802635F246DF84A000DF3B8 /* LexHex.cxx in Sources */,
+				280263BC246DF84A000DF3B8 /* LexMPT.cxx in Sources */,
+				28026371246DF84A000DF3B8 /* LexMatlab.cxx in Sources */,
+				28026385246DF84A000DF3B8 /* LexGui4Cli.cxx in Sources */,
+				280263CD246DF84A000DF3B8 /* LexKVIrc.cxx in Sources */,
+				280263CA246DF84A000DF3B8 /* LexCmake.cxx in Sources */,
+				2802636D246DF84A000DF3B8 /* LexScriptol.cxx in Sources */,
+				2802636A246DF84A000DF3B8 /* LexErrorList.cxx in Sources */,
+				280263BE246DF84A000DF3B8 /* LexHTML.cxx in Sources */,
+				280263AE246DF84A000DF3B8 /* LexNimrod.cxx in Sources */,
+				280262D3246DF809000DF3B8 /* LexerModule.cxx in Sources */,
+				280262E6246DF809000DF3B8 /* DefaultLexer.cxx in Sources */,
+				280263A0246DF84A000DF3B8 /* LexConf.cxx in Sources */,
+				280263C0246DF84A000DF3B8 /* LexEiffel.cxx in Sources */,
+				280263CF246DF84A000DF3B8 /* LexYAML.cxx in Sources */,
+				280263C9246DF84A000DF3B8 /* LexSpecman.cxx in Sources */,
+				2802639E246DF84A000DF3B8 /* LexMMIXAL.cxx in Sources */,
+				2802639F246DF84A000DF3B8 /* LexLaTeX.cxx in Sources */,
+				28026381246DF84A000DF3B8 /* LexRuby.cxx in Sources */,
+				280263A5246DF84A000DF3B8 /* LexSML.cxx in Sources */,
+				280263B8246DF84A000DF3B8 /* LexHaskell.cxx in Sources */,
+				28026395246DF84A000DF3B8 /* LexDataflex.cxx in Sources */,
+				280262B6246DF6B0000DF3B8 /* Lexilla.cxx in Sources */,
+				280262E8246DF809000DF3B8 /* WordList.cxx in Sources */,
+				28026372246DF84A000DF3B8 /* LexOpal.cxx in Sources */,
+				280263B1246DF84A000DF3B8 /* LexProps.cxx in Sources */,
+				28026394246DF84A000DF3B8 /* LexCPP.cxx in Sources */,
+				28026369246DF84A000DF3B8 /* LexR.cxx in Sources */,
+				2802638A246DF84A000DF3B8 /* LexIndent.cxx in Sources */,
+				2802636F246DF84A000DF3B8 /* LexAsm.cxx in Sources */,
+				28026399246DF84A000DF3B8 /* LexPO.cxx in Sources */,
+				2802636C246DF84A000DF3B8 /* LexCSS.cxx in Sources */,
+				2802637B246DF84A000DF3B8 /* LexA68k.cxx in Sources */,
+				28026373246DF84A000DF3B8 /* LexModula.cxx in Sources */,
+				28026366246DF84A000DF3B8 /* LexRaku.cxx in Sources */,
+				280263B0246DF84A000DF3B8 /* LexEDIFACT.cxx in Sources */,
+				280262E0246DF809000DF3B8 /* PropSetSimple.cxx in Sources */,
+				28026360246DF84A000DF3B8 /* LexTCL.cxx in Sources */,
+				28026398246DF84A000DF3B8 /* LexBatch.cxx in Sources */,
+				280263AF246DF84A000DF3B8 /* LexGAP.cxx in Sources */,
+				280262E2246DF809000DF3B8 /* CharacterSet.cxx in Sources */,
+				28026362246DF84A000DF3B8 /* LexTACL.cxx in Sources */,
+				280263B3246DF84A000DF3B8 /* LexLua.cxx in Sources */,
+				280263A3246DF84A000DF3B8 /* LexAda.cxx in Sources */,
+				280263A4246DF84A000DF3B8 /* LexBaan.cxx in Sources */,
+				28026374246DF84A000DF3B8 /* LexNsis.cxx in Sources */,
+				280263A9246DF84A000DF3B8 /* LexAU3.cxx in Sources */,
+				280263B7246DF84A000DF3B8 /* LexAVS.cxx in Sources */,
+				280263A2246DF84A000DF3B8 /* LexECL.cxx in Sources */,
+				280263D0246DF84A000DF3B8 /* LexNim.cxx in Sources */,
+				28026370246DF84A000DF3B8 /* LexVisualProlog.cxx in Sources */,
+				28026380246DF84A000DF3B8 /* LexAVE.cxx in Sources */,
+				280263AC246DF84A000DF3B8 /* LexCsound.cxx in Sources */,
+				28026382246DF84A000DF3B8 /* LexOScript.cxx in Sources */,
+				280263C4246DF84A000DF3B8 /* LexPascal.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_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=1",
+					"$(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.8;
+				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_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_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.8;
+				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 = 4.4.3;
+				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,
+					../../../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 = 4.4.3;
+				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,
+					../../../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 -Nru scite-4.3.3/scintilla/lexilla/src/Lexilla/Lexilla.xcodeproj/project.xcworkspace/contents.xcworkspacedata scite-4.4.4/scintilla/lexilla/src/Lexilla/Lexilla.xcodeproj/project.xcworkspace/contents.xcworkspacedata
--- scite-4.3.3/scintilla/lexilla/src/Lexilla/Lexilla.xcodeproj/project.xcworkspace/contents.xcworkspacedata	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/src/Lexilla/Lexilla.xcodeproj/project.xcworkspace/contents.xcworkspacedata	2020-05-31 23:08:11.000000000 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:Lexilla.xcodeproj">
+   </FileRef>
+</Workspace>
diff -Nru scite-4.3.3/scintilla/lexilla/src/Lexilla/Lexilla.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist scite-4.4.4/scintilla/lexilla/src/Lexilla/Lexilla.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
--- scite-4.3.3/scintilla/lexilla/src/Lexilla/Lexilla.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/src/Lexilla/Lexilla.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist	2020-05-31 23:08:11.000000000 +0000
@@ -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 -Nru scite-4.3.3/scintilla/lexilla/src/Lexilla.cxx scite-4.4.4/scintilla/lexilla/src/Lexilla.cxx
--- scite-4.3.3/scintilla/lexilla/src/Lexilla.cxx	2020-01-15 20:16:06.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/src/Lexilla.cxx	2020-07-18 05:40:21.000000000 +0000
@@ -12,8 +12,10 @@
 
 #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"
@@ -23,7 +25,7 @@
 
 using namespace Scintilla;
 
-//++Autogenerated -- run lexilla/LexillaGen.py to regenerate
+//++Autogenerated -- run lexilla/scripts/LexillaGen.py to regenerate
 //**\(extern LexerModule \*;\n\)
 extern LexerModule lmA68k;
 extern LexerModule lmAbaqus;
@@ -305,12 +307,12 @@
 
 extern "C" {
 
-int EXPORT_FUNCTION GetLexerCount() {
+EXPORT_FUNCTION int CALLING_CONVENTION GetLexerCount() {
 	AddEachLexer();
 	return catalogueLexilla.Count();
 }
 
-void EXPORT_FUNCTION GetLexerName(unsigned int index, char *name, int buflength) {
+EXPORT_FUNCTION void CALLING_CONVENTION GetLexerName(unsigned int index, char *name, int buflength) {
 	AddEachLexer();
 	*name = 0;
 	const char *lexerName = catalogueLexilla.Name(index);
@@ -319,12 +321,12 @@
 	}
 }
 
-LexerFactoryFunction EXPORT_FUNCTION GetLexerFactory(unsigned int index) {
+EXPORT_FUNCTION LexerFactoryFunction CALLING_CONVENTION GetLexerFactory(unsigned int index) {
 	AddEachLexer();
 	return catalogueLexilla.Factory(index);
 }
 
-ILexer5 EXPORT_FUNCTION *CreateLexer(const char *name) {
+EXPORT_FUNCTION ILexer5 * CALLING_CONVENTION CreateLexer(const char *name) {
 	AddEachLexer();
 	for (unsigned int i = 0; i < catalogueLexilla.Count(); i++) {
 		const char *lexerName = catalogueLexilla.Name(i);
diff -Nru scite-4.3.3/scintilla/lexilla/src/Lexilla.def scite-4.4.4/scintilla/lexilla/src/Lexilla.def
--- scite-4.3.3/scintilla/lexilla/src/Lexilla.def	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/src/Lexilla.def	2020-05-31 23:08:11.000000000 +0000
@@ -0,0 +1,5 @@
+EXPORTS
+	GetLexerCount
+	GetLexerName
+	GetLexerFactory
+	CreateLexer
diff -Nru scite-4.3.3/scintilla/lexilla/src/Lexilla.h scite-4.4.4/scintilla/lexilla/src/Lexilla.h
--- scite-4.3.3/scintilla/lexilla/src/Lexilla.h	2020-01-02 00:45:04.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/src/Lexilla.h	2020-06-02 01:42:43.000000000 +0000
@@ -6,8 +6,14 @@
 // Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
+#if _WIN32
+#define LEXILLA_CALLING_CONVENTION __stdcall
+#else
+#define LEXILLA_CALLING_CONVENTION
+#endif
+
 extern "C" {
 
-Scintilla::ILexer5 *CreateLexer(const char *name);
+Scintilla::ILexer5 * LEXILLA_CALLING_CONVENTION CreateLexer(const char *name);
 
 }
diff -Nru scite-4.3.3/scintilla/lexilla/src/lexilla.mak scite-4.4.4/scintilla/lexilla/src/lexilla.mak
--- scite-4.3.3/scintilla/lexilla/src/lexilla.mak	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/src/lexilla.mak	2020-05-31 23:08:11.000000000 +0000
@@ -18,7 +18,21 @@
 
 LD=link
 
-CRTFLAGS=-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 -D_CRT_SECURE_NO_DEPRECATE=1 -D_SCL_SECURE_NO_WARNINGS=1
+!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
+!ELSEIFDEF ARM64
+ADD_DEFINE=-D_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1
+SUBSYSTEM=-SUBSYSTEM:WINDOWS,10.00
+!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
@@ -194,7 +208,7 @@
 	$(LEX_OBJS)
 
 $(LEXILLA): $(LEXILLA_OBJS) LexillaVersion.res
-	$(LD) $(LDFLAGS) -DLL -OUT:$@ $** $(LIBS)
+	$(LD) $(LDFLAGS) -DEF:Lexilla.def -DLL -OUT:$@ $** $(LIBS)
 
 $(LIBLEXILLA): $(LEXILLA_OBJS)
 	LIB -OUT:$@ $**
diff -Nru scite-4.3.3/scintilla/lexilla/src/LexillaVersion.rc scite-4.4.4/scintilla/lexilla/src/LexillaVersion.rc
--- scite-4.3.3/scintilla/lexilla/src/LexillaVersion.rc	2020-03-03 21:50:30.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/src/LexillaVersion.rc	2020-06-02 23:19:05.000000000 +0000
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_LEXILLA "4.3.1"
-#define VERSION_WORDS 4, 3, 1, 0
+#define VERSION_LEXILLA "4.4.3"
+#define VERSION_WORDS 4, 4, 3, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
diff -Nru scite-4.3.3/scintilla/lexilla/src/makefile scite-4.4.4/scintilla/lexilla/src/makefile
--- scite-4.3.3/scintilla/lexilla/src/makefile	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/src/makefile	2020-05-31 23:08:11.000000000 +0000
@@ -19,10 +19,12 @@
 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
@@ -33,7 +35,7 @@
     BASE_FLAGS += -fvisibility=hidden
 endif
 
-LEXILLA=$(DIR_BIN)/lexilla.$(SHAREDEXTENSION)
+LEXILLA=$(DIR_BIN)/$(SHARED_NAME).$(SHAREDEXTENSION)
 LIBLEXILLA=$(DIR_BIN)/liblexilla.a
 
 BASE_FLAGS += --std=c++17
diff -Nru scite-4.3.3/scintilla/lexilla/src/README scite-4.4.4/scintilla/lexilla/src/README
--- scite-4.3.3/scintilla/lexilla/src/README	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/src/README	2020-05-31 23:08:11.000000000 +0000
@@ -5,7 +5,7 @@
 component.
 
 Lexilla is made available as both a shared library and static library.
-The shared library is called lexilla.so / lexilla.dylib / lexilla.dll on Linux / macOS /
+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.
diff -Nru scite-4.3.3/scintilla/lexilla/test/examples/batch/x.bat scite-4.4.4/scintilla/lexilla/test/examples/batch/x.bat
--- scite-4.3.3/scintilla/lexilla/test/examples/batch/x.bat	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/test/examples/batch/x.bat	2020-05-31 23:08:11.000000000 +0000
@@ -31,4 +31,9 @@
 :: 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
+
 :END
diff -Nru scite-4.3.3/scintilla/lexilla/test/examples/batch/x.bat.styled scite-4.4.4/scintilla/lexilla/test/examples/batch/x.bat.styled
--- scite-4.3.3/scintilla/lexilla/test/examples/batch/x.bat.styled	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/test/examples/batch/x.bat.styled	2020-05-31 23:08:11.000000000 +0000
@@ -31,4 +31,9 @@
 {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}
+
 {3}:END
diff -Nru scite-4.3.3/scintilla/lexilla/test/examples/errorlist/AllStyles.err scite-4.4.4/scintilla/lexilla/test/examples/errorlist/AllStyles.err
--- scite-4.3.3/scintilla/lexilla/test/examples/errorlist/AllStyles.err	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/test/examples/errorlist/AllStyles.err	2020-05-31 23:08:11.000000000 +0000
@@ -0,0 +1,107 @@
+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
+
+
+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 -Nru scite-4.3.3/scintilla/lexilla/test/examples/errorlist/AllStyles.err.styled scite-4.4.4/scintilla/lexilla/test/examples/errorlist/AllStyles.err.styled
--- scite-4.3.3/scintilla/lexilla/test/examples/errorlist/AllStyles.err.styled	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/test/examples/errorlist/AllStyles.err.styled	2020-05-31 23:08:11.000000000 +0000
@@ -0,0 +1,107 @@
+{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}
+
+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 -Nru scite-4.3.3/scintilla/lexilla/test/examples/errorlist/SciTE.properties scite-4.4.4/scintilla/lexilla/test/examples/errorlist/SciTE.properties
--- scite-4.3.3/scintilla/lexilla/test/examples/errorlist/SciTE.properties	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/test/examples/errorlist/SciTE.properties	2020-05-31 23:08:11.000000000 +0000
@@ -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 -Nru scite-4.3.3/scintilla/lexilla/test/examples/latex/AllStyles.tex scite-4.4.4/scintilla/lexilla/test/examples/latex/AllStyles.tex
--- scite-4.3.3/scintilla/lexilla/test/examples/latex/AllStyles.tex	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/test/examples/latex/AllStyles.tex	2020-07-18 05:40:21.000000000 +0000
@@ -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 -Nru scite-4.3.3/scintilla/lexilla/test/examples/latex/AllStyles.tex.styled scite-4.4.4/scintilla/lexilla/test/examples/latex/AllStyles.tex.styled
--- scite-4.3.3/scintilla/lexilla/test/examples/latex/AllStyles.tex.styled	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/test/examples/latex/AllStyles.tex.styled	2020-07-18 05:40:21.000000000 +0000
@@ -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 -Nru scite-4.3.3/scintilla/lexilla/test/examples/latex/Feature1358.tex scite-4.4.4/scintilla/lexilla/test/examples/latex/Feature1358.tex
--- scite-4.3.3/scintilla/lexilla/test/examples/latex/Feature1358.tex	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/test/examples/latex/Feature1358.tex	2020-07-18 05:40:21.000000000 +0000
@@ -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 -Nru scite-4.3.3/scintilla/lexilla/test/examples/latex/Feature1358.tex.styled scite-4.4.4/scintilla/lexilla/test/examples/latex/Feature1358.tex.styled
--- scite-4.3.3/scintilla/lexilla/test/examples/latex/Feature1358.tex.styled	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/test/examples/latex/Feature1358.tex.styled	2020-07-18 05:40:21.000000000 +0000
@@ -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 -Nru scite-4.3.3/scintilla/lexilla/test/examples/latex/SciTE.properties scite-4.4.4/scintilla/lexilla/test/examples/latex/SciTE.properties
--- scite-4.3.3/scintilla/lexilla/test/examples/latex/SciTE.properties	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/test/examples/latex/SciTE.properties	2020-07-18 05:40:21.000000000 +0000
@@ -0,0 +1 @@
+lexer.*.tex=latex
diff -Nru scite-4.3.3/scintilla/lexilla/test/examples/mmixal/AllStyles.mms scite-4.4.4/scintilla/lexilla/test/examples/mmixal/AllStyles.mms
--- scite-4.3.3/scintilla/lexilla/test/examples/mmixal/AllStyles.mms	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/test/examples/mmixal/AllStyles.mms	2020-05-31 23:08:11.000000000 +0000
@@ -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 -Nru scite-4.3.3/scintilla/lexilla/test/examples/mmixal/AllStyles.mms.styled scite-4.4.4/scintilla/lexilla/test/examples/mmixal/AllStyles.mms.styled
--- scite-4.3.3/scintilla/lexilla/test/examples/mmixal/AllStyles.mms.styled	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/test/examples/mmixal/AllStyles.mms.styled	2020-05-31 23:08:11.000000000 +0000
@@ -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 -Nru scite-4.3.3/scintilla/lexilla/test/examples/mmixal/references.mms scite-4.4.4/scintilla/lexilla/test/examples/mmixal/references.mms
--- scite-4.3.3/scintilla/lexilla/test/examples/mmixal/references.mms	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/test/examples/mmixal/references.mms	2020-05-31 23:08:11.000000000 +0000
@@ -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 -Nru scite-4.3.3/scintilla/lexilla/test/examples/mmixal/references.mms.styled scite-4.4.4/scintilla/lexilla/test/examples/mmixal/references.mms.styled
--- scite-4.3.3/scintilla/lexilla/test/examples/mmixal/references.mms.styled	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/test/examples/mmixal/references.mms.styled	2020-05-31 23:08:11.000000000 +0000
@@ -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 -Nru scite-4.3.3/scintilla/lexilla/test/examples/mmixal/SciTE.properties scite-4.4.4/scintilla/lexilla/test/examples/mmixal/SciTE.properties
--- scite-4.3.3/scintilla/lexilla/test/examples/mmixal/SciTE.properties	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/test/examples/mmixal/SciTE.properties	2020-05-31 23:08:11.000000000 +0000
@@ -0,0 +1,4 @@
+lexer.*.mms=mmixal
+keywords.*.mms=BYTE GETA JMP LOC PREFIX TRAP
+keywords2.*.mms=rA
+keywords3.*.mms=Fputs StdOut
diff -Nru scite-4.3.3/scintilla/lexilla/test/examples/mmixal/x.mms scite-4.4.4/scintilla/lexilla/test/examples/mmixal/x.mms
--- scite-4.3.3/scintilla/lexilla/test/examples/mmixal/x.mms	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/test/examples/mmixal/x.mms	2020-05-31 23:08:11.000000000 +0000
@@ -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 -Nru scite-4.3.3/scintilla/lexilla/test/examples/mmixal/x.mms.styled scite-4.4.4/scintilla/lexilla/test/examples/mmixal/x.mms.styled
--- scite-4.3.3/scintilla/lexilla/test/examples/mmixal/x.mms.styled	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/test/examples/mmixal/x.mms.styled	2020-05-31 23:08:11.000000000 +0000
@@ -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 -Nru scite-4.3.3/scintilla/lexilla/test/LexillaAccess.cxx scite-4.4.4/scintilla/lexilla/test/LexillaAccess.cxx
--- scite-4.3.3/scintilla/lexilla/test/LexillaAccess.cxx	2020-01-02 00:45:04.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/test/LexillaAccess.cxx	2020-05-31 23:08:11.000000000 +0000
@@ -77,9 +77,9 @@
 	lexillaDL = ::LoadLibraryW(sharedLibrary.c_str());
 #else
 #if defined(__APPLE__)
-	sharedLibrary.append("lexilla.dylib");
+	sharedLibrary.append("liblexilla.dylib");
 #else
-	sharedLibrary.append("lexilla.so");
+	sharedLibrary.append("liblexilla.so");
 #endif
 	lexillaDL = dlopen(sharedLibrary.c_str(), RTLD_LAZY);
 #endif
diff -Nru scite-4.3.3/scintilla/lexilla/version.txt scite-4.4.4/scintilla/lexilla/version.txt
--- scite-4.3.3/scintilla/lexilla/version.txt	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/lexilla/version.txt	2020-07-18 05:40:21.000000000 +0000
@@ -1 +1 @@
-433
+444
diff -Nru scite-4.3.3/scintilla/lexlib/CatalogueModules.h scite-4.4.4/scintilla/lexlib/CatalogueModules.h
--- scite-4.3.3/scintilla/lexlib/CatalogueModules.h	2020-01-02 00:45:04.000000000 +0000
+++ scite-4.4.4/scintilla/lexlib/CatalogueModules.h	2020-07-18 05:40:21.000000000 +0000
@@ -15,7 +15,7 @@
 class CatalogueModules {
 	std::vector<LexerModule *> lexerCatalogue;
 public:
-	const LexerModule *Find(int language) {
+	const LexerModule *Find(int language) const {
 		for (const LexerModule *lm : lexerCatalogue) {
 			if (lm->GetLanguage() == language) {
 				return lm;
@@ -24,7 +24,7 @@
 		return nullptr;
 	}
 
-	const LexerModule *Find(const char *languageName) {
+	const LexerModule *Find(const char *languageName) const noexcept {
 		if (languageName) {
 			for (const LexerModule *lm : lexerCatalogue) {
 				if (lm->languageName && (0 == strcmp(lm->languageName, languageName))) {
@@ -39,11 +39,11 @@
 		lexerCatalogue.push_back(plm);
 	}
 
-	unsigned int Count() {
+	unsigned int Count() const noexcept {
 		return static_cast<unsigned int>(lexerCatalogue.size());
 	}
 
-	const char *Name(unsigned int index) {
+	const char *Name(unsigned int index) const noexcept {
 		if (index < static_cast<unsigned int>(lexerCatalogue.size())) {
 			return lexerCatalogue[index]->languageName;
 		} else {
@@ -51,12 +51,12 @@
 		}
 	}
 
-	LexerFactoryFunction Factory(unsigned int index) {
+	LexerFactoryFunction Factory(unsigned int index) const noexcept {
 		// Works for object lexers but not for function lexers
 		return lexerCatalogue[index]->fnFactory;
 	}
 
-	ILexer5 *Create(unsigned int index) {
+	ILexer5 *Create(unsigned int index) const {
 		const LexerModule *plm = lexerCatalogue[index];
 		if (!plm) {
 			return nullptr;
diff -Nru scite-4.3.3/scintilla/lexlib/CharacterCategory.cxx scite-4.4.4/scintilla/lexlib/CharacterCategory.cxx
--- scite-4.3.3/scintilla/lexlib/CharacterCategory.cxx	2019-12-06 20:39:05.000000000 +0000
+++ scite-4.4.4/scintilla/lexlib/CharacterCategory.cxx	2020-07-18 05:40:21.000000000 +0000
@@ -3846,8 +3846,8 @@
 //--Autogenerated -- end of section automatically generated
 };
 
-const int maxUnicode = 0x10ffff;
-const int maskCategory = 0x1F;
+constexpr int maxUnicode = 0x10ffff;
+constexpr int maskCategory = 0x1F;
 
 }
 
@@ -3880,7 +3880,7 @@
 // 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) {
+OtherID OtherIDOfCharacter(int character) noexcept {
 	if (
 		(character == 0x1885) ||	// MONGOLIAN LETTER ALI GALI BALUDA
 		(character == 0x1886) ||	// MONGOLIAN LETTER ALI GALI THREE BALUDA
@@ -3904,11 +3904,11 @@
 // 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.
-bool IsIdPattern(int character) {
+constexpr bool IsIdPattern(int character) noexcept {
 	return character == 0x2E2F;
 }
 
-bool OmitXidStart(int character) {
+bool OmitXidStart(int character) noexcept {
 	switch (character) {
 	case 0x037A:	// GREEK YPOGEGRAMMENI
 	case 0x0E33:	// THAI CHARACTER SARA AM
@@ -3939,7 +3939,7 @@
 	}
 }
 
-bool OmitXidContinue(int character) {
+bool OmitXidContinue(int character) noexcept {
 	switch (character) {
 	case 0x037A:	// GREEK YPOGEGRAMMENI
 	case 0x309B:	// KATAKANA-HIRAGANA VOICED SOUND MARK
diff -Nru scite-4.3.3/scintilla/lexlib/CharacterSet.cxx scite-4.4.4/scintilla/lexlib/CharacterSet.cxx
--- scite-4.3.3/scintilla/lexlib/CharacterSet.cxx	2018-04-27 10:42:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexlib/CharacterSet.cxx	2020-07-18 05:40:21.000000000 +0000
@@ -15,7 +15,7 @@
 
 namespace Scintilla {
 
-int CompareCaseInsensitive(const char *a, const char *b) {
+int CompareCaseInsensitive(const char *a, const char *b) noexcept {
 	while (*a && *b) {
 		if (*a != *b) {
 			const char upperA = MakeUpperCase(*a);
@@ -30,7 +30,7 @@
 	return *a - *b;
 }
 
-int CompareNCaseInsensitive(const char *a, const char *b, size_t len) {
+int CompareNCaseInsensitive(const char *a, const char *b, size_t len) noexcept {
 	while (*a && *b && len) {
 		if (*a != *b) {
 			const char upperA = MakeUpperCase(*a);
diff -Nru scite-4.3.3/scintilla/lexlib/CharacterSet.h scite-4.4.4/scintilla/lexlib/CharacterSet.h
--- scite-4.3.3/scintilla/lexlib/CharacterSet.h	2019-06-28 23:50:36.000000000 +0000
+++ scite-4.4.4/scintilla/lexlib/CharacterSet.h	2020-07-18 05:40:21.000000000 +0000
@@ -46,7 +46,27 @@
 			bset[i] = other.bset[i];
 		}
 	}
-	CharacterSet &operator=(CharacterSet &&other) {
+	CharacterSet(CharacterSet &&other) noexcept {
+		size = other.size;
+		valueAfter = other.valueAfter;
+		bset = other.bset;
+		other.size = 0;
+		other.bset = nullptr;
+	}
+	CharacterSet &operator=(const CharacterSet &other) {
+		if (this != &other) {
+			bool *bsetNew = new bool[other.size];
+			for (int i = 0; i < other.size; i++) {
+				bsetNew[i] = other.bset[i];
+			}
+			delete[]bset;
+			size = other.size;
+			valueAfter = other.valueAfter;
+			bset = bsetNew;
+		}
+		return *this;
+	}
+	CharacterSet &operator=(CharacterSet &&other) noexcept {
 		if (this != &other) {
 			delete []bset;
 			size = other.size;
@@ -62,19 +82,6 @@
 		bset = nullptr;
 		size = 0;
 	}
-	CharacterSet &operator=(const CharacterSet &other) {
-		if (this != &other) {
-			bool *bsetNew = new bool[other.size];
-			for (int i=0; i < other.size; i++) {
-				bsetNew[i] = other.bset[i];
-			}
-			delete []bset;
-			size = other.size;
-			valueAfter = other.valueAfter;
-			bset = bsetNew;
-		}
-		return *this;
-	}
 	void Add(int val) {
 		assert(val >= 0);
 		assert(val < size);
@@ -87,12 +94,12 @@
 			bset[uch] = true;
 		}
 	}
-	bool Contains(int val) const {
+	bool Contains(int val) const noexcept {
 		assert(val >= 0);
 		if (val < 0) return false;
 		return (val < size) ? bset[val] : valueAfter;
 	}
-	bool Contains(char ch) const {
+	bool Contains(char ch) const noexcept {
 		// Overload char as char may be signed
 		const unsigned char uch = ch;
 		return Contains(uch);
@@ -101,19 +108,19 @@
 
 // Functions for classifying characters
 
-inline bool IsASpace(int ch) {
+constexpr bool IsASpace(int ch) noexcept {
     return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d));
 }
 
-inline bool IsASpaceOrTab(int ch) {
+constexpr bool IsASpaceOrTab(int ch) noexcept {
 	return (ch == ' ') || (ch == '\t');
 }
 
-inline bool IsADigit(int ch) {
+constexpr bool IsADigit(int ch) noexcept {
 	return (ch >= '0') && (ch <= '9');
 }
 
-inline bool IsADigit(int ch, int base) {
+constexpr bool IsADigit(int ch, int base) noexcept {
 	if (base <= 10) {
 		return (ch >= '0') && (ch < '0' + base);
 	} else {
@@ -123,23 +130,23 @@
 	}
 }
 
-inline bool IsASCII(int ch) {
+constexpr bool IsASCII(int ch) noexcept {
 	return (ch >= 0) && (ch < 0x80);
 }
 
-inline bool IsLowerCase(int ch) {
+constexpr bool IsLowerCase(int ch) noexcept {
 	return (ch >= 'a') && (ch <= 'z');
 }
 
-inline bool IsUpperCase(int ch) {
+constexpr bool IsUpperCase(int ch) noexcept {
 	return (ch >= 'A') && (ch <= 'Z');
 }
 
-inline bool IsUpperOrLowerCase(int ch) {
+constexpr bool IsUpperOrLowerCase(int ch) noexcept {
 	return IsUpperCase(ch) || IsLowerCase(ch);
 }
 
-inline bool IsAlphaNumeric(int ch) {
+constexpr bool IsAlphaNumeric(int ch) noexcept {
 	return
 		((ch >= '0') && (ch <= '9')) ||
 		((ch >= 'a') && (ch <= 'z')) ||
@@ -150,19 +157,19 @@
  * Check if a character is a space.
  * This is ASCII specific but is safe with chars >= 0x80.
  */
-inline bool isspacechar(int ch) {
+constexpr bool isspacechar(int ch) noexcept {
     return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d));
 }
 
-inline bool iswordchar(int ch) {
+constexpr bool iswordchar(int ch) noexcept {
 	return IsAlphaNumeric(ch) || ch == '.' || ch == '_';
 }
 
-inline bool iswordstart(int ch) {
+constexpr bool iswordstart(int ch) noexcept {
 	return IsAlphaNumeric(ch) || ch == '_';
 }
 
-inline bool isoperator(int ch) {
+constexpr bool isoperator(int ch) noexcept {
 	if (IsAlphaNumeric(ch))
 		return false;
 	if (ch == '%' || ch == '^' || ch == '&' || ch == '*' ||
@@ -178,7 +185,7 @@
 // Simple case functions for ASCII supersets.
 
 template <typename T>
-inline T MakeUpperCase(T ch) {
+constexpr T MakeUpperCase(T ch) noexcept {
 	if (ch < 'a' || ch > 'z')
 		return ch;
 	else
@@ -186,15 +193,15 @@
 }
 
 template <typename T>
-inline T MakeLowerCase(T ch) {
+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);
-int CompareNCaseInsensitive(const char *a, const char *b, size_t len);
+int CompareCaseInsensitive(const char *a, const char *b) noexcept;
+int CompareNCaseInsensitive(const char *a, const char *b, size_t len) noexcept;
 
 }
 
diff -Nru scite-4.3.3/scintilla/lexlib/LexAccessor.h scite-4.4.4/scintilla/lexlib/LexAccessor.h
--- scite-4.3.3/scintilla/lexlib/LexAccessor.h	2018-06-04 04:48:22.000000000 +0000
+++ scite-4.4.4/scintilla/lexlib/LexAccessor.h	2020-07-18 05:40:21.000000000 +0000
@@ -10,7 +10,7 @@
 
 namespace Scintilla {
 
-enum EncodingType { enc8bit, encUnicode, encDBCS };
+enum class EncodingType { eightBit, unicode, dbcs };
 
 class LexAccessor {
 private:
@@ -51,7 +51,7 @@
 	explicit LexAccessor(IDocument *pAccess_) :
 		pAccess(pAccess_), startPos(extremePosition), endPos(0),
 		codePage(pAccess->CodePage()),
-		encodingType(enc8bit),
+		encodingType(EncodingType::eightBit),
 		lenDoc(pAccess->Length()),
 		validLen(0),
 		startSeg(0), startPosStyling(0),
@@ -61,14 +61,14 @@
 		styleBuf[0] = 0;
 		switch (codePage) {
 		case 65001:
-			encodingType = encUnicode;
+			encodingType = EncodingType::unicode;
 			break;
 		case 932:
 		case 936:
 		case 949:
 		case 950:
 		case 1361:
-			encodingType = encDBCS;
+			encodingType = EncodingType::dbcs;
 		}
 	}
 	char operator[](Sci_Position position) {
@@ -77,7 +77,7 @@
 		}
 		return buf[position - startPos];
 	}
-	IDocument *MultiByteAccess() const {
+	IDocument *MultiByteAccess() const noexcept {
 		return pAccess;
 	}
 	/** Safe version of operator[], returning a defined value for invalid position. */
@@ -94,7 +94,7 @@
 	bool IsLeadByte(char ch) const {
 		return pAccess->IsDBCSLeadByte(ch);
 	}
-	EncodingType Encoding() const {
+	EncodingType Encoding() const noexcept {
 		return encodingType;
 	}
 	bool Match(Sci_Position pos, const char *s) {
diff -Nru scite-4.3.3/scintilla/lexlib/LexerModule.cxx scite-4.4.4/scintilla/lexlib/LexerModule.cxx
--- scite-4.3.3/scintilla/lexlib/LexerModule.cxx	2020-01-02 00:45:04.000000000 +0000
+++ scite-4.4.4/scintilla/lexlib/LexerModule.cxx	2020-07-18 05:40:21.000000000 +0000
@@ -30,7 +30,7 @@
 	LexerFunction fnFolder_,
 	const char *const wordListDescriptions_[],
 	const LexicalClass *lexClasses_,
-	size_t nClasses_) :
+	size_t nClasses_) noexcept :
 	language(language_),
 	fnLexer(fnLexer_),
 	fnFolder(fnFolder_),
@@ -44,7 +44,7 @@
 LexerModule::LexerModule(int language_,
 	LexerFactoryFunction fnFactory_,
 	const char *languageName_,
-	const char * const wordListDescriptions_[]) :
+	const char * const wordListDescriptions_[]) noexcept :
 	language(language_),
 	fnLexer(nullptr),
 	fnFolder(nullptr),
@@ -55,14 +55,11 @@
 	languageName(languageName_) {
 }
 
-LexerModule::~LexerModule() {
-}
-
-int LexerModule::GetLanguage() const { 
+int LexerModule::GetLanguage() const noexcept {
 	return language;
 }
 
-int LexerModule::GetNumWordLists() const {
+int LexerModule::GetNumWordLists() const noexcept {
 	if (!wordListDescriptions) {
 		return -1;
 	} else {
@@ -76,7 +73,7 @@
 	}
 }
 
-const char *LexerModule::GetWordListDescription(int index) const {
+const char *LexerModule::GetWordListDescription(int index) const noexcept {
 	assert(index < GetNumWordLists());
 	if (!wordListDescriptions || (index >= GetNumWordLists())) {
 		return "";
@@ -85,11 +82,11 @@
 	}
 }
 
-const LexicalClass *LexerModule::LexClasses() const {
+const LexicalClass *LexerModule::LexClasses() const noexcept {
 	return lexClasses;
 }
 
-size_t LexerModule::NamedStyles() const {
+size_t LexerModule::NamedStyles() const noexcept {
 	return nClasses;
 }
 
diff -Nru scite-4.3.3/scintilla/lexlib/LexerModule.h scite-4.4.4/scintilla/lexlib/LexerModule.h
--- scite-4.3.3/scintilla/lexlib/LexerModule.h	2020-01-02 00:45:04.000000000 +0000
+++ scite-4.4.4/scintilla/lexlib/LexerModule.h	2020-07-18 05:40:21.000000000 +0000
@@ -43,32 +43,31 @@
 		LexerFunction fnFolder_= nullptr,
 		const char * const wordListDescriptions_[]=nullptr,
 		const LexicalClass *lexClasses_=nullptr,
-		size_t nClasses_=0);
+		size_t nClasses_=0) noexcept;
 	LexerModule(
 		int language_,
 		LexerFactoryFunction fnFactory_,
 		const char *languageName_,
-		const char * const wordListDescriptions_[]=nullptr);
-	virtual ~LexerModule();
-	int GetLanguage() const;
+		const char * const wordListDescriptions_[]=nullptr) noexcept;
+	int GetLanguage() const noexcept;
 
 	// -1 is returned if no WordList information is available
-	int GetNumWordLists() const;
-	const char *GetWordListDescription(int index) const;
-	const LexicalClass *LexClasses() const;
-	size_t NamedStyles() const;
+	int GetNumWordLists() const noexcept;
+	const char *GetWordListDescription(int index) const noexcept;
+	const LexicalClass *LexClasses() const noexcept;
+	size_t NamedStyles() const noexcept;
 
 	ILexer5 *Create() const;
 
-	virtual void Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle,
+	void Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle,
                   WordList *keywordlists[], Accessor &styler) const;
-	virtual void Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle,
+	void Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle,
                   WordList *keywordlists[], Accessor &styler) const;
 
 	friend class CatalogueModules;
 };
 
-inline int Maximum(int a, int b) {
+inline int Maximum(int a, int b) noexcept {
 	return (a > b) ? a : b;
 }
 
diff -Nru scite-4.3.3/scintilla/lexlib/OptionSet.h scite-4.4.4/scintilla/lexlib/OptionSet.h
--- scite-4.3.3/scintilla/lexlib/OptionSet.h	2020-01-02 00:45:04.000000000 +0000
+++ scite-4.4.4/scintilla/lexlib/OptionSet.h	2020-07-18 05:40:21.000000000 +0000
@@ -68,7 +68,7 @@
 			}
 			return false;
 		}
-		const char *Get() const {
+		const char *Get() const noexcept {
 			return value.c_str();
 		}
 	};
@@ -83,8 +83,6 @@
 		names += name;
 	}
 public:
-	virtual ~OptionSet() {
-	}
 	void DefineProperty(const char *name, plcob pb, std::string description="") {
 		nameToDef[name] = Option(pb, description);
 		AppendName(name);
@@ -97,7 +95,7 @@
 		nameToDef[name] = Option(ps, description);
 		AppendName(name);
 	}
-	const char *PropertyNames() const {
+	const char *PropertyNames() const noexcept {
 		return names.c_str();
 	}
 	int PropertyType(const char *name) {
@@ -141,7 +139,7 @@
 		}
 	}
 
-	const char *DescribeWordListSets() const {
+	const char *DescribeWordListSets() const noexcept {
 		return wordLists.c_str();
 	}
 };
diff -Nru scite-4.3.3/scintilla/lexlib/PropSetSimple.cxx scite-4.4.4/scintilla/lexlib/PropSetSimple.cxx
--- scite-4.3.3/scintilla/lexlib/PropSetSimple.cxx	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/lexlib/PropSetSimple.cxx	2020-07-18 05:40:21.000000000 +0000
@@ -21,10 +21,14 @@
 
 typedef std::map<std::string, std::string> mapss;
 
-mapss *PropsFromPointer(void *impl) {
+mapss *PropsFromPointer(void *impl) noexcept {
 	return static_cast<mapss *>(impl);
 }
 
+constexpr bool IsASpaceCharacter(int ch) noexcept {
+	return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d));
+}
+
 }
 
 PropSetSimple::PropSetSimple() {
@@ -35,7 +39,7 @@
 PropSetSimple::~PropSetSimple() {
 	mapss *props = PropsFromPointer(impl);
 	delete props;
-	impl = 0;
+	impl = nullptr;
 }
 
 void PropSetSimple::Set(const char *key, const char *val, size_t lenKey, size_t lenVal) {
@@ -45,10 +49,6 @@
 	(*props)[std::string(key, lenKey)] = std::string(val, lenVal);
 }
 
-static bool IsASpaceCharacter(unsigned int ch) {
-    return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d));
-}
-
 void PropSetSimple::Set(const char *keyVal) {
 	while (IsASpaceCharacter(*keyVal))
 		keyVal++;
@@ -90,7 +90,7 @@
 // for that, through a recursive function and a simple chain of pointers.
 
 struct VarChain {
-	VarChain(const char *var_=nullptr, const VarChain *link_= nullptr): var(var_), link(link_) {}
+	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)))
diff -Nru scite-4.3.3/scintilla/lexlib/SparseState.h scite-4.4.4/scintilla/lexlib/SparseState.h
--- scite-4.3.3/scintilla/lexlib/SparseState.h	2018-04-27 10:42:00.000000000 +0000
+++ scite-4.4.4/scintilla/lexlib/SparseState.h	2020-07-18 05:40:21.000000000 +0000
@@ -17,12 +17,12 @@
 	struct State {
 		Sci_Position position;
 		T value;
-		State(Sci_Position position_, T value_) : position(position_), value(value_) {
+		constexpr State(Sci_Position position_, T value_) noexcept : position(position_), value(value_) {
 		}
-		inline bool operator<(const State &other) const {
+		inline bool operator<(const State &other) const noexcept {
 			return position < other.position;
 		}
-		inline bool operator==(const State &other) const {
+		inline bool operator==(const State &other) const noexcept {
 			return (position == other.position) && (value == other.value);
 		}
 	};
@@ -31,7 +31,7 @@
 	stateVector states;
 
 	typename stateVector::iterator Find(Sci_Position position) {
-		State searchValue(position, T());
+		const State searchValue(position, T());
 		return std::lower_bound(states.begin(), states.end(), searchValue);
 	}
 
diff -Nru scite-4.3.3/scintilla/lexlib/StyleContext.h scite-4.4.4/scintilla/lexlib/StyleContext.h
--- scite-4.3.3/scintilla/lexlib/StyleContext.h	2020-03-03 21:50:30.000000000 +0000
+++ scite-4.4.4/scintilla/lexlib/StyleContext.h	2020-07-18 05:40:21.000000000 +0000
@@ -72,7 +72,7 @@
 		width(0),
 		chNext(0),
 		widthNext(1) {
-		if (styler.Encoding() != enc8bit) {
+		if (styler.Encoding() != EncodingType::eightBit) {
 			multiByteAccess = styler.MultiByteAccess();
 		}
 		styler.StartAt(startPos /*, chMask*/);
@@ -100,7 +100,7 @@
 		styler.ColourTo(currentPos - ((currentPos > lengthDocument) ? 2 : 1), state);
 		styler.Flush();
 	}
-	bool More() const {
+	bool More() const noexcept {
 		return currentPos < endPos;
 	}
 	void Forward() {
@@ -139,7 +139,7 @@
 			}
 		}
 	}
-	void ChangeState(int state_) {
+	void ChangeState(int state_) noexcept {
 		state = state_;
 	}
 	void SetState(int state_) {
diff -Nru scite-4.3.3/scintilla/lexlib/SubStyles.h scite-4.4.4/scintilla/lexlib/SubStyles.h
--- scite-4.3.3/scintilla/lexlib/SubStyles.h	2019-06-28 23:50:36.000000000 +0000
+++ scite-4.4.4/scintilla/lexlib/SubStyles.h	2020-07-18 05:40:21.000000000 +0000
@@ -27,23 +27,23 @@
 		wordToStyle.clear();
 	}
 
-	int Base() const {
+	int Base() const noexcept {
 		return baseStyle;
 	}
 
-	int Start() const {
+	int Start() const noexcept {
 		return firstStyle;
 	}
 
-	int Last() const {
+	int Last() const noexcept {
 		return firstStyle + lenStyles - 1;
 	}
 
-	int Length() const {
+	int Length() const noexcept {
 		return lenStyles;
 	}
 
-	void Clear() {
+	void Clear() noexcept {
 		firstStyle = 0;
 		lenStyles = 0;
 		wordToStyle.clear();
@@ -57,7 +57,7 @@
 			return -1;
 	}
 
-	bool IncludesStyle(int style) const {
+	bool IncludesStyle(int style) const noexcept {
 		return (style >= firstStyle) && (style < (firstStyle + lenStyles));
 	}
 
@@ -98,7 +98,7 @@
 	int allocated;
 	std::vector<WordClassifier> classifiers;
 
-	int BlockFromBaseStyle(int baseStyle) const {
+	int BlockFromBaseStyle(int baseStyle) const noexcept {
 		for (int b=0; b < classifications; b++) {
 			if (baseStyle == baseStyles[b])
 				return b;
@@ -145,12 +145,12 @@
 		}
 	}
 
-	int Start(int styleBase) {
+	int Start(int styleBase) noexcept {
 		const int block = BlockFromBaseStyle(styleBase);
 		return (block >= 0) ? classifiers[block].Start() : -1;
 	}
 
-	int Length(int styleBase) {
+	int Length(int styleBase) noexcept {
 		const int block = BlockFromBaseStyle(styleBase);
 		return (block >= 0) ? classifiers[block].Length() : 0;
 	}
@@ -163,7 +163,7 @@
 			return subStyle;
 	}
 
-	int DistanceToSecondaryStyles() const {
+	int DistanceToSecondaryStyles() const noexcept {
 		return secondaryDistance;
 	}
 
@@ -197,7 +197,7 @@
 			it->Clear();
 	}
 
-	const WordClassifier &Classifier(int baseStyle) const {
+	const WordClassifier &Classifier(int baseStyle) const noexcept {
 		const int block = BlockFromBaseStyle(baseStyle);
 		return classifiers[block >= 0 ? block : 0];
 	}
diff -Nru scite-4.3.3/scintilla/lexlib/WordList.cxx scite-4.4.4/scintilla/lexlib/WordList.cxx
--- scite-4.3.3/scintilla/lexlib/WordList.cxx	2019-10-24 21:24:48.000000000 +0000
+++ scite-4.4.4/scintilla/lexlib/WordList.cxx	2020-07-18 05:40:21.000000000 +0000
@@ -70,11 +70,11 @@
 	Clear();
 }
 
-WordList::operator bool() const {
+WordList::operator bool() const noexcept {
 	return len ? true : false;
 }
 
-bool WordList::operator!=(const WordList &other) const {
+bool WordList::operator!=(const WordList &other) const noexcept {
 	if (len != other.len)
 		return true;
 	for (int i=0; i<len; i++) {
@@ -84,17 +84,17 @@
 	return false;
 }
 
-int WordList::Length() const {
+int WordList::Length() const noexcept {
 	return len;
 }
 
-void WordList::Clear() {
+void WordList::Clear() noexcept {
 	if (words) {
 		delete []list;
 		delete []words;
 	}
-	words = 0;
-	list = 0;
+	words = nullptr;
+	list = nullptr;
 	len = 0;
 }
 
@@ -160,7 +160,7 @@
  * 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 {
+bool WordList::InList(const char *s) const noexcept {
 	if (0 == words)
 		return false;
 	const unsigned char firstChar = s[0];
@@ -202,7 +202,7 @@
  * 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 {
+bool WordList::InListAbbreviated(const char *s, const char marker) const noexcept {
 	if (0 == words)
 		return false;
 	const unsigned char firstChar = s[0];
@@ -256,7 +256,7 @@
 * 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 {
+bool WordList::InListAbridged(const char *s, const char marker) const noexcept {
 	if (0 == words)
 		return false;
 	const unsigned char firstChar = s[0];
@@ -309,7 +309,7 @@
 	return false;
 }
 
-const char *WordList::WordAt(int n) const {
+const char *WordList::WordAt(int n) const noexcept {
 	return words[n];
 }
 
diff -Nru scite-4.3.3/scintilla/lexlib/WordList.h scite-4.4.4/scintilla/lexlib/WordList.h
--- scite-4.3.3/scintilla/lexlib/WordList.h	2019-10-24 21:24:48.000000000 +0000
+++ scite-4.4.4/scintilla/lexlib/WordList.h	2020-07-18 05:40:21.000000000 +0000
@@ -22,15 +22,15 @@
 public:
 	explicit WordList(bool onlyLineEnds_ = false);
 	~WordList();
-	operator bool() const;
-	bool operator!=(const WordList &other) const;
-	int Length() const;
-	void Clear();
+	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;
-	bool InListAbbreviated(const char *s, const char marker) const;
-	bool InListAbridged(const char *s, const char marker) const;
-	const char *WordAt(int n) const;
+	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;
 };
 
 }
diff -Nru scite-4.3.3/scintilla/qt/ScintillaEdit/ScintillaEdit.pro scite-4.4.4/scintilla/qt/ScintillaEdit/ScintillaEdit.pro
--- scite-4.3.3/scintilla/qt/ScintillaEdit/ScintillaEdit.pro	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/qt/ScintillaEdit/ScintillaEdit.pro	2020-07-18 05:40:22.000000000 +0000
@@ -12,7 +12,7 @@
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 4.3.3
+VERSION = 4.4.4
 
 SOURCES += \
     ScintillaEdit.cpp \
diff -Nru scite-4.3.3/scintilla/qt/ScintillaEditBase/PlatQt.cpp scite-4.4.4/scintilla/qt/ScintillaEditBase/PlatQt.cpp
--- scite-4.3.3/scintilla/qt/ScintillaEditBase/PlatQt.cpp	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/qt/ScintillaEditBase/PlatQt.cpp	2020-07-18 05:40:22.000000000 +0000
@@ -17,6 +17,9 @@
 #include "FontQuality.h"
 
 #include <QApplication>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QScreen>
+#endif
 #include <QFont>
 #include <QColor>
 #include <QRect>
@@ -152,7 +155,7 @@
 	QFont *font = new QFont;
 	font->setStyleStrategy(ChooseStrategy(fp.extraFontFlag));
 	font->setFamily(QString::fromUtf8(fp.faceName));
-	font->setPointSize(fp.size);
+	font->setPointSizeF(fp.size);
 	font->setBold(fp.weight > 500);
 	font->setItalic(fp.italic);
 
@@ -211,7 +214,7 @@
 	if (height < 1) height = 1;
 	deviceOwned = true;
 	device = new QPixmap(width, height);
-	SurfaceImpl *psurfOther = static_cast<SurfaceImpl *>(surface);
+	SurfaceImpl *psurfOther = dynamic_cast<SurfaceImpl *>(surface);
 	SetUnicodeMode(psurfOther->unicodeMode);
 	SetDBCSMode(psurfOther->codePage);
 }
@@ -317,7 +320,7 @@
 void SurfaceImpl::FillRectangle(PRectangle rc, Surface &surfacePattern)
 {
 	// Tile pattern over rectangle
-	SurfaceImpl *surface = static_cast<SurfaceImpl *>(&surfacePattern);
+	SurfaceImpl *surface = dynamic_cast<SurfaceImpl *>(&surfacePattern);
 	// Currently assumes 8x8 pattern
 	int widthPat = 8;
 	int heightPat = 8;
@@ -339,7 +342,7 @@
 {
 	PenColour(fore);
 	BrushColour(back);
-	GetPainter()->drawRoundRect(QRectFFromPRect(rc));
+	GetPainter()->drawRoundedRect(QRectFFromPRect(RectangleInset(rc, 0.5f)), 3.0f, 3.0f);
 }
 
 void SurfaceImpl::AlphaRectangle(PRectangle rc,
@@ -350,18 +353,34 @@
                                  int alphaOutline,
                                  int /*flags*/)
 {
-	QColor qOutline = QColorFromCA(outline);
-	qOutline.setAlpha(alphaOutline);
-	GetPainter()->setPen(QPen(qOutline));
-
-	QColor qFill = QColorFromCA(fill);
-	qFill.setAlpha(alphaFill);
-	GetPainter()->setBrush(QBrush(qFill));
-
-	// A radius of 1 shows no curve so add 1
-	qreal radius = cornerSize+1;
-	QRectF rect(rc.left, rc.top, rc.Width() - 1, rc.Height() - 1);
-	GetPainter()->drawRoundedRect(rect, radius, radius);
+	const QColor qFill = QColorFromColourAlpha(ColourAlpha(fill, alphaFill));
+	const QBrush brushFill(qFill);
+	GetPainter()->setBrush(brushFill);
+
+	if ((fill == outline) && (alphaFill == alphaOutline)) {
+		painter->setPen(Qt::NoPen);
+		const 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 {
+		const QColor qOutline = QColorFromColourAlpha(ColourAlpha(outline, alphaOutline));
+		const QPen penOutline(qOutline);
+		GetPainter()->setPen(penOutline);
+
+		const QRectF rect(rc.left, rc.top, rc.Width() - 1.5, rc.Height() - 1.5);
+		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) {
@@ -413,7 +432,7 @@
 
 void SurfaceImpl::Copy(PRectangle rc, Point from, Surface &surfaceSource)
 {
-	SurfaceImpl *source = static_cast<SurfaceImpl *>(&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);
@@ -618,10 +637,23 @@
 //----------------------------------------------------------------------
 
 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() {}
@@ -652,8 +684,7 @@
 	ox += rc.left;
 	oy += rc.top;
 
-	QDesktopWidget *desktop = QApplication::desktop();
-	QRect rectDesk = desktop->availableGeometry(QPoint(ox, oy));
+	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;
@@ -731,13 +762,11 @@
    window coordinates */
 PRectangle Window::GetMonitorRect(Point pt)
 {
-	QPoint originGlobal = window(wid)->mapToGlobal(QPoint(0, 0));
-	QPoint posGlobal = window(wid)->mapToGlobal(QPoint(pt.x, pt.y));
-	QDesktopWidget *desktop = QApplication::desktop();
-	QRect rectScreen = desktop->availableGeometry(posGlobal);
+	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 PRectangle(rectScreen.left(), rectScreen.top(),
-	        rectScreen.right(), rectScreen.bottom());
+	return PRectFromQRect(rectScreen);
 }
 
 //----------------------------------------------------------------------
@@ -747,10 +776,11 @@
 	virtual ~ListWidget();
 
 	void setDelegate(IListBoxDelegate *lbDelegate);
-	void selectionChanged();
+
+	int currentSelection();
 
 protected:
-	void mouseReleaseEvent(QMouseEvent * event) override;
+	void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) override;
 	void mouseDoubleClickEvent(QMouseEvent *event) override;
 	QStyleOptionViewItem viewOptions() const override;
 
@@ -786,7 +816,7 @@
 	void SetDelegate(IListBoxDelegate *lbDelegate) override;
 	void SetList(const char *list, char separator, char typesep) override;
 
-	ListWidget *GetWidget() const;
+	ListWidget *GetWidget() const noexcept;
 private:
 	bool unicodeMode;
 	int visibleRows;
@@ -930,12 +960,11 @@
 		}
 	}
 	list->setCurrentRow(n);
-	list->selectionChanged();
 }
 int ListBoxImpl::GetSelection()
 {
 	ListWidget *list = GetWidget();
-	return list->currentRow();
+	return list->currentSelection();
 }
 int ListBoxImpl::Find(const char *prefix)
 {
@@ -1025,7 +1054,7 @@
 		Append(startword, numword?atoi(numword + 1):-1);
 	}
 }
-ListWidget *ListBoxImpl::GetWidget() const
+ListWidget *ListBoxImpl::GetWidget() const noexcept
 {
 	return static_cast<ListWidget *>(wid);
 }
@@ -1047,13 +1076,25 @@
 	delegate = lbDelegate;
 }
 
-void ListWidget::selectionChanged() {
+void ListWidget::selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) {
+	QListWidget::selectionChanged(selected, deselected);
 	if (delegate) {
-		ListBoxEvent event(ListBoxEvent::EventType::selectionChange);
-		delegate->ListNotify(&event);
+		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) {
@@ -1062,11 +1103,6 @@
 	}
 }
 
-void ListWidget::mouseReleaseEvent(QMouseEvent * /* event */)
-{
-	selectionChanged();
-}
-
 QStyleOptionViewItem ListWidget::viewOptions() const
 {
 	QStyleOptionViewItem result = QListWidget::viewOptions();
diff -Nru scite-4.3.3/scintilla/qt/ScintillaEditBase/PlatQt.h scite-4.4.4/scintilla/qt/ScintillaEditBase/PlatQt.h
--- scite-4.3.3/scintilla/qt/ScintillaEditBase/PlatQt.h	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/qt/ScintillaEditBase/PlatQt.h	2020-07-18 05:40:22.000000000 +0000
@@ -59,6 +59,10 @@
 	return Point(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;
diff -Nru scite-4.3.3/scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp scite-4.4.4/scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp
--- scite-4.3.3/scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp	2019-07-04 00:22:36.000000000 +0000
+++ scite-4.4.4/scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp	2020-07-18 05:40:22.000000000 +0000
@@ -42,7 +42,7 @@
 using namespace Scintilla;
 
 ScintillaEditBase::ScintillaEditBase(QWidget *parent)
-: QAbstractScrollArea(parent), sqt(0), preeditPos(-1), wheelDelta(0)
+: QAbstractScrollArea(parent), sqt(nullptr), preeditPos(-1), wheelDelta(0)
 {
 	sqt = new ScintillaQt(this);
 
diff -Nru scite-4.3.3/scintilla/qt/ScintillaEditBase/ScintillaEditBase.h scite-4.4.4/scintilla/qt/ScintillaEditBase/ScintillaEditBase.h
--- scite-4.3.3/scintilla/qt/ScintillaEditBase/ScintillaEditBase.h	2018-06-01 23:51:46.000000000 +0000
+++ scite-4.4.4/scintilla/qt/ScintillaEditBase/ScintillaEditBase.h	2020-07-18 05:40:22.000000000 +0000
@@ -23,7 +23,7 @@
 
 #include <QAbstractScrollArea>
 #include <QMimeData>
-#include <QTime>
+#include <QElapsedTimer>
 
 namespace Scintilla {
 
@@ -145,7 +145,7 @@
 private:
 	Scintilla::ScintillaQt *sqt;
 
-	QTime time;
+	QElapsedTimer time;
 
 	int preeditPos;
 	QString preeditString;
diff -Nru scite-4.3.3/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro scite-4.4.4/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro
--- scite-4.3.3/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro	2020-07-18 05:40:22.000000000 +0000
@@ -12,7 +12,7 @@
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 4.3.3
+VERSION = 4.4.4
 
 SOURCES += \
     PlatQt.cpp \
diff -Nru scite-4.3.3/scintilla/qt/ScintillaEditPy/sepbuild.py scite-4.4.4/scintilla/qt/ScintillaEditPy/sepbuild.py
--- scite-4.3.3/scintilla/qt/ScintillaEditPy/sepbuild.py	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/qt/ScintillaEditPy/sepbuild.py	2020-05-31 23:08:11.000000000 +0000
@@ -43,6 +43,7 @@
 	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
 
@@ -239,7 +240,7 @@
 		print(" ".join(args))
 		retcode = subprocess.call(" ".join(args), shell=True, stderr=subprocess.STDOUT)
 		if retcode:
-			print("Failed in generatorrunner", retcode)
+			print("Error - failed in generatorrunner " + str(retcode))
 			sys.exit()
 
 	def writeVariables(self):
diff -Nru scite-4.3.3/scintilla/README scite-4.4.4/scintilla/README
--- scite-4.3.3/scintilla/README	2018-04-27 10:42:00.000000000 +0000
+++ scite-4.4.4/scintilla/README	2020-05-31 23:08:11.000000000 +0000
@@ -3,6 +3,11 @@
 Scintilla can be built by itself.
 To build SciTE, Scintilla must first be built.
 
+Lexers can be either compiled into Scintilla or built separately into a Lexilla
+shared library.
+A separate Lexilla is the preferred option and will become the only supported
+direction in Scintilla 5.0.
+See lexilla/src/README for information on building Lexilla.
 
 *** GTK+/Linux version ***
 
@@ -46,6 +51,9 @@
 Visual Studio 2017 is the development system used for most development
 although Mingw-w64 7.1 is also supported.
 
+There are versions of Scintilla with lexers (SciLexer.DLL) and without lexers
+(Scintilla.DLL). Make builds both versions.
+
 To build Scintilla, make in the scintilla/win32 directory
 		cd scintilla\win32
 GCC:		mingw32-make
@@ -65,6 +73,9 @@
 
 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
@@ -76,8 +87,16 @@
 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 directory
+There are versions of Scintilla.framework with lexers (ScintillaFramework) and
+without lexers (Scintilla).
+
+To build Scintilla, run xcodebuild in the scintilla/cocoa/ScintillaFramework or 
+scintilla/cocoa/Scintilla directory
+
+        cd cocoa/Scintilla
+		or
         cd cocoa/ScintillaFramework
+
 	xcodebuild
 
 *** Qt version ***
diff -Nru scite-4.3.3/scintilla/scripts/CheckMentioned.py scite-4.4.4/scintilla/scripts/CheckMentioned.py
--- scite-4.3.3/scintilla/scripts/CheckMentioned.py	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/scripts/CheckMentioned.py	2020-05-31 23:08:11.000000000 +0000
@@ -11,7 +11,6 @@
 sys.path.append(srcRoot + "/scintilla/scripts")
 
 import Face
-import ScintillaData
 
 uninteresting = {
 	"SCINTILLA_H", "SCI_START", "SCI_LEXER_START", "SCI_OPTIONAL_START",
@@ -104,7 +103,6 @@
 pathIface = srcRoot + "/scintilla/include/Scintilla.iface"
 
 def retrieveFeatures():
-	sci = ScintillaData.ScintillaData(srcRoot + "/scintilla/")
 	face = Face.Face()
 	face.ReadFromFile(pathIface)
 	sciToFeature = {}
diff -Nru scite-4.3.3/scintilla/scripts/HeaderCheck.py scite-4.4.4/scintilla/scripts/HeaderCheck.py
--- scite-4.3.3/scintilla/scripts/HeaderCheck.py	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/scripts/HeaderCheck.py	2020-07-18 05:40:22.000000000 +0000
@@ -3,7 +3,7 @@
 # Canonical header order is defined in scripts/HeaderOrder.txt
 # Requires Python 3.6 or later
 
-import codecs, glob, os
+import pathlib
 
 patterns = [
     "include/*.h",
@@ -20,65 +20,101 @@
 ]
 
 def IsHeader(x):
-    return x.strip().startswith("#") and ("include" in x or "import" in 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(filename):
-    with codecs.open(filename, "r", "windows-1252") as infile:
+    with filename.open(encoding="cp437") as infile:
         return [HeaderFromIncludeLine(l) for l in infile if IsHeader(l)]
 
+def ExcludeName(name):
+    # LexCaml adds system headers in #if to be an external lexer
+    # moc_ files are generated by Qt and follow its rules
+    return "LexCaml" in name or "moc_" in name
+
+def SortLike(incs, order):
+    return sorted(incs, key = lambda i: order.index(i))
+
 def CheckFiles(root):
     # Find all the lexer source code files
     filePaths = []
     for p in patterns:
-        filePaths += glob.glob(os.path.join(root, p))
+        filePaths += root.glob(p)
     # The Qt platform code interleaves system and Scintilla headers
-    #~ filePaths += glob.glob(root + "/qt/ScintillaEditBase/*.cpp")
-    #~ filePaths += glob.glob(root + "/qt/ScintillaEdit/*.cpp")
+    #~ filePaths += root.glob("qt/ScintillaEditBase/*.cpp")
+    #~ filePaths += root.glob("qt/ScintillaEdit/*.cpp")
     #~ print(filePaths)
-    masterHeaderList = ExtractHeaders(os.path.join(root, "scripts/HeaderOrder.txt"))
-    orderedPaths = sorted(filePaths, key=str.casefold)
+    scriptDirectory = root / "scripts"
+    headerOrderFile = scriptDirectory / "HeaderOrder.txt"
+    headerOrder = ExtractHeaders(headerOrderFile)
+    originalOrder = headerOrder[:]
+    orderedPaths = [p for p in sorted(filePaths) if not ExcludeName(str(p))]
     allIncs = set()
     for f in orderedPaths:
-        if "LexCaml" in f: # LexCaml adds system headers in #if to be an external lexer
-            continue
-        print("   File ", f)
+        print("   File ", f.relative_to(root))
         incs = ExtractHeaders(f)
         #~ print("\n".join(incs))
-        news = set(incs) - set(masterHeaderList)
+        news = set(incs) - set(headerOrder)
         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(masterHeaderList):
-                print("**** extend", incs[i:])
-                masterHeaderList.extend(incs[i:])
+            if m == len(headerOrder):
+                #~ print("**** extend", incs[i:])
+                headerOrder.extend(incs[i:])
+                needs.extend(incs[i:])
                 break
-            if masterHeaderList[m] == incs[i]:
-                #~ print("equal", masterHeaderList[m])
+            if headerOrder[m] == incs[i]:
+                #~ print("equal", headerOrder[m])
                 i += 1
                 m += 1
             else:
-                if masterHeaderList[m] not in incs:
-                    #~ print("skip", masterHeaderList[m])
+                if headerOrder[m] not in incs:
+                    #~ print("skip", headerOrder[m])
                     m += 1
-                elif incs[i] not in masterHeaderList:
-                    print(f + ":1: Add master", incs[i])
-                    masterHeaderList.insert(m, incs[i])
+                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:
-                    print(f + ":1: Header out of order", incs[i], masterHeaderList[m])
-                    print("incs", " ".join(incs))
                     i += 1
-                    #~ return
-        #print("Master header list", " ".join(masterHeaderList))
-    unused = sorted(set(masterHeaderList) - allIncs)
+        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 = scriptDirectory / "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))
 
-CheckFiles("..")
+CheckFiles(pathlib.Path(__file__).resolve().parent.parent)
diff -Nru scite-4.3.3/scintilla/scripts/HeaderOrder.txt scite-4.4.4/scintilla/scripts/HeaderOrder.txt
--- scite-4.3.3/scintilla/scripts/HeaderOrder.txt	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/scripts/HeaderOrder.txt	2020-07-18 05:40:22.000000000 +0000
@@ -45,6 +45,7 @@
 #include <iostream>
 #include <sstream>
 #include <fstream>
+#include <mutex>
 #include <filesystem>
 
 // POSIX
diff -Nru scite-4.3.3/scintilla/scripts/HFacer.py scite-4.4.4/scintilla/scripts/HFacer.py
--- scite-4.3.3/scintilla/scripts/HFacer.py	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/scripts/HFacer.py	2020-05-31 23:08:11.000000000 +0000
@@ -2,10 +2,9 @@
 # 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 2.7 or later
+# Requires Python 3.6 or later
 
-import sys
-import os
+import pathlib
 import Face
 
 from FileGenerator import UpdateFile, Generate, Regenerate, UpdateLineInFile, lineEnd
@@ -45,9 +44,9 @@
 
 def RegenerateAll(root, showMaxID):
 	f = Face.Face()
-	f.ReadFromFile(root + "include/Scintilla.iface")
-	Regenerate(root + "include/Scintilla.h", "/* ", printHFile(f))
-	Regenerate(root + "include/SciLexer.h", "/* ", printLexHFile(f))
+	f.ReadFromFile(root / "include/Scintilla.iface")
+	Regenerate(root / "include/Scintilla.h", "/* ", printHFile(f))
+	Regenerate(root / "include/SciLexer.h", "/* ", printLexHFile(f))
 	if showMaxID:
 		valueSet = set(int(x) for x in f.values if int(x) < 3000)
 		maximumID = max(valueSet)
@@ -58,4 +57,4 @@
 			#~ print(v)
 
 if __name__ == "__main__":
-	RegenerateAll("../", True)
+	RegenerateAll(pathlib.Path(__file__).resolve().parent.parent, True)
diff -Nru scite-4.3.3/scintilla/scripts/LexGen.py scite-4.4.4/scintilla/scripts/LexGen.py
--- scite-4.3.3/scintilla/scripts/LexGen.py	2019-06-28 23:50:36.000000000 +0000
+++ scite-4.4.4/scintilla/scripts/LexGen.py	2020-05-31 23:08:11.000000000 +0000
@@ -7,6 +7,7 @@
 # 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.
+# Also updates version numbers and modification dates.
 
 from FileGenerator import Regenerate, UpdateLineInFile, \
     ReplaceREInFile, UpdateLineInPlistFile, ReadFileAsList, UpdateFileFromLines, \
@@ -14,6 +15,7 @@
 import ScintillaData
 import HFacer
 import os
+import pathlib
 import uuid
 import sys
 
@@ -24,35 +26,44 @@
 import gtk.DepGen
 
 def UpdateVersionNumbers(sci, root):
-    UpdateLineInFile(root + "win32/ScintRes.rc", "#define VERSION_SCINTILLA",
+    UpdateLineInFile(root / "win32/ScintRes.rc", "#define VERSION_SCINTILLA",
         "#define VERSION_SCINTILLA \"" + sci.versionDotted + "\"")
-    UpdateLineInFile(root + "win32/ScintRes.rc", "#define VERSION_WORDS",
+    UpdateLineInFile(root / "win32/ScintRes.rc", "#define VERSION_WORDS",
         "#define VERSION_WORDS " + sci.versionCommad)
-    UpdateLineInFile(root + "qt/ScintillaEditBase/ScintillaEditBase.pro",
+    UpdateLineInFile(root / "qt/ScintillaEditBase/ScintillaEditBase.pro",
         "VERSION =",
         "VERSION = " + sci.versionDotted)
-    UpdateLineInFile(root + "qt/ScintillaEdit/ScintillaEdit.pro",
+    UpdateLineInFile(root / "qt/ScintillaEdit/ScintillaEdit.pro",
         "VERSION =",
         "VERSION = " + sci.versionDotted)
-    UpdateLineInFile(root + "doc/ScintillaDownload.html", "       Release",
+    UpdateLineInFile(root / "doc/ScintillaDownload.html", "       Release",
         "       Release " + sci.versionDotted)
-    ReplaceREInFile(root + "doc/ScintillaDownload.html",
+    ReplaceREInFile(root / "doc/ScintillaDownload.html",
         r"/www.scintilla.org/([a-zA-Z]+)\d\d\d",
         r"/www.scintilla.org/\g<1>" +  sci.version)
-    UpdateLineInFile(root + "doc/index.html",
+    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",
+    UpdateLineInFile(root / "doc/index.html",
         '           Site last modified',
         '           Site last modified ' + sci.mdyModified + '</font>')
-    UpdateLineInFile(root + "doc/ScintillaHistory.html",
+    UpdateLineInFile(root / "doc/ScintillaHistory.html",
         '	Released ',
         '	Released ' + sci.dmyModified + '.')
-    UpdateLineInPlistFile(root + "cocoa/ScintillaFramework/Info.plist",
+
+    cocoa = root / "cocoa"
+
+    UpdateLineInPlistFile(cocoa / "ScintillaFramework/Info.plist",
         "CFBundleVersion", sci.versionDotted)
-    UpdateLineInPlistFile(root + "cocoa/ScintillaFramework/Info.plist",
+    UpdateLineInPlistFile(cocoa / "ScintillaFramework/Info.plist",
+        "CFBundleShortVersionString", sci.versionDotted)
+
+    UpdateLineInPlistFile(cocoa / "Scintilla" / "Scintilla" / "Info.plist",
         "CFBundleShortVersionString", sci.versionDotted)
+    ReplaceREInFile(cocoa / "Scintilla"/ "Scintilla.xcodeproj" / "project.pbxproj",
+        "CURRENT_PROJECT_VERSION = [0-9.]+;",
+        f'CURRENT_PROJECT_VERSION = {sci.versionDotted};')
 
 # Last 24 digits of UUID, used for item IDs in Xcode
 def uid24():
@@ -116,14 +127,16 @@
 
     UpdateFileFromLines(path, lines, "\n")
 
-def RegenerateAll(root):
+def RegenerateAll(rootDirectory):
+    
+    root = pathlib.Path(rootDirectory)
 
-    scintillaBase = os.path.abspath(root)
+    scintillaBase = root.resolve()
 
-    sci = ScintillaData.ScintillaData(root)
+    sci = ScintillaData.ScintillaData(scintillaBase)
 
-    Regenerate(root + "src/Catalogue.cxx", "//", sci.lexerModules)
-    Regenerate(root + "win32/scintilla.mak", "#", sci.lexFiles)
+    Regenerate(scintillaBase / "src/Catalogue.cxx", "//", sci.lexerModules)
+    Regenerate(scintillaBase / "win32/scintilla.mak", "#", sci.lexFiles)
 
     startDir = os.getcwd()
     os.chdir(os.path.join(scintillaBase, "win32"))
@@ -132,7 +145,7 @@
     gtk.DepGen.Generate()
     os.chdir(startDir)
 
-    RegenerateXcodeProject(root + "cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj",
+    RegenerateXcodeProject(root / "cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj",
         sci.lexFiles, sci.lexersXcode)
 
     UpdateVersionNumbers(sci, root)
@@ -140,4 +153,4 @@
     HFacer.RegenerateAll(root, False)
 
 if __name__=="__main__":
-    RegenerateAll("../")
+    RegenerateAll(pathlib.Path(__file__).resolve().parent.parent)
diff -Nru scite-4.3.3/scintilla/scripts/ScintillaData.py scite-4.4.4/scintilla/scripts/ScintillaData.py
--- scite-4.3.3/scintilla/scripts/ScintillaData.py	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/scripts/ScintillaData.py	2020-05-31 23:08:11.000000000 +0000
@@ -33,16 +33,14 @@
 # This file can be run to see the data it provides.
 # Requires Python 3.6 or later
 
-from __future__ import with_statement
-
-import codecs, datetime, glob, os, sys, textwrap
+import datetime, pathlib, sys, textwrap
 
 import FileGenerator
 
 def FindModules(lexFile):
     modules = []
     partLine = ""
-    with open(lexFile) as f:
+    with lexFile.open() as f:
         for l in f.readlines():
             l = l.rstrip()
             if partLine or l.startswith("LexerModule"):
@@ -116,7 +114,7 @@
 
 def FindPropertyDocumentation(lexFile):
     documents = {}
-    with open(lexFile) as f:
+    with lexFile.open() as f:
         name = ""
         for l in f.readlines():
             l = l.strip()
@@ -158,7 +156,7 @@
 def FindCredits(historyFile):
     credits = []
     stage = 0
-    with codecs.open(historyFile, "r", "utf-8") as f:
+    with historyFile.open(encoding="utf-8") as f:
         for l in f.readlines():
             l = l.strip()
             if stage == 0 and l == "<table>":
@@ -180,7 +178,7 @@
     return credits
 
 def ciKey(a):
-    return a.lower()
+    return str(a).lower()
 
 def SortListInsensitive(l):
     l.sort(key=ciKey)
@@ -188,13 +186,12 @@
 class ScintillaData:
     def __init__(self, scintillaRoot):
         # Discover version information
-        with open(scintillaRoot + "version.txt") as f:
-            self.version = f.read().strip()
+        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 open(scintillaRoot + "doc/index.html") as f:
+        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
@@ -212,9 +209,9 @@
             self.myModified = monthModified + " " + self.yearModified
 
         # Find all the lexer source code files
-        lexFilePaths = glob.glob(scintillaRoot + "lexers/Lex*.cxx")
+        lexFilePaths = list((scintillaRoot / "lexers").glob("Lex*.cxx"))
         SortListInsensitive(lexFilePaths)
-        self.lexFiles = [os.path.basename(f)[:-4] for f in lexFilePaths]
+        self.lexFiles = [f.stem for f in lexFilePaths]
         self.lexerModules = []
         lexerProperties = set()
         self.propertyDocuments = {}
@@ -236,14 +233,15 @@
         self.lexerProperties = list(lexerProperties)
         SortListInsensitive(self.lexerProperties)
 
-        self.lexersXcode = FindLexersInXcode(scintillaRoot + "cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj")
-        self.credits = FindCredits(scintillaRoot + "doc/ScintillaHistory.html")
+        self.lexersXcode = FindLexersInXcode(scintillaRoot /
+            "cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj")
+        self.credits = FindCredits(scintillaRoot / "doc" / "ScintillaHistory.html")
 
 def printWrapped(text):
     print(textwrap.fill(text, subsequent_indent="    "))
 
 if __name__=="__main__":
-    sci = ScintillaData("../")
+    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))
@@ -255,7 +253,7 @@
     lexNames = sorted(sci.sclexFromName.keys())
     for lexName in lexNames:
         sclex = sci.sclexFromName[lexName]
-        fileName = os.path.basename(sci.fileFromSclex[sclex])
+        fileName = sci.fileFromSclex[sclex].name
         print("    " + lexName + " -> " + sclex + " in " + fileName)
     printWrapped("Lexer properties: " + ", ".join(sci.lexerProperties))
     print("Lexer property documentation:")
@@ -267,7 +265,4 @@
             subsequent_indent="        "))
     print("Credits:")
     for c in sci.credits:
-        if sys.version_info[0] == 2:
-            print("    " + c.encode("utf-8"))
-        else:
-            sys.stdout.buffer.write(b"    " + c.encode("utf-8") + b"\n")
+        sys.stdout.buffer.write(b"    " + c.encode("utf-8") + b"\n")
diff -Nru scite-4.3.3/scintilla/src/Catalogue.cxx scite-4.4.4/scintilla/src/Catalogue.cxx
--- scite-4.3.3/scintilla/src/Catalogue.cxx	2020-01-15 20:16:06.000000000 +0000
+++ scite-4.4.4/scintilla/src/Catalogue.cxx	2020-07-18 05:40:22.000000000 +0000
@@ -34,7 +34,7 @@
 	return catalogueDefault.Find(language);
 }
 
-const LexerModule *Catalogue::Find(const char *languageName) {
+const LexerModule *Catalogue::Find(const char *languageName) noexcept {
 	return catalogueDefault.Find(languageName);
 }
 
diff -Nru scite-4.3.3/scintilla/src/Catalogue.h scite-4.4.4/scintilla/src/Catalogue.h
--- scite-4.3.3/scintilla/src/Catalogue.h	2018-05-19 02:49:13.000000000 +0000
+++ scite-4.4.4/scintilla/src/Catalogue.h	2020-07-18 05:40:22.000000000 +0000
@@ -15,7 +15,7 @@
 class Catalogue {
 public:
 	static const LexerModule *Find(int language);
-	static const LexerModule *Find(const char *languageName);
+	static const LexerModule *Find(const char *languageName) noexcept;
 	static void AddLexerModule(LexerModule *plm);
 };
 
diff -Nru scite-4.3.3/scintilla/src/CellBuffer.cxx scite-4.4.4/scintilla/src/CellBuffer.cxx
--- scite-4.3.3/scintilla/src/CellBuffer.cxx	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/src/CellBuffer.cxx	2020-07-18 05:40:22.000000000 +0000
@@ -65,6 +65,7 @@
 	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;
@@ -128,6 +129,15 @@
 		const Sci::Position widthCurrent = LineWidth(line);
 		starts.InsertText(static_cast<POS>(line), static_cast<POS>(width - widthCurrent));
 	}
+	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>
@@ -136,8 +146,15 @@
 	PerLine *perLine;
 	LineStartIndex<POS> startsUTF16;
 	LineStartIndex<POS> startsUTF32;
+	int activeIndices;
+
+	void SetActiveIndices() noexcept {
+		activeIndices = (startsUTF32.Active() ? SC_LINECHARACTERINDEX_UTF32 : 0)
+			| (startsUTF16.Active() ? SC_LINECHARACTERINDEX_UTF16 : 0);
+	}
+
 public:
-	LineVector() : starts(256), perLine(nullptr) {
+	LineVector() : starts(256), perLine(nullptr), activeIndices(0) {
 	}
 	// Deleted so LineVector objects can not be copied.
 	LineVector(const LineVector &) = delete;
@@ -163,13 +180,13 @@
 	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 (startsUTF32.Active()) {
-			startsUTF32.starts.InsertPartition(lineAsPos,
-				static_cast<POS>(startsUTF32.starts.PositionFromPartition(lineAsPos - 1) + 1));
-		}
-		if (startsUTF16.Active()) {
-			startsUTF16.starts.InsertPartition(lineAsPos,
-				static_cast<POS>(startsUTF16.starts.PositionFromPartition(lineAsPos - 1) + 1));
+		if (activeIndices) {
+			if (activeIndices & SC_LINECHARACTERINDEX_UTF32) {
+				startsUTF32.InsertLines(line, 1);
+			}
+			if (activeIndices & SC_LINECHARACTERINDEX_UTF16) {
+				startsUTF16.InsertLines(line, 1);
+			}
 		}
 		if (perLine) {
 			if ((line > 0) && lineStart)
@@ -177,15 +194,36 @@
 			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) {
+			if (activeIndices & SC_LINECHARACTERINDEX_UTF32) {
+				startsUTF32.InsertLines(line, lines);
+			}
+			if (activeIndices & SC_LINECHARACTERINDEX_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 (startsUTF32.Active()) {
+		if (activeIndices & SC_LINECHARACTERINDEX_UTF32) {
 			startsUTF32.starts.RemovePartition(static_cast<POS>(line));
 		}
-		if (startsUTF16.Active()) {
+		if (activeIndices & SC_LINECHARACTERINDEX_UTF16) {
 			startsUTF16.starts.RemovePartition(static_cast<POS>(line));
 		}
 		if (perLine) {
@@ -202,55 +240,50 @@
 		return starts.PositionFromPartition(static_cast<POS>(line));
 	}
 	void InsertCharacters(Sci::Line line, CountWidths delta) noexcept override {
-		if (startsUTF32.Active()) {
+		if (activeIndices & SC_LINECHARACTERINDEX_UTF32) {
 			startsUTF32.starts.InsertText(static_cast<POS>(line), static_cast<POS>(delta.WidthUTF32()));
 		}
-		if (startsUTF16.Active()) {
+		if (activeIndices & SC_LINECHARACTERINDEX_UTF16) {
 			startsUTF16.starts.InsertText(static_cast<POS>(line), static_cast<POS>(delta.WidthUTF16()));
 		}
 	}
 	void SetLineCharactersWidth(Sci::Line line, CountWidths width) noexcept override {
-		if (startsUTF32.Active()) {
+		if (activeIndices & SC_LINECHARACTERINDEX_UTF32) {
 			assert(startsUTF32.starts.Partitions() == starts.Partitions());
 			startsUTF32.SetLineWidth(line, width.WidthUTF32());
 		}
-		if (startsUTF16.Active()) {
+		if (activeIndices & SC_LINECHARACTERINDEX_UTF16) {
 			assert(startsUTF16.starts.Partitions() == starts.Partitions());
 			startsUTF16.SetLineWidth(line, width.WidthUTF16());
 		}
 	}
 
 	int LineCharacterIndex() const noexcept override {
-		int retVal = 0;
-		if (startsUTF32.Active()) {
-			retVal |= SC_LINECHARACTERINDEX_UTF32;
-		}
-		if (startsUTF16.Active()) {
-			retVal |= SC_LINECHARACTERINDEX_UTF16;
-		}
-		return retVal;
+		return activeIndices;
 	}
 	bool AllocateLineCharacterIndex(int lineCharacterIndex, Sci::Line lines) override {
-		bool changed = false;
+		const int activeIndicesStart = activeIndices;
 		if ((lineCharacterIndex & SC_LINECHARACTERINDEX_UTF32) != 0) {
-			changed = startsUTF32.Allocate(lines) || changed;
+			startsUTF32.Allocate(lines);
 			assert(startsUTF32.starts.Partitions() == starts.Partitions());
 		}
 		if ((lineCharacterIndex & SC_LINECHARACTERINDEX_UTF16) != 0) {
-			changed = startsUTF16.Allocate(lines) || changed;
+			startsUTF16.Allocate(lines);
 			assert(startsUTF16.starts.Partitions() == starts.Partitions());
 		}
-		return changed;
+		SetActiveIndices();
+		return activeIndicesStart != activeIndices;
 	}
 	bool ReleaseLineCharacterIndex(int lineCharacterIndex) override {
-		bool changed = false;
+		const int activeIndicesStart = activeIndices;
 		if ((lineCharacterIndex & SC_LINECHARACTERINDEX_UTF32) != 0) {
-			changed = startsUTF32.Release() || changed;
+			startsUTF32.Release();
 		}
 		if ((lineCharacterIndex & SC_LINECHARACTERINDEX_UTF16) != 0) {
-			changed = startsUTF16.Release() || changed;
+			startsUTF16.Release();
 		}
-		return changed;
+		SetActiveIndices();
+		return activeIndicesStart != activeIndices;
 	}
 	Sci::Position IndexLineStart(Sci::Line line, int lineCharacterIndex) const noexcept override {
 		if (lineCharacterIndex == SC_LINECHARACTERINDEX_UTF32) {
@@ -634,7 +667,7 @@
 	}
 }
 
-bool CellBuffer::SetStyleFor(Sci::Position position, Sci::Position lengthStyle, char styleValue) {
+bool CellBuffer::SetStyleFor(Sci::Position position, Sci::Position lengthStyle, char styleValue) noexcept {
 	if (!hasStyles) {
 		return false;
 	}
@@ -702,8 +735,7 @@
 		if ((ch == '\r') || (ch == '\n')) {
 			return true;
 		} else if (utf8LineEnds) {
-			const unsigned char back3[3] = { chBeforePrev, chPrev, ch };
-			if (UTF8IsSeparator(back3) || UTF8IsNEL(back3 + 1)) {
+			if (UTF8IsMultibyteLineEnd(chBeforePrev, chPrev, ch)) {
 				return true;
 			}
 		}
@@ -875,8 +907,7 @@
 				lineInsert++;
 			}
 		} else if (utf8LineEnds) {
-			const unsigned char back3[3] = {chBeforePrev, chPrev, ch};
-			if (UTF8IsSeparator(back3) || UTF8IsNEL(back3+1)) {
+			if (UTF8IsMultibyteLineEnd(chBeforePrev, chPrev, ch)) {
 				InsertLine(lineInsert, (position + i) + 1, atLineStart);
 				lineInsert++;
 			}
@@ -967,33 +998,96 @@
 	if (breakingUTF8LineEnd) {
 		RemoveLine(lineInsert);
 	}
-	unsigned char ch = ' ';
-	for (Sci::Position i = 0; i < insertLength; i++) {
-		ch = s[i];
-		if (ch == '\r') {
-			InsertLine(lineInsert, (position + i) + 1, atLineStart);
-			lineInsert++;
-			simpleInsertion = false;
-		} 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++;
+
+	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) {
+			// 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++;
 			}
-			simpleInsertion = false;
-		} else if (utf8LineEnds) {
-			const unsigned char back3[3] = {chBeforePrev, chPrev, ch};
-			if (UTF8IsSeparator(back3) || UTF8IsNEL(back3+1)) {
-				InsertLine(lineInsert, (position + i) + 1, atLineStart);
+			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 && !UTF8IsAscii(ch)) {
+			if (UTF8IsMultibyteLineEnd(chBeforePrev, chPrev, ch)) {
+				InsertLine(lineInsert, (position + ptr - s), atLineStart);
 				lineInsert++;
-				simpleInsertion = false;
 			}
 		}
-		chBeforePrev = chPrev;
-		chPrev = ch;
 	}
+
 	// Joining two lines where last insertion is cr and following substance starts with lf
 	if (chAfter == '\n') {
 		if (ch == '\r') {
@@ -1002,6 +1096,8 @@
 			simpleInsertion = false;
 		}
 	} else if (utf8LineEnds && !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);
@@ -1009,19 +1105,17 @@
 			if (UTF8IsSeparator(back3)) {
 				InsertLine(lineInsert, (position + insertLength + j) + 1, atLineStart);
 				lineInsert++;
-				simpleInsertion = false;
 			}
 			if ((j == 0) && UTF8IsNEL(back3+1)) {
 				InsertLine(lineInsert, (position + insertLength + j) + 1, atLineStart);
 				lineInsert++;
-				simpleInsertion = false;
 			}
 			chBeforePrev = chPrev;
 			chPrev = chAt;
 		}
 	}
 	if (maintainingIndex) {
-		if (simpleInsertion) {
+		if (simpleInsertion && (lineInsert == lineStart)) {
 			const CountWidths cw = CountCharacterWidthsUTF8(std::string_view(s, insertLength));
 			plv->InsertCharacters(linePosition, cw);
 		} else {
diff -Nru scite-4.3.3/scintilla/src/CellBuffer.h scite-4.4.4/scintilla/src/CellBuffer.h
--- scite-4.3.3/scintilla/src/CellBuffer.h	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/src/CellBuffer.h	2020-07-18 05:40:22.000000000 +0000
@@ -16,6 +16,7 @@
 	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;
 };
 
@@ -172,7 +173,7 @@
 	/// 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);
+	bool SetStyleFor(Sci::Position position, Sci::Position lengthStyle, char styleValue) noexcept;
 
 	const char *DeleteChars(Sci::Position position, Sci::Position deleteLength, bool &startSequence);
 
diff -Nru scite-4.3.3/scintilla/src/CharClassify.cxx scite-4.4.4/scintilla/src/CharClassify.cxx
--- scite-4.3.3/scintilla/src/CharClassify.cxx	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/src/CharClassify.cxx	2020-07-18 05:40:22.000000000 +0000
@@ -43,7 +43,7 @@
 	}
 }
 
-int CharClassify::GetCharsOfClass(cc characterClass, unsigned char *buffer) const {
+int CharClassify::GetCharsOfClass(cc 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;
diff -Nru scite-4.3.3/scintilla/src/CharClassify.h scite-4.4.4/scintilla/src/CharClassify.h
--- scite-4.3.3/scintilla/src/CharClassify.h	2019-06-28 23:50:36.000000000 +0000
+++ scite-4.4.4/scintilla/src/CharClassify.h	2020-07-18 05:40:22.000000000 +0000
@@ -17,7 +17,7 @@
 	enum cc { ccSpace, ccNewLine, ccWord, ccPunctuation };
 	void SetDefaultCharClasses(bool includeWordClass);
 	void SetCharClasses(const unsigned char *chars, cc newCharClass);
-	int GetCharsOfClass(cc characterClass, unsigned char *buffer) const;
+	int GetCharsOfClass(cc characterClass, unsigned char *buffer) const noexcept;
 	cc GetClass(unsigned char ch) const noexcept { return static_cast<cc>(charClass[ch]);}
 	bool IsWord(unsigned char ch) const noexcept { return static_cast<cc>(charClass[ch]) == ccWord;}
 
diff -Nru scite-4.3.3/scintilla/src/ContractionState.cxx scite-4.4.4/scintilla/src/ContractionState.cxx
--- scite-4.3.3/scintilla/src/ContractionState.cxx	2019-06-28 23:50:36.000000000 +0000
+++ scite-4.4.4/scintilla/src/ContractionState.cxx	2020-07-18 05:40:22.000000000 +0000
@@ -61,32 +61,32 @@
 
 	void Clear() noexcept override;
 
-	Sci::Line LinesInDoc() const override;
-	Sci::Line LinesDisplayed() const override;
-	Sci::Line DisplayFromDoc(Sci::Line lineDoc) const override;
-	Sci::Line DisplayLastFromDoc(Sci::Line lineDoc) const override;
-	Sci::Line DocFromDisplay(Sci::Line lineDisplay) const 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 override;
+	bool GetVisible(Sci::Line lineDoc) const noexcept override;
 	bool SetVisible(Sci::Line lineDocStart, Sci::Line lineDocEnd, bool isVisible) override;
-	bool HiddenLines() const override;
+	bool HiddenLines() const noexcept override;
 
-	const char *GetFoldDisplayText(Sci::Line lineDoc) const 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 override;
+	bool GetExpanded(Sci::Line lineDoc) const noexcept override;
 	bool SetExpanded(Sci::Line lineDoc, bool isExpanded) override;
-	Sci::Line ContractedNext(Sci::Line lineDocStart) const override;
+	Sci::Line ContractedNext(Sci::Line lineDocStart) const noexcept override;
 
-	int GetHeight(Sci::Line lineDoc) const override;
+	int GetHeight(Sci::Line lineDoc) const noexcept override;
 	bool SetHeight(Sci::Line lineDoc, int height) override;
 
-	void ShowAll() override;
+	void ShowAll() noexcept override;
 
-	void Check() const;
+	void Check() const noexcept;
 };
 
 template <typename LINE>
@@ -158,7 +158,7 @@
 }
 
 template <typename LINE>
-Sci::Line ContractionState<LINE>::LinesInDoc() const {
+Sci::Line ContractionState<LINE>::LinesInDoc() const noexcept {
 	if (OneToOne()) {
 		return linesInDocument;
 	} else {
@@ -167,7 +167,7 @@
 }
 
 template <typename LINE>
-Sci::Line ContractionState<LINE>::LinesDisplayed() const {
+Sci::Line ContractionState<LINE>::LinesDisplayed() const noexcept {
 	if (OneToOne()) {
 		return linesInDocument;
 	} else {
@@ -176,7 +176,7 @@
 }
 
 template <typename LINE>
-Sci::Line ContractionState<LINE>::DisplayFromDoc(Sci::Line lineDoc) const {
+Sci::Line ContractionState<LINE>::DisplayFromDoc(Sci::Line lineDoc) const noexcept {
 	if (OneToOne()) {
 		return (lineDoc <= linesInDocument) ? lineDoc : linesInDocument;
 	} else {
@@ -187,12 +187,12 @@
 }
 
 template <typename LINE>
-Sci::Line ContractionState<LINE>::DisplayLastFromDoc(Sci::Line lineDoc) const {
+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 {
+Sci::Line ContractionState<LINE>::DocFromDisplay(Sci::Line lineDisplay) const noexcept {
 	if (OneToOne()) {
 		return lineDisplay;
 	} else {
@@ -233,7 +233,7 @@
 }
 
 template <typename LINE>
-bool ContractionState<LINE>::GetVisible(Sci::Line lineDoc) const {
+bool ContractionState<LINE>::GetVisible(Sci::Line lineDoc) const noexcept {
 	if (OneToOne()) {
 		return true;
 	} else {
@@ -270,7 +270,7 @@
 }
 
 template <typename LINE>
-bool ContractionState<LINE>::HiddenLines() const {
+bool ContractionState<LINE>::HiddenLines() const noexcept {
 	if (OneToOne()) {
 		return false;
 	} else {
@@ -279,7 +279,7 @@
 }
 
 template <typename LINE>
-const char *ContractionState<LINE>::GetFoldDisplayText(Sci::Line lineDoc) const {
+const char *ContractionState<LINE>::GetFoldDisplayText(Sci::Line lineDoc) const noexcept {
 	Check();
 	return foldDisplayTexts->ValueAt(lineDoc).get();
 }
@@ -300,7 +300,7 @@
 }
 
 template <typename LINE>
-bool ContractionState<LINE>::GetExpanded(Sci::Line lineDoc) const {
+bool ContractionState<LINE>::GetExpanded(Sci::Line lineDoc) const noexcept {
 	if (OneToOne()) {
 		return true;
 	} else {
@@ -327,7 +327,7 @@
 }
 
 template <typename LINE>
-Sci::Line ContractionState<LINE>::ContractedNext(Sci::Line lineDocStart) const {
+Sci::Line ContractionState<LINE>::ContractedNext(Sci::Line lineDocStart) const noexcept {
 	if (OneToOne()) {
 		return -1;
 	} else {
@@ -345,7 +345,7 @@
 }
 
 template <typename LINE>
-int ContractionState<LINE>::GetHeight(Sci::Line lineDoc) const {
+int ContractionState<LINE>::GetHeight(Sci::Line lineDoc) const noexcept {
 	if (OneToOne()) {
 		return 1;
 	} else {
@@ -378,7 +378,7 @@
 }
 
 template <typename LINE>
-void ContractionState<LINE>::ShowAll() {
+void ContractionState<LINE>::ShowAll() noexcept {
 	const LINE lines = static_cast<LINE>(LinesInDoc());
 	Clear();
 	linesInDocument = lines;
@@ -387,7 +387,7 @@
 // Debugging checks
 
 template <typename LINE>
-void ContractionState<LINE>::Check() const {
+void ContractionState<LINE>::Check() const noexcept {
 #ifdef CHECK_CORRECTNESS
 	for (Sci::Line vline = 0; vline < LinesDisplayed(); vline++) {
 		const Sci::Line lineDoc = DocFromDisplay(vline);
diff -Nru scite-4.3.3/scintilla/src/ContractionState.h scite-4.4.4/scintilla/src/ContractionState.h
--- scite-4.3.3/scintilla/src/ContractionState.h	2019-06-28 23:50:36.000000000 +0000
+++ scite-4.4.4/scintilla/src/ContractionState.h	2020-07-18 05:40:22.000000000 +0000
@@ -18,30 +18,30 @@
 
 	virtual void Clear()=0;
 
-	virtual Sci::Line LinesInDoc() const=0;
-	virtual Sci::Line LinesDisplayed() const=0;
-	virtual Sci::Line DisplayFromDoc(Sci::Line lineDoc) const=0;
-	virtual Sci::Line DisplayLastFromDoc(Sci::Line lineDoc) const=0;
-	virtual Sci::Line DocFromDisplay(Sci::Line lineDisplay) const=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=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=0;
+	virtual bool HiddenLines() const noexcept=0;
 
-	virtual const char *GetFoldDisplayText(Sci::Line lineDoc) const=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=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=0;
+	virtual Sci::Line ContractedNext(Sci::Line lineDocStart) const noexcept =0;
 
-	virtual int GetHeight(Sci::Line lineDoc) const=0;
+	virtual int GetHeight(Sci::Line lineDoc) const noexcept=0;
 	virtual bool SetHeight(Sci::Line lineDoc, int height)=0;
 
-	virtual void ShowAll()=0;
+	virtual void ShowAll() noexcept=0;
 };
 
 std::unique_ptr<IContractionState> ContractionStateCreate(bool largeDocument);
diff -Nru scite-4.3.3/scintilla/src/Decoration.cxx scite-4.4.4/scintilla/src/Decoration.cxx
--- scite-4.3.3/scintilla/src/Decoration.cxx	2019-06-28 23:50:36.000000000 +0000
+++ scite-4.4.4/scintilla/src/Decoration.cxx	2020-07-18 05:40:22.000000000 +0000
@@ -40,22 +40,22 @@
 	~Decoration() override {
 	}
 
-	bool Empty() const override {
+	bool Empty() const noexcept override {
 		return (rs.Runs() == 1) && (rs.AllSameAs(0));
 	}
-	int Indicator() const override {
+	int Indicator() const noexcept override {
 		return indicator;
 	}
-	Sci::Position Length() const override {
+	Sci::Position Length() const noexcept override {
 		return rs.Length();
 	}
-	int ValueAt(Sci::Position position) const override {
+	int ValueAt(Sci::Position position) const noexcept override {
 		return rs.ValueAt(static_cast<POS>(position));
 	}
-	Sci::Position StartRun(Sci::Position position) const override {
+	Sci::Position StartRun(Sci::Position position) const noexcept override {
 		return rs.StartRun(static_cast<POS>(position));
 	}
-	Sci::Position EndRun(Sci::Position position) const override {
+	Sci::Position EndRun(Sci::Position position) const noexcept override {
 		return rs.EndRun(static_cast<POS>(position));
 	}
 	void SetValueAt(Sci::Position position, int value) override {
@@ -64,7 +64,7 @@
 	void InsertSpace(Sci::Position position, Sci::Position insertLength) override {
 		rs.InsertSpace(static_cast<POS>(position), static_cast<POS>(insertLength));
 	}
-	Sci::Position Runs() const override {
+	Sci::Position Runs() const noexcept override {
 		return rs.Runs();
 	}
 };
@@ -80,7 +80,7 @@
 	std::vector<const IDecoration*> decorationView;	// Read-only view of decorationList
 	bool clickNotified;
 
-	Decoration<POS> *DecorationFromIndicator(int indicator);
+	Decoration<POS> *DecorationFromIndicator(int indicator) noexcept;
 	Decoration<POS> *Create(int indicator, Sci::Position length);
 	void Delete(int indicator);
 	void DeleteAnyEmpty();
@@ -90,15 +90,15 @@
 	DecorationList();
 	~DecorationList() override;
 
-	const std::vector<const IDecoration*> &View() const override {
+	const std::vector<const IDecoration*> &View() const noexcept override {
 		return decorationView;
 	}
 
 	void SetCurrentIndicator(int indicator) override;
-	int GetCurrentIndicator() const override { return currentIndicator; }
+	int GetCurrentIndicator() const noexcept override { return currentIndicator; }
 
 	void SetCurrentValue(int value) override;
-	int GetCurrentValue() const override { return currentValue; }
+	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;
@@ -108,15 +108,15 @@
 
 	void DeleteLexerDecorations() override;
 
-	int AllOnFor(Sci::Position position) const override;
-	int ValueAt(int indicator, Sci::Position position) override;
-	Sci::Position Start(int indicator, Sci::Position position) override;
-	Sci::Position End(int indicator, Sci::Position position) 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 override {
+	bool ClickNotified() const noexcept override {
 		return clickNotified;
 	}
-	void SetClickNotified(bool notified) override {
+	void SetClickNotified(bool notified) noexcept override {
 		clickNotified = notified;
 	}
 };
@@ -132,7 +132,7 @@
 }
 
 template <typename POS>
-Decoration<POS> *DecorationList<POS>::DecorationFromIndicator(int indicator) {
+Decoration<POS> *DecorationList<POS>::DecorationFromIndicator(int indicator) noexcept {
 	for (const std::unique_ptr<Decoration<POS>> &deco : decorationList) {
 		if (deco->Indicator() == indicator) {
 			return deco.get();
@@ -149,7 +149,7 @@
 
 	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) {
+		[](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 =
@@ -163,7 +163,7 @@
 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) {
+		[indicator](const std::unique_ptr<Decoration<POS>> &deco) noexcept {
 		return deco->Indicator() == indicator;
 	}), decorationList.end());
 	current = nullptr;
@@ -228,7 +228,7 @@
 template <typename POS>
 void DecorationList<POS>::DeleteLexerDecorations() {
 	decorationList.erase(std::remove_if(decorationList.begin(), decorationList.end(),
-		[](const std::unique_ptr<Decoration<POS>> &deco) {
+		[](const std::unique_ptr<Decoration<POS>> &deco) noexcept {
 		return deco->Indicator() < INDICATOR_CONTAINER ;
 	}), decorationList.end());
 	current = nullptr;
@@ -241,7 +241,7 @@
 		decorationList.clear();
 	} else {
 		decorationList.erase(std::remove_if(decorationList.begin(), decorationList.end(),
-			[](const std::unique_ptr<Decoration<POS>> &deco) {
+			[](const std::unique_ptr<Decoration<POS>> &deco) noexcept {
 			return deco->Empty();
 		}), decorationList.end());
 	}
@@ -256,7 +256,7 @@
 }
 
 template <typename POS>
-int DecorationList<POS>::AllOnFor(Sci::Position position) const {
+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))) {
@@ -269,7 +269,7 @@
 }
 
 template <typename POS>
-int DecorationList<POS>::ValueAt(int indicator, Sci::Position position) {
+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));
@@ -278,7 +278,7 @@
 }
 
 template <typename POS>
-Sci::Position DecorationList<POS>::Start(int indicator, Sci::Position position) {
+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));
@@ -287,7 +287,7 @@
 }
 
 template <typename POS>
-Sci::Position DecorationList<POS>::End(int indicator, Sci::Position position) {
+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));
diff -Nru scite-4.3.3/scintilla/src/Decoration.h scite-4.4.4/scintilla/src/Decoration.h
--- scite-4.3.3/scintilla/src/Decoration.h	2018-04-27 10:42:00.000000000 +0000
+++ scite-4.4.4/scintilla/src/Decoration.h	2020-07-18 05:40:22.000000000 +0000
@@ -12,28 +12,28 @@
 class IDecoration {
 public:
 	virtual ~IDecoration() {}
-	virtual bool Empty() const = 0;
-	virtual int Indicator() const = 0;
-	virtual Sci::Position Length() const = 0;
-	virtual int ValueAt(Sci::Position position) const = 0;
-	virtual Sci::Position StartRun(Sci::Position position) const = 0;
-	virtual Sci::Position EndRun(Sci::Position position) const = 0;
+	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 = 0;
+	virtual Sci::Position Runs() const noexcept = 0;
 };
 
 class IDecorationList {
 public:
 	virtual ~IDecorationList() {}
 
-	virtual const std::vector<const IDecoration*> &View() const =0;
+	virtual const std::vector<const IDecoration*> &View() const noexcept = 0;
 
 	virtual void SetCurrentIndicator(int indicator) = 0;
-	virtual int GetCurrentIndicator() const = 0;
+	virtual int GetCurrentIndicator() const noexcept = 0;
 
 	virtual void SetCurrentValue(int value) = 0;
-	virtual int GetCurrentValue() const = 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;
@@ -41,13 +41,13 @@
 	virtual void DeleteRange(Sci::Position position, Sci::Position deleteLength) = 0;
 	virtual void DeleteLexerDecorations() = 0;
 
-	virtual int AllOnFor(Sci::Position position) const = 0;
-	virtual int ValueAt(int indicator, Sci::Position position) = 0;
-	virtual Sci::Position Start(int indicator, Sci::Position position) = 0;
-	virtual Sci::Position End(int indicator, Sci::Position position) = 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 = 0;
-	virtual void SetClickNotified(bool notified) = 0;
+	virtual bool ClickNotified() const noexcept = 0;
+	virtual void SetClickNotified(bool notified) noexcept = 0;
 };
 
 std::unique_ptr<IDecoration> DecorationCreate(bool largeDocument, int indicator);
diff -Nru scite-4.3.3/scintilla/src/Document.cxx scite-4.4.4/scintilla/src/Document.cxx
--- scite-4.3.3/scintilla/src/Document.cxx	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/src/Document.cxx	2020-07-18 05:40:22.000000000 +0000
@@ -137,6 +137,7 @@
 	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());
 
@@ -178,6 +179,13 @@
 	}
 }
 
+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)
@@ -205,6 +213,10 @@
 	return dynamic_cast<LineAnnotation *>(perLineData[ldAnnotation].get());
 }
 
+LineAnnotation *Document::EOLAnnotations() const noexcept {
+	return dynamic_cast<LineAnnotation *>(perLineData[ldEOLAnnotation].get());
+}
+
 int Document::LineEndTypesSupported() const {
 	if ((SC_CP_UTF8 == dbcsCodePage) && pli)
 		return pli->LineEndTypesSupported();
@@ -1163,11 +1175,11 @@
 
 EncodingFamily Document::CodePageFamily() const noexcept {
 	if (SC_CP_UTF8 == dbcsCodePage)
-		return efUnicode;
+		return EncodingFamily::unicode;
 	else if (dbcsCodePage)
-		return efDBCS;
+		return EncodingFamily::dbcs;
 	else
-		return efEightBit;
+		return EncodingFamily::eightBit;
 }
 
 void Document::ModifiedAt(Sci::Position pos) noexcept {
@@ -1209,7 +1221,7 @@
 			bool startSequence = false;
 			const char *text = cb.DeleteChars(pos, len, startSequence);
 			if (startSavePoint && cb.IsCollectingUndo())
-				NotifySavePoint(!startSavePoint);
+				NotifySavePoint(false);
 			if ((pos < LengthNoExcept()) || (pos == 0))
 				ModifiedAt(pos);
 			else
@@ -1261,7 +1273,7 @@
 	bool startSequence = false;
 	const char *text = cb.InsertString(position, s, insertLength, startSequence);
 	if (startSavePoint && cb.IsCollectingUndo())
-		NotifySavePoint(!startSavePoint);
+		NotifySavePoint(false);
 	ModifiedAt(position);
 	NotifyModified(
 		DocModification(
@@ -2378,6 +2390,36 @@
 	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(SC_MOD_CHANGEEOLANNOTATION, LineStart(line),
+			0, 0, 0, line);
+		NotifyModified(mh);
+	}
+}
+
+void Document::EOLAnnotationSetStyle(Sci::Line line, int style) {
+	EOLAnnotations()->SetStyle(line, style);
+	const DocModification mh(SC_MOD_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;
 }
@@ -2615,7 +2657,7 @@
 }
 
 // TODO: should be able to extend styled region to find matching brace
-Sci::Position Document::BraceMatch(Sci::Position position, Sci::Position /*maxReStyle*/) noexcept {
+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')
@@ -2625,7 +2667,7 @@
 	if (chBrace == '(' || chBrace == '[' || chBrace == '{' || chBrace == '<')
 		direction = 1;
 	int depth = 1;
-	position = NextPosition(position, direction);
+	position = useStartPos ? startPos : NextPosition(position, direction);
 	while ((position >= 0) && (position < LengthNoExcept())) {
 		const char chAtPos = CharAt(position);
 		const int styAtPos = StyleIndexAt(position);
diff -Nru scite-4.3.3/scintilla/src/Document.h scite-4.4.4/scintilla/src/Document.h
--- scite-4.3.3/scintilla/src/Document.h	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/src/Document.h	2020-07-18 05:40:22.000000000 +0000
@@ -18,7 +18,7 @@
 class LineState;
 class LineAnnotation;
 
-enum EncodingFamily { efEightBit, efUnicode, efDBCS };
+enum class EncodingFamily { eightBit, unicode, dbcs };
 
 /**
  * The range class represents a range of text in a document.
@@ -244,13 +244,14 @@
 	std::vector<WatcherWithUserData> watchers;
 
 	// ldSize is not real data - it is for dimensions and loops
-	enum lineData { ldMarkers, ldLevels, ldState, ldMargin, ldAnnotation, ldSize };
+	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;
@@ -298,6 +299,7 @@
 	// 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;
 
 	int LineEndTypesSupported() const;
@@ -365,7 +367,7 @@
 	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) { return cb.RangePointer(position, rangeLength); }
+	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;
@@ -482,6 +484,11 @@
 	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);
 
@@ -494,7 +501,7 @@
 	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) noexcept;
+	Sci::Position BraceMatch(Sci::Position position, Sci::Position maxReStyle, Sci::Position startPos, bool useStartPos) noexcept;
 
 private:
 	void NotifyModifyAttempt();
diff -Nru scite-4.3.3/scintilla/src/EditModel.cxx scite-4.4.4/scintilla/src/EditModel.cxx
--- scite-4.3.3/scintilla/src/EditModel.cxx	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/src/EditModel.cxx	2020-07-18 05:40:22.000000000 +0000
@@ -97,7 +97,7 @@
 	return defaultFoldDisplayText.get();
 }
 
-const char *EditModel::GetFoldDisplayText(Sci::Line lineDoc) const {
+const char *EditModel::GetFoldDisplayText(Sci::Line lineDoc) const noexcept {
 	if (foldDisplayTextStyle == SC_FOLDDISPLAYTEXT_HIDDEN || pcs->GetExpanded(lineDoc)) {
 		return nullptr;
 	}
diff -Nru scite-4.3.3/scintilla/src/EditModel.h scite-4.4.4/scintilla/src/EditModel.h
--- scite-4.3.3/scintilla/src/EditModel.h	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/src/EditModel.h	2020-07-18 05:40:22.000000000 +0000
@@ -68,7 +68,7 @@
 	bool BidirectionalR2L() const noexcept;
 	void SetDefaultFoldDisplayText(const char *text);
 	const char *GetDefaultFoldDisplayText() const noexcept;
-	const char *GetFoldDisplayText(Sci::Line lineDoc) const;
+	const char *GetFoldDisplayText(Sci::Line lineDoc) const noexcept;
 };
 
 }
diff -Nru scite-4.3.3/scintilla/src/Editor.cxx scite-4.4.4/scintilla/src/Editor.cxx
--- scite-4.3.3/scintilla/src/Editor.cxx	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/src/Editor.cxx	2020-07-18 05:40:22.000000000 +0000
@@ -134,7 +134,7 @@
 	dropWentOutside = false;
 	posDrop = SelectionPosition(Sci::invalidPosition);
 	hotSpotClickPos = INVALID_POSITION;
-	selectionType = selChar;
+	selectionUnit = TextUnit::character;
 
 	lastXChosen = 0;
 	lineAnchorPos = 0;
@@ -218,6 +218,7 @@
 		const char c[2] = { static_cast<char>(j), 0 };
 		reprs.SetRepresentation(c, reps[j]);
 	}
+	reprs.SetRepresentation("\x7f", "DEL");
 
 	// C1 control set
 	// As well as Unicode mode, ISO-8859-1 should use these
@@ -273,7 +274,7 @@
 	vs.technology = technology;
 	DropGraphics(false);
 	AllocateGraphics();
-	view.llc.Invalidate(LineLayout::llInvalid);
+	view.llc.Invalidate(LineLayout::ValidLevel::invalid);
 	view.posCache.Clear();
 }
 
@@ -778,7 +779,7 @@
 					ContainerNeedsUpdate(SC_UPDATE_SELECTION);
 					ScrollRange(sel.RangeMain());
 					Redraw();
-					if (addNumber == addOne)
+					if (addNumber == AddNumber::one)
 						return;
 					searchStart = pos + lengthFound;
 				} else {
@@ -1470,13 +1471,13 @@
 }
 
 bool Editor::Wrapping() const noexcept {
-	return vs.wrapState != eWrapNone;
+	return vs.wrapState != WrapMode::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::llPositions);
+		view.llc.Invalidate(LineLayout::ValidLevel::positions);
 	}
 	// Wrap lines during idle.
 	if (Wrapping() && wrapPending.NeedsWrap()) {
@@ -1544,7 +1545,7 @@
 			}
 		} else if (ws == WrapScope::wsIdle) {
 			// Try to keep time taken by wrapping reasonable so interaction remains smooth.
-			const double secondsAllowed = 0.01;
+			constexpr double secondsAllowed = 0.01;
 			const Sci::Line linesInAllowedTime = std::clamp<Sci::Line>(
 				static_cast<Sci::Line>(secondsAllowed / durationWrapOneLine.Duration()),
 				LinesOnScreen() + 50, 0x10000);
@@ -1823,11 +1824,11 @@
 	return view.FormatRange(draw, pfr, surface, surfaceMeasure, *this, vs);
 }
 
-int Editor::TextWidth(int style, const char *text) {
+long Editor::TextWidth(uptr_t style, const char *text) {
 	RefreshStyleData();
 	AutoSurface surface(this);
 	if (surface) {
-		return static_cast<int>(surface->WidthText(vs.styles[style].font, text));
+		return std::lround(surface->WidthText(vs.styles[style].font, text));
 	} else {
 		return 1;
 	}
@@ -2126,6 +2127,7 @@
 		if (!pdoc->IsReadOnly()) {
 			pcs->Clear();
 			pdoc->AnnotationClearAll();
+			pdoc->EOLAnnotationClearAll();
 			pdoc->MarginClearAll();
 		}
 	}
@@ -2526,7 +2528,7 @@
 
 void Editor::CheckModificationForWrap(DocModification mh) {
 	if (mh.modificationType & (SC_MOD_INSERTTEXT | SC_MOD_DELETETEXT)) {
-		view.llc.Invalidate(LineLayout::llCheckTextAndStyle);
+		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()) {
@@ -2605,7 +2607,7 @@
 			}
 		}
 		if (mh.modificationType & SC_MOD_CHANGESTYLE) {
-			view.llc.Invalidate(LineLayout::llCheckTextAndStyle);
+			view.llc.Invalidate(LineLayout::ValidLevel::checkTextAndStyle);
 		}
 	} else {
 		// Move selection and brace highlights
@@ -2661,6 +2663,11 @@
 				Redraw();
 			}
 		}
+		if (mh.modificationType & SC_MOD_CHANGEEOLANNOTATION) {
+			if (vs.eolAnnotationVisible) {
+				Redraw();
+			}
+		}
 		CheckModificationForWrap(mh);
 		if (mh.linesAdded != 0) {
 			// Avoid scrolling of display if change before current display
@@ -4544,34 +4551,34 @@
 		//Platform::DebugPrintf("Double click %d %d = %d\n", curTime, lastClickTime, curTime - lastClickTime);
 		SetMouseCapture(true);
 		FineTickerStart(tickScroll, 100, 10);
-		if (!ctrl || !multipleSelection || (selectionType != selChar && selectionType != selWord))
+		if (!ctrl || !multipleSelection || (selectionUnit != TextUnit::character && selectionUnit != TextUnit::word))
 			SetEmptySelection(newPos.Position());
 		bool doubleClick = false;
 		if (inSelMargin) {
-			// Inside margin selection type should be either selSubLine or selWholeLine.
-			if (selectionType == selSubLine) {
-				// If it is selSubLine, we're inside a *double* click and word wrap is enabled,
-				// so we switch to selWholeLine in order to select whole line.
-				selectionType = selWholeLine;
-			} else if (selectionType != selSubLine && selectionType != selWholeLine) {
+			// 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.
-				selectionType = (Wrapping() && (marginOptions & SC_MARGINOPTION_SUBLINESELECT)) ? selSubLine : selWholeLine;
+				selectionUnit = (Wrapping() && (marginOptions & SC_MARGINOPTION_SUBLINESELECT)) ? TextUnit::subLine : TextUnit::wholeLine;
 			}
 		} else {
-			if (selectionType == selChar) {
-				selectionType = selWord;
+			if (selectionUnit == TextUnit::character) {
+				selectionUnit = TextUnit::word;
 				doubleClick = true;
-			} else if (selectionType == selWord) {
+			} 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.
-				selectionType = selWholeLine;
+				selectionUnit = TextUnit::wholeLine;
 			} else {
-				selectionType = selChar;
+				selectionUnit = TextUnit::character;
 				originalAnchorPos = sel.MainCaret();
 			}
 		}
 
-		if (selectionType == selWord) {
+		if (selectionUnit == TextUnit::word) {
 			Sci::Position charPos = originalAnchorPos;
 			if (sel.MainCaret() == originalAnchorPos) {
 				charPos = PositionFromLocation(pt, false, true);
@@ -4599,9 +4606,9 @@
 			wordSelectAnchorEndPos = endWord;
 			wordSelectInitialCaretPos = sel.MainCaret();
 			WordSelection(wordSelectInitialCaretPos);
-		} else if (selectionType == selSubLine || selectionType == selWholeLine) {
+		} else if (selectionUnit == TextUnit::subLine || selectionUnit == TextUnit::wholeLine) {
 			lineAnchorPos = newPos.Position();
-			LineSelection(lineAnchorPos, lineAnchorPos, selectionType == selWholeLine);
+			LineSelection(lineAnchorPos, lineAnchorPos, selectionUnit == TextUnit::wholeLine);
 			//Platform::DebugPrintf("Triple click: %d - %d\n", anchor, currentPos);
 		} else {
 			SetEmptySelection(sel.MainCaret());
@@ -4620,10 +4627,10 @@
 			}
 			sel.selType = Selection::selStream;
 			if (!shift) {
-				// Single click in margin: select whole line or only subline if word wrap is enabled
+				// Single click in margin: select wholeLine or only subLine if word wrap is enabled
 				lineAnchorPos = newPos.Position();
-				selectionType = (Wrapping() && (marginOptions & SC_MARGINOPTION_SUBLINESELECT)) ? selSubLine : selWholeLine;
-				LineSelection(lineAnchorPos, lineAnchorPos, selectionType == selWholeLine);
+				selectionUnit = (Wrapping() && (marginOptions & SC_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())
@@ -4632,11 +4639,11 @@
 					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.
+				// Otherwise, if there's a non empty selection, reset selection type only if it differs from subLine and wholeLine.
 				// This ensures that we continue selecting in the same selection mode.
-				if (sel.Empty() || (selectionType != selSubLine && selectionType != selWholeLine))
-					selectionType = (Wrapping() && (marginOptions & SC_MARGINOPTION_SUBLINESELECT)) ? selSubLine : selWholeLine;
-				LineSelection(newPos.Position(), lineAnchorPos, selectionType == selWholeLine);
+				if (sel.Empty() || (selectionUnit != TextUnit::subLine && selectionUnit != TextUnit::wholeLine))
+					selectionUnit = (Wrapping() && (marginOptions & SC_MARGINOPTION_SUBLINESELECT)) ? TextUnit::subLine : TextUnit::wholeLine;
+				LineSelection(newPos.Position(), lineAnchorPos, selectionUnit == TextUnit::wholeLine);
 			}
 
 			SetDragPosition(SelectionPosition(Sci::invalidPosition));
@@ -4677,7 +4684,7 @@
 					anchorCurrent = sel.IsRectangular() ?
 						sel.Rectangular().anchor : sel.RangeMain().anchor;
 				sel.selType = alt ? Selection::selRectangle : Selection::selStream;
-				selectionType = selChar;
+				selectionUnit = TextUnit::character;
 				originalAnchorPos = sel.MainCaret();
 				sel.Rectangular() = SelectionRange(newPos, anchorCurrent);
 				SetRectangularRange();
@@ -4804,7 +4811,7 @@
 		if (posDrag.IsValid()) {
 			SetDragPosition(movePos);
 		} else {
-			if (selectionType == selChar) {
+			if (selectionUnit == TextUnit::character) {
 				if (sel.selType == Selection::selStream && (modifiers & SCI_ALT) && mouseSelectionRectangularSwitch) {
 					sel.selType = Selection::selRectangle;
 				}
@@ -4819,7 +4826,7 @@
 				} else {
 					SetSelection(movePos, sel.RangeMain().anchor);
 				}
-			} else if (selectionType == selWord) {
+			} 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
@@ -4837,7 +4844,7 @@
 				}
 			} else {
 				// Continue selecting by line
-				LineSelection(movePos.Position(), lineAnchorPos, selectionType == selWholeLine);
+				LineSelection(movePos.Position(), lineAnchorPos, selectionUnit == TextUnit::wholeLine);
 			}
 		}
 
@@ -4899,7 +4906,7 @@
 	if (inDragDrop == ddInitial) {
 		inDragDrop = ddNone;
 		SetEmptySelection(newPos);
-		selectionType = selChar;
+		selectionUnit = TextUnit::character;
 		originalAnchorPos = sel.MainCaret();
 	}
 	if (hotSpotClickPos != INVALID_POSITION && PointIsHotspot(pt)) {
@@ -4951,10 +4958,10 @@
 					}
 					drag.Clear();
 				}
-				selectionType = selChar;
+				selectionUnit = TextUnit::character;
 			}
 		} else {
-			if (selectionType == selChar) {
+			if (selectionUnit == TextUnit::character) {
 				if (sel.Count() > 1) {
 					sel.RangeMain() =
 						SelectionRange(newPos, sel.Range(sel.Count() - 1).anchor);
@@ -5303,6 +5310,13 @@
 	}
 }
 
+void Editor::SetEOLAnnotationVisible(int visible) {
+	if (vs.eolAnnotationVisible != visible) {
+		vs.eolAnnotationVisible = visible;
+		Redraw();
+	}
+}
+
 /**
  * Recursively expand a fold, making lines visible except where they have an unexpanded parent.
  */
@@ -6364,11 +6378,11 @@
 		return view.printParameters.colourMode;
 
 	case SCI_SETPRINTWRAPMODE:
-		view.printParameters.wrapState = (wParam == SC_WRAP_WORD) ? eWrapWord : eWrapNone;
+		view.printParameters.wrapState = (wParam == SC_WRAP_WORD) ? WrapMode::word : WrapMode::none;
 		break;
 
 	case SCI_GETPRINTWRAPMODE:
-		return view.printParameters.wrapState;
+		return static_cast<sptr_t>(view.printParameters.wrapState);
 
 	case SCI_GETSTYLEAT:
 		if (static_cast<Sci::Position>(wParam) >= pdoc->Length())
@@ -6672,7 +6686,7 @@
 		break;
 
 	case SCI_GETWRAPMODE:
-		return vs.wrapState;
+		return static_cast<sptr_t>(vs.wrapState);
 
 	case SCI_SETWRAPVISUALFLAGS:
 		if (vs.SetWrapVisualFlags(static_cast<int>(wParam))) {
@@ -6757,7 +6771,7 @@
 	case SCI_TEXTWIDTH:
 		PLATFORM_ASSERT(wParam < vs.styles.size());
 		PLATFORM_ASSERT(lParam);
-		return TextWidth(static_cast<int>(wParam), CharPtrFromSPtr(lParam));
+		return TextWidth(wParam, CharPtrFromSPtr(lParam));
 
 	case SCI_TEXTHEIGHT:
 		RefreshStyleData();
@@ -7376,7 +7390,7 @@
 		return vs.caretStyle;
 
 	case SCI_SETCARETWIDTH:
-		vs.caretWidth = std::clamp(static_cast<int>(wParam), 0, 3);
+		vs.caretWidth = std::clamp(static_cast<int>(wParam), 0, 20);
 		InvalidateStyleRedraw();
 		break;
 
@@ -7632,7 +7646,10 @@
 	case SCI_BRACEMATCH:
 		// wParam is position of char to find brace for,
 		// lParam is maximum amount of text to restyle to find it
-		return pdoc->BraceMatch(static_cast<Sci::Position>(wParam), lParam);
+		return pdoc->BraceMatch(static_cast<Sci::Position>(wParam), lParam, 0, false);
+
+	case SCI_BRACEMATCHNEXT:
+		return pdoc->BraceMatch(static_cast<Sci::Position>(wParam), 0, lParam, true);
 
 	case SCI_GETVIEWEOL:
 		return vs.viewEOL;
@@ -8069,6 +8086,43 @@
 	case SCI_ANNOTATIONGETSTYLEOFFSET:
 		return vs.annotationStyleOffset;
 
+	case SCI_EOLANNOTATIONSETTEXT:
+		pdoc->EOLAnnotationSetText(static_cast<Sci::Line>(wParam), CharPtrFromSPtr(lParam));
+		break;
+
+	case SCI_EOLANNOTATIONGETTEXT: {
+			const StyledText st = pdoc->EOLAnnotationStyledText(static_cast<Sci::Line>(wParam));
+			return BytesResult(lParam, reinterpret_cast<const unsigned char *>(st.text), st.length);
+		}
+
+	case SCI_EOLANNOTATIONGETSTYLE: {
+			const StyledText st = pdoc->EOLAnnotationStyledText(static_cast<Sci::Line>(wParam));
+			return st.style;
+		}
+
+	case SCI_EOLANNOTATIONSETSTYLE:
+		pdoc->EOLAnnotationSetStyle(static_cast<Sci::Line>(wParam), static_cast<int>(lParam));
+		break;
+
+	case SCI_EOLANNOTATIONCLEARALL:
+		pdoc->EOLAnnotationClearAll();
+		break;
+
+	case SCI_EOLANNOTATIONSETVISIBLE:
+		SetEOLAnnotationVisible(static_cast<int>(wParam));
+		break;
+
+	case SCI_EOLANNOTATIONGETVISIBLE:
+		return vs.eolAnnotationVisible;
+
+	case SCI_EOLANNOTATIONSETSTYLEOFFSET:
+		vs.eolAnnotationStyleOffset = static_cast<int>(wParam);
+		InvalidateStyleRedraw();
+		break;
+
+	case SCI_EOLANNOTATIONGETSTYLEOFFSET:
+		return vs.eolAnnotationStyleOffset;
+
 	case SCI_RELEASEALLEXTENDEDSTYLES:
 		vs.ReleaseAllExtendedStyles();
 		break;
@@ -8289,11 +8343,11 @@
 		break;
 
 	case SCI_MULTIPLESELECTADDNEXT:
-		MultipleSelectAdd(addOne);
+		MultipleSelectAdd(AddNumber::one);
 		break;
 
 	case SCI_MULTIPLESELECTADDEACH:
-		MultipleSelectAdd(addEach);
+		MultipleSelectAdd(AddNumber::each);
 		break;
 
 	case SCI_CHANGELEXERSTATE:
diff -Nru scite-4.3.3/scintilla/src/Editor.h scite-4.4.4/scintilla/src/Editor.h
--- scite-4.3.3/scintilla/src/Editor.h	2020-03-03 21:50:30.000000000 +0000
+++ scite-4.4.4/scintilla/src/Editor.h	2020-07-18 05:40:22.000000000 +0000
@@ -210,7 +210,7 @@
 	int dwellDelay;
 	int ticksToDwell;
 	bool dwelling;
-	enum { selChar, selWord, selSubLine, selWholeLine } selectionType;
+	enum class TextUnit { character, word, subLine, wholeLine } selectionUnit;
 	Point ptMouseLast;
 	enum { ddNone, ddInitial, ddDragging } inDragDrop;
 	bool dropWentOutside;
@@ -326,7 +326,7 @@
 	void SetSelection(int currentPos_);
 	void SetEmptySelection(SelectionPosition currentPos_);
 	void SetEmptySelection(Sci::Position currentPos_);
-	enum AddNumber { addOne, addEach };
+	enum class AddNumber { one, each };
 	void MultipleSelectAdd(AddNumber addNumber);
 	bool RangeContainsProtected(Sci::Position start, Sci::Position end) const noexcept;
 	bool SelectionContainsProtected() const;
@@ -388,7 +388,7 @@
 	void RefreshPixMaps(Surface *surfaceWindow);
 	void Paint(Surface *surfaceWindow, PRectangle rcArea);
 	Sci::Position FormatRange(bool draw, const Sci_RangeToFormat *pfr);
-	int TextWidth(int style, const char *text);
+	long TextWidth(uptr_t style, const char *text);
 
 	virtual void SetVerticalScrollPos() = 0;
 	virtual void SetHorizontalScrollPos() = 0;
@@ -412,7 +412,7 @@
 	virtual void Cut();
 	void PasteRectangular(SelectionPosition pos, const char *ptr, Sci::Position len);
 	virtual void Copy() = 0;
-	virtual void CopyAllowLine();
+	void CopyAllowLine();
 	virtual bool CanPaste();
 	virtual void Paste() = 0;
 	void Clear();
@@ -546,6 +546,7 @@
 	virtual void SetDocPointer(Document *document);
 
 	void SetAnnotationVisible(int visible);
+	void SetEOLAnnotationVisible(int visible);
 
 	Sci::Line ExpandLine(Sci::Line line);
 	void SetFoldExpanded(Sci::Line lineDoc, bool expanded);
diff -Nru scite-4.3.3/scintilla/src/EditView.cxx scite-4.4.4/scintilla/src/EditView.cxx
--- scite-4.3.3/scintilla/src/EditView.cxx	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/src/EditView.cxx	2020-07-18 05:40:22.000000000 +0000
@@ -59,15 +59,10 @@
 
 using namespace Scintilla;
 
-static constexpr bool IsControlCharacter(int ch) noexcept {
-	// iscntrl returns true for lots of chars > 127 which are displayable
-	return ch >= 0 && ch < ' ';
-}
-
 PrintParameters::PrintParameters() noexcept {
 	magnification = 0;
 	colourMode = SC_PRINT_NORMAL;
-	wrapState = eWrapWord;
+	wrapState = WrapMode::word;
 }
 
 namespace Scintilla {
@@ -213,14 +208,14 @@
 	ldTabstops.reset();
 }
 
-XYPOSITION EditView::NextTabstopPos(Sci::Line line, XYPOSITION x, XYPOSITION tabWidth) const {
+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) {
+bool EditView::ClearTabstops(Sci::Line line) noexcept {
 	return ldTabstops && ldTabstops->ClearTabstops(line);
 }
 
@@ -231,7 +226,7 @@
 	return ldTabstops && ldTabstops->AddTabstop(line, x);
 }
 
-int EditView::GetNextTabstop(Sci::Line line, int x) const {
+int EditView::GetNextTabstop(Sci::Line line, int x) const noexcept {
 	if (ldTabstops) {
 		return ldTabstops->GetNextTabstop(line, x);
 	} else {
@@ -320,9 +315,7 @@
 		pixmapIndentGuideHighlight->InitPixMap(1, vsDraw.lineHeight + 1, surfaceWindow, wid);
 		const PRectangle rcIG = PRectangle::FromInts(0, 0, 1, vsDraw.lineHeight);
 		pixmapIndentGuide->FillRectangle(rcIG, vsDraw.styles[STYLE_INDENTGUIDE].back);
-		pixmapIndentGuide->PenColour(vsDraw.styles[STYLE_INDENTGUIDE].fore);
 		pixmapIndentGuideHighlight->FillRectangle(rcIG, vsDraw.styles[STYLE_BRACELIGHT].back);
-		pixmapIndentGuideHighlight->PenColour(vsDraw.styles[STYLE_BRACELIGHT].fore);
 		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[STYLE_INDENTGUIDE].fore);
@@ -369,6 +362,12 @@
 	}
 }
 
+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);
+}
+
 }
 
 /**
@@ -388,7 +387,7 @@
 	if (posLineEnd >(posLineStart + ll->maxLineLength)) {
 		posLineEnd = posLineStart + ll->maxLineLength;
 	}
-	if (ll->validity == LineLayout::llCheckTextAndStyle) {
+	if (ll->validity == LineLayout::ValidLevel::checkTextAndStyle) {
 		Sci::Position lineLength = posLineEnd - posLineStart;
 		if (!vstyle.viewEOL) {
 			lineLength = model.pdoc->LineEnd(line) - posLineStart;
@@ -413,15 +412,15 @@
 			}
 			allSame = allSame && (ll->styles[numCharsInLine] == styleByte);	// For eolFilled
 			if (allSame) {
-				ll->validity = LineLayout::llPositions;
+				ll->validity = LineLayout::ValidLevel::positions;
 			} else {
-				ll->validity = LineLayout::llInvalid;
+				ll->validity = LineLayout::ValidLevel::invalid;
 			}
 		} else {
-			ll->validity = LineLayout::llInvalid;
+			ll->validity = LineLayout::ValidLevel::invalid;
 		}
 	}
-	if (ll->validity == LineLayout::llInvalid) {
+	if (ll->validity == LineLayout::ValidLevel::invalid) {
 		ll->widthLine = LineLayout::wrapWidthInfinite;
 		ll->lines = 1;
 		if (vstyle.edgeState == EDGE_BACKGROUND) {
@@ -505,13 +504,13 @@
 		}
 		ll->numCharsInLine = numCharsInLine;
 		ll->numCharsBeforeEOL = numCharsBeforeEOL;
-		ll->validity = LineLayout::llPositions;
+		ll->validity = LineLayout::ValidLevel::positions;
 	}
 	// Hard to cope when too narrow, so just assume there is space
 	if (width < 20) {
 		width = 20;
 	}
-	if ((ll->validity == LineLayout::llPositions) || (ll->widthLine != width)) {
+	if ((ll->validity == LineLayout::ValidLevel::positions) || (ll->widthLine != width)) {
 		ll->widthLine = width;
 		if (width == LineLayout::wrapWidthInfinite) {
 			ll->lines = 1;
@@ -579,12 +578,12 @@
 					continue;
 				}
 				if (p > 0) {
-					if (vstyle.wrapState == eWrapChar) {
+					if (vstyle.wrapState == WrapMode::character) {
 						lastGoodBreak = model.pdoc->MovePositionOutsideChar(p + posLineStart, -1)
 							- posLineStart;
 						p = model.pdoc->MovePositionOutsideChar(p + 1 + posLineStart, 1) - posLineStart;
 						continue;
-					} else if ((vstyle.wrapState == eWrapWord) && (ll->styles[p] != ll->styles[p - 1])) {
+					} else if ((vstyle.wrapState == WrapMode::word) && (ll->styles[p] != ll->styles[p - 1])) {
 						lastGoodBreak = p;
 					} else if (IsSpaceOrTab(ll->chars[p - 1]) && !IsSpaceOrTab(ll->chars[p])) {
 						lastGoodBreak = p;
@@ -594,7 +593,7 @@
 			}
 			ll->lines++;
 		}
-		ll->validity = LineLayout::llLines;
+		ll->validity = LineLayout::ValidLevel::lines;
 	}
 }
 
@@ -1050,7 +1049,8 @@
 		rcSegment.left = rcLine.left;
 	rcSegment.right = rcLine.right;
 
-	const bool fillRemainder = !lastSubLine || !model.GetFoldDisplayText(line);
+	const bool drawEOLAnnotationStyledText = (vsDraw.eolAnnotationVisible != EOLANNOTATION_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);
@@ -1090,7 +1090,7 @@
 }
 
 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::DrawState drawState,
+	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)];
@@ -1130,7 +1130,7 @@
 			// 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, drawState, value);
+		vsDraw.indicators[indicNum].Draw(surface, rc, rcLine, rcFirstCharacter, state, value);
 	}
 }
 
@@ -1153,10 +1153,10 @@
 				const bool hover = vsDraw.indicators[deco->Indicator()].IsDynamic() &&
 					rangeRun.ContainsCharacter(model.hoverIndicatorPos);
 				const int value = deco->ValueAt(startPos);
-				const Indicator::DrawState drawState = hover ? Indicator::drawHover : Indicator::drawNormal;
+				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, drawState,
+					surface, vsDraw, ll, xStart, rcLine, posSecond - posLineStart, subLine, state,
 					value, model.BidirectionalEnabled(), tabWidthMinimumPixels);
 				startPos = endPos;
 				if (!deco->ValueAt(startPos)) {
@@ -1177,7 +1177,7 @@
 				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::drawNormal, 1, model.BidirectionalEnabled(), tabWidthMinimumPixels);
+						subLine, Indicator::State::normal, 1, model.BidirectionalEnabled(), tabWidthMinimumPixels);
 				}
 			}
 			if (rangeLine.ContainsCharacter(model.braces[1])) {
@@ -1185,7 +1185,7 @@
 				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::drawNormal, 1, model.BidirectionalEnabled(), tabWidthMinimumPixels);
+						subLine, Indicator::State::normal, 1, model.BidirectionalEnabled(), tabWidthMinimumPixels);
 				}
 			}
 		}
@@ -1285,6 +1285,95 @@
 	}
 }
 
+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 == EOLANNOTATION_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;
+	FontAlias fontText = vsDraw.styles[style].font;
+	const int widthEOLAnnotationText = static_cast<int>(surface->WidthText(fontText, eolAnnotationText));
+
+	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 ColourOptional background = vsDraw.Background(model.pdoc->GetMark(line), model.caret.active, ll->containsCaret);
+	ColourDesired textFore = vsDraw.styles[style].fore;
+	const ColourDesired textBack = TextBackground(model, vsDraw, ll, background, false,
+											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 (phase & drawBack) {
+		surface->FillRectangle(rcSegment, 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 (phase & drawText) {
+		if (phasesDraw != phasesOne) {
+			surface->DrawTextTransparent(rcSegment, fontText,
+			rcSegment.top + vsDraw.maxAscent, eolAnnotationText,
+			textFore);
+		} else {
+			surface->DrawTextNoClip(rcSegment, fontText,
+			rcSegment.top + vsDraw.maxAscent, eolAnnotationText,
+			textFore, textBack);
+		}
+	}
+
+	if (phase & drawIndicatorsFore) {
+		if (vsDraw.eolAnnotationVisible == EOLANNOTATION_BOXED ) {
+			surface->PenColour(textFore);
+			PRectangle rcBox = rcSegment;
+			rcBox.left = std::round(rcSegment.left);
+			rcBox.right = std::round(rcSegment.right);
+			const IntegerRectangle ircBox(rcBox);
+			surface->MoveTo(ircBox.left, ircBox.top);
+			surface->LineTo(ircBox.left, ircBox.bottom);
+			surface->MoveTo(ircBox.right, ircBox.top);
+			surface->LineTo(ircBox.right, ircBox.bottom);
+			surface->MoveTo(ircBox.left, ircBox.top);
+			surface->LineTo(ircBox.right, ircBox.top);
+			surface->MoveTo(ircBox.left, ircBox.bottom - 1);
+			surface->LineTo(ircBox.right, ircBox.bottom - 1);
+		}
+	}
+}
+
 static constexpr bool AnnotationBoxedOrIndented(int annotationVisible) noexcept {
 	return annotationVisible == ANNOTATION_BOXED || annotationVisible == ANNOTATION_INDENTED;
 }
@@ -2039,6 +2128,7 @@
 			DrawBackground(surface, model, vsDraw, ll, rcLine, lineRange, posLineStart, xStart,
 				subLine, background);
 			DrawFoldDisplayText(surface, model, vsDraw, ll, line, xStart, rcLine, subLine, subLineStart, drawBack);
+			DrawEOLAnnotationText(surface, model, vsDraw, ll, line, xStart, rcLine, subLine, subLineStart, drawBack);
 			phase = static_cast<DrawPhase>(phase & ~drawBack);	// Remove drawBack to not draw again in DrawFoldDisplayText
 			DrawEOL(surface, model, vsDraw, ll, rcLine, line, lineRange.end,
 				xStart, subLine, subLineStart, background);
@@ -2069,6 +2159,7 @@
 	}
 
 	DrawFoldDisplayText(surface, model, vsDraw, ll, line, xStart, rcLine, subLine, subLineStart, phase);
+	DrawEOLAnnotationText(surface, model, vsDraw, ll, line, xStart, rcLine, subLine, subLineStart, phase);
 
 	if (phasesDraw == phasesOne) {
 		DrawEOL(surface, model, vsDraw, ll, rcLine, line, lineRange.end,
@@ -2448,7 +2539,7 @@
 	Sci::Position nPrintPos = pfr->chrg.cpMin;
 	int visibleLine = 0;
 	int widthPrint = pfr->rc.right - pfr->rc.left - vsPrint.fixedColumnWidth;
-	if (printParameters.wrapState == eWrapNone)
+	if (printParameters.wrapState == WrapMode::none)
 		widthPrint = LineLayout::wrapWidthInfinite;
 
 	while (lineDoc <= linePrintLast && ypos < pfr->rc.bottom) {
diff -Nru scite-4.3.3/scintilla/src/EditView.h scite-4.4.4/scintilla/src/EditView.h
--- scite-4.3.3/scintilla/src/EditView.h	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/src/EditView.h	2020-07-18 05:40:22.000000000 +0000
@@ -102,10 +102,10 @@
 	bool LinesOverlap() const noexcept;
 
 	void ClearAllTabstops() noexcept;
-	XYPOSITION NextTabstopPos(Sci::Line line, XYPOSITION x, XYPOSITION tabWidth) const;
-	bool ClearTabstops(Sci::Line line);
+	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;
+	int GetNextTabstop(Sci::Line line, int x) const noexcept;
 	void LinesAddedOrRemoved(Sci::Line lineOfPos, Sci::Line linesAdded);
 
 	void DropGraphics(bool freeObjects);
@@ -133,6 +133,8 @@
 		ColourOptional 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,
diff -Nru scite-4.3.3/scintilla/src/ElapsedPeriod.h scite-4.4.4/scintilla/src/ElapsedPeriod.h
--- scite-4.3.3/scintilla/src/ElapsedPeriod.h	2019-06-28 23:50:36.000000000 +0000
+++ scite-4.4.4/scintilla/src/ElapsedPeriod.h	2020-07-18 05:40:22.000000000 +0000
@@ -18,7 +18,7 @@
 	ElapsedPeriod() noexcept : tp(std::chrono::high_resolution_clock::now()) {
 	}
 	/// Return duration as floating point seconds
-	double Duration(bool reset=false) {
+	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 =
diff -Nru scite-4.3.3/scintilla/src/Indicator.cxx scite-4.4.4/scintilla/src/Indicator.cxx
--- scite-4.3.3/scintilla/src/Indicator.cxx	2019-06-28 23:50:36.000000000 +0000
+++ scite-4.4.4/scintilla/src/Indicator.cxx	2020-07-18 05:40:22.000000000 +0000
@@ -29,177 +29,225 @@
 		std::round(rc.right), std::floor(rc.bottom));
 }
 
-void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &rcLine, const PRectangle &rcCharacter, DrawState drawState, int value) const {
+void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &rcLine, const PRectangle &rcCharacter, State state, int value) const {
 	StyleAndColour sacDraw = sacNormal;
 	if (Flags() & SC_INDICFLAG_VALUEFORE) {
 		sacDraw.fore = ColourDesired(value & SC_INDICVALUEMASK);
 	}
-	if (drawState == drawHover) {
+	if (state == State::hover) {
 		sacDraw = sacHover;
 	}
 	const IntegerRectangle irc(rc);
 	surface->PenColour(sacDraw.fore);
 	const int ymid = (irc.bottom + irc.top) / 2;
-	if (sacDraw.style == INDIC_SQUIGGLE) {
-		const IntegerRectangle ircSquiggle(PixelGridAlign(rc));
-		int x = ircSquiggle.left;
-		const int xLast = ircSquiggle.right;
-		int y = 0;
-		surface->MoveTo(x, irc.top + y);
-		while (x < xLast) {
-			if ((x + 2) > xLast) {
-				y = 1;
-				x = xLast;
-			} else {
-				x += 2;
-				y = 2 - y;
+
+	switch (sacDraw.style) {
+	case INDIC_SQUIGGLE: {
+			const IntegerRectangle ircSquiggle(PixelGridAlign(rc));
+			int x = ircSquiggle.left;
+			const int xLast = ircSquiggle.right;
+			int y = 0;
+			surface->MoveTo(x, irc.top + y);
+			while (x < xLast) {
+				if ((x + 2) > xLast) {
+					y = 1;
+					x = xLast;
+				} else {
+					x += 2;
+					y = 2 - y;
+				}
+				surface->LineTo(x, irc.top + y);
 			}
-			surface->LineTo(x, irc.top + y);
 		}
-	} else if (sacDraw.style == INDIC_SQUIGGLEPIXMAP) {
-		const PRectangle rcSquiggle = PixelGridAlign(rc);
+		break;
+
+	case INDIC_SQUIGGLEPIXMAP: {
+			const PRectangle rcSquiggle = PixelGridAlign(rc);
 
-		const int width = std::min(4000, static_cast<int>(rcSquiggle.Width()));
-		RGBAImage image(width, 3, 1.0, nullptr);
-		enum { alphaFull = 0xff, alphaSide = 0x2f, 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, sacDraw.fore, alphaSide);
-				image.SetPixel(x, 1, sacDraw.fore, alphaFull);
-				image.SetPixel(x, 2, 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, sacDraw.fore, alphaFull);
-				image.SetPixel(x, 1, sacDraw.fore, alphaSide2);
-			}
-		}
-		surface->DrawRGBAImage(rcSquiggle, image.GetWidth(), image.GetHeight(), image.Pixels());
-	} else if (sacDraw.style == INDIC_SQUIGGLELOW) {
-		surface->MoveTo(irc.left, irc.top);
-		int x = irc.left + 3;
-		int y = 0;
-		while (x < rc.right) {
-			surface->LineTo(x - 1, irc.top + y);
-			y = 1 - y;
-			surface->LineTo(x, irc.top + y);
-			x += 3;
+			const int width = std::min(4000, static_cast<int>(rcSquiggle.Width()));
+			RGBAImage image(width, 3, 1.0, nullptr);
+			enum { alphaFull = 0xff, alphaSide = 0x2f, 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, sacDraw.fore, alphaSide);
+					image.SetPixel(x, 1, sacDraw.fore, alphaFull);
+					image.SetPixel(x, 2, 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, sacDraw.fore, alphaFull);
+					image.SetPixel(x, 1, sacDraw.fore, alphaSide2);
+				}
+			}
+			surface->DrawRGBAImage(rcSquiggle, image.GetWidth(), image.GetHeight(), image.Pixels());
 		}
-		surface->LineTo(irc.right, irc.top + y);	// Finish the line
-	} else if (sacDraw.style == INDIC_TT) {
-		surface->MoveTo(irc.left, ymid);
-		int x = irc.left + 5;
-		while (x < rc.right) {
-			surface->LineTo(x, ymid);
-			surface->MoveTo(x-3, ymid);
-			surface->LineTo(x-3, ymid+2);
-			x++;
-			surface->MoveTo(x, ymid);
-			x += 5;
-		}
-		surface->LineTo(irc.right, ymid);	// Finish the line
-		if (x - 3 <= rc.right) {
-			surface->MoveTo(x-3, ymid);
-			surface->LineTo(x-3, ymid+2);
-		}
-	} else if (sacDraw.style == INDIC_DIAGONAL) {
-		int x = irc.left;
-		while (x < rc.right) {
-			surface->MoveTo(x, irc.top + 2);
-			int endX = x+3;
-			int endY = irc.top - 1;
-			if (endX > rc.right) {
-				endY += endX - irc.right;
-				endX = irc.right;
-			}
-			surface->LineTo(endX, endY);
-			x += 4;
-		}
-	} else if (sacDraw.style == INDIC_STRIKE) {
-		surface->MoveTo(irc.left, irc.top - 4);
-		surface->LineTo(irc.right, irc.top - 4);
-	} else if ((sacDraw.style == INDIC_HIDDEN) || (sacDraw.style == INDIC_TEXTFORE)) {
+		break;
+
+	case INDIC_SQUIGGLELOW: {
+			surface->MoveTo(irc.left, irc.top);
+			int x = irc.left + 3;
+			int y = 0;
+			while (x < rc.right) {
+				surface->LineTo(x - 1, irc.top + y);
+				y = 1 - y;
+				surface->LineTo(x, irc.top + y);
+				x += 3;
+			}
+			surface->LineTo(irc.right, irc.top + y);	// Finish the line
+		}
+		break;
+
+	case INDIC_TT: {
+			surface->MoveTo(irc.left, ymid);
+			int x = irc.left + 5;
+			while (x < rc.right) {
+				surface->LineTo(x, ymid);
+				surface->MoveTo(x-3, ymid);
+				surface->LineTo(x-3, ymid+2);
+				x++;
+				surface->MoveTo(x, ymid);
+				x += 5;
+			}
+			surface->LineTo(irc.right, ymid);	// Finish the line
+			if (x - 3 <= rc.right) {
+				surface->MoveTo(x-3, ymid);
+				surface->LineTo(x-3, ymid+2);
+			}
+		}
+		break;
+
+	case INDIC_DIAGONAL: {
+			int x = irc.left;
+			while (x < rc.right) {
+				surface->MoveTo(x, irc.top + 2);
+				int endX = x+3;
+				int endY = irc.top - 1;
+				if (endX > rc.right) {
+					endY += endX - irc.right;
+					endX = irc.right;
+				}
+				surface->LineTo(endX, endY);
+				x += 4;
+			}
+		}
+		break;
+
+	case INDIC_STRIKE: {
+			surface->MoveTo(irc.left, irc.top - 4);
+			surface->LineTo(irc.right, irc.top - 4);
+		}
+		break;
+
+	case INDIC_HIDDEN:
+	case INDIC_TEXTFORE:
 		// Draw nothing
-	} else if (sacDraw.style == INDIC_BOX) {
-		surface->MoveTo(irc.left, ymid + 1);
-		surface->LineTo(irc.right, ymid + 1);
-		const int lineTop = static_cast<int>(rcLine.top) + 1;
-		surface->LineTo(irc.right, lineTop);
-		surface->LineTo(irc.left, lineTop);
-		surface->LineTo(irc.left, ymid + 1);
-	} else if (sacDraw.style == INDIC_ROUNDBOX ||
-		sacDraw.style == INDIC_STRAIGHTBOX ||
-		sacDraw.style == INDIC_FULLBOX) {
-		PRectangle rcBox = rcLine;
-		if (sacDraw.style != INDIC_FULLBOX)
+		break;
+
+	case INDIC_BOX: {
+			surface->MoveTo(irc.left, ymid + 1);
+			surface->LineTo(irc.right, ymid + 1);
+			const int lineTop = static_cast<int>(rcLine.top) + 1;
+			surface->LineTo(irc.right, lineTop);
+			surface->LineTo(irc.left, lineTop);
+			surface->LineTo(irc.left, ymid + 1);
+		}
+		break;
+
+	case INDIC_ROUNDBOX:
+	case INDIC_STRAIGHTBOX:
+	case INDIC_FULLBOX: {
+			PRectangle rcBox = rcLine;
+			if (sacDraw.style != INDIC_FULLBOX)
+				rcBox.top = rcLine.top + 1;
+			rcBox.left = rc.left;
+			rcBox.right = rc.right;
+			surface->AlphaRectangle(rcBox, (sacDraw.style == INDIC_ROUNDBOX) ? 1 : 0,
+						sacDraw.fore, fillAlpha, sacDraw.fore, outlineAlpha, 0);
+		}
+		break;
+
+	case INDIC_GRADIENT:
+	case INDIC_GRADIENTCENTRE: {
+			PRectangle rcBox = rc;
+			rcBox.top = rcLine.top + 1;
+			rcBox.bottom = rcLine.bottom;
+			const Surface::GradientOptions options = Surface::GradientOptions::topToBottom;
+			const ColourAlpha start(sacNormal.fore, fillAlpha);
+			const ColourAlpha end(sacNormal.fore, 0);
+			std::vector<ColourStop> stops;
+			switch (sacDraw.style) {
+			case INDIC_GRADIENT:
+				stops.push_back(ColourStop(0.0, start));
+				stops.push_back(ColourStop(1.0, end));
+				break;
+			case INDIC_GRADIENTCENTRE:
+				stops.push_back(ColourStop(0.0, end));
+				stops.push_back(ColourStop(0.5, start));
+				stops.push_back(ColourStop(1.0, end));
+				break;
+			}
+			surface->GradientRectangle(rcBox, stops, options);
+		}
+		break;
+
+	case INDIC_DOTBOX: {
+			PRectangle rcBox = PixelGridAlign(rc);
 			rcBox.top = rcLine.top + 1;
-		rcBox.left = rc.left;
-		rcBox.right = rc.right;
-		surface->AlphaRectangle(rcBox, (sacDraw.style == INDIC_ROUNDBOX) ? 1 : 0,
-			sacDraw.fore, fillAlpha, sacDraw.fore, outlineAlpha, 0);
-	} else if (sacDraw.style == INDIC_GRADIENT ||
-		sacDraw.style == INDIC_GRADIENTCENTRE) {
-		PRectangle rcBox = rc;
-		rcBox.top = rcLine.top + 1;
-		rcBox.bottom = rcLine.bottom;
-		const Surface::GradientOptions options = Surface::GradientOptions::topToBottom;
-		const ColourAlpha start(sacNormal.fore, fillAlpha);
-		const ColourAlpha end(sacNormal.fore, 0);
-		std::vector<ColourStop> stops;
-		switch (sacDraw.style) {
-		case INDIC_GRADIENT:
-			stops.push_back(ColourStop(0.0, start));
-			stops.push_back(ColourStop(1.0, end));
-			break;
-		case INDIC_GRADIENTCENTRE:
-			stops.push_back(ColourStop(0.0, end));
-			stops.push_back(ColourStop(0.5, start));
-			stops.push_back(ColourStop(1.0, end));
-			break;
-		}
-		surface->GradientRectangle(rcBox, stops, options);
-	} else if (sacDraw.style == INDIC_DOTBOX) {
-		PRectangle rcBox = PixelGridAlign(rc);
-		rcBox.top = rcLine.top + 1;
-		rcBox.bottom = rcLine.bottom;
-		IntegerRectangle ircBox(rcBox);
-		// Cap width at 4000 to avoid large allocations when mistakes made
-		const int width = std::min(ircBox.Width(), 4000);
-		RGBAImage image(width, ircBox.Height(), 1.0, nullptr);
-		// Draw horizontal lines top and bottom
-		for (int x=0; x<width; x++) {
-			for (int y = 0; y<ircBox.Height(); y += ircBox.Height() - 1) {
-				image.SetPixel(x, y, sacDraw.fore, ((x + y) % 2) ? outlineAlpha : fillAlpha);
-			}
-		}
-		// Draw vertical lines left and right
-		for (int y = 1; y<ircBox.Height(); y++) {
-			for (int x=0; x<width; x += width-1) {
-				image.SetPixel(x, y, sacDraw.fore, ((x + y) % 2) ? outlineAlpha : fillAlpha);
-			}
-		}
-		surface->DrawRGBAImage(rcBox, image.GetWidth(), image.GetHeight(), image.Pixels());
-	} else if (sacDraw.style == INDIC_DASH) {
-		int x = irc.left;
-		while (x < rc.right) {
-			surface->MoveTo(x, ymid);
-			surface->LineTo(std::min(x + 4, irc.right), ymid);
-			x += 7;
-		}
-	} else if (sacDraw.style == INDIC_DOTS) {
-		int x = irc.left;
-		while (x < irc.right) {
-			const PRectangle rcDot = PRectangle::FromInts(x, ymid, x + 1, ymid + 1);
-			surface->FillRectangle(rcDot, sacDraw.fore);
-			x += 2;
-		}
-	} else if (sacDraw.style == INDIC_COMPOSITIONTHICK) {
-		const PRectangle rcComposition(rc.left+1, rcLine.bottom-2, rc.right-1, rcLine.bottom);
-		surface->FillRectangle(rcComposition, sacDraw.fore);
-	} else if (sacDraw.style == INDIC_COMPOSITIONTHIN) {
-		const PRectangle rcComposition(rc.left+1, rcLine.bottom-2, rc.right-1, rcLine.bottom-1);
-		surface->FillRectangle(rcComposition, sacDraw.fore);
-	} else if (sacDraw.style == INDIC_POINT || sacDraw.style == INDIC_POINTCHARACTER) {
+			rcBox.bottom = rcLine.bottom;
+			const IntegerRectangle ircBox(rcBox);
+			// Cap width at 4000 to avoid large allocations when mistakes made
+			const int width = std::min(ircBox.Width(), 4000);
+			RGBAImage image(width, ircBox.Height(), 1.0, nullptr);
+			// Draw horizontal lines top and bottom
+			for (int x=0; x<width; x++) {
+				for (int y = 0; y<ircBox.Height(); y += ircBox.Height() - 1) {
+					image.SetPixel(x, y, sacDraw.fore, ((x + y) % 2) ? outlineAlpha : fillAlpha);
+				}
+			}
+			// Draw vertical lines left and right
+			for (int y = 1; y<ircBox.Height(); y++) {
+				for (int x=0; x<width; x += width-1) {
+					image.SetPixel(x, y, sacDraw.fore, ((x + y) % 2) ? outlineAlpha : fillAlpha);
+				}
+			}
+			surface->DrawRGBAImage(rcBox, image.GetWidth(), image.GetHeight(), image.Pixels());
+		}
+		break;
+
+	case INDIC_DASH: {
+			int x = irc.left;
+			while (x < rc.right) {
+				surface->MoveTo(x, ymid);
+				surface->LineTo(std::min(x + 4, irc.right), ymid);
+				x += 7;
+			}
+		}
+		break;
+
+	case INDIC_DOTS: {
+			int x = irc.left;
+			while (x < irc.right) {
+				const PRectangle rcDot = PRectangle::FromInts(x, ymid, x + 1, ymid + 1);
+				surface->FillRectangle(rcDot, sacDraw.fore);
+				x += 2;
+			}
+		}
+		break;
+
+	case INDIC_COMPOSITIONTHICK: {
+			const PRectangle rcComposition(rc.left+1, rcLine.bottom-2, rc.right-1, rcLine.bottom);
+			surface->FillRectangle(rcComposition, sacDraw.fore);
+		}
+		break;
+
+	case INDIC_COMPOSITIONTHIN: {
+			const PRectangle rcComposition(rc.left+1, rcLine.bottom-2, rc.right-1, rcLine.bottom-1);
+			surface->FillRectangle(rcComposition, sacDraw.fore);
+		}
+		break;
+
+	case INDIC_POINT:
+	case INDIC_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 == INDIC_POINT) ? (rcCharacter.left) : ((rcCharacter.right + rcCharacter.left) / 2);
@@ -212,12 +260,15 @@
 			};
 			surface->Polygon(pts, std::size(pts), sacDraw.fore, sacDraw.fore);
 		}
-	} else {	// Either INDIC_PLAIN or unknown
+		break;
+
+	default:
+		// Either INDIC_PLAIN or unknown
 		surface->MoveTo(irc.left, ymid);
 		surface->LineTo(irc.right, ymid);
 	}
 }
 
-void Indicator::SetFlags(int attributes_) {
+void Indicator::SetFlags(int attributes_) noexcept {
 	attributes = attributes_;
 }
diff -Nru scite-4.3.3/scintilla/src/Indicator.h scite-4.4.4/scintilla/src/Indicator.h
--- scite-4.3.3/scintilla/src/Indicator.h	2019-06-28 23:50:36.000000000 +0000
+++ scite-4.4.4/scintilla/src/Indicator.h	2020-07-18 05:40:22.000000000 +0000
@@ -26,7 +26,7 @@
  */
 class Indicator {
 public:
-	enum DrawState { drawNormal, drawHover };
+	enum class State { normal, hover };
 	StyleAndColour sacNormal;
 	StyleAndColour sacHover;
 	bool under;
@@ -38,7 +38,7 @@
 	Indicator(int style_, ColourDesired fore_=ColourDesired(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(0) {
 	}
-	void Draw(Surface *surface, const PRectangle &rc, const PRectangle &rcLine, const PRectangle &rcCharacter, DrawState drawState, int value) const;
+	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);
 	}
@@ -48,7 +48,7 @@
 	int Flags() const noexcept {
 		return attributes;
 	}
-	void SetFlags(int attributes_);
+	void SetFlags(int attributes_) noexcept;
 };
 
 }
diff -Nru scite-4.3.3/scintilla/src/LineMarker.cxx scite-4.4.4/scintilla/src/LineMarker.cxx
--- scite-4.3.3/scintilla/src/LineMarker.cxx	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/src/LineMarker.cxx	2020-07-18 05:40:22.000000000 +0000
@@ -110,9 +110,9 @@
 	surface->FillRectangle(rcH, fore);
 }
 
-void LineMarker::Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharacter, typeOfFold tFold, int marginStyle) const {
+void LineMarker::Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharacter, FoldPart part, int marginStyle) const {
 	if (customDraw) {
-		customDraw(surface, rcWhole, fontForCharacter, tFold, marginStyle, this);
+		customDraw(surface, rcWhole, fontForCharacter, static_cast<int>(part), marginStyle, this);
 		return;
 	}
 
@@ -120,22 +120,22 @@
 	ColourDesired colourBody = back;
 	ColourDesired colourTail = back;
 
-	switch (tFold) {
-	case LineMarker::head:
-	case LineMarker::headWithTail:
+	switch (part) {
+	case FoldPart::head:
+	case FoldPart::headWithTail:
 		colourHead = backSelected;
 		colourTail = backSelected;
 		break;
-	case LineMarker::body:
+	case FoldPart::body:
 		colourHead = backSelected;
 		colourBody = backSelected;
 		break;
-	case LineMarker::tail:
+	case FoldPart::tail:
 		colourBody = backSelected;
 		colourTail = backSelected;
 		break;
 	default:
-		// LineMarker::undefined
+		// FoldPart::undefined
 		break;
 	}
 
@@ -316,7 +316,7 @@
 		break;
 
 	case SC_MARK_BOXPLUSCONNECTED: {
-			if (tFold == LineMarker::headWithTail)
+			if (part == FoldPart::headWithTail)
 				surface->PenColour(colourTail);
 			else
 				surface->PenColour(colourBody);
@@ -330,7 +330,7 @@
 			DrawBox(surface, centreX, centreY, blobSize, fore, colourHead);
 			DrawPlus(surface, centreX, centreY, blobSize, colourTail);
 
-			if (tFold == LineMarker::body) {
+			if (part == FoldPart::body) {
 				surface->PenColour(colourTail);
 				surface->MoveTo(centreX + 1, centreY + blobSize);
 				surface->LineTo(centreX + blobSize + 1, centreY + blobSize);
@@ -366,7 +366,7 @@
 			surface->MoveTo(centreX, ircWhole.top);
 			surface->LineTo(centreX, centreY - blobSize);
 
-			if (tFold == LineMarker::body) {
+			if (part == FoldPart::body) {
 				surface->PenColour(colourTail);
 				surface->MoveTo(centreX + 1, centreY + blobSize);
 				surface->LineTo(centreX + blobSize + 1, centreY + blobSize);
@@ -387,7 +387,7 @@
 		break;
 
 	case SC_MARK_CIRCLEPLUSCONNECTED: {
-			if (tFold == LineMarker::headWithTail)
+			if (part == FoldPart::headWithTail)
 				surface->PenColour(colourTail);
 			else
 				surface->PenColour(colourBody);
diff -Nru scite-4.3.3/scintilla/src/LineMarker.h scite-4.4.4/scintilla/src/LineMarker.h
--- scite-4.3.3/scintilla/src/LineMarker.h	2019-06-28 23:50:36.000000000 +0000
+++ scite-4.4.4/scintilla/src/LineMarker.h	2020-07-18 05:40:22.000000000 +0000
@@ -19,7 +19,7 @@
  */
 class LineMarker {
 public:
-	enum typeOfFold { undefined, head, body, tail, headWithTail };
+	enum class FoldPart { undefined, head, body, tail, headWithTail };
 
 	int markType = SC_MARK_CIRCLE;
 	ColourDesired fore = ColourDesired(0, 0, 0);
@@ -44,7 +44,7 @@
 	void SetXPM(const char *textForm);
 	void SetXPM(const char *const *linesForm);
 	void SetRGBAImage(Point sizeRGBAImage, float scale, const unsigned char *pixelsRGBAImage);
-	void Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharacter, typeOfFold tFold, int marginStyle) const;
+	void Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharacter, FoldPart part, int marginStyle) const;
 };
 
 }
diff -Nru scite-4.3.3/scintilla/src/MarginView.cxx scite-4.4.4/scintilla/src/MarginView.cxx
--- scite-4.3.3/scintilla/src/MarginView.cxx	2019-07-04 00:22:37.000000000 +0000
+++ scite-4.4.4/scintilla/src/MarginView.cxx	2020-07-18 05:40:22.000000000 +0000
@@ -172,7 +172,7 @@
 	}
 }
 
-static int SubstituteMarkerIfEmpty(int markerCheck, int markerDefault, const ViewStyle &vs) {
+static int SubstituteMarkerIfEmpty(int markerCheck, int markerDefault, const ViewStyle &vs) noexcept {
 	if (vs.markers[markerCheck].markType == SC_MARK_EMPTY)
 		return markerDefault;
 	return markerCheck;
@@ -432,25 +432,25 @@
 				if (marks) {
 					for (int markBit = 0; (markBit < 32) && marks; markBit++) {
 						if (marks & 1) {
-							LineMarker::typeOfFold tFold = LineMarker::undefined;
+							LineMarker::FoldPart part = LineMarker::FoldPart::undefined;
 							if ((vs.ms[margin].mask & SC_MASK_FOLDERS) && highlightDelimiter.IsFoldBlockHighlighted(lineDoc)) {
 								if (highlightDelimiter.IsBodyOfFoldBlock(lineDoc)) {
-									tFold = LineMarker::body;
+									part = LineMarker::FoldPart::body;
 								} else if (highlightDelimiter.IsHeadOfFoldBlock(lineDoc)) {
 									if (firstSubLine) {
-										tFold = headWithTail ? LineMarker::headWithTail : LineMarker::head;
+										part = headWithTail ? LineMarker::FoldPart::headWithTail : LineMarker::FoldPart::head;
 									} else {
 										if (model.pcs->GetExpanded(lineDoc) || headWithTail) {
-											tFold = LineMarker::body;
+											part = LineMarker::FoldPart::body;
 										} else {
-											tFold = LineMarker::undefined;
+											part = LineMarker::FoldPart::undefined;
 										}
 									}
 								} else if (highlightDelimiter.IsTailOfFoldBlock(lineDoc)) {
-									tFold = LineMarker::tail;
+									part = LineMarker::FoldPart::tail;
 								}
 							}
-							vs.markers[markBit].Draw(surface, rcMarker, fontLineNumber, tFold, vs.ms[margin].style);
+							vs.markers[markBit].Draw(surface, rcMarker, fontLineNumber, part, vs.ms[margin].style);
 						}
 						marks >>= 1;
 					}
diff -Nru scite-4.3.3/scintilla/src/Partitioning.h scite-4.4.4/scintilla/src/Partitioning.h
--- scite-4.3.3/scintilla/src/Partitioning.h	2019-12-06 20:39:05.000000000 +0000
+++ scite-4.4.4/scintilla/src/Partitioning.h	2020-05-31 23:08:11.000000000 +0000
@@ -122,6 +122,26 @@
 		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())) {
diff -Nru scite-4.3.3/scintilla/src/PerLine.cxx scite-4.4.4/scintilla/src/PerLine.cxx
--- scite-4.3.3/scintilla/src/PerLine.cxx	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/src/PerLine.cxx	2020-05-31 23:08:11.000000000 +0000
@@ -70,12 +70,12 @@
 }
 
 void MarkerHandleSet::RemoveHandle(int handle) {
-	mhList.remove_if([handle](const MarkerHandleNumber &mhn) { return mhn.handle == 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) {
+	mhList.remove_if([&](const MarkerHandleNumber &mhn) noexcept {
 		if ((all || !performedDeletion) && (mhn.number == markerNum)) {
 			performedDeletion = true;
 			return true;
@@ -102,6 +102,12 @@
 	}
 }
 
+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()) {
@@ -219,7 +225,14 @@
 void LineLevels::InsertLine(Sci::Line line) {
 	if (levels.Length()) {
 		const int level = (line < levels.Length()) ? levels[line] : SC_FOLDLEVELBASE;
-		levels.InsertValue(line, 1, level);
+		levels.Insert(line, level);
+	}
+}
+
+void LineLevels::InsertLines(Sci::Line line, Sci::Line lines) {
+	if (levels.Length()) {
+		const int level = (line < levels.Length()) ? levels[line] : SC_FOLDLEVELBASE;
+		levels.InsertValue(line, lines, level);
 	}
 }
 
@@ -281,6 +294,14 @@
 	}
 }
 
+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);
@@ -343,6 +364,13 @@
 	}
 }
 
+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();
@@ -459,6 +487,13 @@
 	}
 }
 
+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();
diff -Nru scite-4.3.3/scintilla/src/PerLine.h scite-4.4.4/scintilla/src/PerLine.h
--- scite-4.3.3/scintilla/src/PerLine.h	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/src/PerLine.h	2020-05-31 23:08:11.000000000 +0000
@@ -59,6 +59,7 @@
 	~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;
@@ -85,6 +86,7 @@
 	~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);
@@ -106,6 +108,7 @@
 	~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);
@@ -126,6 +129,7 @@
 	~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;
@@ -155,6 +159,7 @@
 	~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;
diff -Nru scite-4.3.3/scintilla/src/PositionCache.cxx scite-4.4.4/scintilla/src/PositionCache.cxx
--- scite-4.3.3/scintilla/src/PositionCache.cxx	2019-12-06 20:39:05.000000000 +0000
+++ scite-4.4.4/scintilla/src/PositionCache.cxx	2020-07-18 05:40:22.000000000 +0000
@@ -60,7 +60,7 @@
 	maxLineLength(-1),
 	numCharsInLine(0),
 	numCharsBeforeEOL(0),
-	validity(llInvalid),
+	validity(ValidLevel::invalid),
 	xHighlightGuide(0),
 	highlightColumn(false),
 	containsCaret(false),
@@ -108,12 +108,12 @@
 	bidiData.reset();
 }
 
-void LineLayout::Invalidate(validLevel validity_) {
+void LineLayout::Invalidate(ValidLevel validity_) noexcept {
 	if (validity > validity_)
 		validity = validity_;
 }
 
-int LineLayout::LineStart(int line) const {
+int LineLayout::LineStart(int line) const noexcept {
 	if (line <= 0) {
 		return 0;
 	} else if ((line >= lines) || !lineStarts) {
@@ -123,7 +123,7 @@
 	}
 }
 
-int Scintilla::LineLayout::LineLength(int line) const {
+int Scintilla::LineLayout::LineLength(int line) const noexcept {
 	if (!lineStarts) {
 		return numCharsInLine;
 	} if (line >= lines - 1) {
@@ -133,7 +133,7 @@
 	}
 }
 
-int LineLayout::LineLastVisible(int line, Scope scope) const {
+int LineLayout::LineLastVisible(int line, Scope scope) const noexcept {
 	if (line < 0) {
 		return 0;
 	} else if ((line >= lines-1) || !lineStarts) {
@@ -143,16 +143,16 @@
 	}
 }
 
-Range LineLayout::SubLineRange(int subLine, Scope scope) const {
+Range LineLayout::SubLineRange(int subLine, Scope scope) const noexcept {
 	return Range(LineStart(subLine), LineLastVisible(subLine, scope));
 }
 
-bool LineLayout::InLine(int offset, int line) const {
+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 {
+int LineLayout::SubLineFromPosition(int posInLine, PointEnd pe) const noexcept {
 	if (!lineStarts || (posInLine > maxLineLength)) {
 		return lines - 1;
 	}
@@ -225,7 +225,7 @@
 	xHighlightGuide = 0;
 }
 
-int LineLayout::FindBefore(XYPOSITION x, Range range) const {
+int LineLayout::FindBefore(XYPOSITION x, Range range) const noexcept {
 	Sci::Position lower = range.start;
 	Sci::Position upper = range.end;
 	do {
@@ -241,7 +241,7 @@
 }
 
 
-int LineLayout::FindPositionFromX(XYPOSITION x, Range range, bool charPosition) const {
+int LineLayout::FindPositionFromX(XYPOSITION x, Range range, bool charPosition) const noexcept {
 	int pos = FindBefore(x, range);
 	while (pos < range.end) {
 		if (charPosition) {
@@ -258,7 +258,7 @@
 	return static_cast<int>(range.end);
 }
 
-Point LineLayout::PointFromPosition(int posInLine, int lineHeight, PointEnd pe) const {
+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) {
@@ -287,7 +287,7 @@
 	return pt;
 }
 
-int LineLayout::EndLineStyle() const {
+int LineLayout::EndLineStyle() const noexcept {
 	return styles[numCharsBeforeEOL > 0 ? numCharsBeforeEOL-1 : 0];
 }
 
@@ -321,7 +321,7 @@
 size_t ScreenLine::RepresentationCount() const {
 	return std::count_if(&ll->bidiData->widthReprs[start],
 		&ll->bidiData->widthReprs[start + len],
-		[](XYPOSITION w) {return w > 0.0f; });
+		[](XYPOSITION w) noexcept { return w > 0.0f; });
 }
 
 XYPOSITION ScreenLine::Width() const {
@@ -397,14 +397,14 @@
 	cache.clear();
 }
 
-void LineLayoutCache::Invalidate(LineLayout::validLevel validity_) {
+void LineLayoutCache::Invalidate(LineLayout::ValidLevel validity_) noexcept {
 	if (!cache.empty() && !allInvalidated) {
 		for (const std::unique_ptr<LineLayout> &ll : cache) {
 			if (ll) {
 				ll->Invalidate(validity_);
 			}
 		}
-		if (validity_ == LineLayout::llInvalid) {
+		if (validity_ == LineLayout::ValidLevel::invalid) {
 			allInvalidated = true;
 		}
 	}
@@ -422,7 +422,7 @@
                                       Sci::Line linesOnScreen, Sci::Line linesInDoc) {
 	AllocateForLevel(linesOnScreen, linesInDoc);
 	if (styleClock != styleClock_) {
-		Invalidate(LineLayout::llCheckTextAndStyle);
+		Invalidate(LineLayout::ValidLevel::checkTextAndStyle);
 		styleClock = styleClock_;
 	}
 	allInvalidated = false;
@@ -478,7 +478,7 @@
 }
 
 // Simply pack the (maximum 4) character bytes into an int
-static unsigned int KeyFromString(const char *charBytes, size_t len) {
+static unsigned int KeyFromString(const char *charBytes, size_t len) noexcept {
 	PLATFORM_ASSERT(len <= 4);
 	unsigned int k=0;
 	for (size_t i=0; i<len && charBytes[i]; i++) {
@@ -613,10 +613,10 @@
 		const int prev = nextBreak;
 		while (nextBreak < lineRange.end) {
 			int charWidth = 1;
-			if (encodingFamily == efUnicode)
+			if (encodingFamily == EncodingFamily::unicode)
 				charWidth = UTF8DrawBytes(reinterpret_cast<unsigned char *>(&ll->chars[nextBreak]),
 					static_cast<int>(lineRange.end - nextBreak));
-			else if (encodingFamily == efDBCS)
+			else if (encodingFamily == EncodingFamily::dbcs)
 				charWidth = pdoc->DBCSDrawBytes(
 					std::string_view(&ll->chars[nextBreak], lineRange.end - nextBreak));
 			const Representation *repr = preprs->RepresentationFromCharacter(&ll->chars[nextBreak], charWidth);
@@ -710,7 +710,7 @@
 }
 
 bool PositionCacheEntry::Retrieve(unsigned int styleNumber_, const char *s_,
-	unsigned int len_, XYPOSITION *positions_) const {
+	unsigned int len_, XYPOSITION *positions_) const noexcept {
 	if ((styleNumber == styleNumber_) && (len == len_) &&
 		(memcmp(&positions[len], s_, len)== 0)) {
 		for (unsigned int i=0; i<len; i++) {
diff -Nru scite-4.3.3/scintilla/src/PositionCache.h scite-4.4.4/scintilla/src/PositionCache.h
--- scite-4.3.3/scintilla/src/PositionCache.h	2019-12-06 20:39:05.000000000 +0000
+++ scite-4.4.4/scintilla/src/PositionCache.h	2020-07-18 05:40:22.000000000 +0000
@@ -67,7 +67,7 @@
 	int maxLineLength;
 	int numCharsInLine;
 	int numCharsBeforeEOL;
-	enum validLevel { llInvalid, llCheckTextAndStyle, llPositions, llLines } validity;
+	enum class ValidLevel { invalid, checkTextAndStyle, positions, lines } validity;
 	int xHighlightGuide;
 	bool highlightColumn;
 	bool containsCaret;
@@ -97,22 +97,22 @@
 	void Resize(int maxLineLength_);
 	void EnsureBidiData();
 	void Free() noexcept;
-	void Invalidate(validLevel validity_);
-	int LineStart(int line) const;
-	int LineLength(int line) const;
+	void Invalidate(ValidLevel validity_) 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;
-	Range SubLineRange(int subLine, Scope scope) const;
-	bool InLine(int offset, int line) const;
-	int SubLineFromPosition(int posInLine, PointEnd pe) const;
+	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;
-	int FindPositionFromX(XYPOSITION x, Range range, bool charPosition) const;
-	Point PointFromPosition(int posInLine, int lineHeight, PointEnd pe) const;
-	int EndLineStyle() const;
+	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 {
@@ -170,7 +170,7 @@
 		llcPage=SC_CACHE_PAGE,
 		llcDocument=SC_CACHE_DOCUMENT
 	};
-	void Invalidate(LineLayout::validLevel validity_);
+	void Invalidate(LineLayout::ValidLevel validity_) noexcept;
 	void SetLevel(int level_) noexcept;
 	int GetLevel() const noexcept { return level; }
 	LineLayout *Retrieve(Sci::Line lineNumber, Sci::Line lineCaret, int maxChars, int styleClock_,
@@ -194,7 +194,7 @@
 	~PositionCacheEntry();
 	void Set(unsigned int styleNumber_, const char *s_, unsigned int len_, const XYPOSITION *positions_, unsigned int clock_);
 	void Clear() noexcept;
-	bool Retrieve(unsigned int styleNumber_, const char *s_, unsigned int len_, XYPOSITION *positions_) const;
+	bool Retrieve(unsigned int styleNumber_, const char *s_, unsigned int len_, XYPOSITION *positions_) const noexcept;
 	static unsigned int Hash(unsigned int styleNumber_, const char *s, unsigned int len_) noexcept;
 	bool NewerThan(const PositionCacheEntry &other) const noexcept;
 	void ResetClock() noexcept;
diff -Nru scite-4.3.3/scintilla/src/Selection.cxx scite-4.4.4/scintilla/src/Selection.cxx
--- scite-4.3.3/scintilla/src/Selection.cxx	2019-12-06 20:39:05.000000000 +0000
+++ scite-4.4.4/scintilla/src/Selection.cxx	2020-07-18 05:40:22.000000000 +0000
@@ -202,11 +202,11 @@
 	return (selType == selRectangle) || (selType == selThin);
 }
 
-Sci::Position Selection::MainCaret() const {
+Sci::Position Selection::MainCaret() const noexcept {
 	return ranges[mainRange].caret.Position();
 }
 
-Sci::Position Selection::MainAnchor() const {
+Sci::Position Selection::MainAnchor() const noexcept {
 	return ranges[mainRange].anchor.Position();
 }
 
@@ -214,7 +214,7 @@
 	return rangeRectangular;
 }
 
-SelectionSegment Selection::Limits() const {
+SelectionSegment Selection::Limits() const noexcept {
 	if (ranges.empty()) {
 		return SelectionSegment();
 	} else {
@@ -248,23 +248,23 @@
 	mainRange = r;
 }
 
-SelectionRange &Selection::Range(size_t r) {
+SelectionRange &Selection::Range(size_t r) noexcept {
 	return ranges[r];
 }
 
-const SelectionRange &Selection::Range(size_t r) const {
+const SelectionRange &Selection::Range(size_t r) const noexcept {
 	return ranges[r];
 }
 
-SelectionRange &Selection::RangeMain() {
+SelectionRange &Selection::RangeMain() noexcept {
 	return ranges[mainRange];
 }
 
-const SelectionRange &Selection::RangeMain() const {
+const SelectionRange &Selection::RangeMain() const noexcept {
 	return ranges[mainRange];
 }
 
-SelectionPosition Selection::Start() const {
+SelectionPosition Selection::Start() const noexcept {
 	if (IsRectangular()) {
 		return rangeRectangular.Start();
 	} else {
@@ -316,7 +316,7 @@
 	}
 }
 
-void Selection::TrimSelection(SelectionRange range) {
+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
@@ -332,7 +332,7 @@
 	}
 }
 
-void Selection::TrimOtherSelections(size_t r, SelectionRange range) {
+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);
@@ -391,7 +391,7 @@
 	tentativeMain = false;
 }
 
-int Selection::CharacterInSelection(Sci::Position posCharacter) const {
+int Selection::CharacterInSelection(Sci::Position posCharacter) const noexcept {
 	for (size_t i=0; i<ranges.size(); i++) {
 		if (ranges[i].ContainsCharacter(posCharacter))
 			return i == mainRange ? 1 : 2;
@@ -399,7 +399,7 @@
 	return 0;
 }
 
-int Selection::InSelectionForEOL(Sci::Position pos) const {
+int 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 i == mainRange ? 1 : 2;
diff -Nru scite-4.3.3/scintilla/src/Selection.h scite-4.4.4/scintilla/src/Selection.h
--- scite-4.3.3/scintilla/src/Selection.h	2019-12-06 20:39:05.000000000 +0000
+++ scite-4.4.4/scintilla/src/Selection.h	2020-07-18 05:40:22.000000000 +0000
@@ -147,10 +147,10 @@
 	Selection();
 	~Selection();
 	bool IsRectangular() const noexcept;
-	Sci::Position MainCaret() const;
-	Sci::Position MainAnchor() const;
+	Sci::Position MainCaret() const noexcept;
+	Sci::Position MainAnchor() const noexcept;
 	SelectionRange &Rectangular() noexcept;
-	SelectionSegment Limits() const;
+	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.
@@ -158,19 +158,19 @@
 	size_t Count() const noexcept;
 	size_t Main() const noexcept;
 	void SetMain(size_t r) noexcept;
-	SelectionRange &Range(size_t r);
-	const SelectionRange &Range(size_t r) const;
-	SelectionRange &RangeMain();
-	const SelectionRange &RangeMain() const;
-	SelectionPosition Start() const;
+	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);
-	void TrimOtherSelections(size_t r, SelectionRange range);
+	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);
@@ -178,8 +178,8 @@
 	void DropAdditionalRanges();
 	void TentativeSelection(SelectionRange range);
 	void CommitTentative() noexcept;
-	int CharacterInSelection(Sci::Position posCharacter) const;
-	int InSelectionForEOL(Sci::Position pos) const;
+	int CharacterInSelection(Sci::Position posCharacter) const noexcept;
+	int InSelectionForEOL(Sci::Position pos) const noexcept;
 	Sci::Position VirtualSpaceFor(Sci::Position pos) const noexcept;
 	void Clear();
 	void RemoveDuplicates();
diff -Nru scite-4.3.3/scintilla/src/SplitVector.h scite-4.4.4/scintilla/src/SplitVector.h
--- scite-4.3.3/scintilla/src/SplitVector.h	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/src/SplitVector.h	2020-05-31 23:08:11.000000000 +0000
@@ -206,11 +206,12 @@
 	/// 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.
-	void InsertEmpty(ptrdiff_t position, ptrdiff_t insertLength) {
+	/// 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;
+				return nullptr;
 			}
 			RoomFor(insertLength);
 			GapTo(position);
@@ -222,6 +223,7 @@
 			part1Length += insertLength;
 			gapLength -= insertLength;
 		}
+		return body.data() + position;
 	}
 
 	/// Ensure at least length elements allocated,
diff -Nru scite-4.3.3/scintilla/src/UniConversion.cxx scite-4.4.4/scintilla/src/UniConversion.cxx
--- scite-4.3.3/scintilla/src/UniConversion.cxx	2019-06-28 23:50:36.000000000 +0000
+++ scite-4.4.4/scintilla/src/UniConversion.cxx	2020-07-18 05:40:22.000000000 +0000
@@ -49,7 +49,7 @@
 	return positionUTF8;
 }
 
-void UTF8FromUTF16(std::wstring_view wsv, char *putf, size_t len) {
+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];
diff -Nru scite-4.3.3/scintilla/src/UniConversion.h scite-4.4.4/scintilla/src/UniConversion.h
--- scite-4.3.3/scintilla/src/UniConversion.h	2020-03-15 08:36:56.000000000 +0000
+++ scite-4.4.4/scintilla/src/UniConversion.h	2020-07-18 05:40:22.000000000 +0000
@@ -16,7 +16,7 @@
 
 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);
+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);
@@ -75,6 +75,13 @@
 	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 };
diff -Nru scite-4.3.3/scintilla/src/ViewStyle.cxx scite-4.4.4/scintilla/src/ViewStyle.cxx
--- scite-4.3.3/scintilla/src/ViewStyle.cxx	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/src/ViewStyle.cxx	2020-07-18 05:40:22.000000000 +0000
@@ -129,6 +129,8 @@
 	marginStyleOffset = source.marginStyleOffset;
 	annotationVisible = source.annotationVisible;
 	annotationStyleOffset = source.annotationStyleOffset;
+	eolAnnotationVisible = source.eolAnnotationVisible;
+	eolAnnotationStyleOffset = source.eolAnnotationStyleOffset;
 	braceHighlightIndicatorSet = source.braceHighlightIndicatorSet;
 	braceHighlightIndicator = source.braceHighlightIndicator;
 	braceBadLightIndicatorSet = source.braceBadLightIndicatorSet;
@@ -154,7 +156,7 @@
 	fonts.clear();
 }
 
-void ViewStyle::CalculateMarginWidthAndMask() {
+void ViewStyle::CalculateMarginWidthAndMask() noexcept {
 	fixedColumnWidth = marginInside ? leftMarginWidth : 0;
 	maskInLine = 0xffffffff;
 	int maskDefinedMarkers = 0;
@@ -262,6 +264,8 @@
 	marginStyleOffset = 0;
 	annotationVisible = ANNOTATION_HIDDEN;
 	annotationStyleOffset = 0;
+	eolAnnotationVisible = EOLANNOTATION_HIDDEN;
+	eolAnnotationStyleOffset = 0;
 	braceHighlightIndicatorSet = false;
 	braceHighlightIndicator = 0;
 	braceBadLightIndicatorSet = false;
@@ -274,7 +278,7 @@
 	ctrlCharPadding = 3; // +3 For a blank on front and rounded edge each side
 	lastSegItalicsOffset = 2;
 
-	wrapState = eWrapNone;
+	wrapState = WrapMode::none;
 	wrapVisualFlags = 0;
 	wrapVisualFlagsLocation = 0;
 	wrapVisualStartIndent = 0;
@@ -310,10 +314,10 @@
 	}
 
 	indicatorsDynamic = std::any_of(indicators.cbegin(), indicators.cend(),
-		[](const Indicator &indicator) { return indicator.IsDynamic(); });
+		[](const Indicator &indicator) noexcept { return indicator.IsDynamic(); });
 
 	indicatorsSetFore = std::any_of(indicators.cbegin(), indicators.cend(),
-		[](const Indicator &indicator) { return indicator.OverridesTextFore(); });
+		[](const Indicator &indicator) noexcept { return indicator.OverridesTextFore(); });
 
 	maxAscent = 1;
 	maxDescent = 1;
@@ -328,10 +332,10 @@
 		lineOverlap = lineHeight;
 
 	someStylesProtected = std::any_of(styles.cbegin(), styles.cend(),
-		[](const Style &style) { return style.IsProtected(); });
+		[](const Style &style) noexcept { return style.IsProtected(); });
 
 	someStylesForceCase = std::any_of(styles.cbegin(), styles.cend(),
-		[](const Style &style) { return style.caseForce != Style::caseMixed; });
+		[](const Style &style) noexcept { return style.caseForce != Style::caseMixed; });
 
 	aveCharWidth = styles[STYLE_DEFAULT].aveCharWidth;
 	spaceWidth = styles[STYLE_DEFAULT].spaceWidth;
@@ -401,7 +405,7 @@
 	return marginInside ? 0 : fixedColumnWidth;
 }
 
-int ViewStyle::MarginFromLocation(Point pt) const {
+int ViewStyle::MarginFromLocation(Point pt) const noexcept {
 	int margin = -1;
 	int x = marginInside ? 0 : -fixedColumnWidth;
 	for (size_t i = 0; i < ms.size(); i++) {
@@ -416,7 +420,7 @@
 	return styleIndex < styles.size();
 }
 
-void ViewStyle::CalcLargestMarkerHeight() {
+void ViewStyle::CalcLargestMarkerHeight() noexcept {
 	largestMarkerHeight = 0;
 	for (const LineMarker &marker : markers) {
 		switch (marker.markType) {
@@ -447,7 +451,7 @@
 // display itself (as long as it's not an SC_MARK_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.
-ColourOptional ViewStyle::Background(int marksOfLine, bool caretActive, bool lineContainsCaret) const {
+ColourOptional ViewStyle::Background(int marksOfLine, bool caretActive, bool lineContainsCaret) const noexcept {
 	ColourOptional background;
 	if (!caretLineFrame && (caretActive || alwaysShowCaretLineBackground) && showCaretLineBackground &&
 		(caretLineAlpha == SC_ALPHA_NOALPHA) && lineContainsCaret) {
@@ -493,7 +497,7 @@
 		viewWhitespace == wsVisibleAlways;
 }
 
-ColourDesired ViewStyle::WrapColour() const {
+ColourDesired ViewStyle::WrapColour() const noexcept {
 	if (whitespaceColours.fore.isSet)
 		return whitespaceColours.fore;
 	else
@@ -504,16 +508,16 @@
 	WrapMode wrapStateWanted;
 	switch (wrapState_) {
 	case SC_WRAP_WORD:
-		wrapStateWanted = eWrapWord;
+		wrapStateWanted = WrapMode::word;
 		break;
 	case SC_WRAP_CHAR:
-		wrapStateWanted = eWrapChar;
+		wrapStateWanted = WrapMode::character;
 		break;
 	case SC_WRAP_WHITESPACE:
-		wrapStateWanted = eWrapWhitespace;
+		wrapStateWanted = WrapMode::whitespace;
 		break;
 	default:
-		wrapStateWanted = eWrapNone;
+		wrapStateWanted = WrapMode::none;
 		break;
 	}
 	const bool changed = wrapState != wrapStateWanted;
diff -Nru scite-4.3.3/scintilla/src/ViewStyle.h scite-4.4.4/scintilla/src/ViewStyle.h
--- scite-4.3.3/scintilla/src/ViewStyle.h	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/src/ViewStyle.h	2020-07-18 05:40:22.000000000 +0000
@@ -48,7 +48,7 @@
 
 typedef std::map<FontSpecification, std::unique_ptr<FontRealised>> FontMap;
 
-enum WrapMode { eWrapNone, eWrapWord, eWrapChar, eWrapWhitespace };
+enum class WrapMode { none, word, character, whitespace };
 
 class ColourOptional : public ColourDesired {
 public:
@@ -145,6 +145,8 @@
 	int marginStyleOffset;
 	int annotationVisible;
 	int annotationStyleOffset;
+	int eolAnnotationVisible;
+	int eolAnnotationStyleOffset;
 	bool braceHighlightIndicatorSet;
 	int braceHighlightIndicator;
 	bool braceBadLightIndicatorSet;
@@ -170,7 +172,7 @@
 	ViewStyle &operator=(const ViewStyle &) = delete;
 	ViewStyle &operator=(ViewStyle &&) = delete;
 	~ViewStyle();
-	void CalculateMarginWidthAndMask();
+	void CalculateMarginWidthAndMask() noexcept;
 	void Init(size_t stylesSize_=256);
 	void Refresh(Surface &surface, int tabInChars);
 	void ReleaseAllExtendedStyles() noexcept;
@@ -181,15 +183,15 @@
 	void SetStyleFontName(int styleIndex, const char *name);
 	bool ProtectionActive() const noexcept;
 	int ExternalMarginWidth() const noexcept;
-	int MarginFromLocation(Point pt) const;
+	int MarginFromLocation(Point pt) const noexcept;
 	bool ValidStyle(size_t styleIndex) const noexcept;
-	void CalcLargestMarkerHeight();
+	void CalcLargestMarkerHeight() noexcept;
 	int GetFrameWidth() const noexcept;
 	bool IsLineFrameOpaque(bool caretActive, bool lineContainsCaret) const noexcept;
-	ColourOptional Background(int marksOfLine, bool caretActive, bool lineContainsCaret) const;
+	ColourOptional Background(int marksOfLine, bool caretActive, bool lineContainsCaret) const noexcept;
 	bool SelectionBackgroundDrawn() const noexcept;
 	bool WhitespaceBackgroundDrawn() const noexcept;
-	ColourDesired WrapColour() const;
+	ColourDesired WrapColour() const noexcept;
 
 	bool SetWrapState(int wrapState_) noexcept;
 	bool SetWrapVisualFlags(int wrapVisualFlags_) noexcept;
diff -Nru scite-4.3.3/scintilla/test/unit/makefile scite-4.4.4/scintilla/test/unit/makefile
--- scite-4.3.3/scintilla/test/unit/makefile	2019-06-28 23:50:36.000000000 +0000
+++ scite-4.4.4/scintilla/test/unit/makefile	2020-05-31 23:08:11.000000000 +0000
@@ -3,7 +3,7 @@
 # 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 3.3 and g++ 4.8
+# Tested with clang 9 and g++ 9
 
 CXXSTD=c++17
 
@@ -54,6 +54,7 @@
  ../../src/CharClassify.cxx \
  ../../src/ContractionState.cxx \
  ../../src/Decoration.cxx \
+ ../../src/PerLine.cxx \
  ../../src/RunStyles.cxx \
  ../../src/UniConversion.cxx \
  ../../src/UniqueString.cxx
diff -Nru scite-4.3.3/scintilla/test/unit/test.mak scite-4.4.4/scintilla/test/unit/test.mak
--- scite-4.3.3/scintilla/test/unit/test.mak	2019-06-28 23:50:36.000000000 +0000
+++ scite-4.4.4/scintilla/test/unit/test.mak	2020-05-31 23:08:11.000000000 +0000
@@ -1,5 +1,5 @@
 # Build all the unit tests with Microsoft Visual C++ using nmake
-# Tested with Visual C++ 2010 and 2013
+# Tested with Visual C++ 2019
 
 DEL = del /q
 EXE = unitTest.exe
@@ -17,6 +17,7 @@
  ../../src/CharClassify.cxx \
  ../../src/ContractionState.cxx \
  ../../src/Decoration.cxx \
+ ../../src/PerLine.cxx \
  ../../src/RunStyles.cxx \
  ../../src/UniConversion.cxx \
  ../../src/UniqueString.cxx
diff -Nru scite-4.3.3/scintilla/test/unit/testPartitioning.cxx scite-4.4.4/scintilla/test/unit/testPartitioning.cxx
--- scite-4.3.3/scintilla/test/unit/testPartitioning.cxx	2018-05-14 09:47:30.000000000 +0000
+++ scite-4.4.4/scintilla/test/unit/testPartitioning.cxx	2020-05-31 23:08:11.000000000 +0000
@@ -95,6 +95,32 @@
 		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);
diff -Nru scite-4.3.3/scintilla/test/unit/testPerLine.cxx scite-4.4.4/scintilla/test/unit/testPerLine.cxx
--- scite-4.3.3/scintilla/test/unit/testPerLine.cxx	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scintilla/test/unit/testPerLine.cxx	2020-05-31 23:08:11.000000000 +0000
@@ -0,0 +1,363 @@
+// Unit Tests for Scintilla internal data structures
+
+#include <cstddef>
+#include <cstring>
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <forward_list>
+#include <algorithm>
+#include <memory>
+
+#include "Platform.h"
+
+#include "Scintilla.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;
+
+// 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(SC_FOLDLEVELBASE == ll.GetLevel(0));
+	}
+
+	SECTION("SetLevel") {
+		REQUIRE(SC_FOLDLEVELBASE == ll.SetLevel(1, 200, 5));
+		REQUIRE(SC_FOLDLEVELBASE == ll.GetLevel(0));
+		REQUIRE(200 == ll.GetLevel(1));
+		REQUIRE(SC_FOLDLEVELBASE == ll.GetLevel(2));
+		ll.ClearLevels();
+		REQUIRE(SC_FOLDLEVELBASE == ll.GetLevel(1));
+		ll.ExpandLevels(5);
+		REQUIRE(SC_FOLDLEVELBASE == ll.GetLevel(7));
+	}
+
+	SECTION("InsertRemoveLine") {
+		ll.SetLevel(1, 1, 5);
+		ll.SetLevel(2, 2, 5);
+		ll.InsertLine(2);
+		REQUIRE(SC_FOLDLEVELBASE == ll.GetLevel(0));
+		REQUIRE(1 == ll.GetLevel(1));
+		REQUIRE(2 == ll.GetLevel(2));
+		REQUIRE(2 == ll.GetLevel(3));
+		REQUIRE(SC_FOLDLEVELBASE == ll.GetLevel(4));
+		ll.RemoveLine(2);
+		REQUIRE(SC_FOLDLEVELBASE == ll.GetLevel(0));
+		REQUIRE(1 == ll.GetLevel(1));
+		REQUIRE(2 == ll.GetLevel(2));
+		REQUIRE(SC_FOLDLEVELBASE == ll.GetLevel(3));
+		ll.InsertLines(2, 2);
+		REQUIRE(SC_FOLDLEVELBASE == ll.GetLevel(0));
+		REQUIRE(1 == ll.GetLevel(1));
+		REQUIRE(2 == ll.GetLevel(2));
+		REQUIRE(2 == ll.GetLevel(3));
+		REQUIRE(2 == ll.GetLevel(4));
+		REQUIRE(SC_FOLDLEVELBASE == 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 -Nru scite-4.3.3/scintilla/test/unit/testSplitVector.cxx scite-4.4.4/scintilla/test/unit/testSplitVector.cxx
--- scite-4.3.3/scintilla/test/unit/testSplitVector.cxx	2018-07-10 05:40:50.000000000 +0000
+++ scite-4.4.4/scintilla/test/unit/testSplitVector.cxx	2020-05-31 23:08:11.000000000 +0000
@@ -168,6 +168,27 @@
 		}
 	}
 
+	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);
diff -Nru scite-4.3.3/scintilla/test/unit/UnitTester.vcxproj scite-4.4.4/scintilla/test/unit/UnitTester.vcxproj
--- scite-4.3.3/scintilla/test/unit/UnitTester.vcxproj	2019-12-06 20:39:05.000000000 +0000
+++ scite-4.4.4/scintilla/test/unit/UnitTester.vcxproj	2020-05-31 23:08:11.000000000 +0000
@@ -155,6 +155,7 @@
     <ClCompile Include="..\..\src\CharClassify.cxx" />
     <ClCompile Include="..\..\src\ContractionState.cxx" />
     <ClCompile Include="..\..\src\Decoration.cxx" />
+    <ClCompile Include="..\..\src\PerLine.cxx" />
     <ClCompile Include="..\..\src\RunStyles.cxx" />
     <ClCompile Include="..\..\src\UniConversion.cxx" />
     <ClCompile Include="..\..\src\UniqueString.cxx" />
diff -Nru scite-4.3.3/scintilla/test/win32Tests.py scite-4.4.4/scintilla/test/win32Tests.py
--- scite-4.3.3/scintilla/test/win32Tests.py	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/test/win32Tests.py	2020-07-18 05:40:22.000000000 +0000
@@ -130,6 +130,19 @@
 		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")
diff -Nru scite-4.3.3/scintilla/version.txt scite-4.4.4/scintilla/version.txt
--- scite-4.3.3/scintilla/version.txt	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/version.txt	2020-07-18 05:40:22.000000000 +0000
@@ -1 +1 @@
-433
+444
diff -Nru scite-4.3.3/scintilla/win32/makefile scite-4.4.4/scintilla/win32/makefile
--- scite-4.3.3/scintilla/win32/makefile	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/win32/makefile	2020-05-31 23:08:11.000000000 +0000
@@ -163,7 +163,7 @@
 $(LEXCOMPONENT): $(LEXCOMPONENT_OBJS)
 	$(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $^ $(CXXFLAGS) $(LIBS)
 
-$(LIBSCI): $(SCILEX_OBJS)
+$(LIBSCI): $(COMPONENT_OBJS)
 	$(AR) $(ARFLAGS) $@ $^
 	$(RANLIB) $@
 
diff -Nru scite-4.3.3/scintilla/win32/PlatWin.cxx scite-4.4.4/scintilla/win32/PlatWin.cxx
--- scite-4.3.3/scintilla/win32/PlatWin.cxx	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/win32/PlatWin.cxx	2020-07-18 05:40:22.000000000 +0000
@@ -18,7 +18,9 @@
 #include <vector>
 #include <map>
 #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)
@@ -65,7 +67,7 @@
 
 namespace Scintilla {
 
-UINT CodePageFromCharSet(DWORD characterSet, UINT documentCodePage);
+UINT CodePageFromCharSet(DWORD characterSet, UINT documentCodePage) noexcept;
 
 #if defined(USE_D2D)
 IDWriteFactory *pIDWriteFactory = nullptr;
@@ -77,79 +79,76 @@
 static HMODULE hDLLD2D {};
 static HMODULE hDLLDWrite {};
 
-bool LoadD2D() {
-	static bool triedLoadingD2D = false;
-	if (!triedLoadingD2D) {
-		DWORD loadLibraryFlags = 0;
-		HMODULE kernel32 = ::GetModuleHandle(TEXT("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;
-			}
+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);
-		if (hDLLD2D) {
-			D2D1CFSig fnD2DCF = reinterpret_cast<D2D1CFSig>(::GetProcAddress(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);
-		if (hDLLDWrite) {
-			DWriteCFSig fnDWCF = reinterpret_cast<DWriteCFSig>(::GetProcAddress(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));
-				}
-			}
+	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;
-				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();
+	if (pIDWriteFactory) {
+		const HRESULT hr = pIDWriteFactory->CreateRenderingParams(&defaultRenderingParams);
+		if (SUCCEEDED(hr)) {
+			unsigned int clearTypeContrast;
+			if (::SystemParametersInfo(SPI_GETFONTSMOOTHINGCONTRAST, 0, &clearTypeContrast, 0)) {
 
-					pIDWriteFactory->CreateCustomRenderingParams(gamma, defaultRenderingParams->GetEnhancedContrast(), defaultRenderingParams->GetClearTypeLevel(),
-						defaultRenderingParams->GetPixelGeometry(), defaultRenderingParams->GetRenderingMode(), &customClearTypeRenderingParams);
-				}
+				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);
 			}
 		}
-
 	}
-	triedLoadingD2D = true;
+}
+
+bool LoadD2D() {
+	static std::once_flag once;
+	std::call_once(once, LoadD2DOnce);
 	return pIDWriteFactory && pD2DFactory;
 }
+
 #endif
 
 struct FormatAndMetrics {
@@ -196,9 +195,7 @@
 		if (hfont)
 			::DeleteObject(hfont);
 #if defined(USE_D2D)
-		if (pTextFormat)
-			pTextFormat->Release();
-		pTextFormat = nullptr;
+		ReleaseUnknown(pTextFormat);
 #endif
 		extraFontFlag = 0;
 		characterSet = 0;
@@ -206,10 +203,10 @@
 		yDescent = 1;
 		yInternalLeading = 0;
 	}
-	HFONT HFont();
+	HFONT HFont() noexcept;
 };
 
-HFONT FormatAndMetrics::HFont() {
+HFONT FormatAndMetrics::HFont() noexcept {
 	LOGFONTW lf = {};
 #if defined(USE_D2D)
 	if (technology == SCWIN_TECH_GDI) {
@@ -247,9 +244,47 @@
 
 namespace {
 
-HINSTANCE hinstPlatformRes {};
+// 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");
+		}
+	}
+}
 
-HCURSOR reverseArrowCursor {};
+HINSTANCE hinstPlatformRes {};
 
 FormatAndMetrics *FamFromFontID(void *fid) noexcept {
 	return static_cast<FormatAndMetrics *>(fid);
@@ -328,7 +363,7 @@
 			IDWriteTextLayout *pTextLayout = nullptr;
 			hr = pIDWriteFactory->CreateTextLayout(L"X", 1, pTextFormat,
 					100.0f, 100.0f, &pTextLayout);
-			if (SUCCEEDED(hr)) {
+			if (SUCCEEDED(hr) && pTextLayout) {
 				constexpr int maxLines = 2;
 				DWRITE_LINE_METRICS lineMetrics[maxLines]{};
 				UINT32 lineCount = 0;
@@ -343,7 +378,7 @@
 						yInternalLeading = lineMetrics[0].height - emHeight;
 					}
 				}
-				pTextLayout->Release();
+				ReleaseUnknown(pTextLayout);
 				pTextFormat->SetLineSpacing(DWRITE_LINE_SPACING_METHOD_UNIFORM, lineMetrics[0].height, lineMetrics[0].baseline);
 			}
 			fid = new FormatAndMetrics(pTextFormat, fp.extraFontFlag, fp.characterSet, yAscent, yDescent, yInternalLeading);
@@ -419,6 +454,31 @@
 };
 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 {
 	bool unicodeMode=false;
 	HDC hdc{};
@@ -430,6 +490,9 @@
 	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;
@@ -541,20 +604,24 @@
 	return hdc != 0;
 }
 
-void SurfaceGDI::Init(WindowID) {
+void SurfaceGDI::Init(WindowID wid) {
 	Release();
 	hdc = ::CreateCompatibleDC({});
 	hdcOwned = true;
 	::SetTextAlign(hdc, TA_BASELINE);
+	logPixelsY = DpiForWindow(wid);
 }
 
-void SurfaceGDI::Init(SurfaceID sid, WindowID) {
+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);
 }
 
-void SurfaceGDI::InitPixMap(int width, int height, Surface *surface_, WindowID) {
+void SurfaceGDI::InitPixMap(int width, int height, Surface *surface_, WindowID wid) {
 	Release();
 	SurfaceGDI *psurfOther = dynamic_cast<SurfaceGDI *>(surface_);
 	// Should only ever be called with a SurfaceGDI, not a SurfaceD2D
@@ -566,6 +633,7 @@
 	::SetTextAlign(hdc, TA_BASELINE);
 	SetUnicodeMode(psurfOther->unicodeMode);
 	SetDBCSMode(psurfOther->codePage);
+	logPixelsY = DpiForWindow(wid);
 }
 
 void SurfaceGDI::PenColour(ColourDesired fore) {
@@ -586,9 +654,7 @@
 		brush = {};
 		brushOld = {};
 	}
-	// Only ever want pure, non-dithered brushes
-	const ColourDesired colourNearest = ColourDesired(::GetNearestColor(hdc, back.AsInteger()));
-	brush = ::CreateSolidBrush(colourNearest.AsInteger());
+	brush = ::CreateSolidBrush(back.AsInteger());
 	brushOld = SelectBrush(hdc, brush);
 }
 
@@ -603,7 +669,7 @@
 }
 
 int SurfaceGDI::LogPixelsY() {
-	return ::GetDeviceCaps(hdc, LOGPIXELSY);
+	return logPixelsY;
 }
 
 int SurfaceGDI::DeviceHeightFont(int points) {
@@ -622,11 +688,8 @@
 	PenColour(fore);
 	BrushColour(back);
 	std::vector<POINT> outline;
-	for (size_t i=0; i<npts; i++) {
-		POINT pt = POINTFromPoint(pts[i]);
-		outline.push_back(pt);
-	}
-	::Polygon(hdc, &outline[0], static_cast<int>(npts));
+	std::transform(pts, pts + npts, std::back_inserter(outline), POINTFromPoint);
+	::Polygon(hdc, outline.data(), static_cast<int>(npts));
 }
 
 void SurfaceGDI::RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired back) {
@@ -668,101 +731,224 @@
 
 namespace {
 
-// Plot a point into a DWORD buffer symmetrically to all 4 quadrants
-void AllFour(DWORD *pixels, int width, int height, int x, int y, DWORD val) noexcept {
-	pixels[y*width+x] = val;
-	pixels[y*width+width-1-x] = val;
-	pixels[(height-1-y)*width+x] = val;
-	pixels[(height-1-y)*width+width-1-x] = val;
-}
-
-DWORD dwordFromBGRA(byte b, byte g, byte r, byte a) noexcept {
-	union {
-		byte pixVal[4];
-		DWORD val;
-	} converter;
-	converter.pixVal[0] = b;
-	converter.pixVal[1] = g;
-	converter.pixVal[2] = r;
-	converter.pixVal[3] = a;
-	return converter.val;
+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);
 }
 
-DWORD dwordMultiplied(ColourDesired colour, unsigned int alpha) noexcept {
+constexpr DWORD dwordMultiplied(ColourDesired colour, unsigned int alpha) noexcept {
 	return dwordFromBGRA(
-		static_cast<byte>(colour.GetBlue() * alpha / 255),
-		static_cast<byte>(colour.GetGreen() * alpha / 255),
-		static_cast<byte>(colour.GetRed() * alpha / 255),
+		AlphaScaled(colour.GetBlue(), alpha),
+		AlphaScaled(colour.GetGreen(), alpha),
+		AlphaScaled(colour.GetRed(), alpha),
 		static_cast<byte>(alpha));
 }
 
+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, float t) noexcept {
+	return static_cast<unsigned int>(a + t * (b - a));
+}
+
+ColourAlpha Proportional(ColourAlpha a, ColourAlpha b, float t) noexcept {
+	return ColourAlpha(
+		Proportional(a.GetRed(), b.GetRed(), t),
+		Proportional(a.GetGreen(), b.GetGreen(), t),
+		Proportional(a.GetBlue(), b.GetBlue(), t),
+		Proportional(a.GetAlpha(), b.GetAlpha(), t));
+}
+
+ColourAlpha GradientValue(const std::vector<ColourStop> &stops, float proportion) noexcept {
+	for (size_t stop = 0; stop < stops.size() - 1; stop++) {
+		// Loop through each pair of stops
+		const float positionStart = stops[stop].position;
+		const float positionEnd = stops[stop + 1].position;
+		if ((proportion >= positionStart) && (proportion <= positionEnd)) {
+			const float proportionInPair = (proportion - positionStart) /
+				(positionEnd - positionStart);
+			return Proportional(stops[stop].colour, stops[stop + 1].colour, proportionInPair);
+		}
+	}
+	// Loop should always find a value
+	return ColourAlpha();
+}
+
+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, int cornerSize, ColourDesired fill, int alphaFill,
 		ColourDesired outline, int alphaOutline, int /* flags*/ ) {
 	const RECT rcw = RectFromPRectangle(rc);
-	if (rc.Width() > 0) {
-		HDC hMemDC = ::CreateCompatibleDC(hdc);
-		const int width = rcw.right - rcw.left;
-		const int height = rcw.bottom - rcw.top;
-		// Ensure not distorted too much by corners when small
-		cornerSize = std::min(cornerSize, (std::min(width, height) / 2) - 2);
-		const BITMAPINFO bpih = {{sizeof(BITMAPINFOHEADER), width, height, 1, 32, BI_RGB, 0, 0, 0, 0, 0},
-			{{0, 0, 0, 0}}};
-		void *image = nullptr;
-		HBITMAP hbmMem = CreateDIBSection(hMemDC, &bpih,
-			DIB_RGB_COLORS, &image, NULL, 0);
+	const SIZE size = SizeOfRect(rcw);
 
-		if (hbmMem) {
-			HBITMAP hbmOld = SelectBitmap(hMemDC, hbmMem);
+	if (size.cx > 0) {
 
-			const DWORD valEmpty = dwordFromBGRA(0,0,0,0);
+		DIBSection section(hdc, size);
+
+		if (section) {
+
+			// Ensure not distorted too much by corners when small
+			const LONG corner = std::min<LONG>(cornerSize, (std::min(size.cx, size.cy) / 2) - 2);
+
+			constexpr DWORD valEmpty = dwordFromBGRA(0,0,0,0);
 			const DWORD valFill = dwordMultiplied(fill, alphaFill);
 			const DWORD valOutline = dwordMultiplied(outline, alphaOutline);
 
-			DWORD *pixels = static_cast<DWORD *>(image);
-			for (int y=0; y<height; y++) {
-				for (int x=0; x<width; x++) {
-					if ((x==0) || (x==width-1) || (y == 0) || (y == height-1)) {
-						pixels[y*width+x] = valOutline;
+			// 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 {
-						pixels[y*width+x] = valFill;
+						section.SetPixel(x, y, valFill);
 					}
 				}
 			}
-			for (int c=0; c<cornerSize; c++) {
-				for (int x=0; x<c+1; x++) {
-					AllFour(pixels, width, height, x, c-x, valEmpty);
+
+			// 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);
 				}
 			}
-			for (int x=1; x<cornerSize; x++) {
-				AllFour(pixels, width, height, x, cornerSize-x, valOutline);
-			}
 
-			const BLENDFUNCTION merge = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA };
-
-			AlphaBlend(hdc, rcw.left, rcw.top, width, height, hMemDC, 0, 0, width, height, merge);
+			// Draw the corner frame pieces
+			for (LONG x=1; x<corner; x++) {
+				section.SetSymmetric(x, corner - x, valOutline);
+			}
 
-			SelectBitmap(hMemDC, hbmOld);
-			::DeleteObject(hbmMem);
+			AlphaBlend(hdc, rcw.left, rcw.top, size.cx, size.cy, section.DC(), 0, 0, size.cx, size.cy, mergeAlpha);
 		}
-		::DeleteDC(hMemDC);
 	} else {
 		BrushColour(outline);
 		FrameRect(hdc, &rcw, brush);
 	}
 }
 
-void SurfaceGDI::GradientRectangle(PRectangle rc, const std::vector<ColourStop> &stops, GradientOptions) {
-	// Would be better to average start and end.
-	const ColourAlpha colourAverage = stops[0].colour.MixedWith(stops[1].colour);
-	AlphaRectangle(rc, 0, colourAverage.GetColour(), colourAverage.GetAlpha(),
-		colourAverage.GetColour(), colourAverage.GetAlpha(), 0);
+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 float proportion = y / (rc.Height() - 1.0f);
+				const ColourAlpha mixed = GradientValue(stops, proportion);
+				const DWORD valFill = dwordMultiplied(mixed, mixed.GetAlpha());
+				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 float proportion = x / (rc.Width() - 1.0f);
+				const ColourAlpha mixed = GradientValue(stops, proportion);
+				const DWORD valFill = dwordMultiplied(mixed, mixed.GetAlpha());
+				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) {
-		HDC hMemDC = ::CreateCompatibleDC(hdc);
 		if (rc.Width() > width)
 			rc.left += std::floor((rc.Width() - width) / 2);
 		rc.right = rc.left + width;
@@ -770,31 +956,14 @@
 			rc.top += std::floor((rc.Height() - height) / 2);
 		rc.bottom = rc.top + height;
 
-		const BITMAPINFO bpih = {{sizeof(BITMAPINFOHEADER), width, height, 1, 32, BI_RGB, 0, 0, 0, 0, 0},
-			{{0, 0, 0, 0}}};
-		void *image = nullptr;
-		HBITMAP hbmMem = CreateDIBSection(hMemDC, &bpih,
-			DIB_RGB_COLORS, &image, NULL, 0);
-		if (hbmMem) {
-			HBITMAP hbmOld = SelectBitmap(hMemDC, hbmMem);
-
-			for (int y=height-1; y>=0; y--) {
-				// Bits flipped vertically
-				unsigned char *pixel = static_cast<unsigned char *>(image) + RGBAImage::bytesPerPixel * y * width;
-				RGBAImage::BGRAFromRGBA(pixel, pixelsImage, width);
-				pixelsImage += RGBAImage::bytesPerPixel * width;
-			}
-
-			const BLENDFUNCTION merge = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA };
-
+		const SIZE size { width, height };
+		DIBSection section(hdc, size);
+		if (section) {
+			RGBAImage::BGRAFromRGBA(section.Bytes(), pixelsImage, width * height);
 			AlphaBlend(hdc, static_cast<int>(rc.left), static_cast<int>(rc.top),
-				static_cast<int>(rc.Width()), static_cast<int>(rc.Height()), hMemDC, 0, 0, width, height, merge);
-
-			SelectBitmap(hMemDC, hbmOld);
-			::DeleteObject(hbmMem);
+				static_cast<int>(rc.Width()), static_cast<int>(rc.Height()), section.DC(),
+				0, 0, width, height, mergeAlpha);
 		}
-		::DeleteDC(hMemDC);
-
 	}
 }
 
@@ -850,8 +1019,8 @@
 void SurfaceGDI::DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, std::string_view text,
 	ColourDesired fore) {
 	// Avoid drawing spaces in transparent mode
-	for (size_t i=0; i<text.length(); i++) {
-		if (text[i] != ' ') {
+	for (const char ch : text) {
+		if (ch != ' ') {
 			::SetTextColor(hdc, fore.AsInteger());
 			::SetBkMode(hdc, TRANSPARENT);
 			DrawTextCommon(rc, font_, ybase, text, 0);
@@ -974,6 +1143,14 @@
 
 #if defined(USE_D2D)
 
+namespace {
+
+constexpr D2D1_RECT_F RectangleFromPRectangle(PRectangle rc) noexcept {
+	return { rc.left, rc.top, rc.right, rc.bottom };
+}
+
+}
+
 class BlobInline;
 
 class SurfaceD2D : public Surface {
@@ -996,11 +1173,9 @@
 	ID2D1SolidColorBrush *pBrush;
 
 	int logPixelsY;
-	float dpiScaleX;
-	float dpiScaleY;
 
 	void Clear() noexcept;
-	void SetFont(const Font &font_);
+	void SetFont(const Font &font_) noexcept;
 
 public:
 	SurfaceD2D() noexcept;
@@ -1011,7 +1186,7 @@
 	SurfaceD2D &operator=(SurfaceD2D &&) = delete;
 	~SurfaceD2D() override;
 
-	void SetScale();
+	void SetScale(WindowID wid) noexcept;
 	void Init(WindowID wid) override;
 	void Init(SurfaceID sid, WindowID wid) override;
 	void InitPixMap(int width, int height, Surface *surface_, WindowID wid) override;
@@ -1081,9 +1256,7 @@
 
 	pBrush = nullptr;
 
-	logPixelsY = 72;
-	dpiScaleX = 1.0;
-	dpiScaleY = 1.0;
+	logPixelsY = USER_DEFAULT_SCREEN_DPI;
 }
 
 SurfaceD2D::~SurfaceD2D() {
@@ -1091,10 +1264,7 @@
 }
 
 void SurfaceD2D::Clear() noexcept {
-	if (pBrush) {
-		pBrush->Release();
-		pBrush = nullptr;
-	}
+	ReleaseUnknown(pBrush);
 	if (pRenderTarget) {
 		while (clipsActive) {
 			pRenderTarget->PopAxisAlignedClip();
@@ -1102,7 +1272,7 @@
 		}
 		if (ownRenderTarget) {
 			pRenderTarget->EndDraw();
-			pRenderTarget->Release();
+			ReleaseUnknown(pRenderTarget);
 			ownRenderTarget = false;
 		}
 		pRenderTarget = nullptr;
@@ -1114,12 +1284,8 @@
 	Clear();
 }
 
-void SurfaceD2D::SetScale() {
-	HDC hdcMeasure = ::CreateCompatibleDC({});
-	logPixelsY = ::GetDeviceCaps(hdcMeasure, LOGPIXELSY);
-	dpiScaleX = ::GetDeviceCaps(hdcMeasure, LOGPIXELSX) / 96.0f;
-	dpiScaleY = logPixelsY / 96.0f;
-	::DeleteDC(hdcMeasure);
+void SurfaceD2D::SetScale(WindowID wid) noexcept {
+	logPixelsY = DpiForWindow(wid);
 }
 
 bool SurfaceD2D::Initialised() {
@@ -1130,20 +1296,20 @@
 	return pRenderTarget->Flush();
 }
 
-void SurfaceD2D::Init(WindowID /* wid */) {
+void SurfaceD2D::Init(WindowID wid) {
 	Release();
-	SetScale();
+	SetScale(wid);
 }
 
-void SurfaceD2D::Init(SurfaceID sid, WindowID) {
+void SurfaceD2D::Init(SurfaceID sid, WindowID wid) {
 	Release();
-	SetScale();
+	SetScale(wid);
 	pRenderTarget = static_cast<ID2D1RenderTarget *>(sid);
 }
 
-void SurfaceD2D::InitPixMap(int width, int height, Surface *surface_, WindowID) {
+void SurfaceD2D::InitPixMap(int width, int height, Surface *surface_, WindowID wid) {
 	Release();
-	SetScale();
+	SetScale(wid);
 	SurfaceD2D *psurfOther = dynamic_cast<SurfaceD2D *>(surface_);
 	// Should only ever be called with a SurfaceD2D, not a SurfaceGDI
 	PLATFORM_ASSERT(psurfOther);
@@ -1181,15 +1347,14 @@
 			pBrush->SetColor(col);
 		} else {
 			const HRESULT hr = pRenderTarget->CreateSolidColorBrush(col, &pBrush);
-			if (!SUCCEEDED(hr) && pBrush) {
-				pBrush->Release();
-				pBrush = nullptr;
+			if (!SUCCEEDED(hr)) {
+				ReleaseUnknown(pBrush);
 			}
 		}
 	}
 }
 
-void SurfaceD2D::SetFont(const Font &font_) {
+void SurfaceD2D::SetFont(const Font &font_) noexcept {
 	const FormatAndMetrics *pfm = FamFromFontID(font_.GetID());
 	PLATFORM_ASSERT(pfm->technology == SCWIN_TECH_DIRECTWRITE);
 	pTextFormat = pfm->pTextFormat;
@@ -1267,30 +1432,33 @@
 }
 
 void SurfaceD2D::Polygon(Point *pts, size_t npts, ColourDesired fore, ColourDesired back) {
+	PLATFORM_ASSERT(pRenderTarget && (npts > 2));
 	if (pRenderTarget) {
 		ID2D1Factory *pFactory = nullptr;
 		pRenderTarget->GetFactory(&pFactory);
-		ID2D1PathGeometry *geometry=nullptr;
+		PLATFORM_ASSERT(pFactory);
+		ID2D1PathGeometry *geometry = nullptr;
 		HRESULT hr = pFactory->CreatePathGeometry(&geometry);
-		if (SUCCEEDED(hr)) {
+		PLATFORM_ASSERT(geometry);
+		if (SUCCEEDED(hr) && geometry) {
 			ID2D1GeometrySink *sink = nullptr;
 			hr = geometry->Open(&sink);
-			if (SUCCEEDED(hr)) {
+			PLATFORM_ASSERT(sink);
+			if (SUCCEEDED(hr) && sink) {
 				sink->BeginFigure(D2D1::Point2F(pts[0].x + 0.5f, pts[0].y + 0.5f), D2D1_FIGURE_BEGIN_FILLED);
 				for (size_t i=1; i<npts; i++) {
 					sink->AddLine(D2D1::Point2F(pts[i].x + 0.5f, pts[i].y + 0.5f));
 				}
 				sink->EndFigure(D2D1_FIGURE_END_CLOSED);
 				sink->Close();
-				sink->Release();
+				ReleaseUnknown(sink);
 
 				D2DPenColour(back);
 				pRenderTarget->FillGeometry(geometry,pBrush);
 				D2DPenColour(fore);
 				pRenderTarget->DrawGeometry(geometry,pBrush);
 			}
-
-			geometry->Release();
+			ReleaseUnknown(geometry);
 		}
 	}
 }
@@ -1308,8 +1476,8 @@
 void SurfaceD2D::FillRectangle(PRectangle rc, ColourDesired back) {
 	if (pRenderTarget) {
 		D2DPenColour(back);
-        const D2D1_RECT_F rectangle1 = D2D1::RectF(std::round(rc.left), rc.top, std::round(rc.right), rc.bottom);
-        pRenderTarget->FillRectangle(&rectangle1, pBrush);
+		const D2D1_RECT_F rectangle1 = D2D1::RectF(std::round(rc.left), rc.top, std::round(rc.right), rc.bottom);
+		pRenderTarget->FillRectangle(&rectangle1, pBrush);
 	}
 }
 
@@ -1319,19 +1487,19 @@
 	psurfOther->FlushDrawing();
 	ID2D1Bitmap *pBitmap = nullptr;
 	HRESULT hr = psurfOther->pBitmapRenderTarget->GetBitmap(&pBitmap);
-	if (SUCCEEDED(hr)) {
+	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);
-		pBitmap->Release();
-		if (SUCCEEDED(hr)) {
+		ReleaseUnknown(pBitmap);
+		if (SUCCEEDED(hr) && pBitmapBrush) {
 			pRenderTarget->FillRectangle(
 				D2D1::RectF(rc.left, rc.top, rc.right, rc.bottom),
 				pBitmapBrush);
-			pBitmapBrush->Release();
+			ReleaseUnknown(pBitmapBrush);
 		}
 	}
 }
@@ -1415,18 +1583,18 @@
 		ID2D1GradientStopCollection *pGradientStops = nullptr;
 		HRESULT hr = pRenderTarget->CreateGradientStopCollection(
 			gradientStops.data(), static_cast<UINT32>(gradientStops.size()), &pGradientStops);
-		if (FAILED(hr)) {
+		if (FAILED(hr) || !pGradientStops) {
 			return;
 		}
 		ID2D1LinearGradientBrush *pBrushLinear = nullptr;
 		hr = pRenderTarget->CreateLinearGradientBrush(
 			lgbp, pGradientStops, &pBrushLinear);
-		if (SUCCEEDED(hr)) {
+		if (SUCCEEDED(hr) && pBrushLinear) {
 			const D2D1_RECT_F rectangle = D2D1::RectF(std::round(rc.left), rc.top, std::round(rc.right), rc.bottom);
 			pRenderTarget->FillRectangle(&rectangle, pBrushLinear);
-			pBrushLinear->Release();
+			ReleaseUnknown(pBrushLinear);
 		}
-		pGradientStops->Release();
+		ReleaseUnknown(pGradientStops);
 	}
 }
 
@@ -1446,12 +1614,12 @@
 		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[0],
+		const HRESULT hr = pRenderTarget->CreateBitmap(size, image.data(),
                   width * 4, &props, &bitmap);
 		if (SUCCEEDED(hr)) {
-			D2D1_RECT_F rcDestination = {rc.left, rc.top, rc.right, rc.bottom};
+			const D2D1_RECT_F rcDestination = RectangleFromPRectangle(rc);
 			pRenderTarget->DrawBitmap(bitmap, rcDestination);
-			bitmap->Release();
+			ReleaseUnknown(bitmap);
 		}
 	}
 }
@@ -1475,10 +1643,11 @@
 	surfOther.FlushDrawing();
 	ID2D1BitmapRenderTarget *pCompatibleRenderTarget = reinterpret_cast<ID2D1BitmapRenderTarget *>(
 		surfOther.pRenderTarget);
+	PLATFORM_ASSERT(pCompatibleRenderTarget);
 	ID2D1Bitmap *pBitmap = nullptr;
 	HRESULT hr = pCompatibleRenderTarget->GetBitmap(&pBitmap);
 	if (SUCCEEDED(hr)) {
-		D2D1_RECT_F rcDestination = {rc.left, rc.top, rc.right, rc.bottom};
+		const D2D1_RECT_F rcDestination = RectangleFromPRectangle(rc);
 		D2D1_RECT_F rcSource = {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);
@@ -1486,7 +1655,7 @@
 		if (FAILED(hr)) {
 			Platform::DebugPrintf("Failed Flush 0x%lx\n", hr);
 		}
-		pBitmap->Release();
+		ReleaseUnknown(pBitmap);
 	}
 }
 
@@ -1527,6 +1696,8 @@
 
 /// 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)
@@ -1566,6 +1737,8 @@
 COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE BlobInline::GetMetrics(
 	DWRITE_INLINE_OBJECT_METRICS *metrics
 ) {
+	if (!metrics)
+		return E_POINTER;
 	metrics->width = width;
 	metrics->height = 2;
 	metrics->baseline = 1;
@@ -1576,6 +1749,8 @@
 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;
@@ -1587,6 +1762,8 @@
 	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;
@@ -1629,13 +1806,13 @@
 	for (size_t bytePosition = 0; bytePosition < screenLine->Length();) {
 		const unsigned char uch = screenLine->Text()[bytePosition];
 		const unsigned int byteCount = UTF8BytesOfLead[uch];
-		const UINT32 codeUnits = static_cast<UINT32>(UTF16LengthFromUTF8ByteCount(byteCount));
+		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')) {
 			Point realPt;
-			DWRITE_HIT_TEST_METRICS realCaretMetrics;
+			DWRITE_HIT_TEST_METRICS realCaretMetrics {};
 			textLayout->HitTestTextPosition(
 				layoutPosition,
 				false, // trailing if false, else leading edge
@@ -1656,20 +1833,22 @@
 			static_cast<FormatAndMetrics *>(screenLine->FontOfPosition(bytePosition)->GetID());
 
 		const unsigned int fontFamilyNameSize = pfm->pTextFormat->GetFontFamilyNameLength();
-		std::vector<WCHAR> fontFamilyName(fontFamilyNameSize + 1);
-
-		pfm->pTextFormat->GetFontFamilyName(fontFamilyName.data(), fontFamilyNameSize + 1);
-		textLayout->SetFontFamilyName(fontFamilyName.data(), textRange);
+		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 localNameSize = pfm->pTextFormat->GetLocaleNameLength();
-		std::vector<WCHAR> localName(localNameSize + 1);
-
-		pfm->pTextFormat->GetLocaleName(localName.data(), localNameSize);
-		textLayout->SetLocaleName(localName.data(), 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);
 
@@ -1702,7 +1881,7 @@
 
 ScreenLineLayout::ScreenLineLayout(const IScreenLine *screenLine) {
 	// If the text is empty, then no need to go through this function
-	if (!screenLine->Length())
+	if (!screenLine || !screenLine->Length())
 		return;
 
 	text = screenLine->Text();
@@ -1729,10 +1908,7 @@
 }
 
 ScreenLineLayout::~ScreenLineLayout() {
-	if (textLayout) {
-		textLayout->Release();
-		textLayout = nullptr;
-	}
+	ReleaseUnknown(textLayout);
 }
 
 // Get the position from the provided x
@@ -1746,9 +1922,9 @@
 	// If hitting the trailing side of a cluster, return the
 	// leading edge of the following text position.
 
-	BOOL isTrailingHit;
-	BOOL isInside;
-	DWRITE_HIT_TEST_METRICS caretMetrics;
+	BOOL isTrailingHit = FALSE;
+	BOOL isInside = FALSE;
+	DWRITE_HIT_TEST_METRICS caretMetrics {};
 
 	textLayout->HitTestPoint(
 		xDistance,
@@ -1758,7 +1934,7 @@
 		&caretMetrics
 	);
 
-	DWRITE_HIT_TEST_METRICS hitTestMetrics = {};
+	DWRITE_HIT_TEST_METRICS hitTestMetrics {};
 	if (isTrailingHit) {
 		FLOAT caretX = 0.0f;
 		FLOAT caretY = 0.0f;
@@ -1798,7 +1974,7 @@
 	const size_t position = GetPositionInLayout(text, caretPosition);
 
 	// Translate text character offset to point x,y.
-	DWRITE_HIT_TEST_METRICS caretMetrics;
+	DWRITE_HIT_TEST_METRICS caretMetrics {};
 	Point pt;
 
 	textLayout->HitTestTextPosition(
@@ -1888,18 +2064,18 @@
 	const TextWide tbuf(text, unicodeMode, codePageText);
 	if (pRenderTarget && pTextFormat && pBrush) {
 		if (fuOptions & ETO_CLIPPED) {
-			D2D1_RECT_F rcClip = {rc.left, rc.top, rc.right, rc.bottom};
+			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;
+		IDWriteTextLayout *pTextLayout = nullptr;
 		const HRESULT hr = pIDWriteFactory->CreateTextLayout(tbuf.buffer, tbuf.tlen, pTextFormat,
 				rc.Width(), rc.Height(), &pTextLayout);
 		if (SUCCEEDED(hr)) {
 			D2D1_POINT_2F origin = {rc.left, ybase-yAscent};
 			pRenderTarget->DrawTextLayout(origin, pTextLayout, pBrush, d2dDrawTextOptions);
-			pTextLayout->Release();
+			ReleaseUnknown(pTextLayout);
 		}
 
 		if (fuOptions & ETO_CLIPPED) {
@@ -1929,8 +2105,8 @@
 void SurfaceD2D::DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, std::string_view text,
 	ColourDesired fore) {
 	// Avoid drawing spaces in transparent mode
-	for (size_t i=0; i<text.length(); i++) {
-		if (text[i] != ' ') {
+	for (const char ch : text) {
+		if (ch != ' ') {
 			if (pRenderTarget) {
 				D2DPenColour(fore);
 				DrawTextCommon(rc, font_, ybase, text, 0);
@@ -1948,11 +2124,11 @@
 		// Create a layout
 		IDWriteTextLayout *pTextLayout = nullptr;
 		const HRESULT hr = pIDWriteFactory->CreateTextLayout(tbuf.buffer, tbuf.tlen, pTextFormat, 1000.0, 1000.0, &pTextLayout);
-		if (SUCCEEDED(hr)) {
+		if (SUCCEEDED(hr) && pTextLayout) {
 			DWRITE_TEXT_METRICS textMetrics;
 			if (SUCCEEDED(pTextLayout->GetMetrics(&textMetrics)))
 				width = textMetrics.widthIncludingTrailingWhitespace;
-			pTextLayout->Release();
+			ReleaseUnknown(pTextLayout);
 		}
 	}
 	return width;
@@ -1971,14 +2147,14 @@
 	// Create a layout
 	IDWriteTextLayout *pTextLayout = nullptr;
 	const HRESULT hrCreate = pIDWriteFactory->CreateTextLayout(tbuf.buffer, tbuf.tlen, pTextFormat, 10000.0, 1000.0, &pTextLayout);
-	if (!SUCCEEDED(hrCreate)) {
+	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);
-	pTextLayout->Release();
+	ReleaseUnknown(pTextLayout);
 	if (!SUCCEEDED(hrGetCluster)) {
 		return;
 	}
@@ -2068,11 +2244,11 @@
 		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)) {
+		if (SUCCEEDED(hr) && pTextLayout) {
 			DWRITE_TEXT_METRICS textMetrics;
 			if (SUCCEEDED(pTextLayout->GetMetrics(&textMetrics)))
 				width = textMetrics.width / lenAllAlpha;
-			pTextLayout->Release();
+			ReleaseUnknown(pTextLayout);
 		}
 	}
 	return width;
@@ -2080,7 +2256,7 @@
 
 void SurfaceD2D::SetClip(PRectangle rc) {
 	if (pRenderTarget) {
-		D2D1_RECT_F rcClip = {rc.left, rc.top, rc.right, rc.bottom};
+		const D2D1_RECT_F rcClip = RectangleFromPRectangle(rc);
 		pRenderTarget->PushAxisAlignedClip(rcClip, D2D1_ANTIALIAS_MODE_ALIASED);
 		clipsActive++;
 	}
@@ -2210,8 +2386,7 @@
 }
 
 void Window::SetFont(Font &font) {
-	::SendMessage(HwndFromWindowID(wid), WM_SETFONT,
-		reinterpret_cast<WPARAM>(font.GetID()), 0);
+	SetWindowFont(HwndFromWindowID(wid), font.GetID(), 0);
 }
 
 namespace {
@@ -2226,8 +2401,24 @@
 	}
 }
 
-void LoadReverseArrowCursor() noexcept {
+}
+
+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;
@@ -2244,8 +2435,11 @@
 		if (info.hbmColor)
 			::DeleteObject(info.hbmColor);
 	}
-}
 
+	if (created) {
+		::DestroyCursor(cursor);
+	}
+	return reverseArrowCursor;
 }
 
 void Window::SetCursor(Cursor curs) {
@@ -2269,8 +2463,6 @@
 		::SetCursor(::LoadCursor(NULL,IDC_HAND));
 		break;
 	case cursorReverseArrow:
-		::SetCursor(reverseArrowCursor);
-		break;
 	case cursorArrow:
 	case cursorInvalid:	// Should not occur, but just in case.
 		::SetCursor(::LoadCursor(NULL,IDC_ARROW));
@@ -2315,7 +2507,7 @@
 		data.clear();
 	}
 
-	ListItemData Get(size_t index) const {
+	ListItemData Get(size_t index) const noexcept {
 		if (index < data.size()) {
 			return data[index];
 		} else {
@@ -2359,6 +2551,7 @@
 	unsigned int aveCharWidth;
 	Window *parent;
 	int ctrlID;
+	UINT dpi;
 	IListBoxDelegate *delegate;
 	const char *widestItem;
 	unsigned int maxCharWidth;
@@ -2368,23 +2561,23 @@
 	Point location;	// Caret location at which the list is opened
 	int wheelDelta; // mouse wheel residue
 
-	HWND GetHWND() const;
+	HWND GetHWND() const noexcept;
 	void AppendListItem(const char *text, const char *numword);
-	static void AdjustWindowRect(PRectangle *rc);
+	static void AdjustWindowRect(PRectangle *rc, UINT dpi) noexcept;
 	int ItemHeight() const;
-	int MinClientWidth() const;
+	int MinClientWidth() const noexcept;
 	int TextOffset() const;
-	POINT GetClientExtent() const;
+	POINT GetClientExtent() const noexcept;
 	POINT MinTrackSize() const;
 	POINT MaxTrackSize() const;
-	void SetRedraw(bool on);
+	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);
+	void Paint(HDC) noexcept;
 	static LRESULT PASCAL ControlWndProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam);
 
 	static constexpr Point ItemInset {0, 0};	// Padding around whole item
@@ -2394,7 +2587,7 @@
 public:
 	ListBoxX() : lineHeight(10), fontCopy{}, technology(0), lb{}, unicodeMode(false),
 		desiredVisibleRows(9), maxItemCharacters(0), aveCharWidth(8),
-		parent(nullptr), ctrlID(0),
+		parent(nullptr), ctrlID(0), dpi(USER_DEFAULT_SCREEN_DPI),
 		delegate(nullptr),
 		widestItem(nullptr), maxCharWidth(1), resizeHit(0), wheelDelta(0) {
 	}
@@ -2451,6 +2644,7 @@
 		hinstanceParent,
 		this);
 
+	dpi = DpiForWindow(hwndParent);
 	POINT locationw = POINTFromPoint(location);
 	::MapWindowPoints(hwndParent, NULL, &locationw, 1);
 	location = PointFromPOINT(locationw);
@@ -2464,7 +2658,7 @@
 		}
 		FormatAndMetrics *pfm = static_cast<FormatAndMetrics *>(font.GetID());
 		fontCopy = pfm->HFont();
-		::SendMessage(lb, WM_SETFONT, reinterpret_cast<WPARAM>(fontCopy), 0);
+		SetWindowFont(lb, fontCopy, 0);
 	}
 }
 
@@ -2480,7 +2674,7 @@
 	return desiredVisibleRows;
 }
 
-HWND ListBoxX::GetHWND() const {
+HWND ListBoxX::GetHWND() const noexcept {
 	return HwndFromWindowID(GetID());
 }
 
@@ -2518,9 +2712,9 @@
 
 	rcDesired.right = rcDesired.left + TextOffset() + width + (TextInset.x * 2);
 	if (Length() > rows)
-		rcDesired.right += ::GetSystemMetrics(SM_CXVSCROLL);
+		rcDesired.right += SystemMetricsForDpi(SM_CXVSCROLL, dpi);
 
-	AdjustWindowRect(&rcDesired);
+	AdjustWindowRect(&rcDesired, dpi);
 	return rcDesired;
 }
 
@@ -2531,7 +2725,7 @@
 
 int ListBoxX::CaretFromEdge() {
 	PRectangle rc;
-	AdjustWindowRect(&rc);
+	AdjustWindowRect(&rc, dpi);
 	return TextOffset() + static_cast<int>(TextInset.x + (0 - rc.left) - 1);
 }
 
@@ -2649,7 +2843,7 @@
 					);
 				ID2D1DCRenderTarget *pDCRT = nullptr;
 				HRESULT hr = pD2DFactory->CreateDCRenderTarget(&props, &pDCRT);
-				if (SUCCEEDED(hr)) {
+				if (SUCCEEDED(hr) && pDCRT) {
 					RECT rcWindow;
 					GetClientRect(pDrawItem->hwndItem, &rcWindow);
 					hr = pDCRT->BindDC(pDrawItem->hDC, &rcWindow);
@@ -2662,7 +2856,7 @@
 						surfaceItem->DrawRGBAImage(rcImage,
 							pimage->GetWidth(), pimage->GetHeight(), pimage->Pixels());
 						pDCRT->EndDraw();
-						pDCRT->Release();
+						ReleaseUnknown(pDCRT);
 					}
 				}
 #endif
@@ -2729,9 +2923,13 @@
 	SetRedraw(true);
 }
 
-void ListBoxX::AdjustWindowRect(PRectangle *rc) {
+void ListBoxX::AdjustWindowRect(PRectangle *rc, UINT dpi) noexcept {
 	RECT rcw = RectFromPRectangle(*rc);
-	::AdjustWindowRectEx(&rcw, WS_THICKFRAME, false, WS_EX_WINDOWEDGE);
+	if (fnAdjustWindowRectExForDpi) {
+		fnAdjustWindowRectExForDpi(&rcw, WS_THICKFRAME, false, WS_EX_WINDOWEDGE, dpi);
+	} else {
+		::AdjustWindowRectEx(&rcw, WS_THICKFRAME, false, WS_EX_WINDOWEDGE);
+	}
 	*rc = PRectangle::FromInts(rcw.left, rcw.top, rcw.right, rcw.bottom);
 }
 
@@ -2744,13 +2942,13 @@
 	return itemHeight;
 }
 
-int ListBoxX::MinClientWidth() const {
+int ListBoxX::MinClientWidth() const noexcept {
 	return 12 * (aveCharWidth+aveCharWidth/3);
 }
 
 POINT ListBoxX::MinTrackSize() const {
 	PRectangle rc = PRectangle::FromInts(0, 0, MinClientWidth(), ItemHeight());
-	AdjustWindowRect(&rc);
+	AdjustWindowRect(&rc, dpi);
 	POINT ret = {static_cast<LONG>(rc.Width()), static_cast<LONG>(rc.Height())};
 	return ret;
 }
@@ -2759,14 +2957,14 @@
 	PRectangle rc = PRectangle::FromInts(0, 0,
 		std::max(static_cast<unsigned int>(MinClientWidth()),
 		maxCharWidth * maxItemCharacters + static_cast<int>(TextInset.x) * 2 +
-		 TextOffset() + ::GetSystemMetrics(SM_CXVSCROLL)),
+		 TextOffset() + SystemMetricsForDpi(SM_CXVSCROLL, dpi)),
 		ItemHeight() * lti.Count());
-	AdjustWindowRect(&rc);
+	AdjustWindowRect(&rc, dpi);
 	POINT ret = {static_cast<LONG>(rc.Width()), static_cast<LONG>(rc.Height())};
 	return ret;
 }
 
-void ListBoxX::SetRedraw(bool on) {
+void ListBoxX::SetRedraw(bool on) noexcept {
 	::SendMessage(lb, WM_SETREDRAW, on, 0);
 	if (on)
 		::InvalidateRect(lb, nullptr, TRUE);
@@ -2868,7 +3066,7 @@
 	// 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 = GetSystemMetrics(SM_CYMINTRACK);
+		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;
@@ -2918,7 +3116,7 @@
 	}
 }
 
-POINT ListBoxX::GetClientExtent() const {
+POINT ListBoxX::GetClientExtent() const noexcept {
 	RECT rc;
 	::GetWindowRect(HwndFromWindowID(wid), &rc);
 	POINT ret { rc.right - rc.left, rc.bottom - rc.top };
@@ -2940,7 +3138,7 @@
 }
 
 // Performs a double-buffered paint operation to avoid flicker
-void ListBoxX::Paint(HDC hDC) {
+void ListBoxX::Paint(HDC hDC) noexcept {
 	const POINT extent = GetClientExtent();
 	HBITMAP hBitmap = ::CreateCompatibleBitmap(hDC, extent.x, extent.y);
 	HDC bitmapDC = ::CreateCompatibleDC(hDC);
@@ -3183,8 +3381,10 @@
 	return ::RegisterClassEx(&wndclassc) != 0;
 }
 
-bool ListBoxX_Unregister() noexcept {
-	return ::UnregisterClass(ListBoxX_ClassName, hinstPlatformRes) != 0;
+void ListBoxX_Unregister() noexcept {
+	if (hinstPlatformRes) {
+		::UnregisterClass(ListBoxX_ClassName, hinstPlatformRes);
+	}
 }
 
 }
@@ -3295,7 +3495,7 @@
 }
 
 void Platform::Assert(const char *c, const char *file, int line) {
-	char buffer[2000];
+	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",
@@ -3314,43 +3514,33 @@
 	}
 }
 
-void Platform_Initialise(void *hInstance) {
+void Platform_Initialise(void *hInstance) noexcept {
 	hinstPlatformRes = static_cast<HINSTANCE>(hInstance);
-	LoadReverseArrowCursor();
+	LoadDpiForWindow();
 	ListBoxX_Register();
 }
 
-void Platform_Finalise(bool fromDllMain) {
+void Platform_Finalise(bool fromDllMain) noexcept {
 #if defined(USE_D2D)
 	if (!fromDllMain) {
-		if (defaultRenderingParams) {
-			defaultRenderingParams->Release();
-			defaultRenderingParams = nullptr;
-		}
-		if (customClearTypeRenderingParams) {
-			customClearTypeRenderingParams->Release();
-			customClearTypeRenderingParams = nullptr;
-		}
-		if (pIDWriteFactory) {
-			pIDWriteFactory->Release();
-			pIDWriteFactory = nullptr;
-		}
-		if (pD2DFactory) {
-			pD2DFactory->Release();
-			pD2DFactory = nullptr;
-		}
+		ReleaseUnknown(defaultRenderingParams);
+		ReleaseUnknown(customClearTypeRenderingParams);
+		ReleaseUnknown(pIDWriteFactory);
+		ReleaseUnknown(pD2DFactory);
 		if (hDLLDWrite) {
 			FreeLibrary(hDLLDWrite);
-			hDLLDWrite = NULL;
+			hDLLDWrite = {};
 		}
 		if (hDLLD2D) {
 			FreeLibrary(hDLLD2D);
-			hDLLD2D = NULL;
+			hDLLD2D = {};
 		}
 	}
 #endif
-	if (reverseArrowCursor)
-		::DestroyCursor(reverseArrowCursor);
+	if (!fromDllMain && hDLLShcore) {
+		FreeLibrary(hDLLShcore);
+		hDLLShcore = {};
+	}
 	ListBoxX_Unregister();
 }
 
diff -Nru scite-4.3.3/scintilla/win32/PlatWin.h scite-4.4.4/scintilla/win32/PlatWin.h
--- scite-4.3.3/scintilla/win32/PlatWin.h	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/win32/PlatWin.h	2020-07-18 05:40:22.000000000 +0000
@@ -10,8 +10,13 @@
 
 namespace Scintilla {
 
-extern void Platform_Initialise(void *hInstance);
-extern void Platform_Finalise(bool fromDllMain);
+#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),
@@ -38,6 +43,43 @@
 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;
diff -Nru scite-4.3.3/scintilla/win32/scintilla.mak scite-4.4.4/scintilla/win32/scintilla.mak
--- scite-4.3.3/scintilla/win32/scintilla.mak	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/win32/scintilla.mak	2020-05-31 23:08:11.000000000 +0000
@@ -275,7 +275,7 @@
 $(LEXCOMPONENT): $(LEXCOMPONENT_OBJS) $(DIR_O)\ScintRes.res
 	$(LD) $(LDFLAGS) -DEF:Scintilla.def -DLL -OUT:$@ $** $(LIBS)
 
-$(LIBSCI): $(SCILEX_OBJS)
+$(LIBSCI): $(COMPONENT_OBJS)
 	LIB /OUT:$@ $**
 
 # Define how to build all the objects and what they depend on
diff -Nru scite-4.3.3/scintilla/win32/ScintillaWin.cxx scite-4.4.4/scintilla/win32/ScintillaWin.cxx
--- scite-4.3.3/scintilla/win32/ScintillaWin.cxx	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/win32/ScintillaWin.cxx	2020-07-18 05:40:22.000000000 +0000
@@ -22,6 +22,7 @@
 #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)
@@ -96,6 +97,13 @@
 #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
@@ -265,6 +273,37 @@
 
 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);
+	}
+};
+
 }
 
 /**
@@ -282,6 +321,9 @@
 	unsigned int linesPerScroll;	///< Intellimouse support
 	int wheelDelta; ///< Wheel delta from roll
 
+	UINT dpi = USER_DEFAULT_SCREEN_DPI;
+	ReverseArrowCursor reverseArrowCursor;
+
 	HRGN hRgnUpdate;
 
 	bool hasOKText;
@@ -330,6 +372,7 @@
 
 	enum : UINT_PTR { invalidTimerID, standardTimerID, idleTimerID, fineTimerStart };
 
+	void DisplayCursor(Window::Cursor c) override;
 	bool DragThreshold(Point ptStart, Point ptNow) override;
 	void StartDrag() override;
 	static int MouseModifiers(uptr_t wParam) noexcept;
@@ -348,7 +391,7 @@
 	sptr_t HandleCompositionInline(uptr_t wParam, sptr_t lParam);
 	static bool KoreanIME() noexcept;
 	void MoveImeCarets(Sci::Position offset);
-	void DrawImeIndicator(int indicator, int len);
+	void DrawImeIndicator(int indicator, Sci::Position len);
 	void SetCandidateWindowPos();
 	void SelectionToHangul();
 	void EscapeHanja();
@@ -385,7 +428,6 @@
 	CaseFolder *CaseFolderForEncoding() override;
 	std::string CaseMapString(const std::string &s, int caseMapping) override;
 	void Copy() override;
-	void CopyAllowLine() override;
 	bool CanPaste() override;
 	void Paste() override;
 	void CreateCallTipWindow(PRectangle rc) override;
@@ -440,6 +482,7 @@
 	/// 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;
 
@@ -477,6 +520,8 @@
 	linesPerScroll = 0;
 	wheelDelta = 0;   // Wheel delta from roll
 
+	dpi = DpiForWindow(hwnd);
+
 	hRgnUpdate = {};
 
 	hasOKText = false;
@@ -528,11 +573,8 @@
 	hrOle = ::OleInitialize(nullptr);
 
 	// Find SetCoalescableTimer which is only available from Windows 8+
-	HMODULE user32 = ::GetModuleHandle(TEXT("user32.dll"));
-	if (user32) {
-		SetCoalescableTimerFn = reinterpret_cast<SetCoalescableTimerSig>(
-			::GetProcAddress(user32, "SetCoalescableTimer"));
-	}
+	HMODULE user32 = ::GetModuleHandleW(L"user32.dll");
+	SetCoalescableTimerFn = DLLFunction<SetCoalescableTimerSig>(user32, "SetCoalescableTimer");
 
 	vs.indicators[SC_INDICATOR_UNKNOWN] = Indicator(INDIC_HIDDEN, ColourDesired(0, 0, 0xff));
 	vs.indicators[SC_INDICATOR_INPUT] = Indicator(INDIC_DOTS, ColourDesired(0, 0, 0xff));
@@ -636,10 +678,7 @@
 }
 
 void ScintillaWin::DropRenderTarget() {
-	if (pRenderTarget) {
-		pRenderTarget->Release();
-		pRenderTarget = nullptr;
-	}
+	ReleaseUnknown(pRenderTarget);
 }
 
 #endif
@@ -648,12 +687,23 @@
 	return HwndFromWindow(wMain);
 }
 
+void ScintillaWin::DisplayCursor(Window::Cursor c) {
+	if (cursorMode != SC_CURSORNORMAL) {
+		c = static_cast<Window::Cursor>(cursorMode);
+	}
+	if (c == Window::cursorReverseArrow) {
+		::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 > ::GetSystemMetrics(SM_CXDRAG)) ||
-		(yMove > ::GetSystemMetrics(SM_CYDRAG));
+	return (xMove > SystemMetricsForDpi(SM_CXDRAG, dpi)) ||
+		(yMove > SystemMetricsForDpi(SM_CYDRAG, dpi));
 }
 
 void ScintillaWin::StartDrag() {
@@ -951,7 +1001,7 @@
 	}
 }
 
-void ScintillaWin::DrawImeIndicator(int indicator, int len) {
+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().
@@ -1148,7 +1198,7 @@
 
 			InsertCharacter(docChar, CharacterSource::tentativeInput);
 
-			DrawImeIndicator(imeIndicator[i], static_cast<unsigned int>(docChar.size()));
+			DrawImeIndicator(imeIndicator[i], docChar.size());
 			i += ucWidth;
 		}
 
@@ -1292,7 +1342,7 @@
 	Sci::Position sizeRequestedRange = pdoc->GetRelativePositionUTF16(0, lengthWanted);
 	if (sizeRequestedRange < 0) {
 		// Requested more text than there is in the document.
-		sizeRequestedRange = pdoc->CountUTF16(0, pdoc->Length());
+		sizeRequestedRange = pdoc->Length();
 	}
 	std::string docBytes(sizeRequestedRange, '\0');
 	pdoc->GetCharRange(&docBytes[0], 0, sizeRequestedRange);
@@ -1533,7 +1583,7 @@
 			return 1;
 		} else {
 			wchar_t wcs[3] = { 0 };
-			const unsigned int wclen = UTF16FromUTF32Character(static_cast<unsigned int>(wParam), wcs);
+			const size_t wclen = UTF16FromUTF32Character(static_cast<unsigned int>(wParam), wcs);
 			AddWString(std::wstring_view(wcs, wclen), CharacterSource::directInput);
 			return FALSE;
 		}
@@ -1636,7 +1686,7 @@
 		if (static_cast<Sci::Position>(wParam) < 0) {
 			wParam = SelectionStart().Position();
 		}
-		return pdoc->LineFromPosition(static_cast<Sci::Position>(wParam));
+		return pdoc->LineFromPosition(wParam);
 
 	case EM_EXLINEFROMCHAR:
 		return pdoc->LineFromPosition(lParam);
@@ -1661,7 +1711,7 @@
 		break;
 
 	case EM_SETSEL: {
-			Sci::Position nStart = static_cast<Sci::Position>(wParam);
+			Sci::Position nStart = wParam;
 			Sci::Position nEnd = lParam;
 			if (nStart == 0 && nEnd == -1) {
 				nEnd = pdoc->Length();
@@ -1901,6 +1951,20 @@
 			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(iMessage, wParam, lParam);
 
@@ -2357,12 +2421,6 @@
 	}
 }
 
-void ScintillaWin::CopyAllowLine() {
-	SelectionText selectedText;
-	CopySelectionRange(&selectedText, true);
-	CopyToClipboard(selectedText);
-}
-
 bool ScintillaWin::CanPaste() {
 	if (!Editor::CanPaste())
 		return false;
@@ -2810,15 +2868,10 @@
 			int sizeZoomed = vs.styles[styleHere].size + vs.zoomLevel * SC_FONT_SIZE_MULTIPLIER;
 			if (sizeZoomed <= 2 * SC_FONT_SIZE_MULTIPLIER)	// Hangs if sizeZoomed <= 1
 				sizeZoomed = 2 * SC_FONT_SIZE_MULTIPLIER;
-			AutoSurface surface(this);
-			int deviceHeight = sizeZoomed;
-			if (surface) {
-				deviceHeight = (sizeZoomed * surface->LogPixelsY()) / 72;
-			}
 			// The negative is to allow for leading
-			lf.lfHeight = -(std::abs(deviceHeight / SC_FONT_SIZE_MULTIPLIER));
+			lf.lfHeight = -::MulDiv(sizeZoomed, dpi, 72*SC_FONT_SIZE_MULTIPLIER);
 			lf.lfWeight = vs.styles[styleHere].weight;
-			lf.lfItalic = static_cast<BYTE>(vs.styles[styleHere].italic ? 1 : 0);
+			lf.lfItalic = vs.styles[styleHere].italic ? 1 : 0;
 			lf.lfCharSet = DEFAULT_CHARSET;
 			lf.lfFaceName[0] = L'\0';
 			if (vs.styles[styleHere].fontName) {
@@ -3251,6 +3304,22 @@
 	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_;
@@ -3265,22 +3334,7 @@
 	wndclass.hInstance = hInstance;
 	wndclass.lpszClassName = L"Scintilla";
 	scintillaClassAtom = ::RegisterClassExW(&wndclass);
-	bool result = 0 != scintillaClassAtom;
-
-	if (result) {
-		// 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);
-		result = 0 != callClassAtom;
-	}
+	const bool result = 0 != scintillaClassAtom;
 
 	return result;
 }
@@ -3398,8 +3452,10 @@
 					}
 					// If above SUCCEEDED, then pCTRenderTarget not nullptr
 					assert(pCTRenderTarget);
-					surfaceWindow->Init(pCTRenderTarget, hWnd);
-					pCTRenderTarget->BeginDraw();
+					if (pCTRenderTarget) {
+						surfaceWindow->Init(pCTRenderTarget, hWnd);
+						pCTRenderTarget->BeginDraw();
+					}
 #endif
 				}
 				surfaceWindow->SetUnicodeMode(SC_CP_UTF8 == sciThis->ct.codePage);
@@ -3412,8 +3468,7 @@
 #endif
 				surfaceWindow->Release();
 #if defined(USE_D2D)
-				if (pCTRenderTarget)
-					pCTRenderTarget->Release();
+				ReleaseUnknown(pCTRenderTarget);
 #endif
 				::EndPaint(hWnd, &ps);
 				return 0;
@@ -3468,6 +3523,8 @@
 	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);
@@ -3494,14 +3551,13 @@
 // This function is externally visible so it can be called from container when building statically.
 // Must be called once only.
 int Scintilla_RegisterClasses(void *hInstance) {
-	Platform_Initialise(hInstance);
 	const bool result = ScintillaWin::Register(static_cast<HINSTANCE>(hInstance));
 	return result;
 }
 
 namespace Scintilla {
 
-int ResourcesRelease(bool fromDllMain) {
+int ResourcesRelease(bool fromDllMain) noexcept {
 	const bool result = ScintillaWin::Unregister();
 	Platform_Finalise(fromDllMain);
 	return result;
diff -Nru scite-4.3.3/scintilla/win32/ScintillaWin.h scite-4.4.4/scintilla/win32/ScintillaWin.h
--- scite-4.3.3/scintilla/win32/ScintillaWin.h	2020-03-03 21:50:30.000000000 +0000
+++ scite-4.4.4/scintilla/win32/ScintillaWin.h	2020-07-18 05:40:22.000000000 +0000
@@ -12,7 +12,7 @@
 
 namespace Scintilla {
 
-int ResourcesRelease(bool fromDllMain);
+int ResourcesRelease(bool fromDllMain) noexcept;
 sptr_t DirectFunction(ScintillaWin *sci, UINT iMessage, uptr_t wParam, sptr_t lParam);
 
 }
diff -Nru scite-4.3.3/scintilla/win32/ScintRes.rc scite-4.4.4/scintilla/win32/ScintRes.rc
--- scite-4.3.3/scintilla/win32/ScintRes.rc	2020-04-23 01:50:17.000000000 +0000
+++ scite-4.4.4/scintilla/win32/ScintRes.rc	2020-07-18 05:40:22.000000000 +0000
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "4.3.3"
-#define VERSION_WORDS 4, 3, 3, 0
+#define VERSION_SCINTILLA "4.4.4"
+#define VERSION_WORDS 4, 4, 4, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
diff -Nru scite-4.3.3/scite/cppcheck.suppress scite-4.4.4/scite/cppcheck.suppress
--- scite-4.3.3/scite/cppcheck.suppress	2020-01-02 00:45:08.000000000 +0000
+++ scite-4.4.4/scite/cppcheck.suppress	2020-07-18 05:40:25.000000000 +0000
@@ -1,10 +1,6 @@
 // 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.
 
-// unreadVariable has expanded in cppcheck 1.90 to match assigning a struct then reading
-// only from members which is a common idiom
-unreadVariable
-
 // These may be interesting but its not clear without examining each instance closely
 useStlAlgorithm
 
diff -Nru scite-4.3.3/scite/delbin.bat scite-4.4.4/scite/delbin.bat
--- scite-4.3.3/scite/delbin.bat	2018-04-27 10:42:17.000000000 +0000
+++ scite-4.4.4/scite/delbin.bat	2020-07-18 05:40:25.000000000 +0000
@@ -1 +1 @@
-@del /S /Q *.a *.aps *.bsc *.dll *.dsw *.exe *.idb *.ilc *.ild *.ilf *.ilk *.ils *.lib *.map *.ncb *.obj *.o *.opt *.pdb *.plg *.res *.sbr *.tds *.exp *.tlog *.plist >NUL:
+@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 -Nru scite-4.3.3/scite/doc/CommandValues.html scite-4.4.4/scite/doc/CommandValues.html
--- scite-4.3.3/scite/doc/CommandValues.html	2019-06-28 23:50:57.000000000 +0000
+++ scite-4.4.4/scite/doc/CommandValues.html	2020-07-18 05:40:25.000000000 +0000
@@ -164,6 +164,7 @@
 <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>
diff -Nru scite-4.3.3/scite/doc/PaneAPI.html scite-4.4.4/scite/doc/PaneAPI.html
--- scite-4.3.3/scite/doc/PaneAPI.html	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/doc/PaneAPI.html	2020-07-18 05:40:25.000000000 +0000
@@ -371,6 +371,12 @@
 	<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>
@@ -387,6 +393,7 @@
 	<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>
diff -Nru scite-4.3.3/scite/doc/SciTEDoc.html scite-4.4.4/scite/doc/SciTEDoc.html
--- scite-4.3.3/scite/doc/SciTEDoc.html	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/doc/SciTEDoc.html	2020-07-18 05:40:25.000000000 +0000
@@ -289,6 +289,8 @@
         <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
@@ -829,6 +831,11 @@
        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.
@@ -876,6 +883,8 @@
                <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
@@ -935,16 +944,26 @@
     <p>
       <a name="property-if"></a>
       The 'if' statement takes one argument which is a
-      symbol 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. Into the very top property set
+      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>
@@ -4429,6 +4448,15 @@
           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.
+        </td>
+      </tr>
       <tr id='property-caret.sticky'>
         <td>
           caret.sticky
diff -Nru scite-4.3.3/scite/doc/SciTEDownload.html scite-4.4.4/scite/doc/SciTEDownload.html
--- scite-4.3.3/scite/doc/SciTEDownload.html	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/doc/SciTEDownload.html	2020-07-21 10:08:41.000000000 +0000
@@ -30,9 +30,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://www.scintilla.org/scite433.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scite444.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scite433.tgz">
+	<a href="https://www.scintilla.org/scite444.tgz">
           GTK/Linux</a>&nbsp;&nbsp;</font>
         </td>
       </tr>
@@ -45,7 +45,7 @@
       containing very few restrictions.
     </p>
     <h2>
-       Release 4.3.3
+       Release 4.4.4
     </h2>
     <h3>
        Source Code
@@ -53,8 +53,8 @@
        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/scite433.zip">zip format</a> (3.0M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scite433.tgz">tgz format</a> (2.5M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/scite444.zip">zip format</a> (3.1M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scite444.tgz">tgz format</a> (2.6M) 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>
@@ -68,21 +68,21 @@
        is no longer tested.
        <ul>
        <li>
-        <a href="https://www.scintilla.org/wscite433.zip">Full 64-bit download</a> (1.8M) includes the SciTE executable, any required DLLs,
+        <a href="https://www.scintilla.org/wscite444.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_433.zip">Full 32-bit download</a> (1.6M) is similar but will run on 32-bit Windows
+         <a href="https://www.scintilla.org/wscite32_444.zip">Full 32-bit download</a> (1.6M) is similar but will run on 32-bit Windows
          with the executable called SciTE32.EXE .
        </li>
        <li>
-         <a href="https://www.scintilla.org/Sc433.exe">Single file 64-bit executable called Sc1</a> (3.0M) does not need any DLL or
+         <a href="https://www.scintilla.org/Sc444.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_433.zip">Single file 32-bit download</a> (2.4M) is similar but will run on 32-bit Windows.
+         <a href="https://www.scintilla.org/Sc32_444.exe">Single file 32-bit download</a> (2.3M) is similar but will run on 32-bit Windows.
        </li>
        </ul>
     </p>
@@ -106,7 +106,7 @@
       If the target system is 32-bit, you will need to build SciTE from source.
     </p>
     <p>
-       A <a href="https://www.scintilla.org/gscite433.tgz">full download</a> (1.5M) includes the 32-bit SciTE executable,
+       A <a href="https://www.scintilla.org/gscite444.tgz">full download</a> (1.7M) 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
diff -Nru scite-4.3.3/scite/doc/SciTE.html scite-4.4.4/scite/doc/SciTE.html
--- scite-4.3.3/scite/doc/SciTE.html	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/doc/SciTE.html	2020-07-18 05:40:25.000000000 +0000
@@ -9,7 +9,7 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20200427" />
+    <meta name="Date.Modified" content="20200721" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <script type="text/javascript">
    	function IsRemote() {
@@ -56,8 +56,8 @@
           X</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 4.3.3<br />
-           Site last modified April 27 2020</font>
+          <font color="#FFCC99" size="3"> Release version 4.4.4<br />
+           Site last modified July 21 2020</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -72,10 +72,11 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 4.4.4 fixes printing on Windows and finding functions in Lua scripts.</li>
+      <li>Version 4.4.3 fixes loading Lexilla on Windows.</li>
+      <li>Version 4.4.2 fixes loading Lexilla when instal directory contains '.'.</li>
+      <li>Version 4.4.0 uses Lexilla as a shared library except for Sc1. On GTK, Scintilla is now a shared library.</li>
       <li>Version 4.3.3 improves Assembler, Batch, and Perl lexers.</li>
-      <li>Version 4.3.2 fixes dragging text that contains a new line on Win32.</li>
-      <li>Version 4.3.1 automatically scrolls when dragging text near window border.</li>
-      <li>Version 4.3.0 adds support for the Raku language.</li>
     </ul>
     <ul id="menu">
       <li><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
diff -Nru scite-4.3.3/scite/doc/SciTELua.html scite-4.4.4/scite/doc/SciTELua.html
--- scite-4.3.3/scite/doc/SciTELua.html	2019-06-28 23:50:57.000000000 +0000
+++ scite-4.4.4/scite/doc/SciTELua.html	2020-05-31 23:08:16.000000000 +0000
@@ -36,7 +36,7 @@
       </tr>
     </table>
 <h3>Lua Scripting Extension Notes</h3>
-The SciTE Lua Scripting Extension uses a copy of Lua 5.1 as
+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>
diff -Nru scite-4.3.3/scite/gtk/deps.mak scite-4.4.4/scite/gtk/deps.mak
--- scite-4.3.3/scite/gtk/deps.mak	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/gtk/deps.mak	2020-05-31 23:08:16.000000000 +0000
@@ -42,6 +42,7 @@
 	../src/StringList.h \
 	../src/StringHelpers.h \
 	../src/FilePath.h \
+	../src/LexillaLibrary.h \
 	../src/StyleDefinition.h \
 	../src/PropSetFile.h \
 	../src/Extender.h \
@@ -234,8 +235,6 @@
 	../src/LexillaLibrary.cxx \
 	../../scintilla/include/ILexer.h \
 	../../scintilla/include/Sci_Position.h \
-	../src/GUI.h \
-	../src/FilePath.h \
 	../src/LexillaLibrary.h
 LuaExtension.o: \
 	../src/LuaExtension.cxx \
diff -Nru scite-4.3.3/scite/gtk/makefile scite-4.4.4/scite/gtk/makefile
--- scite-4.3.3/scite/gtk/makefile	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/gtk/makefile	2020-07-18 05:40:25.000000000 +0000
@@ -45,13 +45,20 @@
 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)
+all: $(PROG) $(COMPONENT) $(LEXILLA)
 
 vpath %.h $(srcdir) $(srcdir)/../src $(SCINTILLA_DIR)/include
 vpath %.cxx $(srcdir) $(srcdir)/../src
@@ -107,8 +114,8 @@
 depend deps.mak:
 	$(PYTHON) AppDepGen.py
 
-# make should be run in ../../scintilla/gtk to compile all the lexers.
-COMPLIB=$(SCINTILLA_DIR)/bin/scintilla.a
+../bin/%.$(SHAREDEXTENSION):	../../scintilla/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
@@ -142,8 +149,8 @@
 	StyleWriter.o \
 	Utf8_16.o
 
-$(PROG): SciTEGTK.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(COMPLIB) $(LUA_OBJS)
-	$(CXX) $(BASE_FLAGS) -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers $^ -o $@ $(CONFIGLIB) $(LIBS) $(LDLIBS)
+$(PROG): SciTEGTK.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)
+	$(CXX) $(BASE_FLAGS) -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
@@ -153,8 +160,11 @@
 # 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 \
@@ -169,6 +179,8 @@
 
 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
diff -Nru scite-4.3.3/scite/gtk/SciTEGTK.cxx scite-4.4.4/scite/gtk/SciTEGTK.cxx
--- scite-4.3.3/scite/gtk/SciTEGTK.cxx	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/gtk/SciTEGTK.cxx	2020-07-18 05:40:25.000000000 +0000
@@ -48,6 +48,7 @@
 #include "StringList.h"
 #include "StringHelpers.h"
 #include "FilePath.h"
+#include "LexillaLibrary.h"
 #include "StyleDefinition.h"
 #include "PropSetFile.h"
 
@@ -555,6 +556,8 @@
 	gint	fileSelectorWidth;
 	gint	fileSelectorHeight;
 
+	GtkSettings *settings;
+
 	GtkPrintSettings *printSettings;
 	GtkPageSetup *pageSetup;
 	std::vector<int> pageStarts;
@@ -738,6 +741,11 @@
 		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
@@ -798,6 +806,10 @@
 
 	pathAbbreviations = GetAbbrevPropertiesFileName();
 
+	settings = gtk_settings_get_default();
+	appearance = CurrentAppearance();
+	g_signal_connect(settings, "notify::gtk-theme-name", G_CALLBACK(ThemeSignal), this);
+
 	ReadGlobalPropFile();
 	ReadAbbrevPropFile();
 
@@ -826,7 +838,9 @@
 	instance = this;
 }
 
-SciTEGTK::~SciTEGTK() {}
+SciTEGTK::~SciTEGTK() {
+	g_object_unref(settings);
+}
 
 static void destroyDialog(GtkWidget *, gpointer *window) {
 	if (window) {
@@ -902,6 +916,8 @@
 	return button;
 }
 
+FilePath executableDirectory;
+
 FilePath SciTEGTK::GetDefaultDirectory() {
 	const char *where = getenv("SciTE_HOME");
 #ifdef SYSCONF_PATH
@@ -4042,6 +4058,20 @@
 	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);
 }
@@ -5422,6 +5452,18 @@
 	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;
diff -Nru scite-4.3.3/scite/README scite-4.4.4/scite/README
--- scite-4.3.3/scite/README	2018-04-27 10:42:17.000000000 +0000
+++ scite-4.4.4/scite/README	2020-05-31 23:08:15.000000000 +0000
@@ -3,6 +3,11 @@
 Scintilla can be built by itself.
 To build SciTE, Scintilla must first be built.
 
+Lexers can be either compiled into Scintilla or built separately into a Lexilla
+shared library.
+A separate Lexilla is the preferred option and will become the only supported
+direction in Scintilla 5.0.
+See lexilla/src/README for information on building Lexilla.
 
 *** GTK+/Linux version ***
 
@@ -46,6 +51,9 @@
 Visual Studio 2017 is the development system used for most development
 although Mingw-w64 7.1 is also supported.
 
+There are versions of Scintilla with lexers (SciLexer.DLL) and without lexers
+(Scintilla.DLL). Make builds both versions.
+
 To build Scintilla, make in the scintilla/win32 directory
 		cd scintilla\win32
 GCC:		mingw32-make
@@ -65,6 +73,9 @@
 
 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
@@ -76,8 +87,16 @@
 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 directory
+There are versions of Scintilla.framework with lexers (ScintillaFramework) and
+without lexers (Scintilla).
+
+To build Scintilla, run xcodebuild in the scintilla/cocoa/ScintillaFramework or 
+scintilla/cocoa/Scintilla directory
+
+        cd cocoa/Scintilla
+		or
         cd cocoa/ScintillaFramework
+
 	xcodebuild
 
 *** Qt version ***
diff -Nru scite-4.3.3/scite/scripts/builddist.bat scite-4.4.4/scite/scripts/builddist.bat
--- scite-4.3.3/scite/scripts/builddist.bat	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/scripts/builddist.bat	2020-05-31 23:08:16.000000000 +0000
@@ -31,6 +31,14 @@
 call "%MSVC_DIRECTORY%\vcvars64.bat"
 
 pushd scintilla
+pushd lexilla
+pushd src
+nmake -f lexilla.mak SUPPORT_XP=1
+popd
+popd
+popd
+
+pushd scintilla
 pushd win32
 nmake -f scintilla.mak SUPPORT_XP=1
 popd
@@ -39,7 +47,7 @@
 
 pushd scite
 pushd win32
-nmake -f scite.mak SUPPORT_XP=1
+nmake -f scite.mak SUPPORT_XP=1 LOAD_SCINTILLA=1
 popd
 copy bin\Sc1.exe ..\Sc1.exe
 call zipwscite
@@ -65,6 +73,14 @@
 call "%MSVC_DIRECTORY%\vcvars32.bat"
 
 pushd scintilla
+pushd lexilla
+pushd src
+nmake -f lexilla.mak SUPPORT_XP=1
+popd
+popd
+popd
+
+pushd scintilla
 pushd win32
 nmake -f scintilla.mak SUPPORT_XP=1
 popd
@@ -73,7 +89,7 @@
 
 pushd scite
 pushd win32
-nmake -f scite.mak SUPPORT_XP=1
+nmake -f scite.mak SUPPORT_XP=1 LOAD_SCINTILLA=1
 popd
 move bin\SciTE.exe bin\SciTE32.exe
 copy bin\Sc1.exe ..\Sc1.exe
diff -Nru scite-4.3.3/scite/scripts/checkbuildlinux.sh scite-4.4.4/scite/scripts/checkbuildlinux.sh
--- scite-4.3.3/scite/scripts/checkbuildlinux.sh	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/scripts/checkbuildlinux.sh	2020-05-31 23:08:16.000000000 +0000
@@ -56,9 +56,6 @@
 make clean
 make test
 make clean
-cd ..
-cd src || exit
-make clean
 )
 
 (
diff -Nru scite-4.3.3/scite/scripts/checkbuilds.bat scite-4.4.4/scite/scripts/checkbuilds.bat
--- scite-4.3.3/scite/scripts/checkbuilds.bat	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/scripts/checkbuilds.bat	2020-05-31 23:08:16.000000000 +0000
@@ -44,6 +44,10 @@
 mingw32-make -j
 @if ERRORLEVEL 2 goto ERROR
 @popd
+@pushd scintilla\lexilla\src
+mingw32-make -j
+@if ERRORLEVEL 2 goto ERROR
+@popd
 @pushd scintilla\test
 pythonw simpleTests.py
 pythonw lexTests.py
@@ -64,6 +68,10 @@
 nmake -f scintilla.mak QUIET=1
 @if ERRORLEVEL 2 goto ERROR
 @popd
+@pushd scintilla\lexilla\src
+nmake -f lexilla.mak QUIET=1
+@if ERRORLEVEL 2 goto ERROR
+@popd
 @pushd scintilla\test
 pythonw simpleTests.py
 pythonw lexTests.py
@@ -95,7 +103,7 @@
 @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
+mingw32-make -j CXXFLAGS=-Wno-parentheses static
 @if ERRORLEVEL 2 goto ERROR
 @popd ..\..
 @rem
@@ -139,6 +147,10 @@
 mingw32-make CLANG=1 -j
 @if ERRORLEVEL 2 goto ERROR
 @popd
+@pushd scintilla\lexilla\src
+mingw32-make CLANG=1 -j
+@if ERRORLEVEL 2 goto ERROR
+@popd
 @pushd scintilla\test
 pythonw simpleTests.py
 pythonw lexTests.py
diff -Nru scite-4.3.3/scite/scripts/HeaderOrder.txt scite-4.4.4/scite/scripts/HeaderOrder.txt
--- scite-4.3.3/scite/scripts/HeaderOrder.txt	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/scripts/HeaderOrder.txt	2020-05-31 23:08:16.000000000 +0000
@@ -129,6 +129,7 @@
 #include "SciTEKeys.h"
 
 #include "SciTEWin.h"
+#include "DLLFunction.h"
 #include "MultiplexExtension.h"
 #include "DirectorExtension.h"
 #include "LuaExtension.h"
diff -Nru scite-4.3.3/scite/scripts/RegenerateSource.py scite-4.4.4/scite/scripts/RegenerateSource.py
--- scite-4.3.3/scite/scripts/RegenerateSource.py	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/scripts/RegenerateSource.py	2020-05-31 23:08:16.000000000 +0000
@@ -13,19 +13,20 @@
 
 # Regenerates Scintilla files by calling LexGen.RegenerateAll
 
-import codecs, glob, os, sys
+import pathlib, sys
 
-srcRoot = "../.."
-
-sys.path.append(srcRoot + "/scintilla/scripts")
+sciteBase = pathlib.Path(__file__).resolve().parent.parent
+baseDirectory = sciteBase.parent
+sys.path.append(str(baseDirectory / "scintilla" / "scripts"))
 
 from FileGenerator import Generate, Regenerate, UpdateLineInFile, ReplaceREInFile
 import ScintillaData
 import LexGen
+import lexilla.scripts.LexillaGen
 import IFaceTableGen
 import commandsdoc
 
-sys.path.append("..")
+sys.path.append(str(sciteBase))
 
 import win32.AppDepGen
 import gtk.AppDepGen
@@ -33,7 +34,7 @@
 neutralEncoding = "windows-1252"
 
 def UpdateVersionNumbers(sci, pathSciTE):
-    pathHeader = os.path.join(pathSciTE, "src", "SciTE.h")
+    pathHeader = pathSciTE / "src" / "SciTE.h"
     UpdateLineInFile(pathHeader,
         '#define VERSION_SCITE',
         '#define VERSION_SCITE "' + sci.versionDotted + '"')
@@ -47,7 +48,7 @@
         '#define COPYRIGHT_YEARS',
         '#define COPYRIGHT_YEARS "1998-' + sci.yearModified + '"')
 
-    pathDownload = os.path.join(pathSciTE, "doc", "SciTEDownload.html")
+    pathDownload = pathSciTE / "doc" / "SciTEDownload.html"
     UpdateLineInFile(pathDownload,
         "       Release",
         "       Release " + sci.versionDotted)
@@ -61,7 +62,7 @@
         r"/www.scintilla.org/(Sc32_)\d\d\d",
         r"/www.scintilla.org/\g<1>" +  sci.version)
 
-    pathMain = os.path.join(pathSciTE, "doc", "SciTE.html")
+    pathMain = pathSciTE / "doc" / "SciTE.html"
     UpdateLineInFile(pathMain,
         '          <font color="#FFCC99" size="3"> Release version',
         '          <font color="#FFCC99" size="3"> Release version ' + \
@@ -76,19 +77,11 @@
 def OctalEscape(s):
     result = []
     for char in s:
-        try:
-            ordChar = ord(char)
-            # Python 2.x, s is a string so bytes
-            if ordChar < 128:
-                result.append(char)
-            else:
-                result.append("\%o" % ordChar)
-        except TypeError:
-            # Python 3.x, s is a byte string
-            if char < 128:
-                result.append(chr(char))
-            else:
-                result.append("\%o" % char)
+        # 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):
@@ -96,31 +89,29 @@
     propFilesAll = propFilesSpecial + propFiles
     linesEmbedded = []
     for pf in propFilesAll:
-        fullPath = os.path.join(pathSciTE, "src", pf)
-        with codecs.open(fullPath, "r", neutralEncoding) as fi:
-            fileBase = pf.split(".")[0]
+        fullPath = pathSciTE / "src" / pf
+        with fullPath.open(encoding=neutralEncoding) as fi:
+            fileBase = pathlib.Path(pf).stem
             if pf not in propFilesSpecial:
-                linesEmbedded.append(os.linesep + "module " + fileBase + os.linesep)
+                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] += os.linesep
+                linesEmbedded[-1] += "\n"
     textEmbedded = "".join(linesEmbedded)
-    pathEmbedded = os.path.join(pathSciTE, "src", "Embedded.properties")
-    with codecs.open(pathEmbedded, "r", neutralEncoding) as fileEmbedded:
-        original = fileEmbedded.read()
+    pathEmbedded = pathSciTE / "src" / "Embedded.properties"
+    original = pathEmbedded.read_text(encoding=neutralEncoding)
     if textEmbedded != original:
-        with codecs.open(pathEmbedded, "w", neutralEncoding) as fileOutEmbedded:
-            fileOutEmbedded.write(textEmbedded)
-            print("Changed %s" % pathEmbedded)
+        pathEmbedded.write_text(textEmbedded, encoding=neutralEncoding)
+        print("Changed %s" % pathEmbedded)
 
 def RegenerateAll():
     root="../../"
 
-    sci = ScintillaData.ScintillaData(root + "scintilla/")
+    sci = ScintillaData.ScintillaData(baseDirectory / "scintilla")
 
-    pathSciTE = os.path.join(root, "scite")
+    pathSciTE = sciteBase
 
     # Generate HTML to document each property
     # This is done because tags can not be safely put inside comments in HTML
@@ -137,25 +128,26 @@
         "Embedded.properties",
         "SciTEGlobal.properties",
         "SciTE.properties"]
-    propFilePaths = glob.glob(os.path.join(pathSciTE, "src", "*.properties"))
+    propFilePaths = list((pathSciTE / "src").glob("*.properties"))
     ScintillaData.SortListInsensitive(propFilePaths)
-    propFiles = [os.path.basename(f) for f in propFilePaths if os.path.basename(f) not in otherProps]
+    propFiles = [f.name for f in propFilePaths if f.name not in otherProps]
     ScintillaData.SortListInsensitive(propFiles)
 
     UpdateEmbedded(pathSciTE, propFiles)
-    Regenerate(os.path.join(pathSciTE, "win32", "makefile"), "#", propFiles)
-    Regenerate(os.path.join(pathSciTE, "win32", "scite.mak"), "#", propFiles)
-    Regenerate(os.path.join(pathSciTE, "src", "SciTEProps.cxx"), "//", sci.lexerProperties)
-    Regenerate(os.path.join(pathSciTE, "doc", "SciTEDoc.html"), "<!--", propertiesHTML)
+    Regenerate(pathSciTE / "win32" / "makefile", "#", propFiles)
+    Regenerate(pathSciTE / "win32" / "scite.mak", "#", propFiles)
+    Regenerate(pathSciTE / "src" / "SciTEProps.cxx", "//", sci.lexerProperties)
+    Regenerate(pathSciTE / "doc" / "SciTEDoc.html", "<!--", propertiesHTML)
     credits = [OctalEscape(c.encode("utf-8")) for c in sci.credits]
-    Regenerate(os.path.join(pathSciTE, "src", "Credits.cxx"), "//", credits)
+    Regenerate(pathSciTE / "src" / "Credits.cxx", "//", credits)
 
     win32.AppDepGen.Generate()
     gtk.AppDepGen.Generate()
 
     UpdateVersionNumbers(sci, pathSciTE)
 
-LexGen.RegenerateAll("../../scintilla/")
+LexGen.RegenerateAll(sciteBase.parent / "scintilla")
+lexilla.scripts.LexillaGen.RegenerateAll(sciteBase.parent / "scintilla")
 RegenerateAll()
 IFaceTableGen.RegenerateAll()
 commandsdoc.RegenerateAll()
diff -Nru scite-4.3.3/scite/scripts/UpdateSizeInDocs.py scite-4.4.4/scite/scripts/UpdateSizeInDocs.py
--- scite-4.3.3/scite/scripts/UpdateSizeInDocs.py	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scite/scripts/UpdateSizeInDocs.py	2020-05-31 23:08:16.000000000 +0000
@@ -0,0 +1,64 @@
+#!/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"
+    releaseRoot = sciteRoot.parent.parent / "arc"
+
+    uploadDocs = [
+        sciteRoot / "doc" / "SciTEDownload.html",
+        scintillaRoot / "doc" / "ScintillaDownload.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 -Nru scite-4.3.3/scite/src/Credits.cxx scite-4.4.4/scite/src/Credits.cxx
--- scite-4.3.3/scite/src/Credits.cxx	2020-03-15 08:37:00.000000000 +0000
+++ scite-4.4.4/scite/src/Credits.cxx	2020-07-18 05:40:25.000000000 +0000
@@ -459,6 +459,11 @@
             "Mark Reay",
             "David Shuman",
             "McLoo",
+            "Shmuel Zeigerman",
+            "Chris Graham",
+            "Hugues Larrive",
+            "Prakash Sahni",
+            "Michel Sauvard",
 
 //--Autogenerated -- end of automatically generated section
         };
@@ -550,6 +555,9 @@
 		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));
diff -Nru scite-4.3.3/scite/src/Embedded.properties scite-4.4.4/scite/src/Embedded.properties
--- scite-4.3.3/scite/src/Embedded.properties	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/src/Embedded.properties	2020-05-31 23:08:16.000000000 +0000
@@ -154,6 +154,7 @@
 	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
@@ -168,6 +169,7 @@
 	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
@@ -182,6 +184,7 @@
 	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)
 
@@ -6487,6 +6490,7 @@
 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)
@@ -7449,7 +7453,7 @@
 if PLAT_GTK
 	python.command=python3
 if PLAT_MAC
-	python.command=python3
+	python.command=python
 
 if PLAT_WIN
 	command.go.*.py=$(python.command) -u "$(FileNameExt)"
diff -Nru scite-4.3.3/scite/src/IFaceTable.cxx scite-4.4.4/scite/src/IFaceTable.cxx
--- scite-4.3.3/scite/src/IFaceTable.cxx	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/src/IFaceTable.cxx	2020-07-18 05:40:25.000000000 +0000
@@ -144,6 +144,9 @@
 	{"EDGE_LINE",1},
 	{"EDGE_MULTILINE",3},
 	{"EDGE_NONE",0},
+	{"EOLANNOTATION_BOXED",2},
+	{"EOLANNOTATION_HIDDEN",0},
+	{"EOLANNOTATION_STANDARD",1},
 	{"IDM_ABBREV",242},
 	{"IDM_ABOUT",902},
 	{"IDM_ACTIVATE",320},
@@ -889,6 +892,7 @@
 	{"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},
@@ -2200,6 +2204,14 @@
 	{"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},
@@ -2897,10 +2909,11 @@
 	{"SC_MARK_VLINE",9},
 	{"SC_MASK_FOLDERS",static_cast<int>(0xFE000000)},
 	{"SC_MAX_MARGIN",4},
-	{"SC_MODEVENTMASKALL",0x3FFFFF},
+	{"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},
@@ -3022,6 +3035,7 @@
 	{"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}},
@@ -3080,6 +3094,7 @@
 	{"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}},
@@ -3374,6 +3389,10 @@
 	{"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},
@@ -3550,9 +3569,9 @@
 };
 
 enum {
-	ifaceFunctionCount = 311,
-	ifaceConstantCount = 2867,
-	ifacePropertyCount = 238
+	ifaceFunctionCount = 313,
+	ifaceConstantCount = 2880,
+	ifacePropertyCount = 242
 };
 
 //--Autogenerated
diff -Nru scite-4.3.3/scite/src/LexillaLibrary.cxx scite-4.4.4/scite/src/LexillaLibrary.cxx
--- scite-4.3.3/scite/src/LexillaLibrary.cxx	2020-01-02 00:45:08.000000000 +0000
+++ scite-4.4.4/scite/src/LexillaLibrary.cxx	2020-07-18 05:40:25.000000000 +0000
@@ -11,8 +11,8 @@
 #include <cstring>
 
 #include <string>
+#include <string_view>
 #include <vector>
-#include <chrono>
 
 #if !_WIN32
 #include <dlfcn.h>
@@ -22,9 +22,6 @@
 
 #include "ILexer.h"
 
-#include "GUI.h"
-
-#include "FilePath.h"
 #include "LexillaLibrary.h"
 
 namespace {
@@ -33,7 +30,9 @@
 #define EXT_LEXER_DECL __stdcall
 typedef FARPROC Function;
 typedef HMODULE Module;
-constexpr const char *extensionSO = ".dll"; 
+constexpr const char *extensionSO = ".dll";
+constexpr const char *pathSeparator = "\\";
+constexpr const char *defaultName = "lexilla";
 #else
 #define EXT_LEXER_DECL
 typedef void *Function;
@@ -43,6 +42,8 @@
 #else
 constexpr const char *extensionSO = ".so";
 #endif
+constexpr const char *pathSeparator = "/";
+constexpr const char *defaultName = "liblexilla";
 #endif
 
 typedef Scintilla::ILexer5 *(EXT_LEXER_DECL *CreateLexerFn)(const char *name);
@@ -57,7 +58,20 @@
 	return fp;
 }
 
-FilePathSet lastLoaded;
+#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
+
+std::string directoryLoadDefault;
+std::string lastLoaded;
 std::vector<CreateLexerFn> fnCLs;
 
 Function FindSymbol(Module m, const char *symbol) noexcept {
@@ -68,42 +82,88 @@
 #endif
 }
 
+LexillaCreatePointer 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;
+}
+
 }
 
-bool LexillaLoad(FilePathSet sharedLibraries) {
-	if (lastLoaded != sharedLibraries) {
-		fnCLs.clear();
-		for (FilePath sharedLibrary : sharedLibraries) {
-			if (!sharedLibrary.Extension().IsSet()) {
-				std::string slu = sharedLibrary.AsUTF8();
-				slu.append(extensionSO);
-				sharedLibrary.Set(GUI::StringFromUTF8(slu));
+void LexillaSetDefault(LexillaCreatePointer pCreate) {
+	pCreateLexerDefault = pCreate;
+}
+
+void LexillaSetDefaultDirectory(std::string_view directory) {
+	directoryLoadDefault = directory;
+}
+
+bool LexillaLoad(std::string_view sharedLibraryPaths) {
+	if (sharedLibraryPaths == lastLoaded) {
+		return !fnCLs.empty();
+	}
+
+	std::string_view paths = sharedLibraryPaths;
+
+	fnCLs.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 += defaultName;
+		}
+		if (!NameContainsDot(path)) {
+			// No '.' in name so add extension
+			path.append(extensionSO);
+		}
 #if _WIN32
-			Module lexillaDL = ::LoadLibraryW(sharedLibrary.AsInternal());
+		// Convert from UTF-8 to wide characters
+		std::wstring wsPath = WideStringFromUTF8(path);
+		Module lexillaDL = ::LoadLibraryW(wsPath.c_str());
 #else
-			Module lexillaDL = dlopen(sharedLibrary.AsInternal(), RTLD_LAZY);
+		Module lexillaDL = dlopen(path.c_str(), RTLD_LAZY);
 #endif
-			if (lexillaDL) {
-				CreateLexerFn fnCL = FunctionPointer<CreateLexerFn>(
-					FindSymbol(lexillaDL, "CreateLexer"));
-				if (fnCL) {
-					fnCLs.push_back(fnCL);
-				}
+		if (lexillaDL) {
+			CreateLexerFn fnCL = FunctionPointer<CreateLexerFn>(
+				FindSymbol(lexillaDL, "CreateLexer"));
+			if (fnCL) {
+				fnCLs.push_back(fnCL);
 			}
 		}
-		lastLoaded = sharedLibraries;
 	}
+	lastLoaded = sharedLibraryPaths;
 
 	return !fnCLs.empty();
 }
 
-Scintilla::ILexer5 *LexillaCreateLexer(const std::string &languageName) {
+Scintilla::ILexer5 *LexillaCreateLexer(std::string_view languageName) {
+	std::string sLanguageName(languageName);	// Ensure NUL-termination
 	for (CreateLexerFn fnCL : fnCLs) {
-		Scintilla::ILexer5 *pLexer = fnCL(languageName.c_str());
+		Scintilla::ILexer5 *pLexer = fnCL(sLanguageName.c_str());
 		if (pLexer) {
 			return pLexer;
 		}
 	}
+	if (pCreateLexerDefault) {
+		return pCreateLexerDefault(sLanguageName.c_str());
+	}
 	return nullptr;
 }
diff -Nru scite-4.3.3/scite/src/LexillaLibrary.h scite-4.4.4/scite/src/LexillaLibrary.h
--- scite-4.3.3/scite/src/LexillaLibrary.h	2020-03-03 21:50:34.000000000 +0000
+++ scite-4.4.4/scite/src/LexillaLibrary.h	2020-05-31 23:08:16.000000000 +0000
@@ -1,6 +1,7 @@
 // SciTE - Scintilla based Text Editor
 /** @file LexillaLibrary.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.
@@ -8,7 +9,18 @@
 #ifndef LEXILLALIBRARY_H
 #define LEXILLALIBRARY_H
 
-bool LexillaLoad(FilePathSet sharedLibraries);
-Scintilla::ILexer5 *LexillaCreateLexer(const std::string &languageName);
+// Directory to load default Lexilla from, commonly the directory of the application.
+void LexillaSetDefaultDirectory(std::string_view directory);
+
+using LexillaCreatePointer = Scintilla::ILexer5 *(*)(const char *);
+
+void LexillaSetDefault(LexillaCreatePointer pCreate);
+
+// 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 LexillaLoad(std::string_view sharedLibraryPaths);
+
+Scintilla::ILexer5 *LexillaCreateLexer(std::string_view languageName);
 
 #endif
diff -Nru scite-4.3.3/scite/src/LuaExtension.cxx scite-4.4.4/scite/src/LuaExtension.cxx
--- scite-4.3.3/scite/src/LuaExtension.cxx	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/src/LuaExtension.cxx	2020-07-18 05:40:25.000000000 +0000
@@ -37,6 +37,8 @@
 
 #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
@@ -1249,7 +1251,6 @@
 // release 1.62
 // A Lua table called 'buffer' is associated with each buffer
 // and can be used to maintain buffer-specific state.
-	lua_pushliteral(luaState, "buffer");
 	if (curBufferIndex >= 0) {
 		lua_pushliteral(luaState, "SciTE_BufferData_Array");
 		lua_rawget(luaState, LUA_REGISTRYINDEX);
@@ -1303,6 +1304,7 @@
 			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");
@@ -1335,6 +1337,7 @@
 
 		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
diff -Nru scite-4.3.3/scite/src/others.properties scite-4.4.4/scite/src/others.properties
--- scite-4.3.3/scite/src/others.properties	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/src/others.properties	2020-05-31 23:08:16.000000000 +0000
@@ -174,6 +174,8 @@
 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
diff -Nru scite-4.3.3/scite/src/PropSetFile.cxx scite-4.4.4/scite/src/PropSetFile.cxx
--- scite-4.3.3/scite/src/PropSetFile.cxx	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/src/PropSetFile.cxx	2020-05-31 23:08:16.000000000 +0000
@@ -186,6 +186,18 @@
 			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
@@ -387,7 +399,14 @@
 	}
 	if (isprefix(lineBuffer, "if ")) {
 		const char *expr = lineBuffer + strlen("if") + 1;
-		rls = (GetInt(expr) != 0) ? rlActive : rlConditionFalse;
+		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);
diff -Nru scite-4.3.3/scite/src/python.properties scite-4.4.4/scite/src/python.properties
--- scite-4.3.3/scite/src/python.properties	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/src/python.properties	2020-05-31 23:08:16.000000000 +0000
@@ -154,7 +154,7 @@
 if PLAT_GTK
 	python.command=python3
 if PLAT_MAC
-	python.command=python3
+	python.command=python
 
 if PLAT_WIN
 	command.go.*.py=$(python.command) -u "$(FileNameExt)"
diff -Nru scite-4.3.3/scite/src/ScintillaCall.cxx scite-4.4.4/scite/src/ScintillaCall.cxx
--- scite-4.3.3/scite/src/ScintillaCall.cxx	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/src/ScintillaCall.cxx	2020-07-18 05:40:25.000000000 +0000
@@ -1883,6 +1883,10 @@
 	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);
 }
@@ -2963,6 +2967,46 @@
 	Call(Message::ClearRepresentation, 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(API::EOLAnnotationVisible visible) {
+	Call(Message::EOLAnnotationSetVisible, static_cast<uintptr_t>(visible));
+}
+
+EOLAnnotationVisible ScintillaCall::EOLAnnotationGetVisible() {
+	return static_cast<API::EOLAnnotationVisible>(Call(Message::EOLAnnotationGetVisible));
+}
+
+void ScintillaCall::EOLAnnotationSetStyleOffset(int style) {
+	Call(Message::EOLAnnotationSetStyleOffset, style);
+}
+
+int ScintillaCall::EOLAnnotationGetStyleOffset() {
+	return static_cast<int>(Call(Message::EOLAnnotationGetStyleOffset));
+}
+
 void ScintillaCall::StartRecord() {
 	Call(Message::StartRecord);
 }
diff -Nru scite-4.3.3/scite/src/ScintillaCall.h scite-4.4.4/scite/src/ScintillaCall.h
--- scite-4.3.3/scite/src/ScintillaCall.h	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/src/ScintillaCall.h	2020-07-18 05:40:25.000000000 +0000
@@ -485,6 +485,7 @@
 	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();
@@ -755,6 +756,16 @@
 	int Representation(const char *encodedCharacter, char *representation);
 	std::string Representation(const char *encodedCharacter);
 	void ClearRepresentation(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(API::EOLAnnotationVisible visible);
+	API::EOLAnnotationVisible EOLAnnotationGetVisible();
+	void EOLAnnotationSetStyleOffset(int style);
+	int EOLAnnotationGetStyleOffset();
 	void StartRecord();
 	void StopRecord();
 	void SetLexer(int lexer);
diff -Nru scite-4.3.3/scite/src/ScintillaMessages.h scite-4.4.4/scite/src/ScintillaMessages.h
--- scite-4.3.3/scite/src/ScintillaMessages.h	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/src/ScintillaMessages.h	2020-07-18 05:40:25.000000000 +0000
@@ -441,6 +441,7 @@
 	BraceBadLight = 2352,
 	BraceBadLightIndicator = 2499,
 	BraceMatch = 2353,
+	BraceMatchNext = 2369,
 	GetViewEOL = 2355,
 	SetViewEOL = 2356,
 	GetDocPointer = 2357,
@@ -701,6 +702,15 @@
 	SetRepresentation = 2665,
 	GetRepresentation = 2666,
 	ClearRepresentation = 2667,
+	EOLAnnotationSetText = 2740,
+	EOLAnnotationGetText = 2741,
+	EOLAnnotationSetStyle = 2742,
+	EOLAnnotationGetStyle = 2743,
+	EOLAnnotationClearAll = 2744,
+	EOLAnnotationSetVisible = 2745,
+	EOLAnnotationGetVisible = 2746,
+	EOLAnnotationSetStyleOffset = 2747,
+	EOLAnnotationGetStyleOffset = 2748,
 	StartRecord = 3001,
 	StopRecord = 3002,
 	SetLexer = 4001,
diff -Nru scite-4.3.3/scite/src/ScintillaTypes.h scite-4.4.4/scite/src/ScintillaTypes.h
--- scite-4.3.3/scite/src/ScintillaTypes.h	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/src/ScintillaTypes.h	2020-07-18 05:40:25.000000000 +0000
@@ -444,6 +444,12 @@
 	Unicode = 1,
 };
 
+enum class EOLAnnotationVisible {
+	Hidden = 0,
+	Standard = 1,
+	Boxed = 2,
+};
+
 enum class TypeProperty {
 	Boolean = 0,
 	Integer = 1,
@@ -474,7 +480,8 @@
 	LexerState = 0x80000,
 	InsertCheck = 0x100000,
 	ChangeTabStops = 0x200000,
-	EventMaskAll = 0x3FFFFF,
+	ChangeEOLAnnotation = 0x400000,
+	EventMaskAll = 0x7FFFFF,
 };
 
 enum class Update {
@@ -620,36 +627,18 @@
 	}
 };
 
-// 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));
-}
-
-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 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));
-}
-
 // 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));
-}
-
 // Functions to retrieve and manipulate fields from a FoldLevel
 
 constexpr FoldLevel operator&(FoldLevel lhs, FoldLevel rhs) noexcept {
diff -Nru scite-4.3.3/scite/src/SciTEBase.cxx scite-4.4.4/scite/src/SciTEBase.cxx
--- scite-4.3.3/scite/src/SciTEBase.cxx	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/src/SciTEBase.cxx	2020-07-18 05:40:25.000000000 +0000
@@ -146,6 +146,7 @@
 	underIndicator = false;
 	openFilesHere = false;
 	fullScreen = false;
+	appearance = {};
 
 	heightOutput = 0;
 	heightOutputStartDrag = 0;
@@ -248,6 +249,18 @@
 	}
 }
 
+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.
@@ -3763,14 +3776,14 @@
 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 (((km & SA::KeyMod::Shift) == SA::KeyMod::Shift) && ((km & SA::KeyMod::Ctrl) == SA::KeyMod::Ctrl)) {
+	if ((FlagIsSet(km, SA::KeyMod::Shift)) && (FlagIsSet(km, SA::KeyMod::Ctrl))) {
 		FoldAll();
 	} else {
 		const SA::FoldLevel levelClick = wEditor.FoldLevel(lineClick);
 		if (LevelIsHeader(levelClick)) {
-			if ((km & SA::KeyMod::Shift) == SA::KeyMod::Shift) {
+			if (FlagIsSet(km, SA::KeyMod::Shift)) {
 				EnsureAllChildrenVisible(lineClick, levelClick);
-			} else if ((km & SA::KeyMod::Ctrl) == SA::KeyMod::Ctrl) {
+			} else if (FlagIsSet(km, SA::KeyMod::Ctrl)) {
 				ToggleFoldRecursive(lineClick, levelClick);
 			} else {
 				// Toggle this line
@@ -3839,10 +3852,10 @@
 		RemoveFindMarks();
 	}
 	const SA::Update updated = static_cast<SA::Update>(notification->updated);
-	if (static_cast<int>(updated & (SA::Update::Selection | SA::Update::Content))) {
+	if (FlagIsSet(updated, SA::Update::Selection) || FlagIsSet(updated, SA::Update::Content)) {
 		if ((notification->nmhdr.idFrom == IDM_SRCWIN) == (pwFocussed == &wEditor)) {
 			// Only highlight focused pane.
-			if ((updated & SA::Update::Selection) == SA::Update::Selection) {
+			if (FlagIsSet(updated, SA::Update::Selection)) {
 				currentWordHighlight.statesOfDelay = currentWordHighlight.noDelay; // Selection has just been updated, so delay is disabled.
 				currentWordHighlight.textHasChanged = false;
 				HighlightCurrentWord(true);
@@ -3856,17 +3869,16 @@
 void SciTEBase::Modified(const SCNotification *notification) {
 	const SA::ModificationFlags modificationType =
 		static_cast<SA::ModificationFlags>(notification->modificationType);
-	const SA::ModificationFlags insertOrDelete =
-		SA::ModificationFlags::InsertText | SA::ModificationFlags::DeleteText;
-	if ((notification->nmhdr.idFrom == IDM_SRCWIN) &&
-			((modificationType & insertOrDelete) != SA::ModificationFlags::None))
+	const bool textWasModified = FlagIsSet(modificationType, SA::ModificationFlags::InsertText) ||
+		FlagIsSet(modificationType, SA::ModificationFlags::DeleteText);
+	if ((notification->nmhdr.idFrom == IDM_SRCWIN) && textWasModified)
 		CurrentBuffer()->DocumentModified();
-	if ((modificationType & SA::ModificationFlags::LastStepInUndoRedo) != SA::ModificationFlags::None) {
+	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 ((modificationType & insertOrDelete) != SA::ModificationFlags::None) {
+	} else if (textWasModified) {
 		if ((notification->nmhdr.idFrom == IDM_SRCWIN) == (pwFocussed == &wEditor)) {
 			currentWordHighlight.textHasChanged = true;
 		}
@@ -3882,7 +3894,7 @@
 		SetLineNumberWidth();
 	}
 
-	if ((modificationType & SA::ModificationFlags::ChangeFold) != SA::ModificationFlags::None) {
+	if (FlagIsSet(modificationType, SA::ModificationFlags::ChangeFold)) {
 		FoldChanged(notification->line,
 			    static_cast<SA::FoldLevel>(notification->foldLevelNow),
 			    static_cast<SA::FoldLevel>(notification->foldLevelPrev));
diff -Nru scite-4.3.3/scite/src/SciTEBase.h scite-4.4.4/scite/src/SciTEBase.h
--- scite-4.3.3/scite/src/SciTEBase.h	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/src/SciTEBase.h	2020-07-18 05:40:25.000000000 +0000
@@ -357,6 +357,14 @@
 class IEditorConfig;
 struct SCNotification;
 
+struct SystemAppearance {
+	bool dark;
+	bool highContrast;
+	bool operator==(const SystemAppearance &other) const noexcept {
+		return dark == other.dark && highContrast == other.highContrast;
+	}
+};
+
 class SciTEBase : public ExtensionAPI, public Searcher, public WorkerListener {
 protected:
 	bool needIdle;
@@ -457,6 +465,7 @@
 	std::string foldHiliteColour;
 	bool openFilesHere;
 	bool fullScreen;
+	SystemAppearance appearance;
 	enum { toolMax = 50 };
 	Extension *extender;
 	bool needReadProperties;
@@ -583,6 +592,8 @@
 	void ReadLocalPropFile();
 	void ReadDirectoryPropFile();
 
+	virtual SystemAppearance CurrentAppearance() const noexcept;
+	void CheckAppearanceChanged();
 	void SetPaneFocus(bool editPane) noexcept;
 	GUI::ScintillaWindow &PaneFocused();
 	GUI::ScintillaWindow &PaneSource(int destination);
@@ -1006,4 +1017,10 @@
 SA::Colour ColourOfProperty(const PropSetFile &props, const char *key, SA::Colour 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 -Nru scite-4.3.3/scite/src/SciTEGlobal.properties scite-4.4.4/scite/src/SciTEGlobal.properties
--- scite-4.3.3/scite/src/SciTEGlobal.properties	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/src/SciTEGlobal.properties	2020-05-31 23:08:16.000000000 +0000
@@ -383,6 +383,7 @@
 	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
@@ -397,6 +398,7 @@
 	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
@@ -411,6 +413,7 @@
 	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)
 
diff -Nru scite-4.3.3/scite/src/SciTE.h scite-4.4.4/scite/src/SciTE.h
--- scite-4.3.3/scite/src/SciTE.h	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/src/SciTE.h	2020-07-18 05:40:25.000000000 +0000
@@ -9,9 +9,9 @@
 #define SCITE_H
 
 // Version numbers and dates
-#define VERSION_SCITE "4.3.3"
-#define VERSION_WORDS 4, 3, 3, 0
-#define COPYRIGHT_DATES "December 1998-April 2020"
+#define VERSION_SCITE "4.4.4"
+#define VERSION_WORDS 4, 4, 4, 0
+#define COPYRIGHT_DATES "December 1998-July 2020"
 #define COPYRIGHT_YEARS "1998-2020"
 
 // Menu IDs.
diff -Nru scite-4.3.3/scite/src/SciTEProps.cxx scite-4.4.4/scite/src/SciTEProps.cxx
--- scite-4.3.3/scite/src/SciTEProps.cxx	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/src/SciTEProps.cxx	2020-05-31 23:08:16.000000000 +0000
@@ -141,6 +141,11 @@
 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;
 
@@ -662,14 +667,7 @@
 		extender->Clear();
 
 	const std::string lexillaPath = props.GetString("lexilla.path");
-	if (lexillaPath.length()) {
-		std::vector<std::string> paths = StringSplit(lexillaPath, ';');
-		FilePathSet fps;
-		for (std::string path : paths) {
-			fps.push_back(FilePath(GUI::StringFromUTF8(path)));
-		}
-		LexillaLoad(fps);
-	}
+	LexillaLoad(lexillaPath.empty() ? "." : lexillaPath);
 
 	const std::string fileNameForExtension = ExtensionFileName();
 
diff -Nru scite-4.3.3/scite/tgzgscite scite-4.4.4/scite/tgzgscite
--- scite-4.3.3/scite/tgzgscite	2018-04-27 10:42:17.000000000 +0000
+++ scite-4.4.4/scite/tgzgscite	2020-05-31 23:21:08.000000000 +0000
@@ -3,6 +3,7 @@
 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
diff -Nru scite-4.3.3/scite/tgzsrc.orig scite-4.4.4/scite/tgzsrc.orig
--- scite-4.3.3/scite/tgzsrc.orig	2020-01-21 09:08:20.000000000 +0000
+++ scite-4.4.4/scite/tgzsrc.orig	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-cd ..
-rm -f scite.tgz
-rm -f scite/bin/*.properties
-tar --create --exclude-from=scite/.hgignore \
-	scintilla/* scite/* \
-	| gzip -c >scite.tgz
diff -Nru scite-4.3.3/scite/win32/deps.mak scite-4.4.4/scite/win32/deps.mak
--- scite-4.3.3/scite/win32/deps.mak	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/win32/deps.mak	2020-05-31 23:08:16.000000000 +0000
@@ -29,6 +29,7 @@
 	SciTEWin.h \
 	../../scintilla/include/ILoader.h \
 	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
 	../src/ScintillaTypes.h \
 	../src/ScintillaMessages.h \
 	../src/ScintillaCall.h \
@@ -38,6 +39,7 @@
 	../src/StringList.h \
 	../src/StringHelpers.h \
 	../src/FilePath.h \
+	../src/LexillaLibrary.h \
 	../src/StyleDefinition.h \
 	../src/PropSetFile.h \
 	../src/StyleWriter.h \
@@ -53,6 +55,7 @@
 	../src/StripDefinition.h \
 	Strips.h \
 	../src/SciTEKeys.h \
+	DLLFunction.h \
 	../src/MultiplexExtension.h \
 	DirectorExtension.h \
 	../src/LuaExtension.h
@@ -61,6 +64,7 @@
 	SciTEWin.h \
 	../../scintilla/include/ILoader.h \
 	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
 	../src/ScintillaTypes.h \
 	../src/ScintillaMessages.h \
 	../src/ScintillaCall.h \
@@ -70,6 +74,7 @@
 	../src/StringList.h \
 	../src/StringHelpers.h \
 	../src/FilePath.h \
+	../src/LexillaLibrary.h \
 	../src/StyleDefinition.h \
 	../src/PropSetFile.h \
 	../src/StyleWriter.h \
@@ -85,6 +90,7 @@
 	../src/StripDefinition.h \
 	Strips.h \
 	../src/SciTEKeys.h \
+	DLLFunction.h \
 	../src/MultiplexExtension.h \
 	DirectorExtension.h \
 	../src/LuaExtension.h
@@ -93,6 +99,7 @@
 	SciTEWin.h \
 	../../scintilla/include/ILoader.h \
 	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
 	../src/ScintillaTypes.h \
 	../src/ScintillaMessages.h \
 	../src/ScintillaCall.h \
@@ -102,6 +109,7 @@
 	../src/StringList.h \
 	../src/StringHelpers.h \
 	../src/FilePath.h \
+	../src/LexillaLibrary.h \
 	../src/StyleDefinition.h \
 	../src/PropSetFile.h \
 	../src/StyleWriter.h \
@@ -122,6 +130,7 @@
 	SciTEWin.h \
 	../../scintilla/include/ILoader.h \
 	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
 	../src/ScintillaTypes.h \
 	../src/ScintillaMessages.h \
 	../src/ScintillaCall.h \
@@ -131,6 +140,7 @@
 	../src/StringList.h \
 	../src/StringHelpers.h \
 	../src/FilePath.h \
+	../src/LexillaLibrary.h \
 	../src/StyleDefinition.h \
 	../src/PropSetFile.h \
 	../src/StyleWriter.h \
@@ -151,6 +161,7 @@
 	SciTEWin.h \
 	../../scintilla/include/ILoader.h \
 	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
 	../src/ScintillaTypes.h \
 	../src/ScintillaMessages.h \
 	../src/ScintillaCall.h \
@@ -160,6 +171,7 @@
 	../src/StringList.h \
 	../src/StringHelpers.h \
 	../src/FilePath.h \
+	../src/LexillaLibrary.h \
 	../src/StyleDefinition.h \
 	../src/PropSetFile.h \
 	../src/StyleWriter.h \
@@ -180,6 +192,7 @@
 	SciTEWin.h \
 	../../scintilla/include/ILoader.h \
 	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
 	../src/ScintillaTypes.h \
 	../src/ScintillaMessages.h \
 	../src/ScintillaCall.h \
@@ -189,6 +202,7 @@
 	../src/StringList.h \
 	../src/StringHelpers.h \
 	../src/FilePath.h \
+	../src/LexillaLibrary.h \
 	../src/StyleDefinition.h \
 	../src/PropSetFile.h \
 	../src/StyleWriter.h \
@@ -372,8 +386,6 @@
 	../src/LexillaLibrary.cxx \
 	../../scintilla/include/ILexer.h \
 	../../scintilla/include/Sci_Position.h \
-	../src/GUI.h \
-	../src/FilePath.h \
 	../src/LexillaLibrary.h
 LuaExtension.o: \
 	../src/LuaExtension.cxx \
diff -Nru scite-4.3.3/scite/win32/DLLFunction.h scite-4.4.4/scite/win32/DLLFunction.h
--- scite-4.3.3/scite/win32/DLLFunction.h	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.4.4/scite/win32/DLLFunction.h	2020-05-31 23:08:16.000000000 +0000
@@ -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 -Nru scite-4.3.3/scite/win32/makefile scite-4.4.4/scite/win32/makefile
--- scite-4.3.3/scite/win32/makefile	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/win32/makefile	2020-05-31 23:08:16.000000000 +0000
@@ -3,6 +3,8 @@
 # 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.
+# For a build with no lexers, loading Scintilla.DLL instead of SciLexer.DLL,
+# define LOAD_SCINTILLA on the command line.
 
 .PHONY: all clean analyze depend
 
@@ -75,7 +77,7 @@
 vpath %.cxx ../src
 vpath %.a ../../scintilla/bin
 
-LIBS += -lgdi32 -luser32 -limm32 -lole32 -luuid -loleaut32 -lmsimg32 -lshell32 -lcomdlg32 -lcomctl32
+LIBS += -lgdi32 -luser32 -limm32 -lole32 -luuid -loleaut32 -lmsimg32 -lshell32 -lcomdlg32 -lcomctl32 -ladvapi32
 
 CXXFLAGS += --std=c++17
 
@@ -106,6 +108,10 @@
 DEFINES += -DNO_LUA
 endif
 
+ifdef LOAD_SCINTILLA
+DEFINES += -DLOAD_SCINTILLA
+endif
+
 INCLUDES += -I ../../scintilla/include -I ../src
 RCINCLUDEDIRS=--include-dir ../src
 
@@ -157,7 +163,7 @@
 
 OBJS = Credits.o $(OTHER_OBJS)
 
-DLLS=../bin/Scintilla.dll ../bin/SciLexer.dll
+DLLS=../bin/Scintilla.dll ../bin/SciLexer.dll ../bin/lexilla.dll
 
 NOTBINPROPS=SciTE.properties Embedded.properties
 PROPS=$(addprefix ../bin/,$(filter-out $(NOTBINPROPS), $(notdir $(wildcard ../src/*.properties))))
@@ -188,6 +194,7 @@
 	Sc1.o \
 	Sc1Res.o \
 	libscintilla.a \
+	liblexilla.a \
 	$(LUA_OBJS)
 
 $(PROGSTATIC): $(OBJSSTATIC)
diff -Nru scite-4.3.3/scite/win32/nmdeps.mak scite-4.4.4/scite/win32/nmdeps.mak
--- scite-4.3.3/scite/win32/nmdeps.mak	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/win32/nmdeps.mak	2020-05-31 23:08:16.000000000 +0000
@@ -29,6 +29,7 @@
 	SciTEWin.h \
 	../../scintilla/include/ILoader.h \
 	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
 	../src/ScintillaTypes.h \
 	../src/ScintillaMessages.h \
 	../src/ScintillaCall.h \
@@ -38,6 +39,7 @@
 	../src/StringList.h \
 	../src/StringHelpers.h \
 	../src/FilePath.h \
+	../src/LexillaLibrary.h \
 	../src/StyleDefinition.h \
 	../src/PropSetFile.h \
 	../src/StyleWriter.h \
@@ -53,6 +55,7 @@
 	../src/StripDefinition.h \
 	Strips.h \
 	../src/SciTEKeys.h \
+	DLLFunction.h \
 	../src/MultiplexExtension.h \
 	DirectorExtension.h \
 	../src/LuaExtension.h
@@ -61,6 +64,7 @@
 	SciTEWin.h \
 	../../scintilla/include/ILoader.h \
 	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
 	../src/ScintillaTypes.h \
 	../src/ScintillaMessages.h \
 	../src/ScintillaCall.h \
@@ -70,6 +74,7 @@
 	../src/StringList.h \
 	../src/StringHelpers.h \
 	../src/FilePath.h \
+	../src/LexillaLibrary.h \
 	../src/StyleDefinition.h \
 	../src/PropSetFile.h \
 	../src/StyleWriter.h \
@@ -85,6 +90,7 @@
 	../src/StripDefinition.h \
 	Strips.h \
 	../src/SciTEKeys.h \
+	DLLFunction.h \
 	../src/MultiplexExtension.h \
 	DirectorExtension.h \
 	../src/LuaExtension.h
@@ -93,6 +99,7 @@
 	SciTEWin.h \
 	../../scintilla/include/ILoader.h \
 	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
 	../src/ScintillaTypes.h \
 	../src/ScintillaMessages.h \
 	../src/ScintillaCall.h \
@@ -102,6 +109,7 @@
 	../src/StringList.h \
 	../src/StringHelpers.h \
 	../src/FilePath.h \
+	../src/LexillaLibrary.h \
 	../src/StyleDefinition.h \
 	../src/PropSetFile.h \
 	../src/StyleWriter.h \
@@ -122,6 +130,7 @@
 	SciTEWin.h \
 	../../scintilla/include/ILoader.h \
 	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
 	../src/ScintillaTypes.h \
 	../src/ScintillaMessages.h \
 	../src/ScintillaCall.h \
@@ -131,6 +140,7 @@
 	../src/StringList.h \
 	../src/StringHelpers.h \
 	../src/FilePath.h \
+	../src/LexillaLibrary.h \
 	../src/StyleDefinition.h \
 	../src/PropSetFile.h \
 	../src/StyleWriter.h \
@@ -151,6 +161,7 @@
 	SciTEWin.h \
 	../../scintilla/include/ILoader.h \
 	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
 	../src/ScintillaTypes.h \
 	../src/ScintillaMessages.h \
 	../src/ScintillaCall.h \
@@ -160,6 +171,7 @@
 	../src/StringList.h \
 	../src/StringHelpers.h \
 	../src/FilePath.h \
+	../src/LexillaLibrary.h \
 	../src/StyleDefinition.h \
 	../src/PropSetFile.h \
 	../src/StyleWriter.h \
@@ -180,6 +192,7 @@
 	SciTEWin.h \
 	../../scintilla/include/ILoader.h \
 	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
 	../src/ScintillaTypes.h \
 	../src/ScintillaMessages.h \
 	../src/ScintillaCall.h \
@@ -189,6 +202,7 @@
 	../src/StringList.h \
 	../src/StringHelpers.h \
 	../src/FilePath.h \
+	../src/LexillaLibrary.h \
 	../src/StyleDefinition.h \
 	../src/PropSetFile.h \
 	../src/StyleWriter.h \
@@ -372,8 +386,6 @@
 	../src/LexillaLibrary.cxx \
 	../../scintilla/include/ILexer.h \
 	../../scintilla/include/Sci_Position.h \
-	../src/GUI.h \
-	../src/FilePath.h \
 	../src/LexillaLibrary.h
 LuaExtension.obj: \
 	../src/LuaExtension.cxx \
diff -Nru scite-4.3.3/scite/win32/SciTE.exe.manifest scite-4.4.4/scite/win32/SciTE.exe.manifest
--- scite-4.3.3/scite/win32/SciTE.exe.manifest	2018-04-27 10:42:17.000000000 +0000
+++ scite-4.4.4/scite/win32/SciTE.exe.manifest	2020-05-31 23:08:16.000000000 +0000
@@ -11,6 +11,7 @@
 <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>
@@ -36,4 +37,13 @@
       </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 -Nru scite-4.3.3/scite/win32/scite.mak scite-4.4.4/scite/win32/scite.mak
--- scite-4.3.3/scite/win32/scite.mak	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/win32/scite.mak	2020-05-31 23:08:16.000000000 +0000
@@ -6,6 +6,8 @@
 #     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.
+# For a build with no lexers, loading Scintilla.DLL instead of SciLexer.DLL,
+# define LOAD_SCINTILLA on the command line.
 # The main makefile uses mingw32 gcc and may be more current than this file.
 
 .SUFFIXES: .cxx .properties .dll
@@ -16,7 +18,7 @@
 
 PROG=$(DIR_BIN)\SciTE.exe
 PROGSTATIC=$(DIR_BIN)\Sc1.exe
-DLLS=$(DIR_BIN)\Scintilla.dll $(DIR_BIN)\SciLexer.dll
+DLLS=$(DIR_BIN)\Scintilla.dll $(DIR_BIN)\SciLexer.dll $(DIR_BIN)\Lexilla.dll
 
 WIDEFLAGS=-DUNICODE -D_UNICODE
 
@@ -39,6 +41,10 @@
 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)
 
+!IFDEF LOAD_SCINTILLA
+CXXFLAGS=$(CXXFLAGS) -DLOAD_SCINTILLA
+!ENDIF
+
 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
@@ -106,6 +112,7 @@
 	SciTEWin.obj
 
 LIBSCI=$(DIR_SCINTILLA_BIN)\libscintilla.lib
+LIBLEX=$(DIR_SCINTILLA_BIN)\liblexilla.lib
 
 OBJSSTATIC=$(SHAREDOBJS) Sc1.obj
 
@@ -205,7 +212,7 @@
 $(PROG): $(OBJS) SciTERes.res
 	$(LD) $(LDFLAGS) -OUT:$@ $** $(LIBS)
 
-$(PROGSTATIC): $(OBJSSTATIC) $(LIBSCI) Sc1Res.res
+$(PROGSTATIC): $(OBJSSTATIC) $(LIBSCI) $(LIBLEX) Sc1Res.res
 	$(LD) $(LDFLAGS) -OUT:$@ $** $(LIBS)
 
 # Define how to build all the objects and what they depend on
diff -Nru scite-4.3.3/scite/win32/SciTE.vcxproj scite-4.4.4/scite/win32/SciTE.vcxproj
--- scite-4.3.3/scite/win32/SciTE.vcxproj	2019-12-06 20:39:09.000000000 +0000
+++ scite-4.4.4/scite/win32/SciTE.vcxproj	2020-05-31 23:08:16.000000000 +0000
@@ -207,6 +207,7 @@
     <ClCompile Include="..\..\scintilla\win32\HanjaDic.cxx" />
     <ClCompile Include="..\..\scintilla\win32\PlatWin.cxx" />
     <ClCompile Include="..\..\scintilla\win32\ScintillaWin.cxx" />
+    <ClCompile Include="..\..\scintilla\lexilla\src\Lexilla.cxx" />
     <ClCompile Include="..\src\*.cxx" />
     <ClCompile Include="..\win32\*.cxx" />
     <ClCompile Include="..\lua\src\*.c" />
@@ -225,6 +226,9 @@
   <ItemGroup>
     <None Include="..\Win32\SciBall.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="SciTE.exe.manifest" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff -Nru scite-4.3.3/scite/win32/SciTEWinBar.cxx scite-4.4.4/scite/win32/SciTEWinBar.cxx
--- scite-4.3.3/scite/win32/SciTEWinBar.cxx	2020-03-15 08:37:00.000000000 +0000
+++ scite-4.4.4/scite/win32/SciTEWinBar.cxx	2020-05-31 23:08:16.000000000 +0000
@@ -929,11 +929,10 @@
 	if (!wTabBar.Created())
 		exit(FALSE);
 
-	LOGFONT lfIconTitle;
-	ZeroMemory(&lfIconTitle, sizeof(lfIconTitle));
-	if (::SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(lfIconTitle), &lfIconTitle, FALSE) == 0)
+	LOGFONTW lfIconTitle {};
+	if (::SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(lfIconTitle), &lfIconTitle, FALSE) == 0)
 		exit(FALSE);
-	fontTabs = ::CreateFontIndirect(&lfIconTitle);
+	fontTabs = ::CreateFontIndirectW(&lfIconTitle);
 	SetWindowFont(HwndOf(wTabBar), fontTabs, 0);
 
 	wTabBar.Show();
diff -Nru scite-4.3.3/scite/win32/SciTEWin.cxx scite-4.4.4/scite/win32/SciTEWin.cxx
--- scite-4.3.3/scite/win32/SciTEWin.cxx	2020-04-23 01:50:21.000000000 +0000
+++ scite-4.4.4/scite/win32/SciTEWin.cxx	2020-07-18 05:40:25.000000000 +0000
@@ -8,6 +8,7 @@
 #include <time.h>
 
 #include "SciTEWin.h"
+#include "DLLFunction.h"
 
 #ifndef WM_DPICHANGED
 #define WM_DPICHANGED 0x02E0
@@ -30,6 +31,11 @@
 const GUI::gui_char appName[] = GUI_TEXT("Sc1");
 #else
 const GUI::gui_char appName[] = GUI_TEXT("SciTE");
+#ifdef LOAD_SCINTILLA
+static const GUI::gui_char scintillaName[] = GUI_TEXT("Scintilla.DLL");
+#else
+static const GUI::gui_char scintillaName[] = GUI_TEXT("SciLexer.DLL");
+#endif
 #endif
 
 static GUI::gui_string GetErrorMessage(DWORD nRet) {
@@ -151,6 +157,16 @@
 
 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.
@@ -190,6 +206,8 @@
 
 	flatterUI = UIShouldBeFlat();
 
+	appearance = CurrentAppearance();
+
 	cmdShow = 0;
 	heightBar = 7;
 	fontTabs = {};
@@ -218,9 +236,16 @@
 
 	ReadEnvironment();
 
+	SetScaleFactor(GetScaleFactor());
+
 	ReadGlobalPropFile();
 
-	SetScaleFactor(0);
+	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
@@ -382,14 +407,22 @@
 	*maximize = (winPlace.showCmd == SW_MAXIMIZE) ? 1 : 0;
 }
 
-void SciTEWin::SetScaleFactor(int scale) {
-	if (scale == 0) {
-		HDC hdcMeasure = ::CreateCompatibleDC(NULL);
-		scale = ::GetDeviceCaps(hdcMeasure, LOGPIXELSX) * 100 / 96;
-		::DeleteDC(hdcMeasure);
+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;
 	}
-	std::string sScale = StdStringFromInteger(scale);
-	propsPlatform.Set("ScaleFactor", sScale.c_str());
+	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.
@@ -442,6 +475,41 @@
 	}
 }
 
+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) ? 1 : 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!
@@ -1743,6 +1811,52 @@
 	::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);
@@ -1993,18 +2107,15 @@
 			break;
 
 		case WM_SETTINGCHANGE:
-			wEditor.Send(WM_SETTINGCHANGE, wParam, lParam);
-			wOutput.Send(WM_SETTINGCHANGE, wParam, lParam);
+			SettingChanged(wParam, lParam);
 			break;
 
 		case WM_SYSCOLORCHANGE:
-			wEditor.Send(WM_SYSCOLORCHANGE, wParam, lParam);
-			wOutput.Send(WM_SYSCOLORCHANGE, wParam, lParam);
+			SysColourChanged(wParam, lParam);
 			break;
 
 		case WM_DPICHANGED:
-			SetScaleFactor(LOWORD(wParam) * 100 / 96);
-			ReadProperties();
+			ScaleChanged(wParam, lParam);
 			return ::DefWindowProcW(MainHWND(), iMessage, wParam, lParam);
 
 		case WM_ACTIVATEAPP:
@@ -2220,6 +2331,10 @@
 	}
 }
 
+#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)
@@ -2242,20 +2357,22 @@
 #endif
 
 	SciTEWin::Register(hInstance);
+	LexillaSetDefaultDirectory(GetSciTEPath(FilePath()).AsUTF8());
 #ifdef STATIC_BUILD
-
 	Scintilla_LinkLexers();
 	Scintilla_RegisterClasses(hInstance);
+	LexillaSetDefault([](const char *name) {
+		return CreateLexer(name);
+	});
 #else
 
-#ifdef LOAD_SCINTILLA
-	HMODULE hmod = ::LoadLibrary(TEXT("Scintilla.DLL"));
-#else
-	HMODULE hmod = ::LoadLibrary(TEXT("SciLexer.DLL"));
-#endif
-	if (hmod == NULL)
-		::MessageBox(NULL, TEXT("The Scintilla DLL could not be loaded.  SciTE will now close"),
+	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;
diff -Nru scite-4.3.3/scite/win32/SciTEWin.h scite-4.4.4/scite/win32/SciTEWin.h
--- scite-4.3.3/scite/win32/SciTEWin.h	2020-03-15 08:37:00.000000000 +0000
+++ scite-4.4.4/scite/win32/SciTEWin.h	2020-05-31 23:08:16.000000000 +0000
@@ -65,6 +65,7 @@
 #include <shlobj.h>
 
 #include "ILoader.h"
+#include "ILexer.h"
 
 #include "ScintillaTypes.h"
 #include "ScintillaMessages.h"
@@ -78,6 +79,7 @@
 #include "StringList.h"
 #include "StringHelpers.h"
 #include "FilePath.h"
+#include "LexillaLibrary.h"
 #include "StyleDefinition.h"
 #include "PropSetFile.h"
 #include "StyleWriter.h"
@@ -219,12 +221,15 @@
 
 	void ReadLocalization() override;
 	void GetWindowPosition(int *left, int *top, int *width, int *height, int *maximize) override;
-	void SetScaleFactor(int scale);
+	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;
 
@@ -277,6 +282,9 @@
 	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;
 
diff -Nru scite-4.3.3/scite/zipwscite.bat scite-4.4.4/scite/zipwscite.bat
--- scite-4.3.3/scite/zipwscite.bat	2019-06-28 23:50:57.000000000 +0000
+++ scite-4.4.4/scite/zipwscite.bat	2020-05-31 23:08:16.000000000 +0000
@@ -3,7 +3,8 @@
 mkdir wscite
 copy scite\license.txt wscite
 copy scite\bin\SciTE*.exe wscite
-copy scite\bin\SciLexer.dll 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