Updates for version 3.3.0.

7 files changed, 62 insertions, 18 deletions

diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 905d4a22a..499730be7 100644
--- a/doc/ScintillaDownload.html
+++ b/doc/ScintillaDownload.html
@@ -25,9 +25,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla325.zip?download">
+          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla330.zip?download">
 	Windows</a>&nbsp;&nbsp;
-	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla325.tgz?download">
+	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla330.tgz?download">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -41,7 +41,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 3.2.5
+       Release 3.3.0
     </h3>
     <h4>
        Source Code
@@ -49,8 +49,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="http://prdownloads.sourceforge.net/scintilla/scintilla325.zip?download">zip format</a> (1250K) commonly used on Windows</li>
-       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla325.tgz?download">tgz format</a> (1100K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla330.zip?download">zip format</a> (1250K) commonly used on Windows</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla330.tgz?download">tgz format</a> (1100K) 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 21be10c5e..32eaf707c 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -431,6 +431,52 @@
       </li>
     </ul>
     <h3>
+       <a href="http://prdownloads.sourceforge.net/scintilla/scite330.zip?download">Release 3.3.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 30 March 2013.
+	</li>
+	<li>
+	Overlay scrollers and kinetic scrolling implemented on Cocoa.
+	</li>
+	<li>
+	To improve display smoothness, styling and UI Update notifications will, when possible, be performed in
+	a high-priority idle task on Cocoa instead of during painting.
+	Performing these jobs inside painting can cause paints to be abandoned and a new paint scheduled.
+	On GTK+, the high-priority idle task is used in more cases.
+	</li>
+	<li>
+	SCI_SCROLLRANGE added to scroll the view to display a range of text.
+	If the whole range can not be displayed, priority is given one end.
+	</li>
+	<li>
+	SCI_VISIBLEFROMDOCLINE fixed to never return a line beyond the document end.
+	</li>
+	<li>
+	SCI_LINESCROLL fixed for a negative colmn offset.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1450/">Bug #1450.</a>
+	</li>
+	<li>
+	HTML lexer recognizes JavaScript RegEx literals in more contexts.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1412/">Bug #1412.</a>
+	</li>
+	<li>
+	On GTK+, fix tab markers so visible if indent markers are visible.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1453/">Bug #1453.</a>
+	</li>
+	<li>
+	Fixed automatic display of folded text when return pressed at end of fold header and
+	first folded line was blank.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1455/">Bug #1455.</a>
+	</li>
+	<li>
+	The C++ lexer no longer recognizes raw (R"") strings when the first character after "
+	is invalid.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1454/">Bug #1454.</a>
+	</li>
+    </ul>
+    <h3>
        <a href="http://prdownloads.sourceforge.net/scintilla/scite325.zip?download">Release 3.2.5</a>
     </h3>
     <ul>
diff --git a/doc/index.html b/doc/index.html
index 4100e0341..b47043756 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="20130226" />
+    <meta name="Date.Modified" content="20130330" />
     <style type="text/css">
         #versionlist {
             margin: 0;
@@ -55,8 +55,8 @@
           GTK+</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 3.2.5<br />
-           Site last modified February 26 2013</font>
+          <font color="#FFCC99" size="3"> Release version 3.3.0<br />
+           Site last modified March 30 2013</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -71,15 +71,13 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 3.3.0 implements overlay scrollers and kinetic scrolling on Cocoa.
+      Performance improved on GTK+ and Cocoa by performing more work in 
+      high-priority idle tasks.</li>
       <li>Version 3.2.5 SCI_ALLOCATEEXTENDEDSTYLES introduced so that different uses
       of extended styles can cooperate.
 	Unicode line ends and substyles are added as provisional features which means
 	they may change before becoming permanent.</li>
-      <li>Version 3.2.4 does not truncate copies to clipboard at NULs and adds a folder for LaTeX.</li>
-      <li>Version 3.2.3 improves speed when performing multiple searches.</li>
-      <li>Version 3.2.2 supports retina displays on Cocoa.</li>
-      <li>Version 3.2.1 adds some minor features and fixes bugs.</li>
-      <li>Version 3.2.0 adds support for the Qt platform and PySide Python bindings.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="http://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index df48c8d38..cd4f8c251 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -10,7 +10,7 @@ TARGET = ScintillaEdit
 TEMPLATE = lib
 CONFIG += lib_bundle
 
-VERSION = 3.2.5
+VERSION = 3.3.0
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 997f0643d..2c0ef64b0 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -10,7 +10,7 @@ TARGET = ScintillaEditBase
 TEMPLATE = lib
 CONFIG += lib_bundle
 
-VERSION = 3.2.5
+VERSION = 3.3.0
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index 6ac793b42..db2cef56d 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-325
+330
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 80052b44e..93fcf4328 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "3.2.5"
-#define VERSION_WORDS 3, 2, 5, 0
+#define VERSION_SCINTILLA "3.3.0"
+#define VERSION_WORDS 3, 3, 0, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS