diff options
Diffstat (limited to 'Master/texmf-dist')
| -rw-r--r-- | Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkii | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkiv | 45 |
2 files changed, 22 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkii b/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkii index 375dc5381b2..db5666e66fb 100644 --- a/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkii +++ b/Master/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkii @@ -1,6 +1,6 @@ %D \module %D [ file=t-syntax-highlight, -%D version=2012.05.01, +%D version=2012.05.28, %D title=\CONTEXT\ User Module, %D subtitle=Code syntax highlighting, %D author=Aditya Mahajan, @@ -9,7 +9,7 @@ %D email=adityam <at> ieee <dot> org, %D license=Simplified BSD License] -\writestatus{loading}{Code syntax highlighting (ver: 2012.05.01)} +\writestatus{loading}{Code syntax highlighting (ver: 2012.05.28)} \startmodule [syntax-highlight] \usemodule [syntax-groups] @@ -69,6 +69,7 @@ \doifmode\s!mkii{\setups{syntaxhighlighting@setup_line_number_mkii}}% + \forgetall \doifinset{\externalfilterparameter\c!option}{\v!packed} {\setupwhitespace[\v!none,\v!flexible]}% @@ -178,14 +179,13 @@ \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@read_command, \c!output=\externalfilterinputfile, % placeholder \c!setups=syntaxhighlighting@setup, - \c!option=\v!packed, % Can be a list, + \c!option=\v!packed, % Could be a list \s!parent=\externalfilter@namespace, % Numbering options \c!numbering=\v!no, 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 6140ca36e23..687073f4be2 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 @@ -1,6 +1,6 @@ %D \module
%D [ file=t-syntax-highlight,
-%D version=2012.05.06,
+%D version=2012.05.28,
%D title=\CONTEXT\ User Module,
%D subtitle=Code syntax highlighting,
%D author=Aditya Mahajan,
@@ -9,7 +9,7 @@ %D email=adityam <at> ieee <dot> org,
%D license=Simplified BSD License]
-\writestatus{loading}{Code syntax highlighting (ver: 2012.05.06)}
+\writestatus{loading}{Code syntax highlighting (ver: 2012.05.28)}
\startmodule [syntax-highlight]
\usemodule [syntax-groups]
@@ -37,29 +37,10 @@ \appendtoks
\defineexternalfilter[\currentsyntaxhighlighting]
[\s!parent=\????syntaxhighlighting\currentexternalfilter,\c!taglabel=\vimtyping@id]%
- \setevalue{type\currentsyntaxhighlighting file}{\getvalue{process\currentsyntaxhighlighting file}}%
\definelinenumbering [\currentsyntaxhighlighting]%
+ \setevalue{type\currentsyntaxhighlighting file}{\getvalue{process\currentsyntaxhighlighting file}}%
\to\everydefinesyntaxhighlighting
-\appendtoks
- % \externalfitlterparameter does not work, so it is better to use
- % \syntaxhighlighting parameter.
- \normalexpanded{\setuplinenumbering[\currentsyntaxhighlighting]
- [
- \c!method=\syntaxhighlightingparameter{\c!number\c!method},
- \c!conversion=\syntaxhighlightingparameter\c!numberconversion,
- \c!location=\syntaxhighlightingparameter{\c!number\c!location},
- \c!style=\syntaxhighlightingparameter\c!numberstyle,
- \c!color=\syntaxhighlightingparameter\c!numbercolor,
- \c!width=\syntaxhighlightingparameter{\c!number\c!width},
- \c!left=\syntaxhighlightingparameter{\c!number\c!left},
- \c!right=\syntaxhighlightingparameter{\c!number\c!right},
- \c!command=\syntaxhighlightingparameter\c!numbercommand,
- \c!distance=\syntaxhighlightingparameter{\c!number\c!distance},
- \c!align=\syntaxhighlightingparameter{\c!number\c!align},
- ]}%
-\to\everysetupsyntaxhighlighting
-
\def\syntaxhighlighting@id {syntaxhighlighting}
\edef\t!syntaxhighlighting {\syntaxhighlighting@id}
@@ -83,6 +64,7 @@ \def\tab##1%
{\dorecurse{##1}{\obeyedspace}}%
+ \forgetall
\doifinset{\externalfilterparameter\c!option}{\v!packed}
{\setupwhitespace[\v!none,\v!flexible]}%
@@ -101,9 +83,19 @@ \doifinset{\externalfilterparameter\c!numbering}\syntaxhighlighting@yes
{\startlinenumbering
[\currentsyntaxhighlighting]
- [
+ [\c!conversion=\externalfilterparameter\c!numberconversion,
\c!start=\externalfilterparameter{\c!number\c!start},
\c!step=\externalfilterparameter{\c!number\c!step},
+ \c!method=\externalfilterparameter{\c!number\c!method},
+ \c!location=\externalfilterparameter{\c!number\c!location},
+ \c!style=\externalfilterparameter\c!numberstyle,
+ \c!color=\externalfilterparameter\c!numbercolor,
+ \c!width=\externalfilterparameter{\c!number\c!width},
+ \c!left=\externalfilterparameter{\c!number\c!left},
+ \c!right=\externalfilterparameter{\c!number\c!right},
+ \c!command=\externalfilterparameter\c!numbercommand,
+ \c!distance=\externalfilterparameter{\c!number\c!distance},
+ \c!align=\externalfilterparameter{\c!number\c!align},
\c!continue=\externalfilterparameter{\c!number\c!continue},
]}
\dostarttagged\t!syntaxhighlighting\colorscheme@name
@@ -119,7 +111,7 @@ \setupsyntaxhighlighting
[\c!tab=4,
\c!space=\v!off,
- \c!lines=\v!fixed,
+ \c!lines=\v!split,
\c!start=1,
\c!stop=0,
% \c!syntax=context,
@@ -131,14 +123,13 @@ \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@read_command,
\c!output=\externalfilterinputfile, % placeholder
\c!setups=syntaxhighlighting@setup,
- \c!option=\v!packed, % Can be a list,
+ \c!option=\v!packed, % Could be a list
\s!parent=\????externalfilter,
% Numbering options
\c!numbering=\v!no,
@@ -171,7 +162,7 @@ \setvalue{\????syntaxhighlighting::\c!lines::\v!fixed}{\dontleavehmode\kern}
% default
-\setvalue{\????syntaxhighlighting::\c!lines::}{\dontleavehmode\kern}
+\setvalue{\????syntaxhighlighting::\c!lines::}{\hskip}
\def\syntaxhighlighting@split%
{\getvalue{\????syntaxhighlighting::\c!lines::\externalfilterparameter\c!lines}}
|