lua/lexers: update to scintillua 6.5

This is an amalgamation of the following upstream commits:

- Overhauled API documentation for lexer.lua.
- Fixed Markdown to allow code fence blocks to be indented.
- Use GitHub Pages' Primer theme for documentation.
  Build static pages with Jekyll, like GitHub Pages does.
- Migrated systemd lexer.
  Thanks to Matěj Cepl.
- Migrated Lisp lexer and highlight character escapes.
  Thanks to Matěj Cepl.
- Migrated rpmspec lexer and made some improvements.
  Thanks to Matěj Cepl.
- Modernized reST lexer.
  Thanks to Matěj Cepl.
- Markdown lexer should just tag the start of a blockquote.
  The quote's contents may contain markdown.
- Output lexer can highlight CSI color sequences.
- Allow lexers to define their own fold functions.
- Added custom folder for Markdown headers.
- Added `lexer.line_start`, `lexer.line_end` and `lexer.text_range()`.
- Fixed Markdown lexer to not lex some continuation lines as code.
- Fixed SciTE not using Scintillua's markdown lexer.
- Markdown lexer should not highlight secondary paragraphs in list items as code blocks.
- Have SciTE recognize CMakeLists.txt.

1 files changed, 32 insertions, 29 deletions

diff --git a/lua/lexers/lisp.lua b/lua/lexers/lisp.lua
index fa4c034..d628ef5 100644
--- a/lua/lexers/lisp.lua
+++ b/lua/lexers/lisp.lua
@@ -1,52 +1,35 @@
 -- Copyright 2006-2025 Mitchell. See LICENSE.
 -- Lisp LPeg lexer.
 
-local lexer = require('lexer')
-local token, word_match = lexer.token, lexer.word_match
+local lexer = lexer
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('lisp')
-
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+local lex = lexer.new(...)
 
 -- Keywords.
-lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
-	'defclass', 'defconstant', 'defgeneric', 'define-compiler-macro', 'define-condition',
-	'define-method-combination', 'define-modify-macro', 'define-setf-expander', 'define-symbol-macro',
-	'defmacro', 'defmethod', 'defpackage', 'defparameter', 'defsetf', 'defstruct', 'deftype', 'defun',
-	'defvar', --
-	'abort', 'assert', 'block', 'break', 'case', 'catch', 'ccase', 'cerror', 'cond', 'ctypecase',
-	'declaim', 'declare', 'do', 'do*', 'do-all-symbols', 'do-external-symbols', 'do-symbols',
-	'dolist', 'dotimes', 'ecase', 'error', 'etypecase', 'eval-when', 'flet', 'handler-bind',
-	'handler-case', 'if', 'ignore-errors', 'in-package', 'labels', 'lambda', 'let', 'let*', 'locally',
-	'loop', 'macrolet', 'multiple-value-bind', 'proclaim', 'prog', 'prog*', 'prog1', 'prog2', 'progn',
-	'progv', 'provide', 'require', 'restart-bind', 'restart-case', 'restart-name', 'return',
-	'return-from', 'signal', 'symbol-macrolet', 'tagbody', 'the', 'throw', 'typecase', 'unless',
-	'unwind-protect', 'when', 'with-accessors', 'with-compilation-unit', 'with-condition-restarts',
-	'with-hash-table-iterator', 'with-input-from-string', 'with-open-file', 'with-open-stream',
-	'with-output-to-string', 'with-package-iterator', 'with-simple-restart', 'with-slots',
-	'with-standard-io-syntax', --
-	't', 'nil'
-}))
+lex:add_rule('keyword', lex:tag(lexer.KEYWORD, lex:word_match(lexer.KEYWORD)))
 
 -- Identifiers.
 local word = lexer.alpha * (lexer.alnum + S('_-'))^0
-lex:add_rule('identifier', token(lexer.IDENTIFIER, word))
+lex:add_rule('identifier', lex:tag(lexer.IDENTIFIER, word))
 
 -- Strings.
-lex:add_rule('string', token(lexer.STRING, "'" * word + lexer.range('"') + '#\\' * lexer.any))
+local character = lexer.word_match{
+	'backspace', 'linefeed', 'newline', 'page', 'return', 'rubout', 'space', 'tab'
+} + 'x' * lexer.xdigit^1 + lexer.any
+lex:add_rule('string', lex:tag(lexer.STRING, "'" * word + lexer.range('"') + '#\\' * character))
 
 -- Comments.
 local line_comment = lexer.to_eol(';')
 local block_comment = lexer.range('#|', '|#')
-lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment))
+lex:add_rule('comment', lex:tag(lexer.COMMENT, line_comment + block_comment))
 
 -- Numbers.
-lex:add_rule('number', token(lexer.NUMBER, P('-')^-1 * lexer.digit^1 * (S('./') * lexer.digit^1)^-1))
+lex:add_rule('number',
+	lex:tag(lexer.NUMBER, P('-')^-1 * lexer.digit^1 * (S('./') * lexer.digit^1)^-1))
 
 -- Operators.
-lex:add_rule('operator', token(lexer.OPERATOR, S('<>=*/+-`@%()')))
+lex:add_rule('operator', lex:tag(lexer.OPERATOR, S('<>=*/+-`@%()')))
 
 -- Fold points.
 lex:add_fold_point(lexer.OPERATOR, '(', ')')
@@ -54,6 +37,26 @@ lex:add_fold_point(lexer.OPERATOR, '[', ']')
 lex:add_fold_point(lexer.OPERATOR, '{', '}')
 lex:add_fold_point(lexer.COMMENT, '#|', '|#')
 
+-- Word lists
+lex:set_word_list(lexer.KEYWORD, {
+	'defclass', 'defconstant', 'defgeneric', 'define-compiler-macro', 'define-condition',
+	'define-method-combination', 'define-modify-macro', 'define-setf-expander', 'define-symbol-macro',
+	'defmacro', 'defmethod', 'defpackage', 'defparameter', 'defsetf', 'defstruct', 'deftype', 'defun',
+	'defvar', --
+	'abort', 'assert', 'block', 'break', 'case', 'catch', 'ccase', 'cerror', 'cond', 'ctypecase',
+	'declaim', 'declare', 'do', 'do*', 'do-all-symbols', 'do-external-symbols', 'do-symbols',
+	'dolist', 'dotimes', 'ecase', 'error', 'etypecase', 'eval-when', 'flet', 'handler-bind',
+	'handler-case', 'if', 'ignore-errors', 'in-package', 'labels', 'lambda', 'let', 'let*', 'locally',
+	'loop', 'macrolet', 'multiple-value-bind', 'proclaim', 'prog', 'prog*', 'prog1', 'prog2', 'progn',
+	'progv', 'provide', 'require', 'restart-bind', 'restart-case', 'restart-name', 'return',
+	'return-from', 'signal', 'symbol-macrolet', 'tagbody', 'the', 'throw', 'typecase', 'unless',
+	'unwind-protect', 'when', 'with-accessors', 'with-compilation-unit', 'with-condition-restarts',
+	'with-hash-table-iterator', 'with-input-from-string', 'with-open-file', 'with-open-stream',
+	'with-output-to-string', 'with-package-iterator', 'with-simple-restart', 'with-slots',
+	'with-standard-io-syntax', --
+	't', 'nil'
+})
+
 lexer.property['scintillua.comment'] = ';'
 
 return lex