From 8da89fc25d73e8ab4203ac8bb2d1e200e54d7b18 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Thu, 18 Apr 2019 14:16:57 +0200 Subject: [PATCH] + upd: Scintilla GitHub mirror version 4.1.5 + add: missing HTML keywords (picture, slot, template) --- Versions/build.txt | 2 +- np3portableapp/_buildname.txt | 2 +- res/Notepad3.exe.manifest.conf | 4 +- scintilla/Scintilla.vcxproj | 1 + scintilla/Scintilla.vcxproj.filters | 3 ++ scintilla/doc/Markers.png | Bin 8399 -> 22999 bytes scintilla/doc/ScintillaDoc.html | 20 ++++++-- scintilla/doc/ScintillaDownload.html | 10 ++-- scintilla/doc/ScintillaHistory.html | 38 ++++++++++++--- scintilla/doc/index.html | 9 ++-- scintilla/include/Scintilla.h | 7 ++- scintilla/include/Scintilla.iface | 11 ++++- scintilla/scripts/LexGen.py | 14 ++++-- scintilla/src/CaseConvert.cxx | 10 ++-- scintilla/src/ContractionState.cxx | 8 +--- scintilla/src/ContractionState.h | 1 - scintilla/src/DBCS.h | 8 ++++ scintilla/src/EditModel.cxx | 17 +++++++ scintilla/src/EditModel.h | 4 ++ scintilla/src/EditView.cxx | 7 +-- scintilla/src/Editor.cxx | 29 ++++++++---- scintilla/src/LineMarker.cxx | 68 +++++++++++++++------------ scintilla/src/LineMarker.h | 24 ++++++---- scintilla/src/ScintillaBase.h | 2 - scintilla/src/UniqueString.h | 34 ++++++++++---- scintilla/src/ViewStyle.cxx | 59 +++++++---------------- scintilla/src/ViewStyle.h | 49 +++++++------------ scintilla/src/XPM.h | 17 ++++--- scintilla/version.txt | 2 +- scintilla/win32/PlatWin.cxx | 22 +++++++-- scintilla/win32/ScintillaWin.cxx | 67 +++++++++----------------- src/StyleLexers/styleLexHTML.c | 32 ++----------- src/Version.h | 10 +--- src/VersionEx.h | 8 ++-- 34 files changed, 320 insertions(+), 279 deletions(-) diff --git a/Versions/build.txt b/Versions/build.txt index 047d57f1f..3d068d557 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -1658 +1672 diff --git a/np3portableapp/_buildname.txt b/np3portableapp/_buildname.txt index c32b9ffbb..cfd7d0ca4 100644 --- a/np3portableapp/_buildname.txt +++ b/np3portableapp/_buildname.txt @@ -1 +1 @@ -"XpErImEnTaL" +"develop" diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index f36c58c88..d5d4ffeb2 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,8 +3,8 @@ - Notepad3 XpErImEnTaL + Notepad3 develop diff --git a/scintilla/Scintilla.vcxproj b/scintilla/Scintilla.vcxproj index 357a26bcf..daa2d5f50 100644 --- a/scintilla/Scintilla.vcxproj +++ b/scintilla/Scintilla.vcxproj @@ -309,6 +309,7 @@ + diff --git a/scintilla/Scintilla.vcxproj.filters b/scintilla/Scintilla.vcxproj.filters index 2999f6f94..39ea66be2 100644 --- a/scintilla/Scintilla.vcxproj.filters +++ b/scintilla/Scintilla.vcxproj.filters @@ -345,6 +345,9 @@ lexers + + src + diff --git a/scintilla/doc/Markers.png b/scintilla/doc/Markers.png index 2ad37b1021126b44427cc556bc23d7b323a2d153..b1d0120c04d3c82e7d4bfa6866420c118a71a02b 100644 GIT binary patch literal 22999 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, SC_MARK_LEFTRECT, SC_MARK_FULLRECT, - SC_MARK_BOOKMARK, and + SC_MARK_BOOKMARK, + SC_MARK_VERTICALBOOKMARK, and SC_MARK_UNDERLINE.

@@ -6014,6 +6015,8 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){ SCI_TOGGLEFOLDSHOWTEXT(int line, const char *text)
SCI_FOLDDISPLAYTEXTSETSTYLE(int style)
SCI_FOLDDISPLAYTEXTGETSTYLE → int
+ SCI_SETDEFAULTFOLDDISPLAYTEXT(const char *text)
+ SCI_GETDEFAULTFOLDDISPLAYTEXT(<unused>, char *text)
SCI_FOLDLINE(int line, int action)
SCI_FOLDCHILDREN(int line, int action)
SCI_FOLDALL(int action)
@@ -6173,6 +6176,7 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){

An optional text tag may be shown to the right of the folded text with the text argument to SCI_TOGGLEFOLDSHOWTEXT. + The default text for all header lines can be set with SCI_SETDEFAULTFOLDDISPLAYTEXT. The text is drawn with the STYLE_FOLDDISPLAYTEXT style.

@@ -6210,6 +6214,10 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){ +

SCI_SETDEFAULTFOLDDISPLAYTEXT(const char *text)
+ SCI_GETDEFAULTFOLDDISPLAYTEXT(<unused>, char *text) → int
+ These messages set and get the default text displayed at the right of the folded text.

+

SCI_SETFOLDEXPANDED(int line, bool expanded)
SCI_GETFOLDEXPANDED(int line) → bool
These messages set and get the expanded state of a single line. The set message has no effect @@ -7330,7 +7338,10 @@ href="#SCI_POSITIONFROMLINE">SCI_POSITIONFROMLINE(lineNumber); This is sent when the user types an ordinary text character (as opposed to a command character) that is entered into the text. The container can use this to decide to display a call tip or an auto - completion list. The character is in SCNotification.ch. + completion list. The character is in SCNotification::ch. + For single byte character sets, this is the byte value of the character; + for UTF-8, it is the Unicode code point; + for DBCS, it is (first byte * 256 + second byte) for 2 byte characters and the byte value for 1 byte characters. This notification is sent before the character has been styled so processing that depends on styling should instead be performed in the SCN_UPDATEUI notification.

@@ -7349,7 +7360,7 @@ href="#SCI_POSITIONFROMLINE">SCI_POSITIONFROMLINE(lineNumber);

SCN_KEY
Reports all keys pressed but not consumed by Scintilla. Used on GTK+ because of - some problems with keyboard focus and is not sent by the Windows version. SCNotification.ch holds the key code and + some problems with keyboard focus and is not sent by the Windows version. SCNotification::ch holds the key code and SCNotification.modifiers holds the modifiers. This notification is sent if the modifiers include SCMOD_ALT or SCMOD_CTRL and the key code is less than 256.

@@ -8438,6 +8449,9 @@ EM_SETTARGETDEVICE When both GTK+ 2 and GTK+ 3 are present, building for GTK+ 3.x requires defining GTK3 on the command line.

+

Adding and removing source files from Scintilla may require modifying build files. + This is addressed in AddSource.txt.

+

Static linking

On Windows, Scintilla is normally used as a dynamic library as a .DLL file. If you want to diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html index 30316ffb7..8d8f81a8a 100644 --- a/scintilla/doc/ScintillaDownload.html +++ b/scintilla/doc/ScintillaDownload.html @@ -26,9 +26,9 @@ @@ -42,7 +42,7 @@ containing very few restrictions.

- Release 4.1.4 + Release 4.1.5

Source Code @@ -50,8 +50,8 @@ The source code package contains all of the source code for Scintilla but no binary executable code and is available in
    -
  • zip format (1700K) commonly used on Windows
  • -
  • tgz format (1500K) commonly used on Linux and compatible operating systems
  • +
  • zip format (1700K) commonly used on Windows
  • +
  • tgz format (1500K) 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/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html index 8e8d734dd..dc7b4e81c 100644 --- a/scintilla/doc/ScintillaHistory.html +++ b/scintilla/doc/ScintillaHistory.html @@ -558,11 +558,7 @@

  • - Released 7 March 2019. -
  • -
  • - Improve the styling of numbers in Nim. - Feature #1268. + Released 17 April 2019.
  • On Win32, removed special handling of non-0 wParam to WM_PAINT. @@ -570,6 +566,14 @@
  • Implement high-priority idle on Win32 to make redraw smoother and more efficient.
  • +
  • + Add vertical bookmark symbol SC_MARK_VERTICALBOOKMARK. + Feature #1276. +
  • +
  • + Set default fold display text SCI_SETDEFAULTFOLDDISPLAYTEXT(text). + Feature #1272. +
  • Add SCI_SETCHARACTERCATEGORYOPTIMIZATION API to optimize speed of character category features like determining whether a character is a space or number @@ -577,13 +581,33 @@ Feature #1259.
  • + Improve the styling of numbers in Nim. + Feature #1268. +
  • +
  • + Fix exception when inserting DBCS text. + Bug #2093. +
  • +
  • + Improve performance of accessibility on GTK. + Bug #2094. +
  • +
  • + Fix text reported for deletion with accessibility on GTK. + Bug #2095. +
  • +
  • Fix flicker when inserting primary selection on GTK. Bug #2087.
  • + Support coloured text in Windows 8.1+. + Feature #1277. +
  • +
  • Avoid potential long hangs with idle styling for huge documents on Cocoa and GTK.
  • -
      +

    Release 4.1.4

    @@ -1249,7 +1273,7 @@
  • This is the first release of the - long term branch + long term branch which avoids using features from C++14 or later in order to support older systems.
  • diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html index 448da4f2b..57c83cd00 100644 --- a/scintilla/doc/index.html +++ b/scintilla/doc/index.html @@ -9,7 +9,7 @@ - +
- + Windows   - + GTK+/Linux