Updates for 3.3.4.

7 files changed, 33 insertions, 19 deletions

diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 31b8c9e32..5b3299fd0 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/scintilla333.zip?download">
+          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla334.zip?download">
 	Windows</a>&nbsp;&nbsp;
-	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla333.tgz?download">
+	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla334.tgz?download">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -41,7 +41,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 3.3.3
+       Release 3.3.4
     </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/scintilla333.zip?download">zip format</a> (1250K) commonly used on Windows</li>
-       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla333.tgz?download">tgz format</a> (1100K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla334.zip?download">zip format</a> (1250K) commonly used on Windows</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla334.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 cc92ba58c..c4379dd51 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -443,13 +443,22 @@
     </h3>
     <ul>
 	<li>
-	Released 29 December 2013.
+	Released 19 July 2013.
+	</li>
+	<li>
+	Handling of UTF-8 and DBCS text in lexers improved with methods ForwardBytes and
+	GetRelativeCharacter added to StyleContext.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1483/">Bug #1483</a>.
 	</li>
 	<li>
 	For Unicode text, case-insensitive searching and making text upper or lower case is now
 	compliant with Unicode standards on all platforms and is much faster for non-ASCII characters.
 	</li>
 	<li>
+	A CategoriseCharacter function was added to return the Unicode general category of a character
+	which can be useful in lexers.
+	</li>
+	<li>
 	On Cocoa, the LCD Optimized font quality level turns font smoothing on.
 	</li>
 	<li>
@@ -459,11 +468,6 @@
 	Font quality exposed in SciTE as font.quality setting.
 	</li>
 	<li>
-	Handling of UTF-8 and DBCS text in lexers improved with methods ForwardBytes and
-	GetRelativeCharacter added to StyleContext.
-	<a href="http://sourceforge.net/p/scintilla/bugs/1483/">Bug #1483</a>.
-	</li>
-	<li>
 	On Cocoa, message:... methods simplify direct access to Scintilla and avoid call layers..
 	</li>
 	<li>
@@ -545,6 +549,16 @@
 	Compile time checks for Digital Mars C++ removed.
 	</li>
 	<li>
+	Visual C++ 2013 supported.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1492/">Bug #1492</a>.
+	</li>
+	<li>
+	Python scripts used for building and maintenance improved and moved into scripts directory.
+	</li>
+	<li>
+	Testing scripts now work on Linux using Qt and PySide.
+	</li>
+	<li>
 	Tk platform defined.
 	Implementation for Tk will be available separately from main Scintilla distribution.
 	</li>
diff --git a/doc/index.html b/doc/index.html
index 445cc1d5a..03898f8bc 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="20130602" />
+    <meta name="Date.Modified" content="20130719" />
     <style type="text/css">
         #versionlist {
             margin: 0;
@@ -55,8 +55,8 @@
           GTK+, and OS X</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 3.3.3<br />
-           Site last modified June 2 2013</font>
+          <font color="#FFCC99" size="3"> Release version 3.3.4<br />
+           Site last modified July 19 2013</font>
         </td>
         <td width="20%">
           &nbsp;
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index 65aa9b2ae..112bed462 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -11,7 +11,7 @@ TARGET = ScintillaEdit
 TEMPLATE = lib
 CONFIG += lib_bundle
 
-VERSION = 3.3.3
+VERSION = 3.3.4
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index df5e4adbc..17de3daf7 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -11,7 +11,7 @@ TARGET = ScintillaEditBase
 TEMPLATE = lib
 CONFIG += lib_bundle
 
-VERSION = 3.3.3
+VERSION = 3.3.4
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index 55bd0ac4c..0ae9d1ef4 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-333
+334
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 1d1f24c2a..cb3c982db 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "3.3.3"
-#define VERSION_WORDS 3, 3, 3, 0
+#define VERSION_SCINTILLA "3.3.4"
+#define VERSION_WORDS 3, 3, 4, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS