From 4e705edb0910461ebe675eb57d8fd08cc94495ec Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Sun, 15 Feb 2015 23:51:05 +1100
Subject: Add SC_INDICFLAG_VALUEFORE and INDIC_TEXTFORE to allow a wide range
 of indicator colours and to change the colour of text.

---
 doc/ScintillaDoc.html     | 22 +++++++++++++++++++++-
 doc/ScintillaHistory.html |  9 +++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 86db4be09..46039ed54 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -82,7 +82,7 @@
 
     <h1>Scintilla Documentation</h1>
 
-    <p>Last edited 10 February 2015 NH</p>
+    <p>Last edited 13 February 2015 NH</p>
 
     <p>There is <a class="jump" href="Design.html">an overview of the internal design of
     Scintilla</a>.<br />
@@ -3943,6 +3943,8 @@ struct Sci_TextToFind {
      <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 />
@@ -4141,6 +4143,14 @@ struct Sci_TextToFind {
 	  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>
     </table>
 
@@ -4189,6 +4199,16 @@ struct Sci_TextToFind {
      <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>.
+     </p>
+
     <p>
     <b id="SCI_SETINDICATORCURRENT">SCI_SETINDICATORCURRENT(int indicator)</b><br />
     <b id="SCI_GETINDICATORCURRENT">SCI_GETINDICATORCURRENT</b><br />
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index fd9617bd1..e4e91c219 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -489,6 +489,11 @@
 	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>
 	Minimum version of Qt supported is now 4.8 due to the use of QElapsedTimer::nsecsElapsed.
 	</li>
 	<li>
@@ -507,10 +512,10 @@
 	VHDL folder fixes hang in folding when document starts with "entity".
 	</li>
 	<li>
-	Add new indicators INDIC_COMPOSITIONTHIN and INDIC_FULLBOX.
+	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.
+	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).
-- 
cgit v1.2.3