Build files that reflect the new lexer directories and added files.

10 files changed, 1017 insertions, 992 deletions

diff --git a/cocoa/Framework.mk b/cocoa/Framework.mk
index 06a29735b..413ebc76b 100644
--- a/cocoa/Framework.mk
+++ b/cocoa/Framework.mk
@@ -1,49 +1,51 @@
 ### start defines ###
+include common.mk
 
-ARCH=-arch i386
-CC=gcc -x c++ $(ARCH)
-CO=gcc -x objective-c++ $(ARCH)
+INST_NAME=-install_name \
+	@executable_path/../Frameworks/Sci.framework/Versions/A/Sci
 
-INST_NAME=-install_name @executable_path/../Frameworks/Sci.framework/Versions/A/Sci
 LD=gcc $(ARCH) -dynamiclib -framework Cocoa $(INST_NAME)
 
-gDEFs=-DSCI_NAMESPACE -DSCI_LEXER
-
-INCS=-I../src/ -I../include/ -I.
-CCX=$(CC) $(gDEFs) $(INCS)
-CCO=$(CO) $(gDEFs) $(INCS)
-
-BLD=build/framebuild
-
-SCI_LEXERS=LexAPDL.o LexASY.o LexAU3.o LexAVE.o LexAbaqus.o LexAda.o LexAsm.o LexAsn1.o \
-	LexBaan.o LexBash.o LexBasic.o LexBullant.o LexCLW.o LexCOBOL.o LexCPP.o LexCSS.o \
-	LexCaml.o LexCmake.o LexConf.o LexCrontab.o LexCsound.o LexD.o LexEScript.o LexEiffel.o \
-	LexErlang.o LexFlagship.o LexForth.o LexFortran.o LexGAP.o LexGui4Cli.o LexHTML.o \
-	LexHaskell.o LexInno.o LexKix.o LexLisp.o LexLout.o LexLua.o LexMMIXAL.o LexMPT.o \
-	LexMSSQL.o LexMagik.o LexMarkdown.o LexMatlab.o LexMetapost.o LexMySQL.o LexNimrod.o \
-	LexNsis.o LexOpal.o LexOthers.o LexPB.o LexPLM.o LexPOV.o LexPS.o LexPascal.o LexPerl.o \
-	LexPowerPro.o LexPowerShell.o LexProgress.o LexPython.o LexR.o LexRebol.o LexRuby.o \
-	LexSML.o LexSQL.o LexScriptol.o LexSmalltalk.o LexSorcus.o LexSpecman.o LexSpice.o \
-	LexTACL.o LexTADS3.o LexTAL.o LexTCL.o LexTeX.o LexVB.o LexVHDL.o LexVerilog.o LexYAML.o
-
-SCI_OBJ=AutoComplete.o CallTip.o CellBuffer.o CharClassify.o ContractionState.o Decoration.o \
-	Document.o DocumentAccessor.o Editor.o ExternalLexer.o Indicator.o KeyMap.o KeyWords.o \
-	LineMarker.o PerLine.o PositionCache.o PropSet.o RESearch.o RunStyles.o ScintillaBase.o \
-	Style.o StyleContext.o UniConversion.o ViewStyle.o WindowAccessor.o XPM.o Selection.o $(SCI_LEXERS)
+SCI_LEXERS=LexAPDL.o LexASY.o LexAU3.o LexAVE.o LexAbaqus.o LexAda.o \
+	LexAsm.o LexAsn1.o LexBaan.o LexBash.o LexBasic.o LexBullant.o LexCLW.o \
+	LexCOBOL.o LexCPP.o LexCSS.o LexCaml.o LexCmake.o LexConf.o LexCrontab.o \
+	LexCsound.o LexD.o LexEScript.o LexEiffel.o LexErlang.o LexFlagship.o \
+	LexForth.o LexFortran.o LexGAP.o LexGui4Cli.o LexHTML.o LexHaskell.o \
+	LexInno.o LexKix.o LexLisp.o LexLout.o LexLua.o LexMMIXAL.o LexMPT.o \
+	LexMSSQL.o LexMagik.o LexMarkdown.o LexMatlab.o LexMetapost.o LexMySQL.o \
+	LexNimrod.o LexNsis.o LexOpal.o LexOthers.o LexPB.o LexPLM.o LexPOV.o \
+	LexPS.o LexPascal.o LexPerl.o LexPowerPro.o LexPowerShell.o LexProgress.o \
+	LexPython.o LexR.o LexRebol.o LexRuby.o LexSML.o LexSQL.o LexScriptol.o \
+	LexSmalltalk.o LexSorcus.o LexSpecman.o LexSpice.o LexTACL.o LexTADS3.o \
+	LexTAL.o LexTCL.o LexTeX.o LexVB.o LexVHDL.o LexVerilog.o LexYAML.o \
+	LexerBase.o LexerModule.o LexerSimple.o Accessor.o
+
+SCI_OBJ=AutoComplete.o CallTip.o CellBuffer.o CharClassify.o \
+	ContractionState.o Decoration.o Document.o Editor.o \
+	ExternalLexer.o Indicator.o KeyMap.o LineMarker.o PerLine.o \
+	PositionCache.o PropSetSimple.o RESearch.o RunStyles.o ScintillaBase.o Style.o \
+	StyleContext.o UniConversion.o ViewStyle.o XPM.o WordList.o \
+	Selection.o CharacterSet.o Catalogue.o $(SCI_LEXERS)	
+
+WAH_OBJ=DocumentAccessor.o KeyWords.o WindowAccessor.o
+
 COC_OBJ=PlatCocoa.o ScintillaCocoa.o ScintillaView.o InfoBar.o
 
-OBJ=$(SCI_OBJ) $(COC_OBJ)
-OBJS=$(addprefix $(BLD)/,$(OBJ))
+OBJ=$(SCI_OBJ) $(UNUSED_OBJ) $(COC_OBJ)
+OBJS=$(addprefix $(FRM_BLD)/,$(OBJ))
 
 TARG=$(APP)/Versions/A/Sci
-APP=$(BLD)/Sci.framework
+APP=$(FRM_BLD)/Sci.framework
 ### end defines ###
 
 ### start targets ###
 
-all: $(BLD) $(TARG)
+all: $(FRM_BLD) $(TARG)
+
+cleanfrm:
+	-rm -rf $(FRM_BLD)
 
-$(APP): $(BLD)
+$(APP): $(FRM_BLD)
 	-rm -rf $(APP)
 	-mkdir $(APP)
 	-mkdir $(APP)/Versions
@@ -64,22 +66,15 @@ $(TARG) : $(OBJS) $(APP)
 	$(LD) $(OBJS) $(gDEFs) -o $(TARG) -lstdc++
 	-ln `pwd`/$(TARG) `pwd`/$(APP)/Sci
 
-$(BLD):
-	-mkdir build
+$(FRM_BLD):
 	-mkdir $(BLD)
-
-clean:
-	-rm -rf $(BLD)
-
-$(BLD)/%.o : ../src/%.cxx
-	$(CCX) -c ../src/$< -o $@
-
-$(BLD)/%.o : %.mm
-	$(CCO) -c $< -o $@
+	-mkdir $(FRM_BLD)
 
 ### get around to filling out the real dependencies later ###
-$(BLD)/AutoComplete.o : ../src/AutoComplete.cxx ../src/AutoComplete.h ../include/Platform.h
+#$(FRM_BLD)/AutoComplete.o : ../src/AutoComplete.cxx ../src/AutoComplete.h \
+#	../include/Platform.h
 
-$(BLD)/CallTip.o : ../src/CallTip.cxx ../src/CallTip.h ../include/Platform.h
+#$(FRM_BLD)/CallTip.o : ../src/CallTip.cxx ../src/CallTip.h \
+#	../include/Platform.h
 
 ### end targets ###
\ No newline at end of file
diff --git a/cocoa/SciTest.mk b/cocoa/SciTest.mk
index cd922e1b5..1cd075307 100644
--- a/cocoa/SciTest.mk
+++ b/cocoa/SciTest.mk
@@ -1,25 +1,14 @@
 ### start defines ###
-NAME=Editor
+include common.mk
 
-ARCH=-arch i386
-CC=gcc -x c++ $(ARCH)
-CO=gcc -x objective-c++ $(ARCH)
-LD=gcc $(ARCH) -framework Cocoa
-
-gDEFs=-DSCI_NAMESPACE -DSCI_LEXER
+NAME=Demo
 
-INCS=-I../src/ -I../include/ -I.
-CCX=$(CC) $(gDEFs) $(INCS)
-CCO=$(CO) $(gDEFs) $(INCS)
+LD=gcc $(ARCH) -framework Cocoa
 
-BLD=build/SciAppBuild
 TARG=$(APP)/Contents/MacOS/$(NAME)
-APP=$(BLD)/$(NAME).app
-
-all: $(BLD) $(TARG)
+APP=$(APP_BLD)/$(NAME).app
 
-clean:
-	-rm -rf $(BLD)
+all: $(APP_BLD) $(TARG)
 
 $(APP):
 	-rm -rf $(APP)
@@ -38,17 +27,10 @@ $(APP):
 	-cp ScintillaTest/TestData.sql $(APP)/Contents/Resources/
 	-make -f Framework.mk all
 
-$(TARG) : $(BLD)/main.o $(BLD)/AppController.o $(APP)
-	-cp -R build/framebuild/Sci.framework $(APP)/Contents/Frameworks/
-	$(LD) $(BLD)/main.o $(BLD)/AppController.o $(APP)/Contents/Frameworks/Sci.framework/Sci -o $(TARG) -lstdc++
+$(TARG) : $(APP_BLD)/main.o $(APP_BLD)/AppController.o $(APP)
+	-cp -R $(FRM_BLD)/Sci.framework $(APP)/Contents/Frameworks/
+	$(LD) $(APP_BLD)/main.o $(APP_BLD)/AppController.o $(APP)/Contents/Frameworks/Sci.framework/Sci -o $(TARG) -lstdc++
 
-
-$(BLD) :
-	-mkdir build
+$(APP_BLD) :
 	-mkdir $(BLD)
-
-$(BLD)/%.o : ScintillaTest/%.mm
-	$(CCO) -c $< -o $@
-
-$(BLD)/%.o : ScintillaTest/%.m
-	$(CCO) -c $< -o $@
+	-mkdir $(APP_BLD)
diff --git a/cocoa/common.mk b/cocoa/common.mk
new file mode 100644
index 000000000..beb3b0f46
--- /dev/null
+++ b/cocoa/common.mk
@@ -0,0 +1,57 @@
+### shared variables and targets between Framework.mk and SciTest.mk ###
+
+# build directories
+BLD=build
+APP_BLD=$(BLD)/Application
+FRM_BLD=$(BLD)/Framework
+
+ifdef DBG
+CFLAGS=-g -O0
+else
+CFLAGS=-Os
+endif
+
+# compiler and compiler options
+ARCH=-arch i386 $(CFLAGS)
+CC=gcc -x c++ $(ARCH)
+CO=gcc -x objective-c++ $(ARCH)
+CCX=$(CC) $(gDEFs) $(INCS)
+CCO=$(CO) $(gDEFs) $(INCS)
+
+# include directories and global #define
+gDEFs=-DSCI_NAMESPACE -DSCI_LEXER
+
+# source directories
+SRC_DIRS=../src ./ScintillaFramework ./ScintillaTest ./ \
+	../lexers ../lexlib
+
+INC_DIRS=$(SRC_DIRS) ../include
+
+INCS=$(addprefix -I,$(INC_DIRS))
+
+vpath %.m $(SRC_DIRS)
+vpath %.mm $(SRC_DIRS)
+vpath %.cpp $(SRC_DIRS)
+vpath %.cxx $(SRC_DIRS)
+vpath %.c $(SRC_DIRS)
+vpath %.h $(INC_DIRS)
+
+# clean everything
+clean:
+	-rm -rf $(BLD)
+
+# build application objective-c++ files
+$(APP_BLD)/%.o : %.mm
+	$(CCO) -c $< -o $@
+
+# build application objective-c files
+$(APP_BLD)/%.o : %.m
+	$(CCO) -c $< -o $@
+
+# build framework c++ files
+$(FRM_BLD)/%.o : %.cxx
+	$(CCX) -c $< -o $@
+
+# build framework objective-c++ files
+$(FRM_BLD)/%.o : %.mm
+	$(CCO) -c $< -o $@
\ No newline at end of file
diff --git a/gtk/deps.mak b/gtk/deps.mak
index 226705b21..6f86a62cd 100644
--- a/gtk/deps.mak
+++ b/gtk/deps.mak
@@ -3,20 +3,24 @@ PlatGTK.o: PlatGTK.cxx \
  ../src/UniConversion.h ../src/XPM.h Converter.h
 ScintillaGTK.o: ScintillaGTK.cxx \
  ../include/Scintilla.h ../include/ScintillaWidget.h \
- ../include/SciLexer.h ../include/PropSet.h ../src/PropSetSimple.h \
- ../include/Accessor.h ../include/KeyWords.h ../src/SVector.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 \
- ../src/Style.h ../src/AutoComplete.h ../src/ViewStyle.h \
- ../src/Decoration.h ../src/CharClassify.h ../src/Document.h \
- ../src/Selection.h ../src/PositionCache.h ../src/Editor.h \
- ../src/ScintillaBase.h ../src/UniConversion.h scintilla-marshal.h \
- ../src/ExternalLexer.h Converter.h
+ ../include/SciLexer.h ../lexlib/PropSetSimple.h ../lexlib/Accessor.h \
+ ../src/SVector.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 ../src/Style.h ../src/AutoComplete.h \
+ ../src/ViewStyle.h ../src/Decoration.h ../src/CharClassify.h \
+ ../src/Document.h ../src/Selection.h ../src/PositionCache.h \
+ ../src/Editor.h ../src/ScintillaBase.h ../src/UniConversion.h \
+ scintilla-marshal.h ../src/ExternalLexer.h Converter.h
 AutoComplete.o: ../src/AutoComplete.cxx ../include/Platform.h \
- ../src/CharClassify.h ../src/AutoComplete.h
+ ../lexlib/CharacterSet.h ../src/AutoComplete.h
 CallTip.o: ../src/CallTip.cxx ../include/Platform.h \
  ../include/Scintilla.h ../src/CallTip.h
+Catalogue.o: ../src/Catalogue.cxx ../include/ILexer.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 ../src/Catalogue.h
 CellBuffer.o: ../src/CellBuffer.cxx ../include/Platform.h \
  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
  ../src/CellBuffer.h
@@ -27,271 +31,29 @@ ContractionState.o: ../src/ContractionState.cxx ../include/Platform.h \
 Decoration.o: ../src/Decoration.cxx ../include/Platform.h \
  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
  ../src/RunStyles.h ../src/Decoration.h
-DocumentAccessor.o: ../src/DocumentAccessor.cxx ../include/Platform.h \
- ../include/PropSet.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
-Document.o: ../src/Document.cxx ../include/Platform.h \
+Document.o: ../src/Document.cxx ../include/Platform.h ../include/ILexer.h \
  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
  ../src/RunStyles.h ../src/CellBuffer.h ../src/PerLine.h \
- ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \
- ../src/RESearch.h
-Editor.o: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.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 ../src/CharClassify.h ../src/Decoration.h \
+ ../src/CharClassify.h ../lexlib/CharacterSet.h ../src/Decoration.h \
+ ../src/Document.h ../src/RESearch.h ../src/UniConversion.h
+Editor.o: ../src/Editor.cxx ../include/Platform.h ../include/ILexer.h \
+ ../include/Scintilla.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 ../src/CharClassify.h \
+ ../src/Decoration.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
  ../src/Document.h ../src/Selection.h ../src/PositionCache.h \
  ../src/Editor.h
 ExternalLexer.o: ../src/ExternalLexer.cxx ../include/Platform.h \
- ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \
- ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \
- ../src/ExternalLexer.h
+ ../include/ILexer.h ../include/Scintilla.h ../include/SciLexer.h \
+ ../lexlib/LexAccessor.h ../lexlib/Accessor.h ../lexlib/WordList.h \
+ ../lexlib/LexerModule.h ../src/Catalogue.h ../src/ExternalLexer.h
 Indicator.o: ../src/Indicator.cxx ../include/Platform.h \
  ../include/Scintilla.h ../src/Indicator.h
+KW.o: ../src/KW.cxx ../include/Platform.h ../lexlib/PropSetSimple.h \
+ ../lexlib/Accessor.h ../include/Scintilla.h ../include/SciLexer.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/Accessor.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexAbaqus.o: ../src/LexAbaqus.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.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/KeyWords.h \
- ../include/SciLexer.h
-LexAPDL.o: ../src/LexAPDL.cxx ../include/Platform.h ../include/PropSet.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/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/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexASY.o: ../src/LexASY.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h ../src/CharacterSet.h
-LexAU3.o: ../src/LexAU3.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexAVE.o: ../src/LexAVE.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexBaan.o: ../src/LexBaan.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexBash.o: ../src/LexBash.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h ../src/CharacterSet.h
-LexBasic.o: ../src/LexBasic.cxx ../include/Platform.h \
- ../include/PropSet.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/Accessor.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexCaml.o: ../src/LexCaml.cxx ../include/Platform.h ../include/PropSet.h \
- ../src/PropSetSimple.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/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexCmake.o: ../src/LexCmake.cxx ../include/Platform.h \
- ../src/CharClassify.h ../include/PropSet.h ../include/Accessor.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexCOBOL.o: ../src/LexCOBOL.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h
-LexConf.o: ../src/LexConf.cxx ../include/Platform.h ../include/PropSet.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/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h ../src/CharacterSet.h
-LexCrontab.o: ../src/LexCrontab.cxx ../include/Platform.h \
- ../include/PropSet.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/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/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/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/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexErlang.o: ../src/LexErlang.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexEScript.o: ../src/LexEScript.cxx ../include/Platform.h \
- ../include/PropSet.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/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/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexFortran.o: ../src/LexFortran.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexGAP.o: ../src/LexGAP.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexGui4Cli.o: ../src/LexGui4Cli.cxx ../include/Platform.h \
- ../include/PropSet.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 ../src/PropSetSimple.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/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h ../src/CharacterSet.h
-LexInno.o: ../src/LexInno.cxx ../include/Platform.h ../src/CharClassify.h \
- ../include/PropSet.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/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/Accessor.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h ../src/StyleContext.h
-LexLout.o: ../src/LexLout.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexLua.o: ../src/LexLua.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h ../src/CharacterSet.h
-LexMagik.o: ../src/LexMagik.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexMarkdown.o: ../src/LexMarkdown.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexMatlab.o: ../src/LexMatlab.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexMetapost.o: ../src/LexMetapost.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h
-LexMMIXAL.o: ../src/LexMMIXAL.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexMPT.o: ../src/LexMPT.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h
-LexMSSQL.o: ../src/LexMSSQL.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexMySQL.o: ../src/LexMySQL.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexNimrod.o: ../src/LexNimrod.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexNsis.o: ../src/LexNsis.cxx ../include/Platform.h ../src/CharClassify.h \
- ../include/PropSet.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/Accessor.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h ../src/StyleContext.h
-LexOthers.o: ../src/LexOthers.cxx ../include/Platform.h \
- ../src/CharClassify.h ../include/PropSet.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/Accessor.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h \
- ../src/CharacterSet.h
-LexPB.o: ../src/LexPB.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexPerl.o: ../src/LexPerl.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h ../src/CharacterSet.h
-LexPLM.o: ../src/LexPLM.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h ../src/StyleContext.h
-LexPOV.o: ../src/LexPOV.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexPowerPro.o: ../src/LexPowerPro.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \
- ../src/CharacterSet.h
-LexPowerShell.o: ../src/LexPowerShell.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexProgress.o: ../src/LexProgress.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexPS.o: ../src/LexPS.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexPython.o: ../src/LexPython.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexR.o: ../src/LexR.cxx ../include/Platform.h ../include/PropSet.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/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/Accessor.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h
-LexScriptol.o: ../src/LexScriptol.cxx ../include/Platform.h \
- ../include/PropSet.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/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexSML.o: ../src/LexSML.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexSorcus.o: ../src/LexSorcus.cxx ../include/Platform.h \
- ../include/PropSet.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/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/KeyWords.h ../include/SciLexer.h
-LexSQL.o: ../src/LexSQL.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexTACL.o: ../src/LexTACL.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h ../src/StyleContext.h
-LexTADS3.o: ../src/LexTADS3.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexTAL.o: ../src/LexTAL.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h ../src/StyleContext.h
-LexTCL.o: ../src/LexTCL.cxx ../include/Platform.h ../include/PropSet.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/Accessor.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h ../src/StyleContext.h
-LexVB.o: ../src/LexVB.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexVerilog.o: ../src/LexVerilog.cxx ../include/Platform.h \
- ../include/PropSet.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/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/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
 LineMarker.o: ../src/LineMarker.cxx ../include/Platform.h \
  ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h
 PerLine.o: ../src/PerLine.cxx ../include/Platform.h \
@@ -302,28 +64,24 @@ PositionCache.o: ../src/PositionCache.cxx ../include/Platform.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 ../src/CharClassify.h \
- ../src/Decoration.h ../src/Document.h ../src/Selection.h \
- ../src/PositionCache.h
-PropSet.o: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \
- ../src/PropSetSimple.h
+ ../src/Decoration.h ../include/ILexer.h ../src/Document.h \
+ ../src/Selection.h ../src/PositionCache.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 ../src/PropSetSimple.h \
- ../include/SciLexer.h ../include/Accessor.h ../src/DocumentAccessor.h \
- ../include/KeyWords.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 ../src/Style.h ../src/ViewStyle.h \
+ ../include/ILexer.h ../include/Scintilla.h ../lexlib/PropSetSimple.h \
+ ../include/SciLexer.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
+ ../lexlib/LexerModule.h ../src/Catalogue.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 ../src/Style.h ../src/ViewStyle.h \
  ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \
  ../src/Document.h ../src/Selection.h ../src/PositionCache.h \
  ../src/Editor.h ../src/ScintillaBase.h
 Selection.o: ../src/Selection.cxx ../include/Platform.h \
  ../include/Scintilla.h ../src/Selection.h
-StyleContext.o: ../src/StyleContext.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h
 Style.o: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \
  ../src/Style.h
 UniConversion.o: ../src/UniConversion.cxx ../src/UniConversion.h
@@ -331,7 +89,4 @@ ViewStyle.o: ../src/ViewStyle.cxx ../include/Platform.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/Accessor.h ../include/WindowAccessor.h \
- ../include/Scintilla.h
 XPM.o: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h
diff --git a/gtk/makefile b/gtk/makefile
index f0bbc53ad..9a7034b62 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -25,10 +25,10 @@ endif
 
 COMPLIB=../bin/scintilla.a
 
-vpath %.h ../src ../include
-vpath %.cxx ../src
+vpath %.h ../src ../include ../lexlib
+vpath %.cxx ../src ../lexlib ../lexers
 
-INCLUDEDIRS=-I ../include -I ../src
+INCLUDEDIRS=-I ../include -I ../src -I ../lexlib
 CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS)
 
 ifdef NOTHREADS
@@ -51,7 +51,22 @@ MARSHALLER=scintilla-marshal.o
 .c.o:
 	$(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<
 
-LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../src/Lex*.cxx))))
+#++Autogenerated -- run src/LexGen.py to regenerate
+#**LEXOBJS=\\\n\(\*.o \)
+LEXOBJS=\
+LexAbaqus.o LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexASY.o LexAU3.o LexAVE.o \
+LexBaan.o LexBash.o LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexCmake.o \
+LexCOBOL.o LexConf.o LexCPP.o LexCrontab.o LexCsound.o LexCSS.o LexD.o \
+LexEiffel.o LexErlang.o LexEScript.o LexFlagship.o LexForth.o LexFortran.o \
+LexGAP.o LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o \
+LexLout.o LexLua.o LexMagik.o LexMarkdown.o LexMatlab.o LexMetapost.o \
+LexMMIXAL.o LexMPT.o LexMSSQL.o LexMySQL.o LexNimrod.o LexNsis.o LexOpal.o \
+LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPLM.o LexPOV.o LexPowerPro.o \
+LexPowerShell.o LexProgress.o LexPS.o LexPython.o LexR.o LexRebol.o LexRuby.o \
+LexScriptol.o LexSmalltalk.o LexSML.o LexSorcus.o LexSpecman.o LexSpice.o \
+LexSQL.o LexTACL.o LexTADS3.o LexTAL.o LexTCL.o LexTeX.o LexVB.o LexVerilog.o \
+LexVHDL.o LexYAML.o
+#--Autogenerated -- end of automatically generated section
 
 all: $(COMPLIB)
 
@@ -61,9 +76,9 @@ clean:
 deps:
 	$(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
 
-$(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o \
-	CharClassify.o Decoration.o Document.o PerLine.o CallTip.o \
-	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \
+$(COMPLIB): Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o StyleContext.o WordList.o \
+	CharClassify.o Decoration.o Document.o PerLine.o Catalogue.o CallTip.o \
+	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSetSimple.o PlatGTK.o \
 	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
 	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
 	$(MARSHALLER) $(LEXOBJS)
diff --git a/vcbuild/SciLexer.dsp b/vcbuild/SciLexer.dsp
index 847989169..7f390d8c8 100644
--- a/vcbuild/SciLexer.dsp
+++ b/vcbuild/SciLexer.dsp
@@ -7,19 +7,19 @@
 CFG=SciLexer - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "SciLexer.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "SciLexer.mak" CFG="SciLexer - Win32 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "SciLexer - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "SciLexer - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
+!MESSAGE
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SciLexer_EXPORTS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /GX /O1 /I "..\include" /I "..\src" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SCI_LEXER" /D "_CRT_SECURE_NO_WARNINGS" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /GX /O1 /I "..\include" /I "..\src" /I "..\lexlib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SCI_LEXER" /D "_CRT_SECURE_NO_WARNINGS" /FD /c
 # SUBTRACT CPP /Fr /YX /Yc /Yu
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SciLexer_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\src" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SCI_LEXER" /D "_CRT_SECURE_NO_WARNINGS" /FR /FD /GZ /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\src" /I "..\lexlib" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SCI_LEXER" /D "_CRT_SECURE_NO_WARNINGS" /FR /FD /GZ /c
 # SUBTRACT CPP /YX /Yc /Yu
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -83,7 +83,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib comctl32.lib /nologo /dll /debug /machine:I386
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
@@ -94,6 +94,22 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
+SOURCE=..\lexlib\Accessor.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\lexlib\LexerBase.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\lexlib\LexerSimple.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\lexlib\LexerModule.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\AutoComplete.cxx
 # End Source File
 # Begin Source File
@@ -102,10 +118,18 @@ SOURCE=..\src\CallTip.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\Catalogue.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\CellBuffer.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\lexlib\CharacterSet.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\CharClassify.cxx
 # End Source File
 # Begin Source File
@@ -122,10 +146,6 @@ SOURCE=..\src\Document.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\DocumentAccessor.cxx
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\Editor.cxx
 # End Source File
 # Begin Source File
@@ -142,319 +162,315 @@ SOURCE=..\src\KeyMap.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\KeyWords.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\LexAbaqus.cxx
+SOURCE=..\lexers\LexAbaqus.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexAda.cxx
+SOURCE=..\lexers\LexAda.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexAPDL.cxx
+SOURCE=..\lexers\LexAPDL.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexAsm.cxx
+SOURCE=..\lexers\LexAsm.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexAsn1.cxx
+SOURCE=..\lexers\LexAsn1.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexASY.cxx
+SOURCE=..\lexers\LexASY.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexAU3.cxx
+SOURCE=..\lexers\LexAU3.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexAVE.cxx
+SOURCE=..\lexers\LexAVE.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexBaan.cxx
+SOURCE=..\lexers\LexBaan.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexBash.cxx
+SOURCE=..\lexers\LexBash.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexBasic.cxx
+SOURCE=..\lexers\LexBasic.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexBullant.cxx
+SOURCE=..\lexers\LexBullant.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexCaml.cxx
+SOURCE=..\lexers\LexCaml.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexCLW.cxx
+SOURCE=..\lexers\LexCLW.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexCmake.cxx
+SOURCE=..\lexers\LexCmake.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexCOBOL.cxx
+SOURCE=..\lexers\LexCOBOL.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexConf.cxx
+SOURCE=..\lexers\LexConf.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexCPP.cxx
+SOURCE=..\lexers\LexCPP.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexCrontab.cxx
+SOURCE=..\lexers\LexCrontab.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexCsound.cxx
+SOURCE=..\lexers\LexCsound.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexCSS.cxx
+SOURCE=..\lexers\LexCSS.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexD.cxx
+SOURCE=..\lexers\LexD.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexEiffel.cxx
+SOURCE=..\lexers\LexEiffel.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexErlang.cxx
+SOURCE=..\lexers\LexErlang.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexEScript.cxx
+SOURCE=..\lexers\LexEScript.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexFlagship.cxx
+SOURCE=..\lexers\LexFlagship.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexForth.cxx
+SOURCE=..\lexers\LexForth.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexFortran.cxx
+SOURCE=..\lexers\LexFortran.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexGAP.cxx
+SOURCE=..\lexers\LexGAP.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexGui4Cli.cxx
+SOURCE=..\lexers\LexGui4Cli.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexHaskell.cxx
+SOURCE=..\lexers\LexHaskell.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexHTML.cxx
+SOURCE=..\lexers\LexHTML.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexInno.cxx
+SOURCE=..\lexers\LexInno.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexKix.cxx
+SOURCE=..\lexers\LexKix.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexLisp.cxx
+SOURCE=..\lexers\LexLisp.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexLout.cxx
+SOURCE=..\lexers\LexLout.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexLua.cxx
+SOURCE=..\lexers\LexLua.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexMagik.cxx
+SOURCE=..\lexers\LexMagik.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexMarkdown.cxx
+SOURCE=..\lexers\LexMarkdown.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexMatlab.cxx
+SOURCE=..\lexers\LexMatlab.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexMetapost.cxx
+SOURCE=..\lexers\LexMetapost.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexMMIXAL.cxx
+SOURCE=..\lexers\LexMMIXAL.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexMPT.cxx
+SOURCE=..\lexers\LexMPT.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexMSSQL.cxx
+SOURCE=..\lexers\LexMSSQL.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexMySQL.cxx
+SOURCE=..\lexers\LexMySQL.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexNimrod.cxx
+SOURCE=..\lexers\LexNimrod.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexNsis.cxx
+SOURCE=..\lexers\LexNsis.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexOpal.cxx
+SOURCE=..\lexers\LexOpal.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexOthers.cxx
+SOURCE=..\lexers\LexOthers.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexPascal.cxx
+SOURCE=..\lexers\LexPascal.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexPB.cxx
+SOURCE=..\lexers\LexPB.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexPerl.cxx
+SOURCE=..\lexers\LexPerl.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexPLM.cxx
+SOURCE=..\lexers\LexPLM.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexPOV.cxx
+SOURCE=..\lexers\LexPOV.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexPowerPro.cxx
+SOURCE=..\lexers\LexPowerPro.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexPowerShell.cxx
+SOURCE=..\lexers\LexPowerShell.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexProgress.cxx
+SOURCE=..\lexers\LexProgress.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexPS.cxx
+SOURCE=..\lexers\LexPS.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexPython.cxx
+SOURCE=..\lexers\LexPython.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexR.cxx
+SOURCE=..\lexers\LexR.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexRebol.cxx
+SOURCE=..\lexers\LexRebol.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexRuby.cxx
+SOURCE=..\lexers\LexRuby.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexScriptol.cxx
+SOURCE=..\lexers\LexScriptol.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexSmalltalk.cxx
+SOURCE=..\lexers\LexSmalltalk.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexSML.cxx
+SOURCE=..\lexers\LexSML.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexSorcus.cxx
+SOURCE=..\lexers\LexSorcus.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexSpecman.cxx
+SOURCE=..\lexers\LexSpecman.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexSpice.cxx
+SOURCE=..\lexers\LexSpice.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexSQL.cxx
+SOURCE=..\lexers\LexSQL.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexTACL.cxx
+SOURCE=..\lexers\LexTACL.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexTADS3.cxx
+SOURCE=..\lexers\LexTADS3.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexTAL.cxx
+SOURCE=..\lexers\LexTAL.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexTCL.cxx
+SOURCE=..\lexers\LexTCL.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexTeX.cxx
+SOURCE=..\lexers\LexTeX.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexVB.cxx
+SOURCE=..\lexers\LexVB.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexVerilog.cxx
+SOURCE=..\lexers\LexVerilog.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexVHDL.cxx
+SOURCE=..\lexers\LexVHDL.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\LexYAML.cxx
+SOURCE=..\lexers\LexYAML.cxx
 # End Source File
 # Begin Source File
 
@@ -474,7 +490,7 @@ SOURCE=..\src\PositionCache.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\PropSet.cxx
+SOURCE=..\lexlib\PropSetSimple.cxx
 # End Source File
 # Begin Source File
 
@@ -506,7 +522,7 @@ SOURCE=..\src\Style.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\StyleContext.cxx
+SOURCE=..\lexlib\StyleContext.cxx
 # End Source File
 # Begin Source File
 
@@ -518,7 +534,7 @@ SOURCE=..\src\ViewStyle.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\WindowAccessor.cxx
+SOURCE=..\lexlib\WordList.cxx
 # End Source File
 # Begin Source File
 
diff --git a/win32/deps.mak b/win32/deps.mak
index 7adb997c4..c20cae8ce 100644
--- a/win32/deps.mak
+++ b/win32/deps.mak
@@ -1,17 +1,22 @@
 PlatWin.o: PlatWin.cxx ../include/Platform.h PlatformRes.h \
  ../src/UniConversion.h ../src/XPM.h ../src/FontQuality.h
 ScintillaWin.o: ScintillaWin.cxx ../include/Platform.h \
- ../include/Scintilla.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 ../src/Style.h ../src/AutoComplete.h \
+ ../include/ILexer.h ../include/Scintilla.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 ../src/Style.h ../src/AutoComplete.h \
  ../src/ViewStyle.h ../src/CharClassify.h ../src/Decoration.h \
  ../src/Document.h ../src/Selection.h ../src/PositionCache.h \
  ../src/Editor.h ../src/ScintillaBase.h ../src/UniConversion.h
 AutoComplete.o: ../src/AutoComplete.cxx ../include/Platform.h \
- ../src/CharClassify.h ../src/AutoComplete.h
+ ../lexlib/CharacterSet.h ../src/AutoComplete.h
 CallTip.o: ../src/CallTip.cxx ../include/Platform.h \
  ../include/Scintilla.h ../src/CallTip.h
+Catalogue.o: ../src/Catalogue.cxx ../include/ILexer.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 ../src/Catalogue.h
 CellBuffer.o: ../src/CellBuffer.cxx ../include/Platform.h \
  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
  ../src/CellBuffer.h
@@ -22,272 +27,27 @@ ContractionState.o: ../src/ContractionState.cxx ../include/Platform.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 \
+Document.o: ../src/Document.cxx ../include/Platform.h ../include/ILexer.h \
  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
  ../src/RunStyles.h ../src/CellBuffer.h ../src/PerLine.h \
- ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \
- ../src/RESearch.h ../src/UniConversion.h
-DocumentAccessor.o: ../src/DocumentAccessor.cxx ../include/Platform.h \
- ../include/PropSet.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/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 ../src/CharClassify.h ../src/Decoration.h \
+ ../src/CharClassify.h ../lexlib/CharacterSet.h ../src/Decoration.h \
+ ../src/Document.h ../src/RESearch.h ../src/UniConversion.h
+Editor.o: ../src/Editor.cxx ../include/Platform.h ../include/ILexer.h \
+ ../include/Scintilla.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 ../src/CharClassify.h \
+ ../src/Decoration.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
  ../src/Document.h ../src/Selection.h ../src/PositionCache.h \
  ../src/Editor.h
 ExternalLexer.o: ../src/ExternalLexer.cxx ../include/Platform.h \
- ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \
- ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \
- ../src/ExternalLexer.h
+ ../include/ILexer.h ../include/Scintilla.h ../include/SciLexer.h \
+ ../lexlib/LexAccessor.h ../lexlib/Accessor.h ../lexlib/WordList.h \
+ ../lexlib/LexerModule.h ../src/Catalogue.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 \
  ../src/KeyMap.h
-KeyWords.o: ../src/KeyWords.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexAbaqus.o: ../src/LexAbaqus.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.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/KeyWords.h \
- ../include/SciLexer.h
-LexAPDL.o: ../src/LexAPDL.cxx ../include/Platform.h ../include/PropSet.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/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/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexASY.o: ../src/LexASY.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h ../src/CharacterSet.h
-LexAU3.o: ../src/LexAU3.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexAVE.o: ../src/LexAVE.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexBaan.o: ../src/LexBaan.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexBash.o: ../src/LexBash.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h ../src/CharacterSet.h
-LexBasic.o: ../src/LexBasic.cxx ../include/Platform.h \
- ../include/PropSet.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/Accessor.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexCaml.o: ../src/LexCaml.cxx ../include/Platform.h ../include/PropSet.h \
- ../src/PropSetSimple.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/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexCmake.o: ../src/LexCmake.cxx ../include/Platform.h \
- ../src/CharClassify.h ../include/PropSet.h ../include/Accessor.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexCOBOL.o: ../src/LexCOBOL.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h
-LexConf.o: ../src/LexConf.cxx ../include/Platform.h ../include/PropSet.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/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h ../src/CharacterSet.h
-LexCrontab.o: ../src/LexCrontab.cxx ../include/Platform.h \
- ../include/PropSet.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/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/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/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/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexErlang.o: ../src/LexErlang.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexEScript.o: ../src/LexEScript.cxx ../include/Platform.h \
- ../include/PropSet.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/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \
- ../src/CharacterSet.h
-LexForth.o: ../src/LexForth.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexFortran.o: ../src/LexFortran.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexGAP.o: ../src/LexGAP.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexGui4Cli.o: ../src/LexGui4Cli.cxx ../include/Platform.h \
- ../include/PropSet.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 ../src/PropSetSimple.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/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h ../src/CharacterSet.h
-LexInno.o: ../src/LexInno.cxx ../include/Platform.h ../src/CharClassify.h \
- ../include/PropSet.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/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/Accessor.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h ../src/StyleContext.h
-LexLout.o: ../src/LexLout.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexLua.o: ../src/LexLua.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h ../src/CharacterSet.h
-LexMagik.o: ../src/LexMagik.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexMarkdown.o: ../src/LexMarkdown.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexMatlab.o: ../src/LexMatlab.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexMetapost.o: ../src/LexMetapost.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h
-LexMMIXAL.o: ../src/LexMMIXAL.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexMPT.o: ../src/LexMPT.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h
-LexMSSQL.o: ../src/LexMSSQL.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexMySQL.o: ../src/LexMySQL.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexNimrod.o: ../src/LexNimrod.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexNsis.o: ../src/LexNsis.cxx ../include/Platform.h ../src/CharClassify.h \
- ../include/PropSet.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/Accessor.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h ../src/StyleContext.h
-LexOthers.o: ../src/LexOthers.cxx ../include/Platform.h \
- ../src/CharClassify.h ../include/PropSet.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/Accessor.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h \
- ../src/CharacterSet.h
-LexPB.o: ../src/LexPB.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexPerl.o: ../src/LexPerl.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h ../src/CharacterSet.h
-LexPLM.o: ../src/LexPLM.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h ../src/StyleContext.h
-LexPOV.o: ../src/LexPOV.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexPowerPro.o: ../src/LexPowerPro.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \
- ../src/CharacterSet.h
-LexPowerShell.o: ../src/LexPowerShell.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexProgress.o: ../src/LexProgress.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexPS.o: ../src/LexPS.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexPython.o: ../src/LexPython.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexR.o: ../src/LexR.cxx ../include/Platform.h ../include/PropSet.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/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/Accessor.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h
-LexScriptol.o: ../src/LexScriptol.cxx ../include/Platform.h \
- ../include/PropSet.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/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexSML.o: ../src/LexSML.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexSorcus.o: ../src/LexSorcus.cxx ../include/Platform.h \
- ../include/PropSet.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/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/KeyWords.h ../include/SciLexer.h
-LexSQL.o: ../src/LexSQL.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexTACL.o: ../src/LexTACL.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h ../src/StyleContext.h
-LexTADS3.o: ../src/LexTADS3.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexTAL.o: ../src/LexTAL.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h ../src/StyleContext.h
-LexTCL.o: ../src/LexTCL.cxx ../include/Platform.h ../include/PropSet.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/Accessor.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h ../src/StyleContext.h
-LexVB.o: ../src/LexVB.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexVerilog.o: ../src/LexVerilog.cxx ../include/Platform.h \
- ../include/PropSet.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/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/Accessor.h ../src/StyleContext.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
 LineMarker.o: ../src/LineMarker.cxx ../include/Platform.h \
  ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h
 PerLine.o: ../src/PerLine.cxx ../include/Platform.h \
@@ -298,16 +58,14 @@ PositionCache.o: ../src/PositionCache.cxx ../include/Platform.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 ../src/CharClassify.h \
- ../src/Decoration.h ../src/Document.h ../src/Selection.h \
- ../src/PositionCache.h
-PropSet.o: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \
- ../src/PropSetSimple.h
+ ../src/Decoration.h ../include/ILexer.h ../src/Document.h \
+ ../src/Selection.h ../src/PositionCache.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 ../src/PropSetSimple.h \
+ ../include/ILexer.h ../include/Scintilla.h ../lexlib/PropSetSimple.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 \
@@ -319,14 +77,395 @@ Selection.o: ../src/Selection.cxx ../include/Platform.h \
  ../include/Scintilla.h ../src/Selection.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/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/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/Accessor.h ../include/WindowAccessor.h \
- ../include/Scintilla.h
 XPM.o: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h
+Accessor.o: ../lexlib/Accessor.cxx ../include/ILexer.h \
+ ../include/Scintilla.h ../include/SciLexer.h ../lexlib/PropSetSimple.h \
+ ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h
+CharacterSet.o: ../lexlib/CharacterSet.cxx ../lexlib/CharacterSet.h
+LexerBase.o: ../lexlib/LexerBase.cxx ../include/ILexer.h \
+ ../include/Scintilla.h ../include/SciLexer.h ../lexlib/PropSetSimple.h \
+ ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
+ ../lexlib/LexerModule.h ../lexlib/LexerBase.h
+LexerModule.o: ../lexlib/LexerModule.cxx ../include/ILexer.h \
+ ../include/Scintilla.h ../include/SciLexer.h ../lexlib/PropSetSimple.h \
+ ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
+ ../lexlib/LexerModule.h ../lexlib/LexerBase.h ../lexlib/LexerSimple.h
+LexerSimple.o: ../lexlib/LexerSimple.cxx ../include/ILexer.h \
+ ../include/Scintilla.h ../include/SciLexer.h ../lexlib/PropSetSimple.h \
+ ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
+ ../lexlib/LexerModule.h ../lexlib/LexerBase.h ../lexlib/LexerSimple.h
+PropSetSimple.o: ../lexlib/PropSetSimple.cxx ../lexlib/PropSetSimple.h
+StyleContext.o: ../lexlib/StyleContext.cxx ../include/ILexer.h \
+ ../lexlib/LexAccessor.h ../lexlib/Accessor.h ../lexlib/StyleContext.h
+WordList.o: ../lexlib/WordList.cxx ../lexlib/WordList.h
+LexAbaqus.o: ../lexers/LexAbaqus.cxx ../include/ILexer.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
+LexAda.o: ../lexers/LexAda.cxx ../include/ILexer.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
+LexAPDL.o: ../lexers/LexAPDL.cxx ../include/ILexer.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
+LexAsm.o: ../lexers/LexAsm.cxx ../include/ILexer.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
+LexAsn1.o: ../lexers/LexAsn1.cxx ../include/ILexer.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
+LexASY.o: ../lexers/LexASY.cxx ../include/ILexer.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
+LexAU3.o: ../lexers/LexAU3.cxx ../include/ILexer.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
+LexAVE.o: ../lexers/LexAVE.cxx ../include/ILexer.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
+LexBaan.o: ../lexers/LexBaan.cxx ../include/ILexer.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
+LexBash.o: ../lexers/LexBash.cxx ../include/ILexer.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
+LexBasic.o: ../lexers/LexBasic.cxx ../include/ILexer.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
+LexBullant.o: ../lexers/LexBullant.cxx ../include/ILexer.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
+LexCaml.o: ../lexers/LexCaml.cxx ../include/ILexer.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
+LexCLW.o: ../lexers/LexCLW.cxx ../include/ILexer.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
+LexCmake.o: ../lexers/LexCmake.cxx ../include/ILexer.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
+LexCOBOL.o: ../lexers/LexCOBOL.cxx ../include/ILexer.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
+LexConf.o: ../lexers/LexConf.cxx ../include/ILexer.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
+LexCPP.o: ../lexers/LexCPP.cxx ../include/ILexer.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
+LexCrontab.o: ../lexers/LexCrontab.cxx ../include/ILexer.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
+LexCsound.o: ../lexers/LexCsound.cxx ../include/ILexer.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
+LexCSS.o: ../lexers/LexCSS.cxx ../include/ILexer.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
+LexD.o: ../lexers/LexD.cxx ../include/ILexer.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
+LexEiffel.o: ../lexers/LexEiffel.cxx ../include/ILexer.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
+LexErlang.o: ../lexers/LexErlang.cxx ../include/ILexer.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
+LexEScript.o: ../lexers/LexEScript.cxx ../include/ILexer.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
+LexFlagship.o: ../lexers/LexFlagship.cxx ../include/ILexer.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
+LexForth.o: ../lexers/LexForth.cxx ../include/ILexer.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
+LexFortran.o: ../lexers/LexFortran.cxx ../include/ILexer.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
+LexGAP.o: ../lexers/LexGAP.cxx ../include/ILexer.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
+LexGui4Cli.o: ../lexers/LexGui4Cli.cxx ../include/ILexer.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
+LexHaskell.o: ../lexers/LexHaskell.cxx ../include/ILexer.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
+LexHTML.o: ../lexers/LexHTML.cxx ../include/ILexer.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
+LexInno.o: ../lexers/LexInno.cxx ../include/ILexer.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
+LexKix.o: ../lexers/LexKix.cxx ../include/ILexer.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
+LexLisp.o: ../lexers/LexLisp.cxx ../include/ILexer.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
+LexLout.o: ../lexers/LexLout.cxx ../include/ILexer.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
+LexLua.o: ../lexers/LexLua.cxx ../include/ILexer.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
+LexMagik.o: ../lexers/LexMagik.cxx ../include/ILexer.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
+LexMarkdown.o: ../lexers/LexMarkdown.cxx ../include/ILexer.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
+LexMatlab.o: ../lexers/LexMatlab.cxx ../include/ILexer.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
+LexMetapost.o: ../lexers/LexMetapost.cxx ../include/ILexer.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
+LexMMIXAL.o: ../lexers/LexMMIXAL.cxx ../include/ILexer.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
+LexMPT.o: ../lexers/LexMPT.cxx ../include/ILexer.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
+LexMSSQL.o: ../lexers/LexMSSQL.cxx ../include/ILexer.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
+LexMySQL.o: ../lexers/LexMySQL.cxx ../include/ILexer.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
+LexNimrod.o: ../lexers/LexNimrod.cxx ../include/ILexer.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
+LexNsis.o: ../lexers/LexNsis.cxx ../include/ILexer.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
+LexOpal.o: ../lexers/LexOpal.cxx ../include/ILexer.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
+LexOthers.o: ../lexers/LexOthers.cxx ../include/ILexer.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
+LexPascal.o: ../lexers/LexPascal.cxx ../include/ILexer.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
+LexPB.o: ../lexers/LexPB.cxx ../include/ILexer.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
+LexPerl.o: ../lexers/LexPerl.cxx ../include/ILexer.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
+LexPLM.o: ../lexers/LexPLM.cxx ../include/ILexer.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
+LexPOV.o: ../lexers/LexPOV.cxx ../include/ILexer.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
+LexPowerPro.o: ../lexers/LexPowerPro.cxx ../include/ILexer.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
+LexPowerShell.o: ../lexers/LexPowerShell.cxx ../include/ILexer.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
+LexProgress.o: ../lexers/LexProgress.cxx ../include/ILexer.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
+LexPS.o: ../lexers/LexPS.cxx ../include/ILexer.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
+LexPython.o: ../lexers/LexPython.cxx ../include/ILexer.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
+LexR.o: ../lexers/LexR.cxx ../include/ILexer.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
+LexRebol.o: ../lexers/LexRebol.cxx ../include/ILexer.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
+LexRuby.o: ../lexers/LexRuby.cxx ../include/ILexer.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
+LexScriptol.o: ../lexers/LexScriptol.cxx ../include/ILexer.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
+LexSmalltalk.o: ../lexers/LexSmalltalk.cxx ../include/ILexer.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
+LexSML.o: ../lexers/LexSML.cxx ../include/ILexer.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
+LexSorcus.o: ../lexers/LexSorcus.cxx ../include/ILexer.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
+LexSpecman.o: ../lexers/LexSpecman.cxx ../include/ILexer.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
+LexSpice.o: ../lexers/LexSpice.cxx ../include/ILexer.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
+LexSQL.o: ../lexers/LexSQL.cxx ../include/ILexer.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
+LexTACL.o: ../lexers/LexTACL.cxx ../include/ILexer.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
+LexTADS3.o: ../lexers/LexTADS3.cxx ../include/ILexer.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
+LexTAL.o: ../lexers/LexTAL.cxx ../include/ILexer.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
+LexTCL.o: ../lexers/LexTCL.cxx ../include/ILexer.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
+LexTeX.o: ../lexers/LexTeX.cxx ../include/ILexer.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
+LexVB.o: ../lexers/LexVB.cxx ../include/ILexer.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
+LexVerilog.o: ../lexers/LexVerilog.cxx ../include/ILexer.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
+LexVHDL.o: ../lexers/LexVHDL.cxx ../include/ILexer.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
+LexYAML.o: ../lexers/LexYAML.cxx ../include/ILexer.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
diff --git a/win32/makefile b/win32/makefile
index 2e51ce2d5..266fbf514 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -6,19 +6,19 @@
 
 .SUFFIXES: .cxx
 CC = g++
-DLLWRAP = g++ -shared -Wl,--kill-at
+DLLWRAP = dllwrap
 DEL = del /q
 
 COMPONENT = ../bin/Scintilla.dll
 LEXCOMPONENT = ../bin/SciLexer.dll
 LEXLIB = Lexers.a
 
-vpath %.h ../src ../include
-vpath %.cxx ../src
+vpath %.h ../src ../include ../lexlib
+vpath %.cxx ../src ../lexlib ../lexers
 
 LDFLAGS=-mwindows -lstdc++ -limm32 -lole32 -luuid -mno-cygwin
 # Add -MMD to get dependencies
-INCLUDEDIRS=-I ../include -I ../src
+INCLUDEDIRS=-I ../include -I ../src -I../lexlib
 CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-strict-overflow -pedantic $(INCLUDEDIRS) -fno-rtti -mno-cygwin
 
 ifdef DEBUG
@@ -31,30 +31,77 @@ endif
 .cxx.o:
 	$(CC) $(CXXFLAGS) -c $<
 
-ALL:	$(COMPONENT) $(LEXCOMPONENT) $(LEXLIB) ScintillaWinS.o WindowAccessor.o
+ALL:	$(COMPONENT) $(LEXCOMPONENT) $(LEXLIB) ScintillaWinS.o
 
 clean:
 	$(DEL) *.exe *.o *.obj *.dll *.res *.map
 
 deps:
-	$(CC) -MM $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak
+	$(CC) -MM $(CXXFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx >deps.mak
+
+#++Autogenerated -- run src/LexGen.py to regenerate
+#**LEXOBJS=\\\n\(\*.o \)
+LEXOBJS=\
+LexAbaqus.o LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexASY.o LexAU3.o LexAVE.o \
+LexBaan.o LexBash.o LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexCmake.o \
+LexCOBOL.o LexConf.o LexCPP.o LexCrontab.o LexCsound.o LexCSS.o LexD.o \
+LexEiffel.o LexErlang.o LexEScript.o LexFlagship.o LexForth.o LexFortran.o \
+LexGAP.o LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o \
+LexLout.o LexLua.o LexMagik.o LexMarkdown.o LexMatlab.o LexMetapost.o \
+LexMMIXAL.o LexMPT.o LexMSSQL.o LexMySQL.o LexNimrod.o LexNsis.o LexOpal.o \
+LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPLM.o LexPOV.o LexPowerPro.o \
+LexPowerShell.o LexProgress.o LexPS.o LexPython.o LexR.o LexRebol.o LexRuby.o \
+LexScriptol.o LexSmalltalk.o LexSML.o LexSorcus.o LexSpecman.o LexSpice.o \
+LexSQL.o LexTACL.o LexTADS3.o LexTAL.o LexTCL.o LexTeX.o LexVB.o LexVerilog.o \
+LexVHDL.o LexYAML.o
+#--Autogenerated -- end of automatically generated section
+
+BASEOBJS = \
+	AutoComplete.o \
+	CallTip.o \
+	CellBuffer.o \
+	CharacterSet.o \
+	CharClassify.o \
+	ContractionState.o \
+	Decoration.o \
+	Document.o \
+	Editor.o \
+	KeyMap.o \
+	Indicator.o \
+	LineMarker.o \
+	PerLine.o \
+	PlatWin.o \
+	PositionCache.o \
+	PropSetSimple.o \
+	RESearch.o \
+	RunStyles.o \
+	ScintRes.o \
+	Selection.o \
+	Style.o \
+	UniConversion.o \
+	ViewStyle.o \
+	XPM.o
+
+SOBJS = ScintillaWin.o ScintillaBase.o $(BASEOBJS)
 
-LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../src/Lex*.cxx))))
-
-SOBJS	= ScintillaWin.o ScintillaBase.o Editor.o CharClassify.o Decoration.o \
-	Document.o ContractionState.o CellBuffer.o CallTip.o \
-	ScintRes.o PlatWin.o PositionCache.o KeyMap.o Indicator.o LineMarker.o RESearch.o RunStyles.o \
-	Selection.o Style.o ViewStyle.o AutoComplete.o UniConversion.o PropSet.o XPM.o PerLine.o
 $(COMPONENT): $(SOBJS) Scintilla.def
-	$(DLLWRAP) --add-stdcall-alias --target=i386-mingw32 -o $@ $(SOBJS) $(LDFLAGS) $(STRIPFLAG) --relocatable
-
-LOBJS	= ScintillaWinL.o ScintillaBaseL.o Editor.o CharClassify.o Decoration.o \
-	Document.o ContractionState.o CellBuffer.o CallTip.o \
-	ScintRes.o PlatWin.o PositionCache.o KeyMap.o Indicator.o LineMarker.o RESearch.o RunStyles.o \
-	Selection.o Style.o ViewStyle.o AutoComplete.o UniConversion.o KeyWords.o \
-	DocumentAccessor.o PropSet.o ExternalLexer.o StyleContext.o XPM.o PerLine.o $(LEXOBJS)
+	$(DLLWRAP) --add-stdcall-alias --target i386-mingw32 -o $@ $(SOBJS) $(LDFLAGS) $(STRIPFLAG) --relocatable
+
+LOBJS = \
+	Accessor.o \
+	Catalogue.o \
+	ExternalLexer.o \
+	LexerBase.o \
+	LexerModule.o \
+	LexerSimple.o \
+	ScintillaWinL.o \
+	ScintillaBaseL.o \
+	StyleContext.o \
+	WordList.o \
+	$(BASEOBJS) \
+	$(LEXOBJS)
 $(LEXCOMPONENT): $(LOBJS) Scintilla.def
-	$(DLLWRAP) --add-stdcall-alias --target=i386-mingw32 -o $@ $(LOBJS) $(LDFLAGS) $(STRIPFLAG) --relocatable
+	$(DLLWRAP) --add-stdcall-alias --target i386-mingw32 -o $@ $(LOBJS) $(LDFLAGS) $(STRIPFLAG) --relocatable
 
 $(LEXLIB): $(LEXOBJS)
 	$(AR) rc $@ $^
@@ -64,20 +111,37 @@ $(LEXLIB): $(LEXOBJS)
 include deps.mak
 
 # These dependencies are maintained by hand as they do not use the default output name
-ScintillaBaseL.o: ScintillaBase.cxx Platform.h Scintilla.h SciLexer.h \
- ContractionState.h CellBuffer.h CallTip.h KeyMap.h Indicator.h \
- LineMarker.h Style.h AutoComplete.h ViewStyle.h Document.h Editor.h \
- ScintillaBase.h PropSet.h Accessor.h DocumentAccessor.h \
- KeyWords.h ExternalLexer.h PerLine.h
-ScintillaWinL.o: ScintillaWin.cxx Platform.h Scintilla.h SciLexer.h \
- ContractionState.h CellBuffer.h CallTip.h KeyMap.h Indicator.h \
- LineMarker.h Style.h AutoComplete.h ViewStyle.h Document.h Editor.h \
- ScintillaBase.h PropSet.h Accessor.h KeyWords.h \
- ExternalLexer.h UniConversion.h PerLine.h
-ScintillaWinS.o: ScintillaWin.cxx Platform.h Scintilla.h \
- ContractionState.h CellBuffer.h CallTip.h KeyMap.h Indicator.h \
- LineMarker.h Style.h AutoComplete.h ViewStyle.h Document.h Editor.h \
- ScintillaBase.h UniConversion.h PerLine.h
+
+ScintillaBaseL.o: ScintillaBase.cxx Platform.h \
+ ILexer.h Scintilla.h SciLexer.h PropSetSimple.h \
+ SplitVector.h Partitioning.h RunStyles.h \
+ ContractionState.h CellBuffer.h CallTip.h \
+ KeyMap.h Indicator.h XPM.h LineMarker.h \
+ Style.h ViewStyle.h AutoComplete.h \
+ CharClassify.h Decoration.h Document.h \
+ Selection.h PositionCache.h Editor.h \
+ ScintillaBase.h LexAccessor.h Accessor.h \
+ LexerModule.h Catalogue.h
+
+ScintillaWinL.o: ScintillaWin.cxx Platform.h \
+ ILexer.h Scintilla.h SplitVector.h \
+ Partitioning.h RunStyles.h ContractionState.h \
+ CellBuffer.h CallTip.h KeyMap.h Indicator.h \
+ XPM.h LineMarker.h Style.h AutoComplete.h \
+ ViewStyle.h CharClassify.h Decoration.h \
+ Document.h Selection.h PositionCache.h \
+ Editor.h ScintillaBase.h UniConversion.h \
+ LexAccessor.h Accessor.h \
+ LexerModule.h Catalogue.h
+
+ScintillaWinS.o: ScintillaWin.cxx Platform.h \
+ ILexer.h Scintilla.h SplitVector.h \
+ Partitioning.h RunStyles.h ContractionState.h \
+ CellBuffer.h CallTip.h KeyMap.h Indicator.h \
+ XPM.h LineMarker.h Style.h AutoComplete.h \
+ ViewStyle.h CharClassify.h Decoration.h \
+ Document.h Selection.h PositionCache.h \
+ Editor.h ScintillaBase.h UniConversion.h
 
 ScintillaBaseL.o:
 	$(CC) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index 9ad2292cb..d92ab2a61 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -77,10 +77,10 @@ LDFLAGS=$(LDDEBUG) $(LDFLAGS)
 CXXFLAGS=$(CXXFLAGS) $(CXXNDEBUG)
 !ENDIF
 
-INCLUDEDIRS=-I../include -I../src
+INCLUDEDIRS=-I../include -I../src -I../lexlib
 CXXFLAGS=$(CXXFLAGS) $(INCLUDEDIRS)
 
-ALL:	$(COMPONENT) $(LEXCOMPONENT) $(DIR_O)\ScintillaWinS.obj $(DIR_O)\WindowAccessor.obj
+ALL:	$(COMPONENT) $(LEXCOMPONENT) $(DIR_O)\ScintillaWinS.obj
 
 clean:
 	-del /q $(DIR_O)\*.obj $(DIR_O)\*.pdb $(COMPONENT) $(LEXCOMPONENT) \
@@ -90,6 +90,7 @@ SOBJS=\
 	$(DIR_O)\AutoComplete.obj \
 	$(DIR_O)\CallTip.obj \
 	$(DIR_O)\CellBuffer.obj \
+	$(DIR_O)\CharacterSet.obj \
 	$(DIR_O)\CharClassify.obj \
 	$(DIR_O)\ContractionState.obj \
 	$(DIR_O)\Decoration.obj \
@@ -98,9 +99,10 @@ SOBJS=\
 	$(DIR_O)\Indicator.obj \
 	$(DIR_O)\KeyMap.obj \
 	$(DIR_O)\LineMarker.obj \
+	$(DIR_O)\PerLine.obj \
 	$(DIR_O)\PlatWin.obj \
 	$(DIR_O)\PositionCache.obj \
-	$(DIR_O)\PropSet.obj \
+	$(DIR_O)\PropSetSimple.obj \
 	$(DIR_O)\RESearch.obj \
 	$(DIR_O)\RunStyles.obj \
 	$(DIR_O)\ScintillaBase.obj \
@@ -109,8 +111,7 @@ SOBJS=\
 	$(DIR_O)\Style.obj \
 	$(DIR_O)\UniConversion.obj \
 	$(DIR_O)\ViewStyle.obj \
-	$(DIR_O)\XPM.obj \
-	$(DIR_O)\PerLine.obj
+	$(DIR_O)\XPM.obj
 
 #++Autogenerated -- run src/LexGen.py to regenerate
 #**LEXOBJS=\\\n\(\t$(DIR_O)\\\*.obj \\\n\)
@@ -197,24 +198,28 @@ LEXOBJS=\
 #--Autogenerated -- end of automatically generated section
 
 LOBJS=\
+	$(DIR_O)\Accessor.obj \
 	$(DIR_O)\AutoComplete.obj \
 	$(DIR_O)\CallTip.obj \
+	$(DIR_O)\Catalogue.obj \
 	$(DIR_O)\CellBuffer.obj \
+	$(DIR_O)\CharacterSet.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 \
 	$(DIR_O)\ExternalLexer.obj \
 	$(DIR_O)\Indicator.obj \
 	$(DIR_O)\KeyMap.obj \
-	$(DIR_O)\KeyWords.obj \
+	$(DIR_O)\LexerBase.obj \
+	$(DIR_O)\LexerModule.obj \
+	$(DIR_O)\LexerSimple.obj \
 	$(DIR_O)\LineMarker.obj \
 	$(DIR_O)\PerLine.obj \
 	$(DIR_O)\PlatWin.obj \
 	$(DIR_O)\PositionCache.obj \
-	$(DIR_O)\PropSet.obj \
+	$(DIR_O)\PropSetSimple.obj \
 	$(DIR_O)\RESearch.obj \
 	$(DIR_O)\RunStyles.obj \
 	$(DIR_O)\ScintillaBaseL.obj \
@@ -224,6 +229,7 @@ LOBJS=\
 	$(DIR_O)\StyleContext.obj \
 	$(DIR_O)\UniConversion.obj \
 	$(DIR_O)\ViewStyle.obj \
+	$(DIR_O)\WordList.obj \
 	$(DIR_O)\XPM.obj \
 	$(LEXOBJS)
 
@@ -250,9 +256,12 @@ $(LEXCOMPONENT): $(LOBJS) $(DIR_O)\ScintRes.res
 
 # Define how to build all the objects and what they depend on
 
-# Most of the source is in ..\src with a couple in this directory
 {..\src}.cxx{$(DIR_O)}.obj:
 	$(CC) $(CXXFLAGS) -c $(NAME)$@ $<
+{..\lexlib}.cxx{$(DIR_O)}.obj:
+	$(CC) $(CXXFLAGS) -c $(NAME)$@ $<
+{..\lexers}.cxx{$(DIR_O)}.obj:
+	$(CC) $(CXXFLAGS) -c $(NAME)$@ $<
 {.}.cxx{$(DIR_O)}.obj:
 	$(CC) $(CXXFLAGS) -c $(NAME)$@ $<
 
@@ -269,17 +278,19 @@ $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx
 # Dependencies
 
 # All lexers depend on this set of headers
-LEX_HEADERS=..\include\Platform.h ..\include\PropSet.h \
- ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h ..\src\StyleContext.h
+LEX_HEADERS= ..\include\ILexer.h ..\include\Scintilla.h ..\include\SciLexer.h \
+ ..\lexlib\Accessor.h ..\lexlib\CharacterSet.h ..\lexlib\LexAccessor.h \
+ ..\lexlib\LexerModule.h ..\lexlib\StyleContext.h
 
 $(DIR_O)\AutoComplete.obj: ../src/AutoComplete.cxx ../include/Platform.h \
-  ../include/PropSet.h ../src/AutoComplete.h
+  ../src/AutoComplete.h
+$(DIR_O)\Accessor.obj: ../lexlib/Accessor.cxx ../lexlib/Accessor.h
 $(DIR_O)\CallTip.obj: ../src/CallTip.cxx ../include/Platform.h \
   ../include/Scintilla.h ../src/CallTip.h
 $(DIR_O)\CellBuffer.obj: ../src/CellBuffer.cxx ../include/Platform.h \
   ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \
   ../src/Partitioning.h ../src/CellBuffer.h
+$(DIR_O)\CharacterSet.obj: ../lexlib/CharacterSet.cxx ../lexlib/CharacterSet.h
 $(DIR_O)\CharClassify.obj: ../src/CharClassify.cxx ../src/CharClassify.h
 $(DIR_O)\ContractionState.obj: ../src/ContractionState.cxx ../include/Platform.h \
   ../src/ContractionState.h
@@ -291,12 +302,6 @@ $(DIR_O)\Document.obj: ../src/Document.cxx ../include/Platform.h \
   ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \
   ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \
   ../src/RESearch.h ../src/PerLine.h
-$(DIR_O)\DocumentAccessor.obj: ../src/DocumentAccessor.cxx ../include/Platform.h \
-  ../include/PropSet.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 \
@@ -304,179 +309,178 @@ $(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h ../include/Scintill
   ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \
   ../src/Decoration.h ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/PositionCache.h
 $(DIR_O)\ExternalLexer.obj: ../src/ExternalLexer.cxx ../include/Platform.h \
-  ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \
-  ../include/Accessor.h ../src/DocumentAccessor.h \
-  ../include/KeyWords.h ../src/ExternalLexer.h
+  ../include/Scintilla.h ../include/SciLexer.h \
+  ../lexlib/Accessor.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
-$(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
 
 #++Autogenerated -- run src/LexGen.py to regenerate
-#**\n\($(DIR_O)\\\*.obj: ..\\src\\\*.cxx $(LEX_HEADERS)\n\n\)
+#**\n\($(DIR_O)\\\*.obj: ..\\lexers\\\*.cxx $(LEX_HEADERS)\n\n\)
 
-$(DIR_O)\LexAbaqus.obj: ..\src\LexAbaqus.cxx $(LEX_HEADERS)
+$(DIR_O)\LexAbaqus.obj: ..\lexers\LexAbaqus.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexAda.obj: ..\src\LexAda.cxx $(LEX_HEADERS)
+$(DIR_O)\LexAda.obj: ..\lexers\LexAda.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexAPDL.obj: ..\src\LexAPDL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexAPDL.obj: ..\lexers\LexAPDL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexAsm.obj: ..\src\LexAsm.cxx $(LEX_HEADERS)
+$(DIR_O)\LexAsm.obj: ..\lexers\LexAsm.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexAsn1.obj: ..\src\LexAsn1.cxx $(LEX_HEADERS)
+$(DIR_O)\LexAsn1.obj: ..\lexers\LexAsn1.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexASY.obj: ..\src\LexASY.cxx $(LEX_HEADERS)
+$(DIR_O)\LexASY.obj: ..\lexers\LexASY.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexAU3.obj: ..\src\LexAU3.cxx $(LEX_HEADERS)
+$(DIR_O)\LexAU3.obj: ..\lexers\LexAU3.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx $(LEX_HEADERS)
+$(DIR_O)\LexAVE.obj: ..\lexers\LexAVE.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexBaan.obj: ..\src\LexBaan.cxx $(LEX_HEADERS)
+$(DIR_O)\LexBaan.obj: ..\lexers\LexBaan.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexBash.obj: ..\src\LexBash.cxx $(LEX_HEADERS)
+$(DIR_O)\LexBash.obj: ..\lexers\LexBash.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexBasic.obj: ..\src\LexBasic.cxx $(LEX_HEADERS)
+$(DIR_O)\LexBasic.obj: ..\lexers\LexBasic.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexBullant.obj: ..\src\LexBullant.cxx $(LEX_HEADERS)
+$(DIR_O)\LexBullant.obj: ..\lexers\LexBullant.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexCaml.obj: ..\src\LexCaml.cxx $(LEX_HEADERS)
+$(DIR_O)\LexCaml.obj: ..\lexers\LexCaml.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexCLW.obj: ..\src\LexCLW.cxx $(LEX_HEADERS)
+$(DIR_O)\LexCLW.obj: ..\lexers\LexCLW.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexCmake.obj: ..\src\LexCmake.cxx $(LEX_HEADERS)
+$(DIR_O)\LexCmake.obj: ..\lexers\LexCmake.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexCOBOL.obj: ..\src\LexCOBOL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexCOBOL.obj: ..\lexers\LexCOBOL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexConf.obj: ..\src\LexConf.cxx $(LEX_HEADERS)
+$(DIR_O)\LexConf.obj: ..\lexers\LexConf.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexCPP.obj: ..\src\LexCPP.cxx $(LEX_HEADERS)
+$(DIR_O)\LexCPP.obj: ..\lexers\LexCPP.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexCrontab.obj: ..\src\LexCrontab.cxx $(LEX_HEADERS)
+$(DIR_O)\LexCrontab.obj: ..\lexers\LexCrontab.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexCsound.obj: ..\src\LexCsound.cxx $(LEX_HEADERS)
+$(DIR_O)\LexCsound.obj: ..\lexers\LexCsound.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexCSS.obj: ..\src\LexCSS.cxx $(LEX_HEADERS)
+$(DIR_O)\LexCSS.obj: ..\lexers\LexCSS.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexD.obj: ..\src\LexD.cxx $(LEX_HEADERS)
+$(DIR_O)\LexD.obj: ..\lexers\LexD.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS)
+$(DIR_O)\LexEiffel.obj: ..\lexers\LexEiffel.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexErlang.obj: ..\src\LexErlang.cxx $(LEX_HEADERS)
+$(DIR_O)\LexErlang.obj: ..\lexers\LexErlang.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS)
+$(DIR_O)\LexEScript.obj: ..\lexers\LexEScript.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexFlagship.obj: ..\src\LexFlagship.cxx $(LEX_HEADERS)
+$(DIR_O)\LexFlagship.obj: ..\lexers\LexFlagship.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS)
+$(DIR_O)\LexForth.obj: ..\lexers\LexForth.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexFortran.obj: ..\src\LexFortran.cxx $(LEX_HEADERS)
+$(DIR_O)\LexFortran.obj: ..\lexers\LexFortran.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexGAP.obj: ..\src\LexGAP.cxx $(LEX_HEADERS)
+$(DIR_O)\LexGAP.obj: ..\lexers\LexGAP.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexGui4Cli.obj: ..\src\LexGui4Cli.cxx $(LEX_HEADERS)
+$(DIR_O)\LexGui4Cli.obj: ..\lexers\LexGui4Cli.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexHaskell.obj: ..\src\LexHaskell.cxx $(LEX_HEADERS)
+$(DIR_O)\LexHaskell.obj: ..\lexers\LexHaskell.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS)
+$(DIR_O)\LexHTML.obj: ..\lexers\LexHTML.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexInno.obj: ..\src\LexInno.cxx $(LEX_HEADERS)
+$(DIR_O)\LexInno.obj: ..\lexers\LexInno.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexKix.obj: ..\src\LexKix.cxx $(LEX_HEADERS)
+$(DIR_O)\LexKix.obj: ..\lexers\LexKix.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexLisp.obj: ..\src\LexLisp.cxx $(LEX_HEADERS)
+$(DIR_O)\LexLisp.obj: ..\lexers\LexLisp.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexLout.obj: ..\src\LexLout.cxx $(LEX_HEADERS)
+$(DIR_O)\LexLout.obj: ..\lexers\LexLout.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexLua.obj: ..\src\LexLua.cxx $(LEX_HEADERS)
+$(DIR_O)\LexLua.obj: ..\lexers\LexLua.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexMagik.obj: ..\src\LexMagik.cxx $(LEX_HEADERS)
+$(DIR_O)\LexMagik.obj: ..\lexers\LexMagik.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexMarkdown.obj: ..\src\LexMarkdown.cxx $(LEX_HEADERS)
+$(DIR_O)\LexMarkdown.obj: ..\lexers\LexMarkdown.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexMatlab.obj: ..\src\LexMatlab.cxx $(LEX_HEADERS)
+$(DIR_O)\LexMatlab.obj: ..\lexers\LexMatlab.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexMetapost.obj: ..\src\LexMetapost.cxx $(LEX_HEADERS)
+$(DIR_O)\LexMetapost.obj: ..\lexers\LexMetapost.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexMMIXAL.obj: ..\src\LexMMIXAL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexMMIXAL.obj: ..\lexers\LexMMIXAL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexMPT.obj: ..\src\LexMPT.cxx $(LEX_HEADERS)
+$(DIR_O)\LexMPT.obj: ..\lexers\LexMPT.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexMSSQL.obj: ..\src\LexMSSQL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexMSSQL.obj: ..\lexers\LexMSSQL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexMySQL.obj: ..\src\LexMySQL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexMySQL.obj: ..\lexers\LexMySQL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexNimrod.obj: ..\src\LexNimrod.cxx $(LEX_HEADERS)
+$(DIR_O)\LexNimrod.obj: ..\lexers\LexNimrod.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexNsis.obj: ..\src\LexNsis.cxx $(LEX_HEADERS)
+$(DIR_O)\LexNsis.obj: ..\lexers\LexNsis.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexOpal.obj: ..\src\LexOpal.cxx $(LEX_HEADERS)
+$(DIR_O)\LexOpal.obj: ..\lexers\LexOpal.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexOthers.obj: ..\src\LexOthers.cxx $(LEX_HEADERS)
+$(DIR_O)\LexOthers.obj: ..\lexers\LexOthers.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexPascal.obj: ..\src\LexPascal.cxx $(LEX_HEADERS)
+$(DIR_O)\LexPascal.obj: ..\lexers\LexPascal.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexPB.obj: ..\src\LexPB.cxx $(LEX_HEADERS)
+$(DIR_O)\LexPB.obj: ..\lexers\LexPB.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexPerl.obj: ..\src\LexPerl.cxx $(LEX_HEADERS)
+$(DIR_O)\LexPerl.obj: ..\lexers\LexPerl.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexPLM.obj: ..\src\LexPLM.cxx $(LEX_HEADERS)
+$(DIR_O)\LexPLM.obj: ..\lexers\LexPLM.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexPOV.obj: ..\src\LexPOV.cxx $(LEX_HEADERS)
+$(DIR_O)\LexPOV.obj: ..\lexers\LexPOV.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexPowerPro.obj: ..\src\LexPowerPro.cxx $(LEX_HEADERS)
+$(DIR_O)\LexPowerPro.obj: ..\lexers\LexPowerPro.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexPowerShell.obj: ..\src\LexPowerShell.cxx $(LEX_HEADERS)
+$(DIR_O)\LexPowerShell.obj: ..\lexers\LexPowerShell.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexProgress.obj: ..\src\LexProgress.cxx $(LEX_HEADERS)
+$(DIR_O)\LexProgress.obj: ..\lexers\LexProgress.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexPS.obj: ..\src\LexPS.cxx $(LEX_HEADERS)
+$(DIR_O)\LexPS.obj: ..\lexers\LexPS.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS)
+$(DIR_O)\LexPython.obj: ..\lexers\LexPython.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexR.obj: ..\src\LexR.cxx $(LEX_HEADERS)
+$(DIR_O)\LexR.obj: ..\lexers\LexR.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexRebol.obj: ..\src\LexRebol.cxx $(LEX_HEADERS)
+$(DIR_O)\LexRebol.obj: ..\lexers\LexRebol.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS)
+$(DIR_O)\LexRuby.obj: ..\lexers\LexRuby.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexScriptol.obj: ..\src\LexScriptol.cxx $(LEX_HEADERS)
+$(DIR_O)\LexScriptol.obj: ..\lexers\LexScriptol.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexSmalltalk.obj: ..\src\LexSmalltalk.cxx $(LEX_HEADERS)
+$(DIR_O)\LexSmalltalk.obj: ..\lexers\LexSmalltalk.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexSML.obj: ..\src\LexSML.cxx $(LEX_HEADERS)
+$(DIR_O)\LexSML.obj: ..\lexers\LexSML.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexSorcus.obj: ..\src\LexSorcus.cxx $(LEX_HEADERS)
+$(DIR_O)\LexSorcus.obj: ..\lexers\LexSorcus.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexSpecman.obj: ..\src\LexSpecman.cxx $(LEX_HEADERS)
+$(DIR_O)\LexSpecman.obj: ..\lexers\LexSpecman.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexSpice.obj: ..\src\LexSpice.cxx $(LEX_HEADERS)
+$(DIR_O)\LexSpice.obj: ..\lexers\LexSpice.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexSQL.obj: ..\lexers\LexSQL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexTACL.obj: ..\src\LexTACL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexTACL.obj: ..\lexers\LexTACL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexTADS3.obj: ..\src\LexTADS3.cxx $(LEX_HEADERS)
+$(DIR_O)\LexTADS3.obj: ..\lexers\LexTADS3.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexTAL.obj: ..\src\LexTAL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexTAL.obj: ..\lexers\LexTAL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexTCL.obj: ..\src\LexTCL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexTCL.obj: ..\lexers\LexTCL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexTeX.obj: ..\src\LexTeX.cxx $(LEX_HEADERS)
+$(DIR_O)\LexTeX.obj: ..\lexers\LexTeX.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexVB.obj: ..\src\LexVB.cxx $(LEX_HEADERS)
+$(DIR_O)\LexVB.obj: ..\lexers\LexVB.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexVerilog.obj: ..\src\LexVerilog.cxx $(LEX_HEADERS)
+$(DIR_O)\LexVerilog.obj: ..\lexers\LexVerilog.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexVHDL.obj: ..\src\LexVHDL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexVHDL.obj: ..\lexers\LexVHDL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexYAML.obj: ..\src\LexYAML.cxx $(LEX_HEADERS)
+$(DIR_O)\LexYAML.obj: ..\lexers\LexYAML.cxx $(LEX_HEADERS)
 
 
 #--Autogenerated -- end of automatically generated section
 
+$(DIR_O)\LexerBase.obj: ../lexlib/LexerBase.cxx ../lexlib/LexerBase.h
+$(DIR_O)\LexerModule.obj: ../lexlib/LexerModule.cxx ../lexlib/LexerModule.h
+$(DIR_O)\LexerSimple.obj: ../lexlib/LexerSimple.cxx ../lexlib/LexerSimple.h
 $(DIR_O)\LineMarker.obj: ../src/LineMarker.cxx ../include/Platform.h \
   ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h
 $(DIR_O)\PerLine.obj: ../src/PerLine.cxx ../include/Platform.h \
@@ -490,13 +494,13 @@ $(DIR_O)\PositionCache.obj: ../src/Editor.cxx ../include/Platform.h ../include/S
   ../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 ../src/Selection.h ../src/PositionCache.h
-$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h
+$(DIR_O)\PropSetSimple.obj: ../lexlib/PropSetSimple.cxx ../include/Platform.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/Scintilla.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 \
@@ -504,7 +508,7 @@ $(DIR_O)\ScintillaBase.obj: ../src/ScintillaBase.cxx ../include/Platform.h \
   ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \
   ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/ScintillaBase.h
 $(DIR_O)\ScintillaBaseL.obj: ../src/ScintillaBase.cxx ../include/Platform.h \
-  ../include/Scintilla.h ../include/PropSet.h \
+  ../include/Scintilla.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 \
@@ -539,15 +543,12 @@ $(DIR_O)\Selection.obj: ../src/Selection.cxx ../include/Platform.h ../include/Sc
   ../src/Selection.h
 $(DIR_O)\Style.obj: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \
   ../src/Style.h
-$(DIR_O)\StyleContext.obj: ../src/StyleContext.cxx ../include/Platform.h \
-  ../include/PropSet.h ../include/Accessor.h \
-  ../src/StyleContext.h
+$(DIR_O)\StyleContext.obj: ../lexlib/StyleContext.cxx ../lexlib/Accessor.h \
+  ../lexlib/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/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/Accessor.h \
-  ../include/WindowAccessor.h ../include/Scintilla.h
+$(DIR_O)\WordList.obj: ../lexlib/WordList.cxx ../lexlib/WordList.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 c947422cf..23675b2f2 100644
--- a/win32/scintilla_vc6.mak
+++ b/win32/scintilla_vc6.mak
@@ -79,10 +79,10 @@ LDFLAGS=$(LDDEBUG) $(LDFLAGS)
 CXXFLAGS=$(CXXFLAGS) $(CXXNDEBUG)
 !ENDIF
 
-INCLUDEDIRS=-I../include -I../src
+INCLUDEDIRS=-I../include -I../src -I../lexlib
 CXXFLAGS=$(CXXFLAGS) $(INCLUDEDIRS)
 
-ALL:	$(COMPONENT) $(LEXCOMPONENT) $(DIR_O)\ScintillaWinS.obj $(DIR_O)\WindowAccessor.obj
+ALL:	$(COMPONENT) $(LEXCOMPONENT) $(DIR_O)\ScintillaWinS.obj
 
 clean:
 	-del /q $(DIR_O)\*.obj $(DIR_O)\*.pdb $(COMPONENT) $(LEXCOMPONENT) \
@@ -92,6 +92,7 @@ SOBJS=\
 	$(DIR_O)\AutoComplete.obj \
 	$(DIR_O)\CallTip.obj \
 	$(DIR_O)\CellBuffer.obj \
+	$(DIR_O)\CharacterSet.obj \
 	$(DIR_O)\CharClassify.obj \
 	$(DIR_O)\ContractionState.obj \
 	$(DIR_O)\Decoration.obj \
@@ -100,9 +101,10 @@ SOBJS=\
 	$(DIR_O)\Indicator.obj \
 	$(DIR_O)\KeyMap.obj \
 	$(DIR_O)\LineMarker.obj \
+	$(DIR_O)\PerLine.obj \
 	$(DIR_O)\PlatWin.obj \
 	$(DIR_O)\PositionCache.obj \
-	$(DIR_O)\PropSet.obj \
+	$(DIR_O)\PropSetSimple.obj \
 	$(DIR_O)\RESearch.obj \
 	$(DIR_O)\RunStyles.obj \
 	$(DIR_O)\ScintillaBase.obj \
@@ -111,8 +113,7 @@ SOBJS=\
 	$(DIR_O)\Style.obj \
 	$(DIR_O)\UniConversion.obj \
 	$(DIR_O)\ViewStyle.obj \
-	$(DIR_O)\XPM.obj \
-	$(DIR_O)\PerLine.obj
+	$(DIR_O)\XPM.obj
 
 #++Autogenerated -- run src/LexGen.py to regenerate
 #**LEXOBJS=\\\n\(\t$(DIR_O)\\\*.obj \\\n\)
@@ -199,24 +200,28 @@ LEXOBJS=\
 #--Autogenerated -- end of automatically generated section
 
 LOBJS=\
+	$(DIR_O)\Accessor.obj \
 	$(DIR_O)\AutoComplete.obj \
 	$(DIR_O)\CallTip.obj \
+	$(DIR_O)\Catalogue.obj \
 	$(DIR_O)\CellBuffer.obj \
+	$(DIR_O)\CharacterSet.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 \
 	$(DIR_O)\ExternalLexer.obj \
 	$(DIR_O)\Indicator.obj \
 	$(DIR_O)\KeyMap.obj \
-	$(DIR_O)\KeyWords.obj \
+	$(DIR_O)\LexerBase.obj \
+	$(DIR_O)\LexerModule.obj \
+	$(DIR_O)\LexerSimple.obj \
 	$(DIR_O)\LineMarker.obj \
 	$(DIR_O)\PerLine.obj \
 	$(DIR_O)\PlatWin.obj \
 	$(DIR_O)\PositionCache.obj \
-	$(DIR_O)\PropSet.obj \
+	$(DIR_O)\PropSetSimple.obj \
 	$(DIR_O)\RESearch.obj \
 	$(DIR_O)\RunStyles.obj \
 	$(DIR_O)\ScintillaBaseL.obj \
@@ -226,6 +231,7 @@ LOBJS=\
 	$(DIR_O)\StyleContext.obj \
 	$(DIR_O)\UniConversion.obj \
 	$(DIR_O)\ViewStyle.obj \
+	$(DIR_O)\WordList.obj \
 	$(DIR_O)\XPM.obj \
 	$(LEXOBJS)
 
@@ -252,9 +258,12 @@ $(LEXCOMPONENT): $(LOBJS) $(DIR_O)\ScintRes.res
 
 # Define how to build all the objects and what they depend on
 
-# Most of the source is in ..\src with a couple in this directory
 {..\src}.cxx{$(DIR_O)}.obj:
 	$(CC) $(CXXFLAGS) -c $(NAME)$@ $<
+{..\lexlib}.cxx{$(DIR_O)}.obj:
+	$(CC) $(CXXFLAGS) -c $(NAME)$@ $<
+{..\lexers}.cxx{$(DIR_O)}.obj:
+	$(CC) $(CXXFLAGS) -c $(NAME)$@ $<
 {.}.cxx{$(DIR_O)}.obj:
 	$(CC) $(CXXFLAGS) -c $(NAME)$@ $<
 
@@ -271,17 +280,19 @@ $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx
 # Dependencies
 
 # All lexers depend on this set of headers
-LEX_HEADERS=..\include\Platform.h ..\include\PropSet.h \
- ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h ..\src\StyleContext.h
+LEX_HEADERS= ..\include\ILexer.h ..\include\Scintilla.h ..\include\SciLexer.h \
+ ..\lexlib\Accessor.h ..\lexlib\CharacterSet.h ..\lexlib\LexAccessor.h \
+ ..\lexlib\LexerModule.h ..\lexlib\StyleContext.h
 
 $(DIR_O)\AutoComplete.obj: ../src/AutoComplete.cxx ../include/Platform.h \
-  ../include/PropSet.h ../src/AutoComplete.h
+  ../src/AutoComplete.h
+$(DIR_O)\Accessor.obj: ../lexlib/Accessor.cxx ../lexlib/Accessor.h
 $(DIR_O)\CallTip.obj: ../src/CallTip.cxx ../include/Platform.h \
   ../include/Scintilla.h ../src/CallTip.h
 $(DIR_O)\CellBuffer.obj: ../src/CellBuffer.cxx ../include/Platform.h \
   ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \
   ../src/Partitioning.h ../src/CellBuffer.h
+$(DIR_O)\CharacterSet.obj: ../lexlib/CharacterSet.cxx ../lexlib/CharacterSet.h
 $(DIR_O)\CharClassify.obj: ../src/CharClassify.cxx ../src/CharClassify.h
 $(DIR_O)\ContractionState.obj: ../src/ContractionState.cxx ../include/Platform.h \
   ../src/ContractionState.h
@@ -293,12 +304,6 @@ $(DIR_O)\Document.obj: ../src/Document.cxx ../include/Platform.h \
   ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \
   ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \
   ../src/RESearch.h ../src/PerLine.h
-$(DIR_O)\DocumentAccessor.obj: ../src/DocumentAccessor.cxx ../include/Platform.h \
-  ../include/PropSet.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 \
@@ -306,179 +311,178 @@ $(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h ../include/Scintill
   ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \
   ../src/Decoration.h ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/PositionCache.h
 $(DIR_O)\ExternalLexer.obj: ../src/ExternalLexer.cxx ../include/Platform.h \
-  ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \
-  ../include/Accessor.h ../src/DocumentAccessor.h \
-  ../include/KeyWords.h ../src/ExternalLexer.h
+  ../include/Scintilla.h ../include/SciLexer.h \
+  ../lexlib/Accessor.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
-$(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
 
 #++Autogenerated -- run src/LexGen.py to regenerate
-#**\n\($(DIR_O)\\\*.obj: ..\\src\\\*.cxx $(LEX_HEADERS)\n\n\)
+#**\n\($(DIR_O)\\\*.obj: ..\\lexers\\\*.cxx $(LEX_HEADERS)\n\n\)
 
-$(DIR_O)\LexAbaqus.obj: ..\src\LexAbaqus.cxx $(LEX_HEADERS)
+$(DIR_O)\LexAbaqus.obj: ..\lexers\LexAbaqus.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexAda.obj: ..\src\LexAda.cxx $(LEX_HEADERS)
+$(DIR_O)\LexAda.obj: ..\lexers\LexAda.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexAPDL.obj: ..\src\LexAPDL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexAPDL.obj: ..\lexers\LexAPDL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexAsm.obj: ..\src\LexAsm.cxx $(LEX_HEADERS)
+$(DIR_O)\LexAsm.obj: ..\lexers\LexAsm.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexAsn1.obj: ..\src\LexAsn1.cxx $(LEX_HEADERS)
+$(DIR_O)\LexAsn1.obj: ..\lexers\LexAsn1.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexASY.obj: ..\src\LexASY.cxx $(LEX_HEADERS)
+$(DIR_O)\LexASY.obj: ..\lexers\LexASY.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexAU3.obj: ..\src\LexAU3.cxx $(LEX_HEADERS)
+$(DIR_O)\LexAU3.obj: ..\lexers\LexAU3.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx $(LEX_HEADERS)
+$(DIR_O)\LexAVE.obj: ..\lexers\LexAVE.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexBaan.obj: ..\src\LexBaan.cxx $(LEX_HEADERS)
+$(DIR_O)\LexBaan.obj: ..\lexers\LexBaan.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexBash.obj: ..\src\LexBash.cxx $(LEX_HEADERS)
+$(DIR_O)\LexBash.obj: ..\lexers\LexBash.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexBasic.obj: ..\src\LexBasic.cxx $(LEX_HEADERS)
+$(DIR_O)\LexBasic.obj: ..\lexers\LexBasic.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexBullant.obj: ..\src\LexBullant.cxx $(LEX_HEADERS)
+$(DIR_O)\LexBullant.obj: ..\lexers\LexBullant.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexCaml.obj: ..\src\LexCaml.cxx $(LEX_HEADERS)
+$(DIR_O)\LexCaml.obj: ..\lexers\LexCaml.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexCLW.obj: ..\src\LexCLW.cxx $(LEX_HEADERS)
+$(DIR_O)\LexCLW.obj: ..\lexers\LexCLW.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexCmake.obj: ..\src\LexCmake.cxx $(LEX_HEADERS)
+$(DIR_O)\LexCmake.obj: ..\lexers\LexCmake.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexCOBOL.obj: ..\src\LexCOBOL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexCOBOL.obj: ..\lexers\LexCOBOL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexConf.obj: ..\src\LexConf.cxx $(LEX_HEADERS)
+$(DIR_O)\LexConf.obj: ..\lexers\LexConf.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexCPP.obj: ..\src\LexCPP.cxx $(LEX_HEADERS)
+$(DIR_O)\LexCPP.obj: ..\lexers\LexCPP.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexCrontab.obj: ..\src\LexCrontab.cxx $(LEX_HEADERS)
+$(DIR_O)\LexCrontab.obj: ..\lexers\LexCrontab.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexCsound.obj: ..\src\LexCsound.cxx $(LEX_HEADERS)
+$(DIR_O)\LexCsound.obj: ..\lexers\LexCsound.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexCSS.obj: ..\src\LexCSS.cxx $(LEX_HEADERS)
+$(DIR_O)\LexCSS.obj: ..\lexers\LexCSS.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexD.obj: ..\src\LexD.cxx $(LEX_HEADERS)
+$(DIR_O)\LexD.obj: ..\lexers\LexD.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS)
+$(DIR_O)\LexEiffel.obj: ..\lexers\LexEiffel.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexErlang.obj: ..\src\LexErlang.cxx $(LEX_HEADERS)
+$(DIR_O)\LexErlang.obj: ..\lexers\LexErlang.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS)
+$(DIR_O)\LexEScript.obj: ..\lexers\LexEScript.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexFlagship.obj: ..\src\LexFlagship.cxx $(LEX_HEADERS)
+$(DIR_O)\LexFlagship.obj: ..\lexers\LexFlagship.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS)
+$(DIR_O)\LexForth.obj: ..\lexers\LexForth.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexFortran.obj: ..\src\LexFortran.cxx $(LEX_HEADERS)
+$(DIR_O)\LexFortran.obj: ..\lexers\LexFortran.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexGAP.obj: ..\src\LexGAP.cxx $(LEX_HEADERS)
+$(DIR_O)\LexGAP.obj: ..\lexers\LexGAP.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexGui4Cli.obj: ..\src\LexGui4Cli.cxx $(LEX_HEADERS)
+$(DIR_O)\LexGui4Cli.obj: ..\lexers\LexGui4Cli.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexHaskell.obj: ..\src\LexHaskell.cxx $(LEX_HEADERS)
+$(DIR_O)\LexHaskell.obj: ..\lexers\LexHaskell.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS)
+$(DIR_O)\LexHTML.obj: ..\lexers\LexHTML.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexInno.obj: ..\src\LexInno.cxx $(LEX_HEADERS)
+$(DIR_O)\LexInno.obj: ..\lexers\LexInno.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexKix.obj: ..\src\LexKix.cxx $(LEX_HEADERS)
+$(DIR_O)\LexKix.obj: ..\lexers\LexKix.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexLisp.obj: ..\src\LexLisp.cxx $(LEX_HEADERS)
+$(DIR_O)\LexLisp.obj: ..\lexers\LexLisp.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexLout.obj: ..\src\LexLout.cxx $(LEX_HEADERS)
+$(DIR_O)\LexLout.obj: ..\lexers\LexLout.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexLua.obj: ..\src\LexLua.cxx $(LEX_HEADERS)
+$(DIR_O)\LexLua.obj: ..\lexers\LexLua.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexMagik.obj: ..\src\LexMagik.cxx $(LEX_HEADERS)
+$(DIR_O)\LexMagik.obj: ..\lexers\LexMagik.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexMarkdown.obj: ..\src\LexMarkdown.cxx $(LEX_HEADERS)
+$(DIR_O)\LexMarkdown.obj: ..\lexers\LexMarkdown.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexMatlab.obj: ..\src\LexMatlab.cxx $(LEX_HEADERS)
+$(DIR_O)\LexMatlab.obj: ..\lexers\LexMatlab.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexMetapost.obj: ..\src\LexMetapost.cxx $(LEX_HEADERS)
+$(DIR_O)\LexMetapost.obj: ..\lexers\LexMetapost.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexMMIXAL.obj: ..\src\LexMMIXAL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexMMIXAL.obj: ..\lexers\LexMMIXAL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexMPT.obj: ..\src\LexMPT.cxx $(LEX_HEADERS)
+$(DIR_O)\LexMPT.obj: ..\lexers\LexMPT.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexMSSQL.obj: ..\src\LexMSSQL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexMSSQL.obj: ..\lexers\LexMSSQL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexMySQL.obj: ..\src\LexMySQL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexMySQL.obj: ..\lexers\LexMySQL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexNimrod.obj: ..\src\LexNimrod.cxx $(LEX_HEADERS)
+$(DIR_O)\LexNimrod.obj: ..\lexers\LexNimrod.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexNsis.obj: ..\src\LexNsis.cxx $(LEX_HEADERS)
+$(DIR_O)\LexNsis.obj: ..\lexers\LexNsis.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexOpal.obj: ..\src\LexOpal.cxx $(LEX_HEADERS)
+$(DIR_O)\LexOpal.obj: ..\lexers\LexOpal.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexOthers.obj: ..\src\LexOthers.cxx $(LEX_HEADERS)
+$(DIR_O)\LexOthers.obj: ..\lexers\LexOthers.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexPascal.obj: ..\src\LexPascal.cxx $(LEX_HEADERS)
+$(DIR_O)\LexPascal.obj: ..\lexers\LexPascal.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexPB.obj: ..\src\LexPB.cxx $(LEX_HEADERS)
+$(DIR_O)\LexPB.obj: ..\lexers\LexPB.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexPerl.obj: ..\src\LexPerl.cxx $(LEX_HEADERS)
+$(DIR_O)\LexPerl.obj: ..\lexers\LexPerl.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexPLM.obj: ..\src\LexPLM.cxx $(LEX_HEADERS)
+$(DIR_O)\LexPLM.obj: ..\lexers\LexPLM.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexPOV.obj: ..\src\LexPOV.cxx $(LEX_HEADERS)
+$(DIR_O)\LexPOV.obj: ..\lexers\LexPOV.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexPowerPro.obj: ..\src\LexPowerPro.cxx $(LEX_HEADERS)
+$(DIR_O)\LexPowerPro.obj: ..\lexers\LexPowerPro.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexPowerShell.obj: ..\src\LexPowerShell.cxx $(LEX_HEADERS)
+$(DIR_O)\LexPowerShell.obj: ..\lexers\LexPowerShell.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexProgress.obj: ..\src\LexProgress.cxx $(LEX_HEADERS)
+$(DIR_O)\LexProgress.obj: ..\lexers\LexProgress.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexPS.obj: ..\src\LexPS.cxx $(LEX_HEADERS)
+$(DIR_O)\LexPS.obj: ..\lexers\LexPS.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS)
+$(DIR_O)\LexPython.obj: ..\lexers\LexPython.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexR.obj: ..\src\LexR.cxx $(LEX_HEADERS)
+$(DIR_O)\LexR.obj: ..\lexers\LexR.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexRebol.obj: ..\src\LexRebol.cxx $(LEX_HEADERS)
+$(DIR_O)\LexRebol.obj: ..\lexers\LexRebol.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS)
+$(DIR_O)\LexRuby.obj: ..\lexers\LexRuby.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexScriptol.obj: ..\src\LexScriptol.cxx $(LEX_HEADERS)
+$(DIR_O)\LexScriptol.obj: ..\lexers\LexScriptol.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexSmalltalk.obj: ..\src\LexSmalltalk.cxx $(LEX_HEADERS)
+$(DIR_O)\LexSmalltalk.obj: ..\lexers\LexSmalltalk.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexSML.obj: ..\src\LexSML.cxx $(LEX_HEADERS)
+$(DIR_O)\LexSML.obj: ..\lexers\LexSML.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexSorcus.obj: ..\src\LexSorcus.cxx $(LEX_HEADERS)
+$(DIR_O)\LexSorcus.obj: ..\lexers\LexSorcus.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexSpecman.obj: ..\src\LexSpecman.cxx $(LEX_HEADERS)
+$(DIR_O)\LexSpecman.obj: ..\lexers\LexSpecman.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexSpice.obj: ..\src\LexSpice.cxx $(LEX_HEADERS)
+$(DIR_O)\LexSpice.obj: ..\lexers\LexSpice.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexSQL.obj: ..\lexers\LexSQL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexTACL.obj: ..\src\LexTACL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexTACL.obj: ..\lexers\LexTACL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexTADS3.obj: ..\src\LexTADS3.cxx $(LEX_HEADERS)
+$(DIR_O)\LexTADS3.obj: ..\lexers\LexTADS3.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexTAL.obj: ..\src\LexTAL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexTAL.obj: ..\lexers\LexTAL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexTCL.obj: ..\src\LexTCL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexTCL.obj: ..\lexers\LexTCL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexTeX.obj: ..\src\LexTeX.cxx $(LEX_HEADERS)
+$(DIR_O)\LexTeX.obj: ..\lexers\LexTeX.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexVB.obj: ..\src\LexVB.cxx $(LEX_HEADERS)
+$(DIR_O)\LexVB.obj: ..\lexers\LexVB.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexVerilog.obj: ..\src\LexVerilog.cxx $(LEX_HEADERS)
+$(DIR_O)\LexVerilog.obj: ..\lexers\LexVerilog.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexVHDL.obj: ..\src\LexVHDL.cxx $(LEX_HEADERS)
+$(DIR_O)\LexVHDL.obj: ..\lexers\LexVHDL.cxx $(LEX_HEADERS)
 
-$(DIR_O)\LexYAML.obj: ..\src\LexYAML.cxx $(LEX_HEADERS)
+$(DIR_O)\LexYAML.obj: ..\lexers\LexYAML.cxx $(LEX_HEADERS)
 
 
 #--Autogenerated -- end of automatically generated section
 
+$(DIR_O)\LexerBase.obj: ../lexlib/LexerBase.cxx ../lexlib/LexerBase.h
+$(DIR_O)\LexerModule.obj: ../lexlib/LexerModule.cxx ../lexlib/LexerModule.h
+$(DIR_O)\LexerSimple.obj: ../lexlib/LexerSimple.cxx ../lexlib/LexerSimple.h
 $(DIR_O)\LineMarker.obj: ../src/LineMarker.cxx ../include/Platform.h \
   ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h
 $(DIR_O)\PerLine.obj: ../src/PerLine.cxx ../include/Platform.h \
@@ -492,13 +496,13 @@ $(DIR_O)\PositionCache.obj: ../src/Editor.cxx ../include/Platform.h ../include/S
   ../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 ../src/Selection.h ../src/PositionCache.h
-$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h
+$(DIR_O)\PropSetSimple.obj: ../lexlib/PropSetSimple.cxx ../include/Platform.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/Scintilla.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 \
@@ -506,7 +510,7 @@ $(DIR_O)\ScintillaBase.obj: ../src/ScintillaBase.cxx ../include/Platform.h \
   ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \
   ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/ScintillaBase.h
 $(DIR_O)\ScintillaBaseL.obj: ../src/ScintillaBase.cxx ../include/Platform.h \
-  ../include/Scintilla.h ../include/PropSet.h \
+  ../include/Scintilla.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 \
@@ -541,15 +545,12 @@ $(DIR_O)\Selection.obj: ../src/Selection.cxx ../include/Platform.h ../include/Sc
   ../src/Selection.h
 $(DIR_O)\Style.obj: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \
   ../src/Style.h
-$(DIR_O)\StyleContext.obj: ../src/StyleContext.cxx ../include/Platform.h \
-  ../include/PropSet.h ../include/Accessor.h \
-  ../src/StyleContext.h
+$(DIR_O)\StyleContext.obj: ../lexlib/StyleContext.cxx ../lexlib/Accessor.h \
+  ../lexlib/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/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/Accessor.h \
-  ../include/WindowAccessor.h ../include/Scintilla.h
+$(DIR_O)\WordList.obj: ../lexlib/WordList.cxx ../lexlib/WordList.h
 $(DIR_O)\XPM.obj: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h