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.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
@XhmikosR
XhmikosR committed Sep 30, 2014
1 parent 45af17c commit e3126ff
Show file tree
Hide file tree
Showing 24 changed files with 659 additions and 95 deletions.
35 changes: 29 additions & 6 deletions scintilla/doc/ScintillaDoc.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

<h1>Scintilla Documentation</h1>

<p>Last edited 24 May 2014 NH</p>
<p>Last edited 25 September 2014 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 @@ -3171,6 +3171,8 @@ <h2 id="OtherSettings">Other settings</h2>
<a class="message" href="#SCI_GETFONTQUALITY">SCI_GETFONTQUALITY</a><br />
<a class="message" href="#SCI_SETCODEPAGE">SCI_SETCODEPAGE(int codePage)</a><br />
<a class="message" href="#SCI_GETCODEPAGE">SCI_GETCODEPAGE</a><br />
<a class="message" href="#SCI_SETIMEINTERACTION">SCI_SETIMEINTERACTION(int imeInteraction)</a><br />
<a class="message" href="#SCI_GETIMEINTERACTION">SCI_GETIMEINTERACTION</a><br />
<a class="message" href="#SCI_SETKEYSUNICODE">SCI_SETKEYSUNICODE(bool keysUnicode)</a><br />
<a class="message" href="#SCI_GETKEYSUNICODE">SCI_GETKEYSUNICODE</a><br />
<a class="message" href="#SCI_SETWORDCHARS">SCI_SETWORDCHARS(&lt;unused&gt;, const char *characters)</a><br />
Expand Down Expand Up @@ -3240,10 +3242,16 @@ <h2 id="OtherSettings">Other settings</h2>
<b id="SCI_GETTECHNOLOGY">SCI_GETTECHNOLOGY</b><br />
The technology property allows choosing between different drawing APIs and options.
On most platforms, the only choice is <code>SC_TECHNOLOGY_DEFAULT</code> (0).
On Windows Vista or later, <code>SC_TECHNOLOGY_DIRECTWRITE</code> (1)
On Windows Vista or later, <code>SC_TECHNOLOGY_DIRECTWRITE</code> (1) or
<code class="provisional">SC_TECHNOLOGY_DIRECTWRITERETAIN</code> (2)
can be chosen to use the Direct2D and DirectWrite APIs for higher quality antialiased drawing.
<code class="provisional">SC_TECHNOLOGY_DIRECTWRITERETAIN</code> differs from
<code>SC_TECHNOLOGY_DIRECTWRITE</code> by requesting that the frame
is retained after being presented which may prevent drawing failures on some cards and drivers.
Since Direct2D buffers drawing, Scintilla's buffering can be turned off with
<code>SCI_SETBUFFEREDDRAW(0)</code>.</p>
<code>SCI_SETBUFFEREDDRAW(0)</code>.
<span class="provisional">Since <code>SC_TECHNOLOGY_DIRECTWRITERETAIN</code>
is provisional, it may be changed or removed in a future release if a better solution is found.</span></p>

<p><b id="SCI_SETFONTQUALITY">SCI_SETFONTQUALITY(int fontQuality)</b><br />
<b id="SCI_GETFONTQUALITY">SCI_GETFONTQUALITY</b><br />
Expand Down Expand Up @@ -3277,6 +3285,19 @@ <h2 id="OtherSettings">Other settings</h2>
949 (Korean Unified Hangul Code), 950 (Traditional Chinese Big5), or 1361 (Korean Johab)
although these may require installation of language specific support.</p>

<p><b id="SCI_SETIMEINTERACTION">SCI_SETIMEINTERACTION(int imeInteraction)</b><br />
<b id="SCI_GETIMEINTERACTION">SCI_GETIMEINTERACTION</b><br />
When entering text in Chinese, Japanese, or Korean an Input Method Editor (IME) may be displayed.
The IME may be an extra window appearing above Scintilla or may be displayed by Scintilla itself
as text. On some platforms there is a choice between the two techniques.
A windowed IME <code>SC_IME_WINDOWED</code> (0) may be more similar in appearance and
behaviour to the IME in other applications.
An inline IME <code>SC_IME_INLINE</code> (1) may work better with some Scintilla features such as
rectangular and multiple selection.</p>
<p>The windowed behaviour can be chosen with <code>SCI_SETIMEINTERACTION(SC_IME_WINDOWED)</code>
and the inline behaviour with <code>SCI_SETIMEINTERACTION(SC_IME_INLINE)</code>.
Scintilla may ignore this call in some cases. For example, the inline behaviour might only be supported for some languages.</p>

<p><b id="SCI_SETKEYSUNICODE">SCI_SETKEYSUNICODE(bool keysUnicode)</b><br />
<b id="SCI_GETKEYSUNICODE">SCI_GETKEYSUNICODE</b><br />
On Windows, character keys are normally handled differently depending on whether Scintilla is a wide
Expand Down Expand Up @@ -3425,8 +3446,8 @@ <h2 id="TabsAndIndentationGuides">Tabs and Indentation Guides</h2>
<b id="SCI_GETNEXTTABSTOP">SCI_GETNEXTTABSTOP(int line, int x)</b><br />
<code>SCI_CLEARTABSTOPS</code> clears explicit tabstops on a line. <code>SCI_ADDTABSTOP</code>
adds an explicit tabstop at the specified distance from the left (in pixels), and
<code>SCI_GETNEXTTABSTOP</code> gets the next explicit tabstop position, or zero if there
aren't any.
<code>SCI_GETNEXTTABSTOP</code> gets the next explicit tabstop position set after the given x position,
or zero if there aren't any.
Changing tab stops produces a <a class="message" href="#SC_MOD_CHANGETABSTOPS">SC_MOD_CHANGETABSTOPS</a> notification.
</p>

Expand Down Expand Up @@ -7408,7 +7429,9 @@ <h2 id="ProvisionalMessages">Provisional messages</h2>

<p>Provisional features are displayed in this document with <span class="provisional">a distinctive background colour</span>.</p>

<p>There are currently no provisional features.</p>
<p>There are currently no provisional messages.
The <code class="provisional">SC_TECHNOLOGY_DIRECTWRITERETAIN</code> value for
<a class="message" href="#SCI_SETTECHNOLOGY">SCI_SETTECHNOLOGY</a> is provisional.</p>

<p>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
Expand Down
10 changes: 5 additions & 5 deletions scintilla/doc/ScintillaDownload.html
View file
Original file line number Diff line number Diff line change
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/scintilla350.zip?download">
<font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla351.zip?download">
Windows</a>&nbsp;&nbsp;
<a href="http://prdownloads.sourceforge.net/scintilla/scintilla350.tgz?download">
<a href="http://prdownloads.sourceforge.net/scintilla/scintilla351.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.0
Release 3.5.1
</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/scintilla350.zip?download">zip format</a> (1450K) commonly used on Windows</li>
<li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla350.tgz?download">tgz format</a> (1300K) commonly used on Linux and compatible operating systems</li>
<li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla351.zip?download">zip format</a> (1450K) commonly used on Windows</li>
<li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla351.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
60 changes: 60 additions & 0 deletions scintilla/doc/ScintillaHistory.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,12 @@ <h3>
</tr><tr>
<td>Vicente</td>
<td>Nick Gravgaard</td>
<td>Ian Goldby</td>
<td>Holger Stenger</td>
</tr><tr>
<td>danselmi</td>
<td>Mat Berchtold</td>
<td>Michael Staszewski</td>
</tr>
</table>
<p>
Expand All @@ -464,6 +470,60 @@ <h3>
Icons</a> Copyright(C) 1998 by Dean S. Jones<br />
</li>
</ul>
<h3>
<a href="http://prdownloads.sourceforge.net/scintilla/scite351.zip?download">Release 3.5.1</a>
</h3>
<ul>
<li>
Released 30 September 2014.
</li>
<li>
BibTeX lexer added.
<a href="http://sourceforge.net/p/scintilla/feature-requests/1071/">Feature #1071.</a>
</li>
<li>
SQL lexer supports the q-quote operator as SCE_SQL_QOPERATOR(24).
</li>
<li>
VHDL lexer supports block comments.
<a href="http://sourceforge.net/p/scintilla/bugs/1527/">Bug #1527</a>.
</li>
<li>
VHDL folder fixes case where "component" used before name.
<a href="http://sourceforge.net/p/scintilla/bugs/613/">Bug #613</a>.
</li>
<li>
Restore fractional pixel tab positioning which was truncated to whole pixels in 3.5.0.
<a href="http://sourceforge.net/p/scintilla/bugs/1652/">Bug #1652</a>.
</li>
<li>
Allow choice between windowed and inline IME on some platforms.
</li>
<li>
On GTK+ cache autocomplete window to avoid platform bug where windows
were sometimes lost.
<a href="http://sourceforge.net/p/scintilla/bugs/1649/">Bug #1649</a>.
</li>
<li>
On GTK+ size autocomplete window more accurately.
</li>
<li>
On Windows only unregister windows classes registered.
<a href="http://sourceforge.net/p/scintilla/bugs/1639/">Bug #1639</a>.
</li>
<li>
On Windows another DirectWrite mode SC_TECHNOLOGY_DIRECTWRITERETAIN added
which may avoid drawing failures on some cards and drivers.
This feature is provisional and may be changed or removed if a better solution is found.
</li>
<li>
On Windows support the Visual Studio 2010+ clipboard format that indicates a line copy.
<a href="http://sourceforge.net/p/scintilla/bugs/1636/">Bug #1636</a>.
</li>
<li>
SciTE session files remember the scroll position.
</li>
</ul>
<h3>
<a href="http://prdownloads.sourceforge.net/scintilla/scite350.zip?download">Release 3.5.0</a>
</h3>
Expand Down
15 changes: 8 additions & 7 deletions scintilla/doc/index.html
View file
Original file line number Diff line number Diff line change
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="20140813" />
<meta name="Date.Modified" content="20140930" />
<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.0<br />
Site last modified August 13 2014</font>
<font color="#FFCC99" size="3"> Release version 3.5.1<br />
Site last modified September 30 2014</font>
</td>
<td width="20%">
&nbsp;
Expand All @@ -71,6 +71,7 @@
</tr>
</table>
<ul id="versionlist">
<li>Version 3.5.1 fixes minor bugs and includes a lexer for BibTeX.</li>
<li>Version 3.5.0 can share space vertically so that extreme ascenders and descenders are not cut off.
Separate timers are used to minimize wake ups and thus power use.</li>
<li>Version 3.4.4 removes style byte indicators.</li>
Expand Down Expand Up @@ -134,7 +135,7 @@
</p>
<p>
The source code can be downloaded via Mercurial at the Source Forge
<a href="https://sourceforge.net/project/?group_id=2439">Scintilla project page</a>.
<a href="http://sourceforge.net/projects/scintilla/">Scintilla project page</a>.
</p>
<p>
<a href="http://www.scintilla.org/ScintillaRelated.html">Related sites.</a>
Expand Down Expand Up @@ -162,15 +163,15 @@
may receive no response.
<br />
</p>
There is a <a href="https://sourceforge.net/project/?group_id=2439">Scintilla project page</a>
There is a <a href="http://sourceforge.net/projects/scintilla/">Scintilla project page</a>
hosted on
<script type="text/javascript" language="JavaScript">
<!--
if (IsRemote()) {
document.write('<a href="http://sourceforge.net/projects/scintilla">');
document.write('<a href="http://sourceforge.net/projects/scintilla/">');
document.write('<img src="http://sflogo.sourceforge.net/sflogo.php?group_id=2439&amp;type=8" width="80" height="15" alt="Get Scintilla at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a> ');
} else {
document.write('<a href="http://sourceforge.net/projects/scintilla">SourceForge<\/a>');
document.write('<a href="http://sourceforge.net/projects/scintilla/">SourceForge<\/a>');
}
//-->
</script>
Expand Down
10 changes: 10 additions & 0 deletions scintilla/include/SciLexer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
#define SCLEX_AS 113
#define SCLEX_DMIS 114
#define SCLEX_REGISTRY 115
#define SCLEX_BIBTEX 116
#define SCLEX_AHK 200
#define SCLEX_AUTOMATIC 1000
#define SCE_P_DEFAULT 0
Expand Down Expand Up @@ -1005,6 +1006,7 @@
#define SCE_VHDL_STDPACKAGE 12
#define SCE_VHDL_STDTYPE 13
#define SCE_VHDL_USERWORD 14
#define SCE_VHDL_BLOCK_COMMENT 15
#define SCE_CAML_DEFAULT 0
#define SCE_CAML_IDENTIFIER 1
#define SCE_CAML_TAGNAME 2
Expand Down Expand Up @@ -1116,6 +1118,7 @@
#define SCE_SQL_USER3 21
#define SCE_SQL_USER4 22
#define SCE_SQL_QUOTEDIDENTIFIER 23
#define SCE_SQL_QOPERATOR 24
#define SCE_ST_DEFAULT 0
#define SCE_ST_STRING 1
#define SCE_ST_NUMBER 2
Expand Down Expand Up @@ -1753,6 +1756,13 @@
#define SCE_REG_STRING_GUID 10
#define SCE_REG_PARAMETER 11
#define SCE_REG_OPERATOR 12
#define SCE_BIBTEX_DEFAULT 0
#define SCE_BIBTEX_ENTRY 1
#define SCE_BIBTEX_UNKNOWN_ENTRY 2
#define SCE_BIBTEX_KEY 3
#define SCE_BIBTEX_PARAMETER 4
#define SCE_BIBTEX_VALUE 5
#define SCE_BIBTEX_COMMENT 6
/* --Autogenerated -- end of section automatically generated from Scintilla.iface */

#endif
5 changes: 5 additions & 0 deletions scintilla/include/Scintilla.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define SCI_GETNEXTTABSTOP 2677
#define SC_CP_UTF8 65001
#define SCI_SETCODEPAGE 2037
#define SC_IME_WINDOWED 0
#define SC_IME_INLINE 1
#define SCI_GETIMEINTERACTION 2678
#define SCI_SETIMEINTERACTION 2679
#define MARKER_MAX 31
#define SC_MARK_CIRCLE 0
#define SC_MARK_ROUNDRECT 1
Expand Down Expand Up @@ -888,6 +892,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define SCI_SCROLLTOEND 2629
#define SC_TECHNOLOGY_DEFAULT 0
#define SC_TECHNOLOGY_DIRECTWRITE 1
#define SC_TECHNOLOGY_DIRECTWRITERETAIN 2
#define SCI_SETTECHNOLOGY 2630
#define SCI_GETTECHNOLOGY 2631
#define SCI_CREATELOADER 2632
Expand Down
23 changes: 23 additions & 0 deletions scintilla/include/Scintilla.iface
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,16 @@ val SC_CP_UTF8=65001
# The SC_CP_UTF8 value can be used to enter Unicode mode.
set void SetCodePage=2037(int codePage,)

enu IMEInteraction=SC_IME_
val SC_IME_WINDOWED=0
val SC_IME_INLINE=1

# Is the IME displayed in a winow or inline?
get int GetIMEInteraction=2678(,)

# Choose to display the the IME in a winow or inline.
set void SetIMEInteraction=2679(int imeInteraction,)

enu MarkerSymbol=SC_MARK_
val MARKER_MAX=31
val SC_MARK_CIRCLE=0
Expand Down Expand Up @@ -2349,6 +2359,7 @@ fun void ScrollToEnd=2629(,)

val SC_TECHNOLOGY_DEFAULT=0
val SC_TECHNOLOGY_DIRECTWRITE=1
val SC_TECHNOLOGY_DIRECTWRITERETAIN=2

# Set the technology used.
set void SetTechnology=2630(int technology,)
Expand Down Expand Up @@ -2700,6 +2711,7 @@ val SCLEX_DMAP=112
val SCLEX_AS=113
val SCLEX_DMIS=114
val SCLEX_REGISTRY=115
val SCLEX_BIBTEX=116
## notepad2 custom code for the AHK lexer - start
val SCLEX_AHK=200
## notepad2 custom code for the AHK lexer - end
Expand Down Expand Up @@ -3706,6 +3718,7 @@ val SCE_VHDL_STDFUNCTION=11
val SCE_VHDL_STDPACKAGE=12
val SCE_VHDL_STDTYPE=13
val SCE_VHDL_USERWORD=14
val SCE_VHDL_BLOCK_COMMENT=15
# Lexical states for SCLEX_CAML
lex Caml=SCLEX_CAML SCE_CAML_
val SCE_CAML_DEFAULT=0
Expand Down Expand Up @@ -3827,6 +3840,7 @@ val SCE_SQL_USER2=20
val SCE_SQL_USER3=21
val SCE_SQL_USER4=22
val SCE_SQL_QUOTEDIDENTIFIER=23
val SCE_SQL_QOPERATOR=24
# Lexical states for SCLEX_SMALLTALK
lex Smalltalk=SCLEX_SMALLTALK SCE_ST_
val SCE_ST_DEFAULT=0
Expand Down Expand Up @@ -4540,6 +4554,15 @@ val SCE_REG_KEYPATH_GUID=9
val SCE_REG_STRING_GUID=10
val SCE_REG_PARAMETER=11
val SCE_REG_OPERATOR=12
# Lexical state for SCLEX_BIBTEX
lex BibTeX=SCLEX_BIBTEX SCE_BIBTEX_
val SCE_BIBTEX_DEFAULT=0
val SCE_BIBTEX_ENTRY=1
val SCE_BIBTEX_UNKNOWN_ENTRY=2
val SCE_BIBTEX_KEY=3
val SCE_BIBTEX_PARAMETER=4
val SCE_BIBTEX_VALUE=5
val SCE_BIBTEX_COMMENT=6

# Events

Expand Down
Loading

0 comments on commit e3126ff

Please sign in to comment.