22 files changed, 819 insertions, 625 deletions
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index 8026ded2e..c98778fb8 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -31,7 +31,7 @@
 %D 2004.8.30 the low level interface is english. Watch out and adapt
 %D your styles an modules.
 
-\def\contextversion{2005.01.28}
+\def\contextversion{2005.01.31}
 
 %D Welcome to the main module. When this module is ran through
 %D \type{initex} or \type {tex -i} or \type {whatevertex} using
diff --git a/tex/context/base/core-lst.tex b/tex/context/base/core-lst.tex
index f30762561..a9472295c 100644
--- a/tex/context/base/core-lst.tex
+++ b/tex/context/base/core-lst.tex
@@ -205,9 +205,9 @@
       \c!numberstyle=\listparameter\c!style,
       \c!pagestyle=\listparameter\c!style,
       \c!color=,
-      \c!textcolor=\listparameter\c!style,
-      \c!numbercolor=\listparameter\c!style,
-      \c!pagecolor=\listparameter\c!style,
+      \c!textcolor=\listparameter\c!color,
+      \c!numbercolor=\listparameter\c!color,
+      \c!pagecolor=\listparameter\c!color,
       \c!numbercommand=\listnumbercommand,
       \c!textcommand=\listtextcommand,
       \c!pagecommand=\listpagecommand,
diff --git a/tex/context/base/core-rul.tex b/tex/context/base/core-rul.tex
index 06ca596d6..26e1d8eaa 100644
--- a/tex/context/base/core-rul.tex
+++ b/tex/context/base/core-rul.tex
@@ -2497,9 +2497,9 @@
   {\doifsomething{#2}{\setvalue{\??kd#1\c!location}{#2}}%
    \processaction % \v!low en \v!depth are already taken !
      [\framedtextparameter{#1}\c!location]
-     [  \v!left=>\letvalue{\??kd#1\c!left }\relax
+     [   \v!left=>\letvalue{\??kd#1\c!left }\relax
                   \letvalue{\??kd#1\c!right}\hfill,
-       \v!right=>\letvalue{\??kd#1\c!left }\hfill
+        \v!right=>\letvalue{\??kd#1\c!left }\hfill
                   \letvalue{\??kd#1\c!right}\relax,
        \v!middle=>\letvalue{\??kd#1\c!left }\hfill
                   \letvalue{\??kd#1\c!right}\hfill,
diff --git a/tex/context/base/core-tbl.tex b/tex/context/base/core-tbl.tex
index 09523a362..b33302da4 100644
--- a/tex/context/base/core-tbl.tex
+++ b/tex/context/base/core-tbl.tex
@@ -769,7 +769,7 @@
    \doifvaluesomething{\??tt\currenttabulate\c!bodyfont}
      {\expanded{\switchtobodyfont
         [\getvalue{\??tt\currenttabulate\c!bodyfont}]}}%
-   \postponefootnotes % new, to be tested
+   \postponefootnotes % new, to be tested / will be configurable
    \chardef\tabulatepass\plusone
    \widowpenalty\zerocount % otherwise lines are not broken
    \clubpenalty \zerocount % but overlap in funny ways
diff --git a/tex/context/base/enco-ini.tex b/tex/context/base/enco-ini.tex
index afe2c0e82..d77150059 100644
--- a/tex/context/base/enco-ini.tex
+++ b/tex/context/base/enco-ini.tex
@@ -220,26 +220,77 @@
    \uppercase{\unexpanded\edef~{\noexpand#2{\number#1}}}%
    \uccode\activehackcode\scratchcounter}
 
+% \long\def\defineactivedecimal#1 #2 %
+%   {\setregimetoks
+%    \appendtoks\dodefineactivedecimal{#1}{#2}\to\regimetoks}
+%
+% \long\def\defineactivedecimals#1 to #2 as #3 %
+%   {\setregimetoks
+%    \dostepwiserecurse{#1}{#2}\plusone
+%      {\@EA\appendtoks\@EA\dodefineactivedecimal\@EA{\recurselevel}{#3}\to\regimetoks}}
+%
+% \long\def\defineactivetoken #1 #2% no {} after #2, else no kern
+%   {\setregimetoks
+%    \appendtoks\defineactivecharacter#1 {#2}\to\regimetoks}
+%
+% \long\def\defineactiveinspector #1 #2% watch the missing {}
+%   {\setregimetoks
+%    \appendtoks\defineactivecharacter#1 {#2}\to\regimetoks}
+%
+% faster:
+
 \long\def\defineactivedecimal#1 #2 %
   {\setregimetoks
-   \appendtoks\dodefineactivedecimal{#1}{#2}\to\regimetoks}
+   \regimetoks\expandafter{\the\regimetoks\dodefineactivedecimal{#1}{#2}}}
 
 \long\def\defineactivedecimals#1 to #2 as #3 %
   {\setregimetoks
    \dostepwiserecurse{#1}{#2}\plusone
-     {\@EA\appendtoks\@EA\dodefineactivedecimal\@EA{\recurselevel}{#3}\to\regimetoks}}
+     {\regimetoks\@EA\@EA\@EA{\@EA\the\@EA\regimetoks\@EA\dodefineactivedecimal\@EA{\recurselevel}{#3}}}}
+
+\beginETEX
+
+  % much faster, prelude to run time loading
+
+  % \def\doexpandactivedecimal#1#2#3%
+  %   {\ifnum#1>#2 %
+  %      \expandafter\gobblefourarguments
+  %    \else
+  %      \noexpand\dodefineactivedecimal{#1}{#3}%
+  %      \expandafter\expandafter\expandafter\doexpandactivedecimal\expandafter
+  %    \fi\expandafter{\the\numexpr#1+1\relax}{#2}{#3}}
+  %
+  % \long\def\defineactivedecimals#1 to #2 as #3 %
+  %   {\setregimetoks
+  %    \scratchcounter#2\relax
+  %    \scratchtoks{#3}%
+  %    \expanded{\regimetoks{\the\regimetoks\doexpandactivedecimal{#1}{#2}{\the\scratchtoks}}}%
+  %    \ignorespaces}
+
+  \def\doexpandactivedecimal#1%
+    {\ifnum#1>\scratchcounter
+       \expandafter\gobbletwoarguments
+     \else
+       \noexpand\dodefineactivedecimal{#1}{\the\scratchtoks}%
+       \expandafter\expandafter\expandafter\doexpandactivedecimal\expandafter
+     \fi\expandafter{\the\numexpr#1+\plusone\relax}}
 
-% \long\def\defineactivetoken #1 #2% watch the {}
-%   {\setregimetoks
-%    \appendtoks\defineactivecharacter#1 {#2{}}\to\regimetoks}
+  \long\def\defineactivedecimals#1 to #2 as #3 %
+    {\setregimetoks
+     \scratchcounter#2\relax
+     \scratchtoks{#3}%
+     \expanded{\regimetoks{\the\regimetoks\doexpandactivedecimal{#1}}}%
+     \ignorespaces}
+
+\endETEX
 
 \long\def\defineactivetoken #1 #2% no {} after #2, else no kern
   {\setregimetoks
-   \appendtoks\defineactivecharacter#1 {#2}\to\regimetoks}
+   \regimetoks\expandafter{\the\regimetoks\defineactivecharacter#1 {#2}}}
 
 \long\def\defineactiveinspector #1 #2% watch the missing {}
   {\setregimetoks
-   \appendtoks\defineactivecharacter#1 {#2}\to\regimetoks}
+   \regimetoks\expandafter{\the\regimetoks\defineactivecharacter#1 {#2}}}
 
 %D ....
 
@@ -337,6 +388,8 @@
 %D So, character 165 becomes 181 in uppercase and 165 in
 %D lowercase. A mapping is activated with \type {\enablemapping}.
 
+% quite slow, esp when done at runtime
+
 \def\startmapping[#1]%
   {\pushmacro\charactermapping
    \edef\charactermapping{@#1@}%
@@ -349,24 +402,68 @@
 \def\setmappingtoks
   {\@EA\let\@EA\mappingtoks\csname\@map@\charactermapping\endcsname}
 
+% \def\definecasemap #1 #2 #3 % code lower upper
+%   {\setmappingtoks
+%    \doifelse{#2}{to}
+%      {\appendtoks\presetcaserange{#1}{#3}\to\mappingtoks}
+%      {\appendtoks\setcasemap #1 #2 #3 \to\mappingtoks}%
+%    \ignorespaces}
+%
+% faster
+
 \def\definecasemap #1 #2 #3 % code lower upper
   {\setmappingtoks
    \doifelse{#2}{to}
-     {\appendtoks\presetcaserange{#1}{#3}\to\mappingtoks}
-     {\appendtoks\setcasemap #1 #2 #3 \to\mappingtoks}%
+     {\mappingtoks\@EA{\the\mappingtoks\presetcaserange{#1}{#3}}}
+     {\mappingtoks\@EA{\the\mappingtoks\setcasemap #1 #2 #3 }}%
    \ignorespaces}
 
 %D Watch the \type {\definecasemap 127 to 255} option!
 %D Dedicated to Taco there is also:
 
 \def\definecasemaps #1 to #2 lc #3 uc #4 % from to lc+ uc+
-  {\dostepwiserecurse{#1}{#2}{1}
+  {\dostepwiserecurse{#1}{#2}\plusone
      {\!!counta\recurselevel\advance\!!counta #3\relax
       \!!countb\recurselevel\advance\!!countb #4\relax
       \expanded{\definecasemap
         \recurselevel\space\the\!!counta\space\the\!!countb\space}}%
    \ignorespaces}
 
+\beginETEX
+
+  % much faster, prelude to run time loading
+
+  % \def\doexpandcasemaps#1#2#3#4%
+  %   {\ifnum#1>#2 %
+  %      \expandafter\gobblefivearguments
+  %    \else
+  %      \noexpand\setcasemap#1\space\the\numexpr#1+#3\relax\space\the\numexpr#1+#4\relax\space
+  %      \expandafter\expandafter\expandafter\doexpandcasemaps\expandafter
+  %    \fi\expandafter{\the\numexpr#1+1\relax}{#2}{#3}{#4}}
+  %
+  % \def\definecasemaps #1 to #2 lc #3 uc #4 % from to lc+ uc+
+  %   {\setmappingtoks
+  %    \expanded{\mappingtoks{\the\mappingtoks\doexpandcasemaps{#1}{#2}{#3}{#4}}}%
+  %    \ignorespaces}
+
+  \def\doexpandcasemaps#1%
+    {\ifnum#1>\scratchcounter
+       \expandafter\gobbletwoarguments
+     \else
+       \noexpand\setcasemap#1\space\the\numexpr#1+\!!counta\relax\space\the\numexpr#1+\!!countb\relax\space
+       \expandafter\expandafter\expandafter\doexpandcasemaps\expandafter
+     \fi\expandafter{\the\numexpr#1+\plusone\relax}}
+
+  \def\definecasemaps #1 to #2 lc #3 uc #4 % from to lc+ uc+
+    {\setmappingtoks
+     \scratchcounter#2\relax
+     \!!counta#3\relax
+     \!!countb#4\relax
+     \expanded{\mappingtoks{\the\mappingtoks\doexpandcasemaps{#1}}}%
+     \ignorespaces}
+
+\endETEX
+
 %D This can be used like:
 %D
 %D \starttyping
@@ -381,14 +478,56 @@
 %   {\dostepwiserecurse{#1}{#2}{1}
 %      {\expanded{\definecasemap\recurselevel\space0\space0\space}}}
 
+% \def\resetcaserange #1 to #2
+%  {\setmappingtoks
+%   \dostepwiserecurse{#1}{#2}\plusone
+%     {\edef\@@expanded{\recurselevel\space}%
+%      \@EA\appendtoks\@EA\setcasemap\@@expanded 0 0 \to\mappingtoks}%
+%   \ignorespaces}
+%
+% faster:
+
 \def\resetcaserange #1 to #2
  {\setmappingtoks
   \dostepwiserecurse{#1}{#2}\plusone
     {\edef\@@expanded{\recurselevel\space}%
-     \@EA\appendtoks\@EA\setcasemap\@@expanded 0 0 \to\mappingtoks}%
+     \mappingtoks\@EA\@EA\@EA{\@EA\the\@EA\mappingtoks\@EA\setcasemap\@@expanded 0 0 }}%
   \ignorespaces}
 
-\def\presetcaserange#1#2%
+\beginETEX
+
+  % much faster, prelude to run time loading
+
+  % \def\doexpandcaserange#1#2%
+  %   {\ifnum#1>#2 %
+  %      \expandafter\gobblethreearguments
+  %    \else
+  %      \noexpand\setcasemap #1 0 0 %
+  %      \expandafter\expandafter\expandafter\doexpandcaserange\expandafter
+  %    \fi\expandafter{\the\numexpr#1+1\relax}{#2}}
+  %
+  % \def\resetcaserange #1 to #2
+  %   {\setmappingtoks
+  %    \expanded{\mappingtoks{\the\mappingtoks\doexpandcaserange{#1}{#2}}}%
+  %    \ignorespaces}
+
+  \def\doexpandcaserange#1%
+    {\ifnum#1>\scratchcounter
+       \expandafter\gobbletwoarguments
+     \else
+       \noexpand\setcasemap #1 0 0 %
+       \expandafter\expandafter\expandafter\doexpandcaserange\expandafter
+     \fi\expandafter{\the\numexpr#1+\plusone\relax}}
+
+  \def\resetcaserange #1 to #2
+    {\setmappingtoks
+     \scratchcounter#2\relax
+     \expanded{\mappingtoks{\the\mappingtoks\doexpandcaserange{#1}}}%
+     \ignorespaces}
+
+\endETEX
+
+\def\presetcaserange#1#2% could be pre-expanded
   {\dostepwiserecurse{#1}{#2}\plusone
      {\setregimecode\recurselevel\@@letter
       \lccode \recurselevel=\recurselevel
@@ -399,9 +538,16 @@
    \lccode #1=#2
    \uccode #1=#3 }
 
+% \def\definespacemap #1 #2 % code sfcode
+%   {\setmappingtoks
+%    \appendtoks\setspacemap #1 #2 \to\mappingtoks
+%    \ignorespaces}
+%
+% faster:
+
 \def\definespacemap #1 #2 % code sfcode
   {\setmappingtoks
-   \appendtoks\setspacemap #1 #2 \to\mappingtoks
+   \expandafter\mappingtoks{\the\mappingtoks\setspacemap #1 #2 }%
    \ignorespaces}
 
 \def\setspacemap #1 #2 %
@@ -410,14 +556,26 @@
    \uccode #1=\zerocount
    \sfcode #1=#2 }
 
+% \def\defineuppercasecom#1#2%
+%   {\setmappingtoks
+%    \appendtoks\setuppercasecom#1{#2}\to\mappingtoks
+%    \ignorespaces}
+%
+% \def\definelowercasecom#1#2%
+%   {\setmappingtoks
+%    \appendtoks\setlowercasecom#1{#2}\to\mappingtoks
+%    \ignorespaces}
+%
+% faster
+
 \def\defineuppercasecom#1#2%
   {\setmappingtoks
-   \appendtoks\setuppercasecom#1{#2}\to\mappingtoks
+   \expandafter\mappingtoks{\the\mappingtoks\setuppercasecom#1{#2}}%
    \ignorespaces}
 
 \def\definelowercasecom#1#2%
   {\setmappingtoks
-   \appendtoks\setlowercasecom#1{#2}\to\mappingtoks
+   \expandafter\mappingtoks{\the\mappingtoks\setlowercasecom#1{#2}}%
    \ignorespaces}
 
 \let\setuppercasecom\gobbletwoarguments
@@ -1509,7 +1667,7 @@
 
 \useencoding[def,acc,raw,com,cas,mis] % mis should come first
 
-\useencoding[ans,il2,ec,tbo,pdf,uc,pol,qx,t5]
+\useencoding[ans,il2,ec,tbo,pdf,uc,pol,qx,t5,cyr]
 
 % \useencoding[vna]
 
diff --git a/tex/context/base/enco-uc.tex b/tex/context/base/enco-uc.tex
index ffc111799..b694f690a 100644
--- a/tex/context/base/enco-uc.tex
+++ b/tex/context/base/enco-uc.tex
@@ -609,8 +609,6 @@
 \definecharacter cyrillicnje    {\uchar4{"5A}}
 \definecharacter cyrillicyo     {\uchar4{"51}}
 
-\stopencoding
-
 % is there overlap with the above definitions
 
 \definecharacter cyrillicEgrave             {\uchar4{"00}}
@@ -771,6 +769,8 @@
 \definecharacter cyrillicYERUdiaeresis      {\uchar4{"F8}}
 \definecharacter cyrillicyerudiaeresis      {\uchar4{"F9}}
 
+\stopencoding
+
 % Hebrew:
 
 \startencoding[uc]
diff --git a/tex/context/base/font-uni.tex b/tex/context/base/font-uni.tex
index d6b340ec3..09fcf22ea 100644
--- a/tex/context/base/font-uni.tex
+++ b/tex/context/base/font-uni.tex
@@ -454,8 +454,7 @@
 
 \endTEX
 
-
-\beginETEX \protected
+\beginETEX
 
   \let\unicodeTEXwarning\relax
 
diff --git a/tex/context/base/supp-fil.tex b/tex/context/base/supp-fil.tex
index 7cb2e2901..fb7325003 100644
--- a/tex/context/base/supp-fil.tex
+++ b/tex/context/base/supp-fil.tex
@@ -298,34 +298,38 @@
 
 \def\doreadfile#1#2#3#4%
   {\sanitizefilename#2\to\readfilename
-   \let\trackedfilename\readfilename
-   \ifconditional\trackfilenames
-     \doifundefinedelse{fn..\trackedfilename}\donetrue\donefalse
+   \ifx\readfilename\empty
+     % silently ignore
    \else
-     \donetrue
-   \fi
-   \ifdone
-     \checkfilename\readfilename
-     \ifcase\kindoffile
-       \iftracefiles\writestatus\m!systems{searching for \readfilename\space on #1}\fi
-       % not a full path or url, check for existence
-       \doifelsenothing{#1}
-         {\def\next{\redoreadfile\readfilename{#3}{#4}}}%
-         {\def\next{\redoreadfile{\pathplusfile{#1}{\readfilename}}{#3}{#4}}}%
+     \let\trackedfilename\readfilename
+     \ifconditional\trackfilenames
+       \doifundefinedelse{fn..\trackedfilename}\donetrue\donefalse
      \else
-       % a full path or url, no further checking done
-       \doiffileexistselse\readfilename
-         {\iftracefiles\writestatus\m!systems{located \readfilename}\fi
-          \def\next{#3\dodoreadfile}}%
-         {\iftracefiles\writestatus\m!systems{not found \readfilename}\fi
-          \def\next{#4}}%
+       \donetrue
      \fi
-   \else
-     \edef\readfilename{\getvalue{fn..\readfilename}}%
-     \iftracefiles\writestatus\m!systems{already located \readfilename}\fi
-     \def\next{#3\dodoreadfile}%
-   \fi
-   \next}
+     \ifdone
+       \checkfilename\readfilename
+       \ifcase\kindoffile
+         \iftracefiles\writestatus\m!systems{searching for \readfilename\space on #1}\fi
+         % not a full path or url, check for existence
+         \doifelsenothing{#1}
+           {\def\next{\redoreadfile\readfilename{#3}{#4}}}%
+           {\def\next{\redoreadfile{\pathplusfile{#1}{\readfilename}}{#3}{#4}}}%
+       \else
+         % a full path or url, no further checking done
+         \doiffileexistselse\readfilename
+           {\iftracefiles\writestatus\m!systems{located \readfilename}\fi
+            \def\next{#3\dodoreadfile}}%
+           {\iftracefiles\writestatus\m!systems{not found \readfilename}\fi
+            \def\next{#4}}%
+       \fi
+     \else
+       \edef\readfilename{\getvalue{fn..\readfilename}}%
+       \iftracefiles\writestatus\m!systems{already located \readfilename}\fi
+       \def\next{#3\dodoreadfile}%
+     \fi
+     \expandafter\next
+   \fi}
 
 \def\redoreadfile#1#2#3%
   {\doiffileexistselse{#1}%
diff --git a/tex/context/base/type-exa.tex b/tex/context/base/type-exa.tex
index bea98c43e..eb2c2c147 100644
--- a/tex/context/base/type-exa.tex
+++ b/tex/context/base/type-exa.tex
@@ -22,7 +22,7 @@
 
 \stoptypescript
 
-\starttypescript [modern-base] [texnansi,ec,qx,il2,pl0,t5,default]
+\starttypescript [modern-base] [texnansi,ec,qx,il2,t2a,pl0,t5,default]
 
   \definetypeface [modern] [rm] [serif] [computer-modern] [default] [encoding=\typescripttwo]
   \definetypeface [modern] [ss] [sans]  [computer-modern] [default] [encoding=\typescripttwo]
@@ -99,10 +99,10 @@
 
 \starttypescript [lucidaboldmath] [texnansi,ec,8r]
 
-\definetypeface [lucidaboldmath] [rm] [serif]    [lucida] [default] [encoding=\typescripttwo] % needed ?
-\definetypeface [lucidaboldmath] [ss] [sans]     [lucida] [default] [encoding=\typescripttwo] % needed ?
-\definetypeface [lucidaboldmath] [tt] [mono]     [lucida] [default] [encoding=\typescripttwo] % needed ?
-\definetypeface [lucidaboldmath] [mm] [boldmath] [lucida] [default] [encoding=\typescripttwo]
+  \definetypeface [lucidaboldmath] [rm] [serif]    [lucida] [default] [encoding=\typescripttwo] % needed ?
+  \definetypeface [lucidaboldmath] [ss] [sans]     [lucida] [default] [encoding=\typescripttwo] % needed ?
+  \definetypeface [lucidaboldmath] [tt] [mono]     [lucida] [default] [encoding=\typescripttwo] % needed ?
+  \definetypeface [lucidaboldmath] [mm] [boldmath] [lucida] [default] [encoding=\typescripttwo]
 
 \stoptypescript
 
diff --git a/tex/context/base/type-ini.tex b/tex/context/base/type-ini.tex
index 0be6ce73a..a7278714a 100644
--- a/tex/context/base/type-ini.tex
+++ b/tex/context/base/type-ini.tex
@@ -206,6 +206,11 @@
 \long\def\dostarttypescriptC#1\stoptypescript
   {}
 
+% not faster (and demands leading spaces at each line)
+%
+% \def\dostarttypescriptC
+%   {\bgroup \catcode32=\@@comment \let\stoptypescript\egroup}
+
 \def\stoptypescript
   {\popmacro\fontclass}
 
diff --git a/tex/context/base/type-map.tex b/tex/context/base/type-map.tex
index c5de41f84..078616800 100644
--- a/tex/context/base/type-map.tex
+++ b/tex/context/base/type-map.tex
@@ -64,6 +64,12 @@
   \loadmapfile[original-public-vnr.map]
 \stoptypescript
 
+% cyrillic
+
+\starttypescript [map] [computer-modern] [t2a,t2b,t2c]
+  \loadmapfile[cm-super-\typescriptthree.map]
+\stoptypescript
+
 % latin modern (t5 to be done)
 
 \starttypescript [map] [latin-modern] [ec,texnansi,qx,t5,pl0]
diff --git a/tex/context/base/type-siz.tex b/tex/context/base/type-siz.tex
index f4560b125..5349a13ce 100644
--- a/tex/context/base/type-siz.tex
+++ b/tex/context/base/type-siz.tex
@@ -63,65 +63,65 @@
 
 \starttypescript [all] [dtp] [size]
 
-\definebodyfontenvironment
-  [4pt]
-  [\s!text=4pt,\s!script=4pt,\s!scriptscript=4pt,
-   \c!x=4pt,\c!xx=4pt,\c!big=6pt,\c!small=4pt]
-
-\definebodyfontenvironment
-  [5pt]
-  [\s!text=5pt,\s!script=5pt,\s!scriptscript=5pt,
-   \c!x=5pt,\c!xx=5pt,\c!big=7pt,\c!small=5pt]
-
-\definebodyfontenvironment
-  [6pt]
-  [\s!text=6pt,\s!script=5pt,\s!scriptscript=5pt,
-   \c!x=5pt,\c!xx=5pt,\c!big=8pt,\c!small=5pt]
-
-\definebodyfontenvironment
-  [7pt]
-  [\s!text=7pt,\s!script=6pt,\s!scriptscript=5pt,
-   \c!x=6pt,\c!xx=5pt,\c!big=9pt,\c!small=5pt]
-
-\definebodyfontenvironment
-  [8pt]
-  [\s!text=8pt,\s!script=6pt,\s!scriptscript=5pt,
-   \c!x=6pt,\c!xx=5pt,\c!big=10pt,\c!small=6pt]
-
-\definebodyfontenvironment
-  [9pt]
-  [\s!text=9pt,\s!script=7pt,\s!scriptscript=5pt,
-   \c!x=7pt,\c!xx=5pt,\c!big=11pt,\c!small=7pt]
-
-\definebodyfontenvironment
-  [10pt]
-  [\s!text=10pt,\s!script=7pt,\s!scriptscript=5pt,
-   \c!x=8pt,\c!xx=6pt,\c!big=12pt,\c!small=8pt]
-
-\definebodyfontenvironment
-  [11pt]
-  [\s!text=11pt,\s!script=8pt,\s!scriptscript=6pt,
-   \c!x=9pt,\c!xx=7pt,\c!big=13pt,\c!small=9pt]
-
-\definebodyfontenvironment
-  [12pt]
-  [\s!text=12pt,\s!script=9pt,\s!scriptscript=7pt,
-   \c!x=10pt,\c!xx=8pt,\c!big=14pt,\c!small=10pt]
-
-\definebodyfontenvironment
-  [13pt]
-  [\s!text=13pt,\s!script=10pt,\s!scriptscript=8pt,
-   \c!x=11pt,\c!xx=9pt,\c!big=16pt,\c!small=11pt]
-
-\definebodyfontenvironment
-  [14pt]
-  [\s!text=14pt,\s!script=10pt,\s!scriptscript=7pt,
-   \c!x=12pt,\c!xx=10pt,\c!big=16pt,\c!small=12pt]
-
-\definebodyfontenvironment
-  [16pt]
-  [\s!text=16pt,\s!script=12pt,\s!scriptscript=9pt,
-   \c!x=13pt,\c!xx=11pt,\c!big=18pt,\c!small=14pt]
+  \definebodyfontenvironment
+    [4pt]
+    [\s!text=4pt,\s!script=4pt,\s!scriptscript=4pt,
+     \c!x=4pt,\c!xx=4pt,\c!big=6pt,\c!small=4pt]
+
+  \definebodyfontenvironment
+    [5pt]
+    [\s!text=5pt,\s!script=5pt,\s!scriptscript=5pt,
+     \c!x=5pt,\c!xx=5pt,\c!big=7pt,\c!small=5pt]
+
+  \definebodyfontenvironment
+    [6pt]
+    [\s!text=6pt,\s!script=5pt,\s!scriptscript=5pt,
+     \c!x=5pt,\c!xx=5pt,\c!big=8pt,\c!small=5pt]
+
+  \definebodyfontenvironment
+    [7pt]
+    [\s!text=7pt,\s!script=6pt,\s!scriptscript=5pt,
+     \c!x=6pt,\c!xx=5pt,\c!big=9pt,\c!small=5pt]
+
+  \definebodyfontenvironment
+    [8pt]
+    [\s!text=8pt,\s!script=6pt,\s!scriptscript=5pt,
+     \c!x=6pt,\c!xx=5pt,\c!big=10pt,\c!small=6pt]
+
+  \definebodyfontenvironment
+    [9pt]
+    [\s!text=9pt,\s!script=7pt,\s!scriptscript=5pt,
+     \c!x=7pt,\c!xx=5pt,\c!big=11pt,\c!small=7pt]
+
+  \definebodyfontenvironment
+    [10pt]
+    [\s!text=10pt,\s!script=7pt,\s!scriptscript=5pt,
+     \c!x=8pt,\c!xx=6pt,\c!big=12pt,\c!small=8pt]
+
+  \definebodyfontenvironment
+    [11pt]
+    [\s!text=11pt,\s!script=8pt,\s!scriptscript=6pt,
+     \c!x=9pt,\c!xx=7pt,\c!big=13pt,\c!small=9pt]
+
+  \definebodyfontenvironment
+    [12pt]
+    [\s!text=12pt,\s!script=9pt,\s!scriptscript=7pt,
+     \c!x=10pt,\c!xx=8pt,\c!big=14pt,\c!small=10pt]
+
+  \definebodyfontenvironment
+    [13pt]
+    [\s!text=13pt,\s!script=10pt,\s!scriptscript=8pt,
+     \c!x=11pt,\c!xx=9pt,\c!big=16pt,\c!small=11pt]
+
+  \definebodyfontenvironment
+    [14pt]
+    [\s!text=14pt,\s!script=10pt,\s!scriptscript=7pt,
+     \c!x=12pt,\c!xx=10pt,\c!big=16pt,\c!small=12pt]
+
+  \definebodyfontenvironment
+    [16pt]
+    [\s!text=16pt,\s!script=12pt,\s!scriptscript=9pt,
+     \c!x=13pt,\c!xx=11pt,\c!big=18pt,\c!small=14pt]
 
 \stoptypescript
 
@@ -153,317 +153,317 @@
 
 \starttypescript [serif] [computer-modern] [size]
 
-\definebodyfont [12pt] [rm]
-  [tf=cmr12,
-   bf=cmbx12,
-   it=cmti12,
-   sl=cmsl12,
-   bi=cmbxti10 at 12pt,
-   bs=cmbxsl10 at 12pt,
-   sc=cmcsc10 at 12pt]
-
-\definebodyfont [11pt] [rm]
-  [tf=cmr10 at 11pt,
-   bf=cmbx10 at 11pt,
-   sl=cmsl10 at 11pt,
-   it=cmti10 at 11pt,
-   bi=cmbxti10 at 11pt,
-   bs=cmbxsl10 at 11pt,
-   sc=cmcsc10 at 11pt]
-
-\definebodyfont [10pt] [rm]
-  [tf=cmr10,
-   bf=cmbx10,
-   it=cmti10,
-   sl=cmsl10,
-   bi=cmbxti10,
-   bs=cmbxsl10,
-   sc=cmcsc10]
-
-\definebodyfont [9pt] [rm]
-  [tf=cmr9,
-   bf=cmbx9,
-   it=cmti9,
-   sl=cmsl9,
-   bi=cmbxti10 at 9pt,
-   bs=cmbxsl10 at 9pt,
-   sc=cmcsc10 at 9pt]
-
-\definebodyfont [8pt] [rm]
-  [tf=cmr8,
-   bf=cmbx8,
-   it=cmti8,
-   sl=cmsl8,
-   bi=cmbxti10 at 8pt,
-   bs=cmbxsl10 at 8pt,
-   sc=cmcsc10 at 8pt]
-
-\definebodyfont [7pt] [rm]
-  [tf=cmr7,
-   bf=cmbx7,
-   it=cmti10 at 7pt,
-   sl=cmsl10 at 7pt,
-   bi=cmbxti10 at 7pt,
-   bs=cmbxsl10 at 7pt,
-   sc=cmcsc10 at 7pt]
-
-\definebodyfont [6pt] [rm]
-  [tf=cmr6,
-   bf=cmbx6,
-   it=cmti10 at 6pt,
-   sl=cmsl10 at 6pt,
-   bi=cmbxti10 at 6pt,
-   bs=cmbxsl10 at 6pt,
-   sc=cmcsc10 at 6pt]
-
-\definebodyfont [5pt] [rm]
-  [tf=cmr5,
-   bf=cmbx5,
-   it=cmti10 at 5pt,
-   sl=cmsl10 at 5pt,
-   bi=cmbxti10 at 5pt,
-   bs=cmbxsl10 at 5pt,
-   sc=cmcsc10 at 5pt]
-
-\definebodyfont [4pt] [rm]
-  [tf=cmr10 at 4pt,
-   bf=cmbx10 at 4pt,
-   it=cmti10 at 4pt,
-   sl=cmsl10 at 4pt,
-   bi=cmbxti10 at 4pt,
-   bs=cmbxsl10 at 4pt,
-   sc=cmr10 at 4pt]
-
-\definebodyfont [14.4pt,17.3pt,20.7pt] [rm]
-  [tf=cmr12 sa 1,
-   bf=cmbx12 sa 1,
-   it=cmti12 sa 1,
-   sl=cmsl12 sa 1,
-   bi=cmbxti10 sa 1,
-   bs=cmbxsl10 sa 1,
-   sc=cmcsc10 sa 1]
+  \definebodyfont [12pt] [rm]
+    [tf=cmr12,
+     bf=cmbx12,
+     it=cmti12,
+     sl=cmsl12,
+     bi=cmbxti10 at 12pt,
+     bs=cmbxsl10 at 12pt,
+     sc=cmcsc10 at 12pt]
+
+  \definebodyfont [11pt] [rm]
+    [tf=cmr10 at 11pt,
+     bf=cmbx10 at 11pt,
+     sl=cmsl10 at 11pt,
+     it=cmti10 at 11pt,
+     bi=cmbxti10 at 11pt,
+     bs=cmbxsl10 at 11pt,
+     sc=cmcsc10 at 11pt]
+
+  \definebodyfont [10pt] [rm]
+    [tf=cmr10,
+     bf=cmbx10,
+     it=cmti10,
+     sl=cmsl10,
+     bi=cmbxti10,
+     bs=cmbxsl10,
+     sc=cmcsc10]
+
+  \definebodyfont [9pt] [rm]
+    [tf=cmr9,
+     bf=cmbx9,
+     it=cmti9,
+     sl=cmsl9,
+     bi=cmbxti10 at 9pt,
+     bs=cmbxsl10 at 9pt,
+     sc=cmcsc10 at 9pt]
+
+  \definebodyfont [8pt] [rm]
+    [tf=cmr8,
+     bf=cmbx8,
+     it=cmti8,
+     sl=cmsl8,
+     bi=cmbxti10 at 8pt,
+     bs=cmbxsl10 at 8pt,
+     sc=cmcsc10 at 8pt]
+
+  \definebodyfont [7pt] [rm]
+    [tf=cmr7,
+     bf=cmbx7,
+     it=cmti10 at 7pt,
+     sl=cmsl10 at 7pt,
+     bi=cmbxti10 at 7pt,
+     bs=cmbxsl10 at 7pt,
+     sc=cmcsc10 at 7pt]
+
+  \definebodyfont [6pt] [rm]
+    [tf=cmr6,
+     bf=cmbx6,
+     it=cmti10 at 6pt,
+     sl=cmsl10 at 6pt,
+     bi=cmbxti10 at 6pt,
+     bs=cmbxsl10 at 6pt,
+     sc=cmcsc10 at 6pt]
+
+  \definebodyfont [5pt] [rm]
+    [tf=cmr5,
+     bf=cmbx5,
+     it=cmti10 at 5pt,
+     sl=cmsl10 at 5pt,
+     bi=cmbxti10 at 5pt,
+     bs=cmbxsl10 at 5pt,
+     sc=cmcsc10 at 5pt]
+
+  \definebodyfont [4pt] [rm]
+    [tf=cmr10 at 4pt,
+     bf=cmbx10 at 4pt,
+     it=cmti10 at 4pt,
+     sl=cmsl10 at 4pt,
+     bi=cmbxti10 at 4pt,
+     bs=cmbxsl10 at 4pt,
+     sc=cmr10 at 4pt]
+
+  \definebodyfont [14.4pt,17.3pt,20.7pt] [rm]
+    [tf=cmr12 sa 1,
+     bf=cmbx12 sa 1,
+     it=cmti12 sa 1,
+     sl=cmsl12 sa 1,
+     bi=cmbxti10 sa 1,
+     bs=cmbxsl10 sa 1,
+     sc=cmcsc10 sa 1]
 
 \stoptypescript
 
 \starttypescript [sans] [computer-modern] [size]
 
-\definebodyfont [12pt] [ss]
-  [tf=cmss12,
-   bf=cmssbx10 at 12pt,
-   it=cmssi12,
-   sl=cmssi12,
-   bi=cmssbx10 at 12pt,
-   bs=cmssbx10 at 12pt,
-   sc=cmss10 at 12pt]
-
-\definebodyfont [11pt] [ss]
-  [tf=cmss10 at 11pt,
-   bf=cmssbx10 at 11pt,
-   it=cmssi10 at 11pt,
-   sl=cmssi10 at 11pt,
-   bi=cmssbx10 at 11pt,
-   bs=cmssbx10 at 11pt,
-   sc=cmss10 at 11pt]
-
-\definebodyfont [10pt] [ss]
-  [tf=cmss10,
-   bf=cmssbx10,
-   it=cmssi10,
-   sl=cmssi10,
-   bi=cmssbx10,
-   bs=cmssbx10,
-   sc=cmss10]
-
-\definebodyfont [9pt] [ss]
-  [tf=cmss9,
-   bf=cmssbx10 at 9pt,
-   it=cmssi9,
-   sl=cmssi9,
-   bi=cmssbx10 at 9pt,
-   bs=cmssbx10 at 9pt,
-   sc=cmss9]
-
-\definebodyfont [8pt] [ss]
-  [tf=cmss8,
-   bf=cmssbx10 at 8pt,
-   it=cmssi8,
-   sl=cmssi8,
-   bi=cmssbx10 at 8pt,
-   bs=cmssbx10 at 8pt,
-   sc=cmss8]
-
-\definebodyfont [7pt] [ss]
-  [tf=cmss10 at 7pt,
-   bf=cmssbx10 at 7pt,
-   it=cmssi10 at 7pt,
-   sl=cmssi10 at 7pt,
-   bs=cmssbx10 at 7pt,
-   bi=cmssbx10 at 7pt,
-   sc=cmss10 at 7pt]
-
-\definebodyfont [6pt] [ss]
-  [tf=cmss10 at 6pt,
-   bf=cmssbx10 at 6pt,
-   it=cmssi10 at 6pt,
-   sl=cmssi10 at 6pt,
-   bs=cmssbx10 at 6pt,
-   bi=cmssbx10 at 6pt,
-   sc=cmss10 at 6pt]
-
-\definebodyfont [5pt] [ss]
-  [tf=cmss10 at 5pt,
-   bf=cmssbx10 at 5pt,
-   it=cmssi10 at 5pt,
-   sl=cmssi10 at 5pt,
-   bs=cmssbx10 at 5pt,
-   bi=cmssbx10 at 5pt,
-   sc=cmss10 at 5pt]
-
-\definebodyfont [4pt] [ss]
-  [tf=cmss10 at 4pt,
-   bf=cmssbx10 at 4pt,
-   it=cmssi10 at 4pt,
-   sl=cmssi10 at 4pt,
-   bs=cmssbx10 at 4pt,
-   bi=cmssbx10 at 4pt,
-   sc=cmss10 at 4pt]
-
-\definebodyfont [14.4pt,17.3pt,20.7pt] [ss]
-  [tf=cmss12 sa 1,
-   bf=cmssbx10 sa 1,
-   it=cmssi12 sa 1,
-   sl=cmssi12 sa 1,
-   bi=cmssbx10 sa 1,
-   bs=cmssbx10 sa 1,
-   sc=cmss12 sa 1]
+  \definebodyfont [12pt] [ss]
+    [tf=cmss12,
+     bf=cmssbx10 at 12pt,
+     it=cmssi12,
+     sl=cmssi12,
+     bi=cmssbx10 at 12pt,
+     bs=cmssbx10 at 12pt,
+     sc=cmss10 at 12pt]
+
+  \definebodyfont [11pt] [ss]
+    [tf=cmss10 at 11pt,
+     bf=cmssbx10 at 11pt,
+     it=cmssi10 at 11pt,
+     sl=cmssi10 at 11pt,
+     bi=cmssbx10 at 11pt,
+     bs=cmssbx10 at 11pt,
+     sc=cmss10 at 11pt]
+
+  \definebodyfont [10pt] [ss]
+    [tf=cmss10,
+     bf=cmssbx10,
+     it=cmssi10,
+     sl=cmssi10,
+     bi=cmssbx10,
+     bs=cmssbx10,
+     sc=cmss10]
+
+  \definebodyfont [9pt] [ss]
+    [tf=cmss9,
+     bf=cmssbx10 at 9pt,
+     it=cmssi9,
+     sl=cmssi9,
+     bi=cmssbx10 at 9pt,
+     bs=cmssbx10 at 9pt,
+     sc=cmss9]
+
+  \definebodyfont [8pt] [ss]
+    [tf=cmss8,
+     bf=cmssbx10 at 8pt,
+     it=cmssi8,
+     sl=cmssi8,
+     bi=cmssbx10 at 8pt,
+     bs=cmssbx10 at 8pt,
+     sc=cmss8]
+
+  \definebodyfont [7pt] [ss]
+    [tf=cmss10 at 7pt,
+     bf=cmssbx10 at 7pt,
+     it=cmssi10 at 7pt,
+     sl=cmssi10 at 7pt,
+     bs=cmssbx10 at 7pt,
+     bi=cmssbx10 at 7pt,
+     sc=cmss10 at 7pt]
+
+  \definebodyfont [6pt] [ss]
+    [tf=cmss10 at 6pt,
+     bf=cmssbx10 at 6pt,
+     it=cmssi10 at 6pt,
+     sl=cmssi10 at 6pt,
+     bs=cmssbx10 at 6pt,
+     bi=cmssbx10 at 6pt,
+     sc=cmss10 at 6pt]
+
+  \definebodyfont [5pt] [ss]
+    [tf=cmss10 at 5pt,
+     bf=cmssbx10 at 5pt,
+     it=cmssi10 at 5pt,
+     sl=cmssi10 at 5pt,
+     bs=cmssbx10 at 5pt,
+     bi=cmssbx10 at 5pt,
+     sc=cmss10 at 5pt]
+
+  \definebodyfont [4pt] [ss]
+    [tf=cmss10 at 4pt,
+     bf=cmssbx10 at 4pt,
+     it=cmssi10 at 4pt,
+     sl=cmssi10 at 4pt,
+     bs=cmssbx10 at 4pt,
+     bi=cmssbx10 at 4pt,
+     sc=cmss10 at 4pt]
+
+  \definebodyfont [14.4pt,17.3pt,20.7pt] [ss]
+    [tf=cmss12 sa 1,
+     bf=cmssbx10 sa 1,
+     it=cmssi12 sa 1,
+     sl=cmssi12 sa 1,
+     bi=cmssbx10 sa 1,
+     bs=cmssbx10 sa 1,
+     sc=cmss12 sa 1]
 
 \stoptypescript
 
 \starttypescript [mono] [computer-modern] [size]
 
-\definebodyfont [12pt] [tt]
-  [tf=cmtt12,
-   sl=cmsltt10 at 12pt,
-   it=cmitt10 at 12pt]
-
-\definebodyfont [11pt] [tt]
-  [tf=cmtt10 at 11pt,
-   sl=cmsltt10 at 11pt,
-   it=cmitt10 at 11pt]
-
-\definebodyfont [10pt] [tt]
-  [tf=cmtt10,
-   sl=cmsltt10,
-   it=cmitt10]
-
-\definebodyfont [9pt] [tt]
-  [tf=cmtt9,
-   sl=cmsltt10 at 9pt,
-   it=cmitt10 at 9pt]
-
-\definebodyfont [8pt] [tt]
-  [tf=cmtt8,
-   sl=cmsltt10 at 8pt,
-   it=cmitt10 at 8pt]
-
-\definebodyfont [7pt] [tt]
-  [tf=cmtt10 at 7pt,
-   sl=cmsltt10 at 7pt,
-   it=cmitt10 at 7pt]
-
-\definebodyfont [6pt] [tt]
-  [tf=cmtt10 at 6pt,
-   sl=cmsltt10 at 6pt,
-   it=cmitt10 at 6pt]
-
-\definebodyfont [5pt] [tt]
-  [tf=cmtt10 at 5pt,
-   sl=cmsltt10 at 5pt,
-   it=cmitt10 at 5pt]
-
-\definebodyfont [4pt] [tt]
-  [tf=cmtt10 at 4pt,
-   sl=cmsltt10 at 4pt,
-   it=cmitt10 at 4pt]
-
-\definebodyfont [14.4pt,17.3pt,20.7pt] [tt]
-  [tf=cmtt12 sa 1,
-   sl=cmsltt10 sa 1,
-   it=cmitt10 sa 1]
+  \definebodyfont [12pt] [tt]
+    [tf=cmtt12,
+     sl=cmsltt10 at 12pt,
+     it=cmitt10 at 12pt]
+
+  \definebodyfont [11pt] [tt]
+    [tf=cmtt10 at 11pt,
+     sl=cmsltt10 at 11pt,
+     it=cmitt10 at 11pt]
+
+  \definebodyfont [10pt] [tt]
+    [tf=cmtt10,
+     sl=cmsltt10,
+     it=cmitt10]
+
+  \definebodyfont [9pt] [tt]
+    [tf=cmtt9,
+     sl=cmsltt10 at 9pt,
+     it=cmitt10 at 9pt]
+
+  \definebodyfont [8pt] [tt]
+    [tf=cmtt8,
+     sl=cmsltt10 at 8pt,
+     it=cmitt10 at 8pt]
+
+  \definebodyfont [7pt] [tt]
+    [tf=cmtt10 at 7pt,
+     sl=cmsltt10 at 7pt,
+     it=cmitt10 at 7pt]
+
+  \definebodyfont [6pt] [tt]
+    [tf=cmtt10 at 6pt,
+     sl=cmsltt10 at 6pt,
+     it=cmitt10 at 6pt]
+
+  \definebodyfont [5pt] [tt]
+    [tf=cmtt10 at 5pt,
+     sl=cmsltt10 at 5pt,
+     it=cmitt10 at 5pt]
+
+  \definebodyfont [4pt] [tt]
+    [tf=cmtt10 at 4pt,
+     sl=cmsltt10 at 4pt,
+     it=cmitt10 at 4pt]
+
+  \definebodyfont [14.4pt,17.3pt,20.7pt] [tt]
+    [tf=cmtt12 sa 1,
+     sl=cmsltt10 sa 1,
+     it=cmitt10 sa 1]
 
 \stoptypescript
 
 \starttypescript [math] [computer-modern,latin-modern] [size]
 
-% hack to prevent mapping of filenames, watch the space!
-
-\definefontsynonym[xcmr12][cmr12 ]
-\definefontsynonym[xcmr10][cmr10 ]
-\definefontsynonym[xcmr9] [cmr9 ]
-\definefontsynonym[xcmr8] [cmr8 ]
-\definefontsynonym[xcmr7] [cmr7 ]
-\definefontsynonym[xcmr6] [cmr6 ]
-\definefontsynonym[xcmr5] [cmr5 ]
-
-\definebodyfont [12pt] [mm]
-  [mr=xcmr12,
-   ex=cmex10 at 12pt,
-   mi=cmmi12,
-   sy=cmsy10 at 12pt]
-
-\definebodyfont [11pt] [mm]
-  [mr=xcmr10 at 11pt,
-   ex=cmex10 at 11pt,
-   mi=cmmi10 at 11pt,
-   sy=cmsy10 at 11pt]
-
-\definebodyfont [10pt] [mm]
-  [mr=xcmr10,
-   ex=cmex10,
-   mi=cmmi10,
-   sy=cmsy10]
-
-\definebodyfont [9pt] [mm]
-  [mr=xcmr9,
-   ex=cmex10 at 9pt,
-   mi=cmmi9,
-   sy=cmsy9]
-
-\definebodyfont [8pt] [mm]
-  [mr=xcmr8,
-   ex=cmex10 at 8pt,
-   mi=cmmi8,
-   sy=cmsy8]
-
-\definebodyfont [7pt] [mm]
-  [mr=xcmr7,
-   ex=cmex10 at 7pt,
-   mi=cmmi7,
-   sy=cmsy7]
-
-\definebodyfont [6pt] [mm]
-  [mr=xcmr6,
-   ex=cmex10 at 6pt,
-   mi=cmmi6,
-   sy=cmsy6]
-
-\definebodyfont [5pt] [mm]
-  [mr=xcmr5,
-   ex=cmex10 at 5pt,
-   mi=cmmi5,
-   sy=cmsy5]
-
-\definebodyfont [4pt] [mm]
-  [mr=xcmr5 at 4pt,
-   ex=cmex10 at 4pt,
-   mi=cmmi5 at 4pt,
-   sy=cmsy5 at 4pt]
-
-\definebodyfont [14.4pt,17.3pt,20.7pt] [mm]
-  [mr=xcmr12 sa 1,
-   ex=cmex10 sa 1,
-   mi=cmmi12 sa 1,
-   sy=cmsy10 sa 1]
+  % hack to prevent mapping of filenames, watch the space!
+
+  \definefontsynonym[xcmr12][cmr12 ]
+  \definefontsynonym[xcmr10][cmr10 ]
+  \definefontsynonym[xcmr9] [cmr9 ]
+  \definefontsynonym[xcmr8] [cmr8 ]
+  \definefontsynonym[xcmr7] [cmr7 ]
+  \definefontsynonym[xcmr6] [cmr6 ]
+  \definefontsynonym[xcmr5] [cmr5 ]
+
+  \definebodyfont [12pt] [mm]
+    [mr=xcmr12,
+     ex=cmex10 at 12pt,
+     mi=cmmi12,
+     sy=cmsy10 at 12pt]
+
+  \definebodyfont [11pt] [mm]
+    [mr=xcmr10 at 11pt,
+     ex=cmex10 at 11pt,
+     mi=cmmi10 at 11pt,
+     sy=cmsy10 at 11pt]
+
+  \definebodyfont [10pt] [mm]
+    [mr=xcmr10,
+     ex=cmex10,
+     mi=cmmi10,
+     sy=cmsy10]
+
+  \definebodyfont [9pt] [mm]
+    [mr=xcmr9,
+     ex=cmex10 at 9pt,
+     mi=cmmi9,
+     sy=cmsy9]
+
+  \definebodyfont [8pt] [mm]
+    [mr=xcmr8,
+     ex=cmex10 at 8pt,
+     mi=cmmi8,
+     sy=cmsy8]
+
+  \definebodyfont [7pt] [mm]
+    [mr=xcmr7,
+     ex=cmex10 at 7pt,
+     mi=cmmi7,
+     sy=cmsy7]
+
+  \definebodyfont [6pt] [mm]
+    [mr=xcmr6,
+     ex=cmex10 at 6pt,
+     mi=cmmi6,
+     sy=cmsy6]
+
+  \definebodyfont [5pt] [mm]
+    [mr=xcmr5,
+     ex=cmex10 at 5pt,
+     mi=cmmi5,
+     sy=cmsy5]
+
+  \definebodyfont [4pt] [mm]
+    [mr=xcmr5 at 4pt,
+     ex=cmex10 at 4pt,
+     mi=cmmi5 at 4pt,
+     sy=cmsy5 at 4pt]
+
+  \definebodyfont [14.4pt,17.3pt,20.7pt] [mm]
+    [mr=xcmr12 sa 1,
+     ex=cmex10 sa 1,
+     mi=cmmi12 sa 1,
+     sy=cmsy10 sa 1]
 
 \stoptypescript
 
@@ -471,73 +471,73 @@
 
 % hack to prevent mapping of filenames, watch the space!
 
-\definefontsynonym[xcmb12][cmbx12 ]
-\definefontsynonym[xcmb10][cmbx10 ]
-\definefontsynonym[xcmb9] [cmbx9 ]
-\definefontsynonym[xcmb8] [cmbx8 ]
-\definefontsynonym[xcmb7] [cmbx7 ]
-\definefontsynonym[xcmb6] [cmbx6 ]
-\definefontsynonym[xcmb5] [cmbx5 ]
-
-\definebodyfont [12pt] [mm]
-  [mr=xcmb12,
-   ex=cmex10 at 12pt,
-   mi=cmmib10 at 12pt,
-   sy=cmbsy10 at 12pt]
-
-\definebodyfont [11pt] [mm]
-  [mr=xcmb10 at 11pt,
-   ex=cmex10 at 11pt,
-   mi=cmmib10 at 11pt,
-   sy=cmbsy10 at 11pt]
-
-\definebodyfont [10pt] [mm]
-  [mr=xcmb10,
-   ex=cmex10,
-   mi=cmmib10,
-   sy=cmbsy10]
-
-\definebodyfont [9pt] [mm]
-  [mr=xcmb9,
-   ex=cmex10 at 9pt,
-   mi=cmmib10 at 9pt,
-   sy=cmbsy10 at 9pt]
-
-\definebodyfont [8pt] [mm]
-  [mr=xcmb8,
-   ex=cmex10 at 8pt,
-   mi=cmmib7 at 8pt,
-   sy=cmbsy7 at 8pt]
-
-\definebodyfont [7pt] [mm]
-  [mr=xcmb7,
-   ex=cmex10 at 7pt,
-   mi=cmmib7,
-   sy=cmbsy7]
-
-\definebodyfont [6pt] [mm]
-  [mr=xcmb6,
-   ex=cmex10 at 6pt,
-   mi=cmmib5 at 6pt,
-   sy=cmbsy5 at 6pt]
-
-\definebodyfont [5pt] [mm]
-  [mr=xcmb5,
-   ex=cmex10 at 5pt,
-   mi=cmmib5,
-   sy=cmbsy5]
-
-\definebodyfont [4pt] [mm]
-  [mr=xcmb5 at 4pt,
-   ex=cmex10 at 4pt,
-   mi=cmmib5 at 4pt,
-   sy=cmbsy5 at 4pt]
-
-\definebodyfont [14.4pt,17.3pt,20.7pt] [mm]
-  [mr=xcmb12 sa 1,
-   ex=cmex10 sa 1,
-   mi=cmmib10 sa 1,
-   sy=cmbsy10 sa 1]
+  \definefontsynonym[xcmb12][cmbx12 ]
+  \definefontsynonym[xcmb10][cmbx10 ]
+  \definefontsynonym[xcmb9] [cmbx9 ]
+  \definefontsynonym[xcmb8] [cmbx8 ]
+  \definefontsynonym[xcmb7] [cmbx7 ]
+  \definefontsynonym[xcmb6] [cmbx6 ]
+  \definefontsynonym[xcmb5] [cmbx5 ]
+
+  \definebodyfont [12pt] [mm]
+    [mr=xcmb12,
+     ex=cmex10 at 12pt,
+     mi=cmmib10 at 12pt,
+     sy=cmbsy10 at 12pt]
+
+  \definebodyfont [11pt] [mm]
+    [mr=xcmb10 at 11pt,
+     ex=cmex10 at 11pt,
+     mi=cmmib10 at 11pt,
+     sy=cmbsy10 at 11pt]
+
+  \definebodyfont [10pt] [mm]
+    [mr=xcmb10,
+     ex=cmex10,
+     mi=cmmib10,
+     sy=cmbsy10]
+
+  \definebodyfont [9pt] [mm]
+    [mr=xcmb9,
+     ex=cmex10 at 9pt,
+     mi=cmmib10 at 9pt,
+     sy=cmbsy10 at 9pt]
+
+  \definebodyfont [8pt] [mm]
+    [mr=xcmb8,
+     ex=cmex10 at 8pt,
+     mi=cmmib7 at 8pt,
+     sy=cmbsy7 at 8pt]
+
+  \definebodyfont [7pt] [mm]
+    [mr=xcmb7,
+     ex=cmex10 at 7pt,
+     mi=cmmib7,
+     sy=cmbsy7]
+
+  \definebodyfont [6pt] [mm]
+    [mr=xcmb6,
+     ex=cmex10 at 6pt,
+     mi=cmmib5 at 6pt,
+     sy=cmbsy5 at 6pt]
+
+  \definebodyfont [5pt] [mm]
+    [mr=xcmb5,
+     ex=cmex10 at 5pt,
+     mi=cmmib5,
+     sy=cmbsy5]
+
+  \definebodyfont [4pt] [mm]
+    [mr=xcmb5 at 4pt,
+     ex=cmex10 at 4pt,
+     mi=cmmib5 at 4pt,
+     sy=cmbsy5 at 4pt]
+
+  \definebodyfont [14.4pt,17.3pt,20.7pt] [mm]
+    [mr=xcmb12 sa 1,
+     ex=cmex10 sa 1,
+     mi=cmmib10 sa 1,
+     sy=cmbsy10 sa 1]
 
 \stoptypescript
 
@@ -545,94 +545,94 @@
 
 % hack to prevent mapping of filenames, watch the space!
 
-\definefontsynonym[xcmb12][cmbx12 ]
-\definefontsynonym[xcmb10][cmbx10 ]
-\definefontsynonym[xcmb9] [cmbx9 ]
-\definefontsynonym[xcmb8] [cmbx8 ]
-\definefontsynonym[xcmb7] [cmbx7 ]
-\definefontsynonym[xcmb6] [cmbx6 ]
-\definefontsynonym[xcmb5] [cmbx5 ]
-
-\definebodyfont [12pt] [mm]
-  [mrbf=xcmb12,
-   exbf=cmex10 at 12pt,
-   mibf=cmmib10 at 12pt,
-   sybf=cmbsy10 at 12pt]
-
-\definebodyfont [11pt] [mm]
-  [mrbf=xcmb10 at 11pt,
-   exbf=cmex10 at 11pt,
-   mibf=cmmib10 at 11pt,
-   sybf=cmbsy10 at 11pt]
-
-\definebodyfont [10pt] [mm]
-  [mrbf=xcmb10,
-   exbf=cmex10,
-   mibf=cmmib10,
-   sybf=cmbsy10]
-
-\definebodyfont [9pt] [mm]
-  [mrbf=xcmb9,
-   exbf=cmex10 at 9pt,
-   mibf=cmmib10 at 9pt,
-   sybf=cmbsy10 at 9pt]
-
-\definebodyfont [8pt] [mm]
-  [mrbf=xcmb8,
-   exbf=cmex10 at 8pt,
-   mibf=cmmib7 at 8pt,
-   sybf=cmbsy7 at 8pt]
-
-\definebodyfont [7pt] [mm]
-  [mrbf=xcmb7,
-   exbf=cmex10 at 7pt,
-   mibf=cmmib7,
-   sybf=cmbsy7]
-
-\definebodyfont [6pt] [mm]
-  [mrbf=xcmb6,
-   exbf=cmex10 at 6pt,
-   mibf=cmmib5 at 6pt,
-   sybf=cmbsy5 at 6pt]
-
-\definebodyfont [5pt] [mm]
-  [mrbf=xcmb5,
-   exbf=cmex10 at 5pt,
-   mibf=cmmib5,
-   sybf=cmbsy5]
-
-\definebodyfont [4pt] [mm]
-  [mrbf=xcmb5 at 4pt,
-   exbf=cmex10 at 4pt,
-   mibf=cmmib5 at 4pt,
-   sybf=cmbsy5 at 4pt]
-
-\definebodyfont [14.4pt,17.3pt,20.7pt] [mm]
-  [mrbf=xcmb12 sa 1,
-   exbf=cmex10 sa 1,
-   mibf=cmmib10 sa 1,
-   sybf=cmbsy10 sa 1]
+  \definefontsynonym[xcmb12][cmbx12 ]
+  \definefontsynonym[xcmb10][cmbx10 ]
+  \definefontsynonym[xcmb9] [cmbx9 ]
+  \definefontsynonym[xcmb8] [cmbx8 ]
+  \definefontsynonym[xcmb7] [cmbx7 ]
+  \definefontsynonym[xcmb6] [cmbx6 ]
+  \definefontsynonym[xcmb5] [cmbx5 ]
+
+  \definebodyfont [12pt] [mm]
+    [mrbf=xcmb12,
+     exbf=cmex10 at 12pt,
+     mibf=cmmib10 at 12pt,
+     sybf=cmbsy10 at 12pt]
+
+  \definebodyfont [11pt] [mm]
+    [mrbf=xcmb10 at 11pt,
+     exbf=cmex10 at 11pt,
+     mibf=cmmib10 at 11pt,
+     sybf=cmbsy10 at 11pt]
+
+  \definebodyfont [10pt] [mm]
+    [mrbf=xcmb10,
+     exbf=cmex10,
+     mibf=cmmib10,
+     sybf=cmbsy10]
+
+  \definebodyfont [9pt] [mm]
+    [mrbf=xcmb9,
+     exbf=cmex10 at 9pt,
+     mibf=cmmib10 at 9pt,
+     sybf=cmbsy10 at 9pt]
+
+  \definebodyfont [8pt] [mm]
+    [mrbf=xcmb8,
+     exbf=cmex10 at 8pt,
+     mibf=cmmib7 at 8pt,
+     sybf=cmbsy7 at 8pt]
+
+  \definebodyfont [7pt] [mm]
+    [mrbf=xcmb7,
+     exbf=cmex10 at 7pt,
+     mibf=cmmib7,
+     sybf=cmbsy7]
+
+  \definebodyfont [6pt] [mm]
+    [mrbf=xcmb6,
+     exbf=cmex10 at 6pt,
+     mibf=cmmib5 at 6pt,
+     sybf=cmbsy5 at 6pt]
+
+  \definebodyfont [5pt] [mm]
+    [mrbf=xcmb5,
+     exbf=cmex10 at 5pt,
+     mibf=cmmib5,
+     sybf=cmbsy5]
+
+  \definebodyfont [4pt] [mm]
+    [mrbf=xcmb5 at 4pt,
+     exbf=cmex10 at 4pt,
+     mibf=cmmib5 at 4pt,
+     sybf=cmbsy5 at 4pt]
+
+  \definebodyfont [14.4pt,17.3pt,20.7pt] [mm]
+    [mrbf=xcmb12 sa 1,
+     exbf=cmex10 sa 1,
+     mibf=cmmib10 sa 1,
+     sybf=cmbsy10 sa 1]
 
 \stoptypescript
 
 \starttypescript [serif] [concrete] [size]
 
-\definebodyfont [10pt,11pt,12pt,14.4pt,17.3pt] [rm]
-  [tf=ccr10 sa 1,
-   it=ccti10 sa 1,
-   sl=ccsl10 sa 1,
-   sc=cccsc10 sa 1]
+  \definebodyfont [10pt,11pt,12pt,14.4pt,17.3pt] [rm]
+    [tf=ccr10 sa 1,
+     it=ccti10 sa 1,
+     sl=ccsl10 sa 1,
+     sc=cccsc10 sa 1]
 
-\definebodyfont [5pt,6pt,7pt,8pt,9pt] [rm]
-  [it=ccr9 sa 1,
-   sl=ccr9 sa 1,
-   sc=ccr9 sa 1]
+  \definebodyfont [5pt,6pt,7pt,8pt,9pt] [rm]
+    [it=ccr9 sa 1,
+     sl=ccr9 sa 1,
+     sc=ccr9 sa 1]
 
-\definebodyfont [9pt] [rm] [tf=ccr9]
-\definebodyfont [8pt] [rm] [tf=ccr8]
-\definebodyfont [7pt] [rm] [tf=ccr7]
-\definebodyfont [6pt] [rm] [tf=ccr6]
-\definebodyfont [5pt] [rm] [tf=ccr5]
+  \definebodyfont [9pt] [rm] [tf=ccr9]
+  \definebodyfont [8pt] [rm] [tf=ccr8]
+  \definebodyfont [7pt] [rm] [tf=ccr7]
+  \definebodyfont [6pt] [rm] [tf=ccr6]
+  \definebodyfont [5pt] [rm] [tf=ccr5]
 
 \stoptypescript
 
@@ -753,66 +753,67 @@
 
 \starttypescript [math] [euler] [size]
 
-\definebodyfont [9pt,10pt,11pt,12pt,14.4pt,17.3pt,20.7pt] [mm]
-  [mr=zeurm10 sa 1,
-   ex=zeuex10 sa 1,
-   sy=zeusm10 sa 1,
-   mi=eufm10 sa 1]
+  \definebodyfont [9pt,10pt,11pt,12pt,14.4pt,17.3pt,20.7pt] [mm]
+    [mr=zeurm10 sa 1,
+     ex=zeuex10 sa 1,
+     sy=zeusm10 sa 1,
+     mi=eufm10 sa 1]
 
-\definebodyfont [6pt,7pt,8pt] [mm]
-  [mr=zeurm7 sa 1,
-   sy=zeusm7 sa 1,
-   mi=eufm7 sa 1,
-   ex=zeuex10 sa 1]
+  \definebodyfont [6pt,7pt,8pt] [mm]
+    [mr=zeurm7 sa 1,
+     sy=zeusm7 sa 1,
+     mi=eufm7 sa 1,
+     ex=zeuex10 sa 1]
 
-\definebodyfont [5pt] [mm]
-  [mr=zeurm5,
-   sy=zeusm5,
-   mi=eufm5,
-   ex=zeuex10 at 5pt]
+  \definebodyfont [5pt] [mm]
+    [mr=zeurm5,
+     sy=zeusm5,
+     mi=eufm5,
+     ex=zeuex10 at 5pt]
 
 \stoptypescript
 
 \starttypescript [bfmath] [euler] [size]
 
-\definebodyfont [9pt,10pt,11pt,12pt,14.4pt,17.3pt,20.7pt] [mm]
-  [mrbf=zeurb10 sa 1,
-   exbf=zeuex10 sa 1,
-   sybf=zeusb10 sa 1,
-   mibf=eufb10 sa 1]
-
-\definebodyfont [6pt,7pt,8pt] [mm]
-  [mrbf=zeurb7 sa 1,
-   sybf=zeusb7 sa 1,
-   mibf=eufb7 sa 1,
-   exbf=zeuex10 sa 1]
-
-\definebodyfont [5pt] [mm]
-  [mrbf=zeurb5,
-   sybf=zeusb5,
-   mibf=eufb5,
-   exbf=zeuex10 at 5pt]
+  \definebodyfont [9pt,10pt,11pt,12pt,14.4pt,17.3pt,20.7pt] [mm]
+    [mrbf=zeurb10 sa 1,
+     exbf=zeuex10 sa 1,
+     sybf=zeusb10 sa 1,
+     mibf=eufb10 sa 1]
+
+  \definebodyfont [6pt,7pt,8pt] [mm]
+    [mrbf=zeurb7 sa 1,
+     sybf=zeusb7 sa 1,
+     mibf=eufb7 sa 1,
+     exbf=zeuex10 sa 1]
+
+  \definebodyfont [5pt] [mm]
+    [mrbf=zeurb5,
+     sybf=zeusb5,
+     mibf=eufb5,
+     exbf=zeuex10 at 5pt]
+
 \stoptypescript
 
 \starttypescript [boldmath] [euler] [size]
 
-\definebodyfont [9pt,10pt,11pt,12pt,14.4pt,17.3pt,20.7pt] [mm]
-  [mr=zeurb10 sa 1,
-   ex=zeuex10 sa 1,
-   sy=zeusb10 sa 1,
-   mi=eufb10 sa 1]
+  \definebodyfont [9pt,10pt,11pt,12pt,14.4pt,17.3pt,20.7pt] [mm]
+    [mr=zeurb10 sa 1,
+     ex=zeuex10 sa 1,
+     sy=zeusb10 sa 1,
+     mi=eufb10 sa 1]
 
-\definebodyfont [6pt,7pt,8pt] [mm]
-  [mr=zeurb7 sa 1,
-   sy=zeusb7 sa 1,
-   mi=eufb7 sa 1,
-   ex=zeuex10 sa 1]
+  \definebodyfont [6pt,7pt,8pt] [mm]
+    [mr=zeurb7 sa 1,
+     sy=zeusb7 sa 1,
+     mi=eufb7 sa 1,
+     ex=zeuex10 sa 1]
 
-\definebodyfont [5pt] [mm]
-  [mr=zeurb5,
-   sy=zeusb5,
-   mi=eufb5,
-   ex=zeuex10 at 5pt]
+  \definebodyfont [5pt] [mm]
+    [mr=zeurb5,
+     sy=zeusb5,
+     mi=eufb5,
+     ex=zeuex10 at 5pt]
 
 \stoptypescript
 
@@ -832,15 +833,15 @@
 
 \starttypescript [math] [times] [size]
 
-\mapfontsize [5pt]    [6.0pt]
-\mapfontsize [6pt]    [6.8pt]
-\mapfontsize [7pt]    [7.6pt]
-\mapfontsize [8pt]    [8.4pt]
-\mapfontsize [9pt]    [9.2pt]
-\mapfontsize [10pt]   [10pt]
-\mapfontsize [11pt]   [10.8pt]
-\mapfontsize [12pt]   [11.6pt]
-\mapfontsize [14.4pt] [13.2pt]
+  \mapfontsize [5pt]    [6.0pt]
+  \mapfontsize [6pt]    [6.8pt]
+  \mapfontsize [7pt]    [7.6pt]
+  \mapfontsize [8pt]    [8.4pt]
+  \mapfontsize [9pt]    [9.2pt]
+  \mapfontsize [10pt]   [10pt]
+  \mapfontsize [11pt]   [10.8pt]
+  \mapfontsize [12pt]   [11.6pt]
+  \mapfontsize [14.4pt] [13.2pt]
 
 \stoptypescript
 
diff --git a/tex/context/base/unic-004.tex b/tex/context/base/unic-004.tex
index a34883215..1f1b20762 100644
--- a/tex/context/base/unic-004.tex
+++ b/tex/context/base/unic-004.tex
@@ -15,7 +15,7 @@
 
 \startunicodevector 4
   \expandafter\strippedcsname
-  \ifcase\numexpr(#1+1)             % space needed, terminates expr
+  \ifcase\numexpr(#1)               % space needed, terminates expr
     \cyrillicEgrave             \or % 04-00 \uchar0{200} aswell
     \cyrillicYO                 \or % 04-01 Capital YO (or IO)
     \cyrillicDJE                \or % 04-02
@@ -270,3 +270,21 @@
 \stopunicodevector
 
 \protect \endinput
+
+% \enableregime[utf]
+%
+% \definetypeface [russian] [rm] [serif] [computer-modern] [default] [encoding=t2a]
+%
+% \setupbodyfont[russian]
+%
+% \starttext
+%
+% \startbuffer
+% Мама и Папа % Some russian characters
+% \stopbuffer
+%
+% \chardef\utfunicodetracer=0 \blank \getbuffer \blank
+% \chardef\utfunicodetracer=2 \blank \getbuffer \blank
+% \chardef\utfunicodetracer=7 \blank \getbuffer \blank
+%
+% \stoptext
diff --git a/tex/context/base/unic-exp.tex b/tex/context/base/unic-exp.tex
index 0004a5c2d..38c8a7eec 100644
--- a/tex/context/base/unic-exp.tex
+++ b/tex/context/base/unic-exp.tex
@@ -63,6 +63,6 @@
 
 %D Let's use it:
 
-\expandunivector[0,1,2,30,32,33]
+\expandunivector[0,1,2,3,4,5,30,32,33]
 
 \protect \endinput
diff --git a/tex/context/base/unic-ini.tex b/tex/context/base/unic-ini.tex
index 22ce6b269..70a1777e8 100644
--- a/tex/context/base/unic-ini.tex
+++ b/tex/context/base/unic-ini.tex
@@ -319,7 +319,7 @@
 \def\utfunichar   #1{{\tttf U\low{\unicodenumber{#1}}}}
 \def\utfunisplit  #1{{\tttf U\low{\unicodepair{#1}}}}
 \def\utfuniboth   #1{{\tttf U\low{\unicodenumber{#1\relax}->\unicodepair{#1}}}}
-\def\utfunientity #1{{\tttf\&\#\unicodehexnumber{#1};}}
+\def\utfunientity #1{{\tttf\&\#x\unicodehexnumber{#1};}}
 
 %D The character itself is accessed and typeset by:
 %D
diff --git a/tex/context/base/xtag-ext.tex b/tex/context/base/xtag-ext.tex
index 5ee40a77c..9dc0adea3 100644
--- a/tex/context/base/xtag-ext.tex
+++ b/tex/context/base/xtag-ext.tex
@@ -233,6 +233,9 @@
 \gdef\eraseXMLelement#1%
   {\dodoglobal\letbeundefined{\@@XMLsave:#1}}
 
+\gdef\geraseXMLelement
+  {\doglobal\eraseXMLelement}
+
 \gdef\processXMLelement#1%
   {\bgroup
    \enableXMLelements
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index 071c1dcbd..f85d18224 100644
--- a/tex/context/interface/keys-cz.xml
+++ b/tex/context/interface/keys-cz.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2005.01.28">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2005.01.31">
 
   <cd:variables>
     <cd:variable name="one" value="jedna"/>
diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml
index faec8ee0b..c35efdd57 100644
--- a/tex/context/interface/keys-de.xml
+++ b/tex/context/interface/keys-de.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2005.01.28">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2005.01.31">
 
   <cd:variables>
     <cd:variable name="one" value="eins"/>
diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml
index 084d56e68..d56a98c82 100644
--- a/tex/context/interface/keys-en.xml
+++ b/tex/context/interface/keys-en.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2005.01.28">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2005.01.31">
 
   <cd:variables>
     <cd:variable name="one" value="one"/>
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
index c0096102b..9b7900ecd 100644
--- a/tex/context/interface/keys-it.xml
+++ b/tex/context/interface/keys-it.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2005.01.28">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2005.01.31">
 
   <cd:variables>
     <cd:variable name="one" value="uno"/>
diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml
index e47bfb3ac..08c585550 100644
--- a/tex/context/interface/keys-nl.xml
+++ b/tex/context/interface/keys-nl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2005.01.28">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2005.01.31">
 
   <cd:variables>
     <cd:variable name="one" value="een"/>
diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml
index 22c7a529a..e505f8d2f 100644
--- a/tex/context/interface/keys-ro.xml
+++ b/tex/context/interface/keys-ro.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2005.01.28">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2005.01.31">
 
   <cd:variables>
     <cd:variable name="one" value="unu"/>