diff options
author | Karl Berry <karl@freefriends.org> | 2020-06-24 21:03:05 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-06-24 21:03:05 +0000 |
commit | da134b913082e8b63a00dd132a0c3fe6a72e5b92 (patch) | |
tree | d4b604b6a6e74d44e968f88f2b87a89cbda3be4d /Master/texmf-dist/tex/context/third | |
parent | e17ca6c6eed7d408a8bd8b0f8a479b4fe5a509ba (diff) |
context-vim (24jun20)
git-svn-id: svn://tug.org/texlive/trunk@55652 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/third')
-rw-r--r-- | Master/texmf-dist/tex/context/third/vim/t-syntax-groups.tex | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkiv | 62 |
2 files changed, 35 insertions, 35 deletions
diff --git a/Master/texmf-dist/tex/context/third/vim/t-syntax-groups.tex b/Master/texmf-dist/tex/context/third/vim/t-syntax-groups.tex index db526bf77e9..40189fe331c 100644 --- a/Master/texmf-dist/tex/context/third/vim/t-syntax-groups.tex +++ b/Master/texmf-dist/tex/context/third/vim/t-syntax-groups.tex @@ -1,6 +1,6 @@ %D \module %D [ file=t-syntax-groups, -%D version=2012.05.06, +%D version=2020.06.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: 2012.05.06)} +\writestatus{loading}{Syntax highlighting groups (ver: 2020.06.23)} \startmodule [syntax-group] \usemodule [module-catcodes] @@ -52,9 +52,9 @@ [\s!parent=\syntaxgroup@namespace,\c!color=,\c!style=,\c!command=,#2] \doifsomething{\syntaxgroupparameter\c!color} { - \expanded{\definecolor[\syntaxgroup@namespace-##1-color] + \expanded{\definecolor[\syntaxgroup@namespace-\syntaxgroup@name-color] [\syntaxgroupparameter\c!color]} - \setupsyntaxgroup[\syntaxgroup@name][\s!parent=\syntaxgroup@namespace,\c!color=\syntaxgroup@namespace-##1-color] + \setupsyntaxgroup[\syntaxgroup@name][\s!parent=\syntaxgroup@namespace,\c!color=\syntaxgroup@namespace-\syntaxgroup@name-color] } } }{ diff --git a/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkiv b/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkiv index 7c31c8f6a38..a0567301749 100644 --- a/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkiv +++ b/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkiv @@ -97,10 +97,10 @@ {\language\minusone}% \def\obeyedline{\strut\par} + \activatespacehandler{\????syntaxhighlighting\externalfilterparameter\c!space:\externalfilterparameter\c!lines} \setcatcodetable\externalfilter@minimal_catcodes% \letcharcode\endoflineasciicode\obeyedline \letcharcode\spaceasciicode\obeyedspace - \activatespacehandler{\????syntaxhighlighting\externalfilterparameter\c!space} \raggedright \stopsetups @@ -120,7 +120,7 @@ \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}, + \c!continue=\externalfilterparameter{\c!number\c!continue}, ]} \dostarttagged\t!syntaxhighlighting\colorscheme@name \stoptexdefinition @@ -191,40 +191,40 @@ ] % Space handler -% -% The space handing code for MkII and MkIV is not consistent. So, we provide our -% own versions. -\setvalue{\????syntaxhighlighting::\c!lines::\v!split}{\hskip} -\setvalue{\????syntaxhighlighting::\c!lines::\v!fixed}{\dontleavehmode\kern} +% Invisible space, don't split +\installspacemethod {\????syntaxhighlighting\v!off:\v!fixed} + {\def\obeyedspace{\mathortext\normalspace\explicitfixedspace}} -% default -\setvalue{\????syntaxhighlighting::\c!lines::}{\dontleavehmode\kern} +% Invisible space, allow split +\installspacemethod {\????syntaxhighlighting\v!off:\v!split} + {\def\obeyedspace{\mathortext\normalspace\explicitobeyedspace}} -\def\syntaxhighlighting@split% - {\getvalue{\????syntaxhighlighting::\c!lines::\externalfilterparameter\c!lines}} +% 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}} -% Visible space \installspacemethod {\????syntaxhighlighting\v!on} - {\unexpanded\def\obeyedspace - {\mathortext\normalspace - {\syntaxhighlighting@split\zeropoint\relax - \hbox{\normalcontrolspace}% - \syntaxhighlighting@split\zeropoint\relax}}% - \letcharcode\spaceasciicode\obeyedspace} - -% Invisible space -\installspacemethod {\????syntaxhighlighting\v!off} - {\unexpanded\def\obeyedspace - {\mathortext\normalspace - {\syntaxhighlighting@split\interwordspace\relax}}% - \letcharcode\spaceasciicode\obeyedspace} - -% Default -\installspacemethod {\????syntaxhighlighting} - {\activatespacehandler {\????syntaxhighlighting\v!off}} - -% Line highlighting + {\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, |