diff --git a/Build/make_installer.bat b/Build/make_installer.bat
index 74f2dbb44..1a55d2656 100644
--- a/Build/make_installer.bat
+++ b/Build/make_installer.bat
@@ -65,8 +65,6 @@ IF "%~1" == "" (
:START
-IF EXIST "%~dp0..\signinfo_notepad2-mod.txt" SET "SIGN=True"
-
SET INPUTDIRx86=Bin\Release_x86
SET INPUTDIRx64=Bin\Release_x64
IF /I NOT "%COMPILER%" == "VS2015" SET SUFFIX=_%COMPILER%
@@ -75,9 +73,6 @@ SET "TEMP_NAME=temp_zip%SUFFIX%"
IF NOT EXIST "..\%INPUTDIRx86%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x86 first!"
IF NOT EXIST "..\%INPUTDIRx64%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x64 first!"
-IF /I "%SIGN%" == "True" CALL :SubSign %INPUTDIRx86%
-IF /I "%SIGN%" == "True" CALL :SubSign %INPUTDIRx64%
-
CALL :SubInstaller %COMPILER%
@@ -92,7 +87,7 @@ EXIT /B
TITLE Building %1 installer...
CALL :SUBMSG "INFO" "Building %1 installer using %InnoSetupPath%\ISCC.exe..."
-"%InnoSetupPath%\ISCC.exe" /Q /O "packages" "..\distrib\notepad3_setup.iss" /D%1
+"%InnoSetupPath%\ISCC.exe" /SMySignTool="cmd /c "%~dp0sign.bat" $f" /Q /O"packages" "..\distrib\notepad3_setup.iss" /D%1
IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"
EXIT /B
diff --git a/Version.ini b/Version.ini
index 3fc581863..14a6bf753 100644
--- a/Version.ini
+++ b/Version.ini
@@ -7,7 +7,7 @@ Language=CPlusPlus
Major=auto
Minor=auto
Maintenance=auto
-Build=302
+Build=305
[CSharp]
AssemConfig=Rizonesoft.Voice.Win\Properties\AssemblyInfo.cs.conf
diff --git a/distrib/Changes.txt b/distrib/Changes.txt
new file mode 100644
index 000000000..25f3c6e1c
--- /dev/null
+++ b/distrib/Changes.txt
@@ -0,0 +1,12 @@
+Notepad3 Build 0000 (11 June 2016)
+================================================================================
+- Fixed Compiler warnings
+- Updated to Scintilla 3.6.6
+-
+-
+-
+-
+-
+-
+-
+-
\ No newline at end of file
diff --git a/minipath/Version.ini b/minipath/Version.ini
index ad3271cb3..4e5e1908f 100644
--- a/minipath/Version.ini
+++ b/minipath/Version.ini
@@ -1,4 +1,4 @@
[Version]
-Build=72
+Build=73
VersionHeader=src\VersionEx.h
ManifestConfig=res\MiniPath.exe.manifest.conf
diff --git a/minipath/res/MiniPath.exe.manifest b/minipath/res/MiniPath.exe.manifest
index 6dc3337b8..f3449b568 100644
--- a/minipath/res/MiniPath.exe.manifest
+++ b/minipath/res/MiniPath.exe.manifest
@@ -3,7 +3,7 @@
metapath
diff --git a/minipath/src/VersionEx.h b/minipath/src/VersionEx.h
index e9735086a..fa43c2194 100644
--- a/minipath/src/VersionEx.h
+++ b/minipath/src/VersionEx.h
@@ -1,4 +1,4 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 0
#define VERSION_REV 7
-#define VERSION_BUILD 72
+#define VERSION_BUILD 73
diff --git a/res/Notepad3.exe.manifest b/res/Notepad3.exe.manifest
index 50aaa6582..0c0f9cf90 100644
--- a/res/Notepad3.exe.manifest
+++ b/res/Notepad3.exe.manifest
@@ -3,7 +3,7 @@
Notepad3
diff --git a/scintilla/Scintilla.vcxproj b/scintilla/Scintilla.vcxproj
index b7b8474fc..d50e19866 100644
--- a/scintilla/Scintilla.vcxproj
+++ b/scintilla/Scintilla.vcxproj
@@ -23,7 +23,6 @@
{5877B917-512B-49F5-B514-1B4159E7A9CA}
Scintilla
Scintilla
- 8.1
@@ -81,35 +80,35 @@
..\bin\VS2012\$(Configuration)_x86\obj\scintilla\
..\bin\VS2010\$(Configuration)_x86\obj\scintilla\
..\bin\VS2013\$(Configuration)_x86\obj\scintilla\
- ..\Bin\$(Configuration)_x86\obj\scintilla\
+ ..\bin\VS2015\$(Configuration)_x86\obj\scintilla\
..\bin\VS2012\$(Configuration)_x64\obj\scintilla\
..\bin\VS2010\$(Configuration)_x64\obj\scintilla\
..\bin\VS2013\$(Configuration)_x64\obj\scintilla\
- ..\Bin\$(Configuration)_x64\obj\scintilla\
+ ..\bin\VS2015\$(Configuration)_x64\obj\scintilla\
..\bin\VS2012\$(Configuration)_x86\obj\scintilla\
..\bin\VS2010\$(Configuration)_x86\obj\scintilla\
..\bin\VS2013\$(Configuration)_x86\obj\scintilla\
- ..\Bin\$(Configuration)_x86\obj\scintilla\
+ ..\bin\VS2015\$(Configuration)_x86\obj\scintilla\
..\bin\VS2012\$(Configuration)_x64\obj\scintilla\
..\bin\VS2010\$(Configuration)_x64\obj\scintilla\
..\bin\VS2013\$(Configuration)_x64\obj\scintilla\
- ..\Bin\$(Configuration)_x64\obj\scintilla\
+ ..\bin\VS2015\$(Configuration)_x64\obj\scintilla\
..\bin\VS2012\$(Configuration)_x86\obj\scintilla\
..\bin\VS2010\$(Configuration)_x86\obj\scintilla\
..\bin\VS2013\$(Configuration)_x86\obj\scintilla\
- ..\Bin\$(Configuration)_x86\obj\scintilla\
+ ..\bin\VS2015\$(Configuration)_x86\obj\scintilla\
..\bin\VS2012\$(Configuration)_x64\obj\scintilla\
..\bin\VS2010\$(Configuration)_x64\obj\scintilla\
..\bin\VS2013\$(Configuration)_x64\obj\scintilla\
- ..\Bin\$(Configuration)_x64\obj\scintilla\
+ ..\bin\VS2015\$(Configuration)_x64\obj\scintilla\
..\bin\VS2012\$(Configuration)_x86\obj\scintilla\
..\bin\VS2010\$(Configuration)_x86\obj\scintilla\
..\bin\VS2013\$(Configuration)_x86\obj\scintilla\
- ..\Bin\$(Configuration)_x86\obj\scintilla\
+ ..\bin\VS2015\$(Configuration)_x86\obj\scintilla\
..\bin\VS2012\$(Configuration)_x64\obj\scintilla\
..\bin\VS2010\$(Configuration)_x64\obj\scintilla\
..\bin\VS2013\$(Configuration)_x64\obj\scintilla\
- ..\Bin\$(Configuration)_x64\obj\scintilla\
+ ..\bin\VS2015\$(Configuration)_x64\obj\scintilla\
false
false
diff --git a/scintilla/Scintilla.vcxproj.filters b/scintilla/Scintilla.vcxproj.filters
index e49186e26..d3973a604 100644
--- a/scintilla/Scintilla.vcxproj.filters
+++ b/scintilla/Scintilla.vcxproj.filters
@@ -395,6 +395,9 @@
src
+
+ win32
+
win32
diff --git a/scintilla/cppcheck.suppress b/scintilla/cppcheck.suppress
index b13cc7d18..95fe6c4aa 100644
--- a/scintilla/cppcheck.suppress
+++ b/scintilla/cppcheck.suppress
@@ -7,7 +7,6 @@ useInitializationList
// Some non-explicit constructors are used for conversions or are private to lexers
noExplicitConstructor
-noExplicitCopyMoveConstructor
// cppcheck does not understand private methods can be called from static methods
unusedPrivateFunction:scintilla/win32/PlatWin.cxx
@@ -34,7 +33,6 @@ variableScope:scintilla/lexers/LexPB.cxx
variableScope:scintilla/lexers/LexRuby.cxx
uninitMemberVar:scintilla/lexers/LexRuby.cxx
variableScope:scintilla/lexers/LexSpecman.cxx
-unreadVariable:scintilla/lexers/LexSpice.cxx
clarifyCalculation:scintilla/lexers/LexTADS3.cxx
invalidscanf:scintilla/lexers/LexTCMD.cxx
variableScope:scintilla/lexers/LexTeX.cxx
diff --git a/scintilla/doc/SciCoding.html b/scintilla/doc/SciCoding.html
index 7edcbfebf..2e6e211c7 100644
--- a/scintilla/doc/SciCoding.html
+++ b/scintilla/doc/SciCoding.html
@@ -145,8 +145,7 @@
Do not use old C style casts like (char *)s. Instead use the most strict form of C++
cast possible like const_cast<char *>(s). Use static_cast and const_cast
- where possible rather than reinterpret_cast. Because the code is compiled with
- run-time type information turned off, dynamic_cast will not work.
+ where possible rather than reinterpret_cast.
The benefit to using the new style casts is that they explicitly detail what evil is
diff --git a/scintilla/doc/ScintillaDoc.html b/scintilla/doc/ScintillaDoc.html
index b1b550fb0..c6929a370 100644
--- a/scintilla/doc/ScintillaDoc.html
+++ b/scintilla/doc/ScintillaDoc.html
@@ -82,7 +82,7 @@
Scintilla Documentation
- Last edited 6 January 2016 NH
+ Last edited 8 May 2016 NH
There is an overview of the internal design of
Scintilla.
@@ -623,8 +623,9 @@ struct Sci_TextRange {
The base regular expression support
is limited and should only be used for simple cases and initial development.
- When using a C++11 compliant compiler and runtime, it may be possible to use the
- runtime's implementation of <regex> by compiling Scintilla with CXX11_REGEX defined.
+ The C++ runtime <regex> library may be used by setting the SCFIND_CXX11REGEX search flag.
+ When using an older C++ compiler that does not support C++11, this may be turned off by
+ compiling Scintilla with NO_CXX11_REGEX defined.
A different regular expression
library can be integrated into Scintilla
or can be called from the container using direct access to the buffer contents through
@@ -743,29 +744,32 @@ struct Sci_TextRange {
SCFIND_REGEXP |
- The search string should be interpreted as a regular expression. |
+ The search string should be interpreted as a regular expression.
+ Uses Scintilla's base implementation unless combined with SCFIND_CXX11REGEX. |
SCFIND_POSIX |
Treat regular expression in a more POSIX compatible manner
- by interpreting bare ( and ) for tagged sections rather than \( and \). |
+ by interpreting bare ( and ) for tagged sections rather than \( and \).
+ Has no effect when SCFIND_CXX11REGEX is set.
-
+
SCFIND_CXX11REGEX |
- When compiled with CXX11_REGEX this flag
- may be set to use <regex> instead of Scintilla's basic regular expressions.
- If the regular expression is invalid then -1 is returned and status is set to
- SC_STATUS_WARN_REGEX.
- The ECMAScript flag is set on the regex object and UTF-8 documents will exhibit Unicode-compliant
- behaviour. For MSVC, where wchar_t is 16-bits, the reular expression ".." will match a single
- astral-plane character. There may be other differences between compilers. |
+ This flag may be set to use C++11 <regex> instead of Scintilla's basic regular expressions.
+ If the regular expression is invalid then -1 is returned and status is set to
+ SC_STATUS_WARN_REGEX.
+ The ECMAScript flag is set on the regex object and UTF-8 documents will exhibit Unicode-compliant
+ behaviour. For MSVC, where wchar_t is 16-bits, the reular expression ".." will match a single
+ astral-plane character. There may be other differences between compilers.
+ Must also have SCFIND_REGEXP set. |
- In a regular expression, special characters interpreted are:
+ In a regular expression, using Scintilla's base implementation,
+ special characters interpreted are:
@@ -860,6 +864,10 @@ struct Sci_TextRange {
Regular expressions will only match ranges within a single line, never matching over multiple lines.
+ When using SCFIND_CXX11REGEX more features are available,
+ generally similar to regular expression support in JavaScript.
+ See the documentation of your C++ runtime for details on what is supported.
+
SCI_FINDTEXT(int flags, Sci_TextToFind
*ttf)
SCI_SEARCHANCHOR
@@ -1020,7 +1028,7 @@ struct Sci_TextToFind {
Generic failure |
-
+
| SC_STATUS_BADALLOC |
2 |
Memory is exhausted |
@@ -1137,8 +1145,6 @@ struct Sci_TextToFind {
SCI_GETTEXTLENGTH
SCI_GETLENGTH
SCI_GETLINECOUNT
- SCI_SETFIRSTVISIBLELINE(int lineDisplay)
- SCI_GETFIRSTVISIBLELINE
SCI_LINESONSCREEN
SCI_GETMODIFY
SCI_SETSEL(int anchorPos, int currentPos)
@@ -1206,11 +1212,6 @@ struct Sci_TextToFind {
This returns the number of lines in the document. An empty document contains 1 line. A
document holding only an end of line sequence has 2 lines.
- SCI_SETFIRSTVISIBLELINE(int lineDisplay)
- SCI_GETFIRSTVISIBLELINE
- These messages retrieve and set the line number of the first visible line in the Scintilla view. The first line
- in the document is numbered 0. The value is a visible line rather than a document line.
-
SCI_LINESONSCREEN
This returns the number of complete lines visible on the screen. With a constant line height,
this is the vertical space available divided by the line separation. Unless you arrange to size
@@ -1826,7 +1827,12 @@ struct Sci_TextToFind {
- SCI_LINESCROLL(int column, int line)
+
+ SCI_SETFIRSTVISIBLELINE(int lineDisplay)
+ SCI_GETFIRSTVISIBLELINE
+ SCI_SETXOFFSET(int xOffset)
+ SCI_GETXOFFSET
+ SCI_LINESCROLL(int column, int line)
SCI_SCROLLCARET
SCI_SCROLLRANGE(int secondary, int primary)
SCI_SETXCARETPOLICY(int caretPolicy, int
@@ -1839,8 +1845,6 @@ struct Sci_TextToFind {
SCI_GETHSCROLLBAR
SCI_SETVSCROLLBAR(bool visible)
SCI_GETVSCROLLBAR
- SCI_GETXOFFSET
- SCI_SETXOFFSET(int xOffset)
SCI_SETSCROLLWIDTH(int pixelWidth)
SCI_GETSCROLLWIDTH
SCI_SETSCROLLWIDTHTRACKING(bool tracking)
@@ -1850,6 +1854,17 @@ struct Sci_TextToFind {
SCI_GETENDATLASTLINE
+ SCI_SETFIRSTVISIBLELINE(int lineDisplay)
+ SCI_GETFIRSTVISIBLELINE
+ These messages retrieve and set the line number of the first visible line in the Scintilla view. The first line
+ in the document is numbered 0. The value is a visible line rather than a document line.
+
+ SCI_SETXOFFSET(int xOffset)
+ SCI_GETXOFFSET
+ The xOffset is the horizontal scroll position in pixels of the start of the text
+ view. A value of 0 is the normal position with the first text column visible at the left of the
+ view.
+
SCI_LINESCROLL(int column, int line)
This will attempt to scroll the display by the number of columns and lines that you specify.
Positive line values increase the line number at the top of the screen (i.e. they move the text
@@ -2146,12 +2161,6 @@ struct Sci_TextToFind {
or show it with SCI_SETVSCROLLBAR and get the current state with
SCI_GETVSCROLLBAR.
- SCI_SETXOFFSET(int xOffset)
- SCI_GETXOFFSET
- The xOffset is the horizontal scroll position in pixels of the start of the text
- view. A value of 0 is the normal position with the first text column visible at the left of the
- view.
-
See also: SCI_LINESCROLL
SCI_SETSCROLLWIDTH(int pixelWidth)
@@ -5042,9 +5051,11 @@ struct Sci_TextToFind {
SCK_WIN.
The modifiers are a combination of zero or more of SCMOD_ALT,
- SCMOD_CTRL, SCMOD_SHIFT, and SCMOD_META.
+ SCMOD_CTRL, SCMOD_SHIFT,
+ SCMOD_META, and SCMOD_SUPER.
On OS X, the Command key is mapped to SCMOD_CTRL and the Control key to
SCMOD_META.
+ SCMOD_SUPER is only available on GTK+ which is commonly the Windows key.
If you are building a table, you might
want to use SCMOD_NORM, which has the value 0, to mean no modifiers.
@@ -7577,8 +7588,6 @@ for line = lineStart to lineEnd do SCI_ENSUREVISIBLE(line) next
SC_TECHNOLOGY_DIRECTWRITEDC values for
SCI_SETTECHNOLOGY are provisional.
- Using C++11 <regex> is provisional.
-
Some developers may want to only use features that are stable and have graduated from
provisional status. To avoid using provisional messages compile with the symbol
SCI_DISABLE_PROVISIONAL defined.
diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html
index d039a02b1..fb00c831a 100644
--- a/scintilla/doc/ScintillaDownload.html
+++ b/scintilla/doc/ScintillaDownload.html
@@ -26,9 +26,9 @@
|
-
+
Windows
-
+
GTK+/Linux
|
@@ -42,7 +42,7 @@
containing very few restrictions.
- Release 3.6.4
+ Release 3.6.6
Source Code
@@ -50,8 +50,8 @@
The source code package contains all of the source code for Scintilla but no binary
executable code and is available in
- - zip format (1500K) commonly used on Windows
- - tgz format (1400K) commonly used on Linux and compatible operating systems
+ - zip format (1500K) commonly used on Windows
+ - tgz format (1400K) 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/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html
index 79ae769c2..82c992800 100644
--- a/scintilla/doc/ScintillaHistory.html
+++ b/scintilla/doc/ScintillaHistory.html
@@ -484,6 +484,12 @@
| Mark C |
Johannes Sasongko |
+ fstirlitz |
+ Robin Haberkorn |
+
+ | Pavel Sountsov |
+ Dirk Lorenzen |
+ Kasper B. Graversen |
@@ -495,22 +501,94 @@
Icons Copyright(C) 1998 by Dean S. Jones
+
+
+ -
+ Released 24 May 2016.
+
+ -
+ C++ 11 <regex> support built by default. Can be disabled by defining NO_CXX11_REGEX.
+
+ -
+ SciTE_USERHOME environment variable allows separate location for writable properties files.
+ Feature #965.
+
+ -
+ GObject introspection supports notify and command events.
+
+ -
+ The Progress lexer now allows comments preceded by a tab.
+
+ -
+ Scripts reading Scintilla.iface file include comments for enu and lex definitions.
+ Bug #1829.
+
+ -
+ Fix crashes on GTK+ if idle work active when destroyed.
+ Bug #1827.
+
+ -
+ Fixed bugs when used on GTK+ 3.20.
+ Bug #1825.
+ Bug #1831.
+
+ -
+ Fix SciTE search field background with dark theme on GTK+ 2.x.
+ Bug #1826.
+
+ -
+ Fixed bug on Win32 that allowed resizing autocompletion from bottom when it was
+ located above the caret.
+
+ -
+ On Win32, when using a screen reader and selecting text using Shift+Arrow,
+ fix bug when scrolling made the caret stay at the same screen location
+ so the screen reader did not speak the added or removed selection.
+
+
-
- Released 13 March 2016.
+ Released 26 April 2016.
-
JSON lexer added.
Feature #1140.
-
+ The C++ lexer fixes a bug with multi-line strings with line continuation where the string style
+ overflowed after an edit.
+ Bug #1824.
+
+ -
The Python lexer treats '@' as an operator except when it is the first visible character on a line.
This is for Python 3.5.
-
+ The Rust lexer allows '?' as an operator.
+ Feature #1146.
+
+ -
+ Doubled size of compiled regex buffer.
+ Bug #1822.
+
+ -
+ For GTK+, the Super modifier key can be used in key bindings.
+ Feature #1142.
+
+ -
+ For GTK+, fix some crashes when using multiple threads.
+
+ -
+ Platform layer font cache removed on GTK+ as platform-independent caches are used.
+ This avoids the use of thread locking and initialisation of threads so any GTK+
+ applications that rely on Scintilla initialising threads will have to do that themselves.
+
+ -
SciTE bug fixed with exported HTML where extra line shown.
Bug #1816.
@@ -519,6 +597,9 @@
For the replace strip, menu choices change the state.
For the find strip, menu choices are reflected in the appearance of their corresponding buttons.
+ -
+ SciTE on Windows on high DPI displays fixes the height of edit boxes in user strips.
+
Release 3.6.4
diff --git a/scintilla/doc/ScintillaRelated.html b/scintilla/doc/ScintillaRelated.html
index 660e1713c..37605274d 100644
--- a/scintilla/doc/ScintillaRelated.html
+++ b/scintilla/doc/ScintillaRelated.html
@@ -137,7 +137,7 @@
is an XML/JSON editor and XML validator for Windows.
- SciTECO
+ SciTECO
is an advanced TECO dialect and interactive screen editor based on Scintilla.
diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html
index 179d849eb..f95be0975 100644
--- a/scintilla/doc/index.html
+++ b/scintilla/doc/index.html
@@ -9,7 +9,7 @@
-
+