80 files changed, 526 insertions, 541 deletions
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 1944436f5..4fc678333 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -2175,7 +2175,7 @@ elseif os.type == "windows" then
 elseif name == "linux" then
 
     function os.resolvers.platform(t,k)
-        -- we sometims have HOSTTYPE set so let's check that first
+        -- we sometimes have HOSTTYPE set so let's check that first
         local platform, architecture = "", os.getenv("HOSTTYPE") or os.resultof("uname -m") or ""
         if find(architecture,"x86_64") then
             platform = "linux-64"
@@ -2253,7 +2253,7 @@ elseif name == "freebsd" then
 elseif name == "kfreebsd" then
 
     function os.resolvers.platform(t,k)
-        -- we sometims have HOSTTYPE set so let's check that first
+        -- we sometimes have HOSTTYPE set so let's check that first
         local platform, architecture = "", os.getenv("HOSTTYPE") or os.resultof("uname -m") or ""
         if find(architecture,"x86_64") then
             platform = "kfreebsd-amd64"
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 1944436f5..4fc678333 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -2175,7 +2175,7 @@ elseif os.type == "windows" then
 elseif name == "linux" then
 
     function os.resolvers.platform(t,k)
-        -- we sometims have HOSTTYPE set so let's check that first
+        -- we sometimes have HOSTTYPE set so let's check that first
         local platform, architecture = "", os.getenv("HOSTTYPE") or os.resultof("uname -m") or ""
         if find(architecture,"x86_64") then
             platform = "linux-64"
@@ -2253,7 +2253,7 @@ elseif name == "freebsd" then
 elseif name == "kfreebsd" then
 
     function os.resolvers.platform(t,k)
-        -- we sometims have HOSTTYPE set so let's check that first
+        -- we sometimes have HOSTTYPE set so let's check that first
         local platform, architecture = "", os.getenv("HOSTTYPE") or os.resultof("uname -m") or ""
         if find(architecture,"x86_64") then
             platform = "kfreebsd-amd64"
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 1944436f5..4fc678333 100755
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -2175,7 +2175,7 @@ elseif os.type == "windows" then
 elseif name == "linux" then
 
     function os.resolvers.platform(t,k)
-        -- we sometims have HOSTTYPE set so let's check that first
+        -- we sometimes have HOSTTYPE set so let's check that first
         local platform, architecture = "", os.getenv("HOSTTYPE") or os.resultof("uname -m") or ""
         if find(architecture,"x86_64") then
             platform = "linux-64"
@@ -2253,7 +2253,7 @@ elseif name == "freebsd" then
 elseif name == "kfreebsd" then
 
     function os.resolvers.platform(t,k)
-        -- we sometims have HOSTTYPE set so let's check that first
+        -- we sometimes have HOSTTYPE set so let's check that first
         local platform, architecture = "", os.getenv("HOSTTYPE") or os.resultof("uname -m") or ""
         if find(architecture,"x86_64") then
             platform = "kfreebsd-amd64"
diff --git a/tex/context/base/colo-hex.mkii b/tex/context/base/colo-hex.mkii
deleted file mode 100644
index db67f1841..000000000
--- a/tex/context/base/colo-hex.mkii
+++ /dev/null
@@ -1,125 +0,0 @@
-%D \module
-%D   [       file=colo-hex,
-%D        version=2004.06.23,
-%D          title=\CONTEXT\ Color Macros,
-%D       subtitle=Hex Colors,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%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.
-
-\ifdefined \hexcolorprefix
-  \expandafter \endinput
-\fi
-
-\writestatus{loading}{ConTeXt Color Macros / Hexadecimal}
-
-% \edef\testcolor{\string#FFC0C0}
-% \edef\testcolor{\string#55}
-%
-% \setupcolors[state=start]
-%
-% \expanded{\definecolor[thehexcolor][\hexcolorspec\testcolor]}
-%
-% \checkhexcolor[\testcolor]
-%
-% \definecolor[thehexcolor][\testcolor]
-%
-% \starttext
-%
-% test \color[thehexcolor]{rood}
-% test \color[red]{rood}
-% test \color[\testcolor]{rood}
-%
-% \stoptext
-
-\unprotect
-
-% \definecolor[rgbtestcolor] [r=0.87843,g=0.87451,b=0.89020] % RGB(224,223,227)
-% \definecolor[hextestcolor] [h=E0DFE3]
-%
-% \startMPpage
-%     path p ; % example by Peter Rolf
-%     p := unitsquare xyscaled(5cm,5cm) ;
-%     fill (point 0 of p -- point 1 of p -- point 2 of p --cycle) withcolor \MPcolor{rgbtestcolor} ; % bottom right part of the square
-%     fill (point 0 of p -- point 3 of p -- point 2 of p --cycle) withcolor \MPcolor{hextestcolor} ; % top left part
-% \stopMPpage
-
-\newdimen\hexcolorfraction \hexcolorfraction=\dimexpr1pt/255\relax
-
-\chardef\hexcolorprefix=`#
-
-\def\hexcolorspec   #1{\expandafter\dohexcolorspec   #1\empty\empty\empty\empty\relax}
-\def\hexcolorpattern#1{\expandafter\dohexcolorpattern#1\empty\empty\empty\empty\relax}
-
-\ifx\dohexstringtonumber\undefined \def\dohexstringtonumber{"} \fi
-
-\def\hexcolorcomponent#1#2%
-  {\ifnum\dohexstringtonumber#1#2=\zerocount0\else\ifnum\dohexstringtonumber#1#2=\plusone1\else
-     \expandafter\withoutpt\the\dimexpr\dohexstringtonumber#1#2\hexcolorfraction\relax
-   \fi\fi}
-
-\def\dohexcolorspec#1#2#3#4#5#6#7#8\relax
-  {\ifx#4\empty
-     s=\hexcolorcomponent#2#3%
-   \else
-     r=\hexcolorcomponent#2#3,g=\hexcolorcomponent#4#5,b=\hexcolorcomponent#6#7%
-   \fi}
-
-\def\dohexcolorpattern#1#2#3#4#5#6#7#8\relax
-  {0\ifx#4\empty
-     S:\hexcolorcomponent#2#3%
-   \else
-     R:\hexcolorcomponent#2#3:\hexcolorcomponent#4#5:\hexcolorcomponent#6#7%
-   \fi:0:0}
-
-\def\doifhexcolorelse#1%
-  {\expandafter\dodoifhexcolorelse#10\od} % 0 is a dirty trick to catch an empty #1
-
-\def\dodoifhexcolorelse#1#2\od
-  {\ifnum`#1=\hexcolorprefix
-     \expandafter\firstoftwoarguments
-   \else
-     \expandafter\secondoftwoarguments
-   \fi}
-
-\def\docheckhexcolor#1%
-  {\doifhexcolorelse{#1}{\doifundefined{#1}{\setxvalue{\??cr#1}{\hexcolorpattern{#1}}}}\donothing}
-
-\def\checkhexcolor[#1]%
-  {\expanded{\docheckhexcolor{#1}}}
-
-\def\colorHpattern{\@EA\hexcolorpattern\@EA{\@EA*\@@cl@@h}} % * == dummy placeholder
-
-\let\dodododefinecolor\dododefinecolor % we will overload this one
-
-\def\dododefinecolor#1#2#3#4[#5][#6]%
-  {\doifhexcolorelse{#6}
-     {\setxvalue{\??cr#5}{\hexcolorpattern{#6}}}
-     {\dodododefinecolor#1#2#3#4[#5][#6]}}
-
-%D For Adam Lindsay and his XeTeX special driver:
-
-% because we intercept the zero condition, the .23pt in 1.23pt will disappear in the
-% ifcase zero part branch
-
-\def\colorhexcomponent#1%
-  {\ifdim#1\points<.005\points
-     00\else\lchexnumbers{\the\dimexpr255\dimexpr#1\points\relax+.5\points\relax}%
-   \fi}
-
-% the faster one
-
-\newdimen\hex@color@a \hex@color@a=.005pt
-\newdimen\hex@color@b \hex@color@b=.5pt
-\chardef \hex@color@c             =255
-
-\def\colorhexcomponent#1%
-  {\ifdim#1\points<\hex@color@a
-     00\else\lchexnumbers{\the\dimexpr#1\points*\hex@color@c+\hex@color@b\relax}%
-   \fi}
-
-\protect \endinput
diff --git a/tex/context/base/colo-hex.mkiv b/tex/context/base/colo-hex.mkiv
deleted file mode 100644
index f661b2445..000000000
--- a/tex/context/base/colo-hex.mkiv
+++ /dev/null
@@ -1,28 +0,0 @@
-%D \module
-%D   [       file=colo-hex,
-%D        version=2004.06.23,
-%D          title=\CONTEXT\ Color Macros,
-%D       subtitle=Hex Colors,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%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.
-
-%D This is built in.
-
-% \definecolor[rgbtestcolor] [r=0.87843,g=0.87451,b=0.89020] % RGB(224,223,227)
-% \definecolor[hextestcolor] [\letterhash E0DFE3] % or [h=E0DFE3]
-%
-% \startMPpage
-%     path p ; % example by Peter Rolf
-%     p := unitsquare xyscaled(5cm,5cm) ;
-%     fill (point 0 of p -- point 1 of p -- point 2 of p --cycle) withcolor \MPcolor{rgbtestcolor} ; % bottom right part of the square
-%     fill (point 0 of p -- point 3 of p -- point 2 of p --cycle) withcolor \MPcolor{hextestcolor} ; % top left part
-% \stopMPpage
-
-\def\checkhexcolor[#1]{\doifcolorelse{#1}\donothing{\definecolor[#1][x=#1]}} % is this ok?
-
-\endinput
diff --git a/tex/context/base/colo-hex.tex b/tex/context/base/colo-hex.tex
deleted file mode 100644
index 7d223c131..000000000
--- a/tex/context/base/colo-hex.tex
+++ /dev/null
@@ -1,3 +0,0 @@
-% this is just a stub
-
-\loadmarkfile{colo-hex}
diff --git a/tex/context/base/colo-ini.mkiv b/tex/context/base/colo-ini.mkiv
index 2d45c8edd..3b84634d2 100644
--- a/tex/context/base/colo-ini.mkiv
+++ b/tex/context/base/colo-ini.mkiv
@@ -219,7 +219,7 @@
      {\def\colorstyle{#1}%
       \processcommalist[#1]\dodosetupcolor}}
 
-\def\dodosetupcolor#1%
+\def\dodosetupcolor#1% todo: mkii / mkiv
   {\startreadingfile
      \readsysfile{\truefilename{\f!colorprefix#1}}
        {\showcolormessage\m!colors4\colorstyle}
diff --git a/tex/context/base/cont-fil.mkiv b/tex/context/base/cont-fil.mkiv
index 181a881b5..2468f2998 100644
--- a/tex/context/base/cont-fil.mkiv
+++ b/tex/context/base/cont-fil.mkiv
@@ -28,19 +28,19 @@
 \definefilesynonym [int-load]        [set-11]
 \definefilesynonym [int-make]        [set-12]
 
-\definefilesynonym [fig-base]        [fig-00]
-\definefilesynonym [fig-make]        [fig-01]
-\definefilesynonym [fig-fake]        [fig-02]
-\definefilesynonym [fig-missing]     [fig-06]
+    \definefilesynonym [fig-base]        [fig-00]
+    \definefilesynonym [fig-make]        [fig-01]
+    \definefilesynonym [fig-fake]        [fig-02]
+    \definefilesynonym [fig-missing]     [fig-06]
 
 \definefilesynonym [exi-interface]   [exi-21]
 
-\definefilesynonym [res-make]        [res-01]
-\definefilesynonym [res-base]        [res-04]
-\definefilesynonym [res-crop]        [res-07]
-\definefilesynonym [res-trace]       [res-08]
-\definefilesynonym [res-log]         [res-09]
-\definefilesynonym [res-identify]    [res-12]
+    \definefilesynonym [res-make]        [res-01]
+    \definefilesynonym [res-base]        [res-04]
+    \definefilesynonym [res-crop]        [res-07]
+    \definefilesynonym [res-trace]       [res-08]
+    \definefilesynonym [res-log]         [res-09]
+    \definefilesynonym [res-identify]    [res-12]
 
 \definefilesynonym [med-show]        [res-50]
 
diff --git a/tex/context/base/cont-log.tex b/tex/context/base/cont-log.tex
index 2d39c95e7..c89a2dd8f 100644
--- a/tex/context/base/cont-log.tex
+++ b/tex/context/base/cont-log.tex
@@ -254,7 +254,6 @@
       \c!rulethickness=2pt]
      {Mk\ifnum\texengine=\luatexengine IV\else II\fi\\approved}}
 
-
 % \unexpanded\def\luaTeX
 %   {\dontleavehmode\begingroup
 %    Lua%
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 07c33cbd0..a1600a876 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2011.01.23 22:05}
+\newcontextversion{2011.01.24 10:00}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index cfc6ddc10..e4ad7d28a 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2011.01.23 22:05}
+\newcontextversion{2011.01.24 10:00}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/cont-old.tex b/tex/context/base/cont-old.tex
deleted file mode 100644
index 360b5f2e6..000000000
--- a/tex/context/base/cont-old.tex
+++ /dev/null
@@ -1,48 +0,0 @@
-%D \module
-%D   [       file=cont-old,
-%D        version=1995.10.10,
-%D          title=\CONTEXT\ Miscellaneous Macros,
-%D       subtitle=Old Macros,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%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.
-
-\writestatus{loading}{ConTeXt Old Macros}
-
-\unprotect
-
-\def\middleraggedness {6\bodyfontsize}
-
-\def\dosubstitutecommand#1#2%
-  {\writestatus\m!systems{\string#1\normalspace -> \string#2}%
-   \gdef#1{#2}%
-   #2}
-
-\def\substitutecommand#1#2%
-  {\gdef#1{\dosubstitutecommand{#1}{#2}}}
-
-\substitutecommand \volgendehoofdstuk       {\setupheadnumber[hoofdstuk][+1]}
-\substitutecommand \volgendeparagraaf       {\setupheadnumber[paragraaf][+1]}
-\substitutecommand \volgendesubparagraaf    {\setupheadnumber[subparagraaf][+1]}
-\substitutecommand \volgendesubsubparagraaf {\setupheadnumber[subsubparagraaf][+1]}
-
-\substitutecommand \volledigeinhoudsopgave  \volledigeinhoud
-\substitutecommand \plaatsinhoudsopgave     \plaatsinhoud
-\substitutecommand \stelinhoudsopgavein     \stelinhoudin
-
-\substitutecommand \streep                  \onderstreep
-\substitutecommand \strepen                 \onderstrepen
-
-\substitutecommand \pragmakenmerk           \referral
-
-\substitutecommand \definieersynoniem       \definesynonyms
-
-\substitutecommand \setupintermezzos        \setupintermezzi
-
-\let               \Everybodyfont           \EveryBodyFont
-
-\protect \endinput
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index bab5325eb..a58bf3377 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.01.23 21:48}
+\edef\contextversion{2011.01.24 10:00}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/core-job.mkii b/tex/context/base/core-job.mkii
index 1b7f9138e..2cd22e409 100644
--- a/tex/context/base/core-job.mkii
+++ b/tex/context/base/core-job.mkii
@@ -149,7 +149,8 @@
                 \disableXML
                 \readsysfile{\f!errfilename.\mksuffix}\donothing\donothing
               \egroup
-            \to\everygoodbye}}}}
+            \to\everygoodbye}%
+           \donothing}}}
 
 %D Loading of \type {cont-usr.tex} (edited by the user)
 %D and \type {cont-fmt.tex} (generated by texexec). This is
diff --git a/tex/context/base/l-os.lua b/tex/context/base/l-os.lua
index c2e229834..0448710ff 100644
--- a/tex/context/base/l-os.lua
+++ b/tex/context/base/l-os.lua
@@ -212,7 +212,7 @@ elseif os.type == "windows" then
 elseif name == "linux" then
 
     function os.resolvers.platform(t,k)
-        -- we sometims have HOSTTYPE set so let's check that first
+        -- we sometimes have HOSTTYPE set so let's check that first
         local platform, architecture = "", os.getenv("HOSTTYPE") or os.resultof("uname -m") or ""
         if find(architecture,"x86_64") then
             platform = "linux-64"
@@ -290,7 +290,7 @@ elseif name == "freebsd" then
 elseif name == "kfreebsd" then
 
     function os.resolvers.platform(t,k)
-        -- we sometims have HOSTTYPE set so let's check that first
+        -- we sometimes have HOSTTYPE set so let's check that first
         local platform, architecture = "", os.getenv("HOSTTYPE") or os.resultof("uname -m") or ""
         if find(architecture,"x86_64") then
             platform = "kfreebsd-amd64"
diff --git a/tex/context/base/m-arabtex.tex b/tex/context/base/m-arabtex.mkii
index 61e56e93a..61e56e93a 100644
--- a/tex/context/base/m-arabtex.tex
+++ b/tex/context/base/m-arabtex.mkii
diff --git a/tex/context/base/m-directives.tex b/tex/context/base/m-directives.mkiv
index c958f6cad..8b551b27a 100644
--- a/tex/context/base/m-directives.tex
+++ b/tex/context/base/m-directives.mkiv
@@ -1,5 +1,3 @@
-\doifnotmode{mkiv} {\endinput}
-
 \starttext
     \showdirectives
 \stoptext
diff --git a/tex/context/base/m-dratex.tex b/tex/context/base/m-dratex.mkii
index 6c088daf9..6c088daf9 100644
--- a/tex/context/base/m-dratex.tex
+++ b/tex/context/base/m-dratex.mkii
diff --git a/tex/context/base/m-edtsnc.tex b/tex/context/base/m-edtsnc.mkii
index 0926f4488..0926f4488 100644
--- a/tex/context/base/m-edtsnc.tex
+++ b/tex/context/base/m-edtsnc.mkii
diff --git a/tex/context/base/m-level.tex b/tex/context/base/m-level.mkii
index 67d598733..67d598733 100644
--- a/tex/context/base/m-level.tex
+++ b/tex/context/base/m-level.mkii
diff --git a/tex/context/base/m-mkivhacks.tex b/tex/context/base/m-mkivhacks.mkiv
index f47658739..0e959110e 100644
--- a/tex/context/base/m-mkivhacks.tex
+++ b/tex/context/base/m-mkivhacks.mkiv
@@ -11,8 +11,6 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\doifnotmode{mkiv}{\endinput}
-
 %D For Aditya, who needed it for his thesis.
 
 \startluacode
diff --git a/tex/context/base/m-pdfsnc.tex b/tex/context/base/m-pdfsnc.mkii
index da59ab5d8..da59ab5d8 100644
--- a/tex/context/base/m-pdfsnc.tex
+++ b/tex/context/base/m-pdfsnc.mkii
diff --git a/tex/context/base/m-plus.tex b/tex/context/base/m-plus.tex
deleted file mode 100644
index 312d9f931..000000000
--- a/tex/context/base/m-plus.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%D \module
-%D   [       file=m-plus,
-%D        version=2003.03.16,
-%D          title=\CONTEXT\ Extra Modules,
-%D       subtitle=Loading extra features,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright=PRAGMA-ADE]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D Somewhere in 2001 I started collecting new functionality
-%D in a module \type {m-yesno}. As the name suggests, I was
-%D not entirely sure if this functionality belonged in the
-%D kernel. When (again) on the \CONTEXT\ list a request for
-%D side bars was posted, I decided to move such code to plus
-%D modules. Users who want this additional functionality can
-%D put the following call in their \type {cont-sys.tex} file:
-%D
-%D \starttyping
-%D \usemodule[plus]
-%D \stoptyping
-
-% \readfile {plus-rul} \donothing \donothing
-% \readfile {page-str} \donothing \donothing
-% \readfile {page-plg} \donothing \donothing
-
-\endinput
diff --git a/tex/context/base/m-tex4ht.tex b/tex/context/base/m-tex4ht.mkii
index 8a3dc9dbb..8a3dc9dbb 100644
--- a/tex/context/base/m-tex4ht.tex
+++ b/tex/context/base/m-tex4ht.mkii
diff --git a/tex/context/base/m-timing.tex b/tex/context/base/m-timing.mkiv
index 8ecdd2d69..a91891a1b 100644
--- a/tex/context/base/m-timing.tex
+++ b/tex/context/base/m-timing.mkiv
@@ -11,8 +11,6 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\doifnotmode{mkiv}{\endinput}
-
 \ifx\ShowNamedUsage\undefined \else \endinput \fi
 
 %D Written at the end of 2007, this module is dedicated to Taco. Reaching this
diff --git a/tex/context/base/m-trackers.tex b/tex/context/base/m-trackers.mkiv
index cfcbbabff..95c34b16f 100644
--- a/tex/context/base/m-trackers.tex
+++ b/tex/context/base/m-trackers.mkiv
@@ -1,5 +1,3 @@
-\doifnotmode{mkiv} {\endinput}
-
 \starttext
     \showtrackers
 \stoptext
diff --git a/tex/context/base/m-translate.tex b/tex/context/base/m-translate.mkiv
index 25e3c8618..c0e4aad72 100644
--- a/tex/context/base/m-translate.tex
+++ b/tex/context/base/m-translate.mkiv
@@ -11,8 +11,6 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\doifnotmode{mkiv}{\endinput}
-
 %D We can make this module more clever (wildcards and such) but since
 %D it's only a demo we stick to the simple case for now. After all, it's
 %D better to fix your source.
diff --git a/tex/context/base/m-tryout.tex b/tex/context/base/m-tryout.tex
deleted file mode 100644
index 4aa50376d..000000000
--- a/tex/context/base/m-tryout.tex
+++ /dev/null
@@ -1,55 +0,0 @@
-%D \module
-%D   [       file=m-tryout,
-%D        version=2002.05.10,
-%D          title=\CONTEXT\ Extra Modules,
-%D       subtitle=Tryout Features,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%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.
-
-\endinput
-
-\unprotect
-
-%D The following macros make sure that active colons work well
-%D in French, a feature enabled with:
-%D
-%D \starttyping
-%D \useencoding[ffr] \mainlanguage[fr]
-%D \stoptyping
-%D
-%D This trick will disappear when proved robust.
-
-\startmode[activecolon]
-
-% this is now default
-
-\gdef\sectionseparator{-}
-
-\gdef\@@filterfirstpart      [#1--#2]{#1}
-\gdef\@@filtersecondpart     [#1--#2]{#2}
-
-\gdef\@@filterblockpart      [#1--#2--#3]{#1}
-\gdef\@@filternumberpart     [#1--#2--#3]{#2}
-\gdef\@@filterpagepart       [#1--#2--#3]{#3}
-\gdef\@@filterblocknumberpart[#1--#2--#3]{#1--#2}
-
-\gdef\@@filterheadpart[#1]{\@EA\@@dofilterheadpart\@EA[#1-0]}
-\gdef\@@filtertailpart[#1]{\@EA\@@dofiltertailpart\@EA[#1-0]}
-
-\gdef\@@dofilterheadpart[#1-#2]{#1}
-\gdef\@@dofiltertailpart[#1-#2]{#2}
-
-\gdef\@@filterlevelpart[#1--#2--#3]{\@@dofilterlevelpart[#2-0-0-0-0]}
-
-\gdef\@@dofilterlevelpart[#1-0-0-0-#2]{#1}
-
-\reopenutilities
-
-\stopmode
-
-\protect \endinput
diff --git a/tex/context/base/s-chi-00.tex b/tex/context/base/s-chi-00.mkii
index bec86f6d2..bec86f6d2 100644
--- a/tex/context/base/s-chi-00.tex
+++ b/tex/context/base/s-chi-00.mkii
diff --git a/tex/context/base/s-def-01.mkiv b/tex/context/base/s-def-01.mkiv
new file mode 100644
index 000000000..c54cee764
--- /dev/null
+++ b/tex/context/base/s-def-01.mkiv
@@ -0,0 +1,10 @@
+% yes or no
+
+\unprotect
+
+\startsetups defaults:frontpart:pagenumbers:roman
+    \definestructureconversionset[\c!frontpart:\c!pagenumber][][romannumerals]
+    \setupuserpagenumber[\c!way=\v!byblock]
+\stopsetups
+
+\protect
diff --git a/tex/context/base/s-fnt-01.tex b/tex/context/base/s-fnt-01.mkii
index 69c8efab9..69c8efab9 100644
--- a/tex/context/base/s-fnt-01.tex
+++ b/tex/context/base/s-fnt-01.mkii
diff --git a/tex/context/base/s-fnt-02.tex b/tex/context/base/s-fnt-02.mkii
index 69f976102..69f976102 100644
--- a/tex/context/base/s-fnt-02.tex
+++ b/tex/context/base/s-fnt-02.mkii
diff --git a/tex/context/base/s-fnt-10.tex b/tex/context/base/s-fnt-10.mkiv
index a8ef90c5e..a8ef90c5e 100644
--- a/tex/context/base/s-fnt-10.tex
+++ b/tex/context/base/s-fnt-10.mkiv
diff --git a/tex/context/base/s-fnt-11.tex b/tex/context/base/s-fnt-11.mkiv
index f2171ecd0..f2171ecd0 100644
--- a/tex/context/base/s-fnt-11.tex
+++ b/tex/context/base/s-fnt-11.mkiv
diff --git a/tex/context/base/s-fnt-20.tex b/tex/context/base/s-fnt-20.mkiv
index a57c0ba47..a57c0ba47 100644
--- a/tex/context/base/s-fnt-20.tex
+++ b/tex/context/base/s-fnt-20.mkiv
diff --git a/tex/context/base/s-fnt-21.tex b/tex/context/base/s-fnt-21.mkiv
index dd8de398d..dd8de398d 100644
--- a/tex/context/base/s-fnt-21.tex
+++ b/tex/context/base/s-fnt-21.mkiv
diff --git a/tex/context/base/s-fnt-23.tex b/tex/context/base/s-fnt-23.mkiv
index 35973d27e..35973d27e 100644
--- a/tex/context/base/s-fnt-23.tex
+++ b/tex/context/base/s-fnt-23.mkiv
diff --git a/tex/context/base/s-fnt-24.tex b/tex/context/base/s-fnt-24.mkiv
index de485557b..de485557b 100644
--- a/tex/context/base/s-fnt-24.tex
+++ b/tex/context/base/s-fnt-24.mkiv
diff --git a/tex/context/base/s-fnt-25.tex b/tex/context/base/s-fnt-25.mkiv
index fc78ddfda..fc78ddfda 100644
--- a/tex/context/base/s-fnt-25.tex
+++ b/tex/context/base/s-fnt-25.mkiv
diff --git a/tex/context/base/s-fnt-26.tex b/tex/context/base/s-fnt-26.mkiv
index 18d1d6573..18d1d6573 100644
--- a/tex/context/base/s-fnt-26.tex
+++ b/tex/context/base/s-fnt-26.mkiv
diff --git a/tex/context/base/s-fnt-28.tex b/tex/context/base/s-fnt-28.mkiv
index 839c7d4ae..839c7d4ae 100644
--- a/tex/context/base/s-fnt-28.tex
+++ b/tex/context/base/s-fnt-28.mkiv
diff --git a/tex/context/base/s-fnt-29.tex b/tex/context/base/s-fnt-29.mkiv
index 86f40e2f8..86f40e2f8 100644
--- a/tex/context/base/s-fnt-29.tex
+++ b/tex/context/base/s-fnt-29.mkiv
diff --git a/tex/context/base/s-fnt-30.tex b/tex/context/base/s-fnt-30.mkiv
index d6d298011..d6d298011 100644
--- a/tex/context/base/s-fnt-30.tex
+++ b/tex/context/base/s-fnt-30.mkiv
diff --git a/tex/context/base/s-fnt-31.tex b/tex/context/base/s-fnt-31.mkiv
index 8ef65b204..8ef65b204 100644
--- a/tex/context/base/s-fnt-31.tex
+++ b/tex/context/base/s-fnt-31.mkiv
diff --git a/tex/context/base/s-grk-00.tex b/tex/context/base/s-grk-00.mkii
index ec5ddf1f7..ec5ddf1f7 100644
--- a/tex/context/base/s-grk-00.tex
+++ b/tex/context/base/s-grk-00.mkii
diff --git a/tex/context/base/s-inf-01.tex b/tex/context/base/s-inf-01.mkiv
index 1dfb66d6a..80c40fa40 100644
--- a/tex/context/base/s-inf-01.tex
+++ b/tex/context/base/s-inf-01.mkiv
@@ -11,7 +11,8 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-%D Some day I will generalize this table mechanism.
+%D Some day I will generalize this table mechanism. This list is only
+%D right when run in the minimals as my machine might have more files.
 
 \startluacode
     local format, gsub, find, match = string.format, string.gsub, string.find, string.match
diff --git a/tex/context/base/s-inf-02.tex b/tex/context/base/s-inf-02.mkiv
index 77a3f650c..77a3f650c 100644
--- a/tex/context/base/s-inf-02.tex
+++ b/tex/context/base/s-inf-02.mkiv
diff --git a/tex/context/base/s-jap-00.tex b/tex/context/base/s-jap-00.mkii
index 28cb6c241..28cb6c241 100644
--- a/tex/context/base/s-jap-00.tex
+++ b/tex/context/base/s-jap-00.mkii
diff --git a/tex/context/base/s-lan-03.tex b/tex/context/base/s-lan-03.mkiv
index b8d24539b..b8d24539b 100644
--- a/tex/context/base/s-lan-03.tex
+++ b/tex/context/base/s-lan-03.mkiv
diff --git a/tex/context/base/s-pre-69.tex b/tex/context/base/s-pre-69.mkiv
index 9cf6fdfd5..9cf6fdfd5 100644
--- a/tex/context/base/s-pre-69.tex
+++ b/tex/context/base/s-pre-69.mkiv
diff --git a/tex/context/base/s-pre-70.tex b/tex/context/base/s-pre-70.mkiv
index 7e3049ab0..60462cf7a 100644
--- a/tex/context/base/s-pre-70.tex
+++ b/tex/context/base/s-pre-70.mkiv
@@ -1,5 +1,3 @@
-% engine=luatex
-
 %D \module
 %D   [      file=s-pre-70,
 %D        version=2008.04.15,
diff --git a/tex/context/base/s-reg-01.tex b/tex/context/base/s-reg-01.mkiv
index d3e456881..d3e456881 100644
--- a/tex/context/base/s-reg-01.tex
+++ b/tex/context/base/s-reg-01.mkiv
diff --git a/tex/context/base/s-set-31.tex b/tex/context/base/s-set-31.mkiv
index 53037a78d..53037a78d 100644
--- a/tex/context/base/s-set-31.tex
+++ b/tex/context/base/s-set-31.mkiv
diff --git a/tex/context/base/x-fdf-00.tex b/tex/context/base/x-fdf-00.mkii
index fd4bea7e7..fd4bea7e7 100644
--- a/tex/context/base/x-fdf-00.tex
+++ b/tex/context/base/x-fdf-00.mkii
diff --git a/tex/context/base/x-fig-00.tex b/tex/context/base/x-fig-00.mkii
index d293dc39f..d293dc39f 100644
--- a/tex/context/base/x-fig-00.tex
+++ b/tex/context/base/x-fig-00.mkii
diff --git a/tex/context/base/x-fig-01.tex b/tex/context/base/x-fig-01.mkii
index c2f97fea9..c2f97fea9 100644
--- a/tex/context/base/x-fig-01.tex
+++ b/tex/context/base/x-fig-01.mkii
diff --git a/tex/context/base/x-fig-02.tex b/tex/context/base/x-fig-02.mkii
index 22d49d27a..22d49d27a 100644
--- a/tex/context/base/x-fig-02.tex
+++ b/tex/context/base/x-fig-02.mkii
diff --git a/tex/context/base/x-fig-03.tex b/tex/context/base/x-fig-03.mkii
index 131752823..131752823 100644
--- a/tex/context/base/x-fig-03.tex
+++ b/tex/context/base/x-fig-03.mkii
diff --git a/tex/context/base/x-ldx.ctx b/tex/context/base/x-ldx.ctx
deleted file mode 100644
index 0dddc9734..000000000
--- a/tex/context/base/x-ldx.ctx
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' standalone='yes'?>
-
-<ctx:job>
-    <ctx:message>Lua Documentation Generator</ctx:message>
-    <ctx:preprocess>
-        <ctx:processors>
-            <ctx:processor name='ldx'>mtxrun --internal x-ldx.lua <ctx:value name='old'/> <ctx:value name='new'/></ctx:processor>
-        </ctx:processors>
-        <ctx:files>
-            <ctx:file processor='ldx'><ctx:value name='old'/></ctx:file>
-        </ctx:files>
-    </ctx:preprocess>
-    <ctx:flags>
-        <ctx:flag>purge</ctx:flag>
-        <ctx:flag>forcexml</ctx:flag>
-    </ctx:flags>
-    <ctx:process>
-        <ctx:resources>
-            <ctx:module>ldx</ctx:module>
-        </ctx:resources>
-    </ctx:process>
-</ctx:job>
-
diff --git a/tex/context/base/x-ldx.tex b/tex/context/base/x-ldx.tex
deleted file mode 100644
index 44f936d32..000000000
--- a/tex/context/base/x-ldx.tex
+++ /dev/null
@@ -1,191 +0,0 @@
-\doifnotmode{mkiv}{\endinput}
-
-\setupxml[default=hidden]
-
-\usemodule[x][mathml]
-
-\xmlregisterdocumentsetup{ldx}{xml:mml:define}
-\xmlregisterdocumentsetup{ldx}{xml:ldx:define}
-
-\xmlregisterns{ldx}{ldx}
-
-\startxmlsetups xml:ldx:define
-%     \xmlgrab {\xmldocument} {ldx:*} {*}
-    \xmlsetsetup {#1} {ldx:*} {ldx:*}
-\stopxmlsetups
-
-% % %
-
-\startxmlsetups ldx:p
-    \xmlflush{#1}\par
-\stopxmlsetups
-
-\startxmlsetups ldx:source
-    \source{\xmlflush{#1}}
-\stopxmlsetups
-
-\startxmlsetups ldx:key
-    \dontleavehmode{\bf\xmlflush{#1}}
-\stopxmlsetups
-
-\startxmlsetups ldx:variable
-    \xmlflush{#1}
-%     \expanded{\variable{\xmlflush{#1}}}
-\stopxmlsetups
-
-\startxmlsetups ldx:function
-    \dontleavehmode{\bf function}\space\xmlflush{#1}
-%     \expanded{\function{\xmlflush{#1}}}
-\stopxmlsetups
-
-\startxmlsetups ldx:com
-    \dontleavehmode{\tt--\xmlflush{#1}}
-\stopxmlsetups
-
-\startxmlsetups ldx:document
-    \page
-    \xmlflush{#1}
-    \determineregistercharacteristics[function]
-    \startmode[*register]
-        \testpage[4]
-        \extra{Functions}
-        \placeregister[function]
-    \stopmode
-    \determineregistercharacteristics[variable]
-    \startmode[*register]
-        \testpage[4]
-        \extra{Variables}
-        \placeregister[variable]
-    \stopmode
-\stopxmlsetups
-
-\newcounter\CommentCounter
-
-\startxmlsetups ldx:comment
-    \blank
-    \doglobal\increment\CommentCounter
-    \margintitle{\bf\CommentCounter}
-    \xmlflush{#1}
-    \blank
-\stopxmlsetups
-
-\startxmlsetups ldx:dqs
-    \dontleavehmode\bgroup\tt"\xmlflush{#1}"\egroup
-\stopxmlsetups
-
-\startxmlsetups ldx:sqs
-    \dontleavehmode\bgroup\tt'\xmlflush{#1}'\egroup
-\stopxmlsetups
-
-\startxmlsetups ldx:code
-    \startpacked
-    \xmlflush{#1}\relax
-    \stoppacked
-\stopxmlsetups
-
-\startxmlsetups ldx:lines
-    \startpacked
-    \xmlflush{#1}
-    \stoppacked
-\stopxmlsetups
-
-\startxmlsetups ldx:line
-    \doifelsenothing {\xmlflush{#1}} {
-        \xmlflush{#1}\crlf
-    } {
-        \dontleavehmode \hbox to \hsize \bgroup
-            \strut
-            \hskip.25\dimexpr\xmlattdef{#1}{n}{0}em\relax\relax % extra relax needed !
-            \doif {\xmlatt{#1}{comment}} {yes} {\tt}
-            \xmlflush{#1}
-            \hss
-       \egroup
-       \endgraf
-    }
-\stopxmlsetups
-
-\startxmlsetups ldx:logo
-    \uppercasestring\xmlatt{#1}{label}\xmlatt{#1}{name}\to\ascii
-    \ifx\ascii\empty\else\getvalue{\ascii}\fi
-\stopxmlsetups
-
-\startxmlsetups ldx:l
-    \uppercasestring\xmlatt{#1}{l}\xmlatt{#1}{n}\to\ascii
-    \ifx\ascii\empty\else\getvalue{\ascii}\fi
-\stopxmlsetups
-
-\startxmlsetups ldx:typing
-    \blank
-    \startpacked \tt
-    \xmlverbatim{#1}
-    \stoppacked
-    \blank
-\stopxmlsetups
-
-\startxmlsetups ldx:type
-    \dontleavehmode{\tt\xmlflush{#1}}
-\stopxmlsetups
-
-\startxmlsetups ldx:t
-    \dontleavehmode{\tt\xmlflush{#1}}
-\stopxmlsetups
-
-%
-
-\def\xmldocument{ldx}
-
-\usemodule[abr-02]
-
-% key     -> kw
-% dqs     -> dq
-% sqs     -> sq
-% line    -> ln
-% code    -> cd
-% comment -> tx (text)
-
-\definetypeface[mainfacenormal]  [ss][sans] [iwona]       [default]
-\definetypeface[mainfacenormal]  [rm][serif][palatino]    [default]
-\definetypeface[mainfacenormal]  [tt][mono] [modern]      [default][rscale=1] % 1.1
-\definetypeface[mainfacenormal]  [mm][math] [iwona]       [default][encoding=default]
-
-\definetypeface[mainfacemedium]  [ss][sans] [iwona-medium][default]
-\definetypeface[mainfacenormal]  [rm][serif][palatino]    [default]
-\definetypeface[mainfacemedium]  [tt][mono] [modern]      [default][rscale=1] % 1.1
-\definetypeface[mainfacemedium]  [mm][math] [iwona-medium][default][encoding=default]
-
-\definetypeface[mainfacenarrowtt][tt][mono] [modern-cond] [default][rscale=1] % 1.1
-
-\setupbodyfont
-  [mainfacenormal,11pt]
-
-\setupwhitespace
-  [big]
-
-\defineregister[function][functions]
-\defineregister[variable][variables]
-
-\definehead[source][subject]
-\definehead[extra] [subsubject]
-\definehead[topic] [subsubsubject]
-
-\setuphead
-  [source]
-  [style=\bfb]
-
-\setuphead
-  [extra]
-  [style=\bfa]
-
-\setuphead
-  [topic]
-  [style=\bf]
-
-\setuplayout
-  [width=middle,
-   height=middle,
-   backspace=2cm,
-   topspace=2cm]
-
-% \usemodule[inf-02]
-
-\endinput
diff --git a/tex/context/base/x-openmath.tex b/tex/context/base/x-openmath.mkii
index 38474996e..38474996e 100644
--- a/tex/context/base/x-openmath.tex
+++ b/tex/context/base/x-openmath.mkii
diff --git a/tex/context/base/x-res-00.tex b/tex/context/base/x-res-00.mkii
index 9878d0a58..9878d0a58 100644
--- a/tex/context/base/x-res-00.tex
+++ b/tex/context/base/x-res-00.mkii
diff --git a/tex/context/base/x-res-01.tex b/tex/context/base/x-res-01.mkii
index dc14e7054..dc14e7054 100644
--- a/tex/context/base/x-res-01.tex
+++ b/tex/context/base/x-res-01.mkii
diff --git a/tex/context/base/x-res-01.mkiv b/tex/context/base/x-res-01.mkiv
new file mode 100644
index 000000000..dc14e7054
--- /dev/null
+++ b/tex/context/base/x-res-01.mkiv
@@ -0,0 +1,487 @@
+%D \module
+%D   [      file=x-fig-01,
+%D        version=2001.03.21,
+%D          title=\CONTEXT\ Style File,
+%D       subtitle=Figure Base Generation,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%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.
+
+%D See \type {x-fig-00.tex} and \type {x-fig-04.tex} for more
+%D information on how to use and generate figure databases.
+%D This file loads the file named \type {\jobfilename}
+%D (\TEXEXEC\ will set this variable). You can apply this
+%D style to a database by saying:
+%D
+%D \starttyping
+%D texexec --pdf --use=fig-make yourfile.xml
+%D \stoptyping
+%D
+%D The following modes are supported:
+%D
+%D \starttabulate[|lT|l|]
+%D \NC letter             \NC map the preview on letter size  \NC \NR
+%D \NC compact            \NC use an alternative presentation \NC \NR
+%D \NC clipgrid-distance  \NC add a copy with grid overlayed  \NC \NR
+%D \NC clipgrid-steps     \NC add a copy with grid overlayed  \NC \NR
+%D \NC previewpage-A4     \NC show graphic relative to A4     \NC \NR
+%D \NC previewpage-letter \NC show graphic relative to letter \NC \NR
+%D \NC previewpage-S6     \NC show graphic relative to S6     \NC \NR
+%D \stoptabulate
+%D
+%D The resulting file has the following characteristics:
+%D
+%D \startitemize[packed]
+%D \item  the document is split into three sections: first each
+%D       figure is shown at its own page, then an overview of
+%D       figures is shown with some data alongside, and
+%D       finally an index and table of contents shows up
+%D \item  there is no title page, which means that one can
+%D       access a figure by page number without offset
+%D \item  the document is opened at the first overview page,
+%D       that is, when the viewer supports it
+%D \item  the graphic is shown 3~times: on a page of its own,
+%D       scaled to a fixed dimension, and relative to a4 or
+%D       letter paper size
+%D \item  the labels can be accessed in an index and list at
+%D       the end of the document
+%D \stopitemize
+%D
+%D We use named destinations, which means that one can
+%D access a figure by name from an external application.
+
+\usemodule[res-00]
+
+\autoXMLnamespace[rl]
+
+\setupoutput[pdftex] \overcomePDFspacefalse
+
+\setjobfullname {xml} % default suffix
+
+\doifnothing  {\jobfullname}    {\end}
+\doiffileelse {\jobfullname} {} {\end}
+
+\definesymbol     [attachment] [{\bf\color[darkred]{\jobname.xml}}]
+\setupattachments [symbol=attachment]
+\useattachment    [datafile] [\jobname.xml]
+
+\def\StartDescription
+  {\bgroup}
+
+\def\StopDescription
+  {\subject {Figure collection}
+   \starttabulate[|lBe|p|]
+   \doifXMLdataelse{rl:organization}
+     {\NC organization \NC \XMLflush{rl:organization} \NC \NR}{}
+   \doifXMLdataelse{rl:project}
+     {\NC project      \NC \XMLflush{rl:project}      \NC \NR}{}
+   \doifXMLdataelse{rl:product}
+     {\NC product      \NC \XMLflush{rl:product}      \NC \NR}{}
+   \doifXMLdataelse{rl:comment}
+     {\NC comment      \NC \XMLflush{rl:comment}      \NC \NR}{}
+   \NC specification \NC \attachment[datafile] \NC \NR
+   \stoptabulate
+   \blank[2*big]
+   \egroup}
+
+
+\def\localexternalfigurereplacement#1#2#3% hack, no reuse of dummies (yet), todo: pass objname
+  {\doifelsenothing{\XMLflush{rl:label}}
+     {\edef\FigureName{\XMLflush{rl:label}}}
+     {\edef\FigureName{\XMLflush{rl:file}}}%
+   \doifobjectfoundelse{rl}\FigureName
+     {}
+     {\setobject{rl}\FigureName\vbox{\normalexternalfigurereplacement{#1}{#2}{#3}}}%
+   \getobject{rl}\FigureName}
+
+\startmode[dummy]
+
+  \useMPlibrary[dum]
+
+  \def\StartFigureA
+    {\bgroup
+     \XMLassign{rl:file}{dummy}}
+
+  \let\normalexternalfigurereplacement\externalfigurereplacement
+  \let\externalfigurereplacement      \localexternalfigurereplacement
+
+\stopmode
+
+\startnotmode[dummy]
+
+  \def\StartFigureA
+    {\bgroup
+     \XMLassign{rl:file}{unknown}}
+
+\stopnotmode
+
+\startbuffer[unknown]
+  \framed
+    [width=\XMLpar{rl:dummy}{width}{12cm},
+     height=\XMLpar{rl:dummy}{height}{8cm},
+     background=color,
+     backgroundcolor=gray,
+     foregroundcolor=darkred,
+     align={lohi,middle}, % normal,
+     frame=off]
+    {\bf \XMLflush{rl:dummy}}
+\stopbuffer
+
+\useexternalfigure[unknown][unknown][type=buffer,object=no]
+
+\defineoverlay[page][\overlaybutton{Description}]
+
+% \def\externalfigurereplacement#1#2#3%
+%   {\getbuffer[rl-unknown]}
+
+\def\StopFigureA
+  {\doglobal\increment\CurrentPage
+   \setupbackgrounds[page][background=page]
+   \doifelsenothing{\XMLflush{rl:label}}
+     {\expanded{\definereference[Description][about:\XMLflush{rl:file}]}%
+      \expanded{\pagereference[\XMLflush{rl:file}]}}
+     {\expanded{\definereference[Description][about:\XMLflush{rl:label}]}%
+      \expanded{\pagereference[\XMLflush{rl:label}]}}
+   \pagefigure[\XMLflush{rl:file}]
+   \setupbackgrounds[page][background=]
+   \egroup}
+
+\def\StartFigureB
+  {\StartFigureA}
+
+\defineregister
+  [figureindex]
+  [figureindices]
+
+\setupregister
+  [figureindex]
+  [ownnumber=yes,
+   criterium=text,
+   interaction=text,
+   indicator=no]
+
+\definelist
+  [figurelist]
+
+\setuplist
+  [figurelist]
+  [criterium=text,
+   pagenumber=no,
+   width=2em,
+   interaction=all]
+
+\setupcolors
+  [state=start]
+
+\setuptolerance
+  [verytolerant]
+
+% Ulgy:
+
+\startmode[letter] % downward compatible
+  \enablemode[previewpage-letter]
+\stopmode
+
+\startnotmode[previewpage-letter,previewpage-S6]
+  \enablemode[previewpage-A4]
+\stopnotmode
+
+\startsetups[paper]
+\startmode[previewpage-A4]
+  \framed
+    [width=210mm,height=297mm,offset=overlay,frame=off,
+     background=color,backgroundcolor=white]
+    {\externalfigure[\XMLflush{rl:file}][reset=yes]}
+\stopmode
+\startmode[previewpage-letter]
+  \framed
+    [width=8.5in,height=11in,offset=overlay,frame=off,
+     background=color,backgroundcolor=white]
+    {\externalfigure[\XMLflush{rl:file}][reset=yes]}
+\stopmode
+\startmode[previewpage-S6]
+  \framed
+    [width=600pt,height=450pt,offset=overlay,frame=off,
+     background=color,backgroundcolor=white]
+    {\externalfigure[\XMLflush{rl:file}][reset=yes]}
+\stopmode
+\stopsetups
+
+\setupbuttons
+  [offset=10pt,
+   width=broad,
+   strut=no,
+   rulethickness=1pt,
+   framecolor=darkred]
+
+\definecolor[XMLRLcolor][white]
+
+\def\StopFigureB
+  {\doglobal\increment\CurrentPage
+   \doifelsenothing{\XMLflush{rl:label}}
+     {\expanded{\definereference[Figure][\XMLflush{rl:file}]}%
+      \expanded{\definereference[GridPg][grid:\XMLflush{rl:file}]}}
+     {\expanded{\definereference[Figure][\XMLflush{rl:label}]}%
+      \expanded{\definereference[GridPg][grid:\XMLflush{rl:label}]}}%
+   \button
+     {\hbox to \hsize
+        {\forgetall \dontcomplain
+         \doifelsenothing{\XMLflush{rl:label}}
+           {\expanded{\pagereference[about:\XMLflush{rl:file}]}}
+           {\expanded{\pagereference[about:\XMLflush{rl:label}]}}%
+         % moved here, because descriptions may be absent
+         \ifnum\CurrentPage=1 \pagereference[begin]\fi
+         %
+         \expanded{\writetolist[figurelist]{\CurrentPage}{\XMLflush{rl:label}}}%
+         \expanded{\figureindex{\CurrentPage}{\XMLflush{rl:label}}}%
+         \startnotmode[compact]%
+           \vbox to 100pt
+             {\hsize30pt
+              \vskip5pt
+              \hbox to \hsize{\hss\strut\bf\CurrentPage\hss}%
+              \vfill}%
+           \advance\hsize by -30pt
+         \stopnotmode
+         \startmode[compact]%
+           \advance\hsize by -10pt
+           \hskip10pt
+         \stopmode
+         \button % \framed
+           [width=150pt,height=100pt,offset=10pt,frame=off,
+            background=color,backgroundcolor=white,color=]
+           {\externalfigure
+              [\XMLflush{rl:file}]
+             %[maxheight=80pt,frame=off,maxwidth=130pt,factor=max]}%
+              [factor=max]}%
+           [GridPg]%
+         \let\FigWid\figurenaturalwidth
+         \let\FigHei\figurenaturalheight
+         \advance\hsize by -150pt
+         \hskip10pt
+         \advance\hsize by -10pt
+         \vbox to 100pt
+           {\hsize40pt
+           %\externalfigure
+           %  [paper]
+           %  [type=buffer,frame=on,
+           %   framecolor=darkred,rulethickness=.5pt,
+           %   width=40pt,object=no]
+            \framed
+              [offset=overlay,
+               framecolor=darkred,
+               rulethickness=.5pt]
+              {\scale[width=40pt]{\setups[paper]}}%
+            \startmode[compact]%
+              \vfill
+              \hbox to \hsize{\hss\strut\bf\CurrentPage\hss}%
+            \stopmode
+            \vfill}%
+         \advance\hsize by -40pt
+         \hskip10pt
+         \advance\hsize by -10pt
+         \vbox to 100pt
+           {\blank[disable]
+            \starttabulate[|Bel|p|]
+            \NC file \NC \XMLflush{rl:file} \NC \NR
+            \doifXMLdata{rl:label}
+              {\NC label \NC \XMLflush{rl:label} \NC \NR}
+            \NC w$\times$h \NC \FigWid$\times$\FigHei \NC \NR
+            \doifXMLdata{rl:copyright}
+              {\NC copyright \NC \XMLflush{rl:copyright} \NC \NR}
+            \doifXMLdata{rl:status}
+              {\doifelse{\XMLflush{rl:status}}{obsolete}
+                 {\NC status \NC \dontleavehmode \color[darkred]{\bf\XMLflush{rl:status}} \NC \NR}
+                 {\NC status \NC \XMLflush{rl:status} \NC \NR}}
+            \doifXMLdata{rl:comment}
+              {\NC comment \NC \XMLflush{rl:comment} \NC \NR}
+            \stoptabulate
+            \vfill}}}%
+     [Figure]
+  \vskip10pt
+  \egroup}
+
+\def\StartFigureC
+  {\StartFigureA}
+
+\def\StopFigureC
+  {\doglobal\increment\NumberOfFigures
+   \egroup}
+
+\setuplayout
+  [topspace=15pt,backspace=15pt,
+   header=0pt,footer=0pt,bottom=20pt,bottomdistance=10pt,
+   width=middle,height=fit]
+
+\setupbackgrounds
+  [page]
+  [background=,
+   backgroundcolor=gray]
+
+\setupinteractionscreen
+  [width=max,
+   height=max]
+
+\setupcolors
+  [state=start]
+
+\setupinteraction
+  [style=,
+   color=,
+   contrastcolor=,
+   state=start]
+
+\setuphead
+  [section]
+  [style=bfb]
+
+% \setupbodyfont
+%   [pos]
+
+\setupinteractionmenu
+  [bottom]
+  [left=\hfill,
+   middle=\hskip10pt,
+   frame=off,
+   style=bold,
+   background=color,
+   backgroundcolor=darkred,
+   foregroundcolor=white]
+
+\startinteractionmenu[bottom]
+  \but [begin]         begin   \\
+  \but [index]         index   \\
+  \but [list]          list    \\
+  \but [CloseDocument] close   \\
+  \but [PreviousJump]  go back \\
+\stopinteractionmenu
+
+\setupinteraction
+  [openaction=begin]
+
+\defineXMLenvironment [rl:figurelibrary] \StartLibrary \StopLibrary
+\defineXMLenvironment [rl:library]       \StartLibrary \StopLibrary
+
+\starttext
+
+\def\StartLibrary{\mainlanguage[\XMLpar{rl:library}{language}{en}]}
+\def\StopLibrary {}
+
+\defineXMLignore      [rl:description]
+\defineXMLenvironment [rl:figure]      \StartFigureC \StopFigureC
+
+\doglobal\newcounter\CurrentPage
+
+\processXMLfilegrouped{\jobfullname}
+
+\increment\NumberOfFigures
+
+\defineXMLignore      [rl:description]
+\defineXMLenvironment [rl:figure]      \StartFigureA \StopFigureA
+
+\doglobal\newcounter\CurrentPage
+
+\processXMLfilegrouped{\jobfullname}
+
+\setuppapersize
+  [S6][S6]
+
+\setupbackgrounds
+  [page]
+  [background=color]
+
+\setupinteraction
+  [menu=on]
+
+\defineXMLenvironment [rl:description] \StartDescription \StopDescription
+\defineXMLenvironment [rl:figure]      \StartFigureB     \StopFigureB
+
+\doglobal\newcounter\CurrentPage
+
+\processXMLfilegrouped{\jobfullname} \page
+
+\subject [list] {List of figures}
+
+\placelist[figurelist] \page
+
+\subject [index] {Index of figures}
+
+\startcolumns
+\placeregister[figureindex]
+\stopcolumns
+
+\doifmodeelse{clipgrid-distance,clipgrid-steps}{\page}{\stoptext}
+
+\startuniqueMPgraphic{clipgrid}{dx,dy,nx,ny,type}
+  numeric gdx, gdy, lbx, lby ;
+  if \MPvar{type}=1 :
+    gdx := \MPvar{dy} ;
+    gdy := \MPvar{dx} ;
+  else :
+    gdx := OverlayWidth /\MPvar{nx} ;
+    gdy := OverlayHeight/\MPvar{ny} ;
+  fi ;
+  lbx := gdx ;
+  lby := gdy ;
+  defaultfont  := "\truefontname{Mono}" ;
+  defaultscale := .5 ;
+  numeric pen ; pen := .25pt ;
+  def MyGrid text t =
+    draw vlingrid (0,OverlayWidth ,gdy,OverlayWidth ,OverlayHeight) t ;
+    draw hlingrid (0,OverlayHeight,gdx,OverlayHeight,OverlayWidth ) t ;
+  enddef ;
+  pickup pencircle scaled pen ;
+  MyGrid withcolor white ;
+  MyGrid dashed evenly scaled pen ;
+  draw OverlayBox withcolor white ;
+  draw OverlayBox dashed evenly scaled pen ;
+  draw vlinlabel.bot(0,eps+OverlayWidth /lby,2,OverlayWidth ) ;
+  draw hlinlabel.lft(0,eps+OverlayHeight/lbx,2,OverlayHeight) ;
+  setbounds currentpicture to OverlayBox enlarged (2*EmWidth) ;
+\stopuniqueMPgraphic
+
+\presetMPvariable[clipgrid][dx=10pt]
+\presetMPvariable[clipgrid][dy=10pt]
+\presetMPvariable[clipgrid][nx=10]
+\presetMPvariable[clipgrid][ny=10]
+
+\startmode[clipgrid-distance]
+  \defineoverlay[grid][\uniqueMPgraphic{clipgrid}{type=1}]
+\stopmode
+
+\startmode[clipgrid-steps]
+  \defineoverlay[grid][\uniqueMPgraphic{clipgrid}{type=2}]
+\stopmode
+
+\setupexternalfigures
+  [background={color,foreground,grid},
+   backgroundcolor=white]
+
+\def\StartFigureD
+  {\StartFigureA}
+
+\def\StopFigureD
+  {\doglobal\increment\CurrentPage
+   \setupbackgrounds[page][background=page]
+   \startpagefigure[\XMLflush{rl:file}][offset=20pt]%
+     \doifelsenothing{\XMLflush{rl:label}}
+       {\expanded{\definereference[Description][about:\XMLflush{rl:file}]}%
+        \expanded{\pagereference[grid:\XMLflush{rl:file}]}}
+       {\expanded{\definereference[Description][about:\XMLflush{rl:label}]}%
+        \expanded{\pagereference[grid:\XMLflush{rl:label}]}}
+   \stoppagefigure
+  %\pagefigure[\XMLflush{rl:file}][offset=20pt]
+   \setupbackgrounds[page][background=]
+   \egroup}
+
+\defineXMLignore      [rl:description]
+\defineXMLenvironment [rl:figure]      \StartFigureD \StopFigureD
+
+\doglobal\newcounter\CurrentPage
+
+\processXMLfilegrouped{\jobfullname} \page
+
+\stoptext
diff --git a/tex/context/base/x-res-02.tex b/tex/context/base/x-res-02.mkii
index a29f446f3..a29f446f3 100644
--- a/tex/context/base/x-res-02.tex
+++ b/tex/context/base/x-res-02.mkii
diff --git a/tex/context/base/x-res-03.tex b/tex/context/base/x-res-03.mkii
index bf5ea226c..bf5ea226c 100644
--- a/tex/context/base/x-res-03.tex
+++ b/tex/context/base/x-res-03.mkii
diff --git a/tex/context/base/x-res-04.tex b/tex/context/base/x-res-04.mkii
index b5032f550..b5032f550 100644
--- a/tex/context/base/x-res-04.tex
+++ b/tex/context/base/x-res-04.mkii
diff --git a/tex/context/base/x-res-08.tex b/tex/context/base/x-res-08.mkii
index 3d79b00e4..3d79b00e4 100644
--- a/tex/context/base/x-res-08.tex
+++ b/tex/context/base/x-res-08.mkii
diff --git a/tex/context/base/x-res-09.tex b/tex/context/base/x-res-09.mkii
index 608236156..608236156 100644
--- a/tex/context/base/x-res-09.tex
+++ b/tex/context/base/x-res-09.mkii
diff --git a/tex/context/base/x-res-10.tex b/tex/context/base/x-res-10.mkii
index f23c50358..f23c50358 100644
--- a/tex/context/base/x-res-10.tex
+++ b/tex/context/base/x-res-10.mkii
diff --git a/tex/context/base/x-res-11.tex b/tex/context/base/x-res-11.mkii
index b8569d22e..b8569d22e 100644
--- a/tex/context/base/x-res-11.tex
+++ b/tex/context/base/x-res-11.mkii
diff --git a/tex/context/base/x-res-12.tex b/tex/context/base/x-res-12.mkii
index 1cff48717..1cff48717 100644
--- a/tex/context/base/x-res-12.tex
+++ b/tex/context/base/x-res-12.mkii
diff --git a/tex/context/base/x-res-20.tex b/tex/context/base/x-res-20.mkii
index 3ff069ffd..3ff069ffd 100644
--- a/tex/context/base/x-res-20.tex
+++ b/tex/context/base/x-res-20.mkii
diff --git a/tex/context/base/x-res-50.mkiv b/tex/context/base/x-res-50.mkiv
index f29b1d61e..b4c6b4560 100644
--- a/tex/context/base/x-res-50.mkiv
+++ b/tex/context/base/x-res-50.mkiv
@@ -11,6 +11,8 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+%D TO BE REDONE!
+
 %D This is a preliminary module, using a preliminary xml media format that
 %D looks as follows (record is embedded in resource library element):
 %D
diff --git a/tex/context/base/x-sch-00.tex b/tex/context/base/x-sch-00.mkii
index 379d19cf2..379d19cf2 100644
--- a/tex/context/base/x-sch-00.tex
+++ b/tex/context/base/x-sch-00.mkii
diff --git a/tex/context/base/x-sch-01.tex b/tex/context/base/x-sch-01.mkii
index d72cbf89c..d72cbf89c 100644
--- a/tex/context/base/x-sch-01.tex
+++ b/tex/context/base/x-sch-01.mkii
diff --git a/tex/context/base/x-xml-01.tex b/tex/context/base/x-xml-01.mkii
index 9502ab71a..9502ab71a 100644
--- a/tex/context/base/x-xml-01.tex
+++ b/tex/context/base/x-xml-01.mkii
diff --git a/tex/context/base/x-xml-02.tex b/tex/context/base/x-xml-02.mkii
index 24f811c4d..24f811c4d 100644
--- a/tex/context/base/x-xml-02.tex
+++ b/tex/context/base/x-xml-02.mkii
diff --git a/tex/context/base/x-xml-11.tex b/tex/context/base/x-xml-11.mkii
index c1b185b55..c1b185b55 100644
--- a/tex/context/base/x-xml-11.tex
+++ b/tex/context/base/x-xml-11.mkii
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index 7285b2c5e..69a2b3e8c 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 01/23/11 21:48:38
+-- merge date  : 01/24/11 10:00:19
 
 do -- begin closure to overcome local limits and interference