diff --git a/scintilla/cppcheck.suppress b/scintilla/cppcheck.suppress index ebb9f5389..129fcdaaf 100644 --- a/scintilla/cppcheck.suppress +++ b/scintilla/cppcheck.suppress @@ -31,6 +31,10 @@ constParameter:scintilla/lexlib/StyleContext.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/qt/ScintillaEditBase/ScintillaQt.cpp +knownConditionTrueFalse:scintilla/win32/ScintillaWin.cxx + // moc_ files show #error as they are not built with standard context preprocessorErrorDirective:scintilla/qt/*.cpp diff --git a/scintilla/doc/SciCoding.html b/scintilla/doc/SciCoding.html index e27cf5b30..19a13a7f7 100644 --- a/scintilla/doc/SciCoding.html +++ b/scintilla/doc/SciCoding.html @@ -134,7 +134,7 @@ Exceptions and templates may be used but, since Scintilla can be used from C as well as C++, exceptions may not be thrown out of Scintilla and all exceptions should be caught before returning from Scintilla. - A 'Scintilla' name space is used. This helps with name clashes on OS X. + A 'Scintilla' name space is used. This helps with name clashes on macOS.

The goto statement is not used because of bad memories from my first job diff --git a/scintilla/doc/ScintillaDoc.html b/scintilla/doc/ScintillaDoc.html index 932d26de8..c463dc3c2 100644 --- a/scintilla/doc/ScintillaDoc.html +++ b/scintilla/doc/ScintillaDoc.html @@ -169,7 +169,7 @@

The GTK version also uses messages in a similar way to the Windows version. This is different to normal GTK practice but made it easier to implement rapidly.

-

Scintilla also builds with Cocoa on OS X and with Qt, and follows the conventions of +

Scintilla also builds with Cocoa on macOS and with Qt, and follows the conventions of those platforms.

Scintilla provides only limited experimental support on Windows for right-to-left languages @@ -5177,7 +5177,7 @@ struct Sci_TextToFind { RGBA format is used for the pixmap. The width and height must previously been set with the SCI_RGBAIMAGESETWIDTH and SCI_RGBAIMAGESETHEIGHT messages.

-

A scale factor in percent may be set with SCI_RGBAIMAGESETSCALE. This is useful on OS X with +

A scale factor in percent may be set with SCI_RGBAIMAGESETSCALE. This is useful on macOS with a retina display where each display unit is 2 pixels: use a factor of 200 so that each image pixel is displayed using a screen pixel. The default scale, 100, will stretch each image pixel to cover 4 screen pixels on a retina display.

Pixmaps use the SC_MARK_RGBAIMAGE marker symbol.

@@ -5562,7 +5562,7 @@ struct Sci_TextToFind { A version of INDIC_SQUIGGLE that draws using a pixmap instead of as a series of line segments for performance. Measured to be between 3 and 6 times faster than INDIC_SQUIGGLE on GTK. - Appearance will not be as good as INDIC_SQUIGGLE on OS X in HiDPI mode. + Appearance will not be as good as INDIC_SQUIGGLE on macOS in HiDPI mode. @@ -5728,11 +5728,11 @@ struct Sci_TextToFind { Can be used to iterate through the document to discover all the indicator positions.

-

OS X Find Indicator

+

macOS Find Indicator

-

On OS X search matches are highlighted with an animated gold rounded rectangle. +

On macOS search matches are highlighted with an animated gold rounded rectangle. The indicator shows, then briefly grows 25% and shrinks to the original size to draw the user's attention. - While this feature is currently only implemented on OS X, it may be implemented on other platforms + While this feature is currently only implemented on macOS, it may be implemented on other platforms in the future.

SCI_FINDINDICATORSHOW(position start, position end)
@@ -5740,7 +5740,7 @@ struct Sci_TextToFind { These two messages show and animate the find indicator. The indicator remains visible with SCI_FINDINDICATORSHOW and fades out after showing for half a second with SCI_FINDINDICATORFLASH. - SCI_FINDINDICATORSHOW behaves similarly to the OS X TextEdit and Safari applications + SCI_FINDINDICATORSHOW behaves similarly to the macOS TextEdit and Safari applications and is best suited to editing documentation where the search target is often a word. SCI_FINDINDICATORFLASH is similar to Xcode and is suited to editing source code where the match will often be located next to operators which would otherwise be hidden under the indicator's @@ -6471,8 +6471,8 @@ struct Sci_TextToFind {

The SCI_SCROLLTO[START|END] commands scroll the document to the start - or end without changing the selection. These commands match OS X platform conventions for the behaviour of the - home and end keys. Scintilla can be made to match OS X applications + 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 by binding the home and end keys to these commands.

@@ -6514,7 +6514,7 @@ struct Sci_TextToFind {

The modifiers are a combination of zero or more of SCMOD_ALT, SCMOD_CTRL, SCMOD_SHIFT, SCMOD_META, and SCMOD_SUPER. - On OS X, the Command key is mapped to SCMOD_CTRL and the Control key to + On macOS, the Command key is mapped to SCMOD_CTRL and the Control key to SCMOD_META. SCMOD_SUPER is only available on GTK which is commonly the Windows key. If you are building a table, you might @@ -9415,7 +9415,7 @@ for line = lineStart to lineEnd do SCI_ENSUREVISIBLE(line) next If there is no suitable platform support, the LodePNG and picoPNG libraries are small libraries for loading and decoding PNG files available under a BSD-style license.

-

RGBA format is supported on Windows, GTK and OS X Cocoa.

+

RGBA format is supported on Windows, GTK and macOS Cocoa.

XPM

diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html index 7b447f9c2..c95a73cd4 100644 --- a/scintilla/doc/ScintillaDownload.html +++ b/scintilla/doc/ScintillaDownload.html @@ -26,9 +26,9 @@ @@ -42,7 +42,7 @@ containing very few restrictions.

- Release 5.2.0 + Release 5.2.1

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 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 171afc4a8..7491109a6 100644 --- a/scintilla/doc/ScintillaHistory.html +++ b/scintilla/doc/ScintillaHistory.html @@ -572,6 +572,32 @@

- + Windows   - + GTK/Linux  

Releases

+

+ Release 5.2.1 +

+

Release 5.2.0

@@ -599,6 +625,11 @@ Bug #2306.
  • + On GTK, use fractional positioning to help Chinese characters in monospaced fonts + line up better with roman characters. + Bug #2310. +
    • +
  • On macOS allow Scintilla to run if built without cursor images. Feature #1425.
    • diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html index 36608905c..245ec3e4d 100644 --- a/scintilla/doc/index.html +++ b/scintilla/doc/index.html @@ -9,7 +9,7 @@ - +