New StyleContext file added to build system.

7 files changed, 121 insertions, 236 deletions

diff --git a/gtk/makefile b/gtk/makefile
index 97d737bfa..9adc262c0 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -39,7 +39,7 @@ clean:
 deps:
 	$(CC) -MM `gtk-config --cflags` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak
 
-$(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o Document.o CallTip.o \
+$(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o Document.o CallTip.o \
 	ScintillaBase.o ContractionState.o Editor.o PropSet.o PlatGTK.o \
 	KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
 	RESearch.o Style.o Indicator.o AutoComplete.o
diff --git a/gtk/scintilla.mak b/gtk/scintilla.mak
index cf76f2211..53b441dd7 100644
--- a/gtk/scintilla.mak
+++ b/gtk/scintilla.mak
@@ -150,6 +150,7 @@ LOBJS=\
 	$(DIR_O)\ScintillaBaseL.obj \
 	$(DIR_O)\ScintillaGTKL.obj \
 	$(DIR_O)\Style.obj \
+	$(DIR_O)\StyleContext.obj \
 	$(DIR_O)\UniConversion.obj \
 	$(DIR_O)\ViewStyle.obj \
 	$(LEXOBJS)
@@ -207,7 +208,7 @@ $(DIR_O)\ScintillaGTKS.obj: ScintillaGTK.cxx
 # All lexers depend on this set of headers
 LEX_HEADERS=..\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
  
 $(DIR_O)\AutoComplete.obj: ..\src\AutoComplete.cxx ..\include\Platform.h ..\src\AutoComplete.h
 
@@ -295,6 +296,8 @@ $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Sc
 
 $(DIR_O)\Style.obj: ..\src\Style.cxx ..\include\Platform.h ..\src\Style.h
 
+$(DIR_O)\StyleContext.obj: ..\src\StyleContext.cxx ..\include\Platform.h ..\include\Accessor.h ..\include\PropSet.h ..\src\StyleContext.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
 
diff --git a/vcbuild/SciLexer.dsp b/vcbuild/SciLexer.dsp
index 7adbe615d..55ebcd1b4 100644
--- a/vcbuild/SciLexer.dsp
+++ b/vcbuild/SciLexer.dsp
@@ -226,6 +226,10 @@ SOURCE=..\src\Style.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\StyleContext.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\UniConversion.cxx
 # End Source File
 # Begin Source File
diff --git a/win32/deps.mak b/win32/deps.mak
index 74e4a4421..cd87fb17c 100644
--- a/win32/deps.mak
+++ b/win32/deps.mak
@@ -1,105 +1,110 @@
-ExternalLexer.o: ExternalLexer.cxx ..\include\SciLexer.h \
- ..\include\Platform.h ..\include\PropSet.h ..\include\SString.h \
- ..\include\Accessor.h ..\src\DocumentAccessor.h ..\include\KeyWords.h \
+ExternalLexer.o: ExternalLexer.cxx ../include/SciLexer.h \
+ ../include/Platform.h ../include/PropSet.h ../include/SString.h \
+ ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \
  ExternalLexer.h
-PlatWin.o: PlatWin.cxx ..\include\Platform.h PlatformRes.h \
- ..\src\UniConversion.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\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
-AutoComplete.o: ../src/AutoComplete.cxx ..\include\Platform.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
-ContractionState.o: ../src/ContractionState.cxx ..\include\Platform.h \
- ..\src\ContractionState.h
-Document.o: ../src/Document.cxx ..\include\Platform.h \
- ..\include\Scintilla.h ..\src\SVector.h ..\src\CellBuffer.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\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\LineMarker.h ..\src\Style.h ..\src\ViewStyle.h \
- ..\src\Document.h ..\src\Editor.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 ..\src\KeyMap.h
-KeyWords.o: ../src/KeyWords.cxx ..\include\Platform.h \
- ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
- ..\include\KeyWords.h ..\include\Scintilla.h ..\include\SciLexer.h
-LexAda.o: ../src/LexAda.cxx ..\include\Platform.h ..\include\PropSet.h \
- ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h
-LexAVE.o: ../src/LexAVE.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
-LexCPP.o: ../src/LexCPP.cxx ..\include\Platform.h ..\include\PropSet.h \
- ..\include\SString.h ..\include\Accessor.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 \
- ..\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 \
- ..\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
-LexLua.o: ../src/LexLua.cxx ..\include\Platform.h ..\include\PropSet.h \
- ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.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
-LexPascal.o: ../src/LexPascal.cxx ..\include\Platform.h \
- ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
- ..\include\KeyWords.h ..\include\Scintilla.h ..\include\SciLexer.h
-LexPerl.o: ../src/LexPerl.cxx ..\include\Platform.h \
- ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
- ..\include\KeyWords.h ..\include\Scintilla.h ..\include\SciLexer.h
-LexPython.o: ../src/LexPython.cxx ..\include\Platform.h \
- ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
- ..\include\KeyWords.h ..\include\Scintilla.h ..\include\SciLexer.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
-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
-LexVB.o: ../src/LexVB.cxx ..\include\Platform.h ..\include\PropSet.h \
- ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h
-LineMarker.o: ../src/LineMarker.cxx ..\include\Platform.h \
- ..\include\Scintilla.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
-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\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
-Style.o: ../src/Style.cxx ..\include\Platform.h ..\include\Scintilla.h \
- ..\src\Style.h
-UniConversion.o: ../src/UniConversion.cxx ..\src\UniConversion.h
-ViewStyle.o: ../src/ViewStyle.cxx ..\include\Platform.h \
- ..\include\Scintilla.h ..\src\Indicator.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
+PlatWin.o: PlatWin.cxx ../include/Platform.h PlatformRes.h \
+ ../src/UniConversion.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/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
+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
+ContractionState.o: ../src/ContractionState.cxx ../include/Platform.h \
+ ../src/ContractionState.h
+Document.o: ../src/Document.cxx ../include/Platform.h \
+ ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.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/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/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
+ ../src/Document.h ../src/Editor.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 ../src/KeyMap.h
+KeyWords.o: ../src/KeyWords.cxx ../include/Platform.h \
+ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+LexAda.o: ../src/LexAda.cxx ../include/Platform.h ../include/PropSet.h \
+ ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
+ ../include/Scintilla.h ../include/SciLexer.h
+LexAVE.o: ../src/LexAVE.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
+LexCPP.o: ../src/LexCPP.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 \
+ ../include/SciLexer.h
+LexHTML.o: ../src/LexHTML.cxx ../include/Platform.h \
+ ../include/PropSet.h ../include/SString.h ../include/Accessor.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
+LexLua.o: ../src/LexLua.cxx ../include/Platform.h ../include/PropSet.h \
+ ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
+ ../include/Scintilla.h ../include/SciLexer.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
+LexPascal.o: ../src/LexPascal.cxx ../include/Platform.h \
+ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+LexPerl.o: ../src/LexPerl.cxx ../include/Platform.h \
+ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+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
+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
+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
+LexVB.o: ../src/LexVB.cxx ../include/Platform.h ../include/PropSet.h \
+ ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
+ ../include/Scintilla.h ../include/SciLexer.h
+LineMarker.o: ../src/LineMarker.cxx ../include/Platform.h \
+ ../include/Scintilla.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
+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/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
+Style.o: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \
+ ../src/Style.h
+StyleContext.o: ../src/StyleContext.cxx ../include/Platform.h \
+ ../include/PropSet.h ../include/SString.h ../include/Accessor.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/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 8e11f1d4c..e5bc921d0 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -52,7 +52,7 @@ LOBJS	= ScintillaWinL.o ScintillaBaseL.o Editor.o Document.o \
 	ContractionState.o CellBuffer.o CallTip.o \
 	ScintRes.o PlatWin.o KeyMap.o Indicator.o LineMarker.o RESearch.o \
 	Style.o ViewStyle.o AutoComplete.o UniConversion.o KeyWords.o \
-	DocumentAccessor.o PropSet.o ExternalLexer.o $(LEXOBJS)
+	DocumentAccessor.o PropSet.o ExternalLexer.o StyleContext.o $(LEXOBJS)
 $(LEXCOMPONENT): $(LOBJS)
 	$(DLLWRAP) --target i386-mingw32 -o $@ $(LOBJS) $(LDFLAGS) -s --relocatable
 
diff --git a/win32/objs.mak b/win32/objs.mak
deleted file mode 100644
index 57bb8b8cf..000000000
--- a/win32/objs.mak
+++ /dev/null
@@ -1,128 +0,0 @@
-# Make include file for Scintilla on Windows
-# Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-# The License.txt file describes the conditions under which this software may be distributed.
-# This file is included by both the Borland and Microsoft makefiles to define how to build
-# all the objects.
-# The variables DIR_O, CC, INCLUDEDIRS, and CXXFLAGS must be defined before inclusion.
-
-$(DIR_O)\AutoComplete.obj: ..\src\AutoComplete.cxx ..\include\Platform.h ..\src\AutoComplete.h
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
-
-$(DIR_O)\CallTip.obj: ..\src\CallTip.cxx ..\include\Platform.h ..\src\CallTip.h
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
-
-$(DIR_O)\CellBuffer.obj: ..\src\CellBuffer.cxx ..\include\Platform.h ..\include\Scintilla.h ..\src\CellBuffer.h
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
-
-$(DIR_O)\ContractionState.obj: ..\src\ContractionState.cxx ..\include\Platform.h ..\src\ContractionState.h
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
-
-$(DIR_O)\Document.obj: ..\src\Document.cxx ..\include\Platform.h ..\include\Scintilla.h ..\src\CellBuffer.h \
- ..\src\Document.h
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
- 
-$(DIR_O)\DocumentAccessor.obj: ..\src\DocumentAccessor.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\src\DocumentAccessor.h ..\include\Scintilla.h
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
-
-$(DIR_O)\Editor.obj: ..\src\Editor.cxx ..\include\Platform.h ..\include\Scintilla.h ..\src\ContractionState.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
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
- 
-$(DIR_O)\Indicator.obj: ..\src\Indicator.cxx ..\include\Platform.h ..\include\Scintilla.h ..\src\Indicator.h
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
-
-$(DIR_O)\KeyMap.obj: ..\src\KeyMap.cxx ..\include\Platform.h ..\include\Scintilla.h ..\src\KeyMap.h
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
-
-$(DIR_O)\KeyWords.obj: ..\src\KeyWords.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h 
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
- 
-$(DIR_O)\LexCPP.obj: ..\src\LexCPP.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h 
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
- 
-$(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h 
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
- 
-$(DIR_O)\LexLua.obj: ..\src\LexLua.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h 
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
- 
-$(DIR_O)\LexOthers.obj: ..\src\LexOthers.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h 
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
- 
-$(DIR_O)\LexPerl.obj: ..\src\LexPerl.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h 
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
- 
-$(DIR_O)\LexPython.obj: ..\src\LexPython.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h 
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
-
-$(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h 
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
- 
-$(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h 
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
- 
-$(DIR_O)\LexVB.obj: ..\src\LexVB.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h 
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
- 
-$(DIR_O)\LineMarker.obj: ..\src\LineMarker.cxx ..\include\Platform.h ..\include\Scintilla.h ..\src\LineMarker.h
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
-
-$(DIR_O)\PlatWin.obj: PlatWin.cxx ..\include\Platform.h PlatformRes.h ..\src\UniConversion.h
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ $(@B).cxx
-
-$(DIR_O)\PropSet.obj: ..\src\PropSet.cxx ..\include\Platform.h ..\include\PropSet.h
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
-
-$(DIR_O)\ScintillaBase.obj: ..\src\ScintillaBase.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\ViewStyle.h ..\src\AutoComplete.h ..\src\Document.h ..\src\Editor.h \
- ..\src\ScintillaBase.h
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\ScintillaBase.cxx
-	
-$(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\Accessor.h ..\src\DocumentAccessor.h ..\include\KeyWords.h
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -DSCI_LEXER -c $(NAMEFLAG)$@ ..\src\ScintillaBase.cxx
-
-$(DIR_O)\ScintillaWin.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
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ $(@B).cxx
-
-$(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\Accessor.h ..\include\KeyWords.h ..\src\UniConversion.h
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -DSCI_LEXER -c $(NAMEFLAG)$@ ScintillaWin.cxx
-
-$(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
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -DSTATIC_BUILD -c $(NAMEFLAG)$@ ScintillaWin.cxx
-
-$(DIR_O)\Style.obj: ..\src\Style.cxx ..\include\Platform.h ..\src\Style.h
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
-
-$(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
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
-
-$(DIR_O)\UniConversion.obj: ..\src\UniConversion.cxx ..\src\UniConversion.h
- 	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
-
-$(DIR_O)\WindowAccessor.obj: ..\src\WindowAccessor.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\WindowAccessor.h ..\include\Scintilla.h
-	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index fd2f20854..f7ef689cf 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -140,6 +140,7 @@ LOBJS=\
 	$(DIR_O)\ScintillaBaseL.obj \
 	$(DIR_O)\ScintillaWinL.obj \
 	$(DIR_O)\Style.obj \
+	$(DIR_O)\StyleContext.obj \
 	$(DIR_O)\UniConversion.obj \
 	$(DIR_O)\ViewStyle.obj \
 	$(LEXOBJS)
@@ -191,7 +192,7 @@ $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx
 # All lexers depend on this set of headers
 LEX_HEADERS=..\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
 
 $(DIR_O)\AutoComplete.obj: ..\src\AutoComplete.cxx ..\include\Platform.h ..\src\AutoComplete.h