Updated for version 3.21.0.rel-3-21-0

9 files changed, 40 insertions, 22 deletions

diff --git a/LongTermDownload.html b/LongTermDownload.html
index 0d931adab..1380cf55e 100644
--- a/LongTermDownload.html
+++ b/LongTermDownload.html
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.20.0/scintilla3200.zip/download">
+          <font size="4"> <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.21.0/scintilla3210.zip/download">
   Windows</a>&nbsp;&nbsp;
-  <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.20.0/scintilla3200.tgz/download">
+  <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.21.0/scintilla3210.tgz/download">
           GTK+/Linux</a>&nbsp;&nbsp;
   </font>
         </td>
@@ -46,7 +46,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 3.20.0
+       Release 3.21.0
     </h3>
     <h4>
        Source Code
@@ -54,8 +54,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://sourceforge.net/projects/scintilla/files/scintilla/3.20.0/scintilla3200.zip/download">zip format</a> commonly used on Windows</li>
-       <li><a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.20.0/scintilla3200.tgz/download">tgz format</a> commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.21.0/scintilla3210.zip/download">zip format</a> commonly used on Windows</li>
+       <li><a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.21.0/scintilla3210.tgz/download">tgz format</a> commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <p>
diff --git a/cocoa/ScintillaFramework/Info.plist b/cocoa/ScintillaFramework/Info.plist
index b2a7c5a82..15ffbce34 100644
--- a/cocoa/ScintillaFramework/Info.plist
+++ b/cocoa/ScintillaFramework/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.20.0</string>
+	<string>3.21.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.20.0</string>
+	<string>3.21.0</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index af5f9f27b..53ce9b5a7 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://sourceforge.net/projects/scintilla/files/scintilla/3.20.0/scintilla3200.zip/download">
+          <font size="4"> <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.21.0/scintilla3210.zip/download">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.20.0/scintilla3200.tgz/download">
+	<a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.21.0/scintilla3210.tgz/download">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 3.20.0
+       Release 3.21.0
     </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://sourceforge.net/projects/scintilla/files/scintilla/3.20.0/scintilla3200.zip/download">zip format</a> (1600K) commonly used on Windows</li>
-       <li><a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.20.0/scintilla3200.tgz/download">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li>
+         <li><a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.21.0/scintilla3210.zip/download">zip format</a> (1600K) commonly used on Windows</li>
+       <li><a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.21.0/scintilla3210.tgz/download">tgz format</a> (1400K) 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 c7d4322fc..026a37c3d 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -561,11 +561,11 @@
       </li>
     </ul>
     <h3>
-       <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.20.1/scintilla3201.zip/download">Release 3.20.1</a>
+       <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.21.0/scintilla3210.zip/download">Release 3.21.0</a>
     </h3>
     <ul>
 	<li>
-	Released 9 May 2020.
+	Released 27 July 2020.
 	</li>
 	<li>
 	Constants in Scintilla.h can be disabled with SCI_DISABLE_AUTOGENERATED.
@@ -632,6 +632,24 @@
 	<a href="https://sourceforge.net/p/scintilla/feature-requests/1358/">Feature #1358</a>.
 	</li>
 	<li>
+	Lua LPeg lexer API improvements: added <code>lexer.colors</code> and
+	<code>lexer.styles</code> tables (along with a new way to define styles) for
+	use in themes, aliased <code>lexer.fold*</code> to
+	<code>lexer.property['fold*']</code>, and deprecated
+	<code>lexer.nonnewline_esc</code>, <code>lexer.ascii</code>,
+	<code>lexer.extend</code>, <code>lexer.cntrl</code>, and
+	<code>lexer.print</code>.
+	</li>
+	<li>
+	Added Lua LPeg lexer for Fennel.
+	</li>
+	<li>
+	The Lua LPeg lexer for markdown handles code blocks and spans better.
+	</li>
+	<li>
+	The Lua LPeg lexer for C now highlights C99 <code>bool</code>, <code>true</code>, and <code>false</code>.
+	</li>
+	<li>
 	Fixed bug with GTK on recent Linux distributions where underscores were invisible.
 	<a href="https://sourceforge.net/p/scintilla/bugs/2173/">Bug #2173</a>.
 	</li>
diff --git a/doc/index.html b/doc/index.html
index ef9f1fcb6..ac84f9e1b 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="20200509" />
+    <meta name="Date.Modified" content="20200727" />
     <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 3.20.0<br />
-           Site last modified May 9 2020</font>
+          <font color="#FFCC99" size="3"> Release version 3.21.0<br />
+           Site last modified July 27 2020</font>
         </td>
         <td width="20%">
           &nbsp;
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index 14b6245ab..0580d4081 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -20,7 +20,7 @@ unix {
     }
 }
 
-VERSION = 3.20.0
+VERSION = 3.21.0
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 64d43378d..9165a9b3c 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -19,7 +19,7 @@ unix {
     }
 }
 
-VERSION = 3.20.0
+VERSION = 3.21.0
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index a6981b371..465a35cfc 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-3200
+3210
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index f9270de82..4019ef015 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "3.20.0"
-#define VERSION_WORDS 3, 20, 0, 0
+#define VERSION_SCINTILLA "3.21.0"
+#define VERSION_WORDS 3, 21, 0, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS