4 files changed, 76 insertions, 23 deletions
diff --git a/Master/texmf-dist/doc/context/third/rst/COPYING b/Master/texmf-dist/doc/context/third/rst/COPYING
index 05f08de1457..6d4166538b7 100644
--- a/Master/texmf-dist/doc/context/third/rst/COPYING
+++ b/Master/texmf-dist/doc/context/third/rst/COPYING
@@ -1,4 +1,4 @@
-Copyright 2010-2011 Philipp Gesang. All rights reserved.
+Copyright 2010-2012 Philipp Gesang. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
diff --git a/Master/texmf-dist/doc/context/third/rst/README.rst b/Master/texmf-dist/doc/context/third/rst/README.rst
index 1ab41ce94e8..8c0e6fd75db 100644
--- a/Master/texmf-dist/doc/context/third/rst/README.rst
+++ b/Master/texmf-dist/doc/context/third/rst/README.rst
@@ -4,8 +4,8 @@ General Advice
 
 Read the section *Features Not Implemented* in the manual first.
 
-*Note*: if you happen to read this on BitBucket, the error messages some lines
-below just mean that *their* implementation doesn’t understand TeX directives.
+*Note*: if you happen to read this on BitBucket_, the error messages some lines
+below just mean that *their* implementation doesn’t understand |TeX| directives.
 Don’t worry, |rstcontext| does.
 
 ============
@@ -57,12 +57,13 @@ the maintainer_ (Contact_).
 Contact
 =======
 
-|rstcontext| was written by Philipp Gesang, ``megas.kapaneus`` at ``gmail`` dot
+|rstcontext| was written by Philipp Gesang, ``phg42.2a`` at ``gmail`` dot
 ``com`` (find me on BitBucket_).
 
 .. |rstcontext| ctx:: {{\em rst}\kern.5pt\CONTEXT}
+.. |TeX| ctx:: {\TEX}
 .. |CONTEXT| ctx:: {\CONTEXT}
 
-.. _Contact: megas.kapaneus@gmail.com
+.. _Contact: phg42.2a@gmail.com
 .. _BitBucket:  http://bitbucket.org/phg
 .. _maintainer: Contact_
diff --git a/Master/texmf-dist/doc/context/third/rst/manual.pdf b/Master/texmf-dist/doc/context/third/rst/manual.pdf
index de331b5fed5..60e26dd060b 100644
--- a/Master/texmf-dist/doc/context/third/rst/manual.pdf
+++ b/Master/texmf-dist/doc/context/third/rst/manual.pdf
diff --git a/Master/texmf-dist/doc/context/third/rst/manual.tex b/Master/texmf-dist/doc/context/third/rst/manual.tex
index 460051b69c3..cbb0382d968 100644
--- a/Master/texmf-dist/doc/context/third/rst/manual.tex
+++ b/Master/texmf-dist/doc/context/third/rst/manual.tex
@@ -1,8 +1,13 @@
-\usemodule[bib]
-
 \setuppapersize[A5][A5]
 
-\setupcombinedlist[content][interaction=all,focus=standard]
+\setupcombinedlist[content][interaction=all,]
+
+\setupinteraction[
+  state=start,
+  focus=standard,
+  color=darkcyan,
+  contrastcolor=\interactionparameter{color},
+]
 
 \setupindenting[yes,next,medium] % -> lead to the glue node error in mkiv
 
@@ -13,7 +18,16 @@
 \setupheads[indentnext=yes]
 \setupfloats[indentnext=yes]
 
-\setupbodyfont[10pt]
+\setupbodyfont[latin-modern,10pt]
+\definefontfeature [textfigures]    [onum=yes]
+\definefontfeature [liningfigures]  [onum=no]
+\definefontfeature [texligatures]   [tlig=yes]
+\definefontfeature [notexligatures] [tlig=yes]
+\addfs{textfigures,texligatures}
+
+\setuptyping[
+  style={\addff{liningfigures,notexligatures}\ttx},
+]
 
 % title page
 \startbuffer[frontpage]
@@ -38,10 +52,10 @@
 \startstandardmakeup
 \vfill
 \framed [align=right,frame=off,topframe=on] {%
-\tfxx\ss\setupinterlinespace[small]
-Copyright 2010--2011 by Philipp Gesang, Dossenheim.\par
-Mail any patches or suggestions to\par
-\type{string.format("%s@%s.com", "megas.kapaneus", "gmail")}\par
+\tfxx\ss\setupinterlinespace[small]\noindentation
+Copyright 2010--2012 by Philipp Gesang, Heidelberg.\par
+Mail any bug reports, patches or suggestions to\par
+\type{string.format("%s@%s.com", "phg42.2a", "gmail")}\par
 or pay a visit to \goto{my BitBucket home}[url(http://bitbucket.org/phg/)].\par
 }
 \stopstandardmakeup
@@ -49,17 +63,51 @@ or pay a visit to \goto{my BitBucket home}[url(http://bitbucket.org/phg/)].\par
 
 
 % table of contents
-\startbuffer[toc]
-\setuppagenumbering[state=start,alternative=doublesided,location=]
-\setupheadertexts
-  [{\tfx\sc\getmarking[chapter]}]   [{\tfx\bf \pagenumber}]
-  [{\tfx\bf \pagenumber}]           [{\tfx{\em rst}{\kern.5pt\CONTEXT}}]
-\completecontent
+\startbuffer [toc]
+\setuppagenumbering[
+  state=start,
+  alternative=doublesided,
+  location=,
+]
+\setuplayout [grid=no]
+\setuptolerance [verytolerant]
+\setuptolerance [vertical,verytolerant]
+
+\newdimen \mypagenumdistance \mypagenumdistance .7em
+\def\fillercmd{\nobreak\hskip\mypagenumdistance}
+
+\definelistplacement[my_list_placement][command]#1#2#3%
+  {#2\fillercmd#3\hskip1.5em}
+
+\setuplist [chapter] [alternative=a,style=\word\sc]
+\setuplist [section] [alternative=my_list_placement,]
+
+\startsetups toc:subsection
+    \noindentation\placelist[subsection]
+\stopsetups
+
+\startsetups toc:section
+  \blank
+  \setupnarrower [middle=9em,]
+  \startnarrower[middle]\tfx
+  \noindentation\placelist[section][after=\setups{toc:subsection}]
+  \stopnarrower
+  \blank
+\stopsetups
+
+\title{Contents}
+
+\placelist [chapter] [criterium=text,after=\setups{toc:section}]
+
+% \setupheadertexts
+%   [{\tfx\sc\getmarking[chapter]}]   [{\tfx\bf \pagenumber}]
+%   [{\tfx\bf \pagenumber}]           [{\tfx{\em rst}{\kern.5pt\CONTEXT}}]
+% \completecontent
 \stopbuffer
 
 % something radically changed in mkiv
 \startluacode
-jobvariables = jobvariables or {}
+jobvariables           = job.variables or {}
 jobvariables.tobesaved = jobvariables.tobesaved or {}
 \stopluacode
 
@@ -72,9 +120,13 @@ jobvariables.tobesaved = jobvariables.tobesaved or {}
 \completepublications
 \stopbuffer
 
-\appendtoks  \getbuffer[frontpage] \to \everystarttext
-\appendtoks  \getbuffer[author]    \to \everystarttext
-\appendtoks  \getbuffer[toc]       \to \everystarttext
+\appendtoks
+  \startfrontmatter
+    \getbuffer[frontpage]
+    \getbuffer[author]
+    \getbuffer[toc]
+  \stopfrontmatter
+\to \everystarttext
 
 %\prependtoks \getbuffer[pubs]      \to \everystoptext