context release 2006.12.20

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

34 files changed, 454 insertions, 134 deletions

diff --git a/Master/texmf-dist/tex/context/base/cont-log.tex b/Master/texmf-dist/tex/context/base/cont-log.tex
index 4f9bf2d5e3e..37aabbbb619 100644
--- a/Master/texmf-dist/tex/context/base/cont-log.tex
+++ b/Master/texmf-dist/tex/context/base/cont-log.tex
@@ -224,11 +224,11 @@
 
 %D Some placeholders:
 
-\def\eTeX     {\mathematics{\varepsilon}-\TeX}
-\def\pdfTeX   {pdf\TeX}
-\def\pdfeTeX  {pdfe-\TeX}
-\def\luaTeX   {lua\TeX}
-\def\XeTeX    {X\lower.5ex\hbox{\kern-.15em\mirror{E}}\kern-.1667em\TeX}
+\def\eTeX             {\mathematics{\varepsilon}-\TeX}
+\def\pdfTeX           {pdf\TeX}
+\def\pdfeTeX          {pdfe-\TeX}
+\def\luaTeX           {lua\TeX}
+\unexpanded\def\XeTeX {X\lower.5ex\hbox{\kern-.15em\mirror{E}}\kern-.1667em\TeX}
 
 \let\ETEX     \eTeX
 \let\PDFTEX   \pdfTeX
@@ -243,8 +243,8 @@
 
   \let\NormalTeXLogo\TeX
 
-  \def\TeX  {T\smash[d]{\kern-.1667em\lower.5ex\hbox{E}}\kern-.125emX}
-  \def\XeTeX{X\smash[d]{\lower.5ex\hbox{\kern-.15em\mirror{E}}}\kern-.1667em\TeX}
+  \unexpanded\def\TeX  {T\smash[d]{\kern-.1667em\lower.5ex\hbox{E}}\kern-.125emX}
+  \unexpanded\def\XeTeX{X\smash[d]{\lower.5ex\hbox{\kern-.15em\mirror{E}}}\kern-.1667em\TeX}
 
 \endXETEX
 
diff --git a/Master/texmf-dist/tex/context/base/cont-new.tex b/Master/texmf-dist/tex/context/base/cont-new.tex
index 24126438d71..a730ab92806 100644
--- a/Master/texmf-dist/tex/context/base/cont-new.tex
+++ b/Master/texmf-dist/tex/context/base/cont-new.tex
@@ -13,7 +13,7 @@
 
 % it's about time to clean up this file ...
 
-\newcontextversion{2006.12.07 18:22}
+\newcontextversion{2006.12.20 23:52}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
@@ -29,6 +29,16 @@
 
 \let\then\relax % \ifnum1>2\then -)
 
+\def\defXMLexpanded#1#2%
+  {\begingroup
+   \let\getXMLentity\expandedXMLentity
+   \expanded{\endgroup\edef\noexpand#1{#2}}}
+
+\def\gdefXMLexpanded#1#2%
+  {\begingroup
+   \let\getXMLentity\expandedXMLentity
+   \expanded{\endgroup\xdef\noexpand#1{#2}}}
+
 \def\dividedsize#1#2#3% size gap n
   {\dimexpr
      \ifnum\dimexpr#1\relax>\plusone
diff --git a/Master/texmf-dist/tex/context/base/context.tex b/Master/texmf-dist/tex/context/base/context.tex
index f9356f14a29..70c21e5bdfa 100644
--- a/Master/texmf-dist/tex/context/base/context.tex
+++ b/Master/texmf-dist/tex/context/base/context.tex
@@ -42,7 +42,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2006.12.07 18:22}
+\edef\contextversion{2006.12.20 23:52}
 
 %D For those who want to use this:
 
diff --git a/Master/texmf-dist/tex/context/base/core-ctx.tex b/Master/texmf-dist/tex/context/base/core-ctx.tex
index ba47f07fd1a..88659122f7b 100644
--- a/Master/texmf-dist/tex/context/base/core-ctx.tex
+++ b/Master/texmf-dist/tex/context/base/core-ctx.tex
@@ -24,7 +24,9 @@
 \def    \preprocesssuffix {.prep}
 
 \def\loadctxpreplist
-  {\ifcase\preprocessmethod
+  {\begingroup
+   \chardef\XMLtokensreduction\plusone
+   \ifcase\preprocessmethod
      % no checking
    \or
      % simple checking
@@ -42,7 +44,8 @@
         \egroup}%
        {\global\chardef\preprocessmode\plusone}%
    \fi
-   \global\let\loadctxpreplist\relax}
+   \global\let\loadctxpreplist\relax
+   \endgroup}
 
 \appendtoks\loadctxpreplist\to\everystarttext % will become: \prependtoks\loadctxpreplist\to\everyjob
 
diff --git a/Master/texmf-dist/tex/context/base/core-itm.tex b/Master/texmf-dist/tex/context/base/core-itm.tex
index 9f132a96ab2..9642b0f945d 100644
--- a/Master/texmf-dist/tex/context/base/core-itm.tex
+++ b/Master/texmf-dist/tex/context/base/core-itm.tex
@@ -65,6 +65,10 @@
 \newconditional\paragraphlistitem \setfalse\paragraphlistitem
 \newconditional\textlistitem      \setfalse\textlistitem
 \newconditional\firstlistitem     \setfalse\firstlistitem
+\newconditional\beforelistitem    \setfalse\beforelistitem
+\newconditional\afterlistitem     \setfalse\afterlistitem
+\newconditional\nowhitelistitem   \setfalse\nowhitelistitem
+\newconditional\joinedlistitem    \setfalse\joinedwhitelistitem
 
 \newcounter\noflists
 \newcounter\itemlevel
@@ -178,9 +182,12 @@
        #2*\v!broad*=>\setitemparameter{#1}\c!factor{#2},
            \v!text*=>\settrue\textlistitem
                      \settrue\inlinelistitem
-                     \dosetuppackeditemgroup{#1}%
+                     \settrue\joinedlistitem % \dosetuppackeditemgroup{#1}%
                      \packitems,
         \v!columns*=>\packitems,
+         \v!before*=>\settrue\beforelistitem,
+          \v!after*=>\settrue\afterlistitem,
+        \v!nowhite*=>\settrue\nowhitelistitem, % \def\packeditemspacing{\nowhitespace},
          \v!margin*=>\setitemparameter{#1}\c!width{-2em}, % signal
        \v!inmargin*=>\setitemparameter{#1}\c!width{-2em}, % signal
        \v!atmargin*=>\doifnot{#1}{1}{\setitemparameter{#1}\c!width{0em}}, % signal
@@ -188,7 +195,7 @@
           \v!loose*=>\setfalse\optimizelistitem,
       \v!paragraph*=>\settrue\paragraphlistitem
                      \packitems,
-       \v!joinedup*=>\dosetuppackeditemgroup{#1}%
+       \v!joinedup*=>\settrue\joinedlistitem % \dosetuppackeditemgroup{#1}%
                      \packitems,
         \v!serried*=>\setitemparameter{#1}\c!factor{-1},
    #2#3*\v!serried*=>\setitemparameter{#1}\c!factor{-#2#3},
@@ -211,12 +218,75 @@
       \c!after=\blank,
       \c!inner=]}
 
-\def\dosetuppackeditemgroup#1%
-  {\letitemparameter{#1}\c!beforehead\empty
-   \letitemparameter{#1}\c!afterhead \empty
-   \letitemparameter{#1}\c!before    \empty
-   \letitemparameter{#1}\c!after     \empty
-   \letitemparameter{#1}\c!inbetween \empty}
+% \def\packeditemspacing{\empty}
+
+% \setupwhitespace[big]
+% \starttext
+%     test \startitemize[joinedup]                \item test \item test \stopitemize test \par
+%     test \startitemize[joinedup,nowhite]        \item test \item test \stopitemize test \par
+%     test \startitemize[joinedup,nowhite,before] \item test \item test \stopitemize test \par
+%     test \startitemize[joinedup,nowhite,after]  \item test \item test \stopitemize test \par
+% \stoptext
+
+\def\itembeforecommand
+  {\ifconditional\nowhitelistitem
+     \ifconditional\beforelistitem
+       \ifcase\itemlevel\or\getitemparameter\itemlevel\c!before\fi
+     \else
+        \nowhitespace
+     \fi
+   \else\ifconditional\joinedlistitem
+     % \empty
+   \else
+     \getitemparameter\itemlevel\c!before
+   \fi\fi}
+
+\def\itemaftercommand
+  {\ifconditional\nowhitelistitem
+     \ifconditional\afterlistitem
+       \ifcase\itemlevel\or\getitemparameter\itemlevel\c!after\fi
+     \else
+        \nowhitespace
+     \fi
+   \else\ifconditional\joinedlistitem
+     % \empty
+   \else
+     \getitemparameter\itemlevel\c!after
+   \fi\fi}
+
+\def\iteminbetweencommand
+  {\ifconditional\nowhitelistitem
+     \nowhitespace
+   \else\ifconditional\joinedlistitem
+     % \empty
+   \else
+     \getitemparameter\itemlevel\c!inbetween
+   \fi\fi}
+
+\def\itembeforeheadcommand
+  {\ifconditional\nowhitelistitem
+     \nowhitespace
+   \else\ifconditional\joinedlistitem
+     % \empty
+   \else
+     \getitemparameter\itemlevel\c!beforehead
+   \fi\fi}
+
+\def\itemafterheadcommand
+  {\ifconditional\nowhitelistitem
+     \nowhitespace
+   \else\ifconditional\joinedlistitem
+     % \empty
+   \else
+     \getitemparameter\itemlevel\c!afterhead
+   \fi\fi}
+
+% \def\dosetuppackeditemgroup#1%
+%   {\setitemparameter{#1}\c!beforehead{\packeditemspacing}%
+%    \setitemparameter{#1}\c!afterhead {\packeditemspacing}%
+%    \setitemparameter{#1}\c!before    {\packeditemspacing}%
+%    \setitemparameter{#1}\c!after     {\packeditemspacing}%
+%    \setitemparameter{#1}\c!inbetween {\packeditemspacing}}
 
 \def\dosetupitemgroupconstant[#1][#2]%
   {\def\dodosetupitemgroupconstant##1% catches empty in [a,b,] handy for xml
@@ -501,7 +571,7 @@
    \doifinset\v!columns{#1}%
      {\ifinsidecolumns\else\ifnum\itemcolumndepth=\zerocount
         \globallet\itemcolumndepth\itemlevel
-        \getitemparameter\itemlevel\c!before
+        \itembeforecommand
         \processfirstactioninset
           [#1]
           [  \v!one=>\!!counta1\relax,
@@ -551,20 +621,20 @@
    \ifnum\itemcolumndepth=\itemlevel\relax
      \stopcolumns
      \doglobal\newcounter\itemcolumndepth
-     \getitemparameter\itemlevel\c!after
+     \itemaftercommand
      \dontrechecknextindentation
    \else
      \ifnum\itemlevel=\plusone
        \doitembreak\allowbreak           % toegevoegd
-       \getitemparameter1\c!after
+       \itemaftercommand % \getitemparameter\itemlevel\c!after
        % was: \dochecknextindentation\??oo, is now:
        \dochecknextindentation{\??op\currentitemgroup\itemlevel}%
      \else
        % nieuw, not yet nobreak handling
        \ifcase\autoitemgroupspacing
-         \getitemparameter\itemlevel\c!after
+         \itemaftercommand
        \or
-         \getitemparameter\itemlevel\c!after
+         \itemaftercommand
        \fi
        \dontrechecknextindentation
      \fi
@@ -863,7 +933,7 @@
      \or % 1
        \ifnum\itemcolumndepth=0\relax
          \ifconditional\introlistitem\doitembreak\nobreak\fi
-         \getitemparameter1\c!before
+         \itembeforecommand % \getitemparameter\itemlevel\c!before
          \ifconditional\introlistitem\doitembreak\nobreak\fi
        \fi
      \else % 2 en hoger
@@ -871,10 +941,10 @@
          \let\previtemlevel\itemlevel
          \decrement\previtemlevel
          \ifcase\autoitemgroupspacing\relax % nieuw
-           \getitemparameter\itemlevel\c!before
+           \itembeforecommand
          \or
-            \doifelsenothing{\getitemparameter\itemlevel\c!before}
-              {\getitemparameter\itemlevel\c!before}
+            \doifelsenothing{\itembeforecommand}
+              {\itembeforecommand}
               {\getitemparameter\previtemlevel\c!inbetween}%
          \else
            \getitemparameter\previtemlevel\c!inbetween % == itemlevel-1
@@ -886,7 +956,7 @@
 %     \removeunwantedspaces\hskip\interwordspace\!!plus\emwidth\relax % new per 2006/10/20
     \removeunwantedspaces\hskip\emwidth\!!plus\interwordstretch\!!minus\interwordshrink\relax % new per 2006/10/20
 \else
-     \getitemparameter\itemlevel\c!inbetween
+     \iteminbetweencommand
 \fi
    \fi
    \ifconditional\concatnextitem % new, concat
@@ -946,7 +1016,7 @@
 
 % \def\complexdoitemgrouphead[#1]#2\par% % beter in \complexdosom hangen met een if
 %   {\ifconditional\firstlistitem\else\doitembreak\allowbreak\fi
-%    \ifconditional\packlistitem\else\getitemparameter\itemlevel\c!beforehead\fi
+%    \ifconditional\packlistitem\else\itembeforeheadcommand\fi
 %    \ifconditional\firstlistitem\ifconditional\introlistitem\else\ifcase\itemlevel % incr in \complexdosom
 %       \doitembreak\allowbreak
 %    \fi\fi\fi
@@ -958,7 +1028,7 @@
 %      \par
 %    \fi
 %    \doitembreak\nobreak
-%    \ifconditional\packlistitem\else\getitemparameter\itemlevel\c!afterhead\fi
+%    \ifconditional\packlistitem\else\itemafterheadcommand\fi
 %    \doitembreak\nobreak
 %    \noindentation}
 %
@@ -969,7 +1039,7 @@
 
 \def\complexdoitemgrouphead[#1]% beter in \complexdosom hangen met een if
   {\ifconditional\firstlistitem\else\doitembreak\allowbreak\fi
-   \ifconditional\packlistitem\else\getitemparameter\itemlevel\c!beforehead\fi
+   \ifconditional\packlistitem\else\itembeforeheadcommand\fi
    \ifconditional\firstlistitem\ifconditional\introlistitem\else\ifcase\itemlevel % incr in \complexdosom
      \doitembreak\allowbreak
    \fi\fi\fi
@@ -989,7 +1059,7 @@
      \par
    \fi
    \doitembreak\nobreak
-   \ifconditional\packlistitem\else\getitemparameter\itemlevel\c!afterhead\fi
+   \ifconditional\packlistitem\else\itemafterheadcommand\fi
    \doitembreak\nobreak
    \noindentation}
 
diff --git a/Master/texmf-dist/tex/context/base/core-mat.tex b/Master/texmf-dist/tex/context/base/core-mat.tex
index 0a75bfcf617..b4ee9173033 100644
--- a/Master/texmf-dist/tex/context/base/core-mat.tex
+++ b/Master/texmf-dist/tex/context/base/core-mat.tex
@@ -648,7 +648,8 @@
       \ifx\next\bgroup
         \egroup \@EA\moreplaceformula % [ref]{}
       \else
-        \def\nextnext{$}%
+%         \def\nextnext{$}%
+        \let\nextnext$%
         \ifx\next\nextnext
           \egroup \@EAEAEA\dispplaceformula % [ref]$$
         \else
@@ -660,7 +661,8 @@
 \long\def\moreplaceformula[#1]#2#3#4% #2 dummy #4 gobbles spaces
   {\def\redoplaceformula
      {\bgroup
-      \def\nextnext{$}%
+%       \def\nextnext{$}%
+      \let\nextnext$%
       \ifx\next\nextnext
         \egroup \@EA\dispplaceformula % [ref]$$
       \else
@@ -1141,6 +1143,7 @@
    \catcode`\_=\@@active
    \def_{\ifmmode\expandafter\suber\else\expandafter\normalsuber\fi}}
 \egroup
+
 %D \macros
 %D   {enableautomath}
 %D
diff --git a/Master/texmf-dist/tex/context/base/core-mis.tex b/Master/texmf-dist/tex/context/base/core-mis.tex
index 2547e9afae3..5cec47f647b 100644
--- a/Master/texmf-dist/tex/context/base/core-mis.tex
+++ b/Master/texmf-dist/tex/context/base/core-mis.tex
@@ -1060,7 +1060,7 @@
 
 \def\dorepeatdelimitedtext
   {\relax\ifcase\delimitedtextparameter\c!level\else
-     \dohandledelimitedtext\c!middle
+     \dohandledelimitedtext\c!middle % maybe better \dohandleleftdelimitedtext
    \fi}
 
 \let\dohandlerepeatdelimitedtext\relax
@@ -1109,15 +1109,26 @@
    \doifsomething{\delimitedtextparameter\c!spaceafter}
      {\blank[\delimitedtextparameter\c!spaceafter]}}
 
+% \def\dostartdelimitedtexttxt
+%   {\let\dostopdelimitedtext\dostopdelimitedtexttxt
+%    \dostartattributes{\??ci\currentdelimitedtext}\c!style\c!color\empty
+%    \dohandledelimitedtext\c!left
+%    \ignorespaces}
+
 \def\dostartdelimitedtexttxt
   {\let\dostopdelimitedtext\dostopdelimitedtexttxt
    \dostartattributes{\??ci\currentdelimitedtext}\c!style\c!color\empty
-   \dohandledelimitedtext\c!left
+   \dohandleleftdelimitedtext\c!left
    \ignorespaces}
 
+% \def\dostopdelimitedtexttxt
+%   {\removeunwantedspaces
+%    \dohandledelimitedtext\c!right
+%    \dostopattributes}
+
 \def\dostopdelimitedtexttxt
   {\removeunwantedspaces
-   \dohandledelimitedtext\c!right
+   \dohandlerightdelimitedtext\c!right
    \dostopattributes}
 
 \def\stopdelimitedtext
@@ -1156,12 +1167,28 @@
 \def\rightdelimitedtextmark
   {\hsmash{\delimitedtextparameter\c!right}}
 
+% \starttext
+%    \hyphenatedword{groepsvrijstellingsverordeningen}\par
+%    \hyphenatedword{\quote{groepsvrijstellingsverordeningen}}\par
+%     \dorecurse{100}{\hskip300pt\hskip\recurselevel pt test \quote{xxx xxxx}.\par}
+%     \page \setuppapersize[A5][A4]
+%     \quotation {overly beautiful pusillanimous sesquipedalian
+%     longwinded} test test test test test test test test test test test
+%     test test test test test test test test test test test test test
+%     test test test test test test test test test test test test test
+%     test test test test test test test test test test test test test
+%     test test test
+% \stoptext
+
 \def\dohandledelimitedtext#1#2%
   {\begingroup
    \setbox\scratchbox\hbox{\delimitedtextparameter#1}%
    \ifdim\wd\scratchbox>\zeropoint
-     \ifdim\lastskip=\delimitedtextsignal
-       \unskip\hskip\hspaceamount\currentlanguage{interquotation}%
+%      \ifdim\lastskip=\delimitedtextsignal
+%        \unskip
+     \ifdim\lastkern=\delimitedtextsignal
+       \unkern
+       \hskip\hspaceamount\currentlanguage{interquotation}%
      \else
        #2%
      \fi
@@ -1171,33 +1198,101 @@
      \fi
      \strut % new, needed below
      \delimitedtextparameter#1% unhbox\scratchbox
-     % \penalty\!!tenthousand % else overfull boxes
+%      \penalty\!!tenthousand % else overfull boxes, but that's better than dangling periods
+     \kern\delimitedtextsignal % +- \prewordbreak
+   \fi
+   \endgroup}
+
+\def\dohandleleftdelimitedtext#1#2%
+  {\begingroup
+   \setbox\scratchbox\hbox{\delimitedtextparameter#1}%
+   \ifdim\wd\scratchbox>\zeropoint
+     \ifdim\lastkern=\delimitedtextsignal
+       \unkern
+       \hskip\hspaceamount\currentlanguage{interquotation}%
+     \else\ifdim\lastskip=\delimitedtextsignal
+       \unskip
+       \hskip\hspaceamount\currentlanguage{interquotation}%
+     \else
+       #2%
+     \fi\fi
+     \strut % new, needed below
+     \ifhmode % else funny pagebeaks
+       \penalty\!!tenthousand
+       \hskip\zeropoint % == \prewordbreak
+     \fi
+     \strut % new, needed below
+     \delimitedtextparameter#1% unhbox\scratchbox
      \hskip\delimitedtextsignal % +- \prewordbreak
    \fi
    \endgroup}
 
+\def\dohandlerightdelimitedtext#1#2%
+  {\begingroup
+   \setbox\scratchbox\hbox{\delimitedtextparameter#1}%
+   \ifdim\wd\scratchbox>\zeropoint
+     \ifdim\lastkern=\delimitedtextsignal
+       \unkern
+       \hskip\hspaceamount\currentlanguage{interquotation}%
+     \else\ifdim\lastskip=\delimitedtextsignal
+       \unskip
+       \hskip\hspaceamount\currentlanguage{interquotation}%
+     \else
+       #2%
+     \fi\fi
+     \ifhmode % else funny pagebeaks
+       \penalty\!!tenthousand
+       \hskip\zeropoint % == \prewordbreak
+     \fi
+     \strut % new, needed below
+     \delimitedtextparameter#1% unhbox\scratchbox
+     \kern\delimitedtextsignal % +- \prewordbreak
+   \fi
+   \endgroup}
+
 \def\ignoredelimitedtext#1%
   {\delimitedtextparameter#1}
 
 \def\handledelimitedtext#1%
   {\dohandledelimitedtext{#1}\relax}
 
+\def\handleleftdelimitedtext#1%
+  {\dohandleleftdelimitedtext{#1}\relax}
+
+\def\handlerightdelimitedtext#1%
+  {\dohandlerightdelimitedtext{#1}\relax}
+
+% \unexpanded\def\dodelimitedtextpar
+%   {\dohandledelimitedtext\c!left\relax
+%    \groupedcommand
+%      \donothing
+%      {\dohandledelimitedtext\c!right\removelastskip
+%       \popdelimitedtext}}
+
 \unexpanded\def\dodelimitedtextpar
-  {\dohandledelimitedtext\c!left\relax
+  {\dohandleleftdelimitedtext\c!left\relax
    \groupedcommand
      \donothing
-     {\dohandledelimitedtext\c!right\removelastskip
+     {\dohandlerightdelimitedtext\c!right\removelastskip
       \popdelimitedtext}}
 
 \unexpanded\def\dodelimitedtexttxt
   {\doifelse{\delimitedtextparameter\c!style}\v!normal
      \doquoteddelimited\doattributeddelimited}
 
+% \def\doquoteddelimited
+%   {\dohandledelimitedtext\c!left\relax
+%    \groupedcommand
+%      \donothing
+%      {\dohandledelimitedtext\c!right
+%       \removelastskip
+%       \popdelimitedtext}}
+
 \def\doquoteddelimited
-  {\dohandledelimitedtext\c!left\relax
+  {\dohandleleftdelimitedtext\c!left\relax
    \groupedcommand
      \donothing
-     {\dohandledelimitedtext\c!right
+     {\dohandlerightdelimitedtext\c!right
       \removelastskip
       \popdelimitedtext}}
 
diff --git a/Master/texmf-dist/tex/context/base/core-ntb.tex b/Master/texmf-dist/tex/context/base/core-ntb.tex
index 75c3b55405e..9e6eadb9af7 100644
--- a/Master/texmf-dist/tex/context/base/core-ntb.tex
+++ b/Master/texmf-dist/tex/context/base/core-ntb.tex
@@ -255,16 +255,16 @@
 
 \let\setupTBLsection\relax
 
-% \setupTABLE [y]    [first][background=color,backgroundcolor=blue,frame=off,bottomframe=on,topframe=on,framecolor=white]
+% % \setupTABLE [y]    [first][background=color,backgroundcolor=blue,frame=off,bottomframe=on,topframe=on,framecolor=white]
 % \setupTABLE [first][first][backgroundcorner=2,corner=10,frame=on]
 % \setupTABLE [last] [first][backgroundcorner=4,corner=12,frame=on]
-
+%
 % \setupTABLE [row]  [each] [background=color,backgroundcolor=blue,frame=on,framecolor=white]
 % \setupTABLE [first][2]    [corner=8]
 % \setupTABLE [last] [2]    [corner=5]
 % \setupTABLE [first][last] [corner=7]
 % \setupTABLE [last] [last] [corner=6]
-
+%
 % \startTEXpage
 % \bTABLE[frame=off,align=middle]
 % \bTR \bTD one   \eTD \bTD two    \eTD \bTD three \eTD \eTR
@@ -272,6 +272,16 @@
 % \bTR \bTD alpha \eTD \bTD beta   \eTD \bTD gamma \eTD \eTR
 % \eTABLE
 % \stopTEXpage
+%
+% \setupTABLE [first] [two][corner=2] % special case
+% \setupTABLE [last]  [two][corner=4] % special case
+%
+% \startTEXpage
+% \bTABLE[frame=off,align=middle]
+% \bTR \bTD one   \eTD \bTD two    \eTD \bTD three \eTD \eTR
+% \bTR \bTD first \eTD \bTD second \eTD \bTD third \eTD \eTR
+% \eTABLE
+% \stopTEXpage
 
 \def\setupTBLcell#1#2% cell over col over row
   {\setupTBLsection % already forgotten
@@ -325,6 +335,15 @@
    \ifnum\positiverow=\maximumrow\relax \ifnum\positivecol=\plusone
      \csname\@@tblprefix\c!x\v!first\c!y\v!last\endcsname
    \fi\fi
+   % special case: two rows and last row : two&first and two&last (round corners)
+   \ifnum\maximumrow=\plustwo\relax
+       \ifnum\positiverow=\maximumrow\relax \ifnum\positivecol=\plusone
+         \csname\@@tblprefix\c!x\v!first\c!y\v!two\endcsname
+       \fi\fi
+       \ifnum\positiverow=\maximumrow\relax \ifnum\positivecol=\maximumcol\relax
+         \csname\@@tblprefix\c!x\v!last\c!y\v!two\endcsname
+       \fi\fi
+   \fi
    % header things
    \ifnum#1>\noftblhdnxlines\else
      \executeifdefined{\@@tblprefix\v!header\v!each     }\donothing
diff --git a/Master/texmf-dist/tex/context/base/core-trf.tex b/Master/texmf-dist/tex/context/base/core-trf.tex
index cabafb30305..7a62d5392f1 100644
--- a/Master/texmf-dist/tex/context/base/core-trf.tex
+++ b/Master/texmf-dist/tex/context/base/core-trf.tex
@@ -20,7 +20,7 @@
 
 %D Scaling:
 
-\def\scale{\dodoubleempty\doscalenextbox[\??xy]}
+\unexpanded\def\scale{\dodoubleempty\doscalenextbox[\??xy]}
 
 % probably too many dimens / the width calculations can go
 % since we may assume scaling is available (was not true
@@ -533,7 +533,7 @@
       \flushnextbox
       \egroup}}
 
-\def\mirror
+\unexpanded\def\mirror
   {\domirrorbox\hbox}
 
 % \setbox0=\hbox{gans}
diff --git a/Master/texmf-dist/tex/context/base/core-var.tex b/Master/texmf-dist/tex/context/base/core-var.tex
index 4db5cb6e55e..6b019d65803 100644
--- a/Master/texmf-dist/tex/context/base/core-var.tex
+++ b/Master/texmf-dist/tex/context/base/core-var.tex
@@ -451,6 +451,11 @@
    \getvariable{#2}\s!set
    \errorisfatalfalse}
 
+\long\def\setvariable #1#2#3{\long\setvalue {\??vars:#1:#2}{#3}}
+\long\def\setevariable#1#2#3{\long\setevalue{\??vars:#1:#2}{#3}}
+\long\def\setgvariable#1#2#3{\long\setgvalue{\??vars:#1:#2}{#3}}
+\long\def\setxvariable#1#2#3{\long\setxvalue{\??vars:#1:#2}{#3}}
+
 \beginTEX
 
 \def\getvariable#1#2% to be sped up
diff --git a/Master/texmf-dist/tex/context/base/enco-pfr.tex b/Master/texmf-dist/tex/context/base/enco-pfr.tex
index 52069bfe981..199d48fd3a8 100644
--- a/Master/texmf-dist/tex/context/base/enco-pfr.tex
+++ b/Master/texmf-dist/tex/context/base/enco-pfr.tex
@@ -212,6 +212,7 @@
    \edef\currentencoding{#1}%
    \doifvaluesomething\pdffontfileresource
      {\startreadingfile
+        \ignorelines % just in case \par is redefined; this thing can get called anywhere
         \readsysfile{pdfr-\getvalue\pdffontfileresource}\donothing\donothing
       \stopreadingfile
       \letgvalue\pdffontfileresource\empty}%
diff --git a/Master/texmf-dist/tex/context/base/enco-uc.tex b/Master/texmf-dist/tex/context/base/enco-uc.tex
index fb709c82d17..981eb6ae455 100644
--- a/Master/texmf-dist/tex/context/base/enco-uc.tex
+++ b/Master/texmf-dist/tex/context/base/enco-uc.tex
@@ -303,6 +303,27 @@
 
 \stopencoding
 
+%D Mojca's and Taco's additions:
+
+\startencoding[uc]
+
+\definecharacter textasciicircum  {\uchar{0}{94}}  % 5e
+\definecharacter textgrave        {\uchar{0}{96}}  % 60
+\definecharacter textdiaeresis    {\uchar{0}{168}} % a8
+%definecharacter textmacron       {\uchar{0}{175}} % af
+%definecharacter textacute        {\uchar{0}{180}} % b4
+%definecharacter textcedilla      {\uchar{0}{184}} % b8
+\definecharacter textcircumflex   {\uchar{2}{198}} % c6
+\definecharacter textcaron        {\uchar{2}{199}} % c7
+\definecharacter textbreve        {\uchar{2}{216}} % d8
+\definecharacter textdotaccent    {\uchar{2}{217}} % d9
+\definecharacter textring         {\uchar{2}{218}} % da
+\definecharacter textogonek       {\uchar{2}{219}} % db
+\definecharacter texttilde        {\uchar{2}{220}} % dc
+\definecharacter texthungarumlaut {\uchar{2}{221}} % dd
+
+\stopencoding
+
 %D Vietnamese:
 
 \startencoding[uc]
diff --git a/Master/texmf-dist/tex/context/base/lang-mis.tex b/Master/texmf-dist/tex/context/base/lang-mis.tex
index de926b41782..aa763a71918 100644
--- a/Master/texmf-dist/tex/context/base/lang-mis.tex
+++ b/Master/texmf-dist/tex/context/base/lang-mis.tex
@@ -329,12 +329,30 @@
 %D In those situations where the nature of characters is
 %D less predictable, we can use the more direct approach:
 
-\unexpanded\def\directdiscretionary#1%
+\def\directdiscretionary
+  {\csname
+     \ifcase\discretionarymode
+       \strippedcsname\dononemodediscretionary
+     \else
+       \strippedcsname\dodirectdiscretionary
+     \fi
+   \endcsname}
+
+\def\indirectdiscretionary
+  {\csname
+     \ifcase\discretionarymode
+       \strippedcsname\dononemodediscretionary
+     \else
+       \strippedcsname\doindirectdiscretionary
+     \fi
+   \endcsname}
+
+\unexpanded\def\dodirectdiscretionary#1%
   {\edef\discretionarytoken{\detokenize{#1}}%
    \let\textmodediscretionary\compoundhyphen
    \executeifdefined{\@tmd@action@\discretionarytoken}{\indirectdiscretionary{#1}}}
 
-\unexpanded\def\indirectdiscretionary#1%
+\unexpanded\def\doindirectdiscretionary#1%
   {\prewordbreak\discretionary{\hbox{#1}}{}{\hbox{#1}}\allowbreak\postwordbreak}
 
 \def\definetextmodediscretionary #1
diff --git a/Master/texmf-dist/tex/context/base/math-pln.tex b/Master/texmf-dist/tex/context/base/math-pln.tex
index 386b67d9bcf..5ea7bc6fed1 100644
--- a/Master/texmf-dist/tex/context/base/math-pln.tex
+++ b/Master/texmf-dist/tex/context/base/math-pln.tex
@@ -103,7 +103,9 @@
 \def\!{\mskip-\thinmuskip}
 \def\*{\discretionary{\thinspace\the\textfont2\char2}{}{}}
 
-{\catcode`\'=\active \gdef'{^\bgroup\prim@s}}
+% {\catcode`\'=\active \gdef'{^\bgroup\prim@s}}
+
+\def\activemathquote{^\bgroup\prim@s}
 
 \def\prim@s
  {\prime\futurelet\next\pr@m@s}
@@ -135,7 +137,9 @@
 \def\pr@@@t#1#2%
   {#2\egroup}
 
-{\catcode`\_=\active \global\let_=\_} % _ in math is either subscript or \_
+% {\catcode`\_=\active \global\let_=\_} % _ in math is either subscript or \_
+
+\let\activemathunderscore\_
 
 \def\relbar            {\mathrel{\smash-}} % - has the same height as +
 \def\Relbar            {\mathrel=}
@@ -354,4 +358,30 @@
       &\kern-\displaywidth\rlap{$\@lign##$}\tabskip\displaywidth\crcr
       #1\crcr}}
 
+% temporary here
+
+% \startcatcodetable \mthcatcodes
+%     \setcatcodetable\ctxcatcodes
+%     \catcode`\_ = 13
+%     \catcode`\' = 13
+% \stopcatcodetable
+%
+% \letcatcodecommand \mthcatcodes `\_ \activemathunderscore
+% \letcatcodecommand \mthcatcodes `\' \activemathquote
+%
+% \appendtoks \setcatcodetable\mthcatcodes \to \everymath
+
+% tricky, but some day we will reimplement math
+
+\bgroup
+    \catcode`\_ = 13
+    \catcode`\' = 13
+    \doglobal\appendtoks
+        \let_\activemathunderscore
+        \let'\activemathquote
+    \to \everymath
+\egroup
+
+% so far
+
 \protect \endinput
diff --git a/Master/texmf-dist/tex/context/base/regi-8859-1.tex b/Master/texmf-dist/tex/context/base/regi-8859-1.tex
index 268d41b6872..6f515251882 100644
--- a/Master/texmf-dist/tex/context/base/regi-8859-1.tex
+++ b/Master/texmf-dist/tex/context/base/regi-8859-1.tex
@@ -16,13 +16,10 @@
 %D
 %D (Contributors to the original file: Daniel Flipo, Hans Hagen & Denis Roegel.)
 %D
-%D Usage:
-%D \type{\enableregime[iso-8859-1]} or
-%D \type{\enableregime[latin1]} or
-%D \type{\enableregime[il1]}
+%D Usage: \type{\enableregime[8859-1]} (see \type {regi-syn} for
+%D alternatives calls).
 
-
-\startregime[iso-8859-1]
+\startregime[8859-1]
 
 \defineactivetoken 128 {\unknownchar}                % 0080 <control>
 \defineactivetoken 129 {\unknownchar}                % 0081 <control>
diff --git a/Master/texmf-dist/tex/context/base/regi-8859-10.tex b/Master/texmf-dist/tex/context/base/regi-8859-10.tex
index 53d80b6d702..79d74d952ac 100644
--- a/Master/texmf-dist/tex/context/base/regi-8859-10.tex
+++ b/Master/texmf-dist/tex/context/base/regi-8859-10.tex
@@ -13,10 +13,8 @@
 
 %D Support for iso-8859-10/Latin6 input encoding (regime) for Nordic languages.
 %D
-%D Usage:
-%D \type{\enableregime[iso-8859-10]} or
-%D \type{\enableregime[latin6]} or
-%D \type{\enableregime[il6]}
+%D Usage: \type{\enableregime[8859-10]} (see \type {regi-syn} for
+%D alternatives calls).
 
 
 \startregime[iso-8859-10]
diff --git a/Master/texmf-dist/tex/context/base/regi-8859-13.tex b/Master/texmf-dist/tex/context/base/regi-8859-13.tex
index e17907e3efb..a6dbe376f01 100644
--- a/Master/texmf-dist/tex/context/base/regi-8859-13.tex
+++ b/Master/texmf-dist/tex/context/base/regi-8859-13.tex
@@ -14,11 +14,8 @@
 %D Support for iso-8859-13/Latin7 input encoding (regime) for Baltic languages,
 %D see also iso-8859-4 and cp1257.
 %D
-%D Usage:
-%D \type{\enableregime[iso-8859-13]} or
-%D \type{\enableregime[latin7]} or
-%D \type{\enableregime[il7]}
-
+%D Usage: \type{\enableregime[8859-13]} (see \type {regi-syn} for
+%D alternatives calls).
 
 \startregime[iso-8859-13]
 
diff --git a/Master/texmf-dist/tex/context/base/regi-8859-15.tex b/Master/texmf-dist/tex/context/base/regi-8859-15.tex
index 1b643df1520..cf788d3f3b3 100644
--- a/Master/texmf-dist/tex/context/base/regi-8859-15.tex
+++ b/Master/texmf-dist/tex/context/base/regi-8859-15.tex
@@ -11,16 +11,15 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-%D Support for iso-8859-15/Latin9 input encoding (regime) for West European languages,
-%D almost the same as iso-8859-1 with rarely used symbols (currency symbol,%D fractions, accents) replaced by Euro and some additional letters,%D see also cp1252.
+%D Support for iso-8859-15/Latin9 input encoding (regime) for
+%D West European languages, almost the same as iso-8859-1 with rarely
+%D used symbols (currency symbol,%D fractions, accents) replaced by
+%D Euro and some additional letters,%D see also cp1252.
 %D
-%D Usage:
-%D \type{\enableregime[iso-8859-9]} or
-%D \type{\enableregime[latin9]} or
-%D \type{\enableregime[il9]}
+%D Usage: \type{\enableregime[8859-15]} (see \type {regi-syn} for
+%D alternatives calls).
 
-
-\startregime[iso-8859-15]
+\startregime[8859-15]
 
 \defineactivetoken 128 {\unknownchar}                % 0080 <control>
 \defineactivetoken 129 {\unknownchar}                % 0081 <control>
diff --git a/Master/texmf-dist/tex/context/base/regi-8859-16.tex b/Master/texmf-dist/tex/context/base/regi-8859-16.tex
index 453472a4090..96f0a15d462 100644
--- a/Master/texmf-dist/tex/context/base/regi-8859-16.tex
+++ b/Master/texmf-dist/tex/context/base/regi-8859-16.tex
@@ -13,13 +13,10 @@
 
 %D Support for iso-8859-16/Latin10 input encoding (regime) for Romanian.
 %D
-%D Usage:
-%D \type{\enableregime[iso-8859-16]} or
-%D \type{\enableregime[latin10]} or
-%D \type{\enableregime[il10]}
+%D Usage: \type{\enableregime[8859-16]} (see \type {regi-syn} for
+%D alternatives calls).
 
-
-\startregime[iso-8859-16]
+\startregime[8859-16]
 
 \defineactivetoken 128 {\unknownchar}                % 0080 <control>
 \defineactivetoken 129 {\unknownchar}                % 0081 <control>
diff --git a/Master/texmf-dist/tex/context/base/regi-8859-2.tex b/Master/texmf-dist/tex/context/base/regi-8859-2.tex
index b6a83e0e726..81fe8419ed5 100644
--- a/Master/texmf-dist/tex/context/base/regi-8859-2.tex
+++ b/Master/texmf-dist/tex/context/base/regi-8859-2.tex
@@ -11,16 +11,13 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-%D Support for iso-8859-2/Latin2 input encoding (regime) for Central European languages,
-%D see also cp1250.
+%D Support for iso-8859-2/Latin2 input encoding (regime) for
+%D Central European languages, see also cp1250.
 %D
-%D Usage:
-%D \type{\enableregime[iso-8859-2]} or
-%D \type{\enableregime[latin2]} or
-%D \type{\enableregime[il2]}
+%D Usage: \type{\enableregime[8859-2]} (see \type {regi-syn} for
+%D alternatives calls).
 
-
-\startregime[iso-8859-2]
+\startregime[8859-2]
 
 \defineactivetoken 128 {\unknownchar}                % 0080 <control>
 \defineactivetoken 129 {\unknownchar}                % 0081 <control>
diff --git a/Master/texmf-dist/tex/context/base/regi-8859-3.tex b/Master/texmf-dist/tex/context/base/regi-8859-3.tex
index 5ae115cc78f..dcb8be67f24 100644
--- a/Master/texmf-dist/tex/context/base/regi-8859-3.tex
+++ b/Master/texmf-dist/tex/context/base/regi-8859-3.tex
@@ -11,16 +11,13 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-%D Support for iso-8859-3/Latin3 input encoding (regime) for South European languages,
-%D esp. for Esperanto and Maltese.
+%D Support for iso-8859-3/Latin3 input encoding (regime) for South
+%D European languages, esp. for Esperanto and Maltese.
 %D
-%D Usage:
-%D \type{\enableregime[iso-8859-3]} or
-%D \type{\enableregime[latin3]} or
-%D \type{\enableregime[il3]}
+%D Usage: \type{\enableregime[8859-3]} (see \type {regi-syn} for
+%D alternatives calls).
 
-
-\startregime[iso-8859-3]
+\startregime[8859-3]
 
 \defineactivetoken 128 {\unknownchar}                % 0080 <control>
 \defineactivetoken 129 {\unknownchar}                % 0081 <control>
diff --git a/Master/texmf-dist/tex/context/base/regi-8859-4.tex b/Master/texmf-dist/tex/context/base/regi-8859-4.tex
index eaaf9321689..3ebe66a137e 100644
--- a/Master/texmf-dist/tex/context/base/regi-8859-4.tex
+++ b/Master/texmf-dist/tex/context/base/regi-8859-4.tex
@@ -11,16 +11,13 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-%D Support for iso-8859-4/Latin4 input encoding (regime) for West European languages,
-%D see also cp1257 and iso-8859-13.
+%D Support for iso-8859-4/Latin4 input encoding (regime) for West
+%D European languages, see also cp1257 and iso-8859-13.
 %D
-%D Usage:
-%D \type{\enableregime[iso-8859-4]} or
-%D \type{\enableregime[latin4]} or
-%D \type{\enableregime[il4]}
+%D Usage: \type{\enableregime[8859-4]} (see \type {regi-syn} for
+%D alternatives calls).
 
-
-\startregime[iso-8859-4]
+\startregime[8859-4]
 
 \defineactivetoken 128 {\unknownchar}                % 0080 <control>
 \defineactivetoken 129 {\unknownchar}                % 0081 <control>
diff --git a/Master/texmf-dist/tex/context/base/regi-8859-5.tex b/Master/texmf-dist/tex/context/base/regi-8859-5.tex
index fe9fc0cc076..531226433c1 100644
--- a/Master/texmf-dist/tex/context/base/regi-8859-5.tex
+++ b/Master/texmf-dist/tex/context/base/regi-8859-5.tex
@@ -14,11 +14,10 @@
 %D Support for iso-8859-5 input encoding (regime) for Cyrillic,
 %D see also regi-cyr and regi-cyp.
 %D
-%D Usage:
-%D \type{\enableregime[iso-8859-5]}
+%D Usage: \type{\enableregime[8859-5]} (see \type {regi-syn} for
+%D alternatives calls).
 
-
-\startregime[iso-8859-5]
+\startregime[8859-5]
 
 \defineactivetoken 128 {\unknownchar}                % 0080 <control>
 \defineactivetoken 129 {\unknownchar}                % 0081 <control>
diff --git a/Master/texmf-dist/tex/context/base/regi-8859-7.tex b/Master/texmf-dist/tex/context/base/regi-8859-7.tex
index c858d45e6fe..80259be6508 100644
--- a/Master/texmf-dist/tex/context/base/regi-8859-7.tex
+++ b/Master/texmf-dist/tex/context/base/regi-8859-7.tex
@@ -16,12 +16,10 @@
 %D
 %D (Contributor to the original file: Apostolos Syropoulos.)
 %D
-%D Usage:
-%D \type{\enableregime[iso-8859-7]} or
-%D \type{\enableregime[grk]}
+%D Usage: \type{\enableregime[8859-7]} (see \type {regi-syn} for
+%D alternatives calls).
 
-
-\startregime[iso-8859-7]
+\startregime[8859-7]
 
 \defineactivetoken 128 {\unknownchar}                % 0080 <control>
 \defineactivetoken 129 {\unknownchar}                % 0081 <control>
diff --git a/Master/texmf-dist/tex/context/base/regi-8859-9.tex b/Master/texmf-dist/tex/context/base/regi-8859-9.tex
index 302bcc9c65a..8460d739b1c 100644
--- a/Master/texmf-dist/tex/context/base/regi-8859-9.tex
+++ b/Master/texmf-dist/tex/context/base/regi-8859-9.tex
@@ -14,13 +14,10 @@
 %D Support for iso-8859-9/Latin5 input encoding (regime) for Turkish,
 %D see also cp1254.
 %D
-%D Usage:
-%D \type{\enableregime[iso-8859-9]} or
-%D \type{\enableregime[latin5]} or
-%D \type{\enableregime[il5]}
+%D Usage: \type{\enableregime[8859-9]} (see \type {regi-syn} for
+%D alternatives calls).
 
-
-\startregime[iso-8859-9]
+\startregime[8859-9]
 
 \defineactivetoken 128 {\unknownchar}                % 0080 <control>
 \defineactivetoken 129 {\unknownchar}                % 0081 <control>
diff --git a/Master/texmf-dist/tex/context/base/regi-syn.tex b/Master/texmf-dist/tex/context/base/regi-syn.tex
index e57446ad801..b29c0677526 100644
--- a/Master/texmf-dist/tex/context/base/regi-syn.tex
+++ b/Master/texmf-dist/tex/context/base/regi-syn.tex
@@ -36,6 +36,17 @@
 \defineregimesynonym [il9]          [8859-15]
 \defineregimesynonym [il10]         [8859-16]
 
+\defineregimesynonym [iso-8859-1]   [8859-1]
+\defineregimesynonym [iso-8859-2]   [8859-2]
+\defineregimesynonym [iso-8859-3]   [8859-3]
+\defineregimesynonym [iso-8859-4]   [8859-4]
+\defineregimesynonym [iso-8859-9]   [8859-9]
+\defineregimesynonym [iso-8859-10]  [8859-10]
+\defineregimesynonym [iso-8859-13]  [8859-13]
+%defineregimesynonym [iso-8859-14]  [8859-14]
+\defineregimesynonym [iso-8859-15]  [8859-15]
+\defineregimesynonym [iso-8859-16]  [8859-16]
+
 \defineregimesynonym [latin1]       [8859-1]
 \defineregimesynonym [latin2]       [8859-2]
 \defineregimesynonym [latin3]       [8859-3]
diff --git a/Master/texmf-dist/tex/context/base/rlxtools.rlx b/Master/texmf-dist/tex/context/base/rlxtools.rlx
index 3d45798049f..da605f6ee16 100644
--- a/Master/texmf-dist/tex/context/base/rlxtools.rlx
+++ b/Master/texmf-dist/tex/context/base/rlxtools.rlx
@@ -38,6 +38,15 @@
         </rl:step>
     </rl:manipulator -->
 
+    <rl:manipulator name='pdf' suffix='eps'>
+        <rl:old><rl:value name='path'/>/<rl:value name='file' method='nosuffix'/>.eps</rl:old>
+        <rl:new><rl:value name='path'/>/<rl:value name='prefix'/><rl:value name='file' method='nosuffix'/>.pdf</rl:new>
+        <rl:step>
+            texmfstart pstopdf --convert
+            <rl:value name='old'/>
+        </rl:step>
+    </rl:manipulator>
+
     <rl:manipulator name='pdf' suffix='svg'>
         <rl:old><rl:value name='path'/>/<rl:value name='file' method='nosuffix'/>.svg</rl:old>
         <rl:new><rl:value name='path'/>/<rl:value name='prefix'/><rl:value name='file' method='nosuffix'/>.pdf</rl:new>
@@ -91,4 +100,37 @@
         </rl:step>
     </rl:manipulator>
 
+    <rl:manipulator name='pdf' suffix='tif'>
+        <rl:old><rl:value name='path'/>/<rl:value name='file' method='nosuffix'/>.tif</rl:old>
+        <rl:new><rl:value name='cache' default='.'/>/<rl:value name='file' method='nosuffix'/>.pdf</rl:new>
+        <rl:step>
+            texmfstart pstopdf --convert
+            --inputpath=<rl:value name='path'/>
+            --outputpath=<rl:value name='cache' default='.'/>
+            <rl:value name='file' method='nosuffix'/>.gif
+        </rl:step>
+    </rl:manipulator>
+
+    <rl:manipulator name='pdf' suffix='tiff'>
+        <rl:old><rl:value name='path'/>/<rl:value name='file' method='nosuffix'/>.tiff</rl:old>
+        <rl:new><rl:value name='cache' default='.'/>/<rl:value name='file' method='nosuffix'/>.pdf</rl:new>
+        <rl:step>
+            texmfstart pstopdf --convert
+            --inputpath=<rl:value name='path'/>
+            --outputpath=<rl:value name='cache' default='.'/>
+            <rl:value name='file' method='nosuffix'/>.gif
+        </rl:step>
+    </rl:manipulator>
+
+    <rl:manipulator name='cropped' suffix='pdf'>
+        <rl:old><rl:value name='path'/>/<rl:value name='file'/></rl:old>
+        <rl:new><rl:value name='path'/>/<rl:value name='prefix'/><rl:value name='file'/></rl:new>
+        <rl:step>
+            texmfstart pstopdf --convert --method=3
+            --inputpath=<rl:value name='path'/>
+            --outputpath=<rl:value name='path'/>/<rl:value name='prefix'/>
+            <rl:value name='file'/>
+        </rl:step>
+    </rl:manipulator>
+
 </rl:manipulators>
diff --git a/Master/texmf-dist/tex/context/base/s-abr-01.tex b/Master/texmf-dist/tex/context/base/s-abr-01.tex
index 648780320ff..3be27702396 100644
--- a/Master/texmf-dist/tex/context/base/s-abr-01.tex
+++ b/Master/texmf-dist/tex/context/base/s-abr-01.tex
@@ -209,7 +209,8 @@
 \logo [URI]        {uri}
 \logo [URL]        {url}
 \logo [USA]        {usa}
-\logo [UTF]        {utf8}
+\logo [UTF]        {utf}
+\logo [UCS]        {ucs}
 \logo [USENET]     {usenet}
 \logo [UTF]        {utf}
 \logo [WDT]        {wdt}
diff --git a/Master/texmf-dist/tex/context/base/s-abr-02.tex b/Master/texmf-dist/tex/context/base/s-abr-02.tex
index e2cdbfb72da..005559ef366 100644
--- a/Master/texmf-dist/tex/context/base/s-abr-02.tex
+++ b/Master/texmf-dist/tex/context/base/s-abr-02.tex
@@ -8,8 +8,8 @@
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
 \usemodule[abr-01]
 
@@ -19,6 +19,4 @@
 
 \setupcapitals[\c!title=\v!no]
 
-\protect
-
-\endinput
+\protect \endinput
diff --git a/Master/texmf-dist/tex/context/base/syst-cat.tex b/Master/texmf-dist/tex/context/base/syst-cat.tex
index c4f6711ed6c..fb672c327d8 100644
--- a/Master/texmf-dist/tex/context/base/syst-cat.tex
+++ b/Master/texmf-dist/tex/context/base/syst-cat.tex
@@ -69,8 +69,8 @@
 
 \def\defcatcodecommandc % only first time
   {\expandafter\gdef\csname CCD:\number\cctcountera:\number\cctcounterb\expandafter\endcsname
-    \expandafter##\expandafter1\expandafter
-     {\expandafter\def\csname CCC:\number\cctcountera:\number\cctcounterb\endcsname{##1}}%
+     \expandafter##\expandafter1\expandafter
+       {\expandafter\def\csname CCC:\number\cctcountera:\number\cctcounterb\endcsname{##1}}%
    \reinstatecatcodecommanda
    \csname CCD:\number\cctcountera:\number\cctcounterb\endcsname}
 
@@ -118,6 +118,7 @@
 \ifx\ctxcatcodes \undefined \newcatcodetable \ctxcatcodes  \fi
 \ifx\vrbcatcodes \undefined \newcatcodetable \vrbcatcodes  \fi
 \ifx\prtcatcodes \undefined \newcatcodetable \prtcatcodes  \fi
+\ifx\mthcatcodes \undefined \newcatcodetable \mthcatcodes  \fi % math
 \ifx\xmlcatcodesn\undefined \newcatcodetable \xmlcatcodesn \fi % normal
 \ifx\xmlcatcodese\undefined \newcatcodetable \xmlcatcodese \fi % entitle
 \ifx\xmlcatcodesr\undefined \newcatcodetable \xmlcatcodesr \fi % reduce
diff --git a/Master/texmf-dist/tex/context/base/syst-pln.tex b/Master/texmf-dist/tex/context/base/syst-pln.tex
index 0b74d6d0fe6..9582c650890 100644
--- a/Master/texmf-dist/tex/context/base/syst-pln.tex
+++ b/Master/texmf-dist/tex/context/base/syst-pln.tex
@@ -604,7 +604,8 @@
 \chardef\#=`\#
 \chardef\$=`\$
 
-\def\_{\leavevmode \kern.06em \vbox{\hrule width.3em}}
+%def\_{\leavevmode     \kern.06em \vbox{\hrule width.3em}}
+\def\_{\dontleavehmode \kern.06em \vbox{\hrule width.3em}}
 
 %D Replaced later on:
 
diff --git a/Master/texmf-dist/tex/context/base/type-ghz.tex b/Master/texmf-dist/tex/context/base/type-ghz.tex
index 318e6d596ed..afb637818f9 100644
--- a/Master/texmf-dist/tex/context/base/type-ghz.tex
+++ b/Master/texmf-dist/tex/context/base/type-ghz.tex
@@ -90,8 +90,20 @@
 \starttypescript[optima-nova][texnansi,ec] % will change to more narrow tt
     \definetypeface[optima][ss][sans][optima-nova] [default][encoding=\typescripttwo]
     \definetypeface[optima][rm][sans][optima-nova] [default][encoding=\typescripttwo]
-    \definetypeface[optima][tt][mono][latin-modern][default][encoding=\typescripttwo,rscale=1.125]
-    \definetypeface[optima][mm][mono][latin-modern][default][encoding=\typescripttwo,rscale=1.125]
+%     \definetypeface[optima][tt][mono][latin-modern][default][encoding=\typescripttwo,rscale=1.125]
+%     \definetypeface[optima][mm][mono][latin-modern][default][encoding=\typescripttwo,rscale=1.125]
+    \definetypeface[optima][tt][mono][latin-modern][default][encoding=\typescripttwo,rscale=1.1]
+    \definetypeface[optima][mm][mono][latin-modern][default][encoding=\typescripttwo,rscale=1.1]
+    \quittypescriptscanning
+\stoptypescript
+
+\starttypescript[optima-nova-os][texnansi,ec] % will change to more narrow tt
+    \definetypeface[optima-os][ss][sans][optima-nova-os] [default][encoding=\typescripttwo]
+    \definetypeface[optima-os][rm][sans][optima-nova-os] [default][encoding=\typescripttwo]
+%     \definetypeface[optima-os][tt][mono][latin-modern]   [default][encoding=\typescripttwo,rscale=1.125]
+%     \definetypeface[optima-os][mm][mono][latin-modern]   [default][encoding=\typescripttwo,rscale=1.125]
+    \definetypeface[optima-os][tt][mono][latin-modern]   [default][encoding=\typescripttwo,rscale=1.1]
+    \definetypeface[optima-os][mm][mono][latin-modern]   [default][encoding=\typescripttwo,rscale=1.1]
     \quittypescriptscanning
 \stoptypescript
 
diff --git a/Master/texmf-dist/tex/context/base/unic-ini.tex b/Master/texmf-dist/tex/context/base/unic-ini.tex
index ec85c3c9eb9..587edd308ed 100644
--- a/Master/texmf-dist/tex/context/base/unic-ini.tex
+++ b/Master/texmf-dist/tex/context/base/unic-ini.tex
@@ -50,7 +50,7 @@
 %D In \UTF-8 the characters in the range 128---191 are illegal
 %D as first characters. The characters 254 and 255 are
 %D completely illegal and should not appear at all (they are
-%D related to UTF16).
+%D related to UTF-16).
 %D
 %D The unicode number for an \UTF-8 sequence can be calculated
 %D as follows:
diff --git a/Master/texmf-dist/tex/context/base/xtag-ini.tex b/Master/texmf-dist/tex/context/base/xtag-ini.tex
index b6845a90ccb..155034145f7 100644
--- a/Master/texmf-dist/tex/context/base/xtag-ini.tex
+++ b/Master/texmf-dist/tex/context/base/xtag-ini.tex
@@ -2310,6 +2310,12 @@
    \egroup
    \convertcommand\@@XML@@string\to#1}
 
+% this has to expand nicely:
+%
+% <!DOCTYPE XXX SYSTEM "xxx" [ <!ENTITY aaa "../www/"> <!ENTITY bbb SYSTEM "&aaa;mmm.eps"> ]>
+%
+% so keep the following as is!
+
 \def\defXMLclean#1#2%
   {\bgroup
    \enableXMLexpansion