Updated definitions for LUA and to separate generatable definitions from

those done by hand.

2 files changed, 38 insertions, 21 deletions

diff --git a/include/Scintilla.h b/include/Scintilla.h
index 9281ae2b5..7e31d5db1 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -19,6 +19,8 @@ void Scintilla_RegisterClasses(HINSTANCE hInstance);
 #endif
 #endif
 
+// Start of section which could be automatically generated from Scintilla.iface
+
 #define INVALID_POSITION -1 
 
 // Define start of Scintilla messages to be greater than all edit (EM_*) messages
@@ -101,8 +103,6 @@ void Scintilla_RegisterClasses(HINSTANCE hInstance);
 #define SC_MARKNUM_FOLDER 30
 #define SC_MARKNUM_FOLDEROPEN 31
 
-#define SC_MASK_FOLDERS ((1<<SC_MARKNUM_FOLDER) | (1<<SC_MARKNUM_FOLDEROPEN))
-
 #define SC_MARGIN_SYMBOL 0
 #define SC_MARGIN_NUMBER 1
 
@@ -368,6 +368,27 @@ typedef void (tMacroRecorder)(UINT iMessage, WPARAM wParam, LPARAM lParam,
 
 #define SC_MODEVENTMASKALL 0xF77
 
+#define SCN_STYLENEEDED 2000
+#define SCN_CHARADDED 2001
+#define SCN_SAVEPOINTREACHED 2002
+#define SCN_SAVEPOINTLEFT 2003
+#define SCN_MODIFYATTEMPTRO 2004
+// GTK+ Specific to work around focus and accelerator problems:
+#define SCN_KEY 2005
+#define SCN_DOUBLECLICK 2006
+#define SCN_UPDATEUI 2007
+// The old name for SCN_UPDATEUI:
+#define SCN_CHECKBRACE 2007
+#define SCN_MODIFIED 2008
+// Optional module for macro recording
+#ifdef MACRO_SUPPORT
+#define SCN_MACRORECORD 2009
+#endif
+#define SCN_MARGINCLICK 2010
+#define SCN_NEEDSHOWN 2011
+
+// End of definitions that could be generated from Scintilla.iface
+
 struct SCNotification {
 	NMHDR nmhdr;
 	int position;			// SCN_STYLENEEDED, SCN_MODIFIED
@@ -388,24 +409,7 @@ struct SCNotification {
 	int margin;	// SCN_MARGINCLICK
 };
 
-#define SCN_STYLENEEDED 2000
-#define SCN_CHARADDED 2001
-#define SCN_SAVEPOINTREACHED 2002
-#define SCN_SAVEPOINTLEFT 2003
-#define SCN_MODIFYATTEMPTRO 2004
-// GTK+ Specific to work around focus and accelerator problems:
-#define SCN_KEY 2005
-#define SCN_DOUBLECLICK 2006
-#define SCN_UPDATEUI 2007
-// The old name for SCN_UPDATEUI:
-#define SCN_CHECKBRACE 2007
-#define SCN_MODIFIED 2008
-// Optional module for macro recording
-#ifdef MACRO_SUPPORT
-#define SCN_MACRORECORD 2009
-#endif
-#define SCN_MARGINCLICK 2010
-#define SCN_NEEDSHOWN 2011
+#define SC_MASK_FOLDERS ((1<<SC_MARKNUM_FOLDER) | (1<<SC_MARKNUM_FOLDEROPEN))
 
 // Deprecation section listing all API features that are deprecated and will
 // will be removed completely in a future version.
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 7bb5c32e0..f1c24b1bf 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -187,7 +187,6 @@ val SC_MARK_PLUS=8
 
 val SC_MARKNUM_FOLDER=30
 val SC_MARKNUM_FOLDEROPEN=31
-##val SC_MASK_FOLDERS=1<<SC_MARKNUM_FOLDER | 1<<SC_MARKNUM_FOLDEROPEN 
 
 # Set the symbol used for a particular marker number.
 fun void MarkerDefine=2040(int markerNumber, int markerSymbol)
@@ -804,6 +803,7 @@ val SCLEX_MAKEFILE=11
 val SCLEX_BATCH=12
 val SCLEX_XCODE=13
 val SCLEX_LATEX=14
+val SCLEX_LUA=15
 val SCE_P_DEFAULT=0
 val SCE_P_COMMENTLINE=1
 val SCE_P_NUMBER=2
@@ -941,6 +941,19 @@ val SCE_L_COMMAND=1
 val SCE_L_TAG=2
 val SCE_L_MATH=3
 val SCE_L_COMMENT=4
+val SCE_LUA_DEFAULT=0
+val SCE_LUA_COMMENT=1
+val SCE_LUA_COMMENTLINE=2
+val SCE_LUA_COMMENTDOC=3
+val SCE_LUA_NUMBER=4
+val SCE_LUA_WORD=5
+val SCE_LUA_STRING=6
+val SCE_LUA_CHARACTER=7
+val SCE_LUA_LITERALSTRING=8
+val SCE_LUA_PREPROCESSOR=9
+val SCE_LUA_OPERATOR=10
+val SCE_LUA_IDENTIFIER=11
+val SCE_LUA_STRINGEOL=12
 
 ################################################
 # From WinDefs.h