stable 2005.10.27

author: Hans Hagen <pragma@wxs.nl> 2005-10-27 00:00:00 +0200
committer: Hans Hagen <pragma@wxs.nl> 2005-10-27 00:00:00 +0200
commit: 28ba5960fc4486f4e667ee0cbd802335483e1c99 (patch)
tree: 364430fa36f4d3b1b254a10874b4ed369469d4c9 /tex
parent: a35805505d72f60e25a5d9b96dcc5c0a83cc1ed0 (diff)
download: context-28ba5960fc4486f4e667ee0cbd802335483e1c99.tar.gz
48 files changed, 1474 insertions, 929 deletions
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index c8c84b4c8..87d53cb68 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -24,103 +24,160 @@
 
 \writestatus{\m!systems}{beware: some patches loaded from cont-new.tex}
 
-\def\headparameter#1% to do: everywhere in core-sec
-  {\csname\??ko\currenthead#1\endcsname}
-
-% supp-fil.tex
-
-% <?xml version='1.0' standalone='yes'?>
-% <ctx:job>
-%     <ctx:message>loading preprocessor definition</ctx:message>
-%     <ctx:preprocessor>texmfstart --direct iconv "--binary -f CP1250 -t UTF-8 kpse:&ctx:oldfilename; &gt; &ctx:newfilename;"</ctx:preprocessor>
-% </ctx:job>
-
-\let\preprocessfile\gobbleoneargument
-
-\def\dodoreadfile % we provide hooks, for instance for \enableXML
-  {\ifconditional\trackfilenames
-     \setxvalue{fn..\trackedfilename}{\readfilename}%
-   \fi
-   \preprocessfile\readfilename % new
-   \the\everybeforereadfile
-   \normalinput\readfilename\relax
-   \the\everyafterreadfile}
-
-% core-fil.tex
-
-% \let\checkpreprocessor\relax
+% \tracefilestrue
 %
-% \appendtoks\relax{\appendtoks \checkpreprocessor \to \everyjob}\to\everydump
-
-% core-job.tex
+% \unexpanded\def\readfile#1#2#3%
+%   {\readlocfile{#1}{#2}
+%      {\readjobfile{#1}{#2}
+%         {\readsysfile{#1}{#2}{#3}}}}
 
-\definesystemvariable {fz}  % file preprocessing
-
-\definefileconstant {prepprefix} {prep-}
-
-\chardef\preprocessmode\zerocount
+\unexpanded\def\readfile#1#2#3%
+  {\readlocfile{#1}{#2}{\readsysfile{#1}{#2}{#3}}}
+
+\chardef\preprocessmethod 2 % 0=no check 1=present_check 2=log_check
+\chardef\preprocessstate  0 % 1=found 2=not_present (skip)
+\def    \preprocesssuffix {.prep}
 
-\def\processlocalfile#1#2%
-  {% #1=\readlocfile|\readsetfile{dir} #2=filename
-   % #1{#2}\donothing\donothing
-   \chardef\preprocessmode\plusone
-   #1{#2}\donothing{\readfile{#2}\donothing\donothing}}
+\def\loadctxpreplist
+  {\ifcase\preprocessmethod
+     % no checking
+   \or
+     % simple checking
+   \or
+     \doiffileexistselse{./\jobname.ctl}
+       {\bgroup
+        \defineXMLenvironment[ctx:preplist]
+          {\writestatus\m!systems{loading ctx log file}}
+          {}%
+        \defineXMLenvironmentsave[ctx:prepfile][done=no]
+          {}
+          {\writestatus\m!systems{registering \XMLflush{ctx:prepfile} -> \XMLop{done}}%
+           \setxvalue{fp..\XMLflush{ctx:prepfile}}{\XMLop{done}}}%
+        \processXMLfile{./\jobname.ctl}%
+        \egroup}%
+       {\global\chardef\preprocessmode\plusone}%
+   \fi
+   \global\let\loadctxpreplist\relax}
 
-\beginETEX
+\appendtoks\loadctxpreplist\to\everystarttext % will become: \prependtoks\loadctxpreplist\to\everyjob
 
-\let\oldfilename\empty
-\let\newfilename\empty
-
-\def\preprocessfile#1%
-  {\ifcase\preprocessmode\else
-     \chardef\preprocessmode\zerocount % one time shot
-     \doifsomething{\filepreprocessor}
-       {\def\oldfilename{#1}%
-        \splitfilename\oldfilename % whatever path
-        \ifx\splitofftype\empty
-          \let\splitofftype\c!tex
-          \edef\oldfilename{\oldfilename.\splitofftype}%
-        \fi
-        \edef\newfilename{\f!prepprefix\splitoffname.\splitofftype}% local path
-        \doifundefined{fp..\oldfilename}
-          {\doifmode{\systemmodeprefix\v!first}
-             {\bgroup
-              \enableXML
-              \let\executeXMLentity\expandedXMLentity
-              \defineXMLentity[gt]\lettermore
-              \defineXMLentity[lt]\letterless
-              \writestatus\m!systems{\filepreprocessor}%
-              \executesystemcommand{\filepreprocessor}%
-              \egroup}%
-           \setxvalue{fp..\oldfilename}{\newfilename}}%
-        \let#1\newfilename}%
+\def\docheckprepfile
+  {\ifcase\preprocessmethod
+     % no preprocessing
+   \or
+     % only check for existence
+     \doiffileexistselse{\readfilename\preprocesssuffix}
+       {\chardef\preprocessstate\plusone}
+       \donothing
+   \or
+     % check when in list, otherwise assume normal file
+     \bgroup
+     \splitfilename\readfilename
+     \ifx\splitofftype\empty
+       % saveguard and speed up
+       \egroup
+     \else
+       \doifdefinedelse{fp..\splitoffname.\splitofftype}
+         {\egroup
+          \doiffileexistselse{\readfilename\preprocesssuffix}
+            {\chardef\preprocessstate\plusone}
+            {\chardef\preprocessstate\plustwo}}%
+         {\egroup}%
+     \fi
    \fi}
 
-\def\filepreprocessor{\XMLflush{ctx:preprocessor}}
-
-\defineXMLenvironment[ctx:job]          \startXMLignore \stopXMLignore
-\defineXMLgsave      [ctx:preprocessor]
-\defineXMLargument   [ctx:message]     {\writestatus\m!systems}
-\defineXMLentity     [ctx:oldfilename]  \oldfilename
-\defineXMLentity     [ctx:newfilename]  \newfilename
+% beware, \readfilename keeps the original one, but we load and store the
+% suffixed with .prep file (if present)
 
-\def\checkpreprocessor
-  {\global\let\checkpreprocessor\empty
-   \processXMLfilegrouped{./\jobname.ctx}%
-   \doifsomething\filepreprocessor
-     {\chardef\preprocessmode\plusone
-      \preprocessfile\inputfilename
-      \endinput
-      \normalinput\inputfilename\relax}}
-
-\endETEX
-
-\beginTEX
+\def\doreadfile#1#2#3#4% beware, this one already works at format generation time!
+  {\sanitizefilename#2\to\readfilename
+   \ifx\readfilename\empty
+     % silently ignore
+   \else
+     \let\trackedfilename\readfilename
+     \chardef\preprocessstate\zerocount
+     \ifconditional\trackfilenames
+       \doifundefinedelse{fn..\trackedfilename}\donetrue\donefalse
+     \else
+       \donetrue
+     \fi
+     \ifdone
+       \checkfilename\readfilename
+       \ifcase\kindoffile
+         % not a full path or url, check for existence
+         \doifelsenothing{#1}
+           {\iftracefiles\writestatus\m!systems{searching for \readfilename\space on tex path}\fi
+            \def\next{\redoreadfile\readfilename{#3}{#4}}}%
+           {\iftracefiles\writestatus\m!systems{searching for \readfilename\space on #1}\fi
+            \def\next{\redoreadfile{\pathplusfile{#1}{\readfilename}}{#3}{#4}}}%
+       \else
+         % a full path or url, no further checking done
+         \docheckprepfile
+         \ifcase\preprocessstate
+           \doiffileexistselse\readfilename
+             {\iftracefiles\writestatus\m!systems{located \readfilename}\fi
+              \def\next{#3\dodoreadfile}}%
+             {\iftracefiles\writestatus\m!systems{not found \readfilename}\fi
+              \def\next{#4}}%
+         \or
+           \iftracefiles\writestatus\m!systems{located \readfilename\preprocesssuffix}\fi
+           \def\next{#3\dodoreadfile}%
+         \or
+           \iftracefiles\writestatus\m!systems{not found \readfilename\preprocesssuffix}\fi
+           \def\next{#4}%
+         \fi
+       \fi
+     \else
+       \edef\readfilename{\getvalue{fn..\readfilename}}%
+       \iftracefiles\writestatus\m!systems{already located \readfilename}\fi
+       \def\next{#3\dodoreadfile}%
+     \fi
+     \expandafter\next
+   \fi}
 
-\def\preprocessfile#1%
-  {\chardef\preprocessmode\zerocount}
+\def\redoreadfile#1#2#3%
+  {\docheckprepfile
+   \ifcase\preprocessstate
+     \doiffileexistselse{#1}%
+       {\edef\readfilename{#1}%
+        \iftracefiles\writestatus\m!systems{#1 located}\fi
+        \def\next{#2\dodoreadfile}}%
+       {\iftracefiles\writestatus\m!systems{cannot locate #1}\fi
+        \decrement\readlevel\relax
+        \ifnum\readlevel>\zerocount
+          \edef\readfilename{\pathplusfile{\f!parentpath}{\readfilename}}%
+          \def\next{\redoreadfile\readfilename{#2}{#3}}%
+        \else
+          \def\next{#3}%
+        \fi}%
+   \or
+     \edef\readfilename{#1}%
+     \iftracefiles\writestatus\m!systems{#1\preprocesssuffix\space located}\fi
+     \def\next{#2\dodoreadfile}%
+   \or
+     \def\next{#3}%
+   \fi
+   \next}
 
-\endTEX
+\def\dodoreadfile % we provide hooks, for instance for \enableXML
+  {\ifconditional\trackfilenames
+     \setxvalue{fn..\trackedfilename}{\readfilename\ifcase\preprocessstate\or\preprocesssuffix\fi}%
+   \fi
+   \the\everybeforereadfile
+   \ifcase\preprocessstate
+     % no checking or not found when using method 1
+     \normalinput\readfilename
+   \or
+     % found when using method 1 or 2
+     \normalinput\readfilename\preprocesssuffix
+   \or
+     % not found when using method 2
+   \fi
+   \relax
+   \the\everyafterreadfile}
+
+\def\headparameter#1% to do: everywhere in core-sec
+  {\csname\??ko\currenthead#1\endcsname}
 
 % The following may be a solution for the fact that one cannot
 % change catcodes of characters like : and ; inside an environment.
diff --git a/tex/context/base/cont-sys.ori b/tex/context/base/cont-sys.ori
index ee54a99b7..a74614bd1 100644
--- a/tex/context/base/cont-sys.ori
+++ b/tex/context/base/cont-sys.ori
@@ -109,8 +109,8 @@
   \loadmapfile[ec-public-lm.map]
   \loadmapfile[qx-public-lm.map]
   \loadmapfile[t5-public-lm.map]
-  \loadmapfile[pl0-public-lm.map]
-  \loadmapfile[il2-public-lm.map]
+  %loadmapfile[pl0-public-lm.map]
+  %loadmapfile[il2-public-lm.map]
 
 \fi
 
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index 105fffb18..0d67d6746 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.08.31}
+\def\contextversion{2005.10.27}
 
 %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-box.tex b/tex/context/base/core-box.tex
index fa576b5cb..8875cfe5f 100644
--- a/tex/context/base/core-box.tex
+++ b/tex/context/base/core-box.tex
@@ -703,22 +703,22 @@
       \executeifdefined{\??ab\??ab\serializedcommalist}\middlebox{\flushnextbox}%
       \egroup}#1}
 
-\setvalue{\??ab\??ab         }{\middlebox}
-\setvalue{\??ab\??ab\v!middle}{\middlebox}
-\setvalue{\??ab\??ab\v!left }{\leftbox  }
-\setvalue{\??ab\??ab\v!right}{\rightbox }
+\setvalue{\??ab\??ab          }{\middlebox}
+\setvalue{\??ab\??ab\v!middle }{\middlebox}
+\setvalue{\??ab\??ab\v!left   }{\leftbox  }
+\setvalue{\??ab\??ab\v!right  }{\rightbox }
 \setvalue{\??ab\??ab\v!bottom }{\bottombox}
-\setvalue{\??ab\??ab\v!top }{\topbox   }
+\setvalue{\??ab\??ab\v!top    }{\topbox   }
 
 \setvalue{\??ab\??ab\v!middle\v!middle}{\middlebox}
-\setvalue{\??ab\??ab\v!left \v!top }{\lefttopbox}
-\setvalue{\??ab\??ab\v!left \v!bottom }{\leftbottombox}
-\setvalue{\??ab\??ab\v!right\v!top }{\righttopbox}
-\setvalue{\??ab\??ab\v!right\v!bottom }{\rightbottombox}
-\setvalue{\??ab\??ab\v!top \v!left }{\topleftbox}
-\setvalue{\??ab\??ab\v!bottom \v!left }{\bottomleftbox}
-\setvalue{\??ab\??ab\v!top \v!right}{\toprightbox}
-\setvalue{\??ab\??ab\v!bottom \v!right}{\bottomrightbox}
+\setvalue{\??ab\??ab\v!left  \v!top   }{\lefttopbox}
+\setvalue{\??ab\??ab\v!left  \v!bottom}{\leftbottombox}
+\setvalue{\??ab\??ab\v!right \v!top   }{\righttopbox}
+\setvalue{\??ab\??ab\v!right \v!bottom}{\rightbottombox}
+\setvalue{\??ab\??ab\v!top   \v!left  }{\topleftbox}
+\setvalue{\??ab\??ab\v!bottom\v!left  }{\bottomleftbox}
+\setvalue{\??ab\??ab\v!top   \v!right }{\toprightbox}
+\setvalue{\??ab\??ab\v!bottom\v!right }{\bottomrightbox}
 
 \setvalue{\??ab\??ab  c}{\middlebox}
 \setvalue{\??ab\??ab  l}{\leftbox}
diff --git a/tex/context/base/core-fig.tex b/tex/context/base/core-fig.tex
index ed0a87d2e..572500bbd 100644
--- a/tex/context/base/core-fig.tex
+++ b/tex/context/base/core-fig.tex
@@ -1052,10 +1052,10 @@
       \doif\@@effiletype\c!svg\presetfiguresvg}%
    #1[#4][#5][#6]%
    % prefix in runs > 1
-   % prefix in runs > 1
-   \doifnotmode{\systemmodeprefix\v!first}
-     {\doifsomething\@@efprefix{\edef\@@effilename{\@@efprefix\@@effilename}}%
-      \let\@@effiletype\empty}% beware, walks over the whole suffixlist
+   \doifsomething\@@efconversion % added, forgotten
+     {\doifnotmode{\systemmodeprefix\v!first}
+        {\doifsomething\@@efprefix{\edef\@@effilename{\@@efprefix\@@effilename}}%
+         \let\@@effiletype\empty}}% beware, walks over the whole suffixlist
    % new, somehow needed when \textwidth is used:
    \doifsomething\@@efmaxwidth {\freezedimenmacro\@@efmaxwidth }%
    \doifsomething\@@efmaxheight{\freezedimenmacro\@@efmaxheight}%
@@ -1420,6 +1420,7 @@
 % begin force convertable image into file
 \doifmode{\systemmodeprefix\v!first}{\doifsomething\@@efconversion
   {% needs to be sorted out
+   \ifx\@@efconversionpath\undefined\else\let\figurefilepath\@@efconversionpath\fi % needed for welzorg etc
    \ifx\@@efconversionfile\undefined\else\let\figurefilename\@@efconversionfile\fi
    \ifx\@@efconversiontype\undefined\else\let\figurefiletype\@@efconversiontype\fi}}%
 % end
diff --git a/tex/context/base/core-fil.tex b/tex/context/base/core-fil.tex
index b6d535b11..5820798cd 100644
--- a/tex/context/base/core-fil.tex
+++ b/tex/context/base/core-fil.tex
@@ -261,7 +261,8 @@
 
 \let\checkpreprocessor\relax
 
-\appendtoks\relax{\appendtoks \checkpreprocessor \to \everyjob}\to\everydump
+% \appendtoks\relax{\appendtoks \checkpreprocessor \to \everyjob}\to\everydump
+\appendtoks\everyjob\expandafter{\the\everyjob\checkpreprocessor}\to\everydump
 
 %D To be documented and probably moved
 
diff --git a/tex/context/base/core-job.tex b/tex/context/base/core-job.tex
index b7e203240..0a398f462 100644
--- a/tex/context/base/core-job.tex
+++ b/tex/context/base/core-job.tex
@@ -290,14 +290,20 @@
 \def\verwerkfile#1 %
   {\doexecutefile{#1}}
 
+\def\useenvironment[#1]% maybe commalist
+  {\environment #1 }
+
 \def\environment #1 % at outermost level only
   {\def\startenvironment ##1 {}%
    \let\stopenvironment\relax
+   % why not \doexecutefile ?
+   \registerfileinfo[begin]{#1}%
    \dostarttextfile{#1}%
    \startreadingfile
    \processfile{#1}% was : \readlocfile{#1}{}{}
    \stopreadingfile
-   \dostoptextfile}
+   \dostoptextfile
+   \registerfileinfo[end]{#1}}
 
 \def\component #1 % at outermost level only
   {\dostarttextfile{#1}%
diff --git a/tex/context/base/core-mis.tex b/tex/context/base/core-mis.tex
index 00d2a3ee8..acd84554e 100644
--- a/tex/context/base/core-mis.tex
+++ b/tex/context/base/core-mis.tex
@@ -546,7 +546,7 @@
    \begingroup
    \scratchdimen\periodswidth
    \hbox to \iffirstargument#1\else\periodsdefault\fi \scratchdimen
-     {\leaders\hbox to \scratchdimen{\hss.\hss}\hss}
+     {\leaders\hbox to \scratchdimen{\hss.\hss}\hss}%
    \endgroup}
 
 \unexpanded\def\unknown
@@ -2477,8 +2477,9 @@
    \dowithnextbox
      {\dontshowcomposition
       \scratchdimen\nextboxwd
-      \setbox\nextbox\vbox
-        {\dostartmirroring\hskip-\nextboxwd\flushnextbox\dostopmirroring}%
+      % better use an hbox (if no \forgetall, leftskip etc may creep in)
+     %\setbox\nextbox\vbox{\forgetall\dostartmirroring\hskip-\nextboxwd\flushnextbox\dostopmirroring}%
+      \setbox\nextbox\hbox{\dostartmirroring\hskip-\nextboxwd\flushnextbox\dostopmirroring}%
       \nextboxwd\scratchdimen
       \flushnextbox
       \egroup}}
diff --git a/tex/context/base/core-not.tex b/tex/context/base/core-not.tex
index f3f696a56..73c5c2555 100644
--- a/tex/context/base/core-not.tex
+++ b/tex/context/base/core-not.tex
@@ -704,17 +704,30 @@
 \def\dodonotesymbol#1%
   {\noteparameter\c!textcommand{\doattributes{\??vn\currentnote}\c!textstyle\c!textcolor{#1}}}
 
+% \def\donotesymbol[#1][#2]%
+%   {\bgroup
+%    \ifnotesenabled
+%      \def\currentnote{#1}%
+%      \ifsecondargument
+%        \ifx\lastnotesymbol\relax % bugged
+%          \unskip
+%          \gotobox{\dodonotesymbol\currenttextreference}[#2]%
+%        \else
+%          \lastnotesymbol
+%        \fi
+%      \else
+%        \lastnotesymbol
+%      \fi
+%    \fi
+%    \egroup}
+
 \def\donotesymbol[#1][#2]%
   {\bgroup
    \ifnotesenabled
      \def\currentnote{#1}%
      \ifsecondargument
-       \ifx\lastnotesymbol\relax
-         \unskip
-         \gotobox{\dodonotesymbol\currenttextreference}[#2]%
-       \else
-         \lastnotesymbol
-       \fi
+       \unskip
+       \gotobox{\dodonotesymbol\currenttextreference}[#2]%
      \else
        \lastnotesymbol
      \fi
diff --git a/tex/context/base/core-spa.tex b/tex/context/base/core-spa.tex
index 6ee5df55d..cb3363f8c 100644
--- a/tex/context/base/core-spa.tex
+++ b/tex/context/base/core-spa.tex
@@ -41,6 +41,8 @@
 
 \appendtoks \simplesetupspacing     \to \everydefinedfont
 
+% if you want to hyphenate the first word of a paragraph ... \appendtoks\hskip0pt\to\everypar
+
 \def\stelfactorenin
   {\simplesetupwhitespace
    \simplesetupblank
@@ -1199,7 +1201,8 @@
 \def\presetindentation
   {\doifoutervmode{\ifindentfirstparagraph\else\noindentation\fi}}
 
-%D This sets up the indentation method as well as the amounts.
+%D This sets up the (normally) global indentation behavior as well
+%D as the amounts.
 
 \definecomplexorsimple\setupindenting
 
@@ -1209,12 +1212,13 @@
    \parindent\ctxparindent
    \chardef\indentingtoggle\zerocount
    \processcommalist[#1]\docomplexsetupindenting
+   \ifindentfirstparagraph\else\noindentation\fi % added
    \toggleindentation}
 
-\def\docomplexsetupindenting#1%
-  {\edef\!!stringa{#1}% catch #1=\somedimen
-   \convertcommand\!!stringa\to\!!stringa
-   \executeifdefined{\??in:\!!stringa}{\edef\currentindentation{#1}\simplesetupindenting}}
+% \def\docomplexsetupindenting#1%
+%   {\edef\!!stringa{#1}% catch #1=\somedimen
+%    \convertcommand\!!stringa\to\!!stringa
+%    \executeifdefined{\??in:\!!stringa}{\edef\currentindentation{#1}\simplesetupindenting}}
 
 \def\docomplexsetupindenting#1%
   {\edef\!!stringa{#1}% catch #1=\somedimen
@@ -1254,8 +1258,8 @@
                                       \simplesetupindenting
                                     \fi}
 
-\def\noindenting{\indenting[\v!no, \v!next ]} % was \nietinspringen
-\def\doindenting{\indenting[\v!yes,\v!first]} % was \welinspringen
+\def\noindenting{\indenting[\v!no, \v!next ]}
+\def\doindenting{\indenting[\v!yes,\v!first]}
 
 %D This one sets up the local indentation behaviour (i.e. either or not
 %D a next paragraph will be indented).
diff --git a/tex/context/base/core-tab.tex b/tex/context/base/core-tab.tex
index 73850e5af..51404e689 100644
--- a/tex/context/base/core-tab.tex
+++ b/tex/context/base/core-tab.tex
@@ -371,6 +371,39 @@
 
 \newif\ifForgetTableBarAndQuote \ForgetTableBarAndQuotetrue
 
+% Old crappy code (live has changed):
+%
+% \bgroup
+%
+% \catcode`\|=\@@active
+% \catcode`\"=\@@active
+%
+% \gdef\pushouterbarandquote
+%   {\ifForgetTableBarAndQuote
+%      \ifnum\catcode`\|=\@@active \else
+%        \catcode`\|=\@@active
+%        \def|{\ifmmode\vert\else\char`\|\fi}%
+%      \fi
+%      \let\outertablebar=|%
+%      \ifnum\catcode`\"=\@@active \else
+%        \catcode`\"=\@@active
+%        \def"{\char`\"}%
+%      \fi
+%      \let\outertablequote="%
+%    \fi}
+%
+% \gdef\popouterbarandquote
+%   {\ifForgetTableBarAndQuote
+%      \let|\outertablebar
+%      \let"\outertablequote
+%    \else
+%      \redefinetablebarandquote
+%    \fi}
+%
+% \egroup
+%
+% probably better (untested):
+
 \bgroup
 
 \catcode`\|=\@@active
@@ -378,34 +411,34 @@
 
 \gdef\pushouterbarandquote
   {\ifForgetTableBarAndQuote
-     \ifnum\catcode`\|=\@@active \else
-       \catcode`\|=\@@active
-       \def|{\ifmmode\vert\else\char`\|\fi}%
+     \ifnum\catcode`\|=\@@active
+        \let\outertablebar|%
+     \else
+        \let\outertablebar\relax
      \fi
-     \let\outertablebar=|%
-     \ifnum\catcode`\"=\@@active \else
-       \catcode`\"=\@@active
-       \def"{\char`\"}%
+     \ifnum\catcode`\"=\@@active
+       \let\outertablequote"%
+     \else
+       \let\outertablequote\relax
      \fi
-     \let\outertablequote="%
    \fi}
 
 \gdef\popouterbarandquote
   {\ifForgetTableBarAndQuote
-     \let|\outertablebar
-     \let"\outertablequote
+     \ifx\outertablebar  \relax\else\let|\outertablebar  \fi
+     \ifx\outertablequote\relax\else\let"\outertablequote\fi
    \else
      \redefinetablebarandquote
    \fi}
 
-\gdef\ObeyTableBarAndQuote
+\egroup
+
+\def\ObeyTableBarAndQuote
   {\ForgetTableBarAndQuotefalse
    \ifintable
      \redefinetablebarandquote
    \fi}
 
-\egroup
-
 %D \macros
 %D   {ObeyTableBarAndQuote}
 %D
@@ -790,6 +823,12 @@
    \ReadFormatKeys \LeftGlue\hfil \RightGlue\empty}
 
 \appendtoks \TABLEparalignment \to \EveryTableParBox
+
+\def\!tfReFormat#1%
+  {\the \!taLeftGlue
+   \vbox{\forgetall\ialign{\span\the\!taDataColumnTemplate\cr#1\cr}}%
+   \the \!taRightGlue
+   \kern\zeropoint} % prevents \unskip / really needed
 
 %D Later on, we're going to implement multiple page table
 %D support, therefore the next \TABLE\ macro needs to be
@@ -2461,7 +2500,7 @@
      [  \v!none=>\OpenUp00\def\LOW{\Lower6 },
        \v!small=>\OpenUp00\def\LOW{\Lower6 }, % == baseline
       \v!medium=>\OpenUp11\def\LOW{\Lower7 },
-       \v!big=>\OpenUp22\def\LOW{\Lower8 }]%
+         \v!big=>\OpenUp22\def\LOW{\Lower8 }]%
    \doifelse\@@tidistance\v!none
      {\chardef\TABLErowfactor\zerocount}
      {\chardef\TABLErowfactor\plustwo  }}
diff --git a/tex/context/base/core-ver.tex b/tex/context/base/core-ver.tex
index 507480f1f..eb8363cf0 100644
--- a/tex/context/base/core-ver.tex
+++ b/tex/context/base/core-ver.tex
@@ -463,6 +463,11 @@
   {\setupgroupedtype
    \slantedtypepermittedtrue}
 
+% the next one was \string, but this prevents coloring, one can make
+% it \string again if needed
+
+\let\protectedfirsttype\relax
+
 \bgroup
 \catcode`\<=\active
 \catcode`\>=\active
@@ -476,7 +481,7 @@
    \else\ifx\next\activeleftargument
      \let\next\relax
    \else
-     \let\next\string
+     \let\next\protectedfirsttype
    \fi\fi\fi\fi
    \next}
 \egroup
diff --git a/tex/context/base/enco-cas.tex b/tex/context/base/enco-cas.tex
index 032b71786..61155ee5c 100644
--- a/tex/context/base/enco-cas.tex
+++ b/tex/context/base/enco-cas.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [     file=enco-cas,
-%D      version=2000.20.12,
+%D      version=2005.08.23,
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=Named Glyph Case Mapping,
 %D       author=Hans Hagen,
@@ -41,8 +41,8 @@
 \defineULcharacter Atilde atilde
 \defineULcharacter Itilde itilde
 \defineULcharacter Otilde otilde
-\defineULcharacter Utilde utilde
 \defineULcharacter Ntilde ntilde
+\defineULcharacter Utilde utilde
 
 \defineULcharacter Adiaeresis adiaeresis
 \defineULcharacter Ediaeresis ediaeresis
@@ -61,11 +61,14 @@
 \defineULcharacter Racute racute
 \defineULcharacter Sacute sacute
 \defineULcharacter Uacute uacute
-\defineULcharacter Zacute zacute
 \defineULcharacter Yacute yacute
+\defineULcharacter Zacute zacute
 
 \defineULcharacter Dstroke dstroke
 \defineULcharacter Hstroke hstroke
+\defineULcharacter Lstroke lstroke
+\defineULcharacter Lslash  lslash % = lstroke
+\defineULcharacter Ostroke ostroke
 \defineULcharacter Tstroke tstroke
 
 \defineULcharacter Cdotaccent cdotaccent
@@ -80,14 +83,23 @@
 \defineULcharacter Omacron omacron
 \defineULcharacter Umacron umacron
 
-\defineULcharacter Kcedilla kcedilla
-\defineULcharacter Lcedilla lcedilla
-\defineULcharacter Ncedilla ncedilla
-\defineULcharacter Rcedilla rcedilla
+\defineULcharacter Ccedilla ccedilla
+\defineULcharacter Gcedilla gcedilla % = gcommaaccent
+\defineULcharacter Kcedilla kcedilla % = kcommaaccent
+\defineULcharacter Lcedilla lcedilla % = lcommaaccent
+\defineULcharacter Ncedilla ncedilla % = ncommaaccent
+\defineULcharacter Rcedilla rcedilla % = rcommaaccent
 \defineULcharacter Scedilla scedilla
 \defineULcharacter Tcedilla tcedilla
-\defineULcharacter Ccedilla ccedilla
-\defineULcharacter Gcedilla gcedilla
+
+\defineULcharacter Ccommaaccent ccommaaccent
+\defineULcharacter Gcommaaccent gcommaaccent
+\defineULcharacter Kcommaaccent kcommaaccent
+\defineULcharacter Lcommaaccent lcommaaccent
+\defineULcharacter Ncommaaccent ncommaaccent
+\defineULcharacter Rcommaaccent rcommaaccent
+\defineULcharacter Scommaaccent scommaaccent
+\defineULcharacter Tcommaaccent tcommaaccent
 
 \defineULcharacter Ohungarumlaut ohungarumlaut
 \defineULcharacter Uhungarumlaut uhungarumlaut
@@ -122,16 +134,10 @@
 
 \defineULcharacter AEligature aeligature
 \defineULcharacter OEligature oeligature
-\defineULcharacter Ostroke    ostroke
 \defineULcharacter Ssharp     ssharp
 \defineULcharacter IJligature ijligature
 
-\defineULcharacter Scommaaccent scommaaccent
-\defineULcharacter Tcommaaccent tcommaaccent
-
-\defineULcharacter Thorn  thorn
-\defineULcharacter Eth    eth
-
-\defineULcharacter Lslash lslash
+\defineULcharacter Eth   eth
+\defineULcharacter Thorn thorn
 
 \endinput
diff --git a/tex/context/base/enco-el.tex b/tex/context/base/enco-el.tex
new file mode 100644
index 000000000..24729967b
--- /dev/null
+++ b/tex/context/base/enco-el.tex
@@ -0,0 +1,272 @@
+%D \module
+%D   [     file=enco-el,
+%D      version=2005.08.24,
+%D        title=\CONTEXT\ Encoding Macros,
+%D     subtitle=EuroLetter,
+%D       author={Several Users},
+%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 This EuroLetter encoding vector, also known as Dense Encoding is
+%D the result of discussion among users, most noticably Adam Lindsay,
+%D Mojka Miklavec, Patrick Gundlach, Taco Hoekwater and \unknown.
+%D It was a follow up of a thread started long ago where we
+%D discussed an encoding without the weird, never used symbols, but
+%D with as many characters as possible in order to support the utf-8
+%D input regime.
+
+\startencoding[el]
+
+\definecasemaps   1 to  15 lc +16 uc   0
+\definecasemaps  17 to  31 lc   0 uc -16
+
+\definecasemaps 128 to 159 lc +32 uc   0
+\definecasemaps 160 to 191 lc   0 uc -32
+
+\definecasemaps 192 to 223 lc +32 uc   0
+\definecasemaps 224 to 255 lc   0 uc -32
+
+\definecasemap   92  92 124
+\definecasemap   92 124  92
+
+\definecharacter dotlessi         160
+\definecharacter endash            32
+\definecharacter emdash            16
+
+\definecharacter aeligature       230
+\definecharacter AEligature       198
+\definecharacter oeligature       247
+\definecharacter OEligature       215
+
+\definecharacter ssharp            38
+
+\definecharacter thorn            254
+\definecharacter Thorn            222
+
+\definecharacter eth              240
+\definecharacter Eth              208
+
+\definecharacter exclamdown        42
+\definecharacter questiondown      43
+
+\definecharacter quotedbl          35
+\definecharacter quotedblbase      36
+\definecharacter quotedblleft      34
+\definecharacter quotedblright     35
+
+\definecharacter quotesingle       39
+\definecharacter quotesinglebase    0
+
+\definecharacter quoteleft         96
+\definecharacter quoteright        39
+
+\definecharacter guilsingleleft    60
+\definecharacter guilsingleright   62
+
+\definecharacter leftguillemot    123
+\definecharacter rightguillemot   125
+
+\definecharacter Acircumflex      194
+\definecharacter acircumflex      226
+%definecharacter Ccircumflex      {\buildtextaccent\textcircumflex C}
+%definecharacter ccircumflex      {\buildtextaccent\textcircumflex c}
+\definecharacter Ecircumflex      202
+\definecharacter ecircumflex      234
+%definecharacter Gcircumflex      {\buildtextaccent\textcircumflex G}
+%definecharacter gcircumflex      {\buildtextaccent\textcircumflex g}
+%definecharacter Hcircumflex      {\buildtextaccent\textcircumflex H}
+%definecharacter hcircumflex      {\buildtextaccent\textcircumflex h}
+\definecharacter Icircumflex      206
+\definecharacter icircumflex      238
+%definecharacter Jcircumflex      {\buildtextaccent\textcircumflex \dotlessJ}
+%definecharacter jcircumflex      {\buildtextaccent\textcircumflex \dotlessj}
+\definecharacter Ocircumflex      212
+\definecharacter ocircumflex      244
+%definecharacter Scircumflex      {\buildtextaccent\textcircumflex S}
+%definecharacter scircumflex      {\buildtextaccent\textcircumflex s}
+\definecharacter Ucircumflex      219
+\definecharacter ucircumflex      251
+\definecharacter Wcircumflex      154
+\definecharacter wcircumflex      186
+\definecharacter Ycircumflex      156
+\definecharacter ycircumflex      188
+
+\definecharacter Agrave           192
+\definecharacter agrave           224
+\definecharacter Egrave           200
+\definecharacter egrave           232
+\definecharacter Igrave           204
+\definecharacter igrave           236
+\definecharacter Ograve           210
+\definecharacter ograve           242
+\definecharacter Ugrave           217
+\definecharacter ugrave           249
+\definecharacter Ygrave           155
+\definecharacter ygrave           187
+
+\definecharacter Atilde           195
+\definecharacter atilde           227
+%definecharacter Itilde           {\buildtextaccent\texttilde \dotlessI}
+%definecharacter itilde           {\buildtextaccent\texttilde \dotlessi}
+\definecharacter Ntilde           209
+\definecharacter ntilde           241
+\definecharacter Otilde           213
+\definecharacter otilde           245
+%definecharacter Utilde           {\buildtextaccent\texttilde U}
+%definecharacter utilde           {\buildtextaccent\texttilde u}
+%definecharacter Ytilde           {\buildtextaccent\texttilde Y}
+%definecharacter ytilde           {\buildtextaccent\texttilde y}
+
+\definecharacter Adiaeresis       196
+\definecharacter adiaeresis       228
+\definecharacter Ediaeresis       203
+\definecharacter ediaeresis       235
+\definecharacter Idiaeresis       207
+\definecharacter idiaeresis       239
+\definecharacter Odiaeresis       214
+\definecharacter odiaeresis       246
+\definecharacter Udiaeresis       220
+\definecharacter udiaeresis       252
+\definecharacter Ydiaeresis       223
+\definecharacter ydiaeresis       255
+
+\definecharacter Aacute           193
+\definecharacter aacute           225
+\definecharacter Cacute             4
+\definecharacter cacute            20
+\definecharacter Eacute           201
+\definecharacter eacute           233
+\definecharacter Iacute           205
+\definecharacter iacute           237
+\definecharacter Lacute           132
+\definecharacter lacute           164
+\definecharacter Nacute           136
+\definecharacter nacute           168
+\definecharacter Oacute           211
+\definecharacter oacute           243
+\definecharacter Racute           141
+\definecharacter racute           173
+\definecharacter Sacute           144
+\definecharacter sacute           176
+\definecharacter Uacute           218
+\definecharacter uacute           250
+\definecharacter Yacute           221
+\definecharacter yacute           253
+\definecharacter Zacute           157
+\definecharacter zacute           189
+
+\definecharacter Dstroke            8
+\definecharacter dstroke           24
+\definecharacter Hstroke           92
+\definecharacter hstroke          124
+%definecharacter Tstroke          {T}
+%definecharacter tstroke          {t}
+
+\definecharacter Cdotaccent         6
+\definecharacter cdotaccent        22
+\definecharacter Edotaccent        10
+\definecharacter edotaccent        26
+\definecharacter Gdotaccent        15
+\definecharacter gdotaccent        31
+\definecharacter Idotaccent       128
+%definecharacter idotaccent       {\buildtextaccent\textdotaccent \dotlessi}
+\definecharacter Zdotaccent       159
+\definecharacter zdotaccent       191
+
+\definecharacter Amacron            2
+\definecharacter amacron           18
+\definecharacter Emacron           11
+\definecharacter emacron           27
+\definecharacter Imacron          129
+\definecharacter imacron          161
+\definecharacter Omacron          140
+\definecharacter omacron          172
+\definecharacter Umacron          152
+\definecharacter umacron          184
+
+\definecharacter Ccedilla         199
+\definecharacter ccedilla         231
+\definecharacter Scedilla         146
+\definecharacter scedilla         178
+
+\definecharacter Gcommaaccent      14
+\definecharacter gcommaaccent      30
+\definecharacter Kcommaaccent     131
+\definecharacter kcommaaccent     163
+\definecharacter Lcommaaccent     135
+\definecharacter lcommaaccent     167
+\definecharacter Ncommaaccent     138
+\definecharacter ncommaaccent     170
+\definecharacter Rcommaaccent     143
+\definecharacter rcommaaccent     175
+%definecharacter Tcedilla         149 % there is no tcedilla in encoding
+%definecharacter tcedilla         181
+
+\definecharacter Scommaaccent     147
+\definecharacter scommaaccent     179
+\definecharacter Tcommaaccent     149
+\definecharacter tcommaaccent     181
+
+\definecharacter Ohungarumlaut    139
+\definecharacter ohungarumlaut    171
+\definecharacter Uhungarumlaut    150
+\definecharacter uhungarumlaut    182
+
+\definecharacter Aogonek            3
+\definecharacter aogonek           19
+\definecharacter Eogonek           12
+\definecharacter eogonek           28
+\definecharacter Iogonek          130
+\definecharacter iogonek          162
+\definecharacter Uogonek          153
+\definecharacter uogonek          185
+
+\definecharacter Aring            197
+\definecharacter aring            229
+\definecharacter Uring            151
+\definecharacter uring            183
+
+\definecharacter Abreve            1
+\definecharacter abreve            17
+%definecharacter Ebreve           {\buildtextaccent\textbreve E}
+%definecharacter ebreve           {\buildtextaccent\textbreve e}
+\definecharacter Gbreve            13
+\definecharacter gbreve            29
+%definecharacter Ibreve           {\buildtextaccent\textbreve \dotlessI}
+%definecharacter ibreve           {\buildtextaccent\textbreve \dotlessi}
+%definecharacter Obreve           {\buildtextaccent\textbreve O}
+%definecharacter obreve           {\buildtextaccent\textbreve o}
+%definecharacter Ubreve           {\buildtextaccent\textbreve U}
+%definecharacter ubreve           {\buildtextaccent\textbreve u}
+
+\definecharacter Ccaron             5
+\definecharacter ccaron            21
+\definecharacter Dcaron             7
+\definecharacter dcaron            23
+\definecharacter Ecaron             9
+\definecharacter ecaron            25
+\definecharacter Lcaron           133
+\definecharacter lcaron           165
+\definecharacter Ncaron           137
+\definecharacter ncaron           169
+\definecharacter Rcaron           142
+\definecharacter rcaron           174
+\definecharacter Scaron           145
+\definecharacter scaron           177
+\definecharacter Tcaron           148
+\definecharacter tcaron           180
+%definecharacter Ycaron           {\buildtextaccent\textcaron Y}
+%definecharacter ycaron           {\buildtextaccent\textcaron y}
+\definecharacter Zcaron           158
+\definecharacter zcaron           190
+
+\definecharacter Lstroke          134
+\definecharacter lstroke          166
+\definecharacter Ostroke          216
+\definecharacter ostroke          248
+
+\stopencoding
diff --git a/tex/context/base/enco-il2.tex b/tex/context/base/enco-il2.tex
index 6f1ce351f..9fb87b2fd 100644
--- a/tex/context/base/enco-il2.tex
+++ b/tex/context/base/enco-il2.tex
@@ -11,6 +11,8 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+% This encoding will go but the regime will remain.
+
 %D This Czech/Slovak encoding is dedicated to Han The Thanh.
 %D The numbers are derived from some files he sent me. This
 %D definition file is (still) sort of beta.
@@ -45,7 +47,7 @@
 
 \stopmapping
 
-\startcoding[il2][il2]
+\startencoding[il2][il2]
 
 \definecharacter textgrave          18
 \definecharacter textacute          19
@@ -133,21 +135,23 @@
 \definecharacter Lstroke       {\ilencodedL}
 \definecharacter lstroke       {\ilencodedl}
 
-\def\ilencodedrA%
-  {\leavevmode\hbox\bgroup
+\def\ilencodedrA
+  {\dontleavehmode\hbox\bgroup
    \setbox0\hbox{h}%
    \dimen0=\ht0
    \advance\dimen0 by -1ex
    \rlap{\raise.67\dimen0\hbox{\char'27}}A%
    \egroup}
 
-\def\ilencodedl%
-  {{\char32l}}
+\def\ilencodedl
+  {\dontleavehmode{\char32l}}
 
-\def\ilencodedL% I don't like the \leavevmode here, better \enterhmode
-  {\leavevmode\hbox\bgroup
+\def\ilencodedL
+  {\dontleavehmode\hbox\bgroup
    \setbox0\hbox{L}%
    \hbox to\wd0{\hss\char32L}%
    \egroup}
 
-\stopcoding
+\stopencoding
+
+\endinput
diff --git a/tex/context/base/enco-pfr.tex b/tex/context/base/enco-pfr.tex
index aba9bac88..9507d9e4e 100644
--- a/tex/context/base/enco-pfr.tex
+++ b/tex/context/base/enco-pfr.tex
@@ -123,10 +123,10 @@
 %D This macro is defined as follows.
 
 \def\usepdffontresource #1 %
-  {\doifundefinedelse{\pdffontfileresource} % okay, undefined, so either
-     {\setxvalue{\pdffontfileresource}{#1}} % brand new, or not yet loaded
-     {\doifvaluesomething{\pdffontfileresource}  % only if not loaded in which
-        {\setxvalue{\pdffontfileresource}{#1}}}} % case it's made empty
+  {\doifundefinedelse\pdffontfileresource % okay, undefined, so either
+     {\setxvalue\pdffontfileresource{#1}} % brand new, or not yet loaded
+     {\doifvaluesomething\pdffontfileresource  % only if not loaded in which
+        {\setxvalue\pdffontfileresource{#1}}}} % case it's made empty
 
 %D Watch how we check for duplicated loading. The resource
 %D itself, when asked for, is included immediately, after which
@@ -165,10 +165,11 @@
 \def\dododoincludepdffontresource#1% encoding
   {\bgroup
    \def\currentencoding{#1}%
-   \startreadingfile
-     \readsysfile{pdfr-\getvalue\pdffontfileresource}\donothing\donothing
-   \stopreadingfile
-   \letgvalue\pdffontfileresource\empty
+   \doifvaluesomething\pdffontfileresource
+     {\startreadingfile
+        \readsysfile{pdfr-\getvalue\pdffontfileresource}\donothing\donothing
+      \stopreadingfile
+      \letgvalue\pdffontfileresource\empty}%
    \egroup}
 
 \beginETEX
diff --git a/tex/context/base/enco-pol.tex b/tex/context/base/enco-pol.tex
index 57355019e..d9f49a2dc 100644
--- a/tex/context/base/enco-pol.tex
+++ b/tex/context/base/enco-pol.tex
@@ -11,6 +11,8 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+% This encoding will go but the regime will remain.
+
 %D Polish native encoding; normally polish users will use
 %D translate=cp1250pl in combination with ec encoding.
 
@@ -64,7 +66,7 @@
 
 \stopmapping
 
-\startencoding[pl0]
+\startencoding[pl0][pl0]
 
 \definecharacter Aogonek    129
 \definecharacter Cacute     130
@@ -87,7 +89,7 @@
 
 \stopencoding
 
-\startencoding[pl0]
+\startencoding[pl0][pl0]
 
 \definecharacter leftguillemot   174
 \definecharacter rightguillemot  175
diff --git a/tex/context/base/enco-uc.tex b/tex/context/base/enco-uc.tex
index 36e611542..fb709c82d 100644
--- a/tex/context/base/enco-uc.tex
+++ b/tex/context/base/enco-uc.tex
@@ -33,7 +33,7 @@
 \definecharacter Iacute        {\uchar0{205}}
 \definecharacter Icircumflex   {\uchar0{206}}
 \definecharacter Idiaeresis    {\uchar0{207}}
-%definecharacter Dstroke       {\uchar0{208}}
+\definecharacter Eth           {\uchar0{208}}
 \definecharacter Ntilde        {\uchar0{209}}
 \definecharacter Ograve        {\uchar0{210}}
 \definecharacter Oacute        {\uchar0{211}}
@@ -65,7 +65,7 @@
 \definecharacter iacute        {\uchar0{237}}
 \definecharacter icircumflex   {\uchar0{238}}
 \definecharacter idiaeresis    {\uchar0{239}}
-%definecharacter dmacron       {\uchar0{240}}
+\definecharacter eth           {\uchar0{240}}
 \definecharacter ntilde        {\uchar0{241}}
 \definecharacter ograve        {\uchar0{242}}
 \definecharacter oacute        {\uchar0{243}}
@@ -116,8 +116,8 @@
 \definecharacter gbreve        {\uchar1{31}}
 \definecharacter Gdotaccent    {\uchar1{32}}
 \definecharacter gdotaccent    {\uchar1{33}}
-%definecharacter Gdotaccent    {\uchar1{34}}
-%definecharacter gdotaccent    {\uchar1{35}}
+\definecharacter Gcommaaccent  {\uchar1{34}}
+\definecharacter gcommaaccent  {\uchar1{35}}
 \definecharacter Hcircumflex   {\uchar1{36}}
 \definecharacter hcircumflex   {\uchar1{37}}
 \definecharacter Hstroke       {\uchar1{38}}
@@ -136,13 +136,13 @@
 \definecharacter ijligature    {\uchar1{51}}
 \definecharacter Jcircumflex   {\uchar1{52}}
 \definecharacter jcircumflex   {\uchar1{53}}
-\definecharacter Kcedilla      {\uchar1{54}}
-\definecharacter kcedilla      {\uchar1{55}}
+\definecharacter Kcommaaccent  {\uchar1{54}}
+\definecharacter kcommaaccent  {\uchar1{55}}
 \definecharacter kkra          {\uchar1{56}}
 \definecharacter Lacute        {\uchar1{57}}
 \definecharacter lacute        {\uchar1{58}}
-\definecharacter Lcedilla      {\uchar1{59}}
-\definecharacter lcedilla      {\uchar1{60}}
+\definecharacter Lcommaaccent  {\uchar1{59}}
+\definecharacter lcommaaccent  {\uchar1{60}}
 \definecharacter Lcaron        {\uchar1{61}}
 \definecharacter lcaron        {\uchar1{62}}
 \definecharacter Ldotmiddle    {\uchar1{63}}
@@ -151,8 +151,8 @@
 \definecharacter lstroke       {\uchar1{66}}
 \definecharacter Nacute        {\uchar1{67}}
 \definecharacter nacute        {\uchar1{68}}
-\definecharacter Ncedilla      {\uchar1{69}}
-\definecharacter ncedilla      {\uchar1{70}}
+\definecharacter Ncommaaccent  {\uchar1{69}}
+\definecharacter ncommaaccent  {\uchar1{70}}
 \definecharacter Ncaron        {\uchar1{71}}
 \definecharacter ncaron        {\uchar1{72}}
 \definecharacter napostrophe   {\uchar1{73}}
@@ -168,8 +168,8 @@
 \definecharacter oeligature    {\uchar1{83}}
 \definecharacter Racute        {\uchar1{84}}
 \definecharacter racute        {\uchar1{85}}
-\definecharacter Rcedilla      {\uchar1{86}}
-\definecharacter rcedilla      {\uchar1{87}}
+\definecharacter Rcommaaccent  {\uchar1{86}}
+\definecharacter rcommaaccent  {\uchar1{87}}
 \definecharacter Rcaron        {\uchar1{88}}
 \definecharacter rcaron        {\uchar1{89}}
 \definecharacter Sacute        {\uchar1{90}}
@@ -295,10 +295,11 @@
 \definecharacter textellipsis     {\uchar{32}{38}}
 \definecharacter perthousand      {\uchar{32}{48}}
 
-\definecharacter Gcedilla         {\uchar1{34}}
-\definecharacter gcedilla         {\uchar1{35}}
-\definecharacter Eth              {\uchar0{208}}
-\definecharacter eth              {\uchar0{240}}
+%new:
+\definecharacter Scommaaccent     {\uchar2{24}}
+\definecharacter scommaaccent     {\uchar2{25}}
+\definecharacter Tcommaaccent     {\uchar2{26}}
+\definecharacter tcommaaccent     {\uchar2{27}}
 
 \stopencoding
 
diff --git a/tex/context/base/lang-ctx.tex b/tex/context/base/lang-ctx.tex
index 30de62fb5..b3a2e020f 100644
--- a/tex/context/base/lang-ctx.tex
+++ b/tex/context/base/lang-ctx.tex
@@ -37,10 +37,10 @@
 
 \installlanguage [\s!hr] [\s!mapping=ec,\s!encoding=ec] % no il2, misses cacute characters
 
-\installlanguage [\s!pl] [\s!mapping={pl0,ec},\s!encoding={pl0,ec}] % maybe also qx
-\installlanguage [\s!cz] [\s!mapping={il2,ec},\s!encoding={il2,ec}]
-\installlanguage [\s!sk] [\s!mapping={il2,ec},\s!encoding={il2,ec}]
-\installlanguage [\s!sl] [\s!mapping={il2,ec},\s!encoding={il2,ec}]
+\installlanguage [\s!pl] [\s!mapping={pl0,ec,qx},\s!encoding={pl0,ec,qx}] % pl0 may go
+\installlanguage [\s!cz] [\s!mapping={il2,ec},\s!encoding={il2,ec}]       % il2 may go
+\installlanguage [\s!sk] [\s!mapping={il2,ec},\s!encoding={il2,ec}]       % il2 may go
+\installlanguage [\s!sl] [\s!mapping={il2,ec},\s!encoding={il2,ec}]       % il2 may go
 
 \installlanguage [\s!vn] [\s!mapping=t5,\s!encoding=t5]
 
diff --git a/tex/context/base/lang-ini.tex b/tex/context/base/lang-ini.tex
index 4615920a8..e435c2420 100644
--- a/tex/context/base/lang-ini.tex
+++ b/tex/context/base/lang-ini.tex
@@ -222,12 +222,14 @@
 \let\preloadedpatterns\empty
 \let\preloadedpmessage\empty
 
-\def\showpatterns#1#2#3#4% language number encoding mapping
+\def\doshowpatterns#1#2#3#4% language number encoding mapping
   {#1->#3:#4->#2->\xxlanguageparameter{#1}\s!lefthyphenmin:\xxlanguageparameter{#1}\s!righthyphenmin\space}
 
 \def\preloadlanguages
   {\doifsomething\preloadedpmessage{\showmessage\m!linguals{10}\preloadedpmessage}}
 
+\fetchruntimecommand \showpatterns {\f!languageprefix\s!run}
+
 \let\installedlanguages\empty
 
 \def\doiflanguageelse#1{\doifdefinedelse{\??la#1\c!state}}
@@ -318,7 +320,7 @@
    % \enableregime[utf]%
    %
    \ifundefined{\??la\??la:\currentencoding:\currentmapping:#2}%
-     \let\showpatterns\relax
+     \let\doshowpatterns\relax
      \edef\alreadyloadedlanguage
        {\executeifdefined{\??la\??la:\currentencoding:\currentmapping:\truefilename{\f!languageprefix#2.\f!patternsextension}}\empty}%
      \edef\alreadyloadedlanguage
@@ -330,7 +332,7 @@
          \readsysfile{\truefilename{\f!languageprefix#2.\f!patternsextension}}
            {\setxvalue{\??la#1\s!patterns}{#2}%
             \setxvalue{\??la\??la:\currentencoding:\currentmapping:\truefilename{\f!languageprefix#2.\f!patternsextension}}{\number\loadedlanguage}%
-            \xdef\preloadedpmessage{\preloadedpmessage\showpatterns{#2}{\number\normallanguage}{\currentencoding}{\currentmapping}}%
+            \xdef\preloadedpmessage{\preloadedpmessage\doshowpatterns{#2}{\number\normallanguage}{\currentencoding}{\currentmapping}}%
             \doglobal\addtocommalist{#2}\preloadedpatterns
             \showmessage\m!linguals1{#2,#1,\loadedlanguage,\currentencoding,\currentmapping}}
            {\showmessage\m!linguals2{#2,#1,\loadedlanguage,\currentencoding,\currentmapping,\f!languageprefix#2.\f!patternsextension,\truefilename{\f!languageprefix#2.\f!patternsextension}}}%
@@ -346,7 +348,7 @@
        \letgvalue{\??la\??la:\currentencoding:\currentmapping:#2}\alreadyloadedlanguage
        \doifundefined{\??la\??la:\s!default:\s!default:#2}{\letgvalue{\??la\??la:\s!default:\s!default:#2}\loadedlanguage}% fall back
        \setxvalue{\??la#1\s!patterns}{#2}%
-       \xdef\preloadedpmessage{\preloadedpmessage\showpatterns{#2}{[\number\alreadyloadedlanguage]}{\currentencoding}{\currentmapping}}%
+       \xdef\preloadedpmessage{\preloadedpmessage\doshowpatterns{#2}{[\number\alreadyloadedlanguage]}{\currentencoding}{\currentmapping}}%
        \doglobal\addtocommalist{#2}\preloadedpatterns
        \showmessage\m!linguals1{#2,#1,[\alreadyloadedlanguage],\currentencoding,\currentmapping}%
      \fi
diff --git a/tex/context/base/lang-run.tex b/tex/context/base/lang-run.tex
new file mode 100644
index 000000000..76e38e4c5
--- /dev/null
+++ b/tex/context/base/lang-run.tex
@@ -0,0 +1,34 @@
+%D \module
+%D   [       file=lang-run,
+%D        version=2005.09.08,
+%D          title=\CONTEXT\ Language Macros,
+%D       subtitle=Runtime 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.
+
+%D [This code is hooked into the core macros and saves some
+%D format space.]
+
+\unprotect
+
+\gdef\showpatterns
+  {\bgroup
+   \def\doshowpatterns##1##2##3##4% language number encoding mapping
+     {\NC##1\NC##3\NC##4\NC##2\NC
+      \xxlanguageparameter{##1}\s!lefthyphenmin\NC\xxlanguageparameter{##1}\s!righthyphenmin\NC\NR}%
+   \starttabulate[|c|c|c|c|c|c|]
+   \HL
+   \NC \bf language \NC \bf encoding \NC \bf mapping \NC \bf number \NC
+       \bf left\low{min} \NC \bf right\low{min} \NC \NR
+   \HL
+   \preloadedpmessage
+   \HL
+   \stoptabulate
+   \egroup}
+
+\protect \endinput
diff --git a/tex/context/base/lang-sla.tex b/tex/context/base/lang-sla.tex
index 96d537909..428796e8a 100644
--- a/tex/context/base/lang-sla.tex
+++ b/tex/context/base/lang-sla.tex
@@ -35,6 +35,35 @@
 
 \unprotect
 
+% \unexpanded\def\textormathglue#1#2#3% submitted original
+%   {\begingroup
+%    \scratchdimen=#1\hspaceamount\empty{#3}%
+%    \scratchskip=\zeropoint\!!plus.5\scratchdimen\!!minus.3\scratchdimen\relax
+%    \ifmmode
+%      \mskip#1#2%
+%    \else
+%      \kern#1\hspaceamount\empty{#3}%
+%      \hskip\scratchskip
+%    \fi
+%    \endgroup}
+
+% actually we could use the new pdftex features
+
+\unexpanded\def\textormathglue#1#2#3% cleaned up one
+  {\begingroup
+   \ifmmode
+     \mskip#1#2%
+   \else
+     \scratchdimen#1\hspaceamount\empty{#3}%
+     \scratchskip\scratchdimen\!!plus.5\scratchdimen\!!minus.3\scratchdimen
+     \hskip\scratchskip
+   \fi
+   \endgroup}
+
+\def\thinglue {\textormathglue+\thinmuskip 1}
+\def\medglue  {\textormathglue+\medmuskip  2}
+\def\thickglue{\textormathglue+\thickmuskip3}
+
 \installlanguage
   [\s!pl]
   [\c!spacing=\v!packed,
@@ -52,10 +81,10 @@
 \installlanguage
   [\s!cz]
   [\c!spacing=\v!packed,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \c!leftsentence=\thickglue--\thickglue\penalty-20\relax, % hh, \relax added
+   \c!rightsentence=\thickglue--\thickglue\penalty-20\relax,
+   \c!leftsubsentence=~---~\penalty-20\relax,
+   \c!rightsubsentence=~---~\penalty-20\relax,
    \c!leftquote=\lowerleftsingleninequote,
    \c!rightquote=\upperrightsinglesixquote,
    \c!leftquotation=\lowerleftdoubleninequote,
@@ -229,13 +258,13 @@
 \setupheadtext [\s!sl] [\v!figures=Slike]
 
 \setupheadtext [\s!pl] [\v!graphics=Grafika]
-\setupheadtext [\s!cz] [\v!graphics=...]
+\setupheadtext [\s!cz] [\v!graphics=Grafika] % new
 \setupheadtext [\s!sk] [\v!graphics=...]
 \setupheadtext [\s!hr] [\v!graphics=Slike]
 \setupheadtext [\s!sl] [\v!graphics=Slike]
 
 \setupheadtext [\s!pl] [\v!intermezzi=Intermezza]
-\setupheadtext [\s!cz] [\v!intermezzi=...]
+\setupheadtext [\s!cz] [\v!intermezzi=Intermezza]
 \setupheadtext [\s!sk] [\v!intermezzi=...]
 \setupheadtext [\s!hr] [\v!intermezzi=Intermezza]
 \setupheadtext [\s!sl] [\v!intermezzi=Intermezzi]
@@ -247,19 +276,19 @@
 \setupheadtext [\s!sl] [\v!index=Kazalo]
 
 \setupheadtext [\s!pl] [\v!abbreviations=Skr\oacute cenie]
-\setupheadtext [\s!cz] [\v!abbreviations=...]
+\setupheadtext [\s!cz] [\v!abbreviations=Zkratky] % new
 \setupheadtext [\s!sk] [\v!abbreviations=...]
 \setupheadtext [\s!hr] [\v!abbreviations=Kratice]
 \setupheadtext [\s!sl] [\v!abbreviations=Kratice]
 
 \setupheadtext [\s!pl] [\v!logos=Znaki]
-\setupheadtext [\s!cz] [\v!logos=...]
+\setupheadtext [\s!cz] [\v!logos=Loga] % new
 \setupheadtext [\s!sk] [\v!logos=...]
 \setupheadtext [\s!hr] [\v!logos=Znakovi]
 \setupheadtext [\s!sl] [\v!logos=Logotipi]
 
 \setupheadtext [\s!pl] [\v!units=Jednostki]
-\setupheadtext [\s!cz] [\v!units=...]
+\setupheadtext [\s!cz] [\v!units=Jednotky] % new
 \setupheadtext [\s!sk] [\v!units=...]
 \setupheadtext [\s!hr] [\v!units=Jednostki]
 \setupheadtext [\s!sl] [\v!units=Enote]
@@ -277,7 +306,7 @@
 \setuplabeltext [\s!sl] [\v!figure=Slika ]
 
 \setuplabeltext [\s!pl] [\v!intermezzo=Intermezzo ]
-\setuplabeltext [\s!cz] [\v!intermezzo=... ]
+\setuplabeltext [\s!cz] [\v!intermezzo=Intermezzo ]
 \setuplabeltext [\s!sk] [\v!intermezzo=... ]
 \setuplabeltext [\s!hr] [\v!intermezzo=Intermezzo ]
 \setuplabeltext [\s!sl] [\v!intermezzo=Intermezzo ]
@@ -295,31 +324,31 @@
 \setuplabeltext [\s!sl] [\v!chapter=] % Poglavje
 
 \setuplabeltext [\s!pl] [\v!section=] % Podrozdzia\l
-\setuplabeltext [\s!cz] [\v!section=]
+\setuplabeltext [\s!cz] [\v!section=] % Sekce % new
 \setuplabeltext [\s!sk] [\v!section=]
 \setuplabeltext [\s!hr] [\v!section=] % Podrozdzia\l
 \setuplabeltext [\s!sl] [\v!section=]
 
 \setuplabeltext [\s!pl] [\v!subsection=]
-\setuplabeltext [\s!cz] [\v!subsection=]
+\setuplabeltext [\s!cz] [\v!subsection=] % Podsekce % new
 \setuplabeltext [\s!sk] [\v!subsection=]
 \setuplabeltext [\s!hr] [\v!subsection=]
 \setuplabeltext [\s!sl] [\v!subsection=]
 
 \setuplabeltext [\s!pl] [\v!subsubsection=]
-\setuplabeltext [\s!cz] [\v!subsubsection=]
+\setuplabeltext [\s!cz] [\v!subsubsection=] % Podpodsekce % new
 \setuplabeltext [\s!sk] [\v!subsubsection=]
 \setuplabeltext [\s!hr] [\v!subsubsection=]
 \setuplabeltext [\s!sl] [\v!subsubsection=]
 
 \setuplabeltext [\s!pl] [\v!subsubsubsection=]
-\setuplabeltext [\s!cz] [\v!subsubsubsection=]
+\setuplabeltext [\s!cz] [\v!subsubsubsection=] % Podpodpodsekce % new
 \setuplabeltext [\s!sk] [\v!subsubsubsection=]
 \setuplabeltext [\s!hr] [\v!subsubsubsection=]
 \setuplabeltext [\s!sl] [\v!subsubsubsection=]
 
 \setuplabeltext [\s!pl] [\v!appendix=] % Dodatek
-\setuplabeltext [\s!cz] [\v!appendix=]
+\setuplabeltext [\s!cz] [\v!appendix=P\rcaron\iacute loha] % new
 \setuplabeltext [\s!sk] [\v!appendix=]
 \setuplabeltext [\s!hr] [\v!appendix=Dodatak ]
 \setuplabeltext [\s!sl] [\v!appendix=Dodatek ]
@@ -331,13 +360,13 @@
 \setuplabeltext [\s!sl] [\v!part=Del ]
 
 \setuplabeltext [\s!pl] [\v!line=wiersz ]
-\setuplabeltext [\s!cz] [\v!line=... ]
+\setuplabeltext [\s!cz] [\v!line=\rcaron\aacute dek] % new
 \setuplabeltext [\s!sk] [\v!line=... ]
 \setuplabeltext [\s!hr] [\v!line=red ]
 \setuplabeltext [\s!sl] [\v!line=vrstica ]
 
 \setuplabeltext [\s!pl] [\v!lines=wiersze ]
-\setuplabeltext [\s!cz] [\v!lines=... ]
+\setuplabeltext [\s!cz] [\v!lines=\rcaron\aacute dky] % new
 \setuplabeltext [\s!sk] [\v!lines=... ]
 \setuplabeltext [\s!hr] [\v!lines=redovi ]
 \setuplabeltext [\s!sl] [\v!lines=vrstice ]
@@ -415,6 +444,15 @@
 \setuplabeltext [\s!pl]    [\v!friday=pi\aogonek tek]
 \setuplabeltext [\s!pl]  [\v!saturday=sobota]
 
+% new
+\setuplabeltext [\s!cz]    [\v!sunday=ned\ecaron le]
+\setuplabeltext [\s!cz]    [\v!monday=pond\ecaron l\iacute]
+\setuplabeltext [\s!cz]   [\v!tuesday=\uacute ter\yacute]
+\setuplabeltext [\s!cz] [\v!wednesday=st\rcaron eda]
+\setuplabeltext [\s!cz]  [\v!thursday=\ccaron tvrtek]
+\setuplabeltext [\s!cz]    [\v!friday=p\aacute tek]
+\setuplabeltext [\s!cz]  [\v!saturday=sobota]
+
 \setuplabeltext [\s!hr]    [\v!sunday=nedjelja]
 \setuplabeltext [\s!hr]    [\v!monday=ponedjeljak]
 \setuplabeltext [\s!hr]   [\v!tuesday=utorak]
@@ -432,6 +470,20 @@
 \setuplabeltext [\s!sl]  [\v!saturday=sobota]
 
 %D Rather new ...
+%\installlanguage
+%  [\s!cz]
+%  [\c!spacing=\v!packed,
+%   \c!leftsentence=---,
+%   \c!rightsentence=---,
+%   \c!leftsubsentence=---,
+%   \c!rightsubsentence=---,
+%   \c!leftquote=\lowerleftsingleninequote,
+%   \c!rightquote=\upperrightsinglesixquote,
+%   \c!leftquotation=\lowerleftdoubleninequote,
+%   \c!rightquotation=\upperrightdoublesixquote,
+%   \c!date={\v!day,\ ,\v!month,\ ,\v!year},
+%   \c!state=\v!stop]
+
 
 \setuplabeltext [\s!sl]    [\v!page=stran ]
 \setuplabeltext [\s!sl]  [\v!atpage=na strani ]
@@ -439,6 +491,13 @@
 \setuplabeltext [\s!sl] [\v!hereafter=glej spodaj]
 \setuplabeltext [\s!sl]       [\v!see=glej ]
 
+% new
+\setuplabeltext [\s!cz]    [\v!page=strna ]
+\setuplabeltext [\s!cz]  [\v!atpage=na stran\ecaron\ ]
+\setuplabeltext [\s!cz] [\v!hencefore=viz v\yacute\scaron e ]
+\setuplabeltext [\s!cz] [\v!hereafter=viz n\iacute\zcaron e ]
+\setuplabeltext [\s!cz]       [\v!see=viz ]
+
 %D \ShowAllLanguageValues [\s!pl] [polish]    {Polish}    {furniture}
 %D \ShowAllLanguageValues [\s!cz] [czech]     {Czech}     {mate}
 %D \ShowAllLanguageValues [\s!sk] [slovak]    {Slovakian} {face}
diff --git a/tex/context/base/m-narrowtt.tex b/tex/context/base/m-narrowtt.tex
new file mode 100644
index 000000000..3a83b7d94
--- /dev/null
+++ b/tex/context/base/m-narrowtt.tex
@@ -0,0 +1,38 @@
+%D \module
+%D   [       file=m-narrowtt,
+%D        version=2005.09.08,
+%D          title=\CONTEXT\ Modules,
+%D       subtitle=Narrow Verbatim,
+%D         author={Hans Hagen \& Ton Otten},
+%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 Test file
+%D
+%D \starttyping
+%D \usemodule[narrowtt]
+%D \starttext
+%D \starttyping
+%D Test test test.
+%D \stoptyping
+%D test \type {test} test \ntype{test} test
+%D \startntyping
+%D Test test test.
+%D \stopntyping
+%D \stoptext
+%D \stoptyping
+
+\unprotect
+
+\definetypeface
+  [narrowtt] [tt]
+  [mono] [modern-cond] [default] [encoding=\defaultencoding]
+
+\definetyping[n\v!typing][\v!typing] \setuptyping[n\v!typing][style=\narrowtt]
+\definetype  [n\v!type]  [\v!type]   \setuptype  [n\v!type]  [style=\narrowtt]
+
+\protect \endinput
diff --git a/tex/context/base/math-tex.tex b/tex/context/base/math-tex.tex
index 5df4d0c9a..8b547d000 100644
--- a/tex/context/base/math-tex.tex
+++ b/tex/context/base/math-tex.tex
@@ -462,8 +462,9 @@
 %D $\sqrt[3]{10}$
 %D \stoptyping
 
-\let\normalsqrt     \sqrt       % just set to: \dohandlemathtoken {sqrt}
-\def\notsosqrt [#1]{\root#1\of}
+\ifx\normalsqrt\undefined  \let\normalsqrt\sqrt \fi      % just set to: \dohandlemathtoken {sqrt}
+
+\def\notsosqrt[#1]{\root#1\of}
 
 \def\sqrt{\doifnextcharelse[\notsosqrt\normalsqrt}
 
diff --git a/tex/context/base/s-abr-01.tex b/tex/context/base/s-abr-01.tex
index 573b1cec2..3c45346ea 100644
--- a/tex/context/base/s-abr-01.tex
+++ b/tex/context/base/s-abr-01.tex
@@ -181,6 +181,9 @@
 \logo [TEXTOOLS]   {textools}
 \logo [XMLTOOLS]   {xmltools}
 \logo [PDFTOOLS]   {pdftools}
+\logo [RLXTOOLS]   {rlxtools}
+\logo [CTXTOOLS]   {ctxtools}
+\logo [TMFTOOLS]   {tmftools}
 \logo [TEXMFSTART] {texmfstart}
 \logo [TEXSYNC]    {texsync}
 \logo [TEX]        {\TeX}
diff --git a/tex/context/base/s-pre-61.tex b/tex/context/base/s-pre-61.tex
index 4e772a0ce..fd30624c3 100644
--- a/tex/context/base/s-pre-61.tex
+++ b/tex/context/base/s-pre-61.tex
@@ -257,11 +257,11 @@
 \StartSteps
 
 \startitemize
-\item Mark Hollis \FlushStep
-\item Roger Waters \FlushStep
+\item Mark Hollis   \FlushStep
+\item Roger Waters  \FlushStep
 \item David Gilmore \FlushStep
 \item Peter Gabriel \FlushStep
-\item Randy Newman \FlushStep
+\item Randy Newman  \FlushStep
 \stopitemize
 
 \StopSteps
diff --git a/tex/context/base/spec-dpx.tex b/tex/context/base/spec-dpx.tex
index 0feffbf0b..161cee303 100644
--- a/tex/context/base/spec-dpx.tex
+++ b/tex/context/base/spec-dpx.tex
@@ -421,8 +421,7 @@
 	 \hbox to #3{\hss\lower.5\scratchdimen\box\nextbox\hss}%
          \ifx\currentPDFresources\empty
          \else
-           \special{pdf:put @resources
-	     <<\currentPDFresources\the\pdfpageresources>>}%
+           \special{pdf:put @resources <<\currentPDFresources\the\pdfpageresources>>}%
            \global\let\currentPDFresources\empty
          \fi
          \special{pdf:exobj}}%
diff --git a/tex/context/base/supp-box.tex b/tex/context/base/supp-box.tex
index 7680eb6af..4b451a6bf 100644
--- a/tex/context/base/supp-box.tex
+++ b/tex/context/base/supp-box.tex
@@ -1295,6 +1295,39 @@
    \else
      \speciallimitatetext{#1}\leftlimit\rightlimit{#3}%
    \fi}
+
+%D Undocumented bonus (see wiki):
+%D
+%D \starttyping
+%D \limitatefirstline{\input tufte\relax}{10cm}{\unknown}
+%D \stoptyping
+
+\def\limitatefirstline#1#2#3%
+  {\hbox\bgroup\strut
+   \setbox\scratchbox\hbox{\begstrut#1\endstrut}%
+   \ifdim\wd\scratchbox>#2\relax
+     \setbox\scratchbox\hbox{#3}%
+     \hsize#2\relax
+     \advance\hsize-\wd\scratchbox
+     \setbox\scratchbox\vbox{\forgetall\veryraggedright#1}%
+     \setbox\scratchbox\vsplit\scratchbox to \lineheight
+     \vbox
+       {\unvbox\scratchbox
+        \global\setbox\plusone\lastbox
+        \global\setbox\plusone\hbox{\strut\unhbox\plusone}%
+        \hbox % to #2
+          {\ifx\clip\undefined
+             \box\plusone
+           \else\ifdim\wd\plusone>\hsize
+             \lower\strutdepth\hbox{\clip[\c!width=\hsize,\c!height=\lineheight]{\hbox{\raise\strutdepth\box\plusone}}}%
+           \else
+             \box\plusone
+           \fi\fi
+           \removeunwantedspaces#3}}% \removeunwantedspaces\hss#3}}%
+   \else
+     #1%
+   \fi
+   \egroup}
 
 %D \macros
 %D   {processisolatedwords,
diff --git a/tex/context/base/syst-pln.tex b/tex/context/base/syst-pln.tex
index 67482a48e..e60a73644 100644
--- a/tex/context/base/syst-pln.tex
+++ b/tex/context/base/syst-pln.tex
@@ -148,7 +148,7 @@
 %D occur.
 %D \stopnarrower
 %D
-%D We well overload some macros in \ETEX\ mode.
+%D We will overload some macros in \ETEX\ mode.
 
 \count10 = 22 % allocates \count    registers 23,  24, ...
 \count11 =  9 % allocates \dimen    registers 10,  11, ...
@@ -507,6 +507,8 @@
    \omit
    \advance\mscount\m@ne}
 
+% begin of tab code
+
 \def\cleartabs
   {\global\setbox\tabsyet\null
    \setbox\tabs\null}
@@ -524,30 +526,30 @@
    \let\next\relax
    \nxt}
 
-\def\s@tt@b%
+\def\s@tt@b
   {\let\nxt\relax
    \us@false\m@ketabbox}
 
-\def\tabalign%
+\def\tabalign
   {\us@true\m@ketabbox}
 
 \let\+\tabalign % no outer here
 
-\def\s@tcols#1\columns%
+\def\s@tcols#1\columns
   {\count@#1%
    \dimen@\hsize
    \loop
      \ifnum\count@>\z@ \@nother
    \repeat}
 
-\def\@nother%
+\def\@nother
   {\dimen@ii\dimen@
    \divide\dimen@ii\count@
    \setbox\tabs\hbox{\hbox to\dimen@ii{}\unhbox\tabs}%
    \advance\dimen@-\dimen@ii
    \advance\count@\m@ne}
 
-\def\m@ketabbox%
+\def\m@ketabbox
   {\begingroup
    \global\setbox\tabsyet\copy\tabs
    \global\setbox\tabsdone\null
@@ -577,6 +579,8 @@
   \fi
   \box\z@}
 
+% end to tab code
+
 %D Users are advised not to use the following macros:
 
 \def\hang
@@ -587,7 +591,7 @@
    \llap{#1\enspace}%
    \ignorespaces}
 
-\def\narrower%
+\def\narrower
   {\advance\leftskip \parindent
    \advance\rightskip\parindent}
 
diff --git a/tex/context/base/type-buy.tex b/tex/context/base/type-buy.tex
index 9bc16c079..53a178d6e 100644
--- a/tex/context/base/type-buy.tex
+++ b/tex/context/base/type-buy.tex
@@ -861,6 +861,33 @@
 
 \stoptypescript
 
+% linotype syntax
+
+\starttypescript [sans] [syntax] [ec,texnansi]
+
+  \loadmapfile[\typescriptthree-linotype-syntax.map]
+
+  \definefontsynonym [SyntaxLT-Roman]      [\typescriptthree-lte50617] [encoding=\typescriptthree]
+  \definefontsynonym [SyntaxLT-Italic]     [\typescriptthree-lte50618] [encoding=\typescriptthree]
+  \definefontsynonym [SyntaxLT-Bold]       [\typescriptthree-lte50619] [encoding=\typescriptthree]
+  \definefontsynonym [SyntaxLT-Black]      [\typescriptthree-lte50620] [encoding=\typescriptthree]
+  \definefontsynonym [SyntaxLT-UltraBlack] [\typescriptthree-lte50621] [encoding=\typescriptthree]
+
+\stoptypescript
+
+\starttypescript [sans] [syntax] [name]
+
+  \loadmapfile[\typescriptthree-linotype-syntax.map]
+
+  \definefontsynonym [Sans]           [SyntaxLT-Roman]
+  \definefontsynonym [SansItalic]     [SyntaxLT-Italic]
+  \definefontsynonym [SansSlanted]    [SyntaxLT-Italic]
+  \definefontsynonym [SansBold]       [SyntaxLT-Black]
+  \definefontsynonym [SansBoldItalic] [SyntaxLT-Black]
+
+\stoptypescript
+
+
 \stoptypescriptcollection
 
 \endinput
diff --git a/tex/context/base/type-dis.tex b/tex/context/base/type-dis.tex
index 2511d9682..c4cbd6f96 100644
--- a/tex/context/base/type-dis.tex
+++ b/tex/context/base/type-dis.tex
@@ -17,202 +17,6 @@
 
 \starttypescriptcollection[distributed fonts]
 
-% obsolete: cork- is now ec- in latin modern
-%
-% \starttypescript[all][modern,latin-modern,computer-modern][ec]
-%
-%   \definefontsynonym[ec-lmb10]   [cork-lmb10]   [encoding=ec]
-%
-% \stoptypescript
-
-\starttypescript[all][modern,latin-modern,computer-modern][pl0]
-
-  \definefontsynonym[pl0-lmb10]   [plb10]    [encoding=pl0]
-  \definefontsynonym[pl0-lmbo10]  [plbsl10]  [encoding=pl0]
-  \definefontsynonym[pl0-lmbx10]  [plbx10]   [encoding=pl0]
-  \definefontsynonym[pl0-lmbx12]  [plbx12]   [encoding=pl0]
-  \definefontsynonym[pl0-lmbx5]   [plbx5]    [encoding=pl0]
-  \definefontsynonym[pl0-lmbx6]   [plbx6]    [encoding=pl0]
-  \definefontsynonym[pl0-lmbx7]   [plbx7]    [encoding=pl0]
-  \definefontsynonym[pl0-lmbx8]   [plbx8]    [encoding=pl0]
-  \definefontsynonym[pl0-lmbx9]   [plbx9]    [encoding=pl0]
-  \definefontsynonym[pl0-lmbxi10] [plbxti10] [encoding=pl0]
-  \definefontsynonym[pl0-lmbxo10] [plbxsl10] [encoding=pl0]
-  \definefontsynonym[pl0-lmcsc10] [plcsc10]  [encoding=pl0]
-  \definefontsynonym[pl0-lmcsco10][plcscsl10][encoding=pl0]
-  \definefontsynonym[pl0-lmr10]   [plr10]    [encoding=pl0]
-  \definefontsynonym[pl0-lmr12]   [plr12]    [encoding=pl0]
-  \definefontsynonym[pl0-lmr17]   [plr17]    [encoding=pl0]
-  \definefontsynonym[pl0-lmr5]    [plr5]     [encoding=pl0]
-  \definefontsynonym[pl0-lmr6]    [plr6]     [encoding=pl0]
-  \definefontsynonym[pl0-lmr7]    [plr7]     [encoding=pl0]
-  \definefontsynonym[pl0-lmr8]    [plr8]     [encoding=pl0]
-  \definefontsynonym[pl0-lmr9]    [plr9]     [encoding=pl0]
-  \definefontsynonym[pl0-lmri10]  [plti10]   [encoding=pl0]
-  \definefontsynonym[pl0-lmri12]  [plti12]   [encoding=pl0]
-  \definefontsynonym[pl0-lmri7]   [plti7]    [encoding=pl0]
-  \definefontsynonym[pl0-lmri8]   [plti8]    [encoding=pl0]
-  \definefontsynonym[pl0-lmri9]   [plti9]    [encoding=pl0]
-  \definefontsynonym[pl0-lmro10]  [plsl10]   [encoding=pl0]
-  \definefontsynonym[pl0-lmro12]  [plsl12]   [encoding=pl0]
-  \definefontsynonym[pl0-lmro8]   [plsl8]    [encoding=pl0]
-  \definefontsynonym[pl0-lmro9]   [plsl9]    [encoding=pl0]
-  \definefontsynonym[pl0-lmss10]  [plss10]   [encoding=pl0]
-  \definefontsynonym[pl0-lmss12]  [plss12]   [encoding=pl0]
-  \definefontsynonym[pl0-lmss17]  [plss17]   [encoding=pl0]
-  \definefontsynonym[pl0-lmss8]   [plss8]    [encoding=pl0]
-  \definefontsynonym[pl0-lmss9]   [plss9]    [encoding=pl0]
-  \definefontsynonym[pl0-lmssbo10][plssbi10] [encoding=pl0]
-  \definefontsynonym[pl0-lmssbx10][plssbx10] [encoding=pl0]
-  \definefontsynonym[pl0-lmssdc10][plssdc10] [encoding=pl0]
-  \definefontsynonym[pl0-lmssdo10][plssdi10] [encoding=pl0]
-  \definefontsynonym[pl0-lmsso10] [plssi10]  [encoding=pl0]
-  \definefontsynonym[pl0-lmsso12] [plssi12]  [encoding=pl0]
-  \definefontsynonym[pl0-lmsso17] [plssi17]  [encoding=pl0]
-  \definefontsynonym[pl0-lmsso8]  [plssi8]   [encoding=pl0]
-  \definefontsynonym[pl0-lmsso9]  [plssi9]   [encoding=pl0]
-  \definefontsynonym[pl0-lmssq8]  [plssq8]   [encoding=pl0]
-  \definefontsynonym[pl0-lmssqbo8][plssqbi8] [encoding=pl0]
-  \definefontsynonym[pl0-lmssqbx8][plssqb8]  [encoding=pl0]
-  \definefontsynonym[pl0-lmssqo8] [plssqi8]  [encoding=pl0]
-  \definefontsynonym[pl0-lmtcsc10][pltcsc10] [encoding=pl0]
-  \definefontsynonym[pl0-lmtt10]  [pltt10]   [encoding=pl0]
-  \definefontsynonym[pl0-lmtt12]  [pltt12]   [encoding=pl0]
-  \definefontsynonym[pl0-lmtt8]   [pltt8]    [encoding=pl0]
-  \definefontsynonym[pl0-lmtt9]   [pltt9]    [encoding=pl0]
-  \definefontsynonym[pl0-lmtti10] [pltti10]  [encoding=pl0]
-  \definefontsynonym[pl0-lmtto10] [plsltt10] [encoding=pl0]
-  \definefontsynonym[pl0-lmvtt10] [plvtt10]  [encoding=pl0]
-  \definefontsynonym[pl0-lmvtto10][plvtti10] [encoding=pl0]
-
-\stoptypescript
-
-\starttypescript[all][modern,latin-modern,computer-modern][il2]
-
-  \definefontsynonym[il2-lmb10]   [csb10]    [encoding=il2]
-  \definefontsynonym[il2-lmbo10]  [csbsl10]  [encoding=il2]
-  \definefontsynonym[il2-lmbx10]  [csbx10]   [encoding=il2]
-  \definefontsynonym[il2-lmbx12]  [csbx12]   [encoding=il2]
-  \definefontsynonym[il2-lmbx5]   [csbx5]    [encoding=il2]
-  \definefontsynonym[il2-lmbx6]   [csbx6]    [encoding=il2]
-  \definefontsynonym[il2-lmbx7]   [csbx7]    [encoding=il2]
-  \definefontsynonym[il2-lmbx8]   [csbx8]    [encoding=il2]
-  \definefontsynonym[il2-lmbx9]   [csbx9]    [encoding=il2]
-  \definefontsynonym[il2-lmbxi10] [csbxti10] [encoding=il2]
-  \definefontsynonym[il2-lmbxo10] [csbxsl10] [encoding=il2]
-  \definefontsynonym[il2-lmcsc10] [cscsc10]  [encoding=il2]
-  \definefontsynonym[il2-lmcsco10][cscscls10][encoding=il2]
-  \definefontsynonym[il2-lmr10]   [csr10]    [encoding=il2]
-  \definefontsynonym[il2-lmr12]   [csr12]    [encoding=il2]
-  \definefontsynonym[il2-lmr17]   [csr17]    [encoding=il2]
-  \definefontsynonym[il2-lmr5]    [csr5]     [encoding=il2]
-  \definefontsynonym[il2-lmr6]    [csr6]     [encoding=il2]
-  \definefontsynonym[il2-lmr7]    [csr7]     [encoding=il2]
-  \definefontsynonym[il2-lmr8]    [csr8]     [encoding=il2]
-  \definefontsynonym[il2-lmr9]    [csr9]     [encoding=il2]
-  \definefontsynonym[il2-lmri10]  [csti10]   [encoding=il2]
-  \definefontsynonym[il2-lmri12]  [csti12]   [encoding=il2]
-  \definefontsynonym[il2-lmri7]   [csti7]    [encoding=il2]
-  \definefontsynonym[il2-lmri8]   [csti8]    [encoding=il2]
-  \definefontsynonym[il2-lmri9]   [csti9]    [encoding=il2]
-  \definefontsynonym[il2-lmro10]  [cssl10]   [encoding=il2]
-  \definefontsynonym[il2-lmro12]  [cssl12]   [encoding=il2]
-  \definefontsynonym[il2-lmro8]   [cssl8]    [encoding=il2]
-  \definefontsynonym[il2-lmro9]   [cssl9]    [encoding=il2]
-  \definefontsynonym[il2-lmss10]  [csss10]   [encoding=il2]
-  \definefontsynonym[il2-lmss12]  [csss12]   [encoding=il2]
-  \definefontsynonym[il2-lmss17]  [csss17]   [encoding=il2]
-  \definefontsynonym[il2-lmss8]   [csss8]    [encoding=il2]
-  \definefontsynonym[il2-lmss9]   [csss9]    [encoding=il2]
-  \definefontsynonym[il2-lmssbo10][csssbi10] [encoding=il2]
-  \definefontsynonym[il2-lmssbx10][csssbx10] [encoding=il2]
-  \definefontsynonym[il2-lmssdc10][csssdc10] [encoding=il2]
-  \definefontsynonym[il2-lmssdo10][csssdi10] [encoding=il2]
-  \definefontsynonym[il2-lmsso10] [csssi10]  [encoding=il2]
-  \definefontsynonym[il2-lmsso12] [csssi12]  [encoding=il2]
-  \definefontsynonym[il2-lmsso17] [csssi17]  [encoding=il2]
-  \definefontsynonym[il2-lmsso8]  [csssi8]   [encoding=il2]
-  \definefontsynonym[il2-lmsso9]  [csssi9]   [encoding=il2]
-  \definefontsynonym[il2-lmssq8]  [csssq8]   [encoding=il2]
-  \definefontsynonym[il2-lmssqbo8][csssqbi8] [encoding=il2]
-  \definefontsynonym[il2-lmssqbx8][csssqb8]  [encoding=il2]
-  \definefontsynonym[il2-lmssqo8] [csssqi8]  [encoding=il2]
-  \definefontsynonym[il2-lmtcsc10][cstcsc10] [encoding=il2]
-  \definefontsynonym[il2-lmtt10]  [cstt10]   [encoding=il2]
-  \definefontsynonym[il2-lmtt12]  [cstt12]   [encoding=il2]
-  \definefontsynonym[il2-lmtt8]   [cstt8]    [encoding=il2]
-  \definefontsynonym[il2-lmtt9]   [cstt9]    [encoding=il2]
-  \definefontsynonym[il2-lmtti10] [cstti10]  [encoding=il2]
-  \definefontsynonym[il2-lmtto10] [cssltt10] [encoding=il2]
-  \definefontsynonym[il2-lmvtt10] [csvtt10]  [encoding=il2]
-  \definefontsynonym[il2-lmvtto10][csvtti10] [encoding=il2]
-
-\stoptypescript
-
-% we have two sets of tfm files
-
-\starttypescript[all][modern,latin-modern,computer-modern][t5]
-
-  \definefontsynonym[t5-lmb10]   [vnb10]    [encoding=t5]
-  \definefontsynonym[t5-lmbo10]  [vnbsl10]  [encoding=t5]
-  \definefontsynonym[t5-lmbx10]  [vnbx10]   [encoding=t5]
-  \definefontsynonym[t5-lmbx12]  [vnbx12]   [encoding=t5]
-  \definefontsynonym[t5-lmbx5]   [vnbx5]    [encoding=t5]
-  \definefontsynonym[t5-lmbx6]   [vnbx6]    [encoding=t5]
-  \definefontsynonym[t5-lmbx7]   [vnbx7]    [encoding=t5]
-  \definefontsynonym[t5-lmbx8]   [vnbx8]    [encoding=t5]
-  \definefontsynonym[t5-lmbx9]   [vnbx9]    [encoding=t5]
-  \definefontsynonym[t5-lmbxi10] [vnbxti10] [encoding=t5]
-  \definefontsynonym[t5-lmbxo10] [vnbxsl10] [encoding=t5]
-  \definefontsynonym[t5-lmcsc10] [vncsc10]  [encoding=t5]
-  \definefontsynonym[t5-lmcsco10][vncscsl10][encoding=t5]
-  \definefontsynonym[t5-lmr10]   [vnr10]    [encoding=t5]
-  \definefontsynonym[t5-lmr12]   [vnr12]    [encoding=t5]
-  \definefontsynonym[t5-lmr17]   [vnr17]    [encoding=t5]
-  \definefontsynonym[t5-lmr5]    [vnr5]     [encoding=t5]
-  \definefontsynonym[t5-lmr6]    [vnr6]     [encoding=t5]
-  \definefontsynonym[t5-lmr7]    [vnr7]     [encoding=t5]
-  \definefontsynonym[t5-lmr8]    [vnr8]     [encoding=t5]
-  \definefontsynonym[t5-lmr9]    [vnr9]     [encoding=t5]
-  \definefontsynonym[t5-lmri10]  [vnti10]   [encoding=t5]
-  \definefontsynonym[t5-lmri12]  [vnti12]   [encoding=t5]
-  \definefontsynonym[t5-lmri7]   [vnti7]    [encoding=t5]
-  \definefontsynonym[t5-lmri8]   [vnti8]    [encoding=t5]
-  \definefontsynonym[t5-lmri9]   [vnti9]    [encoding=t5]
-  \definefontsynonym[t5-lmro10]  [vnsl10]   [encoding=t5]
-  \definefontsynonym[t5-lmro12]  [vnsl12]   [encoding=t5]
-  \definefontsynonym[t5-lmro8]   [vnsl8]    [encoding=t5]
-  \definefontsynonym[t5-lmro9]   [vnsl9]    [encoding=t5]
-  \definefontsynonym[t5-lmss10]  [vnss10]   [encoding=t5]
-  \definefontsynonym[t5-lmss12]  [vnss12]   [encoding=t5]
-  \definefontsynonym[t5-lmss17]  [vnss17]   [encoding=t5]
-  \definefontsynonym[t5-lmss8]   [vnss8]    [encoding=t5]
-  \definefontsynonym[t5-lmss9]   [vnss9]    [encoding=t5]
-  \definefontsynonym[t5-lmssbo10][vnssbi10] [encoding=t5]
-  \definefontsynonym[t5-lmssbx10][vnssbx10] [encoding=t5]
-  \definefontsynonym[t5-lmssdc10][vnssdc10] [encoding=t5]
-  \definefontsynonym[t5-lmssdo10][vnssdi10] [encoding=t5]
-  \definefontsynonym[t5-lmsso10] [vnssi10]  [encoding=t5]
-  \definefontsynonym[t5-lmsso12] [vnssi12]  [encoding=t5]
-  \definefontsynonym[t5-lmsso17] [vnssi17]  [encoding=t5]
-  \definefontsynonym[t5-lmsso8]  [vnssi8]   [encoding=t5]
-  \definefontsynonym[t5-lmsso9]  [vnssi9]   [encoding=t5]
-  \definefontsynonym[t5-lmssq8]  [vnssq8]   [encoding=t5]
-  \definefontsynonym[t5-lmssqbo8][vnssqbi8] [encoding=t5]
-  \definefontsynonym[t5-lmssqbx8][vnssqb8]  [encoding=t5]
-  \definefontsynonym[t5-lmssqo8] [vnssqi8]  [encoding=t5]
-  \definefontsynonym[t5-lmtcsc10][vntcsc10] [encoding=t5]
-  \definefontsynonym[t5-lmtt10]  [vntt10]   [encoding=t5]
-  \definefontsynonym[t5-lmtt12]  [vntt12]   [encoding=t5]
-  \definefontsynonym[t5-lmtt8]   [vntt8]    [encoding=t5]
-  \definefontsynonym[t5-lmtt9]   [vntt9]    [encoding=t5]
-  \definefontsynonym[t5-lmtti10] [vntti10]  [encoding=t5]
-  \definefontsynonym[t5-lmtto10] [vnsltt10] [encoding=t5]
-  \definefontsynonym[t5-lmvtt10] [vnvtt10]  [encoding=t5]
-  \definefontsynonym[t5-lmvtto10][vnvtti10] [encoding=t5]
-
-\stoptypescript
-
 \starttypescript[all][modern,latin-modern][all]
 
   % fallbacks, no math in latin modern
diff --git a/tex/context/base/type-enc.tex b/tex/context/base/type-enc.tex
index 8ba9156e4..af6c69746 100644
--- a/tex/context/base/type-enc.tex
+++ b/tex/context/base/type-enc.tex
@@ -26,7 +26,172 @@
 
 \starttypescriptcollection[encodings]
 
-\starttypescript [serif] [modern,latin-modern,computer-modern] [texnansi,ec,qx,pl0,il2,t5]
+\starttypescript[all][modern,latin-modern][all]
+
+  % fallbacks, no math in latin modern
+
+  \definefontsynonym[lmbsy10] [cmbsy10]
+  \definefontsynonym[lmbsy5]  [cmbsy5]
+  \definefontsynonym[lmbsy6]  [cmbsy7]
+  \definefontsynonym[lmbsy7]  [cmbsy7]
+  \definefontsynonym[lmbsy8]  [cmbsy7]
+  \definefontsynonym[lmbsy9]  [cmbsy10]
+  \definefontsynonym[lmdunh10][cmdunh10]
+  \definefontsynonym[lmex10]  [cmex10]
+  \definefontsynonym[lmex7]   [cmex10]
+  \definefontsynonym[lmex8]   [cmex10]
+  \definefontsynonym[lmex9]   [cmex10]
+  \definefontsynonym[lmff10]  [cmff10]
+  \definefontsynonym[lmfi10]  [cmfi10]
+  \definefontsynonym[lmfib8]  [cmfib8]
+  \definefontsynonym[lmmi10]  [cmmi10]
+  \definefontsynonym[lmmi12]  [cmmi12]
+  \definefontsynonym[lmmi5]   [cmmi5]
+  \definefontsynonym[lmmi6]   [cmmi6]
+  \definefontsynonym[lmmi7]   [cmmi7]
+  \definefontsynonym[lmmi8]   [cmmi8]
+  \definefontsynonym[lmmi9]   [cmmi9]
+  \definefontsynonym[lmmib10] [cmmib10]
+  \definefontsynonym[lmmib5]  [cmmib5]
+  \definefontsynonym[lmmib6]  [cmmib7]
+  \definefontsynonym[lmmib7]  [cmmib7]
+  \definefontsynonym[lmmib8]  [cmmib7]
+  \definefontsynonym[lmmib9]  [cmmib10]
+  \definefontsynonym[lmsy10]  [cmsy10]
+  \definefontsynonym[lmsy5]   [cmsy5]
+  \definefontsynonym[lmsy6]   [cmsy6]
+  \definefontsynonym[lmsy7]   [cmsy7]
+  \definefontsynonym[lmsy8]   [cmsy8]
+  \definefontsynonym[lmsy9]   [cmsy9]
+  \definefontsynonym[lmtex10] [cmtex10]
+  \definefontsynonym[lmtex8]  [cmtex8]
+  \definefontsynonym[lmtex9]  [cmtex9]
+
+\stoptypescript
+
+\starttypescript [serif] [modern,latin-modern] [texnansi,ec,qx,t5]
+
+  \definefontsynonym [LMRoman10-DemiOblique] [\typescriptthree-lmbo10]   [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman10-Bold]        [\typescriptthree-lmbx10]   [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman12-Bold]        [\typescriptthree-lmbx12]   [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman5-Bold]         [\typescriptthree-lmbx5]    [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman6-Bold]         [\typescriptthree-lmbx6]    [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman7-Bold]         [\typescriptthree-lmbx7]    [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman8-Bold]         [\typescriptthree-lmbx8]    [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman9-Bold]         [\typescriptthree-lmbx9]    [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman10-BoldItalic]  [\typescriptthree-lmbxi10]  [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman10-BoldOblique] [\typescriptthree-lmbxo10]  [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman10-CapsRegular] [\typescriptthree-lmcsc10]  [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman10-CapsOblique] [\typescriptthree-lmcsco10] [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman10-Regular]     [\typescriptthree-lmr10]    [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman12-Regular]     [\typescriptthree-lmr12]    [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman17-Regular]     [\typescriptthree-lmr17]    [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman5-Regular]      [\typescriptthree-lmr5]     [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman6-Regular]      [\typescriptthree-lmr6]     [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman7-Regular]      [\typescriptthree-lmr7]     [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman8-Regular]      [\typescriptthree-lmr8]     [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman9-Regular]      [\typescriptthree-lmr9]     [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman10-Italic]      [\typescriptthree-lmri10]   [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman12-Italic]      [\typescriptthree-lmri12]   [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman7-Italic]       [\typescriptthree-lmri7]    [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman8-Italic]       [\typescriptthree-lmri8]    [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman9-Italic]       [\typescriptthree-lmri9]    [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman10-Oblique]     [\typescriptthree-lmro10]   [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman12-Oblique]     [\typescriptthree-lmro12]   [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman17-Oblique]     [\typescriptthree-lmro17]   [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman8-Oblique]      [\typescriptthree-lmro8]    [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman9-Oblique]      [\typescriptthree-lmro9]    [encoding=\typescriptthree]
+
+  \definefontsynonym [LMRoman-DemiOblique]   [LMRoman10-DemiOblique] [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman-Bold]          [LMRoman10-Bold]        [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman-BoldItalic]    [LMRoman10-BoldItalic]  [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman-BoldOblique]   [LMRoman10-BoldOblique] [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman-CapsRegular]   [LMRoman10-CapsRegular] [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman-CapsOblique]   [LMRoman10-CapsOblique] [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman-Regular]       [LMRoman10-Regular]     [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman-Italic]        [LMRoman10-Italic]      [encoding=\typescriptthree]
+  \definefontsynonym [LMRoman-Oblique]       [LMRoman10-Oblique]     [encoding=\typescriptthree]
+
+\stoptypescript
+
+\starttypescript [sans] [modern,latin-modern] [texnansi,ec,qx,t5]
+
+  \definefontsynonym [LMSans10-Regular]              [\typescriptthree-lmss10]   [encoding=\typescriptthree]
+  \definefontsynonym [LMSans12-Regular]              [\typescriptthree-lmss12]   [encoding=\typescriptthree]
+  \definefontsynonym [LMSans17-Regular]              [\typescriptthree-lmss17]   [encoding=\typescriptthree]
+  \definefontsynonym [LMSans8-Regular]               [\typescriptthree-lmss8]    [encoding=\typescriptthree]
+  \definefontsynonym [LMSans9-Regular]               [\typescriptthree-lmss9]    [encoding=\typescriptthree]
+  \definefontsynonym [LMSans10-BoldOblique]          [\typescriptthree-lmssbo10] [encoding=\typescriptthree]
+  \definefontsynonym [LMSans10-Bold]                 [\typescriptthree-lmssbx10] [encoding=\typescriptthree]
+  \definefontsynonym [LMSans10-DemiCondensed]        [\typescriptthree-lmssdc10] [encoding=\typescriptthree]
+  \definefontsynonym [LMSans10-DemiCondensedOblique] [\typescriptthree-lmssdo10] [encoding=\typescriptthree]
+  \definefontsynonym [LMSans10-Oblique]              [\typescriptthree-lmsso10]  [encoding=\typescriptthree]
+  \definefontsynonym [LMSans12-Oblique]              [\typescriptthree-lmsso12]  [encoding=\typescriptthree]
+  \definefontsynonym [LMSans17-Oblique]              [\typescriptthree-lmsso17]  [encoding=\typescriptthree]
+  \definefontsynonym [LMSans8-Oblique]               [\typescriptthree-lmsso8]   [encoding=\typescriptthree]
+  \definefontsynonym [LMSans9-Oblique]               [\typescriptthree-lmsso9]   [encoding=\typescriptthree]
+  \definefontsynonym [LMSansQuotation8-Regular]      [\typescriptthree-lmssq8]   [encoding=\typescriptthree]
+  \definefontsynonym [LMSansQuotation8-BoldOblique]  [\typescriptthree-lmssqbo8] [encoding=\typescriptthree]
+  \definefontsynonym [LMSansQuotation8-Bold]         [\typescriptthree-lmssqbx8] [encoding=\typescriptthree]
+  \definefontsynonym [LMSansQuotation8-Oblique]      [\typescriptthree-lmssqo8]  [encoding=\typescriptthree]
+
+  \definefontsynonym [LMSans-Regular]                [LMSans10-Regular]              [encoding=\typescriptthree]
+  \definefontsynonym [LMSans-BoldOblique]            [LMSans10-BoldOblique]          [encoding=\typescriptthree]
+  \definefontsynonym [LMSans-Bold]                   [LMSans10-Bold]                 [encoding=\typescriptthree]
+  \definefontsynonym [LMSans-DemiCondensed]          [LMSans10-DemiCondensed]        [encoding=\typescriptthree]
+  \definefontsynonym [LMSans-DemiCondensedOblique]   [LMSans10-DemiCondensedOblique] [encoding=\typescriptthree]
+  \definefontsynonym [LMSans-Oblique]                [LMSans10-Oblique]              [encoding=\typescriptthree]
+
+\stoptypescript
+
+\starttypescript [mono] [modern,latin-modern,modern-vari,latin-modern-vari,modern-cond,latin-modern-cond] [texnansi,ec,qx,t5]
+
+  \definefontsynonym [LMTypewriter10-CapsRegular]           [\typescriptthree-lmtcsc10] [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter10-CapsOblique]           [\typescriptthree-lmtcso10] [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter10-Light]                 [\typescriptthree-lmtl10]   [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter10-LightOblique]          [\typescriptthree-lmtlo10]  [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter10-LightCondensed]        [\typescriptthree-lmtlc10]  [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter10-LightCondensedOblique] [\typescriptthree-lmtlco10] [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter10-Dark]                  [\typescriptthree-lmtk10]   [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter10-DarkOblique]           [\typescriptthree-lmtko10]  [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter10-Regular]               [\typescriptthree-lmtt10]   [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter12-Regular]               [\typescriptthree-lmtt12]   [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter8-Regular]                [\typescriptthree-lmtt8]    [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter9-Regular]                [\typescriptthree-lmtt9]    [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter10-Italic]                [\typescriptthree-lmtti10]  [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter10-Oblique]               [\typescriptthree-lmtto10]  [encoding=\typescriptthree]
+
+  \definefontsynonym [LMTypewriterVarWd10-Regular]          [\typescriptthree-lmvtt10]  [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriterVarWd10-Oblique]          [\typescriptthree-lmvtto10] [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriterVarWd10-Light]            [\typescriptthree-lmvtl10]  [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriterVarWd10-LightOblique]     [\typescriptthree-lmvtlo10] [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriterVarWd10-Dark]             [\typescriptthree-lmvtk10]  [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriterVarWd10-DarkOblique]      [\typescriptthree-lmvtko10] [encoding=\typescriptthree]
+
+  \definefontsynonym [LMTypewriter-CapsRegular]             [LMTypewriter10-CapsRegular]          [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter-CapsOblique]             [LMTypewriter10-CapsOblique]          [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter-Light]                   [LMTypewriter10-Light]                [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter-LightOblique]            [LMTypewriter10-LightOblique]         [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter-LightCondensed]          [LMTypewriter10-LightCondensed]       [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter-LightCondensedOblique]   [LMTypewriter10-LightCondensedOblique][encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter-Dark]                    [LMTypewriter10-Dark]                 [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter-DarkOblique]             [LMTypewriter10-DarkOblique]          [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter-Regular]                 [LMTypewriter10-Regular]              [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter-Italic]                  [LMTypewriter10-Italic]               [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriter-Oblique]                 [LMTypewriter10-Oblique]              [encoding=\typescriptthree]
+
+  \definefontsynonym [LMTypewriterVarWd-Regular]            [LMTypewriterVarWd10-Regular]         [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriterVarWd-Oblique]            [LMTypewriterVarWd10-Oblique]         [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriterVarWd-Light]              [LMTypewriterVarWd10-Light]           [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriterVarWd-LightOblique]       [LMTypewriterVarWd10-LightOblique]    [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriterVarWd-Dark]               [LMTypewriterVarWd10-Dark]            [encoding=\typescriptthree]
+  \definefontsynonym [LMTypewriterVarWd-DarkOblique]        [LMTypewriterVarWd10-DarkOblique]     [encoding=\typescriptthree]
+
+\stoptypescript
+
+% todo: map these onto verbose names
+
+\starttypescript [serif] [modern,latin-modern,computer-modern] [texnansi,ec,qx,t5]
 
   \definefontsynonym [cmr5]     [\typescriptthree-lmr5]     [encoding=\typescriptthree]
   \definefontsynonym [cmr6]     [\typescriptthree-lmr6]     [encoding=\typescriptthree]
@@ -66,7 +231,7 @@
 
 \stoptypescript
 
-\starttypescript [sans] [modern,latin-modern,computer-modern] [texnansi,ec,qx,pl0,il2,t5]
+\starttypescript [sans] [modern,latin-modern,computer-modern] [texnansi,ec,qx,t5]
 
   \definefontsynonym [cmss8]    [\typescriptthree-lmss8]    [encoding=\typescriptthree]
   \definefontsynonym [cmss9]    [\typescriptthree-lmss9]    [encoding=\typescriptthree]
@@ -92,7 +257,7 @@
 
 \stoptypescript
 
-\starttypescript [mono] [modern,latin-modern,computer-modern] [texnansi,ec,qx,pl0,il2,t5]
+\starttypescript [mono] [modern,latin-modern,computer-modern] [texnansi,ec,qx,t5]
 
   \definefontsynonym [cmtt8]    [\typescriptthree-lmtt8]    [encoding=\typescriptthree]
   \definefontsynonym [cmtt9]    [\typescriptthree-lmtt9]    [encoding=\typescriptthree]
@@ -109,313 +274,6 @@
 
 \stoptypescript
 
-% \starttypescript [all] [computer-modern] [ec] % will become ae
-%   \definefontsynonym [cmb10]    [aeb10]    [encoding=ec,handling=glm]
-%   \definefontsynonym [cmbx10]   [aebx10]   [encoding=ec,handling=glm]
-%   \definefontsynonym [cmbx12]   [aebx12]   [encoding=ec,handling=glm]
-%   \definefontsynonym [cmbx5]    [aebx5]    [encoding=ec,handling=glm]
-%   \definefontsynonym [cmbx6]    [aebx6]    [encoding=ec,handling=glm]
-%   \definefontsynonym [cmbx7]    [aebx7]    [encoding=ec,handling=glm]
-%   \definefontsynonym [cmbx8]    [aebx8]    [encoding=ec,handling=glm]
-%   \definefontsynonym [cmbx9]    [aebx9]    [encoding=ec,handling=glm]
-%   \definefontsynonym [cmbxsl10] [aebxsl10] [encoding=ec,handling=glm]
-%   \definefontsynonym [cmbxti10] [aebxti10] [encoding=ec,handling=glm]
-%   \definefontsynonym [cmcsc10]  [aecsc10]  [encoding=ec,handling=glm]
-%   \definefontsynonym [cmitt10]  [aeitt10]  [encoding=ec,handling=glm]
-%   \definefontsynonym [cmr10]    [aer10]    [encoding=ec,handling=glm]
-%   \definefontsynonym [cmr12]    [aer12]    [encoding=ec,handling=glm]
-%   \definefontsynonym [cmr17]    [aer17]    [encoding=ec,handling=glm]
-%   \definefontsynonym [cmr5]     [aer5]     [encoding=ec,handling=glm]
-%   \definefontsynonym [cmr6]     [aer6]     [encoding=ec,handling=glm]
-%   \definefontsynonym [cmr7]     [aer7]     [encoding=ec,handling=glm]
-%   \definefontsynonym [cmr8]     [aer8]     [encoding=ec,handling=glm]
-%   \definefontsynonym [cmr9]     [aer9]     [encoding=ec,handling=glm]
-%   \definefontsynonym [cmsl10]   [aesl10]   [encoding=ec,handling=glm]
-%   \definefontsynonym [cmsl12]   [aesl12]   [encoding=ec,handling=glm]
-%   \definefontsynonym [cmsl8]    [aesl8]    [encoding=ec,handling=glm]
-%   \definefontsynonym [cmsl9]    [aesl9]    [encoding=ec,handling=glm]
-%   \definefontsynonym [cmsltt10] [aesltt10] [encoding=ec,handling=glm]
-%   \definefontsynonym [cmss10]   [aess10]   [encoding=ec,handling=glm]
-%   \definefontsynonym [cmss12]   [aess12]   [encoding=ec,handling=glm]
-%   \definefontsynonym [cmss17]   [aess17]   [encoding=ec,handling=glm]
-%   \definefontsynonym [cmss8]    [aess8]    [encoding=ec,handling=glm]
-%   \definefontsynonym [cmss9]    [aess9]    [encoding=ec,handling=glm]
-%   \definefontsynonym [cmssbx10] [aessbx10] [encoding=ec,handling=glm]
-%   \definefontsynonym [cmssdc10] [aessdc10] [encoding=ec,handling=glm]
-%   \definefontsynonym [cmssi10]  [aessi10]  [encoding=ec,handling=glm]
-%   \definefontsynonym [cmssi12]  [aessi12]  [encoding=ec,handling=glm]
-%   \definefontsynonym [cmssi17]  [aessi17]  [encoding=ec,handling=glm]
-%   \definefontsynonym [cmssi8]   [aessi8]   [encoding=ec,handling=glm]
-%   \definefontsynonym [cmssi9]   [aessi9]   [encoding=ec,handling=glm]
-%   \definefontsynonym [cmtcsc10] [aetcsc10] [encoding=ec,handling=glm]
-%   \definefontsynonym [cmti10]   [aeti10]   [encoding=ec,handling=glm]
-%   \definefontsynonym [cmti12]   [aeti12]   [encoding=ec,handling=glm]
-%   \definefontsynonym [cmti7]    [aeti7]    [encoding=ec,handling=glm]
-%   \definefontsynonym [cmti8]    [aeti8]    [encoding=ec,handling=glm]
-%   \definefontsynonym [cmti9]    [aeti9]    [encoding=ec,handling=glm]
-%   \definefontsynonym [cmtt10]   [aett10]   [encoding=ec,handling=glm]
-%   \definefontsynonym [cmtt12]   [aett12]   [encoding=ec,handling=glm]
-%   \definefontsynonym [cmtt8]    [aett8]    [encoding=ec,handling=glm]
-%   \definefontsynonym [cmtt9]    [aett9]    [encoding=ec,handling=glm]
-% \stoptypescript
-
-% \starttypescript [all] [computer-modern] [il2]
-%   \definefontsynonym [cmb10]    [csb10]    [encoding=il2]
-%   \definefontsynonym [cmbx10]   [csbx10]   [encoding=il2]
-%   \definefontsynonym [cmbx12]   [csbx12]   [encoding=il2]
-%   \definefontsynonym [cmbx5]    [csbx5]    [encoding=il2]
-%   \definefontsynonym [cmbx6]    [csbx6]    [encoding=il2]
-%   \definefontsynonym [cmbx7]    [csbx7]    [encoding=il2]
-%   \definefontsynonym [cmbx8]    [csbx8]    [encoding=il2]
-%   \definefontsynonym [cmbx9]    [csbx9]    [encoding=il2]
-%   \definefontsynonym [cmbxsl10] [csbxsl10] [encoding=il2]
-%   \definefontsynonym [cmbxti10] [csbxti10] [encoding=il2]
-%   \definefontsynonym [cmcsc10]  [cscsc10]  [encoding=il2]
-%   \definefontsynonym [cmdunh10] [csdunh10] [encoding=il2]
-%   \definefontsynonym [cmff10]   [csff10]   [encoding=il2]
-%   \definefontsynonym [cmfi10]   [csfi10]   [encoding=il2]
-%   \definefontsynonym [cmfib8]   [csfib8]   [encoding=il2]
-%   \definefontsynonym [cminch]   [csinch]   [encoding=il2]
-%   \definefontsynonym [cmitt10]  [csitt10]  [encoding=il2]
-%   \definefontsynonym [cmr10]    [csr10]    [encoding=il2]
-%   \definefontsynonym [cmr12]    [csr12]    [encoding=il2]
-%   \definefontsynonym [cmr17]    [csr17]    [encoding=il2]
-%   \definefontsynonym [cmr5]     [csr5]     [encoding=il2]
-%   \definefontsynonym [cmr6]     [csr6]     [encoding=il2]
-%   \definefontsynonym [cmr7]     [csr7]     [encoding=il2]
-%   \definefontsynonym [cmr8]     [csr8]     [encoding=il2]
-%   \definefontsynonym [cmr9]     [csr9]     [encoding=il2]
-%   \definefontsynonym [cmsl10]   [cssl10]   [encoding=il2]
-%   \definefontsynonym [cmsl12]   [cssl12]   [encoding=il2]
-%   \definefontsynonym [cmsl8]    [cssl8]    [encoding=il2]
-%   \definefontsynonym [cmsl9]    [cssl9]    [encoding=il2]
-%   \definefontsynonym [cmsltt10] [cssltt10] [encoding=il2]
-%   \definefontsynonym [cmss10]   [csss10]   [encoding=il2]
-%   \definefontsynonym [cmss12]   [csss12]   [encoding=il2]
-%   \definefontsynonym [cmss17]   [csss17]   [encoding=il2]
-%   \definefontsynonym [cmss8]    [csss8]    [encoding=il2]
-%   \definefontsynonym [cmss9]    [csss9]    [encoding=il2]
-%   \definefontsynonym [cmssbx10] [csssbx10] [encoding=il2]
-%   \definefontsynonym [cmssdc10] [csssdc10] [encoding=il2]
-%   \definefontsynonym [cmssi10]  [csssi10]  [encoding=il2]
-%   \definefontsynonym [cmssi12]  [csssi12]  [encoding=il2]
-%   \definefontsynonym [cmssi17]  [csssi17]  [encoding=il2]
-%   \definefontsynonym [cmssi8]   [csssi8]   [encoding=il2]
-%   \definefontsynonym [cmssi9]   [csssi9]   [encoding=il2]
-%   \definefontsynonym [cmssq8]   [csssq8]   [encoding=il2]
-%   \definefontsynonym [cmssqi8]  [csssqi8]  [encoding=il2]
-%   \definefontsynonym [cmtcsc10] [cstcsc10] [encoding=il2]
-%   \definefontsynonym [cmti10]   [csti10]   [encoding=il2]
-%   \definefontsynonym [cmti12]   [csti12]   [encoding=il2]
-%   \definefontsynonym [cmti7]    [csti7]    [encoding=il2]
-%   \definefontsynonym [cmti8]    [csti8]    [encoding=il2]
-%   \definefontsynonym [cmti9]    [csti9]    [encoding=il2]
-%   \definefontsynonym [cmtt10]   [cstt10]   [encoding=il2]
-%   \definefontsynonym [cmtt12]   [cstt12]   [encoding=il2]
-%   \definefontsynonym [cmtt8]    [cstt8]    [encoding=il2]
-%   \definefontsynonym [cmtt9]    [cstt9]    [encoding=il2]
-%   \definefontsynonym [cmu10]    [csu10]    [encoding=il2]
-%   \definefontsynonym [cmvtt10]  [csvtt10]  [encoding=il2]
-% \stoptypescript
-
-% \starttypescript [all] [computer-modern] [pl0]
-%   \definefontsynonym [cmb10]    [plb10]    [encoding=pl0]
-%   \definefontsynonym [cmbsy10]  [plbsy10]  [encoding=pl0]
-%   \definefontsynonym [cmbx10]   [plbx10]   [encoding=pl0]
-%   \definefontsynonym [cmbx12]   [plbx12]   [encoding=pl0]
-%   \definefontsynonym [cmbx5]    [plbx5]    [encoding=pl0]
-%   \definefontsynonym [cmbx6]    [plbx6]    [encoding=pl0]
-%   \definefontsynonym [cmbx7]    [plbx7]    [encoding=pl0]
-%   \definefontsynonym [cmbx8]    [plbx8]    [encoding=pl0]
-%   \definefontsynonym [cmbx9]    [plbx9]    [encoding=pl0]
-%   \definefontsynonym [cmbxsl10] [plbxsl10] [encoding=pl0]
-%   \definefontsynonym [cmbxti10] [plbxti10] [encoding=pl0]
-%   \definefontsynonym [cmcsc10]  [plcsc10]  [encoding=pl0]
-%   \definefontsynonym [cmdunh10] [pldunh10] [encoding=pl0]
-%   \definefontsynonym [cmex10]   [plex10]   [encoding=pl0]
-%   \definefontsynonym [cmex9]    [plex9]    [encoding=pl0]
-%   \definefontsynonym [cmff10]   [plff10]   [encoding=pl0]
-%   \definefontsynonym [cmfi10]   [plfi10]   [encoding=pl0]
-%   \definefontsynonym [cmfib8]   [plfib8]   [encoding=pl0]
-%   \definefontsynonym [cminch]   [plinch]   [encoding=pl0]
-%   \definefontsynonym [cmitt10]  [plitt10]  [encoding=pl0]
-%   \definefontsynonym [cmmi10]   [plmi10]   [encoding=pl0]
-%   \definefontsynonym [cmmi12]   [plmi12]   [encoding=pl0]
-%   \definefontsynonym [cmmi5]    [plmi5]    [encoding=pl0]
-%   \definefontsynonym [cmmi6]    [plmi6]    [encoding=pl0]
-%   \definefontsynonym [cmmi7]    [plmi7]    [encoding=pl0]
-%   \definefontsynonym [cmmi8]    [plmi8]    [encoding=pl0]
-%   \definefontsynonym [cmmi9]    [plmi9]    [encoding=pl0]
-%   \definefontsynonym [cmmib10]  [plmib10]  [encoding=pl0]
-%   \definefontsynonym [cmr10]    [plr10]    [encoding=pl0]
-%   \definefontsynonym [cmr12]    [plr12]    [encoding=pl0]
-%   \definefontsynonym [cmr17]    [plr17]    [encoding=pl0]
-%   \definefontsynonym [cmr5]     [plr5]     [encoding=pl0]
-%   \definefontsynonym [cmr6]     [plr6]     [encoding=pl0]
-%   \definefontsynonym [cmr7]     [plr7]     [encoding=pl0]
-%   \definefontsynonym [cmr8]     [plr8]     [encoding=pl0]
-%   \definefontsynonym [cmr9]     [plr9]     [encoding=pl0]
-%   \definefontsynonym [cmsl10]   [plsl10]   [encoding=pl0]
-%   \definefontsynonym [cmsl12]   [plsl12]   [encoding=pl0]
-%   \definefontsynonym [cmsl8]    [plsl8]    [encoding=pl0]
-%   \definefontsynonym [cmsl9]    [plsl9]    [encoding=pl0]
-%   \definefontsynonym [cmsltt10] [plsltt10] [encoding=pl0]
-%   \definefontsynonym [cmss10]   [plss10]   [encoding=pl0]
-%   \definefontsynonym [cmss12]   [plss12]   [encoding=pl0]
-%   \definefontsynonym [cmss17]   [plss17]   [encoding=pl0]
-%   \definefontsynonym [cmss8]    [plss8]    [encoding=pl0]
-%   \definefontsynonym [cmss9]    [plss9]    [encoding=pl0]
-%   \definefontsynonym [cmssbi10] [plssbi10] [encoding=pl0]
-%   \definefontsynonym [cmssbx10] [plssbx10] [encoding=pl0]
-%   \definefontsynonym [cmssdc10] [plssdc10] [encoding=pl0]
-%   \definefontsynonym [cmssi10]  [plssi10]  [encoding=pl0]
-%   \definefontsynonym [cmssi12]  [plssi12]  [encoding=pl0]
-%   \definefontsynonym [cmssi17]  [plssi17]  [encoding=pl0]
-%   \definefontsynonym [cmssi8]   [plssi8]   [encoding=pl0]
-%   \definefontsynonym [cmssi9]   [plssi9]   [encoding=pl0]
-%   \definefontsynonym [cmssq8]   [plssq8]   [encoding=pl0]
-%   \definefontsynonym [cmssqi8]  [plssqi8]  [encoding=pl0]
-%   \definefontsynonym [cmsy10]   [plsy10]   [encoding=pl0]
-%   \definefontsynonym [cmsy5]    [plsy5]    [encoding=pl0]
-%   \definefontsynonym [cmsy6]    [plsy6]    [encoding=pl0]
-%   \definefontsynonym [cmsy7]    [plsy7]    [encoding=pl0]
-%   \definefontsynonym [cmsy8]    [plsy8]    [encoding=pl0]
-%   \definefontsynonym [cmsy9]    [plsy9]    [encoding=pl0]
-%   \definefontsynonym [cmtcsc10] [pltcsc10] [encoding=pl0]
-%   \definefontsynonym [cmtex10]  [pltex10]  [encoding=pl0]
-%   \definefontsynonym [cmtex8]   [pltex8]   [encoding=pl0]
-%   \definefontsynonym [cmtex9]   [pltex9]   [encoding=pl0]
-%   \definefontsynonym [cmti10]   [plti10]   [encoding=pl0]
-%   \definefontsynonym [cmti12]   [plti12]   [encoding=pl0]
-%   \definefontsynonym [cmti7]    [plti7]    [encoding=pl0]
-%   \definefontsynonym [cmti8]    [plti8]    [encoding=pl0]
-%   \definefontsynonym [cmti9]    [plti9]    [encoding=pl0]
-%   \definefontsynonym [cmtt10]   [pltt10]   [encoding=pl0]
-%   \definefontsynonym [cmtt12]   [pltt12]   [encoding=pl0]
-%   \definefontsynonym [cmtt8]    [pltt8]    [encoding=pl0]
-%   \definefontsynonym [cmtt9]    [pltt9]    [encoding=pl0]
-%   \definefontsynonym [cmu10]    [plu10]    [encoding=pl0]
-%   \definefontsynonym [cmvtt10]  [plvtt10]  [encoding=pl0]
-% \stoptypescript
-
-% \starttypescript [all] [computer-modern] [t5]
-%   \definefontsynonym [cmb10]    [vnb10]    [encoding=t5]
-%   \definefontsynonym [cmbx10]   [vnbx10]   [encoding=t5]
-%   \definefontsynonym [cmbx12]   [vnbx12]   [encoding=t5]
-%   \definefontsynonym [cmbx5]    [vnbx5]    [encoding=t5]
-%   \definefontsynonym [cmbx6]    [vnbx6]    [encoding=t5]
-%   \definefontsynonym [cmbx7]    [vnbx7]    [encoding=t5]
-%   \definefontsynonym [cmbx8]    [vnbx8]    [encoding=t5]
-%   \definefontsynonym [cmbx9]    [vnbx9]    [encoding=t5]
-%   \definefontsynonym [cmbxsl10] [vnbxsl10] [encoding=t5]
-%   \definefontsynonym [cmbxti10] [vnbxti10] [encoding=t5]
-%   \definefontsynonym [cmcsc10]  [vncsc10]  [encoding=t5]
-%   \definefontsynonym [cmdunh10] [vndunh10] [encoding=t5]
-%   \definefontsynonym [cmff10]   [vnff10]   [encoding=t5]
-%   \definefontsynonym [cmfi10]   [vnfi10]   [encoding=t5]
-%   \definefontsynonym [cmfib8]   [vnfib8]   [encoding=t5]
-%   \definefontsynonym [cminch]   [vninch]   [encoding=t5]
-%   \definefontsynonym [cmitt10]  [vnitt10]  [encoding=t5]
-%   \definefontsynonym [cmr10]    [vnr10]    [encoding=t5]
-%   \definefontsynonym [cmr12]    [vnr12]    [encoding=t5]
-%   \definefontsynonym [cmr17]    [vnr17]    [encoding=t5]
-%   \definefontsynonym [cmr5]     [vnr5]     [encoding=t5]
-%   \definefontsynonym [cmr6]     [vnr6]     [encoding=t5]
-%   \definefontsynonym [cmr7]     [vnr7]     [encoding=t5]
-%   \definefontsynonym [cmr8]     [vnr8]     [encoding=t5]
-%   \definefontsynonym [cmr9]     [vnr9]     [encoding=t5]
-%   \definefontsynonym [cmsl10]   [vnsl10]   [encoding=t5]
-%   \definefontsynonym [cmsl12]   [vnsl12]   [encoding=t5]
-%   \definefontsynonym [cmsl8]    [vnsl8]    [encoding=t5]
-%   \definefontsynonym [cmsl9]    [vnsl9]    [encoding=t5]
-%   \definefontsynonym [cmsltt10] [vnsltt10] [encoding=t5]
-%   \definefontsynonym [cmss10]   [vnss10]   [encoding=t5]
-%   \definefontsynonym [cmss12]   [vnss12]   [encoding=t5]
-%   \definefontsynonym [cmss17]   [vnss17]   [encoding=t5]
-%   \definefontsynonym [cmss8]    [vnss8]    [encoding=t5]
-%   \definefontsynonym [cmss9]    [vnss9]    [encoding=t5]
-%   \definefontsynonym [cmssbx10] [vnssbx10] [encoding=t5]
-%   \definefontsynonym [cmssdc10] [vnssdc10] [encoding=t5]
-%   \definefontsynonym [cmssi10]  [vnssi10]  [encoding=t5]
-%   \definefontsynonym [cmssi12]  [vnssi12]  [encoding=t5]
-%   \definefontsynonym [cmssi17]  [vnssi17]  [encoding=t5]
-%   \definefontsynonym [cmssi8]   [vnssi8]   [encoding=t5]
-%   \definefontsynonym [cmssi9]   [vnssi9]   [encoding=t5]
-%   \definefontsynonym [cmssq8]   [vnssq8]   [encoding=t5]
-%   \definefontsynonym [cmssqi8]  [vnssqi8]  [encoding=t5]
-%   \definefontsynonym [cmtcsc10] [vntcsc10] [encoding=t5]
-%   \definefontsynonym [cmti10]   [vnti10]   [encoding=t5]
-%   \definefontsynonym [cmti12]   [vnti12]   [encoding=t5]
-%   \definefontsynonym [cmti7]    [vnti7]    [encoding=t5]
-%   \definefontsynonym [cmti8]    [vnti8]    [encoding=t5]
-%   \definefontsynonym [cmti9]    [vnti9]    [encoding=t5]
-%   \definefontsynonym [cmtt10]   [vntt10]   [encoding=t5]
-%   \definefontsynonym [cmtt12]   [vntt12]   [encoding=t5]
-%   \definefontsynonym [cmtt8]    [vntt8]    [encoding=t5]
-%   \definefontsynonym [cmtt9]    [vntt9]    [encoding=t5]
-%   \definefontsynonym [cmu10]    [vnu10]    [encoding=t5]
-%   \definefontsynonym [cmvtt10]  [vnvtt10]  [encoding=t5]
-% \stoptypescript
-
-% \starttypescript [all] [computer-modern] [ec]
-%   \definefontsynonym [cmb10]    [ecrb1000]   [encoding=ec]
-%   \definefontsynonym [cmbx10]   [ecbx1000]   [encoding=ec]
-%   \definefontsynonym [cmbx12]   [ecbx1200]   [encoding=ec]
-%   \definefontsynonym [cmbx5]    [ecbx0500]   [encoding=ec]
-%   \definefontsynonym [cmbx6]    [ecbx0600]   [encoding=ec]
-%   \definefontsynonym [cmbx7]    [ecbx0700]   [encoding=ec]
-%   \definefontsynonym [cmbx8]    [ecbx0800]   [encoding=ec]
-%   \definefontsynonym [cmbx9]    [ecbx0900]   [encoding=ec]
-%   \definefontsynonym [cmbxsl10] [ecbl1000]   [encoding=ec]
-%   \definefontsynonym [cmbxti10] [ecbi1000]   [encoding=ec]
-%   \definefontsynonym [cmcsc10]  [eccc1000]   [encoding=ec]
-%   \definefontsynonym [cmdunh10] [ecdh1000]   [encoding=ec]
-%   \definefontsynonym [cmff10]   [ecff1000]   [encoding=ec]
-%   \definefontsynonym [cmfi10]   [ecfi1000]   [encoding=ec]
-%   \definefontsynonym [cmfib8]   [ecfb0800]   [encoding=ec]
-%  %\definefontsynonym [cminch]   [ecinch00]   [encoding=ec]
-%   \definefontsynonym [cmitt10]  [ecit1000]   [encoding=ec]
-%   \definefontsynonym [cmr10]    [ecrm1000]   [encoding=ec]
-%   \definefontsynonym [cmr12]    [ecrm1200]   [encoding=ec]
-%   \definefontsynonym [cmr17]    [ecrm1700]   [encoding=ec]
-%   \definefontsynonym [cmr5]     [ecrm0500]   [encoding=ec]
-%   \definefontsynonym [cmr6]     [ecrm0600]   [encoding=ec]
-%   \definefontsynonym [cmr7]     [ecrm0700]   [encoding=ec]
-%   \definefontsynonym [cmr8]     [ecrm0800]   [encoding=ec]
-%   \definefontsynonym [cmr9]     [ecrm0900]   [encoding=ec]
-%   \definefontsynonym [cmsl10]   [ecsl1000]   [encoding=ec]
-%   \definefontsynonym [cmsl12]   [ecsl1200]   [encoding=ec]
-%   \definefontsynonym [cmsl8]    [ecsl0800]   [encoding=ec]
-%   \definefontsynonym [cmsl9]    [ecsl0900]   [encoding=ec]
-%   \definefontsynonym [cmsltt10] [ecst1000]   [encoding=ec]
-%   \definefontsynonym [cmss10]   [ecss1000]   [encoding=ec]
-%   \definefontsynonym [cmss12]   [ecss1200]   [encoding=ec]
-%   \definefontsynonym [cmss17]   [ecss1700]   [encoding=ec]
-%   \definefontsynonym [cmss8]    [ecss0800]   [encoding=ec]
-%   \definefontsynonym [cmss9]    [ecss0900]   [encoding=ec]
-%   \definefontsynonym [cmssbx10] [ecsx1000]   [encoding=ec]
-%  %\definefontsynonym [cmssdc10] [ecssdc1000] [encoding=ec]
-%   \definefontsynonym [cmssi10]  [ecsi1000]   [encoding=ec]
-%   \definefontsynonym [cmssi12]  [ecsi1200]   [encoding=ec]
-%   \definefontsynonym [cmssi17]  [ecsi1700]   [encoding=ec]
-%   \definefontsynonym [cmssi8]   [ecsi0800]   [encoding=ec]
-%   \definefontsynonym [cmssi9]   [ecsi0900]   [encoding=ec]
-%   \definefontsynonym [cmssq8]   [ecss0800]   [encoding=ec] % ssq->ss
-%   \definefontsynonym [cmssqi8]  [ecsi0800]   [encoding=ec] % ssq->ss
-%   \definefontsynonym [cmtcsc10] [ectc1000]   [encoding=ec]
-%   \definefontsynonym [cmti10]   [ecti1000]   [encoding=ec]
-%   \definefontsynonym [cmti12]   [ecti1200]   [encoding=ec]
-%   \definefontsynonym [cmti7]    [ecti0700]   [encoding=ec]
-%   \definefontsynonym [cmti8]    [ecti0800]   [encoding=ec]
-%   \definefontsynonym [cmti9]    [ecti0900]   [encoding=ec]
-%   \definefontsynonym [cmtt10]   [ectt1000]   [encoding=ec]
-%   \definefontsynonym [cmtt12]   [ectt1200]   [encoding=ec]
-%   \definefontsynonym [cmtt8]    [ectt0800]   [encoding=ec]
-%   \definefontsynonym [cmtt9]    [ectt0900]   [encoding=ec]
-%   \definefontsynonym [cmu10]    [ecui1000]   [encoding=ec]
-%   \definefontsynonym [cmvtt10]  [ecvt1000]   [encoding=ec]
-% \stoptypescript
-
 %D {\em Comments by Victor Figurnov:} the wcmb10, wcmbx10,
 %D \unknown\ fonts below are taken from the Paradissa
 %D collection by Basil Malyshev. These fonts don't conform t2a
@@ -637,37 +495,51 @@
 \stoptypescript
 
 \starttypescript [serif] [modern,computer-modern,latin-modern] [default]
-  \definefontsynonym [ComputerModern]             [cmr10]
-  \definefontsynonym [ComputerModern-Italic]      [cmti10]
-  \definefontsynonym [ComputerModern-Slanted]     [cmsl10]
-  \definefontsynonym [ComputerModern-Bold]        [cmbx10]
-  \definefontsynonym [ComputerModern-BoldItalic]  [cmbxti10]
-  \definefontsynonym [ComputerModern-BoldSlanted] [cmbxsl10]
-  \definefontsynonym [ComputerModern-Caps]        [cmcsc10]
-\stoptypescript
-
-\starttypescript [sans] [modern,computer-modern,latin-modern] [default]
-  \definefontsynonym [ComputerModernSans]             [cmss10]
-  \definefontsynonym [ComputerModernSans-Italic]      [cmssi10]
-  \definefontsynonym [ComputerModernSans-Slanted]     [cmssi10]
-  \definefontsynonym [ComputerModernSans-Bold]        [cmssbx10]
-  \definefontsynonym [ComputerModernSans-BoldItalic]  [cmssbx10]
-  \definefontsynonym [ComputerModernSans-BoldSlanted] [cmssbx10]
-  \definefontsynonym [ComputerModernSans-Caps]        [cmss10]
-\stoptypescript
-
-\starttypescript [mono] [modern,computer-modern,latin-modern] [default]
-  \definefontsynonym [ComputerModernMono]             [cmtt10]
-  \definefontsynonym [ComputerModernMono-Italic]      [cmitt10]
-  \definefontsynonym [ComputerModernMono-Slanted]     [cmsltt10]
-  \definefontsynonym [ComputerModernMono-Bold]        [cmtt10]
-  \definefontsynonym [ComputerModernMono-BoldItalic]  [cmtt10]
-  \definefontsynonym [ComputerModernMono-BoldSlanted] [cmtt10]
-  \definefontsynonym [ComputerModernMono-Caps]        [cmtt10]
-  \definefontsynonym [ComputerModernMono-Variable]    [cmvtt10]
-\stoptypescript
-
-\starttypescript [math] [modern,computer-modern,latin-modern] [default]
+  \definefontsynonym [ComputerModern]             [LMRoman-Regular]
+  \definefontsynonym [ComputerModern-Italic]      [LMRoman-Italic]
+  \definefontsynonym [ComputerModern-Slanted]     [LMRoman-Oblique]
+  \definefontsynonym [ComputerModern-Bold]        [LMRoman-Bold]
+  \definefontsynonym [ComputerModern-BoldItalic]  [LMRoman-BoldItalic]
+  \definefontsynonym [ComputerModern-BoldSlanted] [LMRoman-BoldOblique]
+  \definefontsynonym [ComputerModern-Caps]        [LMRoman-CapsRegular]
+  \definefontsynonym [ComputerModern-CapsSlanted] [LMRoman-CapsOblique]
+\stoptypescript
+
+\starttypescript [sans] [modern,computer-modern,latin-modern] % [default]
+  \definefontsynonym [ComputerModernSans]             [LMSans-Regular]
+  \definefontsynonym [ComputerModernSans-Italic]      [LMSans-Italic]
+  \definefontsynonym [ComputerModernSans-Slanted]     [LMSans-Oblique]
+  \definefontsynonym [ComputerModernSans-Bold]        [LMSans-Bold]
+  \definefontsynonym [ComputerModernSans-BoldItalic]  [LMSans-BoldItalic]
+  \definefontsynonym [ComputerModernSans-BoldSlanted] [LMSans-BoldOblique]
+  \definefontsynonym [ComputerModernSans-Caps]        [LMSans-Regular] % [LMSans-CapsRegular]
+  \definefontsynonym [ComputerModernSans-CapsSlanted] [LMSans-Oblique] % [LMSans-CapsOblique]
+\stoptypescript
+
+\starttypescript [mono] [modern,computer-modern,latin-modern] % [default]
+  \definefontsynonym [ComputerModernMono]             [LMTypewriter-Regular]
+  \definefontsynonym [ComputerModernMono-Italic]      [LMTypewriter-Italic]
+  \definefontsynonym [ComputerModernMono-Slanted]     [LMTypewriter-Oblique]
+  \definefontsynonym [ComputerModernMono-Bold]        [LMTypewriter-Dark]
+  \definefontsynonym [ComputerModernMono-BoldItalic]  [LMTypewriter-DarkOblique] % !
+  \definefontsynonym [ComputerModernMono-BoldSlanted] [LMTypewriter-DarkOblique]
+  \definefontsynonym [ComputerModernMono-Caps]        [LMTypewriter-CapsRegular]
+  \definefontsynonym [ComputerModernMono-CapsSlanted] [LMTypewriter-CapsOblique]
+  \definefontsynonym [ComputerModernMono-Variable]    [LMTypewriterVarWd-Regular]
+\stoptypescript
+
+\starttypescript [serif] [modern-vari,computer-modern-vari,latin-modern-vari] % [default]
+  \definefontsynonym [ComputerModernVariable]             [LMTypewriterVarWd-Regular]
+  \definefontsynonym [ComputerModernVariable-Italic]      [LMTypewriterVarWd-Oblique]
+  \definefontsynonym [ComputerModernVariable-Slanted]     [LMTypewriterVarWd-Oblique]
+  \definefontsynonym [ComputerModernVariable-Bold]        [LMTypewriterVarWd-Dark]
+  \definefontsynonym [ComputerModernVariable-BoldItalic]  [LMTypewriterVarWd-DarkOblique]
+  \definefontsynonym [ComputerModernVariable-BoldSlanted] [LMTypewriterVarWd-DarkOblique]
+  \definefontsynonym [ComputerModernVariable-Caps]        [LMTypewriterVarWd-Regular]
+  \definefontsynonym [ComputerModernVariable-CapsSlanted] [LMTypewriterVarWd-Oblique]
+\stoptypescript
+
+\starttypescript [math] [modern,computer-modern,latin-modern] % [default]
   % watch the space, it prevents remapping
   \definefontsynonym [ComputerModernMath-Roman]     [cmr10 ]
   \definefontsynonym [ComputerModernMath-Extension] [cmex10]
@@ -675,7 +547,7 @@
   \definefontsynonym [ComputerModernMath-Symbol]    [cmsy10]
 \stoptypescript
 
-\starttypescript [boldmath,bfmath] [modern,computer-modern,latin-modern] [default]
+\starttypescript [boldmath,bfmath] [modern,computer-modern,latin-modern] % [default]
   % watch the space, it prevents remapping
   \definefontsynonym [ComputerModernMath-Roman-Bold]  [cmb10 ]
   \definefontsynonym [ComputerModernMath-Extension]   [cmex10]
diff --git a/tex/context/base/type-exa.tex b/tex/context/base/type-exa.tex
index ee9e01954..d08b565f4 100644
--- a/tex/context/base/type-exa.tex
+++ b/tex/context/base/type-exa.tex
@@ -15,7 +15,7 @@
 
 \starttypescriptcollection[examples]
 
-\starttypescript [fallback] [texnansi,ec,qx,il2,pl0,t5,default]
+\starttypescript [fallback] [texnansi,ec,qx,t5,default]
 
   % no fontclass, so this is the fall back
 
@@ -28,7 +28,7 @@
 
 \stoptypescript
 
-\starttypescript [modern] [texnansi,ec,qx,il2,pl0,t5,default]
+\starttypescript [modern] [texnansi,ec,qx,t5,default]
 
   \definetypeface [modern] [rm] [serif] [modern] [computer-modern] [encoding=\typescripttwo]
   \definetypeface [modern] [ss] [sans]  [modern] [computer-modern] [encoding=\typescripttwo]
@@ -39,7 +39,7 @@
 
 \stoptypescript
 
-\starttypescript [modern-base] [texnansi,ec,qx,pl0,il2,t5,default]
+\starttypescript [modern-base] [texnansi,ec,qx,t5,default]
 
   \definetypeface [modern] [rm] [serif] [modern] [default] [encoding=\typescripttwo]
   \definetypeface [modern] [ss] [sans]  [modern] [default] [encoding=\typescripttwo]
@@ -61,7 +61,16 @@
 
 \stoptypescript
 
-\starttypescript [postscript] [texnansi,ec,qx,8r,t5,uc]
+\starttypescript [fallback,modern,modern-base] [il2]
+  \usetypescript[\typescriptone][ec]
+  \enableregime[il2]
+\stoptypescript
+\starttypescript [fallback,modern,modern-base] [pl0]
+  \usetypescript[\typescriptone][qx]
+  \enableregime[pl0]
+\stoptypescript
+
+\starttypescript [postscript] [texnansi,ec,qx,t5,uc,8r]
 
   \definetypeface [postscript] [rm] [serif] [times]     [default] [encoding=\typescripttwo]
   \definetypeface [postscript] [ss] [sans]  [helvetica] [default] [rscale=.9,encoding=\typescripttwo]
diff --git a/tex/context/base/type-ghz.tex b/tex/context/base/type-ghz.tex
index 1551fe895..23f71d583 100644
--- a/tex/context/base/type-ghz.tex
+++ b/tex/context/base/type-ghz.tex
@@ -32,9 +32,9 @@
   \definefontsynonym [SansItalic]      [OptimaLT-Italic]
   \definefontsynonym [SansBold]        [OptimaLT-Bold]
   \definefontsynonym [SansBoldItalic]  [OptimaLT-BoldItalic]
-
   \definefontsynonym [SansSlanted]     [SansItalic]
   \definefontsynonym [SansBoldSlanted] [SansBoldItalic]
+  \definefontsynonym [SansCaps]        [Sans]
 
 \stoptypescript
 
@@ -72,9 +72,9 @@
   \definefontsynonym [SansItalic]      [OptimaNovaLT-Italic]
   \definefontsynonym [SansBold]        [OptimaLT-Bold]
   \definefontsynonym [SansBoldItalic]  [OptimaLT-BoldItalic]
-
   \definefontsynonym [SansSlanted]     [SansItalic]
   \definefontsynonym [SansBoldSlanted] [SansBoldItalic]
+  \definefontsynonym [SansCaps]        [Sans]
 
 \stoptypescript
 
diff --git a/tex/context/base/type-ini.tex b/tex/context/base/type-ini.tex
index a70042448..f551c8861 100644
--- a/tex/context/base/type-ini.tex
+++ b/tex/context/base/type-ini.tex
@@ -25,8 +25,6 @@
 %   \usetypescript[modern][texnansi] texnansi: \setupbodyfont[modern] \eacute \eogonek \zcaron \acircumflexgrave
 %   \usetypescript[modern][ec]       ec:       \setupbodyfont[modern] \eacute \eogonek \zcaron \acircumflexgrave
 %   \usetypescript[modern][qx]       qx:       \setupbodyfont[modern] \eacute \eogonek \zcaron \acircumflexgrave
-%   \usetypescript[modern][il2]      il2:      \setupbodyfont[modern] \eacute \eogonek \zcaron \acircumflexgrave
-%   \usetypescript[modern][pl0]      pl0:      \setupbodyfont[modern] \eacute \eogonek \zcaron \acircumflexgrave
 %   \usetypescript[modern][t5]       t5:       \setupbodyfont[modern] \eacute \eogonek \zcaron \acircumflexgrave
 % \stoptext
 %
diff --git a/tex/context/base/type-map.tex b/tex/context/base/type-map.tex
index d2485baa1..2c87d8ad2 100644
--- a/tex/context/base/type-map.tex
+++ b/tex/context/base/type-map.tex
@@ -31,17 +31,9 @@
   \loadmapfile[original-public-lm.map]
 \stoptypescript
 
-% per 20050201 we moved to latin modern for plr/csr/vnr
-%
-% \starttypescript [map] [base] [all]
-%   \loadmapfile[original-public-plr.map]
-%   \loadmapfile[original-public-csr.map]
-%   \loadmapfile[original-public-vnr.map]
-% \stoptypescript
-
 % This is the base map file, load it to be sure.
 
-\starttypescript [map] [all] [ec,8r,texnansi,qx,t5,pl0,il2]
+\starttypescript [map] [all] [ec,8r,texnansi,qx,t5]
   \loadmapfile[original-base.map]
   \loadmapfile[\typescriptthree-base.map]
 \stoptypescript
@@ -54,47 +46,12 @@
 
 % cmr and related
 
-% \starttypescript [map] [cmr]
-%   \loadmapfile[original-ams-cmr.map]
-%   \loadmapfile[original-ams-euler.map]
-% \stoptypescript
-%
-% \starttypescript [map] [lm,lmr]
-%   \loadmapfile[original-public-lm.map]
-% \stoptypescript
-
 \starttypescript [map] [cmr,lm,lmr]
   \loadmapfile[original-public-lm.map]
   \loadmapfile[original-ams-base.map]
   \loadmapfile[original-ams-euler.map]
 \stoptypescript
 
-% per 20050201 we moved to latin modern for plr/csr/vnr
-%
-% \starttypescript [map] [il2,csr]
-%   \loadmapfile[original-public-csr.map]
-% \stoptypescript
-%
-% \starttypescript [map] [pl0,plr]
-%   \loadmapfile[original-public-plr.map]
-% \stoptypescript
-%
-% \starttypescript [map] [vnr]
-%   \loadmapfile[original-public-vnr.map]
-% \stoptypescript
-
-\starttypescript [map] [il2,csr]
-  \loadmapfile[il2-public-lm.map]
-\stoptypescript
-
-\starttypescript [map] [pl0,plr]
-  \loadmapfile[pl0-public-lm.map]
-\stoptypescript
-
-\starttypescript [map] [t5,vnr]
-  \loadmapfile[t5-public-lm.map]
-\stoptypescript
-
 % cyrillic
 
 \starttypescript [map] [computer-modern] [t2a,t2b,t2c,x2]
@@ -102,26 +59,20 @@
   \loadmapfile[cm-super-\typescriptthree.map]
 \stoptypescript
 
-% latin modern
+% latin modern (watch the unfortunate \quote {lm-encoding} order
+% in the name; for the moment we ship copies of the map files.
 
-\starttypescript [map] [modern,computer-modern,latin-modern] [ec,texnansi,qx,t5,pl0,il2]
+\starttypescript [map] [modern,modern-vari,modern-cond,computer-modern,latin-modern,latin-modern-vari,latin-modern-cond,] [ec,texnansi,qx,t5]
+% \loadmapfile[lm-\typescriptthree.map] % maybe some day
   \loadmapfile[\typescriptthree-public-lm.map]
 \stoptypescript
 
-% \usetypescript [map] [latin-modern-var] [\defaultencoding]
-%
-% example:
-%
 % \usetypescript [map] [latin-modern-os] [ec] % lm is loaded under ec regime
 % \starttext
 %     Is onze Frans nu 41, 52, 63, 74, 85 of 96 jaar \quote {old}?
 % \stoptext
 
-\starttypescript [map] [latin-modern-var] [ec,texnansi,qx,t5,pl0,il2]
-  \loadmapfile[\typescriptthree-var-exclusive-public-lm.map]
-\stoptypescript
-
-\starttypescript [map] [latin-modern-os] [ec,texnansi,qx,t5,pl0,il2]
+\starttypescript [map] [latin-modern-os] [ec,texnansi,qx,t5]
   \loadmapfile[\typescriptthree-os-public-lm.map]
 \stoptypescript
 
@@ -147,12 +98,6 @@
   \loadmapfile[ex-antt.map]
 \stoptypescript
 
-% obsolete
-%
-% \starttypescript [map] [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] [ec]
-%   \loadmapfile[cork-antt.map]
-% \stoptypescript
-
 \starttypescript [map] [antykwa-poltawskiego] [ec,texnansi,qx,t5]
   \loadmapfile[\typescriptthree-public-antp.map]
 \stoptypescript
diff --git a/tex/context/base/type-old.tex b/tex/context/base/type-old.tex
new file mode 100644
index 000000000..881deeefe
--- /dev/null
+++ b/tex/context/base/type-old.tex
@@ -0,0 +1,320 @@
+%D \module
+%D   [       file=type-old,
+%D        version=2005.09.07, % moved from type-*.tex
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Ghosts from the Past,
+%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
+
+% \starttypescript[all][modern,latin-modern,computer-modern][pl0]
+%
+%   \definefontsynonym[pl0-lmb10]   [plb10]    [encoding=pl0]
+%   \definefontsynonym[pl0-lmbo10]  [plbsl10]  [encoding=pl0]
+%   \definefontsynonym[pl0-lmbx10]  [plbx10]   [encoding=pl0]
+%   \definefontsynonym[pl0-lmbx12]  [plbx12]   [encoding=pl0]
+%   \definefontsynonym[pl0-lmbx5]   [plbx5]    [encoding=pl0]
+%   \definefontsynonym[pl0-lmbx6]   [plbx6]    [encoding=pl0]
+%   \definefontsynonym[pl0-lmbx7]   [plbx7]    [encoding=pl0]
+%   \definefontsynonym[pl0-lmbx8]   [plbx8]    [encoding=pl0]
+%   \definefontsynonym[pl0-lmbx9]   [plbx9]    [encoding=pl0]
+%   \definefontsynonym[pl0-lmbxi10] [plbxti10] [encoding=pl0]
+%   \definefontsynonym[pl0-lmbxo10] [plbxsl10] [encoding=pl0]
+%   \definefontsynonym[pl0-lmcsc10] [plcsc10]  [encoding=pl0]
+%   \definefontsynonym[pl0-lmcsco10][plcscsl10][encoding=pl0]
+%   \definefontsynonym[pl0-lmr10]   [plr10]    [encoding=pl0]
+%   \definefontsynonym[pl0-lmr12]   [plr12]    [encoding=pl0]
+%   \definefontsynonym[pl0-lmr17]   [plr17]    [encoding=pl0]
+%   \definefontsynonym[pl0-lmr5]    [plr5]     [encoding=pl0]
+%   \definefontsynonym[pl0-lmr6]    [plr6]     [encoding=pl0]
+%   \definefontsynonym[pl0-lmr7]    [plr7]     [encoding=pl0]
+%   \definefontsynonym[pl0-lmr8]    [plr8]     [encoding=pl0]
+%   \definefontsynonym[pl0-lmr9]    [plr9]     [encoding=pl0]
+%   \definefontsynonym[pl0-lmri10]  [plti10]   [encoding=pl0]
+%   \definefontsynonym[pl0-lmri12]  [plti12]   [encoding=pl0]
+%   \definefontsynonym[pl0-lmri7]   [plti7]    [encoding=pl0]
+%   \definefontsynonym[pl0-lmri8]   [plti8]    [encoding=pl0]
+%   \definefontsynonym[pl0-lmri9]   [plti9]    [encoding=pl0]
+%   \definefontsynonym[pl0-lmro10]  [plsl10]   [encoding=pl0]
+%   \definefontsynonym[pl0-lmro12]  [plsl12]   [encoding=pl0]
+%   \definefontsynonym[pl0-lmro8]   [plsl8]    [encoding=pl0]
+%   \definefontsynonym[pl0-lmro9]   [plsl9]    [encoding=pl0]
+%   \definefontsynonym[pl0-lmss10]  [plss10]   [encoding=pl0]
+%   \definefontsynonym[pl0-lmss12]  [plss12]   [encoding=pl0]
+%   \definefontsynonym[pl0-lmss17]  [plss17]   [encoding=pl0]
+%   \definefontsynonym[pl0-lmss8]   [plss8]    [encoding=pl0]
+%   \definefontsynonym[pl0-lmss9]   [plss9]    [encoding=pl0]
+%   \definefontsynonym[pl0-lmssbo10][plssbi10] [encoding=pl0]
+%   \definefontsynonym[pl0-lmssbx10][plssbx10] [encoding=pl0]
+%   \definefontsynonym[pl0-lmssdc10][plssdc10] [encoding=pl0]
+%   \definefontsynonym[pl0-lmssdo10][plssdi10] [encoding=pl0]
+%   \definefontsynonym[pl0-lmsso10] [plssi10]  [encoding=pl0]
+%   \definefontsynonym[pl0-lmsso12] [plssi12]  [encoding=pl0]
+%   \definefontsynonym[pl0-lmsso17] [plssi17]  [encoding=pl0]
+%   \definefontsynonym[pl0-lmsso8]  [plssi8]   [encoding=pl0]
+%   \definefontsynonym[pl0-lmsso9]  [plssi9]   [encoding=pl0]
+%   \definefontsynonym[pl0-lmssq8]  [plssq8]   [encoding=pl0]
+%   \definefontsynonym[pl0-lmssqbo8][plssqbi8] [encoding=pl0]
+%   \definefontsynonym[pl0-lmssqbx8][plssqb8]  [encoding=pl0]
+%   \definefontsynonym[pl0-lmssqo8] [plssqi8]  [encoding=pl0]
+%   \definefontsynonym[pl0-lmtcsc10][pltcsc10] [encoding=pl0]
+%   \definefontsynonym[pl0-lmtt10]  [pltt10]   [encoding=pl0]
+%   \definefontsynonym[pl0-lmtt12]  [pltt12]   [encoding=pl0]
+%   \definefontsynonym[pl0-lmtt8]   [pltt8]    [encoding=pl0]
+%   \definefontsynonym[pl0-lmtt9]   [pltt9]    [encoding=pl0]
+%   \definefontsynonym[pl0-lmtti10] [pltti10]  [encoding=pl0]
+%   \definefontsynonym[pl0-lmtto10] [plsltt10] [encoding=pl0]
+%   \definefontsynonym[pl0-lmvtt10] [plvtt10]  [encoding=pl0]
+%   \definefontsynonym[pl0-lmvtto10][plvtti10] [encoding=pl0]
+%
+% \stoptypescript
+
+% \starttypescript[all][modern,latin-modern,computer-modern][il2]
+%
+%   \definefontsynonym[il2-lmb10]   [csb10]    [encoding=il2]
+%   \definefontsynonym[il2-lmbo10]  [csbsl10]  [encoding=il2]
+%   \definefontsynonym[il2-lmbx10]  [csbx10]   [encoding=il2]
+%   \definefontsynonym[il2-lmbx12]  [csbx12]   [encoding=il2]
+%   \definefontsynonym[il2-lmbx5]   [csbx5]    [encoding=il2]
+%   \definefontsynonym[il2-lmbx6]   [csbx6]    [encoding=il2]
+%   \definefontsynonym[il2-lmbx7]   [csbx7]    [encoding=il2]
+%   \definefontsynonym[il2-lmbx8]   [csbx8]    [encoding=il2]
+%   \definefontsynonym[il2-lmbx9]   [csbx9]    [encoding=il2]
+%   \definefontsynonym[il2-lmbxi10] [csbxti10] [encoding=il2]
+%   \definefontsynonym[il2-lmbxo10] [csbxsl10] [encoding=il2]
+%   \definefontsynonym[il2-lmcsc10] [cscsc10]  [encoding=il2]
+%   \definefontsynonym[il2-lmcsco10][cscscls10][encoding=il2]
+%   \definefontsynonym[il2-lmr10]   [csr10]    [encoding=il2]
+%   \definefontsynonym[il2-lmr12]   [csr12]    [encoding=il2]
+%   \definefontsynonym[il2-lmr17]   [csr17]    [encoding=il2]
+%   \definefontsynonym[il2-lmr5]    [csr5]     [encoding=il2]
+%   \definefontsynonym[il2-lmr6]    [csr6]     [encoding=il2]
+%   \definefontsynonym[il2-lmr7]    [csr7]     [encoding=il2]
+%   \definefontsynonym[il2-lmr8]    [csr8]     [encoding=il2]
+%   \definefontsynonym[il2-lmr9]    [csr9]     [encoding=il2]
+%   \definefontsynonym[il2-lmri10]  [csti10]   [encoding=il2]
+%   \definefontsynonym[il2-lmri12]  [csti12]   [encoding=il2]
+%   \definefontsynonym[il2-lmri7]   [csti7]    [encoding=il2]
+%   \definefontsynonym[il2-lmri8]   [csti8]    [encoding=il2]
+%   \definefontsynonym[il2-lmri9]   [csti9]    [encoding=il2]
+%   \definefontsynonym[il2-lmro10]  [cssl10]   [encoding=il2]
+%   \definefontsynonym[il2-lmro12]  [cssl12]   [encoding=il2]
+%   \definefontsynonym[il2-lmro8]   [cssl8]    [encoding=il2]
+%   \definefontsynonym[il2-lmro9]   [cssl9]    [encoding=il2]
+%   \definefontsynonym[il2-lmss10]  [csss10]   [encoding=il2]
+%   \definefontsynonym[il2-lmss12]  [csss12]   [encoding=il2]
+%   \definefontsynonym[il2-lmss17]  [csss17]   [encoding=il2]
+%   \definefontsynonym[il2-lmss8]   [csss8]    [encoding=il2]
+%   \definefontsynonym[il2-lmss9]   [csss9]    [encoding=il2]
+%   \definefontsynonym[il2-lmssbo10][csssbi10] [encoding=il2]
+%   \definefontsynonym[il2-lmssbx10][csssbx10] [encoding=il2]
+%   \definefontsynonym[il2-lmssdc10][csssdc10] [encoding=il2]
+%   \definefontsynonym[il2-lmssdo10][csssdi10] [encoding=il2]
+%   \definefontsynonym[il2-lmsso10] [csssi10]  [encoding=il2]
+%   \definefontsynonym[il2-lmsso12] [csssi12]  [encoding=il2]
+%   \definefontsynonym[il2-lmsso17] [csssi17]  [encoding=il2]
+%   \definefontsynonym[il2-lmsso8]  [csssi8]   [encoding=il2]
+%   \definefontsynonym[il2-lmsso9]  [csssi9]   [encoding=il2]
+%   \definefontsynonym[il2-lmssq8]  [csssq8]   [encoding=il2]
+%   \definefontsynonym[il2-lmssqbo8][csssqbi8] [encoding=il2]
+%   \definefontsynonym[il2-lmssqbx8][csssqb8]  [encoding=il2]
+%   \definefontsynonym[il2-lmssqo8] [csssqi8]  [encoding=il2]
+%   \definefontsynonym[il2-lmtcsc10][cstcsc10] [encoding=il2]
+%   \definefontsynonym[il2-lmtt10]  [cstt10]   [encoding=il2]
+%   \definefontsynonym[il2-lmtt12]  [cstt12]   [encoding=il2]
+%   \definefontsynonym[il2-lmtt8]   [cstt8]    [encoding=il2]
+%   \definefontsynonym[il2-lmtt9]   [cstt9]    [encoding=il2]
+%   \definefontsynonym[il2-lmtti10] [cstti10]  [encoding=il2]
+%   \definefontsynonym[il2-lmtto10] [cssltt10] [encoding=il2]
+%   \definefontsynonym[il2-lmvtt10] [csvtt10]  [encoding=il2]
+%   \definefontsynonym[il2-lmvtto10][csvtti10] [encoding=il2]
+%
+% \stoptypescript
+
+% \starttypescript[all][modern,latin-modern,computer-modern][t5]
+%
+%   \definefontsynonym[t5-lmb10]   [vnb10]    [encoding=t5]
+%   \definefontsynonym[t5-lmbo10]  [vnbsl10]  [encoding=t5]
+%   \definefontsynonym[t5-lmbx10]  [vnbx10]   [encoding=t5]
+%   \definefontsynonym[t5-lmbx12]  [vnbx12]   [encoding=t5]
+%   \definefontsynonym[t5-lmbx5]   [vnbx5]    [encoding=t5]
+%   \definefontsynonym[t5-lmbx6]   [vnbx6]    [encoding=t5]
+%   \definefontsynonym[t5-lmbx7]   [vnbx7]    [encoding=t5]
+%   \definefontsynonym[t5-lmbx8]   [vnbx8]    [encoding=t5]
+%   \definefontsynonym[t5-lmbx9]   [vnbx9]    [encoding=t5]
+%   \definefontsynonym[t5-lmbxi10] [vnbxti10] [encoding=t5]
+%   \definefontsynonym[t5-lmbxo10] [vnbxsl10] [encoding=t5]
+%   \definefontsynonym[t5-lmcsc10] [vncsc10]  [encoding=t5]
+%   \definefontsynonym[t5-lmcsco10][vncscsl10][encoding=t5]
+%   \definefontsynonym[t5-lmr10]   [vnr10]    [encoding=t5]
+%   \definefontsynonym[t5-lmr12]   [vnr12]    [encoding=t5]
+%   \definefontsynonym[t5-lmr17]   [vnr17]    [encoding=t5]
+%   \definefontsynonym[t5-lmr5]    [vnr5]     [encoding=t5]
+%   \definefontsynonym[t5-lmr6]    [vnr6]     [encoding=t5]
+%   \definefontsynonym[t5-lmr7]    [vnr7]     [encoding=t5]
+%   \definefontsynonym[t5-lmr8]    [vnr8]     [encoding=t5]
+%   \definefontsynonym[t5-lmr9]    [vnr9]     [encoding=t5]
+%   \definefontsynonym[t5-lmri10]  [vnti10]   [encoding=t5]
+%   \definefontsynonym[t5-lmri12]  [vnti12]   [encoding=t5]
+%   \definefontsynonym[t5-lmri7]   [vnti7]    [encoding=t5]
+%   \definefontsynonym[t5-lmri8]   [vnti8]    [encoding=t5]
+%   \definefontsynonym[t5-lmri9]   [vnti9]    [encoding=t5]
+%   \definefontsynonym[t5-lmro10]  [vnsl10]   [encoding=t5]
+%   \definefontsynonym[t5-lmro12]  [vnsl12]   [encoding=t5]
+%   \definefontsynonym[t5-lmro8]   [vnsl8]    [encoding=t5]
+%   \definefontsynonym[t5-lmro9]   [vnsl9]    [encoding=t5]
+%   \definefontsynonym[t5-lmss10]  [vnss10]   [encoding=t5]
+%   \definefontsynonym[t5-lmss12]  [vnss12]   [encoding=t5]
+%   \definefontsynonym[t5-lmss17]  [vnss17]   [encoding=t5]
+%   \definefontsynonym[t5-lmss8]   [vnss8]    [encoding=t5]
+%   \definefontsynonym[t5-lmss9]   [vnss9]    [encoding=t5]
+%   \definefontsynonym[t5-lmssbo10][vnssbi10] [encoding=t5]
+%   \definefontsynonym[t5-lmssbx10][vnssbx10] [encoding=t5]
+%   \definefontsynonym[t5-lmssdc10][vnssdc10] [encoding=t5]
+%   \definefontsynonym[t5-lmssdo10][vnssdi10] [encoding=t5]
+%   \definefontsynonym[t5-lmsso10] [vnssi10]  [encoding=t5]
+%   \definefontsynonym[t5-lmsso12] [vnssi12]  [encoding=t5]
+%   \definefontsynonym[t5-lmsso17] [vnssi17]  [encoding=t5]
+%   \definefontsynonym[t5-lmsso8]  [vnssi8]   [encoding=t5]
+%   \definefontsynonym[t5-lmsso9]  [vnssi9]   [encoding=t5]
+%   \definefontsynonym[t5-lmssq8]  [vnssq8]   [encoding=t5]
+%   \definefontsynonym[t5-lmssqbo8][vnssqbi8] [encoding=t5]
+%   \definefontsynonym[t5-lmssqbx8][vnssqb8]  [encoding=t5]
+%   \definefontsynonym[t5-lmssqo8] [vnssqi8]  [encoding=t5]
+%   \definefontsynonym[t5-lmtcsc10][vntcsc10] [encoding=t5]
+%   \definefontsynonym[t5-lmtt10]  [vntt10]   [encoding=t5]
+%   \definefontsynonym[t5-lmtt12]  [vntt12]   [encoding=t5]
+%   \definefontsynonym[t5-lmtt8]   [vntt8]    [encoding=t5]
+%   \definefontsynonym[t5-lmtt9]   [vntt9]    [encoding=t5]
+%   \definefontsynonym[t5-lmtti10] [vntti10]  [encoding=t5]
+%   \definefontsynonym[t5-lmtto10] [vnsltt10] [encoding=t5]
+%   \definefontsynonym[t5-lmvtt10] [vnvtt10]  [encoding=t5]
+%   \definefontsynonym[t5-lmvtto10][vnvtti10] [encoding=t5]
+%
+% \stoptypescript
+
+% \starttypescript [cmr]
+%   \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size]
+%   \usemathcollection[default]
+% \stoptypescript
+
+% \starttypescript [aer]
+%   \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,ec]
+%   \usemathcollection[default]
+% \stoptypescript
+
+% \starttypescript [csr]
+%   \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,il2]
+%   \usemathcollection[default]
+% \stoptypescript
+
+% \starttypescript [plr]
+%   \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,pl0]
+%   \usemathcollection[default]
+% \stoptypescript
+
+% \starttypescript [vnr]
+%   \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,t5]
+%   \usemathcollection[default]
+% \stoptypescript
+
+% \starttypescript [map] [il2,csr]
+%   \loadmapfile[original-public-csr.map]
+% \stoptypescript
+
+% \starttypescript [map] [pl0,plr]
+%   \loadmapfile[original-public-plr.map]
+% \stoptypescript
+
+% \starttypescript [map] [vnr]
+%   \loadmapfile[original-public-vnr.map]
+% \stoptypescript
+
+% \starttypescript [map] [il2,csr]
+%   \loadmapfile[il2-public-lm.map]
+% \stoptypescript
+
+% \starttypescript [map] [pl0,plr]
+%   \loadmapfile[pl0-public-lm.map]
+% \stoptypescript
+
+% \starttypescript [map] [t5,vnr]
+%   \loadmapfile[t5-public-lm.map]
+% \stoptypescript
+
+% support for alternative shapes has been removed from latin modern
+%
+% \starttypescript [map] [latin-modern-var] [ec,texnansi,qx,t5,pl0,il2]
+%   \loadmapfile[\typescriptthree-var-exclusive-public-lm.map]
+% \stoptypescript
+
+% \starttypescript [map] [cmr]
+%   \loadmapfile[original-ams-cmr.map]
+%   \loadmapfile[original-ams-euler.map]
+% \stoptypescript
+% \starttypescript [map] [lm,lmr]
+%   \loadmapfile[original-public-lm.map]
+% \stoptypescript
+
+% per 20050201 we moved to latin modern for plr/csr/vnr
+%
+% \starttypescript [map] [base] [all]
+%   \loadmapfile[original-public-plr.map]
+%   \loadmapfile[original-public-csr.map]
+%   \loadmapfile[original-public-vnr.map]
+% \stoptypescript
+
+% \starttypescript [cmr]
+%   \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size]
+%   \usemathcollection[default]
+% \stoptypescript
+
+% \starttypescript [plr]
+%   \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,pl0]
+%   \usemathcollection[default]
+% \stoptypescript
+
+% \starttypescript [csr]
+%   \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,il2]
+%   \usemathcollection[default]
+% \stoptypescript
+
+% \starttypescript [aer]
+%   \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,ec]
+%   \usemathcollection[default]
+% \stoptypescript
+
+% \starttypescript [vnr]
+%   \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,t5]
+%   \usemathcollection[default]
+% \stoptypescript
+
+% \starttypescript [ant]
+%   \usetypescript [serif] [antykwa-torunska] [name,\defaultencoding]
+%   \usetypescript [serif] [default]          [size]
+%   \usetypescript [all] [antykwa-torunska] [\defaultencoding]
+% \stoptypescript
+
+% \starttypescript [ppl]
+%   \usetypescript [serif] [palatino] [name,\defaultencoding]
+%   \usetypescript [serif] [default]  [size]
+%   \usetypescript [all]   [palatino] [\defaultencoding]
+% \stoptypescript
+
+% %D With thanks to Berthold Horn from YandY for providing me
+% %D evaluation copies of the MathTimePlus fonts.
+%
+% \starttypescript [tim]
+%   \usetypescript [math] [times]   [all]
+%   \usetypescript [math] [default] [size]
+%   \usemathcollection[tim]
+%   \usetypescript [all] [times] [\defaultencoding]
+% \stoptypescript
+
+\endinput
diff --git a/tex/context/base/type-pre.tex b/tex/context/base/type-pre.tex
index 05742dd22..dd7feb443 100644
--- a/tex/context/base/type-pre.tex
+++ b/tex/context/base/type-pre.tex
@@ -14,8 +14,6 @@
 %D This file is obsolete. We now have latin modern and proper
 %D typescripts. Forget about this file.
 
-% alas, i'd love to do: \endinput
-
 %D This file defines some typescripts that simulate the pre-typescript way
 %D of defining fonts. This file will not be extended.
 
@@ -25,11 +23,6 @@
 %D Times Roman. In this module, that is loaded by default, we
 %D define all relevant alternatives.
 
-% \starttypescript [cmr]
-%   \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size]
-%   \usemathcollection[default]
-% \stoptypescript
-
 \starttypescript [cmr]
   \usetypescript[modern][default]
   \setupbodyfont[modern]
@@ -39,49 +32,32 @@
 %D onto the EC ones, so that hyphenations work well. (The proper
 %D latin modern ec variants have replaed the ae ones.)
 
-% \starttypescript [aer]
-%   \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,ec]
-%   \usemathcollection[default]
-% \stoptypescript
-
 \starttypescript [aer]
   \usetypescript[modern][ec]
   \setupbodyfont[modern]
+ %\enableregime[ec]
 \stoptypescript
 
-%D This script defines the Computer Modern Roman with iso
-%D latin 2 encoding, as needed for Czech and other languages.
-
-% \starttypescript [csr]
-%   \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,il2]
-%   \usemathcollection[default]
-% \stoptypescript
+%D This script defines the Computer Modern Roman with a pseudo kind
+%D of iso latin 2 encoding.
 
 \starttypescript [csr]
-  \usetypescript[modern][il2]
+  \usetypescript[modern][ec]
   \setupbodyfont[modern]
+  \enableregime[il2]
 \stoptypescript
 
 %D This script defines the Computer Modern Roman with a
-%D polish encoding, as needed for Czech and other languages.
-
-% \starttypescript [plr]
-%   \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,pl0]
-%   \usemathcollection[default]
-% \stoptypescript
+%D polish encoding.
 
 \starttypescript [plr]
   \usetypescript[modern][qx]
   \setupbodyfont[modern]
+  \enableregime[pl0]
 \stoptypescript
 
 %D Vietnamese.
 
-% \starttypescript [vnr]
-%   \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,t5]
-%   \usemathcollection[default]
-% \stoptypescript
-
 \starttypescript [vnr]
   \usetypescript[modern][t5]
   \setupbodyfont[modern]
@@ -165,18 +141,10 @@
 % \stoptypescript
 
 \starttypescript [lbr]
-    \usetypescript[lucida][\defaultencoding]
+  \usetypescript[lucida][\defaultencoding]
 \stoptypescript
 
-% %D With thanks to Berthold Horn from YandY for providing me
-% %D evaluation copies of the MathTimePlus fonts.
-
-% \starttypescript [tim]
-%   \usetypescript [math] [times]   [all]
-%   \usetypescript [math] [default] [size]
-%   \usemathcollection[tim]
-%   \usetypescript [all] [times] [\defaultencoding]
-% \stoptypescript
+%D Times
 
 \starttypescript [tim]
   \usetypescript [times] [\defaultencoding]
@@ -187,12 +155,6 @@
 %D and subtle one. Although primary meant for the polish
 %D language, it can be used for other languages as well.
 
-% \starttypescript [ant]
-%   \usetypescript [serif] [antykwa-torunska] [name,\defaultencoding]
-%   \usetypescript [serif] [default]          [size]
-%   \usetypescript [all] [antykwa-torunska] [\defaultencoding]
-% \stoptypescript
-
 \starttypescript [ant]
   \usetypescript [antykwa-torunska] [\defaultencoding]
   \setupbodyfont [antykwa,rm]
@@ -255,12 +217,6 @@
 
 %D This script defines the Palatino font.
 
-% \starttypescript [ppl]
-%   \usetypescript [serif] [palatino] [name,\defaultencoding]
-%   \usetypescript [serif] [default]  [size]
-%   \usetypescript [all]   [palatino] [\defaultencoding]
-% \stoptypescript
-
 \starttypescript [ppl]
   \usetypescript [palatino] [\defaultencoding]
   \setupbodyfont [palatino]
diff --git a/tex/context/base/type-syn.tex b/tex/context/base/type-syn.tex
index 16d0c0a83..3f642e4bf 100644
--- a/tex/context/base/type-syn.tex
+++ b/tex/context/base/type-syn.tex
@@ -55,6 +55,7 @@
   \definefontsynonym [SerifBoldItalic]  [ComputerModern-BoldItalic]
   \definefontsynonym [SerifBoldSlanted] [ComputerModern-BoldSlanted]
   \definefontsynonym [SerifCaps]        [ComputerModern-Caps]
+  \definefontsynonym [SerifCapsSlanted] [ComputerModern-CapsSlanted]
 \stoptypescript
 
 \starttypescript [sans] [modern,computer-modern,latin-modern] [name]
@@ -65,6 +66,7 @@
   \definefontsynonym [SansBoldItalic]   [ComputerModernSans-BoldItalic]
   \definefontsynonym [SansBoldSlanted]  [ComputerModernSans-BoldSlanted]
   \definefontsynonym [SansCaps]         [ComputerModernSans-Caps]
+  \definefontsynonym [SansCapsSlanted]  [ComputerModernSans-CapsSlanted]
 \stoptypescript
 
 \starttypescript [mono] [modern,computer-modern,latin-modern] [name]
@@ -75,6 +77,7 @@
   \definefontsynonym [MonoBoldItalic]   [ComputerModernMono-BoldItalic]
   \definefontsynonym [MonoBoldSlanted]  [ComputerModernMono-BoldSlanted]
   \definefontsynonym [MonoCaps]         [ComputerModernMono-Caps]
+  \definefontsynonym [MonoCapsSlanted]  [ComputerModernMono-CapsSlanted]
 \stoptypescript
 
 \starttypescript [math] [modern,computer-modern,latin-modern] [name]
@@ -99,13 +102,36 @@
 \stoptypescript
 
 \starttypescript [serif] [modern-vari,computer-modern-vari,latin-modern-vari] [name]
-  \definefontsynonym [Serif]            [ComputerModernMono-Variable]
-  \definefontsynonym [SerifBold]        [Serif]
-  \definefontsynonym [SerifItalic]      [Serif]
-  \definefontsynonym [SerifSlanted]     [SerifItalic]
-  \definefontsynonym [SerifBoldItalic]  [SerifItalic]
-  \definefontsynonym [SerifBoldSlanted] [SerifSlanted]
-  \definefontsynonym [SerifCaps]        [Serif]
+  \definefontsynonym [Serif]            [LMTypewriterVarWd-Regular]
+  \definefontsynonym [SerifBold]        [LMTypewriterVarWd-Oblique]
+  \definefontsynonym [SerifItalic]      [LMTypewriterVarWd-Oblique]
+  \definefontsynonym [SerifSlanted]     [LMTypewriterVarWd-Dark]
+  \definefontsynonym [SerifBoldItalic]  [LMTypewriterVarWd-DarkOblique]
+  \definefontsynonym [SerifBoldSlanted] [LMTypewriterVarWd-DarkOblique]
+  \definefontsynonym [SerifCaps]        [LMTypewriterVarWd-Regular]
+  \definefontsynonym [SerifCapsSlanted] [LMTypewriterVarWd-Oblique]
+\stoptypescript
+
+\starttypescript [mono] [modern-cond,computer-modern-cond,latin-modern-cond,modern-lightcond,computer-modern-lightcond,latin-modern-lightcond] [name]
+  \definefontsynonym [Mono]             [LMTypewriter-LightCondensed]
+  \definefontsynonym [MonoBold]         [LMTypewriter-LightCondensed]
+  \definefontsynonym [MonoItalic]       [LMTypewriter-LightCondensedOblique]
+  \definefontsynonym [MonoSlanted]      [LMTypewriter-LightCondensedOblique]
+  \definefontsynonym [MonoBoldItalic]   [LMTypewriter-LightCondensed]
+  \definefontsynonym [MonoBoldSlanted]  [LMTypewriter-LightCondensed]
+  \definefontsynonym [MonoCaps]         [LMTypewriter-LightCondensed]
+  \definefontsynonym [MonoCapsSlanted]  [LMTypewriter-LightCondensed]
+\stoptypescript
+
+\starttypescript [mono] [modern-light,computer-modern-light,latin-modern-light] [name]
+  \definefontsynonym [Mono]             [LMTypewriter-Light]
+  \definefontsynonym [MonoBold]         [LMTypewriter-Light]
+  \definefontsynonym [MonoItalic]       [LMTypewriter-LightOblique]
+  \definefontsynonym [MonoSlanted]      [LMTypewriter-LightOblique]
+  \definefontsynonym [MonoBoldItalic]   [LMTypewriter-Light]
+  \definefontsynonym [MonoBoldSlanted]  [LMTypewriter-Light]
+  \definefontsynonym [MonoCaps]         [LMTypewriter-Light]
+  \definefontsynonym [MonoCapsSlanted]  [LMTypewriter-Light]
 \stoptypescript
 
 % This will change some day.
@@ -134,21 +160,21 @@
 
 \starttypescript [math] [euler] [name]
   \definefontsynonym [MathRoman]     [Euler-Roman]      % mr
-  \definefontsynonym [MathItalic]    [Euler-Fraktur]      % mi
+  \definefontsynonym [MathItalic]    [Euler-Fraktur]    % mi
   \definefontsynonym [MathExtension] [Euler-Extension]  % ex
   \definefontsynonym [MathSymbol]    [Euler-Symbol]     % sy
 \stoptypescript
 
 \starttypescript [boldmath] [euler] [name]
   \definefontsynonym [MathRoman]     [Euler-Roman-Bold]     % mr
-  \definefontsynonym [MathItalic]    [Euler-Fraktur-Bold]     % mi
+  \definefontsynonym [MathItalic]    [Euler-Fraktur-Bold]   % mi
   \definefontsynonym [MathExtension] [Euler-Extension]      % ex
   \definefontsynonym [MathSymbol]    [Euler-Symbol-Bold]    % sy
 \stoptypescript
 
 \starttypescript [bfmath] [euler] [name]
   \definefontsynonym [MathRomanBold]  [Euler-Roman-Bold]     % mr
-  \definefontsynonym [MathItalicBold] [Euler-Fraktur-Bold]     % mi
+  \definefontsynonym [MathItalicBold] [Euler-Fraktur-Bold]   % mi
   \definefontsynonym [MathExtension]  [Euler-Extension]      % ex
   \definefontsynonym [MathSymbolBold] [Euler-Symbol-Bold]    % sy
 \stoptypescript
@@ -176,16 +202,6 @@
 
 % Antykwa Torunska :
 
-% \starttypescript [serif] [antykwa-torunska] [name]
-%   \definefontsynonym [Serif]            [AntykwaTorunska-Regular]
-%   \definefontsynonym [SerifBold]        [AntykwaTorunska-Bold]
-%   \definefontsynonym [SerifItalic]      [AntykwaTorunska-Italic]
-%   \definefontsynonym [SerifSlanted]     [AntykwaTorunska-Italic]
-%   \definefontsynonym [SerifBoldItalic]  [AntykwaTorunska-Bold]
-%   \definefontsynonym [SerifBoldSlanted] [AntykwaTorunska-Bold]
-%   \definefontsynonym [SerifCaps]        [AntykwaTorunska-Regular]
-% \stoptypescript
-
 \starttypescript [serif] [antykwa-torunska] [name]
   \definefontsynonym [Serif]            [AntykwaTorunska-Regular]
   \definefontsynonym [SerifBold]        [AntykwaTorunska-Bold]
@@ -435,6 +451,7 @@
 % Iwona
 
 \starttypescript [sans] [iwona-light] [name]
+  \setups[font:fallback:sans]
   \definefontsynonym [Sans]           [Iwona-Light]        [encoding=\typescriptthree]
   \definefontsynonym [SansItalic]     [Iwona-LightItalic]  [encoding=\typescriptthree]
   \definefontsynonym [SansBold]       [Iwona-Medium]       [encoding=\typescriptthree]
@@ -442,6 +459,7 @@
 \stoptypescript
 
 \starttypescript [sans] [iwona] [name]
+  \setups[font:fallback:sans]
   \definefontsynonym [Sans]           [Iwona-Regular]       [encoding=\typescriptthree]
   \definefontsynonym [SansItalic]     [Iwona-RegularItalic] [encoding=\typescriptthree]
   \definefontsynonym [SansBold]       [Iwona-Bold]          [encoding=\typescriptthree]
@@ -449,6 +467,7 @@
 \stoptypescript
 
 \starttypescript [sans] [iwona-medium] [name]
+  \setups[font:fallback:sans]
   \definefontsynonym [Sans]           [Iwona-Medium]       [encoding=\typescriptthree]
   \definefontsynonym [SansItalic]     [Iwona-MediumItalic] [encoding=\typescriptthree]
   \definefontsynonym [SansBold]       [Iwona-Heavy]        [encoding=\typescriptthree]
@@ -479,6 +498,7 @@
 % Kurier
 
 \starttypescript [sans] [kurier-light] [name]
+  \setups[font:fallback:sans]
   \definefontsynonym [Sans]           [Kurier-Light]        [encoding=\typescriptthree]
   \definefontsynonym [SansItalic]     [Kurier-LightItalic]  [encoding=\typescriptthree]
   \definefontsynonym [SansBold]       [Kurier-Medium]       [encoding=\typescriptthree]
@@ -486,6 +506,7 @@
 \stoptypescript
 
 \starttypescript [sans] [kurier] [name]
+  \setups[font:fallback:sans]
   \definefontsynonym [Sans]           [Kurier-Regular]       [encoding=\typescriptthree]
   \definefontsynonym [SansItalic]     [Kurier-RegularItalic] [encoding=\typescriptthree]
   \definefontsynonym [SansBold]       [Kurier-Bold]          [encoding=\typescriptthree]
@@ -493,6 +514,7 @@
 \stoptypescript
 
 \starttypescript [sans] [kurier-medium] [name]
+  \setups[font:fallback:sans]
   \definefontsynonym [Sans]           [Kurier-Medium]       [encoding=\typescriptthree]
   \definefontsynonym [SansItalic]     [Kurier-MediumItalic] [encoding=\typescriptthree]
   \definefontsynonym [SansBold]       [Kurier-Heavy]        [encoding=\typescriptthree]
diff --git a/tex/context/base/unic-001.tex b/tex/context/base/unic-001.tex
index 0c53fbcd6..6c6af6f4c 100644
--- a/tex/context/base/unic-001.tex
+++ b/tex/context/base/unic-001.tex
@@ -26,6 +26,12 @@
 %D But we can speed things up, watch how we avoid zero and \TEX's
 %D automatically added \type {\relax}.
 
+% remark:
+% - gcommaaccent, kcomaaccent, lcomaaccent, ncomaaccent, rcomaaccent
+% bear the name "WITH CEDILLA" in Unicode
+% - scomaaccent and tcomaaccent point to the "WITH CEDILLA" in the
+% Adobe Glyph List
+
 \startunicodevector 1
   \expandafter\strippedcsname
   \ifcase\numexpr#1\relax
@@ -63,8 +69,8 @@
     \gbreve        \or
     \Gdotaccent    \or
     \gdotaccent    \or
-    \Gcedilla      \or % \Gcedilla \or
-    \gcedilla      \or % \gcedilla \or
+    \Gcommaaccent  \or % WITH CEDILLA
+    \gcommaaccent  \or % WITH CEDILLA
     \Hcircumflex   \or
     \hcircumflex   \or
     \Hstroke       \or
@@ -83,13 +89,13 @@
     \ijligature    \or
     \Jcircumflex   \or
     \jcircumflex   \or
-    \Kcedilla      \or
-    \kcedilla      \or
+    \Kcommaaccent  \or % WITH CEDILLA
+    \kcommaaccent  \or % WITH CEDILLA
     \kkra          \or % \kkra \or
     \Lacute        \or
     \lacute        \or
-    \Lcedilla      \or
-    \lcedilla      \or
+    \Lcommaaccent  \or % WITH CEDILLA
+    \lcommaaccent  \or % WITH CEDILLA
     \Lcaron        \or
     \lcaron        \or
     \Ldotmiddle    \or % \Ldotmiddle \or
@@ -98,8 +104,8 @@
     \lstroke       \or
     \Nacute        \or
     \nacute        \or
-    \Ncedilla      \or
-    \ncedilla      \or
+    \Ncommaaccent  \or % WITH CEDILLA
+    \ncommaaccent  \or % WITH CEDILLA
     \Ncaron        \or
     \ncaron        \or
     \napostrophe   \or
@@ -115,8 +121,8 @@
     \oeligature    \or
     \Racute        \or
     \racute        \or
-    \Rcedilla      \or
-    \rcedilla      \or
+    \Rcommaaccent  \or % WITH CEDILLA
+    \rcommaaccent  \or % WITH CEDILLA
     \Rcaron        \or
     \rcaron        \or
     \Sacute        \or
diff --git a/tex/context/base/unic-030.tex b/tex/context/base/unic-030.tex
index 387ddeb4e..ef42c807a 100644
--- a/tex/context/base/unic-030.tex
+++ b/tex/context/base/unic-030.tex
@@ -15,7 +15,7 @@
 
 \startunicodevector 30
   \expandafter\strippedcsname
-  \ifcase\numexpr#1-158\relax
+  \ifcase\numexpr#1-160\relax
     \Adotbelow            \or
     \adotbelow            \or
     \Ahook                \or
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index c09234e18..e0e1423d9 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.08.31">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2005.10.27">
 
   <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 ebd9e6708..831fd37c1 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.08.31">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2005.10.27">
 
   <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 b2d780965..d913ebe67 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.08.31">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2005.10.27">
 
   <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 c3ffeeda0..63f45e6dc 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.08.31">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2005.10.27">
 
   <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 8342f0530..ee84ea394 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.08.31">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2005.10.27">
 
   <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 c9de476a0..5e86b26db 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.08.31">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2005.10.27">
 
   <cd:variables>
     <cd:variable name="one" value="unu"/>
diff --git a/tex/context/user/cont-sys.rme b/tex/context/user/cont-sys.rme
index ee54a99b7..a74614bd1 100644
--- a/tex/context/user/cont-sys.rme
+++ b/tex/context/user/cont-sys.rme
@@ -109,8 +109,8 @@
   \loadmapfile[ec-public-lm.map]
   \loadmapfile[qx-public-lm.map]
   \loadmapfile[t5-public-lm.map]
-  \loadmapfile[pl0-public-lm.map]
-  \loadmapfile[il2-public-lm.map]
+  %loadmapfile[pl0-public-lm.map]
+  %loadmapfile[il2-public-lm.map]
 
 \fi
author	Hans Hagen <pragma@wxs.nl>	2005-10-27 00:00:00 +0200
committer	Hans Hagen <pragma@wxs.nl>	2005-10-27 00:00:00 +0200
commit	28ba5960fc4486f4e667ee0cbd802335483e1c99 (patch)
tree	364430fa36f4d3b1b254a10874b4ed369469d4c9 /tex
parent	a35805505d72f60e25a5d9b96dcc5c0a83cc1ed0 (diff)
download	context-28ba5960fc4486f4e667ee0cbd802335483e1c99.tar.gz