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 2ad37b102..b1d0120c0 100644 Binary files a/scintilla/doc/Markers.png and b/scintilla/doc/Markers.png differ diff --git a/scintilla/doc/ScintillaDoc.html b/scintilla/doc/ScintillaDoc.html index 0624f02f2..7f7857a5e 100644 --- a/scintilla/doc/ScintillaDoc.html +++ b/scintilla/doc/ScintillaDoc.html @@ -4072,7 +4072,8 @@ struct Sci_TextToFind { SC_MARK_BACKGROUND, 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