aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2021-03-29 15:15:36 +1100
committerNeil <nyamatongwe@gmail.com>2021-03-29 15:15:36 +1100
commit381a23c9d1ed661109c5560641b61ac43eb2f1f4 (patch)
tree5ec02ddb2fb30e3e82b8f814558c52ec00b50d5f
parentb5ba1cee2188ab879573126c62d6291b346e089c (diff)
downloadscintilla-mirror-381a23c9d1ed661109c5560641b61ac43eb2f1f4.tar.gz
Clarify encoding of EOL annotation text.
-rw-r--r--doc/ScintillaDoc.html3
-rw-r--r--doc/ScintillaHistory.html3
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index db04e66c5..c23d89df7 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -119,7 +119,7 @@
<h1>Scintilla Documentation</h1>
- <p>Last edited 27 March 2021 NH</p>
+ <p>Last edited 29 March 2021 NH</p>
<p style="background:#90F0C0">Scintilla 5 has moved the lexers from Scintilla into a new
<a href="Lexilla.html">Lexilla</a> project.<br />
@@ -3807,6 +3807,7 @@ struct Sci_TextToFind {
<b id="SCI_EOLANNOTATIONGETSTYLE">SCI_EOLANNOTATIONGETSTYLE(line line) &rarr; int</b><br />
<b id="SCI_EOLANNOTATIONCLEARALL">SCI_EOLANNOTATIONCLEARALL</b><br />
A different string may be set for each line with <code>SCI_EOLANNOTATIONSETTEXT</code>.
+ The text argument is always in UTF-8, not the document encoding.
To clear end of line annotations call <code>SCI_EOLANNOTATIONSETTEXT</code> with a NULL pointer.
The whole of the text EOLANNOTATION on a line may be displayed in a particular style with
<code>SCI_EOLANNOTATIONSETSTYLE</code> or each character may be individually styled with
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 2a9a2d498..cf933b774 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -615,6 +615,9 @@
Support Unicode characters as margin markers with SC_MARK_CHARACTER.
</li>
<li>
+ EOL annotation text is now always treated as UTF-8 instead of in the document encoding.
+ </li>
+ <li>
Change graphics coordinates from float (32-bit) to double (64-bit).
Fixes uneven line heights in large documents on Cocoa.
Increases memory use.