From 1697ce8a35b4d6e4e3ca178d6b7ff4691c0578ec Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 14 Jul 2012 17:46:28 +0200 Subject: [PATCH] Upgraded to scintilla 3.2.1 Signed-off-by: Sven Strickroth --- ext/scintilla/doc/ScintillaDoc.html | 41 +++++++--- ext/scintilla/doc/ScintillaDownload.html | 10 +-- ext/scintilla/doc/ScintillaHistory.html | 125 +++++++++++++++++++++++++++++++ ext/scintilla/doc/ScintillaRelated.html | 30 ++++++++ ext/scintilla/doc/index.html | 7 +- ext/scintilla/include/Face.py | 8 +- ext/scintilla/include/Platform.h | 8 +- ext/scintilla/include/SciLexer.h | 1 + ext/scintilla/include/Scintilla.h | 7 +- ext/scintilla/include/Scintilla.iface | 63 ++++++++++------ ext/scintilla/lexers/LexCPP.cxx | 32 ++++++-- ext/scintilla/lexers/LexCSS.cxx | 29 +++++-- ext/scintilla/lexers/LexFortran.cxx | 33 +++++--- ext/scintilla/lexers/LexHTML.cxx | 2 +- ext/scintilla/lexlib/CharacterSet.h | 37 ++++++++- ext/scintilla/src/AutoComplete.cxx | 13 +++- ext/scintilla/src/AutoComplete.h | 8 ++ ext/scintilla/src/CharClassify.cxx | 16 ++++ ext/scintilla/src/CharClassify.h | 1 + ext/scintilla/src/Document.cxx | 77 ++++++++++--------- ext/scintilla/src/Document.h | 1 + ext/scintilla/src/Editor.cxx | 71 +++++++++++++----- ext/scintilla/src/Editor.h | 2 +- ext/scintilla/src/PerLine.cxx | 11 +-- ext/scintilla/src/PerLine.h | 2 +- ext/scintilla/src/ScintillaBase.cxx | 37 ++++----- ext/scintilla/src/ViewStyle.h | 2 +- ext/scintilla/tortoisegit.txt | 2 +- ext/scintilla/version.txt | 2 +- ext/scintilla/win32/PlatWin.cxx | 117 ++++++++++++++++------------- ext/scintilla/win32/ScintRes.rc | 4 +- ext/scintilla/win32/ScintillaWin.cxx | 11 +-- ext/scintilla/win32/scintilla.mak | 3 +- 33 files changed, 577 insertions(+), 236 deletions(-) diff --git a/ext/scintilla/doc/ScintillaDoc.html b/ext/scintilla/doc/ScintillaDoc.html index 307b6641c..619fb00b7 100644 --- a/ext/scintilla/doc/ScintillaDoc.html +++ b/ext/scintilla/doc/ScintillaDoc.html @@ -79,7 +79,7 @@

Scintilla Documentation

-

Last edited 16/April/2012 NH

+

Last edited 27/June/2012 NH

There is an overview of the internal design of Scintilla.
@@ -2899,6 +2899,9 @@ struct Sci_TextToFind { notification to be sent.

+ Only some style attributes are active in text margins: font, size/sizeFractional, bold/weight, italics, fore, back, and characterSet. +

+

SCI_MARGINSETSTYLEOFFSET(int style)
SCI_MARGINGETSTYLEOFFSET
Margin styles may be completely separated from standard text styles by setting a style offset. For example, @@ -2966,6 +2969,9 @@ struct Sci_TextToFind { which is equivalent to clearing each line (setting to 0) and then deleting other memory used for this feature.

+ Only some style attributes are active in annotations: font, size/sizeFractional, bold/weight, italics, fore, back, and characterSet. +

+

SCI_ANNOTATIONSETVISIBLE(int visible)
SCI_ANNOTATIONGETVISIBLE
Annotations can be made visible in a view and there is a choice of display style when visible. @@ -3026,10 +3032,12 @@ struct Sci_TextToFind { SCI_GETCODEPAGE
SCI_SETKEYSUNICODE(bool keysUnicode)
SCI_GETKEYSUNICODE
- SCI_SETWORDCHARS(<unused>, const char - *chars)
- SCI_SETWHITESPACECHARS(<unused>, const char - *chars)
+ SCI_SETWORDCHARS(<unused>, const char *characters)
+ SCI_GETWORDCHARS(<unused>, char *characters)
+ SCI_SETWHITESPACECHARS(<unused>, const char *characters)
+ SCI_GETWHITESPACECHARS(<unused>, char *characters)
+ SCI_SETPUNCTUATIONCHARS(<unused>, const char *characters)
+ SCI_GETPUNCTUATIONCHARS(<unused>, char *characters)
SCI_SETCHARSDEFAULT
SCI_GRABFOCUS
SCI_SETFOCUS(bool focus)
@@ -3111,7 +3119,7 @@ struct Sci_TextToFind { or narrow character window with character messages treated as Unicode when wide and as 8 bit otherwise. Set this property to always treat as Unicode. This option is needed for Delphi.

-

SCI_SETWORDCHARS(<unused>, const char *chars)
+

SCI_SETWORDCHARS(<unused>, const char *characters)
Scintilla has several functions that operate on words, which are defined to be contiguous sequences of characters from a particular set of characters. This message defines which characters are members of that set. The character sets are set to default values before processing this @@ -3120,13 +3128,28 @@ struct Sci_TextToFind { use:
SCI_SETWORDCHARS(0, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");

-

SCI_SETWHITESPACECHARS(<unused>, const char *chars)
+

SCI_GETWORDCHARS(<unused>, char *characters)
+ This fills the characters parameter with all the characters included in words. + The characters parameter must be large enough to hold all of the characters. + If the characters parameter is 0 then the length that should be allocated + to store the entire set is returned.

+ +

SCI_SETWHITESPACECHARS(<unused>, const char *characters)
+ SCI_GETWHITESPACECHARS(<unused>, char *characters)
Similar to SCI_SETWORDCHARS, this message allows the user to define which chars Scintilla considers as whitespace. Setting the whitespace chars allows the user to fine-tune Scintilla's behaviour doing such things as moving the cursor to the start or end of a word; for example, by defining punctuation chars as whitespace, they will be skipped over when the user presses ctrl+left or ctrl+right. This function should be called after SCI_SETWORDCHARS as it will - reset the whitespace characters to the default set.

+ reset the whitespace characters to the default set. + SCI_GETWHITESPACECHARS behaves similarly to SCI_GETWORDCHARS.

+ +

SCI_SETPUNCTUATIONCHARS(<unused>, const char *characters)
+ SCI_GETPUNCTUATIONCHARS(<unused>, char *characters)
+ Similar to SCI_SETWORDCHARS and SCI_SETWHITESPACECHARS, this message + allows the user to define which chars Scintilla considers as punctuation. + SCI_GETPUNCTUATIONCHARS behaves similarly to SCI_GETWORDCHARS.

+

SCI_SETCHARSDEFAULT
Use the default sets of word and whitespace characters. This sets whitespace to space, tab and other characters with codes less than 0x20, with word characters set to alphanumeric and '_'. @@ -4622,8 +4645,6 @@ struct Sci_TextToFind { HDCs., on GTK+ 3.x cairo_t *, and on Cocoa CGContextRef is used.

-

SCI_FORMATRANGE is not supported on GTK+ 2.x.

- SCI_FORMATRANGE(bool bDraw, Sci_RangeToFormat *pfr)
SCI_SETPRINTMAGNIFICATION(int diff --git a/ext/scintilla/doc/ScintillaDownload.html b/ext/scintilla/doc/ScintillaDownload.html index 165b111da..ea8c56d9c 100644 --- a/ext/scintilla/doc/ScintillaDownload.html +++ b/ext/scintilla/doc/ScintillaDownload.html @@ -25,9 +25,9 @@ @@ -41,7 +41,7 @@ containing very few restrictions.

- Release 3.2.0 + Release 3.2.1

Source Code @@ -49,8 +49,8 @@ The source code package contains all of the source code for Scintilla but no binary executable code and is available in
    -
  • zip format (1200K) commonly used on Windows
    • -
  • tgz format (1080K) commonly used on Linux and compatible operating systems
    • +
  • zip format (1250K) commonly used on Windows
    • +
  • tgz format (1100K) commonly used on Linux and compatible operating systems
Instructions for building on both Windows and Linux are included in the readme file.

diff --git a/ext/scintilla/doc/ScintillaHistory.html b/ext/scintilla/doc/ScintillaHistory.html index a40138965..d17c556d4 100644 --- a/ext/scintilla/doc/ScintillaHistory.html +++ b/ext/scintilla/doc/ScintillaHistory.html @@ -400,6 +400,15 @@

+ + + + + + + + +
- + Windows   - + GTK+/Linux   James Ribe Markus Nißl Martin Panter
Mark YenPhilippe ElsassDimitar ZhekovFan Yang
Denis ShelomovskijdarmarJohn Vella

@@ -412,6 +421,122 @@

+ Release 3.2.1 +

+
    +
  • + Released 14 July 2012. +
    • +
  • + In Scintilla.iface, specify features as properties instead of functions where possible and fix some enumerations. +
    • +
  • + In SciTE Lua scripts, string properties in Scintilla API can be retrieved as well as set using property notation. +
    • +
  • + Added character class APIs: SCI_SETPUNCTUATIONCHARS, SCI_GETWORDCHARS, SCI_GETWHITESPACECHARS, + and SCI_GETPUNCTUATIONCHARS. + Feature #3529805. +
    • +
  • + Less/Hss support added to CSS lexer. + Feature #3532413. +
    • +
  • + C++ lexer style SCE_C_PREPROCESSORCOMMENT added for stream comments in preprocessor. + Bug #3487406. +
    • +
  • + Fix incorrect styling of inactive code in C++ lexer. + Bug #3533036. +
    • +
  • + Fix incorrect styling by C++ lexer after empty lines in preprocessor style. +
    • +
  • + C++ lexer option "lexer.cpp.allow.dollars" fixed so can be turned off after being on. + Bug #3541461. +
    • +
  • + Fortran fixed format lexer fixed to style comments from column 73. + Bug #3540486. +
    • +
  • + Fortran folder folds CRITICAL .. END CRITICAL. + Bug #3540486. +
    • +
  • + Fortran lexer fixes styling after comment line ending with '&'. + Bug #3087226. +
    • +
  • + Fortran lexer styles preprocessor lines so they do not trigger incorrect folding. + Bug #2906275. +
    • +
  • + Fortran folder fixes folding of nested ifs. + Bug #2809176. +
    • +
  • + HTML folder fixes folding of CDATA when fold.html.preprocessor=0. + Bug #3540491. +
    • +
  • + On Cocoa, fix autocompletion font lifetime issue and row height computation. +
    • +
  • + In 'choose single' mode, autocompletion will close an existing list if asked to display a single entry list. +
    • +
  • + Fixed SCI_MARKERDELETE to only delete one marker per call. + Bug #3535806. +
    • +
  • + Properly position caret after undoing coalesced delete operations. + Bug #3523326. +
    • +
  • + Ensure margin is redrawn when SCI_MARGINSETSTYLE called. +
    • +
  • + Fix clicks in first pixel of margins to send SCN_MARGINCLICK. +
    • +
  • + Fix infinite loop when drawing block caret for a zero width space character at document start. +
    • +
  • + Crash fixed for deleting negative range. +
    • +
  • + For characters that overlap the beginning of their space such as italics descenders and bold serifs, allow start + of text to draw 1 pixel into margin. + Bug #699587. + Bug #3537799. +
    • +
  • + Fixed problems compiling Scintilla for Qt with GCC 4.7.1 x64. +
    • +
  • + Fixed problem with determining GTK+ sub-platform caused when adding Qt support in 3.2.0. +
    • +
  • + Fix incorrect measurement of untitled file in SciTE on Linux leading to message "File ...' is 2147483647 bytes long". + Bug #3537764. +
    • +
  • + In SciTE, fix open of selected filename with line number to go to that line. +
    • +
  • + Fix problem with last visible buffer closing in SciTE causing invisible buffers to be active. +
    • +
  • + Avoid blinking of SciTE's current word highlight when output pane changes. +
    • +
  • + SciTE properties files can be longer than 60K. +
    • +
+

Release 3.2.0

    diff --git a/ext/scintilla/doc/ScintillaRelated.html b/ext/scintilla/doc/ScintillaRelated.html index f87f5520b..13e724866 100644 --- a/ext/scintilla/doc/ScintillaRelated.html +++ b/ext/scintilla/doc/ScintillaRelated.html @@ -29,6 +29,10 @@ Ports and Bindings of Scintilla

    + Scintilla.mcc + is a port to MorphOS. +

    +

    Wx::Scintilla is a Perl Binding for Scintilla on wxWidgets.

    @@ -119,6 +123,28 @@ Projects using Scintilla

    + QGrinUI + searches for a regex within all relevant files in a directory and shows matches using + SciTE through the director interface. +

    +

    + Textadept + is a ridiculously extensible cross-platform text editor for programmers written (mostly) in + Lua using LPeg to handle the lexers. +

    +

    + Scribble + is a text editor included in MorphOS. +

    +

    + MySQL Workbench + is a cross-platform, visual database design, sql coding and administration tool. +

    +

    + LIVEditor + is for web front end coders editing html/css/js code. +

    +

    Padre is a wxWidgets-based Perl IDE.

    @@ -417,6 +443,10 @@ Editing Components

    + UniCodeEditor + is a Unicode aware syntax editor control for Delphi and C++ Builder. +

    +

    GtkSourceView is a text widget that extends the standard GTK+ 2.x text widget and improves it by implementing syntax highlighting and other features typical of a source editor. diff --git a/ext/scintilla/doc/index.html b/ext/scintilla/doc/index.html index 725f6c287..146e9061c 100644 --- a/ext/scintilla/doc/index.html +++ b/ext/scintilla/doc/index.html @@ -9,7 +9,7 @@ - +