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

Move Unicode conversion functions UnicodeFromUTF8 and UTF8FromUTF32Character
into UniConversion.

1 files changed, 46 insertions, 29 deletions

diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index 7f943474b..1cdb2dc93 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -320,8 +320,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 \
@@ -355,6 +354,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 \
@@ -365,6 +366,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 \
@@ -375,11 +379,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 \
@@ -394,13 +411,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 \
@@ -412,7 +429,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 \
@@ -427,8 +443,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 \
@@ -441,7 +458,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 \
@@ -459,8 +475,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 \
@@ -474,7 +491,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 \
@@ -498,6 +514,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 \
@@ -792,8 +812,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 \
@@ -805,7 +826,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 \
@@ -835,12 +855,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 \
@@ -851,7 +873,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 \
@@ -882,8 +903,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 \
@@ -896,7 +918,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 \
@@ -915,8 +936,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 \
@@ -929,7 +951,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 \
@@ -948,8 +969,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 \
@@ -962,7 +984,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 \
@@ -985,8 +1006,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 \
@@ -999,7 +1021,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 \
@@ -1022,8 +1043,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 \
@@ -1036,7 +1058,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 \
@@ -1100,7 +1121,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