From 28382215fcc5fdb615018853429eef4d3117a7bf Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Mon, 20 Sep 2021 09:09:44 +1000
Subject: Updates for 5.1.2.

---
 cocoa/Scintilla/Info.plist                          |  2 +-
 cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj |  8 ++++----
 doc/ScintillaDownload.html                          | 10 +++++-----
 doc/ScintillaHistory.html                           |  2 +-
 doc/index.html                                      | 12 ++++--------
 qt/ScintillaEdit/ScintillaEdit.pro                  |  2 +-
 qt/ScintillaEditBase/ScintillaEditBase.pro          |  2 +-
 version.txt                                         |  2 +-
 win32/ScintRes.rc                                   |  4 ++--
 9 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/cocoa/Scintilla/Info.plist b/cocoa/Scintilla/Info.plist
index 75fdd6561..6c88f3151 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.1</string>
+	<string>5.1.2</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 8c9192025..f8fa55771 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.1;
+				CURRENT_PROJECT_VERSION = 5.1.2;
 				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.1;
+				CURRENT_PROJECT_VERSION = 5.1.2;
 				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.1;
+				CURRENT_PROJECT_VERSION = 5.1.2;
 				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.1;
+				CURRENT_PROJECT_VERSION = 5.1.2;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 48b673d31..609162248 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/scintilla511.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scintilla512.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scintilla511.tgz">
+	<a href="https://www.scintilla.org/scintilla512.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 5.1.1
+       Release 5.1.2
     </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/scintilla511.zip">zip format</a> (1.3M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla511.tgz">tgz format</a> (1.2M) commonly used on Linux and compatible operating systems</li>
+       <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>
        </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 3f9dd09e5..e7d0ead45 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -572,7 +572,7 @@
     </h3>
     <ul>
 	<li>
-	Released 26 July 2021.
+	Released 23 September 2021.
 	</li>
 	<li>
 	Add SCI_STYLESETCHECKMONOSPACED which can be used to optimize fonts that are monospaced
diff --git a/doc/index.html b/doc/index.html
index f3fe83b9a..a9baf4d87 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="20210726" />
+    <meta name="Date.Modified" content="20210923" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
         #versionlist {
@@ -56,8 +56,8 @@
           GTK, and OS X</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 5.1.1<br />
-           Site last modified July 26 2021</font>
+          <font color="#FFCC99" size="3"> Release version 5.1.2<br />
+           Site last modified September 23 2021</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -72,6 +72,7 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <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
       platform-independent code and platform layers should remain compatible through 5.x releases.
@@ -81,11 +82,6 @@
       The colours used for selections, carets, and hot spots can now be controlled with the 'elements'
       APIs which allows better control over translucency and may default to platform colours such
       as using the system defined selection background colour on macOS.</li>
-      <li>Version 5.0.2 fixes text encoding for display and adds font locale support on Windows.
-      Autocompletion lists improved on macOS 11.</li>
-      <li>Version 5.0.1 has significantly changed the interface between platform layers and platform-independent code
-      with more drawing capabilities. This includes ubiquitous translucency and variable stroke width to better support High DPI displays.</li>
-      <li>Version 5.0.0 is an unstable release with lexers unbundled.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index 4f34e8b79..8b814d09e 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.1
+VERSION = 5.1.2
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 152ba54de..e0d553a34 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.1
+VERSION = 5.1.2
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index c0556fb20..4d0e90cbc 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-511
+512
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 54ae1c8be..0689fbff5 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "5.1.1"
-#define VERSION_WORDS 5, 1, 1, 0
+#define VERSION_SCINTILLA "5.1.2"
+#define VERSION_WORDS 5, 1, 2, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
-- 
cgit v1.2.3