using Scintilla 3.2.0

git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@743 28bd50df-7adb-d945-0439-6e466c6a13cc

5 files changed, 101 insertions, 18 deletions

diff --git a/Readme-mod.txt b/Readme-mod.txt
index d6ad800..426f8ac 100644
--- a/Readme-mod.txt
+++ b/Readme-mod.txt
@@ -31,6 +31,6 @@ Ctrl+Alt+F2         Expand selection to next match.
 Ctrl+Alt+Shift+F2   Expand selection to previous match.

 Ctrl+Shift+Enter    New line with toggled auto indent option.

 

-Notepad2-mod 4.2.25 has been created with Scintilla 3.1.0 HG 9739512b19c4.

+Notepad2-mod 4.2.25 has been created with Scintilla 3.2.0 HG cdf405b6a70c.

 You can use WDK 7.1, MSVC 2010 or Intel C++ Compiler XE 2011 SP1 Update 10

 to build Notepad2-mod.

diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html
index 5c67860..165b111 100644
--- a/scintilla/doc/ScintillaDownload.html
+++ b/scintilla/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/scintilla310.zip?download">

+          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla320.zip?download">

 	Windows</a>&nbsp;&nbsp;

-	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla310.tgz?download">

+	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla320.tgz?download">

           GTK+/Linux</a>&nbsp;&nbsp;

 	</font>

         </td>

@@ -41,7 +41,7 @@
       containing very few restrictions.

     </p>

     <h3>

-       Release 3.1.0

+       Release 3.2.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/scintilla310.zip?download">zip format</a> (1200K) commonly used on Windows</li>

-       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla310.tgz?download">tgz format</a> (1080K) commonly used on Linux and compatible operating systems</li>

+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla320.zip?download">zip format</a> (1200K) commonly used on Windows</li>

+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla320.tgz?download">tgz format</a> (1080K) 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/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html
index 1132ce4..a401389 100644
--- a/scintilla/doc/ScintillaHistory.html
+++ b/scintilla/doc/ScintillaHistory.html
@@ -412,6 +412,96 @@
       </li>

     </ul>

     <h3>

+       <a href="http://prdownloads.sourceforge.net/scintilla/scite320.zip?download">Release 3.2.0</a>

+    </h3>

+    <ul>

+	<li>

+	Released 1 June 2012.

+	</li>

+	<li>

+	Platform layer added for the Qt open-source cross-platform application and user interface framework

+	for development in C++ or in Python with the PySide bindings for Qt.

+	</li>

+	<li>

+	Direct access provided to the document bytes for ranges within Scintilla.

+	This is similar to the existing SCI_GETCHARACTERPOINTER API but allows for better performance.

+	</li>

+	<li>

+	Ctrl+Double Click and Ctrl+Triple Click add the word or line to the set of selections.

+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3520037&group_id=2439">Feature #3520037.</a>

+	</li>

+	<li>

+	A SCI_DELETERANGE API was added for deleting a range of text.

+	</li>

+	<li>

+	Line wrap markers may now be drawn in the line number margin.

+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3518198&group_id=2439">Feature #3518198.</a>

+	</li>

+	<li>

+	SciTE on OS X adds option to hide hidden files in the open dialog box.

+	</li>

+	<li>

+	Lexer added for OScript language.

+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3523197&group_id=2439">Feature #3523197.</a>

+	</li>

+	<li>

+	Lexer added for Visual Prolog language.

+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3523018&group_id=2439">Feature #3523018.</a>

+	</li>

+	<li>

+	UTF-8 validity is checked more stringently and consistently. All 66 non-characters are now treated as invalid.

+	</li>

+	<li>

+	HTML lexer bug fixed with inconsistant highlighting for PHP when attribute on separate line from tag.

+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3520027&group_id=2439">Bug #3520027.</a>

+	</li>

+	<li>

+	HTML lexer bug fixed for JavaScript block comments.

+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3520032&group_id=2439">Bug #3520032.</a>

+	</li>

+	<li>

+	Annotation drawing bug fixed when box displayed with different colours on different lines.

+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3519872&group_id=2439">Bug #3519872.</a>

+	</li>

+	<li>

+	On Windows with Direct2D, fix drawing with 125% and 150% DPI system settings.

+	</li>

+	<li>

+	Virtual space selection bug fixed for rectangular selections.

+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3519246&group_id=2439">Bug #3519246.</a>

+	</li>

+	<li>

+	Replacing multiple selection with newline changed to only affect main selection.

+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3522251&group_id=2439">Bug #3522251.</a>

+	</li>

+	<li>

+	Replacing selection with newline changed to group deletion and insertion as a single undo action.

+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3522250&group_id=2439">Bug #3522250.</a>

+	</li>

+	<li>

+	Auto-completion lists on GTK+ 3 set height correctly instead of showing too few lines.

+	</li>

+	<li>

+	Mouse wheel scrolling changed to avoid GTK+ bug in recent distributions.

+	</li>

+	<li>

+	IME bug on Windows fixed for horizontal jump.

+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3529728&group_id=2439">Bug #3529728.</a>

+	</li>

+	<li>

+	SciTE case-insensitive autocompletion filters equal identifiers better.

+	Calltip arrows work with bare word identifiers.

+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3517810&group_id=2439">Bug #3517810.</a>

+	</li>

+	<li>

+	SciTE bug fixed where shbang lines not setting file type when switching

+	to file loaded in background.

+	</li>

+	<li>

+	SciTE on GTK+ shows open and save dialogs with the directory of the current file displayed.

+	</li>

+    </ul>

+    <h3>

        <a href="http://prdownloads.sourceforge.net/scintilla/scite310.zip?download">Release 3.1.0</a>

     </h3>

     <ul>

diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html
index c4311b5..725f6c2 100644
--- a/scintilla/doc/index.html
+++ b/scintilla/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="20120420" />

+    <meta name="Date.Modified" content="20120601" />

     <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.1.0<br />

-           Site last modified April 20 2012</font>

+          <font color="#FFCC99" size="3"> Release version 3.2.0<br />

+           Site last modified June 1 2012</font>

         </td>

         <td width="20%">

           &nbsp;

@@ -71,17 +71,10 @@
       </tr>

     </table>

     <ul id="versionlist">

+      <li>Version 3.2.0 adds support for the Qt platform and PySide Python bindings.</li>

       <li>Version 3.1.0 adds an animated find indicator on Cocoa.</li>

       <li>Version 3.0.4 fixes minor problems particularly with Direct2D.</li>

       <li>Version 3.0.3 uses fractional positioning in more situations.</li>

-      <li>Version 3.0.2 fixes bugs.</li>

-      <li>Version 3.0.1 fixes bugs, most notably display bugs on Windows.</li>

-      <li>Version 3.0.0 has changed the platforms supported.

-      For OS X, Cocoa must be used instead of Carbon.

-      For recent versions of Windows, Direct2D and DirectWrite can be used.

-      For GTK+ all drawing is performed with Cairo as GDK drawing removed.

-      Palette support removed.

-      Font size and weight can be specified with more precision.</li>

     </ul>

     <ul id="menu">

       <li id="remote1"><a href="http://www.scintilla.org/SciTEImage.html">Screenshot</a></li>

diff --git a/scintilla/version.txt b/scintilla/version.txt
index c3c194e..5200413 100644
--- a/scintilla/version.txt
+++ b/scintilla/version.txt
@@ -1 +1 @@
-310

+320