runtime(context): update ConTeXt keywords and other minor fixes (#13778)

lifepillar · web-flow · commit 0bca4a00188c · 2023-12-27T18:49:50.000+01:00
Update to the ConTeXt runtime files. Changes:

1. shared syntax files updated with `mtxrun --script interface --vim`
   using the latest ConTeXt LMTX.

2. fixed reference to `make` tag in the help file.

3. added `keepend` to mitigate issues with embedded Lua syntax (see
   below).

4. the latest revision date of each ConTeXt runtime file has been
   updated to the date of this commit.

The issue about embedded Lua was reported by a user:

&gt;Take the following valid ConTeXt file:

&gt;   \starttext
&gt;   \ctxlua{context("Text generated from Lua.")}
&gt;   \ctxlua{context("Another text generated from Lua.")}
&gt;   \stoptext

&gt;On my Vim installation (including when I start Vim with `--clean`), the
&gt;closing bracket and curly braces on line 2 are highlighted red and the
&gt;syntax highlighting after that is off.

&gt;I was trying to dig a little bit into what was going on, using the
&gt;`synID()` and `synIDattr()` functions. It appears that the closing
&gt;bracket on line 2 is matched as a `luaParentError` instead of the end
&gt;of the `luaParen` region. Therefore, the `luaParen` region continues
&gt;all the way to the end of the file. The closing curly brace on line
&gt;2 is matched as a `luaError`, the 2nd `\ctxlua` on line 3 as
&gt;`luaParen`, etc.

&gt;This issue doesn't occur in a plain Lua file, where the closing bracket
&gt;is correctly matched as the end of the `luaParen` region. So it seems
&gt;that something goes wrong when the Lua syntax file is included in the
&gt;ConTeXt one.

By adding `keepend`, the right parenthesis for some reason is still
highlighted as a `luaParenError`, but at least the right curly brace
should correctly end the Lua block.

From what I've seen, I think it is very difficult to embed Lua syntax
properly without help from the Lua syntax file (that is, without
patching it). It has global rules such as:

   syn match  luaParenError ")"
   syn match  luaError "}"

which make it difficult, if not impossible, to contain Lua syntax
without `keepend` (and its limitations).


Signed-off-by: Lifepillar &lt;lifepillar@lifepillar.me&gt;
Signed-off-by: Christian Brabandt &lt;cb@256bit.org&gt;
diff --git a/runtime/autoload/context.vim b/runtime/autoload/context.vim
@@ -3,7 +3,7 @@ vim9script
 # Language:           ConTeXt typesetting engine
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Former Maintainers: Nikolai Weibull <now@bitwi.se>
-# Latest Revision:    2022 Sep 19
+# Latest Revision:    2023 Dec 26
 
 # Typesetting {{{
 import autoload './typeset.vim'
diff --git a/runtime/compiler/context.vim b/runtime/compiler/context.vim
@@ -3,7 +3,7 @@ vim9script
 # Language:           ConTeXt typesetting engine
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Former Maintainers: Nikolai Weibull <now@bitwi.se>
-# Latest Revision:    2022 Aug 12
+# Latest Revision:    2023 Dec 26
 
 if exists("g:current_compiler")
   finish
diff --git a/runtime/doc/ft_context.txt b/runtime/doc/ft_context.txt
@@ -1,4 +1,4 @@
-*ft_context.txt*	For Vim version 9.0.  Last change: 2022 Sep 27
+*ft_context.txt*	For Vim version 9.0.  Last change: 2023 Dec 26
 
 This is the documentation for the ConTeXt filetype plugin.
 
@@ -103,13 +103,13 @@ Stop all the ConTeXt jobs currently running in the background.
 Settings ~
 					*'b:context_ignore_makefile'*
 					*'g:context_ignore_makefile'*
-`:make` can be used to (synchronously) typeset a document. If a Makefile exists
+|make| can be used to (synchronously) typeset a document. If a Makefile exists
 and this option is not set, standard `make` is used. If this option is set,
 `mtxrun` is invoked instead, even if a Makefile exists.
 >
 	g:context_ignore_makefile = 0
 <
-NOTE: before using `:make`, set the working directory of the buffer to the
+NOTE: before using |make|, set the working directory of the buffer to the
 directory of the file to be typeset.
 
 					*'g:context_extra_options'*
diff --git a/runtime/ftplugin/context.vim b/runtime/ftplugin/context.vim
@@ -4,7 +4,7 @@ vim9script
 # Language:           ConTeXt typesetting engine
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Former Maintainers: Nikolai Weibull <now@bitwi.se>
-# Latest Revision:    2022 Aug 12
+# Latest Revision:    2023 Dec 26
 
 if exists("b:did_ftplugin")
   finish
diff --git a/runtime/indent/context.vim b/runtime/indent/context.vim
@@ -3,7 +3,7 @@ vim9script
 # Language:           ConTeXt typesetting engine
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Former Maintainers: Nikolai Weibull <now@bitwi.se>
-# Latest Revision:    2022 Aug 12
+# Latest Revision:    2023 Dec 26
 
 if exists("b:did_indent")
   finish
diff --git a/runtime/syntax/context.vim b/runtime/syntax/context.vim
@@ -4,7 +4,7 @@ vim9script
 # Language:           ConTeXt typesetting engine
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Former Maintainers: Nikolai Weibull <now@bitwi.se>
-# Latest Revision:    2022 Aug 12
+# Latest Revision:    2023 Dec 26
 
 if exists("b:current_syntax")
   finish
@@ -90,7 +90,7 @@ syn match   contextDirectLua  "\\\%(directlua\|ctxlua\)\>\%(\s*%.*$\)\="
       \ nextgroup=contextBeginEndLua skipwhite skipempty
       \ contains=contextComment
 syn region  contextBeginEndLua matchgroup=contextSpecial
-      \ start="{" end="}" skip="\\[{}]"
+      \ start="{" end="}" skip="\\[{}]" keepend
       \ contained contains=@luaTop,@NoSpell
 
 for synname in keys(context_include)
diff --git a/runtime/syntax/shared/context-data-context.vim b/runtime/syntax/shared/context-data-context.vim
diff --git a/runtime/syntax/shared/context-data-interfaces.vim b/runtime/syntax/shared/context-data-interfaces.vim
diff --git a/runtime/syntax/shared/context-data-metafun.vim b/runtime/syntax/shared/context-data-metafun.vim
@@ -2,7 +2,7 @@ vim9script
 
 # Vim syntax file
 # Language: ConTeXt
-# Automatically generated by mtx-interface (2022-08-12 10:49)
+# Automatically generated by mtx-interface (2023-12-26 16:40)
 
 syn keyword metafunCommands loadfile loadimage loadmodule dispose nothing
 syn keyword metafunCommands transparency tolist topath tocycle sqr
@@ -97,7 +97,7 @@ syn keyword metafunCommands mpvard mpvarn mpvars mpvar withtolerance
 syn keyword metafunCommands hatched withdashes processpath pencilled sortedintersectiontimes
 syn keyword metafunCommands intersectionpath firstintersectionpath secondintersectionpath intersectionsfound cutbeforefirst
 syn keyword metafunCommands cutafterfirst cutbeforelast cutafterlast xnormalized ynormalized
-syn keyword metafunCommands xynormalized phantom scrutinized
+syn keyword metafunCommands xynormalized phantom scrutinized xshifted yshifted
 syn keyword metafunInternals nocolormodel greycolormodel graycolormodel rgbcolormodel cmykcolormodel
 syn keyword metafunInternals shadefactor shadeoffset textextoffset textextanchor normaltransparent
 syn keyword metafunInternals multiplytransparent screentransparent overlaytransparent softlighttransparent hardlighttransparent
@@ -114,4 +114,4 @@ syn keyword metafunInternals getrecord cntrecord anchorxy anchorx anchory
 syn keyword metafunInternals anchorht anchordp anchorul anchorll anchorlr
 syn keyword metafunInternals anchorur localanchorbox localanchorcell localanchorspan anchorbox
 syn keyword metafunInternals anchorcell anchorspan matrixbox matrixcell matrixspan
-syn keyword metafunInternals pensilcolor pensilstep
+syn keyword metafunInternals pensilcolor pensilstep uu
diff --git a/runtime/syntax/shared/context-data-tex.vim b/runtime/syntax/shared/context-data-tex.vim
