From 4586f5aa1d78451bade67e6443e910fc5492feaa Mon Sep 17 00:00:00 2001 From: nyamatongwe Date: Tue, 9 Apr 2013 13:52:53 +1000 Subject: Automate updating download links in script. --- src/LexGen.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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", ' Release version', ' Release version ' + versionDotted + '
') @@ -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", ' Release version', ' Release version ' + versionDotted + '
') -- cgit v1.2.3 From 4e2ff17f9c02fbb62654e2346a94140953e4975c Mon Sep 17 00:00:00 2001 From: nyamatongwe Date: Tue, 9 Apr 2013 13:53:22 +1000 Subject: Updating for 3.3.1. --- doc/ScintillaDownload.html | 10 +++++----- doc/ScintillaHistory.html | 23 ++++++++++++++++++++++- doc/index.html | 2 +- qt/ScintillaEdit/ScintillaEdit.pro | 2 +- qt/ScintillaEditBase/ScintillaEditBase.pro | 2 +- version.txt | 2 +- win32/ScintRes.rc | 4 ++-- 7 files changed, 33 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 @@ @@ -41,7 +41,7 @@ containing very few restrictions.

- Release 3.3.0 + Release 3.3.1

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
    -
  • zip format (1250K) commonly used on Windows
    • -
  • tgz format (1100K) commonly used on Linux and compatible operating systems
    • +
  • zip format (1250K) commonly used on Windows
    • +
  • tgz format (1100K) commonly used on Linux and compatible operating systems
Instructions for building on both Windows and Linux are included in the readme file.

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 39bb8581d..3f48cd017 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -434,9 +434,17 @@

- 3.3.1 placeholder + Release 3.3.1

    +
  • + Autocompletion lists can now appear in priority order or be sorted by Scintilla. + Feature #981. +
    • +
  • + 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. +
  • Haskell lexer improved in several ways. Bug #1459. @@ -446,8 +454,21 @@ Bug #1414.
  • + Ruby lexer crash fixed with keyword at start of document. +
    • +
  • The PLAT_NCURSES platform now called PLAT_CURSES as may work on other implementations.
    • +
  • + Bug on Cocoa fixed where input composition with multiple selection or virtual space selection + could make undo stop working. +
    • +
  • + Direct2D/DirectWrite mode on Windows now displays documents in non-Latin1 8-bit encodings correctly. +
    • +
  • + Position of calltip and autocompletion lists fixed on Cocoa. +

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

- + Windows   - + GTK+/Linux   - Release version 3.3.0
+ Release version 3.3.1
Site last modified March 30 2013 		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/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 -#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 -- cgit v1.2.3 From 9e2240700ad781f374a857fd05da3908307aa0cb Mon Sep 17 00:00:00 2001 From: nyamatongwe Date: Tue, 9 Apr 2013 14:24:51 +1000 Subject: Slightly better behaviour for regular expression search in DBCS: ensure end of match range is not in the middle of a character. --- src/Document.cxx | 2 ++ 1 file changed, 2 insertions(+) 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] != '^')) { -- cgit v1.2.3 From 0c7d071a2116dbdb069c6e8ec3b858d0c45af93c Mon Sep 17 00:00:00 2001 From: nyamatongwe Date: Tue, 9 Apr 2013 15:22:02 +1000 Subject: Updates to history. --- doc/ScintillaHistory.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 3f48cd017..7b952af85 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -444,6 +444,8 @@
  • 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. + Bug #574, + Bug #588.
  • Haskell lexer improved in several ways. @@ -469,6 +471,10 @@
  • Position of calltip and autocompletion lists fixed on Cocoa.
    • +
  • + 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. +

    • Release 3.3.0 -- cgit v1.2.3