Skip to content
This repository has been archived by the owner on Aug 12, 2018. It is now read-only.

Commit

Permalink
Update Scintilla to v3.5.4.
Browse files Browse the repository at this point in the history
  • Loading branch information
@XhmikosR
XhmikosR committed Mar 9, 2015
1 parent 12949f7 commit 4ac3088
Show file tree
Hide file tree
Showing 40 changed files with 1,609 additions and 759 deletions.
5 changes: 5 additions & 0 deletions build/makefile.deps.mak
View file
Expand Up @@ -481,6 +481,11 @@ $(SCI_SRC_OBJDIR)\XPM.obj: \
#######################
## scintilla\win32 ##
#######################
$(SCI_WIN_OBJDIR)\HanjaDic.obj: \
$(SCI_WIN)\HanjaDic.cxx \
$(SCI_WIN)\HanjaDic.h \
$(SCI_SRC)\UniConversion.h

$(SCI_WIN_OBJDIR)\PlatWin.obj: \
$(SCI_WIN)\PlatWin.cxx \
$(SCI_INC)\Platform.h \
Expand Down
1 change: 1 addition & 0 deletions build/makefile.mak
View file
Expand Up @@ -192,6 +192,7 @@ SCI_SRC_OBJ = \
$(SCI_SRC_OBJDIR)\XPM.obj

SCI_WIN_OBJ = \
$(SCI_WIN_OBJDIR)\HanjaDic.obj \
$(SCI_WIN_OBJDIR)\PlatWin.obj \
$(SCI_WIN_OBJDIR)\ScintillaWin.obj

Expand Down
1 change: 1 addition & 0 deletions scintilla/Scintilla.vcxproj
View file
Expand Up @@ -223,6 +223,7 @@
<ClCompile Include="src\UniConversion.cxx" />
<ClCompile Include="src\ViewStyle.cxx" />
<ClCompile Include="src\XPM.cxx" />
<ClCompile Include="win32\HanjaDic.cxx" />
<ClCompile Include="win32\PlatWin.cxx" />
<ClCompile Include="win32\ScintillaWin.cxx" />
</ItemGroup>
Expand Down
6 changes: 6 additions & 0 deletions scintilla/Scintilla.vcxproj.filters
View file
Expand Up @@ -213,6 +213,9 @@
<ClCompile Include="src\XPM.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="win32\HanjaDic.cxx">
<Filter>win32</Filter>
</ClCompile>
<ClCompile Include="win32\PlatWin.cxx">
<Filter>win32</Filter>
</ClCompile>
Expand Down Expand Up @@ -374,6 +377,9 @@
<ClInclude Include="src\XPM.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="win32\HanjaDic.h">
<Filter>win32</Filter>
</ClInclude>
<ClInclude Include="win32\PlatWin.h">
<Filter>win32</Filter>
</ClInclude>
Expand Down
93 changes: 84 additions & 9 deletions scintilla/doc/ScintillaDoc.html
View file
Expand Up @@ -82,7 +82,7 @@

<h1>Scintilla Documentation</h1>

<p>Last edited 10 January 2015 NH</p>
<p>Last edited 22 February 2015 NH</p>

<p>There is <a class="jump" href="Design.html">an overview of the internal design of
Scintilla</a>.<br />
Expand Down Expand Up @@ -585,12 +585,14 @@ <h2 id="TextRetrievalAndModification">Text retrieval and modification</h2>
};
</pre>

<h3 id="EncodedAccess">GTK+-specific: Access to encoded text</h3>
<h3 id="EncodedAccess">Specific to GTK+ and Cocoa only: Access to encoded text</h3>

<p><b id="SCI_TARGETASUTF8">SCI_TARGETASUTF8(&lt;unused&gt;, char *s)</b><br />
This method retrieves the value of the target encoded as UTF-8 which is the default
encoding of GTK+ so is useful for retrieving text for use in other parts of the user interface,
such as find and replace dialogs. The length of the encoded text in bytes is returned.
Cocoa uses UTF-16 which is easily converted from UTF-8 so this method can be used to perform the
more complex work of transcoding from the various of encodings supported.
</p>

<p><b id="SCI_ENCODEDFROMUTF8">SCI_ENCODEDFROMUTF8(const char *utf8, char *encoded)</b><br />
Expand Down Expand Up @@ -635,11 +637,14 @@ <h3 id="SearchAndReplaceUsingTheTarget">Search and replace using the target</h3>
<a class="message" href="#SCI_GETTARGETSTART">SCI_GETTARGETSTART</a><br />
<a class="message" href="#SCI_SETTARGETEND">SCI_SETTARGETEND(int pos)</a><br />
<a class="message" href="#SCI_GETTARGETEND">SCI_GETTARGETEND</a><br />
<a class="message" href="#SCI_SETTARGETRANGE">SCI_SETTARGETRANGE(int start, int end)</a><br />
<a class="message" href="#SCI_TARGETFROMSELECTION">SCI_TARGETFROMSELECTION</a><br />
<a class="message" href="#SCI_SETSEARCHFLAGS">SCI_SETSEARCHFLAGS(int searchFlags)</a><br />
<a class="message" href="#SCI_GETSEARCHFLAGS">SCI_GETSEARCHFLAGS</a><br />
<a class="message" href="#SCI_SEARCHINTARGET">SCI_SEARCHINTARGET(int length, const char
*text)</a><br />
<a class="message" href="#SCI_GETTARGETTEXT">SCI_GETTARGETTEXT(&lt;unused&gt;,
char *text)</a><br />
<a class="message" href="#SCI_REPLACETARGET">SCI_REPLACETARGET(int length, const char
*text)</a><br />
<a class="message" href="#SCI_REPLACETARGETRE">SCI_REPLACETARGETRE(int length, const char
Expand All @@ -651,6 +656,7 @@ <h3 id="SearchAndReplaceUsingTheTarget">Search and replace using the target</h3>
<b id="SCI_GETTARGETSTART">SCI_GETTARGETSTART</b><br />
<b id="SCI_SETTARGETEND">SCI_SETTARGETEND(int pos)</b><br />
<b id="SCI_GETTARGETEND">SCI_GETTARGETEND</b><br />
<b id="SCI_SETTARGETRANGE">SCI_SETTARGETRANGE(int start, int end)</b><br />
These functions set and return the start and end of the target. When searching
you can set start greater than end to find the last matching text in the
target rather than the first matching text. The target is also set by a successful
Expand All @@ -673,6 +679,9 @@ <h3 id="SearchAndReplaceUsingTheTarget">Search and replace using the target</h3>
text and the return value is the position of the start of the matching text. If the search
fails, the result is -1.</p>

<p><b id="SCI_GETTARGETTEXT">SCI_GETTARGETTEXT(&lt;unused&gt;, char *text)</b><br />
Retrieve the value in the target.</p>

<p><b id="SCI_REPLACETARGET">SCI_REPLACETARGET(int length, const char *text)</b><br />
If <code>length</code> is -1, <code>text</code> is a zero terminated string, otherwise
<code>length</code> sets the number of character to replace the target with.
Expand Down Expand Up @@ -3900,8 +3909,12 @@ <h2 id="Indicators">Indicators</h2>
They can be used to show, for example, syntax errors, deprecated names and bad indentation
by drawing underlines under text or boxes around text.</p>

<p>Indicators may have a different "hover" colour and style when the mouse is over them or the caret is moved into them.
This may be used, for example, to indicate that a URL can be clicked.</p>

<p>Indicators may be displayed as simple underlines, squiggly underlines, a
line of small 'T' shapes, a line of diagonal hatching, a strike-out or a rectangle around the text.</p>
line of small 'T' shapes, a line of diagonal hatching, a strike-out or a rectangle around the text.
They may also be invisible when used to track pieces of content for the application as <code>INDIC_HIDDEN</code>.</p>

<p>The <code>SCI_INDIC*</code> messages allow you to get and set the visual appearance of the
indicators. They all use an <code>indicatorNumber</code> argument in the range 0 to INDIC_MAX(35)
Expand All @@ -3910,6 +3923,11 @@ <h2 id="Indicators">Indicators</h2>
(8=<code>INDIC_CONTAINER</code> .. 31=<code>INDIC_IME-1</code>)
and a range for IME indicators (32=<code>INDIC_IME</code> .. 35=<code>INDIC_IME_MAX</code>).</p>

<p>Indicators are stored in a format similar to run length encoding which is efficient in both
speed and storage for sparse information.</p>
<p>An indicator may store different values for each range but currently all values are drawn the same.
In the future, it may be possible to draw different values in different styles.</p>

<p>Originally, Scintilla used a different technique for indicators but this
has been <a href="#RemovedFeatures">removed</a>
and the APIs perform <a href="#StyleByteIndicators">no action</a>.
Expand All @@ -3928,6 +3946,15 @@ <h2 id="Indicators">Indicators</h2>
<a class="message" href="#SCI_INDICGETOUTLINEALPHA">SCI_INDICGETOUTLINEALPHA(int indicatorNumber)</a><br />
<a class="message" href="#SCI_INDICSETUNDER">SCI_INDICSETUNDER(int indicatorNumber, bool under)</a><br />
<a class="message" href="#SCI_INDICGETUNDER">SCI_INDICGETUNDER(int indicatorNumber)</a><br />
<a class="message" href="#SCI_INDICSETHOVERSTYLE">SCI_INDICSETHOVERSTYLE(int indicatorNumber, int
indicatorStyle)</a><br />
<a class="message" href="#SCI_INDICGETHOVERSTYLE">SCI_INDICGETHOVERSTYLE(int indicatorNumber)</a><br />
<a class="message" href="#SCI_INDICSETHOVERFORE">SCI_INDICSETHOVERFORE(int indicatorNumber, int
colour)</a><br />
<a class="message" href="#SCI_INDICGETHOVERFORE">SCI_INDICGETHOVERFORE(int indicatorNumber)</a><br />
<a class="message" href="#SCI_INDICSETFLAGS">SCI_INDICSETFLAGS(int indicatorNumber, int flags)</a><br />
<a class="message" href="#SCI_INDICGETFLAGS">SCI_INDICGETFLAGS(int indicatorNumber)</a><br />
<br />

<a class="message" href="#SCI_SETINDICATORCURRENT">SCI_SETINDICATORCURRENT(int indicator)</a><br />
<a class="message" href="#SCI_GETINDICATORCURRENT">SCI_GETINDICATORCURRENT</a><br />
Expand Down Expand Up @@ -4042,7 +4069,18 @@ <h2 id="Indicators">Indicators</h2>
interior usually more transparent than the border. You can use
<a class="message" href="#SCI_INDICSETALPHA">SCI_INDICSETALPHA</a> and
<a class="message" href="#SCI_INDICSETOUTLINEALPHA">SCI_INDICSETOUTLINEALPHA</a>
to control the alpha transparency values. The default alpha values are 30 for fill colour and 50 for outline colour.</td>
to control the alpha transparency values. The default alpha values are 30 for fill colour and 50 for outline colour.
This indicator does not colour the top pixel of the line so that indicators on contiguous lines are visually distinct
and disconnected.</td>
</tr>

<tr>
<td align="left"><code>INDIC_FULLBOX</code></td>

<td align="center">16</td>

<td>A rectangle around the text using translucent drawing similar to <code>INDIC_STRAIGHTBOX</code>
but covering the entire character area.</td>
</tr>

<tr>
Expand Down Expand Up @@ -4101,7 +4139,25 @@ <h2 id="Indicators">Indicators</h2>

<td>A 2-pixel thick underline located at the bottom of the line to try to avoid touching the character base.
Each side is inset 1 pixel so that different indicators in this style covering a range appear isolated.
This is similar to an appearance used for Asian language input composition.</td>
This is similar to an appearance used for the target in Asian language input composition.</td>
</tr>

<tr>
<td align="left"><code>INDIC_COMPOSITIONTHIN</code></td>

<td align="center">15</td>

<td>A 1-pixel thick underline located just before the bottom of the line.
Each side is inset 1 pixel so that different indicators in this style covering a range appear isolated.
This is similar to an appearance used for non-target ranges in Asian language input composition.</td>
</tr>

<tr>
<td align="left"><code>INDIC_TEXTFORE</code></td>

<td align="center">17</td>

<td>Change the colour of the text to the indicator's fore colour.</td>
</tr>

</tbody>
Expand Down Expand Up @@ -4140,10 +4196,29 @@ <h2 id="Indicators">Indicators</h2>
Drawing under text works only for indicators when <a class="message" href="#SCI_SETTWOPHASEDRAW">two phase drawing</a>
is enabled.</p>

<p>Indicators are stored in a format similar to run length encoding which is efficient in both
speed and storage for sparse information.</p>
<p>An indicator may store different values for each range but currently all values are drawn the same.
In the future, it may be possible to draw different values in different styles.</p>
<p><b id="SCI_INDICSETHOVERSTYLE">SCI_INDICSETHOVERSTYLE(int indicatorNumber, int
indicatorStyle)</b><br />
<b id="SCI_INDICGETHOVERSTYLE">SCI_INDICGETHOVERSTYLE(int indicatorNumber)</b><br />
<b id="SCI_INDICSETHOVERFORE">SCI_INDICSETHOVERFORE(int indicatorNumber, int <a class="jump" href="#colour">colour</a>)</b><br />
<b id="SCI_INDICGETHOVERFORE">SCI_INDICGETHOVERFORE(int indicatorNumber)</b><br />
These messages set and get the colour and style used to draw indicators when the mouse is over them or the caret moved into them.
The mouse cursor also changes when an indicator is drawn in hover style.
The default is for the hover appearance to be the same as the normal appearance and calling
<a class="message" href="#SCI_INDICSETFORE">SCI_INDICSETFORE</a> or
<a class="message" href="#SCI_INDICSETSTYLE">SCI_INDICSETSTYLE</a> will
also reset the hover attribute.</p>

<p><b id="SCI_INDICSETFLAGS">SCI_INDICSETFLAGS(int indicatorNumber, int flags)</b><br />
<b id="SCI_INDICGETFLAGS">SCI_INDICGETFLAGS(int indicatorNumber)</b><br />
These messages set and get the flags associated with an indicator.
There is currently one flag defined, <code>SC_INDICFLAG_VALUEFORE</code>: when this flag is set
the colour used by the indicator is not from the indicator's fore setting but instead from the value of the indicator at
that point in the file. This allows many colours to be displayed for a single indicator. The value is an <a class="jump"
href="#colour">RGB integer colour</a> that has been ored with <code>SC_INDICVALUEBIT</code>(0x1000000)
when calling <a class="message" href="#SCI_SETINDICATORVALUE">SCI_SETINDICATORVALUE</a>.
To find the colour from the value, and the value with <code>SC_INDICVALUEMASK<code>(0xFFFFFF).
</p>

<p>
<b id="SCI_SETINDICATORCURRENT">SCI_SETINDICATORCURRENT(int indicator)</b><br />
<b id="SCI_GETINDICATORCURRENT">SCI_GETINDICATORCURRENT</b><br />
Expand Down
10 changes: 5 additions & 5 deletions scintilla/doc/ScintillaDownload.html
View file
Expand Up @@ -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/scintilla353.zip?download">
<font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla354.zip?download">
Windows</a>&nbsp;&nbsp;
<a href="http://prdownloads.sourceforge.net/scintilla/scintilla353.tgz?download">
<a href="http://prdownloads.sourceforge.net/scintilla/scintilla354.tgz?download">
GTK+/Linux</a>&nbsp;&nbsp;
</font>
</td>
Expand All @@ -41,16 +41,16 @@ <h2>
containing very few restrictions.
</p>
<h3>
Release 3.5.3
Release 3.5.4
</h3>
<h4>
Source Code
</h4>
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/scintilla353.zip?download">zip format</a> (1450K) commonly used on Windows</li>
<li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla353.tgz?download">tgz format</a> (1300K) commonly used on Linux and compatible operating systems</li>
<li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla354.zip?download">zip format</a> (1450K) commonly used on Windows</li>
<li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla354.tgz?download">tgz format</a> (1300K) 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>
Expand Down
82 changes: 82 additions & 0 deletions scintilla/doc/ScintillaHistory.html
View file
Expand Up @@ -465,6 +465,10 @@ <h3>
<td>Yusuf Ramazan Karagöz</td>
<td>Markus Heidelberg</td>
<td>Joe Mueller</td>
</tr><tr>
<td>Mika Attila</td>
<td>JoMazM</td>
<td>Markus Moser</td>
</tr>
</table>
<p>
Expand All @@ -476,6 +480,84 @@ <h3>
Icons</a> Copyright(C) 1998 by Dean S. Jones<br />
</li>
</ul>
<h3>
<a href="http://prdownloads.sourceforge.net/scintilla/scite354.zip?download">Release 3.5.4</a>
</h3>
<ul>
<li>
Released 8 March 2015.
</li>
<li>
Indicators may have a different colour and style when the mouse is over them or the caret is moved into them.
</li>
<li>
An indicator may display in a large variety of colours with the SC_INDICFLAG_VALUEFORE
flag taking the colour from the indicator's value, which may differ for every character, instead of its
foreground colour attribute.
</li>
<li>
On Cocoa, additional IME methods implemented so that more commands are enabled.
For Japanese: Reverse Conversion, Convert to Related Character, and Search Similar Kanji
can now be performed.
The global definition hotkey Command+Control+D and the equivalent three finger tap gesture
can be used.
</li>
<li>
Minimum version of Qt supported is now 4.8 due to the use of QElapsedTimer::nsecsElapsed.
</li>
<li>
On Windows, for Korean, the VK_HANJA key is implemented to choose Hanja for Hangul and
to convert from Hanja to Hangul.
</li>
<li>
C++ lexer adds lexer.cpp.verbatim.strings.allow.escapes option that allows verbatim (@") strings
to contain escape sequences. This should remain off (0) for C# and be turned on (1) for Objective C.
</li>
<li>
Rust lexer accepts new 'is'/'us' integer suffixes instead of 'i'/'u'.
<a href="http://sourceforge.net/p/scintilla/bugs/1098/">Bug #1098</a>.
</li>
<li>
Ruby folder can fold multiline comments.
<a href="http://sourceforge.net/p/scintilla/bugs/1697/">Bug #1697</a>.
</li>
<li>
SQL lexer fixes a bug with the q-quote operator.
</li>
<li>
TCL lexer fixes a bug with some strings.
<a href="http://sourceforge.net/p/scintilla/bugs/1642/">Bug #1642</a>.
</li>
<li>
Verilog lexer handles escaped identifiers that begin with \ and end with space like \reset* .
Verilog folder fixes one bug with inconsistent folding when fold.comment is on and another
with typedef class statements creating a fold point, expecting an endclass statement.
</li>
<li>
VHDL folder fixes hang in folding when document starts with "entity".
</li>
<li>
Add new indicators INDIC_COMPOSITIONTHIN, INDIC_FULLBOX, and INDIC_TEXTFORE.
INDIC_COMPOSITIONTHIN is a thin underline that mimics the appearance of non-target segments in OS X IME.
INDIC_FULLBOX is similar to INDIC_STRAIGHTBOX but covers the entire character area which means that
indicators with this style on contiguous lines may touch. INDIC_TEXTFORE changes the text foreground colour.
</li>
<li>
Fix adaptive scrolling speed for GTK+ on OS X with GTK Quartz backend (as opposed to X11 backend).
<a href="http://sourceforge.net/p/scintilla/bugs/1696/">Bug #1696</a>.
</li>
<li>
Fix crash in SciTE when saving large files in background when closing application.
<a href="http://sourceforge.net/p/scintilla/bugs/1691/">Bug #1691</a>.
</li>
<li>
Fix decoding of MSVC warnings in SciTE so that files in the C:\Program Files (x86)\ directory can be opened.
This is a common location of system include files.
</li>
<li>
Fix compilation failure of C++11 &lt;regex&gt; on Windows using gcc.
</li>
</ul>
<h3>
<a href="http://prdownloads.sourceforge.net/scintilla/scite353.zip?download">Release 3.5.3</a>
</h3>
Expand Down
7 changes: 4 additions & 3 deletions scintilla/doc/index.html
View file
Expand Up @@ -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="20150120" />
<meta name="Date.Modified" content="20150308" />
<style type="text/css">
#versionlist {
margin: 0;
Expand Down Expand Up @@ -55,8 +55,8 @@
GTK+, and OS X</font>
</td>
<td width="40%" align="right">
<font color="#FFCC99" size="3"> Release version 3.5.3<br />
Site last modified January 20 2015</font>
<font color="#FFCC99" size="3"> Release version 3.5.4<br />
Site last modified March 8 2015</font>
</td>
<td width="20%">
&nbsp;
Expand All @@ -71,6 +71,7 @@
</tr>
</table>
<ul id="versionlist">
<li>Version 3.5.4 improves indicators to be able to change appearance on mouse-over and to use a wide variety of colours together.</li>
<li>Version 3.5.3 removes support for Windows 95, 98, and ME.</li>
<li>Version 3.5.2 only supports 64-bit builds for OS X 10.7+ Cocoa. Provisional support of C++11 &lt;regex&gt;.</li>
<li>Version 3.5.1 fixes minor bugs and includes a lexer for BibTeX.</li>
Expand Down

0 comments on commit 4ac3088

Please sign in to comment.