From 80781c95bbdaa770cce026c6e0461c803ead84bb Mon Sep 17 00:00:00 2001 From: Neil Date: Thu, 5 Sep 2013 16:37:34 +1000 Subject: Added SCI_GETPRIMARYSTYLEFROMSTYLE. --- doc/ScintillaDoc.html | 9 +++++++-- doc/ScintillaHistory.html | 6 ++++-- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html index 5b3ca0717..98f9bb844 100644 --- a/doc/ScintillaDoc.html +++ b/doc/ScintillaDoc.html @@ -82,7 +82,7 @@

Scintilla Documentation

-

Last edited 3 September 2013 NH

+

Last edited 5 September 2013 NH

There is an overview of the internal design of Scintilla.
@@ -5931,6 +5931,7 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){ SCI_GETSUBSTYLESSTART(int styleBase)
SCI_GETSUBSTYLESLENGTH(int styleBase)
SCI_GETSTYLEFROMSUBSTYLE(int subStyle)
+ SCI_GETPRIMARYSTYLEFROMSTYLE(int style)
SCI_SETIDENTIFIERS(int style, const char *identifiers)
@@ -6107,7 +6108,10 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){ Return the start and length of the substyles allocated for a base style.

SCI_GETSTYLEFROMSUBSTYLE(int subStyle)
- Returns the base style of a substyle.

+ For a sub style, return the base style, else return the argument.

+ +

SCI_GETPRIMARYSTYLEFROMSTYLE(int style)
+ For a secondary style, return the primary style, else return the argument.

SCI_SETIDENTIFIERS(int style, const char *identifiers)
Similar to SCI_SETKEYWORDS but for substyles.

@@ -6242,6 +6246,7 @@ To allow lexers to report which line ends they support, and to support substyles         virtual int SCI_METHOD SubStylesStart(int styleBase) = 0;
        virtual int SCI_METHOD SubStylesLength(int styleBase) = 0;
        virtual int SCI_METHOD StyleFromSubStyle(int subStyle) = 0;
+        virtual int SCI_METHOD PrimaryStyleFromStyle(int style) = 0;
        virtual void SCI_METHOD FreeSubStyles() = 0;
        virtual void SCI_METHOD SetIdentifiers(int style, const char *identifiers) = 0;
        virtual int SCI_METHOD DistanceToSecondaryStyles() = 0;
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 476241297..66c552611 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -449,9 +449,11 @@ Released 3 September 2013.
  • - Added SCI_GETSTYLEFROMSUBSTYLE function to find the base style of substyles. + Added functions to help convert between substyles and base styles and between secondary and primary styles. + SCI_GETSTYLEFROMSUBSTYLE finds the base style of substyles. Can be used to treat all substyles of a style equivalent to that style. - A StyleFromSubStyle method was added to ILexerWithSubStyles so each lexer can implement this. + SCI_GETPRIMARYSTYLEFROMSTYLE finds the primary style of secondary styles. + StyleFromSubStyle and PrimaryStyleFromStyle methods were added to ILexerWithSubStyles so each lexer can implement these.
  • On Qt, turn off idle events on destruction to prevent repeatedly calling idle. -- cgit v1.2.3