diff options
| -rw-r--r-- | doc/ScintillaDownload.html | 10 | ||||
| -rw-r--r-- | doc/ScintillaHistory.html | 29 | ||||
| -rw-r--r-- | doc/index.html | 2 | ||||
| -rw-r--r-- | qt/ScintillaEdit/ScintillaEdit.pro | 2 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.pro | 2 | ||||
| -rw-r--r-- | src/Document.cxx | 2 | ||||
| -rwxr-xr-x | src/LexGen.py | 19 | ||||
| -rw-r--r-- | version.txt | 2 | ||||
| -rw-r--r-- | win32/ScintRes.rc | 4 |
9 files changed, 60 insertions, 12 deletions
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html index 499730be7..c21fa5638 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/scintilla330.zip?download"> + <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla331.zip?download"> Windows</a> - <a href="http://prdownloads.sourceforge.net/scintilla/scintilla330.tgz?download"> + <a href="http://prdownloads.sourceforge.net/scintilla/scintilla331.tgz?download"> GTK+/Linux</a> </font> </td> @@ -41,7 +41,7 @@ containing very few restrictions. </p> <h3> - Release 3.3.0 + Release 3.3.1 </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/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> + <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla331.zip?download">zip format</a> (1250K) commonly used on Windows</li> + <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla331.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 39bb8581d..7b952af85 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -434,10 +434,20 @@ </li> </ul> <h3> - 3.3.1 placeholder + <a href="http://prdownloads.sourceforge.net/scintilla/scite331.zip?download">Release 3.3.1</a> </h3> <ul> <li> + Autocompletion lists can now appear in priority order or be sorted by Scintilla. + <a href="http://sourceforge.net/p/scintilla/feature-requests/981/">Feature #981.</a> + </li> + <li> + Most lexers now lex an extra NUL byte at the end of the + document which makes it more likely they will classify keywords at document end correctly. + <a href="http://sourceforge.net/p/scintilla/bugs/574/">Bug #574</a>, + <a href="http://sourceforge.net/p/scintilla/bugs/588/">Bug #588.</a> + </li> + <li> Haskell lexer improved in several ways. <a href="http://sourceforge.net/p/scintilla/bugs/1459/">Bug #1459.</a> </li> @@ -446,8 +456,25 @@ <a href="http://sourceforge.net/p/scintilla/bugs/1414/">Bug #1414.</a> </li> <li> + Ruby lexer crash fixed with keyword at start of document. + </li> + <li> The PLAT_NCURSES platform now called PLAT_CURSES as may work on other implementations. </li> + <li> + Bug on Cocoa fixed where input composition with multiple selection or virtual space selection + could make undo stop working. + </li> + <li> + Direct2D/DirectWrite mode on Windows now displays documents in non-Latin1 8-bit encodings correctly. + </li> + <li> + Position of calltip and autocompletion lists fixed on Cocoa. + </li> + <li> + While regular expression search in DBCS text is still not working, matching partial characters is now avoided + by moving end of match to end of character. + </li> </ul> <h3> <a href="http://prdownloads.sourceforge.net/scintilla/scite330.zip?download">Release 3.3.0</a> diff --git a/doc/index.html b/doc/index.html index 1e50b448c..9d5875736 100644 --- a/doc/index.html +++ b/doc/index.html @@ -55,7 +55,7 @@ GTK+</font> </td> <td width="40%" align="right"> - <font color="#FFCC99" size="3"> Release version 3.3.0<br /> + <font color="#FFCC99" size="3"> Release version 3.3.1<br /> Site last modified March 30 2013</font> </td> <td width="20%"> diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro index cd4f8c251..b96baee69 100644 --- a/qt/ScintillaEdit/ScintillaEdit.pro +++ b/qt/ScintillaEdit/ScintillaEdit.pro @@ -10,7 +10,7 @@ TARGET = ScintillaEdit TEMPLATE = lib CONFIG += lib_bundle -VERSION = 3.3.0 +VERSION = 3.3.1 SOURCES += \ ScintillaEdit.cpp \ diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro index 2c0ef64b0..4b17ebf90 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.pro +++ b/qt/ScintillaEditBase/ScintillaEditBase.pro @@ -10,7 +10,7 @@ TARGET = ScintillaEditBase TEMPLATE = lib CONFIG += lib_bundle -VERSION = 3.3.0 +VERSION = 3.3.1 SOURCES += \ PlatQt.cpp \ diff --git a/src/Document.cxx b/src/Document.cxx index b75c754ac..56785af78 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -2236,6 +2236,8 @@ long BuiltinRegex::FindText(Document *doc, int minPos, int maxPos, const char *s int success = search.Execute(di, startOfLine, endOfLine); if (success) { pos = search.bopat[0]; + // Ensure only whole characters selected + search.eopat[0] = doc->MovePositionOutsideChar(search.eopat[0], 1, false); lenRet = search.eopat[0] - search.bopat[0]; // There can be only one start of a line, so no need to look for last match in line if ((increment == -1) && (s[0] != '^')) { diff --git a/src/LexGen.py b/src/LexGen.py index d03c4a24a..233aeeb33 100755 --- a/src/LexGen.py +++ b/src/LexGen.py @@ -261,6 +261,23 @@ def UpdateLineInFile(path, linePrefix, lineReplace): contents = NATIVE.join(lines) + NATIVE UpdateFile(path, contents) +host = "prdownloads.sourceforge.net/" +def UpdateDownloadLinks(path, version): + lines = [] + with open(path, "r") as f: + for l in f.readlines(): + l = l.rstrip() + if host in l: + start, prd, rest = l.partition(host) + pth, dot, ending = rest.partition(".") + pthNew = pth[:-3] + version.rstrip() + lineWithNewVersion = start + prd +pthNew + dot + ending + lines.append(lineWithNewVersion) + else: + lines.append(l) + contents = NATIVE.join(lines) + NATIVE + UpdateFile(path, contents) + def UpdateVersionNumbers(root): with open(root + "scintilla/version.txt") as f: version = f.read() @@ -279,6 +296,7 @@ def UpdateVersionNumbers(root): "VERSION = " + versionDotted) UpdateLineInFile(root + "scintilla/doc/ScintillaDownload.html", " Release", " Release " + versionDotted) + UpdateDownloadLinks(root + "scintilla/doc/ScintillaDownload.html", version) UpdateLineInFile(root + "scintilla/doc/index.html", ' <font color="#FFCC99" size="3"> Release version', ' <font color="#FFCC99" size="3"> Release version ' + versionDotted + '<br />') @@ -290,6 +308,7 @@ def UpdateVersionNumbers(root): "#define VERSION_WORDS " + versionCommad) UpdateLineInFile(root + "scite/doc/SciTEDownload.html", " Release", " Release " + versionDotted) + UpdateDownloadLinks(root + "scite/doc/SciTEDownload.html", version) UpdateLineInFile(root + "scite/doc/SciTE.html", ' <font color="#FFCC99" size="3"> Release version', ' <font color="#FFCC99" size="3"> Release version ' + versionDotted + '<br />') diff --git a/version.txt b/version.txt index db2cef56d..ec6cab011 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -330 +331 diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc index 93fcf4328..61932f497 100644 --- a/win32/ScintRes.rc +++ b/win32/ScintRes.rc @@ -4,8 +4,8 @@ #include <windows.h> -#define VERSION_SCINTILLA "3.3.0" -#define VERSION_WORDS 3, 3, 0, 0 +#define VERSION_SCINTILLA "3.3.1" +#define VERSION_WORDS 3, 3, 1, 0 VS_VERSION_INFO VERSIONINFO FILEVERSION VERSION_WORDS |