Rename CharacterSet and CharacterCategory modules in Scintilla to CharacterType

and CharacterCategoryMap to avoid clashes with Lexilla when building an
executable that includes both.

30 files changed, 128 insertions, 222 deletions

diff --git a/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj b/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
index bd194654d..9f18d4423 100644
--- a/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
+++ b/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
@@ -91,10 +91,10 @@
 		286F8EE0260448C300EC8D60 /* Geometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 286F8EDD260448C300EC8D60 /* Geometry.h */; };
 		287F3C6A246F90240040E76F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 287F3C69246F90240040E76F /* Cocoa.framework */; };
 		287F3C6C246F90300040E76F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 287F3C6B246F90300040E76F /* QuartzCore.framework */; };
-		28EA9CAE255894B4007710C4 /* CharacterCategory.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28EA9CAA255894B4007710C4 /* CharacterCategory.cxx */; };
-		28EA9CAF255894B4007710C4 /* CharacterSet.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28EA9CAB255894B4007710C4 /* CharacterSet.cxx */; };
-		28EA9CB0255894B4007710C4 /* CharacterCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 28EA9CAC255894B4007710C4 /* CharacterCategory.h */; };
-		28EA9CB1255894B4007710C4 /* CharacterSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 28EA9CAD255894B4007710C4 /* CharacterSet.h */; };
+		28EA9CAE255894B4007710C4 /* CharacterCategoryMap.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28EA9CAA255894B4007710C4 /* CharacterCategoryMap.cxx */; };
+		28EA9CAF255894B4007710C4 /* CharacterType.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28EA9CAB255894B4007710C4 /* CharacterType.cxx */; };
+		28EA9CB0255894B4007710C4 /* CharacterCategoryMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 28EA9CAC255894B4007710C4 /* CharacterCategoryMap.h */; };
+		28EA9CB1255894B4007710C4 /* CharacterType.h in Headers */ = {isa = PBXBuildFile; fileRef = 28EA9CAD255894B4007710C4 /* CharacterType.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -185,10 +185,10 @@
 		287F3C69246F90240040E76F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		287F3C6B246F90300040E76F /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		287F3E0F246F9AE50040E76F /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = SOURCE_ROOT; };
-		28EA9CAA255894B4007710C4 /* CharacterCategory.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CharacterCategory.cxx; path = ../../src/CharacterCategory.cxx; sourceTree = "<group>"; };
-		28EA9CAB255894B4007710C4 /* CharacterSet.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CharacterSet.cxx; path = ../../src/CharacterSet.cxx; sourceTree = "<group>"; };
-		28EA9CAC255894B4007710C4 /* CharacterCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CharacterCategory.h; path = ../../src/CharacterCategory.h; sourceTree = "<group>"; };
-		28EA9CAD255894B4007710C4 /* CharacterSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CharacterSet.h; path = ../../src/CharacterSet.h; sourceTree = "<group>"; };
+		28EA9CAA255894B4007710C4 /* CharacterCategoryMap.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CharacterCategoryMap.cxx; path = ../../src/CharacterCategoryMap.cxx; sourceTree = "<group>"; };
+		28EA9CAB255894B4007710C4 /* CharacterType.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CharacterType.cxx; path = ../../src/CharacterType.cxx; sourceTree = "<group>"; };
+		28EA9CAC255894B4007710C4 /* CharacterCategoryMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CharacterCategoryMap.h; path = ../../src/CharacterCategoryMap.h; sourceTree = "<group>"; };
+		28EA9CAD255894B4007710C4 /* CharacterType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CharacterType.h; path = ../../src/CharacterType.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -236,10 +236,10 @@
 				2829372524E2D58700C84BA2 /* CaseFolder.h */,
 				2829372624E2D58700C84BA2 /* CellBuffer.cxx */,
 				2829371924E2D58600C84BA2 /* CellBuffer.h */,
-				28EA9CAA255894B4007710C4 /* CharacterCategory.cxx */,
-				28EA9CAC255894B4007710C4 /* CharacterCategory.h */,
-				28EA9CAB255894B4007710C4 /* CharacterSet.cxx */,
-				28EA9CAD255894B4007710C4 /* CharacterSet.h */,
+				28EA9CAA255894B4007710C4 /* CharacterCategoryMap.cxx */,
+				28EA9CAC255894B4007710C4 /* CharacterCategoryMap.h */,
+				28EA9CAB255894B4007710C4 /* CharacterType.cxx */,
+				28EA9CAD255894B4007710C4 /* CharacterType.h */,
 				2829371524E2D58600C84BA2 /* CharClassify.cxx */,
 				282936FE24E2D58400C84BA2 /* CharClassify.h */,
 				2829370E24E2D58500C84BA2 /* ContractionState.cxx */,
@@ -362,7 +362,7 @@
 				2829373F24E2D58800C84BA2 /* UniConversion.h in Headers */,
 				2829373D24E2D58800C84BA2 /* PerLine.h in Headers */,
 				2829373724E2D58800C84BA2 /* RunStyles.h in Headers */,
-				28EA9CB0255894B4007710C4 /* CharacterCategory.h in Headers */,
+				28EA9CB0255894B4007710C4 /* CharacterCategoryMap.h in Headers */,
 				282936E624E2D55D00C84BA2 /* InfoBar.h in Headers */,
 				2829375E24E2D58800C84BA2 /* LineMarker.h in Headers */,
 				2829376824E2D58800C84BA2 /* CaseFolder.h in Headers */,
@@ -378,7 +378,7 @@
 				2829374A24E2D58800C84BA2 /* ContractionState.h in Headers */,
 				2829376024E2D58800C84BA2 /* XPM.h in Headers */,
 				2829372F24E2D58800C84BA2 /* ElapsedPeriod.h in Headers */,
-				28EA9CB1255894B4007710C4 /* CharacterSet.h in Headers */,
+				28EA9CB1255894B4007710C4 /* CharacterType.h in Headers */,
 				2829373A24E2D58800C84BA2 /* MarginView.h in Headers */,
 				286F8E6525F84F7400EC8D60 /* ILoader.h in Headers */,
 				282936EA24E2D55D00C84BA2 /* ScintillaView.h in Headers */,
@@ -488,7 +488,7 @@
 				2829373324E2D58800C84BA2 /* LineMarker.cxx in Sources */,
 				2829374E24E2D58800C84BA2 /* KeyMap.cxx in Sources */,
 				2829376D24E2D58800C84BA2 /* RunStyles.cxx in Sources */,
-				28EA9CAF255894B4007710C4 /* CharacterSet.cxx in Sources */,
+				28EA9CAF255894B4007710C4 /* CharacterType.cxx in Sources */,
 				2829376B24E2D58800C84BA2 /* Editor.cxx in Sources */,
 				2829373C24E2D58800C84BA2 /* CaseFolder.cxx in Sources */,
 				2829374824E2D58800C84BA2 /* RESearch.cxx in Sources */,
@@ -497,7 +497,7 @@
 				2829374724E2D58800C84BA2 /* Style.cxx in Sources */,
 				2829375A24E2D58800C84BA2 /* ViewStyle.cxx in Sources */,
 				282936E024E2D55D00C84BA2 /* InfoBar.mm in Sources */,
-				28EA9CAE255894B4007710C4 /* CharacterCategory.cxx in Sources */,
+				28EA9CAE255894B4007710C4 /* CharacterCategoryMap.cxx in Sources */,
 				2829374024E2D58800C84BA2 /* XPM.cxx in Sources */,
 				2829374B24E2D58800C84BA2 /* Decoration.cxx in Sources */,
 				286F8EDF260448C300EC8D60 /* Geometry.cxx in Sources */,
diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
index 2474ca6f1..841ba8f13 100644
--- a/cocoa/ScintillaCocoa.h
+++ b/cocoa/ScintillaCocoa.h
@@ -28,7 +28,7 @@
 #include "ILoader.h"
 #include "ILexer.h"
 
-#include "CharacterCategory.h"
+#include "CharacterCategoryMap.h"
 #include "Position.h"
 #include "UniqueString.h"
 #include "SplitVector.h"
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 9846e197b..1296bb2dd 100755
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -46,7 +46,7 @@
 #include "ILexer.h"
 #include "Scintilla.h"
 #include "ScintillaWidget.h"
-#include "CharacterCategory.h"
+#include "CharacterCategoryMap.h"
 #include "Position.h"
 #include "UniqueString.h"
 #include "SplitVector.h"
diff --git a/gtk/ScintillaGTKAccessible.cxx b/gtk/ScintillaGTKAccessible.cxx
index d5219aec8..e8bf2af77 100644
--- a/gtk/ScintillaGTKAccessible.cxx
+++ b/gtk/ScintillaGTKAccessible.cxx
@@ -97,7 +97,7 @@
 #include "ILexer.h"
 #include "Scintilla.h"
 #include "ScintillaWidget.h"
-#include "CharacterCategory.h"
+#include "CharacterCategoryMap.h"
 #include "Position.h"
 #include "UniqueString.h"
 #include "SplitVector.h"
diff --git a/gtk/deps.mak b/gtk/deps.mak
index 3bd9b98b1..c98dddfa1 100644
--- a/gtk/deps.mak
+++ b/gtk/deps.mak
@@ -20,7 +20,7 @@ ScintillaGTK.o: \
 	../include/ILexer.h \
 	../include/Scintilla.h \
 	../include/ScintillaWidget.h \
-	../src/CharacterCategory.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -62,7 +62,7 @@ ScintillaGTKAccessible.o: \
 	../include/ILexer.h \
 	../include/Scintilla.h \
 	../include/ScintillaWidget.h \
-	../src/CharacterCategory.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -99,7 +99,7 @@ AutoComplete.o: \
 	../src/Platform.h \
 	../include/Scintilla.h \
 	../include/Sci_Position.h \
-	../src/CharacterSet.h \
+	../src/CharacterType.h \
 	../src/Position.h \
 	../src/AutoComplete.h
 CallTip.o: \
@@ -129,15 +129,15 @@ CellBuffer.o: \
 	../src/Partitioning.h \
 	../src/CellBuffer.h \
 	../src/UniConversion.h
-CharacterCategory.o: \
-	../src/CharacterCategory.cxx \
-	../src/CharacterCategory.h
-CharacterSet.o: \
-	../src/CharacterSet.cxx \
-	../src/CharacterSet.h
+CharacterCategoryMap.o: \
+	../src/CharacterCategoryMap.cxx \
+	../src/CharacterCategoryMap.h
+CharacterType.o: \
+	../src/CharacterType.cxx \
+	../src/CharacterType.h
 CharClassify.o: \
 	../src/CharClassify.cxx \
-	../src/CharacterSet.h \
+	../src/CharacterType.h \
 	../src/CharClassify.h
 ContractionState.o: \
 	../src/ContractionState.cxx \
@@ -169,8 +169,8 @@ Document.o: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterSet.h \
-	../src/CharacterCategory.h \
+	../src/CharacterType.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/SplitVector.h \
 	../src/Partitioning.h \
@@ -193,7 +193,7 @@ EditModel.o: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterCategory.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -223,8 +223,8 @@ Editor.o: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterSet.h \
-	../src/CharacterCategory.h \
+	../src/CharacterType.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -259,8 +259,8 @@ EditView.o: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterSet.h \
-	../src/CharacterCategory.h \
+	../src/CharacterType.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -322,7 +322,7 @@ MarginView.o: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterCategory.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -366,7 +366,7 @@ PositionCache.o: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterCategory.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -409,7 +409,7 @@ ScintillaBase.o: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterCategory.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
diff --git a/gtk/makefile b/gtk/makefile
index a820e1476..8967a16b8 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -128,8 +128,8 @@ SRC_OBJS = \
 	CaseConvert.o \
 	CaseFolder.o \
 	CellBuffer.o \
-	CharacterCategory.o \
-	CharacterSet.o \
+	CharacterCategoryMap.o \
+	CharacterType.o \
 	CharClassify.o \
 	ContractionState.o \
 	DBCS.o \
diff --git a/qt/ScintillaEdit/ScintillaDocument.cpp b/qt/ScintillaEdit/ScintillaDocument.cpp
index c1605dbd2..cae99f64b 100644
--- a/qt/ScintillaEdit/ScintillaDocument.cpp
+++ b/qt/ScintillaEdit/ScintillaDocument.cpp
@@ -20,7 +20,7 @@
 #include "ILexer.h"
 #include "Scintilla.h"
 
-#include "CharacterCategory.h"
+#include "CharacterCategoryMap.h"
 #include "Position.h"
 #include "UniqueString.h"
 #include "SplitVector.h"
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index ba1d93d10..9e53524ad 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -44,8 +44,8 @@ SOURCES += \
     ../../src/DBCS.cxx \
     ../../src/ContractionState.cxx \
     ../../src/CharClassify.cxx \
-    ../../src/CharacterSet.cxx \
-    ../../src/CharacterCategory.cxx \
+    ../../src/CharacterType.cxx \
+    ../../src/CharacterCategoryMap.cxx \
     ../../src/CellBuffer.cxx \
     ../../src/CaseFolder.cxx \
     ../../src/CaseConvert.cxx \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index cc0d39c73..65e39ad87 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -42,8 +42,8 @@ SOURCES += \
     ../../src/DBCS.cxx \
     ../../src/ContractionState.cxx \
     ../../src/CharClassify.cxx \
-    ../../src/CharacterSet.cxx \
-    ../../src/CharacterCategory.cxx \
+    ../../src/CharacterType.cxx \
+    ../../src/CharacterCategoryMap.cxx \
     ../../src/CellBuffer.cxx \
     ../../src/CaseFolder.cxx \
     ../../src/CaseConvert.cxx \
@@ -77,8 +77,8 @@ HEADERS  += \
     ../../src/Decoration.h \
     ../../src/ContractionState.h \
     ../../src/CharClassify.h \
-    ../../src/CharacterSet.h \
-    ../../src/CharacterCategory.h \
+    ../../src/CharacterType.h \
+    ../../src/CharacterCategoryMap.h \
     ../../src/CellBuffer.h \
     ../../src/CaseFolder.h \
     ../../src/CaseConvert.h \
diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h
index 617635e55..e8ef4d403 100644
--- a/qt/ScintillaEditBase/ScintillaQt.h
+++ b/qt/ScintillaEditBase/ScintillaQt.h
@@ -35,7 +35,7 @@
 #include "Platform.h"
 #include "ILoader.h"
 #include "ILexer.h"
-#include "CharacterCategory.h"
+#include "CharacterCategoryMap.h"
 #include "Position.h"
 #include "UniqueString.h"
 #include "SplitVector.h"
diff --git a/scripts/GenerateCharacterCategory.py b/scripts/GenerateCharacterCategory.py
index 271381064..806dea2fe 100644
--- a/scripts/GenerateCharacterCategory.py
+++ b/scripts/GenerateCharacterCategory.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
-# Script to generate CharacterCategory.cxx from Python's Unicode data
+# Script to generate scintilla/src/CharacterCategoryMap.cxx and lexilla/lexlib/CharacterCategory.cxx
+# from Python's Unicode data
 # Should be run rarely when a Python with a new version of Unicode data is available.
 # Requires Python 3.3 or later
 # Should not be run with old versions of Python.
@@ -45,8 +46,8 @@ def updateCharacterCategory(filename):
 
 scintillaDirectory = pathlib.Path(__file__).resolve().parent.parent
 
-categories = findCategories(scintillaDirectory / "src" / "CharacterCategory.h")
+categories = findCategories(scintillaDirectory / "src" / "CharacterCategoryMap.h")
 
-updateCharacterCategory(scintillaDirectory / "src" / "CharacterCategory.cxx")
+updateCharacterCategory(scintillaDirectory / "src" / "CharacterCategoryMap.cxx")
 
 updateCharacterCategory(scintillaDirectory.parent / "lexilla" / "lexlib" / "CharacterCategory.cxx")
diff --git a/scripts/HeaderOrder.txt b/scripts/HeaderOrder.txt
index a45d798de..72ee15cb1 100644
--- a/scripts/HeaderOrder.txt
+++ b/scripts/HeaderOrder.txt
@@ -101,11 +101,9 @@
 #include "Scintilla.h"
 #include "ScintillaWidget.h"
 
-// lexlib
-#include "CharacterSet.h"
-#include "CharacterCategory.h"
-
 // src
+#include "CharacterType.h"
+#include "CharacterCategoryMap.h"
 #include "Position.h"
 #include "UniqueString.h"
 #include "SplitVector.h"
diff --git a/src/AutoComplete.cxx b/src/AutoComplete.cxx
index 779d34965..3de456371 100644
--- a/src/AutoComplete.cxx
+++ b/src/AutoComplete.cxx
@@ -24,7 +24,7 @@
 #include "Platform.h"
 
 #include "Scintilla.h"
-#include "CharacterSet.h"
+#include "CharacterType.h"
 #include "Position.h"
 #include "AutoComplete.h"
 
diff --git a/src/CharClassify.cxx b/src/CharClassify.cxx
index f82fe75a6..64d720740 100644
--- a/src/CharClassify.cxx
+++ b/src/CharClassify.cxx
@@ -10,7 +10,7 @@
 
 #include <stdexcept>
 
-#include "CharacterSet.h"
+#include "CharacterType.h"
 #include "CharClassify.h"
 
 using namespace Scintilla;
diff --git a/src/CharacterCategory.cxx b/src/CharacterCategoryMap.cxx
index fdd6c15e7..e9bfecb6a 100644
--- a/src/CharacterCategory.cxx
+++ b/src/CharacterCategoryMap.cxx
@@ -1,8 +1,10 @@
 // Scintilla source code edit control
-/** @file CharacterCategory.cxx
+/** @file CharacterCategoryMap.cxx
  ** Returns the Unicode general category of a character.
  ** Table automatically regenerated by scripts/GenerateCharacterCategory.py
  ** Should only be rarely regenerated for new versions of Unicode.
+ ** Similar code to Lexilla's lexilla/lexlib/CharacterCategory.cxx but renamed
+ ** to avoid problems with builds that statically include both Scintilla and Lexilla.
  **/
 // Copyright 2013 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
@@ -11,7 +13,7 @@
 #include <algorithm>
 #include <iterator>
 
-#include "CharacterCategory.h"
+#include "CharacterCategoryMap.h"
 
 namespace Scintilla {
 
diff --git a/src/CharacterCategory.h b/src/CharacterCategoryMap.h
index cd3320dd9..35706eda7 100644
--- a/src/CharacterCategory.h
+++ b/src/CharacterCategoryMap.h
@@ -1,12 +1,14 @@
 // Scintilla source code edit control
-/** @file CharacterCategory.h
+/** @file CharacterCategoryMap.h
  ** Returns the Unicode general category of a character.
+ ** Similar code to Lexilla's lexilla/lexlib/CharacterCategory.h but renamed
+ ** to avoid problems with builds that statically include both Scintilla and Lexilla.
  **/
 // Copyright 2013 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
-#ifndef CHARACTERCATEGORY_H
-#define CHARACTERCATEGORY_H
+#ifndef CHARACTERCATEGORYMAP_H
+#define CHARACTERCATEGORYMAP_H
 
 namespace Scintilla {
 
diff --git a/src/CharacterSet.cxx b/src/CharacterType.cxx
index b934c2dd4..04d6a2abe 100644
--- a/src/CharacterSet.cxx
+++ b/src/CharacterType.cxx
@@ -1,7 +1,6 @@
 // Scintilla source code edit control
-/** @file CharacterSet.cxx
- ** Simple case functions for ASCII.
- ** Lexer infrastructure.
+/** @file CharacterType.cxx
+ ** Tests for character type and case-insensitive comparisons.
  **/
 // Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
@@ -9,7 +8,7 @@
 #include <cstdlib>
 #include <cassert>
 
-#include "CharacterSet.h"
+#include "CharacterType.h"
 
 using namespace Scintilla;
 
diff --git a/src/CharacterSet.h b/src/CharacterType.h
index a518c27fc..1a478cbe4 100644
--- a/src/CharacterSet.h
+++ b/src/CharacterType.h
@@ -1,111 +1,15 @@
 // Scintilla source code edit control
-/** @file CharacterSet.h
- ** Encapsulates a set of characters. Used to test if a character is within a set.
+/** @file CharacterType.h
+ ** Tests for character type and case-insensitive comparisons.
  **/
 // Copyright 2007 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
-#ifndef CHARACTERSET_H
-#define CHARACTERSET_H
+#ifndef CHARACTERTYPE_H
+#define CHARACTERTYPE_H
 
 namespace Scintilla {
 
-class CharacterSet {
-	int size;
-	bool valueAfter;
-	bool *bset;
-public:
-	enum setBase {
-		setNone=0,
-		setLower=1,
-		setUpper=2,
-		setDigits=4,
-		setAlpha=setLower|setUpper,
-		setAlphaNum=setAlpha|setDigits
-	};
-	CharacterSet(setBase base=setNone, const char *initialSet="", int size_=0x80, bool valueAfter_=false) {
-		size = size_;
-		valueAfter = valueAfter_;
-		bset = new bool[size];
-		for (int i=0; i < size; i++) {
-			bset[i] = false;
-		}
-		AddString(initialSet);
-		if (base & setLower)
-			AddString("abcdefghijklmnopqrstuvwxyz");
-		if (base & setUpper)
-			AddString("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
-		if (base & setDigits)
-			AddString("0123456789");
-	}
-	CharacterSet(const CharacterSet &other) {
-		size = other.size;
-		valueAfter = other.valueAfter;
-		bset = new bool[size];
-		for (int i=0; i < size; i++) {
-			bset[i] = other.bset[i];
-		}
-	}
-	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;
-			valueAfter = other.valueAfter;
-			bset = other.bset;
-			other.size = 0;
-			other.bset = nullptr;
-		}
-		return *this;
-	}
-	~CharacterSet() {
-		delete []bset;
-		bset = nullptr;
-		size = 0;
-	}
-	void Add(int val) {
-		assert(val >= 0);
-		assert(val < size);
-		bset[val] = true;
-	}
-	void AddString(const char *setToAdd) {
-		for (const char *cp=setToAdd; *cp; cp++) {
-			const unsigned char uch = *cp;
-			assert(uch < size);
-			bset[uch] = true;
-		}
-	}
-	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 noexcept {
-		// Overload char as char may be signed
-		const unsigned char uch = ch;
-		return Contains(uch);
-	}
-};
-
 // Functions for classifying characters
 
 constexpr bool IsASpace(int ch) noexcept {
diff --git a/src/Document.cxx b/src/Document.cxx
index 0a4c8ca0b..ffbf8f557 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -32,8 +32,8 @@
 #include "ILexer.h"
 #include "Scintilla.h"
 
-#include "CharacterSet.h"
-#include "CharacterCategory.h"
+#include "CharacterType.h"
+#include "CharacterCategoryMap.h"
 #include "Position.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
diff --git a/src/EditModel.cxx b/src/EditModel.cxx
index 013f848ba..c7fe1c710 100644
--- a/src/EditModel.cxx
+++ b/src/EditModel.cxx
@@ -29,7 +29,7 @@
 #include "ILexer.h"
 #include "Scintilla.h"
 
-#include "CharacterCategory.h"
+#include "CharacterCategoryMap.h"
 
 #include "Position.h"
 #include "UniqueString.h"
diff --git a/src/EditView.cxx b/src/EditView.cxx
index 08bdfb55c..1061d28fc 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -33,8 +33,8 @@
 #include "ILexer.h"
 #include "Scintilla.h"
 
-#include "CharacterSet.h"
-#include "CharacterCategory.h"
+#include "CharacterType.h"
+#include "CharacterCategoryMap.h"
 #include "Position.h"
 #include "UniqueString.h"
 #include "SplitVector.h"
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 66b8fe47d..adc9f3492 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -33,8 +33,8 @@
 #include "ILexer.h"
 #include "Scintilla.h"
 
-#include "CharacterSet.h"
-#include "CharacterCategory.h"
+#include "CharacterType.h"
+#include "CharacterCategoryMap.h"
 #include "Position.h"
 #include "UniqueString.h"
 #include "SplitVector.h"
diff --git a/src/MarginView.cxx b/src/MarginView.cxx
index 308923ad8..c2dcbf32d 100644
--- a/src/MarginView.cxx
+++ b/src/MarginView.cxx
@@ -30,7 +30,7 @@
 #include "ILexer.h"
 #include "Scintilla.h"
 
-#include "CharacterCategory.h"
+#include "CharacterCategoryMap.h"
 #include "Position.h"
 #include "UniqueString.h"
 #include "SplitVector.h"
diff --git a/src/PositionCache.cxx b/src/PositionCache.cxx
index 7516c82ec..0a9ef259a 100644
--- a/src/PositionCache.cxx
+++ b/src/PositionCache.cxx
@@ -29,7 +29,7 @@
 #include "ILexer.h"
 #include "Scintilla.h"
 
-#include "CharacterCategory.h"
+#include "CharacterCategoryMap.h"
 #include "Position.h"
 #include "UniqueString.h"
 #include "SplitVector.h"
diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx
index 0b9e8e41c..62c3fa658 100644
--- a/src/ScintillaBase.cxx
+++ b/src/ScintillaBase.cxx
@@ -28,7 +28,7 @@
 #include "ILexer.h"
 #include "Scintilla.h"
 
-#include "CharacterCategory.h"
+#include "CharacterCategoryMap.h"
 
 #include "Position.h"
 #include "UniqueString.h"
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 4888c286e..dc12d78ee 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -58,7 +58,7 @@
 #include "ILexer.h"
 #include "Scintilla.h"
 
-#include "CharacterCategory.h"
+#include "CharacterCategoryMap.h"
 #include "Position.h"
 #include "UniqueString.h"
 #include "SplitVector.h"
diff --git a/win32/deps.mak b/win32/deps.mak
index 3fd1b4765..d9f44d995 100644
--- a/win32/deps.mak
+++ b/win32/deps.mak
@@ -29,7 +29,7 @@ ScintillaWin.o: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterCategory.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -68,7 +68,7 @@ AutoComplete.o: \
 	../src/Platform.h \
 	../include/Scintilla.h \
 	../include/Sci_Position.h \
-	../src/CharacterSet.h \
+	../src/CharacterType.h \
 	../src/Position.h \
 	../src/AutoComplete.h
 CallTip.o: \
@@ -98,15 +98,15 @@ CellBuffer.o: \
 	../src/Partitioning.h \
 	../src/CellBuffer.h \
 	../src/UniConversion.h
-CharacterCategory.o: \
-	../src/CharacterCategory.cxx \
-	../src/CharacterCategory.h
-CharacterSet.o: \
-	../src/CharacterSet.cxx \
-	../src/CharacterSet.h
+CharacterCategoryMap.o: \
+	../src/CharacterCategoryMap.cxx \
+	../src/CharacterCategoryMap.h
+CharacterType.o: \
+	../src/CharacterType.cxx \
+	../src/CharacterType.h
 CharClassify.o: \
 	../src/CharClassify.cxx \
-	../src/CharacterSet.h \
+	../src/CharacterType.h \
 	../src/CharClassify.h
 ContractionState.o: \
 	../src/ContractionState.cxx \
@@ -138,8 +138,8 @@ Document.o: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterSet.h \
-	../src/CharacterCategory.h \
+	../src/CharacterType.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/SplitVector.h \
 	../src/Partitioning.h \
@@ -162,7 +162,7 @@ EditModel.o: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterCategory.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -192,8 +192,8 @@ Editor.o: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterSet.h \
-	../src/CharacterCategory.h \
+	../src/CharacterType.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -228,8 +228,8 @@ EditView.o: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterSet.h \
-	../src/CharacterCategory.h \
+	../src/CharacterType.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -291,7 +291,7 @@ MarginView.o: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterCategory.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -335,7 +335,7 @@ PositionCache.o: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterCategory.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -378,7 +378,7 @@ ScintillaBase.o: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterCategory.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -413,7 +413,7 @@ ScintillaBaseL.o: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterCategory.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
diff --git a/win32/makefile b/win32/makefile
index 7dd2604bb..9a49602ef 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -86,8 +86,8 @@ SRC_OBJS = \
 	CaseConvert.o \
 	CaseFolder.o \
 	CellBuffer.o \
-	CharacterCategory.o \
-	CharacterSet.o \
+	CharacterCategoryMap.o \
+	CharacterType.o \
 	CharClassify.o \
 	ContractionState.o \
 	DBCS.o \
diff --git a/win32/nmdeps.mak b/win32/nmdeps.mak
index b831d6add..0f7f0fcbb 100644
--- a/win32/nmdeps.mak
+++ b/win32/nmdeps.mak
@@ -29,7 +29,7 @@ $(DIR_O)/ScintillaWin.obj: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterCategory.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -68,7 +68,7 @@ $(DIR_O)/AutoComplete.obj: \
 	../src/Platform.h \
 	../include/Scintilla.h \
 	../include/Sci_Position.h \
-	../src/CharacterSet.h \
+	../src/CharacterType.h \
 	../src/Position.h \
 	../src/AutoComplete.h
 $(DIR_O)/CallTip.obj: \
@@ -98,15 +98,15 @@ $(DIR_O)/CellBuffer.obj: \
 	../src/Partitioning.h \
 	../src/CellBuffer.h \
 	../src/UniConversion.h
-$(DIR_O)/CharacterCategory.obj: \
-	../src/CharacterCategory.cxx \
-	../src/CharacterCategory.h
-$(DIR_O)/CharacterSet.obj: \
-	../src/CharacterSet.cxx \
-	../src/CharacterSet.h
+$(DIR_O)/CharacterCategoryMap.obj: \
+	../src/CharacterCategoryMap.cxx \
+	../src/CharacterCategoryMap.h
+$(DIR_O)/CharacterType.obj: \
+	../src/CharacterType.cxx \
+	../src/CharacterType.h
 $(DIR_O)/CharClassify.obj: \
 	../src/CharClassify.cxx \
-	../src/CharacterSet.h \
+	../src/CharacterType.h \
 	../src/CharClassify.h
 $(DIR_O)/ContractionState.obj: \
 	../src/ContractionState.cxx \
@@ -138,8 +138,8 @@ $(DIR_O)/Document.obj: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterSet.h \
-	../src/CharacterCategory.h \
+	../src/CharacterType.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/SplitVector.h \
 	../src/Partitioning.h \
@@ -162,7 +162,7 @@ $(DIR_O)/EditModel.obj: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterCategory.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -192,8 +192,8 @@ $(DIR_O)/Editor.obj: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterSet.h \
-	../src/CharacterCategory.h \
+	../src/CharacterType.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -228,8 +228,8 @@ $(DIR_O)/EditView.obj: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterSet.h \
-	../src/CharacterCategory.h \
+	../src/CharacterType.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -291,7 +291,7 @@ $(DIR_O)/MarginView.obj: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterCategory.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -335,7 +335,7 @@ $(DIR_O)/PositionCache.obj: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterCategory.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -378,7 +378,7 @@ $(DIR_O)/ScintillaBase.obj: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterCategory.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
@@ -413,7 +413,7 @@ $(DIR_O)/ScintillaBaseL.obj: \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
 	../include/Scintilla.h \
-	../src/CharacterCategory.h \
+	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/SplitVector.h \
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index edb0c7de8..1858368da 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -79,8 +79,8 @@ SRC_OBJS=\
 	$(DIR_O)\CaseConvert.obj \
 	$(DIR_O)\CaseFolder.obj \
 	$(DIR_O)\CellBuffer.obj \
-	$(DIR_O)\CharacterCategory.obj \
-	$(DIR_O)\CharacterSet.obj \
+	$(DIR_O)\CharacterCategoryMap.obj \
+	$(DIR_O)\CharacterType.obj \
 	$(DIR_O)\CharClassify.obj \
 	$(DIR_O)\ContractionState.obj \
 	$(DIR_O)\DBCS.obj \