Ruby support.

9 files changed, 20 insertions, 3 deletions

diff --git a/gtk/makefile b/gtk/makefile
index ab58ce2a8..c5464fcee 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -27,7 +27,7 @@ endif
 
 LEXOBJS=LexAda.o LexAVE.o LexConf.o LexCPP.o LexHTML.o \
 	LexLisp.o LexLua.o LexOthers.o LexPascal.o LexPerl.o \
-	LexPython.o LexSQL.o LexVB.o
+	LexPython.o LexRuby.o LexSQL.o LexVB.o
 
 # The LEXOBJS have to be treated specially as the functions in them are not called from external code
 
diff --git a/gtk/scintilla.mak b/gtk/scintilla.mak
index 8ed33ac6b..28bb28e84 100644
--- a/gtk/scintilla.mak
+++ b/gtk/scintilla.mak
@@ -125,6 +125,7 @@ LEXOBJS=\
 	$(DIR_O)\LexPascal.obj \
 	$(DIR_O)\LexPerl.obj \
 	$(DIR_O)\LexPython.obj \
+	$(DIR_O)\LexRuby.obj \
 	$(DIR_O)\LexSQL.obj \
 	$(DIR_O)\LexVB.obj
 
diff --git a/include/SciLexer.h b/include/SciLexer.h
index ea2987529..72f9cd5ea 100644
--- a/include/SciLexer.h
+++ b/include/SciLexer.h
@@ -36,6 +36,7 @@
 #define SCLEX_AVE 19
 #define SCLEX_ADA 20
 #define SCLEX_LISP 21
+#define SCLEX_RUBY 22
 #define SCLEX_AUTOMATIC 1000
 #define SCE_P_DEFAULT 0
 #define SCE_P_COMMENTLINE 1
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 898faaee2..3a0fa61f9 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -1184,6 +1184,7 @@ val SCLEX_PASCAL=18
 val SCLEX_AVE=19
 val SCLEX_ADA=20
 val SCLEX_LISP=21
+val SCLEX_RUBY=22
 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a 
 # value assigned in sequence from SCLEX_AUTOMATIC+1.
 val SCLEX_AUTOMATIC=1000
diff --git a/vcbuild/SciLexer.dsp b/vcbuild/SciLexer.dsp
index 81cf664c8..af8b12c8d 100644
--- a/vcbuild/SciLexer.dsp
+++ b/vcbuild/SciLexer.dsp
@@ -178,6 +178,10 @@ SOURCE=..\src\LexPython.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\LexRuby.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\LexSQL.cxx
 # End Source File
 # Begin Source File
diff --git a/win32/deps.mak b/win32/deps.mak
index c81935b93..f46cfa7ef 100644
--- a/win32/deps.mak
+++ b/win32/deps.mak
@@ -51,7 +51,7 @@ LexerManager.o: ../src/LexerManager.cxx ..\include\SciLexer.h \
 LexHTML.o: ../src/LexHTML.cxx ..\include\Platform.h \
  ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
  ..\include\KeyWords.h ..\include\Scintilla.h ..\include\SciLexer.h
-LexLISP.o: ../src/LexLISP.cxx ..\include\Platform.h \
+LexLisp.o: ../src/LexLisp.cxx ..\include\Platform.h \
  ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
  ..\include\KeyWords.h ..\include\Scintilla.h ..\include\SciLexer.h
 LexLua.o: ../src/LexLua.cxx ..\include\Platform.h ..\include\PropSet.h \
@@ -69,6 +69,9 @@ LexPerl.o: ../src/LexPerl.cxx ..\include\Platform.h \
 LexPython.o: ../src/LexPython.cxx ..\include\Platform.h \
  ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
  ..\include\KeyWords.h ..\include\Scintilla.h ..\include\SciLexer.h
+LexRuby.o: ../src/LexRuby.cxx ..\include\Platform.h \
+ ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
+ ..\include\KeyWords.h ..\include\Scintilla.h ..\include\SciLexer.h
 LexSQL.o: ../src/LexSQL.cxx ..\include\Platform.h ..\include\PropSet.h \
  ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \
  ..\include\Scintilla.h ..\include\SciLexer.h
diff --git a/win32/makefile b/win32/makefile
index ff01961fc..d177302b2 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -39,7 +39,7 @@ deps:
 
 LEXOBJS=LexAda.o LexAVE.o LexConf.o LexCPP.o LexHTML.o \
 	LexLisp.o LexLua.o LexOthers.o LexPascal.o LexPerl.o \
-	LexPython.o LexSQL.o LexVB.o
+	LexPython.o LexRuby.o LexSQL.o LexVB.o
 
 SOBJS	= ScintillaWin.o ScintillaBase.o Editor.o Document.o \
 	ContractionState.o CellBuffer.o CallTip.o \
diff --git a/win32/objs.mak b/win32/objs.mak
index af07d957e..57bb8b8cf 100644
--- a/win32/objs.mak
+++ b/win32/objs.mak
@@ -62,6 +62,10 @@ $(DIR_O)\LexPerl.obj: ..\src\LexPerl.cxx ..\include\Platform.h ..\include\PropSe
 $(DIR_O)\LexPython.obj: ..\src\LexPython.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
  ..\include\Scintilla.h ..\include\SciLexer.h 
 	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
+
+$(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
+ ..\include\Scintilla.h ..\include\SciLexer.h 
+	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $(NAMEFLAG)$@ ..\src\$(@B).cxx
  
 $(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
  ..\include\Scintilla.h ..\include\SciLexer.h 
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index 1c40cdb66..f9a757646 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -114,6 +114,7 @@ LEXOBJS=\
 	$(DIR_O)\LexPascal.obj \
 	$(DIR_O)\LexPerl.obj \
 	$(DIR_O)\LexPython.obj \
+	$(DIR_O)\LexRuby.obj \		
 	$(DIR_O)\LexSQL.obj \
 	$(DIR_O)\LexVB.obj
 
@@ -236,6 +237,8 @@ $(DIR_O)\LexPerl.obj: ..\src\LexPerl.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS)
 
+$(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS)
+
 $(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexVB.obj: ..\src\LexVB.cxx $(LEX_HEADERS)