diff --git a/build/makefile.deps.mak b/build/makefile.deps.mak index 02af416c..f30ed174 100644 --- a/build/makefile.deps.mak +++ b/build/makefile.deps.mak @@ -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 \ diff --git a/build/makefile.mak b/build/makefile.mak index 78a2dce4..e518dad8 100644 --- a/build/makefile.mak +++ b/build/makefile.mak @@ -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 diff --git a/scintilla/Scintilla.vcxproj b/scintilla/Scintilla.vcxproj index 1b2ae0fd..c99dea71 100644 --- a/scintilla/Scintilla.vcxproj +++ b/scintilla/Scintilla.vcxproj @@ -223,6 +223,7 @@ + diff --git a/scintilla/Scintilla.vcxproj.filters b/scintilla/Scintilla.vcxproj.filters index ee3aaa78..540e09d5 100644 --- a/scintilla/Scintilla.vcxproj.filters +++ b/scintilla/Scintilla.vcxproj.filters @@ -213,6 +213,9 @@ src + + win32 + win32 @@ -374,6 +377,9 @@ src + + win32 + win32 diff --git a/scintilla/doc/ScintillaDoc.html b/scintilla/doc/ScintillaDoc.html index ed66afa6..0a913506 100644 --- a/scintilla/doc/ScintillaDoc.html +++ b/scintilla/doc/ScintillaDoc.html @@ -82,7 +82,7 @@

Scintilla Documentation

-

Last edited 10 January 2015 NH

+

Last edited 22 February 2015 NH

There is an overview of the internal design of Scintilla.
@@ -585,12 +585,14 @@

Text retrieval and modification

}; -

GTK+-specific: Access to encoded text

+

Specific to GTK+ and Cocoa only: Access to encoded text

SCI_TARGETASUTF8(<unused>, char *s)
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.

SCI_ENCODEDFROMUTF8(const char *utf8, char *encoded)
@@ -635,11 +637,14 @@

Search and replace using the target

SCI_GETTARGETSTART
SCI_SETTARGETEND(int pos)
SCI_GETTARGETEND
+ SCI_SETTARGETRANGE(int start, int end)
SCI_TARGETFROMSELECTION
SCI_SETSEARCHFLAGS(int searchFlags)
SCI_GETSEARCHFLAGS
SCI_SEARCHINTARGET(int length, const char *text)
+ SCI_GETTARGETTEXT(<unused>, + char *text)
SCI_REPLACETARGET(int length, const char *text)
SCI_REPLACETARGETRE(int length, const char @@ -651,6 +656,7 @@

Search and replace using the target

SCI_GETTARGETSTART
SCI_SETTARGETEND(int pos)
SCI_GETTARGETEND
+ SCI_SETTARGETRANGE(int start, int end)
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 @@ -673,6 +679,9 @@

Search and replace using the target

text and the return value is the position of the start of the matching text. If the search fails, the result is -1.

+

SCI_GETTARGETTEXT(<unused>, char *text)
+ Retrieve the value in the target.

+

SCI_REPLACETARGET(int length, const char *text)
If length is -1, text is a zero terminated string, otherwise length sets the number of character to replace the target with. @@ -3900,8 +3909,12 @@

Indicators

They can be used to show, for example, syntax errors, deprecated names and bad indentation by drawing underlines under text or boxes around text.

+

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.

+

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.

+ 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 INDIC_HIDDEN.

The SCI_INDIC* messages allow you to get and set the visual appearance of the indicators. They all use an indicatorNumber argument in the range 0 to INDIC_MAX(35) @@ -3910,6 +3923,11 @@

Indicators

(8=INDIC_CONTAINER .. 31=INDIC_IME-1) and a range for IME indicators (32=INDIC_IME .. 35=INDIC_IME_MAX).

+

Indicators are stored in a format similar to run length encoding which is efficient in both + speed and storage for sparse information.

+

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.

+

Originally, Scintilla used a different technique for indicators but this has been removed and the APIs perform no action. @@ -3928,6 +3946,15 @@

Indicators

SCI_INDICGETOUTLINEALPHA(int indicatorNumber)
SCI_INDICSETUNDER(int indicatorNumber, bool under)
SCI_INDICGETUNDER(int indicatorNumber)
+ SCI_INDICSETHOVERSTYLE(int indicatorNumber, int + indicatorStyle)
+ SCI_INDICGETHOVERSTYLE(int indicatorNumber)
+ SCI_INDICSETHOVERFORE(int indicatorNumber, int + colour)
+ SCI_INDICGETHOVERFORE(int indicatorNumber)
+ SCI_INDICSETFLAGS(int indicatorNumber, int flags)
+ SCI_INDICGETFLAGS(int indicatorNumber)
+
SCI_SETINDICATORCURRENT(int indicator)
SCI_GETINDICATORCURRENT
@@ -4042,7 +4069,18 @@

Indicators

interior usually more transparent than the border. You can use SCI_INDICSETALPHA and SCI_INDICSETOUTLINEALPHA - to control the alpha transparency values. The default alpha values are 30 for fill colour and 50 for outline colour. + 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. + + + + INDIC_FULLBOX + + 16 + + A rectangle around the text using translucent drawing similar to INDIC_STRAIGHTBOX + but covering the entire character area. @@ -4101,7 +4139,25 @@

Indicators

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. + This is similar to an appearance used for the target in Asian language input composition. + + + + INDIC_COMPOSITIONTHIN + + 15 + + 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. + + + + INDIC_TEXTFORE + + 17 + + Change the colour of the text to the indicator's fore colour. @@ -4140,10 +4196,29 @@

Indicators

Drawing under text works only for indicators when two phase drawing is enabled.

-

Indicators are stored in a format similar to run length encoding which is efficient in both - speed and storage for sparse information.

-

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.

+

SCI_INDICSETHOVERSTYLE(int indicatorNumber, int + indicatorStyle)
+ SCI_INDICGETHOVERSTYLE(int indicatorNumber)
+ SCI_INDICSETHOVERFORE(int indicatorNumber, int colour)
+ SCI_INDICGETHOVERFORE(int indicatorNumber)
+ 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 + SCI_INDICSETFORE or + SCI_INDICSETSTYLE will + also reset the hover attribute.

+ +

SCI_INDICSETFLAGS(int indicatorNumber, int flags)
+ SCI_INDICGETFLAGS(int indicatorNumber)
+ These messages set and get the flags associated with an indicator. + There is currently one flag defined, SC_INDICFLAG_VALUEFORE: 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 RGB integer colour that has been ored with SC_INDICVALUEBIT(0x1000000) + when calling SCI_SETINDICATORVALUE. + To find the colour from the value, and the value with SC_INDICVALUEMASK(0xFFFFFF). +

+

SCI_SETINDICATORCURRENT(int indicator)
SCI_GETINDICATORCURRENT
diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html index c272a48e..2fdcf000 100644 --- a/scintilla/doc/ScintillaDownload.html +++ b/scintilla/doc/ScintillaDownload.html @@ -25,9 +25,9 @@ @@ -41,7 +41,7 @@

containing very few restrictions.

- Release 3.5.3 + Release 3.5.4

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 (1450K) commonly used on Windows
    • -
  • tgz format (1300K) commonly used on Linux and compatible operating systems
    • +
  • zip format (1450K) commonly used on Windows
    • +
  • tgz format (1300K) 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 4360b282..9705e5a3 100644 --- a/scintilla/doc/ScintillaHistory.html +++ b/scintilla/doc/ScintillaHistory.html @@ -465,6 +465,10 @@

+ + + +
- + Windows   - + GTK+/Linux   Yusuf Ramazan Karagöz Markus Heidelberg Joe Mueller
Mika AttilaJoMazMMarkus Moser

@@ -476,6 +480,84 @@

Icons Copyright(C) 1998 by Dean S. Jones
+

+ Release 3.5.4 +

+
    +
  • + Released 8 March 2015. +
    • +
  • + Indicators may have a different colour and style when the mouse is over them or the caret is moved into them. +
    • +
  • + 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. +
    • +
  • + 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. +
    • +
  • + Minimum version of Qt supported is now 4.8 due to the use of QElapsedTimer::nsecsElapsed. +
    • +
  • + On Windows, for Korean, the VK_HANJA key is implemented to choose Hanja for Hangul and + to convert from Hanja to Hangul. +
    • +
  • + 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. +
    • +
  • + Rust lexer accepts new 'is'/'us' integer suffixes instead of 'i'/'u'. + Bug #1098. +
    • +
  • + Ruby folder can fold multiline comments. + Bug #1697. +
    • +
  • + SQL lexer fixes a bug with the q-quote operator. +
    • +
  • + TCL lexer fixes a bug with some strings. + Bug #1642. +
    • +
  • + 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. +
    • +
  • + VHDL folder fixes hang in folding when document starts with "entity". +
    • +
  • + 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. +
    • +
  • + Fix adaptive scrolling speed for GTK+ on OS X with GTK Quartz backend (as opposed to X11 backend). + Bug #1696. +
    • +
  • + Fix crash in SciTE when saving large files in background when closing application. + Bug #1691. +
    • +
  • + 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. +
    • +
  • + Fix compilation failure of C++11 <regex> on Windows using gcc. +
    • +

Release 3.5.3

diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html index 900b1b66..fbe80e6c 100644 --- a/scintilla/doc/index.html +++ b/scintilla/doc/index.html @@ -9,7 +9,7 @@ - +