add context-vim

git-svn-id: svn://tug.org/texlive/trunk@9887 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 1054 insertions, 0 deletions

diff --git a/Master/texmf-dist/doc/context/third/vim/README b/Master/texmf-dist/doc/context/third/vim/README
new file mode 100644
index 00000000000..e98b964acf8
--- /dev/null
+++ b/Master/texmf-dist/doc/context/third/vim/README
@@ -0,0 +1,15 @@
+Name of module:	ViM syntax highlighting
+Author:	Aditya Mahajan and Mojca Miklavec
+
+Description:	ConTeXt has an excellent pretty printing capabilities for many
+languages. The code for pretty printing is written in TeX, and due to catcode
+jugglary verbatim typesetting is perhaps the trickiest part of TeX. This makes
+it difficult for a "normal" user to define syntax highlighting rules for a new
+language. This module, takes the onus of defining syntax highlighting rules
+away from the user and uses ViM editor to generate the syntax highlighting.
+There is a helper 2context.vim script to do the syntax parsing in ViM. This is
+a stop-gap method, and hopefully with luaTeX, things will be much easier.
+
+The module documentation is available in doc/context/third/vim/vim-doc.pdf and
+a demo is at doc/context/third/vim/vim-demo.pdf
+
diff --git a/Master/texmf-dist/doc/context/third/vim/vim-demo.pdf b/Master/texmf-dist/doc/context/third/vim/vim-demo.pdf
new file mode 100644
index 00000000000..27b96ac7eea
--- /dev/null
+++ b/Master/texmf-dist/doc/context/third/vim/vim-demo.pdf
diff --git a/Master/texmf-dist/doc/context/third/vim/vim-doc.pdf b/Master/texmf-dist/doc/context/third/vim/vim-doc.pdf
new file mode 100644
index 00000000000..cbdffc70be7
--- /dev/null
+++ b/Master/texmf-dist/doc/context/third/vim/vim-doc.pdf
diff --git a/Master/texmf-dist/tex/context/interface/third/t-vim.xml b/Master/texmf-dist/tex/context/interface/third/t-vim.xml
new file mode 100644
index 00000000000..4e7194441e2
--- /dev/null
+++ b/Master/texmf-dist/tex/context/interface/third/t-vim.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2006.07.14">
+
+  <cd:command name="setupvimtyping" file="t-vim.tex">
+    <cd:sequence>
+      <cd:string value="setupvimtyping" />
+    </cd:sequence>
+    <cd:arguments>
+      <cd:assignments list="yes">
+        <cd:parameter name="syntax">
+          <cd:constant type="cd:name" />
+        </cd:parameter>
+        <cd:parameter name="colorscheme">
+          <cd:constant type="cd:name" />
+        </cd:parameter>
+        <cd:parameter name="space">
+          <cd:constant type="yes" default="yes"/>
+          <cd:constant type="on"/>
+          <cd:constant type="no"/>
+        </cd:parameter>
+        <cd:parameter name="tab">
+          <cd:constant type="cd:number"/>
+        </cd:parameter>
+        <cd:parameter name="start">
+          <cd:constant type="cd:number"/>
+        </cd:parameter>
+        <cd:parameter name="stop">
+          <cd:constant type="cd:number"/>
+        </cd:parameter>
+        <cd:parameter name="numbering">
+          <cd:constant type="yes"/>
+          <cd:constant type="no" default="yes"/>
+        </cd:parameter>
+        <cd:parameter name="step">
+          <cd:constant type="cd:number"/>
+        </cd:parameter>
+        <cd:parameter name="numberstyle">
+          <cd:resolve name="style"/>
+        </cd:parameter>
+        <cd:parameter name="numbercolor">
+          <cd:constant type="cd:name"/>
+        </cd:parameter>
+        <cd:parameter name="before">
+          <cd:constant type="cd:command"/>
+        </cd:parameter>
+        <cd:parameter name="after">
+          <cd:constant type="cd:command"/>
+        </cd:parameter>
+      </cd:assignments> 
+    </cd:arguments>
+  </cd:command>
+
+  <cd:command name="definevimtyping" file="t-vim.tex">
+    <cd:sequence>
+      <cd:string value="definevimtyping" />
+    </cd:sequence>
+    <cd:arguments>
+      <cd:keywords>
+        <cd:constant type="cd:name" />
+      </cd:keywords>
+      <cd:assignments optional="yes">
+        <cd:inherit name="setupvimtyping"/>
+      </cd:assignments>
+    </cd:arguments>
+  </cd:command>
+
+
+  <cd:command name="definetypevimfile" file="t-vim.tex">
+    <cd:sequence>
+      <cd:string value="definetypevimfile" />
+    </cd:sequence>
+    <cd:arguments>
+      <cd:keywords>
+        <cd:constant type="cd:name" />
+      </cd:keywords>
+      <cd:assignments optional="yes">
+        <cd:inherit name="setupvimtyping"/>
+      </cd:assignments>
+    </cd:arguments>
+  </cd:command>
+
+</cd:interface>
diff --git a/Master/texmf-dist/tex/context/third/vim/2context.vim b/Master/texmf-dist/tex/context/third/vim/2context.vim
new file mode 100644
index 00000000000..ef238121a33
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/vim/2context.vim
@@ -0,0 +1,141 @@
+"D \module
+"D   [      file=2context.vim,
+"D        version=2007.01.03,
+"D          title=ViM to \CONTEXT,
+"D       subtitle=Use ViM to generate code listing,
+"D         author=Mojca Miklavec \& Aditya Mahajan,
+"D          email=adityam at umich dot edu,
+"D           date=\currentdate,
+"D      copyright=Public Domain]
+
+"D This file is based on \filename{2html.vim}. It uses ViM systax highlighting
+"D to generate a \CONTEXT\ file which is parsed using \filename{t-vimsyntax}
+"D module.
+
+"D We use \filename{.tmp} extension so that the file is purged by
+"D \filename{ctxtools}
+
+if expand("%") == ""
+  new vimsyntax.tmp
+else
+  new %-vimsyntax.tmp
+endif
+
+"D We are right now in the new buffer.
+
+set modifiable
+%d "This empties the buffer.
+
+wincmd p
+
+"D Loop over all lines in the original text.
+"D Use contextstartline and contextstopline if they are set.
+
+if exists("contextstartline")
+  let s:lnum = contextstartline
+  if !(s:lnum >= 1 && s:lnum <= line("$"))
+    let s:lnum = 1
+  endif
+else
+  let s:lnum = 1
+endif
+
+if exists("contextstopline")
+  let s:end = contextstopline
+  if !(s:end >= s:lnum && s:end <= line("$"))
+    let s:end = line("$")
+  endif
+else
+  let s:end = line("$")
+endif
+
+let s:buffer_lnum = 1
+
+while s:lnum <= s:end
+"D Get the current line
+  let s:line = getline(s:lnum)
+  let s:len  = strlen(s:line)
+  let s:new  = ""
+
+"D Loop over each character in the line
+  let s:col = 1
+  while s:col <= s:len
+    let s:startcol = s:col " The start column for processing text
+    let s:id       = synID (s:lnum, s:col, 1)
+    let s:col      = s:col + 1
+"D Speed loop (it's small - that's the trick)
+"D Go along till we find a change in synID
+    while s:col <= s:len && s:id == synID(s:lnum, s:col, 1) 
+      let s:col = s:col + 1 
+    endwhile
+
+"D Output the text with the same synID, with class set to {s:id_name}
+    let s:id      = synIDtrans (s:id)
+    let s:id_name = synIDattr  (s:id, "name", "gui")
+    let s:temp    = strpart(s:line, s:startcol - 1, s:col - s:startcol)
+"D Remove line endings (on unix machines reading windows files)
+    let s:temp    = substitute(s:temp, '\r*$', '', '')
+"D It might have happened that that one has been the last item in a row, so
+"D we don't need to print in in that case
+    if strlen(s:temp) > 0
+"D We need to get rid of the characters that can cause trouble in \CONTEXT.
+"D The funny \type{||||||||||} and \type{$$$$$$$$$} characters should never
+"D appear in {\em normal} \TEX\ file. As a side||effect, this script can not
+"D pretty print itself.
+      let s:temp = substitute( s:temp,  '\\', '||||||||||\\letterbackslash$$$$$$$$$$', 'g')
+      let s:temp = substitute( s:temp,  '{',  '||||||||||\\letteropenbrace$$$$$$$$$$', 'g')
+      let s:temp = substitute( s:temp,  '}',  '||||||||||\\letterclosebrace$$$$$$$$$$', 'g')
+      let s:temp = substitute( s:temp,  '||||||||||' , '{' , 'g')
+      let s:temp = substitute( s:temp,  '\$\$\$\$\$\$\$\$\$\$' , '}' , 'g')
+      let s:temp = substitute( s:temp,  '&',  '{\\letterampersand}', 'g')
+      let s:temp = substitute( s:temp,  '<',  '{\\letterless}', 'g')
+      let s:temp = substitute( s:temp,  '>',  '{\\lettermore}', 'g')
+      let s:temp = substitute( s:temp,  '#',  '{\\letterhash}', 'g')
+      let s:temp = substitute( s:temp,  '"',  '{\\letterdoublequote}', 'g')
+      let s:temp = substitute( s:temp,  "'",  '{\\lettersinglequote}', 'g')
+      let s:temp = substitute( s:temp,  '\$', '{\\letterdollar}', 'g')
+      let s:temp = substitute( s:temp,  '%',  '{\\letterpercent}', 'g')
+      let s:temp = substitute( s:temp,  '\^', '{\\letterhat}', 'g')
+      let s:temp = substitute( s:temp,  '_',  '{\\letterunderscore}', 'g')
+      let s:temp = substitute( s:temp,  '|',  '{\\letterbar}', 'g')
+      let s:temp = substitute( s:temp,  '\~', '{\\lettertilde}', 'g')
+      let s:temp = substitute( s:temp,  '/',  '{\\letterslash}', 'g')
+      let s:temp = substitute( s:temp,  '?',  '{\\letterquestionmark}', 'g')
+      let s:temp = substitute( s:temp,  '!',  '{\\letterexclamationmark}', 'g')
+      let s:temp = substitute( s:temp,  '@',  '{\\letterat}', 'g')
+      let s:temp = substitute( s:temp,  ':',  '{\\lettercolon}', 'g')
+      let s:new  = s:new . '\s[' . s:id_name . ']{' . s:temp .  '}'
+    endif
+
+" Why will we ever enter this loop
+"    if s:col > s:len
+"      break
+"    endif
+  endwhile
+
+"D Expand tabs 
+  let s:pad   = 0
+  let s:start = 0
+  let s:idx = stridx(s:line, "\t")
+  while s:idx >= 0
+    let s:i     = &ts - ((s:start + s:pad + s:idx) % &ts)
+"    let s:new   = substitute(s:new, '\t', strpart(s:expandedtab, 0, s:i), '')
+    let s:new   = substitute(s:new, '\t', '\\tab{' . s:i . '}', '')
+    let s:pad   = s:pad + s:i - 1
+    let s:start = s:start + s:idx + 1
+    let s:idx   = stridx(strpart(s:line, s:start), "\t")
+  endwhile
+
+"D Go back and paste the current line
+  wincmd p
+  call append (s:buffer_lnum-1, s:new)
+  wincmd p
+
+"D Increment line numbers
+  let s:lnum = s:lnum + 1
+  let s:buffer_lnum = s:buffer_lnum + 1
+endwhile
+
+wincmd p
+"D We have a spurious line in the end. So we remove it.
+$delete
diff --git a/Master/texmf-dist/tex/context/third/vim/t-vim.tex b/Master/texmf-dist/tex/context/third/vim/t-vim.tex
new file mode 100644
index 00000000000..43de298ba9d
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/vim/t-vim.tex
@@ -0,0 +1,776 @@
+%M \logo [VIM] {VIM} % Needed for the title
+
+%D \module
+%D   [      file=t-vim,
+%D        version=2007.01.03,
+%D          title=\VIM\ to \CONTEXT,
+%D       subtitle=Use \VIM\ to generate code listing,
+%D         author=Mojca Miklavec \& Aditya Mahajan,
+%D          email=adityam at umich dot edu,
+%D           date=\currentdate,
+%D      copyright=Public Domain]
+
+%M \usemodule [vim]
+%M \usemodule[int-load]
+%M \loadsetups[vim.xml]
+%M \usetypescript[modern-base][texnansi] \setupbodyfont[modern]
+%M \setuptyping[option=color]
+
+%D \section   {User Manual}
+%D
+%D \CONTEXT\ has an excellent pretty printing capabilities for many languages.
+%D The code for pretty printing is written in \TEX, and due to catcode
+%D jugglary verbatim typesetting is perhaps the trickiest part of \TEX. This
+%D makes it difficult for a \quotation{normal} user to define syntax
+%D highlighting rules for a new language. This module, takes the onus of
+%D defining syntax highlighting rules away from the user and uses \VIM\ editor
+%D to generate the syntax highlighting.  There is a helper
+%D \filename{2context.vim} script to do the syntax parsing in \VIM. This is a
+%D stop|-|gap method, and hopefully with \LUATEX, things will be much easier. 
+%D
+%D The main macro of this module is \type{\definevimtyping}. The best way to
+%D explain it is by using an example. Suppose you want to pretty print ruby
+%D code in \CONTEXT. So you can do
+%D \starttyping
+%D \definevimtyping [RUBY]  [syntax=ruby]
+%D \stoptyping
+%D after which you can get ruby highlighting by
+%D \starttyping
+%D \startRUBY
+%D ....
+%D \stopRUBY
+%D \stoptyping
+%D
+%D For example
+%D \startbuffer
+%D \definevimtyping [RUBY] [syntax=ruby]
+%D
+%D \startRUBY
+%D #! /usr/bin/ruby
+%D # This is my first ruby program
+%D puts "Hello World"
+%D \stopRUBY
+%D \stopbuffer
+%D {\getbuffer}
+%D This was typed as \typebuffer
+%D
+%D The typing can be setup using \type{\setupvimtyping}.
+%D
+%D \showsetup{setupvimtyping}
+%D
+%D Here \type{syntax} is the syntax file in \VIM\ for the language
+%D highlighting that you want. See \type{:he syntax.txt} inside \VIM\ for
+%D details. \type{colorscheme} provides the sytax highlighting for various
+%D regions. Right now, two colorschemes are defined. The \type{default}
+%D colorscheme is based on on \filename{ps_color.vim} colorscheme in \VIM, and
+%D the \type{blackandwhite} colorscheme is based on \filename{print_bw.vim}.
+%D If there is a particular colorscheme that you will like, you can convert it
+%D into \CONTEXT. \type{space=(yes|on|no)} makes the space significant,
+%D visible, and unsignificant respectively. \type{tab} specifies the number of
+%D spaces a tab is equivalent to. It's default value is 8. \type{start} and
+%D \type{stop} specify which lines to read from a file. These options only
+%D make sense for highlighting files and should not to be set by
+%D \type{\setupvimtyping}.  \type{numbering} enables line numbering, and
+%D \type{step} specifies which lines are numbered. \type{numberstyle} and
+%D \type{numbercolor} specify the style and color of line numbers.
+%D
+%D A new typing region can be define using \type{\definevimtyping}.
+%D
+%D \showsetup{definevimtyping}
+%D
+%D Minor changes in syntax highlighting can be made easily. For example, Mojca
+%D likes \quote{void} to be bold in C programs. This can be done as follows
+%D
+%D \startbuffer
+%D \definevimtyping [C] [syntax=c,numbering=on]
+%D 
+%D \startvimcolorscheme[default]
+%D 
+%D \definevimsyntax
+%D   [Type]
+%D   [style=boldmono]
+%D
+%D \definevimsyntax
+%D   [PreProc]
+%D   [style=slantedmono]
+%D 
+%D \stopvimcolorscheme
+%D 
+%D \startC
+%D #include <stdio.h>
+%D #include <stdlib.h>
+%D 
+%D void main() 
+%D {
+%D    printf("Hello World\n") ;
+%D    return;
+%D }
+%D \stopC
+%D \stopbuffer 
+%D \typebuffer which gives {\getbuffer}
+%D
+%D The second command provided by this module is \type{\definetypevimfile} for
+%D typesetting files.  The syntax of this command is
+%D
+%D \showsetup{definetypevimfile}
+%D
+%D For example, to pretty print a ruby file you can do
+%D \starttyping
+%D \definetypevimfile[typeRUBY] [syntax=ruby]
+%D \stoptyping
+%D after which one can use
+%D \starttyping
+%D \typeRUBY[option]{rubyfile}
+%D \stoptyping
+%D
+%D We hope that this is sufficient to get you started. The rest of this
+%D document gives the implementation details of the module. If you want to
+%D change something, read ahead.
+
+%D \section   {Module Details}
+%D The synax highlighting of the source here is done using \type{t-vim}
+%D module. There is a bug in the module due to which line numberings for
+%D different filetypes use the same counter. In the source we use a
+%D round||about method to correct this. Right now, in case someone needs this
+%D module for numbering more than one filetype, let me know, and I will try to
+%D iron out the bug.
+
+%M % Due to the bug in numbering
+%M \definevimtyping [definition]  [syntax=context,start=1,numbering=on]
+
+\writestatus  {loading}   {Context Module for ViM Sytax Highlighting}
+
+%M \definevimtyping [definition]  [syntax=context,start=continue,numbering=on]
+
+\startmodule[vim]
+
+\unprotect
+
+\definesystemvariable {vs}  % Vim Syntax
+
+%D First of all we take care of bold monotype. By default, \CONTEXT\ uses
+%D latin modern fonts. If you want to get bold monotype in latin modern, you
+%D need to use \type{modern-base} typescript. For example:
+%D \starttyping
+%D \usetypescript[modern-base][texnansi] \setupbodyfont[modern]
+%D \starttext
+%D {\tt\bf This is bold monotype}
+%D \stoptext
+%D \stoptyping
+%D \CONTEXT\ does not provide any style alternative for bold monotype and
+%D slanted monotype, so we provide one here. These will only work if your font
+%D setup knows about bold and slanted monotype.
+
+\definealternativestyle [\v!bold\v!mono,\v!mono\v!bold]       [\ttbf] []
+\definealternativestyle [\v!slanted\v!mono,\v!mono\v!slanted] [\ttsl] []
+
+%D \macros{startvimcolorscheme}
+%D To start a new vim colorscheme.
+
+\def\startvimcolorscheme[#1]%
+  {\pushmacro\vimcolorscheme
+   \edef\vimcolorscheme{#1}}
+
+\def\stopvimcolorscheme
+  {\popmacro\vimcolorscheme}
+
+%D \macros{definevimsyntax, definevimsyntaxsynonyms} 
+%D These macros should always occur inside a \type{\startvimcolorschme}
+%D \unknown \type{\stopvimcolorscheme} pair.  The \type{\definevimsyntax}
+%D macro defines syntax highlighting rules for \VIM's syntax highlighting
+%D regions. It takes three arguments \type{style}, \type{color} and
+%D \type{command}. The most common \VIM\ syntax highlighting regions are defined
+%D in the end of this file. The \type{\definevimsyntaxsynonyms} macro just
+%D copies the settings from another syntax highlighting region.
+
+\def\definevimsyntax
+  {\dodoubleargumentwithset\dodefinevimsyntax}
+
+\def\dodefinevimsyntax[#1]% [#2]
+  {\getparameters[\??vs\vimcolorscheme#1]} %[#2]
+
+\def\definevimsyntaxsynonyms
+  {\dodoubleargumentwithset\dodefinevimsyntaxsynonyms}
+
+\def\dodefinevimsyntaxsynonyms[#1][#2]%
+  {\copyparameters[\??vs\vimcolorscheme#1][\??vs\vimcolorscheme#2]
+                  [\c!style,\c!color,\c!command]}
+
+
+%D \macros{vimsyntax}
+%D This is just a placeholder macro. The \filename{2context.vim} script marks
+%D the highlightin reigions by \type{\s[...]{...}}. While typing the generated
+%D files, we locally redefine \type{\s} to \type{\vimsyntax}.
+
+\def\vimsyntax[#1]#2%
+  {\dostartattributes{\??vs\vimcolorscheme Normal}\c!style\c!color\empty%
+   \dostartattributes{\??vs\vimcolorscheme #1}\c!style\c!color\empty%
+   \getvalue{\??vs\vimcolorscheme #1\c!command}{#2}%
+    \dostopattributes%
+    \dostopattributes}
+
+%D \macros{setupvimtyping, typevimfile}
+%D There are three settings for \type{\setupvimtyping}: \type{syntax}, which
+%D tells \VIM\ which syntax rules to use; \type{tab}, which sets the
+%D \type{tabstop} in \VIM; and \type{space} which takes care of spaces.
+%D
+%D \type{\typevimfile} macro basically calls \VIM\ with appropriate settings and
+%D sources the \filename{2context.vim} script. The result is slow, because
+%D parsing by \VIM\ is slow. Do not use this method for anything larger than a
+%D few hundred lines. For large files, one option is to pre||prase them, and
+%D then typeset the result. We have not provided any interface for that, but
+%D it is relatively easy to implement.
+%D
+%D Taking care of line||numbering is more tricky. We could not get
+%D \type{\setuplinenumbering} to work properly, so implement our own
+%D line||numbering mechanism. This is a bit awkward, since it places
+%D line||number after each \type{^M} in the source file. So, if the source
+%D code line is larger than one typeset line, the line number will be on the
+%D second line. To do it correctly, we need to read lines from the vimsyntax
+%D file one|-|by|-|one. Our own mechanism for line||numbering is plain.
+%D Unlike \CONTEXT's core verbatim highlighting, multiple blank lines are
+%D displayed and numbered.
+
+\def\setupvimtyping
+  {\dosingleargument\getparameters[\??vs]}
+
+\def\typevimfile
+  {\dosingleempty\dotypevimfile}
+
+\def\notypevimfile[#1][#2]#3%
+  {\dotypevimfile[#1,#2]{#3}}
+
+\def\dotypevimfile[#1]#2%
+  {\doiffileelse{#2}
+   {\dodotypevimfile[#1]{#2}}
+   {\reporttypingerror{#2}}}
+
+\def\dodotypevimfile[#1]#2%
+  {\@@vsbefore
+   \bgroup
+   \initializevimtyping{#1}
+   \runvimsyntax{#2}
+    % The strut is needed for the output to be the same when not using
+    % numbering. Otherwise, multiple par's are ignored. We need to figure out
+    % a mechanism to imitate this behaviour even while using line numbering.
+    \strut%else the first line is shifted to the left
+    \input #2-vimsyntax.tmp\relax%
+   \egroup
+   \@@vsafter}
+
+\makecounter{vimlinenumber}
+
+\def\doplacevimlinenumber 
+  {%Always place the first linenumber
+   \showvimlinenumber
+   %Calculate step in futute
+   \let\placevimlinenumber\dodoplacevimlinenumber
+   \pluscounter{vimlinenumber}}
+
+\def\dodoplacevimlinenumber
+  {\ifnum\numexpr(\countervalue{vimlinenumber}/\@@vsstep)*\@@vsstep\relax=%
+         \numexpr\countervalue{vimlinenumber}\relax
+      \showvimlinenumber
+  \fi
+   \pluscounter{vimlinenumber}}
+   
+\def\showvimlinenumber
+  {\inmargin%TODO: make configurable
+      {\dostartattributes\??vs\c!numberstyle\c!numbercolor\empty
+       \countervalue{vimlinenumber}
+       \dostopattributes}}
+
+\def\initializevimtyping#1
+  {\setupvimtyping[#1]
+   %Make sure that stop is not empty
+   \doifempty{\@@vsstop}{\setvalue{\@@vsstop}{0}}
+   \doifelse{\@@vsstart}{\v!continue}
+    {\setvalue{@@vsstart}{\countervalue{vimlinenumber}}}
+    {\setcounter{vimlinenumber}{\doifnumberelse{\@@vsstart}{\@@vsstart}{1}}}
+   \whitespace
+  %\page[\v!preference]} gaat mis na koppen, nieuw: later \nobreak
+   \setupwhitespace[\v!none]%
+   \obeylines
+   \ignoreeofs
+   \ignorespaces
+   \activatespacehandler\@@vsspace
+   \let\s=\vimsyntax
+   \def\tab##1{\dorecurse{##1}{\space}}% TODO: allow customization
+   \def\vimcolorscheme{\@@vscolorscheme}
+   \processaction[\@@vsnumbering]
+   [     \v!on=>\let\placevimlinenumber\doplacevimlinenumber,
+        \v!off=>\let\placevimlinenumber\relax,
+    \s!unknown=>\let\placevimlinenumber\relax,
+    \s!default=>\let\placevimlinenumber\relax,
+   ]
+   \def\obeyedline{\placevimlinenumber\par\strut}
+   }
+
+\def\runvimsyntax#1
+   {\executesystemcommand
+      {texmfstart bin:vim 
+          "-u NONE  % No need to read unnessary configurations
+           -e       % run in ex mode
+%            -V10log  % For debugging only, will go away later.
+           -c \letterbackslash"set noswapfile\letterbackslash"   
+           -c \letterbackslash"set tabstop=\@@vstab\letterbackslash"   
+           -c \letterbackslash"set cp\letterbackslash"   
+           -c \letterbackslash"syntax on\letterbackslash"   
+           -c \letterbackslash"set syntax=\@@vssyntax\letterbackslash"   
+           -c \letterbackslash"let contextstartline=\@@vsstart\letterbackslash"   
+           -c \letterbackslash"let contextstopline=\@@vsstop\letterbackslash"   
+           -c \letterbackslash"source kpse:2context.vim\letterbackslash"   
+           -c \letterbackslash"wqa\letterbackslash"   
+            " #1}}
+
+
+%D \macros{definetypevimfile}
+%D This macro allows you to define new file typing commands. For example
+%D \starttyping
+%D \definetypevimfile[typeRUBY] [syntax=ruby]
+%D \stoptyping
+%D after which one can use
+%D \starttyping
+%D \typeRUBY[option]{rubyfile}
+%D \stoptyping
+
+\def\definetypevimfile
+  {\dodoubleargument\dodefinetypevimfile}
+
+\def\dodefinetypevimfile[#1][#2]%
+  {\unexpanded\setvalue{#1}{\dodoubleempty\notypevimfile[#2]}}
+
+%D \macros{definevimtyping}
+%D
+%D This macro allows you to pretty print code snippets. For example
+%D \startbuffer
+%D \definevimtyping [RUBY] [syntax=ruby]
+%D \startRUBY
+%D # This is my first ruby program
+%D puts "Hello World"
+%D \stopRUBY
+%D \stopbuffer
+%D \typebuffer gives \getbuffer
+
+%M %More bug fixes to get the line numbering in documentaion right.
+%M \definevimtyping [definition]  [syntax=context,start=109,numbering=on]
+
+\def\definevimtyping
+  {\dodoubleargument\dodefinevimtyping}
+
+%M %More bug fixes to get the line numbering in documentaion right.
+%M \definevimtyping [definition]  [syntax=context,start=continue,numbering=on]
+
+\def\dodefinevimtyping[#1][#2]%
+  {\setevalue{\e!start#1}{\noexpand\dostartbuffer[vimsyntax][\e!start#1][\e!stop#1]}%
+   \setvalue{\e!stop#1}{\dodotypevimfile[#2]{\TEXbufferfile{vimsyntax}}}}
+
+%D Some defaults.
+
+\setupvimtyping
+  [        syntax=context,
+           \c!tab=8,
+         \c!space=\v!yes,
+         \c!start=1,
+          \c!stop=0,
+        \c!before=,
+         \c!after=,
+     \c!numbering=\v!off,
+   \c!numberstyle=\v!smallslanted,
+   \c!numbercolor=,
+          \c!step=1,
+      colorscheme=default,
+  ]
+
+%D Pre-defined Syntax : {{{ 
+%D This is based on \filename{ps_color.vim}, which does not use any bold
+%D typeface.
+
+%D \VIM\ uses hex mode for setting colors, I do not want to convert them to rgb
+%D values.
+
+\startvimcolorscheme[default]
+
+\setupcolor[hex]
+
+\definecolor  [vimsyntax!default!Special]     [h=907000]
+\definecolor  [vimsyntax!default!Comment]     [h=606000]
+\definecolor  [vimsyntax!default!Number]      [h=907000]
+\definecolor  [vimsyntax!default!Constant]    [h=007068]
+\definecolor  [vimsyntax!default!PreProc]     [h=009030]
+\definecolor  [vimsyntax!default!Statement]   [h=2060a8]
+\definecolor  [vimsyntax!default!Type]        [h=0850a0]
+\definecolor  [vimsyntax!default!Todo]        [h=e0e090]
+
+\definecolor  [vimsyntax!default!Error]       [h=c03000]
+\definecolor  [vimsyntax!default!Identifier]  [h=a030a0]
+\definecolor  [vimsyntax!default!SpecialKey]  [h=1050a0]
+\definecolor  [vimsyntax!default!Underline]   [h=6a5acd]
+
+
+\definevimsyntax
+  [Normal]
+  [\c!style=\tttf,\c!color=\maintextcolor]
+
+\definevimsyntax 
+  [Constant]
+  [\c!style=\v!mono,\c!color=vimsyntax!default!Constant]
+
+\definevimsyntaxsynonyms
+  [Character,Boolean,Float]
+  [Constant]
+
+\definevimsyntax
+  [Number]
+  [\c!style=\v!mono,\c!color=vimsyntax!default!Number]
+
+\definevimsyntax
+  [Identifier]
+  [\c!style=\v!mono,\c!color=vimsyntax!default!Identifier]
+
+\definevimsyntaxsynonyms
+  [Function]
+  [Identifier]
+
+\definevimsyntax 
+  [Statement]
+  [\c!style=\v!mono,\c!color=vimsyntax!default!Statement]
+
+\definevimsyntaxsynonyms
+  [Conditional,Repeat,Label,Operator,Keyword,Exception]
+  [Statement]
+
+\definevimsyntax 
+  [PreProc]
+  [\c!style=\v!mono,\c!color=vimsyntax!default!PreProc]
+
+\definevimsyntaxsynonyms
+  [Include,Define,Macro,PreCondit]
+  [PreProc]
+
+\definevimsyntax 
+  [Type,StorageClass, Structure, Typedef]
+  [\c!style=\v!mono, \c!color=vimsyntax!default!Type]
+
+\definevimsyntax 
+  [Special]
+  [\c!style=\v!mono,\c!color=vimsyntax!default!Special]
+
+\definevimsyntax 
+  [SpecialKey]
+  [\c!style=\v!mono,\c!color=vimsyntax!default!SpecialKey]
+
+\definevimsyntax
+  [Tag,Delimiter]
+  [\c!style=\v!mono]
+
+\definevimsyntax
+  [Comment,SpecialComment]
+  [\c!style=\v!mono,\c!color=vimsyntax!default!Comment]
+
+\definevimsyntax
+  [Debug]
+  [\c!style=\v!mono]
+
+\definevimsyntax
+  [Underlined]
+  [\c!style=\v!mono,\c!command=\underbar]
+
+\definevimsyntax 
+  [Ignore]
+  [\c!style=\v!mono]
+
+\definevimsyntax 
+  [Error]
+  [\c!style=\v!mono,\c!color=vimsyntax!default!Error]
+
+\definevimsyntax 
+  [Todo]
+  [\c!style=\v!mono,\c!color=vimsyntax!default!Todo]
+
+\stopvimcolorscheme
+% }}}
+
+\startvimcolorscheme[blackandwhite]
+
+\definevimsyntax
+  [Normal]
+  [\c!style=\tttf,\c!color=\maintextcolor]
+
+\definevimsyntax 
+  [Constant]
+  [\c!style=\v!mono,\c!color=]
+
+\definevimsyntaxsynonyms
+  [Character,Boolean,Float]
+  [Constant]
+
+\definevimsyntax
+  [Number]
+  [\c!style=\v!mono,\c!color=]
+
+\definevimsyntax
+  [Identifier]
+  [\c!style=\v!mono,\c!color=]
+
+\definevimsyntaxsynonyms
+  [Function]
+  [Identifier]
+
+\definevimsyntax 
+  [Statement]
+  [\c!style=\v!mono\v!bold,\c!color=]
+
+\definevimsyntaxsynonyms
+  [Conditional,Repeat,Label,Operator,Keyword,Exception]
+  [Statement]
+
+\definevimsyntax 
+  [PreProc]
+  [\c!style=\v!bold\v!mono,\c!color=]
+
+\definevimsyntaxsynonyms
+  [Include,Define,Macro,PreCondit]
+  [PreProc]
+
+\definevimsyntax 
+  [Type,StorageClass, Structure, Typedef]
+  [\c!style=\v!bold\v!mono, \c!color=]
+
+\definevimsyntax 
+  [Special]
+  [\c!style=\v!mono,\c!color=]
+
+\definevimsyntax 
+  [SpecialKey]
+  [\c!style=\v!mono,\c!color=]
+
+\definevimsyntax
+  [Tag,Delimiter]
+  [\c!style=\v!mono,\c!color=]
+
+\definevimsyntax
+  [Comment,SpecialComment]
+  [\c!style=\v!slanted\v!mono,\c!color=]
+
+\definevimsyntax
+  [Debug]
+  [\c!style=\v!mono,\c!color=]
+
+\definevimsyntax
+  [Underlined]
+  [\c!style=\v!mono,\c!color=,\c!command=\underbar]
+
+\definevimsyntax 
+  [Ignore]
+  [\c!style=\v!mono,\c!color=]
+
+\definevimsyntax 
+  [Error]
+  [\c!style=\v!mono,\c!color=,\c!command=\overstrike]
+
+\definevimsyntax 
+  [Todo]
+  [\c!style=\v!mono,\c!command=\inframed]
+
+\stopvimcolorscheme
+% }}}
+
+
+\protect
+
+\stopmodule
+
+
+%D An example usage: {{{
+
+\doifnotmode{demo}{\endinput}
+
+\setupcolors[state=start]
+
+\usetypescript[modern-base][texnansi]
+
+\setupbodyfont[modern,10pt]
+
+\starttext
+
+\title{Matlab Code Listing -- Color}
+
+\definevimtyping  [MATLAB]  [syntax=matlab]
+
+\startMATLAB
+function russell_demo()
+% Do the example in ch 17 (p501) of Russell and Norvig
+% (1,1) is top left corner.
+r = 3; c = 4; p = 0.8; action_cost = -1/25;
+obstacle = zeros(r,c); obstacle(2,2)=1;
+terminal = zeros(r,c); terminal(1,4)=1; terminal(2,4)=1;
+absorb = 1;
+wrap_around = 0;
+noop = 0;
+T = mk_grid_world(r, c, p, obstacle, terminal, absorb, wrap_around, noop);
+% Add rewards for terminal states
+nstates = r*c + 1;
+if noop
+  nact = 5;
+else
+  nact = 4;
+end
+R = action_cost*ones(nstates, nact);
+R(10,:) = 1;
+R(11,:) = -1;
+R(nstates,:) = 0;
+discount_factor = 1;
+
+V = value_iteration(T, R, discount_factor);
+%reshape(V(1:end-1),[r c])
+%    0.8116    0.8678    0.9178    1.0000
+%    0.7616    0.7964    0.6603   -1.0000
+%    0.7053    0.6553    0.6114    0.3878
+% Same as the book p501
+
+Q = Q_from_V(V, T, R, discount_factor);
+[V, p] = max(Q, [], 2);
+
+
+use_val_iter = 1;
+% (I-gT) is singular since g=1 and there is an absorbing state (i.e., T(i,i)=1)
+% Hence we cannot use value determination.
+[p,V] = policy_iteration(T, R, discount_factor, use_val_iter);
+
+%reshape(V(1:end-1),[r c])
+%    0.8115    0.8678    0.9178    1.0000
+%    0.7615    0.7964    0.6603   -1.0000
+%    0.7048    0.6539    0.6085    0.3824
+\stopMATLAB
+
+\title{Lua Code Listing -- Black and White}
+
+\definevimtyping  [LUA]  [syntax=lua,colorscheme=blackandwhite]
+
+\startLUA
+-- version   : 1.0.0 - 07/2005
+-- author    : Hans Hagen - PRAGMA ADE - www.pragma-ade.com
+-- copyright : public domain or whatever suits
+-- remark    : part of the context distribution
+
+-- TODO: name space for local functions
+
+-- loading: scite-ctx.properties
+
+-- generic functions
+
+local crlf = "\n"
+
+function traceln(str)
+    trace(str .. crlf)
+    io.flush()
+end
+
+table.len  = table.getn
+table.join = table.concat
+
+function table.found(tab, str)
+    local l, r, p
+    if string.len(str) == 0 then
+        return false
+    else
+        l, r = 1, table.len(tab)
+        while l <= r do
+            p = math.floor((l+r)/2)
+            if str < tab[p] then
+                r = p - 1
+            elseif str > tab[p] then
+                l = p + 1
+            else
+                return true
+            end
+        end
+        return false
+    end
+end
+
+function string.grab(str, delimiter)
+    local list = {}
+    for snippet in string.gfind(str,delimiter) do
+        table.insert(list, snippet)
+    end
+    return list
+end
+
+function string.join(list, delimiter)
+    local size, str = table.len(list), ''
+    if size > 0 then
+        str = list[1]
+        for i = 2, size, 1 do
+            str = str .. delimiter .. list[i]
+        end
+    end
+    return str
+end
+
+function string.spacy(str)
+    if string.find(str,"^%s*$") then
+        return true
+    else
+        return false
+    end
+end
+
+function string.alphacmp(a,b,i) -- slow but ok
+    if i and i > 0 then
+        return string.lower(string.gsub(string.sub(a,i),'0',' ')) < string.lower(string.gsub(string.sub(b,i),'0',' '))
+    else
+        return string.lower(a) < string.lower(b)
+    end
+end
+
+function table.alphasort(list,i)
+    table.sort(list, function(a,b) return string.alphacmp(a,b,i) end)
+end
+
+function io.exists(filename)
+    local ok, result, message = pcall(io.open,filename)
+    if result then
+        io.close(result)
+        return true
+    else
+        return false
+    end
+end
+
+function os.envvar(str)
+    if os.getenv(str) ~= '' then
+        return os.getenv(str)
+    elseif os.getenv(string.upper(str)) ~= '' then
+        return os.getenv(string.upper(str))
+    elseif os.getenv(string.lower(str)) ~= '' then
+        return os.getenv(string.lower(str))
+    else
+        return ''
+    end
+end
+
+function string.expand(str)
+    return string.gsub(str, "ENV%((%w+)%)", os.envvar)
+end
+
+function string.strip(str)
+    return string.gsub(string.gsub(str,"^%s+",''),"%s+$",'')
+end
+
+function string.replace(original,pattern,replacement)
+    local str = string.gsub(original,pattern,replacement)
+--     print(str) -- indirect, since else str + nofsubs
+    return str -- indirect, since else str + nofsubs
+end
+
+\stopLUA
+
+% \title{Source Code of the Module}
+
+% \typevimfile[numbering=on,numbercolor=red,step=5]{\jobname.tex}
+
+\stoptext
+
+% }}}
diff --git a/Master/texmf-dist/tpm/t-vim.tpm b/Master/texmf-dist/tpm/t-vim.tpm
new file mode 100644
index 00000000000..9a850d78c93
--- /dev/null
+++ b/Master/texmf-dist/tpm/t-vim.tpm
@@ -0,0 +1,33 @@
+<!DOCTYPE rdf:RDF SYSTEM "tpm.dtd">
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:TPM="http://texlive.dante.de/">
+  <rdf:Description about="http://dl.contextgarden.net/modules/t-vim">
+    <TPM:Name>t-vim</TPM:Name>
+    <TPM:Type>Module</TPM:Type>
+    <TPM:Date>2007/01/04 00:00:00</TPM:Date>
+    <TPM:Version>2007.01.03</TPM:Version>
+    <TPM:Creator>Aditya Mahajan</TPM:Creator>
+    <TPM:Title>ViM syntax highlighting</TPM:Title>
+    <TPM:Description>
+      This module uses ViM editor's syntax files to pretty print verbatim code in ConTeXt
+    </TPM:Description>
+    <TPM:Author>Aditya Mahaja</TPM:Author>
+    <TPM:Size>412257</TPM:Size>
+    <TPM:Build/>
+     <TPM:RunFiles size="29697">
+       tex/context/third/vim/2context.vim
+       tex/context/third/vim/t-vim.tex
+       tex/context/interface/third/t-vim.xml
+     </TPM:RunFiles>
+     <TPM:DocFiles size="382560">
+       doc/context/third/vim/vim-doc.pdf
+       doc/context/third/vim/vim-demo.pdf
+       doc/context/third/vim/README
+       tpm/t-vim.tpm
+     </TPM:DocFiles>
+    <TPM:Requires>
+      <TPM:Package name="context"/>
+    </TPM:Requires>
+    <TPM:Provides>t-vim</TPM:Provides>
+  </rdf:Description>
+</rdf:RDF>
+
diff --git a/Master/tlpkg/tlpsrc/collection-context.tlpsrc b/Master/tlpkg/tlpsrc/collection-context.tlpsrc
index 628b1625442..dec494b6949 100644
--- a/Master/tlpkg/tlpsrc/collection-context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-context.tlpsrc
@@ -17,5 +17,6 @@ depend context-lettrine
 depend context-lilypond
 depend context-mathsets
 depend context-typearea
+depend context-vim
 depend collection-metapost
 depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/context-vim.tlpsrc b/Master/tlpkg/tlpsrc/context-vim.tlpsrc
new file mode 100644
index 00000000000..50b02628989
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/context-vim.tlpsrc
@@ -0,0 +1,5 @@
+name context-vim
+category Package
+runpattern d texmf-dist/tex/context/third/vim
+runpattern f texmf-dist/tex/context/interface/third/t-vim.xml
+docpattern d texmf-dist/doc/context/third/vim