1 files changed, 31 insertions, 54 deletions
diff --git a/lua/lexers/latex.lua b/lua/lexers/latex.lua
index 3e276e1..a0b8995 100644
--- a/lua/lexers/latex.lua
+++ b/lua/lexers/latex.lua
@@ -1,73 +1,50 @@
--- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE.
+-- Copyright 2006-2022 Mitchell. See LICENSE.
 -- Latex LPeg lexer.
 -- Modified by Brian Schott.
 -- Modified by Robert Gieseke.
 
-local l = require('lexer')
-local token, word_match = l.token, l.word_match
-local P, R, S = lpeg.P, lpeg.R, lpeg.S
+local lexer = require('lexer')
+local token, word_match = lexer.token, lexer.word_match
+local P, S = lpeg.P, lpeg.S
 
-local M = {_NAME = 'latex'}
+local lex = lexer.new('latex')
 
 -- Whitespace.
-local ws = token(l.WHITESPACE, l.space^1)
+lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
 
 -- Comments.
-local line_comment = '%' * l.nonnewline^0
-local block_comment = '\\begin' * P(' ')^0 * '{comment}' *
-                      (l.any - '\\end' * P(' ')^0 * '{comment}')^0 *
-                      P('\\end' * P(' ')^0 * '{comment}')^-1
--- Note: need block_comment before line_comment or LPeg cannot compile rule.
-local comment = token(l.COMMENT, block_comment + line_comment)
-
--- Sections.
-local section = token('section', '\\' * word_match{
-  'part', 'chapter', 'section', 'subsection', 'subsubsection', 'paragraph',
-  'subparagraph'
-} * P('*')^-1)
+local line_comment = lexer.to_eol('%')
+local block_comment = lexer.range('\\begin' * P(' ')^0 * '{comment}',
+  '\\end' * P(' ')^0 * '{comment}')
+lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment))
 
 -- Math environments.
-local math_word = word_match{
-  'align', 'displaymath', 'eqnarray', 'equation', 'gather', 'math', 'multline'
-}
-local math_begin_end = (P('begin') + P('end')) * P(' ')^0 *
-                       '{' * math_word * P('*')^-1 * '}'
-local math = token('math', '$' + '\\' * (S('[]()') + math_begin_end))
+local math_word = word_match('align displaymath eqnarray equation gather math multline')
+local math_begin_end = (P('begin') + P('end')) * P(' ')^0 * '{' * math_word * P('*')^-1 * '}'
+lex:add_rule('math', token('math', '$' + '\\' * (S('[]()') + math_begin_end)))
+lex:add_style('math', lexer.styles['function'])
 
 -- LaTeX environments.
-local environment = token('environment', '\\' * (P('begin') + P('end')) *
-                                         P(' ')^0 *
-                                         '{' * l.word * P('*')^-1 * '}')
+lex:add_rule('environment', token('environment', '\\' * (P('begin') + 'end') * P(' ')^0 * '{' *
+  lexer.word * P('*')^-1 * '}'))
+lex:add_style('environment', lexer.styles.keyword)
+
+-- Sections.
+lex:add_rule('section', token('section', '\\' *
+  word_match('part chapter section subsection subsubsection paragraph subparagraph') * P('*')^-1))
+lex:add_style('section', lexer.styles.class)
 
 -- Commands.
-local command = token(l.KEYWORD, '\\' * (l.alpha^1 + S('#$&~_^%{}')))
+lex:add_rule('command', token('command', '\\' * (lexer.alpha^1 + S('#$&~_^%{}\\'))))
+lex:add_style('command', lexer.styles.keyword)
 
 -- Operators.
-local operator = token(l.OPERATOR, S('&#{}[]'))
-
-M._rules = {
-  {'whitespace', ws},
-  {'comment', comment},
-  {'math', math},
-  {'environment', environment},
-  {'section', section},
-  {'keyword', command},
-  {'operator', operator},
-}
-
-M._tokenstyles = {
-  environment = l.STYLE_KEYWORD,
-  math = l.STYLE_FUNCTION,
-  section = l.STYLE_CLASS
-}
+lex:add_rule('operator', token(lexer.OPERATOR, S('&#{}[]')))
 
-M._foldsymbols = {
-  _patterns = {'\\[a-z]+', '[{}]', '%%'},
-  [l.COMMENT] = {
-    ['\\begin'] = 1, ['\\end'] = -1, ['%'] = l.fold_line_comments('%')
-  },
-  ['environment'] = {['\\begin'] = 1, ['\\end'] = -1},
-  [l.OPERATOR] = {['{'] = 1, ['}'] = -1}
-}
+-- Fold points.
+lex:add_fold_point(lexer.COMMENT, '\\begin', '\\end')
+lex:add_fold_point(lexer.COMMENT, lexer.fold_consecutive_lines('%'))
+lex:add_fold_point('environment', '\\begin', '\\end')
+lex:add_fold_point(lexer.OPERATOR, '{', '}')
 
-return M
+return lex