Backport: Feature [feature-requests:#1212]. Move Unicode conversions into UniConversion.

Move Unicode conversion functions UnicodeFromUTF8 and UTF8FromUTF32Character into UniConversion.

Backport of changeset 6645:463fa6965d9a.

2 files changed, 131 insertions, 97 deletions

diff --git a/win32/deps.mak b/win32/deps.mak
index 547406db9..d53e52343 100644
--- a/win32/deps.mak
+++ b/win32/deps.mak
@@ -1,13 +1,13 @@
 CheckD2D.o: CheckD2D.cxx
 HanjaDic.o: HanjaDic.cxx ../src/UniConversion.h HanjaDic.h
 PlatWin.o: PlatWin.cxx ../include/Platform.h ../lexlib/StringCopy.h \
- ../src/XPM.h ../src/UniConversion.h ../src/FontQuality.h
+ ../src/XPM.h ../src/UniConversion.h ../src/DBCS.h ../src/FontQuality.h
 ScintillaWin.o: ScintillaWin.cxx ../include/Platform.h \
- ../include/ILexer.h ../include/Sci_Position.h ../include/Scintilla.h \
- ../lexlib/StringCopy.h ../src/Position.h ../src/UniqueString.h \
- ../src/SplitVector.h ../src/Partitioning.h ../src/RunStyles.h \
- ../src/ContractionState.h ../src/CellBuffer.h ../src/CallTip.h \
- ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
+ ../include/ILoader.h ../include/Sci_Position.h ../include/ILexer.h \
+ ../include/Scintilla.h ../lexlib/StringCopy.h ../src/Position.h \
+ ../src/UniqueString.h ../src/SplitVector.h ../src/Partitioning.h \
+ ../src/RunStyles.h ../src/ContractionState.h ../src/CellBuffer.h \
+ ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/LineMarker.h \
  ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \
  ../src/Decoration.h ../src/CaseFolder.h ../src/Document.h \
  ../src/CaseConvert.h ../src/UniConversion.h ../src/Selection.h \
@@ -21,7 +21,7 @@ CallTip.o: ../src/CallTip.cxx ../include/Platform.h \
  ../include/Scintilla.h ../include/Sci_Position.h ../lexlib/StringCopy.h \
  ../src/Position.h ../src/CallTip.h
 CaseConvert.o: ../src/CaseConvert.cxx ../lexlib/StringCopy.h \
- ../src/CaseConvert.h ../src/UniConversion.h ../src/UnicodeFromUTF8.h
+ ../src/CaseConvert.h ../src/UniConversion.h
 CaseFolder.o: ../src/CaseFolder.cxx ../src/CaseFolder.h \
  ../src/CaseConvert.h ../src/UniConversion.h
 Catalogue.o: ../src/Catalogue.cxx ../include/ILexer.h \
@@ -36,46 +36,49 @@ ContractionState.o: ../src/ContractionState.cxx ../include/Platform.h \
  ../src/Position.h ../src/UniqueString.h ../src/SplitVector.h \
  ../src/Partitioning.h ../src/RunStyles.h ../src/SparseVector.h \
  ../src/ContractionState.h
+DBCS.o: ../src/DBCS.cxx ../src/DBCS.h
 Decoration.o: ../src/Decoration.cxx ../include/Platform.h \
  ../include/Scintilla.h ../include/Sci_Position.h ../src/Position.h \
  ../src/SplitVector.h ../src/Partitioning.h ../src/RunStyles.h \
  ../src/Decoration.h
-Document.o: ../src/Document.cxx ../include/Platform.h ../include/ILexer.h \
- ../include/Sci_Position.h ../include/Scintilla.h \
- ../lexlib/CharacterSet.h ../lexlib/CharacterCategory.h ../src/Position.h \
- ../src/SplitVector.h ../src/Partitioning.h ../src/RunStyles.h \
- ../src/CellBuffer.h ../src/PerLine.h ../src/CharClassify.h \
- ../src/Decoration.h ../src/CaseFolder.h ../src/Document.h \
- ../src/RESearch.h ../src/UniConversion.h ../src/UnicodeFromUTF8.h
+Document.o: ../src/Document.cxx ../include/Platform.h \
+ ../include/ILoader.h ../include/Sci_Position.h ../include/ILexer.h \
+ ../include/Scintilla.h ../lexlib/CharacterSet.h \
+ ../lexlib/CharacterCategory.h ../src/Position.h ../src/SplitVector.h \
+ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \
+ ../src/PerLine.h ../src/CharClassify.h ../src/Decoration.h \
+ ../src/CaseFolder.h ../src/Document.h ../src/RESearch.h \
+ ../src/UniConversion.h
 EditModel.o: ../src/EditModel.cxx ../include/Platform.h \
- ../include/ILexer.h ../include/Sci_Position.h ../include/Scintilla.h \
+ ../include/ILoader.h ../include/Sci_Position.h ../include/ILexer.h \
+ ../include/Scintilla.h ../lexlib/StringCopy.h ../src/Position.h \
+ ../src/UniqueString.h ../src/SplitVector.h ../src/Partitioning.h \
+ ../src/RunStyles.h ../src/ContractionState.h ../src/CellBuffer.h \
+ ../src/KeyMap.h ../src/Indicator.h ../src/LineMarker.h ../src/Style.h \
+ ../src/ViewStyle.h ../src/CharClassify.h ../src/Decoration.h \
+ ../src/CaseFolder.h ../src/Document.h ../src/UniConversion.h \
+ ../src/Selection.h ../src/PositionCache.h ../src/EditModel.h
+Editor.o: ../src/Editor.cxx ../include/Platform.h ../include/ILoader.h \
+ ../include/Sci_Position.h ../include/ILexer.h ../include/Scintilla.h \
  ../lexlib/StringCopy.h ../src/Position.h ../src/UniqueString.h \
  ../src/SplitVector.h ../src/Partitioning.h ../src/RunStyles.h \
- ../src/ContractionState.h ../src/CellBuffer.h ../src/KeyMap.h \
- ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \
+ ../src/ContractionState.h ../src/CellBuffer.h ../src/PerLine.h \
+ ../src/KeyMap.h ../src/Indicator.h ../src/LineMarker.h ../src/Style.h \
  ../src/ViewStyle.h ../src/CharClassify.h ../src/Decoration.h \
  ../src/CaseFolder.h ../src/Document.h ../src/UniConversion.h \
- ../src/Selection.h ../src/PositionCache.h ../src/EditModel.h
-Editor.o: ../src/Editor.cxx ../include/Platform.h ../include/ILexer.h \
- ../include/Sci_Position.h ../include/Scintilla.h ../lexlib/StringCopy.h \
+ ../src/Selection.h ../src/PositionCache.h ../src/EditModel.h \
+ ../src/MarginView.h ../src/EditView.h ../src/Editor.h
+EditView.o: ../src/EditView.cxx ../include/Platform.h \
+ ../include/ILoader.h ../include/Sci_Position.h ../include/ILexer.h \
+ ../include/Scintilla.h ../lexlib/StringCopy.h ../lexlib/CharacterSet.h \
  ../src/Position.h ../src/UniqueString.h ../src/SplitVector.h \
  ../src/Partitioning.h ../src/RunStyles.h ../src/ContractionState.h \
  ../src/CellBuffer.h ../src/PerLine.h ../src/KeyMap.h ../src/Indicator.h \
- ../src/XPM.h ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
+ ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
  ../src/CharClassify.h ../src/Decoration.h ../src/CaseFolder.h \
  ../src/Document.h ../src/UniConversion.h ../src/Selection.h \
  ../src/PositionCache.h ../src/EditModel.h ../src/MarginView.h \
- ../src/EditView.h ../src/Editor.h
-EditView.o: ../src/EditView.cxx ../include/Platform.h ../include/ILexer.h \
- ../include/Sci_Position.h ../include/Scintilla.h ../lexlib/StringCopy.h \
- ../lexlib/CharacterSet.h ../src/Position.h ../src/UniqueString.h \
- ../src/SplitVector.h ../src/Partitioning.h ../src/RunStyles.h \
- ../src/ContractionState.h ../src/CellBuffer.h ../src/PerLine.h \
- ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
- ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \
- ../src/Decoration.h ../src/CaseFolder.h ../src/Document.h \
- ../src/UniConversion.h ../src/Selection.h ../src/PositionCache.h \
- ../src/EditModel.h ../src/MarginView.h ../src/EditView.h
+ ../src/EditView.h
 ExternalLexer.o: ../src/ExternalLexer.cxx ../include/Platform.h \
  ../include/ILexer.h ../include/Sci_Position.h ../include/Scintilla.h \
  ../include/SciLexer.h ../lexlib/LexerModule.h ../src/Catalogue.h \
@@ -89,11 +92,11 @@ LineMarker.o: ../src/LineMarker.cxx ../include/Platform.h \
  ../include/Scintilla.h ../include/Sci_Position.h ../lexlib/StringCopy.h \
  ../src/XPM.h ../src/LineMarker.h
 MarginView.o: ../src/MarginView.cxx ../include/Platform.h \
- ../include/ILexer.h ../include/Sci_Position.h ../include/Scintilla.h \
- ../lexlib/StringCopy.h ../src/Position.h ../src/UniqueString.h \
- ../src/SplitVector.h ../src/Partitioning.h ../src/RunStyles.h \
- ../src/ContractionState.h ../src/CellBuffer.h ../src/KeyMap.h \
- ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \
+ ../include/ILoader.h ../include/Sci_Position.h ../include/ILexer.h \
+ ../include/Scintilla.h ../lexlib/StringCopy.h ../src/Position.h \
+ ../src/UniqueString.h ../src/SplitVector.h ../src/Partitioning.h \
+ ../src/RunStyles.h ../src/ContractionState.h ../src/CellBuffer.h \
+ ../src/KeyMap.h ../src/Indicator.h ../src/LineMarker.h ../src/Style.h \
  ../src/ViewStyle.h ../src/CharClassify.h ../src/Decoration.h \
  ../src/CaseFolder.h ../src/Document.h ../src/UniConversion.h \
  ../src/Selection.h ../src/PositionCache.h ../src/EditModel.h \
@@ -103,11 +106,11 @@ PerLine.o: ../src/PerLine.cxx ../include/Platform.h \
  ../src/SplitVector.h ../src/Partitioning.h ../src/CellBuffer.h \
  ../src/PerLine.h
 PositionCache.o: ../src/PositionCache.cxx ../include/Platform.h \
- ../include/ILexer.h ../include/Sci_Position.h ../include/Scintilla.h \
- ../src/Position.h ../src/UniqueString.h ../src/SplitVector.h \
- ../src/Partitioning.h ../src/RunStyles.h ../src/ContractionState.h \
- ../src/CellBuffer.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \
- ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
+ ../include/ILoader.h ../include/Sci_Position.h ../include/ILexer.h \
+ ../include/Scintilla.h ../src/Position.h ../src/UniqueString.h \
+ ../src/SplitVector.h ../src/Partitioning.h ../src/RunStyles.h \
+ ../src/ContractionState.h ../src/CellBuffer.h ../src/KeyMap.h \
+ ../src/Indicator.h ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
  ../src/CharClassify.h ../src/Decoration.h ../src/CaseFolder.h \
  ../src/Document.h ../src/UniConversion.h ../src/Selection.h \
  ../src/PositionCache.h
@@ -117,11 +120,11 @@ RunStyles.o: ../src/RunStyles.cxx ../include/Platform.h \
  ../include/Scintilla.h ../include/Sci_Position.h ../src/Position.h \
  ../src/SplitVector.h ../src/Partitioning.h ../src/RunStyles.h
 ScintillaBase.o: ../src/ScintillaBase.cxx ../include/Platform.h \
- ../include/ILexer.h ../include/Sci_Position.h ../include/Scintilla.h \
- ../lexlib/PropSetSimple.h ../src/Position.h ../src/UniqueString.h \
- ../src/SplitVector.h ../src/Partitioning.h ../src/RunStyles.h \
- ../src/ContractionState.h ../src/CellBuffer.h ../src/CallTip.h \
- ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
+ ../include/ILoader.h ../include/Sci_Position.h ../include/ILexer.h \
+ ../include/Scintilla.h ../lexlib/PropSetSimple.h ../src/Position.h \
+ ../src/UniqueString.h ../src/SplitVector.h ../src/Partitioning.h \
+ ../src/RunStyles.h ../src/ContractionState.h ../src/CellBuffer.h \
+ ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/LineMarker.h \
  ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \
  ../src/Decoration.h ../src/CaseFolder.h ../src/Document.h \
  ../src/Selection.h ../src/PositionCache.h ../src/EditModel.h \
@@ -145,6 +148,10 @@ Accessor.o: ../lexlib/Accessor.cxx ../include/ILexer.h \
 CharacterCategory.o: ../lexlib/CharacterCategory.cxx \
  ../lexlib/StringCopy.h ../lexlib/CharacterCategory.h
 CharacterSet.o: ../lexlib/CharacterSet.cxx ../lexlib/CharacterSet.h
+DefaultLexer.o: ../lexlib/DefaultLexer.cxx ../include/ILexer.h \
+ ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
+ ../lexlib/PropSetSimple.h ../lexlib/WordList.h ../lexlib/LexAccessor.h \
+ ../lexlib/Accessor.h ../lexlib/LexerModule.h ../lexlib/DefaultLexer.h
 LexerBase.o: ../lexlib/LexerBase.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/PropSetSimple.h ../lexlib/WordList.h ../lexlib/LexAccessor.h \
@@ -193,7 +200,8 @@ LexAPDL.o: ../lexers/LexAPDL.cxx ../include/ILexer.h \
 LexAsm.o: ../lexers/LexAsm.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/StyleContext.h \
- ../lexlib/CharacterSet.h ../lexlib/LexerModule.h ../lexlib/OptionSet.h
+ ../lexlib/CharacterSet.h ../lexlib/LexerModule.h ../lexlib/OptionSet.h \
+ ../lexlib/DefaultLexer.h
 LexAsn1.o: ../lexers/LexAsn1.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
@@ -222,7 +230,8 @@ LexAVS.o: ../lexers/LexAVS.cxx ../include/ILexer.h \
 LexBaan.o: ../lexers/LexBaan.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/StyleContext.h \
- ../lexlib/CharacterSet.h ../lexlib/LexerModule.h ../lexlib/OptionSet.h
+ ../lexlib/CharacterSet.h ../lexlib/LexerModule.h ../lexlib/OptionSet.h \
+ ../lexlib/DefaultLexer.h
 LexBash.o: ../lexers/LexBash.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
@@ -231,7 +240,8 @@ LexBash.o: ../lexers/LexBash.cxx ../include/ILexer.h \
 LexBasic.o: ../lexers/LexBasic.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/StyleContext.h \
- ../lexlib/CharacterSet.h ../lexlib/LexerModule.h ../lexlib/OptionSet.h
+ ../lexlib/CharacterSet.h ../lexlib/LexerModule.h ../lexlib/OptionSet.h \
+ ../lexlib/DefaultLexer.h
 LexBatch.o: ../lexers/LexBatch.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
@@ -279,8 +289,8 @@ LexConf.o: ../lexers/LexConf.cxx ../include/ILexer.h \
  ../lexlib/LexerModule.h
 LexCPP.o: ../lexers/LexCPP.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
- ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
- ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \
+ ../lexlib/StringCopy.h ../lexlib/WordList.h ../lexlib/LexAccessor.h \
+ ../lexlib/Accessor.h ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \
  ../lexlib/LexerModule.h ../lexlib/OptionSet.h ../lexlib/SparseState.h \
  ../lexlib/SubStyles.h
 LexCrontab.o: ../lexers/LexCrontab.cxx ../include/ILexer.h \
@@ -301,7 +311,8 @@ LexCSS.o: ../lexers/LexCSS.cxx ../include/ILexer.h \
 LexD.o: ../lexers/LexD.cxx ../include/ILexer.h ../include/Sci_Position.h \
  ../include/Scintilla.h ../include/SciLexer.h ../lexlib/WordList.h \
  ../lexlib/LexAccessor.h ../lexlib/StyleContext.h \
- ../lexlib/CharacterSet.h ../lexlib/LexerModule.h ../lexlib/OptionSet.h
+ ../lexlib/CharacterSet.h ../lexlib/LexerModule.h ../lexlib/OptionSet.h \
+ ../lexlib/DefaultLexer.h
 LexDiff.o: ../lexers/LexDiff.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
@@ -315,7 +326,8 @@ LexDMAP.o: ../lexers/LexDMAP.cxx ../include/ILexer.h \
 LexDMIS.o: ../lexers/LexDMIS.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/StyleContext.h \
- ../lexlib/CharacterSet.h ../lexlib/LexerModule.h
+ ../lexlib/CharacterSet.h ../lexlib/LexerModule.h \
+ ../lexlib/DefaultLexer.h
 LexECL.o: ../lexers/LexECL.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/PropSetSimple.h ../lexlib/WordList.h ../lexlib/LexAccessor.h \
@@ -323,7 +335,7 @@ LexECL.o: ../lexers/LexECL.cxx ../include/ILexer.h \
  ../lexlib/LexerModule.h ../lexlib/OptionSet.h
 LexEDIFACT.o: ../lexers/LexEDIFACT.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
- ../lexlib/LexAccessor.h ../lexlib/LexerModule.h
+ ../lexlib/LexAccessor.h ../lexlib/LexerModule.h ../lexlib/DefaultLexer.h
 LexEiffel.o: ../lexers/LexEiffel.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
@@ -374,7 +386,7 @@ LexHaskell.o: ../lexers/LexHaskell.cxx ../include/ILexer.h \
  ../lexlib/PropSetSimple.h ../lexlib/WordList.h ../lexlib/LexAccessor.h \
  ../lexlib/Accessor.h ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \
  ../lexlib/CharacterCategory.h ../lexlib/LexerModule.h \
- ../lexlib/OptionSet.h
+ ../lexlib/OptionSet.h ../lexlib/DefaultLexer.h
 LexHex.o: ../lexers/LexHex.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
@@ -398,7 +410,8 @@ LexInno.o: ../lexers/LexInno.cxx ../include/ILexer.h \
 LexJSON.o: ../lexers/LexJSON.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/StyleContext.h \
- ../lexlib/CharacterSet.h ../lexlib/LexerModule.h ../lexlib/OptionSet.h
+ ../lexlib/CharacterSet.h ../lexlib/LexerModule.h ../lexlib/OptionSet.h \
+ ../lexlib/DefaultLexer.h
 LexKix.o: ../lexers/LexKix.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
@@ -413,7 +426,7 @@ LexLaTeX.o: ../lexers/LexLaTeX.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/PropSetSimple.h ../lexlib/WordList.h ../lexlib/LexAccessor.h \
  ../lexlib/Accessor.h ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \
- ../lexlib/LexerModule.h ../lexlib/LexerBase.h
+ ../lexlib/LexerModule.h ../lexlib/DefaultLexer.h ../lexlib/LexerBase.h
 LexLisp.o: ../lexers/LexLisp.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
@@ -426,8 +439,8 @@ LexLout.o: ../lexers/LexLout.cxx ../include/ILexer.h \
  ../lexlib/LexerModule.h
 LexLua.o: ../lexers/LexLua.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
- ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
- ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \
+ ../lexlib/StringCopy.h ../lexlib/WordList.h ../lexlib/LexAccessor.h \
+ ../lexlib/Accessor.h ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \
  ../lexlib/LexerModule.h
 LexMagik.o: ../lexers/LexMagik.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
@@ -522,7 +535,8 @@ LexPB.o: ../lexers/LexPB.cxx ../include/ILexer.h \
 LexPerl.o: ../lexers/LexPerl.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/StyleContext.h \
- ../lexlib/CharacterSet.h ../lexlib/LexerModule.h ../lexlib/OptionSet.h
+ ../lexlib/CharacterSet.h ../lexlib/LexerModule.h ../lexlib/OptionSet.h \
+ ../lexlib/DefaultLexer.h
 LexPLM.o: ../lexers/LexPLM.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
@@ -552,7 +566,7 @@ LexProgress.o: ../lexers/LexProgress.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/StyleContext.h \
  ../lexlib/CharacterSet.h ../lexlib/LexerModule.h ../lexlib/OptionSet.h \
- ../lexlib/SparseState.h
+ ../lexlib/SparseState.h ../lexlib/DefaultLexer.h
 LexProps.o: ../lexers/LexProps.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
@@ -568,7 +582,7 @@ LexPython.o: ../lexers/LexPython.cxx ../include/ILexer.h \
  ../lexlib/StringCopy.h ../lexlib/WordList.h ../lexlib/LexAccessor.h \
  ../lexlib/Accessor.h ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \
  ../lexlib/CharacterCategory.h ../lexlib/LexerModule.h \
- ../lexlib/OptionSet.h ../lexlib/SubStyles.h
+ ../lexlib/OptionSet.h ../lexlib/SubStyles.h ../lexlib/DefaultLexer.h
 LexR.o: ../lexers/LexR.cxx ../include/ILexer.h ../include/Sci_Position.h \
  ../include/Scintilla.h ../include/SciLexer.h ../lexlib/WordList.h \
  ../lexlib/LexAccessor.h ../lexlib/Accessor.h ../lexlib/StyleContext.h \
@@ -581,7 +595,8 @@ LexRebol.o: ../lexers/LexRebol.cxx ../include/ILexer.h \
 LexRegistry.o: ../lexers/LexRegistry.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/StyleContext.h \
- ../lexlib/CharacterSet.h ../lexlib/LexerModule.h ../lexlib/OptionSet.h
+ ../lexlib/CharacterSet.h ../lexlib/LexerModule.h ../lexlib/OptionSet.h \
+ ../lexlib/DefaultLexer.h
 LexRuby.o: ../lexers/LexRuby.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
@@ -591,7 +606,7 @@ LexRust.o: ../lexers/LexRust.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/PropSetSimple.h ../lexlib/WordList.h ../lexlib/LexAccessor.h \
  ../lexlib/Accessor.h ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \
- ../lexlib/LexerModule.h ../lexlib/OptionSet.h
+ ../lexlib/LexerModule.h ../lexlib/OptionSet.h ../lexlib/DefaultLexer.h
 LexScriptol.o: ../lexers/LexScriptol.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
@@ -626,7 +641,8 @@ LexSQL.o: ../lexers/LexSQL.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
  ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \
- ../lexlib/LexerModule.h ../lexlib/OptionSet.h ../lexlib/SparseState.h
+ ../lexlib/LexerModule.h ../lexlib/OptionSet.h ../lexlib/SparseState.h \
+ ../lexlib/DefaultLexer.h
 LexSTTXT.o: ../lexers/LexSTTXT.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
@@ -676,7 +692,8 @@ LexVerilog.o: ../lexers/LexVerilog.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
  ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \
- ../lexlib/LexerModule.h ../lexlib/OptionSet.h ../lexlib/SubStyles.h
+ ../lexlib/LexerModule.h ../lexlib/OptionSet.h ../lexlib/SubStyles.h \
+ ../lexlib/DefaultLexer.h
 LexVHDL.o: ../lexers/LexVHDL.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
@@ -687,7 +704,7 @@ LexVisualProlog.o: ../lexers/LexVisualProlog.cxx ../include/ILexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
  ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \
  ../lexlib/CharacterCategory.h ../lexlib/LexerModule.h \
- ../lexlib/OptionSet.h
+ ../lexlib/OptionSet.h ../lexlib/DefaultLexer.h
 LexYAML.o: ../lexers/LexYAML.cxx ../include/ILexer.h \
  ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index 15c2c1279..eb0dd0054 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -317,8 +317,7 @@ $(DIR_O)\CaseConvert.obj: \
 	../src/CaseConvert.cxx \
 	../lexlib/StringCopy.h \
 	../src/CaseConvert.h \
-	../src/UniConversion.h \
-	../src/UnicodeFromUTF8.h
+	../src/UniConversion.h
 $(DIR_O)\CaseFolder.obj: \
 	../src/CaseFolder.cxx \
 	../src/CaseFolder.h \
@@ -352,6 +351,8 @@ $(DIR_O)\CharacterSet.obj: \
 $(DIR_O)\CharClassify.obj: \
 	../src/CharClassify.cxx \
 	../src/CharClassify.h
+$(DIR_O)\CheckD2D.obj: \
+	CheckD2D.cxx
 $(DIR_O)\ContractionState.obj: \
 	../src/ContractionState.cxx \
 	../include/Platform.h \
@@ -362,6 +363,9 @@ $(DIR_O)\ContractionState.obj: \
 	../src/RunStyles.h \
 	../src/SparseVector.h \
 	../src/ContractionState.h
+$(DIR_O)\DBCS.obj: \
+	../src/DBCS.cxx \
+	../src/DBCS.h
 $(DIR_O)\Decoration.obj: \
 	../src/Decoration.cxx \
 	../include/Platform.h \
@@ -372,11 +376,24 @@ $(DIR_O)\Decoration.obj: \
 	../src/Partitioning.h \
 	../src/RunStyles.h \
 	../src/Decoration.h
+$(DIR_O)\DefaultLexer.obj: \
+	../lexlib/DefaultLexer.cxx \
+	../include/ILexer.h \
+	../include/Sci_Position.h \
+	../include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/LexerModule.h \
+	../lexlib/DefaultLexer.h
 $(DIR_O)\Document.obj: \
 	../src/Document.cxx \
 	../include/Platform.h \
-	../include/ILexer.h \
+	../include/ILoader.h \
 	../include/Sci_Position.h \
+	../include/ILexer.h \
 	../include/Scintilla.h \
 	../lexlib/CharacterSet.h \
 	../lexlib/CharacterCategory.h \
@@ -391,13 +408,13 @@ $(DIR_O)\Document.obj: \
 	../src/CaseFolder.h \
 	../src/Document.h \
 	../src/RESearch.h \
-	../src/UniConversion.h \
-	../src/UnicodeFromUTF8.h
+	../src/UniConversion.h
 $(DIR_O)\EditModel.obj: \
 	../src/EditModel.cxx \
 	../include/Platform.h \
-	../include/ILexer.h \
+	../include/ILoader.h \
 	../include/Sci_Position.h \
+	../include/ILexer.h \
 	../include/Scintilla.h \
 	../lexlib/StringCopy.h \
 	../src/Position.h \
@@ -409,7 +426,6 @@ $(DIR_O)\EditModel.obj: \
 	../src/CellBuffer.h \
 	../src/KeyMap.h \
 	../src/Indicator.h \
-	../src/XPM.h \
 	../src/LineMarker.h \
 	../src/Style.h \
 	../src/ViewStyle.h \
@@ -424,8 +440,9 @@ $(DIR_O)\EditModel.obj: \
 $(DIR_O)\Editor.obj: \
 	../src/Editor.cxx \
 	../include/Platform.h \
-	../include/ILexer.h \
+	../include/ILoader.h \
 	../include/Sci_Position.h \
+	../include/ILexer.h \
 	../include/Scintilla.h \
 	../lexlib/StringCopy.h \
 	../src/Position.h \
@@ -438,7 +455,6 @@ $(DIR_O)\Editor.obj: \
 	../src/PerLine.h \
 	../src/KeyMap.h \
 	../src/Indicator.h \
-	../src/XPM.h \
 	../src/LineMarker.h \
 	../src/Style.h \
 	../src/ViewStyle.h \
@@ -456,8 +472,9 @@ $(DIR_O)\Editor.obj: \
 $(DIR_O)\EditView.obj: \
 	../src/EditView.cxx \
 	../include/Platform.h \
-	../include/ILexer.h \
+	../include/ILoader.h \
 	../include/Sci_Position.h \
+	../include/ILexer.h \
 	../include/Scintilla.h \
 	../lexlib/StringCopy.h \
 	../lexlib/CharacterSet.h \
@@ -471,7 +488,6 @@ $(DIR_O)\EditView.obj: \
 	../src/PerLine.h \
 	../src/KeyMap.h \
 	../src/Indicator.h \
-	../src/XPM.h \
 	../src/LineMarker.h \
 	../src/Style.h \
 	../src/ViewStyle.h \
@@ -495,6 +511,10 @@ $(DIR_O)\ExternalLexer.obj: \
 	../lexlib/LexerModule.h \
 	../src/Catalogue.h \
 	../src/ExternalLexer.h
+$(DIR_O)\HanjaDic.obj: \
+	HanjaDic.cxx \
+	../src/UniConversion.h \
+	HanjaDic.h
 $(DIR_O)\Indicator.obj: \
 	../src/Indicator.cxx \
 	../include/Platform.h \
@@ -791,8 +811,9 @@ $(DIR_O)\LineMarker.obj: \
 $(DIR_O)\MarginView.obj: \
 	../src/MarginView.cxx \
 	../include/Platform.h \
-	../include/ILexer.h \
+	../include/ILoader.h \
 	../include/Sci_Position.h \
+	../include/ILexer.h \
 	../include/Scintilla.h \
 	../lexlib/StringCopy.h \
 	../src/Position.h \
@@ -804,7 +825,6 @@ $(DIR_O)\MarginView.obj: \
 	../src/CellBuffer.h \
 	../src/KeyMap.h \
 	../src/Indicator.h \
-	../src/XPM.h \
 	../src/LineMarker.h \
 	../src/Style.h \
 	../src/ViewStyle.h \
@@ -834,12 +854,14 @@ $(DIR_O)\PlatWin.obj: \
 	../lexlib/StringCopy.h \
 	../src/XPM.h \
 	../src/UniConversion.h \
+	../src/DBCS.h \
 	../src/FontQuality.h
 $(DIR_O)\PositionCache.obj: \
 	../src/PositionCache.cxx \
 	../include/Platform.h \
-	../include/ILexer.h \
+	../include/ILoader.h \
 	../include/Sci_Position.h \
+	../include/ILexer.h \
 	../include/Scintilla.h \
 	../src/Position.h \
 	../src/UniqueString.h \
@@ -850,7 +872,6 @@ $(DIR_O)\PositionCache.obj: \
 	../src/CellBuffer.h \
 	../src/KeyMap.h \
 	../src/Indicator.h \
-	../src/XPM.h \
 	../src/LineMarker.h \
 	../src/Style.h \
 	../src/ViewStyle.h \
@@ -881,8 +902,9 @@ $(DIR_O)\RunStyles.obj: \
 $(DIR_O)\ScintillaBase.obj: \
 	../src/ScintillaBase.cxx \
 	../include/Platform.h \
-	../include/ILexer.h \
+	../include/ILoader.h \
 	../include/Sci_Position.h \
+	../include/ILexer.h \
 	../include/Scintilla.h \
 	../lexlib/PropSetSimple.h \
 	../src/Position.h \
@@ -895,7 +917,6 @@ $(DIR_O)\ScintillaBase.obj: \
 	../src/CallTip.h \
 	../src/KeyMap.h \
 	../src/Indicator.h \
-	../src/XPM.h \
 	../src/LineMarker.h \
 	../src/Style.h \
 	../src/ViewStyle.h \
@@ -914,8 +935,9 @@ $(DIR_O)\ScintillaBase.obj: \
 $(DIR_O)\ScintillaBaseL.obj: \
 	../src/ScintillaBase.cxx \
 	../include/Platform.h \
-	../include/ILexer.h \
+	../include/ILoader.h \
 	../include/Sci_Position.h \
+	../include/ILexer.h \
 	../include/Scintilla.h \
 	../lexlib/PropSetSimple.h \
 	../src/Position.h \
@@ -928,7 +950,6 @@ $(DIR_O)\ScintillaBaseL.obj: \
 	../src/CallTip.h \
 	../src/KeyMap.h \
 	../src/Indicator.h \
-	../src/XPM.h \
 	../src/LineMarker.h \
 	../src/Style.h \
 	../src/ViewStyle.h \
@@ -947,8 +968,9 @@ $(DIR_O)\ScintillaBaseL.obj: \
 $(DIR_O)\ScintillaWin.obj: \
 	ScintillaWin.cxx \
 	../include/Platform.h \
-	../include/ILexer.h \
+	../include/ILoader.h \
 	../include/Sci_Position.h \
+	../include/ILexer.h \
 	../include/Scintilla.h \
 	../lexlib/StringCopy.h \
 	../src/Position.h \
@@ -961,7 +983,6 @@ $(DIR_O)\ScintillaWin.obj: \
 	../src/CallTip.h \
 	../src/KeyMap.h \
 	../src/Indicator.h \
-	../src/XPM.h \
 	../src/LineMarker.h \
 	../src/Style.h \
 	../src/ViewStyle.h \
@@ -984,8 +1005,9 @@ $(DIR_O)\ScintillaWin.obj: \
 $(DIR_O)\ScintillaWinL.obj: \
 	ScintillaWin.cxx \
 	../include/Platform.h \
-	../include/ILexer.h \
+	../include/ILoader.h \
 	../include/Sci_Position.h \
+	../include/ILexer.h \
 	../include/Scintilla.h \
 	../lexlib/StringCopy.h \
 	../src/Position.h \
@@ -998,7 +1020,6 @@ $(DIR_O)\ScintillaWinL.obj: \
 	../src/CallTip.h \
 	../src/KeyMap.h \
 	../src/Indicator.h \
-	../src/XPM.h \
 	../src/LineMarker.h \
 	../src/Style.h \
 	../src/ViewStyle.h \
@@ -1021,8 +1042,9 @@ $(DIR_O)\ScintillaWinL.obj: \
 $(DIR_O)\ScintillaWinS.obj: \
 	ScintillaWin.cxx \
 	../include/Platform.h \
-	../include/ILexer.h \
+	../include/ILoader.h \
 	../include/Sci_Position.h \
+	../include/ILexer.h \
 	../include/Scintilla.h \
 	../lexlib/StringCopy.h \
 	../src/Position.h \
@@ -1035,7 +1057,6 @@ $(DIR_O)\ScintillaWinS.obj: \
 	../src/CallTip.h \
 	../src/KeyMap.h \
 	../src/Indicator.h \
-	../src/XPM.h \
 	../src/LineMarker.h \
 	../src/Style.h \
 	../src/ViewStyle.h \
@@ -1099,7 +1120,3 @@ $(DIR_O)\XPM.obj: \
 	../src/XPM.cxx \
 	../include/Platform.h \
 	../src/XPM.h
-$(DIR_O)\HanjaDic.obj: \
-	HanjaDic.cxx \
-	../src/UniConversion.h \
-	HanjaDic.h