From 346c0695d37868c8d099cc34b29317f9862109e4 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 20 Jan 2015 12:10:20 +0200 Subject: [PATCH] Update Scintilla to v3.5.3. --- build/makefile.deps.mak | 3 +- scintilla/cppcheck.suppress | 1 + scintilla/doc/ScintillaDoc.html | 13 +- scintilla/doc/ScintillaDownload.html | 10 +- scintilla/doc/ScintillaHistory.html | 71 ++ scintilla/doc/index.html | 7 +- scintilla/include/Platform.h | 5 + scintilla/include/SciLexer.h | 27 + scintilla/include/Scintilla.iface | 33 + scintilla/lexers/LexBash.cxx | 14 +- scintilla/lexers/LexCPP.cxx | 4 +- scintilla/lexers/LexHex.cxx | 1045 ++++++++++++++++++++++++++ scintilla/lexers/LexVerilog.cxx | 876 +++++++++++++++++---- scintilla/lexlib/LexAccessor.h | 3 + scintilla/lexlib/WordList.cxx | 2 + scintilla/scripts/HeaderOrder.txt | 1 + scintilla/src/Catalogue.cxx | 3 + scintilla/src/Document.cxx | 18 +- scintilla/src/Editor.cxx | 26 +- scintilla/src/Editor.h | 1 + scintilla/src/MarginView.cxx | 18 +- scintilla/src/ScintillaBase.cxx | 4 +- scintilla/src/UniConversion.cxx | 14 +- scintilla/src/UniConversion.h | 4 +- scintilla/version.txt | 2 +- scintilla/win32/PlatWin.cxx | 89 +-- scintilla/win32/PlatWin.h | 1 - scintilla/win32/ScintillaWin.cxx | 340 +++++---- 28 files changed, 2232 insertions(+), 403 deletions(-) create mode 100644 scintilla/lexers/LexHex.cxx diff --git a/build/makefile.deps.mak b/build/makefile.deps.mak index 2f3d1c26..f3f3dd4d 100644 --- a/build/makefile.deps.mak +++ b/build/makefile.deps.mak @@ -219,7 +219,8 @@ $(SCI_SRC_OBJDIR)\Document.obj: \ $(SCI_SRC)\CaseFolder.h \ $(SCI_SRC)\Document.h \ $(SCI_SRC)\RESearch.h \ - $(SCI_SRC)\UniConversion.h + $(SCI_SRC)\UniConversion.h \ + $(SCI_SRC)\UnicodeFromUTF8.h $(SCI_SRC_OBJDIR)\EditModel.obj: \ $(SCI_SRC)\EditModel.cxx \ diff --git a/scintilla/cppcheck.suppress b/scintilla/cppcheck.suppress index 7fded2fb..81146f0b 100644 --- a/scintilla/cppcheck.suppress +++ b/scintilla/cppcheck.suppress @@ -30,6 +30,7 @@ variableScope:scintilla/lexers/LexRuby.cxx uninitMemberVar:scintilla/lexers/LexRuby.cxx variableScope:scintilla/lexers/LexSpecman.cxx unreadVariable:scintilla/lexers/LexSpice.cxx +clarifyCalculation:scintilla/lexers/LexTADS3.cxx invalidscanf:scintilla/lexers/LexTCMD.cxx variableScope:scintilla/lexers/LexTeX.cxx variableScope:scintilla/lexers/LexVHDL.cxx diff --git a/scintilla/doc/ScintillaDoc.html b/scintilla/doc/ScintillaDoc.html index 8b9ecb1b..ed66afa6 100644 --- a/scintilla/doc/ScintillaDoc.html +++ b/scintilla/doc/ScintillaDoc.html @@ -82,7 +82,7 @@

Scintilla Documentation

-

Last edited 24 November 2014 NH

+

Last edited 10 January 2015 NH

There is an overview of the internal design of Scintilla.
@@ -2577,11 +2577,15 @@

Style definition

SCI_STYLEGETITALIC(int styleNumber)
These messages (plus SCI_STYLESETCHARACTERSET) set the font - attributes that are used to match the fonts you request to those available. The + attributes that are used to match the fonts you request to those available.

+

The fontName is a zero terminated string holding the name of a font. Under Windows, - only the first 32 characters of the name are used and the name is not case sensitive. For + only the first 32 characters of the name are used, the name is decoded as UTF-8, and the name is not case sensitive. For internal caching, Scintilla tracks fonts by name and does care about the casing of font names, - so please be consistent. On GTK+, Pango is used to display text.

+ so please be consistent. + On GTK+, Pango is used to display text and the name is sent directly to Pango without transformation. + On Qt, the name is decoded as UTF-8. + On Cocoa, the name is decoded as MacRoman.

Sizes can be set to a whole number of points with SCI_STYLESETSIZE or to a fractional point size in hundredths of a point with SCI_STYLESETSIZEFRACTIONAL by multiplying the size by 100 (SC_FONT_SIZE_MULTIPLIER). @@ -7320,6 +7324,7 @@

Notifications

These notifications are generated when the user clicks or double clicks on text that is in a style with the hotspot attribute set. This notification can be used to link to variable definitions or web pages. + In the notification handler, you should avoid calling any function that modifies the current selection or caret position. The position field is set the text position of the click or double click and the modifiers field set to the key modifiers held down in a similar manner to SCN_KEY. diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html index 4677dc9a..c272a48e 100644 --- a/scintilla/doc/ScintillaDownload.html +++ b/scintilla/doc/ScintillaDownload.html @@ -25,9 +25,9 @@ @@ -41,7 +41,7 @@

containing very few restrictions.

- Release 3.5.2 + Release 3.5.3

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 Instructions for building on both Windows and Linux are included in the readme file.

diff --git a/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html index d1afca38..4360b282 100644 --- a/scintilla/doc/ScintillaHistory.html +++ b/scintilla/doc/ScintillaHistory.html @@ -463,6 +463,8 @@

+ +
- + Windows   - + GTK+/Linux  
Erik Angelin Yusuf Ramazan KaragözMarkus HeidelbergJoe Mueller

@@ -474,6 +476,74 @@

Icons Copyright(C) 1998 by Dean S. Jones
+

+ Release 3.5.3 +

+

Release 3.5.2

@@ -498,6 +568,7 @@

  • ANNOTATION_INDENTED added which is similar to ANNOTATION_BOXED in terms of positioning but does not show a border. + Feature #1086.
  • Allow platform overrides for drawing tab arrows, wrap markers, and line markers. diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html index 89dd22c7..900b1b66 100644 --- a/scintilla/doc/index.html +++ b/scintilla/doc/index.html @@ -9,7 +9,7 @@ - +