beta 2010.05.07 14:21

39 files changed, 1462 insertions, 903 deletions

diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index cbe5296fa..93f757f67 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2010.05.02 16:43}
+\newcontextversion{2010.05.07 14:21}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index 8f682741f..00eabe64c 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2010.05.02 16:43}
+\edef\contextversion{2010.05.07 14:21}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/data-lua.lua b/tex/context/base/data-lua.lua
index 57a434d1d..988133fbe 100644
--- a/tex/context/base/data-lua.lua
+++ b/tex/context/base/data-lua.lua
@@ -23,7 +23,7 @@ local _path_, libpaths, _cpath_, clibpaths
 function package.libpaths()
     if not _path_ or package.path ~= _path_ then
         _path_ = package.path
-        libpaths = file.split_path(_path_)
+        libpaths = file.split_path(_path_,";")
     end
     return libpaths
 end
@@ -31,7 +31,7 @@ end
 function package.clibpaths()
     if not _cpath_ or package.cpath ~= _cpath_ then
         _cpath_ = package.cpath
-        clibpaths = file.split_path(_cpath_)
+        clibpaths = file.split_path(_cpath_,";")
     end
     return clibpaths
 end
diff --git a/tex/context/base/m-pstricks.mkii b/tex/context/base/m-pstricks.mkii
index 384812ecc..3ada9e07e 100644
--- a/tex/context/base/m-pstricks.mkii
+++ b/tex/context/base/m-pstricks.mkii
@@ -11,6 +11,10 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+% pstricks is not supported in context mkii (it's no problem doing that
+% but as we also need to support latex it would become quite messy so for
+% context we use metapost and for latex pstricks)
+
 %M \usemodule[pstric]
 
 \letvalue{@unused}\plussixteen
diff --git a/tex/context/base/scrn-int.mkii b/tex/context/base/scrn-int.mkii
index 9f1be68e1..cf55f864a 100644
--- a/tex/context/base/scrn-int.mkii
+++ b/tex/context/base/scrn-int.mkii
@@ -269,18 +269,30 @@
        \else
          \let\openbookmarklist\empty
        \fi
-       \global\let\bookmarklevellist\empty
-       \def\bookmarklevelcount{0}%
-       \doprocessbookmarks[#1]\dogetbookmarkelement
-       \dolistelement{}{}{}{}{}{}% needed to finish the first pass
-       \doprocessbookmarks[#1]\doputbookmarkelement
-       \flushbookmark
+       \xdef\doplacebookmarksindeed{\noexpand\dodoplacebookmarksindeed[#1][\openbookmarklist]}
        \egroup
      \else
        \expanded{\placebookmarks\@EA[\getvalue{\??ih\v!content\c!list}]}%
      \fi
    \fi}
 
+\def\dodoplacebookmarksindeed[#1][#2]%
+  {\bgroup
+   \edef\openbookmarklist{#2}%
+   \global\let\bookmarklevellist\empty
+   \def\bookmarklevelcount{0}%
+   \doprocessbookmarks[#1]\dogetbookmarkelement
+   \dolistelement{}{}{}{}{}{}% needed to finish the first pass
+   \doprocessbookmarks[#1]\doputbookmarkelement
+   \flushbookmark
+   \egroup}
+
+\let\doplacebookmarksindeed\relax
+
+\prependtoks
+    \doplacebookmarksindeed % new, now postponed so that halfway defined commands work out ok
+\to \everystoptext
+
 \def\doprocessbookmarks[#1]#2%
   {\let\dolistelement#2\relax
    \scratchcounter\zerocount
diff --git a/tex/context/base/spac-ver.lua b/tex/context/base/spac-ver.lua
index ec3d29849..b3bfcc00c 100644
--- a/tex/context/base/spac-ver.lua
+++ b/tex/context/base/spac-ver.lua
@@ -167,9 +167,16 @@ local function snap_hlist(current,method,height,depth) -- method.strut is defaul
     if method["local"] then
         -- snapping is done immediately here
         snapht, snapdp = texdimen.bodyfontstrutheight, texdimen.bodyfontstrutdepth
+    elseif method["global"] then
+        snapht, snapdp = texdimen.globalbodyfontstrutheight, texdimen.globalbodyfontstrutdepth
     else
+        -- maybe autolocal
         -- snapping might happen later in the otr
         snapht, snapdp = texdimen.globalbodyfontstrutheight, texdimen.globalbodyfontstrutdepth
+        local lsnapht, lsnapdp = texdimen.bodyfontstrutheight, texdimen.bodyfontstrutdepth
+        if snapht ~= lsnapht and snapdp ~= lsnapdp then
+            snapht, snapdp = lsnapht, lsnapdp
+        end
     end
     local h, d = height or current.height, depth or current.depth
     local hr, dr, ch, cd = method.hfraction or 1, method.dfraction or 1, h, d
@@ -573,7 +580,7 @@ function vspacing.snap_box(n,how)
             local s = has_attribute(list,snap_method)
             if s == 0 then
                 if trace_vsnapping then
-                    logs.report("snapper", "hlist not snapped, already done")
+                --  logs.report("snapper", "hlist not snapped, already done")
                 end
             else
                 local h, d, ch, cd, lines = snap_hlist(box,sv,box.height,box.depth)
@@ -648,6 +655,7 @@ local function collapser(head,where,what,trace,snap) -- maybe also pass tail
     while current do
         local id, subtype = current.id, current.subtype
         if id == hlist or id == vlist then
+-- needs checking, why so many calls
             if snap then
                 local s = has_attribute(current,snap_method)
                 if not s then
@@ -656,7 +664,7 @@ local function collapser(head,where,what,trace,snap) -- maybe also pass tail
                 --  end
                 elseif s == 0 then
                     if trace_vsnapping then
-                        logs.report("snapper", "hlist not snapped, already done")
+                    --  logs.report("snapper", "hlist not snapped, already done")
                     end
                 else
                     local sv = snapmethods[s]
diff --git a/tex/context/base/type-buy.tex b/tex/context/base/type-buy.mkii
index e34f9f1d2..56fc92e62 100644
--- a/tex/context/base/type-buy.tex
+++ b/tex/context/base/type-buy.mkii
@@ -17,202 +17,6 @@
 
 \starttypescriptcollection[commercial fonts]
 
-% Lucida Bright : Biggelow and Holmes
-
-% \starttypescript [serif] [lucida] [name]
-%     \definefontsynonym [Serif]            [LucidaBright]
-%     \definefontsynonym [SerifBold]        [LucidaBright-Demi]
-%     \definefontsynonym [SerifItalic]      [LucidaBright-Italic]
-%     \definefontsynonym [SerifSlanted]     [LucidaBright-Oblique]
-%     \definefontsynonym [SerifBoldItalic]  [LucidaBright-DemiItalic]
-%     \definefontsynonym [SerifBoldSlanted] [LucidaBright-DemiItalic]
-%     \definefontsynonym [SerifCaps]        [LucidaBrightSmallcaps]
-%     \definefontsynonym [SerifBoldCaps]    [LucidaBrightSmallcaps-Demi]
-% \stoptypescript
-
-% \starttypescript [sans] [lucida] [name]
-%     \definefontsynonym [Sans]            [LucidaSans]
-%     \definefontsynonym [SansBold]        [LucidaSans-Demi]
-%     \definefontsynonym [SansItalic]      [LucidaSans-Italic]
-%     \definefontsynonym [SansSlanted]     [LucidaSans-Italic]
-%     \definefontsynonym [SansBoldItalic]  [LucidaSans-DemiItalic]
-%     \definefontsynonym [SansBoldSlanted] [LucidaSans-DemiItalic]
-%     \definefontsynonym [SansCaps]        [LucidaSans]
-% \stoptypescript
-
-% \starttypescript [mono] [lucida] [name]
-%     \definefontsynonym [Mono]            [LucidaSans-Typewriter]
-%     \definefontsynonym [MonoBold]        [LucidaSans-TypewriterBold]
-%     \definefontsynonym [MonoItalic]      [LucidaSans-TypewriterOblique]
-%     \definefontsynonym [MonoSlanted]     [LucidaSans-TypewriterOblique]
-%     \definefontsynonym [MonoBoldItalic]  [LucidaSans-TypewriterBoldOblique]
-%     \definefontsynonym [MonoBoldSlanted] [LucidaSans-TypewriterBoldOblique]
-%     \definefontsynonym [MonoCaps]        [LucidaSans-Typewriter]
-% \stoptypescript
-
-% \starttypescript [math] [lucida] [name]
-%     \definefontsynonym [MathRoman]     [LucidaBright]
-%     \definefontsynonym [MathExtension] [LucidaNewMath-Extension]
-%     \definefontsynonym [MathItalic]    [LucidaNewMath-AltItalic]
-%     \definefontsynonym [MathSymbol]    [LucidaNewMath-Symbol]
-%     \definefontsynonym [MathAlpha]     [LucidaNewMath-Arrows]
-%     \definefontsynonym [MathBeta]      [LucidaNewMath-Roman]
-% \stoptypescript
-
-% \starttypescript [math] [lucida] [name]
-%     \definefontsynonym [OldStyle]     [MathItalic]
-%     \definefontsynonym [Fraktur]      [eufm10]
-%     \definefontsynonym [Blackboard]   [MathAlpha]
-%     \definefontsynonym [Gothic]       [eufm10]
-%     \definefontsynonym [Calligraphic] [MathSymbol] % math caligraphic !
-% \stoptypescript
-
-% \starttypescript [boldmath] [lucida] [name]
-%     \definefontsynonym [MathRoman]     [LucidaBright-Demi]
-%     \definefontsynonym [MathExtension] [LucidaNewMath-Extension]
-%     \definefontsynonym [MathItalic]    [LucidaNewMath-AltDemiItalic]
-%     \definefontsynonym [MathSymbol]    [LucidaNewMath-Symbol-Demi]
-%     \definefontsynonym [MathAlpha]     [LucidaNewMath-Arrows-Demi]
-%     \definefontsynonym [MathBeta]      [LucidaNewMath-Demi]
-% \stoptypescript
-
-% \starttypescript [bfmath] [lucida] [name]
-%     \definefontsynonym [MathRomanBold]     [LucidaNewMath-Demi]
-%     \definefontsynonym [MathExtensionBold] [LucidaNewMath-Extension]
-%     \definefontsynonym [MathItalicBold]    [LucidaNewMath-AltDemiItalic]
-%     \definefontsynonym [MathSymbolBold]    [LucidaNewMath-Symbol-Demi]
-%     \definefontsynonym [MathAlphaBold]     [LucidaNewMath-Arrows-Demi]
-%     \definefontsynonym [MathBetaBold]      [LucidaNewMath-Demi]
-% \stoptypescript
-
-% \starttypescript [handwriting] [lucida] [name]
-%     \definefontsynonym [Handwriting] [LucidaHandwriting-Italic]
-% \stoptypescript
-
-% \starttypescript [calligraphy] [lucida] [name]
-%     \definefontsynonym [Calligraphy] [LucidaCalligraphy-Italic]
-% \stoptypescript
-
-% \starttypescript [serif] [lucida] [texnansi,ec,8r]
-%     \definefontsynonym [LucidaBright]               [\typescriptthree-lbr]   [encoding=\typescriptthree]
-%     \definefontsynonym [LucidaBright-Demi]          [\typescriptthree-lbd]   [encoding=\typescriptthree]
-%     \definefontsynonym [LucidaBright-DemiItalic]    [\typescriptthree-lbdi]  [encoding=\typescriptthree]
-%     \definefontsynonym [LucidaBright-Italic]        [\typescriptthree-lbi]   [encoding=\typescriptthree]
-%     \definefontsynonym [LucidaBrightSmallcaps]      [\typescriptthree-lbrsc] [encoding=\typescriptthree]
-%     \definefontsynonym [LucidaBrightSmallcaps-Demi] [\typescriptthree-lbdsc] [encoding=\typescriptthree]
-%     \definefontsynonym [LucidaBright-Oblique]       [\typescriptthree-lbsl]  [encoding=\typescriptthree]
-% \stoptypescript
-
-% \starttypescript [sans] [lucida] [texnansi,ec,8r]
-%     \definefontsynonym [LucidaSans]            [\typescriptthree-lsr]  [encoding=\typescriptthree]
-%     \definefontsynonym [LucidaSans-Demi]       [\typescriptthree-lsd]  [encoding=\typescriptthree]
-%     \definefontsynonym [LucidaSans-DemiItalic] [\typescriptthree-lsdi] [encoding=\typescriptthree]
-%     \definefontsynonym [LucidaSans-Italic]     [\typescriptthree-lsi]  [encoding=\typescriptthree]
-%     \definefontsynonym [LucidaSans-Bold]       [\typescriptthree-lsb]  [encoding=\typescriptthree]
-%     \definefontsynonym [LucidaSans-BoldItalic] [\typescriptthree-lsbi] [encoding=\typescriptthree]
-% \stoptypescript
-
-% \starttypescript [mono] [lucida] [texnansi,ec,8r]
-%     \definefontsynonym [LucidaSans-Typewriter]            [\typescriptthree-lstr]  [encoding=\typescriptthree]
-%     \definefontsynonym [LucidaSans-TypewriterBold]        [\typescriptthree-lstb]  [encoding=\typescriptthree]
-%     \definefontsynonym [LucidaSans-TypewriterBoldOblique] [\typescriptthree-lstbo] [encoding=\typescriptthree]
-%     \definefontsynonym [LucidaSans-TypewriterOblique]     [\typescriptthree-lsto]  [encoding=\typescriptthree]
-%     \loadmapfile [\typescriptthree-bh-lucida.map]
-%     \fakecontrolspace
-% \stoptypescript
-
-% \starttypescript [math] [lucida] [texnansi,ec,8r]
-%     \definefontsynonym [LucidaBright]                [\typescriptthree-lbr]   [encoding=\typescriptthree]
-%     \definefontsynonym [LucidaNewMath-AltItalic]     [lbmo]
-%     \definefontsynonym [LucidaNewMath-Arrows]        [lbma]
-%     \definefontsynonym [LucidaNewMath-Extension]     [lbme]
-%     \definefontsynonym [LucidaNewMath-Roman]         [lbmr]
-%     \definefontsynonym [LucidaNewMath-Italic]        [lbmi]
-%     \definefontsynonym [LucidaNewMath-Symbol]        [lbms]
-%     \definefontsynonym [LucidaBlackletter]           [lbl]
-%     \loadmapfile [\typescriptthree-bh-lucida.map]
-% \stoptypescript
-
-% \starttypescript [boldmath,bfmath] [lucida] [texnansi,ec,8r]
-%     \definefontsynonym [LucidaNewMath-AltDemiItalic] [lbmdo]
-%     \definefontsynonym [LucidaNewMath-Arrows-Demi]   [lbmad]
-%     \definefontsynonym [LucidaNewMath-Extension]     [lbme]
-%     \definefontsynonym [LucidaNewMath-Demi]          [lbmd]
-%     \definefontsynonym [LucidaNewMath-DemiItalic]    [lbmdi]
-%     \definefontsynonym [LucidaNewMath-Symbol-Demi]   [lbmsd]
-%     \loadmapfile [\typescriptthree-bh-lucida.map]
-% \stoptypescript
-
-% \starttypescript [calligraphy] [lucida] [texnansi,ec,8r]
-%     \definefontsynonym [LucidaCalligraphy-Italic] [\typescriptthree-lbc] [encoding=\typescriptthree]
-%     \loadmapfile [\typescriptthree-bh-lucida.map]
-% \stoptypescript
-
-% \starttypescript [casual] [lucida] [texnansi,ec,8r]
-%     \definefontsynonym [LucidaCasual]        [\typescriptthree-lbkr] [encoding=\typescriptthree]
-%     \definefontsynonym [LucidaCasual-Italic] [\typescriptthree-lbki] [encoding=\typescriptthree]
-%     \loadmapfile [\typescriptthree-bh-lucida.map]
-% \stoptypescript
-
-% \starttypescript [handwriting] [lucida] [texnansi,ec,8r]
-%     \definefontsynonym [LucidaHandwriting-Italic] [\typescriptthree-lbh] [encoding=\typescriptthree]
-%     \loadmapfile [\typescriptthree-bh-lucida.map]
-% \stoptypescript
-
-% \starttypescript [fax] [lucida] [texnansi,ec,8r]
-%     \definefontsynonym [LucidaFax]            [\typescriptthree-lfr]  [encoding=\typescriptthree]
-%     \definefontsynonym [LucidaFax-Demi]       [\typescriptthree-lfd]  [encoding=\typescriptthree]
-%     \definefontsynonym [LucidaFax-DemiItalic] [\typescriptthree-lfdi] [encoding=\typescriptthree]
-%     \definefontsynonym [LucidaFax-Italic]     [\typescriptthree-lfi]  [encoding=\typescriptthree]
-%     \loadmapfile [\typescriptthree-bh-lucida.map]
-% \stoptypescript
-
-% \starttypescript [lucida,lucidabfm,lucidaboldmath] [texnansi,ec,8r,uc]
-%     \definetypeface [lucida] [rm] [serif]       [lucida] [default] [encoding=\typescripttwo]
-%     \definetypeface [lucida] [ss] [sans]        [lucida] [default] [encoding=\typescripttwo]
-%     \definetypeface [lucida] [tt] [mono]        [lucida] [default] [encoding=\typescripttwo]
-%     \definetypeface [lucida] [hw] [handwriting] [lucida] [default] [encoding=\typescripttwo]
-%     \definetypeface [lucida] [cg] [calligraphy] [lucida] [default] [encoding=\typescripttwo]
-%     \loadmapfile [\typescripttwo-bh-lucida.map]
-% \stoptypescript
-
-% \starttypescript [lucida] [texnansi,ec,8r]
-%     \definetypeface [lucida]         [mm] [math] [lucida] [default] [encoding=\typescripttwo]
-% \stoptypescript
-
-% \starttypescript [lucidabfm] [texnansi,ec,8r]
-%     \definetypeface [lucida]         [mm] [bfmath] [lucida] [default] [encoding=\typescripttwo]
-% \stoptypescript
-
-% \starttypescript [lucidaboldmath] [texnansi,ec,8r]
-%     \definetypeface [lucida]         [mm] [boldmath] [lucida] [default] [encoding=\typescripttwo]
-% \stoptypescript
-
-% \starttypescript [lucidabfm] [texnansi,ec,8r,uc]
-%     \definetypeface [lucidabfm] [rm] [serif]       [lucida] [default] [encoding=\typescripttwo]
-%     \definetypeface [lucidabfm] [ss] [sans]        [lucida] [default] [encoding=\typescripttwo]
-%     \definetypeface [lucidabfm] [tt] [mono]        [lucida] [default] [encoding=\typescripttwo]
-%     \definetypeface [lucidabfm] [hw] [handwriting] [lucida] [default] [encoding=\typescripttwo]
-%     \definetypeface [lucidabfm] [cg] [calligraphy] [lucida] [default] [encoding=\typescripttwo]
-%     \definetypeface [lucidabfm] [mm] [bfmath] [lucida] [default] [encoding=\typescripttwo]
-%     \loadmapfile [\typescripttwo-bh-lucida.map]
-% \stoptypescript
-
-% \starttypescript [lucidaboldmath] [texnansi,ec,8r,uc]
-%     \definetypeface [lucidaboldmath] [rm] [serif]       [lucida] [default] [encoding=\typescripttwo]
-%     \definetypeface [lucidaboldmath] [ss] [sans]        [lucida] [default] [encoding=\typescripttwo]
-%     \definetypeface [lucidaboldmath] [tt] [mono]        [lucida] [default] [encoding=\typescripttwo]
-%     \definetypeface [lucidaboldmath] [hw] [handwriting] [lucida] [default] [encoding=\typescripttwo]
-%     \definetypeface [lucidaboldmath] [cg] [calligraphy] [lucida] [default] [encoding=\typescripttwo]
-%     \definetypeface [lucidaboldmath] [mm] [boldmath]    [lucida] [default] [encoding=\typescripttwo]
-%     \loadmapfile [\typescripttwo-bh-lucida.map]
-% \stoptypescript
-
-% \starttypescript [lucida,lucidabfm,lucidaboldmath] [texnansi,ec,8r]
-%     \usemathcollection[lbr]
-%     \quittypescriptscanning % last in the row
-% \stoptypescript
-
 % Informal : Vulis
 
 \starttypescript [casual] [informal] [name]
diff --git a/tex/context/base/type-buy.mkiv b/tex/context/base/type-buy.mkiv
new file mode 100644
index 000000000..36ca43ea8
--- /dev/null
+++ b/tex/context/base/type-buy.mkiv
@@ -0,0 +1,80 @@
+%D \module
+%D   [       file=type-buy,
+%D        version=2003.07.08, % 2001.04.12,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=A Few Commercial Fonts,
+%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.
+
+\starttypescriptcollection[commercial fonts]
+
+% Informal : Vulis
+
+\starttypescript [casual] [informal] [name]
+    \definefontsynonym [Serif]            [Informal-Regular]
+    \definefontsynonym [SerifBold]        [Informal-Bold]
+    \definefontsynonym [SerifSlanted]     [Informal-Oblique]
+    \definefontsynonym [SerifItalic]      [Informal-Oblique]
+    \definefontsynonym [SerifBoldSlanted] [Informal-BoldOblique]
+    \definefontsynonym [SerifBoldItalic]  [Informal-BoldOblique]
+    \definefontsynonym [SerifCaps]        [Informal-Regular]
+\stoptypescript
+
+\starttypescript [math] [informal] [name]
+    \definefontsynonym [MathRoman]     [Informal-Regular]
+    \definefontsynonym [MathExtension] [Informal-MathExtendedSymbols]
+    \definefontsynonym [MathItalic]    [Informal-MathItalics]
+    \definefontsynonym [MathSymbol]    [Informal-MathSymbols]
+\stoptypescript
+
+\starttypescript [casual] [informal] [default]
+    \definefontsynonym [Informal-Regular]     [ifrm10cm]
+    \definefontsynonym [Informal-Bold]        [ifrb10cm]
+    \definefontsynonym [Informal-Oblique]     [ifro10cm]
+    \definefontsynonym [Informal-BoldOblique] [ifbo10cm]
+    \loadmapfile[original-micropress-informal.map]
+\stoptypescript
+
+\starttypescript [math] [informal] [default]
+    \definefontsynonym [Informal-Regular]             [ifrm10cm]
+    \definefontsynonym [Informal-MathExtendedSymbols] [ifex10]
+    \definefontsynonym [Informal-MathItalics]         [ifmi10]
+    \definefontsynonym [Informal-MathSymbols]         [ifsy10]
+    \loadmapfile[original-micropress-informal.map]
+\stoptypescript
+
+% Sabon
+
+\starttypescript [serif] [sabon] [name]
+
+    \definefontsynonym [Serif]            [SabonMT]
+    \definefontsynonym [SerifItalic]      [SabonMT-Italic]
+    \definefontsynonym [SerifSlanted]     [SabonMT-Italic]
+    \definefontsynonym [SerifBold]        [SabonMT-SemiBold]
+    \definefontsynonym [SerifBoldItalic]  [SabonMT-SemiBoldItalic]
+    \definefontsynonym [SerifBoldSlanted] [SabonMT-SemiBoldItalic]
+    \definefontsynonym [SerifCaps]        [SabonMT-RegularSC]
+
+    \definefontsynonym[SabonMT]                  [sab_____]
+    \definefontsynonym[SabonMT-Italic]           [sabi____]
+    \definefontsynonym[SabonMT-ItalicOsF]        [saboi___]
+    \definefontsynonym[SabonMT-SemiBoldOsF]      [sabos___]
+    \definefontsynonym[SabonMT-SemiBold]         [sabs____]
+    \definefontsynonym[SabonMT-RegularSC]        [sabsc___]
+    \definefontsynonym[SabonMT-SemiBoldItalic]   [sabsi___]
+    \definefontsynonym[SabonMT-SemiBoldItalicOsF][sasio___]
+\stoptypescript
+
+% \definetypeface[sabon][rm][serif][sabon][default]
+% \setupbodyfont[sabon]
+% \starttext
+%     \input tufte
+% \stoptext
+
+\stoptypescriptcollection
+
diff --git a/tex/context/base/type-cbg.tex b/tex/context/base/type-cbg.mkii
index 93cfa077e..93cfa077e 100644
--- a/tex/context/base/type-cbg.tex
+++ b/tex/context/base/type-cbg.mkii
diff --git a/tex/context/base/type-cow.tex b/tex/context/base/type-cow.mkii
index 507386443..507386443 100644
--- a/tex/context/base/type-cow.tex
+++ b/tex/context/base/type-cow.mkii
diff --git a/tex/context/base/type-cow.mkiv b/tex/context/base/type-cow.mkiv
new file mode 100644
index 000000000..5215e7122
--- /dev/null
+++ b/tex/context/base/type-cow.mkiv
@@ -0,0 +1,85 @@
+%D \module
+%D   [       file=type-cow,
+%D        version=2006.06.23,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Cow Fonts,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright=PRAGMA]
+%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 The cow fonts are a project of Duane Bibby, Hans Hagen and Taco
+%D Hoekwater.
+
+\starttypescriptcollection[cow]
+
+\starttypescript [math,serif] [cow,sheep]
+    \setups[font:fallback:serif]
+  % \usemathcollection[cow]
+    \loadmapfile[koeieletters.map]
+    \definefontsynonym [Serif]           [Cows]
+    \definefontsynonym [SerifContour]    [CowsContour]
+    \definefontsynonym [SerifLogo]       [CowsLogo]
+    \definefontsynonym [SerifLogoContour][CowsLogoContour]
+    \definefontsynonym [MathRoman]       [CowsMathRoman]
+    \definefontsynonym [MathItalic]      [CowsMathItalic]
+    \definefontsynonym [MathSymbol]      [CowsMathSymbol]
+    \definefontsynonym [MathExtension]   [CowsMathExtensions]
+\stoptypescript
+
+\starttypescript [math,serif] [sheep]
+    \setups[font:fallback:serif]
+  % \usemathcollection[cow]
+    \loadmapfile[koeieletters.map]
+    \definefontsynonym [Serif]           [Sheep]
+    \definefontsynonym [SerifContour]    [SheepContour]
+    \definefontsynonym [SerifLogo]       [SheepLogo]
+    \definefontsynonym [SerifLogoContour][SheepLogoContour]
+    \definefontsynonym [MathRoman]       [SheepMathRoman]
+    \definefontsynonym [MathItalic]      [SheepMathItalic]
+    \definefontsynonym [MathSymbol]      [SheepMathSymbol]
+    \definefontsynonym [MathExtension]   [SheepMathExtensions]
+\stoptypescript
+
+\starttypescript [all] [cow,sheep]
+    \definefontsynonym [Cows]              [koeielett]
+    \definefontsynonym [CowsContour]       [koeielett-contour]
+    \definefontsynonym [CowsLogo]          [koeielogos]
+    \definefontsynonym [CowsLogoContour]   [koeielogos-contour]
+    \definefontsynonym [CowsMathRoman]     [koeielett]
+    \definefontsynonym [CowsMathItalic]    [koeieletter-mi]
+    \definefontsynonym [CowsMathSymbol]    [koeieletter-sy]
+    \definefontsynonym [CowsMathExtensions][koeieletter-ex]
+\stoptypescript
+
+\starttypescript [all] [sheep]
+    \definefontsynonym [Sheep]              [koeielett]
+    \definefontsynonym [SheepContour]       [koeielett-contour]
+    \definefontsynonym [SheepLogo]          [koeielogos]
+    \definefontsynonym [SheepLogoContour]   [koeielogos-contour]
+    \definefontsynonym [SheepMathRoman]     [koeielettx]
+    \definefontsynonym [SheepMathItalic]    [koeieletter-mi]
+    \definefontsynonym [SheepMathSymbol]    [koeieletter-syx]
+    \definefontsynonym [SheepMathExtensions][koeieletter-ex]
+\stoptypescript
+
+\starttypescript [cow]
+    \definetypeface [cow][rm][serif][cow]   [default]
+    \definetypeface [cow][ss][serif][cow]   [default]
+    \definetypeface [cow][mm][math] [cow]   [default]
+    \definetypeface [cow][tt][mono] [modern][default][rscale=0.85]
+\stoptypescript
+
+\starttypescript [sheep]
+    \definetypeface [sheep][rm][serif][sheep] [default]
+    \definetypeface [sheep][ss][serif][sheep] [default]
+    \definetypeface [sheep][mm][math] [sheep] [default]
+    \definetypeface [sheep][tt][mono] [modern][default][,rscale=0.85]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/tex/context/base/type-exp.tex b/tex/context/base/type-exp.mkii
index dae770e98..dae770e98 100644
--- a/tex/context/base/type-exp.tex
+++ b/tex/context/base/type-exp.mkii
diff --git a/tex/context/base/type-fsf.tex b/tex/context/base/type-fsf.mkii
index 7813b7b5d..7813b7b5d 100644
--- a/tex/context/base/type-fsf.tex
+++ b/tex/context/base/type-fsf.mkii
diff --git a/tex/context/base/type-ghz.tex b/tex/context/base/type-ghz.mkii
index 7e31096ee..7e31096ee 100644
--- a/tex/context/base/type-ghz.tex
+++ b/tex/context/base/type-ghz.mkii
diff --git a/tex/context/base/type-hgz.tex b/tex/context/base/type-ghz.mkiv
index e6a12d7e3..e6a12d7e3 100644
--- a/tex/context/base/type-hgz.tex
+++ b/tex/context/base/type-ghz.mkiv
diff --git a/tex/context/base/type-hgz.mkii b/tex/context/base/type-hgz.mkii
new file mode 100644
index 000000000..4d3e495b0
--- /dev/null
+++ b/tex/context/base/type-hgz.mkii
@@ -0,0 +1 @@
+\input type-ghz.mkii \endinput % can be file synonym
diff --git a/tex/context/base/type-hgz.mkiv b/tex/context/base/type-hgz.mkiv
new file mode 100644
index 000000000..a3c2a7841
--- /dev/null
+++ b/tex/context/base/type-hgz.mkiv
@@ -0,0 +1 @@
+\input type-ghz.mkiv \endinput % can be file synonym
diff --git a/tex/context/base/type-husayni-default.mkiv b/tex/context/base/type-husayni-default.mkiv
new file mode 100644
index 000000000..b3c1af5b7
--- /dev/null
+++ b/tex/context/base/type-husayni-default.mkiv
@@ -0,0 +1,146 @@
+\definefontfeature
+  [husayni-default]
+  [analyze=yes,mode=node,
+   language=dflt,script=arab,
+   ccmp=yes, % adds identity dots to unicode letters; includes dynamic dot placement
+   init=yes,medi=yes,fina=yes, % contextual analysis
+   % dlig=yes, % Hamzahbelow under YaaHamzahabove
+   rlig=yes, % indispensable
+   calt=yes, % ayah+numerals
+   salt=yes, % includes manual justification with Tatwiil
+   % fchr=yes % formatting chars
+   anum=yes, % replace latin numerals with arabic-script ones
+   ss01=yes, % Allah, Muhammad,
+   % ss02=yes, % ss01 + Allah_final
+   ss03=yes, % level-1 stack over Jiim, initial entry only
+   % ss04=yes, % level-1 stack over Jiim, initial/medial entry
+   % ss05=yes, % multi-level Jiim stacking, initial/medial entry
+   % ss06=yes, % aesthetic Faa/Qaaf for FJ_mm, FJ_mf connection
+   ss07=yes, % initial-entry stacking over Haa
+   % ss08=yes, % initial/medial stacking over Haa, minus HM_mf strings
+   % ss09=yes, % initial/medial Haa stacking plus HM_mf strings
+   ss10=yes, % basic dipped Miim, initial-entry B_S-stack over Miim
+   % ss11=yes, % full dipped Miim, initial-entry B_S-stack over Miim
+   ss12=yes, % XBM_im initial-medial entry B_S-stack over Miim,
+   % ss13=yes, % full initial-medial entry B_S-stacked Miim
+   % ss14=yes, initial entry, stacked Laam on Miim
+   ss15=yes, % full stacked Laam-on-Miim
+   ss16=yes, % initial entry, stacked Ayn-on-Miim
+   % ss17=yes, % full stacked Ayn-on-Miim
+   % ss18=yes, % LMJ_im % already contained in ss03--05, may remove
+   ss19=yes, % LM_im
+   % ss20=yes, % KLM_m, sloped Miim
+   % ss21=yes, % KLM_i_mm/LM_mm, sloped Miim
+   % ss22=yes, % filled sloped Miim
+   % ss23=yes, % LM_mm, non-sloped Miim
+   ss24=yes, % BR_i_mf, BN_i_mf
+   ss25=yes, % basic LH_im % might merge with ss24
+   ss26=yes, % full Yaa.final special strings: BY_if, BY_mf, LY_mf
+   ss27=yes, % basic thin Miim.final
+   % ss28=yes, % full thin Miim.final % to be moved to jsnn
+   % ss29=yes, % basic short Miim.final
+   % ss30=yes, % full short Miim.final % to be moved to jsnn
+   ss31=yes, % basic Raa.final strings: JR and SR
+   % ss32=yes, % basic Raa.final strings: JR, SR, and BR
+   % ss33=yes, % TtR % to be moved to jsnn
+   ss34=yes, % AyR style % also available in jsnn
+   ss35=yes, % full Kaaf contexts
+   ss36=yes, % full Laam contexts
+   ss37=yes, % Miim-Miim contexts
+   ss38=yes, % basic dipped Haa, B_SH_mm
+   % ss39=yes, % full dipped Haa,  B_S_LH_i_mm_Mf
+   % ss40=yes, % aesthetic dipped medial Haa
+   ss41=yes, % high and low Baa strings
+   ss42=yes, % diagonal entry
+   ss43=yes, % initial alternates
+   % ss44=yes, % hooked final alif
+   % ss45=yes, % BMA_f
+   % ss46=yes, % BM_mm_alt, for JBM combinations
+   % ss47=yes, % Shaddah-<kasrah> combo
+   % ss48=yes, % Auto-sukuun
+   % ss49=yes, % No vowels
+   % ss50=yes, % Shaddah/MaaddahHamzah only
+   % ss51=yes, % No Skuun
+   % ss52=yes, % No Waslah
+   % ss53=yes, % No Waslah
+   % ss54=yes, % chopped finals
+   % ss55=yes, % idgham-tanwin
+   ss60=yes, % 
+   % js01=yes, % Raawide
+   % js02=yes, % Yaawide
+   % js03=yes, % Kaafwide
+   % js04=yes, % Nuunwide
+   % js05=yes, % Kaafwide Nuunwide Siinwide Baawide
+   % js06=yes, % final Haa wide
+   % js07=yes, % thin Miim
+   % js08=yes, % short Miim
+   % js09=yes, % wide Siin
+   % js10=yes, % thuluth-style initial Haa, final Miim, MRw_mf
+   % js11=yes, % level-1 stretching
+   % js12=yes, % level-2 stretching
+   % js13=yes, % level-3 stretching
+   % js14=yes, % final Alif
+   % js15=yes, % hooked final Alif
+   js16=yes, % aesthetic medial Faa/Qaaf
+   % js17=yes, % fancy isol Haa after Daal, Raa, and Waaw
+   % js18=yes, % Laamwide, alternate substitution
+   % js19=yes, % level-4 stretching, only siin and Hhaa for basmalah
+   % js20=yes, % level-5 stretching, only siin and Hhaa for basmalah
+   % js21=yes, % Haa.final_alt2
+   % calt=yes, % to be used for vowel/dot-based dynamics
+   % ttwl=yes, % for simple, horizontal stretching, not yet implemented in luatex/mkiv
+   % flts=yes, % Final Glyph On Line Alternates Short: Baa-like
+   % fltw=yes, % Final Glyph On Line Alternates Wide: Baa-like
+   % gclr=yes, % Geometric Cursive LR : for testing GPOS only!
+   % gcrl=yes, % Geometric Cursive RL
+   % gklr=yes, % Geometric Kerning LR
+   % gkrl=yes, % Geometric Kerning RL
+   kern=yes, % includes kerning of dot-base pairs, and final pairs in continuous strings
+   curs=yes, % we don't curs final pairs, padj for that
+   mark=yes, % vowels
+   mkmk=yes, % stacked vowels
+   tlig=yes,
+   colorscheme=husayni:default]
+
+\definefontfeature
+  [husayni-tt]
+  [analyze=yes,mode=node,
+   language=dflt,script=arab,
+   ccmp=yes, % adds identity dots to unicode letters; includes dynamic dot placement
+   init=yes,medi=yes,fina=yes, % contextual analysis
+   rlig=yes, % indispensable
+   fchr=yes,
+   kern=yes, % includes kerning of dot-base pairs, and final pairs in continuous strings
+   curs=yes, % we don't curs final pairs, padj for that
+   mark=yes, % vowels
+   mkmk=yes] % stacked vowels
+
+\definefontfeature
+  [husayni-mono]
+  [analyze=yes,mode=node,
+   language=dflt,script=arab,ccmp=no,
+   init=yes,medi=yes,fina=yes,isol=yes,
+   rlig=yes,liga=yes,
+   mset=yes]
+   
+\definedelimitedtext
+  [ornatequote]
+  [left={‏\char"FD3F\penalty10000},
+   right={‏\char"FD3E\penalty10000}]   
+   
+\definedelimitedtext
+  [arparenthesis]
+  [left={‏\char"0028},
+   right={‏\char"0029}] 
+
+\definedelimitedtext
+  [arquotation]
+  [left={‏\symbol[rightquotation]},
+   right={‏\symbol[leftquotation]},
+   leftmargin=standard]
+
+\definedelimitedtext
+  [arquote]
+  [left={‏\symbol[rightquote]},
+   right={‏\symbol[leftquote]},
+   leftmargin=standard]
\ No newline at end of file
diff --git a/tex/context/base/type-ini.mkii b/tex/context/base/type-ini.mkii
index e1a2d40a0..771e50e01 100644
--- a/tex/context/base/type-ini.mkii
+++ b/tex/context/base/type-ini.mkii
@@ -158,7 +158,7 @@
        \startreadingfile
        \pushendofline
        \unprotect
-       \readfile\currenttypefile\donothing\donothing
+       \readfile{\currenttypefile.\mksuffix}\donothing{\readfile\currenttypefile\donothing\donothing}%
        \protect
        \popendofline
        \stopreadingfile
@@ -172,7 +172,7 @@
      \startreadingfile
      \pushendofline
      \unprotect
-     \readfile\currenttypefile\donothing\donothing
+     \readfile{\currenttypefile.\mksuffix}\donothing{\readfile\currenttypefile\donothing\donothing}%
      \protect
      \popendofline
      \stopreadingfile
diff --git a/tex/context/base/type-ini.mkiv b/tex/context/base/type-ini.mkiv
index d30fd951e..fcd16cd27 100644
--- a/tex/context/base/type-ini.mkiv
+++ b/tex/context/base/type-ini.mkiv
@@ -170,7 +170,7 @@
    \pushendofline
    \unprotect
    % we could have something readfilewithMKfallback
-   \readfile\currenttypefile\donothing{\readfile{\currenttypefile.\mksuffix}\donothing\donothing}%
+   \readfile{\currenttypefile.\mksuffix}\donothing{\readfile\currenttypefile\donothing\donothing}%
    \protect
    \popendofline
    \stopreadingfile}
@@ -495,7 +495,8 @@
    \ifmmode\mr\else\tf\fi} % needed ?
 
 \def\usetypefile[#1]% recurses on path !
-  {\readfile{\f!typeprefix#1}\donothing\donothing}
+  {\edef\currenttypefile{\f!typeprefix#1}%
+   \readfile{\currenttypefile.\mksuffix}\donothing{\readfile\currenttypefile\donothing\donothing}}
 
 %D For Taco:
 %D
diff --git a/tex/context/base/type-lua.tex b/tex/context/base/type-lua.mkiv
index a6799671e..a6799671e 100644
--- a/tex/context/base/type-lua.tex
+++ b/tex/context/base/type-lua.mkiv
diff --git a/tex/context/base/type-mac.mkii b/tex/context/base/type-mac.mkii
index feedcd43d..ac57726cb 100644
--- a/tex/context/base/type-mac.mkii
+++ b/tex/context/base/type-mac.mkii
@@ -23,6 +23,21 @@
 \definetypescriptprefix [f:trebuchet]       [Trebuchet MS]
 \definetypescriptprefix [f:verdana]         [Verdana]
 
+\definetypescriptprefix [n:andalemono]      [AndaleMono]
+\definetypescriptprefix [n:chalkboard]      [Chalkboard]
+\definetypescriptprefix [n:cochin]          [Cochin]
+\definetypescriptprefix [n:comicsans]       [ComicSans]
+\definetypescriptprefix [n:couriernew]      [CourierNew]
+\definetypescriptprefix [n:georgia]         [Georgia]
+\definetypescriptprefix [n:lucidagrande]    [LucidaGrande]
+\definetypescriptprefix [n:monaco]          [Monaco]
+\definetypescriptprefix [n:tahoma]          [Tahoma]
+\definetypescriptprefix [n:timesnewroman]   [TimesNewRoman]
+\definetypescriptprefix [n:trebuchet]       [Trebuchet]
+\definetypescriptprefix [n:verdana]         [Verdana]
+
+\starttypescriptcollection [macosx]
+
 % American Typewriter
 
 \starttypescript [serif] [americantypewriter-light-condensed,americantypewriter-condensed,americantypewriter-light,americantypewriter]
@@ -34,6 +49,34 @@
     \definefontsynonym [AmericanTypewriter-BoldCond]  [name:American Typewriter Condensed Bold]  [features=default]
 \stoptypescript
 
+\starttypescript [serif] [americantypewriter-light-condensed]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]     [AmericanTypewriter-LightCond] [features=default]
+    \definefontsynonym [SerifBold] [AmericanTypewriter-Condensed] [features=default]
+\stoptypescript
+
+\starttypescript [serif] [americantypewriter-condensed]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]     [AmericanTypewriter-Condensed] [features=default]
+    \definefontsynonym [SerifBold] [AmericanTypewriter-BoldCond]  [features=default]
+\stoptypescript
+
+\starttypescript [serif] [americantypewriter-light]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]     [AmericanTypewriter-Light]     [features=default]
+    \definefontsynonym [SerifBold] [AmericanTypewriter-Regular]   [features=default]
+\stoptypescript
+
+\starttypescript [serif] [americantypewriter]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]     [AmericanTypewriter-Regular]   [features=default]
+    \definefontsynonym [SerifBold] [AmericanTypewriter-Bold]      [features=default]
+\stoptypescript
+
+\starttypescript [americantypewriter-light-condensed,americantypewriter-condensed,americantypewriter-light,americantypewriter]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
 % Arial / Arial Narrow / Arial Rounded / Arial Unicode
 
 \starttypescript [sans] [arial-narrow,arial-condensed,arial,arial-rounded,arial-unicode]
@@ -50,6 +93,36 @@
     \definefontsynonym [Arial-Rounded]        [name:Arial Rounded MT Bold]    [features=default]
 \stoptypescript
 
+\starttypescript [sans] [arial-narrow,arial-condensed]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Arial-Condensed]      [features=default]
+    \definefontsynonym [SansItalic]     [Arial-ItalicCond]     [features=default]
+    \definefontsynonym [SansBold]       [Arial-BoldCond]       [features=default]
+    \definefontsynonym [SansBoldItalic] [Arial-BoldItalicCond] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [arial]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Arial-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [Arial-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [Arial-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [Arial-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [arial-rounded]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [Arial-Rounded] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [arial-unicode]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [Arial-Unicode] [features=default]
+\stoptypescript
+
+\starttypescript [arial-narrow,arial-condensed,arial,arial-rounded,arial-unicode]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Baskerville
 
 \starttypescript [serif] [baskerville]
@@ -61,12 +134,33 @@
     \definefontsynonym [Baskerville-BoldItalic]   [name:Baskerville Bold Italic]     [features=default]
 \stoptypescript
 
+\starttypescript [serif] [baskerville]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [Baskerville-Regular]      [features=default]
+    \definefontsynonym [SerifItalic]     [Baskerville-Italic]       [features=default]
+    \definefontsynonym [SerifBold]       [Baskerville-Medium]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [Baskerville-MediumItalic] [features=default]
+\stoptypescript
+
+\starttypescript [baskerville]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
 % Big Caslon
 
 \starttypescript [serif] [caslon,bigcaslon]
     \definefontsynonym [BigCaslon-Medium] [name:Big Caslon Medium] [features=default]
 \stoptypescript
 
+\starttypescript [serif] [caslon,bigcaslon]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif] [BigCaslon-Medium] [features=default]
+\stoptypescript
+
+\starttypescript [caslon,bigcaslon]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
 % Copperplate
 
 \starttypescript [sans] [copperplate-light,copperplate]
@@ -75,6 +169,22 @@
     \definefontsynonym [Copperplate-Bold]    [name:Copperplate Bold]  [features=default]
 \stoptypescript
 
+\starttypescript [sans] [copperplate-light]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [Copperplate-Light]   [features=default]
+    \definefontsynonym [SansBold] [Copperplate-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [copperplate]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [Copperplate-Regular] [features=default]
+    \definefontsynonym [SansBold] [Copperplate-Bold]    [features=default]
+\stoptypescript
+
+\starttypescript [copperplate-light,copperplate]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Futura
 
 \starttypescript [sans] [futura-condensed,futura]
@@ -84,6 +194,22 @@
     \definefontsynonym [Futura-BoldCond]     [name:Futura Condensed ExtraBold] [features=default]
 \stoptypescript
 
+\starttypescript [sans] [futura-condensed]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [Futura-MediumCond] [features=default]
+    \definefontsynonym [SansBold] [Futura-BoldCond]   [features=default]
+\stoptypescript
+
+\starttypescript [sans] [futura]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]       [Futura-Medium]       [features=default]
+    \definefontsynonym [SansItalic] [Futura-MediumItalic] [features=default]
+\stoptypescript
+
+\starttypescript [futura-condensed,futura]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Gill Sans
 
 \starttypescript [sans] [gillsans-light,gillsans]
@@ -95,6 +221,26 @@
     \definefontsynonym [GillSans-BoldItalic]  [name:Gill Sans Bold Italic]  [features=default]
 \stoptypescript
 
+\starttypescript [sans] [gillsans-light]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [GillSans-Light]       [features=default]
+    \definefontsynonym [SansItalic]     [GillSans-LightItalic] [features=default]
+    \definefontsynonym [SansBold]       [GillSans-Regular]     [features=default]
+    \definefontsynonym [SansBoldItalic] [GillSans-Italic]      [features=default]
+\stoptypescript
+
+\starttypescript [sans] [gillsans]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [GillSans-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [GillSans-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [GillSans-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [GillSans-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [gillsans-light,gillsans]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Helvetica Neuse
 
 \starttypescript [sans] [helvetica-neue-ultralight,helvetica-neue-light,helvetica-neue,helvetica-neue-boldcondensed]
@@ -110,6 +256,40 @@
     \definefontsynonym [HelveticaNeue-BlackCond]        [name:Helvetica Neue Condensed Black]   [features=default]
 \stoptypescript
 
+\starttypescript [sans] [helvetica-neue-ultralight]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [HelveticaNeue-UltraLight]       [features=default]
+    \definefontsynonym [SansItalic]     [HelveticaNeue-UltraLightItalic] [features=default]
+    \definefontsynonym [SansBold]       [HelveticaNeue-Light]            [features=default]
+    \definefontsynonym [SansBoldItalic] [HelveticaNeue-LightItalic]      [features=default]
+\stoptypescript
+
+\starttypescript [sans] [helvetica-neue-light]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [HelveticaNeue-Light]       [features=default]
+    \definefontsynonym [SansItalic]     [HelveticaNeue-LightItalic] [features=default]
+    \definefontsynonym [SansBold]       [HelveticaNeue-Regular]     [features=default]
+    \definefontsynonym [SansBoldItalic] [HelveticaNeue-Italic]      [features=default]
+\stoptypescript
+
+\starttypescript [sans] [helvetica-neue]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [HelveticaNeue-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [HelveticaNeue-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [HelveticaNeue-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [HelveticaNeue-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [helvetica-neue-boldcondensed]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [HelveticaNeue-BoldCond]  [features=default]
+    \definefontsynonym [SansBold] [HelveticaNeue-BlackCond] [features=default]
+\stoptypescript
+
+\starttypescript [helvetica-neue-ultralight,helvetica-neue-light,helvetica-neue,helvetica-neue-boldcondensed]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Hiragino Mincho
 
 \starttypescript [serif] [hiragino-mincho]
@@ -119,6 +299,22 @@
     \definefontsynonym [HiraginoMinchoProN-Bold]    [name:Hiragino Mincho ProN W6] [features=japanese]
 \stoptypescript
 
+\starttypescript [serif] [hiragino-mincho]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]     [HiraginoMinchoPro-Regular] [features=japanese]
+    \definefontsynonym [SerifBold] [HiraginoMinchoPro-Bold]    [features=japanese]
+\stoptypescript
+
+% \starttypescript [serif] [hiragino-mincho]
+%     \setups[font:fallback:serif]
+%     \definefontsynonym [Serif]     [HiraginoMinchoProN-Regular] [features=japanese]
+%     \definefontsynonym [SerifBold] [HiraginoMinchoProN-Bold]    [features=japanese]
+% \stoptypescript
+
+\starttypescript [hiragino-mincho]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
 % Hiragino Maru
 
 \starttypescript [sans] [hiragino-maru]
@@ -126,6 +322,20 @@
     \definefontsynonym [HiraginoMaruGothicProN-Regular] [name:Hiragino Maru Gothic ProN W4] [features=japanese]
 \stoptypescript
 
+\starttypescript [sans] [hiragino-maru]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [HiraginoMaruGothicPro-Regular] [features=japanese]
+\stoptypescript
+
+% \starttypescript [sans] [hiragino-maru]
+%     \setups[font:fallback:sans]
+%     \definefontsynonym [Sans] [HiraginoMaruGothicProN-Regular] [features=japanese]
+% \stoptypescript
+
+\starttypescript [hiragino-maru]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Hiragino Kaku
 
 \starttypescript [sans] [hiragino-kaku]
@@ -137,6 +347,22 @@
     \definefontsynonym [HiraginoKakuGothicStdN-Black]   [name:Hiragino Kaku Gothic StdN W8] [features=japanese]
 \stoptypescript
 
+\starttypescript [sans] [hiragino-kaku]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [HiraginoKakuGothicPro-Regular] [features=japanese]
+    \definefontsynonym [SansBold] [HiraginoKakuGothicPro-Bold]    [features=japanese]
+\stoptypescript
+
+% \starttypescript [sans] [hiragino-kaku]
+%     \setups[font:fallback:sans]
+%     \definefontsynonym [Sans]     [HiraginoKakuGothicProN-Regular] [features=japanese]
+%     \definefontsynonym [SansBold] [HiraginoKakuGothicProN-Bold]    [features=japanese]
+% \stoptypescript
+
+\starttypescript [hiragino-kaku]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Hoefler Text
 
 \starttypescript [serif] [hoefler]
@@ -147,18 +373,48 @@
     \definefontsynonym [HoeflerText-Ornaments]   [name:Hoefler Text Ornaments]    [features=default]
 \stoptypescript
 
+\starttypescript [serif] [hoefler]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [HoeflerText-Regular]     [features=default]
+    \definefontsynonym [SerifItalic]     [HoeflerText-Italic]      [features=default]
+    \definefontsynonym [SerifBold]       [HoeflerText-Black]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [HoeflerText-BlackItalic] [features=default]
+\stoptypescript
+
+\starttypescript [hoefler]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
 % Impact
 
 \starttypescript [sans] [impact]
     \definefontsynonym [Impact-Regular] [name:Impact] [features=default]
 \stoptypescript
 
+\starttypescript [sans] [impact]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [Impact-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [impact]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Andale Mono / Monaco
 
 \starttypescript [mono] [andalemono,monaco]
     \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular] [name:\typescriptprefix{f:\typescripttwo}] [features=default]
 \stoptypescript
 
+\starttypescript [mono] [andalemono,monaco]
+    \setups[font:fallback:mono]
+    \definefontsynonym [Mono] [\typescriptprefix{n:\typescripttwo}-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [andalemono,monaco]
+    \definetypeface [\typescriptone] [tt] [mono] [\typescriptone] [default]
+\stoptypescript
+
 % Optima
 
 \starttypescript [sans] [optima,optima-bold]
@@ -169,6 +425,25 @@
     \definefontsynonym [Optima-Black]      [name:Optima ExtraBlack]  [features=default]
 \stoptypescript
 
+\starttypescript [sans] [optima]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Optima-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [Optima-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [Optima-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [Optima-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [optima-bold]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]       [Optima-Bold]       [features=default]
+    \definefontsynonym [SansItalic] [Optima-BoldItalic] [features=default]
+    \definefontsynonym [SansBold]   [Optima-Black]      [features=default]
+\stoptypescript
+
+\starttypescript [optima,optima-bold]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Papyrus
 
 \starttypescript [sans] [papyrus]
@@ -176,12 +451,30 @@
     \definefontsynonym [Papyrus-Condensed] [name:Papyrus Condensed] [features=default]
 \stoptypescript
 
+\starttypescript [sans] [papyrus]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [Papyrus-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [papyrus]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % STFangsong
 
 \starttypescript [serif] [stfangsong]
     \definefontsynonym [STFangsong-Regular] [name:STFangsong] [features=chinese]
 \stoptypescript
 
+\starttypescript [serif] [stfangsong]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Serif] [STFangsong-Regular] [features=chinese]
+\stoptypescript
+
+\starttypescript [stfangsong]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
 % STHeiti
 
 \starttypescript [sans] [stheiti]
@@ -189,18 +482,46 @@
     \definefontsynonym [STHeiti-Regular] [name:STHeiti Regular] [features=chinese]
 \stoptypescript
 
+\starttypescript [sans] [stheiti]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [STXihei-Light]   [features=chinese]
+    \definefontsynonym [SansBold] [STKaiti-Regular] [features=chinese]
+\stoptypescript
+
+\starttypescript [stheiti]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % STKaiti
 
 \starttypescript [serif] [stkaiti]
     \definefontsynonym [STKaiti-Regular] [name:STKaiti] [features=chinese]
 \stoptypescript
 
+\starttypescript [serif] [stkaiti]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Serif] [STKaiti-Regular] [features=chinese]
+\stoptypescript
+
+\starttypescript [stkaiti]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
 % STSong
 
 \starttypescript [serif] [stsong]
     \definefontsynonym [STSong-Regular] [name:STSong] [features=chinese]
 \stoptypescript
 
+\starttypescript [serif] [stsong]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Serif] [STSong-Regular] [features=chinese]
+\stoptypescript
+
+\starttypescript [stsong]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
 % Chalkboard / Comic Sans / Tahoma
 
 \starttypescript [sans] [chalkboard,comicsans,lucidagrande,tahoma]
@@ -208,6 +529,16 @@
     \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]    [name:\typescriptprefix{f:\typescripttwo} Bold] [features=default]
 \stoptypescript
 
+\starttypescript [sans] [chalkboard,comicsans,lucidagrande,tahoma]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [\typescriptprefix{n:\typescripttwo}-Regular] [features=default]
+    \definefontsynonym [SansBold] [\typescriptprefix{n:\typescripttwo}-Bold]    [features=default]
+\stoptypescript
+
+\starttypescript [chalkboard,comicsans,tahoma]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Cochin / Courier New / Georgia / Times New Roman / Trebuchet / Verdana
 
 \starttypescript [serif,sans,mono] [cochin,georgia,timesnewroman,trebuchet,verdana,couriernew]
@@ -217,4 +548,46 @@
     \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [name:\typescriptprefix{f:\typescripttwo} Bold Italic] [features=default]
 \stoptypescript
 
+\starttypescript [serif] [cochin,georgia,timesnewroman]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [cochin,georgia,timesnewroman]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
+% Courier New
+
+% \starttypescript [mono] [couriernew]
+%     \setups[font:fallback:mono]
+%     \definefontsynonym [Mono]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
+%     \definefontsynonym [MonoItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
+%     \definefontsynonym [MonoBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
+%     \definefontsynonym [MonoBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
+% \stoptypescript
+
+% \starttypescript [couriernew]
+%     \definetypeface [\typescriptone] [tt] [mono] [\typescriptone] [default]
+% \stoptypescript
+
+% Trebuchet / Verdana
+
+% \starttypescript [sans] [trebuchet,verdana]
+%     \setups[font:fallback:sans]
+%     \definefontsynonym [Sans]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
+%     \definefontsynonym [SansItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
+%     \definefontsynonym [SansBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
+%     \definefontsynonym [SansBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
+% \stoptypescript
+
+% \starttypescript [trebuchet,verdana]
+%     \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+% \stoptypescript
+
+\stoptypescriptcollection
+
 \endinput
diff --git a/tex/context/base/type-mac.mkiv b/tex/context/base/type-mac.mkiv
index 10a415883..9856439da 100644
--- a/tex/context/base/type-mac.mkiv
+++ b/tex/context/base/type-mac.mkiv
@@ -23,6 +23,21 @@
 \definetypescriptprefix [f:trebuchet]       [trebuchetms]
 \definetypescriptprefix [f:verdana]         [verdana]
 
+\definetypescriptprefix [n:andalemono]      [AndaleMono]
+\definetypescriptprefix [n:chalkboard]      [Chalkboard]
+\definetypescriptprefix [n:cochin]          [Cochin]
+\definetypescriptprefix [n:comicsans]       [ComicSans]
+\definetypescriptprefix [n:couriernew]      [CourierNew]
+\definetypescriptprefix [n:georgia]         [Georgia]
+\definetypescriptprefix [n:lucidagrande]    [LucidaGrande]
+\definetypescriptprefix [n:monaco]          [Monaco]
+\definetypescriptprefix [n:tahoma]          [Tahoma]
+\definetypescriptprefix [n:timesnewroman]   [TimesNewRoman]
+\definetypescriptprefix [n:trebuchet]       [Trebuchet]
+\definetypescriptprefix [n:verdana]         [Verdana]
+
+\starttypescriptcollection [macosx]
+
 % American Typewriter
 
 \starttypescript [serif] [americantypewriter-light-condensed,americantypewriter-condensed,americantypewriter-light,americantypewriter]
@@ -34,6 +49,34 @@
     \definefontsynonym [AmericanTypewriter-BoldCond]  [name:americantypewritercondensedbold]  [features=default]
 \stoptypescript
 
+\starttypescript [serif] [americantypewriter-light-condensed]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]     [AmericanTypewriter-LightCond] [features=default]
+    \definefontsynonym [SerifBold] [AmericanTypewriter-Condensed] [features=default]
+\stoptypescript
+
+\starttypescript [serif] [americantypewriter-condensed]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]     [AmericanTypewriter-Condensed] [features=default]
+    \definefontsynonym [SerifBold] [AmericanTypewriter-BoldCond]  [features=default]
+\stoptypescript
+
+\starttypescript [serif] [americantypewriter-light]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]     [AmericanTypewriter-Light]     [features=default]
+    \definefontsynonym [SerifBold] [AmericanTypewriter-Regular]   [features=default]
+\stoptypescript
+
+\starttypescript [serif] [americantypewriter]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]     [AmericanTypewriter-Regular]   [features=default]
+    \definefontsynonym [SerifBold] [AmericanTypewriter-Bold]      [features=default]
+\stoptypescript
+
+\starttypescript [americantypewriter-light-condensed,americantypewriter-condensed,americantypewriter-light,americantypewriter]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
 % Arial / Arial Narrow / Arial Rounded / Arial Unicode
 
 \starttypescript [sans] [arial-narrow,arial-condensed,arial,arial-rounded,arial-unicode]
@@ -50,6 +93,36 @@
     \definefontsynonym [Arial-Rounded]        [name:arialroundedmtbold]    [features=default]
 \stoptypescript
 
+\starttypescript [sans] [arial-narrow,arial-condensed]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Arial-Condensed]      [features=default]
+    \definefontsynonym [SansItalic]     [Arial-ItalicCond]     [features=default]
+    \definefontsynonym [SansBold]       [Arial-BoldCond]       [features=default]
+    \definefontsynonym [SansBoldItalic] [Arial-BoldItalicCond] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [arial]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Arial-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [Arial-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [Arial-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [Arial-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [arial-rounded]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [Arial-Rounded] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [arial-unicode]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [Arial-Unicode] [features=default]
+\stoptypescript
+
+\starttypescript [arial-narrow,arial-condensed,arial,arial-rounded,arial-unicode]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Baskerville
 
 \starttypescript [serif] [baskerville]
@@ -61,12 +134,33 @@
     \definefontsynonym [Baskerville-BoldItalic]   [name:baskervillebolditalic]     [features=default]
 \stoptypescript
 
+\starttypescript [serif] [baskerville]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [Baskerville-Regular]      [features=default]
+    \definefontsynonym [SerifItalic]     [Baskerville-Italic]       [features=default]
+    \definefontsynonym [SerifBold]       [Baskerville-Medium]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [Baskerville-MediumItalic] [features=default]
+\stoptypescript
+
+\starttypescript [baskerville]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
 % Big Caslon
 
 \starttypescript [serif] [caslon,bigcaslon]
     \definefontsynonym [BigCaslon-Medium] [name:bigcaslonmedium] [features=default]
 \stoptypescript
 
+\starttypescript [serif] [caslon,bigcaslon]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif] [BigCaslon-Medium] [features=default]
+\stoptypescript
+
+\starttypescript [caslon,bigcaslon]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
 % Copperplate
 
 \starttypescript [sans] [copperplate-light,copperplate]
@@ -75,6 +169,22 @@
     \definefontsynonym [Copperplate-Bold]    [name:copperplatebold]  [features=default]
 \stoptypescript
 
+\starttypescript [sans] [copperplate-light]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [Copperplate-Light]   [features=default]
+    \definefontsynonym [SansBold] [Copperplate-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [copperplate]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [Copperplate-Regular] [features=default]
+    \definefontsynonym [SansBold] [Copperplate-Bold]    [features=default]
+\stoptypescript
+
+\starttypescript [copperplate-light,copperplate]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Futura
 
 \starttypescript [sans] [futura-condensed,futura]
@@ -84,6 +194,22 @@
     \definefontsynonym [Futura-BoldCond]     [name:futuracondensedextrabold] [features=default]
 \stoptypescript
 
+\starttypescript [sans] [futura-condensed]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [Futura-MediumCond] [features=default]
+    \definefontsynonym [SansBold] [Futura-BoldCond]   [features=default]
+\stoptypescript
+
+\starttypescript [sans] [futura]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]       [Futura-Medium]       [features=default]
+    \definefontsynonym [SansItalic] [Futura-MediumItalic] [features=default]
+\stoptypescript
+
+\starttypescript [futura-condensed,futura]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Gill Sans
 
 \starttypescript [sans] [gillsans-light,gillsans]
@@ -95,6 +221,26 @@
     \definefontsynonym [GillSans-BoldItalic]  [name:gillsansbolditalic]  [features=default]
 \stoptypescript
 
+\starttypescript [sans] [gillsans-light]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [GillSans-Light]       [features=default]
+    \definefontsynonym [SansItalic]     [GillSans-LightItalic] [features=default]
+    \definefontsynonym [SansBold]       [GillSans-Regular]     [features=default]
+    \definefontsynonym [SansBoldItalic] [GillSans-Italic]      [features=default]
+\stoptypescript
+
+\starttypescript [sans] [gillsans]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [GillSans-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [GillSans-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [GillSans-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [GillSans-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [gillsans-light,gillsans]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Helvetica Neuse
 
 \starttypescript [sans] [helvetica-neue-ultralight,helvetica-neue-light,helvetica-neue,helvetica-neue-boldcondensed]
@@ -110,6 +256,40 @@
     \definefontsynonym [HelveticaNeue-BlackCond]        [name:helveticaneuecondensedblack]   [features=default]
 \stoptypescript
 
+\starttypescript [sans] [helvetica-neue-ultralight]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [HelveticaNeue-UltraLight]       [features=default]
+    \definefontsynonym [SansItalic]     [HelveticaNeue-UltraLightItalic] [features=default]
+    \definefontsynonym [SansBold]       [HelveticaNeue-Light]            [features=default]
+    \definefontsynonym [SansBoldItalic] [HelveticaNeue-LightItalic]      [features=default]
+\stoptypescript
+
+\starttypescript [sans] [helvetica-neue-light]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [HelveticaNeue-Light]       [features=default]
+    \definefontsynonym [SansItalic]     [HelveticaNeue-LightItalic] [features=default]
+    \definefontsynonym [SansBold]       [HelveticaNeue-Regular]     [features=default]
+    \definefontsynonym [SansBoldItalic] [HelveticaNeue-Italic]      [features=default]
+\stoptypescript
+
+\starttypescript [sans] [helvetica-neue]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [HelveticaNeue-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [HelveticaNeue-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [HelveticaNeue-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [HelveticaNeue-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [helvetica-neue-boldcondensed]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [HelveticaNeue-BoldCond]  [features=default]
+    \definefontsynonym [SansBold] [HelveticaNeue-BlackCond] [features=default]
+\stoptypescript
+
+\starttypescript [helvetica-neue-ultralight,helvetica-neue-light,helvetica-neue,helvetica-neue-boldcondensed]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Hiragino Mincho
 
 \starttypescript [serif] [hiragino-mincho]
@@ -119,6 +299,22 @@
     \definefontsynonym [HiraginoMinchoProN-Bold]    [name:hiraminpronw6] [features=japanese]
 \stoptypescript
 
+\starttypescript [serif] [hiragino-mincho]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]     [HiraginoMinchoPro-Regular] [features=japanese]
+    \definefontsynonym [SerifBold] [HiraginoMinchoPro-Bold]    [features=japanese]
+\stoptypescript
+
+% \starttypescript [serif] [hiragino-mincho]
+%     \setups[font:fallback:serif]
+%     \definefontsynonym [Serif]     [HiraginoMinchoProN-Regular] [features=japanese]
+%     \definefontsynonym [SerifBold] [HiraginoMinchoProN-Bold]    [features=japanese]
+% \stoptypescript
+
+\starttypescript [hiragino-mincho]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
 % Hiragino Maru
 
 \starttypescript [sans] [hiragino-maru]
@@ -126,6 +322,20 @@
     \definefontsynonym [HiraginoMaruGothicProN-Regular] [name:hiramarupronw4] [features=japanese]
 \stoptypescript
 
+\starttypescript [sans] [hiragino-maru]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [HiraginoMaruGothicPro-Regular] [features=japanese]
+\stoptypescript
+
+% \starttypescript [sans] [hiragino-maru]
+%     \setups[font:fallback:sans]
+%     \definefontsynonym [Sans] [HiraginoMaruGothicProN-Regular] [features=japanese]
+% \stoptypescript
+
+\starttypescript [hiragino-maru]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Hiragino Kaku
 
 \starttypescript [sans] [hiragino-kaku]
@@ -137,6 +347,22 @@
     \definefontsynonym [HiraginoKakuGothicStdN-Black]   [name:hirakakustdnw8] [features=japanese]
 \stoptypescript
 
+\starttypescript [sans] [hiragino-kaku]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [HiraginoKakuGothicPro-Regular] [features=japanese]
+    \definefontsynonym [SansBold] [HiraginoKakuGothicPro-Bold]    [features=japanese]
+\stoptypescript
+
+% \starttypescript [sans] [hiragino-kaku]
+%     \setups[font:fallback:sans]
+%     \definefontsynonym [Sans]     [HiraginoKakuGothicProN-Regular] [features=japanese]
+%     \definefontsynonym [SansBold] [HiraginoKakuGothicProN-Bold]    [features=japanese]
+% \stoptypescript
+
+\starttypescript [hiragino-kaku]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Hoefler Text
 
 \starttypescript [serif] [hoefler]
@@ -147,18 +373,48 @@
     \definefontsynonym [HoeflerText-Ornaments]   [name:hoeflertextornaments]   [features=default]
 \stoptypescript
 
+\starttypescript [serif] [hoefler]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [HoeflerText-Regular]     [features=default]
+    \definefontsynonym [SerifItalic]     [HoeflerText-Italic]      [features=default]
+    \definefontsynonym [SerifBold]       [HoeflerText-Black]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [HoeflerText-BlackItalic] [features=default]
+\stoptypescript
+
+\starttypescript [hoefler]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
 % Impact
 
 \starttypescript [sans] [impact]
     \definefontsynonym [Impact-Regular] [name:impact] [features=default]
 \stoptypescript
 
+\starttypescript [sans] [impact]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [Impact-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [impact]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Andale Mono / Monaco
 
 \starttypescript [mono] [andalemono,monaco]
     \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular] [name:\typescriptprefix{f:\typescripttwo}] [features=default]
 \stoptypescript
 
+\starttypescript [mono] [andalemono,monaco]
+    \setups[font:fallback:mono]
+    \definefontsynonym [Mono] [\typescriptprefix{n:\typescripttwo}-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [andalemono,monaco]
+    \definetypeface [\typescriptone] [tt] [mono] [\typescriptone] [default]
+\stoptypescript
+
 % Optima
 
 \starttypescript [sans] [optima,optima-bold]
@@ -169,6 +425,25 @@
     \definefontsynonym [Optima-Black]      [name:optimaextrablack] [features=default]
 \stoptypescript
 
+\starttypescript [sans] [optima]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Optima-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [Optima-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [Optima-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [Optima-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [optima-bold]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]       [Optima-Bold]       [features=default]
+    \definefontsynonym [SansItalic] [Optima-BoldItalic] [features=default]
+    \definefontsynonym [SansBold]   [Optima-Black]      [features=default]
+\stoptypescript
+
+\starttypescript [optima,optima-bold]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Papyrus
 
 \starttypescript [sans] [papyrus]
@@ -176,12 +451,30 @@
     \definefontsynonym [Papyrus-Condensed] [name:papyruscondensed] [features=default]
 \stoptypescript
 
+\starttypescript [sans] [papyrus]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [Papyrus-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [papyrus]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % STFangsong
 
 \starttypescript [serif] [stfangsong]
     \definefontsynonym [STFangsong-Regular] [name:stfangsong] [features=chinese]
 \stoptypescript
 
+\starttypescript [serif] [stfangsong]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Serif] [STFangsong-Regular] [features=chinese]
+\stoptypescript
+
+\starttypescript [stfangsong]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
 % STHeiti
 
 \starttypescript [sans] [stheiti]
@@ -189,18 +482,46 @@
     \definefontsynonym [STHeiti-Regular] [name:stheiti] [features=chinese]
 \stoptypescript
 
+\starttypescript [sans] [stheiti]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [STXihei-Light]   [features=chinese]
+    \definefontsynonym [SansBold] [STKaiti-Regular] [features=chinese]
+\stoptypescript
+
+\starttypescript [stheiti]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % STKaiti
 
 \starttypescript [serif] [stkaiti]
     \definefontsynonym [STKaiti-Regular] [name:stkaiti] [features=chinese]
 \stoptypescript
 
+\starttypescript [serif] [stkaiti]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Serif] [STKaiti-Regular] [features=chinese]
+\stoptypescript
+
+\starttypescript [stkaiti]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
 % STSong
 
 \starttypescript [serif] [stsong]
     \definefontsynonym [STSong-Regular] [name:stsong] [features=chinese]
 \stoptypescript
 
+\starttypescript [serif] [stsong]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Serif] [STSong-Regular] [features=chinese]
+\stoptypescript
+
+\starttypescript [stsong]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
 % Chalkboard / Comic Sans / Tahoma
 
 \starttypescript [sans] [chalkboard,comicsans,tahoma]
@@ -208,6 +529,16 @@
     \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]    [name:\typescriptprefix{f:\typescripttwo}bold] [features=default]
 \stoptypescript
 
+\starttypescript [sans] [chalkboard,comicsans,lucidagrande,tahoma]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [\typescriptprefix{n:\typescripttwo}-Regular] [features=default]
+    \definefontsynonym [SansBold] [\typescriptprefix{n:\typescripttwo}-Bold]    [features=default]
+\stoptypescript
+
+\starttypescript [chalkboard,comicsans,tahoma]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
 % Cochin / Courier New / Georgia / Times New Roman / Trebuchet / Verdana
 
 \starttypescript [serif,sans,mono] [cochin,georgia,timesnewroman,trebuchet,verdana,couriernew]
@@ -217,4 +548,46 @@
     \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [name:\typescriptprefix{f:\typescripttwo}bolditalic] [features=default]
 \stoptypescript
 
+\starttypescript [serif] [cochin,georgia,timesnewroman]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [cochin,georgia,timesnewroman]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
+% Courier New
+
+% \starttypescript [mono] [couriernew]
+%     \setups[font:fallback:mono]
+%     \definefontsynonym [Mono]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
+%     \definefontsynonym [MonoItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
+%     \definefontsynonym [MonoBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
+%     \definefontsynonym [MonoBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
+% \stoptypescript
+
+% \starttypescript [couriernew]
+%     \definetypeface [\typescriptone] [tt] [mono] [\typescriptone] [default]
+% \stoptypescript
+
+% Trebuchet / Verdana
+
+% \starttypescript [sans] [trebuchet,verdana]
+%     \setups[font:fallback:sans]
+%     \definefontsynonym [Sans]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
+%     \definefontsynonym [SansItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
+%     \definefontsynonym [SansBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
+%     \definefontsynonym [SansBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
+% \stoptypescript
+
+% \starttypescript [trebuchet,verdana]
+%     \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+% \stoptypescript
+
+\stoptypescriptcollection
+
 \endinput
diff --git a/tex/context/base/type-mac.tex b/tex/context/base/type-mac.tex
deleted file mode 100644
index 04ac6139b..000000000
--- a/tex/context/base/type-mac.tex
+++ /dev/null
@@ -1,434 +0,0 @@
-%D \module
-%D   [       file=type-mac,
-%D        version=2009.03.10,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Mac OS X Definitions,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C This module is part of the \CONTEXT\ macro||package. See
-%C mreadme.pdf for details.
-
-\starttypescriptcollection [macosx]
-
-\definetypescriptprefix [n:andalemono]      [AndaleMono]
-\definetypescriptprefix [n:chalkboard]      [Chalkboard]
-\definetypescriptprefix [n:cochin]          [Cochin]
-\definetypescriptprefix [n:comicsans]       [ComicSans]
-\definetypescriptprefix [n:couriernew]      [CourierNew]
-\definetypescriptprefix [n:georgia]         [Georgia]
-\definetypescriptprefix [n:lucidagrande]    [LucidaGrande]
-\definetypescriptprefix [n:monaco]          [Monaco]
-\definetypescriptprefix [n:tahoma]          [Tahoma]
-\definetypescriptprefix [n:timesnewroman]   [TimesNewRoman]
-\definetypescriptprefix [n:trebuchet]       [Trebuchet]
-\definetypescriptprefix [n:verdana]         [Verdana]
-
-% American Typewriter
-
-\starttypescript [serif] [americantypewriter-light-condensed]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]     [AmericanTypewriter-LightCond] [features=default]
-    \definefontsynonym [SerifBold] [AmericanTypewriter-Condensed] [features=default]
-\stoptypescript
-
-\starttypescript [serif] [americantypewriter-condensed]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]     [AmericanTypewriter-Condensed] [features=default]
-    \definefontsynonym [SerifBold] [AmericanTypewriter-BoldCond]  [features=default]
-\stoptypescript
-
-\starttypescript [serif] [americantypewriter-light]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]     [AmericanTypewriter-Light]     [features=default]
-    \definefontsynonym [SerifBold] [AmericanTypewriter-Regular]   [features=default]
-\stoptypescript
-
-\starttypescript [serif] [americantypewriter]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]     [AmericanTypewriter-Regular]   [features=default]
-    \definefontsynonym [SerifBold] [AmericanTypewriter-Bold]      [features=default]
-\stoptypescript
-
-\starttypescript [americantypewriter-light-condensed,americantypewriter-condensed,americantypewriter-light,americantypewriter]
-    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
-\stoptypescript
-
-% Arial / Arial Narrow / Arial Rounded / Arial Unicode
-
-\starttypescript [sans] [arial-narrow,arial-condensed]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [Arial-Condensed]      [features=default]
-    \definefontsynonym [SansItalic]     [Arial-ItalicCond]     [features=default]
-    \definefontsynonym [SansBold]       [Arial-BoldCond]       [features=default]
-    \definefontsynonym [SansBoldItalic] [Arial-BoldItalicCond] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [arial]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [Arial-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [Arial-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [Arial-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [Arial-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [arial-rounded]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans] [Arial-Rounded] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [arial-unicode]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans] [Arial-Unicode] [features=default]
-\stoptypescript
-
-\starttypescript [arial-narrow,arial-condensed,arial,arial-rounded,arial-unicode]
-    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
-\stoptypescript
-
-% Baskerville
-
-\starttypescript [serif] [baskerville]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [Baskerville-Regular]      [features=default]
-    \definefontsynonym [SerifItalic]     [Baskerville-Italic]       [features=default]
-    \definefontsynonym [SerifBold]       [Baskerville-Medium]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [Baskerville-MediumItalic] [features=default]
-\stoptypescript
-
-\starttypescript [baskerville]
-    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
-\stoptypescript
-
-% Big Caslon
-
-\starttypescript [serif] [caslon,bigcaslon]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif] [BigCaslon-Medium] [features=default]
-\stoptypescript
-
-\starttypescript [caslon,bigcaslon]
-    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
-\stoptypescript
-
-% Copperplate
-
-\starttypescript [sans] [copperplate-light]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]     [Copperplate-Light]   [features=default]
-    \definefontsynonym [SansBold] [Copperplate-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [copperplate]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]     [Copperplate-Regular] [features=default]
-    \definefontsynonym [SansBold] [Copperplate-Bold]    [features=default]
-\stoptypescript
-
-\starttypescript [copperplate-light,copperplate]
-    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
-\stoptypescript
-
-% Courier New
-
-\starttypescript [mono] [couriernew]
-    \setups[font:fallback:mono]
-    \definefontsynonym [Mono]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
-    \definefontsynonym [MonoItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
-    \definefontsynonym [MonoBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
-    \definefontsynonym [MonoBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [couriernew]
-    \definetypeface [\typescriptone] [tt] [mono] [\typescriptone] [default]
-\stoptypescript
-
-% Futura
-
-\starttypescript [sans] [futura-condensed]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]     [Futura-MediumCond] [features=default]
-    \definefontsynonym [SansBold] [Futura-BoldCond]   [features=default]
-\stoptypescript
-
-\starttypescript [sans] [futura]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]       [Futura-Medium]       [features=default]
-    \definefontsynonym [SansItalic] [Futura-MediumItalic] [features=default]
-\stoptypescript
-
-\starttypescript [futura-condensed,futura]
-    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
-\stoptypescript
-
-% Gill Sans
-
-\starttypescript [sans] [gillsans-light]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [GillSans-Light]       [features=default]
-    \definefontsynonym [SansItalic]     [GillSans-LightItalic] [features=default]
-    \definefontsynonym [SansBold]       [GillSans-Regular]     [features=default]
-    \definefontsynonym [SansBoldItalic] [GillSans-Italic]      [features=default]
-\stoptypescript
-
-\starttypescript [sans] [gillsans]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [GillSans-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [GillSans-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [GillSans-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [GillSans-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [gillsans-light,gillsans]
-    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
-\stoptypescript
-
-% Helvetica Neuse
-
-\starttypescript [sans] [helvetica-neue-ultralight]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [HelveticaNeue-UltraLight]       [features=default]
-    \definefontsynonym [SansItalic]     [HelveticaNeue-UltraLightItalic] [features=default]
-    \definefontsynonym [SansBold]       [HelveticaNeue-Light]            [features=default]
-    \definefontsynonym [SansBoldItalic] [HelveticaNeue-LightItalic]      [features=default]
-\stoptypescript
-
-\starttypescript [sans] [helvetica-neue-light]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [HelveticaNeue-Light]       [features=default]
-    \definefontsynonym [SansItalic]     [HelveticaNeue-LightItalic] [features=default]
-    \definefontsynonym [SansBold]       [HelveticaNeue-Regular]     [features=default]
-    \definefontsynonym [SansBoldItalic] [HelveticaNeue-Italic]      [features=default]
-\stoptypescript
-
-\starttypescript [sans] [helvetica-neue]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [HelveticaNeue-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [HelveticaNeue-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [HelveticaNeue-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [HelveticaNeue-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [helvetica-neue-boldcondensed]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]     [HelveticaNeue-BoldCond]  [features=default]
-    \definefontsynonym [SansBold] [HelveticaNeue-BlackCond] [features=default]
-\stoptypescript
-
-\starttypescript [helvetica-neue-ultralight,helvetica-neue-light,helvetica-neue,helvetica-neue-boldcondensed]
-    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
-\stoptypescript
-
-% Hiragino Mincho
-
-\starttypescript [serif] [hiragino-mincho]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]     [HiraginoMinchoPro-Regular] [features=japanese]
-    \definefontsynonym [SerifBold] [HiraginoMinchoPro-Bold]    [features=japanese]
-\stoptypescript
-
-% \starttypescript [serif] [hiragino-mincho]
-%     \setups[font:fallback:serif]
-%     \definefontsynonym [Serif]     [HiraginoMinchoProN-Regular] [features=japanese]
-%     \definefontsynonym [SerifBold] [HiraginoMinchoProN-Bold]    [features=japanese]
-% \stoptypescript
-
-\starttypescript [hiragino-mincho]
-    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
-\stoptypescript
-
-% Hiragino Maru
-
-\starttypescript [sans] [hiragino-maru]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans] [HiraginoMaruGothicPro-Regular] [features=japanese]
-\stoptypescript
-
-% \starttypescript [sans] [hiragino-maru]
-%     \setups[font:fallback:sans]
-%     \definefontsynonym [Sans] [HiraginoMaruGothicProN-Regular] [features=japanese]
-% \stoptypescript
-
-\starttypescript [hiragino-maru]
-    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
-\stoptypescript
-
-% Hiragino Kaku
-
-\starttypescript [sans] [hiragino-kaku]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]     [HiraginoKakuGothicPro-Regular] [features=japanese]
-    \definefontsynonym [SansBold] [HiraginoKakuGothicPro-Bold]    [features=japanese]
-\stoptypescript
-
-% \starttypescript [sans] [hiragino-kaku]
-%     \setups[font:fallback:sans]
-%     \definefontsynonym [Sans]     [HiraginoKakuGothicProN-Regular] [features=japanese]
-%     \definefontsynonym [SansBold] [HiraginoKakuGothicProN-Bold]    [features=japanese]
-% \stoptypescript
-
-\starttypescript [hiragino-kaku]
-    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
-\stoptypescript
-
-% Hoefler Text
-
-\starttypescript [serif] [hoefler]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [HoeflerText-Regular]     [features=default]
-    \definefontsynonym [SerifItalic]     [HoeflerText-Italic]      [features=default]
-    \definefontsynonym [SerifBold]       [HoeflerText-Black]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [HoeflerText-BlackItalic] [features=default]
-\stoptypescript
-
-\starttypescript [hoefler]
-    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
-\stoptypescript
-
-% Impact
-
-\starttypescript [sans] [impact]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans] [Impact-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [impact]
-    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
-\stoptypescript
-
-% Andale Mono / Monaco
-
-\starttypescript [mono] [andalemono,monaco]
-    \setups[font:fallback:mono]
-    \definefontsynonym [Mono] [\typescriptprefix{n:\typescripttwo}-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [andalemono,monaco]
-    \definetypeface [\typescriptone] [tt] [mono] [\typescriptone] [default]
-\stoptypescript
-
-% Optima
-
-\starttypescript [sans] [optima]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [Optima-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [Optima-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [Optima-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [Optima-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [optima-bold]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]       [Optima-Bold]       [features=default]
-    \definefontsynonym [SansItalic] [Optima-BoldItalic] [features=default]
-    \definefontsynonym [SansBold]   [Optima-Black]      [features=default]
-\stoptypescript
-
-\starttypescript [optima,optima-bold]
-    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
-\stoptypescript
-
-% Papyrus
-
-\starttypescript [sans] [papyrus]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans] [Papyrus-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [papyrus]
-    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
-\stoptypescript
-
-% STFangsong
-
-\starttypescript [serif] [stfangsong]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Serif] [STFangsong-Regular] [features=chinese]
-\stoptypescript
-
-\starttypescript [stfangsong]
-    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
-\stoptypescript
-
-% STHeiti
-
-\starttypescript [sans] [stheiti]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]     [STXihei-Light]   [features=chinese]
-    \definefontsynonym [SansBold] [STKaiti-Regular] [features=chinese]
-\stoptypescript
-
-\starttypescript [stheiti]
-    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
-\stoptypescript
-
-% STKaiti
-
-\starttypescript [serif] [stkaiti]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Serif] [STKaiti-Regular] [features=chinese]
-\stoptypescript
-
-\starttypescript [stkaiti]
-    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
-\stoptypescript
-
-% STSong
-
-\starttypescript [serif] [stsong]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Serif] [STSong-Regular] [features=chinese]
-\stoptypescript
-
-\starttypescript [stsong]
-    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
-\stoptypescript
-
-% Chalkboard / Comic Sans / Tahoma
-
-\starttypescript [sans] [chalkboard,comicsans,lucidagrande,tahoma]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]     [\typescriptprefix{n:\typescripttwo}-Regular] [features=default]
-    \definefontsynonym [SansBold] [\typescriptprefix{n:\typescripttwo}-Bold]    [features=default]
-\stoptypescript
-
-\starttypescript [chalkboard,comicsans,tahoma]
-    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
-\stoptypescript
-
-% Cochin / Georgia / Times New Roman
-
-\starttypescript [serif] [cochin,georgia,timesnewroman]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [cochin,georgia,timesnewroman]
-    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
-\stoptypescript
-
-% Trebuchet / Verdana
-
-\starttypescript [sans] [trebuchet,verdana]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [trebuchet,verdana]
-    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
-\stoptypescript
-
-\stoptypescriptcollection
-
-% XeTeX / LuaTeX font names
-
-\loadmarkfile{type-mac}
-
-\endinput
diff --git a/tex/context/base/type-msw.mkii b/tex/context/base/type-msw.mkii
new file mode 100644
index 000000000..26ec190cb
--- /dev/null
+++ b/tex/context/base/type-msw.mkii
@@ -0,0 +1 @@
+\input type-win.mkii \endinput % could be a file synonym
diff --git a/tex/context/base/type-msw.mkiv b/tex/context/base/type-msw.mkiv
new file mode 100644
index 000000000..2e741f7a0
--- /dev/null
+++ b/tex/context/base/type-msw.mkiv
@@ -0,0 +1 @@
+\input type-win.mkiv \endinput % could be a file synonym
diff --git a/tex/context/base/type-one.tex b/tex/context/base/type-one.tex
deleted file mode 100644
index bd18eb281..000000000
--- a/tex/context/base/type-one.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-%D \module
-%D   [       file=type-one,
-%D        version=2007.07.30,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Type One Definitions,
-%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.
-
-\loadmarkfile{type-one}
-
-\endinput
diff --git a/tex/context/base/type-otf.mkii b/tex/context/base/type-otf.mkii
index 56fdda466..014ec59dc 100644
--- a/tex/context/base/type-otf.mkii
+++ b/tex/context/base/type-otf.mkii
@@ -16,6 +16,28 @@
 %D in good old \TEX, and these may differ a bit. Here we also see
 %D some oldstyle definitions which normally are done with features.
 
+\starttypescriptcollection[fallback]
+
+\starttypescript [fallback]
+    \definetypeface [] [rm] [serif] [modern] [computer-modern]
+    \definetypeface [] [ss] [sans]  [modern] [computer-modern]
+    \definetypeface [] [tt] [mono]  [modern] [computer-modern]
+    \definetypeface [] [mm] [math]  [modern] [computer-modern]
+    \quittypescriptscanning
+\stoptypescript
+
+% faster
+%
+% \starttypescript [fallback]
+%     \definetypeface [] [rm] [serif] [modern] [default]
+%     \definetypeface [] [ss] [sans]  [modern] [default]
+%     \definetypeface [] [tt] [mono]  [modern] [default]
+%     \definetypeface [] [mm] [math]  [modern] [default]
+%     \quittypescriptscanning
+% \stoptypescript
+
+\stoptypescriptcollection
+
 % if a fontname equals the filename, then use
 %
 % \setupfontsynonym  [LMRoman10-DemiOblique]                              [features=default] % file is lowercase, so fails
diff --git a/tex/context/base/type-otf.mkiv b/tex/context/base/type-otf.mkiv
index ddbf3f13c..e97956ad5 100644
--- a/tex/context/base/type-otf.mkiv
+++ b/tex/context/base/type-otf.mkiv
@@ -16,6 +16,28 @@
 %D in good old \TEX, and these may differ a bit. Here we also see
 %D some oldstyle definitions which normally are done with features.
 
+\starttypescriptcollection[fallback]
+
+\starttypescript [fallback]
+    \definetypeface [] [rm] [serif] [modern] [computer-modern]
+    \definetypeface [] [ss] [sans]  [modern] [computer-modern]
+    \definetypeface [] [tt] [mono]  [modern] [computer-modern]
+    \definetypeface [] [mm] [math]  [modern] [computer-modern]
+    \quittypescriptscanning
+\stoptypescript
+
+% faster
+%
+% \starttypescript [fallback]
+%     \definetypeface [] [rm] [serif] [modern] [default]
+%     \definetypeface [] [ss] [sans]  [modern] [default]
+%     \definetypeface [] [tt] [mono]  [modern] [default]
+%     \definetypeface [] [mm] [math]  [modern] [default]
+%     \quittypescriptscanning
+% \stoptypescript
+
+\stoptypescriptcollection
+
 % if a fontname equals the filename, then use
 %
 % \setupfontsynonym  [LMRoman10-DemiOblique]                                 [\s!features=\s!default] % file is lowercase, so fails
diff --git a/tex/context/base/type-otf.tex b/tex/context/base/type-otf.tex
deleted file mode 100644
index 234c2221d..000000000
--- a/tex/context/base/type-otf.tex
+++ /dev/null
@@ -1,43 +0,0 @@
-%D \module
-%D   [       file=type-otf,
-%D        version=2007.07.30,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Opentype Definitions,
-%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 Actually, \LUATEX\ does not need all these definitions since it can
-%D consult its database. However, here we use the names that we used
-%D in good old \TEX, and these may differ a bit. Here we also see
-%D some oldstyle definitions which normally are done with features.
-
-\starttypescriptcollection[fallback]
-
-\starttypescript [fallback]
-    \definetypeface [] [rm] [serif] [modern] [computer-modern]
-    \definetypeface [] [ss] [sans]  [modern] [computer-modern]
-    \definetypeface [] [tt] [mono]  [modern] [computer-modern]
-    \definetypeface [] [mm] [math]  [modern] [computer-modern]
-    \quittypescriptscanning
-\stoptypescript
-
-% faster
-%
-% \starttypescript [fallback]
-%     \definetypeface [] [rm] [serif] [modern] [default]
-%     \definetypeface [] [ss] [sans]  [modern] [default]
-%     \definetypeface [] [tt] [mono]  [modern] [default]
-%     \definetypeface [] [mm] [math]  [modern] [default]
-%     \quittypescriptscanning
-% \stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-otf}
-
-\endinput
diff --git a/tex/context/base/type-pre.tex b/tex/context/base/type-pre.mkii
index ad2109a65..ad2109a65 100644
--- a/tex/context/base/type-pre.tex
+++ b/tex/context/base/type-pre.mkii
diff --git a/tex/context/base/type-siz.mkii b/tex/context/base/type-siz.mkii
index 6bf7f01f4..831019e95 100644
--- a/tex/context/base/type-siz.mkii
+++ b/tex/context/base/type-siz.mkii
@@ -11,6 +11,163 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+\starttypescriptcollection[size]
+
+\starttypescript [serif] [default] [size]
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [rm] [default]
+\stoptypescript
+
+\starttypescript [sans] [default] [size]
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [ss] [default]
+\stoptypescript
+
+\starttypescript [mono] [default] [size]
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [tt] [default]
+\stoptypescript
+
+\starttypescript [math,boldmath] [default] [size]
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [mm] [default]
+\stoptypescript
+
+\starttypescript [bfmath] [default] [size]
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [mm] [bfmath]
+\stoptypescript
+
+\starttypescript [handwriting] [default] [size]
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [hw] [default]
+\stoptypescript
+
+\starttypescript [calligraphy] [default] [size]
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [cg] [default]
+\stoptypescript
+
+\starttypescript [casual] [default] [size] % maps onto rm !
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [rm] [default]
+\stoptypescript
+
+\starttypescript [all] [dtp] [size]
+
+  \definebodyfontenvironment
+    [4pt]
+    [\s!text=4pt,\s!script=4pt,\s!scriptscript=4pt,
+     \c!x=4pt,\c!xx=4pt,\c!big=6pt,\c!small=4pt]
+
+  \definebodyfontenvironment
+    [5pt]
+    [\s!text=5pt,\s!script=5pt,\s!scriptscript=5pt,
+     \c!x=5pt,\c!xx=5pt,\c!big=7pt,\c!small=5pt]
+
+  \definebodyfontenvironment
+    [6pt]
+    [\s!text=6pt,\s!script=5pt,\s!scriptscript=5pt,
+     \c!x=5pt,\c!xx=5pt,\c!big=8pt,\c!small=5pt]
+
+  \definebodyfontenvironment
+    [7pt]
+    [\s!text=7pt,\s!script=6pt,\s!scriptscript=5pt,
+     \c!x=6pt,\c!xx=5pt,\c!big=9pt,\c!small=5pt]
+
+  \definebodyfontenvironment
+    [8pt]
+    [\s!text=8pt,\s!script=6pt,\s!scriptscript=5pt,
+     \c!x=6pt,\c!xx=5pt,\c!big=10pt,\c!small=6pt]
+
+  \definebodyfontenvironment
+    [9pt]
+    [\s!text=9pt,\s!script=7pt,\s!scriptscript=5pt,
+     \c!x=7pt,\c!xx=5pt,\c!big=11pt,\c!small=7pt]
+
+  \definebodyfontenvironment
+    [10pt]
+    [\s!text=10pt,\s!script=7pt,\s!scriptscript=5pt,
+     \c!x=8pt,\c!xx=6pt,\c!big=12pt,\c!small=8pt]
+
+  \definebodyfontenvironment
+    [11pt]
+    [\s!text=11pt,\s!script=8pt,\s!scriptscript=6pt,
+     \c!x=9pt,\c!xx=7pt,\c!big=13pt,\c!small=9pt]
+
+  \definebodyfontenvironment
+    [12pt]
+    [\s!text=12pt,\s!script=9pt,\s!scriptscript=7pt,
+     \c!x=10pt,\c!xx=8pt,\c!big=14pt,\c!small=10pt]
+
+  \definebodyfontenvironment
+    [13pt]
+    [\s!text=13pt,\s!script=10pt,\s!scriptscript=8pt,
+     \c!x=11pt,\c!xx=9pt,\c!big=16pt,\c!small=11pt]
+
+  \definebodyfontenvironment
+    [14pt]
+    [\s!text=14pt,\s!script=10pt,\s!scriptscript=7pt,
+     \c!x=12pt,\c!xx=10pt,\c!big=16pt,\c!small=12pt]
+
+  \definebodyfontenvironment
+    [16pt]
+    [\s!text=16pt,\s!script=12pt,\s!scriptscript=9pt,
+     \c!x=13pt,\c!xx=11pt,\c!big=18pt,\c!small=14pt]
+
+  % suboptimal math sizes
+
+  \definebodyfontenvironment
+    [18pt]
+    [\s!text=18pt,\s!script=16pt,\s!scriptscript=14pt,
+     \c!x=16pt,\c!xx=14pt,\c!big=22pt,\c!small=16pt]
+
+  \definebodyfontenvironment
+    [22pt]
+    [\s!text=22pt,\s!script=22pt,\s!scriptscript=18pt,
+     \c!x=18pt,\c!xx=16pt,\c!big=28pt,\c!small=18pt]
+
+  \definebodyfontenvironment
+    [28pt]
+    [\s!text=28pt,\s!script=22pt,\s!scriptscript=18pt,
+     \c!x=22pt,\c!xx=18pt,\c!big=28pt,\c!small=22pt]
+
+\stoptypescript
+
+\starttypescript [serif] [dtp] [size]
+  \definebodyfont
+    [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt]
+    [rm] [default]
+\stoptypescript
+
+\starttypescript [sans] [dtp] [size]
+  \definebodyfont
+    [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt]
+    [ss] [default]
+\stoptypescript
+
+\starttypescript [mono] [dtp] [size]
+  \definebodyfont
+    [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt]
+    [tt] [default]
+\stoptypescript
+
+\starttypescript [math,boldmath] [dtp] [size]
+  \definebodyfont
+    [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt]
+    [mm] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
 \starttypescriptcollection[size-mkii]
 
 % todo: instead of assuming designsize we will set it explicitly (saves these
diff --git a/tex/context/base/type-siz.mkiv b/tex/context/base/type-siz.mkiv
index fb06267d4..f513c7392 100644
--- a/tex/context/base/type-siz.mkiv
+++ b/tex/context/base/type-siz.mkiv
@@ -11,6 +11,163 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+\starttypescriptcollection[size]
+
+\starttypescript [serif] [default] [size]
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [rm] [default]
+\stoptypescript
+
+\starttypescript [sans] [default] [size]
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [ss] [default]
+\stoptypescript
+
+\starttypescript [mono] [default] [size]
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [tt] [default]
+\stoptypescript
+
+\starttypescript [math,boldmath] [default] [size]
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [mm] [default]
+\stoptypescript
+
+\starttypescript [bfmath] [default] [size]
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [mm] [bfmath]
+\stoptypescript
+
+\starttypescript [handwriting] [default] [size]
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [hw] [default]
+\stoptypescript
+
+\starttypescript [calligraphy] [default] [size]
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [cg] [default]
+\stoptypescript
+
+\starttypescript [casual] [default] [size] % maps onto rm !
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [rm] [default]
+\stoptypescript
+
+\starttypescript [all] [dtp] [size]
+
+  \definebodyfontenvironment
+    [4pt]
+    [\s!text=4pt,\s!script=4pt,\s!scriptscript=4pt,
+     \c!x=4pt,\c!xx=4pt,\c!big=6pt,\c!small=4pt]
+
+  \definebodyfontenvironment
+    [5pt]
+    [\s!text=5pt,\s!script=5pt,\s!scriptscript=5pt,
+     \c!x=5pt,\c!xx=5pt,\c!big=7pt,\c!small=5pt]
+
+  \definebodyfontenvironment
+    [6pt]
+    [\s!text=6pt,\s!script=5pt,\s!scriptscript=5pt,
+     \c!x=5pt,\c!xx=5pt,\c!big=8pt,\c!small=5pt]
+
+  \definebodyfontenvironment
+    [7pt]
+    [\s!text=7pt,\s!script=6pt,\s!scriptscript=5pt,
+     \c!x=6pt,\c!xx=5pt,\c!big=9pt,\c!small=5pt]
+
+  \definebodyfontenvironment
+    [8pt]
+    [\s!text=8pt,\s!script=6pt,\s!scriptscript=5pt,
+     \c!x=6pt,\c!xx=5pt,\c!big=10pt,\c!small=6pt]
+
+  \definebodyfontenvironment
+    [9pt]
+    [\s!text=9pt,\s!script=7pt,\s!scriptscript=5pt,
+     \c!x=7pt,\c!xx=5pt,\c!big=11pt,\c!small=7pt]
+
+  \definebodyfontenvironment
+    [10pt]
+    [\s!text=10pt,\s!script=7pt,\s!scriptscript=5pt,
+     \c!x=8pt,\c!xx=6pt,\c!big=12pt,\c!small=8pt]
+
+  \definebodyfontenvironment
+    [11pt]
+    [\s!text=11pt,\s!script=8pt,\s!scriptscript=6pt,
+     \c!x=9pt,\c!xx=7pt,\c!big=13pt,\c!small=9pt]
+
+  \definebodyfontenvironment
+    [12pt]
+    [\s!text=12pt,\s!script=9pt,\s!scriptscript=7pt,
+     \c!x=10pt,\c!xx=8pt,\c!big=14pt,\c!small=10pt]
+
+  \definebodyfontenvironment
+    [13pt]
+    [\s!text=13pt,\s!script=10pt,\s!scriptscript=8pt,
+     \c!x=11pt,\c!xx=9pt,\c!big=16pt,\c!small=11pt]
+
+  \definebodyfontenvironment
+    [14pt]
+    [\s!text=14pt,\s!script=10pt,\s!scriptscript=7pt,
+     \c!x=12pt,\c!xx=10pt,\c!big=16pt,\c!small=12pt]
+
+  \definebodyfontenvironment
+    [16pt]
+    [\s!text=16pt,\s!script=12pt,\s!scriptscript=9pt,
+     \c!x=13pt,\c!xx=11pt,\c!big=18pt,\c!small=14pt]
+
+  % suboptimal math sizes
+
+  \definebodyfontenvironment
+    [18pt]
+    [\s!text=18pt,\s!script=16pt,\s!scriptscript=14pt,
+     \c!x=16pt,\c!xx=14pt,\c!big=22pt,\c!small=16pt]
+
+  \definebodyfontenvironment
+    [22pt]
+    [\s!text=22pt,\s!script=22pt,\s!scriptscript=18pt,
+     \c!x=18pt,\c!xx=16pt,\c!big=28pt,\c!small=18pt]
+
+  \definebodyfontenvironment
+    [28pt]
+    [\s!text=28pt,\s!script=22pt,\s!scriptscript=18pt,
+     \c!x=22pt,\c!xx=18pt,\c!big=28pt,\c!small=22pt]
+
+\stoptypescript
+
+\starttypescript [serif] [dtp] [size]
+  \definebodyfont
+    [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt]
+    [rm] [default]
+\stoptypescript
+
+\starttypescript [sans] [dtp] [size]
+  \definebodyfont
+    [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt]
+    [ss] [default]
+\stoptypescript
+
+\starttypescript [mono] [dtp] [size]
+  \definebodyfont
+    [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt]
+    [tt] [default]
+\stoptypescript
+
+\starttypescript [math,boldmath] [dtp] [size]
+  \definebodyfont
+    [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt]
+    [mm] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
 \starttypescriptcollection[size-mkiv]
 
 \starttypescript [serif] [computer-modern] [size]
diff --git a/tex/context/base/type-siz.tex b/tex/context/base/type-siz.tex
deleted file mode 100644
index 56b54b301..000000000
--- a/tex/context/base/type-siz.tex
+++ /dev/null
@@ -1,179 +0,0 @@
-%D \module
-%D   [       file=type-siz,
-%D        version=2001.04.12,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Sizing scripts,
-%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.
-
-% we need to use proper verbose names, which saves us a resolve
-
-\unprotect
-
-\starttypescriptcollection[size]
-
-\starttypescript [serif] [default] [size]
-  \definebodyfont
-    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
-    [rm] [default]
-\stoptypescript
-
-\starttypescript [sans] [default] [size]
-  \definebodyfont
-    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
-    [ss] [default]
-\stoptypescript
-
-\starttypescript [mono] [default] [size]
-  \definebodyfont
-    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
-    [tt] [default]
-\stoptypescript
-
-\starttypescript [math,boldmath] [default] [size]
-  \definebodyfont
-    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
-    [mm] [default]
-\stoptypescript
-
-\starttypescript [bfmath] [default] [size]
-  \definebodyfont
-    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
-    [mm] [bfmath]
-\stoptypescript
-
-\starttypescript [handwriting] [default] [size]
-  \definebodyfont
-    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
-    [hw] [default]
-\stoptypescript
-
-\starttypescript [calligraphy] [default] [size]
-  \definebodyfont
-    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
-    [cg] [default]
-\stoptypescript
-
-\starttypescript [casual] [default] [size] % maps onto rm !
-  \definebodyfont
-    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
-    [rm] [default]
-\stoptypescript
-
-\starttypescript [all] [dtp] [size]
-
-  \definebodyfontenvironment
-    [4pt]
-    [\s!text=4pt,\s!script=4pt,\s!scriptscript=4pt,
-     \c!x=4pt,\c!xx=4pt,\c!big=6pt,\c!small=4pt]
-
-  \definebodyfontenvironment
-    [5pt]
-    [\s!text=5pt,\s!script=5pt,\s!scriptscript=5pt,
-     \c!x=5pt,\c!xx=5pt,\c!big=7pt,\c!small=5pt]
-
-  \definebodyfontenvironment
-    [6pt]
-    [\s!text=6pt,\s!script=5pt,\s!scriptscript=5pt,
-     \c!x=5pt,\c!xx=5pt,\c!big=8pt,\c!small=5pt]
-
-  \definebodyfontenvironment
-    [7pt]
-    [\s!text=7pt,\s!script=6pt,\s!scriptscript=5pt,
-     \c!x=6pt,\c!xx=5pt,\c!big=9pt,\c!small=5pt]
-
-  \definebodyfontenvironment
-    [8pt]
-    [\s!text=8pt,\s!script=6pt,\s!scriptscript=5pt,
-     \c!x=6pt,\c!xx=5pt,\c!big=10pt,\c!small=6pt]
-
-  \definebodyfontenvironment
-    [9pt]
-    [\s!text=9pt,\s!script=7pt,\s!scriptscript=5pt,
-     \c!x=7pt,\c!xx=5pt,\c!big=11pt,\c!small=7pt]
-
-  \definebodyfontenvironment
-    [10pt]
-    [\s!text=10pt,\s!script=7pt,\s!scriptscript=5pt,
-     \c!x=8pt,\c!xx=6pt,\c!big=12pt,\c!small=8pt]
-
-  \definebodyfontenvironment
-    [11pt]
-    [\s!text=11pt,\s!script=8pt,\s!scriptscript=6pt,
-     \c!x=9pt,\c!xx=7pt,\c!big=13pt,\c!small=9pt]
-
-  \definebodyfontenvironment
-    [12pt]
-    [\s!text=12pt,\s!script=9pt,\s!scriptscript=7pt,
-     \c!x=10pt,\c!xx=8pt,\c!big=14pt,\c!small=10pt]
-
-  \definebodyfontenvironment
-    [13pt]
-    [\s!text=13pt,\s!script=10pt,\s!scriptscript=8pt,
-     \c!x=11pt,\c!xx=9pt,\c!big=16pt,\c!small=11pt]
-
-  \definebodyfontenvironment
-    [14pt]
-    [\s!text=14pt,\s!script=10pt,\s!scriptscript=7pt,
-     \c!x=12pt,\c!xx=10pt,\c!big=16pt,\c!small=12pt]
-
-  \definebodyfontenvironment
-    [16pt]
-    [\s!text=16pt,\s!script=12pt,\s!scriptscript=9pt,
-     \c!x=13pt,\c!xx=11pt,\c!big=18pt,\c!small=14pt]
-
-  % suboptimal math sizes
-
-  \definebodyfontenvironment
-    [18pt]
-    [\s!text=18pt,\s!script=16pt,\s!scriptscript=14pt,
-     \c!x=16pt,\c!xx=14pt,\c!big=22pt,\c!small=16pt]
-
-  \definebodyfontenvironment
-    [22pt]
-    [\s!text=22pt,\s!script=22pt,\s!scriptscript=18pt,
-     \c!x=18pt,\c!xx=16pt,\c!big=28pt,\c!small=18pt]
-
-  \definebodyfontenvironment
-    [28pt]
-    [\s!text=28pt,\s!script=22pt,\s!scriptscript=18pt,
-     \c!x=22pt,\c!xx=18pt,\c!big=28pt,\c!small=22pt]
-
-\stoptypescript
-
-\starttypescript [serif] [dtp] [size]
-  \definebodyfont
-    [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt]
-    [rm] [default]
-\stoptypescript
-
-\starttypescript [sans] [dtp] [size]
-  \definebodyfont
-    [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt]
-    [ss] [default]
-\stoptypescript
-
-\starttypescript [mono] [dtp] [size]
-  \definebodyfont
-    [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt]
-    [tt] [default]
-\stoptypescript
-
-\starttypescript [math,boldmath] [dtp] [size]
-  \definebodyfont
-    [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt]
-    [mm] [default]
-\stoptypescript
-
-\stoptypescriptcollection
-
-\protect
-
-\loadmarkfile{type-siz}
-
-\endinput
diff --git a/tex/context/base/type-tmf.tex b/tex/context/base/type-tmf.tex
deleted file mode 100644
index 78ed89cf9..000000000
--- a/tex/context/base/type-tmf.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-%D \module
-%D   [       file=type-tmf,
-%D        version=2007.07.30,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Core \TEX\ Fonts,
-%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.
-
-\loadmarkfile{type-tmf}
-
-\endinput
diff --git a/tex/context/base/type-msw.tex b/tex/context/base/type-win.mkii
index 4757b5008..cb0ad19f5 100644
--- a/tex/context/base/type-msw.tex
+++ b/tex/context/base/type-win.mkii
@@ -26,7 +26,7 @@
 % {\tt test {\sl test} {\it test} {\bf test} {\bs test} {\bi test}}
 % \stoplines
 
-\starttypescriptcollection[microsoft windows]
+\starttypescriptcollection[windows]
 
 % verdana
 
diff --git a/tex/context/base/type-win.tex b/tex/context/base/type-win.mkiv
index 3f06fa4db..3f06fa4db 100644
--- a/tex/context/base/type-win.tex
+++ b/tex/context/base/type-win.mkiv
diff --git a/tex/context/base/type-xtx.tex b/tex/context/base/type-xtx.mkii
index 450beb6f2..0ee0130f7 100644
--- a/tex/context/base/type-xtx.tex
+++ b/tex/context/base/type-xtx.mkii
@@ -88,7 +88,6 @@
 %D Here, there are no \type{<engine-options>}, because there is no
 %D font discovery engine available to be queried.
 
-
 %D TH: This \type{\xetexcolon} definition seems needed because the name/file \
 %D parser otherwise drops the rest of the argument into oblivion.
 
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index 53494e57c..bc8b02906 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 05/02/10 16:43:27
+-- merge date  : 05/07/10 14:21:56
 
 do -- begin closure to overcome local limits and interference