diff --git a/ext/scintilla/.hg_archival.txt b/ext/scintilla/.hg_archival.txt index da70972e..bbba9e06 100644 --- a/ext/scintilla/.hg_archival.txt +++ b/ext/scintilla/.hg_archival.txt @@ -1,6 +1,6 @@ repo: bdf8c3ef2fb01ea24578e726337888e706d10b92 -node: e175dbd62e6b83cfb77f57bc13661421946323e4 +node: 71d4ce5533b402cf13c9ea2b188a8c01cd67dad0 branch: default -latesttag: rel-5-5-1 +latesttag: rel-5-5-3 latesttagdistance: 1 changessincelatesttag: 1 diff --git a/ext/scintilla/.hgtags b/ext/scintilla/.hgtags index 39a16437..90dd89a0 100644 --- a/ext/scintilla/.hgtags +++ b/ext/scintilla/.hgtags @@ -210,3 +210,5 @@ d5477c63f5f60a2869a1b46cafb1687c020701f9 rel-5-4-0 c171b756efc76359f0795ca0a1bfb7eb16d4c04b rel-5-4-3 3a219b13a5d88a9e1bfe6ff76c91a07e08e59003 rel-5-5-0 26e6c52345337236815c1221c99a4540c78596c5 rel-5-5-1 +8d3fb4e5905454cc46a33141d07654dddfeb3b44 rel-5-5-2 +7bc37e9e9de31baf3725e083ee1b937e54856856 rel-5-5-3 diff --git a/ext/scintilla/README b/ext/scintilla/README index f6138d52..87ab2491 100644 --- a/ext/scintilla/README +++ b/ext/scintilla/README @@ -67,7 +67,7 @@ Mingw-w64 is known to work. Other compilers will probably not work. Only Scintilla will build with GTK+ on Windows. SciTE will not work. Make builds both a static library version of Scintilla with lexers (scintilla.a) and -a shared library without lexers (libscintilla.so or or libscintilla.dll). +a shared library without lexers (libscintilla.so or libscintilla.dll). To build Scintilla, make in the scintilla/gtk directory cd scintilla\gtk diff --git a/ext/scintilla/Scintilla.vcxproj b/ext/scintilla/Scintilla.vcxproj index 19b4d58f..2348ef72 100644 --- a/ext/scintilla/Scintilla.vcxproj +++ b/ext/scintilla/Scintilla.vcxproj @@ -251,6 +251,7 @@ + @@ -295,6 +296,7 @@ + @@ -333,6 +335,8 @@ + + @@ -340,6 +344,7 @@ + diff --git a/ext/scintilla/Scintilla.vcxproj.filters b/ext/scintilla/Scintilla.vcxproj.filters index d5fcf40b..a782561e 100644 --- a/ext/scintilla/Scintilla.vcxproj.filters +++ b/ext/scintilla/Scintilla.vcxproj.filters @@ -758,6 +758,21 @@ Lexilla\lexlib + + Lexilla\lexers + + + Lexilla\lexers + + + Lexilla\lexers + + + Lexilla\lexers + + + Lexilla\lexers + diff --git a/ext/scintilla/call/ScintillaCall.cxx b/ext/scintilla/call/ScintillaCall.cxx index 8f48a525..64c9728e 100644 --- a/ext/scintilla/call/ScintillaCall.cxx +++ b/ext/scintilla/call/ScintillaCall.cxx @@ -655,6 +655,14 @@ bool ScintillaCall::StyleGetCheckMonospaced(int style) { return Call(Message::StyleGetCheckMonospaced, style); } +void ScintillaCall::StyleSetStretch(int style, Scintilla::FontStretch stretch) { + Call(Message::StyleSetStretch, style, static_cast(stretch)); +} + +FontStretch ScintillaCall::StyleGetStretch(int style) { + return static_cast(Call(Message::StyleGetStretch, style)); +} + void ScintillaCall::StyleSetInvisibleRepresentation(int style, const char *representation) { CallString(Message::StyleSetInvisibleRepresentation, style, representation); } @@ -799,6 +807,10 @@ void ScintillaCall::EndUndoAction() { Call(Message::EndUndoAction); } +int ScintillaCall::UndoSequence() { + return static_cast(Call(Message::GetUndoSequence)); +} + int ScintillaCall::UndoActions() { return static_cast(Call(Message::GetUndoActions)); } @@ -1975,10 +1987,18 @@ void ScintillaCall::Tab() { Call(Message::Tab); } +void ScintillaCall::LineIndent() { + Call(Message::LineIndent); +} + void ScintillaCall::BackTab() { Call(Message::BackTab); } +void ScintillaCall::LineDedent() { + Call(Message::LineDedent); +} + void ScintillaCall::NewLine() { Call(Message::NewLine); } @@ -2723,6 +2743,18 @@ void ScintillaCall::CutAllowLine() { Call(Message::CutAllowLine); } +void ScintillaCall::SetCopySeparator(const char *separator) { + CallString(Message::SetCopySeparator, 0, separator); +} + +int ScintillaCall::CopySeparator(char *separator) { + return static_cast(CallPointer(Message::GetCopySeparator, 0, separator)); +} + +std::string ScintillaCall::CopySeparator() { + return CallReturnString(Message::GetCopySeparator, 0); +} + void *ScintillaCall::CharacterPointer() { return reinterpret_cast(Call(Message::GetCharacterPointer)); } diff --git a/ext/scintilla/cppcheck.suppress b/ext/scintilla/cppcheck.suppress index ea0dacc4..7344a7ae 100644 --- a/ext/scintilla/cppcheck.suppress +++ b/ext/scintilla/cppcheck.suppress @@ -1,6 +1,12 @@ // File to suppress cppcheck warnings for files that will not be fixed. // Does not suppress warnings where an additional occurrence of the warning may be of interest. -// Configured for cppcheck 2.11 +// Configured for cppcheck 2.15 + +// Just a report of how many checkers are run +checkersReport + +// This just warns that cppcheck isn't exhaustive and it still appears in exhaustive mode +normalCheckLevelMaxBranches // Coding style is to use assignments in constructor when there are many // members to initialize or the initialization is complex or has comments. @@ -37,12 +43,6 @@ returnByReference:scintilla/src/Selection.h // MarginView access to all bits is safe and is better defined in later versions of C++ shiftTooManyBitsSigned:scintilla/src/MarginView.cxx -// DLL entry points are unused inside Scintilla -unusedFunction:scintilla/win32/ScintillaDLL.cxx - -// ScintillaDocument is providing an API and there are no consumers of the API inside Scintilla -unusedFunction:scintilla/qt/ScintillaEdit/ScintillaDocument.cpp - // Doesn't understand changing dropWentOutside in Editor knownConditionTrueFalse:scintilla/win32/ScintillaWin.cxx @@ -53,19 +53,10 @@ constParameterPointer:scintilla/win32/ScintillaWin.cxx knownConditionTrueFalse:scintilla/src/Editor.cxx knownConditionTrueFalse:scintilla/src/EditView.cxx -// cppcheck seems to believe that unique_ptr::get returns void* instead of T** -arithOperationsOnVoidPointer:scintilla/src/PerLine.cxx -arithOperationsOnVoidPointer:scintilla/src/PositionCache.cxx - // G_DEFINE_TYPE is too complex to pass to cppcheck unknownMacro:scintilla/gtk/PlatGTK.cxx - -// maskSmooth set depending on preprocessor allowing Wayland definition -badBitmaskCheck:scintilla/gtk/ScintillaGTK.cxx - -// Changing events to const pointers changes signature and would require casts when hooking up -constParameterPointer:scintilla/gtk/ScintillaGTK.cxx -constParameterCallback:scintilla/gtk/ScintillaGTK.cxx +// G_END_DECLS +unknownMacro:scintilla/gtk/scintilla-marshal.h // Difficult to test accessibility so don't change constParameterPointer:scintilla/gtk/ScintillaGTKAccessible.cxx diff --git a/ext/scintilla/doc/ScintillaDoc.html b/ext/scintilla/doc/ScintillaDoc.html index bc282f50..95a830be 100644 --- a/ext/scintilla/doc/ScintillaDoc.html +++ b/ext/scintilla/doc/ScintillaDoc.html @@ -1858,6 +1858,8 @@

Cut, copy and paste

SCI_CUTALLOWLINE
SCI_SETPASTECONVERTENDINGS(bool convert)
SCI_GETPASTECONVERTENDINGS → bool
+ SCI_SETCOPYSEPARATOR(<unused>, const char *separator)
+ SCI_GETCOPYSEPARATOR(<unused>, char *separator) → int
SCI_REPLACERECTANGULAR(position length, const char *text)
@@ -1905,6 +1907,11 @@

Cut, copy and paste

SCI_SETEOLMODE. Defaults to true.

+

SCI_SETCOPYSEPARATOR(<unused>, const char *separator)
+ SCI_GETCOPYSEPARATOR(<unused>, char *separator) → int
+ When a multiple selection is copied, this string property is added between each part. + Defaults to empty.

+

SCI_REPLACERECTANGULAR(position length, const char *text)
Replaces the selected text or empty selection with the given text. The insertion is performed similarly to rectangular pastes: new lines in the given text are interpreted as @@ -1929,6 +1936,7 @@

Undo and Redo

SCI_GETUNDOCOLLECTION → bool
SCI_BEGINUNDOACTION
SCI_ENDUNDOACTION
+ SCI_GETUNDOSEQUENCE → int
SCI_ADDUNDOACTION(int token, int flags)
@@ -1972,11 +1980,17 @@

Undo and Redo

SCI_BEGINUNDOACTION
SCI_ENDUNDOACTION
- Send these two messages to Scintilla to mark the beginning and end of a set of operations that + Send these two messages to Scintilla to mark the beginning and end of a sequence of operations that you want to undo all as one operation but that you have to generate as several operations. Alternatively, you can use these to mark a set of operations that you do not want to have combined with the preceding or following operations if they are undone.

+

SCI_GETUNDOSEQUENCE → int
+ Determine if an undo sequence is active with a positive value indicating that a sequence is active and 0 that there is no current sequence. + The value returned is the nesting depth of the sequence, that is, the number of times SCI_BEGINUNDOACTION + was called without a correspnding SCI_ENDUNDOACTION. + A negative value indicates an error.

+

SCI_ADDUNDOACTION(int token, int flags)
The container can add its own actions into the undo stack by calling SCI_ADDUNDOACTION and an SCN_MODIFIED @@ -3334,6 +3348,8 @@

Style definition

SCI_STYLESETWEIGHT(int style, int weight)
SCI_STYLEGETWEIGHT(int style) → int
+ SCI_STYLESETSTRETCH(int style, int stretch)
+ SCI_STYLEGETSTRETCH(int style) → int
SCI_STYLESETITALIC(int style, bool italic)
SCI_STYLEGETITALIC(int style) → bool
@@ -3393,6 +3409,8 @@

Style definition

SCI_STYLEGETBOLD(int style) → bool
SCI_STYLESETWEIGHT(int style, int weight)
SCI_STYLEGETWEIGHT(int style) → int
+ SCI_STYLESETSTRETCH(int style, int stretch)
+ SCI_STYLEGETSTRETCH(int style) → int
SCI_STYLESETITALIC(int style, bool italic)
SCI_STYLEGETITALIC(int style) → bool
These messages (plus Style definition The SCI_STYLESETBOLD message takes a boolean argument with 0 choosing SC_WEIGHT_NORMAL and 1 SC_WEIGHT_BOLD.

+

The stretch of a font can be set with SCI_STYLESETSTRETCH which can produce condensed or expanded text. + The weight is a number between 1 and 9 which corresponds to a horizontal magnification between 50% and 200% + with 1 being very condensed, 5 normal, and 9 very expanded. + While any value can be used, fonts and platforms often only support between 2 and 3 stretches. + The best supported and useful values are + SC_STRETCH_CONDENSED, + SC_STRETCH_NORMAL, and + SC_STRETCH_EXPANDED. + The Inconsolata variable font supports many stretch values and can be useful for experimenting. + Condensed text can be used to display more text in a narrower window and expanded text may be used + for clearer text that is easier to read. + The API is based on the Cascading Style Sheets font-stretch property. +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SC_STRETCH_ULTRA_CONDENSED150%
SC_STRETCH_EXTRA_CONDENSED262.5%
SC_STRETCH_CONDENSED375%
SC_STRETCH_SEMI_CONDENSED487.5%
SC_STRETCH_NORMAL5100%
SC_STRETCH_SEMI_EXPANDED6112.5%
SC_STRETCH_EXPANDED7125%
SC_STRETCH_EXTRA_EXPANDED8150%
SC_STRETCH_ULTRA_EXPANDED9200%

SCI_STYLESETUNDERLINE(int style, bool underline)
@@ -6288,6 +6368,8 @@

Autocompletion

SCI_AUTOCGETMAXHEIGHT → int
SCI_AUTOCSETMAXWIDTH(int characterCount)
SCI_AUTOCGETMAXWIDTH → int
+ SCI_AUTOCSETSTYLE(int style)
+ SCI_AUTOCGETSTYLE → int
SC_ELEMENT_LIST : colouralpha
SC_ELEMENT_LIST_BACK : colouralpha
SC_ELEMENT_LIST_SELECTED : colouralpha
@@ -6510,7 +6592,7 @@

Autocompletion

- SCI_AUTOCSETSTYLE
+ SCI_AUTOCSETSTYLE(int style)
SCI_AUTOCGETSTYLE → int
Get or set the style used by autocompletion lists to determine the font facename, size and character set used to display characters. Defaults @@ -6913,6 +6995,9 @@

Keyboard commands

SCI_VERTICALCENTRECARET + SCI_LINEINDENT + + SCI_LINEDEDENT @@ -6955,6 +7040,9 @@

Keyboard commands

as appropriate for SCI_[[VC]HOME|LINEEND]*.

+

The SCI_LINE[INDENT|DEDENT] commands are like SCI_[BACK]TAB but force the + multiline behaviour of the second.

+

The SCI_SCROLLTO[START|END] commands scroll the document to the start or end without changing the selection. These commands match macOS platform conventions for the behaviour of the home and end keys. Scintilla can be made to match macOS applications diff --git a/ext/scintilla/doc/ScintillaDownload.html b/ext/scintilla/doc/ScintillaDownload.html index d2c789f9..68bd415d 100644 --- a/ext/scintilla/doc/ScintillaDownload.html +++ b/ext/scintilla/doc/ScintillaDownload.html @@ -26,9 +26,9 @@ @@ -42,7 +42,7 @@

containing very few restrictions.

- Release 5.5.1 + Release 5.5.3

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 (1.8M) commonly used on Windows
    • -
  • tgz format (1.7M) commonly used on Linux and compatible operating systems
    • +
  • zip format (1.8M) commonly used on Windows
    • +
  • tgz format (1.7M) 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 dc011dda..8f1b3d83 100644 --- a/ext/scintilla/doc/ScintillaHistory.html +++ b/ext/scintilla/doc/ScintillaHistory.html @@ -585,6 +585,46 @@

Contributors

- + Windows   - + GTK/Linux  

Releases

+

+ Release 5.5.3 +

+
    +
  • + Released 19 October 2024. +
    • +
  • + On Win32 change direction of horizontal mouse wheel and touchpad scrolling to match other applications. + Bug #2449. +
    • +
+

+ Release 5.5.2 +

+
    +
  • + Released 21 August 2024. +
    • +
  • + Add SCI_SETCOPYSEPARATOR for separator between parts of a multiple selection when copied to the clipboard. + Feature #1530. +
    • +
  • + Add SCI_GETUNDOSEQUENCE to determine whether an undo sequence is active and its nesting depth. +
    • +
  • + Add SCI_STYLESETSTRETCH to support condensed and expanded text styles. +
    • +
  • + Add SCI_LINEINDENT and SCI_LINEDEDENT. + Feature #1524. +
    • +
  • + Fix bug on Cocoa where double-click stopped working when system had been running for a long time. +
    • +
  • + On Cocoa implement more values of font weight and stretch. +
    • +

Release 5.5.1

diff --git a/ext/scintilla/doc/index.html b/ext/scintilla/doc/index.html index bd718be5..fe0c4e54 100644 --- a/ext/scintilla/doc/index.html +++ b/ext/scintilla/doc/index.html @@ -9,7 +9,7 @@ - +