From fdb8953cdffa47ff9f13f1cc173e1cb2df191019 Mon Sep 17 00:00:00 2001
From: A-R-C-A <unknown>
Date: Fri, 23 Sep 2016 18:07:56 +1000
Subject: EDGE_MULTILINE and SCI_MULTIEDGEADDLINE added to allow displaying
 multiple vertical edges simultaneously.

---
 doc/ScintillaDoc.html     | 22 ++++++++++++++++++++++
 doc/ScintillaHistory.html |  4 ++++
 2 files changed, 26 insertions(+)

(limited to 'doc')

diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 9175d6b80..681970d93 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -6177,6 +6177,9 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){
      <a class="message" href="#SCI_GETEDGECOLUMN">SCI_GETEDGECOLUMN</a><br />
      <a class="message" href="#SCI_SETEDGECOLOUR">SCI_SETEDGECOLOUR(int colour)</a><br />
      <a class="message" href="#SCI_GETEDGECOLOUR">SCI_GETEDGECOLOUR</a><br />
+     <br />
+     <a class="message" href="#SCI_MULTIEDGEADDLINE">SCI_MULTIEDGEADDLINE(int column, int colour)</a><br />
+     <a class="message" href="#SCI_MULTIEDGECLEARALL">SCI_MULTIEDGECLEARALL</a><br />
     </code>
 
     <p><b id="SCI_SETEDGEMODE">SCI_SETEDGEMODE(int edgeMode)</b><br />
@@ -6225,6 +6228,17 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){
           <td>The background colour of characters after the column limit is changed to the colour
           set by <code>SCI_SETEDGECOLOUR</code>. This is recommended for proportional fonts.</td>
         </tr>
+
+        <tr>
+          <td align="left"><code>EDGE_MULTILINE</code></td>
+
+          <td align="center">3</td>
+
+          <td>This is similar to <code>EDGE_LINE</code> but in contrary to showing only one single
+          line a configurable set of vertical lines can be shown simultaneously. This <code>edgeMode
+          </code> uses a completely independent dataset that can only be configured by using the
+          <code>SCI_MULTIEDGE*</code> messages.</td>
+        </tr>
       </tbody>
     </table>
 
@@ -6241,6 +6255,14 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){
      These messages set and get the colour of the marker used to show that a line has exceeded the
     length set by <code>SCI_SETEDGECOLUMN</code>.</p>
 
+    <p><b id="SCI_MULTIEDGEADDLINE">SCI_MULTIEDGEADDLINE(int column, int <a class="jump"
+    href="#colour">colour</a>)</b><br />
+     <b id="SCI_MULTIEDGECLEARALL">SCI_MULTIEDGECLEARALL</b><br />
+     <code>SCI_MULTIEDGEADDLINE</code> adds a new vertical edge to the view. The edge will be
+    displayed at the given column number. The resulting edge position depends on the metric
+    of a space character in <code>STYLE_DEFAULT</code>. All the edges can be cleared with
+    <code>SCI_MULTIEDGECLEARALL</code>.</p>
+
     <h2 id="Lexer">Lexer</h2>
 
     <p>If you define the symbol <code>SCI_LEXER</code> when building Scintilla, (this is sometimes
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 072de2c70..404ffa16d 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -500,6 +500,7 @@
 	<td>Alexey Denisov</td>
 	<td>jedailey</td>
 	<td>oirfeodent</td>
+	<td>A-R-C-A</td>
     </tr>
     </table>
     <p>
@@ -526,6 +527,9 @@
 	These changes do not affect the standard C/C++ binding.
 	</li>
 	<li>
+	EDGE_MULTILINE and SCI_MULTIEDGEADDLINE added to allow displaying multiple
+	vertical edges simultaneously.
+	<li>
 	The WordList class in lexlib used by lexers adds an InListAbridged method for
 	matching keywords that have particular prefixes and/or suffixes.
 	</li>
-- 
cgit v1.2.3