update Scintilla to v3.3.4 [e074c3]

4 files changed, 157 insertions, 18 deletions

diff --git a/scintilla/doc/ScintillaDoc.html b/scintilla/doc/ScintillaDoc.html
index 1c95c86..8c111b1 100644
--- a/scintilla/doc/ScintillaDoc.html
+++ b/scintilla/doc/ScintillaDoc.html
@@ -82,7 +82,7 @@
 

     <h1>Scintilla Documentation</h1>

 

-    <p>Last edited 5/May/2013 NH</p>

+    <p>Last edited 29/June/2013 NH</p>

 

     <p>There is <a class="jump" href="Design.html">an overview of the internal design of

     Scintilla</a>.<br />

@@ -115,6 +115,9 @@
     <p>The GTK+ version also uses messages in a similar way to the Windows version. This is

     different to normal GTK+ practice but made it easier to implement rapidly.</p>

 

+    <p>Scintilla also builds with Cocoa on OS X and with Qt, and follows the conventions of 

+    those platforms.</p>

+

     <p>Scintilla does not properly support right-to-left languages like Arabic and Hebrew.

     While text in these languages may appear correct, it is not possible to interact with this text

     as is normal with other editing components.</p>

@@ -1344,7 +1347,7 @@ struct Sci_TextToFind {
     <p><b id="SCI_GETLINESELSTARTPOSITION">SCI_GETLINESELSTARTPOSITION(int line)</b><br />

     <b id="SCI_GETLINESELENDPOSITION">SCI_GETLINESELENDPOSITION(int line)</b><br />

     Retrieve the position of the start and end of the selection at the given line with

-    INVALID_POSITION returned if no selection on this line.</p>

+    <code>INVALID_POSITION</code> returned if no selection on this line.</p>

 

     <p><b id="SCI_MOVECARETINSIDEVIEW">SCI_MOVECARETINSIDEVIEW</b><br />

      If the caret is off the top or bottom of the view, it is moved to the nearest line that is

@@ -6321,13 +6324,23 @@ exception options.</p>
 

 <p>

 To allow lexers to determine the end position of a line and thus more easily support Unicode line ends

-<code>IDocument</code> is extended to <code>IDocumentWithLineEnd</code>.

+<code>IDocument</code> is extended to <code>IDocumentWithLineEnd</code>.</p>

+<p><code>GetRelativePosition</code> navigates the document by whole characters,

+returning <code>INVALID_POSITION</code> for movement beyond the start and end of the document.</p>

+<p><code>GetCharacterAndWidth</code> provides a standard

+conversion from UTF-8 bytes to a UTF-32 character or from DBCS to a 16 bit value.

+Bytes in invalid UTF-8 are reported individually with values 0xDC80+byteValue, which are

+not valid Unicode code points.

+The <code>pWidth</code> argument can be NULL if the caller does not need to know the number of

+bytes in the character.

 </p>

 

 <div class="highlighted">

 <span class="S5">class</span><span class="S0"> </span>IDocumentWithLineEnd<span class="S0"> </span><span class="S10">:</span><span class="S0"> </span><span class="S5">public</span><span class="S0"> </span>IDocument<span class="S0"> </span><span class="S10">{</span><br />

 <span class="S5">public</span><span class="S10">:</span><br />

 <span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>LineEnd<span class="S10">(</span><span class="S5">int</span><span class="S0"> </span>line<span class="S10">)</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />

+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>GetRelativePosition<span class="S10">(</span><span class="S5">int</span><span class="S0"> </span>positionStart<span class="S10">,</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>characterOffset<span class="S10">)</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />

+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>GetCharacterAndWidth<span class="S10">(</span><span class="S5">int</span><span class="S0"> </span>position<span class="S10">,</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span><span class="S10">*</span>pWidth<span class="S10">)</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />

 <span class="S10">};</span><br />

 </div>

 

@@ -6602,9 +6615,7 @@ href="#SCI_POSITIONFROMLINE">SCI_POSITIONFROMLINE</a>(lineNumber);
 

           <td align="left">Valid for text changes, not for style changes. If we are collecting undo

           information this holds a pointer to the text that is handed to the Undo system, otherwise

-          it is zero. For user performed SC_MOD_BEFOREDELETE the text field is 0 and

-                  for user performed SC_MOD_BEFOREINSERT the text field points to an array of cells,

-                   not bytes and the length is the number of cells.</td>

+          it is zero. For user performed SC_MOD_BEFOREDELETE the text field is 0.</td>

         </tr>

 

         <tr>

diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html
index 1e9b1f5..17e30fb 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/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/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html
index b7179e6..c7911bf 100644
--- a/scintilla/doc/ScintillaHistory.html
+++ b/scintilla/doc/ScintillaHistory.html
@@ -425,6 +425,8 @@
 	<td>Igor Shaula</td>

 	<td>Pavel Bulochkin</td>

 	<td>Yosef Or Boczko</td>

+      </tr><tr>

+	<td>Brian Griffin</td>

     </tr>

     </table>

     <p>

@@ -437,6 +439,131 @@
       </li>

     </ul>

     <h3>

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

+    </h3>

+    <ul>

+	<li>

+	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>

+	SciTE 'immediate' subsystem added to allow scripts that work while tools are executed.

+	</li>

+	<li>

+	Font quality exposed in SciTE as font.quality setting.

+	</li>

+	<li>

+	On Cocoa, message:... methods simplify direct access to Scintilla and avoid call layers..

+	</li>

+	<li>

+	A68K lexer updated.

+	</li>

+	<li>

+	CoffeeScript lexer fixes a bug with comment blocks.

+	<a href="http://sourceforge.net/p/scintilla/feature-requests/1495/">Feature #1495.</a>

+	</li>

+	<li>

+	ECL lexer regular expression code fixed.

+	<a href="http://sourceforge.net/p/scintilla/bugs/1491/">Bug #1491</a>.

+	</li>

+	<li>

+	errorlist lexer only recognises Perl diagnostics when there is a filename between

+	"at" and "line". Had been triggering for MSVC errors containing "at line".

+	</li>

+	<li>

+	Haskell lexer fixed to avoid unnecessary full redraws.

+	Don't highlight CPP inside comments when styling.within.preprocessor is on.

+	<a href="http://sourceforge.net/p/scintilla/bugs/1459/">Bug #1459</a>.

+	</li>

+	<li>

+	Lua lexer fixes bug in labels with UTF-8 text.

+	<a href="http://sourceforge.net/p/scintilla/bugs/1483/">Bug #1483</a>.

+	</li>

+	<li>

+	Perl lexer fixes bug in string interpolation with UTF-8 text.

+	<a href="http://sourceforge.net/p/scintilla/bugs/1483/">Bug #1483</a>.

+	</li>

+	<li>

+	Fixed bugs with case conversion when the result was longer or shorter than the original text.

+	Could access past end of string potentially crashing.

+	Selection now updated to result length.

+	</li>

+	<li>

+	Fixed bug where data being inserted and removed was not being reported in

+	notification messages. Bug was introduced in 3.3.2.

+	</li>

+	<li>

+	Word wrap bug fixed where the last line could be shown twice.

+	</li>

+	<li>

+	Word wrap bug fixed for lines wrapping too short on Windows and GTK+.

+	</li>

+	<li>

+	Word wrap performance improved.

+	</li>

+	<li>

+	Minor memory leak fixed.

+	<a href="http://sourceforge.net/p/scintilla/bugs/1487/">Bug #1487</a>.

+	</li>

+	<li>

+	On Cocoa, fixed insertText: method which was broken when implementing a newer protocol.

+	</li>

+	<li>

+	On Cocoa, fixed a crash when performing string folding for bytes that do not represent a character

+	in the current encoding.

+	</li>

+	<li>

+	On Qt, fixed layout problem when QApplication construction delayed.

+	</li>

+	<li>

+	On Qt, find_text reports failure with -1 as first element of return value.

+	</li>

+	<li>

+	Fixed SciTE on GTK+ bug where a tool command could be performed using the keyboard while one was

+	already running leading to confusion and crashes.

+	<a href="http://sourceforge.net/p/scintilla/bugs/1486/">Bug #1486</a>.

+	</li>

+	<li>

+	Fixed SciTE bug in Copy as RTF which was limited to first 32 styles.

+	<a href="http://sourceforge.net/p/scintilla/bugs/1011/">Bug #1011</a>.

+	</li>

+	<li>

+	Fixed SciTE on Windows user strip height when the system text scaling factor is 125% or 150%.

+	</li>

+	<li>

+	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>

+    </ul>

+    <h3>

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

     </h3>

     <ul>

diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html
index d916e18..357fc48 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="20130602" />

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

     <style type="text/css">

         #versionlist {

             margin: 0;

@@ -51,12 +51,12 @@
           <img src="SciWord.jpg" height="78" width="256" alt="Scintilla" />

         </td>

         <td width="40%" align="left">

-          <font color="#FFCC99" size="4"> A free source code editing component for Win32 and

-          GTK+</font>

+          <font color="#FFCC99" size="4"> A free source code editing component for Win32,

+          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;

@@ -71,6 +71,7 @@
       </tr>

     </table>

     <ul id="versionlist">

+      <li>Version 3.3.4 better supports Unicode use in lexers.</li>

       <li>Version 3.3.3 fixes bugs on GTK+.</li>

       <li>Version 3.3.2 simplifies implementing folding.</li>

       <li>Version 3.3.1 fixes bugs on Cocoa.</li>

@@ -124,8 +125,8 @@ if (!IsRemote()) { //if NOT remote...
       code, styling should not be persisted as it can be mechanically recreated.

     </p>

     <p>

-       Scintilla and SciTE are currently available for Intel Win32 and Linux compatible operating

-      systems with GTK+. They have been run on Windows XP, Windows 7, and on Ubuntu 10.10

+       Scintilla and SciTE are currently available for Intel Win32, OS X, and Linux compatible operating

+      systems with GTK+. They have been run on Windows XP, Windows 7, OS X 10.6+, and on Ubuntu 10.10

       with GTK+ 2.20. <a href="http://www.scintilla.org/SciTEImage.html">Here is a screenshot of

       SciTE.</a><br />

     </p>