From 38e4d3cbc591f06a6663d6c0962bc17ea73d61ad Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Fri, 13 Dec 2019 22:28:13 +1100
Subject: Lexilla implemented as loadable lexer.

---
 doc/ScintillaDoc.html     | 24 +++++++++++++++++++++++-
 doc/ScintillaHistory.html |  3 +++
 2 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index cb237264a..3a25677c7 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -119,7 +119,7 @@
 
     <h1>Scintilla Documentation</h1>
 
-    <p>Last edited 15 November 2019 NH</p>
+    <p>Last edited 21 December 2019 NH</p>
 
     <p>There is <a class="jump" href="Design.html">an overview of the internal design of
     Scintilla</a>.<br />
@@ -266,6 +266,28 @@
       </tbody>
     </table>
 
+    <h2 class="provisional">Lexilla</h2>
+
+    <p>For Scintilla 5.0, lexers will be split off into a separate Lexilla library.
+    Scintilla will be responsible for the GUI and calling lexers and Lexilla will provide the lexers.
+    To allow work towards this with Scintilla 4.x, the first stage is to allow building Lexilla but
+    also include the lexers in Scintilla.</p>
+
+    <p>Lexilla is built as both a shared library and static library and applications may choose to
+    link to one or the other.</p>
+
+    <p>To build Lexilla, in the lexilla/src directory, run make (for gcc or clang)<br />
+    <code>make</code><br />
+    or nmake for MSVC<br />
+    <code>nmake -f lexilla.mak</code><br />
+    </p>
+
+    <p>Lexilla follows the <a class="seealso" href="#SCI_LOADLEXERLIBRARY">external lexer protocol</a>
+    so can be loaded by applications that support this.
+    As the protocol only supports object lexers, an additional function <code>CreateLexer(const char *name)</code>
+    is exposed which will create a lexer object (ILexer4 *) for any object lexer or function lexer.
+    </p>
+
     <h2 id="MessageCategories">Contents</h2>
 
     <table class="categories" summary="Message categories">
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 3354bcb3d..ddad79d68 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -567,6 +567,9 @@
 	Released 11 December 2019.
 	</li>
 	<li>
+	Lexers made available as Lexilla library.
+	</li>
+	<li>
 	SCI_LOADLEXERLIBRARY implemented on Cocoa.
 	</li>
 	<li>
-- 
cgit v1.2.3