update scintilla (HG 326600b303dc)

git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@738 28bd50df-7adb-d945-0439-6e466c6a13cc

2 files changed, 92 insertions, 0 deletions

diff --git a/scintilla/include/SciLexer.h b/scintilla/include/SciLexer.h
index feab853..75adecb 100644
--- a/scintilla/include/SciLexer.h
+++ b/scintilla/include/SciLexer.h
@@ -118,6 +118,8 @@
 #define SCLEX_TCMD 103

 #define SCLEX_AVS 104

 #define SCLEX_ECL 105

+#define SCLEX_OSCRIPT 106

+#define SCLEX_VISUALPROLOG 107

 #define SCLEX_AHK 200

 #define SCLEX_AUTOMATIC 1000

 #define SCE_P_DEFAULT 0

@@ -1584,6 +1586,48 @@
 #define SCE_ECL_DELETED 25

 #define SCE_ECL_CHANGED 26

 #define SCE_ECL_MOVED 27

+#define SCE_OSCRIPT_DEFAULT 0

+#define SCE_OSCRIPT_LINE_COMMENT 1

+#define SCE_OSCRIPT_BLOCK_COMMENT 2

+#define SCE_OSCRIPT_DOC_COMMENT 3

+#define SCE_OSCRIPT_PREPROCESSOR 4

+#define SCE_OSCRIPT_NUMBER 5

+#define SCE_OSCRIPT_SINGLEQUOTE_STRING 6

+#define SCE_OSCRIPT_DOUBLEQUOTE_STRING 7

+#define SCE_OSCRIPT_CONSTANT 8

+#define SCE_OSCRIPT_IDENTIFIER 9

+#define SCE_OSCRIPT_GLOBAL 10

+#define SCE_OSCRIPT_KEYWORD 11

+#define SCE_OSCRIPT_OPERATOR 12

+#define SCE_OSCRIPT_LABEL 13

+#define SCE_OSCRIPT_TYPE 14

+#define SCE_OSCRIPT_FUNCTION 15

+#define SCE_OSCRIPT_OBJECT 16

+#define SCE_OSCRIPT_PROPERTY 17

+#define SCE_OSCRIPT_METHOD 18

+#define SCE_VISUALPROLOG_DEFAULT 0

+#define SCE_VISUALPROLOG_KEY_MAJOR 1

+#define SCE_VISUALPROLOG_KEY_MINOR 2

+#define SCE_VISUALPROLOG_KEY_DIRECTIVE 3

+#define SCE_VISUALPROLOG_COMMENT_BLOCK 4

+#define SCE_VISUALPROLOG_COMMENT_LINE 5

+#define SCE_VISUALPROLOG_COMMENT_KEY 6

+#define SCE_VISUALPROLOG_COMMENT_KEY_ERROR 7

+#define SCE_VISUALPROLOG_IDENTIFIER 8

+#define SCE_VISUALPROLOG_VARIABLE 9

+#define SCE_VISUALPROLOG_ANONYMOUS 10

+#define SCE_VISUALPROLOG_NUMBER 11

+#define SCE_VISUALPROLOG_OPERATOR 12

+#define SCE_VISUALPROLOG_CHARACTER 13

+#define SCE_VISUALPROLOG_CHARACTER_TOO_MANY 14

+#define SCE_VISUALPROLOG_CHARACTER_ESCAPE_ERROR 15

+#define SCE_VISUALPROLOG_STRING 16

+#define SCE_VISUALPROLOG_STRING_ESCAPE 17

+#define SCE_VISUALPROLOG_STRING_ESCAPE_ERROR 18

+#define SCE_VISUALPROLOG_STRING_EOL_OPEN 19

+#define SCE_VISUALPROLOG_STRING_VERBATIM 20

+#define SCE_VISUALPROLOG_STRING_VERBATIM_SPECIAL 21

+#define SCE_VISUALPROLOG_STRING_VERBATIM_EOL 22

 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */

 

 #endif

diff --git a/scintilla/include/Scintilla.iface b/scintilla/include/Scintilla.iface
index 7da9c61..7c51494 100644
--- a/scintilla/include/Scintilla.iface
+++ b/scintilla/include/Scintilla.iface
@@ -2477,6 +2477,8 @@ val SCLEX_COFFEESCRIPT=102
 val SCLEX_TCMD=103

 val SCLEX_AVS=104

 val SCLEX_ECL=105

+val SCLEX_OSCRIPT=106

+val SCLEX_VISUALPROLOG=107

 ## notepad2 custom code for the AHK lexer - start

 val SCLEX_AHK=200

 ## notepad2 custom code for the AHK lexer - end

@@ -4142,6 +4144,52 @@ val SCE_ECL_ADDED=24
 val SCE_ECL_DELETED=25

 val SCE_ECL_CHANGED=26

 val SCE_ECL_MOVED=27

+# Lexical states for SCLEX_OSCRIPT

+lex OScript=SCLEX_OSCRIPT SCE_OSCRIPT_

+val SCE_OSCRIPT_DEFAULT=0

+val SCE_OSCRIPT_LINE_COMMENT=1

+val SCE_OSCRIPT_BLOCK_COMMENT=2

+val SCE_OSCRIPT_DOC_COMMENT=3

+val SCE_OSCRIPT_PREPROCESSOR=4

+val SCE_OSCRIPT_NUMBER=5

+val SCE_OSCRIPT_SINGLEQUOTE_STRING=6

+val SCE_OSCRIPT_DOUBLEQUOTE_STRING=7

+val SCE_OSCRIPT_CONSTANT=8

+val SCE_OSCRIPT_IDENTIFIER=9

+val SCE_OSCRIPT_GLOBAL=10

+val SCE_OSCRIPT_KEYWORD=11

+val SCE_OSCRIPT_OPERATOR=12

+val SCE_OSCRIPT_LABEL=13

+val SCE_OSCRIPT_TYPE=14

+val SCE_OSCRIPT_FUNCTION=15

+val SCE_OSCRIPT_OBJECT=16

+val SCE_OSCRIPT_PROPERTY=17

+val SCE_OSCRIPT_METHOD=18

+# Lexical states for SCLEX_VISUALPROLOG

+lex VisualProlog=SCLEX_VISUALPROLOG SCE_VISUALPROLOG_

+val SCE_VISUALPROLOG_DEFAULT=0

+val SCE_VISUALPROLOG_KEY_MAJOR=1

+val SCE_VISUALPROLOG_KEY_MINOR=2

+val SCE_VISUALPROLOG_KEY_DIRECTIVE=3

+val SCE_VISUALPROLOG_COMMENT_BLOCK=4

+val SCE_VISUALPROLOG_COMMENT_LINE=5

+val SCE_VISUALPROLOG_COMMENT_KEY=6

+val SCE_VISUALPROLOG_COMMENT_KEY_ERROR=7

+val SCE_VISUALPROLOG_IDENTIFIER=8

+val SCE_VISUALPROLOG_VARIABLE=9

+val SCE_VISUALPROLOG_ANONYMOUS=10

+val SCE_VISUALPROLOG_NUMBER=11

+val SCE_VISUALPROLOG_OPERATOR=12

+val SCE_VISUALPROLOG_CHARACTER=13

+val SCE_VISUALPROLOG_CHARACTER_TOO_MANY=14

+val SCE_VISUALPROLOG_CHARACTER_ESCAPE_ERROR=15

+val SCE_VISUALPROLOG_STRING=16

+val SCE_VISUALPROLOG_STRING_ESCAPE=17

+val SCE_VISUALPROLOG_STRING_ESCAPE_ERROR=18

+val SCE_VISUALPROLOG_STRING_EOL_OPEN=19

+val SCE_VISUALPROLOG_STRING_VERBATIM=20

+val SCE_VISUALPROLOG_STRING_VERBATIM_SPECIAL=21

+val SCE_VISUALPROLOG_STRING_VERBATIM_EOL=22

 

 # Events