SciLexer.h and Scintilla.h now generated from Scintilla.iface.

Scintilla.iface updated to be current.

3 files changed, 366 insertions, 446 deletions

diff --git a/include/SciLexer.h b/include/SciLexer.h
index f6253d30d..204c96090 100644
--- a/include/SciLexer.h
+++ b/include/SciLexer.h
@@ -8,6 +8,7 @@
 
 // SciLexer features - not in standard Scintilla
 
+//++Autogenerated -- start of section automatically generated from Scintilla.iface
 #define SCLEX_CONTAINER 0
 #define SCLEX_NULL 1
 #define SCLEX_PYTHON 2
@@ -25,8 +26,6 @@
 #define SCLEX_LATEX 14
 #define SCLEX_LUA 15
 #define SCLEX_DIFF 16
-
-// Lexical states for SCLEX_PYTHON
 #define SCE_P_DEFAULT 0
 #define SCE_P_COMMENTLINE 1
 #define SCE_P_NUMBER 2
@@ -41,8 +40,6 @@
 #define SCE_P_IDENTIFIER 11
 #define SCE_P_COMMENTBLOCK 12
 #define SCE_P_STRINGEOL 13
-
-// Lexical states for SCLEX_CPP, SCLEX_VB
 #define SCE_C_DEFAULT 0
 #define SCE_C_COMMENT 1
 #define SCE_C_COMMENTLINE 2
@@ -57,8 +54,6 @@
 #define SCE_C_IDENTIFIER 11
 #define SCE_C_STRINGEOL 12
 #define SCE_C_VERBATIM 13
-
-// Lexical states for SCLEX_HTML, SCLEX_XML
 #define SCE_H_DEFAULT 0
 #define SCE_H_TAG 1
 #define SCE_H_TAGUNKNOWN 2
@@ -70,7 +65,6 @@
 #define SCE_H_OTHER 8
 #define SCE_H_COMMENT 9
 #define SCE_H_ENTITY 10
-// XML and ASP
 #define SCE_H_TAGEND 11
 #define SCE_H_XMLSTART 12
 #define SCE_H_XMLEND 13
@@ -79,9 +73,7 @@
 #define SCE_H_ASPAT 16
 #define SCE_H_CDATA 17
 #define SCE_H_QUESTION 18
-// More HTML
 #define SCE_H_VALUE 19
-// Embedded Javascript
 #define SCE_HJ_START 40
 #define SCE_HJ_DEFAULT 41
 #define SCE_HJ_COMMENT 42
@@ -94,7 +86,6 @@
 #define SCE_HJ_SINGLESTRING 49
 #define SCE_HJ_SYMBOLS 50
 #define SCE_HJ_STRINGEOL 51
-// ASP Javascript
 #define SCE_HJA_START 55
 #define SCE_HJA_DEFAULT 56
 #define SCE_HJA_COMMENT 57
@@ -107,7 +98,6 @@
 #define SCE_HJA_SINGLESTRING 64
 #define SCE_HJA_SYMBOLS 65
 #define SCE_HJA_STRINGEOL 66
-// Embedded VBScript
 #define SCE_HB_START 70
 #define SCE_HB_DEFAULT 71
 #define SCE_HB_COMMENTLINE 72
@@ -116,7 +106,6 @@
 #define SCE_HB_STRING 75
 #define SCE_HB_IDENTIFIER 76
 #define SCE_HB_STRINGEOL 77
-// ASP VBScript
 #define SCE_HBA_START 80
 #define SCE_HBA_DEFAULT 81
 #define SCE_HBA_COMMENTLINE 82
@@ -125,7 +114,6 @@
 #define SCE_HBA_STRING 85
 #define SCE_HBA_IDENTIFIER 86
 #define SCE_HBA_STRINGEOL 87
-// Embedded Python
 #define SCE_HP_START 90
 #define SCE_HP_DEFAULT 91
 #define SCE_HP_COMMENTLINE 92
@@ -139,7 +127,6 @@
 #define SCE_HP_DEFNAME 100
 #define SCE_HP_OPERATOR 101
 #define SCE_HP_IDENTIFIER 102
-// ASP Python
 #define SCE_HPA_START 105
 #define SCE_HPA_DEFAULT 106
 #define SCE_HPA_COMMENTLINE 107
@@ -153,7 +140,6 @@
 #define SCE_HPA_DEFNAME 115
 #define SCE_HPA_OPERATOR 116
 #define SCE_HPA_IDENTIFIER 117
-// PHP
 #define SCE_HPHP_DEFAULT 118
 #define SCE_HPHP_HSTRING 119
 #define SCE_HPHP_SIMPLESTRING 120
@@ -163,8 +149,6 @@
 #define SCE_HPHP_COMMENT 124
 #define SCE_HPHP_COMMENTLINE 125
 #define SCE_HPHP_STRINGEOL 126
-
-// Lexical states for SCLEX_PERL
 #define SCE_PL_DEFAULT 0
 #define SCE_PL_HERE 1
 #define SCE_PL_COMMENTLINE 2
@@ -187,15 +171,11 @@
 #define SCE_PL_LONGQUOTE 19
 #define SCE_PL_BACKTICKS 20
 #define SCE_PL_DATASECTION 21
- 
-// Lexical states for SCLEX_LATEX
 #define SCE_L_DEFAULT 0
 #define SCE_L_COMMAND 1
 #define SCE_L_TAG 2
 #define SCE_L_MATH 3
 #define SCE_L_COMMENT 4
-
-// Lexical states for SCLEX_LUA
 #define SCE_LUA_DEFAULT 0
 #define SCE_LUA_COMMENT 1
 #define SCE_LUA_COMMENTLINE 2
@@ -209,8 +189,6 @@
 #define SCE_LUA_OPERATOR 10
 #define SCE_LUA_IDENTIFIER 11
 #define SCE_LUA_STRINGEOL 12
-
-// Lexical states for SCLEX_ERRORLIST
 #define SCE_ERR_DEFAULT 0
 #define SCE_ERR_PYTHON 1
 #define SCE_ERR_GCC 2
@@ -218,5 +196,6 @@
 #define SCE_ERR_CMD 4
 #define SCE_ERR_BORLAND 5
 #define SCE_ERR_PERL 6
+//--Autogenerated -- end of section automatically generated from Scintilla.iface
 
 #endif
diff --git a/include/Scintilla.h b/include/Scintilla.h
index e1cf56a36..68c14e469 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -17,72 +17,57 @@ void Scintilla_RegisterClasses(HINSTANCE hInstance);
 
 typedef long (*SciFnDirect)(long ptr, unsigned int iMessage, unsigned long wParam, long lParam);
 
-// 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
-// as many EM_ messages can be used.
+//++Autogenerated -- start of section automatically generated from Scintilla.iface
+#define INVALID_POSITION -1
 #define SCI_START 2000
 #define SCI_OPTIONAL_START 3000
 #define SCI_LEXER_START 4000
-
-#define SCI_ADDTEXT SCI_START + 1
-#define SCI_ADDSTYLEDTEXT SCI_START + 2
-#define SCI_INSERTTEXT SCI_START + 3
-#define SCI_CLEARALL SCI_START + 4
-#define SCI_CLEARDOCUMENTSTYLE SCI_START + 5
-#define SCI_GETLENGTH SCI_START + 6
-#define SCI_GETCHARAT SCI_START + 7
-#define SCI_GETCURRENTPOS SCI_START + 8
-#define SCI_GETANCHOR SCI_START + 9
-#define SCI_GETSTYLEAT SCI_START + 10
-
-#define SCI_REDO SCI_START + 11
-#define SCI_SETUNDOCOLLECTION SCI_START + 12
-#define SCI_SELECTALL SCI_START + 13
-#define SCI_SETSAVEPOINT SCI_START + 14
-#define SCI_GETSTYLEDTEXT SCI_START + 15
-#define SCI_CANREDO SCI_START + 16
-#define SCI_MARKERLINEFROMHANDLE SCI_START + 17
-#define SCI_MARKERDELETEHANDLE SCI_START + 18
-#define SCI_GETUNDOCOLLECTION SCI_START + 19
-
+#define SCI_ADDTEXT 2001
+#define SCI_ADDSTYLEDTEXT 2002
+#define SCI_INSERTTEXT 2003
+#define SCI_CLEARALL 2004
+#define SCI_CLEARDOCUMENTSTYLE 2005
+#define SCI_GETLENGTH 2006
+#define SCI_GETCHARAT 2007
+#define SCI_GETCURRENTPOS 2008
+#define SCI_GETANCHOR 2009
+#define SCI_GETSTYLEAT 2010
+#define SCI_REDO 2011
+#define SCI_SETUNDOCOLLECTION 2012
+#define SCI_SELECTALL 2013
+#define SCI_SETSAVEPOINT 2014
+#define SCI_GETSTYLEDTEXT 2015
+#define SCI_CANREDO 2016
+#define SCI_MARKERLINEFROMHANDLE 2017
+#define SCI_MARKERDELETEHANDLE 2018
+#define SCI_GETUNDOCOLLECTION 2019
 #define SCWS_INVISIBLE 0
 #define SCWS_VISIBLEALWAYS 1
 #define SCWS_VISIBLEAFTERINDENT 2
-	
-#define SCI_GETVIEWWS SCI_START + 20
-#define SCI_SETVIEWWS SCI_START + 21
-#define SCI_POSITIONFROMPOINT SCI_START + 22
-#define SCI_GOTOLINE SCI_START + 24
-#define SCI_GOTOPOS SCI_START + 25
-#define SCI_SETANCHOR SCI_START + 26
-#define SCI_GETCURLINE SCI_START + 27
-#define SCI_GETENDSTYLED SCI_START + 28
-#define SCI_CONVERTEOLS SCI_START + 29
-
-#define SCI_GETEOLMODE SCI_START + 30
-#define SCI_SETEOLMODE SCI_START + 31
-
+#define SCI_GETVIEWWS 2020
+#define SCI_SETVIEWWS 2021
+#define SCI_POSITIONFROMPOINT 2022
+#define SCI_GOTOLINE 2024
+#define SCI_GOTOPOS 2025
+#define SCI_SETANCHOR 2026
+#define SCI_GETCURLINE 2027
+#define SCI_GETENDSTYLED 2028
+#define SCI_CONVERTEOLS 2029
 #define SC_EOL_CRLF 0
 #define SC_EOL_CR 1
 #define SC_EOL_LF 2
-
-#define SCI_STARTSTYLING SCI_START + 32
-#define SCI_SETSTYLING SCI_START + 33
-
-// This is the same value as CP_UTF8 in Windows
+#define SCI_GETEOLMODE 2030
+#define SCI_SETEOLMODE 2031
+#define SCI_STARTSTYLING 2032
+#define SCI_SETSTYLING 2033
+#define SCI_GETBUFFEREDDRAW 2034
+#define SCI_SETBUFFEREDDRAW 2035
+#define SCI_SETTABWIDTH 2036
+#define SCI_GETTABWIDTH 2121
 #define SC_CP_UTF8 65001
-
-#define SCI_GETBUFFEREDDRAW SCI_START + 34
-#define SCI_SETBUFFEREDDRAW SCI_START + 35
-#define SCI_SETTABWIDTH SCI_START + 36
-#define SCI_SETCODEPAGE SCI_START + 37
-#define SCI_SETUSEPALETTE SCI_START + 39
-
+#define SCI_SETCODEPAGE 2037
+#define SCI_SETUSEPALETTE 2039
 #define MARKER_MAX 31
-
 #define SC_MARK_CIRCLE 0
 #define SC_MARK_ROUNDRECT 1
 #define SC_MARK_ARROW 2
@@ -92,32 +77,27 @@ typedef long (*SciFnDirect)(long ptr, unsigned int iMessage, unsigned long wPara
 #define SC_MARK_ARROWDOWN 6
 #define SC_MARK_MINUS 7
 #define SC_MARK_PLUS 8
-
-#define SCI_MARKERDEFINE SCI_START + 40
-#define SCI_MARKERSETFORE SCI_START + 41
-#define SCI_MARKERSETBACK SCI_START + 42
-#define SCI_MARKERADD SCI_START + 43
-#define SCI_MARKERDELETE SCI_START + 44
-#define SCI_MARKERDELETEALL SCI_START + 45
-#define SCI_MARKERGET SCI_START + 46
-#define SCI_MARKERNEXT SCI_START + 47
-#define SCI_MARKERPREVIOUS SCI_START + 48
-
 #define SC_MARKNUM_FOLDER 30
 #define SC_MARKNUM_FOLDEROPEN 31
-
+#define SCI_MARKERDEFINE 2040
+#define SCI_MARKERSETFORE 2041
+#define SCI_MARKERSETBACK 2042
+#define SCI_MARKERADD 2043
+#define SCI_MARKERDELETE 2044
+#define SCI_MARKERDELETEALL 2045
+#define SCI_MARKERGET 2046
+#define SCI_MARKERNEXT 2047
+#define SCI_MARKERPREVIOUS 2048
 #define SC_MARGIN_SYMBOL 0
 #define SC_MARGIN_NUMBER 1
-
-#define SCI_SETMARGINTYPEN SCI_START + 240
-#define SCI_GETMARGINTYPEN SCI_START + 241
-#define SCI_SETMARGINWIDTHN SCI_START + 242
-#define SCI_GETMARGINWIDTHN SCI_START + 243
-#define SCI_SETMARGINMASKN SCI_START + 244
-#define SCI_GETMARGINMASKN SCI_START + 245
-#define SCI_SETMARGINSENSITIVEN SCI_START + 246
-#define SCI_GETMARGINSENSITIVEN SCI_START + 247
-
+#define SCI_SETMARGINTYPEN 2240
+#define SCI_GETMARGINTYPEN 2241
+#define SCI_SETMARGINWIDTHN 2242
+#define SCI_GETMARGINWIDTHN 2243
+#define SCI_SETMARGINMASKN 2244
+#define SCI_GETMARGINMASKN 2245
+#define SCI_SETMARGINSENSITIVEN 2246
+#define SCI_GETMARGINSENSITIVEN 2247
 #define STYLE_DEFAULT 32
 #define STYLE_LINENUMBER 33
 #define STYLE_BRACELIGHT 34
@@ -125,7 +105,6 @@ typedef long (*SciFnDirect)(long ptr, unsigned int iMessage, unsigned long wPara
 #define STYLE_CONTROLCHAR 36
 #define STYLE_INDENTGUIDE 37
 #define STYLE_MAX 127
-
 #define SC_CHARSET_ANSI 0
 #define SC_CHARSET_DEFAULT 1
 #define SC_CHARSET_BALTIC 186
@@ -145,295 +124,247 @@ typedef long (*SciFnDirect)(long ptr, unsigned int iMessage, unsigned long wPara
 #define SC_CHARSET_ARABIC 178
 #define SC_CHARSET_VIETNAMESE 163
 #define SC_CHARSET_THAI 222
-
-#define SCI_STYLECLEARALL SCI_START + 50
-#define SCI_STYLESETFORE SCI_START + 51
-#define SCI_STYLESETBACK SCI_START + 52
-#define SCI_STYLESETBOLD SCI_START + 53
-#define SCI_STYLESETITALIC SCI_START + 54
-#define SCI_STYLESETSIZE SCI_START + 55
-#define SCI_STYLESETFONT SCI_START + 56
-#define SCI_STYLESETEOLFILLED SCI_START + 57
-#define SCI_STYLERESETDEFAULT SCI_START + 58
-#define SCI_STYLESETUNDERLINE SCI_START + 59
-#define SCI_STYLESETCHARACTERSET SCI_START + 66
-#define SCI_STYLESETVISIBLE SCI_START + 74
-
-#define SCI_SETSELFORE SCI_START + 67
-#define SCI_SETSELBACK SCI_START + 68
-#define SCI_SETCARETFORE SCI_START + 69
-
-#define SCI_ASSIGNCMDKEY SCI_START + 70
-#define SCI_CLEARCMDKEY SCI_START + 71
-#define SCI_CLEARALLCMDKEYS SCI_START + 72
-
-#define SCI_SETSTYLINGEX SCI_START + 73
-
-#define SCI_GETCARETPERIOD SCI_START + 75
-#define SCI_SETCARETPERIOD SCI_START + 76
-#define SCI_SETWORDCHARS SCI_START + 77
-
-#define SCI_BEGINUNDOACTION SCI_START + 78
-#define SCI_ENDUNDOACTION SCI_START + 79
-
+#define SCI_STYLECLEARALL 2050
+#define SCI_STYLESETFORE 2051
+#define SCI_STYLESETBACK 2052
+#define SCI_STYLESETBOLD 2053
+#define SCI_STYLESETITALIC 2054
+#define SCI_STYLESETSIZE 2055
+#define SCI_STYLESETFONT 2056
+#define SCI_STYLESETEOLFILLED 2057
+#define SCI_STYLERESETDEFAULT 2058
+#define SCI_STYLESETUNDERLINE 2059
+#define SCI_STYLESETCHARACTERSET 2066
+#define SCI_SETSELFORE 2067
+#define SCI_SETSELBACK 2068
+#define SCI_SETCARETFORE 2069
+#define SCI_ASSIGNCMDKEY 2070
+#define SCI_CLEARCMDKEY 2071
+#define SCI_CLEARALLCMDKEYS 2072
+#define SCI_SETSTYLINGEX 2073
+#define SCI_STYLESETVISIBLE 2074
+#define SCI_GETCARETPERIOD 2075
+#define SCI_SETCARETPERIOD 2076
+#define SCI_SETWORDCHARS 2077
+#define SCI_BEGINUNDOACTION 2078
+#define SCI_ENDUNDOACTION 2079
 #define INDIC_MAX 7
-
 #define INDIC_PLAIN 0
 #define INDIC_SQUIGGLE 1
 #define INDIC_TT 2
 #define INDIC_DIAGONAL 3
 #define INDIC_STRIKE 4
-
 #define INDIC0_MASK 32
 #define INDIC1_MASK 64
 #define INDIC2_MASK 128
-#define INDICS_MASK (INDIC0_MASK | INDIC1_MASK | INDIC2_MASK)
-
-#define SCI_INDICSETSTYLE SCI_START + 80
-#define SCI_INDICGETSTYLE SCI_START + 81
-#define SCI_INDICSETFORE SCI_START + 82
-#define SCI_INDICGETFORE SCI_START + 83
-
-#define SCI_SETSTYLEBITS SCI_START + 90
-#define SCI_GETSTYLEBITS SCI_START + 91
-#define SCI_SETLINESTATE SCI_START + 92
-#define SCI_GETLINESTATE SCI_START + 93
-#define SCI_GETMAXLINESTATE SCI_START + 94
-
-#define SCI_AUTOCSHOW SCI_START + 100
-#define SCI_AUTOCCANCEL SCI_START + 101
-#define SCI_AUTOCACTIVE SCI_START + 102
-#define SCI_AUTOCPOSSTART SCI_START + 103
-#define SCI_AUTOCCOMPLETE SCI_START + 104
-#define SCI_AUTOCSTOPS SCI_START + 105
-#define SCI_AUTOCSETSEPARATOR SCI_START + 106
-#define SCI_AUTOCGETSEPARATOR SCI_START + 107
-#define SCI_AUTOCSELECT SCI_START + 108
-#define SCI_AUTOCSETCANCELATSTART SCI_START + 110
-#define SCI_AUTOCGETCANCELATSTART SCI_START + 111
-#define SCI_AUTOCSETFILLUPS SCI_START + 112
-#define SCI_AUTOCSETCHOOSESINGLE SCI_START + 113
-#define SCI_AUTOCGETCHOOSESINGLE SCI_START + 114
-#define SCI_AUTOCSETIGNORECASE SCI_START + 115
-#define SCI_AUTOCGETIGNORECASE SCI_START + 116
-
-#define SCI_GETTABWIDTH SCI_START + 121
-#define SCI_SETINDENT SCI_START + 122
-#define SCI_GETINDENT SCI_START + 123
-#define SCI_SETUSETABS SCI_START + 124
-#define SCI_GETUSETABS SCI_START + 125
-#define SCI_SETLINEINDENTATION SCI_START + 126
-#define SCI_GETLINEINDENTATION SCI_START + 127
-#define SCI_GETLINEINDENTPOSITION SCI_START + 128
-#define SCI_GETCOLUMN SCI_START + 129
-
-#define SCI_SETHSCROLLBAR SCI_START + 130
-#define SCI_GETHSCROLLBAR SCI_START + 131
-#define SCI_SETINDENTATIONGUIDES SCI_START + 132
-#define SCI_GETINDENTATIONGUIDES SCI_START + 133
-#define SCI_SETHIGHLIGHTGUIDE SCI_START + 134
-#define SCI_GETHIGHLIGHTGUIDE SCI_START + 135
-#define SCI_GETLINEENDPOSITION SCI_START + 136
-#define SCI_GETCODEPAGE SCI_START + 137
-#define SCI_GETCARETFORE SCI_START + 138
-#define SCI_GETUSEPALETTE SCI_START + 139
-
-#define SCI_GETREADONLY SCI_START + 140
-#define SCI_SETCURRENTPOS SCI_START + 141
-#define SCI_SETSELECTIONSTART SCI_START + 142
-#define SCI_GETSELECTIONSTART SCI_START + 143
-#define SCI_SETSELECTIONEND SCI_START + 144
-#define SCI_GETSELECTIONEND SCI_START + 145
-#define SCI_SETPRINTMAGNIFICATION SCI_START + 146
-#define SCI_GETPRINTMAGNIFICATION SCI_START + 147
-
+#define INDICS_MASK INDIC0_MASK | INDIC1_MASK | INDIC2_MASK
+#define SCI_INDICSETSTYLE 2080
+#define SCI_INDICGETSTYLE 2081
+#define SCI_INDICSETFORE 2082
+#define SCI_INDICGETFORE 2083
+#define SCI_SETSTYLEBITS 2090
+#define SCI_GETSTYLEBITS 2091
+#define SCI_SETLINESTATE 2092
+#define SCI_GETLINESTATE 2093
+#define SCI_GETMAXLINESTATE 2094
+#define SCI_AUTOCSHOW 2100
+#define SCI_AUTOCCANCEL 2101
+#define SCI_AUTOCACTIVE 2102
+#define SCI_AUTOCPOSSTART 2103
+#define SCI_AUTOCCOMPLETE 2104
+#define SCI_AUTOCSTOPS 2105
+#define SCI_AUTOCSETSEPARATOR 2106
+#define SCI_AUTOCGETSEPARATOR 2107
+#define SCI_AUTOCSELECT 2108
+#define SCI_AUTOCSETCANCELATSTART 2110
+#define SCI_AUTOCGETCANCELATSTART 2111
+#define SCI_AUTOCSETFILLUPS 2112
+#define SCI_AUTOCSETCHOOSESINGLE 2113
+#define SCI_AUTOCGETCHOOSESINGLE 2114
+#define SCI_AUTOCSETIGNORECASE 2115
+#define SCI_AUTOCGETIGNORECASE 2116
+#define SCI_SETINDENT 2122
+#define SCI_GETINDENT 2123
+#define SCI_SETUSETABS 2124
+#define SCI_GETUSETABS 2125
+#define SCI_SETLINEINDENTATION 2126
+#define SCI_GETLINEINDENTATION 2127
+#define SCI_GETLINEINDENTPOSITION 2128
+#define SCI_GETCOLUMN 2129
+#define SCI_SETHSCROLLBAR 2130
+#define SCI_GETHSCROLLBAR 2131
+#define SCI_SETINDENTATIONGUIDES 2132
+#define SCI_GETINDENTATIONGUIDES 2133
+#define SCI_SETHIGHLIGHTGUIDE 2134
+#define SCI_GETHIGHLIGHTGUIDE 2135
+#define SCI_GETLINEENDPOSITION 2136
+#define SCI_GETCODEPAGE 2137
+#define SCI_GETCARETFORE 2138
+#define SCI_GETUSEPALETTE 2139
+#define SCI_GETREADONLY 2140
+#define SCI_SETCURRENTPOS 2141
+#define SCI_SETSELECTIONSTART 2142
+#define SCI_GETSELECTIONSTART 2143
+#define SCI_SETSELECTIONEND 2144
+#define SCI_GETSELECTIONEND 2145
+#define SCI_SETPRINTMAGNIFICATION 2146
+#define SCI_GETPRINTMAGNIFICATION 2147
 #define SC_PRINT_NORMAL 0
 #define SC_PRINT_INVERTLIGHT 1
 #define SC_PRINT_BLACKONWHITE 2
-
-#define SCI_SETPRINTCOLOURMODE SCI_START + 148
-#define SCI_GETPRINTCOLOURMODE SCI_START + 149
-
-#define SCI_FINDTEXT SCI_START + 150
-#define SCI_FORMATRANGE SCI_START + 151
-#define SCI_GETFIRSTVISIBLELINE SCI_START + 152
-#define SCI_GETLINE SCI_START + 153
-#define SCI_GETLINECOUNT SCI_START + 154
-#define SCI_SETMARGINLEFT SCI_START + 155
-#define SCI_GETMARGINLEFT SCI_START + 156
-#define SCI_SETMARGINRIGHT SCI_START + 157
-#define SCI_GETMARGINRIGHT SCI_START + 158
-#define SCI_GETMODIFY SCI_START + 159
-#define SCI_SETSEL SCI_START + 160
-#define SCI_GETSELTEXT SCI_START + 161
-#define SCI_GETTEXTRANGE SCI_START + 162
-#define SCI_HIDESELECTION SCI_START + 163
-#define SCI_POINTXFROMPOSITION SCI_START + 164
-#define SCI_POINTYFROMPOSITION SCI_START + 165
-#define SCI_LINEFROMPOSITION SCI_START + 166
-#define SCI_POSITIONFROMLINE SCI_START + 167
-#define SCI_LINESCROLL SCI_START + 168
-#define SCI_SCROLLCARET SCI_START + 169
-#define SCI_REPLACESEL SCI_START + 170
-#define SCI_SETREADONLY SCI_START + 171
-
-#define SCI_NULL SCI_START + 172
-#define SCI_CANPASTE SCI_START + 173
-#define SCI_CANUNDO SCI_START + 174
-#define SCI_EMPTYUNDOBUFFER SCI_START + 175
-#define SCI_UNDO SCI_START + 176
-#define SCI_CUT SCI_START + 177
-#define SCI_COPY SCI_START + 178
-#define SCI_PASTE SCI_START + 179
-#define SCI_CLEAR SCI_START + 180
-#define SCI_SETTEXT SCI_START + 181
-#define SCI_GETTEXT SCI_START + 182
-#define SCI_GETTEXTLENGTH SCI_START + 183
-
-#define SCI_GETDIRECTFUNCTION SCI_START + 184
-#define SCI_GETDIRECTPOINTER SCI_START + 185
-
-#define SCI_SETOVERTYPE SCI_START + 186
-#define SCI_GETOVERTYPE SCI_START + 187
-
-#define SCI_CALLTIPSHOW SCI_START + 200
-#define SCI_CALLTIPCANCEL SCI_START + 201
-#define SCI_CALLTIPACTIVE SCI_START + 202
-#define SCI_CALLTIPPOSSTART SCI_START + 203
-#define SCI_CALLTIPSETHLT SCI_START + 204
-#define SCI_CALLTIPSETBACK SCI_START + 205
-
+#define SCI_SETPRINTCOLOURMODE 2148
+#define SCI_GETPRINTCOLOURMODE 2149
+#define SCFIND_MATCHCASE 4
+#define SCFIND_WHOLEWORD 2
+#define SCFIND_DOWN 1
+#define SCI_FINDTEXT 2150
+#define SCI_FORMATRANGE 2151
+#define SCI_GETFIRSTVISIBLELINE 2152
+#define SCI_GETLINE 2153
+#define SCI_GETLINECOUNT 2154
+#define SCI_SETMARGINLEFT 2155
+#define SCI_GETMARGINLEFT 2156
+#define SCI_SETMARGINRIGHT 2157
+#define SCI_GETMARGINRIGHT 2158
+#define SCI_GETMODIFY 2159
+#define SCI_SETSEL 2160
+#define SCI_GETSELTEXT 2161
+#define SCI_GETTEXTRANGE 2162
+#define SCI_HIDESELECTION 2163
+#define SCI_POINTXFROMPOSITION 2164
+#define SCI_POINTYFROMPOSITION 2165
+#define SCI_LINEFROMPOSITION 2166
+#define SCI_POSITIONFROMLINE 2167
+#define SCI_LINESCROLL 2168
+#define SCI_SCROLLCARET 2169
+#define SCI_REPLACESEL 2170
+#define SCI_SETREADONLY 2171
+#define SCI_NULL 2172
+#define SCI_CANPASTE 2173
+#define SCI_CANUNDO 2174
+#define SCI_EMPTYUNDOBUFFER 2175
+#define SCI_UNDO 2176
+#define SCI_CUT 2177
+#define SCI_COPY 2178
+#define SCI_PASTE 2179
+#define SCI_CLEAR 2180
+#define SCI_SETTEXT 2181
+#define SCI_GETTEXT 2182
+#define SCI_GETTEXTLENGTH 2183
+#define SCI_GETDIRECTFUNCTION 2184
+#define SCI_GETDIRECTPOINTER 2185
+#define SCI_SETOVERTYPE 2186
+#define SCI_GETOVERTYPE 2187
+#define SCI_CALLTIPSHOW 2200
+#define SCI_CALLTIPCANCEL 2201
+#define SCI_CALLTIPACTIVE 2202
+#define SCI_CALLTIPPOSSTART 2203
+#define SCI_CALLTIPSETHLT 2204
+#define SCI_CALLTIPSETBACK 2205
+#define SCI_VISIBLEFROMDOCLINE 2220
+#define SCI_DOCLINEFROMVISIBLE 2221
 #define SC_FOLDLEVELBASE 0x400
 #define SC_FOLDLEVELWHITEFLAG 0x1000
 #define SC_FOLDLEVELHEADERFLAG 0x2000
 #define SC_FOLDLEVELNUMBERMASK 0x0FFF
-
-#define SCI_VISIBLEFROMDOCLINE SCI_START + 220
-#define SCI_DOCLINEFROMVISIBLE SCI_START + 221
-#define SCI_SETFOLDLEVEL SCI_START + 222
-#define SCI_GETFOLDLEVEL SCI_START + 223
-#define SCI_GETLASTCHILD SCI_START + 224
-#define SCI_GETFOLDPARENT SCI_START + 225
-#define SCI_SHOWLINES SCI_START + 226
-#define SCI_HIDELINES SCI_START + 227
-#define SCI_GETLINEVISIBLE SCI_START + 228
-#define SCI_SETFOLDEXPANDED SCI_START + 229
-#define SCI_GETFOLDEXPANDED SCI_START + 230
-#define SCI_TOGGLEFOLD SCI_START + 231
-#define SCI_ENSUREVISIBLE SCI_START + 232
-#define SCI_SETFOLDFLAGS SCI_START + 233
-
-// Key messages
-#define SCI_LINEDOWN SCI_START + 300
-#define SCI_LINEDOWNEXTEND SCI_START + 301
-#define SCI_LINEUP SCI_START + 302
-#define SCI_LINEUPEXTEND SCI_START + 303
-#define SCI_CHARLEFT SCI_START + 304
-#define SCI_CHARLEFTEXTEND SCI_START + 305
-#define SCI_CHARRIGHT SCI_START + 306
-#define SCI_CHARRIGHTEXTEND SCI_START + 307
-#define SCI_WORDLEFT SCI_START + 308
-#define SCI_WORDLEFTEXTEND SCI_START + 309
-#define SCI_WORDRIGHT SCI_START + 310
-#define SCI_WORDRIGHTEXTEND SCI_START + 311
-#define SCI_HOME SCI_START + 312
-#define SCI_HOMEEXTEND SCI_START + 313
-#define SCI_LINEEND SCI_START + 314
-#define SCI_LINEENDEXTEND SCI_START + 315
-#define SCI_DOCUMENTSTART SCI_START + 316
-#define SCI_DOCUMENTSTARTEXTEND SCI_START + 317
-#define SCI_DOCUMENTEND SCI_START + 318
-#define SCI_DOCUMENTENDEXTEND SCI_START + 319
-#define SCI_PAGEUP SCI_START + 320
-#define SCI_PAGEUPEXTEND SCI_START + 321
-#define SCI_PAGEDOWN SCI_START + 322
-#define SCI_PAGEDOWNEXTEND SCI_START + 323
-#define SCI_EDITTOGGLEOVERTYPE SCI_START + 324
-#define SCI_CANCEL SCI_START + 325
-#define SCI_DELETEBACK SCI_START + 326
-#define SCI_TAB SCI_START + 327
-#define SCI_BACKTAB SCI_START + 328
-#define SCI_NEWLINE SCI_START + 329
-#define SCI_FORMFEED SCI_START + 330
-#define SCI_VCHOME SCI_START + 331
-#define SCI_VCHOMEEXTEND SCI_START + 332
-#define SCI_ZOOMIN SCI_START + 333
-#define SCI_ZOOMOUT SCI_START + 334
-#define SCI_DELWORDLEFT SCI_START + 335
-#define SCI_DELWORDRIGHT SCI_START + 336
-#define SCI_LINECUT SCI_START + 337
-#define SCI_LINEDELETE SCI_START + 338
-#define SCI_LINETRANSPOSE SCI_START + 339
-#define SCI_LOWERCASE SCI_START + 340
-#define SCI_UPPERCASE SCI_START + 341
-#define SCI_LINESCROLLDOWN SCI_START + 342
-#define SCI_LINESCROLLUP SCI_START + 343
-
-#define SCI_LINELENGTH SCI_START + 350
-#define SCI_BRACEHIGHLIGHT SCI_START + 351
-#define SCI_BRACEBADLIGHT SCI_START + 352
-#define SCI_BRACEMATCH SCI_START + 353
-#define SCI_GETVIEWEOL SCI_START + 355
-#define SCI_SETVIEWEOL SCI_START + 356
-#define SCI_GETDOCPOINTER SCI_START + 357
-#define SCI_SETDOCPOINTER SCI_START + 358
-#define SCI_SETMODEVENTMASK SCI_START + 359
-
+#define SCI_SETFOLDLEVEL 2222
+#define SCI_GETFOLDLEVEL 2223
+#define SCI_GETLASTCHILD 2224
+#define SCI_GETFOLDPARENT 2225
+#define SCI_SHOWLINES 2226
+#define SCI_HIDELINES 2227
+#define SCI_GETLINEVISIBLE 2228
+#define SCI_SETFOLDEXPANDED 2229
+#define SCI_GETFOLDEXPANDED 2230
+#define SCI_TOGGLEFOLD 2231
+#define SCI_ENSUREVISIBLE 2232
+#define SCI_SETFOLDFLAGS 2233
+#define SCI_LINEDOWN 2300
+#define SCI_LINEDOWNEXTEND 2301
+#define SCI_LINEUP 2302
+#define SCI_LINEUPEXTEND 2303
+#define SCI_CHARLEFT 2304
+#define SCI_CHARLEFTEXTEND 2305
+#define SCI_CHARRIGHT 2306
+#define SCI_CHARRIGHTEXTEND 2307
+#define SCI_WORDLEFT 2308
+#define SCI_WORDLEFTEXTEND 2309
+#define SCI_WORDRIGHT 2310
+#define SCI_WORDRIGHTEXTEND 2311
+#define SCI_HOME 2312
+#define SCI_HOMEEXTEND 2313
+#define SCI_LINEEND 2314
+#define SCI_LINEENDEXTEND 2315
+#define SCI_DOCUMENTSTART 2316
+#define SCI_DOCUMENTSTARTEXTEND 2317
+#define SCI_DOCUMENTEND 2318
+#define SCI_DOCUMENTENDEXTEND 2319
+#define SCI_PAGEUP 2320
+#define SCI_PAGEUPEXTEND 2321
+#define SCI_PAGEDOWN 2322
+#define SCI_PAGEDOWNEXTEND 2323
+#define SCI_EDITTOGGLEOVERTYPE 2324
+#define SCI_CANCEL 2325
+#define SCI_DELETEBACK 2326
+#define SCI_TAB 2327
+#define SCI_BACKTAB 2328
+#define SCI_NEWLINE 2329
+#define SCI_FORMFEED 2330
+#define SCI_VCHOME 2331
+#define SCI_VCHOMEEXTEND 2332
+#define SCI_ZOOMIN 2333
+#define SCI_ZOOMOUT 2334
+#define SCI_DELWORDLEFT 2335
+#define SCI_DELWORDRIGHT 2336
+#define SCI_LINECUT 2337
+#define SCI_LINEDELETE 2338
+#define SCI_LINETRANSPOSE 2339
+#define SCI_LOWERCASE 2340
+#define SCI_UPPERCASE 2341
+#define SCI_LINESCROLLDOWN 2342
+#define SCI_LINESCROLLUP 2343
+#define SCI_LINELENGTH 2350
+#define SCI_BRACEHIGHLIGHT 2351
+#define SCI_BRACEBADLIGHT 2352
+#define SCI_BRACEMATCH 2353
+#define SCI_GETVIEWEOL 2355
+#define SCI_SETVIEWEOL 2356
+#define SCI_GETDOCPOINTER 2357
+#define SCI_SETDOCPOINTER 2358
+#define SCI_SETMODEVENTMASK 2359
 #define EDGE_NONE 0
 #define EDGE_LINE 1
 #define EDGE_BACKGROUND 2
-
-#define SCI_GETEDGECOLUMN SCI_START + 360
-#define SCI_SETEDGECOLUMN SCI_START + 361
-#define SCI_GETEDGEMODE SCI_START + 362
-#define SCI_SETEDGEMODE SCI_START + 363
-#define SCI_GETEDGECOLOUR SCI_START + 364
-#define SCI_SETEDGECOLOUR SCI_START + 365
-
-#define SCI_SEARCHANCHOR SCI_START + 366
-#define SCI_SEARCHNEXT SCI_START + 367
-#define SCI_SEARCHPREV SCI_START + 368
-
-#define CARET_SLOP 0x01    // Show caret within N lines of edge when it's scrolled to view
-#define CARET_CENTER 0x02  // Center caret on screen when it's scrolled to view
-#define CARET_STRICT 0x04  // OR this with CARET_CENTER to reposition even when visible, or
-                           // OR this with CARET_SLOP to reposition whenever outside slop border
-
-#define SCI_SETCARETPOLICY SCI_START + 369
-#define SCI_LINESONSCREEN SCI_START + 370
-#define SCI_USEPOPUP SCI_START + 371
-#define SCI_SELECTIONISRECTANGLE SCI_START + 372
-#define SCI_SETZOOM SCI_START + 373
-#define SCI_GETZOOM SCI_START + 374
-
-#define SCI_CREATEDOCUMENT SCI_START + 375
-#define SCI_ADDREFDOCUMENT SCI_START + 376
-#define SCI_RELEASEDOCUMENT SCI_START + 377
-
-#define SCI_GETMODEVENTMASK SCI_START + 378
-
-// GTK+ Specific
-#define SCI_GRABFOCUS SCI_START + 400
-
-// Optional module for macro recording
-#ifdef MACRO_SUPPORT
-typedef void (tMacroRecorder)(unsigned int iMessage, unsigned long wParam, 
-	long lParam, void *userData);
-#define SCI_STARTRECORD SCI_OPTIONAL_START + 1
-#define SCI_STOPRECORD SCI_OPTIONAL_START + 2
-#endif
-
-#define SCI_SETLEXER SCI_LEXER_START + 1
-#define SCI_GETLEXER SCI_LEXER_START + 2
-#define SCI_COLOURISE SCI_LEXER_START + 3
-#define SCI_SETPROPERTY SCI_LEXER_START + 4
-#define SCI_SETKEYWORDS SCI_LEXER_START + 5
-
-// Notifications
-
-// Type of modification and the action which caused the modification
-// These are defined as a bit mask to make it easy to specify which notifications are wanted.
-// One bit is set from each of SC_MOD_* and SC_PERFORMED_*.
+#define SCI_GETEDGECOLUMN 2360
+#define SCI_SETEDGECOLUMN 2361
+#define SCI_GETEDGEMODE 2362
+#define SCI_SETEDGEMODE 2363
+#define SCI_GETEDGECOLOUR 2364
+#define SCI_SETEDGECOLOUR 2365
+#define SCI_SEARCHANCHOR 2366
+#define SCI_SEARCHNEXT 2367
+#define SCI_SEARCHPREV 2368
+#define CARET_SLOP 0x01
+#define CARET_CENTER 0x02
+#define CARET_STRICT 0x04
+#define SCI_SETCARETPOLICY 2369
+#define SCI_LINESONSCREEN 2370
+#define SCI_USEPOPUP 2371
+#define SCI_SELECTIONISRECTANGLE 2372
+#define SCI_SETZOOM 2373
+#define SCI_GETZOOM 2374
+#define SCI_CREATEDOCUMENT 2375
+#define SCI_ADDREFDOCUMENT 2376
+#define SCI_RELEASEDOCUMENT 2377
+#define SCI_GETMODEVENTMASK 2378
+#define SCI_GRABFOCUS 2400
+#define SCI_STARTRECORD 3001
+#define SCI_STOPRECORD 3002
+#define SCI_SETLEXER 4001
+#define SCI_GETLEXER 4002
+#define SCI_COLOURISE 4003
+#define SCI_SETPROPERTY 4004
+#define SCI_SETKEYWORDS 4005
 #define SC_MOD_INSERTTEXT 0x1
 #define SC_MOD_DELETETEXT 0x2
 #define SC_MOD_CHANGESTYLE 0x4
@@ -445,36 +376,51 @@ typedef void (tMacroRecorder)(unsigned int iMessage, unsigned long wParam,
 #define SC_MOD_CHANGEMARKER 0x200
 #define SC_MOD_BEFOREINSERT 0x400
 #define SC_MOD_BEFOREDELETE 0x800
-
 #define SC_MODEVENTMASKALL 0xF77
-
+#define SCEN_CHANGE 768
+#define SCEN_SETFOCUS 512
+#define SCEN_KILLFOCUS 256
+#define SCK_DOWN 300
+#define SCK_UP 301
+#define SCK_LEFT 302
+#define SCK_RIGHT 303
+#define SCK_HOME 304
+#define SCK_END 305
+#define SCK_PRIOR 306
+#define SCK_NEXT 307
+#define SCK_DELETE 308
+#define SCK_INSERT 309
+#define SCK_ESCAPE 7
+#define SCK_BACK 8
+#define SCK_TAB 9
+#define SCK_RETURN 13
+#define SCK_ADD 310
+#define SCK_SUBTRACT 311
+#define SCK_DIVIDE 312
+#define SCMOD_SHIFT 1
+#define SCMOD_CTRL 2
+#define SCMOD_ALT 4
 #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 SCN_POSCHANGED 2012
+//--Autogenerated -- end of section automatically generated from Scintilla.iface
 
-// For compatibility, these go through the COMMAND notification rather than NOTIFY
-// and have exactly the same values as the EN_* constants.
-#define SCEN_CHANGE 768
-#define SCEN_SETFOCUS 512
-#define SCEN_KILLFOCUS 256
-
-// End of definitions that could be generated from Scintilla.iface
+// Optional module for macro recording
+#ifdef MACRO_SUPPORT
+typedef void (tMacroRecorder)(unsigned int iMessage, unsigned long wParam, 
+	long lParam, void *userData);
+#endif
 
 // These structures are defined to be exactly the same shape as the Win32
 // CHARRANGE, TEXTRANGE, FINDTEXTEX, FORMATRANGE, and NMHDR structs.
@@ -542,36 +488,6 @@ struct SCNotification {
 
 #define SC_MASK_FOLDERS ((1<<SC_MARKNUM_FOLDER) | (1<<SC_MARKNUM_FOLDEROPEN))
 
-#define SCFIND_MATCHCASE	4
-#define SCFIND_WHOLEWORD 2
-#define SCFIND_DOWN 1
-
-// Symbolic key codes
-// ASCII and other printable characters below 256
-// Extended keys above 300
-
-#define SCK_DOWN 300
-#define SCK_UP 301
-#define SCK_LEFT 302
-#define SCK_RIGHT 303
-#define SCK_HOME 304
-#define SCK_END 305
-#define SCK_PRIOR 306
-#define SCK_NEXT 307
-#define SCK_DELETE 308
-#define SCK_INSERT 309
-#define SCK_ESCAPE 7
-#define SCK_BACK 8
-#define SCK_TAB 9
-#define SCK_RETURN 13
-#define SCK_ADD 310
-#define SCK_SUBTRACT 311
-#define SCK_DIVIDE 312
-
-#define SCMOD_SHIFT 1
-#define SCMOD_CTRL 2
-#define SCMOD_ALT 4
-
 // Deprecation section listing all API features that are deprecated and will
 // will be removed completely in a future version.
 // To enable these features define INCLUDE_DEPRECATED_FEATURES
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index dce7cb4c6..536ebbd6a 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -52,8 +52,10 @@
 cat Basics 
 
 ################################################
-## From Scintilla.h
+## For Scintilla.h
 val INVALID_POSITION=-1
+# Define start of Scintilla messages to be greater than all edit (EM_*) messages
+# as many EM_ messages can be used although that use is deprecated.
 val SCI_START=2000
 val SCI_OPTIONAL_START=3000
 val SCI_LEXER_START=4000
@@ -186,6 +188,7 @@ set void SetTabWidth=2036(int tabWidth,)
 get int GetTabWidth=2121(,)
 
 # The SC_CP_UTF8 value can be used to enter Unicode mode.
+# This is the same value as CP_UTF8 in Windows
 val SC_CP_UTF8=65001
 
 # Set the code page used to interpret the bytes of the document as characters.
@@ -269,6 +272,7 @@ val STYLE_LINENUMBER=33
 val STYLE_BRACELIGHT=34
 val STYLE_BRACEBAD=35
 val STYLE_CONTROLCHAR=36
+val STYLE_INDENTGUIDE=37
 val STYLE_MAX=127
 
 # Character set identifiers are used in StyleSetCharacterSet.
@@ -347,6 +351,9 @@ fun void ClearAllCmdKeys=2072(,)
 # Set the styles for a segment of the document.
 fun void SetStylingEx=2073(int length, string styles)
 
+# Set a style to be visible or not.
+set void StyleSetVisible=2074(int style, bool visible)
+
 # Get the time in milliseconds that the caret is on and off. 
 get int GetCaretPeriod=2075(,)
 
@@ -740,6 +747,7 @@ fun void EnsureVisible=2232(int line,)
 # Set some debugging options for folding
 fun void SetFoldFlags=2233(int flags,)
 
+## Start of key messages
 # Move caret down one line.
 fun void LineDown=2300(,)
 
@@ -935,8 +943,12 @@ fun int SearchNext=2367(int flags, string text)
 # Find some text starting at the search anchor and moving backwards.
 fun int SearchPrev=2368(int flags, string text)
 
+# Show caret within N lines of edge when it's scrolled to view
 val CARET_SLOP=0x01
+# Center caret on screen when it's scrolled to view
 val CARET_CENTER=0x02
+# OR this with CARET_CENTER to reposition even when visible, or
+# OR this with CARET_SLOP to reposition whenever outside slop border
 val CARET_STRICT=0x04
 # Set the way the line the caret is on is kept visible.
 fun void SetCaretPolicy=2369(int caretPolicy, int caretSlop)
@@ -969,6 +981,7 @@ fun void ReleaseDocument=2377(, int doc)
 get int GetModEventMask=2378(,)
 
 # Set the focus to this Scintilla widget.
+# GTK+ Specific
 fun void GrabFocus=2400(,)
 
 # Start notifying the container of all key presses and commands.
@@ -992,6 +1005,10 @@ set void SetProperty=4004(string key, string value)
 # Set up the key words used by the lexer.
 set void SetKeyWords=4005(int keywordSet, string keyWords)
 
+# Notifications
+# Type of modification and the action which caused the modification
+# These are defined as a bit mask to make it easy to specify which notifications are wanted.
+# One bit is set from each of SC_MOD_* and SC_PERFORMED_*.
 val SC_MOD_INSERTTEXT=0x1
 val SC_MOD_DELETETEXT=0x2
 val SC_MOD_CHANGESTYLE=0x4
@@ -1004,20 +1021,6 @@ val SC_MOD_CHANGEMARKER=0x200
 val SC_MOD_BEFOREINSERT=0x400
 val SC_MOD_BEFOREDELETE=0x800
 val SC_MODEVENTMASKALL=0xF77
-val SCN_STYLENEEDED=2000
-val SCN_CHARADDED=2001
-val SCN_SAVEPOINTREACHED=2002
-val SCN_SAVEPOINTLEFT=2003
-val SCN_MODIFYATTEMPTRO=2004
-val SCN_KEY=2005
-val SCN_DOUBLECLICK=2006
-val SCN_UPDATEUI=2007
-val SCN_CHECKBRACE=2007
-val SCN_MODIFIED=2008
-val SCN_MACRORECORD=2009
-val SCN_MARGINCLICK=2010
-val SCN_NEEDSHOWN=2011
-val SCN_POSCHANGED=2012
 
 # For compatibility, these go through the COMMAND notification rather than NOTIFY
 # and have exactly the same values as the EN_* constants.
@@ -1052,7 +1055,7 @@ val SCMOD_CTRL=2
 val SCMOD_ALT=4
 
 ################################################
-# From SciLexer.h
+# For SciLexer.h
 val SCLEX_CONTAINER=0
 val SCLEX_NULL=1
 val SCLEX_PYTHON=2
@@ -1070,6 +1073,7 @@ val SCLEX_XCODE=13
 val SCLEX_LATEX=14
 val SCLEX_LUA=15
 val SCLEX_DIFF=16
+# Lexical states for SCLEX_PYTHON
 val SCE_P_DEFAULT=0
 val SCE_P_COMMENTLINE=1
 val SCE_P_NUMBER=2
@@ -1084,6 +1088,7 @@ val SCE_P_OPERATOR=10
 val SCE_P_IDENTIFIER=11
 val SCE_P_COMMENTBLOCK=12
 val SCE_P_STRINGEOL=13
+# Lexical states for SCLEX_CPP, SCLEX_VB
 val SCE_C_DEFAULT=0
 val SCE_C_COMMENT=1
 val SCE_C_COMMENTLINE=2
@@ -1098,6 +1103,7 @@ val SCE_C_OPERATOR=10
 val SCE_C_IDENTIFIER=11
 val SCE_C_STRINGEOL=12
 val SCE_C_VERBATIM=13
+# Lexical states for SCLEX_HTML, SCLEX_XML
 val SCE_H_DEFAULT=0
 val SCE_H_TAG=1
 val SCE_H_TAGUNKNOWN=2
@@ -1109,6 +1115,7 @@ val SCE_H_SINGLESTRING=7
 val SCE_H_OTHER=8
 val SCE_H_COMMENT=9
 val SCE_H_ENTITY=10
+# XML and ASP
 val SCE_H_TAGEND=11
 val SCE_H_XMLSTART=12
 val SCE_H_XMLEND=13
@@ -1117,7 +1124,9 @@ val SCE_H_ASP=15
 val SCE_H_ASPAT=16
 val SCE_H_CDATA=17
 val SCE_H_QUESTION=18
+# More HTML
 val SCE_H_VALUE=19
+# Embedded Javascript
 val SCE_HJ_START=40
 val SCE_HJ_DEFAULT=41
 val SCE_HJ_COMMENT=42
@@ -1130,6 +1139,7 @@ val SCE_HJ_DOUBLESTRING=48
 val SCE_HJ_SINGLESTRING=49
 val SCE_HJ_SYMBOLS=50
 val SCE_HJ_STRINGEOL=51
+# ASP Javascript
 val SCE_HJA_START=55
 val SCE_HJA_DEFAULT=56
 val SCE_HJA_COMMENT=57
@@ -1142,6 +1152,7 @@ val SCE_HJA_DOUBLESTRING=63
 val SCE_HJA_SINGLESTRING=64
 val SCE_HJA_SYMBOLS=65
 val SCE_HJA_STRINGEOL=66
+# Embedded VBScript
 val SCE_HB_START=70
 val SCE_HB_DEFAULT=71
 val SCE_HB_COMMENTLINE=72
@@ -1150,6 +1161,7 @@ val SCE_HB_WORD=74
 val SCE_HB_STRING=75
 val SCE_HB_IDENTIFIER=76
 val SCE_HB_STRINGEOL=77
+# ASP VBScript
 val SCE_HBA_START=80
 val SCE_HBA_DEFAULT=81
 val SCE_HBA_COMMENTLINE=82
@@ -1158,6 +1170,7 @@ val SCE_HBA_WORD=84
 val SCE_HBA_STRING=85
 val SCE_HBA_IDENTIFIER=86
 val SCE_HBA_STRINGEOL=87
+# Embedded Python
 val SCE_HP_START=90
 val SCE_HP_DEFAULT=91
 val SCE_HP_COMMENTLINE=92
@@ -1171,6 +1184,7 @@ val SCE_HP_CLASSNAME=99
 val SCE_HP_DEFNAME=100
 val SCE_HP_OPERATOR=101
 val SCE_HP_IDENTIFIER=102
+# ASP Python
 val SCE_HPA_START=105
 val SCE_HPA_DEFAULT=106
 val SCE_HPA_COMMENTLINE=107
@@ -1184,6 +1198,7 @@ val SCE_HPA_CLASSNAME=114
 val SCE_HPA_DEFNAME=115
 val SCE_HPA_OPERATOR=116
 val SCE_HPA_IDENTIFIER=117
+# PHP
 val SCE_HPHP_DEFAULT=118
 val SCE_HPHP_HSTRING=119
 val SCE_HPHP_SIMPLESTRING=120
@@ -1193,6 +1208,7 @@ val SCE_HPHP_VARIABLE=123
 val SCE_HPHP_COMMENT=124
 val SCE_HPHP_COMMENTLINE=125
 val SCE_HPHP_STRINGEOL=126
+# Lexical states for SCLEX_PERL
 val SCE_PL_DEFAULT=0
 val SCE_PL_HERE=1
 val SCE_PL_COMMENTLINE=2
@@ -1215,11 +1231,13 @@ val SCE_PL_REGSUBST=18
 val SCE_PL_LONGQUOTE=19
 val SCE_PL_BACKTICKS=20
 val SCE_PL_DATASECTION=21
+# Lexical states for SCLEX_LATEX
 val SCE_L_DEFAULT=0
 val SCE_L_COMMAND=1
 val SCE_L_TAG=2
 val SCE_L_MATH=3
 val SCE_L_COMMENT=4
+# Lexical states for SCLEX_LUA
 val SCE_LUA_DEFAULT=0
 val SCE_LUA_COMMENT=1
 val SCE_LUA_COMMENTLINE=2
@@ -1241,6 +1259,28 @@ val SCE_ERR_CMD=4
 val SCE_ERR_BORLAND=5
 val SCE_ERR_PERL=6
 
+# Events
+
+evt void StyleNeeded=2000(int position)
+evt void CharAdded=2001(int ch)
+evt void SavePointReached=2002(void)
+evt void SavePointLeft=2003(void)
+evt void ModifyAttemptRO=2004(void)
+# GTK+ Specific to work around focus and accelerator problems:
+evt void Key=2005(int ch, int modifiers)
+evt void DoubleClick=2006(void)
+evt void UpdateUI=2007(void)
+# The old name for SCN_UPDATEUI
+val SCN_CHECKBRACE=2007
+evt void Modified=2008(int position, int modificationType, string text, int length, int linesAdded, int line, int foldLevelNow, int foldLevelPrev)
+# Optional module for macro recording
+evt void MacroRecord=2009(int message, int wParam, int lParam)
+evt void MarginClick=2010(int modifiers, int position, int margin)
+evt void NeedShown=2011(int position, int length)
+evt void PosChanged=2012(int position)
+
+cat Deprecated 
+
 ################################################
 # From WinDefs.h
 
@@ -1405,19 +1445,4 @@ val LEFT_CTRL_PRESSED=2
 val LEFT_ALT_PRESSED=4
 
 #events
-
-evt void StyleNeeded=2000(int position)
-evt void CharAdded=2001(int ch)
-evt void SavePointReached=2002(void)
-evt void SavePointLeft=2003(void)
-evt void ModifyAttemptRO=2004(void)
-evt void Key=2005(int ch, int modifiers)
-evt void DoubleClick=2006(void)
-evt void UpdateUI=2007(void)
-evt void Modified=2008(int position, int modificationType, string text, int length, int linesAdded, int line, int foldLevelNow, int foldLevelPrev)
-evt void MacroRecord=2009(int message, int wParam, int lParam)
-evt void MarginClick=2010(int modifiers, int position, int margin)
-evt void NeedShown=2011(int position, int length)
-evt void PosChanged=2012(int position)
 evt void EN_Change=768(void)
-