Skip to content
This repository has been archived by the owner on Aug 12, 2018. It is now read-only.

Commit

Permalink
Update Scintilla to 3.3.7.
Browse files Browse the repository at this point in the history
  • Loading branch information
@XhmikosR
XhmikosR committed Dec 12, 2013
1 parent 7254c1a commit 0b28887
Show file tree
Hide file tree
Showing 33 changed files with 10,085 additions and 9,494 deletions.
15,026 changes: 7,514 additions & 7,512 deletions scintilla/doc/ScintillaDoc.html
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions scintilla/doc/ScintillaDownload.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
<table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
<tr>
<td>
<font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla336.zip?download">
<font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla337.zip?download">
Windows</a>&nbsp;&nbsp;
<a href="http://prdownloads.sourceforge.net/scintilla/scintilla336.tgz?download">
<a href="http://prdownloads.sourceforge.net/scintilla/scintilla337.tgz?download">
GTK+/Linux</a>&nbsp;&nbsp;
</font>
</td>
Expand All @@ -41,16 +41,16 @@ <h2>
containing very few restrictions.
</p>
<h3>
Release 3.3.6
Release 3.3.7
</h3>
<h4>
Source Code
</h4>
The source code package contains all of the source code for Scintilla but no binary
executable code and is available in
<ul>
<li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla336.zip?download">zip format</a> (1300K) commonly used on Windows</li>
<li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla336.tgz?download">tgz format</a> (1200K) commonly used on Linux and compatible operating systems</li>
<li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla337.zip?download">zip format</a> (1300K) commonly used on Windows</li>
<li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla337.tgz?download">tgz format</a> (1200K) commonly used on Linux and compatible operating systems</li>
</ul>
Instructions for building on both Windows and Linux are included in the readme file.
<h4>
Expand Down
122 changes: 122 additions & 0 deletions scintilla/doc/ScintillaHistory.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,13 @@ <h3>
<td>OmegaPhil</td>
</tr><tr>
<td>SiegeLord</td>
<td>Erik</td>
<td>TJF</td>
<td>Mark Robinson</td>
</tr><tr>
<td>Thomas Martitz</td>
<td>felix</td>
<td>Christian Walther</td>
</tr>
</table>
<p>
Expand All @@ -443,6 +450,117 @@ <h3>
Icons</a> Copyright(C) 1998 by Dean S. Jones<br />
</li>
</ul>
<h3>
<a href="http://prdownloads.sourceforge.net/scintilla/scite337.zip?download">Release 3.3.7</a>
</h3>
<ul>
<li>
Released 12 December 2013.
</li>
<li>
Lexer added for DMAP language.
<a href="http://sourceforge.net/p/scintilla/feature-requests/1026/">Feature #1026.</a>
</li>
<li>
Basic lexer supports multiline comments in FreeBASIC.
<a href="http://sourceforge.net/p/scintilla/feature-requests/1023/">Feature #1023.</a>
</li>
<li>
Bash lexer allows '#' inside words..
<a href="http://sourceforge.net/p/scintilla/bugs/1553/">Bug #1553</a>.
</li>
<li>
C++ lexer recognizes C++11 user-defined lierals and applies lexical class SCE_C_USERLITERAL.
</li>
<li>
C++ lexer allows single quote characters as digit separators in numeric literals like 123'456 as this is
included in C++14.
</li>
<li>
C++ lexer fixes bug with #include statements without " or &gt; terminating filename.
<a href="http://sourceforge.net/p/scintilla/bugs/1538/">Bug #1538</a>.
</li>
<li>
C++ lexer fixes split of Doxygen keywords @code{.fileExtension} and @param[in,out].
<a href="http://sourceforge.net/p/scintilla/bugs/1551/">Bug #1551</a>.
</li>
<li>
C++ lexer styles Doxygen keywords at end of document.
</li>
<li>
Cmake lexer fixes bug with empty comments.
<a href="http://sourceforge.net/p/scintilla/bugs/1550/">Bug #1550</a>.
</li>
<li>
Fortran folder improved. Treats "else" as fold header.
<a href="http://sourceforge.net/p/scintilla/feature-requests/962/">Feature #962.</a>
</li>
<li>
Fix bug with adjacent instances of the same indicator with different values where only the first was drawn.
<a href="http://sourceforge.net/p/scintilla/bugs/1560/">Bug #1560</a>.
</li>
<li>
For DirectWrite, use the GDI ClearType gamma value for SC_EFF_QUALITY_LCD_OPTIMIZED as
this results in text that is similar in colour intensity to GDI.
For the duller default DirectWrite ClearType text appearance, use SC_EFF_QUALITY_DEFAULT.
<a href="http://sourceforge.net/p/scintilla/feature-requests/887/">Feature #887.</a>
</li>
<li>
Fix another problem with drawing on Windows with Direct2D when returning from lock screen.
The whole window is redrawn as just redrawing the initially required area left other areas black.
</li>
<li>
When scroll width is tracked, take width of annotation lines into account.
</li>
<li>
For Cocoa on OS X 10.9, responsive scrolling is supported.
</li>
<li>
On Cocoa, apply font quality setting to line numbers.
<a href="http://sourceforge.net/p/scintilla/bugs/1544/">Bug #1544</a>.
</li>
<li>
On Cocoa, clicking in margin now sets focus.
<a href="http://sourceforge.net/p/scintilla/bugs/1542/">Bug #1542</a>.
</li>
<li>
On Cocoa, correct cursor displayed in margin after showing dialog.
</li>
<li>
On Cocoa, multipaste mode now works.
<a href="http://sourceforge.net/p/scintilla/bugs/1541/">Bug #1541</a>.
</li>
<li>
On GTK+, chain up to superclass finalize so that all finalization is performed.
<a href="http://sourceforge.net/p/scintilla/bugs/1549/">Bug #1549</a>.
</li>
<li>
On GTK+, fix horizontal scroll bar range to not be double the needed width.
<a href="http://sourceforge.net/p/scintilla/bugs/1546/">Bug #1546</a>.
</li>
<li>
On OS X GTK+, report control key as SCI_META for mouse down events.
</li>
<li>
On Qt, bug fixed with drawing of scrollbars, where previous contents were not drawn over with some
themes.
</li>
<li>
On Qt, bug fixed with finding monitor rectangle which could lead to autocomplete showing at wrong location.
</li>
<li>
SciTE fix for multiple message boxes when failing to save a file with save.on.deactivate.
<a href="http://sourceforge.net/p/scintilla/bugs/1540/">Bug #1540</a>.
</li>
<li>
SciTE on GTK+ fixes SIGCHLD handling so that Lua scripts can determine the exit status of processes
they start.
<a href="http://sourceforge.net/p/scintilla/bugs/1557/">Bug #1557</a>.
</li>
<li>
SciTE on Windows XP fixes bad display of find and replace values when using strips.
</li>
</ul>
<h3>
<a href="http://prdownloads.sourceforge.net/scintilla/scite336.zip?download">Release 3.3.6</a>
</h3>
Expand Down Expand Up @@ -552,6 +670,10 @@ <h3>
<a href="http://sourceforge.net/p/scintilla/bugs/1523/">Bug #1523</a>.
</li>
<li>
On Windows, SciTE's Incremental Search displays match failures by changing the background colour
instead of not adding the character that caused failure.
</li>
<li>
Fix SciTE on GTK+ 3.x incremental search to change foreground colour when no match as
changing background colour is difficult.
</li>
Expand Down
7 changes: 4 additions & 3 deletions scintilla/doc/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
<meta name="Description"
content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
<meta name="Date.Modified" content="20131015" />
<meta name="Date.Modified" content="20131212" />
<style type="text/css">
#versionlist {
margin: 0;
Expand Down Expand Up @@ -55,8 +55,8 @@
GTK+, and OS X</font>
</td>
<td width="40%" align="right">
<font color="#FFCC99" size="3"> Release version 3.3.6<br />
Site last modified October 15 2013</font>
<font color="#FFCC99" size="3"> Release version 3.3.7<br />
Site last modified December 12 2013</font>
</td>
<td width="20%">
&nbsp;
Expand All @@ -71,6 +71,7 @@
</tr>
</table>
<ul id="versionlist">
<li>Version 3.3.7 uses responsive scrolling on OS X 10.9, enhances lexers, and fixes bugs.</li>
<li>Version 3.3.6 adds support for the Rust language and fixes bugs.</li>
<li>Version 3.3.5 can represent characters with strings. This may be used for modes
which show invisible characters or differentiate characters that appear similar.</li>
Expand Down
17 changes: 17 additions & 0 deletions scintilla/include/SciLexer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
#define SCLEX_STTXT 109
#define SCLEX_KVIRC 110
#define SCLEX_RUST 111
#define SCLEX_DMAP 112
#define SCLEX_AHK 200
#define SCLEX_AUTOMATIC 1000
#define SCE_P_DEFAULT 0
Expand Down Expand Up @@ -167,6 +168,7 @@
#define SCE_C_HASHQUOTEDSTRING 22
#define SCE_C_PREPROCESSORCOMMENT 23
#define SCE_C_PREPROCESSORCOMMENTDOC 24
#define SCE_C_USERLITERAL 25
#define SCE_D_DEFAULT 0
#define SCE_D_COMMENT 1
#define SCE_D_COMMENTLINE 2
Expand Down Expand Up @@ -421,6 +423,10 @@
#define SCE_B_ERROR 16
#define SCE_B_HEXNUMBER 17
#define SCE_B_BINNUMBER 18
#define SCE_B_COMMENTBLOCK 19
#define SCE_B_DOCLINE 20
#define SCE_B_DOCBLOCK 21
#define SCE_B_DOCKEYWORD 22
#define SCE_PROPS_DEFAULT 0
#define SCE_PROPS_COMMENT 1
#define SCE_PROPS_SECTION 2
Expand Down Expand Up @@ -1705,6 +1711,17 @@
#define SCE_RUST_LIFETIME 18
#define SCE_RUST_MACRO 19
#define SCE_RUST_LEXERROR 20
#define SCE_DMAP_DEFAULT 0
#define SCE_DMAP_COMMENT 1
#define SCE_DMAP_NUMBER 2
#define SCE_DMAP_STRING1 3
#define SCE_DMAP_STRING2 4
#define SCE_DMAP_STRINGEOL 5
#define SCE_DMAP_OPERATOR 6
#define SCE_DMAP_IDENTIFIER 7
#define SCE_DMAP_WORD 8
#define SCE_DMAP_WORD2 9
#define SCE_DMAP_WORD3 10
/* --Autogenerated -- end of section automatically generated from Scintilla.iface */

#endif
2 changes: 1 addition & 1 deletion scintilla/include/Scintilla.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ struct Sci_TextRange {

struct Sci_TextToFind {
struct Sci_CharacterRange chrg;
char *lpstrText;
const char *lpstrText;
struct Sci_CharacterRange chrgText;
};

Expand Down
32 changes: 24 additions & 8 deletions scintilla/include/Scintilla.iface
View file
Original file line number Diff line number Diff line change
Expand Up @@ -856,8 +856,8 @@ set void SetPrintColourMode=2148(int mode,)
get int GetPrintColourMode=2149(,)

enu FindOption=SCFIND_
val SCFIND_WHOLEWORD=2
val SCFIND_MATCHCASE=4
val SCFIND_WHOLEWORD=0x2
val SCFIND_MATCHCASE=0x4
val SCFIND_WORDSTART=0x00100000
val SCFIND_REGEXP=0x00200000
val SCFIND_POSIX=0x00400000
Expand Down Expand Up @@ -2601,6 +2601,7 @@ val SCLEX_LITERATEHASKELL=108
val SCLEX_STTXT=109
val SCLEX_KVIRC=110
val SCLEX_RUST=111
val SCLEX_DMAP=112
## notepad2 custom code for the AHK lexer - start
val SCLEX_AHK=200
## notepad2 custom code for the AHK lexer - end
Expand Down Expand Up @@ -2655,6 +2656,7 @@ val SCE_C_TRIPLEVERBATIM=21
val SCE_C_HASHQUOTEDSTRING=22
val SCE_C_PREPROCESSORCOMMENT=23
val SCE_C_PREPROCESSORCOMMENTDOC=24
val SCE_C_USERLITERAL=25
# Lexical states for SCLEX_D
lex D=SCLEX_D SCE_D_
val SCE_D_DEFAULT=0
Expand Down Expand Up @@ -2707,8 +2709,6 @@ val SCE_TCL_BLOCK_COMMENT=21
# Lexical states for SCLEX_HTML, SCLEX_XML
lex HTML=SCLEX_HTML SCE_H_ SCE_HJ_ SCE_HJA_ SCE_HB_ SCE_HBA_ SCE_HP_ SCE_HPHP_ SCE_HPA_
lex XML=SCLEX_XML SCE_H_ SCE_HJ_ SCE_HJA_ SCE_HB_ SCE_HBA_ SCE_HP_ SCE_HPHP_ SCE_HPA_
lex ASP=SCLEX_ASP SCE_H_ SCE_HJ_ SCE_HJA_ SCE_HB_ SCE_HBA_ SCE_HP_ SCE_HPHP_ SCE_HPA_
lex PHP=SCLEX_PHP SCE_H_ SCE_HJ_ SCE_HJA_ SCE_HB_ SCE_HBA_ SCE_HP_ SCE_HPHP_ SCE_HPA_
val SCE_H_DEFAULT=0
val SCE_H_TAG=1
val SCE_H_TAGUNKNOWN=2
Expand Down Expand Up @@ -2938,6 +2938,10 @@ val SCE_B_LABEL=15
val SCE_B_ERROR=16
val SCE_B_HEXNUMBER=17
val SCE_B_BINNUMBER=18
val SCE_B_COMMENTBLOCK=19
val SCE_B_DOCLINE=20
val SCE_B_DOCBLOCK=21
val SCE_B_DOCKEYWORD=22
# Lexical states for SCLEX_PROPERTIES
lex Properties=SCLEX_PROPERTIES SCE_PROPS_
val SCE_PROPS_DEFAULT=0
Expand Down Expand Up @@ -3948,8 +3952,8 @@ val SCE_R_OPERATOR=8
val SCE_R_IDENTIFIER=9
val SCE_R_INFIX=10
val SCE_R_INFIXEOL=11
# Lexical state for SCLEX_MAGIKSF
lex MagikSF=SCLEX_MAGIKSF SCE_MAGIK_
# Lexical state for SCLEX_MAGIK
lex MagikSF=SCLEX_MAGIK SCE_MAGIK_
val SCE_MAGIK_DEFAULT=0
val SCE_MAGIK_COMMENT=1
val SCE_MAGIK_HYPER_COMMENT=16
Expand Down Expand Up @@ -4236,7 +4240,6 @@ val SCE_COFFEESCRIPT_COMMENTDOCKEYWORDERROR=18
val SCE_COFFEESCRIPT_GLOBALCLASS=19
val SCE_COFFEESCRIPT_STRINGRAW=20
val SCE_COFFEESCRIPT_TRIPLEVERBATIM=21
val SCE_COFFEESCRIPT_HASHQUOTEDSTRING=22
val SCE_COFFEESCRIPT_COMMENTBLOCK=22
val SCE_COFFEESCRIPT_VERBOSE_REGEX=23
val SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT=24
Expand Down Expand Up @@ -4355,7 +4358,7 @@ val SCE_STTXT_DATETIME=16
val SCE_STTXT_VARS=17
val SCE_STTXT_PRAGMAS=18
# Lexical states for SCLEX_KVIRC
lex KVIrc=SCLEX_KVIRC SCLEX_KVIRC_
lex KVIrc=SCLEX_KVIRC SCE_KVIRC_
val SCE_KVIRC_DEFAULT=0
val SCE_KVIRC_COMMENT=1
val SCE_KVIRC_COMMENTBLOCK=2
Expand Down Expand Up @@ -4392,6 +4395,19 @@ val SCE_RUST_IDENTIFIER=17
val SCE_RUST_LIFETIME=18
val SCE_RUST_MACRO=19
val SCE_RUST_LEXERROR=20
# Lexical states for SCLEX_DMAP
lex DMAP=SCLEX_DMAP SCE_DMAP_
val SCE_DMAP_DEFAULT=0
val SCE_DMAP_COMMENT=1
val SCE_DMAP_NUMBER=2
val SCE_DMAP_STRING1=3
val SCE_DMAP_STRING2=4
val SCE_DMAP_STRINGEOL=5
val SCE_DMAP_OPERATOR=6
val SCE_DMAP_IDENTIFIER=7
val SCE_DMAP_WORD=8
val SCE_DMAP_WORD2=9
val SCE_DMAP_WORD3=10

# Events

Expand Down
15 changes: 0 additions & 15 deletions scintilla/lexers/LexAbaqus.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@
using namespace Scintilla;
#endif

static inline bool IsAWordChar(const int ch) {
return (ch < 0x80 && (isalnum(ch) || (ch == '_')));
}

static inline bool IsAKeywordChar(const int ch) {
return (ch < 0x80 && (isalnum(ch) || (ch == '_') || (ch == ' ')));
}
Expand All @@ -42,17 +38,6 @@ static inline bool IsASetChar(const int ch) {
return (ch < 0x80 && (isalnum(ch) || (ch == '_') || (ch == '.') || (ch == '-')));
}

static inline bool IsAnOperator(char ch) {
// '.' left out as it is used to make up numbers
if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
ch == '(' || ch == ')' || ch == '=' || ch == '^' ||
ch == '[' || ch == ']' || ch == '<' || ch == '&' ||
ch == '>' || ch == ',' || ch == '|' || ch == '~' ||
ch == '$' || ch == ':' || ch == '%')
return true;
return false;
}

static void ColouriseABAQUSDoc(unsigned int startPos, int length, int initStyle, WordList*[] /* *keywordlists[] */,
Accessor &styler) {
enum localState { KW_LINE_KW, KW_LINE_COMMA, KW_LINE_PAR, KW_LINE_EQ, KW_LINE_VAL, \
Expand Down
Loading

0 comments on commit 0b28887

Please sign in to comment.