diff options
| -rw-r--r-- | cocoa/Scintilla/Info.plist | 2 | ||||
| -rw-r--r-- | cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj | 8 | ||||
| -rw-r--r-- | doc/ScintillaDownload.html | 10 | ||||
| -rw-r--r-- | doc/ScintillaHistory.html | 12 | ||||
| -rw-r--r-- | doc/index.html | 3 | ||||
| -rw-r--r-- | qt/ScintillaEdit/ScintillaEdit.pro | 2 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.pro | 2 | ||||
| -rw-r--r-- | version.txt | 2 | ||||
| -rw-r--r-- | win32/ScintRes.rc | 4 | 
9 files changed, 29 insertions, 16 deletions
diff --git a/cocoa/Scintilla/Info.plist b/cocoa/Scintilla/Info.plist index 6c88f3151..1facbec50 100644 --- a/cocoa/Scintilla/Info.plist +++ b/cocoa/Scintilla/Info.plist @@ -15,7 +15,7 @@  	<key>CFBundlePackageType</key>  	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>  	<key>CFBundleShortVersionString</key> -	<string>5.1.2</string> +	<string>5.1.3</string>  	<key>CFBundleVersion</key>  	<string>$(CURRENT_PROJECT_VERSION)</string>  	<key>NSHumanReadableCopyright</key> diff --git a/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj b/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj index f8fa55771..de3106577 100644 --- a/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj +++ b/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj @@ -569,7 +569,7 @@  				CLANG_WARN_UNREACHABLE_CODE = YES;  				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;  				COPY_PHASE_STRIP = NO; -				CURRENT_PROJECT_VERSION = 5.1.2; +				CURRENT_PROJECT_VERSION = 5.1.3;  				DEBUG_INFORMATION_FORMAT = dwarf;  				ENABLE_STRICT_OBJC_MSGSEND = YES;  				ENABLE_TESTABILITY = YES; @@ -631,7 +631,7 @@  				CLANG_WARN_UNREACHABLE_CODE = YES;  				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;  				COPY_PHASE_STRIP = NO; -				CURRENT_PROJECT_VERSION = 5.1.2; +				CURRENT_PROJECT_VERSION = 5.1.3;  				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";  				ENABLE_NS_ASSERTIONS = NO;  				ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -661,7 +661,7 @@  				CODE_SIGN_IDENTITY = "-";  				CODE_SIGN_STYLE = Manual;  				COMBINE_HIDPI_IMAGES = YES; -				CURRENT_PROJECT_VERSION = 5.1.2; +				CURRENT_PROJECT_VERSION = 5.1.3;  				DEFINES_MODULE = YES;  				DEVELOPMENT_TEAM = "";  				DYLIB_COMPATIBILITY_VERSION = 1; @@ -695,7 +695,7 @@  				CODE_SIGN_IDENTITY = "-";  				CODE_SIGN_STYLE = Manual;  				COMBINE_HIDPI_IMAGES = YES; -				CURRENT_PROJECT_VERSION = 5.1.2; +				CURRENT_PROJECT_VERSION = 5.1.3;  				DEFINES_MODULE = YES;  				DEVELOPMENT_TEAM = "";  				DYLIB_COMPATIBILITY_VERSION = 1; diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html index 609162248..1670df4e1 100644 --- a/doc/ScintillaDownload.html +++ b/doc/ScintillaDownload.html @@ -26,9 +26,9 @@      <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">        <tr>          <td> -          <font size="4"> <a href="https://www.scintilla.org/scintilla512.zip"> +          <font size="4"> <a href="https://www.scintilla.org/scintilla513.zip">  	Windows</a>   -	<a href="https://www.scintilla.org/scintilla512.tgz"> +	<a href="https://www.scintilla.org/scintilla513.tgz">            GTK/Linux</a>    	</font>          </td> @@ -42,7 +42,7 @@        containing very few restrictions.      </p>      <h3> -       Release 5.1.2 +       Release 5.1.3      </h3>      <h4>         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         <ul> -       <li><a href="https://www.scintilla.org/scintilla512.zip">zip format</a> (1.3M) commonly used on Windows</li> -       <li><a href="https://www.scintilla.org/scintilla512.tgz">tgz format</a> (1.2M) commonly used on Linux and compatible operating systems</li> +       <li><a href="https://www.scintilla.org/scintilla513.zip">zip format</a> (1.3M) commonly used on Windows</li> +       <li><a href="https://www.scintilla.org/scintilla513.tgz">tgz format</a> (1.2M) commonly used on Linux and compatible operating systems</li>         </ul>         Instructions for building on both Windows and Linux are included in the readme file.      <h4> diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index e7d0ead45..442b97e48 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -568,6 +568,18 @@      </table>      <h2>Releases</h2>      <h3> +       <a href="https://www.scintilla.org/scintilla513.zip">Release 5.1.3</a> +    </h3> +    <ul> +	<li> +	Released 29 September 2021. +	</li> +	<li> +	Fix bug with SCI_STYLESETCHECKMONOSPACED on Cocoa that led to incorrect +	layout with overlapping text. +	</li> +    </ul> +    <h3>         <a href="https://www.scintilla.org/scintilla512.zip">Release 5.1.2</a>      </h3>      <ul> diff --git a/doc/index.html b/doc/index.html index a9baf4d87..7bcd4fa88 100644 --- a/doc/index.html +++ b/doc/index.html @@ -9,7 +9,7 @@      <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />      <meta name="Description"      content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." /> -    <meta name="Date.Modified" content="20210923" /> +    <meta name="Date.Modified" content="20210929" />      <meta name="viewport" content="width=device-width, initial-scale=1" />      <style type="text/css">          #versionlist { @@ -72,6 +72,7 @@        </tr>      </table>      <ul id="versionlist"> +      <li>Version 5.1.3 fixes a layout bug with monospaced fonts on Cocoa.</li>        <li>Version 5.1.2 can optimize monospaced fonts and allows hiding the first line.</li>        <li>Version 5.1.1 searches faster and improves accuracy for invalid DBCS text.</li>        <li>Version 5.1.0 is a stable release: the interfaces between Scintilla and Lexilla and between diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro index 8b814d09e..f4cf5407f 100644 --- a/qt/ScintillaEdit/ScintillaEdit.pro +++ b/qt/ScintillaEdit/ScintillaEdit.pro @@ -12,7 +12,7 @@ TEMPLATE = lib  CONFIG += lib_bundle  CONFIG += c++1z -VERSION = 5.1.2 +VERSION = 5.1.3  SOURCES += \      ScintillaEdit.cpp \ diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro index e0d553a34..9e1370234 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.pro +++ b/qt/ScintillaEditBase/ScintillaEditBase.pro @@ -12,7 +12,7 @@ TEMPLATE = lib  CONFIG += lib_bundle  CONFIG += c++1z -VERSION = 5.1.2 +VERSION = 5.1.3  SOURCES += \      PlatQt.cpp \ diff --git a/version.txt b/version.txt index 4d0e90cbc..31cf34b8d 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -512 +513 diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc index 0689fbff5..8536edaa0 100644 --- a/win32/ScintRes.rc +++ b/win32/ScintRes.rc @@ -4,8 +4,8 @@  #include <windows.h> -#define VERSION_SCINTILLA "5.1.2" -#define VERSION_WORDS 5, 1, 2, 0 +#define VERSION_SCINTILLA "5.1.3" +#define VERSION_WORDS 5, 1, 3, 0  VS_VERSION_INFO VERSIONINFO  FILEVERSION	VERSION_WORDS  | 
