texlive[59356] Master/texmf-dist: context-vim (26may21)

commits+karl at tug.org commits+karl at tug.org
Wed May 26 21:43:26 CEST 2021


Revision: 59356
          http://tug.org/svn/texlive?view=revision&revision=59356
Author:   karl
Date:     2021-05-26 21:43:26 +0200 (Wed, 26 May 2021)
Log Message:
-----------
context-vim (26may21)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/context/third/vim/VERSION
    trunk/Master/texmf-dist/doc/context/third/vim/vim.txt
    trunk/Master/texmf-dist/tex/context/third/vim/t-syntax-groups.mkiv
    trunk/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkiv
    trunk/Master/texmf-dist/tex/context/third/vim/t-vim.tex

Added Paths:
-----------
    trunk/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkxl

Modified: trunk/Master/texmf-dist/doc/context/third/vim/VERSION
===================================================================
--- trunk/Master/texmf-dist/doc/context/third/vim/VERSION	2021-05-26 19:42:53 UTC (rev 59355)
+++ trunk/Master/texmf-dist/doc/context/third/vim/VERSION	2021-05-26 19:43:26 UTC (rev 59356)
@@ -1 +1 @@
-2021.03.01
+2021.05.24

Modified: trunk/Master/texmf-dist/doc/context/third/vim/vim.txt
===================================================================
--- trunk/Master/texmf-dist/doc/context/third/vim/vim.txt	2021-05-26 19:42:53 UTC (rev 59355)
+++ trunk/Master/texmf-dist/doc/context/third/vim/vim.txt	2021-05-26 19:43:26 UTC (rev 59356)
@@ -441,6 +441,7 @@
          ...]
 
 The default value of `option` is `packed`.  
+[**Note:** This option is not yet working in LMTX.]
 
 Note that with both these alternatives do not hyphenate a word, merely break
 lines at spaces or at the boundary of compound words. If you really need to
@@ -455,6 +456,7 @@
 
 Note that you have to add **both** `option=hyphenated` and `align=hyphenated`.
 The default value of align is `nothypenated`. 
+[**Note:** This option is not yet working in LMTX.]
 
 Highlighting lines
 ------------------

Modified: trunk/Master/texmf-dist/tex/context/third/vim/t-syntax-groups.mkiv
===================================================================
--- trunk/Master/texmf-dist/tex/context/third/vim/t-syntax-groups.mkiv	2021-05-26 19:42:53 UTC (rev 59355)
+++ trunk/Master/texmf-dist/tex/context/third/vim/t-syntax-groups.mkiv	2021-05-26 19:43:26 UTC (rev 59356)
@@ -1,6 +1,6 @@
 %D \module
 %D   [     file=t-syntax-groups,
-%D      version=2021.03.01,
+%D      version=2021.05.23,
 %D        title=\CONTEXT\ User Module,
 %D     subtitle=Syntax highlighting support,
 %D       author=Aditya Mahajan,
@@ -9,7 +9,7 @@
 %D        email=adityam <at> ieee <dot> org,
 %D      license=Simplified BSD License]
 
-\writestatus{loading}{Syntax highlighting groups (ver: 2021.03.01)}
+\writestatus{loading}{Syntax highlighting groups (ver: 2021.05.23)}
 
 \startmodule [syntax-group]
 \usemodule   [module-catcodes]

Modified: trunk/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkiv
===================================================================
--- trunk/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkiv	2021-05-26 19:42:53 UTC (rev 59355)
+++ trunk/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkiv	2021-05-26 19:43:26 UTC (rev 59356)
@@ -91,6 +91,7 @@
       {\dorecurse{##1}{\obeyedspace}}%
 
   \forgetall
+  \the\everyinitializeverbatim
   \usealignparameter\externalfilterparameter
   \doifinset{\v!packed}{\externalfilterparameter\c!option}
       {\setupwhitespace[\v!none,\v!flexible]}%
@@ -97,12 +98,12 @@
 
   \doadaptleftskip{\externalfilterparameter\c!margin}%
 
-  \setbreakpoints[compound]% Only works is `option=hyphenated` is set.
-  \doifnotinset{\v!hyphenated}{\externalfilterparameter\c!option}
+  \doifinsetelse{\v!hyphenated}{\externalfilterparameter\c!option}
+      {\setbreakpoints[compound]}
       {\language\minusone
        \resetbreakpoints}%
 
-  \def\obeyedline{\strut\par}
+  \def\obeyedline{\strut\par}%
   \activatespacehandler{\????syntaxhighlighting\externalfilterparameter\c!space:\externalfilterparameter\c!lines}
   \setcatcodetable\externalfilter at minimal_catcodes%
   \letcharcode\endoflineasciicode\obeyedline

Added: trunk/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkxl
===================================================================
--- trunk/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkxl	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkxl	2021-05-26 19:43:26 UTC (rev 59356)
@@ -0,0 +1,263 @@
+%D \module
+%D   [     file=t-syntax-highlight,
+%D      version=2021.05.24,
+%D        title=\CONTEXT\ User Module,
+%D     subtitle=Code syntax highlighting,
+%D       author=Aditya Mahajan,
+%D         date=\currentdate,
+%D    copyright=Aditya Mahajan,
+%D        email=adityam <at> ieee <dot> org,
+%D      license=Simplified BSD License]
+
+\writestatus{loading}{Code syntax highlighting (ver: 2021.05.24)}
+
+\startmodule    [syntax-highlight]
+\usemodule      [syntax-groups]
+\usemodule      [filter] % loads module-catcodes
+
+\unprotect
+
+\startinterface all
+  \setinterfaceconstant {syntax}          {syntax}
+  \setinterfaceconstant {highlight}       {highlight}
+  \setinterfaceconstant {highlightcolor}  {highlightcolor}
+\stopinterface
+
+%D Name space
+
+\definenamespace
+    [syntaxhighlighting]
+    [\c!type=module,
+     \c!name=syntaxhighlighting,
+     \c!command=\v!yes,
+     setup=\v!list,
+     \c!style=\v!no,
+     \s!parent=syntaxhighlighting]
+
+\appendtoks
+    \defineexternalfilter[\currentsyntaxhighlighting]
+                         [\s!parent=\????syntaxhighlighting\currentexternalfilter,
+                          \c!taglabel=\vimtyping at id,
+                          \c!tagdetail={\externalfilterparameter\c!alternative},
+                        ]%
+    \normalexpanded{\definelinenumbering [\currentsyntaxhighlighting]}%
+    \setevalue{type\currentsyntaxhighlighting file}{\getvalue{process\currentsyntaxhighlighting file}}%
+\to\everydefinesyntaxhighlighting
+
+\define[1]\syntaxhighlighting at set_linenumbers
+    {\def\syntaxhighlighting at linenumbering{\getvalue{current#1}}%
+     \def\syntaxhighlighting at parameter{\getvalue{#1parameter}}%
+     \normalexpanded{\setuplinenumbering[\syntaxhighlighting at linenumbering]
+          [
+                \c!method=\syntaxhighlighting at parameter{\c!number\c!method},
+            \c!conversion=\syntaxhighlighting at parameter\c!numberconversion,
+              \c!location=\syntaxhighlighting at parameter{\c!number\c!location},
+                 \c!style=\syntaxhighlighting at parameter\c!numberstyle,
+                 \c!color=\syntaxhighlighting at parameter\c!numbercolor,
+                 \c!width=\syntaxhighlighting at parameter{\c!number\c!width},
+                  \c!left=\syntaxhighlighting at parameter{\c!number\c!left},
+                 \c!right=\syntaxhighlighting at parameter{\c!number\c!right},
+               \c!command=\syntaxhighlighting at parameter\c!numbercommand,
+              \c!distance=\syntaxhighlighting at parameter{\c!number\c!distance},
+                 \c!align=\syntaxhighlighting at parameter{\c!number\c!align},
+           ]}}
+
+\appendtoks
+  \syntaxhighlighting at set_linenumbers\syntaxhighlighting at id
+\to\everysetupsyntaxhighlighting
+
+\def\syntaxhighlighting at id {syntaxhighlighting}
+
+%D Helper macro
+
+\def\syntaxhighlighting at yes{\v!yes,\v!on}
+
+\startsetups syntaxhighlighting at setup
+
+  \edef\currentsyntaxhighlighting{\currentexternalfilter}
+  \edef\colorscheme at name{\externalfilterparameter\c!alternative}
+
+  \let\SYN\syntaxgroup
+  \edef\HGL{\externalfilterparameter{\c!highlight\c!command}}
+  \let\\\textbackslash
+  \let\{\textbraceleft
+  \let\}\textbraceright
+  \let\SYNBOL\donothing
+  \let\SYNEOL\donothing
+
+  \setupbar[syntaxhighlightline][color=\externalfilterparameter\c!highlightcolor]
+
+  \def\tab##1%
+      {\dorecurse{##1}{\obeyedspace}}%
+
+  \forgetall
+  \the\everyinitializeverbatim
+  \usealignparameter\externalfilterparameter
+  \doifinset{\v!packed}{\externalfilterparameter\c!option}
+      {\setupwhitespace[\v!none,\v!flexible]}%
+
+  \doadaptleftskip{\externalfilterparameter\c!margin}%
+
+  % FIXME: after looking at hyphenation settings
+  %\doifinsetelse{\v!hyphenated}{\externalfilterparameter\c!option}
+  %    {\setbreakpoints[compound]}
+  %    {\language\minusone
+  %     \resetbreakpoints}%
+
+  \def\obeyedline{\strut\par}%
+  \activatespacehandler{\????syntaxhighlighting\externalfilterparameter\c!space:\externalfilterparameter\c!lines}
+  \setcatcodetable\externalfilter at minimal_catcodes%
+  \letcharcode\endoflineasciicode\obeyedline
+  \letcharcode\spaceasciicode\obeyedspace
+  \raggedright
+\stopsetups
+
+\starttexdefinition syntaxhighlighting at read_command #1
+    \syntaxhighlighting at linenumbering_start
+    \ReadFile{#1}
+    \syntaxhighlighting at linenumbering_stop
+\stoptexdefinition
+
+\starttexdefinition syntaxhighlighting at linenumbering_start
+   \doifinsetelse{\externalfilterparameter\c!numbering}\syntaxhighlighting at yes
+       {\let\SYNBOL=\syntaxhighlighting_begin_number_lines
+        \let\SYNEOL=\syntaxhighlighting_end_number_lines
+        \startlinenumbering
+          [\currentsyntaxhighlighting]
+          [
+              \c!method=\v!type,
+               \c!start=\externalfilterparameter{\c!number\c!start},
+                \c!step=\externalfilterparameter{\c!number\c!step},
+            \c!continue=\externalfilterparameter{\c!number\c!continue},
+          ]}
+        {\let\SYNBOL=\syntaxhighlighting_begin_lines
+         \let\SYNEOL=\syntaxhighlighting_end_lines}
+\stoptexdefinition
+
+\starttexdefinition syntaxhighlighting at linenumbering_stop
+   \doifinset{\externalfilterparameter\c!numbering}\syntaxhighlighting at yes
+      {\stoplinenumbering}
+\stoptexdefinition
+
+\newcount\nofsyntaxhighlightinglines
+
+\starttexdefinition syntaxhighlighting_begin_lines
+  \dostarttaggednodetail\t!verbatimline
+\stoptexdefinition
+
+\starttexdefinition syntaxhighlighting_end_lines
+  \dostoptagged
+\stoptexdefinition
+
+\starttexdefinition syntaxhighlighting_begin_number_lines
+  \global\advance\nofsyntaxhighlightinglines\plusone
+  \dostarttaggednodetail\t!verbatimline
+  \attribute\verbatimlineattribute\nofsyntaxhighlightinglines
+\stoptexdefinition
+
+\starttexdefinition syntaxhighlighting_end_number_lines
+  \attribute\verbatimlineattribute\attributeunsetvalue
+  \dostoptagged
+\stoptexdefinition
+
+
+\setupsyntaxhighlighting
+  [\c!tab=4,
+   \c!space=\v!off,
+   \c!lines=\v!fixed,
+   \c!margin=\zeropoint,
+   \c!start=1,
+   \c!stop=0,
+   % \c!syntax=context,
+   \c!alternative=pscolor,
+   \c!before=,
+   \c!after=,
+   \c!spacebefore=\v!none,
+   \c!spaceafter=\v!none,
+   \c!location=\v!paragraph,
+   \c!style=\tttf,
+   \c!color=,
+   \c!align={\v!flushleft,\v!nothyphenated}, 
+   \c!filtercommand=echo, % placeholder
+   \c!continue=yes,
+   \c!read=\v!yes,
+   \c!readcommand=\syntaxhighlighting at read_command,
+   \c!output=\externalfilterinputfile, % placeholder
+   \c!setups=syntaxhighlighting at setup,
+   \c!option=\v!packed, % \v!hyphenated
+   \s!parent=\????externalfilter,
+   % Numbering options
+   \c!numbering=\v!no,
+   \c!number\c!start=1,
+   \c!number\c!step=1,
+   \c!number\c!continue=\v!no,
+   \c!numberconversion=\v!numbers,
+   \c!number\c!method=\v!type, 
+   \c!number\c!location=\v!left,
+   \c!numberstyle=\ttx,
+   \c!numbercolor=,
+   \c!number\c!width=2em,
+   \c!number\c!left=,
+   \c!number\c!right=,
+   \c!numbercommand=,
+   \c!number\c!distance=0.5em,
+   \c!number\c!align=\v!flushright,
+   %Highlight options
+   \c!highlight=,
+   \c!highlightcolor=lightgray,
+   \c!highlight\c!command=\syntaxhighlightline,
+  ]
+
+% Space handler
+
+% Invisible space, don't split
+\installspacemethod {\????syntaxhighlighting\v!off:\v!fixed}
+  {\def\obeyedspace{\mathortext\normalspace\explicitfixedspace}}
+
+% Invisible space, allow split
+\installspacemethod {\????syntaxhighlighting\v!off:\v!split}
+  {\def\obeyedspace{\mathortext\normalspace\explicitobeyedspace}}
+
+% Visible space, don't split
+\installspacemethod {\????syntaxhighlighting\v!on:\v!fixed}
+  {\def\obeyedspace{\mathortext\normalspace\optionalcontrolspace}}
+
+% Visible space, allow split
+\installspacemethod {\????syntaxhighlighting\v!on:\v!split}
+  {\def\obeyedspace{\mathortext\normalspace\explicitcontrolspace}}
+
+% Default: line=empty
+\installspacemethod {\????syntaxhighlighting\v!off:}
+  {\activatespacehandler {\????syntaxhighlighting\v!off:\v!fixed}}
+
+\installspacemethod {\????syntaxhighlighting\v!on}
+  {\activatespacehandler {\????syntaxhighlighting\v!on:\v!fixed}}
+
+% space=empty, line=something
+\installspacemethod {\????syntaxhighlighting:\v!fixed}
+  {\activatespacehandler {\????syntaxhighlighting\v!off:\v!fixed}}
+
+\installspacemethod {\????syntaxhighlighting:\v!split}
+  {\activatespacehandler {\????syntaxhighlighting\v!off:\v!split}}
+
+% Both empty
+\installspacemethod {\????syntaxhighlighting:}
+  {\activatespacehandler {\????syntaxhighlighting\v!off:\v!fixed}}
+
+\definebar[syntaxhighlightline]
+          [\c!order=\v!background,
+   \c!rulethickness=2.5,
+           \c!method=0,
+          \c!offset=1.375,
+        \c!continue=\v!yes,
+           \c!color=\externalfilterparameter\c!highlightcolor,
+          ]
+
+% For backward compatibility
+\def\syntaxhighlighting at namespace {\????syntaxhighlighting}
+\def\syntaxhighlighting at name      {\currentsyntaxhighlighting}
+
+\protect
+
+\stopmodule
+

Modified: trunk/Master/texmf-dist/tex/context/third/vim/t-vim.tex
===================================================================
--- trunk/Master/texmf-dist/tex/context/third/vim/t-vim.tex	2021-05-26 19:42:53 UTC (rev 59355)
+++ trunk/Master/texmf-dist/tex/context/third/vim/t-vim.tex	2021-05-26 19:43:26 UTC (rev 59356)
@@ -1,6 +1,6 @@
 %D \module
 %D   [     file=t-vim,
-%D      version=2020.06.29,
+%D      version=2021.05.23,
 %D        title=\CONTEXT\ User Module,
 %D     subtitle=Vim syntax highlighting,
 %D       author=Aditya Mahajan,
@@ -9,7 +9,7 @@
 %D        email=adityam <at> ieee <dot> org,
 %D      license=Simplified BSD License]
 
-\writestatus{loading}{Vim syntax highlighting (ver: 2020.06.29)}
+\writestatus{loading}{Vim syntax highlighting (ver: 2021.05.23)}
 
 \startmodule [vim]
 \usemodule   [filter]           % loads module catcodes
@@ -68,7 +68,6 @@
        -X % dont connect to X server
        -i NONE % dont use viminfo file
        --noplugin % dont load plugins
-       --clean % dont load scada file (nvim)
        -es % run in ex mode in silent
        % -C % set compatible
        -n % no swap file



More information about the tex-live-commits mailing list.