Implemented decorations which are extended indicators.

5 files changed, 286 insertions, 154 deletions

diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index ae30b9a4d..046da18a6 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -32,6 +32,7 @@
 #include "SVector.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
+#include "RunStyles.h"
 #include "CellBuffer.h"
 #include "CallTip.h"
 #include "KeyMap.h"
@@ -42,6 +43,7 @@
 #include "AutoComplete.h"
 #include "ViewStyle.h"
 #include "CharClassify.h"
+#include "Decoration.h"
 #include "Document.h"
 #include "Editor.h"
 #include "ScintillaBase.h"
@@ -740,7 +742,7 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam
 		} else {
 			if (IsUnicodeMode()) {
 				char utfval[4];
-				wchar_t wcs[2] = {wParam, 0};
+				wchar_t wcs[2] = {static_cast<wchar_t>(wParam), 0};
 				unsigned int len = UTF8Length(wcs, 1);
 				UTF8FromUCS2(wcs, 1, utfval, len);
 				AddCharUTF(utfval, len);
diff --git a/win32/deps.mak b/win32/deps.mak
index 44723e267..d41c20a13 100644
--- a/win32/deps.mak
+++ b/win32/deps.mak
@@ -2,34 +2,46 @@ PlatWin.o: PlatWin.cxx ../include/Platform.h PlatformRes.h \
   ../src/UniConversion.h ../src/XPM.h
 ScintillaWin.o: ScintillaWin.cxx ../include/Platform.h \
   ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \
-  ../src/SVector.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \
+  ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \
   ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \
-  ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h ../src/Document.h \
-  ../src/Editor.h ../src/ScintillaBase.h ../src/UniConversion.h
+  ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \
+  ../src/Decoration.h ../src/Document.h ../src/Editor.h \
+  ../src/ScintillaBase.h ../src/UniConversion.h
 AutoComplete.o: ../src/AutoComplete.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h
 CallTip.o: ../src/CallTip.cxx ../include/Platform.h \
   ../include/Scintilla.h ../src/CallTip.h
 CellBuffer.o: ../src/CellBuffer.cxx ../include/Platform.h \
-  ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h
+  ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/CellBuffer.h
 CharClassify.o: ../src/CharClassify.cxx ../src/CharClassify.h
 ContractionState.o: ../src/ContractionState.cxx ../include/Platform.h \
   ../src/ContractionState.h
+Decoration.o: ../src/Decoration.cxx ../include/Platform.h \
+  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/RunStyles.h ../src/Decoration.h
 Document.o: ../src/Document.cxx ../include/Platform.h \
-  ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h \
- ../src/CharClassify.h  ../src/Document.h ../src/RESearch.h
+  ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \
+  ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \
+  ../src/RESearch.h
 DocumentAccessor.o: ../src/DocumentAccessor.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../src/SVector.h \
-  ../include/Accessor.h ../src/DocumentAccessor.h ../src/CellBuffer.h \
-  ../include/Scintilla.h ../src/CharClassify.h ../src/Document.h
+  ../include/Accessor.h ../src/DocumentAccessor.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \
+  ../include/Scintilla.h ../src/CharClassify.h ../src/Decoration.h \
+  ../src/Document.h
 Editor.o: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.h \
-  ../src/ContractionState.h ../src/SVector.h ../src/CellBuffer.h \
-  ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
-  ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h ../src/Document.h ../src/Editor.h
+  ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/CellBuffer.h ../src/KeyMap.h \
+  ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
+  ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \
+  ../src/Decoration.h ../src/Document.h ../src/Editor.h
 ExternalLexer.o: ../src/ExternalLexer.cxx ../include/Platform.h \
-  ../include/SciLexer.h ../include/PropSet.h ../include/SString.h \
-  ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \
-  ../src/ExternalLexer.h
+  ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../src/DocumentAccessor.h \
+  ../include/KeyWords.h ../src/ExternalLexer.h
 Indicator.o: ../src/Indicator.cxx ../include/Platform.h \
   ../include/Scintilla.h ../src/Indicator.h
 KeyMap.o: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \
@@ -39,13 +51,16 @@ KeyWords.o: ../src/KeyWords.cxx ../include/Platform.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexAda.o: ../src/LexAda.cxx ../include/Platform.h ../include/Accessor.h \
   ../src/StyleContext.h ../include/PropSet.h ../include/SString.h \
-  ../include/KeyWords.h ../include/SciLexer.h
+  ../include/KeyWords.h ../include/SciLexer.h ../include/SString.h
 LexAPDL.o: ../src/LexAPDL.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexAsm.o: ../src/LexAsm.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+LexAsn1.o: ../src/LexAsn1.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexAU3.o: ../src/LexAU3.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
@@ -58,12 +73,22 @@ LexBaan.o: ../src/LexBaan.cxx ../include/Platform.h ../include/PropSet.h \
 LexBash.o: ../src/LexBash.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
   ../include/Scintilla.h ../include/SciLexer.h
+LexBasic.o: ../src/LexBasic.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
+  ../include/SciLexer.h
 LexBullant.o: ../src/LexBullant.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+LexCaml.o: ../src/LexCaml.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexCLW.o: ../src/LexCLW.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+LexCmake.o: ../src/LexCmake.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexConf.o: ../src/LexConf.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
   ../include/Scintilla.h ../include/SciLexer.h
@@ -73,9 +98,16 @@ LexCPP.o: ../src/LexCPP.cxx ../include/Platform.h ../include/PropSet.h \
 LexCrontab.o: ../src/LexCrontab.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+LexCsound.o: ../src/LexCsound.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
+  ../include/SciLexer.h
 LexCSS.o: ../src/LexCSS.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+LexD.o: ../src/LexD.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexEiffel.o: ../src/LexEiffel.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
@@ -88,6 +120,10 @@ LexEScript.o: ../src/LexEScript.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
   ../include/SciLexer.h
+LexFlagship.o: ../src/LexFlagship.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
+  ../include/SciLexer.h
 LexForth.o: ../src/LexForth.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
@@ -99,15 +135,22 @@ LexGui4Cli.o: ../src/LexGui4Cli.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
   ../include/SciLexer.h
+LexHaskell.o: ../src/LexHaskell.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
+  ../include/SciLexer.h
 LexHTML.o: ../src/LexHTML.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+LexInno.o: ../src/LexInno.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexKix.o: ../src/LexKix.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexLisp.o: ../src/LexLisp.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
-  ../include/Scintilla.h ../include/SciLexer.h
+  ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h
 LexLout.o: ../src/LexLout.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
@@ -128,13 +171,16 @@ LexMMIXAL.o: ../src/LexMMIXAL.cxx ../include/Platform.h \
   ../include/SciLexer.h
 LexMPT.o: ../src/LexMPT.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
-  ../include/Scintilla.h ../include/SciLexer.h
+  ../include/Scintilla.h ../include/SciLexer.h ../include/SString.h
 LexMSSQL.o: ../src/LexMSSQL.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexNsis.o: ../src/LexNsis.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
   ../include/Scintilla.h ../include/SciLexer.h
+LexOpal.o: ../src/LexOpal.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
+  ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h
 LexOthers.o: ../src/LexOthers.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
@@ -158,19 +204,38 @@ LexPython.o: ../src/LexPython.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
   ../include/SciLexer.h
+LexRebol.o: ../src/LexRebol.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \
+  ../src/StyleContext.h
 LexRuby.o: ../src/LexRuby.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
   ../include/Scintilla.h ../include/SciLexer.h
 LexScriptol.o: ../src/LexScriptol.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+LexSmalltalk.o: ../src/LexSmalltalk.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
+  ../include/SciLexer.h
 LexSpecman.o: ../src/LexSpecman.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
   ../include/SciLexer.h
+LexSpice.o: ../src/LexSpice.cxx ../include/Platform.h \
+  ../include/Accessor.h ../src/StyleContext.h ../include/PropSet.h \
+  ../include/SString.h ../include/KeyWords.h ../include/SciLexer.h \
+  ../include/SString.h
 LexSQL.o: ../src/LexSQL.cxx ../include/Platform.h ../include/PropSet.h \
-  ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
-  ../include/Scintilla.h ../include/SciLexer.h
+  ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+LexTADS3.o: ../src/LexTADS3.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
+  ../include/SciLexer.h
+LexTCL.o: ../src/LexTCL.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexTeX.o: ../src/LexTeX.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
   ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h
@@ -181,6 +246,9 @@ LexVerilog.o: ../src/LexVerilog.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
   ../include/SciLexer.h
+LexVHDL.o: ../src/LexVHDL.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexYAML.o: ../src/LexYAML.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
@@ -188,14 +256,18 @@ LineMarker.o: ../src/LineMarker.cxx ../include/Platform.h \
   ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h
 PropSet.o: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h
-RESearch.o: ../src/RESearch.cxx ../src/RESearch.h
+RESearch.o: ../src/RESearch.cxx ../src/CharClassify.h ../src/RESearch.h
+RunStyles.o: ../src/RunStyles.cxx ../include/Platform.h \
+  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/RunStyles.h
 ScintillaBase.o: ../src/ScintillaBase.cxx ../include/Platform.h \
   ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \
-  ../src/ContractionState.h ../src/SVector.h ../src/CellBuffer.h \
+  ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \
   ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \
   ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
-  ../src/AutoComplete.h ../src/CharClassify.h ../src/Document.h ../src/Editor.h \
-  ../src/ScintillaBase.h
+  ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \
+  ../src/Document.h ../src/Editor.h ../src/ScintillaBase.h
 Style.o: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \
   ../src/Style.h
 StyleContext.o: ../src/StyleContext.cxx ../include/Platform.h \
@@ -203,8 +275,9 @@ StyleContext.o: ../src/StyleContext.cxx ../include/Platform.h \
   ../src/StyleContext.h
 UniConversion.o: ../src/UniConversion.cxx ../src/UniConversion.h
 ViewStyle.o: ../src/ViewStyle.cxx ../include/Platform.h \
-  ../include/Scintilla.h ../src/Indicator.h ../src/XPM.h \
-  ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h
+  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
+  ../src/Style.h ../src/ViewStyle.h
 WindowAccessor.o: ../src/WindowAccessor.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../include/WindowAccessor.h ../include/Scintilla.h
diff --git a/win32/makefile b/win32/makefile
index ef18e0d7a..ce0d2c076 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -62,16 +62,16 @@ LexScriptol.o LexSmalltalk.o LexSpecman.o LexSpice.o LexSQL.o LexTADS3.o \
 LexTCL.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o
 #--Autogenerated -- end of automatically generated section
 
-SOBJS	= ScintillaWin.o ScintillaBase.o Editor.o CharClassify.o Document.o \
-	ContractionState.o CellBuffer.o CallTip.o \
-	ScintRes.o PlatWin.o KeyMap.o Indicator.o LineMarker.o RESearch.o \
+SOBJS	= ScintillaWin.o ScintillaBase.o Editor.o CharClassify.o Decoration.o \
+	Document.o ContractionState.o CellBuffer.o CallTip.o \
+	ScintRes.o PlatWin.o KeyMap.o Indicator.o LineMarker.o RESearch.o RunStyles.o \
 	Style.o ViewStyle.o AutoComplete.o UniConversion.o PropSet.o XPM.o
 $(COMPONENT): $(SOBJS) Scintilla.def
 	$(DLLWRAP) --add-stdcall-alias --target i386-mingw32 -o $@ $(SOBJS) $(LDFLAGS) -s --relocatable
 
-LOBJS	= ScintillaWinL.o ScintillaBaseL.o Editor.o CharClassify.o Document.o \
-	ContractionState.o CellBuffer.o CallTip.o \
-	ScintRes.o PlatWin.o KeyMap.o Indicator.o LineMarker.o RESearch.o \
+LOBJS	= ScintillaWinL.o ScintillaBaseL.o Editor.o CharClassify.o Decoration.o \
+	Document.o ContractionState.o CellBuffer.o CallTip.o \
+	ScintRes.o PlatWin.o KeyMap.o Indicator.o LineMarker.o RESearch.o RunStyles.o \
 	Style.o ViewStyle.o AutoComplete.o UniConversion.o KeyWords.o \
 	DocumentAccessor.o PropSet.o ExternalLexer.o StyleContext.o XPM.o $(LEXOBJS)
 $(LEXCOMPONENT): $(LOBJS) Scintilla.def
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index fafe6f335..0d60c4bea 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -92,6 +92,7 @@ SOBJS=\
 	$(DIR_O)\CellBuffer.obj \
 	$(DIR_O)\CharClassify.obj \
 	$(DIR_O)\ContractionState.obj \
+	$(DIR_O)\Decoration.obj \
 	$(DIR_O)\Document.obj \
 	$(DIR_O)\Editor.obj \
 	$(DIR_O)\Indicator.obj \
@@ -100,6 +101,7 @@ SOBJS=\
 	$(DIR_O)\PlatWin.obj \
 	$(DIR_O)\PropSet.obj \
 	$(DIR_O)\RESearch.obj \
+	$(DIR_O)\RunStyles.obj \
 	$(DIR_O)\ScintillaBase.obj \
 	$(DIR_O)\ScintillaWin.obj \
 	$(DIR_O)\Style.obj \
@@ -180,6 +182,7 @@ LOBJS=\
 	$(DIR_O)\CellBuffer.obj \
 	$(DIR_O)\CharClassify.obj \
 	$(DIR_O)\ContractionState.obj \
+	$(DIR_O)\Decoration.obj \
 	$(DIR_O)\Document.obj \
 	$(DIR_O)\DocumentAccessor.obj \
 	$(DIR_O)\Editor.obj \
@@ -189,8 +192,9 @@ LOBJS=\
 	$(DIR_O)\KeyWords.obj \
 	$(DIR_O)\LineMarker.obj \
 	$(DIR_O)\PlatWin.obj \
-	$(DIR_O)\RESearch.obj \
 	$(DIR_O)\PropSet.obj \
+	$(DIR_O)\RESearch.obj \
+	$(DIR_O)\RunStyles.obj \
 	$(DIR_O)\ScintillaBaseL.obj \
 	$(DIR_O)\ScintillaWinL.obj \
 	$(DIR_O)\Style.obj \
@@ -247,37 +251,46 @@ LEX_HEADERS=..\include\Platform.h ..\include\PropSet.h \
  ..\include\Scintilla.h ..\include\SciLexer.h ..\src\StyleContext.h
 
 $(DIR_O)\AutoComplete.obj: ../src/AutoComplete.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h
+  ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h
 $(DIR_O)\CallTip.obj: ../src/CallTip.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/CallTip.h
+  ../include/Scintilla.h ../src/CallTip.h
 $(DIR_O)\CellBuffer.obj: ../src/CellBuffer.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h
+  ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/CellBuffer.h
 $(DIR_O)\CharClassify.obj: ../src/CharClassify.cxx ../src/CharClassify.h
 $(DIR_O)\ContractionState.obj: ../src/ContractionState.cxx ../include/Platform.h \
- ../src/ContractionState.h
+  ../src/ContractionState.h
+$(DIR_O)\Decoration.obj: ../src/Decoration.cxx ../include/Platform.h \
+  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/RunStyles.h ../src/Decoration.h
 $(DIR_O)\Document.obj: ../src/Document.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h \
-  ../src/CharClassify.h ../src/Document.h ../src/RESearch.h
+  ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \
+  ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \
+  ../src/RESearch.h
 $(DIR_O)\DocumentAccessor.obj: ../src/DocumentAccessor.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../src/SVector.h \
- ../include/Accessor.h ../src/DocumentAccessor.h ../src/CellBuffer.h \
- ../include/Scintilla.h ../src/CharClassify.h ../src/Document.h
-$(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/ContractionState.h ../src/SVector.h \
- ../src/CellBuffer.h ../src/KeyMap.h ../src/Indicator.h \
- ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
- ../src/CharClassify.h ../src/Document.h ../src/Editor.h ../src/XPM.h
+  ../include/PropSet.h ../include/SString.h ../src/SVector.h \
+  ../include/Accessor.h ../src/DocumentAccessor.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \
+  ../include/Scintilla.h ../src/CharClassify.h ../src/Decoration.h \
+  ../src/Document.h
+$(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.h \
+  ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/CellBuffer.h ../src/KeyMap.h \
+  ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
+  ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \
+  ../src/Decoration.h ../src/Document.h ../src/Editor.h
 $(DIR_O)\ExternalLexer.obj: ../src/ExternalLexer.cxx ../include/Platform.h \
- ../include/SciLexer.h ../include/PropSet.h ../include/SString.h \
- ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \
- ../src/ExternalLexer.h
+  ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../src/DocumentAccessor.h \
+  ../include/KeyWords.h ../src/ExternalLexer.h
 $(DIR_O)\Indicator.obj: ../src/Indicator.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/Indicator.h
-$(DIR_O)\KeyMap.obj: ../src/KeyMap.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/KeyMap.h
+  ../include/Scintilla.h ../src/Indicator.h
+$(DIR_O)\KeyMap.obj: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \
+  ../src/KeyMap.h
 $(DIR_O)\KeyWords.obj: ../src/KeyWords.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 
 #++Autogenerated -- run src/LexGen.py to regenerate
 #**\n\($(DIR_O)\\\*.obj: ..\\src\\\*.cxx $(LEX_HEADERS)\n\n\)
@@ -408,52 +421,66 @@ $(DIR_O)\LexYAML.obj: ..\src\LexYAML.cxx $(LEX_HEADERS)
 #--Autogenerated -- end of automatically generated section
 
 $(DIR_O)\LineMarker.obj: ../src/LineMarker.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/LineMarker.h ../src/XPM.h
+  ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h
 $(DIR_O)\PlatWin.obj: PlatWin.cxx ../include/Platform.h PlatformRes.h \
- ../src/UniConversion.h  ../src/XPM.h
-$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h
-$(DIR_O)\RESearch.obj: ../src/RESearch.cxx ../src/RESearch.h
+  ../src/UniConversion.h ../src/XPM.h
+$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h
+$(DIR_O)\RESearch.obj: ../src/RESearch.cxx ../src/CharClassify.h ../src/RESearch.h
+$(DIR_O)\RunStyles.obj: ../src/RunStyles.cxx ../include/Platform.h \
+  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/RunStyles.h
 $(DIR_O)\ScintillaBase.obj: ../src/ScintillaBase.cxx ../include/Platform.h \
- ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \
- ../src/ContractionState.h ../src/SVector.h ../src/CellBuffer.h \
- ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h \
- ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
- ../src/AutoComplete.h ../src/CharClassify.h ../src/Document.h ../src/Editor.h \
- ../src/ScintillaBase.h ../src/XPM.h
-$(DIR_O)\ScintillaBaseL.obj: ..\src\ScintillaBase.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \
- ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
- ..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ../src/CharClassify.h \
- ..\src\Document.h ..\src\Editor.h \
- ..\src\ScintillaBase.h ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
- ..\src\DocumentAccessor.h ..\include\KeyWords.h ../src/XPM.h
+  ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \
+  ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \
+  ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \
+  ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
+  ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \
+  ../src/Document.h ../src/Editor.h ../src/ScintillaBase.h
+$(DIR_O)\ScintillaBaseL.obj: ../src/ScintillaBase.cxx ../include/Platform.h \
+  ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \
+  ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \
+  ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \
+  ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
+  ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \
+  ../src/Document.h ../src/Editor.h ../src/ScintillaBase.h
 $(DIR_O)\ScintillaWin.obj: ScintillaWin.cxx ../include/Platform.h \
- ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \
- ../src/SVector.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \
- ../src/Indicator.h ../src/LineMarker.h ../src/Style.h \
- ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h ../src/Document.h \
- ../src/Editor.h ../src/ScintillaBase.h ../src/UniConversion.h ../src/XPM.h
-$(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \
- ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
- ..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ../src/CharClassify.h \
- ..\src\Document.h ..\src\Editor.h \
- ..\src\ScintillaBase.h ..\include\PropSet.h \
- ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h ..\src\UniConversion.h ../src/XPM.h
-$(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h \
- ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
- ..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ../src/CharClassify.h \
- ..\src\Document.h ..\src\Editor.h \
- ..\src\ScintillaBase.h ..\src\UniConversion.h
+  ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \
+  ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \
+  ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \
+  ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \
+  ../src/Decoration.h ../src/Document.h ../src/Editor.h \
+  ../src/ScintillaBase.h ../src/UniConversion.h
+$(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ../include/Platform.h \
+  ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \
+  ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \
+  ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \
+  ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \
+  ../src/Decoration.h ../src/Document.h ../src/Editor.h \
+  ../src/ScintillaBase.h ../src/UniConversion.h
+$(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx ../include/Platform.h \
+  ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \
+  ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \
+  ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \
+  ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \
+  ../src/Decoration.h ../src/Document.h ../src/Editor.h \
+  ../src/ScintillaBase.h ../src/UniConversion.h
 $(DIR_O)\Style.obj: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \
- ../src/Style.h
+  ../src/Style.h
 $(DIR_O)\StyleContext.obj: ../src/StyleContext.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
- ../src/StyleContext.h
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../src/StyleContext.h
 $(DIR_O)\UniConversion.obj: ../src/UniConversion.cxx ../src/UniConversion.h
 $(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/Indicator.h ../src/LineMarker.h \
- ../src/Style.h ../src/ViewStyle.h ../src/XPM.h
+  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
+  ../src/Style.h ../src/ViewStyle.h
 $(DIR_O)\WindowAccessor.obj: ../src/WindowAccessor.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
- ../include/WindowAccessor.h ../include/Scintilla.h
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../include/WindowAccessor.h ../include/Scintilla.h
 $(DIR_O)\XPM.obj: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h
diff --git a/win32/scintilla_vc6.mak b/win32/scintilla_vc6.mak
index 75862f494..5506dd1fd 100644
--- a/win32/scintilla_vc6.mak
+++ b/win32/scintilla_vc6.mak
@@ -94,6 +94,7 @@ SOBJS=\
 	$(DIR_O)\CellBuffer.obj \
 	$(DIR_O)\CharClassify.obj \
 	$(DIR_O)\ContractionState.obj \
+	$(DIR_O)\Decoration.obj \
 	$(DIR_O)\Document.obj \
 	$(DIR_O)\Editor.obj \
 	$(DIR_O)\Indicator.obj \
@@ -102,6 +103,7 @@ SOBJS=\
 	$(DIR_O)\PlatWin.obj \
 	$(DIR_O)\PropSet.obj \
 	$(DIR_O)\RESearch.obj \
+	$(DIR_O)\RunStyles.obj \
 	$(DIR_O)\ScintillaBase.obj \
 	$(DIR_O)\ScintillaWin.obj \
 	$(DIR_O)\Style.obj \
@@ -182,6 +184,7 @@ LOBJS=\
 	$(DIR_O)\CellBuffer.obj \
 	$(DIR_O)\CharClassify.obj \
 	$(DIR_O)\ContractionState.obj \
+	$(DIR_O)\Decoration.obj \
 	$(DIR_O)\Document.obj \
 	$(DIR_O)\DocumentAccessor.obj \
 	$(DIR_O)\Editor.obj \
@@ -191,6 +194,7 @@ LOBJS=\
 	$(DIR_O)\KeyWords.obj \
 	$(DIR_O)\LineMarker.obj \
 	$(DIR_O)\PlatWin.obj \
+	$(DIR_O)\RunStyles.obj \
 	$(DIR_O)\RESearch.obj \
 	$(DIR_O)\PropSet.obj \
 	$(DIR_O)\ScintillaBaseL.obj \
@@ -249,37 +253,46 @@ LEX_HEADERS=..\include\Platform.h ..\include\PropSet.h \
  ..\include\Scintilla.h ..\include\SciLexer.h ..\src\StyleContext.h
 
 $(DIR_O)\AutoComplete.obj: ../src/AutoComplete.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h
+  ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h
 $(DIR_O)\CallTip.obj: ../src/CallTip.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/CallTip.h
+  ../include/Scintilla.h ../src/CallTip.h
 $(DIR_O)\CellBuffer.obj: ../src/CellBuffer.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h
+  ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/CellBuffer.h
 $(DIR_O)\CharClassify.obj: ../src/CharClassify.cxx ../src/CharClassify.h
 $(DIR_O)\ContractionState.obj: ../src/ContractionState.cxx ../include/Platform.h \
- ../src/ContractionState.h
+  ../src/ContractionState.h
+$(DIR_O)\Decoration.obj: ../src/Decoration.cxx ../include/Platform.h \
+  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/RunStyles.h ../src/Decoration.h
 $(DIR_O)\Document.obj: ../src/Document.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h \
- ../src/Document.h ../src/RESearch.h
+  ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \
+  ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \
+  ../src/RESearch.h
 $(DIR_O)\DocumentAccessor.obj: ../src/DocumentAccessor.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../src/SVector.h \
- ../include/Accessor.h ../src/DocumentAccessor.h ../src/CellBuffer.h \
- ../include/Scintilla.h ../src/Document.h
-$(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/ContractionState.h ../src/SVector.h \
- ../src/CellBuffer.h ../src/KeyMap.h ../src/Indicator.h \
- ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
- ../src/Document.h ../src/Editor.h ../src/XPM.h
+  ../include/PropSet.h ../include/SString.h ../src/SVector.h \
+  ../include/Accessor.h ../src/DocumentAccessor.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \
+  ../include/Scintilla.h ../src/CharClassify.h ../src/Decoration.h \
+  ../src/Document.h
+$(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.h \
+  ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/CellBuffer.h ../src/KeyMap.h \
+  ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
+  ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \
+  ../src/Decoration.h ../src/Document.h ../src/Editor.h
 $(DIR_O)\ExternalLexer.obj: ../src/ExternalLexer.cxx ../include/Platform.h \
- ../include/SciLexer.h ../include/PropSet.h ../include/SString.h \
- ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \
- ../src/ExternalLexer.h
+  ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../src/DocumentAccessor.h \
+  ../include/KeyWords.h ../src/ExternalLexer.h
 $(DIR_O)\Indicator.obj: ../src/Indicator.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/Indicator.h
-$(DIR_O)\KeyMap.obj: ../src/KeyMap.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/KeyMap.h
+  ../include/Scintilla.h ../src/Indicator.h
+$(DIR_O)\KeyMap.obj: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \
+  ../src/KeyMap.h
 $(DIR_O)\KeyWords.obj: ../src/KeyWords.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 
 #++Autogenerated -- run src/LexGen.py to regenerate
 #**\n\($(DIR_O)\\\*.obj: ..\\src\\\*.cxx $(LEX_HEADERS)\n\n\)
@@ -410,49 +423,66 @@ $(DIR_O)\LexYAML.obj: ..\src\LexYAML.cxx $(LEX_HEADERS)
 #--Autogenerated -- end of automatically generated section
 
 $(DIR_O)\LineMarker.obj: ../src/LineMarker.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/LineMarker.h ../src/XPM.h
+  ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h
 $(DIR_O)\PlatWin.obj: PlatWin.cxx ../include/Platform.h PlatformRes.h \
- ../src/UniConversion.h  ../src/XPM.h
-$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h
-$(DIR_O)\RESearch.obj: ../src/RESearch.cxx ../src/RESearch.h
+  ../src/UniConversion.h ../src/XPM.h
+$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h
+$(DIR_O)\RESearch.obj: ../src/RESearch.cxx ../src/CharClassify.h ../src/RESearch.h
+$(DIR_O)\RunStyles.obj: ../src/RunStyles.cxx ../include/Platform.h \
+  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/RunStyles.h
 $(DIR_O)\ScintillaBase.obj: ../src/ScintillaBase.cxx ../include/Platform.h \
- ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \
- ../src/ContractionState.h ../src/SVector.h ../src/CellBuffer.h \
- ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h \
- ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
- ../src/AutoComplete.h ../src/Document.h ../src/Editor.h \
- ../src/ScintillaBase.h ../src/XPM.h
-$(DIR_O)\ScintillaBaseL.obj: ..\src\ScintillaBase.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \
- ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
- ..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\Document.h ..\src\Editor.h \
- ..\src\ScintillaBase.h ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
- ..\src\DocumentAccessor.h ..\include\KeyWords.h ../src/XPM.h
+  ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \
+  ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \
+  ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \
+  ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
+  ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \
+  ../src/Document.h ../src/Editor.h ../src/ScintillaBase.h
+$(DIR_O)\ScintillaBaseL.obj: ../src/ScintillaBase.cxx ../include/Platform.h \
+  ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \
+  ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \
+  ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \
+  ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
+  ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \
+  ../src/Document.h ../src/Editor.h ../src/ScintillaBase.h
 $(DIR_O)\ScintillaWin.obj: ScintillaWin.cxx ../include/Platform.h \
- ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \
- ../src/SVector.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \
- ../src/Indicator.h ../src/LineMarker.h ../src/Style.h \
- ../src/AutoComplete.h ../src/ViewStyle.h ../src/Document.h \
- ../src/Editor.h ../src/ScintillaBase.h ../src/UniConversion.h ../src/XPM.h
-$(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \
- ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
- ..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\Document.h ..\src\Editor.h \
- ..\src\ScintillaBase.h ..\include\PropSet.h \
- ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h ..\src\UniConversion.h ../src/XPM.h
-$(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h \
- ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
- ..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\Document.h ..\src\Editor.h \
- ..\src\ScintillaBase.h ..\src\UniConversion.h
+  ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \
+  ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \
+  ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \
+  ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \
+  ../src/Decoration.h ../src/Document.h ../src/Editor.h \
+  ../src/ScintillaBase.h ../src/UniConversion.h
+$(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ../include/Platform.h \
+  ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \
+  ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \
+  ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \
+  ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \
+  ../src/Decoration.h ../src/Document.h ../src/Editor.h \
+  ../src/ScintillaBase.h ../src/UniConversion.h
+$(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx ../include/Platform.h \
+  ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \
+  ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \
+  ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \
+  ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \
+  ../src/Decoration.h ../src/Document.h ../src/Editor.h \
+  ../src/ScintillaBase.h ../src/UniConversion.h
 $(DIR_O)\Style.obj: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \
- ../src/Style.h
+  ../src/Style.h
 $(DIR_O)\StyleContext.obj: ../src/StyleContext.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
- ../src/StyleContext.h
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../src/StyleContext.h
 $(DIR_O)\UniConversion.obj: ../src/UniConversion.cxx ../src/UniConversion.h
 $(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/Indicator.h ../src/LineMarker.h \
- ../src/Style.h ../src/ViewStyle.h ../src/XPM.h
+  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
+  ../src/Style.h ../src/ViewStyle.h
 $(DIR_O)\WindowAccessor.obj: ../src/WindowAccessor.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
- ../include/WindowAccessor.h ../include/Scintilla.h
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../include/WindowAccessor.h ../include/Scintilla.h
 $(DIR_O)\XPM.obj: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h