2016-01-12 16:26:00

88 files changed, 7592 insertions, 0 deletions

diff --git a/tex/context/fonts/mkii/type-buy.mkii b/tex/context/fonts/mkii/type-buy.mkii
new file mode 100644
index 000000000..b8518acb0
--- /dev/null
+++ b/tex/context/fonts/mkii/type-buy.mkii
@@ -0,0 +1,571 @@
+%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 ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% fallback
+
+% todo \typescriptthree
+
+\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
+
+% ITC Officina
+
+\starttypescript [serif] [officina] [name]
+    \definefontsynonym [Serif]            [OfficinaSerif-Book]
+    \definefontsynonym [SerifItalic]      [OfficinaSerif-BookItalic]
+    \definefontsynonym [SerifSlanted]     [OfficinaSerif-BookSlanted]
+    \definefontsynonym [SerifBold]        [OfficinaSerif-Bold]
+    \definefontsynonym [SerifBoldItalic]  [OfficinaSerif-BoldItalic]
+    \definefontsynonym [SerifBoldSlanted] [OfficinaSerif-BoldSlanted]
+    \definefontsynonym [SerifCaps]        [OfficinaSerif-Caps]
+\stoptypescript
+
+\starttypescript [sans] [officina] [name]
+    \definefontsynonym [Sans]            [OfficinaSans-Book]
+    \definefontsynonym [SansItalic]      [OfficinaSans-BookItalic]
+    \definefontsynonym [SansSlanted]     [OfficinaSans-BookSlanted]
+    \definefontsynonym [SansBold]        [OfficinaSans-Bold]
+    \definefontsynonym [SansBoldItalic]  [OfficinaSans-BoldItalic]
+    \definefontsynonym [SansBoldSlanted] [OfficinaSans-BoldSlanted]
+    \definefontsynonym [SansCaps]        [OfficinaSans-Caps]
+\stoptypescript
+
+\starttypescript [serif] [officina] [texnansi,ec,8r]
+    \definefontsynonym [OfficinaSerif-Book]        [\typescriptthree-ovbk]                 [encoding=\typescriptthree]
+    \definefontsynonym [OfficinaSerif-BookItalic]  [\typescriptthree-ovwi]                 [encoding=\typescriptthree]
+    \definefontsynonym [OfficinaSerif-Bold]        [\typescriptthree-ovb]                  [encoding=\typescriptthree]
+    \definefontsynonym [OfficinaSerif-BoldItalic]  [\typescriptthree-ovbi]                 [encoding=\typescriptthree]
+    \definefontsynonym [OfficinaSerif-BookSlanted] [\typescriptthree-ovbk-slanted-167]     [encoding=\typescriptthree]
+    \definefontsynonym [OfficinaSerif-BoldSlanted] [\typescriptthree-ovb-slanted-167]      [encoding=\typescriptthree]
+    \definefontsynonym [OfficinaSerif-Caps]        [\typescriptthree-ovbk-capitalized-800] [encoding=\typescriptthree]
+    \loadmapfile [\typescriptthree-itc-officina.map]
+\stoptypescript
+
+\starttypescript [sans] [officina] [texnansi,ec,8r]
+  \definefontsynonym [OfficinaSans-Book]        [\typescriptthree-owbk]                 [encoding=\typescriptthree]
+  \definefontsynonym [OfficinaSans-BookItalic]  [\typescriptthree-owwi]                 [encoding=\typescriptthree]
+  \definefontsynonym [OfficinaSans-Bold]        [\typescriptthree-owb]                  [encoding=\typescriptthree]
+  \definefontsynonym [OfficinaSans-BoldItalic]  [\typescriptthree-owbi]                 [encoding=\typescriptthree]
+  \definefontsynonym [OfficinaSans-BookSlanted] [\typescriptthree-owbk-slanted-167]     [encoding=\typescriptthree]
+  \definefontsynonym [OfficinaSans-BoldSlanted] [\typescriptthree-owb-slanted-167]      [encoding=\typescriptthree]
+  \definefontsynonym [OfficinaSans-Caps]        [\typescriptthree-owbk-capitalized-800] [encoding=\typescriptthree]
+  \loadmapfile [\typescriptthree-itc-officina.map]
+\stoptypescript
+
+% FontFont Meta
+
+\starttypescript [sans] [meta] [name]
+    \definefontsynonym [Sans]           [MetaNormal-Roman]
+    \definefontsynonym [SansItalic]     [MetaNormal-Italic]
+    \definefontsynonym [SansSlanted]    [MetaNormal-Italic]
+    \definefontsynonym [SansBold]       [MetaBold-Roman]
+    \definefontsynonym [SansBoldItalic] [MetaBold-Italic]
+    \definefontsynonym [SansBoldSlanted][MetaBold-Italic]
+    \definefontsynonym [SansCaps]       [MetaNormal-Caps]
+\stoptypescript
+
+\starttypescript [sans] [meta-medium] [name]
+    \definefontsynonym [Sans]           [MetaMedium-Roman]
+    \definefontsynonym [SansItalic]     [MetaMedium-Italic]
+    \definefontsynonym [SansSlanted]    [MetaMedium-Italic]
+    \definefontsynonym [SansBold]       [MetaBold-Roman]
+    \definefontsynonym [SansBoldItalic] [MetaBold-Italic]
+    \definefontsynonym [SansBoldSlanted][MetaBold-Italic]
+    \definefontsynonym [SansCaps]       [MetaMedium-Caps]
+\stoptypescript
+
+\starttypescript [sans] [meta-lf] [name]
+    \definefontsynonym [Sans]           [MetaBookLF-Roman]
+    \definefontsynonym [SansBold]       [MetaBoldLF-Roman]
+    \definefontsynonym [SansItalic]     [MetaBookLF-Italic]
+    \definefontsynonym [SansBoldItalic] [MetaBoldLF-Italic]
+    \definefontsynonym [SansCaps]       [MetaBookLF-Caps]
+\stoptypescript
+
+\starttypescript [sans] [meta,meta-book] [texnansi,ec,8r]
+    \definefontsynonym [MetaBook-Roman]      [\typescriptthree-mtbk]   [encoding=\typescriptthree]
+    \definefontsynonym [MetaBook-Italic]     [\typescriptthree-mtbki]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaBook-Caps]       [\typescriptthree-mtbkc]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaBook-ItalicCaps] [\typescriptthree-mtbkic] [encoding=\typescriptthree]
+    \loadmapfile [\typescriptthree-fontfont-meta.map]
+\stoptypescript
+
+\starttypescript [sans] [meta-lf,meta-book-lf] [texnansi,ec,8r]
+    \definefontsynonym [MetaBookLF-Roman]      [\typescriptthree-mtbkf]   [encoding=\typescriptthree]
+    \definefontsynonym [MetaBookLF-Italic]     [\typescriptthree-mtbkfi]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaBookLF-Caps]       [\typescriptthree-mtbkfc]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaBookLF-ItalicCaps] [\typescriptthree-mtbkfic] [encoding=\typescriptthree]
+    \loadmapfile [\typescriptthree-fontfont-meta.map]
+\stoptypescript
+
+\starttypescript [sans] [meta,meta-bold] [texnansi,ec,8r]
+    \definefontsynonym [MetaBold-Roman]      [\typescriptthree-mtbd]   [encoding=\typescriptthree]
+    \definefontsynonym [MetaBold-Italic]     [\typescriptthree-mtbdi]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaBold-Caps]       [\typescriptthree-mtbdc]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaBold-ItalicCaps] [\typescriptthree-mtbdic] [encoding=\typescriptthree]
+    \loadmapfile [\typescriptthree-fontfont-meta.map]
+\stoptypescript
+
+\starttypescript [sans] [meta-lf,meta-bold-lf] [texnansi,ec,8r]
+    \definefontsynonym [MetaBoldLF-Roman]      [\typescriptthree-mtbdf]   [encoding=\typescriptthree]
+    \definefontsynonym [MetaBoldLF-Italic]     [\typescriptthree-mtbdfi]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaBoldLF-Caps]       [\typescriptthree-mtbdfc]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaBoldLF-ItalicCaps] [\typescriptthree-mtbdfic] [encoding=\typescriptthree]
+    \loadmapfile [\typescriptthree-fontfont-meta.map]
+\stoptypescript
+
+\starttypescript [sans] [meta-normal] [texnansi,ec,8r]
+    \definefontsynonym [MetaNormal-Roman]      [\typescriptthree-mtn]   [encoding=\typescriptthree]
+    \definefontsynonym [MetaNormal-Italic]     [\typescriptthree-mtni]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaNormal-Caps]       [\typescriptthree-mtnc]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaNormal-ItalicCaps] [\typescriptthree-mtnic] [encoding=\typescriptthree]
+    \loadmapfile [\typescriptthree-fontfont-meta.map]
+\stoptypescript
+
+\starttypescript [sans] [meta-normal-lf] [texnansi,ec,8r]
+    \definefontsynonym [MetaNormalLF-Roman]      [\typescriptthree-mtnf]   [encoding=\typescriptthree]
+    \definefontsynonym [MetaNormalLF-Italic]     [\typescriptthree-mtnfi]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaNormalLF-Caps]       [\typescriptthree-mtnfc]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaNormalLF-ItalicCaps] [\typescriptthree-mtnfic] [encoding=\typescriptthree]
+    \loadmapfile [\typescriptthree-fontfont-meta.map]
+\stoptypescript
+
+\starttypescript [sans] [meta-medium] [texnansi,ec,8r]
+    \definefontsynonym [MetaMedium-Roman]      [\typescriptthree-mtm]   [encoding=\typescriptthree]
+    \definefontsynonym [MetaMedium-Italic]     [\typescriptthree-mtmi]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaMedium-Caps]       [\typescriptthree-mtmc]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaMedium-ItalicCaps] [\typescriptthree-mtmic] [encoding=\typescriptthree]
+    \loadmapfile [\typescriptthree-fontfont-meta.map]
+\stoptypescript
+
+\starttypescript [sans] [meta-medium-lf] [texnansi,ec,8r]
+    \definefontsynonym [MetaMediumLF-Roman]      [\typescriptthree-mtmf]   [encoding=\typescriptthree]
+    \definefontsynonym [MetaMediumLF-Italic]     [\typescriptthree-mtmfi]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaMediumLF-Caps]       [\typescriptthree-mtmfc]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaMediumLF-ItalicCaps] [\typescriptthree-mtmfic] [encoding=\typescriptthree]
+    \loadmapfile [\typescriptthree-fontfont-meta.map]
+\stoptypescript
+
+\starttypescript [sans] [meta-black] [texnansi,ec,8r]
+    \definefontsynonym [MetaBlack-Roman]      [\typescriptthree-mtbl]   [encoding=\typescriptthree]
+    \definefontsynonym [MetaBlack-Italic]     [\typescriptthree-mtbli]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaBlack-Caps]       [\typescriptthree-mtblc]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaBlack-ItalicCaps] [\typescriptthree-mtblic] [encoding=\typescriptthree]
+    \loadmapfile [\typescriptthree-fontfont-meta.map]
+\stoptypescript
+
+\starttypescript [sans] [meta-black-lf] [texnansi,ec,8r]
+    \definefontsynonym [MetaBlackLF-Roman]      [\typescriptthree-mtblf]   [encoding=\typescriptthree]
+    \definefontsynonym [MetaBlackLF-Italic]     [\typescriptthree-mtblfi]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaBlackLF-Caps]       [\typescriptthree-mtblfc]  [encoding=\typescriptthree]
+    \definefontsynonym [MetaBlackLF-ItalicCaps] [\typescriptthree-mtblfic] [encoding=\typescriptthree]
+    \loadmapfile [\typescriptthree-fontfont-meta.map]
+\stoptypescript
+
+\starttypescript [expert] [meta] % incomplete
+    \definefontsynonym [MetaNormal-Expert] [mtnx]
+    \loadmapfile [\typescriptthree-fontfont-meta.map]
+\stoptypescript
+
+%D Linotype Univers
+
+\starttypescript [sans] [univers,univers-light,univers-black] [name]
+  \definefontsynonym [Sans]            [Univers]
+  \definefontsynonym [SansBold]        [Univers-Bold]
+  \definefontsynonym [SansSlanted]     [Univers-Oblique]
+  \definefontsynonym [SansBoldSlanted] [Univers-BoldOblique]
+\stoptypescript
+
+\starttypescript [sans] [univers-light] [name]
+  \definefontsynonym [Sans]            [Univers-Light]
+  \definefontsynonym [SansSlanted]     [Univers-LightOblique]
+\stoptypescript
+
+\starttypescript [sans] [univers-black] [name]
+  \definefontsynonym [Sans]            [Univers-Black]
+  \definefontsynonym [SansSlanted]     [Univers-BlackOblique]
+  \definefontsynonym [SansBold]        [Univers-Black]
+  \definefontsynonym [SansBoldSlanted] [Univers-BlackOblique]
+\stoptypescript
+
+\starttypescript [sans] [univers,univers-black,univers-light] [texnansi,ec,8r]
+    \definefontsynonym [Univers-Light]        [\typescriptthree-lt50136] [encoding=\typescriptthree]
+    \definefontsynonym [Univers-LightOblique] [\typescriptthree-lt50137] [encoding=\typescriptthree]
+    \definefontsynonym [Univers]              [\typescriptthree-lt50138] [encoding=\typescriptthree]
+    \definefontsynonym [Univers-Oblique]      [\typescriptthree-lt50139] [encoding=\typescriptthree]
+    \definefontsynonym [Univers-Bold]         [\typescriptthree-lt50140] [encoding=\typescriptthree]
+    \definefontsynonym [Univers-BoldOblique]  [\typescriptthree-lt50141] [encoding=\typescriptthree]
+    \definefontsynonym [Univers-Black]        [\typescriptthree-lt50142] [encoding=\typescriptthree]
+    \definefontsynonym [Univers-BlackOblique] [\typescriptthree-lt50143] [encoding=\typescriptthree]
+    \loadmapfile[\typescriptthree-linotype-univers.map]
+\stoptypescript
+
+% mendoza
+
+\starttypescript [serif] [mendoza] [name]
+  \definefontsynonym [Serif]               [MendozaRoman-Book]
+  \definefontsynonym [SerifCaps]           [MendozaRoman-Book]
+  \definefontsynonym [SerifSlanted]        [MendozaRoman-BookItalic]
+  \definefontsynonym [SerifItalic]         [MendozaRoman-BookItalic]
+  \definefontsynonym [SerifBold]           [MendozaRoman-Bold]
+  \definefontsynonym [SerifBoldSlanted]    [MendozaRoman-BoldItalic]
+  \definefontsynonym [SerifBoldItalic]     [MendozaRoman-BoldItalic]
+\stoptypescript
+
+\starttypescript [serif] [mendoza] [ec,8r,texnansi]
+    \definefontsynonym[MendozaRoman-Bold]        [\typescriptthree-zab] [encoding=\typescriptthree]
+    \definefontsynonym[MendozaRoman-BoldItalic]  [\typescriptthree-zabi][encoding=\typescriptthree]
+    \definefontsynonym[MendozaRoman-Medium]      [\typescriptthree-zam] [encoding=\typescriptthree]
+    \definefontsynonym[MendozaRoman-MediumItalic][\typescriptthree-zami][encoding=\typescriptthree]
+    \definefontsynonym[MendozaRoman-Book]        [\typescriptthree-zaw] [encoding=\typescriptthree]
+    \definefontsynonym[MendozaRoman-BookItalic]  [\typescriptthree-zawi][encoding=\typescriptthree]
+    \loadmapfile[\typescriptthree-itc-mendoza.map]
+\stoptypescript
+
+% frutiger
+
+\starttypescript [sans] [frutiger] [name]
+    \definefontsynonym [Sans]            [Frutiger-Roman]
+    \definefontsynonym [SansCaps]        [Frutiger-Roman]
+    \definefontsynonym [SansItalic]      [Frutiger-Italic]
+    \definefontsynonym [SansSlanted]     [Frutiger-Italic]
+    \definefontsynonym [SansBold]        [Frutiger-Bold]
+    \definefontsynonym [SansBoldItalic]  [Frutiger-BoldItalic]
+    \definefontsynonym [SansBoldSlanted] [Frutiger-BoldItalic]
+\stoptypescript
+
+\starttypescript [sans] [frutiger] [ec,8r,texnansi]
+    \definefontsynonym[Frutiger-Bold]       [\typescriptthree-ftb]  [encoding=\typescriptthree]
+    \definefontsynonym[Frutiger-BoldItalic] [\typescriptthree-ftbi] [encoding=\typescriptthree]
+    \definefontsynonym[Frutiger-Black]      [\typescriptthree-ftbl] [encoding=\typescriptthree]
+    \definefontsynonym[Frutiger-BlackItalic][\typescriptthree-ftbli][encoding=\typescriptthree]
+    \definefontsynonym[Frutiger-Italic]     [\typescriptthree-fti]  [encoding=\typescriptthree]
+    \definefontsynonym[Frutiger-Light]      [\typescriptthree-ftl]  [encoding=\typescriptthree]
+    \definefontsynonym[Frutiger-LightItalic][\typescriptthree-ftli] [encoding=\typescriptthree]
+    \definefontsynonym[Frutiger-Roman]      [\typescriptthree-ftr]  [encoding=\typescriptthree]
+    \definefontsynonym[Frutiger-UltraBlack] [\typescriptthree-ftubl][encoding=\typescriptthree]
+    \loadmapfile[\typescriptthree-adobe-frutiger.map]
+\stoptypescript
+
+\starttypescript [frutiger] [texnansi,ec,8r,uc]
+    \definetypeface [frutiger] [ss] [sans] [frutiger] [default] [encoding=\typescripttwo]
+%   \loadmapfile [\typescripttwo-adobe-frutiger.map]
+\stoptypescript
+
+% kabel
+
+\starttypescript [sans] [kabel] [ec,8r,texnansi]
+    \definefontsynonym [ItcKabel-Bold]   [\typescriptthree-kbb] [encoding=\typescriptthree]
+    \definefontsynonym [ItcKabel-Demi]   [\typescriptthree-kbd] [encoding=\typescriptthree]
+    \definefontsynonym [ItcKabel-Medium] [\typescriptthree-kbm] [encoding=\typescriptthree]
+    \definefontsynonym [ItcKabel-Ultra]  [\typescriptthree-kbu] [encoding=\typescriptthree]
+    \definefontsynonym [ItcKabel-Book]   [\typescriptthree-kbw] [encoding=\typescriptthree]
+    \loadmapfile [\typescriptthree-itc-kabel.map]
+\stoptypescript
+
+% thesans
+
+\starttypescript [sans] [thesans] [name]
+    \definefontsynonym [Sans]                [TheSans-Plain]
+    \definefontsynonym [SansItalic]          [TheSans-Italic]
+    \definefontsynonym [SansSlanted]         [TheSans-Italic]
+    \definefontsynonym [SansBold]            [TheSansBold-Plain]
+    \definefontsynonym [SansBoldItalic]      [TheSansBold-Italic]
+    \definefontsynonym [SansBoldSlanted]     [TheSansBold-Italic]
+    \definefontsynonym [SansCaps]            [TheSans-Caps]
+    \definefontsynonym [SansCapsItalic]      [TheSans-CapsItalic]
+    \definefontsynonym [SansCapsSlanted]     [TheSans-CapsItalic]
+    \definefontsynonym [SansCapsBold]        [TheSansBold-Caps]
+    \definefontsynonym [SansCapsBoldItalic]  [TheSansBold-CapsItalic]
+    \definefontsynonym [SansCapsBoldSlanted] [TheSansBold-CapsItalic]
+\stoptypescript
+
+\starttypescript [mono] [thesans] [name]
+    \definefontsynonym [Mono]            [TheSansTypewriter-Plain]
+    \definefontsynonym [MonoCaps]        [TheSansTypewriter-Plain]
+    \definefontsynonym [MonoItalic]      [TheSansTypewriter-Italic]
+    \definefontsynonym [MonoSlanted]     [TheSansTypewriter-Italic]
+    \definefontsynonym [MonoBold]        [TheSansTypewriter-Bold]
+    \definefontsynonym [MonoBoldItalic]  [TheSansTypewriter-BoldItalic]
+    \definefontsynonym [MonoBoldSlanted] [TheSansTypewriter-BoldItalic]
+\stoptypescript
+
+\starttypescript [sans] [thesans] [ec,8r,texnansi]
+    \definefontsynonym [TheSans-Plain]            [\typescriptthree-tsan5]   [encoding=\typescriptthree]
+    \definefontsynonym [TheSans-Italic]           [\typescriptthree-tsan5i]  [encoding=\typescriptthree]
+    \definefontsynonym [TheSansBold-Plain]        [\typescriptthree-tsan7]   [encoding=\typescriptthree]
+    \definefontsynonym [TheSansBold-Italic]       [\typescriptthree-tsan7i]  [encoding=\typescriptthree]
+    \definefontsynonym [TheSans-Caps]             [\typescriptthree-tsan5c]  [encoding=\typescriptthree]
+    \definefontsynonym [TheSans-CapsItalic]       [\typescriptthree-tsan5ci] [encoding=\typescriptthree]
+    \definefontsynonym [TheSansBold-Caps]         [\typescriptthree-tsan7c]  [encoding=\typescriptthree]
+    \definefontsynonym [TheSansBold-CapsItalic]   [\typescriptthree-tsan7ci] [encoding=\typescriptthree]
+    \loadmapfile[\typescriptthree-lucas-thesans.map]
+\stoptypescript
+
+\starttypescript [mono] [thesans] [ec,8r,texnansi]
+    \definefontsynonym [TheSansTypewriter-Plain]      [\typescriptthree-tsaty5]  [encoding=\typescriptthree]
+    \definefontsynonym [TheSansTypewriter-Italic]     [\typescriptthree-tsaty5i] [encoding=\typescriptthree]
+    \definefontsynonym [TheSansTypewriter-Bold]       [\typescriptthree-tsaty7]  [encoding=\typescriptthree]
+    \definefontsynonym [TheSansTypewriter-BoldItalic] [\typescriptthree-tsaty7i] [encoding=\typescriptthree]
+    \loadmapfile[\typescriptthree-lucas-thesans.map]
+\stoptypescript
+
+\starttypescript [expert] [thesans]
+    \definefontsynonym [TheSans-Expert]           [tsan5e]  [encoding=\typescriptthree]
+    \definefontsynonym [TheSans-ExpertItalic]     [tsan5ei] [encoding=\typescriptthree]
+    \definefontsynonym [TheSansBold-Expert]       [tsan7e]  [encoding=\typescriptthree]
+    \definefontsynonym [TheSansBold-ExpertItalic] [tsan7ei] [encoding=\typescriptthree]
+    \loadmapfile[\typescriptthree-lucas-thesans.map]
+\stoptypescript
+
+% monotype 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]
+\stoptypescript
+
+\starttypescript [serif] [sabon] [ec,8r,texnansi]
+    \definefontsynonym[SabonMT]                  [\typescriptthree-sab]  [encoding=\typescriptthree]
+    \definefontsynonym[SabonMT-Italic]           [\typescriptthree-sabi] [encoding=\typescriptthree]
+    \definefontsynonym[SabonMT-ItalicOsF]        [\typescriptthree-saboi][encoding=\typescriptthree]
+    \definefontsynonym[SabonMT-SemiBoldOsF]      [\typescriptthree-sabos][encoding=\typescriptthree]
+    \definefontsynonym[SabonMT-SemiBold]         [\typescriptthree-sabs] [encoding=\typescriptthree]
+    \definefontsynonym[SabonMT-RegularSC]        [\typescriptthree-sabsc][encoding=\typescriptthree]
+    \definefontsynonym[SabonMT-SemiBoldItalic]   [\typescriptthree-sabsi][encoding=\typescriptthree]
+    \definefontsynonym[SabonMT-SemiBoldItalicOsF][\typescriptthree-sasio][encoding=\typescriptthree]
+    \loadmapfile[\typescriptthree-monotype-sabon.map]
+\stoptypescript
+
+% itc stone
+
+\starttypescript [sans] [stone] [name]
+    \definefontsynonym [Sans]            [StoneSansITC-Medium]
+    \definefontsynonym [SansItalic]      [StoneSansITC-MediumItalic]
+    \definefontsynonym [SansSlanted]     [StoneSansITC-MediumItalic]
+    \definefontsynonym [SansBold]        [StoneSansITC-Bold]
+    \definefontsynonym [SansBoldItalic]  [StoneSansITC-BoldItalic]
+    \definefontsynonym [SansBoldSlanted] [StoneSansITC-BoldItalic]
+    \definefontsynonym [SansCaps]        [StoneSansSCITC-Medium]
+\stoptypescript
+
+\starttypescript [serif] [stone] [name]
+    \definefontsynonym [Serif]            [StoneSerifITC-Medium]
+    \definefontsynonym [SerifItalic]      [StoneSerifITC-MediumItalic]
+    \definefontsynonym [SerifSlanted]     [StoneSerifITC-MediumItalic]
+    \definefontsynonym [SerifBold]        [StoneSerifITC-Bold]
+    \definefontsynonym [SerifBoldItalic]  [StoneSerifITC-BoldItalic]
+    \definefontsynonym [SerifBoldSlanted] [StoneSerifITC-BoldItalic]
+    \definefontsynonym [SerifCaps]        [StoneSerifSCITC-Medium]
+\stoptypescript
+
+\starttypescript [sans] [stone-oldstyle] [name]
+    \definefontsynonym [Sans]            [StoneSansOSITC-Medium]
+    \definefontsynonym [SansItalic]      [StoneSansOSITC-MediumItalic]
+    \definefontsynonym [SansSlanted]     [StoneSansOSITC-MediumItalic]
+    \definefontsynonym [SansBold]        [StoneSansOSITC-Bold]
+    \definefontsynonym [SansBoldItalic]  [StoneSansOSITC-BoldItalic]
+    \definefontsynonym [SansBoldSlanted] [StoneSansOSITC-BoldItalic]
+    \definefontsynonym [SansCaps]        [StoneSansSCITC-Medium]
+\stoptypescript
+
+\starttypescript [serif] [stone-oldstyle] [name]
+    \definefontsynonym [Serif]            [StoneSerifOSITC-Medium]
+    \definefontsynonym [SerifItalic]      [StoneSerifOSITC-MediumItalic]
+    \definefontsynonym [SerifSlanted]     [StoneSerifOSITC-MediumItalic]
+    \definefontsynonym [SerifBold]        [StoneSerifOSITC-Bold]
+    \definefontsynonym [SerifBoldItalic]  [StoneSerifOSITC-BoldItalic]
+    \definefontsynonym [SerifBoldSlanted] [StoneSerifOSITC-BoldItalic]
+    \definefontsynonym [SerifCaps]        [StoneSerifSCITC-Medium]
+\stoptypescript
+
+\starttypescript [sans] [stone] [ec,texnansi]
+    \definefontsynonym[StoneSansITC-Bold]          [\typescriptthree-stosnb]  [encoding=\typescriptthree]
+    \definefontsynonym[StoneSansITC-BoldItalic]    [\typescriptthree-stosnbi] [encoding=\typescriptthree]
+    \definefontsynonym[StoneSansITC-Medium]        [\typescriptthree-stosnm]  [encoding=\typescriptthree]
+    \definefontsynonym[StoneSansITC-MediumItalic]  [\typescriptthree-stosnmi] [encoding=\typescriptthree]
+    \definefontsynonym[StoneSansOSITC-Bold]        [\typescriptthree-stosnob] [encoding=\typescriptthree]
+    \definefontsynonym[StoneSansOSITC-BoldItalic]  [\typescriptthree-stosnobi][encoding=\typescriptthree]
+    \definefontsynonym[StoneSansOSITC-Medium]      [\typescriptthree-stosnom] [encoding=\typescriptthree]
+    \definefontsynonym[StoneSansOSITC-MediumItalic][\typescriptthree-stosnomi][encoding=\typescriptthree]
+    \definefontsynonym[StoneSansSCITC-Medium]      [\typescriptthree-stosnscm][encoding=\typescriptthree]
+    \definefontsynonym[StoneSansSemITC-Semi]       [\typescriptthree-stosns]  [encoding=\typescriptthree]
+    \definefontsynonym[StoneSansSemITC-SemiIta]    [\typescriptthree-stosnsi] [encoding=\typescriptthree]
+    \definefontsynonym[StoneSansSemOSITC-Semi]     [\typescriptthree-stosnos] [encoding=\typescriptthree]
+    \definefontsynonym[StoneSansSemOSITC-SemiIta]  [\typescriptthree-stosnosi][encoding=\typescriptthree]
+    \definefontsynonym[StoneSansSemSCITC-Semi]     [\typescriptthree-stosnscs][encoding=\typescriptthree]
+    \loadmapfile[\typescriptthree-itc-stone.map]
+\stoptypescript
+
+\starttypescript [serif] [stone] [ec,texnansi]
+    \definefontsynonym[StoneSerifITC-Bold]          [\typescriptthree-stosfb]  [encoding=\typescriptthree]
+    \definefontsynonym[StoneSerifITC-BoldItalic]    [\typescriptthree-stosfbi] [encoding=\typescriptthree]
+    \definefontsynonym[StoneSerifITC-Medium]        [\typescriptthree-stosfm]  [encoding=\typescriptthree]
+    \definefontsynonym[StoneSerifITC-MediumItalic]  [\typescriptthree-stosfmi] [encoding=\typescriptthree]
+    \definefontsynonym[StoneSerifOSITC-Bold]        [\typescriptthree-stosfob] [encoding=\typescriptthree]
+    \definefontsynonym[StoneSerifOSITC-BoldItalic]  [\typescriptthree-stosfobi][encoding=\typescriptthree]
+    \definefontsynonym[StoneSerifOSITC-Medium]      [\typescriptthree-stosfom] [encoding=\typescriptthree]
+    \definefontsynonym[StoneSerifOSITC-MediumItalic][\typescriptthree-stosfomi][encoding=\typescriptthree]
+    \definefontsynonym[StoneSerifSCITC-Medium]      [\typescriptthree-stosfscm][encoding=\typescriptthree]
+    \definefontsynonym[StoneSerifSemITC-Semi]       [\typescriptthree-stosfs]  [encoding=\typescriptthree]
+    \definefontsynonym[StoneSerifSemITC-SemiIta]    [\typescriptthree-stosfsi] [encoding=\typescriptthree]
+    \definefontsynonym[StoneSerifSemOSITC-Semi]     [\typescriptthree-stosfos] [encoding=\typescriptthree]
+    \definefontsynonym[StoneSerifSemOSITC-SemiIta]  [\typescriptthree-stosfosi][encoding=\typescriptthree]
+    \definefontsynonym[StoneSerifSemSCITC-Semi]     [\typescriptthree-stosfscs][encoding=\typescriptthree]
+    \loadmapfile[\typescriptthree-itc-stone.map]
+\stoptypescript
+
+% linotype industria
+
+\starttypescript [sans] [industria] [ec,texnansi]
+    \definefontsynonym[Industria-Solid][\typescriptthree-lt50545][encoding=\typescriptthree]
+    \loadmapfile[\typescriptthree-linotype-industria.map]
+\stoptypescript
+
+% itc bauhaus
+%
+% texfont --enc=texnansi --ven=itc --col=bauhaus type-buy.dat
+
+\starttypescript [sans] [bauhaus] [ec,texnansi]
+    \definefontsynonym[Bauhaus-Light]         [\typescriptthree-bhl]            [encoding=\typescriptthree]
+    \definefontsynonym[Bauhaus-Medium]        [\typescriptthree-bhm]            [encoding=\typescriptthree]
+    \definefontsynonym[Bauhaus-Demi]          [\typescriptthree-bhd]            [encoding=\typescriptthree]
+    \definefontsynonym[Bauhaus-Bold]          [\typescriptthree-bhb]            [encoding=\typescriptthree]
+    \definefontsynonym[Bauhaus-Heavy]         [\typescriptthree-bhh]            [encoding=\typescriptthree]
+    \definefontsynonym[Bauhaus-Bold-Slanted]  [\typescriptthree-bhb-slanted-167][encoding=\typescriptthree]
+    \definefontsynonym[Bauhaus-Demi-Slanted]  [\typescriptthree-bhd-slanted-167][encoding=\typescriptthree]
+    \definefontsynonym[Bauhaus-Heavy-Slanted] [\typescriptthree-bhh-slanted-167][encoding=\typescriptthree]
+    \definefontsynonym[Bauhaus-Light-Slanted] [\typescriptthree-bhl-slanted-167][encoding=\typescriptthree]
+    \definefontsynonym[Bauhaus-Medium-Slanted][\typescriptthree-bhm-slanted-167][encoding=\typescriptthree]
+    \loadmapfile[\typescriptthree-itc-bauhaus.map]
+\stoptypescript
+
+% ef swift
+%
+% texfont --enc=texnansi --ven=ef --col=swift type-buy.dat
+
+\starttypescript [serif] [swift] [name]
+  \definefontsynonym [Serif]            [SwiftEF-Regular]
+  \definefontsynonym [SerifItalic]      [SwiftEF-RegularItalic]
+  \definefontsynonym [SerifSlanted]     [SwiftEF-RegularItalic]
+  \definefontsynonym [SerifBold]        [SwiftEF-Bold]
+  \definefontsynonym [SerifBoldItalic]  [SwiftEF-Bold]
+  \definefontsynonym [SerifBoldSlanted] [SwiftEF-Bold]
+  \definefontsynonym [SerifCaps]        [SwiftSCEF-Regular]
+\stoptypescript
+
+\starttypescript [serif] [swift-light] [name]
+  \definefontsynonym [Serif]            [SwiftEF-Light]
+  \definefontsynonym [SerifItalic]      [SwiftEF-LightItalic]
+  \definefontsynonym [SerifSlanted]     [SwiftEF-LightItalic]
+  \definefontsynonym [SerifBold]        [SwiftEF-Regular]
+  \definefontsynonym [SerifBoldItalic]  [SwiftEF-RegularItalic]
+  \definefontsynonym [SerifBoldSlanted] [SwiftEF-RegularItalic]
+  \definefontsynonym [SerifCaps]        [SwiftSCEF-Regular]
+\stoptypescript
+
+\starttypescript [serif] [swift] [ec,texnansi]
+    \definefontsynonym[SwiftEF-Light]        [\typescriptthree-swlt] [encoding=\typescriptthree]
+    \definefontsynonym[SwiftEF-Regular]      [\typescriptthree-swrg] [encoding=\typescriptthree]
+    \definefontsynonym[SwiftEF-Bold]         [\typescriptthree-swbd] [encoding=\typescriptthree]
+    \definefontsynonym[SwiftEF-ExtraBold]    [\typescriptthree-swxb] [encoding=\typescriptthree]
+    \definefontsynonym[SwiftEF-LightItalic]  [\typescriptthree-swlti][encoding=\typescriptthree]
+    \definefontsynonym[SwiftEF-RegularItalic][\typescriptthree-swrgi][encoding=\typescriptthree]
+    \definefontsynonym[SwiftEF-BoldCondensed][\typescriptthree-swbdc][encoding=\typescriptthree]
+    \definefontsynonym[SwiftSCEF-Regular]    [\typescriptthree-swrgs][encoding=\typescriptthree]
+    \loadmapfile[\typescriptthree-ef-swift.map]
+\stoptypescript
+
+% linotype syntax
+
+\starttypescript [sans] [syntax] [name]
+  \definefontsynonym [Sans]           [SyntaxLT-Roman]
+  \definefontsynonym [SansItalic]     [SyntaxLT-Italic]
+  \definefontsynonym [SansSlanted]    [SyntaxLT-Italic]
+  \definefontsynonym [SansBold]       [SyntaxLT-Black]
+  \definefontsynonym [SansBoldItalic] [SyntaxLT-Black]
+  \definefontsynonym [SansBoldSlanted][SyntaxLT-Black]
+\stoptypescript
+
+\starttypescript [sans] [syntax] [ec,texnansi]
+    \definefontsynonym [SyntaxLT-Roman]      [\typescriptthree-lte50617] [encoding=\typescriptthree]
+    \definefontsynonym [SyntaxLT-Italic]     [\typescriptthree-lte50618] [encoding=\typescriptthree]
+    \definefontsynonym [SyntaxLT-Bold]       [\typescriptthree-lte50619] [encoding=\typescriptthree]
+    \definefontsynonym [SyntaxLT-Black]      [\typescriptthree-lte50620] [encoding=\typescriptthree]
+    \definefontsynonym [SyntaxLT-UltraBlack] [\typescriptthree-lte50621] [encoding=\typescriptthree]
+    \loadmapfile[\typescriptthree-linotype-syntax.map]
+\stoptypescript
+
+% linotype linoletter
+
+\starttypescript [serif] [linoletter] [name]
+    \definefontsynonym [Serif]           [LinoLetterLT-Roman]
+    \definefontsynonym [SerifItalic]     [LinoLetterLT-Italic]
+    \definefontsynonym [SerifSlanted]    [LinoLetterLT-Italic]
+    \definefontsynonym [SerifBold]       [LinoLetterLT-Bold]
+    \definefontsynonym [SerifBoldItalic] [LinoLetterLT-BoldItalic]
+    \definefontsynonym [SerifBoldSlanted][LinoLetterLT-BoldItalic]
+\stoptypescript
+
+\starttypescript [serif] [linoletter] [ec,texnansi]
+    \definefontsynonym[LinoLetterLT-Roman]       [texnansi-lte51129] [encoding=\typescriptthree]
+    \definefontsynonym[LinoLetterLT-Italic]      [texnansi-lte51130] [encoding=\typescriptthree]
+    \definefontsynonym[LinoLetterLT-Bold]        [texnansi-lte51133] [encoding=\typescriptthree]
+    \definefontsynonym[LinoLetterLT-BoldItalic]  [texnansi-lte51134] [encoding=\typescriptthree]
+    \definefontsynonym[LinoLetterLT-BlackItalic] [texnansi-lte51136] [encoding=\typescriptthree]
+    \definefontsynonym[LinoLetter-MediumSC]      [texnansi-llmsc]    [encoding=\typescriptthree]
+    \loadmapfile[\typescriptthree-linotype-linoletter.map]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/tex/context/fonts/mkii/type-cbg.mkii b/tex/context/fonts/mkii/type-cbg.mkii
new file mode 100644
index 000000000..a45a71d4e
--- /dev/null
+++ b/tex/context/fonts/mkii/type-cbg.mkii
@@ -0,0 +1,352 @@
+%D \module
+%D   [       file=type-cbg,
+%D        version=2004.08.23,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=CB Greek,
+%D         author={Giuseppe Bilotta, Hans Hagen},
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% legend:
+%
+% g=greek
+% r=regular s=sansserif t=typewriter
+% m=medium x=boldextended t=monospaced
+% n=normal o=oblique i=italic u=uprightitalic c=smallcaps
+
+% ruby script to make small zip file:
+%
+% zipfile = 'cbsmall.zip'
+%
+% fontfiles = Array.new
+%
+% fontfiles.push(Dir.glob("fonts/{tfm,vf,afm,type1}/public/cb/{gr,gs,gt}{m,s,t}{n,o,i,u,c}{0800,1000,1200}.{tfm,afm,pfb}"))
+% fontfiles.push(Dir.glob("fonts/{map,enc,lig}/{dvips,pdftex,dvipdfm,dvipdfmx}/cb/{cbgreek,cbsmall}.{map,enc,lig}"))
+%
+% File.delete(zipfile) if FileTest.file?(zipfile)
+% system("zip -r -9 cbsmall #{fontfiles.join(' ')}")
+
+\starttypescriptcollection[cbgreek]
+
+\starttypescript [serif] [cbgreek] [name]
+    \definefontsynonym [CBGreek-Regular-Medium-Normal]              [grmn1000]
+    \definefontsynonym [CBGreek-Regular-Medium-Oblique]             [grmo1000]
+    \definefontsynonym [CBGreek-Regular-Medium-Italic]              [grmi1000]
+    \definefontsynonym [CBGreek-Regular-Medium-UprightItalic]       [grmu1000]
+    \definefontsynonym [CBGreek-Regular-Medium-Caps]                [grmc1000]
+    \definefontsynonym [CBGreek-Regular-Medium-Leipzig]             [grml1000]
+    \definefontsynonym [CBGreek-Regular-Medium-Roman]               [grmr1000]
+    \definefontsynonym [CBGreek-Regular-BoldExtended-Normal]        [grxn1000]
+    \definefontsynonym [CBGreek-Regular-BoldExtended-Oblique]       [grxo1000]
+    \definefontsynonym [CBGreek-Regular-BoldExtended-Italic]        [grxi1000]
+    \definefontsynonym [CBGreek-Regular-BoldExtended-UprightItalic] [grxu1000]
+    \definefontsynonym [CBGreek-Regular-BoldExtended-Caps]          [grxc1000]
+    \definefontsynonym [CBGreek-Regular-BoldExtended-Leipzig]       [grxl1000]
+    \definefontsynonym [CBGreek-Regular-BoldExtended-Roman]         [grxr1000]
+    \loadmapfile [cbgreek.map]
+\stoptypescript
+
+\starttypescript [sans] [cbgreek] [name]
+    \definefontsynonym [CBGreek-Sans-Medium-Normal]              [gsmn1000]
+    \definefontsynonym [CBGreek-Sans-Medium-Oblique]             [gsmo1000]
+    \definefontsynonym [CBGreek-Sans-Medium-Italic]              [gsmi1000]
+    \definefontsynonym [CBGreek-Sans-Medium-UprightItalic]       [gsmu1000]
+    \definefontsynonym [CBGreek-Sans-Medium-Caps]                [gsmc1000]
+    \definefontsynonym [CBGreek-Sans-Medium-Leipzig]             [gsml1000]
+    \definefontsynonym [CBGreek-Sans-Medium-Roman]               [gsmr1000]
+    \definefontsynonym [CBGreek-Sans-BoldExtended-Normal]        [gsxn1000]
+    \definefontsynonym [CBGreek-Sans-BoldExtended-Oblique]       [gsxo1000]
+    \definefontsynonym [CBGreek-Sans-BoldExtended-Italic]        [gsxi1000]
+    \definefontsynonym [CBGreek-Sans-BoldExtended-UprightItalic] [gsxu1000]
+    \definefontsynonym [CBGreek-Sans-BoldExtended-Caps]          [gsxc1000]
+    \definefontsynonym [CBGreek-Sans-BoldExtended-Leipzig]       [gsxl1000]
+    \definefontsynonym [CBGreek-Sans-BoldExtended-Roman]         [gsxr1000]
+    \loadmapfile [cbgreek.map]
+\stoptypescript
+
+\starttypescript [mono] [cbgreek] [name]
+    \definefontsynonym [CBGreek-Typewriter-Medium-Normal]        [gttn1000]
+    \definefontsynonym [CBGreek-Typewriter-Medium-Oblique]       [gtto1000]
+    \definefontsynonym [CBGreek-Typewriter-Medium-Italic]        [gtti1000]
+    \definefontsynonym [CBGreek-Typewriter-Medium-UprightItalic] [gttu1000]
+    \definefontsynonym [CBGreek-Typewriter-Medium-Caps]          [gttc1000]
+    \definefontsynonym [CBGreek-Typewriter-Medium-Leipzig]       [gttl1000]
+    \definefontsynonym [CBGreek-Typewriter-Medium-Roman]         [gttr1000]
+    \loadmapfile [cbgreek.map]
+\stoptypescript
+
+\starttypescript [serif] [cbgreek] [name]
+    \definefontsynonym [Serif]            [CBGreek-Regular-Medium-Normal]
+    \definefontsynonym [SerifSlanted]     [CBGreek-Regular-Medium-Oblique]
+    \definefontsynonym [SerifItalic]      [CBGreek-Regular-Medium-Italic]
+    \definefontsynonym [SerifCaps]        [CBGreek-Regular-Medium-Caps]
+    \definefontsynonym [SerifBold]        [CBGreek-Regular-BoldExtended-Normal]
+    \definefontsynonym [SerifBoldSlanted] [CBGreek-Regular-BoldExtended-Oblique]
+    \definefontsynonym [SerifBoldItalic]  [CBGreek-Regular-BoldExtended-Italic]
+    \definefontsynonym [SerifBoldCaps]    [CBGreek-Regular-BoldExtended-Caps]
+    \loadmapfile [cbgreek.map]
+\stoptypescript
+
+\starttypescript [sans] [cbgreek] [name]
+    \definefontsynonym [Sans]            [CBGreek-Sans-Medium-Normal]
+    \definefontsynonym [SansSlanted]     [CBGreek-Sans-Medium-Oblique]
+    \definefontsynonym [SansItalic]      [CBGreek-Sans-Medium-Italic]
+    \definefontsynonym [SansCaps]        [CBGreek-Sans-Medium-Caps]
+    \definefontsynonym [SansBold]        [CBGreek-Sans-BoldExtended-Normal]
+    \definefontsynonym [SansBoldSlanted] [CBGreek-Sans-BoldExtended-Oblique]
+    \definefontsynonym [SansBoldItalic]  [CBGreek-Sans-BoldExtended-Italic]
+    \definefontsynonym [SansBoldCaps]    [CBGreek-Sans-BoldExtended-Caps]
+    \loadmapfile [cbgreek.map]
+\stoptypescript
+
+\starttypescript [mono] [cbgreek] [name]
+    \definefontsynonym [Mono]        [CBGreek-Typewriter-Medium-Normal]
+    \definefontsynonym [MonoSlanted] [CBGreek-Typewriter-Medium-Oblique]
+    \definefontsynonym [MonoItalic]  [CBGreek-Typewriter-Medium-Italic]
+    \definefontsynonym [MonoCaps]    [CBGreek-Typewriter-Medium-Caps]
+    \loadmapfile [cbgreek.map]
+\stoptypescript
+
+% Please note that we use Bold Extended instead of Bold
+
+\starttypescript [serif] [cbgreek-all] [size]
+
+  \definebodyfont [4pt,5pt] [rm]
+    [tf=grmn0500 sa 1,sl=grmo0500 sa 1,it=grmi0500 sa 1,
+     bf=grxn0500 sa 1,bs=grxo0500 sa 1,bi=grxi0500 sa 1,
+     sc=grmc0500 sa 1]
+
+  \definebodyfont [6pt] [rm]
+    [tf=grmn0600,sl=grmo0600,it=grmi0600,
+     bf=grxn0600,bs=grxo0600,bi=grxi0600,
+     sc=grmc0600]
+
+  \definebodyfont [7pt] [rm]
+    [tf=grmn0700,sl=grmo0700,it=grmi0700,
+     bf=grxn0700,bs=grxo0700,bi=grxi0700,
+     sc=grmc0700]
+
+  \definebodyfont [8pt] [rm]
+    [tf=grmn0800,sl=grmo0800,it=grmi0800,
+     bf=grxn0800,bs=grxo0800,bi=grxi0800,
+     sc=grmc0800]
+
+  \definebodyfont [9pt] [rm]
+    [tf=grmn0900,sl=grmo0900,it=grmi0900,
+     bf=grxn0900,bs=grxo0900,bi=grxi0900,
+     sc=grmc0900]
+
+  \definebodyfont [10pt] [rm]
+    [tf=grmn1000,sl=grmo1000,it=grmi1000,
+     bf=grxn1000,bs=grxo1000,bi=grxi1000,
+     sc=grmc1000]
+
+  \definebodyfont [11pt] [rm]
+    [tf=grmn1095,sl=grmo1095,it=grmi1095,
+     bf=grxn1095,bs=grxo1095,bi=grxi1095,
+     sc=grmc1095]
+
+  \definebodyfont [12pt] [rm]
+    [tf=grmn1200,sl=grmo1200,it=grmi1200,
+     bf=grxn1200,bs=grxo1200,bi=grxi1200,
+     sc=grmc1200]
+
+  \definebodyfont [14.4pt,17.3pt,20.7pt] [rm]
+    [tf=grmn1440 sa 1,sl=grmo1440 sa 1,it=grmi1440 sa 1,
+     bf=grxn1440 sa 1,bs=grxo1440 sa 1,bi=grxi1440 sa 1,
+     sc=grmc1440 sa 1]
+
+  \loadmapfile [cbgreek.map]
+
+\stoptypescript
+
+\starttypescript [sans] [cbgreek-all] [size]
+
+  \definebodyfont [4pt,5pt] [ss]
+    [tf=gsmn0500 sa 1,sl=gsmo0500 sa 1,it=gsmi0500 sa 1,
+     bf=gsxn0500 sa 1,bs=gsxo0500 sa 1,bi=gsxi0500 sa 1,
+     sc=gsmc0500 sa 1]
+
+  \definebodyfont [6pt] [ss]
+    [tf=gsmn0600,sl=gsmo0600,it=gsmi0600,
+     bf=gsxn0600,bs=gsxo0600,bi=gsxi0600,
+     sc=gsmc0600]
+
+  \definebodyfont [7pt] [ss]
+    [tf=gsmn0700,sl=gsmo0700,it=gsmi0700,
+     bf=gsxn0700,bs=gsxo0700,bi=gsxi0700,
+     sc=gsmc0700]
+
+  \definebodyfont [8pt] [ss]
+    [tf=gsmn0800,sl=gsmo0800,it=gsmi0800,
+     bf=gsxn0800,bs=gsxo0800,bi=gsxi0800,
+     sc=gsmc0800]
+
+  \definebodyfont [9pt] [ss]
+    [tf=gsmn0900,sl=gsmo0900,it=gsmi0900,
+     bf=gsxn0900,bs=gsxo0900,bi=gsxi0900,
+     sc=gsmc0900]
+
+  \definebodyfont [10pt] [ss]
+    [tf=gsmn1000,sl=gsmo1000,it=gsmi1000,
+     bf=gsxn1000,bs=gsxo1000,bi=gsxi1000,
+     sc=gsmc1000]
+
+  \definebodyfont [11pt] [ss]
+    [tf=gsmn1095,sl=gsmo1095,it=gsmi1095,
+     bf=gsxn1095,bs=gsxo1095,bi=gsxi1095,
+     sc=gsmc1095]
+
+  \definebodyfont [12pt] [ss]
+    [tf=gsmn1200,sl=gsmo1200,it=gsmi1200,
+     bf=gsxn1200,bs=gsxo1200,bi=gsxi1200,
+     sc=gsmc1200]
+
+  \definebodyfont [14.4pt,17.3pt,20.7pt] [ss]
+    [tf=gsmn1440 sa 1,sl=gsmo1440 sa 1,it=gsmi1440 sa 1,
+     bf=gsxn1440 sa 1,bs=gsxo1440 sa 1,bi=gsxi1440 sa 1,
+     sc=gsmc1440 sa 1]
+
+  \loadmapfile [cbgreek.map]
+
+\stoptypescript
+
+\starttypescript [mono] [cbgreek-all] [size]
+
+  \definebodyfont [4pt,5pt] [tt]
+    [tf=gttn0500 sa 1,sl=gtto0500 sa 1,it=gtti0500 sa 1,
+     sc=gttc0500 sa 1]
+
+  \definebodyfont [6pt] [tt]
+    [tf=gttn0600,sl=gtto0600,it=gtti0600,
+     sc=gttc0600]
+
+  \definebodyfont [7pt] [tt]
+    [tf=gttn0700,sl=gtto0700,it=gtti0700,
+     sc=gttc0700]
+
+  \definebodyfont [8pt] [tt]
+    [tf=gttn0800,sl=gtto0800,it=gtti0800,
+     sc=gttc0800]
+
+  \definebodyfont [9pt] [tt]
+    [tf=gttn0900,sl=gtto0900,it=gtti0900,
+     sc=gttc0900]
+
+  \definebodyfont [10pt] [tt]
+    [tf=gttn1000,sl=gtto1000,it=gtti1000,
+     sc=gttc1000]
+
+  \definebodyfont [11pt] [tt]
+    [tf=gttn1095,sl=gtto1095,it=gtti1095,
+     sc=gttc1095]
+
+  \definebodyfont [12pt] [tt]
+    [tf=gttn1200,sl=gtto1200,it=gtti1200,
+     sc=gttc1200]
+
+  \definebodyfont [14.4pt,17.3pt,20.7pt] [tt]
+    [tf=gttn1440 sa 1,sl=gtto1440 sa 1,it=gtti1440 sa 1,
+     sc=gttc1440 sa 1]
+
+  \loadmapfile [cbgreek.map]
+
+\stoptypescript
+
+\starttypescript [serif] [cbgreek-medium] [size]
+
+  \definebodyfont [4pt,5pt,6pt,7pt,8pt,9pt] [rm]
+    [tf=grmn0800 sa 1,sl=grmo0800 sa 1,it=grmi0800 sa 1,
+     bf=grxn0800 sa 1,bs=grxo0800 sa 1,bi=grxi0800 sa 1,
+     sc=grmc0800 sa 1]
+
+  \definebodyfont [10pt,11pt] [rm]
+    [tf=grmn1000 sa 1,sl=grmo1000 sa 1,it=grmi1000 sa 1,
+     bf=grxn1000 sa 1,bs=grxo1000 sa 1,bi=grxi1000 sa 1,
+     sc=grmc1000 sa 1]
+
+  \definebodyfont [12pt,14.4pt,17.3pt,20.7pt] [rm]
+    [tf=grmn1200 sa 1,sl=grmo1200 sa 1,it=grmi1200 sa 1,
+     bf=grxn1200 sa 1,bs=grxo1200 sa 1,bi=grxi1200 sa 1,
+     sc=grmc1200 sa 1]
+
+  \loadmapfile [cbgreek.map]
+
+\stoptypescript
+
+\starttypescript [sans] [cbgreek-medium] [size]
+
+  \definebodyfont [4pt,5pt,6pt,7pt,8pt,9pt] [ss]
+    [tf=gsmn0800 sa 1,sl=gsmo0800 sa 1,it=gsmi0800 sa 1,
+     bf=gsxn0800 sa 1,bs=gsxo0800 sa 1,bi=gsxi0800 sa 1,
+     sc=gsmc0800 sa 1]
+
+  \definebodyfont [10pt,11pt] [ss]
+    [tf=gsmn1000 sa 1,sl=gsmo1000 sa 1,it=gsmi1000 sa 1,
+     bf=gsxn1000 sa 1,bs=gsxo1000 sa 1,bi=gsxi1000 sa 1,
+     sc=gsmc1000 sa 1]
+
+  \definebodyfont [12pt,14.4pt,17.3pt,20.7pt] [ss]
+    [tf=gsmn1200 sa 1,sl=gsmo1200 sa 1,it=gsmi1200 sa 1,
+     bf=gsxn1200 sa 1,bs=gsxo1200 sa 1,bi=gsxi1200 sa 1,
+     sc=gsmc1200 sa 1]
+
+  \loadmapfile [cbgreek.map]
+
+\stoptypescript
+
+\starttypescript [mono] [cbgreek-medium] [size]
+
+  \definebodyfont [4pt,5pt,6pt,7pt,8pt,9pt] [tt]
+    [tf=gttn0800 sa 1,sl=gtto0800 sa 1,it=gtti0800 sa 1,
+     sc=gttc0800 sa 1]
+
+  \definebodyfont [10pt,11pt] [tt]
+    [tf=gttn1000 sa 1,sl=gtto1000 sa 1,it=gtti1000 sa 1,
+     sc=gttc1000 sa 1]
+
+  \definebodyfont [12pt,14.4pt,17.3pt,20.7pt] [tt]
+    [tf=gttn1200 sa 1,sl=gtto1200 sa 1,it=gtti1200 sa 1,
+     sc=gttc1200 sa 1]
+
+  \loadmapfile [cbgreek.map]
+
+\stoptypescript
+
+\starttypescript [cbgreek-all]
+
+  \definebodyfontenvironment [cbgreek] [default] []
+
+  \definetypeface [cbgreek] [rm] [serif] [cbgreek] [cbgreek-all]
+  \definetypeface [cbgreek] [ss] [sans]  [cbgreek] [cbgreek-all]
+  \definetypeface [cbgreek] [tt] [mono]  [cbgreek] [cbgreek-all]
+
+\stoptypescript
+
+\starttypescript [cbgreek-medium] % lowercase, patched HH
+
+  \definebodyfontenvironment [cbgreek] [default] []
+
+  \definetypeface [cbgreek] [rm] [serif] [cbgreek] [cbgreek-medium]
+  \definetypeface [cbgreek] [ss] [sans]  [cbgreek] [cbgreek-medium]
+  \definetypeface [cbgreek] [tt] [mono]  [cbgreek] [cbgreek-medium]
+
+\stoptypescript
+
+\starttypescript [cbgreek] % lowercase, patched HH
+
+  \definebodyfontenvironment [cbgreek] [default] []
+
+  \definetypeface [cbgreek] [rm] [serif] [cbgreek] [default]
+  \definetypeface [cbgreek] [ss] [sans]  [cbgreek] [default]
+  \definetypeface [cbgreek] [tt] [mono]  [cbgreek] [default]
+
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/tex/context/fonts/mkii/type-cow.mkii b/tex/context/fonts/mkii/type-cow.mkii
new file mode 100644
index 000000000..f46ac968b
--- /dev/null
+++ b/tex/context/fonts/mkii/type-cow.mkii
@@ -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 ADE \& \CONTEXT\ Development Team}]
+%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] [default]
+    \setups[font:fallback:serif]
+    \usemathcollection[cow]
+    \loadmapfile[koeieletters.map]
+    \definefontsynonym [Serif]           [Cows]              [encoding=\typescriptthree]
+    \definefontsynonym [SerifContour]    [CowsContour]       [encoding=\typescriptthree]
+    \definefontsynonym [SerifLogo]       [CowsLogo]          [encoding=\typescriptthree]
+    \definefontsynonym [SerifLogoContour][CowsLogoContour]   [encoding=\typescriptthree]
+    \definefontsynonym [MathRoman]       [CowsMathRoman]     [encoding=\typescriptthree]
+    \definefontsynonym [MathItalic]      [CowsMathItalic]    [encoding=\typescriptthree]
+    \definefontsynonym [MathSymbol]      [CowsMathSymbol]    [encoding=\typescriptthree]
+    \definefontsynonym [MathExtension]   [CowsMathExtensions][encoding=\typescriptthree]
+\stoptypescript
+
+\starttypescript [math,serif] [sheep] [default]
+    \setups[font:fallback:serif]
+    \usemathcollection[cow]
+    \loadmapfile[koeieletters.map]
+    \definefontsynonym [Serif]           [Sheep]              [encoding=\typescriptthree]
+    \definefontsynonym [SerifContour]    [SheepContour]       [encoding=\typescriptthree]
+    \definefontsynonym [SerifLogo]       [SheepLogo]          [encoding=\typescriptthree]
+    \definefontsynonym [SerifLogoContour][SheepLogoContour]   [encoding=\typescriptthree]
+    \definefontsynonym [MathRoman]       [SheepMathRoman]     [encoding=\typescriptthree]
+    \definefontsynonym [MathItalic]      [SheepMathItalic]    [encoding=\typescriptthree]
+    \definefontsynonym [MathSymbol]      [SheepMathSymbol]    [encoding=\typescriptthree]
+    \definefontsynonym [MathExtension]   [SheepMathExtensions][encoding=\typescriptthree]
+\stoptypescript
+
+\starttypescript [all] [cow,sheep] [default]
+    \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] [default]
+    \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] [default]
+    \definetypeface [cow]  [rm][serif][cow]   [default][encoding=default]
+    \definetypeface [cow]  [ss][serif][cow]   [default][encoding=default]
+    \definetypeface [cow]  [mm][math] [cow]   [default][encoding=default]
+    \definetypeface [cow]  [tt][mono] [modern][default][encoding=default,rscale=0.85]
+\stoptypescript
+
+\starttypescript [sheep] [default]
+    \definetypeface [sheep][rm][serif][sheep] [default][encoding=default]
+    \definetypeface [sheep][ss][serif][sheep] [default][encoding=default]
+    \definetypeface [sheep][mm][math] [sheep] [default][encoding=default]
+    \definetypeface [sheep][tt][mono] [modern][default][encoding=default,rscale=0.85]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/tex/context/fonts/mkii/type-exp.mkii b/tex/context/fonts/mkii/type-exp.mkii
new file mode 100644
index 000000000..c7c6e4b45
--- /dev/null
+++ b/tex/context/fonts/mkii/type-exp.mkii
@@ -0,0 +1,95 @@
+%D \module
+%D   [       file=type-exp,
+%D        version=2007.01.28,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Experimental Definitions,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% \usetypescript[palatino-light] [texnansi] \setupbodyfont[palatino-light]  \input zapf \par
+% \usetypescript[palatino-normal][texnansi] \setupbodyfont[palatino-normal] \input zapf \par
+% \usetypescript[palatino-medium][texnansi] \setupbodyfont[palatino-medium] \input zapf \par
+
+%D This file is used for \LUATEX\ experiments.
+
+\starttypescriptcollection[experiment]
+
+\starttypescript [sans] [palatino-sans-light] [name]
+
+  \definefontsynonym [Sans]            [PalatinoSans-Light]
+  \definefontsynonym [SansItalic]      [PalatinoSans-LightItalic]
+  \definefontsynonym [SansBold]        [PalatinoSans-Regular]
+  \definefontsynonym [SansBoldItalic]  [PalatinoSans-Italic]
+  \definefontsynonym [SansSlanted]     [PalatinoSans-Regular]
+  \definefontsynonym [SansBoldSlanted] [PalatinoSans-Italic]
+  \definefontsynonym [SansCaps]        [PalatinoSans-Light]
+
+\stoptypescript
+
+\starttypescript [sans] [palatino-sans-normal] [name]
+
+  \definefontsynonym [Sans]            [PalatinoSans-Regular]
+  \definefontsynonym [SansItalic]      [PalatinoSans-Italic]
+  \definefontsynonym [SansBold]        [PalatinoSans-Bold]
+  \definefontsynonym [SansBoldItalic]  [PalatinoSans-BoldItalic]
+  \definefontsynonym [SansSlanted]     [PalatinoSans-Italic]
+  \definefontsynonym [SansBoldSlanted] [PalatinoSans-BoldItalic]
+  \definefontsynonym [SansCaps]        [PalatinoSans-Regular]
+
+\stoptypescript
+
+\starttypescript [sans] [palatino-sans-medium] [name]
+
+  \definefontsynonym [Sans]            [PalatinoSans-Medium]
+  \definefontsynonym [SansItalic]      [PalatinoSans-MediumItalic]
+  \definefontsynonym [SansBold]        [PalatinoSans-Bold]
+  \definefontsynonym [SansBoldItalic]  [PalatinoSans-BoldItalic]
+  \definefontsynonym [SansSlanted]     [PalatinoSans-Bold]
+  \definefontsynonym [SansBoldSlanted] [PalatinoSans-BoldItalic]
+  \definefontsynonym [SansCaps]        [PalatinoSans-MediumSC]
+
+\stoptypescript
+
+\starttypescript [sans] [palatino-sans-light,palatino-sans-normal,palatino-sans-medium] [texnansi,ec,8r]
+
+  \definefontsynonym[PalatinoSans-Light]       [\typescriptthree-palatinosanscom-light]       [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoSans-LightItalic] [\typescriptthree-palatinosanscom-lightitalic] [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoSans-Regular]     [\typescriptthree-palatinosanscom-regular]     [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoSans-Italic]      [\typescriptthree-palatinosanscom-italic]      [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoSans-Medium]      [\typescriptthree-palatinosanscom-medium]      [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoSans-MediumItalic][\typescriptthree-palatinosanscom-mediumitalic][encoding=\typescriptthree]
+  \definefontsynonym[PalatinoSans-Bold]        [\typescriptthree-palatinosanscom-bold]        [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoSans-BoldItalic]  [\typescriptthree-palatinosanscom-bolditalic]  [encoding=\typescriptthree]
+
+\stoptypescript
+
+\starttypescript[palatino-normal][texnansi,ec]
+    \definetypeface[palatino-normal][ss][sans] [palatino-sans-normal] [default][encoding=\typescripttwo]
+    \definetypeface[palatino-normal][rm][serif][palatino-nova]        [default][encoding=\typescripttwo]
+    \definetypeface[palatino-normal][tt][mono] [latin-modern]         [default][encoding=\typescripttwo,rscale=1.1]
+    \definetypeface[palatino-normal][mm][math] [latin-modern]         [default][encoding=\typescripttwo,rscale=1.1]
+    \quittypescriptscanning
+\stoptypescript
+
+\starttypescript[palatino-medium][texnansi,ec]
+    \definetypeface[palatino-medium][ss][sans] [palatino-sans-medium] [default][encoding=\typescripttwo]
+    \definetypeface[palatino-medium][rm][serif][palatino-nova]        [default][encoding=\typescripttwo]
+    \definetypeface[palatino-medium][tt][mono] [latin-modern]         [default][encoding=\typescripttwo,rscale=1.1]
+    \definetypeface[palatino-medium][mm][math] [latin-modern]         [default][encoding=\typescripttwo,rscale=1.1]
+    \quittypescriptscanning
+\stoptypescript
+
+\starttypescript[palatino-light][texnansi,ec]
+    \definetypeface[palatino-light][ss][sans] [palatino-sans-light] [default][encoding=\typescripttwo]
+    \definetypeface[palatino-light][rm][serif][palatino-nova]       [default][encoding=\typescripttwo]
+    \definetypeface[palatino-light][tt][mono] [latin-modern]        [default][encoding=\typescripttwo,rscale=1.1]
+    \definetypeface[palatino-light][mm][math] [latin-modern]        [default][encoding=\typescripttwo,rscale=1.1]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkii/type-fsf.mkii b/tex/context/fonts/mkii/type-fsf.mkii
new file mode 100644
index 000000000..6782d3dcf
--- /dev/null
+++ b/tex/context/fonts/mkii/type-fsf.mkii
@@ -0,0 +1,94 @@
+%D \module
+%D   [       file=page-new,
+%D        version=2000.10.20,
+%D          title=\CONTEXT\ Page Macros,
+%D       subtitle=Fontsite 500,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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 I'm not sure how correct the fontsite cd is. These are probably
+%D mostly rip-offs. I no longer use these fonts.
+
+% run texfont from currentpath with the fonts on subpath fontsite/500
+
+% texfont --en=texnansi --ve=fontsite --co=opus       type-fsf.dat
+% texfont --en=texnansi --ve=fontsite --co=typewriter type-fsf.dat
+
+\starttypescriptcollection[font site 500]
+
+%D Please use the original Optima!
+
+\starttypescript [sans] [opus] [name]
+    \definefontsynonym [Sans]            [Opus]
+    \definefontsynonym [SansCaps]        [OpusSmCaps]
+    \definefontsynonym [SansItalic]      [Opus-Italic]
+    \definefontsynonym [SansBold]        [Opus-Bold]
+    \definefontsynonym [SansBoldCaps]    [OpusSmCaps-Bold]
+    \definefontsynonym [SansBoldItalic]  [Opus-BoldItalic]
+    \definefontsynonym [SansSlanted]     [Opus-Slanted]      % faked
+    \definefontsynonym [SansBoldSlanted] [Opus-BoldSlanted]  % faked
+\stoptypescript
+
+\starttypescript [sans] [opus] [texnansi,ec,8r]
+    \definefontsynonym [Opus]             [\typescriptthree-opusrg]             [encoding=\typescriptthree]
+    \definefontsynonym [OpusSmCaps]       [\typescriptthree-opusscrg]           [encoding=\typescriptthree]
+    \definefontsynonym [Opus-Italic]      [\typescriptthree-opusi]              [encoding=\typescriptthree]
+    \definefontsynonym [Opus-Bold]        [\typescriptthree-opusb]              [encoding=\typescriptthree]
+    \definefontsynonym [Opus-BoldItalic]  [\typescriptthree-opusbi]             [encoding=\typescriptthree]
+    \definefontsynonym [OpusSmCaps-Bold]  [\typescriptthree-opusscb]            [encoding=\typescriptthree]
+    \definefontsynonym [Opus-Slanted]     [\typescriptthree-opusrg-slanted-167] [encoding=\typescriptthree]
+    \definefontsynonym [Opus-BoldSlanted] [\typescriptthree-opusb-slanted-167]  [encoding=\typescriptthree]
+    \loadmapfile[\typescriptthree-fontsite-opus.map]
+\stoptypescript
+
+\starttypescript [mono] [typewriter] [name]
+    \definefontsynonym [Mono]            [Typewriter]
+    \definefontsynonym [MonoItalic]      [Typewriter-Italic]
+    \definefontsynonym [MonoBold]        [Typewriter-Bold]
+    \definefontsynonym [MonoBoldItalic]  [Typewriter-BoldItalic]
+    \definefontsynonym [MonoSlanted]     [Typewriter-Slanted]      % faked
+    \definefontsynonym [MonoBoldSlanted] [Typewriter-BoldSlanted]  % faked
+\stoptypescript
+
+\starttypescript [mono] [typewriter] [texnansi,ec,8r]
+    \definefontsynonym [Typewriter]             [\typescriptthree-typerg]             [encoding=\typescriptthree]
+    \definefontsynonym [Typewriter-Italic]      [\typescriptthree-typei]              [encoding=\typescriptthree]
+    \definefontsynonym [Typewriter-Bold]        [\typescriptthree-typeb]              [encoding=\typescriptthree]
+    \definefontsynonym [Typewriter-BoldItalic]  [\typescriptthree-typebi]             [encoding=\typescriptthree]
+    \definefontsynonym [Typewriter-Slanted]     [\typescriptthree-typerg-slanted-167] [encoding=\typescriptthree]
+    \definefontsynonym [Typewriter-BoldSlanted] [\typescriptthree-typeb-slanted-167]  [encoding=\typescriptthree]
+    \definefontsynonym [TypewriterCond]         [\typescriptthree-typecrg]
+    \definefontsynonym [TypewriterCond-Bold]    [\typescriptthree-typecb]
+    \loadmapfile[\typescriptthree-fontsite-typewriter.map]
+\stoptypescript
+
+\starttypescript [serif] [garamond] [name]
+    \definefontsynonym [Serif]            [FSGaramond]
+    \definefontsynonym [SerifCaps]        [FSGaramondSmCaps]
+    \definefontsynonym [SerifItalic]      [FSGaramond-Italic]
+    \definefontsynonym [SerifBold]        [FSGaramond-Bold]
+    \definefontsynonym [SerifBoldCaps]    [FSGaramondSmCaps-Bold]
+    \definefontsynonym [SerifSlanted]     [FSGaramond-Slanted]
+    \definefontsynonym [SerifBoldSlanted] [FSGaramond-BoldSlanted]
+\stoptypescript
+
+\starttypescript [serif] [garamond] [texnansi,ec,8r]
+    \definefontsynonym [FSGaramond]             [\typescriptthree-garamond]             [encoding=\typescriptthree]
+    \definefontsynonym [FSGaramondSmCaps]       [\typescriptthree-garasc]               [encoding=\typescriptthree]
+    \definefontsynonym [FSGaramond-Italic]      [\typescriptthree-garai]                [encoding=\typescriptthree]
+    \definefontsynonym [FSGaramond-Bold]        [\typescriptthree-garab]                [encoding=\typescriptthree]
+    \definefontsynonym [FSGaramond-BoldItalic]  [\typescriptthree-garabi]               [encoding=\typescriptthree]
+    \definefontsynonym [FSGaramondSmCaps-Bold]  [\typescriptthree-garascb]              [encoding=\typescriptthree]
+    \definefontsynonym [FSGaramond-Slanted]     [\typescriptthree-garamond-slanted-167] [encoding=\typescriptthree]
+    \definefontsynonym [FSGaramond-BoldSlanted] [\typescriptthree-garab-slanted-167]    [encoding=\typescriptthree]
+    \loadmapfile[\typescriptthree-fontsite-garamond.map]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/tex/context/fonts/mkii/type-ghz.mkii b/tex/context/fonts/mkii/type-ghz.mkii
new file mode 100644
index 000000000..3778cd964
--- /dev/null
+++ b/tex/context/fonts/mkii/type-ghz.mkii
@@ -0,0 +1,409 @@
+%D \module
+%D   [       file=type-ghz,
+%D        version=2005.06.07,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Hermann Zapf's Fonts,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% \usetypescriptfile[type-ghz]
+%
+% \definetypeface[optima]  [ss][sans] [optima-nova]  [default]
+% \definetypeface[palatino][rm][serif][palatino-nova][default]
+% \definetypeface[aldus]   [rm][serif][aldus-nova]   [default]
+%
+% \starttext
+%     \setupbodyfont[optima]   \input zapf \blank
+%     \setupbodyfont[palatino] \input zapf \blank
+%     \setupbodyfont[aldus]    \input zapf \blank
+% \stoptext
+
+\starttypescriptcollection[zapf collection]
+
+% zapfino
+
+\starttypescript [serif,handwriting] [zapfino] [texnansi,ec,8r] % todo: handwriting
+
+  \definefontsynonym [ZapfinoOne]   [\typescriptthree-lt54223] [encoding=\typescriptthree]
+  \definefontsynonym [ZapfinoTwo]   [\typescriptthree-lt54224] [encoding=\typescriptthree]
+  \definefontsynonym [ZapfinoThree] [\typescriptthree-lt54225] [encoding=\typescriptthree]
+  \definefontsynonym [ZapfinoFour]  [\typescriptthree-lt54226] [encoding=\typescriptthree]
+
+  \loadmapfile[\typescriptthree-linotype-zapfino.map]
+
+\stoptypescript
+
+% \starttypescript [handwriting] [zapfino-1] \definefontsynonym [Handwriting]  [ZapfinoOne] \stoptypescript
+% \starttypescript [handwriting] [zapfino-2] \definefontsynonym [Handwriting]  [ZapfinoTwo] \stoptypescript
+% \starttypescript [handwriting] [zapfino-3] \definefontsynonym [Handwriting]  [ZapfinoThree] \stoptypescript
+% \starttypescript [handwriting] [zapfino-4] \definefontsynonym [Handwriting]  [ZapfinoFour] \stoptypescript
+
+% optima
+
+\starttypescript [sans] [optima] [name]
+
+  \definefontsynonym [Sans]            [OptimaLT]
+  \definefontsynonym [SansItalic]      [OptimaLT-Italic]
+  \definefontsynonym [SansBold]        [OptimaLT-Bold]
+  \definefontsynonym [SansBoldItalic]  [OptimaLT-BoldItalic]
+  \definefontsynonym [SansSlanted]     [SansItalic]
+  \definefontsynonym [SansBoldSlanted] [SansBoldItalic]
+  \definefontsynonym [SansCaps]        [Sans]
+
+\stoptypescript
+
+\starttypescript [sans] [optima,optima-nova] [texnansi,ec,8r]
+
+  \definefontsynonym [OptimaLT]                  [\typescriptthree-lte50019] [encoding=\typescriptthree]
+  \definefontsynonym [OptimaLT-Italic]           [\typescriptthree-lte52401] [encoding=\typescriptthree]
+  \definefontsynonym [OptimaLT-Bold]             [\typescriptthree-lte50021] [encoding=\typescriptthree]
+  \definefontsynonym [OptimaLT-BoldItalic]       [\typescriptthree-lte54379] [encoding=\typescriptthree]
+
+  \definefontsynonym [OptimaLT-Medium]           [\typescriptthree-lte53505] [encoding=\typescriptthree]
+  \definefontsynonym [OptimaLT-MediumItalic]     [\typescriptthree-lte53506] [encoding=\typescriptthree]
+  \definefontsynonym [OptimaLT-DemiBold]         [\typescriptthree-lte53507] [encoding=\typescriptthree]
+  \definefontsynonym [OptimaLT-DemiBoldItalic]   [\typescriptthree-lte53508] [encoding=\typescriptthree]
+  \definefontsynonym [OptimaLT-Black]            [\typescriptthree-lte53509] [encoding=\typescriptthree]
+  \definefontsynonym [OptimaLT-BlackItalic]      [\typescriptthree-lte53510] [encoding=\typescriptthree]
+  \definefontsynonym [OptimaLT-ExtraBlack]       [\typescriptthree-lte53511] [encoding=\typescriptthree]
+  \definefontsynonym [OptimaLT-ExtraBlackItalic] [\typescriptthree-lte53512] [encoding=\typescriptthree]
+
+  \loadmapfile[\typescriptthree-linotype-optima.map]
+
+\stoptypescript
+
+\starttypescript [optima] [texnansi,ec,qx]
+    \definetypeface[optima][ss][sans] [optima-nova][default][encoding=\typescripttwo]
+    \definetypeface[optima][rm][serif][palatino]   [default][encoding=\typescripttwo]
+    \definetypeface[optima][tt][mono] [modern]     [default][encoding=\typescripttwo,rscale=1.1]
+    \definetypeface[optima][mm][math] [palatino]   [default][encoding=\typescripttwo]
+    \quittypescriptscanning
+\stoptypescript
+
+% optima nova
+
+% see antykwa, we could define variants for light and osf
+
+\starttypescript [sans] [optima-nova] [name]
+
+  \definefontsynonym [Sans]            [OptimaNovaLT-Regular]
+  \definefontsynonym [SansItalic]      [OptimaNovaLT-Italic]
+  \definefontsynonym [SansBold]        [OptimaNovaLT-Bold]
+  \definefontsynonym [SansBoldItalic]  [OptimaNovaLT-BoldItalic]
+  \definefontsynonym [SansSlanted]     [OptimaNovaLT-Italic]
+  \definefontsynonym [SansBoldSlanted] [OptimaNovaLT-BoldItalic]
+  \definefontsynonym [SansCaps]        [OptimaNovaLT-RegularSC]
+
+  \definefontvariant [Serif][osf][OsF]
+  \definefontvariant [Serif][sc][Caps]
+
+  \definefontsynonym [SansOsF]            [OptimaNovaLT-RegularOsF]
+  \definefontsynonym [SansItalicOsF]      [OptimaNovaLT-ItalicOsF]
+  \definefontsynonym [SansBoldOsF]        [OptimaNovaLT-BoldOsF]
+  \definefontsynonym [SansBoldItalicOsF]  [OptimaNovaLT-BoldItalicOsF]
+  \definefontsynonym [SansSlantedOsF]     [OptimaNovaLT-ItalicOsF]
+  \definefontsynonym [SansBoldSlantedOsF] [OptimaNovaLT-BoldItalicOsF]
+  \definefontsynonym [SansCapsOsF]        [OptimaNovaLT-RegularSC]
+
+  \definefontsynonym [SansCaps]            [OptimaNovaLT-RegularSC]
+  \definefontsynonym [SansItalicCaps]      [OptimaNovaLT-ItalicSC ]
+  \definefontsynonym [SansBoldCaps]        [OptimaNovaLT-BoldSC]
+  \definefontsynonym [SansBoldItalicCaps]  [OptimaNovaLT-BoldItalicSC]
+  \definefontsynonym [SansSlantedCaps]     [OptimaNovaLT-ItalicSC]
+  \definefontsynonym [SansBoldSlantedCaps] [OptimaNovaLT-BoldItalicSC]
+  \definefontsynonym [SansCapsCaps]        [OptimaNovaLT-RegularSC]
+
+\stoptypescript
+
+\starttypescript [sans] [optima-nova-os] [name]
+
+  \definefontsynonym [Sans]            [OptimaNovaLT-RegularOsF]
+  \definefontsynonym [SansItalic]      [OptimaNovaLT-ItalicOsF]
+  \definefontsynonym [SansBold]        [OptimaNovaLT-BoldOsF]
+  \definefontsynonym [SansBoldItalic]  [OptimaNovaLT-BoldItalicOsF]
+  \definefontsynonym [SansSlanted]     [OptimaNovaLT-ItalicOsF]
+  \definefontsynonym [SansBoldSlanted] [OptimaNovaLT-BoldItalicOsF]
+  \definefontsynonym [SansCaps]        [OptimaNovaLT-RegularSC]
+
+\stoptypescript
+
+\starttypescript [sans] [optima-nova-light] [name] % may change
+
+  \definefontsynonym [Sans]            [OptimaNovaLT-Light]
+  \definefontsynonym [SansItalic]      [OptimaNovaLT-LightItalic]
+  \definefontsynonym [SansBold]        [OptimaNovaLT-Medium]
+  \definefontsynonym [SansBoldItalic]  [OptimaNovaLT-MediumItalic]
+  \definefontsynonym [SansSlanted]     [OptimaNovaLT-LightItalic]
+  \definefontsynonym [SansBoldSlanted] [OptimaNovaLT-MediumItalic]
+  \definefontsynonym [SansCaps]        [OptimaNovaLT-LightSC]
+
+\stoptypescript
+
+\starttypescript [sans] [optima-nova-medium] [name] % may change
+
+  \definefontsynonym [Sans]            [OptimaNovaLT-Medium]
+  \definefontsynonym [SansItalic]      [OptimaNovaLT-MediumItalic]
+  \definefontsynonym [SansBold]        [OptimaNovaLT-Heavy]
+  \definefontsynonym [SansBoldItalic]  [OptimaNovaLT-HeavyItalic]
+  \definefontsynonym [SansSlanted]     [OptimaNovaLT-MediumItalic]
+  \definefontsynonym [SansBoldSlanted] [OptimaNovaLT-HeavyItalic]
+  \definefontsynonym [SansCaps]        [OptimaNovaLT-MediumSC]
+
+\stoptypescript
+
+\starttypescript [sans] [optima-nova,optima-nova-light,optima-nova-medium,optima-nova-os] [texnansi,ec,8r]
+
+  \definefontsynonym[OptimaNovaLT-Light]          [\typescriptthree-lt55476][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-LightSC]        [\typescriptthree-lt55477][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-LightOsF]       [\typescriptthree-lt55478][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-LightItalic]    [\typescriptthree-lt55479][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-LightItalicSC]  [\typescriptthree-lt55480][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-LightItalicOsF] [\typescriptthree-lt55481][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-LightCond]      [\typescriptthree-lt55482][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-Regular]        [\typescriptthree-lt55483][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-RegularSC]      [\typescriptthree-lt55484][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-RegularOsF]     [\typescriptthree-lt55485][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-Italic]         [\typescriptthree-lt55486][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-ItalicSC]       [\typescriptthree-lt55487][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-ItalicOsF]      [\typescriptthree-lt55488][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-Condensed]      [\typescriptthree-lt55489][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-Medium]         [\typescriptthree-lt55490][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-MediumSC]       [\typescriptthree-lt55491][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-MediumOsF]      [\typescriptthree-lt55492][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-MediumItalic]   [\typescriptthree-lt55493][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-MediumItalicSC] [\typescriptthree-lt55494][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-MediumItalicOsF][\typescriptthree-lt55495][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-MediumCond]     [\typescriptthree-lt55496][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-TitlingInitials][\typescriptthree-lt55497][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-Demi]           [\typescriptthree-lt55498][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-DemiSC]         [\typescriptthree-lt55499][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-DemiOsF]        [\typescriptthree-lt55500][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-DemiItalic]     [\typescriptthree-lt55501][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-DemiItalicSC]   [\typescriptthree-lt55502][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-DemiItalicOsF]  [\typescriptthree-lt55503][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-DemiCond]       [\typescriptthree-lt55504][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-Bold]           [\typescriptthree-lt55505][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-BoldSC]         [\typescriptthree-lt55506][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-BoldOsF]        [\typescriptthree-lt55507][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-BoldItalic]     [\typescriptthree-lt55508][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-BoldItalicSC]   [\typescriptthree-lt55509][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-BoldItalicOsF]  [\typescriptthree-lt55510][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-BoldCond]       [\typescriptthree-lt55511][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-Heavy]          [\typescriptthree-lt55512][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-HeavyItalic]    [\typescriptthree-lt55513][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-Black]          [\typescriptthree-lt55514][encoding=\typescriptthree]
+  \definefontsynonym[OptimaNovaLT-BlackItalic]    [\typescriptthree-lt55515][encoding=\typescriptthree]
+
+  \loadmapfile[\typescriptthree-linotype-optima-nova.map]
+
+\stoptypescript
+
+\starttypescript[optima-nova][texnansi,ec] % will change to more narrow tt
+    \definetypeface[optima][ss][sans][optima-nova] [default][encoding=\typescripttwo]
+    \definetypeface[optima][rm][sans][optima-nova] [default][encoding=\typescripttwo]
+    \definetypeface[optima][tt][mono][latin-modern][default][encoding=\typescripttwo,rscale=1.1]
+    \definetypeface[optima][mm][math][latin-modern][default][encoding=\typescripttwo,rscale=1.1]
+    \quittypescriptscanning
+\stoptypescript
+
+\starttypescript[optima-nova-os][texnansi,ec] % will change to more narrow tt
+    \definetypeface[optima-os][ss][sans][optima-nova-os] [default][encoding=\typescripttwo]
+    \definetypeface[optima-os][rm][sans][optima-nova-os] [default][encoding=\typescripttwo]
+    \definetypeface[optima-os][tt][mono][latin-modern]   [default][encoding=\typescripttwo,rscale=1.1]
+    \definetypeface[optima-os][mm][math][latin-modern]   [default][encoding=\typescripttwo,rscale=1.1]
+    \quittypescriptscanning
+\stoptypescript
+
+% palatino
+
+\starttypescript [serif] [palatino] [name]
+
+  \definefontsynonym [Serif]            [PalatinoLT-Roman]
+  \definefontsynonym [SerifItalic]      [PalatinoLT-Italic]
+  \definefontsynonym [SerifBold]        [PalatinoLT-Bold]
+  \definefontsynonym [SerifBoldItalic]  [PalatinoLT-BoldItalic]
+  \definefontsynonym [SerifSlanted]     [SerifItalic]
+  \definefontsynonym [SerifBoldSlanted] [SerifBoldItalic]
+
+  \definefontsynonym [SerifCaps]        [PalatinoSC]
+
+\stoptypescript
+
+\starttypescript [serif] [palatino] [texnansi,ec,8r]
+
+  \definefontsynonym[PalatinoLT-Roman]        [\typescriptthree-lte50001] [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoLT-Italic]       [\typescriptthree-lte50002] [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoLT-Bold]         [\typescriptthree-lte50003] [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoLT-BoldItalic]   [\typescriptthree-lte50004] [encoding=\typescriptthree]
+
+  \definefontsynonym[PalatinoLT-Light]        [\typescriptthree-lte52168] [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoLT-LightItalic]  [\typescriptthree-lte52169] [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoLT-Medium]       [\typescriptthree-lte52170] [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoLT-MediumItalic] [\typescriptthree-lte52171] [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoLT-Black]        [\typescriptthree-lte52172] [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoLT-BlackItalic]  [\typescriptthree-lte52173] [encoding=\typescriptthree]
+  \definefontsynonym[Palatino-BoldItalicOsF]  [\typescriptthree-pobio]    [encoding=\typescriptthree]
+  \definefontsynonym[Palatino-BoldOsF]        [\typescriptthree-pobos]    [encoding=\typescriptthree]
+  \definefontsynonym[Palatino-ItalicOsF]      [\typescriptthree-poios]    [encoding=\typescriptthree]
+
+  \definefontsynonym[PalatinoSC]              [\typescriptthree-posc]     [encoding=\typescriptthree]
+
+  \loadmapfile[\typescriptthree-linotype-palatino.map]
+
+\stoptypescript
+
+% palatino nova
+
+\starttypescript [serif] [palatino-nova] [name]
+
+  \definefontsynonym [Serif]            [PalatinoNova-Regular]
+  \definefontsynonym [SerifItalic]      [PalatinoNova-Italic]
+  \definefontsynonym [SerifBold]        [PalatinoNova-Bold]
+  \definefontsynonym [SerifBoldItalic]  [PalatinoNova-BoldItalic]
+  \definefontsynonym [SerifSlanted]     [PalatinoNova-Italic]
+  \definefontsynonym [SerifBoldSlanted] [PalatinoNova-BoldItalic]
+  \definefontsynonym [SerifCaps]        [PalatinoNova-RegularSC]
+
+  \definefontvariant [Serif][sc][Caps]
+
+  \definefontsynonym [SerifCaps]            [PalatinoNova-RegularSC]
+  \definefontsynonym [SerifItalicCaps]      [PalatinoNova-ItalicSC]
+  \definefontsynonym [SerifBoldCaps]        [PalatinoNova-BoldSC]
+  \definefontsynonym [SerifBoldItalicCaps]  [PalatinoNova-BoldItalicSC]
+  \definefontsynonym [SerifSlantedCaps]     [PalatinoNova-ItalicSC]
+  \definefontsynonym [SerifBoldSlantedCaps] [PalatinoNova-BoldItalicSC]
+  \definefontsynonym [SerifCapsCaps]        [PalatinoNova-RegularSC]
+
+\stoptypescript
+
+\starttypescript [serif] [palatino-nova-light] [name] % may change
+
+  \definefontsynonym [Serif]            [PalatinoNova-Light]
+  \definefontsynonym [SerifItalic]      [PalatinoNova-LightItalic]
+  \definefontsynonym [SerifBold]        [PalatinoNova-Regular]
+  \definefontsynonym [SerifBoldItalic]  [PalatinoNova-Italic]
+  \definefontsynonym [SerifSlanted]     [PalatinoNova-Regular]
+  \definefontsynonym [SerifBoldSlanted] [PalatinoNova-Italic]
+  \definefontsynonym [SerifCaps]        [PalatinoNova-LightSC]
+
+\stoptypescript
+
+\starttypescript [serif] [palatino-nova-medium] [name] % may change
+
+  \definefontsynonym [Serif]            [PalatinoNova-Medium]
+  \definefontsynonym [SerifItalic]      [PalatinoNova-MediumItalic]
+  \definefontsynonym [SerifBold]        [PalatinoNova-Bold]
+  \definefontsynonym [SerifBoldItalic]  [PalatinoNova-BoldItalic]
+  \definefontsynonym [SerifSlanted]     [PalatinoNova-Bold]
+  \definefontsynonym [SerifBoldSlanted] [PalatinoNova-BoldItalic]
+  \definefontsynonym [SerifCaps]        [PalatinoNova-MediumSC]
+
+\stoptypescript
+
+\starttypescript [serif] [palatino-nova,palatino-nova-light,palatino-nova-medium] [texnansi,ec,8r]
+
+  \definefontsynonym[PalatinoNova-Light]       [\typescriptthree-PalatinoNova-Light]       [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoNova-LightItalic] [\typescriptthree-PalatinoNova-LightItalic] [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoNova-Regular]     [\typescriptthree-PalatinoNova-Regular]     [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoNova-Italic]      [\typescriptthree-PalatinoNova-Italic]      [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoNova-Medium]      [\typescriptthree-PalatinoNova-Medium]      [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoNova-MediumItalic][\typescriptthree-PalatinoNova-MediumItalic][encoding=\typescriptthree]
+  \definefontsynonym[PalatinoNova-Bold]        [\typescriptthree-PalatinoNova-Bold]        [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoNova-BoldItalic]  [\typescriptthree-PalatinoNova-BoldItalic]  [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoNova-Imperial]    [\typescriptthree-PalatinoNova-Imperial]    [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoNova-Titling]     [\typescriptthree-PalatinoNova-Titling]     [encoding=\typescriptthree]
+
+  \definefontsynonym[PalatinoNova-LightSC]       [\typescriptthree-sc-PalatinoNova-Light]       [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoNova-LightItalicSC] [\typescriptthree-sc-PalatinoNova-LightItalic] [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoNova-RegularSC]     [\typescriptthree-sc-PalatinoNova-Regular]     [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoNova-ItalicSC]      [\typescriptthree-sc-PalatinoNova-Italic]      [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoNova-MediumSC]      [\typescriptthree-sc-PalatinoNova-Medium]      [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoNova-MediumItalicSC][\typescriptthree-sc-PalatinoNova-MediumItalic][encoding=\typescriptthree]
+  \definefontsynonym[PalatinoNova-BoldSC]        [\typescriptthree-sc-PalatinoNova-Bold]        [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoNova-BoldItalicSC]  [\typescriptthree-sc-PalatinoNova-BoldItalic]  [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoNova-ImperialSC]    [\typescriptthree-sc-PalatinoNova-Imperial]    [encoding=\typescriptthree]
+  \definefontsynonym[PalatinoNova-TitlingSC]     [\typescriptthree-sc-PalatinoNova-Titling]     [encoding=\typescriptthree]
+
+  \loadmapfile[\typescriptthree-linotype-palatino-nova.map]
+  \loadmapfile[\typescriptthree-sc-linotype-palatino-nova.map]
+
+\stoptypescript
+
+% aldusnova
+
+\starttypescript [serif] [aldus-nova] [name]
+
+  \definefontsynonym [Serif]            [AldusNova-Book]
+  \definefontsynonym [SerifItalic]      [AldusNova-BookItalic]
+  \definefontsynonym [SerifBold]        [AldusNova-Bold]
+  \definefontsynonym [SerifBoldItalic]  [AldusNova-BoldItalic]
+  \definefontsynonym [SerifSlanted]     [AldusNova-BookItalic]
+  \definefontsynonym [SerifBoldSlanted] [AldusNova-BoldItalic]
+  \definefontsynonym [SerifCaps]        [AldusNova-BookSC]
+
+  \definefontvariant [Serif][sc][Caps]
+
+  \definefontsynonym [SerifCaps]            [AldusNova-BookSC]
+  \definefontsynonym [SerifItalicCaps]      [AldusNova-BookItalicSC]
+  \definefontsynonym [SerifBoldCaps]        [AldusNova-BoldSC]
+  \definefontsynonym [SerifBoldItalicCaps]  [AldusNova-BoldItalicSC]
+  \definefontsynonym [SerifSlantedCaps]     [AldusNova-BookItalicSC]
+  \definefontsynonym [SerifBoldSlantedCaps] [AldusNova-BoldItalicSC]
+  \definefontsynonym [SerifCapsCaps]        [AldusNova-BookSC]
+
+\stoptypescript
+
+\starttypescript [serif] [aldus-nova] [texnansi,ec,8r]
+
+  \definefontsynonym[AldusNova-Book]       [\typescriptthree-AldusNova-Book]       [encoding=\typescriptthree]
+  \definefontsynonym[AldusNova-BookItalic] [\typescriptthree-AldusNova-BookItalic] [encoding=\typescriptthree]
+  \definefontsynonym[AldusNova-Bold]       [\typescriptthree-AldusNova-Bold]       [encoding=\typescriptthree]
+  \definefontsynonym[AldusNova-BoldItalic] [\typescriptthree-AldusNova-BoldItalic] [encoding=\typescriptthree]
+
+  \definefontsynonym[AldusNova-BookSC]       [\typescriptthree-sc-AldusNova-Book]       [encoding=\typescriptthree]
+  \definefontsynonym[AldusNova-BookItalicSC] [\typescriptthree-sc-AldusNova-BookItalic] [encoding=\typescriptthree]
+  \definefontsynonym[AldusNova-BoldSC]       [\typescriptthree-sc-AldusNova-Bold]       [encoding=\typescriptthree]
+  \definefontsynonym[AldusNova-BoldItalicSC] [\typescriptthree-sc-AldusNova-BoldItalic] [encoding=\typescriptthree]
+
+  \loadmapfile[\typescriptthree-linotype-aldus-nova.map]
+  \loadmapfile[\typescriptthree-sc-linotype-aldus-nova.map]
+
+\stoptypescript
+
+% melior
+
+\starttypescript [serif] [melior] [name]
+
+  \definefontsynonym [MeliorLT-Roman]   [MeliorLT]
+
+  \definefontsynonym [Serif]            [MeliorLT-Roman]
+  \definefontsynonym [SerifItalic]      [MeliorLT-Italic]
+  \definefontsynonym [SerifBold]        [MeliorLT-Bold]
+  \definefontsynonym [SerifBoldItalic]  [MeliorLT-BoldItalic]
+
+  \definefontsynonym [SerifSlanted]     [SerifItalic]
+  \definefontsynonym [SerifBoldSlanted] [SerifBoldItalic]
+
+  \definefontsynonym [SerifCaps]        [Serif]
+
+\stoptypescript
+
+\starttypescript [serif] [melior] [texnansi,ec,8r]
+
+  \definefontsynonym [MeliorLT]            [texnansi-lte50062] [encoding=\typescriptthree]
+  \definefontsynonym [MeliorLT-Italic]     [texnansi-lte50063] [encoding=\typescriptthree]
+  \definefontsynonym [MeliorLT-Bold]       [texnansi-lte50064] [encoding=\typescriptthree]
+  \definefontsynonym [MeliorLT-BoldItalic] [texnansi-lte50065] [encoding=\typescriptthree]
+
+  \loadmapfile[\typescriptthree-linotype-melior.map]
+
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/tex/context/fonts/mkii/type-hgz.mkii b/tex/context/fonts/mkii/type-hgz.mkii
new file mode 100644
index 000000000..4d3e495b0
--- /dev/null
+++ b/tex/context/fonts/mkii/type-hgz.mkii
@@ -0,0 +1 @@
+\input type-ghz.mkii \endinput % can be file synonym
diff --git a/tex/context/fonts/mkii/type-mac.mkii b/tex/context/fonts/mkii/type-mac.mkii
new file mode 100644
index 000000000..e8abf09b9
--- /dev/null
+++ b/tex/context/fonts/mkii/type-mac.mkii
@@ -0,0 +1,593 @@
+%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.
+
+\definetypescriptprefix [f:andalemono]      [Andale Mono]
+\definetypescriptprefix [f:chalkboard]      [Chalkboard]
+\definetypescriptprefix [f:cochin]          [Cochin]
+\definetypescriptprefix [f:comicsans]       [Comic Sans MS]
+\definetypescriptprefix [f:couriernew]      [Courier New]
+\definetypescriptprefix [f:georgia]         [Georgia]
+\definetypescriptprefix [f:lucidagrande]    [Lucida Grande]
+\definetypescriptprefix [f:monaco]          [Monaco]
+\definetypescriptprefix [f:tahoma]          [Tahoma]
+\definetypescriptprefix [f:timesnewroman]   [Times New Roman]
+\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]
+    \definefontsynonym [AmericanTypewriter-Light]     [name:American Typewriter Light]           [features=default]
+    \definefontsynonym [AmericanTypewriter-Regular]   [name:American Typewriter]                 [features=default]
+    \definefontsynonym [AmericanTypewriter-Bold]      [name:American Typewriter Bold]            [features=default]
+    \definefontsynonym [AmericanTypewriter-LightCond] [name:American Typewriter Condensed Light] [features=default]
+    \definefontsynonym [AmericanTypewriter-Condensed] [name:American Typewriter Condensed]       [features=default]
+    \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]
+    \definefontsynonym [Arial-Condensed]      [name:Arial Narrow]             [features=default]
+    \definefontsynonym [Arial-ItalicCond]     [name:Arial Narrow Italic]      [features=default]
+    \definefontsynonym [Arial-BoldCond]       [name:Arial Narrow Bold]        [features=default]
+    \definefontsynonym [Arial-BoldItalicCond] [name:Arial Narrow Bold Italic] [features=default]
+    \definefontsynonym [Arial-Regular]        [name:Arial]                    [features=default]
+    \definefontsynonym [Arial-Italic]         [name:Arial Italic]             [features=default]
+    \definefontsynonym [Arial-Bold]           [name:Arial Bold]               [features=default]
+    \definefontsynonym [Arial-BoldItalic]     [name:Arial Bold Italic]        [features=default]
+    \definefontsynonym [Arial-Black]          [name:Arial Black]              [features=default]
+    \definefontsynonym [Arial-Unicode]        [name:Arial Unicode MS]         [features=default]
+    \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]
+    \definefontsynonym [Baskerville-Regular]      [name:Baskerville]                 [features=default]
+    \definefontsynonym [Baskerville-Italic]       [name:Baskerville Italic]          [features=default]
+    \definefontsynonym [Baskerville-Medium]       [name:Baskerville SemiBold]        [features=default]
+    \definefontsynonym [Baskerville-MediumItalic] [name:Baskerville SemiBold Italic] [features=default]
+    \definefontsynonym [Baskerville-Bold]         [name:Baskerville Bold]            [features=default]
+    \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]
+    \definefontsynonym [Copperplate-Light]   [name:Copperplate Light] [features=default]
+    \definefontsynonym [Copperplate-Regular] [name:Copperplate]       [features=default]
+    \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]
+    \definefontsynonym [Futura-MediumCond]   [name:Futura Condensed Medium]    [features=default]
+    \definefontsynonym [Futura-Medium]       [name:Futura Medium]              [features=default]
+    \definefontsynonym [Futura-MediumItalic] [name:Futura Medium Italic]       [features=default]
+    \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]
+    \definefontsynonym [GillSans-Light]       [name:Gill Sans Light]        [features=default]
+    \definefontsynonym [GillSans-LightItalic] [name:Gill Sans Light Italic] [features=default]
+    \definefontsynonym [GillSans-Regular]     [name:Gill Sans]              [features=default]
+    \definefontsynonym [GillSans-Italic]      [name:Gill Sans Italic]       [features=default]
+    \definefontsynonym [GillSans-Bold]        [name:Gill Sans Bold]         [features=default]
+    \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]
+    \definefontsynonym [HelveticaNeue-UltraLight]       [name:Helvetica Neue UltraLight]        [features=default]
+    \definefontsynonym [HelveticaNeue-UltraLightItalic] [name:Helvetica Neue UltraLight Italic] [features=default]
+    \definefontsynonym [HelveticaNeue-Light]            [name:Helvetica Neue Light]             [features=default]
+    \definefontsynonym [HelveticaNeue-LightItalic]      [name:Helvetica Neue Light Italic]      [features=default]
+    \definefontsynonym [HelveticaNeue-Regular]          [name:Helvetica Neue]                   [features=default]
+    \definefontsynonym [HelveticaNeue-Italic]           [name:Helvetica Neue Italic]            [features=default]
+    \definefontsynonym [HelveticaNeue-Bold]             [name:Helvetica Neue Bold]              [features=default]
+    \definefontsynonym [HelveticaNeue-BoldItalic]       [name:Helvetica Neue Bold Italic]       [features=default]
+    \definefontsynonym [HelveticaNeue-BoldCond]         [name:Helvetica Neue Condensed Bold]    [features=default]
+    \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]
+    \definefontsynonym [HiraginoMinchoPro-Regular]  [name:Hiragino Mincho Pro W3]  [features=japanese]
+    \definefontsynonym [HiraginoMinchoPro-Bold]     [name:Hiragino Mincho Pro W6]  [features=japanese]
+    \definefontsynonym [HiraginoMinchoProN-Regular] [name:Hiragino Mincho ProN W3] [features=japanese]
+    \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]
+    \definefontsynonym [HiraginoMaruGothicPro-Regular]  [name:Hiragino Maru Gothic Pro W4]  [features=japanese]
+    \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]
+    \definefontsynonym [HiraginoKakuGothicPro-Regular]  [name:Hiragino Kaku Gothic Pro W3]  [features=japanese]
+    \definefontsynonym [HiraginoKakuGothicPro-Bold]     [name:Hiragino Kaku Gothic Pro W6]  [features=japanese]
+    \definefontsynonym [HiraginoKakuGothicStd-Black]    [name:Hiragino Kaku Gothic Std W8]  [features=japanese]
+    \definefontsynonym [HiraginoKakuGothicProN-Regular] [name:Hiragino Kaku Gothic Pron W3] [features=japanese]
+    \definefontsynonym [HiraginoKakuGothicProN-Bold]    [name:Hiragino Kaku Gothic ProN W6] [features=japanese]
+    \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]
+    \definefontsynonym [HoeflerText-Regular]     [name:Hoefler Text]              [features=default]
+    \definefontsynonym [HoeflerText-Italic]      [name:Hoefler Text Italic]       [features=default]
+    \definefontsynonym [HoeflerText-Black]       [name:Hoefler Text Black]        [features=default]
+    \definefontsynonym [HoeflerText-BlackItalic] [name:Hoefler Text Black Italic] [features=default]
+    \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]
+    \definefontsynonym [Optima-Regular]    [name:Optima Regular]     [features=default]
+    \definefontsynonym [Optima-Italic]     [name:Optima Italic]      [features=default]
+    \definefontsynonym [Optima-Bold]       [name:Optima Bold]        [features=default]
+    \definefontsynonym [Optima-BoldItalic] [name:Optima Bold Italic] [features=default]
+    \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]
+    \definefontsynonym [Papyrus-Regular]   [name:Papyrus]           [features=default]
+    \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]
+    \definefontsynonym [STXihei-Light]   [name:STHeiti Light]   [features=chinese]
+    \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]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular] [name:\typescriptprefix{f:\typescripttwo}]      [features=default]
+    \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]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]    [name:\typescriptprefix{f:\typescripttwo}]             [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]     [name:\typescriptprefix{f:\typescripttwo} Italic]      [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]       [name:\typescriptprefix{f:\typescripttwo} Bold]        [features=default]
+    \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/fonts/mkii/type-msw.mkii b/tex/context/fonts/mkii/type-msw.mkii
new file mode 100644
index 000000000..26ec190cb
--- /dev/null
+++ b/tex/context/fonts/mkii/type-msw.mkii
@@ -0,0 +1 @@
+\input type-win.mkii \endinput % could be a file synonym
diff --git a/tex/context/fonts/mkii/type-pre.mkii b/tex/context/fonts/mkii/type-pre.mkii
new file mode 100644
index 000000000..99db52c2f
--- /dev/null
+++ b/tex/context/fonts/mkii/type-pre.mkii
@@ -0,0 +1,253 @@
+%D \module
+%D   [       file=type-pre,
+%D        version=2001.04.12,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Compatibility scripts,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D This file is obsolete. We now have latin modern and proper
+%D typescripts. Forget about this file.
+
+%D This file defines some typescripts that simulate the pre-typescript way
+%D of defining fonts. This file will not be extended.
+
+\starttypescriptcollection[previous]
+
+%D The Computer Modern Roman is derived from the Monotype~8a
+%D Times Roman. In this module, that is loaded by default, we
+%D define all relevant alternatives.
+
+\starttypescript [cmr]
+  \usetypescript[modern][default]
+  \setupbodyfont[modern]
+\stoptypescript
+
+%D This script remaps the default Computer Modern Font Files
+%D onto the EC ones, so that hyphenations work well. (The proper
+%D latin modern ec variants have replaed the ae ones.)
+
+\starttypescript [aer]
+  \usetypescript[modern][ec]
+  \setupbodyfont[modern]
+ %\enableregime[ec]
+\stoptypescript
+
+%D This script defines the Computer Modern Roman with a pseudo kind
+%D of iso latin 2 encoding.
+
+\starttypescript [csr]
+  \usetypescript[modern][ec]
+  \setupbodyfont[modern]
+  \enableregime[il2]
+\stoptypescript
+
+%D This script defines the Computer Modern Roman with a
+%D polish encoding.
+
+\starttypescript [plr]
+  \usetypescript[modern][qx]
+  \setupbodyfont[modern]
+  \enableregime[pl0]
+\stoptypescript
+
+%D Vietnamese.
+
+\starttypescript [vnr]
+  \usetypescript[modern][t5]
+  \setupbodyfont[modern]
+\stoptypescript
+
+%D Cyrillic alternatives are available under the symbolic
+%D name \type {cyr}.
+
+\starttypescript [cyr]
+  \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,cyr]
+  \usemathcollection[default]
+\stoptypescript
+
+\starttypescript [lh-ec]
+  \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,ec]
+  \usemathcollection[default]
+\stoptypescript
+
+\starttypescript [lh-t2a]
+  \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,t2a]
+  \usemathcollection[default]
+\stoptypescript
+
+\starttypescript [lh-t2b]
+  \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,t2b]
+  \usemathcollection[default]
+\stoptypescript
+
+\starttypescript [lh-t2c]
+  \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,t2c]
+  \usemathcollection [default]
+\stoptypescript
+
+\starttypescript [lh-x2]
+  \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,x2]
+  \usemathcollection [default]
+\stoptypescript
+
+\starttypescript [lh-lcy]
+  \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,lcy]
+  \usemathcollection [default]
+\stoptypescript
+
+%D Here we implement the symbol fonts as provided by the
+%D American Mathematical Society. The names of these symbols
+%D can be found in The Joy of \TeX\ by M.~Spivak.
+
+% \starttypescript [ams]
+%   \usetypescript [math] [ams] [all]
+%   \usemathcollection[default]
+% \stoptypescript
+
+%D The Concrete Modern Roman is just an alternative Computer
+%D Modern Roman.
+
+% \starttypescript [con]
+%   \usetypescript [serif] [concrete] [all]
+%   \usemathcollection[default]
+% \stoptypescript
+
+%D The Euler Fonts are designed by Herman Zapf and can be
+%D used with the Concrete Fonts defined elsewhere.
+
+% \starttypescript [eul]
+%   \usetypescript [math] [euler] [all]
+%   \usemathcollection[eul]
+% \stoptypescript
+
+%D The Lucida Bright fonts are both good looking and and
+%D complete. These fonts have prebuilt accented characters,
+%D which means that we use another encoding vector: \YandY\
+%D texnansi. These fonts are a good illustration that a 12
+%D point bodyfont is indeed never that size. The Lucida Bright
+%D fonts come in one design size.
+
+% \starttypescript [lbr]
+%   \usetypescript [serif,sans,mono,math,calligraphy,handwriting] [lucida]  [name,special,\defaultencoding]
+%   \usetypescript [serif,sans,mono,math,calligraphy,handwriting] [default] [size]
+%   \usemathcollection[lbr]
+%   \usetypescript [all] [lucida] [\defaultencoding]
+% \stoptypescript
+
+\starttypescript [lbr]
+  \usetypescript[lucida][\defaultencoding]
+\stoptypescript
+
+%D Times
+
+\starttypescript [tim]
+  \usetypescript [times] [\defaultencoding]
+  \setupbodyfont [times]
+\stoptypescript
+
+%D The Antikwa Torunska font family is a rather nice
+%D and subtle one. Although primary meant for the polish
+%D language, it can be used for other languages as well.
+
+\starttypescript [ant]
+  \usetypescript [antykwa-torunska] [\defaultencoding]
+  \setupbodyfont [antykwa,rm]
+\stoptypescript
+
+%D This script defines the Standard Adobe Courier fonts.
+
+% \starttypescript [pcr]
+%   \usetypescript [mono] [courier] [name,\defaultencoding]
+%   \usetypescript [mono] [default] [size]
+%   \usetypescript [all] [courier] [\defaultencoding]
+% \stoptypescript
+
+\starttypescript [pcr]
+  \usetypescript [postscript] [\defaultencoding]
+  \setupbodyfont [postscript,tt]
+\stoptypescript
+
+%D This script defines the Standard Adobe Helvetica fonts.
+
+% \starttypescript [phv]
+%   \usetypescript [sans] [helvetica] [name,\defaultencoding]
+%   \usetypescript [sans] [default]   [size]
+%   \usetypescript [all] [helvetica] [\defaultencoding]
+% \stoptypescript
+
+\starttypescript [phv]
+  \usetypescript [postscript] [\defaultencoding]
+  \setupbodyfont [postscript,ss]
+\stoptypescript
+
+%D This script defines the Standard Adobe Times fonts.
+
+% \starttypescript [ptm]
+%   \usetypescript [serif] [times]   [name,\defaultencoding]
+%   \usetypescript [serif] [default] [size]
+%   \usetypescript [all] [times] [\defaultencoding]
+% \stoptypescript
+
+\starttypescript [ptm]
+  \usetypescript [postscript] [\defaultencoding]
+  \setupbodyfont [postscript,rm]
+\stoptypescript
+
+%D This script loads the Adobe Times Roman, Helvetica and
+%D Courier.
+
+% \starttypescript [pos]
+%   \usetypescript [serif] [times]     [name,\defaultencoding]
+%   \usetypescript [sans]  [helvetica] [name,\defaultencoding]
+%   \usetypescript [mono]  [courier]   [name,\defaultencoding]
+%   \usetypescript [serif,sans,mono] [default] [size]
+%   \usetypescript [all] [times,helvetica,courier] [\defaultencoding]
+% \stoptypescript
+
+\starttypescript [pos]
+  \usetypescript [postscript] [\defaultencoding]
+  \setupbodyfont [postscript]
+\stoptypescript
+
+%D This script defines the Palatino font.
+
+\starttypescript [ppl]
+  \usetypescript [palatino] [\defaultencoding]
+  \setupbodyfont [palatino]
+\stoptypescript
+
+%D The following scripts fake the old \type {font-ber} and
+%D alike files.
+
+\starttypescript[fil]
+  % fake to prevent loading font-fil.tex and signal 'done'
+\stoptypescript
+
+%D But for old time sake we provide:
+
+\starttypescript[ber]
+  \usetypescript [berry] [ec,t5] % could be [all]
+\stoptypescript
+
+\stoptypescriptcollection
+
+%D Special scripts:
+
+\unprotect
+
+\starttypescriptcollection[special scripts]
+
+  \starttypescript[chi] \readfile{\f!fontprefix chi}\donothing\donothing \stoptypescript
+  \starttypescript[jap] \readfile{\f!fontprefix jap}\donothing\donothing \stoptypescript
+  \starttypescript[arb] \readfile{\f!fontprefix arb}\donothing\donothing \stoptypescript
+  \starttypescript[heb] \readfile{\f!fontprefix heb}\donothing\donothing \stoptypescript
+
+\stoptypescriptcollection
+
+\protect \endinput
diff --git a/tex/context/fonts/mkii/type-win.mkii b/tex/context/fonts/mkii/type-win.mkii
new file mode 100644
index 000000000..ae6909820
--- /dev/null
+++ b/tex/context/fonts/mkii/type-win.mkii
@@ -0,0 +1,69 @@
+%D \module
+%D   [       file=type-msw,
+%D        version=2005.02.04,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Microsoft Windows Fonts,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% \usetypescriptfile[type-msw]
+%
+% \definetypeface[verdana][ss][sans] [verdana] [default][encoding=texnansi]
+% \definetypeface[verdana][rm][serif][palatino][default][encoding=texnansi,rscale=1.1]
+% \definetypeface[verdana][mm][math] [palatino][default][encoding=texnansi,rscale=1.1]
+% \definetypeface[verdana][tt][mono] [modern]  [default][encoding=texnansi,rscale=1.25]
+%
+% \setupbodyfont[verdana] \showfontstrip
+%
+% \startlines
+% {\rm test {\sl test} {\it test} {\bf test} {\bs test} {\bi test}}
+% {\ss test {\sl test} {\it test} {\bf test} {\bs test} {\bi test}}
+% {\tt test {\sl test} {\it test} {\bf test} {\bs test} {\bi test}}
+% \stoplines
+
+\starttypescriptcollection[windows]
+
+% verdana
+
+\starttypescript [sans] [verdana] [name]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Verdana]
+    \definefontsynonym [SansBold]       [Verdana-Bold]
+    \definefontsynonym [SansItalic]     [Verdana-Italic]
+    \definefontsynonym [SansBoldItalic] [Verdana-BoldItalic]
+\stoptypescript
+
+\starttypescript [sans] [verdana] [texnansi,ec,qx]
+    \definefontsynonym [Verdana]            [\typescriptthree-verdana]  [encoding=\typescriptthree]
+    \definefontsynonym [Verdana-Bold]       [\typescriptthree-verdanab] [encoding=\typescriptthree]
+    \definefontsynonym [Verdana-Italic]     [\typescriptthree-verdanai] [encoding=\typescriptthree]
+    \definefontsynonym [Verdana-BoldItalic] [\typescriptthree-verdanaz] [encoding=\typescriptthree]
+    \loadmapfile[\typescriptthree-microsoft-verdana.map]
+\stoptypescript
+
+% arial
+
+\starttypescript [sans] [arial] [name]
+  \setups[font:fallback:sans]
+  \definefontsynonym [Sans]           [ArialMT]
+  \definefontsynonym [SansBold]       [Arial-BoldMT]
+  \definefontsynonym [SansItalic]     [Arial-ItalicMT]
+  \definefontsynonym [SansBoldItalic] [Arial-BoldItalicMT]
+\stoptypescript
+
+\starttypescript [sans] [arial] [texnansi,ec,qx]
+    \definefontsynonym [ArialMT]            [\typescriptthree-arial]   [encoding=\typescriptthree]
+    \definefontsynonym [Arial-BoldMT]       [\typescriptthree-arialbd] [encoding=\typescriptthree]
+    \definefontsynonym [Arial-ItalicMT]     [\typescriptthree-ariali]  [encoding=\typescriptthree]
+    \definefontsynonym [Arial-BoldItalicMT] [\typescriptthree-arialbi] [encoding=\typescriptthree]
+    \loadmapfile[\typescriptthree-microsoft-arial.map]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/tex/context/fonts/mkii/type-xtx.mkii b/tex/context/fonts/mkii/type-xtx.mkii
new file mode 100644
index 000000000..3c5b06d9e
--- /dev/null
+++ b/tex/context/fonts/mkii/type-xtx.mkii
@@ -0,0 +1,570 @@
+%D \module
+%D   [       file=type-xtx,
+%D        version=2004.11.15, % prereleased earlier
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=\XETEX's font treasures,
+%D         author=Adam T. Lindsay etc,
+%D           date=\currentdate,
+%D      copyright={Adam Lindsay \& Hans Hagen \& ...}]
+%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 Note HH: this file probably needs to be adapted to the current names and
+%D so but as I don't use \XETEX\ myself others have to provide information.
+
+%D Here are some fonts definitions that can get you started with
+%D \XETEX\ (for more details see Adam's MyWay documents).
+%D
+%D Most typescripts in this file are mostly independent of the other
+%D typescript files. Generally, you can speed things up a lot by
+%D eliminating all but one of \CONTEXT's typescript files:
+%D
+%D \starttyping
+%D \usetypescriptfiles[reset]     % HH: watch out, new feature, since
+%D \usetypescriptfiles[type-siz]  % I disliked the low level redef.
+%D \stoptyping
+%D
+%D The exceptions are the \quotation {legacy} fonts Times, Palatino,
+%D Courier, and Helvetica, which also depend on \type {type-syn}.
+%D
+%D These following six typescripts call the basic four variants on any
+%D given font, given the name of the \quotation {Regular} variant in the
+%D name slot. These typescripts default to a Unicode encoding,
+%D accepts sizes \quotation {default} and \quotation {dtp}, and are
+%D activated with the identifiers \quotation {Xserif}, \quotation {Xsans},
+%D and \quotation {Xmono}. They can have relative scaling within the
+%D typeface. Any of the following work:
+%D
+%D \starttyping
+%D \definetypeface[basic][rm][Xserif][Baskerville]
+%D \definetypeface[basic][ss][Xsans] [Optima Regular][default][features=default,rscale=0.87]
+%D \definetypeface[basic][tt][Xmono] [Courier]       [default]
+%D \stoptyping
+%D
+%D Activate the typeface with:
+%D
+%D \starttyping
+%D \setupbodyfont[basic]
+%D \stoptyping
+
+%D This file is hacked by Taco Hoekwater in an attempt to figure out the right approach
+%D to font loading in \XeTeX.  (jun19,2007)
+
+%D The General \XeTeX\ low-level font syntax is (at least) as follows.
+%D
+%D Named font:
+%D \starttyping
+%D \font\x = "<fontname><engine-options>:<featurelist>" <at or scaled>
+%D \stoptyping
+%D \type{<fontname>} = Font name as seen in a system font menu or the output of fc-list
+%D
+%D \type{<engine-options>} = \type{/B} or \type{/I} or \tupe{/BI}, and||or \type{/S=<X>}.
+%D That last one selects an optical scaled variant for size \type{<X>}
+%D (it is a bare number, the unit is points).
+%D
+%D \type{<featurelist>} = comma- or semicolon- separated list of font features.
+%D
+%D Opentype features are selected using \type{+<tag>}, and deselected using \type{-<tag>},
+%D except that key||value pairs are used for \type{script=<tag>} and \type{language=<tag>}
+%D
+%D AAT features are always key||value pairs, often including spaces.
+%D
+%D \XETEX's own features are key||value pairs, and can be applied to both OpenType
+%D and AAT fonts:
+%D \type{mapping=<font map>} for glyph remapping
+%D \type{color=RRGGBB[TT]} for color (hex numbers, with  optional transparancy),
+%D \type{letterspace=<x>} to add \type{<x>/<fontsize>}  intercharacter spacing.
+%D
+%D Full example showing all parts of the syntax for an OTF font:
+%D \starttyping
+%D \font\f= "Warnock Pro/I/S=5:+smcp,-liga,mapping=tex-text,script=latn"
+%D \stoptyping
+
+%D Non-installed (filename-based) fonts :
+%D
+%D \starttyping
+%D \font\x = "[<fontname>]:<featurelist>" <at or scaled>
+%D \stoptyping
+%D
+%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.
+
+\unexpanded\def\xetexcolon{:}
+
+\starttypescriptcollection[xetex]
+
+\starttypescript[Xserif][all][name]
+
+%D TH: I removed all single quotes because they don't seem to add anything. And I added
+%D the \type{name:} everywhere, because passing that information on \type{\typescripttwo}
+%D doesn't work either (maybe  \type{\typescripttwo} is expanded incorrectly)
+%D
+%D And even if that would have worked, \type{file:} will not work properly anyway
+%D in this case since tricks like \type{/I} will never, ever work for local fonts,
+%D so there is really only one choice.
+
+%D HH: todo, define feature set switch mapping=tex-tex
+
+\definefontsynonym[Dummy]          [name:\typescripttwo]   [features=default]
+\definefontsynonym[DummyItalic]    [name:\typescripttwo/I] [features=default]
+\definefontsynonym[DummyBold]      [name:\typescripttwo/B] [features=default]
+\definefontsynonym[DummyBoldItalic][name:\typescripttwo/BI][features=default]
+
+\definefontsynonym[DummyCaps]      [name:\typescripttwo]   [features=smallcaps]
+
+\definefontsynonym[Serif]           [Dummy]
+\definefontsynonym[SerifBold]       [DummyBold]
+\definefontsynonym[SerifItalic]     [DummyItalic]
+\definefontsynonym[SerifBoldItalic] [DummyBoldItalic]
+\definefontsynonym[SerifSlanted]    [DummyItalic]
+\definefontsynonym[SerifBoldSlanted][DummyBoldItalic]
+\definefontsynonym[SerifCaps]       [DummyCaps]
+
+\stoptypescript
+
+\starttypescript[Xsans][all][name]
+
+\definefontsynonym[DummySans]          [name:\typescripttwo]   [features=default]
+\definefontsynonym[DummySansItalic]    [name:\typescripttwo/I] [features=default]
+\definefontsynonym[DummySansBold]      [name:\typescripttwo/B] [features=default]
+\definefontsynonym[DummySansBoldItalic][name:\typescripttwo/BI][features=default]
+
+\definefontsynonym[DummySansCaps]      [name:\typescripttwo]   [features=smallcaps]
+
+\definefontsynonym[Sans]           [DummySans]
+\definefontsynonym[SansBold]       [DummySansBold]
+\definefontsynonym[SansItalic]     [DummySansItalic]
+\definefontsynonym[SansBoldItalic] [DummySansBoldItalic]
+\definefontsynonym[SansSlanted]    [DummySansItalic]
+\definefontsynonym[SansBoldSlanted][DummySansBoldItalic]
+\definefontsynonym[SansCaps]       [DummySansCaps]
+
+\stoptypescript
+
+\starttypescript[Xmono][all][name]
+
+\definefontsynonym[DummyMono]          [name:\typescripttwo]
+\definefontsynonym[DummyMonoItalic]    [name:\typescripttwo/I]
+\definefontsynonym[DummyMonoBold]      [name:\typescripttwo/B]
+\definefontsynonym[DummyMonoBoldItalic][name:\typescripttwo/BI]
+
+% TODO: smallcaps without other features
+
+\definefontsynonym[Mono]           [DummyMono]
+\definefontsynonym[MonoBold]       [DummyMonoBold]
+\definefontsynonym[MonoItalic]     [DummyMonoItalic]
+\definefontsynonym[MonoBoldItalic] [DummyMonoBoldItalic]
+\definefontsynonym[MonoSlanted]    [DummyMonoItalic]
+\definefontsynonym[MonoBoldSlanted][DummyMonoBoldItalic]
+\definefontsynonym[MonoCaps]       [DummyMono]
+
+\stoptypescript
+
+\starttypescript[Xserif][default][size]
+  \definebodyfont
+  [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt] [rm]
+  [default]
+\stoptypescript
+
+\starttypescript[Xsans][default][size]
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [ss] [default]
+\stoptypescript
+
+\starttypescript [Xmono][default][size]
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [tt] [default]
+\stoptypescript
+
+\starttypescript[Xserif][dtp][size]
+  \definebodyfont
+    [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt]
+    [rm] [default]
+\stoptypescript
+
+\starttypescript[Xsans][dtp][size]
+  \definebodyfont
+    [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt]
+    [ss] [default]
+\stoptypescript
+
+\starttypescript[Xmono][dtp][size]
+  \definebodyfont
+    [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt]
+    [tt] [default]
+\stoptypescript
+
+%D The following are \quotation {legacy} named fonts. Times, Palatino,
+%D and Helvetica are familiar to most users of modern \TEX\
+%D systems. These versions are accessed via the Unicode encoding
+%D enabled by \XETEX. There is no attempt to match metrics with
+%D the actual legacy fonts. These are simply familiar names.
+
+%D These typescripts, unlike others in this file, depend on those in
+%D \type{type-pre}.
+
+\starttypescript[serif][times][uc]
+
+\definefontsynonym[Times-Roman]     [name:Times Roman]      [features=default]
+\definefontsynonym[Times-Italic]    [name:Times Italic]     [features=default]
+\definefontsynonym[Times-Bold]      [name:Times Bold]       [features=default]
+\definefontsynonym[Times-BoldItalic][name:Times Bold Italic][features=default]
+
+\stoptypescript
+
+%D Book Antiqua is Mac OS X's Palatino clone.
+
+\starttypescript[serif][palatino][uc]
+
+\definefontsynonym[Palatino]            [name:Book Antiqua]            [features=default]
+\definefontsynonym[Palatino-Italic]     [name:Book Antiqua Italic]     [features=default]
+\definefontsynonym[Palatino-Bold]       [name:Book Antiqua Bold]       [features=default]
+\definefontsynonym[Palatino-BoldItalic] [name:Book Antiqua Bold Italic][features=default]
+
+\definefontsynonym[Palatino-Slanted]     [Palatino-Italic]
+\definefontsynonym[Palatino-BoldSlanted] [Palatino-BoldItalic]
+\definefontsynonym[Palatino-Caps]        [Palatino]
+
+\stoptypescript
+
+%D The default Helvetica doesn't have an oblique variant, so we'll
+%D go ahead and name Helvertica Neue here.
+
+\starttypescript[sans][helvetica][uc]
+
+\definefontsynonym[Helvetica]            [name:Helvetica Neue]            [features=default]
+\definefontsynonym[Helvetica-Oblique]    [name:Helvetica Neue Italic]     [features=default]
+\definefontsynonym[Helvetica-Bold]       [name:Helvetica Neue Bold]       [features=default]
+\definefontsynonym[Helvetica-BoldOblique][name:Helvetica Neue Bold Italic][features=default]
+
+\stoptypescript
+
+%D Courier, as delivered on MacOSX 10.3, doesn't have an oblique
+%D variant, either. Unfortunately, none of the default Mono fonts in
+%D MacOSX have oblique|/|italic versions!
+
+\starttypescript[mono][courier][uc]
+
+\definefontsynonym[Courier]            [name:Courier]
+\definefontsynonym[Courier-Oblique]    [Courier]
+\definefontsynonym[Courier-Bold]       [name:Courier Bold]
+\definefontsynonym[Courier-BoldOblique][Courier-Bold]
+
+\stoptypescript
+
+%D The following fonts go beyond the usual four variants that
+%D are accessible via the above wildcard typescripts, so they
+%D get a more expanded treatment here\xetexcolon
+
+\starttypescript[serif][hoefler][uc]
+
+\definefontsynonym[Hoefler]      [name:Hoefler Text\xetexcolon mapping=tex-text;%
+                   Ligatures=Diphthongs]  [encoding=uc]
+\definefontsynonym[HoeflerItalic][name:Hoefler Text Italic\xetexcolon mapping=tex-text;%
+                   Ligatures=Diphthongs]  [encoding=uc]
+\definefontsynonym[HoeflerBlack] [name:Hoefler Text Black\xetexcolon mapping=tex-text;%
+                   Ligatures=Diphthongs]  [encoding=uc]
+\definefontsynonym[HoeflerBlackItalic][name:Hoefler Text Black Italic\xetexcolon mapping=tex-text;%
+                   Ligatures=Diphthongs]  [encoding=uc]
+\definefontsynonym[HoeflerSmCap] [name:Hoefler Text\xetexcolon mapping=tex-text;%
+                   Ligatures=Diphthongs;%
+                   Letter Case=Small Caps][encoding=uc]
+\stoptypescript
+
+\starttypescript[serif][hoefler][name]
+
+\definefontsynonym[Serif]           [Hoefler]
+\definefontsynonym[SerifBold]       [HoeflerBlack]
+\definefontsynonym[SerifItalic]     [HoeflerItalic]
+\definefontsynonym[SerifBoldItalic] [HoeflerBlackItalic]
+\definefontsynonym[SerifSlanted]    [HoeflerItalic]
+\definefontsynonym[SerifBoldSlanted][HoeflerBlackItalic]
+\definefontsynonym[SerifCaps]       [HoeflerSmCap]
+
+\stoptypescript
+
+\starttypescript[sans][lucidagrande][uc]
+
+\definefontsynonym[LucidaGrande]    [name:Lucida Grande]     [features=default]
+\definefontsynonym[LucidaGrandeBold][name:Lucida Grande Bold][features=default]
+
+\stoptypescript
+
+\starttypescript[sans][lucidagrande][name]
+
+\definefontsynonym[Sans]           [LucidaGrande]
+\definefontsynonym[SansBold]       [LucidaGrandeBold]
+\definefontsynonym[SansItalic]     [LucidaGrande]
+\definefontsynonym[SansBoldItalic] [LucidaGrandeBold]
+\definefontsynonym[SansSlanted]    [LucidaGrande]
+\definefontsynonym[SansBoldSlanted][LucidaGrandeBold]
+\definefontsynonym[SansCaps]       [LucidaGrande]
+
+\stoptypescript
+
+\starttypescript[sans][optima][uc]
+\definefontsynonym[Optima]          [name:Optima Regular]    [features=default]
+\definefontsynonym[OptimaItalic]    [name:Optima Italic]     [features=default]
+\definefontsynonym[OptimaBold]      [name:Optima Bold]       [features=default]
+\definefontsynonym[OptimaBoldItalic][name:Optima Bold Italic][features=default]
+\definefontsynonym[OptimaBlack]     [name:Optima ExtraBlack] [features=default]
+\stoptypescript
+
+\starttypescript[sans][optima][name]
+
+\definefontsynonym[Sans]           [Optima]
+\definefontsynonym[SansBold]       [OptimaBold]
+\definefontsynonym[SansItalic]     [OptimaItalic]
+\definefontsynonym[SansBoldItalic] [OptimaBoldItalic]
+\definefontsynonym[SansSlanted]    [OptimaItalic]
+\definefontsynonym[SansBoldSlanted][OptimaBoldItalic]
+\definefontsynonym[SansCaps]       [Optima]
+
+\stoptypescript
+
+\starttypescript[sans][gillsans,gillsanslt][uc]
+
+\definefontsynonym[GillSans]           [name:Gill Sans]             [features=default]
+\definefontsynonym[GillSansItalic]     [name:Gill Sans Italic]      [features=default]
+\definefontsynonym[GillSansBold]       [name:Gill Sans Bold]        [features=default]
+\definefontsynonym[GillSansBoldItalic] [name:Gill Sans Bold Italic] [features=default]
+\definefontsynonym[GillSansLight]      [name:Gill Sans Light]       [features=default]
+\definefontsynonym[GillSansLightItalic][name:Gill Sans Light Italic][features=default]
+
+\stoptypescript
+
+\starttypescript[sans][gillsans][name]
+
+\definefontsynonym[Sans]           [GillSans]
+\definefontsynonym[SansBold]       [GillSansBold]
+\definefontsynonym[SansItalic]     [GillSansItalic]
+\definefontsynonym[SansBoldItalic] [GillSansBoldItalic]
+\definefontsynonym[SansSlanted]    [GillSansItalic]
+\definefontsynonym[SansBoldSlanted][GillSansBoldItalic]
+\definefontsynonym[SansCaps]       [GillSans]
+
+\stoptypescript
+
+\starttypescript[sans][gillsanslt][name]
+
+\definefontsynonym[Sans]           [GillSansLight]
+\definefontsynonym[SansBold]       [GillSans]
+\definefontsynonym[SansItalic]     [GillSansLightItalic]
+\definefontsynonym[SansBoldItalic] [GillSansItalic]
+\definefontsynonym[SansSlanted]    [GillSansLightItalic]
+\definefontsynonym[SansBoldSlanted][GillSansItalic]
+\definefontsynonym[SansCaps]       [GillSansLight]
+
+\stoptypescript
+
+\starttypescript[serif,handwriting][zapfino][uc]
+
+\definefontsynonym[ZapfinoOne]  [name:Zapfino\xetexcolon mapping=tex-text]   [encoding=uc]
+\definefontsynonym[ZapfinoTwo]  [name:Zapfino\xetexcolon mapping=tex-text;%
+                                 Stylistic Variants=First variant glyph set] [encoding=uc]
+\definefontsynonym[ZapfinoThree][name:Zapfino\xetexcolon mapping=tex-text;%
+                                 Stylistic Variants=Second variant glyph set][encoding=uc]
+\definefontsynonym[ZapfinoFour] [name:Zapfino\xetexcolon mapping=tex-text;%
+                                 Stylistic Variants=Third variant glyph set] [encoding=uc]
+\stoptypescript
+
+\starttypescript[handwriting][zapfino][name]
+
+\definefontsynonym[Handwriting][ZapfinoOne]
+
+\stoptypescript
+
+\starttypescript[serif][zapfino][name]
+
+\definefontsynonym[Serif]           [ZapfinoOne]
+\definefontsynonym[SerifBold]       [ZapfinoThree]
+\definefontsynonym[SerifItalic]     [ZapfinoTwo]
+\definefontsynonym[SerifBoldItalic] [ZapfinoTwo]
+\definefontsynonym[SerifSlanted]    [ZapfinoThree]
+\definefontsynonym[SerifBoldSlanted][ZapfinoThree]
+\definefontsynonym[SerifCaps]       [ZapfinoOne]
+
+\stoptypescript
+
+\starttypescript[serif,calligraphy][applechancery][uc]
+
+\definefontsynonym[AppleChanceryOne]    [name:Apple Chancery\xetexcolon mapping=tex-text;%
+                   Number Case=Old Styles]                [encoding=uc]
+\definefontsynonym[AppleChanceryTwo]    [name:Apple Chancery\xetexcolon mapping=tex-text;%
+                   Number Case=Old Styles;%
+                   Design Complexity=Elegant Design Level][encoding=uc]
+\definefontsynonym[AppleChanceryThree]  [name:Apple Chancery\xetexcolon mapping=tex-text;%
+                   Number Case=Old Styles;%
+                   Design Complexity=Flourishes Set A]    [encoding=uc]
+\definefontsynonym[AppleChanceryFour]   [name:Apple Chancery\xetexcolon mapping=tex-text;%
+                   Number Case=Old Styles;%
+                   Design Complexity=Flourishes Set B]    [encoding=uc]
+\definefontsynonym[AppleChanceryCaps]   [name:Apple Chancery\xetexcolon mapping=tex-text;%
+                   Number Case=Old Styles;%
+                   Letter Case=Small Caps]                [encoding=uc]
+\definefontsynonym[AppleChanceryCapsTwo][name:Apple Chancery\xetexcolon mapping=tex-text;%
+                   Number Case=Old Styles;%
+                   Letter Case=Small Caps;%
+                   Design Complexity=Flourishes Set B]    [encoding=uc]
+\stoptypescript
+
+\starttypescript[calligraphy][applechancery][name]
+
+\definefontsynonym[Calligraphy][AppleChanceryOne]
+
+\stoptypescript
+
+\starttypescript[serif][applechancery][name]
+
+\definefontsynonym[Serif]           [AppleChanceryOne]
+\definefontsynonym[SerifBold]       [AppleChanceryThree]
+\definefontsynonym[SerifItalic]     [AppleChanceryTwo]
+\definefontsynonym[SerifBoldItalic] [AppleChanceryFour]
+\definefontsynonym[SerifSlanted]    [AppleChanceryThree]
+\definefontsynonym[SerifBoldSlanted][AppleChanceryFour]
+\definefontsynonym[SerifCaps]       [AppleChanceryCaps]
+
+\stoptypescript
+
+% MS Office 2004 for Mac has impressive Unicode coverage in many of its fonts.
+
+\starttypescript[serif][timesnewroman][uc]
+
+\definefontsynonym[MSTimes]          [name:Times New Roman]            [features=default]
+\definefontsynonym[MSTimesItalic]    [name:Times New Roman Italic]     [features=default]
+\definefontsynonym[MSTimesBold]      [name:Times New Roman Bold]       [features=default]
+\definefontsynonym[MSTimesBoldItalic][name:Times New Roman Bold Italic][features=default]
+
+\stoptypescript
+
+\starttypescript[serif][timesnewroman][name]
+
+\definefontsynonym[Serif]           [MSTimes]
+\definefontsynonym[SerifBold]       [MSTimesBold]
+\definefontsynonym[SerifItalic]     [MSTimesItalic]
+\definefontsynonym[SerifBoldItalic] [MSTimesBoldItalic]
+\definefontsynonym[SerifSlanted]    [MSTimesItalic]
+\definefontsynonym[SerifBoldSlanted][MSTimesBoldItalic]
+\definefontsynonym[SerifCaps]       [MSTimes]
+
+\stoptypescript
+
+\starttypescript[sans][arial][uc]
+
+\definefontsynonym[Arial]          [name:Arial]            [features=default]
+\definefontsynonym[ArialItalic]    [name:Arial Italic]     [features=default]
+\definefontsynonym[ArialBold]      [name:Arial Bold]       [features=default]
+\definefontsynonym[ArialBoldItalic][name:Arial Bold Italic][features=default]
+
+\stoptypescript
+
+\starttypescript[sans][arial][name]
+
+\definefontsynonym[Sans]           [Arial]
+\definefontsynonym[SansBold]       [ArialBold]
+\definefontsynonym[SansItalic]     [ArialItalic]
+\definefontsynonym[SansBoldItalic] [ArialBoldItalic]
+\definefontsynonym[SansSlanted]    [ArialItalic]
+\definefontsynonym[SansBoldSlanted][ArialBoldItalic]
+\definefontsynonym[SansCaps]       [Arial]
+
+\stoptypescript
+
+%D MS Office comes with an installation of the Lucida family in TrueType form. It's nice,
+%D except\dots\ no math, no slanted, no caps and some other auxiliary fonts.
+
+\starttypescript [serif] [lucida] [uc]
+
+  \definefontsynonym [LucidaBright]              [name:Lucida Bright]         [features=default]
+  \definefontsynonym [LucidaBright-Demi]         [name:Lucida Bright Demibold][features=default]
+  \definefontsynonym [LucidaBright-DemiItalic]   [name:Lucida Bright Demibold][features=default]
+  \definefontsynonym [LucidaBright-Italic]       [name:Lucida Bright]         [features=default]
+
+  \definefontsynonym [LucidaBrightSmallcaps]     [LucidaBright]
+  \definefontsynonym [LucidaBrightSmallcaps-Demi][LucidaBright-Demi]
+  \definefontsynonym [LucidaBright-Oblique]      [LucidaBright-Italic]
+
+\stoptypescript
+
+\starttypescript [sans] [lucida] [uc]
+  \definefontsynonym [LucidaSans]           [name:Lucida Sans Regular]        [features=default]
+  \definefontsynonym [LucidaSans-Demi]      [name:Lucida Sans Demibold Roman] [features=default]
+  \definefontsynonym [LucidaSans-DemiItalic][name:Lucida Sans Demibold Italic][features=default]
+  \definefontsynonym [LucidaSans-Italic]    [name:Lucida Sans Italic]         [features=default]
+
+  \definefontsynonym [LucidaSans-Bold]      [LucidaSans-Demi]
+  \definefontsynonym [LucidaSans-BoldItalic][LucidaSans-DemiItalic]
+
+\stoptypescript
+
+\starttypescript [mono] [lucida] [uc]
+
+  \definefontsynonym [LucidaSans-Typewriter]           [name:Lucida Sans Typewriter Regular]     [encoding=uc]
+  \definefontsynonym [LucidaSans-TypewriterBold]       [name:Lucida Sans Typewriter Bold]        [encoding=uc]
+  \definefontsynonym [LucidaSans-TypewriterBoldOblique][name:Lucida Sans Typewriter Bold Oblique][encoding=uc]
+  \definefontsynonym [LucidaSans-TypewriterOblique]    [name:Lucida Sans Typewriter Oblique]     [encoding=uc]
+
+\stoptypescript
+
+\starttypescript [calligraphy] [lucida] [uc]
+
+  \definefontsynonym[LucidaCalligraphy-Italic][name:Lucida Calligraphy Italic][features=default]
+
+\stoptypescript
+
+% No casual that I know of
+
+\starttypescript[handwriting][lucida][uc]
+
+  \definefontsynonym[LucidaHandwriting-Italic][name:Lucida Handwriting Italic][features=default]
+
+\stoptypescript
+
+\starttypescript[fax][lucida][uc]
+
+  \definefontsynonym[LucidaFax]           [name:Lucida Fax Regular]        [features=default]
+  \definefontsynonym[LucidaFax-Demi]      [name:Lucida Fax Demibold]       [features=default]
+  \definefontsynonym[LucidaFax-DemiItalic][name:Lucida Fax Demibold Italic][features=default]
+  \definefontsynonym[LucidaFax-Italic]    [name:Lucida Fax Italic]         [features=default]
+
+\stoptypescript
+
+%D Gentium is from SIL, the fine makers of \XETEX, and it's not only very complete with
+%D Roman and Italic Unicode support, but very attractive.
+
+\starttypescript [serif] [gentium]
+    \definefontsynonym [Gentium-Roman]       [file:GentiumPlus-R] [features=default]
+    \definefontsynonym [Gentium-Italic]      [file:GentiumPlus-I] [features=default]
+    \definefontsynonym [Gentium-Bold]        [file:GenBasB]       [features=default]
+    \definefontsynonym [Gentium-BoldItalic]  [file:GenBasBI]      [features=default]
+    \definefontsynonym [Gentium-Slanted]     [Gentium-Italic]
+    \definefontsynonym [Gentium-BoldSlanted] [Gentium-BoldItalic]
+    \definefontsynonym [Gentium-RomanCaps]   [file:GentiumPlus-R] [features=smallcaps]
+\stoptypescript
+
+\starttypescript [serif] [gentium] [name]
+    \definefontsynonym [Serif]            [Gentium-Roman]
+    \definefontsynonym [SerifItalic]      [Gentium-Italic]
+    \definefontsynonym [SerifBold]        [Gentium-Bold]
+    \definefontsynonym [SerifBoldItalic]  [Gentium-BoldItalic]
+    \definefontsynonym [SerifSlanted]     [Gentium-Slanted]
+    \definefontsynonym [SerifBoldSlanted] [Gentium-BoldSlanted]
+    \definefontsynonym [SerifCaps]        [Serif]
+    \definefontsynonym [OldStyle]         [Serif]
+    \definefontsynonym [SerifCaps]        [Gentium-RomanCaps]
+\stoptypescript
+
+\starttypescript [gentium]
+    \definetypeface [gentium] [rm] [serif] [gentium] [default] [features=default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/tex/context/fonts/antykwa-math.lfg b/tex/context/fonts/mkiv/antykwa-math.lfg
index 112a3f9a7..112a3f9a7 100644
--- a/tex/context/fonts/antykwa-math.lfg
+++ b/tex/context/fonts/mkiv/antykwa-math.lfg
diff --git a/tex/context/fonts/antykwapoltawskiego.lfg b/tex/context/fonts/mkiv/antykwapoltawskiego.lfg
index 794b9f407..794b9f407 100644
--- a/tex/context/fonts/antykwapoltawskiego.lfg
+++ b/tex/context/fonts/mkiv/antykwapoltawskiego.lfg
diff --git a/tex/context/fonts/asana-math.lfg b/tex/context/fonts/mkiv/asana-math.lfg
index 5b47b3ff8..5b47b3ff8 100644
--- a/tex/context/fonts/asana-math.lfg
+++ b/tex/context/fonts/mkiv/asana-math.lfg
diff --git a/tex/context/fonts/cambria-math.lfg b/tex/context/fonts/mkiv/cambria-math.lfg
index 6415069e6..6415069e6 100644
--- a/tex/context/fonts/cambria-math.lfg
+++ b/tex/context/fonts/mkiv/cambria-math.lfg
diff --git a/tex/context/fonts/cambria.lfg b/tex/context/fonts/mkiv/cambria.lfg
index 04211009b..04211009b 100644
--- a/tex/context/fonts/cambria.lfg
+++ b/tex/context/fonts/mkiv/cambria.lfg
diff --git a/tex/context/fonts/cc-icons.lfg b/tex/context/fonts/mkiv/cc-icons.lfg
index fd0759b78..fd0759b78 100644
--- a/tex/context/fonts/cc-icons.lfg
+++ b/tex/context/fonts/mkiv/cc-icons.lfg
diff --git a/tex/context/fonts/ccicons.lfg b/tex/context/fonts/mkiv/ccicons.lfg
index b79b3fb93..b79b3fb93 100644
--- a/tex/context/fonts/ccicons.lfg
+++ b/tex/context/fonts/mkiv/ccicons.lfg
diff --git a/tex/context/fonts/demo.lfg b/tex/context/fonts/mkiv/demo.lfg
index 06c59e644..06c59e644 100644
--- a/tex/context/fonts/demo.lfg
+++ b/tex/context/fonts/mkiv/demo.lfg
diff --git a/tex/context/fonts/dingbats.lfg b/tex/context/fonts/mkiv/dingbats.lfg
index b6bf3880f..b6bf3880f 100644
--- a/tex/context/fonts/dingbats.lfg
+++ b/tex/context/fonts/mkiv/dingbats.lfg
diff --git a/tex/context/fonts/ebgaramond.lfg b/tex/context/fonts/mkiv/ebgaramond.lfg
index 43cc13c51..43cc13c51 100644
--- a/tex/context/fonts/ebgaramond.lfg
+++ b/tex/context/fonts/mkiv/ebgaramond.lfg
diff --git a/tex/context/fonts/euler-math.lfg b/tex/context/fonts/mkiv/euler-math.lfg
index da7647c53..da7647c53 100644
--- a/tex/context/fonts/euler-math.lfg
+++ b/tex/context/fonts/mkiv/euler-math.lfg
diff --git a/tex/context/fonts/hanbatanglvt.lfg b/tex/context/fonts/mkiv/hanbatanglvt.lfg
index 333743348..333743348 100644
--- a/tex/context/fonts/hanbatanglvt.lfg
+++ b/tex/context/fonts/mkiv/hanbatanglvt.lfg
diff --git a/tex/context/fonts/husayni.lfg b/tex/context/fonts/mkiv/husayni.lfg
index 2f45add21..2f45add21 100644
--- a/tex/context/fonts/husayni.lfg
+++ b/tex/context/fonts/mkiv/husayni.lfg
diff --git a/tex/context/fonts/hvmath-math.lfg b/tex/context/fonts/mkiv/hvmath-math.lfg
index 0eba3db23..0eba3db23 100644
--- a/tex/context/fonts/hvmath-math.lfg
+++ b/tex/context/fonts/mkiv/hvmath-math.lfg
diff --git a/tex/context/fonts/informal-math.lfg b/tex/context/fonts/mkiv/informal-math.lfg
index a1f461740..a1f461740 100644
--- a/tex/context/fonts/informal-math.lfg
+++ b/tex/context/fonts/mkiv/informal-math.lfg
diff --git a/tex/context/fonts/iwona-math.lfg b/tex/context/fonts/mkiv/iwona-math.lfg
index f2fb69341..f2fb69341 100644
--- a/tex/context/fonts/iwona-math.lfg
+++ b/tex/context/fonts/mkiv/iwona-math.lfg
diff --git a/tex/context/fonts/lm-math.lfg b/tex/context/fonts/mkiv/lm-math.lfg
index b8c996979..b8c996979 100644
--- a/tex/context/fonts/lm-math.lfg
+++ b/tex/context/fonts/mkiv/lm-math.lfg
diff --git a/tex/context/fonts/lm.lfg b/tex/context/fonts/mkiv/lm.lfg
index 546d18def..546d18def 100644
--- a/tex/context/fonts/lm.lfg
+++ b/tex/context/fonts/mkiv/lm.lfg
diff --git a/tex/context/fonts/lucida-opentype-math.lfg b/tex/context/fonts/mkiv/lucida-opentype-math.lfg
index 946458dea..946458dea 100644
--- a/tex/context/fonts/lucida-opentype-math.lfg
+++ b/tex/context/fonts/mkiv/lucida-opentype-math.lfg
diff --git a/tex/context/fonts/lucida-typeone-math.lfg b/tex/context/fonts/mkiv/lucida-typeone-math.lfg
index 82ba589cd..82ba589cd 100644
--- a/tex/context/fonts/lucida-typeone-math.lfg
+++ b/tex/context/fonts/mkiv/lucida-typeone-math.lfg
diff --git a/tex/context/fonts/mathtimes-math.lfg b/tex/context/fonts/mkiv/mathtimes-math.lfg
index 951cb6838..951cb6838 100644
--- a/tex/context/fonts/mathtimes-math.lfg
+++ b/tex/context/fonts/mkiv/mathtimes-math.lfg
diff --git a/tex/context/fonts/mdbch-math.lfg b/tex/context/fonts/mkiv/mdbch-math.lfg
index c66a3575a..c66a3575a 100644
--- a/tex/context/fonts/mdbch-math.lfg
+++ b/tex/context/fonts/mkiv/mdbch-math.lfg
diff --git a/tex/context/fonts/mdici-math.lfg b/tex/context/fonts/mkiv/mdici-math.lfg
index 84833c407..84833c407 100644
--- a/tex/context/fonts/mdici-math.lfg
+++ b/tex/context/fonts/mkiv/mdici-math.lfg
diff --git a/tex/context/fonts/mdpgd-math.lfg b/tex/context/fonts/mkiv/mdpgd-math.lfg
index b7863b46e..b7863b46e 100644
--- a/tex/context/fonts/mdpgd-math.lfg
+++ b/tex/context/fonts/mkiv/mdpgd-math.lfg
diff --git a/tex/context/fonts/mdpus-math.lfg b/tex/context/fonts/mkiv/mdpus-math.lfg
index 95d51de14..95d51de14 100644
--- a/tex/context/fonts/mdpus-math.lfg
+++ b/tex/context/fonts/mkiv/mdpus-math.lfg
diff --git a/tex/context/fonts/mdput-math.lfg b/tex/context/fonts/mkiv/mdput-math.lfg
index 7779ec152..7779ec152 100644
--- a/tex/context/fonts/mdput-math.lfg
+++ b/tex/context/fonts/mkiv/mdput-math.lfg
diff --git a/tex/context/fonts/mdugm-math.lfg b/tex/context/fonts/mkiv/mdugm-math.lfg
index 293c99371..293c99371 100644
--- a/tex/context/fonts/mdugm-math.lfg
+++ b/tex/context/fonts/mkiv/mdugm-math.lfg
diff --git a/tex/context/fonts/px-math.lfg b/tex/context/fonts/mkiv/px-math.lfg
index 14f71dad3..14f71dad3 100644
--- a/tex/context/fonts/px-math.lfg
+++ b/tex/context/fonts/mkiv/px-math.lfg
diff --git a/tex/context/fonts/symbol-math.lfg b/tex/context/fonts/mkiv/symbol-math.lfg
index d37a3b1ee..d37a3b1ee 100644
--- a/tex/context/fonts/symbol-math.lfg
+++ b/tex/context/fonts/mkiv/symbol-math.lfg
diff --git a/tex/context/fonts/texgyre.lfg b/tex/context/fonts/mkiv/texgyre.lfg
index bcbc2ad86..bcbc2ad86 100644
--- a/tex/context/fonts/texgyre.lfg
+++ b/tex/context/fonts/mkiv/texgyre.lfg
diff --git a/tex/context/fonts/treatments.lfg b/tex/context/fonts/mkiv/treatments.lfg
index 40bac427c..40bac427c 100644
--- a/tex/context/fonts/treatments.lfg
+++ b/tex/context/fonts/mkiv/treatments.lfg
diff --git a/tex/context/fonts/tx-math.lfg b/tex/context/fonts/mkiv/tx-math.lfg
index 2ad173486..2ad173486 100644
--- a/tex/context/fonts/tx-math.lfg
+++ b/tex/context/fonts/mkiv/tx-math.lfg
diff --git a/tex/context/fonts/mkiv/type-imp-antykwa.mkiv b/tex/context/fonts/mkiv/type-imp-antykwa.mkiv
new file mode 100644
index 000000000..ba5895c8e
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-antykwa.mkiv
@@ -0,0 +1,228 @@
+%D \module
+%D   [       file=type-imp-antykwa,
+%D        version=2010.06.21,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Antykwa Torunska,
+%D         author=Mojca Miklavec \& Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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[antykwa-torunska]
+
+    \starttypescript [antykwa,antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond]
+        \definetypeface[\typescriptone][\s!rm][\s!serif][\typescriptone] [\s!default]
+        \definetypeface[\typescriptone][\s!ss][\s!sans] [modern]         [\s!default] [\s!rscale=1.05]
+        \definetypeface[\typescriptone][\s!tt][\s!mono] [modern]         [\s!default] [\s!rscale=1.05]
+        \definetypeface[\typescriptone][\s!mm][\s!math] [\typescriptone] [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+    \starttypescript [\s!serif] [antykwa,antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond]
+        \definefontsynonym [AntykwaTorunska-Regular]           [\s!file:AntykwaTorunska-Regular]          [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-Italic]            [\s!file:AntykwaTorunska-Italic]           [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-Bold]              [\s!file:AntykwaTorunska-Bold]             [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-BoldItalic]        [\s!file:AntykwaTorunska-BoldItalic]       [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-Light]             [\s!file:AntykwaTorunskaLight-Regular]     [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-LightItalic]       [\s!file:AntykwaTorunskaLight-Italic]      [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-Medium]            [\s!file:AntykwaTorunskaMed-Regular]       [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-MedItalic]         [\s!file:AntykwaTorunskaMed-Italic]        [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-CondRegular]       [\s!file:AntykwaTorunskaCond-Regular]      [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-CondItalic]        [\s!file:AntykwaTorunskaCond-Italic]       [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-CondBold]          [\s!file:AntykwaTorunskaCond-Bold]         [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-CondBoldItalic]    [\s!file:AntykwaTorunskaCond-BoldItalic]   [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-CondLight]         [\s!file:AntykwaTorunskaCondLight-Regular] [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-CondLightItalic]   [\s!file:AntykwaTorunskaCondLight-Italic]  [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-CondMedium]        [\s!file:AntykwaTorunskaCondMed-Regular]   [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-CondMedItalic]     [\s!file:AntykwaTorunskaCondMed-Italic]    [\s!features=\s!default]
+
+        \definefontsynonym [AntykwaTorunska-Cap]               [\s!file:AntykwaTorunska-Regular]          [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaTorunska-ItalicCap]         [\s!file:AntykwaTorunska-Italic]           [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaTorunska-BoldCap]           [\s!file:AntykwaTorunska-Bold]             [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaTorunska-BoldItalicCap]     [\s!file:AntykwaTorunska-BoldItalic]       [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaTorunska-LightCap]          [\s!file:AntykwaTorunskaLight-Regular]     [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaTorunska-LightItalicCap]    [\s!file:AntykwaTorunskaLight-Italic]      [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaTorunska-MediumCap]         [\s!file:AntykwaTorunskaMed-Regular]       [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaTorunska-MedItalicCap]      [\s!file:AntykwaTorunskaMed-Italic]        [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaTorunska-CondCap]           [\s!file:AntykwaTorunskaCond-Regular]      [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaTorunska-CondItalicCap]     [\s!file:AntykwaTorunskaCond-Italic]       [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaTorunska-CondBoldCap]       [\s!file:AntykwaTorunskaCond-Bold]         [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaTorunska-CondBoldItalicCap] [\s!file:AntykwaTorunskaCond-BoldItalic]   [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaTorunska-CondLightCap]      [\s!file:AntykwaTorunskaCondLight-Regular] [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaTorunska-CondLightItalicCap][\s!file:AntykwaTorunskaCondLight-Italic]  [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaTorunska-CondMediumCap]     [\s!file:AntykwaTorunskaCondMed-Regular]   [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaTorunska-CondMedItalicCap]  [\s!file:AntykwaTorunskaCondMed-Italic]    [\s!features=\s!smallcaps]
+    \stoptypescript
+
+    \starttypescript [\s!math][antykwa,antykwa-torunska][\s!all]
+        \loadfontgoodies[antykwa-math]
+        \definefontsynonym[\s!MathRoman][antykwamath@antykwa-math]
+    \stoptypescript
+
+    \starttypescript [\s!math][antykwa-torunska-light][\s!all]
+        \loadfontgoodies[antykwa-math]
+        \definefontsynonym[\s!MathRoman][antykwalightmath@antykwa-light-math]
+    \stoptypescript
+
+    \starttypescript [\s!math][antykwa-torunska-cond][\s!all]
+        \loadfontgoodies[antykwa-math]
+        \definefontsynonym[\s!MathRoman][antykwacondmath@antykwa-cond-math]
+    \stoptypescript
+
+    \starttypescript [\s!math][antykwa-torunska-lightcond][\s!all]
+        \loadfontgoodies[antykwa-math]
+        \definefontsynonym[\s!MathRoman][antykwalightcondmath@antykwa-lightcond-math]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [antykwa,antykwa-torunska] [\s!name]
+        \definefontsynonym [\s!Serif]            [AntykwaTorunska-Regular]
+        \definefontsynonym [\s!SerifBold]        [AntykwaTorunska-Bold]
+        \definefontsynonym [\s!SerifItalic]      [AntykwaTorunska-Italic]
+        \definefontsynonym [\s!SerifSlanted]     [AntykwaTorunska-Italic]
+        \definefontsynonym [\s!SerifBoldItalic]  [AntykwaTorunska-BoldItalic]
+        \definefontsynonym [\s!SerifBoldSlanted] [AntykwaTorunska-BoldItalic]
+        \definefontsynonym [\s!SerifCaps]        [AntykwaTorunska-Cap]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [antykwa-torunska-light] [\s!name]
+        \definefontsynonym [\s!Serif]            [AntykwaTorunska-Light]
+        \definefontsynonym [\s!SerifBold]        [AntykwaTorunska-Medium]
+        \definefontsynonym [\s!SerifItalic]      [AntykwaTorunska-LightItalic]
+        \definefontsynonym [\s!SerifSlanted]     [AntykwaTorunska-LightItalic]
+        \definefontsynonym [\s!SerifBoldItalic]  [AntykwaTorunska-MedItalic]
+        \definefontsynonym [\s!SerifBoldSlanted] [AntykwaTorunska-MedItalic]
+        \definefontsynonym [\s!SerifCaps]        [AntykwaTorunska-LightCap]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [antykwa-torunska-cond] [\s!name]
+        \definefontsynonym [\s!Serif]            [AntykwaTorunska-CondRegular]
+        \definefontsynonym [\s!SerifBold]        [AntykwaTorunska-CondBold]
+        \definefontsynonym [\s!SerifItalic]      [AntykwaTorunska-CondItalic]
+        \definefontsynonym [\s!SerifSlanted]     [AntykwaTorunska-CondItalic]
+        \definefontsynonym [\s!SerifBoldItalic]  [AntykwaTorunska-CondBoldItalic]
+        \definefontsynonym [\s!SerifBoldSlanted] [AntykwaTorunska-CondBoldItalic]
+        \definefontsynonym [\s!SerifCaps]        [AntykwaTorunska-CondCap]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [antykwa-torunska-lightcond] [\s!name]
+        \definefontsynonym [\s!Serif]            [AntykwaTorunska-CondLight]
+        \definefontsynonym [\s!SerifBold]        [AntykwaTorunska-CondMedium]
+        \definefontsynonym [\s!SerifItalic]      [AntykwaTorunska-CondLightItalic]
+        \definefontsynonym [\s!SerifSlanted]     [AntykwaTorunska-CondLightItalic]
+        \definefontsynonym [\s!SerifBoldItalic]  [AntykwaTorunska-CondMedItalic]
+        \definefontsynonym [\s!SerifBoldSlanted] [AntykwaTorunska-CondMedItalic]
+        \definefontsynonym [\s!SerifCaps]        [AntykwaTorunska-CondLightCap]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [antykwa,antykwa-torunska] [\s!name]
+        \definefontsynonym [SerifRegular]         [Serif]
+        \definefontsynonym [SerifRegularCaps]     [AntykwaTorunska-Cap]
+        \definefontsynonym [SerifBoldCaps]        [AntykwaTorunska-BoldCap]
+        \definefontsynonym [SerifItalicCaps]      [AntykwaTorunska-ItalicCap]
+        \definefontsynonym [SerifSlantedCaps]     [AntykwaTorunska-ItalicCap]
+        \definefontsynonym [SerifBoldItalicCaps]  [AntykwaTorunska-BoldItalicCap]
+        \definefontsynonym [SerifBoldSlantedCaps] [AntykwaTorunska-BoldItalicCap]
+        \definefontsynonym [SerifCapsCaps]        [AntykwaTorunska-Cap]
+
+        \definefontsynonym [SerifRegularLight]     [AntykwaTorunska-Light]
+        \definefontsynonym [SerifBoldLight]        [AntykwaTorunska-Medium]
+        \definefontsynonym [SerifItalicLight]      [AntykwaTorunska-LightItalic]
+        \definefontsynonym [SerifSlantedLight]     [AntykwaTorunska-LightItalic]
+        \definefontsynonym [SerifBoldItalicLight]  [AntykwaTorunska-MedItalic]
+        \definefontsynonym [SerifBoldSlantedLight] [AntykwaTorunska-MedItalic]
+        \definefontsynonym [SerifCapsLight]        [AntykwaTorunska-LightCap]
+
+        \definefontsynonym [SerifRegularCond]     [AntykwaTorunska-CondRegular]
+        \definefontsynonym [SerifBoldCond]        [AntykwaTorunska-CondBold]
+        \definefontsynonym [SerifItalicCond]      [AntykwaTorunska-CondItalic]
+        \definefontsynonym [SerifSlantedCond]     [AntykwaTorunska-CondItalic]
+        \definefontsynonym [SerifBoldItalicCond]  [AntykwaTorunska-CondBoldItalic]
+        \definefontsynonym [SerifBoldSlantedCond] [AntykwaTorunska-CondBoldItalic]
+        \definefontsynonym [SerifCapsCond]        [AntykwaTorunska-CondCap]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [antykwa-torunska-light] [\s!name]
+        \definefontsynonym [SerifRegular]         [Serif]
+        \definefontsynonym [SerifRegularCaps]     [AntykwaTorunska-LightCap]
+        \definefontsynonym [SerifBoldCaps]        [AntykwaTorunska-MediumCap]
+        \definefontsynonym [SerifItalicCaps]      [AntykwaTorunska-LightItalicCap]
+        \definefontsynonym [SerifSlantedCaps]     [AntykwaTorunska-LightItalicCap]
+        \definefontsynonym [SerifBoldItalicCaps]  [AntykwaTorunska-MedItalicCap]
+        \definefontsynonym [SerifBoldSlantedCaps] [AntykwaTorunska-MedItalicCap]
+        \definefontsynonym [SerifCapsCaps]        [AntykwaTorunska-LightCap]
+
+        \definefontsynonym [SerifRegularDark]     [AntykwaTorunska-Regular]
+        \definefontsynonym [SerifBoldDark]        [AntykwaTorunska-Bold]
+        \definefontsynonym [SerifItalicDark]      [AntykwaTorunska-Italic]
+        \definefontsynonym [SerifSlantedDark]     [AntykwaTorunska-Italic]
+        \definefontsynonym [SerifBoldItalicDark]  [AntykwaTorunska-BoldItalic]
+        \definefontsynonym [SerifBoldSlantedDark] [AntykwaTorunska-BoldItalic]
+        \definefontsynonym [SerifCapsDark]        [AntykwaTorunska-Cap]
+
+        \definefontsynonym [SerifRegularCond]     [AntykwaTorunska-CondLight]
+        \definefontsynonym [SerifBoldCond]        [AntykwaTorunska-CondMedium]
+        \definefontsynonym [SerifItalicCond]      [AntykwaTorunska-CondLightItalic]
+        \definefontsynonym [SerifSlantedCond]     [AntykwaTorunska-CondLightItalic]
+        \definefontsynonym [SerifBoldItalicCond]  [AntykwaTorunska-CondMedItalic]
+        \definefontsynonym [SerifBoldSlantedCond] [AntykwaTorunska-CondMedItalic]
+        \definefontsynonym [SerifCapsCond]        [AntykwaTorunska-CondLightCap]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [antykwa-torunska-cond] [\s!name]
+        \definefontsynonym [SerifRegular]         [Serif]
+        \definefontsynonym [SerifRegularCaps]     [AntykwaTorunska-CondCap]
+        \definefontsynonym [SerifBoldCaps]        [AntykwaTorunska-CondBoldCap]
+        \definefontsynonym [SerifItalicCaps]      [AntykwaTorunska-CondItalicCap]
+        \definefontsynonym [SerifSlantedCaps]     [AntykwaTorunska-CondItalicCap]
+        \definefontsynonym [SerifBoldItalicCaps]  [AntykwaTorunska-CondBoldItalicCap]
+        \definefontsynonym [SerifBoldSlantedCaps] [AntykwaTorunska-CondBoldItalicCap]
+        \definefontsynonym [SerifCapsCaps]        [AntykwaTorunska-CondCap]
+
+        \definefontsynonym [SerifRegularLight]     [AntykwaTorunska-CondLight]
+        \definefontsynonym [SerifBoldLight]        [AntykwaTorunska-CondMedium]
+        \definefontsynonym [SerifItalicLight]      [AntykwaTorunska-CondLightItalic]
+        \definefontsynonym [SerifSlantedLight]     [AntykwaTorunska-CondLightItalic]
+        \definefontsynonym [SerifBoldItalicLight]  [AntykwaTorunska-CondMedItalic]
+        \definefontsynonym [SerifBoldSlantedLight] [AntykwaTorunska-CondMedItalic]
+        \definefontsynonym [SerifCapsLight]        [AntykwaTorunska-CondLightCap]
+
+        \definefontsynonym [SerifRegularExp]     [AntykwaTorunska-Regular]
+        \definefontsynonym [SerifBoldExp]        [AntykwaTorunska-Bold]
+        \definefontsynonym [SerifItalicExp]      [AntykwaTorunska-Italic]
+        \definefontsynonym [SerifSlantedExp]     [AntykwaTorunska-Italic]
+        \definefontsynonym [SerifBoldItalicExp]  [AntykwaTorunska-BoldItalic]
+        \definefontsynonym [SerifBoldSlantedExp] [AntykwaTorunska-BoldItalic]
+        \definefontsynonym [SerifCapsExp]        [AntykwaTorunska-Cap]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [antykwa-torunska-lightcond] [\s!name]
+        \definefontsynonym [SerifRegular]         [Serif]
+        \definefontsynonym [SerifRegularCaps]     [AntykwaTorunska-CondLightCap]
+        \definefontsynonym [SerifBoldCaps]        [AntykwaTorunska-CondMediumCap]
+        \definefontsynonym [SerifItalicCaps]      [AntykwaTorunska-CondLightItalicCap]
+        \definefontsynonym [SerifSlantedCaps]     [AntykwaTorunska-CondLightItalicCap]
+        \definefontsynonym [SerifBoldItalicCaps]  [AntykwaTorunska-CondMedItalicCap]
+        \definefontsynonym [SerifBoldSlantedCaps] [AntykwaTorunska-CondMedItalicCap]
+        \definefontsynonym [SerifCapsCaps]        [AntykwaTorunska-CondLightCap]
+
+        \definefontsynonym [SerifRegularDark]     [AntykwaTorunska-CondRegular]
+        \definefontsynonym [SerifBoldDark]        [AntykwaTorunska-CondBold]
+        \definefontsynonym [SerifItalicDark]      [AntykwaTorunska-CondItalic]
+        \definefontsynonym [SerifSlantedDark]     [AntykwaTorunska-CondItalic]
+        \definefontsynonym [SerifBoldItalicDark]  [AntykwaTorunska-CondBoldItalic]
+        \definefontsynonym [SerifBoldSlantedDark] [AntykwaTorunska-CondBoldItalic]
+        \definefontsynonym [SerifCapsDark]        [AntykwaTorunska-CondCap]
+
+        \definefontsynonym [SerifRegularExp]     [AntykwaTorunska-Light]
+        \definefontsynonym [SerifBoldExp]        [AntykwaTorunska-Medium]
+        \definefontsynonym [SerifItalicExp]      [AntykwaTorunska-LightItalic]
+        \definefontsynonym [SerifSlantedExp]     [AntykwaTorunska-LightItalic]
+        \definefontsynonym [SerifBoldItalicExp]  [AntykwaTorunska-MedItalic]
+        \definefontsynonym [SerifBoldSlantedExp] [AntykwaTorunska-MedItalic]
+        \definefontsynonym [SerifCapsExp]        [AntykwaTorunska-LightCap]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-antykwapoltawskiego.mkiv b/tex/context/fonts/mkiv/type-imp-antykwapoltawskiego.mkiv
new file mode 100644
index 000000000..5a4c1c462
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-antykwapoltawskiego.mkiv
@@ -0,0 +1,140 @@
+%D \module
+%D   [       file=type-imp-antykwa-poltawskiego,
+%D        version=2010.06.21,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Antykwa Poltawskiego,
+%D         author=Mojca Miklavec \& Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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[antykwa-poltawskiego]
+
+    % condensed and extended variants are still missing
+
+    \starttypescript [antykwa-poltawskiego,antykwa-poltawskiego-light,antykwapoltawskiego,antykwapoltawskiego-light]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [modern]         [\s!default] [\s!rscale=1.05]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern]         [\s!default] [\s!rscale=1.05]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [modern]         [\s!default] [\s!rscale=1.05]
+        \quittypescriptscanning
+    \stoptypescript
+
+    % names of "Caps" may still change
+
+    \starttypescript [\s!serif] [antykwa-poltawskiego,antykwa-poltawskiego-light,antykwapoltawskiego,antykwapoltawskiego-light]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-Light]                [\s!file:antpoltltcond-regular]        [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-LightItalic]          [\s!file:antpoltltcond-italic]         [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-Regular]              [\s!file:antpoltcond-regular]          [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-Italic]               [\s!file:antpoltcond-italic]           [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-Medium]               [\s!file:antpoltltcond-bold]           [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-MediumItalic]         [\s!file:antpoltltcond-bolditalic]     [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-Bold]                 [\s!file:antpoltcond-bold]             [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-BoldItalic]           [\s!file:antpoltcond-bolditalic]       [\s!features=\s!default]
+
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsLight]            [\s!file:antpoltltcond-regular]        [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsLightItalic]      [\s!file:antpoltltcond-italic]         [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsRegular]          [\s!file:antpoltcond-regular]          [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsItalic]           [\s!file:antpoltcond-italic]           [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsMedium]           [\s!file:antpoltltcond-bold]           [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsMediumItalic]     [\s!file:antpoltltcond-bolditalic]     [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsBold]             [\s!file:antpoltcond-bold]             [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsBoldItalic]       [\s!file:antpoltcond-bolditalic]       [\s!features=\s!smallcaps]
+
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Light]            [\s!file:antpoltltsemicond-regular]    [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-LightItalic]      [\s!file:antpoltltsemicond-italic]     [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Regular]          [\s!file:antpoltsemicond-regular]      [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Italic]           [\s!file:antpoltsemicond-italic]       [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Medium]           [\s!file:antpoltltsemicond-bold]       [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-MediumItalic]     [\s!file:antpoltltsemicond-bolditalic] [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Bold]             [\s!file:antpoltsemicond-bold]         [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-BoldItalic]       [\s!file:antpoltsemicond-bolditalic]   [\s!features=\s!default]
+
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsLight]        [\s!file:antpoltltsemicond-regular]    [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsLightItalic]  [\s!file:antpoltltsemicond-italic]     [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsRegular]      [\s!file:antpoltsemicond-regular]      [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsItalic]       [\s!file:antpoltsemicond-italic]       [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsMedium]       [\s!file:antpoltltsemicond-bold]       [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsMediumItalic] [\s!file:antpoltltsemicond-bolditalic] [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsBold]         [\s!file:antpoltsemicond-bold]         [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsBoldItalic]   [\s!file:antpoltsemicond-bolditalic]   [\s!features=\s!smallcaps]
+
+        \definefontsynonym [AntykwaPoltawskiego-Light]                          [\s!file:antpoltlt-regular]            [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-LightItalic]                    [\s!file:antpoltlt-italic]             [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Regular]                        [\s!file:antpolt-regular]              [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Italic]                         [\s!file:antpolt-italic]               [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Medium]                         [\s!file:antpoltlt-bold]               [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-MediumItalic]                   [\s!file:antpoltlt-bolditalic]         [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Bold]                           [\s!file:antpolt-bold]                 [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-BoldItalic]                     [\s!file:antpolt-bolditalic]           [\s!features=\s!default]
+
+        \definefontsynonym [AntykwaPoltawskiego-CapsLight]                      [\s!file:antpoltcond-regular]          [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsLightItalic]                [\s!file:antpoltcond-italic]           [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsRegular]                    [\s!file:antpolt-regular]              [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsItalic]                     [\s!file:antpolt-italic]               [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsMedium]                     [\s!file:antpoltcond-bold]             [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsMediumItalic]               [\s!file:antpoltcond-bolditalic]       [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsBold]                       [\s!file:antpolt-bold]                 [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsBoldItalic]                 [\s!file:antpolt-bolditalic]           [\s!features=\s!smallcaps]
+
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Light]             [\s!file:antpoltltsemiexpd-regular]    [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-LightItalic]       [\s!file:antpoltltsemiexpd-italic]     [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Regular]           [\s!file:antpoltsemiexpd-regular]      [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Italic]            [\s!file:antpoltsemiexpd-italic]       [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Medium]            [\s!file:antpoltltsemiexpd-bold]       [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-MediumItalic]      [\s!file:antpoltltsemiexpd-bolditalic] [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Bold]              [\s!file:antpoltsemiexpd-bold]         [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-BoldItalic]        [\s!file:antpoltsemiexpd-bolditalic]   [\s!features=\s!default]
+
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsLight]         [\s!file:antpoltltsemiexpd-regular]    [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsLightItalic]   [\s!file:antpoltltsemiexpd-italic]     [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsRegular]       [\s!file:antpoltsemiexpd-regular]      [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsItalic]        [\s!file:antpoltsemiexpd-italic]       [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsMedium]        [\s!file:antpoltltsemiexpd-bold]       [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsMediumItalic]  [\s!file:antpoltltsemiexpd-bolditalic] [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsBold]          [\s!file:antpoltsemiexpd-bold]         [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsBoldItalic]    [\s!file:antpoltsemiexpd-bolditalic]   [\s!features=\s!smallcaps]
+
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Light]                 [\s!file:antpoltltexpd-regular]        [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-LightItalic]           [\s!file:antpoltltexpd-italic]         [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Regular]               [\s!file:antpoltexpd-regular]          [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Italic]                [\s!file:antpoltexpd-italic]           [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Medium]                [\s!file:antpoltltexpd-bold]           [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-MediumItalic]          [\s!file:antpoltltexpd-bolditalic]     [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Bold]                  [\s!file:antpoltexpd-bold]             [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-BoldItalic]            [\s!file:antpoltexpd-bolditalic]       [\s!features=\s!default]
+
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsLight]             [\s!file:antpoltltexpd-regular]        [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsLightItalic]       [\s!file:antpoltltexpd-italic]         [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsRegular]           [\s!file:antpoltexpd-regular]          [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsItalic]            [\s!file:antpoltexpd-italic]           [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsMedium]            [\s!file:antpoltltexpd-bold]           [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsMediumItalic]      [\s!file:antpoltltexpd-bolditalic]     [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsBold]              [\s!file:antpoltexpd-bold]             [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsBoldItalic]        [\s!file:antpoltexpd-bolditalic]       [\s!features=\s!smallcaps]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [antykwa-poltawskiego,antykwapoltawskiego] [\s!name]
+        \definefontsynonym [\s!Serif]            [AntykwaPoltawskiego-Regular]
+        \definefontsynonym [\s!SerifBold]        [AntykwaPoltawskiego-Bold]
+        \definefontsynonym [\s!SerifItalic]      [AntykwaPoltawskiego-Italic]
+        \definefontsynonym [\s!SerifSlanted]     [AntykwaPoltawskiego-Italic]
+        \definefontsynonym [\s!SerifBoldItalic]  [AntykwaPoltawskiego-BoldItalic]
+        \definefontsynonym [\s!SerifBoldSlanted] [AntykwaPoltawskiego-BoldItalic]
+        \definefontsynonym [\s!SerifCaps]        [AntykwaPoltawskiego-CapsRegular]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [antykwa-poltawskiego-light,antykwapoltawskiego-light] [\s!name]
+        \definefontsynonym [\s!Serif]            [AntykwaPoltawskiego-Light]
+        \definefontsynonym [\s!SerifBold]        [AntykwaPoltawskiego-Medium]
+        \definefontsynonym [\s!SerifItalic]      [AntykwaPoltawskiego-LightItalic]
+        \definefontsynonym [\s!SerifSlanted]     [AntykwaPoltawskiego-LightItalic]
+        \definefontsynonym [\s!SerifBoldItalic]  [AntykwaPoltawskiego-MediumItalic]
+        \definefontsynonym [\s!SerifBoldSlanted] [AntykwaPoltawskiego-MediumItalic]
+        \definefontsynonym [\s!SerifCaps]        [AntykwaPoltawskiego-CapsLight]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-asana.mkiv b/tex/context/fonts/mkiv/type-imp-asana.mkiv
new file mode 100644
index 000000000..b87c969e2
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-asana.mkiv
@@ -0,0 +1,35 @@
+%D \module
+%D   [       file=type-imp-asana,
+%D        version=2007.07.30,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Asana,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\loadtypescriptfile[texgyre]
+
+\starttypescriptcollection [asanamath]
+
+    \starttypescript [\s!math] [asana]
+        \definefontsynonym [AsanaMath] [\s!name:asanamath]
+    \stoptypescript
+
+    \starttypescript [\s!math] [asana] [\s!name]
+        \loadfontgoodies[asana-math]
+        \definefontsynonym [MathRoman] [AsanaMath] [\s!features=\s!math\mathsizesuffix,\s!goodies=asana-math]
+    \stoptypescript
+
+    \starttypescript[asana]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [palatino]       [\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [modern]         [\s!default] [\s!rscale=1.075]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern]         [\s!default] [\s!rscale=1.075]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [\typescriptone] [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-averia.mkiv b/tex/context/fonts/mkiv/type-imp-averia.mkiv
new file mode 100644
index 000000000..fd0ee7100
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-averia.mkiv
@@ -0,0 +1,90 @@
+%D \module
+%D   [       file=type-imp-averia,
+%D        version=2012.04.24,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Averia fonts (iotic.com),
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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 fonts can be downloaded from the (nice looking) page:
+%D
+%D \starttyping
+%D http://iotic.com/averia
+%D \stoptyping
+%D
+%D This link was posted by Aditya on the ConTeXt mailing list.
+%D
+%D There is no monospace font yet.
+
+\starttypescriptcollection[averia]
+
+    \starttypescript [\s!serif] [averia] [\s!name]
+        \setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]           [\s!file:averia-regular]    [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBold]       [\s!file:averia-bold]       [\s!features=\s!default]
+        \definefontsynonym [\s!SerifItalic]     [\s!file:averia-italic]     [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldItalic] [\s!file:averia-bolditalic] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [averiaserif] [\s!name]
+        \setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]           [\s!file:averiaserif-regular]    [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBold]       [\s!file:averiaserif-bold]       [\s!features=\s!default]
+        \definefontsynonym [\s!SerifItalic]     [\s!file:averiaserif-italic]     [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldItalic] [\s!file:averiaserif-bolditalic] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [averialight] [\s!name]
+        \setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]           [\s!file:averia-light]       [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBold]       [\s!file:averia-regular]     [\s!features=\s!default]
+        \definefontsynonym [\s!SerifItalic]     [\s!file:averia-lightitalic] [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldItalic] [\s!file:averia-italic]      [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [averiaseriflight] [\s!name]
+        \setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]           [\s!file:averiaserif-light]       [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBold]       [\s!file:averiaserif-regular]     [\s!features=\s!default]
+        \definefontsynonym [\s!SerifItalic]     [\s!file:averiaserif-lightitalic] [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldItalic] [\s!file:averiaserif-italic]      [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [averiasans] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [\s!file:averiasans-regular]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]       [\s!file:averiasans-bold]       [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]     [\s!file:averiasans-italic]     [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic] [\s!file:averiasans-bolditalic] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [averiasanslight] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [\s!file:averiasans-light]       [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]       [\s!file:averiasans-regular]     [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]     [\s!file:averiasans-lightitalic] [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic] [\s!file:averiasans-italic]      [\s!features=\s!default]
+    \stoptypescript
+
+    % todo: rscale
+
+    \starttypescript[averia]
+        \definetypeface [averia] [\s!rm] [\s!serif] [averiaserif] [\s!default]
+        \definetypeface [averia] [\s!ss] [\s!sans]  [averiasans]  [\s!default]
+        \definetypeface [averia] [\s!tt] [\s!mono]  [dejavu]      [\s!default] [\s!rscale=0.850]
+        \definetypeface [averia] [\s!mm] [\s!math]  [times]       [\s!default] [\s!rscale=1.025]
+    \stoptypescript
+
+    \starttypescript[averialight]
+        \definetypeface [averialight] [\s!rm] [\s!serif] [averiaseriflight] [\s!default]
+        \definetypeface [averialight] [\s!ss] [\s!sans]  [averiasanslight]  [\s!default]
+        \definetypeface [averialight] [\s!tt] [\s!mono]  [dejavu]           [\s!default] [\s!rscale=0.850]
+        \definetypeface [averialight] [\s!mm] [\s!math]  [times]            [\s!default] [\s!rscale=1.025]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-buy.mkiv b/tex/context/fonts/mkiv/type-imp-buy.mkiv
new file mode 100644
index 000000000..dbfffe57c
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-buy.mkiv
@@ -0,0 +1,135 @@
+%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 ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% monotype sabon
+
+\starttypescriptcollection[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
+
+\stoptypescriptcollection
+
+% itc stone
+
+\starttypescriptcollection[stone]
+
+    \starttypescript [sans] [stone] [name]
+        %
+        \definefontsynonym [Sans]           [StoneSansITC-Medium]
+        \definefontsynonym [SansItalic]     [StoneSansITC-MediumItalic]
+        \definefontsynonym [SansSlanted]    [StoneSansITC-MediumItalic]
+        \definefontsynonym [SansBold]       [StoneSansITC-Bold]
+        \definefontsynonym [SansBoldItalic] [StoneSansITC-BoldItalic]
+        \definefontsynonym [SansBoldSlanted][StoneSansITC-BoldItalic]
+        \definefontsynonym [SansCaps]       [StoneSansSCITC-Medium]
+        %
+        \definefontsynonym[StoneSansITC-Bold]        [stosnb]
+        \definefontsynonym[StoneSansITC-BoldItalic]  [stosnbi]
+        \definefontsynonym[StoneSansITC-Medium]      [stosnm]
+        \definefontsynonym[StoneSansITC-MediumItalic][stosnmi]
+        \definefontsynonym[StoneSansSemITC-Semi]     [stosns]
+        \definefontsynonym[StoneSansSemITC-SemiIta]  [stosnsi]
+        \definefontsynonym[StoneSansSCITC-Medium]    [stosnscm]
+        \definefontsynonym[StoneSansSemSCITC-Semi]   [stosnscs]
+        %
+    \stoptypescript
+
+    \starttypescript [serif] [stone] [name]
+        %
+        \definefontsynonym [Serif]           [StoneSerifITC-Medium]
+        \definefontsynonym [SerifItalic]     [StoneSerifITC-MediumItalic]
+        \definefontsynonym [SerifSlanted]    [StoneSerifITC-MediumItalic]
+        \definefontsynonym [SerifBold]       [StoneSerifITC-Bold]
+        \definefontsynonym [SerifBoldItalic] [StoneSerifITC-BoldItalic]
+        \definefontsynonym [SerifBoldSlanted][StoneSerifITC-BoldItalic]
+        \definefontsynonym [SerifCaps]       [StoneSerifSCITC-Medium]
+        %
+        \definefontsynonym[StoneSerifITC-Bold]        [stosfb]
+        \definefontsynonym[StoneSerifITC-BoldItalic]  [stosfbi]
+        \definefontsynonym[StoneSerifITC-Medium]      [stosfm]
+        \definefontsynonym[StoneSerifITC-MediumItalic][stosfmi]
+        \definefontsynonym[StoneSerifSemITC-Semi]     [stosfs]
+        \definefontsynonym[StoneSerifSemITC-SemiIta]  [stosfsi]
+        \definefontsynonym[StoneSerifSCITC-Medium]    [stosfscm]
+        \definefontsynonym[StoneSerifSemSCITC-Semi]   [stosfscs]
+        %
+    \stoptypescript
+
+    \starttypescript [sans] [stone-oldstyle] [name]
+        %
+        \definefontsynonym [Sans]           [StoneSansOSITC-Medium]
+        \definefontsynonym [SansItalic]     [StoneSansOSITC-MediumItalic]
+        \definefontsynonym [SansSlanted]    [StoneSansOSITC-MediumItalic]
+        \definefontsynonym [SansBold]       [StoneSansOSITC-Bold]
+        \definefontsynonym [SansBoldItalic] [StoneSansOSITC-BoldItalic]
+        \definefontsynonym [SansBoldSlanted][StoneSansOSITC-BoldItalic]
+        \definefontsynonym [SansCaps]       [StoneSansSCITC-Medium]
+        %
+        \definefontsynonym[StoneSansOSITC-Bold]        [stosnob]
+        \definefontsynonym[StoneSansOSITC-BoldItalic]  [stosnobi]
+        \definefontsynonym[StoneSansOSITC-Medium]      [stosnom]
+        \definefontsynonym[StoneSansOSITC-MediumItalic][stosnomi]
+        \definefontsynonym[StoneSansSemOSITC-Semi]     [stosnos]
+        \definefontsynonym[StoneSansSemOSITC-SemiIta]  [stosnosi]
+        %
+    \stoptypescript
+
+    \starttypescript [serif] [stone-oldstyle] [name]
+        %
+        \definefontsynonym [Serif]            [StoneSerifOSITC-Medium]
+        \definefontsynonym [SerifItalic]      [StoneSerifOSITC-MediumItalic]
+        \definefontsynonym [SerifSlanted]     [StoneSerifOSITC-MediumItalic]
+        \definefontsynonym [SerifBold]        [StoneSerifOSITC-Bold]
+        \definefontsynonym [SerifBoldItalic]  [StoneSerifOSITC-BoldItalic]
+        \definefontsynonym [SerifBoldSlanted] [StoneSerifOSITC-BoldItalic]
+        \definefontsynonym [SerifCaps]        [StoneSerifSCITC-Medium]
+        %
+        \definefontsynonym[StoneSerifOSITC-Bold]        [stosfob]
+        \definefontsynonym[StoneSerifOSITC-BoldItalic]  [stosfobi]
+        \definefontsynonym[StoneSerifOSITC-Medium]      [stosfom]
+        \definefontsynonym[StoneSerifOSITC-MediumItalic][stosfomi]
+        \definefontsynonym[StoneSerifSemOSITC-Semi]     [stosfos]
+        \definefontsynonym[StoneSerifSemOSITC-SemiIta]  [stosfosi]
+        %
+    \stoptypescript
+
+\stoptypescriptcollection
+
+% linotype industria
+
+\starttypescriptcollection[industria]
+
+    \starttypescript [sans] [industria] [name]
+        \definefontsynonym[Industria-Solid][lt_50545]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-cambria.mkiv b/tex/context/fonts/mkiv/type-imp-cambria.mkiv
new file mode 100644
index 000000000..8154817bd
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-cambria.mkiv
@@ -0,0 +1,77 @@
+%D \module
+%D   [       file=type-imp-cambria,
+%D        version=2007.07.30,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Microsoft Cambria,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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 We use Dejavu as it covers wider range of monospaced glyphs.
+
+\loadtypescriptfile[dejavu]
+
+\starttypescriptcollection[cambria]
+
+    % microsoft: cambria.ttc cambriab.ttf cambriai.ttf cambriaz.ttf
+    % ascender : cambmath.ttf cambria.ttf cambriab.ttf cambriai.ttf cambriaz.ttf
+
+    \starttypescript [\s!math,\s!serif] [cambria,cambria-x,cambria-y]
+        % whatever matches
+        \definefontsynonym [CambriaMath]  [\s!name:cambriamath]
+        \definefontsynonym [CambriaSerif] [\s!name:cambria]
+    \stoptypescript
+    \starttypescript [\s!math,\s!serif] [cambria-m]
+        % microsoft cabria
+        \definefontsynonym [CambriaMath]  [\s!file:cambria.ttc(Cambria Math)]
+        \definefontsynonym [CambriaSerif] [\s!file:cambria.ttc(Cambria)]
+    \stoptypescript
+    \starttypescript [\s!math,\s!serif] [cambria-a]
+        % ascender cambria
+        \definefontsynonym [CambriaMath]  [\s!file:cambmath.ttf]
+        \definefontsynonym [CambriaSerif] [\s!file:cambria.ttf]
+    \stoptypescript
+
+    % We load a goodies file that will apply a patch to the font. As a demonstration
+    % we apply the patch when caching as as when scaling which is why we also specify
+    % the goodies file with the name.
+
+    \starttypescript [\s!math] [cambria,cambria-m,cambria-a] [\s!name]
+        \loadfontgoodies[cambria-math]
+        \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features=\s!math\mathsizesuffix,\s!goodies=cambria-math]
+    \stoptypescript
+    \starttypescript [\s!math] [cambria-x] [\s!name]
+        \loadfontgoodies[cambria-math]
+        \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features=\s!math,\s!goodies=cambria-math]
+    \stoptypescript
+    \starttypescript [\s!math] [cambria-y] [\s!name]
+        \loadfontgoodies[cambria-math]
+        \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features=\s!math-nostack\mathsizesuffix,\s!goodies=cambria-math]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [cambria,cambria-m,cambria-a] [\s!name]
+        \setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]           [CambriaSerif]              [\s!features=\s!default,\s!goodies=cambria]
+        \definefontsynonym [\s!SerifBold]       [\s!name:cambriabold]       [\s!features=\s!default,\s!goodies=cambria]
+        \definefontsynonym [\s!SerifItalic]     [\s!name:cambriaitalic]     [\s!features=\s!default,\s!goodies=cambria]
+        \definefontsynonym [\s!SerifBoldItalic] [\s!name:cambriabolditalic] [\s!features=\s!default,\s!goodies=cambria]
+    \stoptypescript
+
+    \starttypescript [cambria,cambria-m,cambria-a]
+        % any
+        \definetypeface [cambria] [\s!rm] [\s!serif] [\typescriptone] [\s!default]
+        \definetypeface [cambria] [\s!tt] [\s!mono]  [dejavu]         [\s!default]
+        \definetypeface [cambria] [\s!mm] [\s!math]  [\typescriptone] [\s!default]
+    \stoptypescript
+    \starttypescript [cambria-x,cambria-y]
+        % test x
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [cambria]        [\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [dejavu]         [\s!default]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [\typescriptone] [\s!default]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-charter.mkiv b/tex/context/fonts/mkiv/type-imp-charter.mkiv
new file mode 100644
index 000000000..b788a974e
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-charter.mkiv
@@ -0,0 +1,36 @@
+%D \module
+%D   [       file=type-imp-charter,
+%D        version=2007.07.30,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Charter,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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[charter]
+
+    \starttypescript [\s!serif] [charter]
+        \definefontsynonym [Charter-Roman]       [\s!name:CharterBT-Roman]
+        \definefontsynonym [Charter-Italic]      [\s!name:CharterBT-Italic]
+        \definefontsynonym [Charter-Bold]        [\s!name:CharterBT-Bold]
+        \definefontsynonym [Charter-BoldItalic]  [\s!name:CharterBT-BoldItalic]
+        \definefontsynonym [Charter-Slanted]     [\s!name:CharterBT-Italic]
+        \definefontsynonym [Charter-BoldSlanted] [\s!name:CharterBT-BoldItalic]
+        \definefontsynonym [Charter-Roman-Caps]  [Charter-Roman]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [charter] [\s!name]
+        \definefontsynonym [Serif]            [Charter-Roman]
+        \definefontsynonym [SerifItalic]      [Charter-Italic]
+        \definefontsynonym [SerifBold]        [Charter-Bold]
+        \definefontsynonym [SerifBoldItalic]  [Charter-BoldItalic]
+        \definefontsynonym [SerifSlanted]     [Charter-Slanted]
+        \definefontsynonym [SerifBoldSlanted] [Charter-BoldSlanted]
+        \definefontsynonym [SerifCaps]        [Charter-Roman-Caps]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-cleartype.mkiv b/tex/context/fonts/mkiv/type-imp-cleartype.mkiv
new file mode 100644
index 000000000..b2f1b21a5
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-cleartype.mkiv
@@ -0,0 +1,56 @@
+%D \module
+%D   [       file=type-imp-cleartype,
+%D        version=2007.07.30,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Microsoft Cleartype,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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[cleartype]
+
+    \starttypescript [\s!sans] [candara] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [\s!file:candara]  [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]       [\s!file:candarab] [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]     [\s!file:candarai] [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic] [\s!file:candaraz] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [consolas] [\s!name]
+        \setups[\s!font:\s!fallback:\s!mono]
+        \definefontsynonym [\s!Mono]           [\s!file:consola]  [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBold]       [\s!file:consolab] [\s!features=\s!none]
+        \definefontsynonym [\s!MonoItalic]     [\s!file:consolai] [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBoldItalic] [\s!file:consolaz] [\s!features=\s!none]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [constantia] [\s!name]
+        \setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]           [\s!file:constan]  [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBold]       [\s!file:constanb] [\s!features=\s!default]
+        \definefontsynonym [\s!SerifItalic]     [\s!file:constani] [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldItalic] [\s!file:constanz] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [corbel] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [\s!file:corbel]  [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]       [\s!file:corbelb] [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]     [\s!file:corbeli] [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic] [\s!file:corbelz] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [calibri] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [\s!file:calibri]  [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]       [\s!file:calibrib] [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]     [\s!file:calibrii] [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic] [\s!file:calibriz] [\s!features=\s!default]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-computer-modern-unicode.mkiv b/tex/context/fonts/mkiv/type-imp-computer-modern-unicode.mkiv
new file mode 100644
index 000000000..0789b922e
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-computer-modern-unicode.mkiv
@@ -0,0 +1,64 @@
+%D \module
+%D   [       file=type-computer-modern-unicode,
+%D        version=2007.07.30, % moved from type-otf
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Computer Modern Unicode,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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[computer-modern-unicode]
+
+    \definefontfeature[default-slanted-concrete][default][slant=.2]
+    \definefontfeature[none-slanted-concrete]   [none]   [slant=.2]
+
+    \starttypescript [\s!serif] [computer-modern-unicode]
+        \definefontsynonym [\s!Serif]           [\s!file:cmunrm]    [\s!features=\s!default]
+        \definefontsynonym [\s!SerifItalic]     [\s!file:cmunti]    [\s!features=\s!default]
+        \definefontsynonym [\s!SerifSlanted]    [\s!file:cmunsl]    [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBold]       [\s!file:cmunbx]    [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldItalic] [\s!file:cmunbi]    [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldSlanted][\s!SerifBoldItalic]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [computer-modern-unicode-concrete]
+        \definefontsynonym [\s!Serif]           [\s!file:cmunorm]   [\s!features=\s!default]
+        \definefontsynonym [\s!SerifItalic]     [\s!file:cmunoti]   [\s!features=\s!default]
+        \definefontsynonym [\s!SerifSlanted]    [\s!file:cmunorm]   [\s!features=default-slanted-concrete]
+        \definefontsynonym [\s!SerifBold]       [\s!file:cmunobx]   [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldItalic] [\s!file:cmunobi]   [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldSlanted][\s!file:cmunobx]   [\s!features=default-slanted-concrete]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [computer-modern-unicode,computer-modern-unicode-concrete]
+        \definefontsynonym [\s!Sans]            [\s!file:cmunss]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]      [\s!file:cmunsi]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansSlanted]     [\s!file:cmunss]    [\s!features=default-slanted-concrete]
+        \definefontsynonym [\s!SansBold]        [\s!file:cmunsx]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic]  [\s!file:cmunso]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldSlanted] [\s!file:cmunsx]    [\s!features=default-slanted-concrete]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [computer-modern-unicode,computer-modern-unicode-concrete]
+        \definefontsynonym [\s!Mono]            [\s!file:cmuntt]    [\s!features=\s!none]
+        \definefontsynonym [\s!MonoItalic]      [\s!file:cmunit]    [\s!features=\s!none]
+        \definefontsynonym [\s!MonoSlanted]     [\s!file:cmunst]    [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBold]        [\s!file:cmuntb]    [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBoldItalic]  [\s!file:cmuntx]    [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBoldSlanted] [\s!file:cmuntb]    [\s!features=none-slanted-concrete]
+    \stoptypescript
+
+    \starttypescript[computer-modern-unicode,computer-modern-unicode-concrete]
+        \definetypeface[\typescriptone][\s!rm][\s!serif][\typescriptone]         [\s!default]
+        \definetypeface[\typescriptone][\s!ss][\s!sans] [computer-modern-unicode][\s!default]
+        \definetypeface[\typescriptone][\s!tt][\s!mono] [computer-modern-unicode][\s!default]
+        \definetypeface[\typescriptone][\s!mm][\s!math] [modern]                 [\s!default]
+    \stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/tex/context/fonts/mkiv/type-imp-cow.mkiv b/tex/context/fonts/mkiv/type-imp-cow.mkiv
new file mode 100644
index 000000000..f93e36428
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-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 ADE \& \CONTEXT\ Development Team}]
+%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/fonts/mkiv/type-imp-dejavu.mkiv b/tex/context/fonts/mkiv/type-imp-dejavu.mkiv
new file mode 100644
index 000000000..41cf1f701
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-dejavu.mkiv
@@ -0,0 +1,106 @@
+%D \module
+%D   [       file=type-imp-dejavu,
+%D        version=2010.06.21,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Dejavu fonts (dejavu-fonts.org),
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\definefontfeature[dejavu-condensed-mono][extend=.8]
+
+\starttypescriptcollection[dejavu]
+
+    \starttypescript [\s!serif] [dejavu] [\s!name]
+        \setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]           [\s!name:dejavuserif]           [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBold]       [\s!name:dejavuserifbold]       [\s!features=\s!default]
+        \definefontsynonym [\s!SerifItalic]     [\s!name:dejavuserifitalic]     [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldItalic] [\s!name:dejavuserifbolditalic] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [dejavu] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [\s!name:dejavusans]            [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]       [\s!name:dejavusansbold]        [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]     [\s!name:dejavusansoblique]     [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic] [\s!name:dejavusansboldoblique] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [dejavu] [\s!name]
+        \setups[\s!font:\s!fallback:\s!mono]
+        \definefontsynonym [\s!Mono]           [\s!name:dejavusansmono]            [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBold]       [\s!name:dejavusansmonobold]        [\s!features=\s!none]
+        \definefontsynonym [\s!MonoItalic]     [\s!name:dejavusansmonooblique]     [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBoldItalic] [\s!name:dejavusansmonoboldoblique] [\s!features=\s!none]
+    \stoptypescript
+
+    \starttypescript [\s!math][dejavu][\s!name]
+       %\loadfontgoodies[dejavu]
+        \definefontsynonym[\s!MathRoman][file:dejavu-math.otf][\s!features=\s!math\mathsizesuffix]
+    \stoptypescript
+
+    \starttypescript[dejavu]
+        \definetypeface [dejavu] [\s!rm] [\s!serif] [dejavu] [\s!default]
+        \definetypeface [dejavu] [\s!ss] [\s!sans]  [dejavu] [\s!default]
+        \definetypeface [dejavu] [\s!tt] [\s!mono]  [dejavu] [\s!default]
+%       \definetypeface [dejavu] [\s!mm] [\s!math]  [xits]   [\s!default] [\s!rscale=1.2]
+        \definetypeface [dejavu] [\s!mm] [\s!math]  [dejavu] [\s!default]
+    \stoptypescript
+
+    \starttypescript[dejavubidi]
+        \definetypeface [dejavu] [\s!rm] [\s!serif] [dejavu]   [\s!default]
+        \definetypeface [dejavu] [\s!ss] [\s!sans]  [dejavu]   [\s!default]
+        \definetypeface [dejavu] [\s!tt] [\s!mono]  [dejavu]   [\s!default]
+        \definetypeface [dejavu] [\s!mm] [\s!math]  [xitsbidi] [\s!default] [\s!rscale=1.2]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [dejavu-condensed] [\s!name]
+        \setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]           [\s!name:dejavuserifcondensed]           [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBold]       [\s!name:dejavuserifcondensedbold]       [\s!features=\s!default]
+        \definefontsynonym [\s!SerifItalic]     [\s!name:dejavuserifcondenseditalic]     [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldItalic] [\s!name:dejavuserifcondensedbolditalic] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [dejavu-condensed] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [\s!name:dejavusanscondensed]            [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]       [\s!name:dejavusanscondensedbold]        [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]     [\s!name:dejavusanscondensedoblique]     [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic] [\s!name:dejavusanscondensedboldoblique] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [dejavu-condensed] [\s!name]
+        \setups[\s!font:\s!fallback:\s!mono]
+      % \definefontsynonym [\s!Mono]           [\s!name:dejavusansmonocondensed]            [\s!features=\s!none]
+      % \definefontsynonym [\s!MonoBold]       [\s!name:dejavusansmonoboldcondensed]        [\s!features=\s!none]
+      % \definefontsynonym [\s!MonoItalic]     [\s!name:dejavusansmonoobliquecondensed]     [\s!features=\s!none]
+      % \definefontsynonym [\s!MonoBoldItalic] [\s!name:dejavusansmonoboldobliquecondensed] [\s!features=\s!none]
+        \definefontsynonym [\s!Mono]           [\s!name:dejavusansmono]            [\s!features=dejavu-condensed-mono]
+        \definefontsynonym [\s!MonoBold]       [\s!name:dejavusansmonobold]        [\s!features=dejavu-condensed-mono]
+        \definefontsynonym [\s!MonoItalic]     [\s!name:dejavusansmonooblique]     [\s!features=dejavu-condensed-mono]
+        \definefontsynonym [\s!MonoBoldItalic] [\s!name:dejavusansmonoboldoblique] [\s!features=dejavu-condensed-mono]
+    \stoptypescript
+
+  % \starttypescript [\s!mono] [dejavu-condensed] [\s!name]
+  %     \setups[\s!font:\s!fallback:\s!mono]
+  %     \definefontsynonym [\s!Mono]           [\s!name:dejavusansmono]            [\s!features=\s!none]
+  %     \definefontsynonym [\s!MonoBold]       [\s!name:dejavusansmonobold]        [\s!features=\s!none]
+  %     \definefontsynonym [\s!MonoItalic]     [\s!name:dejavusansmonooblique]     [\s!features=\s!none]
+  %     \definefontsynonym [\s!MonoBoldItalic] [\s!name:dejavusansmonoboldoblique] [\s!features=\s!none]
+  % \stoptypescript
+
+    \starttypescript[dejavu-condensed]
+        \definetypeface [dejavu-condensed] [\s!rm] [\s!serif] [dejavu-condensed] [\s!default]
+        \definetypeface [dejavu-condensed] [\s!ss] [\s!sans]  [dejavu-condensed] [\s!default]
+        \definetypeface [dejavu-condensed] [\s!tt] [\s!mono]  [dejavu-condensed] [\s!default]
+%       \definetypeface [dejavu-condensed] [\s!mm] [\s!math]  [xits]             [\s!default] [\s!rscale=1.2]
+        \definetypeface [dejavu-condensed] [\s!mm] [\s!math]  [dejavu]           [\s!default]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv b/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv
new file mode 100644
index 000000000..838654d49
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv
@@ -0,0 +1,45 @@
+%D \module
+%D   [       file=type-imp-ebgaramond,
+%D        version=2013.06.22,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=EB Garamond,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\definefontfeature
+  [eb-garamond-normal]
+  [default]
+  [mode=node,ccmp=yes,calt=yes,
+   liga=yes,dlig=yes,hlig=yes,
+   kern=yes,mark=yes,mkmk=yes,
+   onum=yes,pnum=yes,salt=yes,
+   script=latn]
+
+\definefontfeature
+  [eb-garamond-smallcaps]
+  [eb-garamond-normal]
+  [smcp=yes,c2sc=yes]
+
+\starttypescriptcollection[ebgaramond]
+
+    \starttypescript [serif] [ebgaramond]
+        \loadfontgoodies[ebgaramond]
+        \setups[font:fallback:serif]
+        \definefontsynonym [Serif]       [file:ebgaramond-regular] [features=eb-garamond-normal]
+        \definefontsynonym [SerifItalic] [file:ebgaramond-italic]  [features=eb-garamond-normal]
+        \definefontsynonym [SerifBold]   [file:ebgaramond-bold]    [features=eb-garamond-normal]
+        \definefontsynonym [SerifCaps]   [Serif]                   [features=eb-garamond-smallcaps]
+    \stoptypescript
+
+    \starttypescript[ebgaramond]
+        \definetypeface [ebgaramond] [rm] [serif] [ebgaramond] [default] [designsize=auto]
+        \definetypeface [ebgaramond] [tt] [mono]  [dejavu]     [default]
+        \definetypeface [ebgaramond] [mm] [math]  [bonum]      [default]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-euler.mkiv b/tex/context/fonts/mkiv/type-imp-euler.mkiv
new file mode 100644
index 000000000..d3b552b56
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-euler.mkiv
@@ -0,0 +1,91 @@
+%D \module
+%D   [       file=type-otf,
+%D        version=2007.07.30,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Euler,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\loadtypescriptfile[texgyre]
+\loadtypescriptfile[dejavu]
+
+% U+0000 upto U+3100 is probably ok, but even then we don't want a mix of accented
+
+\resetfontfallback  [euleroverpagella]
+\resetfontfallback  [pagellaovereuler]
+
+% 0x1D455 : italic h
+
+\definefontfallback [euleroverpagella] [\s!file:euler.otf]   [0x02100-0x02BFF] [\s!check=yes,\c!force=yes]
+\definefontfallback [euleroverpagella] [\s!file:euler.otf]   [0x1D400-0x1D7FF] [\s!check=yes,\c!force=yes]
+\definefontfallback [euleroverpagella] [texgyrepagella-math] [0x0210E]         [\s!check=yes,\c!force=\v!yes]
+%definefontfallback [euleroverpagella] [\s!file:euler.otf]   [0x1D538-0x1D550] [\s!check=yes,\c!force=yes]
+
+\definefontfallback [pagellaovereuler] [texgyrepagella-math] [0x02100-0x02BFF] [\s!check=yes]
+\definefontfallback [pagellaovereuler] [texgyrepagella-math] [0x1D400-0x1D7FF] [\s!check=yes]
+\definefontfallback [pagellaovereuler] [texgyrepagella-math] [0x1D400-0x1D7FF] [\s!check=yes]
+\definefontfallback [pagellaovereuler] [texgyrepagella-math] [0x0210E]         [\s!check=yes,\c!force=\v!yes]
+%definefontfallback [pagellaovereuler] [texgyrepagella-math] [0x1D538-0x1D550] [\s!check=yes]
+
+% example for aditya:
+
+% \definefontfallback [pagellaovereuler] [texgyrepagella-math] [lowercasenormal] [offset=uppercasenormal,force=yes]
+% \definefontfallback [pagellaovereuler] [texgyrepagella-math] [uppercasenormal] [offset=lowercasenormal,force=yes]
+
+% \definefontfallback [pagellaovereuler] [texgyrepagella-math] [uppercasebolditalic] [force=yes]
+% \definefontfallback [pagellaovereuler] [texgyrepagella-math] [lowercasebolditalic] [force=yes]
+
+\starttypescriptcollection[pagella-eulernova]
+
+    \starttypescript [\s!serif] [eulernova] [\s!name]
+        \setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif] [\s!file:euler.otf] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!math] [eulernova] [\s!name]
+        \loadfontgoodies[euler-math]
+        \definefontsynonym [MathRoman] [\s!file:euler.otf] [\s!features=\s!math\mathsizesuffix]
+    \stoptypescript
+
+    \starttypescript [pagella-eulernova]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [pagella]   [\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [dejavu]    [\s!default] [\s!rscale=0.9]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [eulernova] [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+    \starttypescript [eulernova]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [eulernova] [\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [dejavu]    [\s!default] [\s!rscale=0.9]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [eulernova] [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+    \starttypescript [\s!math] [euleroverpagella] [\s!name]
+        \definefontsynonym [MathRoman] [texgyrepagella-math] [\s!features=\s!math\mathsizesuffix,\s!fallbacks=euleroverpagella]
+    \stoptypescript
+
+    \starttypescript [\s!math] [pagellaovereuler] [\s!name]
+        \definefontsynonym [MathRoman] [\s!file:euler.otf] [\s!features=\s!math\mathsizesuffix,\s!fallbacks=pagellaovereuler]
+    \stoptypescript
+
+    \starttypescript [pagella-with-euler]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [pagella]          [\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [dejavu]           [\s!default] [\s!rscale=0.9]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [euleroverpagella] [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+    \starttypescript [euler-with-pagella]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [eulernova]        [\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [dejavu]           [\s!default] [\s!rscale=0.9]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [pagellaovereuler] [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-gentium.mkiv b/tex/context/fonts/mkiv/type-imp-gentium.mkiv
new file mode 100644
index 000000000..b2ad35a96
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-gentium.mkiv
@@ -0,0 +1,34 @@
+%D \module
+%D   [       file=type-gentium,
+%D        version=2013.05.02,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Typescript file for Gentium,
+%D         author={Thomas A. Schmitz and Mojca Miklavec},
+%D           date=\currentdate,
+%D      copyright={Mojca and Thomas}]
+
+\starttypescript [serif] [gentium]
+    \definefontsynonym [Gentium-Roman]       [file:GentiumPlus-R]  [features=default]
+    \definefontsynonym [Gentium-Italic]      [file:GentiumPlus-I]  [features=default]
+    \definefontsynonym [Gentium-Bold]        [file:GenBasB]        [features=default]
+    \definefontsynonym [Gentium-BoldItalic]  [file:GenBasBI]       [features=default]
+    \definefontsynonym [Gentium-Slanted]     [Gentium-Italic]
+    \definefontsynonym [Gentium-BoldSlanted] [Gentium-BoldItalic]
+    \definefontsynonym [Gentium-RomanCaps]   [file:GentiumPlus-R]  [features=smallcaps]
+\stoptypescript
+
+\starttypescript [serif] [gentium] [name]
+    \definefontsynonym [Serif]            [Gentium-Roman]
+    \definefontsynonym [SerifItalic]      [Gentium-Italic]
+    \definefontsynonym [SerifBold]        [Gentium-Bold]
+    \definefontsynonym [SerifBoldItalic]  [Gentium-BoldItalic]
+    \definefontsynonym [SerifSlanted]     [Gentium-Slanted]
+    \definefontsynonym [SerifBoldSlanted] [Gentium-BoldSlanted]
+    \definefontsynonym [SerifCaps]        [Serif]
+    \definefontsynonym [OldStyle]         [Serif]
+    \definefontsynonym [SerifCaps]        [Gentium-RomanCaps]
+\stoptypescript
+
+\starttypescript [gentium]
+    \definetypeface [gentium] [rm] [serif] [gentium] [default] [features=default]
+\stoptypescript
diff --git a/tex/context/fonts/mkiv/type-imp-ghz.mkiv b/tex/context/fonts/mkiv/type-imp-ghz.mkiv
new file mode 100644
index 000000000..868d73021
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-ghz.mkiv
@@ -0,0 +1,322 @@
+%D \module
+%D   [       file=type-hgz, % variant of ghz
+%D        version=2005.06.07,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Hermann Zapf's Fonts,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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 At some point I will switch to opentype Optima fonts (don't have them).
+
+% \usetypescriptfile[type-ghz]
+%
+% \definetypeface[optima]  [ss][sans] [optima-nova]  [default]
+% \definetypeface[palatino][rm][serif][palatino-nova][default]
+% \definetypeface[aldus]   [rm][serif][aldus-nova]   [default]
+%
+% \starttext
+%     \setupbodyfont[optima]   \input zapf \blank
+%     \setupbodyfont[palatino] \input zapf \blank
+%     \setupbodyfont[aldus]    \input zapf \blank
+% \stoptext
+
+\starttypescriptcollection[zapf collection]
+
+% zapfino
+
+\starttypescript [serif,handwriting] [zapfino]
+
+    \definefontsynonym[zapfino]      [file:zapfinoextraltpro]
+    \definefontsynonym[zapfinoextra] [file:zapfinoextraltpro]
+    \definefontsynonym[zapfinoforte] [file:zapfinoextraltpro]
+
+\stoptypescript
+
+% optima nova
+
+\starttypescript [sans] [optima-nova,optima-nova-light,optima-nova-medium,optima-nova-os]
+
+    \definefontsynonym[OptimaNova-Light]          [file:lt55476]
+    \definefontsynonym[OptimaNova-LightSC]        [file:lt55477]
+    \definefontsynonym[OptimaNova-LightOsF]       [file:lt55478]
+    \definefontsynonym[OptimaNova-LightItalic]    [file:lt55479]
+    \definefontsynonym[OptimaNova-LightItalicSC]  [file:lt55480]
+    \definefontsynonym[OptimaNova-LightItalicOsF] [file:lt55481]
+    \definefontsynonym[OptimaNova-LightCond]      [file:lt55482]
+    \definefontsynonym[OptimaNova-Regular]        [file:lt55483]
+    \definefontsynonym[OptimaNova-RegularSC]      [file:lt55484]
+    \definefontsynonym[OptimaNova-RegularOsF]     [file:lt55485]
+    \definefontsynonym[OptimaNova-Italic]         [file:lt55486]
+    \definefontsynonym[OptimaNova-ItalicSC]       [file:lt55487]
+    \definefontsynonym[OptimaNova-ItalicOsF]      [file:lt55488]
+    \definefontsynonym[OptimaNova-Condensed]      [file:lt55489]
+    \definefontsynonym[OptimaNova-Medium]         [file:lt55490]
+    \definefontsynonym[OptimaNova-MediumSC]       [file:lt55491]
+    \definefontsynonym[OptimaNova-MediumOsF]      [file:lt55492]
+    \definefontsynonym[OptimaNova-MediumItalic]   [file:lt55493]
+    \definefontsynonym[OptimaNova-MediumItalicSC] [file:lt55494]
+    \definefontsynonym[OptimaNova-MediumItalicOsF][file:lt55495]
+    \definefontsynonym[OptimaNova-MediumCond]     [file:lt55496]
+    \definefontsynonym[OptimaNova-TitlingInitials][file:lt55497]
+    \definefontsynonym[OptimaNova-Demi]           [file:lt55498]
+    \definefontsynonym[OptimaNova-DemiSC]         [file:lt55499]
+    \definefontsynonym[OptimaNova-DemiOsF]        [file:lt55500]
+    \definefontsynonym[OptimaNova-DemiItalic]     [file:lt55501]
+    \definefontsynonym[OptimaNova-DemiItalicSC]   [file:lt55502]
+    \definefontsynonym[OptimaNova-DemiItalicOsF]  [file:lt55503]
+    \definefontsynonym[OptimaNova-DemiCond]       [file:lt55504]
+    \definefontsynonym[OptimaNova-Bold]           [file:lt55505]
+    \definefontsynonym[OptimaNova-BoldSC]         [file:lt55506]
+    \definefontsynonym[OptimaNova-BoldOsF]        [file:lt55507]
+    \definefontsynonym[OptimaNova-BoldItalic]     [file:lt55508]
+    \definefontsynonym[OptimaNova-BoldItalicSC]   [file:lt55509]
+    \definefontsynonym[OptimaNova-BoldItalicOsF]  [file:lt55510]
+    \definefontsynonym[OptimaNova-BoldCond]       [file:lt55511]
+    \definefontsynonym[OptimaNova-Heavy]          [file:lt55512]
+    \definefontsynonym[OptimaNova-HeavyItalic]    [file:lt55513]
+    \definefontsynonym[OptimaNova-Black]          [file:lt55514]
+    \definefontsynonym[OptimaNova-BlackItalic]    [file:lt55515]
+
+\stoptypescript
+
+\starttypescript [sans] [optima-nova] [name]
+
+    \definefontsynonym [Sans]                [OptimaNova-Regular]
+    \definefontsynonym [SansItalic]          [OptimaNova-Italic]
+    \definefontsynonym [SansBold]            [OptimaNova-Bold]
+    \definefontsynonym [SansBoldItalic]      [OptimaNova-BoldItalic]
+    \definefontsynonym [SansSlanted]         [OptimaNova-Italic]
+    \definefontsynonym [SansBoldSlanted]     [OptimaNova-BoldItalic]
+    \definefontsynonym [SansCaps]            [OptimaNova-RegularSC]
+
+    \definefontsynonym [SansOsF]             [OptimaNova-RegularOsF]
+    \definefontsynonym [SansItalicOsF]       [OptimaNova-ItalicOsF]
+    \definefontsynonym [SansBoldOsF]         [OptimaNova-BoldOsF]
+    \definefontsynonym [SansBoldItalicOsF]   [OptimaNova-BoldItalicOsF]
+    \definefontsynonym [SansSlantedOsF]      [OptimaNova-ItalicOsF]
+    \definefontsynonym [SansBoldSlantedOsF]  [OptimaNova-BoldItalicOsF]
+    \definefontsynonym [SansCapsOsF]         [OptimaNova-RegularSC]
+
+    \definefontsynonym [SansCaps]            [OptimaNova-RegularSC]
+    \definefontsynonym [SansItalicCaps]      [OptimaNova-ItalicSC ]
+    \definefontsynonym [SansBoldCaps]        [OptimaNova-BoldSC]
+    \definefontsynonym [SansBoldItalicCaps]  [OptimaNova-BoldItalicSC]
+    \definefontsynonym [SansSlantedCaps]     [OptimaNova-ItalicSC]
+    \definefontsynonym [SansBoldSlantedCaps] [OptimaNova-BoldItalicSC]
+    \definefontsynonym [SansCapsCaps]        [OptimaNova-RegularSC]
+
+\stoptypescript
+
+\starttypescript [sans] [optima-nova-os] [name]
+
+    \definefontsynonym [Sans]            [OptimaNova-RegularOsF]
+    \definefontsynonym [SansItalic]      [OptimaNova-ItalicOsF]
+    \definefontsynonym [SansBold]        [OptimaNova-BoldOsF]
+    \definefontsynonym [SansBoldItalic]  [OptimaNova-BoldItalicOsF]
+    \definefontsynonym [SansSlanted]     [OptimaNova-ItalicOsF]
+    \definefontsynonym [SansBoldSlanted] [OptimaNova-BoldItalicOsF]
+    \definefontsynonym [SansCaps]        [OptimaNova-RegularSC]
+
+\stoptypescript
+
+\starttypescript [sans] [optima-nova-light] [name] % may change
+
+    \definefontsynonym [Sans]            [OptimaNova-Light]
+    \definefontsynonym [SansItalic]      [OptimaNova-LightItalic]
+    \definefontsynonym [SansBold]        [OptimaNova-Medium]
+    \definefontsynonym [SansBoldItalic]  [OptimaNova-MediumItalic]
+    \definefontsynonym [SansSlanted]     [OptimaNova-LightItalic]
+    \definefontsynonym [SansBoldSlanted] [OptimaNova-MediumItalic]
+    \definefontsynonym [SansCaps]        [OptimaNova-LightSC]
+
+\stoptypescript
+
+\starttypescript [sans] [optima-nova-medium] [name] % may change
+
+    \definefontsynonym [Sans]            [OptimaNova-Medium]
+    \definefontsynonym [SansItalic]      [OptimaNova-MediumItalic]
+    \definefontsynonym [SansBold]        [OptimaNova-Heavy]
+    \definefontsynonym [SansBoldItalic]  [OptimaNova-HeavyItalic]
+    \definefontsynonym [SansSlanted]     [OptimaNova-MediumItalic]
+    \definefontsynonym [SansBoldSlanted] [OptimaNova-HeavyItalic]
+    \definefontsynonym [SansCaps]        [OptimaNova-MediumSC]
+
+\stoptypescript
+
+\starttypescript[optima-nova,optima]
+    \definetypeface[\typescriptone][ss][sans][optima-nova] [default][features=default]
+    \definetypeface[\typescriptone][rm][sans][optima-nova] [default][features=default]
+    \definetypeface[\typescriptone][tt][mono][modern]      [default][rscale=1.1]
+    \definetypeface[\typescriptone][mm][math][modern]      [default][rscale=1.1]
+    \quittypescriptscanning
+\stoptypescript
+
+\starttypescript[optima-nova-os]
+    \definetypeface[optima-os][ss][sans][optima-nova-os] [default][features=default]
+    \definetypeface[optima-os][rm][sans][optima-nova-os] [default][features=default]
+    \definetypeface[optima-os][tt][mono][modern]         [default][rscale=1.1]
+    \definetypeface[optima-os][mm][math][modern]         [default][rscale=1.1]
+    \quittypescriptscanning
+\stoptypescript
+
+% palatino nova
+
+\starttypescript [serif] [palatino-nova,palatino-nova-light,palatino-nova-medium]
+
+    \definefontsynonym[PalatinoNova-Light]       [file:palatinonova-light]
+    \definefontsynonym[PalatinoNova-LightItalic] [file:palatinonova-lightitalic]
+    \definefontsynonym[PalatinoNova-Regular]     [file:palatinonova-regular]
+    \definefontsynonym[PalatinoNova-Italic]      [file:palatinonova-italic]
+    \definefontsynonym[PalatinoNova-Medium]      [file:palatinonova-medium]
+    \definefontsynonym[PalatinoNova-MediumItalic][file:palatinonova-mediumitalic]
+    \definefontsynonym[PalatinoNova-Bold]        [file:palatinonova-bold]
+    \definefontsynonym[PalatinoNova-BoldItalic]  [file:palatinonova-bolditalic]
+    \definefontsynonym[PalatinoNova-Imperial]    [file:palatinonova-imperial]
+    \definefontsynonym[PalatinoNova-Titling]     [file:palatinonova-titling]
+
+\stoptypescript
+
+\starttypescript [serif] [palatino-nova] [name]
+
+    \definefontsynonym [Serif]            [PalatinoNova-Regular]
+    \definefontsynonym [SerifItalic]      [PalatinoNova-Italic]
+    \definefontsynonym [SerifBold]        [PalatinoNova-Bold]
+    \definefontsynonym [SerifBoldItalic]  [PalatinoNova-BoldItalic]
+    \definefontsynonym [SerifSlanted]     [SerifItalic]
+    \definefontsynonym [SerifBoldSlanted] [SerifBoldItalic]
+
+\stoptypescript
+
+\starttypescript [serif] [palatino-nova-light] [name]% may change
+
+    \definefontsynonym [Serif]            [PalatinoNova-Light]
+    \definefontsynonym [SerifItalic]      [PalatinoNova-LightItalic]
+    \definefontsynonym [SerifBold]        [PalatinoNova-Regular]
+    \definefontsynonym [SerifBoldItalic]  [PalatinoNova-Italic]
+    \definefontsynonym [SerifSlanted]     [SerifItalic]
+    \definefontsynonym [SerifBoldSlanted] [SerifBoldItalic]
+
+\stoptypescript
+
+\starttypescript [serif] [palatino-nova-medium] [name]% may change
+
+    \definefontsynonym [Serif]            [PalatinoNova-Medium]
+    \definefontsynonym [SerifItalic]      [PalatinoNova-MediumItalic]
+    \definefontsynonym [SerifBold]        [PalatinoNova-Bold]
+    \definefontsynonym [SerifBoldItalic]  [PalatinoNova-BoldItalic]
+    \definefontsynonym [SerifSlanted]     [SerifItalic]
+    \definefontsynonym [SerifBoldSlanted] [SerifBoldItalic]
+
+\stoptypescript
+
+% palatino sans
+
+\starttypescript [sans] [palatino-sans,palatino-informal]
+
+    % palatino sans com ultra light arrows / Palatino Sans Com Ultra Light Arrows / palatinosanscom-ultltarrows]
+
+    \definefontsynonym[PalatinoSans-UltraLight]           [file:palatinosanscom-ultlight]
+    \definefontsynonym[PalatinoSans-UltraLightItalic]     [file:palatinosanscom-ultlightita]
+    \definefontsynonym[PalatinoSans-Light]                [file:palatinosanscom-light]
+    \definefontsynonym[PalatinoSans-LightItalic]          [file:palatinosanscom-lightita]
+    \definefontsynonym[PalatinoSans-Regular]              [file:palatinosanscom-regular]
+    \definefontsynonym[PalatinoSans-Italic]               [file:palatinosanscom-italic]
+    \definefontsynonym[PalatinoSans-Medium]               [file:palatinosanscom-medium]
+    \definefontsynonym[PalatinoSans-MediumItalic]         [file:palatinosanscom-mediumita]
+    \definefontsynonym[PalatinoSans-Bold]                 [file:palatinosanscom-bold]
+    \definefontsynonym[PalatinoSans-BoldItalic]           [file:palatinosanscom-boldita]
+
+    \definefontsynonym[PalatinoInformal-UltraLight]       [file:palatinosansinflcom-ultlt]
+    \definefontsynonym[PalatinoInformal-UltraLightItalic] [file:palatinosansinflcom-ultltit]
+    \definefontsynonym[PalatinoInformal-Light]            [file:palatinosansinflcom-light]
+    \definefontsynonym[PalatinoInformal-LightItalic]      [file:palatinosansinflcom-lightit]
+    \definefontsynonym[PalatinoInformal-Regular]          [file:palatinosansinflcom-regular]
+    \definefontsynonym[PalatinoInformal-Italic]           [file:palatinosansinflcom-italic]
+    \definefontsynonym[PalatinoInformal-Medium]           [file:palatinosansinflcom-med]
+    \definefontsynonym[PalatinoInformal-MediumItalic]     [file:palatinosansinflcom-medit]
+    \definefontsynonym[PalatinoInformal-Bold]             [file:palatinosansinflcom-bold]
+    \definefontsynonym[PalatinoInformal-BoldItalic]       [file:palatinosansinflcom-boldit]
+
+\stoptypescript
+
+\starttypescript [sans] [palatino-sans] [name]
+
+    \definefontsynonym [Sans]            [PalatinoSans-Medium]
+    \definefontsynonym [SansItalic]      [PalatinoSans-MediumItalic]
+    \definefontsynonym [SansBold]        [PalatinoSans-Bold]
+    \definefontsynonym [SansBoldItalic]  [PalatinoSans-BoldItalic]
+    \definefontsynonym [SansSlanted]     [SansItalic]
+    \definefontsynonym [SansBoldSlanted] [SansBoldItalic]
+
+\stoptypescript
+
+\starttypescript [sans] [palatino-informal] [name]
+
+    \definefontsynonym [Sans]            [PalatinoInformal-Medium]
+    \definefontsynonym [SansItalic]      [PalatinoInformal-MediumItalic]
+    \definefontsynonym [SansBold]        [PalatinoInformal-Bold]
+    \definefontsynonym [SansBoldItalic]  [PalatinoInformal-BoldItalic]
+    \definefontsynonym [SansSlanted]     [SansItalic]
+    \definefontsynonym [SansBoldSlanted] [SansBoldItalic]
+
+\stoptypescript
+
+\starttypescript[palatino,palatino-nova]
+    \definetypeface[palatino][rm][serif][palatino-nova][default][features=default]
+    \definetypeface[palatino][ss][sans] [palatino-sans][default][features=default]
+    \definetypeface[palatino][tt][mono] [modern]       [default][rscale=1.1]
+    \definetypeface[palatino][mm][math] [palatino]     [default]% [rscale=1.1]
+    \quittypescriptscanning
+\stoptypescript
+
+\starttypescript[palatino-sans]
+    \definetypeface[palatino][ss][sans] [palatino-sans][default][features=default]
+    \definetypeface[palatino][rm][serif][palatino-nova][default][features=default]
+    \definetypeface[palatino][tt][mono] [modern]       [default][rscale=1.1]
+    \definetypeface[palatino][mm][math] [palatino]     [default] % [rscale=1.1]
+    \quittypescriptscanning
+\stoptypescript
+
+\starttypescript[palatino-informal]
+    \definetypeface[palatino-informal][ss][sans] [palatino-informal][default][features=default]
+    \definetypeface[palatino-informal][rm][serif][palatino-nova]    [default][features=default]
+    \definetypeface[palatino-informal][tt][mono] [latin-modern]     [default][features=none,rscale=1.1]
+    \definetypeface[palatino-informal][mm][math] [palatino]         [default][features=default]% ,rscale=1.1]
+    \quittypescriptscanning
+\stoptypescript
+
+% melior
+
+\starttypescript [serif] [melior] [name]
+
+  \definefontsynonym [MeliorLT-Roman]   [MeliorLT]
+
+  \definefontsynonym [Serif]            [MeliorLT-Roman]
+  \definefontsynonym [SerifItalic]      [MeliorLT-Italic]
+  \definefontsynonym [SerifBold]        [MeliorLT-Bold]
+  \definefontsynonym [SerifBoldItalic]  [MeliorLT-BoldItalic]
+
+  \definefontsynonym [SerifSlanted]     [SerifItalic]
+  \definefontsynonym [SerifBoldSlanted] [SerifBoldItalic]
+
+  \definefontsynonym [SerifCaps]        [Serif]
+
+\stoptypescript
+
+\starttypescript [serif] [melior]
+
+  \definefontsynonym [MeliorLT]            [file:lte50062]
+  \definefontsynonym [MeliorLT-Italic]     [file:lte50063]
+  \definefontsynonym [MeliorLT-Bold]       [file:lte50064]
+  \definefontsynonym [MeliorLT-BoldItalic] [file:lte50065]
+
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/tex/context/fonts/mkiv/type-imp-hgz.mkiv b/tex/context/fonts/mkiv/type-imp-hgz.mkiv
new file mode 100644
index 000000000..091adeb2d
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-hgz.mkiv
@@ -0,0 +1 @@
+\input type-imp-ghz.mkiv \endinput % can be file synonym
diff --git a/tex/context/fonts/mkiv/type-imp-husayni.mkiv b/tex/context/fonts/mkiv/type-imp-husayni.mkiv
new file mode 100644
index 000000000..76cbf77db
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-husayni.mkiv
@@ -0,0 +1,198 @@
+%D \module
+%D   [       file=type-imp-husayni,
+%D        version=2008.08.08, % or whatever ... onwards
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Husayni,
+%D         author=Idris Samawi Hamid \& Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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 For a detailed list of features and names, see husayni.lfg. In fact, the following
+%D sets will go there.
+
+\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, % contextual analysis
+   medi=yes, % contextual analysis
+   fina=yes, % contextual analysis
+   rlig=yes, % indispensable
+   calt=yes, % ayah+numerals
+   salt=yes, % includes manual justification with Tatwiil
+   anum=yes, % replace latin numerals with arabic-script ones
+   ss01=yes, % Allah, Muhammad,
+   ss03=yes, % level-1 stack over Jiim, initial entry only
+   ss10=yes, % basic dipped Miim, initial-entry B_S-stack over Miim
+   ss12=yes, % XBM_im initial-medial entry B_S-stack over Miim,
+   ss15=yes, % full stacked Laam-on-Miim
+   ss16=yes, % initial entry, stacked Ayn-on-Miim
+   ss19=yes, % LM_im
+   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
+   ss31=yes, % basic Raa.final strings: JR and SR
+   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
+   ss41=yes, % high and low Baa strings
+   ss42=yes, % diagonal entry
+   ss43=yes, % initial alternates
+   ss60=yes, %
+   js16=yes, % aesthetic medial Faa/Qaaf
+   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,
+   goodies=husayni,
+   colorscheme=default]
+
+\definefontfeature
+  [husayni-alternative] % was husayni-default2
+  [analyze=yes,
+   mode=node,
+   language=dflt,
+   script=arab,
+   ccmp=yes, % adds identity dots to unicode letters; includes dynamic dot placement
+   init=yes, % contextual analysis
+   medi=yes, % contextual analysis
+   fina=yes, % contextual analysis
+   rlig=yes, % indispensable
+   calt=yes, % ayah+numerals
+   salt=yes, % includes manual justification with Tatwiil
+   anum=yes, % replace latin numerals with arabic-script ones
+   ss01=yes, % Allah, Muhammad,
+   ss03=yes, % level-1 stack over Jiim, initial entry only
+   ss10=yes, % basic dipped Miim, initial-entry B_S-stack over Miim
+   ss12=yes, % XBM_im initial-medial entry B_S-stack over Miim,
+   ss15=yes, % full stacked Laam-on-Miim
+   ss16=yes, % initial entry, stacked Ayn-on-Miim
+   ss19=yes, % LM_im
+   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
+   ss31=yes, % basic Raa.final strings: JR and SR
+   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
+   ss41=yes, % high and low Baa strings
+   ss42=yes, % diagonal entry
+   ss43=yes, % initial alternates
+   ss60=yes, %
+   js16=yes, % aesthetic medial Faa/Qaaf
+   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]
+
+\definefontfeature
+  [husayni-tt]
+  [analyze=yes,
+   mode=node,
+   language=dflt,
+   script=arab,
+   ccmp=yes,
+   init=yes,
+   medi=yes,
+   fina=yes,
+   rlig=yes,
+   fchr=yes,
+   kern=yes,
+   curs=yes,
+   mark=yes,
+   mkmk=yes]
+
+\definefontfeature
+  [husayni-mono]
+  [analyze=yes,
+   mode=node,
+   language=dflt,
+   script=arab,
+   ccmp=no,
+   init=yes,
+   medi=yes,
+   fina=yes,
+   isol=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]
+
+\definebodyfontenvironment
+  [husayni-default]
+  [default]
+  [interlinespace=4.4ex]
+
+\definefontfallback
+  [husayni-latin]
+  [file:lmroman12-regular*default]
+  [basiclatin,latin-1supplement,latinextended-A,latinextendedadditional]
+  [force=no,
+   rscale=.7]
+
+\definefontfallback
+   [husayni-mono]
+   [file:cour*husayni-mono]
+   [arabic,arabicpresentationformsa,arabicpresentationformsb,arabicsupplement,0x200C,0x200D,0x200E,0x200F]
+ % [force=no]
+
+\definebodyfontenvironment[20.7pt]
+\definebodyfontenvironment[24.8pt]
+\definebodyfontenvironment[29.8pt]
+\definebodyfontenvironment[35.8pt]
+
+\starttypescriptcollection[husayni]
+
+    \starttypescript [naskh] [husayni] [name]
+        \definefontsynonym [Arabic-Light]       [name:husayni] [goodies=husayni,features=husayni-default]
+        \definefontsynonym [Arabic-Bold]        [name:husayni] [goodies=husayni,features=husayni-default]
+        \definefontsynonym [Arabic-Italic]      [name:husayni] [goodies=husayni,features=husayni-default]
+        \definefontsynonym [Arabic-Bold-Italic] [name:husayni] [goodies=husayni,features=husayni-default]
+
+        \definefontsynonym [Serif]           [Arabic-Light]
+        \definefontsynonym [SerifItalic]     [Arabic-Italic]
+        \definefontsynonym [SerifBold]       [Arabic-Bold]
+        \definefontsynonym [SerifBoldItalic] [Arabic-Bold-Italic]
+    \stoptypescript
+
+    \starttypescript [husayni-default]
+        \definetypeface [husayni-default] [rm] [naskh] [husayni]  [default] [fallbacks=husayni-latin]
+        \definetypeface [husayni-default] [tt] [mono]  [modern]   [default] [fallbacks=husayni-latin]
+        \definetypeface [husayni-default] [mm] [math]  [xitsbidi] [default]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-hvmath.mkiv b/tex/context/fonts/mkiv/type-imp-hvmath.mkiv
new file mode 100644
index 000000000..01595710e
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-hvmath.mkiv
@@ -0,0 +1,30 @@
+%D \module
+%D   [       file=type-imp-hvmath,
+%D        version=2007.07.30,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=HV Math Fonts,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\loadtypescriptfile[texgyre]
+
+\starttypescriptcollection[hvmath]
+
+    \starttypescript [\s!math] [hvmath]
+        \definefontsynonym[\s!MathRoman][hvmath@hvmath-math]
+        \loadfontgoodies[hvmath-math]
+    \stoptypescript
+
+    \starttypescript [hvmath]
+        \definetypeface [hvmath] [\s!ss] [\s!sans]  [heros]  [\s!default] [\s!rscale=0.9]
+        \definetypeface [hvmath] [\s!rm] [\s!serif] [termes] [\s!default]
+        \definetypeface [hvmath] [\s!tt] [\s!mono]  [cursor] [\s!default] [\s!rscale=1.05]
+        \definetypeface [hvmath] [\s!mm] [\s!math]  [hvmath] [\s!default]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-inconsolata.mkiv b/tex/context/fonts/mkiv/type-imp-inconsolata.mkiv
new file mode 100644
index 000000000..159759e9b
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-inconsolata.mkiv
@@ -0,0 +1,25 @@
+%D \module
+%D   [       file=type-imp-incolsolata,
+%D        version=2007.07.30,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Inconsolata,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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[inconsolata]
+
+    \starttypescript [\s!mono] [inconsolata]
+        \definefontsynonym [Inconsolata] [\s!file:inconsolata.otf]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [inconsolata] [\s!name]
+        \setups[\s!font:\s!fallback:\s!mono]
+        \definefontsynonym [\s!Mono] [Inconsolata]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-informal.mkiv b/tex/context/fonts/mkiv/type-imp-informal.mkiv
new file mode 100644
index 000000000..575a836e5
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-informal.mkiv
@@ -0,0 +1,52 @@
+%D \module
+%D   [       file=type-buy,
+%D        version=2003.07.08, % 2001.04.12,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Informal by M. Vulis,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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[informal]
+
+\starttypescript [casual] [informal]
+    \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]
+    \definefontsynonym [Informal-Regular]     [file:ifrg]
+    \definefontsynonym [Informal-Bold]        [file:ifb]
+    \definefontsynonym [Informal-Oblique]     [file:ifo]
+    \definefontsynonym [Informal-BoldOblique] [file:ifbo]
+\stoptypescript
+
+\starttypescript [math] [informal] [name]
+    \loadfontgoodies[informal-math]
+    \definefontsynonym[MathRoman][informalmath@informal-math]
+\stoptypescript
+
+\starttypescript [informal]
+    \definetypeface[informal][rm][casual][informal][default]
+    \definetypeface[informal][tt][mono]  [modern]  [default][rscale=0.95]
+    \definetypeface[informal][mm][math]  [informal][default]
+\stoptypescript
+
+\stoptypescriptcollection
+
diff --git a/tex/context/fonts/mkiv/type-imp-ipaex.mkiv b/tex/context/fonts/mkiv/type-imp-ipaex.mkiv
new file mode 100644
index 000000000..b11f96878
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-ipaex.mkiv
@@ -0,0 +1,137 @@
+%D \module
+%D   [       file=type-imp-ipaex,
+%D        version=2015.05.01,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=IPAex,
+%D         author=Yusuke KUROKI \& Hans HAGEN,
+%D           date=\currentdate,
+%D      copyright=Yusuke KUROKI \& Hans HAGEN]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% usage: \setupbodyfont[ipaex,10pt]
+
+\loadtypescriptfile[texgyre]
+\loadtypescriptfile[xits]
+
+\definefontfeature
+  [jp-default]
+  [script=default,lang=japanese]
+
+\definefontfeature
+  [jp-latin-default]
+  [jp-default]
+
+\definefontfeature
+  [jp-latin-slanted]
+  [jp-latin-default]
+  [slant=.2]
+
+\definefontfeature
+  [jp-latin-slanted-mono]
+  [slant=.2]
+
+\definefontfeature
+  [jp-latin-smallcaps]
+  [jp-latin-default]
+  [smcp=yes]
+
+\definefontfeature
+  [jp-latin-smallcaps-mono]
+  [cmcp=yes]
+
+\definefontfallback[jp-serif]           [texgyrepagella-regular*jp-latin-default]      [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-serifbold]       [texgyrepagella-bold*jp-latin-default]         [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-serifitalic]     [texgyrepagella-italic*jp-latin-default]       [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-serifbolditalic] [texgyrepagella-bolditalic*jp-latin-default]   [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-serifslanted]    [texgyrepagella-regular*jp-latin-slanted]      [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-serifboldslanted][texgyrepagella-bold*jp-latin-slanted]         [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-serifcaps]       [texgyrepagella-regular*jp-latin-smallcaps]    [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-sans]            [texgyreheros-regular*jp-latin-default]        [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-sansbold]        [texgyreheros-bold*jp-latin-default]           [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-sansitalic]      [texgyreheros-italic*jp-latin-default]         [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-sansbolditalic]  [texgyreheros-bolditalic*jp-latin-default]     [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-sansslanted]     [texgyreheros-regular*jp-latin-slanted]        [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-sansboldslanted] [texgyreheros-bold*jp-latin-slanted]           [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-sanscaps]        [texgyreheros-regular*jp-latin-smallcaps]      [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-mono]            [texgyrecursor-regular]                        [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-monobold]        [texgyrecursor-bold]                           [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-monoitalic]      [texgyrecursor-italic]                         [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-monobolditalic]  [texgyrecursor-bolditalic]                     [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-monoslanted]     [texgyrecursor-regular*jp-latin-slanted-mono]  [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-monoboldslanted] [texgyrecursor-bold*jp-latin-slanted-mono]     [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-monocaps]        [texgyrecursor-regular*jp-latin-smallcaps-mono][0x0000-0x0400][force=yes,rscale=1.0406]
+
+\starttypescriptcollection[ipaex]
+    \starttypescript [\s!serif] [ipaexm]
+        \definefontsynonym [ipaexm]           [\s!file:ipaexm][\s!features=jp-default,\s!fallbacks=jp-serif]
+        \definefontsynonym [ipaexmbold]       [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-serifbold]
+        \definefontsynonym [ipaexmitalic]     [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-serifitalic]
+        \definefontsynonym [ipaexmbolditalic] [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-serifbolditalic]
+        \definefontsynonym [ipaexmslanted]    [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-serifslanted]
+        \definefontsynonym [ipaexmboldslanted][\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-serifboldslanted]
+        \definefontsynonym [ipaexmcaps]       [\s!file:ipaexm][\s!features=jp-default,\s!fallbacks=jp-serifcaps]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [ipaexg]
+        \definefontsynonym[ipaexg]             [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-sans]
+        \definefontsynonym[ipaexgbold]         [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-sansbold]
+        \definefontsynonym[ipaexgitalic]       [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-sansitalic]
+        \definefontsynonym[ipaexgbolditalic]   [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-sansbolditalic]
+        \definefontsynonym[ipaexgslanted]      [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-sansslanted]
+        \definefontsynonym[ipaexgboldslanted]  [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-sansboldslanted]
+        \definefontsynonym[ipaexgcaps]         [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-sanscaps]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [ipaexgmono]
+        \definefontsynonym[ipaexgmono]              [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-mono]
+        \definefontsynonym[ipaexgmonobold]          [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-monobold]
+        \definefontsynonym[ipaexgmonoitalic]        [\s!file:ipaexg][\s!features=jp-slanted,\s!fallbacks=jp-monoitalic]
+        \definefontsynonym[ipaexgmonobolditalic]    [\s!file:ipaexg][\s!features=jp-slanted,\s!fallbacks=jp-monobolditalic]
+        \definefontsynonym[ipaexgmonoslanted]       [\s!file:ipaexg][\s!features=jp-slanted,\s!fallbacks=jp-monoslanted]
+        \definefontsynonym[ipaexgmonoboldslanted]   [\s!file:ipaexg][\s!features=jp-slanted,\s!fallbacks=jp-monoboldslanted]
+        \definefontsynonym[ipaexgmonocaps]          [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-monocaps]
+    \stoptypescript
+    
+    \starttypescript [\s!serif] [ipaexm] [\s!name]
+        \definefontsynonym[\s!Serif]           [ipaexm]
+        \definefontsynonym[\s!SerifBold]       [ipaexmbold]
+        \definefontsynonym[\s!SerifItalic]     [ipaexmitalic]
+        \definefontsynonym[\s!SerifBoldItalic] [ipaexmbolditalic]
+        \definefontsynonym[\s!SerifSlanted]    [ipaexmslanted]
+        \definefontsynonym[\s!SerifBoldSlanted][ipaexmboldslanted]
+        \definefontsynonym[\s!SerifCaps]       [ipaexmcaps]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [ipaexg] [\s!name]
+        \definefontsynonym[\s!Sans]            [ipaexg]
+        \definefontsynonym[\s!SansBold]        [ipaexgbold]
+        \definefontsynonym[\s!SansItalic]      [ipaexgitalic]
+        \definefontsynonym[\s!SansBoldItalic]  [ipaexgbolditalic]
+        \definefontsynonym[\s!SansSlanted]     [ipaexgslanted]
+        \definefontsynonym[\s!SansBoldSlanted] [ipaexgboldslanted]
+        \definefontsynonym[\s!SansCaps]        [ipaexgcaps]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [ipaexgmono] [\s!name]
+        \definefontsynonym[\s!Mono]            [ipaexgmono]
+        \definefontsynonym[\s!MonoBold]        [ipaexgmonobold]
+        \definefontsynonym[\s!MonoItalic]      [ipaexgmonoitalic]
+        \definefontsynonym[\s!MonoBoldItalic]  [ipaexgmonobolditalic]
+        \definefontsynonym[\s!MonoSlanted]     [ipaexgmonoslanted]
+        \definefontsynonym[\s!MonoBoldSlanted] [ipaexgmonoboldslanted]
+        \definefontsynonym[\s!MonoCaps]        [ipaexgmonocaps]
+    \stoptypescript
+
+    % xits might get replaced with a pagella once we have it
+
+    \starttypescript[ipaex]
+        \definetypeface [ipaex] [\s!rm] [\s!serif] [ipaexm]
+        \definetypeface [ipaex] [\s!ss] [\s!sans]  [ipaexg]
+        \definetypeface [ipaex] [\s!tt] [\s!mono]  [ipaexgmono]
+        \definetypeface [ipaex] [\s!mm] [\s!math]  [xits]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-iwona.mkiv b/tex/context/fonts/mkiv/type-imp-iwona.mkiv
new file mode 100644
index 000000000..88cb7e719
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-iwona.mkiv
@@ -0,0 +1,236 @@
+%D \module
+%D   [       file=type-imp-iwona,
+%D        version=2010.06.21,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Iwona,
+%D         author=Mojca Miklavec \& Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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[iwona]
+
+    % maybe this will change in Iwona-Math-Letters and Iwona-Math-Letters-Italic
+
+    % These names are a depressing mess. They have changed over time and are
+    % still not consistent. I'd expect Bold-Regular and Bold-Italic.
+
+    \starttypescript [\s!sans] [iwona-light,iwona,iwona-medium,iwona-heavy,iwona-light-cond,iwona-cond,iwona-medium-cond,iwona-heavy-cond]
+
+        \definefontsynonym [Iwona-Regular]               [\s!file:Iwona-Regular]                [\s!features=\s!default]
+        \definefontsynonym [Iwona-Italic]                [\s!file:Iwona-Italic]                 [\s!features=\s!default]
+        \definefontsynonym [Iwona-Bold]                  [\s!file:Iwona-Bold]                   [\s!features=\s!default]
+        \definefontsynonym [Iwona-BoldItalic]            [\s!file:Iwona-BoldItalic]             [\s!features=\s!default]
+        \definefontsynonym [Iwona-Light-Regular]         [\s!file:IwonaLight-Regular]           [\s!features=\s!default]
+        \definefontsynonym [Iwona-Light-Italic]          [\s!file:IwonaLight-Italic]            [\s!features=\s!default]
+        \definefontsynonym [Iwona-Medium-Regular]        [\s!file:IwonaMedium-Regular]          [\s!features=\s!default]
+        \definefontsynonym [Iwona-Medium-Italic]         [\s!file:IwonaMedium-Italic]           [\s!features=\s!default]
+        \definefontsynonym [Iwona-Heavy-Regular]         [\s!file:IwonaHeavy-Regular]           [\s!features=\s!default]
+        \definefontsynonym [Iwona-Heavy-Italic]          [\s!file:IwonaHeavy-Italic]            [\s!features=\s!default]
+
+        \definefontsynonym [Iwona-CapsRegular]           [\s!file:Iwona-Regular]                [\s!features=\s!smallcaps]
+        \definefontsynonym [Iwona-CapsItalic]            [\s!file:Iwona-Italic]                 [\s!features=\s!smallcaps]
+        \definefontsynonym [Iwona-CapsBold]              [\s!file:Iwona-Bold]                   [\s!features=\s!smallcaps]
+        \definefontsynonym [Iwona-CapsBoldItalic]        [\s!file:Iwona-BoldItalic]             [\s!features=\s!smallcaps]
+        \definefontsynonym [Iwona-CapsLight]             [\s!file:IwonaLight-Regular]           [\s!features=\s!smallcaps]
+        \definefontsynonym [Iwona-CapsLight-Italic]      [\s!file:IwonaLight-Italic]            [\s!features=\s!smallcaps]
+        \definefontsynonym [Iwona-CapsMedium]            [\s!file:IwonaMedium-Regular]          [\s!features=\s!smallcaps]
+        \definefontsynonym [Iwona-CapsMedium-Italic]     [\s!file:IwonaMedium-Italic]           [\s!features=\s!smallcaps]
+        \definefontsynonym [Iwona-CapsHeavy]             [\s!file:IwonaHeavy-Regular]           [\s!features=\s!smallcaps]
+        \definefontsynonym [Iwona-CapsHeavy-Italic]      [\s!file:IwonaHeavy-Italic]            [\s!features=\s!smallcaps]
+
+        \definefontsynonym [Iwona-CondRegular]           [\s!file:IwonaCond-Regular]            [\s!features=\s!default]
+        \definefontsynonym [Iwona-CondItalic]            [\s!file:IwonaCond-Italic]             [\s!features=\s!default]
+        \definefontsynonym [Iwona-CondBold]              [\s!file:IwonaCond-Bold]               [\s!features=\s!default]
+        \definefontsynonym [Iwona-CondBoldItalic]        [\s!file:IwonaCond-BoldItalic]         [\s!features=\s!default]
+        \definefontsynonym [Iwona-CondLight-Regular]     [\s!file:IwonaCondLight-Regular]       [\s!features=\s!default]
+        \definefontsynonym [Iwona-CondLight-Italic]      [\s!file:IwonaCondLight-Italic]        [\s!features=\s!default]
+        \definefontsynonym [Iwona-CondMedium-Regular]    [\s!file:IwonaCondMedium-Regular]      [\s!features=\s!default]
+        \definefontsynonym [Iwona-CondMedium-Italic]     [\s!file:IwonaCondMedium-Italic]       [\s!features=\s!default]
+        \definefontsynonym [Iwona-CondHeavy-Regular]     [\s!file:IwonaCondHeavy-Regular]       [\s!features=\s!default]
+        \definefontsynonym [Iwona-CondHeavy-Italic]      [\s!file:IwonaCondHeavy-Italic]        [\s!features=\s!default]
+
+        \definefontsynonym [Iwona-CapsCondRegular]       [\s!file:IwonaCond-Regular]            [\s!features=\s!smallcaps]
+        \definefontsynonym [Iwona-CapsCondItalic]        [\s!file:IwonaCond-Italic]             [\s!features=\s!smallcaps]
+        \definefontsynonym [Iwona-CapsCondBold]          [\s!file:IwonaCond-Bold]               [\s!features=\s!smallcaps]
+        \definefontsynonym [Iwona-CapsCondBoldItalic]    [\s!file:IwonaCond-BoldItalic]         [\s!features=\s!smallcaps]
+        \definefontsynonym [Iwona-CapsCondLight-Regular] [\s!file:IwonaCondLight-Regular]       [\s!features=\s!smallcaps]
+        \definefontsynonym [Iwona-CapsCondLight-Italic]  [\s!file:IwonaCondLight-Italic]        [\s!features=\s!smallcaps]
+        \definefontsynonym [Iwona-CapsCondMedium-Regular][\s!file:IwonaCondMedium-Regular]      [\s!features=\s!smallcaps]
+        \definefontsynonym [Iwona-CapsCondMedium-Italic] [\s!file:IwonaCondMedium-Italic]       [\s!features=\s!smallcaps]
+        \definefontsynonym [Iwona-CapsCondHeavy-Regular] [\s!file:IwonaCondHeavy-Regular]       [\s!features=\s!smallcaps]
+        \definefontsynonym [Iwona-CapsCondHeavy-Italic]  [\s!file:IwonaCondHeavy-Italic]        [\s!features=\s!smallcaps]
+
+    \stoptypescript
+
+    % [all] is redundant
+
+    \starttypescript [\s!math][iwona][\s!all]
+        \definefontsynonym[\s!MathRoman][iwonamath@iwona-math]
+    \stoptypescript
+    \starttypescript [\s!math][iwona-light][\s!all]
+        \definefontsynonym[\s!MathRoman][iwonalightmath@iwona-light-math]
+    \stoptypescript
+    \starttypescript [\s!math][iwona-medium][\s!all]
+        \definefontsynonym[\s!MathRoman][iwonamediummath@iwona-medium-math]
+    \stoptypescript
+    \starttypescript [\s!math][iwona-heavy][\s!all]
+        \definefontsynonym[\s!MathRoman][iwonaheavymath@iwona-heavy-math]
+    \stoptypescript
+
+    \starttypescript [\s!math] [iwona,iwona-light,iwona-medium,iwona-heavy] [\s!all]
+        \loadfontgoodies[iwona-math]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [iwona-light] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]            [Iwona-Light-Regular]
+        \definefontsynonym [\s!SansItalic]      [Iwona-Light-Italic]
+        \definefontsynonym [\s!SansBold]        [Iwona-Medium-Regular]
+        \definefontsynonym [\s!SansBoldItalic]  [Iwona-Medium-Italic]
+        \definefontsynonym [SansCaps]           [Iwona-CapsLight]
+        \definefontsynonym [SansItalicCaps]     [Iwona-CapsLightItalic]
+        \definefontsynonym [SansBoldCaps]       [Iwona-CapsMedium]
+        \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsMediumItalic]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [iwona-light-caps] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [Iwona-CapsLight-Regular]
+        \definefontsynonym [\s!SansItalic]     [Iwona-CapsLight-Italic]
+        \definefontsynonym [\s!SansBold]       [Iwona-CapsMedium-Regular]
+        \definefontsynonym [\s!SansBoldItalic] [Iwona-CapsMedium-Italic]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [iwona] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]            [Iwona-Regular]
+        \definefontsynonym [\s!SansItalic]      [Iwona-Italic]
+        \definefontsynonym [\s!SansBold]        [Iwona-Bold]
+        \definefontsynonym [\s!SansBoldItalic]  [Iwona-BoldItalic]
+        \definefontsynonym [SansCaps]           [Iwona-CapsRegular]
+        \definefontsynonym [SansItalicCaps]     [Iwona-CapsItalic]
+        \definefontsynonym [SansBoldCaps]       [Iwona-CapsBold]
+        \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsBoldItalic]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [iwona-caps] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [Iwona-CapsRegular]
+        \definefontsynonym [\s!SansItalic]     [Iwona-CapsItalic]
+        \definefontsynonym [\s!SansBold]       [Iwona-CapsBold]
+        \definefontsynonym [\s!SansBoldItalic] [Iwona-CapsBoldItalic]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [iwona-medium] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]            [Iwona-Medium-Regular]
+        \definefontsynonym [\s!SansItalic]      [Iwona-Medium-Italic]
+        \definefontsynonym [\s!SansBold]        [Iwona-Heavy-Regular]
+        \definefontsynonym [\s!SansBoldItalic]  [Iwona-Heavy-Italic]
+        \definefontsynonym [SansCaps]           [Iwona-CapsHeavy-Regular]
+        \definefontsynonym [SansItalicCaps]     [Iwona-CapsMedium-Italic]
+        \definefontsynonym [SansBoldCaps]       [Iwona-CapsHeavy-Regular]
+        \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsHeavy-Italic]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [iwona-medium-caps] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [Iwona-CapsHeavy-Regular]
+        \definefontsynonym [\s!SansItalic]     [Iwona-CapsMedium-Italic]
+        \definefontsynonym [\s!SansBold]       [Iwona-CapsHeavy-Regular]
+        \definefontsynonym [\s!SansBoldItalic] [Iwona-CapsHeavy-Italic]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [iwona-heavy] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]            [Iwona-Heavy-Regular]
+        \definefontsynonym [\s!SansItalic]      [Iwona-Heavy-Italic]
+        \definefontsynonym [\s!SansBold]        [Iwona-Heavy-Regular]
+        \definefontsynonym [\s!SansBoldItalic]  [Iwona-Heavy-Italic]
+        \definefontsynonym [SansCaps]           [Iwona-CapsHeavy-Regular]
+        \definefontsynonym [SansItalicCaps]     [Iwona-CapsHeavy-Italic]
+        \definefontsynonym [SansBoldCaps]       [Iwona-CapsHeavy-Regular]
+        \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsHeavy-Italic]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [iwona-heavy-caps] [\s!name]
+       \setups[\s!font:\s!fallback:\s!sans]
+       \definefontsynonym [SansCaps]           [Iwona-CapsHeavy-Regular]
+       \definefontsynonym [SansItalicCaps]     [Iwona-CapsHeavy-Italic]
+       \definefontsynonym [SansBoldCaps]       [Iwona-CapsHeavy-Regular]
+       \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsHeavy-Italic]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [iwona-light-cond] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]            [Iwona-CondLight-Regular]
+        \definefontsynonym [\s!SansItalic]      [Iwona-CondLight-Italic]
+        \definefontsynonym [\s!SansBold]        [Iwona-CondMedium-Regular]
+        \definefontsynonym [\s!SansBoldItalic]  [Iwona-CondMedium-Italic]
+        \definefontsynonym [SansCaps]           [Iwona-CapsCondLight-Regular]
+        \definefontsynonym [SansItalicCaps]     [Iwona-CapsCondLight-Italic]
+        \definefontsynonym [SansBoldCaps]       [Iwona-CapsCondMedium-Regular]
+        \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsCondMedium-Italic]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [iwona-light-cond-caps,iwona-light-caps-cond] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [Iwona-CapsCondLight-Regular]
+        \definefontsynonym [\s!SansItalic]     [Iwona-CapsCondLight-Italic]
+        \definefontsynonym [\s!SansBold]       [Iwona-CapsCondMedium-Regular]
+        \definefontsynonym [\s!SansBoldItalic] [Iwona-CapsCondMedium-Italic]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [iwona-cond] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]            [Iwona-CondRegular]
+        \definefontsynonym [\s!SansItalic]      [Iwona-CondItalic]
+        \definefontsynonym [\s!SansBold]        [Iwona-CondBold]
+        \definefontsynonym [\s!SansBoldItalic]  [Iwona-CondBoldItalic]
+        \definefontsynonym [SansCaps]           [Iwona-CapsCondRegular]
+        \definefontsynonym [SansItalicCaps]     [Iwona-CapsCondItalic]
+        \definefontsynonym [SansBoldCaps]       [Iwona-CapsCondBold]
+        \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsCondBoldItalic]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [iwona-cond-caps,iwona-caps-cond] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [Iwona-CapsCondRegular]
+        \definefontsynonym [\s!SansItalic]     [Iwona-CapsCondItalic]
+        \definefontsynonym [\s!SansBold]       [Iwona-CapsCondBold]
+        \definefontsynonym [\s!SansBoldItalic] [Iwona-CapsCondBoldItalic]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [iwona-medium-cond] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]            [Iwona-CondMedium-Regular]
+        \definefontsynonym [\s!SansItalic]      [Iwona-CondMedium-Italic]
+        \definefontsynonym [\s!SansBold]        [Iwona-CondHeavy-Regular]
+        \definefontsynonym [\s!SansBoldItalic]  [Iwona-CondHeavy-Italic]
+        \definefontsynonym [SansCaps]           [Iwona-CapsCondHeavy-Regular]
+        \definefontsynonym [SansItalicCaps]     [Iwona-CapsCondMedium-Italic]
+        \definefontsynonym [SansBoldCaps]       [Iwona-CapsCondHeavy-Regular]
+        \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsCondHeavy-Italic]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [iwona-medium-cond-caps,iwona-medium-caps-cond] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [Iwona-CapsCondHeavy-Regular]
+        \definefontsynonym [\s!SansItalic]     [Iwona-CapsCondMedium-Italic]
+        \definefontsynonym [\s!SansBold]       [Iwona-CapsCondHeavy-Regular]
+        \definefontsynonym [\s!SansBoldItalic] [Iwona-CapsCondHeavy-Italic]
+    \stoptypescript
+
+    \starttypescript [iwona,iwona-light,iwona-heavy,iwona-medium]
+        \definetypeface[\typescriptone][\s!ss][\s!sans] [\typescriptone] [\s!default]
+        \definetypeface[\typescriptone][\s!rm][\s!serif][modern]         [\s!default]
+        \definetypeface[\typescriptone][\s!tt][\s!mono] [modern]         [\s!default]
+        \definetypeface[\typescriptone][\s!mm][\s!math] [\typescriptone] [\s!default][text=ss]
+        \quittypescriptscanning
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-kurier.mkiv b/tex/context/fonts/mkiv/type-imp-kurier.mkiv
new file mode 100644
index 000000000..d83510b95
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-kurier.mkiv
@@ -0,0 +1,56 @@
+%D \module
+%D   [       file=type-imp-kurier,
+%D        version=2007.07.30,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Kurier by JMN,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% There are no open type fonts yet so this should be in type-one.mkiv
+% instead but we keep it here till ready.
+
+\starttypescriptcollection[kurier]
+
+    \starttypescript [\s!sans] [kurier-light,kurier,kurier-medium]
+        \definefontsynonym[Kurier-Light]         [kurierl]
+        \definefontsynonym[Kurier-Regular]       [kurierr]
+        \definefontsynonym[Kurier-Medium]        [kurierm]
+        \definefontsynonym[Kurier-Bold]          [kurierb]
+        \definefontsynonym[Kurier-Heavy]         [kurierh]
+        \definefontsynonym[Kurier-LightItalic]   [kurierli]
+        \definefontsynonym[Kurier-Italic]        [kurierri]
+        \definefontsynonym[Kurier-MediumItalic]  [kuriermi]
+        \definefontsynonym[Kurier-BoldItalic]    [kurierbi]
+        \definefontsynonym[Kurier-HeavyItalic]   [kurierhi]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [kurier-light] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [Kurier-Light-Regular]
+        \definefontsynonym [\s!SansItalic]     [Kurier-Light-Italic]
+        \definefontsynonym [\s!SansBold]       [Kurier-Medium-Regular]
+        \definefontsynonym [\s!SansBoldItalic] [Kurier-Medium-Italic]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [kurier] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [Kurier-Regular]
+        \definefontsynonym [\s!SansItalic]     [Kurier-Italic]
+        \definefontsynonym [\s!SansBold]       [Kurier-Bold]
+        \definefontsynonym [\s!SansBoldItalic] [Kurier-BoldItalic]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [kurier-medium] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [Kurier-Medium-Regular]
+        \definefontsynonym [\s!SansItalic]     [Kurier-Medium-Italic]
+        \definefontsynonym [\s!SansBold]       [Kurier-Heavy-Regular]
+        \definefontsynonym [\s!SansBoldItalic] [Kurier-Heavy-Italic]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv b/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv
new file mode 100644
index 000000000..fe4b669bd
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv
@@ -0,0 +1,238 @@
+%D \module
+%D   [       file=type-imp-modern,
+%D        version=2007.07.30,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Latin Modern,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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[\s!fallback]
+%     \starttypescript [\s!fallback]
+%         \definetypeface [\s!fallback] [\s!rm] [\s!serif] [modern] [\s!default]
+%         \definetypeface [\s!fallback] [\s!ss] [\s!sans]  [modern] [\s!default]
+%         \definetypeface [\s!fallback] [\s!tt] [\s!mono]  [modern] [\s!default]
+%         \definetypeface [\s!fallback] [\s!mm] [\s!math]  [modern] [\s!default]
+%         \quittypescriptscanning
+%     \stoptypescript
+% \stoptypescriptcollection
+
+%D Here comes good old Latin Modern, the default font, based on Knuths Computer
+%D Modern. The design size variants is:
+%D
+%D modern-designsize
+
+\starttypescriptcollection[latinmodern]
+
+    \starttypescript [\s!serif] [simple] [\s!name]% for old times sake (manuals)
+        \definefontsynonym [\s!Simple] [\s!file:lmmonoproplt10-regular] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [modern,latin-modern-designsize,latin-modern] [\s!name]
+        \loadfontgoodies[lm]
+        \definefontsynonym [\s!Serif]            [LMRoman-Regular]     [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBold]        [LMRoman-Bold]        [\s!features=\s!default]
+        \definefontsynonym [\s!SerifItalic]      [LMRoman-Italic]      [\s!features=\s!default]
+        \definefontsynonym [\s!SerifSlanted]     [LMRoman-Oblique]     [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldItalic]  [LMRoman-BoldItalic]  [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldSlanted] [LMRoman-BoldOblique] [\s!features=\s!default]
+        \definefontsynonym [\s!SerifCaps]        [LMRoman-CapsRegular] [\s!features=\s!default]
+        \definefontsynonym [SerifCapsSlanted]    [LMRoman-CapsOblique] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [modern,latin-modern-designsize,latin-modern] [\s!name]
+        \loadfontgoodies[lm]
+        \definefontsynonym [\s!Sans]            [LMSans-Regular]     [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]        [LMSans-Bold]        [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]      [LMSans-Oblique]     [\s!features=\s!default]
+        \definefontsynonym [\s!SansSlanted]     [LMSans-Oblique]     [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic]  [LMSans-BoldOblique] [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldSlanted] [LMSans-BoldOblique] [\s!features=\s!default]
+        \definefontsynonym [\s!SansCaps]        [LMSans-Regular]     [\s!features=\s!default]
+        \definefontsynonym [SansCapsSlanted]    [LMSans-Oblique]     [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [modern,latin-modern-designsize,latin-modern] [\s!name]
+        \loadfontgoodies[lm]
+        \definefontsynonym [\s!Mono]            [LMTypewriter-Regular]      [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBold]        [LMTypewriter-Dark]         [\s!features=\s!none]
+        \definefontsynonym [\s!MonoItalic]      [LMTypewriter-Italic]       [\s!features=\s!none]
+        \definefontsynonym [\s!MonoSlanted]     [LMTypewriter-Oblique]      [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBoldItalic]  [LMTypewriter-DarkOblique]  [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBoldSlanted] [LMTypewriter-DarkOblique]  [\s!features=\s!none]
+        \definefontsynonym [\s!MonoCaps]        [LMTypewriter-CapsRegular]  [\s!features=\s!none]
+        \definefontsynonym [MonoCapsSlanted]    [LMTypewriter-CapsOblique]  [\s!features=\s!none]
+        \definefontsynonym [MonoVariable]       [LMTypewriterVarWd-Regular] [\s!features=\s!none]
+    \stoptypescript
+
+    \starttypescript [\s!math] [modern,latin-modern-designsize,latin-modern] [\s!name]
+        \loadfontgoodies[lm]
+        \definefontsynonym [\s!MathRoman]     [LMMathRoman-Regular]
+        \definefontsynonym [\s!MathRomanBold] [LMMathRoman-Bold]
+    \stoptypescript
+
+    \starttypescript [\s!math] [latin-modern-designsize] [\s!name]
+        \loadfontgoodies[lm-math]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [modern-variable,latin-modern-variable-designsize,latin-modern-variable] [\s!name]
+        \loadfontgoodies[lm]
+        \definefontsynonym [\s!Serif]            [LMTypewriterVarWd-Regular]     [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBold]        [LMTypewriterVarWd-Oblique]     [\s!features=\s!default]
+        \definefontsynonym [\s!SerifItalic]      [LMTypewriterVarWd-Oblique]     [\s!features=\s!default]
+        \definefontsynonym [\s!SerifSlanted]     [LMTypewriterVarWd-Dark]        [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldItalic]  [LMTypewriterVarWd-DarkOblique] [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldSlanted] [LMTypewriterVarWd-DarkOblique] [\s!features=\s!default]
+        \definefontsynonym [\s!SerifCaps]        [LMTypewriterVarWd-Regular]     [\s!features=\s!default]
+        \definefontsynonym [SerifCapsSlanted]    [LMTypewriterVarWd-Oblique]     [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [modern-condensed,latin-modern-condensed-designsize,latin-modern-condensed,modern-light-condensed,latin-modern-light-condensed] [\s!name]
+        \loadfontgoodies[lm]
+        \definefontsynonym [\s!Mono]            [LMTypewriter-LightCondensed]        [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBold]        [LMTypewriter-LightCondensed]        [\s!features=\s!none]
+        \definefontsynonym [\s!MonoItalic]      [LMTypewriter-LightCondensedOblique] [\s!features=\s!none]
+        \definefontsynonym [\s!MonoSlanted]     [LMTypewriter-LightCondensedOblique] [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBoldItalic]  [LMTypewriter-LightCondensed]        [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBoldSlanted] [LMTypewriter-LightCondensed]        [\s!features=\s!none]
+        \definefontsynonym [\s!MonoCaps]        [LMTypewriter-LightCondensed]        [\s!features=\s!none]
+        \definefontsynonym [MonoCapsSlanted]    [LMTypewriter-LightCondensed]        [\s!features=\s!none]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [modern-light,latin-modern-light-designsize,latin-modern-light] [\s!name]
+        \loadfontgoodies[lm]
+        \definefontsynonym [\s!Mono]            [LMTypewriter-Light]        [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBold]        [LMTypewriter-Light]        [\s!features=\s!none]
+        \definefontsynonym [\s!MonoItalic]      [LMTypewriter-LightOblique] [\s!features=\s!none]
+        \definefontsynonym [\s!MonoSlanted]     [LMTypewriter-LightOblique] [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBoldItalic]  [LMTypewriter-Light]        [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBoldSlanted] [LMTypewriter-Light]        [\s!features=\s!none]
+        \definefontsynonym [\s!MonoCaps]        [LMTypewriter-Light]        [\s!features=\s!none]
+        \definefontsynonym [MonoCapsSlanted]    [LMTypewriter-Light]        [\s!features=\s!none]
+    \stoptypescript
+
+    % why not also [name]
+
+    \starttypescript [\s!serif] [modern,latin-modern]
+        \loadfontgoodies[lm]
+        \definefontsynonym [LMRoman-Regular]        [\s!file:lmroman10-regular]      [\s!features=\s!default]
+        \definefontsynonym [LMRoman-Bold]           [\s!file:lmroman10-bold]         [\s!features=\s!default]
+        \definefontsynonym [LMRoman-Demi]           [\s!file:lmromandemi10-regular]  [\s!features=\s!default]
+        \definefontsynonym [LMRoman-Italic]         [\s!file:lmroman10-italic]       [\s!features=\s!default]
+        \definefontsynonym [LMRoman-Oblique]        [\s!file:lmromanslant10-regular] [\s!features=\s!default]
+        \definefontsynonym [LMRoman-BoldItalic]     [\s!file:lmroman10-bolditalic]   [\s!features=\s!default]
+        \definefontsynonym [LMRoman-BoldOblique]    [\s!file:lmromanslant10-bold]    [\s!features=\s!default]
+        \definefontsynonym [LMRoman-DemiOblique]    [\s!file:lmromandemi10-oblique]  [\s!features=\s!default]
+        \definefontsynonym [LMRoman-CapsRegular]    [\s!file:lmroman10-CapsRegular]  [\s!features=\s!default]
+        \definefontsynonym [LMRoman-CapsOblique]    [\s!file:lmroman10-CapsOblique]  [\s!features=\s!default]
+        \definefontsynonym [LMRoman-CapsRegular]    [\s!file:lmromancaps10-regular]  [\s!features=\s!default]
+        \definefontsynonym [LMRoman-CapsOblique]    [\s!file:lmromancaps10-oblique]  [\s!features=\s!default]
+        \definefontsynonym [LMRoman-Dunhill]        [\s!file:lmromandunh10-regular]  [\s!features=\s!default]
+        \definefontsynonym [LMRoman-DunhillOblique] [\s!file:lmromandunh10-oblique]  [\s!features=\s!default]
+        \definefontsynonym [LMRoman-Unslanted]      [\s!file:lmromanunsl10-regular]  [\s!features=\s!default]
+
+    \stoptypescript
+
+    \starttypescript [\s!sans] [modern,latin-modern]
+        \loadfontgoodies[lm]
+        \definefontsynonym [LMSans-Regular]               [\s!file:lmsans10-regular]           [\s!features=\s!default]
+        \definefontsynonym [LMSans-Bold]                  [\s!file:lmsans10-bold]              [\s!features=\s!default]
+        \definefontsynonym [LMSans-Oblique]               [\s!file:lmsans10-oblique]           [\s!features=\s!default]
+        \definefontsynonym [LMSans-BoldOblique]           [\s!file:lmsans10-boldoblique]       [\s!features=\s!default]
+        \definefontsynonym [LMSans-DemiCondensed]         [\s!file:lmsansdemicond10-regular]   [\s!features=\s!default]
+        \definefontsynonym [LMSans-DemiCondensedOblique]  [\s!file:lmsansdemicond10-oblique]   [\s!features=\s!default]
+        \definefontsynonym [LMSansQuotation-Regular]      [\s!file:lmsansquot8-regular]        [\s!features=\s!default]
+        \definefontsynonym [LMSansQuotation-Bold]         [\s!file:lmsansquot8-bold]           [\s!features=\s!default]
+        \definefontsynonym [LMSansQuotation-Oblique]      [\s!file:lmsansquot8-oblique]        [\s!features=\s!default]
+        \definefontsynonym [LMSansQuotation-BoldOblique]  [\s!file:lmsansquot8-boldoblique]    [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [modern,latin-modern,modern-variable,latin-modern-variable,modern-condensed,latin-modern-condensed]
+        \definefontsynonym [LMTypewriter-Regular]               [\s!file:lmmono10-regular]           [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter-Italic]                [\s!file:lmmono10-italic]            [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter-Oblique]               [\s!file:lmmonoslant10-regular]      [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter-CapsRegular]           [\s!file:lmmonocaps10-regular]       [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter-CapsOblique]           [\s!file:lmmonocaps10-oblique]       [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter-Light]                 [\s!file:lmmonolt10-regular]         [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter-LightOblique]          [\s!file:lmmonolt10-oblique]         [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter-LightCondensed]        [\s!file:lmmonoltcond10-regular]     [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter-LightCondensedOblique] [\s!file:lmmonoltcond10-oblique]     [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter-Dark]                  [\s!file:lmmonolt10-bold]            [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter-DarkOblique]           [\s!file:lmmonolt10-boldoblique]     [\s!features=\s!none]
+        \definefontsynonym [LMTypewriterVarWd-Regular]          [\s!file:lmmonoproplt10-regular]     [\s!features=\s!default]
+        \definefontsynonym [LMTypewriterVarWd-Oblique]          [\s!file:lmmonoproplt10-oblique]     [\s!features=\s!default]
+        \definefontsynonym [LMTypewriterVarWd-Light]            [\s!file:lmmonoprop10-regular]       [\s!features=\s!default]
+        \definefontsynonym [LMTypewriterVarWd-LightOblique]     [\s!file:lmmonoprop10-oblique]       [\s!features=\s!default]
+        \definefontsynonym [LMTypewriterVarWd-Dark]             [\s!file:lmmonoproplt10-bold]        [\s!features=\s!default]
+        \definefontsynonym [LMTypewriterVarWd-DarkOblique]      [\s!file:lmmonoproplt10-boldoblique] [\s!features=\s!default]
+    \stoptypescript
+
+%     \starttypescript [\s!math] [modern,latin-modern]
+%         \loadfontgoodies[lm]
+%         \definefontsynonym [LMMathRoman-Regular] [\v!file:latinmodern-math-regular.otf] [\s!features=\s!math\mathsizesuffix,\s!goodies=lm]
+%         \definefontsynonym [LMMathRoman-Bold]    [\v!file:latinmodern-math-regular.otf] [\s!features=\s!math\mathsizesuffix,\s!goodies=lm]
+%     \stoptypescript
+
+    \starttypescript [\s!math] [modern,latin-modern]
+        \loadfontgoodies[lm]
+        \definefontsynonym [LMMathRoman-Regular] [\v!file:latinmodern-math-regular.otf] [\s!features={\s!math\mathsizesuffix,lm-math},\s!goodies=lm]
+        \definefontsynonym [LMMathRoman-Bold]    [\v!file:latinmodern-math-regular.otf] [\s!features={\s!math\mathsizesuffix,lm-math},\s!goodies=lm]
+    \stoptypescript
+
+    \starttypescript [modern-designsize-virtual]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [latin-modern-designsize] [\s!default] [\s!designsize=\s!auto]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [latin-modern-designsize] [\s!default] [\s!designsize=\s!auto]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [latin-modern-designsize] [\s!default] [\s!designsize=\s!auto]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [latin-modern-designsize] [\s!default] [\s!designsize=\s!auto]
+        \quittypescriptscanning
+    \stoptypescript
+
+    \starttypescript [modern-designsize]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [latin-modern-designsize] [\s!default] [\s!designsize=\s!auto]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [latin-modern-designsize] [\s!default] [\s!designsize=\s!auto]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [latin-modern-designsize] [\s!default] [\s!designsize=\s!auto]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [modern]                  [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+    \starttypescript [modern,modern-base]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [modern] [\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [modern] [\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern] [\s!default]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [modern] [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+    \starttypescript [modernvariable,modern-variable]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [modern-variable] [\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern-variable] [\s!default]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [modern]          [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+    \starttypescript [modernvariablelight,modern-variable-light]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [modern-variable-light] [\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern-variable-light] [\s!default]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [modern]                [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+    \starttypescript [modern-mono,modern-base-mono]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [modern]       [\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [modern]       [\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern-light] [\s!default]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [modern]       [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+\stoptypescriptcollection
+
+%D It doesn't hurt to have these, at least for the moment (can go to type-imp-symbol)
+
+\definefontsynonym [ZapfDingbats] [\s!file:uzdr] [\s!features=dingbats]% [\s!goodies=dingbats]
+
+\endinput
diff --git a/tex/context/fonts/mkiv/type-imp-lato.mkiv b/tex/context/fonts/mkiv/type-imp-lato.mkiv
new file mode 100644
index 000000000..8fb8647fc
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-lato.mkiv
@@ -0,0 +1,56 @@
+%D \module
+%D   [       file=type-imp-lato,
+%D        version=2014.05.02,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Lato fonts,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% hai : hair    / lta : italic
+% lig : light   / lta : italic
+% reg : regular / lta : italic
+% bol : bold    / lta : italic
+% bla : black   / lta : italic
+
+\loadtypescriptfile[dejavu]
+\loadtypescriptfile[xits]
+
+\starttypescriptcollection[lato]
+
+    \starttypescript [\s!sans] [lato] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [\s!file:lato-reg]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]       [\s!file:lato-bol]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]     [\s!file:lato-reglta] [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic] [\s!file:lato-bollta] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [lato-light] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [\s!file:lato-lig]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]       [\s!file:lato-reg]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]     [\s!file:lato-liglta] [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic] [\s!file:lato-reglta] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [lato-dark] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [\s!file:lato-bol]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]       [\s!file:lato-bla]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]     [\s!file:lato-bollta] [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic] [\s!file:lato-blalta] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript[lato,lato-light,lato-dark]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [\typescriptone] [\s!default]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [dejavu]         [\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [dejavu]         [\s!default]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [xits]           [\s!default] [\s!rscale=1.2]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-liberation.mkiv b/tex/context/fonts/mkiv/type-imp-liberation.mkiv
new file mode 100644
index 000000000..cc2c01b7b
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-liberation.mkiv
@@ -0,0 +1,47 @@
+%D \module
+%D   [       file=type-imp-liberation,
+%D        version=2010.06.21,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Liberation fonts,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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[liberation]
+
+    \starttypescript [\s!serif] [liberation] [\s!name]
+        \setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]           [\s!file:liberationserif-regular]    [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBold]       [\s!file:liberationserif-bold]       [\s!features=\s!default]
+        \definefontsynonym [\s!SerifItalic]     [\s!file:liberationserif-italic]     [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldItalic] [\s!file:liberationserif-bolditalic] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [liberation] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [\s!file:liberationsans-regular]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]       [\s!file:liberationsans-bold]       [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]     [\s!file:liberationsans-italic]     [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic] [\s!file:liberationsans-bolditalic] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [liberation] [\s!name]
+        \setups[\s!font:\s!fallback:\s!mono]
+        \definefontsynonym [\s!Mono]           [\s!file:liberationmono-regular]    [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBold]       [\s!file:liberationmono-bold]       [\s!features=\s!none]
+        \definefontsynonym [\s!MonoItalic]     [\s!file:liberationmono-italic]     [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBoldItalic] [\s!file:liberationmono-bolditalic] [\s!features=\s!none]
+    \stoptypescript
+
+    \starttypescript[liberation]
+        \definetypeface [liberation] [\s!rm] [\s!serif] [liberation] [\s!default]
+        \definetypeface [liberation] [\s!ss] [\s!sans]  [liberation] [\s!default] [\s!rscale=0.870]
+        \definetypeface [liberation] [\s!tt] [\s!mono]  [liberation] [\s!default] [\s!rscale=0.870]
+        \definetypeface [liberation] [\s!mm] [\s!math]  [times]      [\s!default] [\s!rscale=1.040]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-libertine.mkiv b/tex/context/fonts/mkiv/type-imp-libertine.mkiv
new file mode 100644
index 000000000..4620995b9
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-libertine.mkiv
@@ -0,0 +1,66 @@
+%D \module
+%D   [       file=type-imp-libertine,
+%D        version=2010.06.21,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Libertine fonts,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% Linux Libertine O Italic
+
+\starttypescriptcollection[libertine]
+
+    \starttypescript [\s!serif] [libertine]
+        \definefontsynonym [Libertine-Regular]     [\s!file:linlibertiner]
+        \definefontsynonym [Libertine-Italic]      [\s!file:linlibertineri] % z
+        \definefontsynonym [Libertine-Slanted]     [\s!file:linlibertineri]
+        \definefontsynonym [Libertine-Bold]        [\s!file:linlibertinerb]
+        \definefontsynonym [Libertine-BoldItalic]  [\s!file:linlibertinerbi] % zi
+        \definefontsynonym [Libertine-BoldSlanted] [\s!file:linlibertinerbi]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [libertine] [\s!name]
+        \setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]            [Libertine-Regular]     [\s!features=\s!default]
+        \definefontsynonym [\s!SerifItalic]      [Libertine-Italic]      [\s!features=\s!default]
+        \definefontsynonym [\s!SerifSlanted]     [Libertine-Slanted]     [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBold]        [Libertine-Bold]        [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldItalic]  [Libertine-BoldItalic]  [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldSlanted] [Libertine-BoldSlanted] [\s!features=\s!default]
+        \definefontsynonym [SerifCaps]           [Libertine-Regular]     [\s!features=\s!smallcaps]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [biolinum]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [Biolinum-Regular]     [\s!file:linbiolinumr]
+        \definefontsynonym [Biolinum-Italic]      [\s!file:linbiolinumri]
+        \definefontsynonym [Biolinum-Slanted]     [\s!file:linbiolinumri]
+        \definefontsynonym [Biolinum-Bold]        [\s!file:linbiolinumrb]
+        \definefontsynonym [Biolinum-BoldItalic]  [\s!file:linbiolinumrbo]
+        \definefontsynonym [Biolinum-BoldSlanted] [\s!file:linbiolinumrbo]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [biolinum] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [Biolinum-Regular]     [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]       [Biolinum-Bold]        [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]     [Biolinum-Italic]      [\s!features=\s!default]
+        \definefontsynonym [\s!SansSlanted]    [Biolinum-Slanted]     [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic] [Biolinum-BoldSlanted] [\s!features=\s!default]
+        \definefontsynonym [SansCaps]          [Biolinum-Regular]     [\s!features=\s!smallcaps]
+    \stoptypescript
+
+    \starttypescript [libertine]
+        \definetypeface [libertine] [\s!rm] [\s!serif] [libertine] [\s!default]
+        \definetypeface [libertine] [\s!ss] [\s!sans]  [biolinum]  [\s!default]
+        \definetypeface [libertine] [\s!tt] [\s!mono]  [default]   [\s!default]
+        %definetypeface [libertine] [\s!mm] [\s!math]  [times]     [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-lmnames.mkiv b/tex/context/fonts/mkiv/type-imp-lmnames.mkiv
new file mode 100644
index 000000000..11ba93c34
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-lmnames.mkiv
@@ -0,0 +1,129 @@
+%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 ADE \& \CONTEXT\ Development Team}]
+%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[latinmodern-names]
+
+    \starttypescript [\s!serif] [modern,latin-modern-designsize,latin-modern]
+
+        \definefontsynonym [LMRoman5-Regular]         [\s!file:lmroman5-regular]       [\s!features=\s!default]
+        \definefontsynonym [LMRoman6-Regular]         [\s!file:lmroman6-regular]       [\s!features=\s!default]
+        \definefontsynonym [LMRoman7-Regular]         [\s!file:lmroman7-regular]       [\s!features=\s!default]
+        \definefontsynonym [LMRoman8-Regular]         [\s!file:lmroman8-regular]       [\s!features=\s!default]
+        \definefontsynonym [LMRoman9-Regular]         [\s!file:lmroman9-regular]       [\s!features=\s!default]
+        \definefontsynonym [LMRoman10-Regular]        [\s!file:lmroman10-regular]      [\s!features=\s!default]
+        \definefontsynonym [LMRoman12-Regular]        [\s!file:lmroman12-regular]      [\s!features=\s!default]
+        \definefontsynonym [LMRoman17-Regular]        [\s!file:lmroman17-regular]      [\s!features=\s!default]
+        \definefontsynonym [LMRoman5-Bold]            [\s!file:lmroman5-bold]          [\s!features=\s!default]
+        \definefontsynonym [LMRoman6-Bold]            [\s!file:lmroman6-bold]          [\s!features=\s!default]
+        \definefontsynonym [LMRoman7-Bold]            [\s!file:lmroman7-bold]          [\s!features=\s!default]
+        \definefontsynonym [LMRoman8-Bold]            [\s!file:lmroman8-bold]          [\s!features=\s!default]
+        \definefontsynonym [LMRoman9-Bold]            [\s!file:lmroman9-bold]          [\s!features=\s!default]
+        \definefontsynonym [LMRoman10-Bold]           [\s!file:lmroman10-bold]         [\s!features=\s!default]
+        \definefontsynonym [LMRoman12-Bold]           [\s!file:lmroman12-bold]         [\s!features=\s!default]
+        \definefontsynonym [LMRoman7-Italic]          [\s!file:lmroman7-italic]        [\s!features=\s!default]
+        \definefontsynonym [LMRoman8-Italic]          [\s!file:lmroman8-italic]        [\s!features=\s!default]
+        \definefontsynonym [LMRoman9-Italic]          [\s!file:lmroman9-italic]        [\s!features=\s!default]
+        \definefontsynonym [LMRoman10-Italic]         [\s!file:lmroman10-italic]       [\s!features=\s!default]
+        \definefontsynonym [LMRoman12-Italic]         [\s!file:lmroman12-italic]       [\s!features=\s!default]
+        \definefontsynonym [LMRoman10-BoldItalic]     [\s!file:lmroman10-bolditalic]   [\s!features=\s!default]
+        \definefontsynonym [LMRoman8-Oblique]         [\s!file:lmromanslant8-regular]  [\s!features=\s!default]
+        \definefontsynonym [LMRoman9-Oblique]         [\s!file:lmromanslant9-regular]  [\s!features=\s!default]
+        \definefontsynonym [LMRoman10-Oblique]        [\s!file:lmromanslant10-regular] [\s!features=\s!default]
+        \definefontsynonym [LMRoman12-Oblique]        [\s!file:lmromanslant12-regular] [\s!features=\s!default]
+        \definefontsynonym [LMRoman17-Oblique]        [\s!file:lmromanslant17-regular] [\s!features=\s!default]
+        \definefontsynonym [LMRoman10-BoldOblique]    [\s!file:lmromanslant10-bold]    [\s!features=\s!default]
+        \definefontsynonym [LMRoman10-Demi]           [\s!file:lmromandemi10-regular]  [\s!features=\s!default]
+        \definefontsynonym [LMRoman10-DemiOblique]    [\s!file:lmromandemi10-oblique]  [\s!features=\s!default]
+        \definefontsynonym [LMRoman10-CapsRegular]    [\s!file:lmromancaps10-regular]  [\s!features=\s!default]
+        \definefontsynonym [LMRoman10-CapsOblique]    [\s!file:lmromancaps10-oblique]  [\s!features=\s!default]
+        \definefontsynonym [LMRoman10-Dunhill]        [\s!file:lmromandunh10-regular]  [\s!features=\s!default]
+        \definefontsynonym [LMRoman10-DunhillOblique] [\s!file:lmromandunh10-oblique]  [\s!features=\s!default]
+        \definefontsynonym [LMRoman10-Unslanted]      [\s!file:lmromanunsl10-regular]  [\s!features=\s!default]
+
+    \stoptypescript
+
+    \starttypescript [\s!sans] [modern,latin-modern-designsize,latin-modern]
+
+        \definefontsynonym [LMSans8-Regular]               [\s!file:lmsans8-regular]          [\s!features=\s!default]
+        \definefontsynonym [LMSans9-Regular]               [\s!file:lmsans9-regular]          [\s!features=\s!default]
+        \definefontsynonym [LMSans10-Regular]              [\s!file:lmsans10-regular]         [\s!features=\s!default]
+        \definefontsynonym [LMSans12-Regular]              [\s!file:lmsans12-regular]         [\s!features=\s!default]
+        \definefontsynonym [LMSans17-Regular]              [\s!file:lmsans17-regular]         [\s!features=\s!default]
+        \definefontsynonym [LMSans10-Bold]                 [\s!file:lmsans10-bold]            [\s!features=\s!default]
+        \definefontsynonym [LMSans8-Oblique]               [\s!file:lmsans8-oblique]          [\s!features=\s!default]
+        \definefontsynonym [LMSans9-Oblique]               [\s!file:lmsans9-oblique]          [\s!features=\s!default]
+        \definefontsynonym [LMSans10-Oblique]              [\s!file:lmsans10-oblique]         [\s!features=\s!default]
+        \definefontsynonym [LMSans12-Oblique]              [\s!file:lmsans12-oblique]         [\s!features=\s!default]
+        \definefontsynonym [LMSans17-Oblique]              [\s!file:lmsans17-oblique]         [\s!features=\s!default]
+        \definefontsynonym [LMSans10-BoldOblique]          [\s!file:lmsans10-boldoblique]     [\s!features=\s!default]
+        \definefontsynonym [LMSans10-DemiCondensed]        [\s!file:lmsansdemicond10-regular] [\s!features=\s!default]
+        \definefontsynonym [LMSans10-DemiCondensedOblique] [\s!file:lmsansdemicond10-oblique] [\s!features=\s!default]
+        \definefontsynonym [LMSansQuotation8-Regular]      [\s!file:lmsansquot8-regular]      [\s!features=\s!default]
+        \definefontsynonym [LMSansQuotation8-Bold]         [\s!file:lmsansquot8-bold]         [\s!features=\s!default]
+        \definefontsynonym [LMSansQuotation8-Oblique]      [\s!file:lmsansquot8-oblique]      [\s!features=\s!default]
+        \definefontsynonym [LMSansQuotation8-BoldOblique]  [\s!file:lmsansquot8-boldoblique]  [\s!features=\s!default]
+
+    \stoptypescript
+
+    \starttypescript [\s!mono] [modern,latin-modern-designsize,latin-modern,modern-variable,modern-condensed,latin-modern-variable,latin-modern-condensed]
+
+        \definefontsynonym [LMTypewriter8-Regular]                [\s!file:lmmono8-regular]            [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter9-Regular]                [\s!file:lmmono9-regular]            [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter10-Regular]               [\s!file:lmmono10-regular]           [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter12-Regular]               [\s!file:lmmono12-regular]           [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter10-Italic]                [\s!file:lmmono10-italic]            [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter10-Oblique]               [\s!file:lmmonoslant10-regular]      [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter10-CapsRegular]           [\s!file:lmmonocaps10-regular]       [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter10-CapsOblique]           [\s!file:lmmonocaps10-oblique]       [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter10-Light]                 [\s!file:lmmonolt10-regular]         [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter10-LightOblique]          [\s!file:lmmonolt10-oblique]         [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter10-LightCondensed]        [\s!file:lmmonoltcond10-regular]     [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter10-LightCondensedOblique] [\s!file:lmmonoltcond10-oblique]     [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter10-Dark]                  [\s!file:lmmonolt10-bold]            [\s!features=\s!none]
+        \definefontsynonym [LMTypewriter10-DarkOblique]           [\s!file:lmmonolt10-boldoblique]     [\s!features=\s!none]
+        \definefontsynonym [LMTypewriterVarWd10-Regular]          [\s!file:lmmonoproplt10-regular]     [\s!features=\s!default]
+        \definefontsynonym [LMTypewriterVarWd10-Oblique]          [\s!file:lmmonoproplt10-oblique]     [\s!features=\s!default]
+        \definefontsynonym [LMTypewriterVarWd10-Light]            [\s!file:lmmonoprop10-regular]       [\s!features=\s!default]
+        \definefontsynonym [LMTypewriterVarWd10-LightOblique]     [\s!file:lmmonoprop10-oblique]       [\s!features=\s!default]
+        \definefontsynonym [LMTypewriterVarWd10-Dark]             [\s!file:lmmonoproplt10-bold]        [\s!features=\s!default]
+        \definefontsynonym [LMTypewriterVarWd10-DarkOblique]      [\s!file:lmmonoproplt10-boldoblique] [\s!features=\s!default]
+
+    \stoptypescript
+
+    \starttypescript [\s!math] [modern,latin-modern]
+
+        \definefontsynonym [LMMathRoman5-Regular]  [LMMath5-Regular@lmroman5-math]
+        \definefontsynonym [LMMathRoman6-Regular]  [LMMath6-Regular@lmroman6-math]
+        \definefontsynonym [LMMathRoman7-Regular]  [LMMath7-Regular@lmroman7-math]
+        \definefontsynonym [LMMathRoman8-Regular]  [LMMath8-Regular@lmroman8-math]
+        \definefontsynonym [LMMathRoman9-Regular]  [LMMath9-Regular@lmroman9-math]
+        \definefontsynonym [LMMathRoman10-Regular] [LMMath10-Regular@lmroman10-math]
+        \definefontsynonym [LMMathRoman12-Regular] [LMMath12-Regular@lmroman12-math]
+        \definefontsynonym [LMMathRoman17-Regular] [LMMath17-Regular@lmroman17-math]
+
+        % we no longer care to provide pseudo full bold
+
+        \definefontsynonym [LMMathRoman5-Bold]  [LMMathRoman5-Regular]
+        \definefontsynonym [LMMathRoman6-Bold]  [LMMathRoman6-Regular]
+        \definefontsynonym [LMMathRoman7-Bold]  [LMMathRoman7-Regular]
+        \definefontsynonym [LMMathRoman8-Bold]  [LMMathRoman8-Regular]
+        \definefontsynonym [LMMathRoman9-Bold]  [LMMathRoman9-Regular]
+        \definefontsynonym [LMMathRoman10-Bold] [LMMathRoman10-Regular]
+        \definefontsynonym [LMMathRoman12-Bold] [LMMathRoman12-Regular]
+        \definefontsynonym [LMMathRoman17-Bold] [LMMathRoman17-Regular]
+
+        \loadfontgoodies[lm-math]
+
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-lucida-opentype.mkiv b/tex/context/fonts/mkiv/type-imp-lucida-opentype.mkiv
new file mode 100644
index 000000000..f39ed6e1f
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-lucida-opentype.mkiv
@@ -0,0 +1,82 @@
+%D \module
+%D   [       file=type-lucida-opentype,
+%D        version=2011.05.18,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Lucida Nova Opentype,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% NOTA BENE: class features and goodies get expanded!
+
+\starttypescriptcollection[lucida-opentype]
+
+    \starttypescript [lucidaot,lucidadk]
+        \loadfontgoodies[lucida-opentype-math]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif]       [\typescriptone] [\s!default] [\s!features=\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]        [\typescriptone] [\s!default] [\s!features=\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]        [\typescriptone] [\s!default] [\s!features=\s!none]
+        \definetypeface [\typescriptone] [\s!hw] [\s!handwriting] [\typescriptone] [\s!default] [\s!features=\s!default]
+        \definetypeface [\typescriptone] [\s!cg] [\s!calligraphy] [\typescriptone] [\s!default] [\s!features=\s!default]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]        [\typescriptone] [\s!default]
+        % for the moment here:
+        \setupmathrendering[\typescriptone][\s!it=\s!italic]
+        \quittypescriptscanning
+    \stoptypescript
+
+    \starttypescript [\s!serif] [lucidaot,lucidadk]
+        \definefontsynonym [\s!Serif]            [\s!file:LucidaBrightOT.otf]
+        \definefontsynonym [\s!SerifBold]        [\s!file:LucidaBrightOT-Demi.otf]
+        \definefontsynonym [\s!SerifItalic]      [\s!file:LucidaBrightOT-Italic.otf]
+        \definefontsynonym [\s!SerifBoldItalic]  [\s!file:LucidaBrightOT-DemiItalic.otf]
+        \definefontsynonym [\s!SerifSlanted]     [\s!SerifItalic]
+        \definefontsynonym [\s!SerifBoldSlanted] [\s!SerifBoldItalic]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [lucidaot,lucidadk]
+        \definefontsynonym [\s!Sans]            [\s!file:LucidaSansOT.otf]
+        \definefontsynonym [\s!SansBold]        [\s!file:LucidaSansOT-Demi.otf]
+        \definefontsynonym [\s!SansItalic]      [\s!file:LucidaSansOT-Italic.otf]
+        \definefontsynonym [\s!SansBoldItalic]  [\s!file:LucidaSansOT-DemiItalic.otf]
+        \definefontsynonym [\s!SansSlanted]     [\s!SansItalic]
+        \definefontsynonym [\s!SansBoldSlanted] [\s!SansBoldItalic]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [lucidaot]
+        \definefontsynonym [\s!Mono]            [\s!file:LucidaSansTypewriterOT.otf]
+        \definefontsynonym [\s!MonoBold]        [\s!file:LucidaSansTypewriterOT-Bold.otf]
+        \definefontsynonym [\s!MonoItalic]      [\s!file:LucidaSansTypewriterOT-Oblique.otf]
+        \definefontsynonym [\s!MonoBoldItalic]  [\s!file:LucidaSansTypewriterOT-BoldOblique.otf]
+        \definefontsynonym [\s!MonoSlanted]     [\s!MonoItalic]
+        \definefontsynonym [\s!MonoBoldSlanted] [\s!MonoBoldItalic]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [lucidadk]
+        \definefontsynonym [\s!Mono]            [\s!file:LucidaGrandeMonoDK.otf]
+        \definefontsynonym [\s!MonoBold]        [\s!file:LucidaGrandeMonoDK-Bold.otf]
+        \definefontsynonym [\s!MonoItalic]      [\s!file:LucidaGrandeMonoDK-Oblique.otf]
+        \definefontsynonym [\s!MonoBoldItalic]  [\s!file:LucidaGrandeMonoDK-BoldOblique.otf]
+        \definefontsynonym [\s!MonoSlanted]     [\s!MonoItalic]
+        \definefontsynonym [\s!MonoBoldSlanted] [\s!MonoBoldItalic]
+    \stoptypescript
+
+    \starttypescript [\s!math] [lucidaot,lucidadk]
+        \definefontsynonym [\s!MathRoman]     [\s!file:LucidaBrightMathOT.otf]      [\s!features=\s!math\mathsizesuffix,\s!goodies=lucida-opentype-math]
+        \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT-Demi.otf] [\s!features=\s!math\mathsizesuffix,\s!goodies=lucida-opentype-math]
+    \stoptypescript
+
+    \starttypescript [\s!handwriting] [lucidaot,lucidadk]
+        \definefontsynonym [\s!Handwriting] [\s!file:LucidaHandwritingOT.otf]
+    \stoptypescript
+
+    \starttypescript [\s!calligraphy] [lucidaot,lucidadk]
+        \definefontsynonym [\s!Calligraphy] [\s!file:LucidaCalligraphyOT.otf]
+    \stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/tex/context/fonts/mkiv/type-imp-lucida-typeone.mkiv b/tex/context/fonts/mkiv/type-imp-lucida-typeone.mkiv
new file mode 100644
index 000000000..5f28b9eed
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-lucida-typeone.mkiv
@@ -0,0 +1,134 @@
+%D \module
+%D   [       file=type-imp-lucida-typeone,
+%D        version=2010.06.21,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Lucida,
+%D         author=Mojca Miklavec \& Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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[lucida-typeone]
+
+    \starttypescript [\s!serif] [lucida]
+        \definefontsynonym [LucidaBright]               [\s!name:LucidaBright]
+        \definefontsynonym [LucidaBright-Demi]          [\s!name:LucidaBright-Demi]
+        \definefontsynonym [LucidaBright-Italic]        [\s!name:LucidaBright-Italic]
+        \definefontsynonym [LucidaBright-DemiItalic]    [\s!name:LucidaBright-DemiItalic]
+        \definefontsynonym [LucidaBright-Oblique]       [\s!name:LucidaBright-Oblique]
+        \definefontsynonym [LucidaBrightSmallcaps]      [\s!name:LucidaBrightSmallcaps]
+        \definefontsynonym [LucidaBrightSmallcaps-Demi] [\s!name:LucidaBrightSmallcaps-Demi]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [lucida]
+        \definefontsynonym [LucidaSans]            [\s!name:LucidaSans]
+        \definefontsynonym [LucidaSans-Demi]       [\s!name:LucidaSans-Demi]
+        \definefontsynonym [LucidaSans-Bold]       [\s!name:LucidaSans-Bold]
+        \definefontsynonym [LucidaSans-Italic]     [\s!name:LucidaSans-Italic]
+        \definefontsynonym [LucidaSans-DemiItalic] [\s!name:LucidaSans-DemiItalic]
+        \definefontsynonym [LucidaSans-BoldItalic] [\s!name:LucidaSans-BoldItalic]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [lucida]
+        \definefontsynonym [LucidaTypewriter]            [\s!name:LucidaTypewriter]
+        \definefontsynonym [LucidaTypewriterBold]        [\s!name:LucidaTypewriterBold]
+        \definefontsynonym [LucidaTypewriterOblique]     [\s!name:LucidaTypewriterOblique]
+        \definefontsynonym [LucidaTypewriterBoldOblique] [\s!name:LucidaTypewriterBoldOblique]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [lucida]
+        \definefontsynonym [LucidaSans-Typewriter]            [\s!name:LucidaSans-Typewriter]
+        \definefontsynonym [LucidaSans-TypewriterBold]        [\s!name:LucidaSans-TypewriterBold]
+        \definefontsynonym [LucidaSans-TypewriterOblique]     [\s!name:LucidaSans-TypewriterOblique]
+        \definefontsynonym [LucidaSans-TypewriterBoldOblique] [\s!name:LucidaSans-TypewriterBoldOblique]
+    \stoptypescript
+
+    \starttypescript [calligraphy] [lucida]
+        \definefontsynonym [LucidaCalligraphy-Italic] [\s!name:LucidaCalligraphy-Italic]
+    \stoptypescript
+
+    \starttypescript [casual] [lucida]
+        \definefontsynonym [LucidaCasual]        [\s!name:LucidaCasual]
+        \definefontsynonym [LucidaCasual-Italic] [\s!name:LucidaCasual-Italic]
+    \stoptypescript
+
+    \starttypescript [handwriting] [lucida]
+        \definefontsynonym [LucidaHandwriting-Italic] [\s!name:LucidaHandwriting-Italic]
+    \stoptypescript
+
+    \starttypescript [fax] [lucida]
+        \definefontsynonym [LucidaFax]            [\s!name:LucidaFax]
+        \definefontsynonym [LucidaFax-Demi]       [\s!name:LucidaFax-Demi]
+        \definefontsynonym [LucidaFax-Italic]     [\s!name:LucidaFax-Italic]
+        \definefontsynonym [LucidaFax-DemiItalic] [\s!name:LucidaFax-DemiItalic]
+    \stoptypescript
+
+    \starttypescript [blackletter] [lucida]
+        \definefontsynonym [LucidaBlackletter] [\s!name:LucidaBlackletter]
+    \stoptypescript
+
+    \starttypescript [\s!math] [lucida]
+        \loadfontgoodies[lucida-typeone-math]
+        \definefontsynonym[\s!MathRoman][lucidamath@lucida-math]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [lucida] [\s!name]
+        \definefontsynonym [\s!Serif]            [LucidaBright]
+        \definefontsynonym [\s!SerifBold]        [LucidaBright-Demi]
+        \definefontsynonym [\s!SerifItalic]      [LucidaBright-Italic]
+        \definefontsynonym [\s!SerifBoldItalic]  [LucidaBright-DemiItalic]
+        \definefontsynonym [\s!SerifSlanted]     [LucidaBright-Oblique]
+        \definefontsynonym [\s!SerifBoldSlanted] [LucidaBright-DemiItalic]
+        \definefontsynonym [SerifCaps]           [LucidaBrightSmallcaps]
+        \definefontsynonym [SerifBoldCaps]       [LucidaBrightSmallcaps-Demi]
+    \stoptypescript
+
+    % Lucida Bright Sans
+
+    \starttypescript [\s!sans] [lucida] [\s!name]
+        \definefontsynonym [\s!Sans]            [LucidaSans]
+        \definefontsynonym [\s!SansBold]        [LucidaSans-Demi]
+        \definefontsynonym [\s!SansItalic]      [LucidaSans-Italic]
+        \definefontsynonym [\s!SansBoldItalic]  [LucidaSans-DemiItalic]
+        \definefontsynonym [\s!SansSlanted]     [LucidaSans-Italic]
+        \definefontsynonym [\s!SansBoldSlanted] [LucidaSans-DemiItalic]
+        \definefontsynonym [SansCaps]           [LucidaSans]
+    \stoptypescript
+
+    % Lucida Bright Sans Typewriter
+
+    \starttypescript [\s!mono] [lucida] [\s!name]
+        \definefontsynonym [\s!Mono]            [LucidaSans-Typewriter]
+        \definefontsynonym [\s!MonoBold]        [LucidaSans-TypewriterBold]
+        \definefontsynonym [\s!MonoItalic]      [LucidaSans-TypewriterOblique]
+        \definefontsynonym [\s!MonoBoldItalic]  [LucidaSans-TypewriterBoldOblique]
+        \definefontsynonym [\s!MonoSlanted]     [LucidaSans-TypewriterOblique]
+        \definefontsynonym [\s!MonoBoldSlanted] [LucidaSans-TypewriterBoldOblique]
+        \definefontsynonym [MonoCaps]           [LucidaSans-Typewriter]
+    \stoptypescript
+
+    %  Lucida Calligraphy
+
+    \starttypescript [calligraphy] [lucida] [\s!name]
+        \definefontsynonym [Calligraphy] [LucidaCalligraphy-Italic]
+    \stoptypescript
+
+    % Lucida Handwriting
+
+    \starttypescript [handwriting] [lucida] [\s!name]
+        \definefontsynonym [Handwriting] [LucidaHandwriting-Italic]
+    \stoptypescript
+
+    \starttypescript [lucida]
+        \definetypeface [lucida] [\s!rm] [\s!serif]       [lucida] [\s!default] [\s!features=\s!default]
+        \definetypeface [lucida] [\s!ss] [\s!sans]        [lucida] [\s!default] [\s!features=\s!default]
+        \definetypeface [lucida] [\s!tt] [\s!mono]        [lucida] [\s!default] [\s!features=\s!none]
+        \definetypeface [lucida] [\s!hw] [\s!handwriting] [lucida] [\s!default] [\s!features=\s!default]
+        \definetypeface [lucida] [\s!cg] [\s!calligraphy] [lucida] [\s!default] [\s!features=\s!default]
+        \definetypeface [lucida] [\s!mm] [\s!math]        [lucida] [\s!default]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-mathdesign.mkiv b/tex/context/fonts/mkiv/type-imp-mathdesign.mkiv
new file mode 100644
index 000000000..00e753e75
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-mathdesign.mkiv
@@ -0,0 +1,133 @@
+%D \module
+%D   [       file=type-imp-mathdesign,
+%D        version=2013.11.03,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Mathdesign,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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 [mathdesign]
+
+    % Bistream Charter
+
+    \starttypescript [\s!serif] [charter]
+        \definefontsynonym [Charter-Regular]     [\s!file:bchr8a.afm]
+        \definefontsynonym [Charter-Italic]      [\s!file:bchri8a.afm]
+        \definefontsynonym [Charter-Bold]        [\s!file:bchb8a.afm]
+        \definefontsynonym [Charter-BoldItalic]  [\s!file:bchbi8a.afm]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [charter] [\s!name]
+		\setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]            [Charter-Regular]
+        \definefontsynonym [\s!SerifItalic]      [Charter-Italic]
+        \definefontsynonym [\s!SerifBold]        [Charter-Bold]
+        \definefontsynonym [\s!SerifBoldItalic]  [Charter-BoldItalic]
+    \stoptypescript
+
+    \starttypescript [\s!math] [mdbch,mathdesignch,charter] [\s!all]
+        \loadfontgoodies[mdbch-math]
+        \definefontsynonym [\s!MathRoman]     [mdbchrm@mdbch-rm]
+        \definefontsynonym [\s!MathRomanBold] [mdbchbf@mdbch-bf]
+    \stoptypescript
+
+    \starttypescript [mathdesignch,charter]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [charter] [\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [modern]  [\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern]  [\s!default]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [charter] [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+    % URW Garamond
+
+    \starttypescript [\s!serif] [garamond]
+        \definefontsynonym [Garamond-Regular]     [\s!file:ugmr8a.afm]
+        \definefontsynonym [Garamond-Italic]      [\s!file:ugmri8a.afm]
+        \definefontsynonym [Garamond-Bold]        [\s!file:bchb8a.afm]
+        \definefontsynonym [Garamond-BoldItalic]  [\s!file:ugmmi8a.afm]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [garamond] [\s!name]
+		\setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]            [Garamond-Regular]
+        \definefontsynonym [\s!SerifItalic]      [Garamond-Italic]
+        \definefontsynonym [\s!SerifBold]        [Garamond-Bold]
+        \definefontsynonym [\s!SerifBoldItalic]  [Garamond-BoldItalic]
+    \stoptypescript
+
+    \starttypescript [\s!math] [mdugm,mathdesigngm,garamond] [\s!all]
+        \loadfontgoodies[mdugm-math]
+        \definefontsynonym [\s!MathRoman]     [mdugmrm@mdugm-rm]
+        \definefontsynonym [\s!MathRomanBold] [mdugmbf@mdugm-bf]
+    \stoptypescript
+
+    \starttypescript [mathdesigngm,garamond]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [garamond] [\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [modern]   [\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern]   [\s!default]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [garamond] [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+    % Adobe Utopia
+
+    \starttypescript [\s!serif] [utopia]
+        \definefontsynonym [Utopia-Regular]     [\s!file:putr8a.afm]
+        \definefontsynonym [Utopia-Italic]      [\s!file:putri8a.afm]
+        \definefontsynonym [Utopia-Bold]        [\s!file:putb8a.afm]
+        \definefontsynonym [Utopia-BoldItalic]  [\s!file:putbi8a.afm]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [utopia] [\s!name]
+		\setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]            [Utopia-Regular]
+        \definefontsynonym [\s!SerifItalic]      [Utopia-Italic]
+        \definefontsynonym [\s!SerifBold]        [Utopia-Bold]
+        \definefontsynonym [\s!SerifBoldItalic]  [Utopia-BoldItalic]
+    \stoptypescript
+
+    \starttypescript [\s!math] [mdput,mathdesignut,utopia] [\s!all]
+        \loadfontgoodies[mdput-math]
+        \definefontsynonym [\s!MathRoman]     [mdputrm@mdput-rm]
+        \definefontsynonym [\s!MathRomanBold] [mdputbf@mdput-bf]
+    \stoptypescript
+
+    \starttypescript [mathdesignut,utopia]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [utopia] [\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [modern] [\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern] [\s!default]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [utopia] [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+    % Charter ITC Std
+
+    \starttypescript [\s!math] [mdici,mathdesignci] [\s!all]
+        \loadfontgoodies[mdici-math]
+        \definefontsynonym [\s!MathRoman]     [mdicirm@mdici-rm]
+        \definefontsynonym [\s!MathRomanBold] [mdicibf@mdici-bf]
+    \stoptypescript
+
+    % Adobe Garamond Pro
+
+    \starttypescript [\s!math] [mdpgd,mathdesigngd] [\s!all]
+        \loadfontgoodies[mdpgd-math]
+        \definefontsynonym [\s!MathRoman]     [mdpgdrm@mdpgd-rm]
+        \definefontsynonym [\s!MathRomanBold] [mdpgdbf@mdpgd-bf]
+    \stoptypescript
+
+    % Adobe Utopia Std
+
+    \starttypescript [\s!math] [mdpus,mathdesignus] [\s!all]
+        \loadfontgoodies[mdpus-math]
+        \definefontsynonym [\s!MathRoman]     [mdpusrm@mdpus-rm]
+        \definefontsynonym [\s!MathRomanBold] [mdpusbf@mdpus-bf]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-mathdigits.mkiv b/tex/context/fonts/mkiv/type-imp-mathdigits.mkiv
new file mode 100644
index 000000000..7a7e6b764
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-mathdigits.mkiv
@@ -0,0 +1,53 @@
+%D \module
+%D   [       file=type-imp-hvmath,
+%D        version=2007.07.30,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Xits,
+%D         author=Khaled Hosny \& Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% \starttypescript [math] [xits] [name]
+%     \definefontsynonym[MathRoman][file:xits-math.otf][features=math\mathsizesuffix,goodies=xits-math,fallbacks=mathdigits]
+% \stoptypescript
+%
+% \usetypescript [mathdigits][dejavu][arabicindic]
+
+% \definefontsynonym [MathRomanDigitsXitsDejavu] [file:xits-math.otf] [features=math\mathsizesuffix,goodies=xits-math,fallbacks=mathdigits]
+%
+% \starttypescript [math] [xits] [name]
+%     \definefontsynonym [MathRoman] [MathRomanDigitsXitsDejavu]
+% \stoptypescript
+%
+% \usetypescript [mathdigits][dejavu][arabicindic]
+
+\starttypescriptcollection[mathdigits]
+
+    \starttypescript [mathdigits] [dejavu] [arabicindic,extendedarabicindic]
+        \resetfontfallback  [mathdigits]
+        \definefontfallback [mathdigits] [dejavusansmono]     [digits\typescriptthree] [check=yes,force=yes,offset=digitsnormal]
+        \definefontfallback [mathdigits] [dejavusansmonobold] [digits\typescriptthree] [check=yes,force=yes,offset=digitsbold]
+    \stoptypescript
+
+    \starttypescript [mathdigits] [xits-dejavu] [arabicindic,extendedarabicindic]
+        \usetypescript [mathdigits] [dejavu] [\typescriptthree]
+        \definefontsynonym[MathRoman][file:xits-math.otf][features=math\mathsizesuffix,goodies=xits-math,fallbacks=mathdigits]
+    \stoptypescript
+
+\stoptypescriptcollection
+
+\continueifinputfile{type-imp-mathdigits.mkiv}
+
+% \usetypescriptfile[mathdigits]
+
+\usetypescript [mathdigits] [xits-dejavu] [arabicindic]
+
+\setupbodyfont[dejavu]
+
+\starttext
+    $3+2=5 \quad \bf 3+2=5$
+\stoptext
diff --git a/tex/context/fonts/mkiv/type-imp-mathtimes.mkiv b/tex/context/fonts/mkiv/type-imp-mathtimes.mkiv
new file mode 100644
index 000000000..212882772
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-mathtimes.mkiv
@@ -0,0 +1,31 @@
+%D \module
+%D   [       file=type-imp-mathtimes,
+%D        version=2007.07.30,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Math Times,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\loadtypescriptfile[texgyre]
+
+\starttypescriptcollection[mathtimes]
+
+    \starttypescript [\s!math] [mathtimes] [\s!all]
+        \loadfontgoodies[mathtimes-math]
+        \definefontsynonym[\s!MathRoman][mathtimes@mathtimes-math]
+    \stoptypescript
+
+    \starttypescript [mathtimes]
+        \definetypeface [mathtimes] [\s!rm] [\s!serif] [times]     [\s!default]
+        \definetypeface [mathtimes] [\s!ss] [\s!sans]  [helvetica] [\s!default] [\s!rscale=0.9]
+        \definetypeface [mathtimes] [\s!tt] [\s!mono]  [modern]    [\s!default] [\s!rscale=1.05]
+        \definetypeface [mathtimes] [\s!mm] [\s!math]  [mathtimes] [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-mscore.mkiv b/tex/context/fonts/mkiv/type-imp-mscore.mkiv
new file mode 100644
index 000000000..971a03de7
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-mscore.mkiv
@@ -0,0 +1,79 @@
+%D \module
+%D   [       file=type-imp-mscore,
+%D        version=2007.07.30,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Microsoft Core Fonts,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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[mscore]
+
+    % .ttf not really needed but we want to force the originals
+
+    \starttypescript [\s!serif] [mscoretimes] [\s!name]
+        \setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]           [\s!file:times.ttf]   [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBold]       [\s!file:timesbd.ttf] [\s!features=\s!default]
+        \definefontsynonym [\s!SerifItalic]     [\s!file:timesi.ttf]  [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldItalic] [\s!file:timesbi.ttf] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [mscorearial] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [\s!file:arial.ttf]   [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]       [\s!file:arialbd.ttf] [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]     [\s!file:ariali.ttf]  [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic] [\s!file:arialbi.ttf] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [mscorearialnarrow] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [\s!file:arialn.ttf]   [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]       [\s!file:arialnb.ttf]  [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]     [\s!file:arialni.ttf]  [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic] [\s!file:arialnbi.ttf] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [mscorecourier] [\s!name]
+        \setups[\s!font:\s!fallback:\s!mono]
+        \definefontsynonym [\s!Mono]           [\s!file:cour.ttf]   [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBold]       [\s!file:courbd.ttf] [\s!features=\s!none]
+        \definefontsynonym [\s!MonoItalic]     [\s!file:couri.ttf]  [\s!features=\s!none]
+        \definefontsynonym [\s!MonoBoldItalic] [\s!file:courbi.ttf] [\s!features=\s!none]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [mscoreverdana] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [\s!file:verdana.ttf]  [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]       [\s!file:verdanab.ttf] [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]     [\s!file:verdanai.ttf] [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic] [\s!file:verdanaz.ttf] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript[mscore]
+        \definetypeface [mscore] [\s!rm] [\s!serif] [mscoretimes]   [\s!default]
+        \definetypeface [mscore] [\s!ss] [\s!sans]  [mscorearial]   [\s!default] [\s!rscale=0.860]
+        \definetypeface [mscore] [\s!tt] [\s!mono]  [mscorecourier] [\s!default] [\s!rscale=1.065]
+        \definetypeface [mscore] [\s!mm] [\s!math]  [times]         [\s!default] [\s!rscale=1.020]
+    \stoptypescript
+
+    \starttypescript[mscorenarrow]
+        \definetypeface [mscorenarrow] [\s!rm] [\s!serif] [mscoretimes]       [\s!default]
+        \definetypeface [mscorenarrow] [\s!ss] [\s!sans]  [mscorearialnarrow] [\s!default] [\s!rscale=0.860]
+        \definetypeface [mscorenarrow] [\s!tt] [\s!mono]  [mscorecourier]     [\s!default] [\s!rscale=1.065]
+        \definetypeface [mscorenarrow] [\s!mm] [\s!math]  [times]             [\s!default] [\s!rscale=1.020]
+    \stoptypescript
+
+  % \starttypescript[mscoress]
+  %     \definetypeface [mscoress] [\s!ss] [\s!sans]  [mscorearial]   [\s!default]
+  %     \definetypeface [mscoress] [\s!rm] [\s!serif] [mscoretimes]   [\s!default] [rscale=1.160]
+  %     \definetypeface [mscoress] [\s!tt] [\s!mono]  [mscorecourier] [\s!default] [rscale=1.240]
+  %     \definetypeface [mscoress] [\s!mm] [\s!math]  [times]         [\s!default] [rscale=1.185]
+  % \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-opendyslexic.mkiv b/tex/context/fonts/mkiv/type-imp-opendyslexic.mkiv
new file mode 100644
index 000000000..770d43c6c
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-opendyslexic.mkiv
@@ -0,0 +1,39 @@
+%D \module
+%D   [       file=type-imp-opendyslexic,
+%D        version=2013.05.02,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Opendyslexic Fonts,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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[opendyslexic]
+
+    \starttypescript [\s!serif] [opendyslexic] [\s!name]
+        \setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]           [\s!file:opendyslexic-regular.otf]    [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBold]       [\s!file:opendyslexic-bold.otf]       [\s!features=\s!default]
+        \definefontsynonym [\s!SerifItalic]     [\s!file:opendyslexic-italic.otf]     [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldItalic] [\s!file:opendyslexic-bolditalic.otf] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [opendyslexic] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [\s!file:opendyslexicalta-regular.otf]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]       [\s!file:opendyslexicalta-bold.otf]       [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]     [\s!file:opendyslexicalta-italic.otf]     [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic] [\s!file:opendyslexicalta-bolditalic.otf] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript[opendyslexic]
+        \definetypeface [opendyslexic] [\s!rm] [\s!serif] [opendyslexic] [\s!default]
+        \definetypeface [opendyslexic] [\s!ss] [\s!sans]  [opendyslexic] [\s!default]
+        \definetypeface [opendyslexic] [\s!tt] [\s!mono]  [dejavu]       [\s!default]% [rscale=1.065]
+        \definetypeface [opendyslexic] [\s!mm] [\s!math]  [xits]         [\s!default]% [rscale=1.020]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-osx.mkiv b/tex/context/fonts/mkiv/type-imp-osx.mkiv
new file mode 100644
index 000000000..16b8e0545
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-osx.mkiv
@@ -0,0 +1,567 @@
+%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]
+
+% American Typewriter
+
+\starttypescript [serif] [americantypewriter-light-condensed,americantypewriter-condensed,americantypewriter-light,americantypewriter]
+    \definefontsynonym [AmericanTypewriter-Light]     [name:americantypewriterlight]          [features=default]
+    \definefontsynonym [AmericanTypewriter-Regular]   [name:americantypewriter]               [features=default]
+    \definefontsynonym [AmericanTypewriter-Bold]      [name:americantypewriterbold]           [features=default]
+    \definefontsynonym [AmericanTypewriter-LightCond] [name:americantypewritercondensedlight] [features=default]
+    \definefontsynonym [AmericanTypewriter-Condensed] [name:americantypewritercondensed]      [features=default]
+    \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]
+    \definefontsynonym [Arial-Condensed]      [name:arialnarrow]           [features=default]
+    \definefontsynonym [Arial-ItalicCond]     [name:arialnarrowitalic]     [features=default]
+    \definefontsynonym [Arial-BoldCond]       [name:arialnarrowbold]       [features=default]
+    \definefontsynonym [Arial-BoldItalicCond] [name:arialnarrowbolditalic] [features=default]
+    \definefontsynonym [Arial-Regular]        [name:arial]                 [features=default]
+    \definefontsynonym [Arial-Italic]         [name:arialitalic]           [features=default]
+    \definefontsynonym [Arial-Bold]           [name:arialbold]             [features=default]
+    \definefontsynonym [Arial-BoldItalic]     [name:arialbolditalic]       [features=default]
+    \definefontsynonym [Arial-Black]          [name:arialblack]            [features=default]
+    \definefontsynonym [Arial-Unicode]        [name:arialunicodems]        [features=default]
+    \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]
+    \definefontsynonym [Baskerville-Regular]      [name:baskerville]               [features=default]
+    \definefontsynonym [Baskerville-Italic]       [name:baskervilleitalic]         [features=default]
+    \definefontsynonym [Baskerville-Medium]       [name:baskervillesemibold]       [features=default]
+    \definefontsynonym [Baskerville-MediumItalic] [name:baskervillesemibolditalic] [features=default]
+    \definefontsynonym [Baskerville-Bold]         [name:baskervillebold]           [features=default]
+    \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]
+    \definefontsynonym [Copperplate-Light]   [name:copperplatelight] [features=default]
+    \definefontsynonym [Copperplate-Regular] [name:copperplate]      [features=default]
+    \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]
+    \definefontsynonym [Futura-MediumCond]   [name:futuracondensedmedium]    [features=default]
+    \definefontsynonym [Futura-Medium]       [name:futuramedium]             [features=default]
+    \definefontsynonym [Futura-MediumItalic] [name:futuramediumitalic]       [features=default]
+    \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]
+    \definefontsynonym [GillSans-Light]       [name:gillsanslight]       [features=default]
+    \definefontsynonym [GillSans-LightItalic] [name:gillsanslightitalic] [features=default]
+    \definefontsynonym [GillSans-Regular]     [name:gillsans]            [features=default]
+    \definefontsynonym [GillSans-Italic]      [name:gillsansitalic]      [features=default]
+    \definefontsynonym [GillSans-Bold]        [name:gillsansbold]        [features=default]
+    \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]
+    \definefontsynonym [HelveticaNeue-UltraLight]       [name:helveticaneueultralight]       [features=default]
+    \definefontsynonym [HelveticaNeue-UltraLightItalic] [name:helveticaneueultralightitalic] [features=default]
+    \definefontsynonym [HelveticaNeue-Light]            [name:helveticaneuelight]            [features=default]
+    \definefontsynonym [HelveticaNeue-LightItalic]      [name:helveticaneuelightitalic]      [features=default]
+    \definefontsynonym [HelveticaNeue-Regular]          [name:helveticaneue]                 [features=default]
+    \definefontsynonym [HelveticaNeue-Italic]           [name:helveticaneueitalic]           [features=default]
+    \definefontsynonym [HelveticaNeue-Bold]             [name:helveticaneuebold]             [features=default]
+    \definefontsynonym [HelveticaNeue-BoldItalic]       [name:helveticaneuebolditalic]       [features=default]
+    \definefontsynonym [HelveticaNeue-BoldCond]         [name:helveticaneuecondensedbold]    [features=default]
+    \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]
+    \definefontsynonym [HiraginoMinchoPro-Regular]  [name:hiraminprow3]  [features=japanese]
+    \definefontsynonym [HiraginoMinchoPro-Bold]     [name:hiraminprow6]  [features=japanese]
+    \definefontsynonym [HiraginoMinchoProN-Regular] [name:hiraminpronw3] [features=japanese]
+    \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]
+    \definefontsynonym [HiraginoMaruGothicPro-Regular]  [name:hiramaruprow4]  [features=japanese]
+    \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]
+    \definefontsynonym [HiraginoKakuGothicPro-Regular]  [name:hirakakuprow3]  [features=japanese]
+    \definefontsynonym [HiraginoKakuGothicPro-Bold]     [name:hirakakuprow6]  [features=japanese]
+    \definefontsynonym [HiraginoKakuGothicStd-Black]    [name:hirakakustdw8]  [features=japanese]
+    \definefontsynonym [HiraginoKakuGothicProN-Regular] [name:hirakakupronw3] [features=japanese]
+    \definefontsynonym [HiraginoKakuGothicProN-Bold]    [name:hirakakupronw6] [features=japanese]
+    \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]
+    \definefontsynonym [HoeflerText-Regular]     [name:hoeflertext]            [features=default]
+    \definefontsynonym [HoeflerText-Italic]      [name:hoeflertextitalic]      [features=default]
+    \definefontsynonym [HoeflerText-Black]       [name:hoeflertextblack]       [features=default]
+    \definefontsynonym [HoeflerText-BlackItalic] [name:hoeflertextblackitalic] [features=default]
+    \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]
+    \definefontsynonym [Optima-Regular]    [name:optimaregular]    [features=default]
+    \definefontsynonym [Optima-Italic]     [name:optimaitalic]     [features=default]
+    \definefontsynonym [Optima-Bold]       [name:optimabold]       [features=default]
+    \definefontsynonym [Optima-BoldItalic] [name:optimabolditalic] [features=default]
+    \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]
+    \definefontsynonym [Papyrus-Regular]   [name:papyrus]          [features=default]
+    \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]
+    \definefontsynonym [STXihei-Light]   [name:stxihei] [features=chinese]
+    \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]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular] [name:\typescriptprefix{f:\typescripttwo}]     [features=default]
+    \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]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]    [name:\typescriptprefix{f:\typescripttwo}]           [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]     [name:\typescriptprefix{f:\typescripttwo}italic]     [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]       [name:\typescriptprefix{f:\typescripttwo}bold]       [features=default]
+    \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/fonts/mkiv/type-imp-postscript.mkiv b/tex/context/fonts/mkiv/type-imp-postscript.mkiv
new file mode 100644
index 000000000..c53b89519
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-postscript.mkiv
@@ -0,0 +1,26 @@
+%D \module
+%D   [       file=type-imp-postscript,
+%D        version=2007.07.30,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Basic Font Set,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\loadtypescriptfile[texgyre]
+
+\starttypescriptcollection[postscript]
+
+    \starttypescript [postscript]
+        \definetypeface [postscript] [\s!rm] [\s!serif] [times]     [\s!default]
+        \definetypeface [postscript] [\s!ss] [\s!sans]  [helvetica] [\s!default] [\s!rscale=0.9]
+        \definetypeface [postscript] [\s!tt] [\s!mono]  [courier]   [\s!default] [\s!rscale=1.1]
+        \definetypeface [postscript] [\s!mm] [\s!math]  [times]     [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-punknova.mkiv b/tex/context/fonts/mkiv/type-imp-punknova.mkiv
new file mode 100644
index 000000000..8d95bf885
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-punknova.mkiv
@@ -0,0 +1,34 @@
+%D \module
+%D   [       file=type-imp-punknova,
+%D        version=2010.06.21,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Punk Nova,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D This file defined the Punk made by Khaled Hosny based on the
+%D \METAPOST\ output from a (slightly) adapted punk font.
+
+\starttypescriptcollection[punknova]
+
+    \definefontfeature [punknova] [mode=node,script=latn,rand=yes,kern=yes,liga=yes,tlig=yes]
+
+    \starttypescript [\s!serif] [punknova]
+        \definefontsynonym [\s!Serif]           [\s!file:punknova-regular]     [\s!features=punknova]
+        \definefontsynonym [\s!SerifSlanted]    [\s!file:punknova-slanted]     [\s!features=punknova]
+        \definefontsynonym [\s!SerifBold]       [\s!file:punknova-bold]        [\s!features=punknova]
+        \definefontsynonym [\s!SerifBoldSlanted][\s!file:punknova-boldslanted] [\s!features=punknova]
+        \definefontsynonym [\s!SerifItalic]     [\s!SerifSlanted]
+        \definefontsynonym [\s!SerifBoldItalic] [\s!SerifBoldSlanted]
+    \stoptypescript
+
+    \starttypescript [punknova]
+        \definetypeface [punknova] [\s!rm] [\s!serif] [punknova] [\s!default]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-texgyre.mkiv b/tex/context/fonts/mkiv/type-imp-texgyre.mkiv
new file mode 100644
index 000000000..ca5d456e5
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-texgyre.mkiv
@@ -0,0 +1,288 @@
+%D \module
+%D   [       file=type-imp-texgyre,
+%D        version=2007.07.30,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=\TEX Gyre Fonts,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%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 There are some weird ones that are never used .. all these Caps ... we can better
+%D split them into pagella-caps etc.
+
+\starttypescriptcollection[texgyre]
+
+    \definetypescriptprefix [f:pagella] [pagella]
+    \definetypescriptprefix [f:termes]  [termes]
+    \definetypescriptprefix [f:heros]   [heros]
+    \definetypescriptprefix [f:bonum]   [bonum]
+    \definetypescriptprefix [f:schola]  [schola]
+    \definetypescriptprefix [f:adventor][adventor]
+    \definetypescriptprefix [f:cursor]  [cursor]
+    \definetypescriptprefix [f:chorus]  [chorus]
+
+    \definetypescriptprefix [f:palatino]   [pagella]
+    \definetypescriptprefix [f:times]      [termes]
+    \definetypescriptprefix [f:helvetica]  [heros]
+    \definetypescriptprefix [f:bookman]    [bonum]
+    \definetypescriptprefix [f:schoolbook] [schola]
+    \definetypescriptprefix [f:avantgarde] [adventor]
+    \definetypescriptprefix [f:courier]    [cursor]
+    \definetypescriptprefix [f:chancery]   [chorus]
+
+    \definetypescriptprefix [n:pagella]  [TeXGyrePagella]
+    \definetypescriptprefix [n:termes]   [TeXGyreTermes]
+    \definetypescriptprefix [n:heros]    [TeXGyreHeros]
+    \definetypescriptprefix [n:bonum]    [TeXGyreBonum]
+    \definetypescriptprefix [n:schola]   [TeXGyreSchola]
+    \definetypescriptprefix [n:adventor] [TeXGyreAdventor]
+    \definetypescriptprefix [n:cursor]   [TeXGyreCursor]
+    \definetypescriptprefix [n:chorus]   [TeXGyreChorus]
+
+    \definetypescriptprefix [n:palatino]   [TeXGyrePagella]
+    \definetypescriptprefix [n:times]      [TeXGyreTermes]
+    \definetypescriptprefix [n:helvetica]  [TeXGyreHeros]
+    \definetypescriptprefix [n:bookman]    [TeXGyreBonum]
+    \definetypescriptprefix [n:schoolbook] [TeXGyreSchola]
+    \definetypescriptprefix [n:adventor]   [TeXGyreAdventor]
+    \definetypescriptprefix [n:courier]    [TeXGyreCursor]
+    \definetypescriptprefix [n:chancery]   [TeXGyreChorus]
+
+    \starttypescript [\s!serif,\s!sans] [adventor,bonum,bookman,heros,helvetica,pagella,palatino,bonum,bookman,schola,schoolbook,termes,times]
+        \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]        [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-regular]    [\s!features=\s!default]
+        \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]         [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-italic]     [\s!features=\s!default]
+        \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]           [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-bold]       [\s!features=\s!default]
+        \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic]     [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-bolditalic] [\s!features=\s!default]
+        \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Caps]           [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-regular]    [\s!features=\s!smallcaps]
+        \definefontsynonym [\typescriptprefix{n:\typescripttwo}-ItalicCaps]     [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-italic]     [\s!features=\s!smallcaps]
+        \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldCaps]       [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-bold]       [\s!features=\s!smallcaps]
+        \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalicCaps] [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-bolditalic] [\s!features=\s!smallcaps]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [cursor,courier]
+        \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]        [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-regular]    [\s!features=\s!none]
+        \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]         [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-italic]     [\s!features=\s!none]
+        \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]           [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-bold]       [\s!features=\s!none]
+        \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic]     [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-bolditalic] [\s!features=\s!none]
+    \stoptypescript
+
+    \starttypescript [\s!serif,\s!calligraphy] [chorus,chancery]
+        \definefontsynonym [TeXGyreChorus-MediumItalic] [\s!file:texgyrechorus-mediumitalic] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [pagella,palatino,termes,times,bonum,bookman,schola,schoolbook] [\s!name]
+        \definefontsynonym [\s!Serif]             [\typescriptprefix{n:\typescripttwo}-Regular]
+        \definefontsynonym [\s!SerifItalic]       [\typescriptprefix{n:\typescripttwo}-Italic]
+        \definefontsynonym [\s!SerifBold]         [\typescriptprefix{n:\typescripttwo}-Bold]
+        \definefontsynonym [\s!SerifBoldItalic]   [\typescriptprefix{n:\typescripttwo}-BoldItalic]
+        \definefontsynonym [\s!SerifSlanted]      [\s!SerifItalic]
+        \definefontsynonym [\s!SerifBoldSlanted]  [\s!SerifBoldItalic]
+        \definefontsynonym [\s!SerifCaps]         [\typescriptprefix{n:\typescripttwo}-Caps]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [pagella-caps,palatino-caps,termes-caps,times-caps,bonum-caps,bookman-caps,schola-caps,schoolbook-caps] [\s!name]
+        \definefontsynonym [\s!Serif]             [\typescriptprefix{n:\typescripttwo}-Caps]
+        \definefontsynonym [\s!SerifItalic]       [\typescriptprefix{n:\typescripttwo}-ItalicCaps]
+        \definefontsynonym [\s!SerifBold]         [\typescriptprefix{n:\typescripttwo}-BoldCaps]
+        \definefontsynonym [\s!SerifBoldItalic]   [\typescriptprefix{n:\typescripttwo}-BoldItalicCaps]
+        \definefontsynonym [\s!SerifSlanted]      [\s!SerifItalic]
+        \definefontsynonym [\s!SerifBoldSlanted]  [\s!SerifBoldItalic]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [chorus,chancery] [\s!name]
+        \definefontsynonym [\s!Serif]            [TeXGyreChorus-MediumItalic]
+        \definefontsynonym [\s!SerifItalic]      [\s!Serif]
+        \definefontsynonym [\s!SerifBold]        [\s!Serif]
+        \definefontsynonym [\s!SerifBoldItalic]  [\s!Serif]
+        \definefontsynonym [\s!SerifSlanted]     [\s!Serif]
+        \definefontsynonym [\s!SerifBoldSlanted] [\s!Serif]
+        \definefontsynonym [\s!SerifCaps]        [\s!Serif]
+    \stoptypescript
+
+    \starttypescript [\s!calligraphy] [chorus,chancery] [\s!name]
+        \definefontsynonym [Calligraphy] [TeXGyreChorus-MediumItalic]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [heros,helvetica,adventor] [\s!name]
+        \definefontsynonym [\s!Sans]            [\typescriptprefix{n:\typescripttwo}-Regular]
+        \definefontsynonym [\s!SansItalic]      [\typescriptprefix{n:\typescripttwo}-Italic]
+        \definefontsynonym [\s!SansBold]        [\typescriptprefix{n:\typescripttwo}-Bold]
+        \definefontsynonym [\s!SansBoldItalic]  [\typescriptprefix{n:\typescripttwo}-BoldItalic]
+        \definefontsynonym [\s!SansSlanted]     [\s!SansItalic]
+        \definefontsynonym [\s!SansBoldSlanted] [\s!SansBoldItalic]
+        \definefontsynonym [\s!SansCaps]        [\typescriptprefix{n:\typescripttwo}-Caps]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [heros-caps,helvetica-caps,adventor-caps] [\s!name]
+        \definefontsynonym [\s!Sans]            [\typescriptprefix{n:\typescripttwo}-Caps]
+        \definefontsynonym [\s!SansItalic]      [\typescriptprefix{n:\typescripttwo}-ItalicCaps]
+        \definefontsynonym [\s!SansBold]        [\typescriptprefix{n:\typescripttwo}-BoldCaps]
+        \definefontsynonym [\s!SansBoldItalic]  [\typescriptprefix{n:\typescripttwo}-BoldItalicCaps]
+        \definefontsynonym [\s!SansSlanted]     [\s!SansItalic]
+        \definefontsynonym [\s!SansBoldSlanted] [\s!SansBoldItalic]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [cursor,courier] [\s!name]
+        \definefontsynonym [\s!Mono]             [\typescriptprefix{n:\typescripttwo}-Regular]
+        \definefontsynonym [\s!MonoItalic]       [\typescriptprefix{n:\typescripttwo}-Italic]
+        \definefontsynonym [\s!MonoBold]         [\typescriptprefix{n:\typescripttwo}-Bold]
+        \definefontsynonym [\s!MonoBoldItalic]   [\typescriptprefix{n:\typescripttwo}-BoldItalic]
+        \definefontsynonym [\s!MonoSlanted]      [\s!MonoItalic]
+        \definefontsynonym [\s!MonoBoldSlanted]  [\s!MonoBoldItalic]
+        \definefontsynonym [\s!MonoCaps]         [\typescriptprefix{n:\typescripttwo}-Caps]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [cursor-caps,courier-caps] [\s!name]
+        \definefontsynonym [\s!Mono]            [\typescriptprefix{n:\typescripttwo}-Caps]
+        \definefontsynonym [\s!MonoItalic]      [\typescriptprefix{n:\typescripttwo}-ItalicCaps]
+        \definefontsynonym [\s!MonoBold]        [\typescriptprefix{n:\typescripttwo}-BoldCaps]
+        \definefontsynonym [\s!MonoBoldItalic]  [\typescriptprefix{n:\typescripttwo}-BoldItalicCaps]
+        \definefontsynonym [\s!MonoSlanted]     [\s!MonoItalic]
+        \definefontsynonym [\s!MonoBoldSlanted] [\s!MonoBoldItalic]
+    \stoptypescript
+
+    % interesting is that we cannot move these definitions up (without loosing features)
+
+    % caps: \definetypeface [pagella] [rm] [serif] [pagella-caps] [default]
+
+    \starttypescript [times,termes]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [helvetica]      [\s!default] [\s!rscale=0.9]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern]         [\s!default] [\s!rscale=1.05]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [termes]         [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+    \starttypescript [palatino,pagella]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [modern]         [\s!default] [\s!rscale=1.075]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern]         [\s!default] [\s!rscale=1.075]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [pagella]        [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+    \starttypescript [schoolbook,schola]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [modern]         [\s!default] [\s!rscale=1.1]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern]         [\s!default] [\s!rscale=1.1]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [schola]         [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+    \starttypescript [bookman,bonum]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [modern]         [\s!default] [\s!rscale=1.1]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern]         [\s!default] [\s!rscale=1.1]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [bonum]          [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+    \starttypescript [chancery,chorus]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [modern]         [\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern]         [\s!default]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [modern]         [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+    \starttypescript [helvetica,heros]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [\typescriptone] [\s!default]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [modern]         [\s!default] [\s!rscale=1.15]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern]         [\s!default] [\s!rscale=1.15]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [modern]         [\s!default] [\s!rscale=1.15]
+        \quittypescriptscanning
+    \stoptypescript
+
+    \starttypescript [avantgarde,adventor]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [adventor] [\s!default]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [modern]   [\s!default] [\s!rscale=1.15]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern]   [\s!default] [\s!rscale=1.15]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [modern]   [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+    \starttypescript [courier,cursor]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [\typescriptone] [\s!default]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [modern]         [\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [modern]         [\s!default]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [modern]         [\s!default]
+        \quittypescriptscanning
+    \stoptypescript
+
+\stoptypescriptcollection
+
+\startmode[txmath]
+
+    \starttypescriptcollection[texgyre-math-times]
+
+        \starttypescript [\s!math][times,termes][\s!all]
+            \loadfontgoodies[tx-math]
+            \definefontsynonym[\s!MathRoman][txmath@tx-math]
+          % \definefontsynonym[\s!MathRomanBold][MathRoman]
+        \stoptypescript
+
+    \stoptypescriptcollection
+
+\stopmode
+
+\startnotmode[txmath]
+
+    \starttypescriptcollection[texgyre-math-times]
+
+        \starttypescript [\s!math][times,termes][\s!all]
+            \loadfontgoodies[texgyre]
+            \definefontsynonym[\s!MathRoman][file:texgyre-termes-math-regular.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=texgyre]
+        \stoptypescript
+
+    \stoptypescriptcollection
+
+\stopnotmode
+
+\startmode[pxmath]
+
+    \starttypescriptcollection[texgyre-math-pagella]
+
+        \starttypescript [\s!math][palatino,pagella][\s!all]
+            \loadfontgoodies[px-math]
+            \definefontsynonym[\s!MathRoman][pxmath@px-math]
+          % \definefontsynonym[\s!MathRomanBold][MathRoman]
+        \stoptypescript
+
+    \stoptypescriptcollection
+
+\stopmode
+
+\startnotmode[pxmath]
+
+    \starttypescriptcollection[texgyre-math-pagella]
+
+        \starttypescript [\s!math][palatino,pagella][\s!all]
+            \loadfontgoodies[texgyre]
+            \definefontsynonym[\s!MathRoman][file:texgyre-pagella-math-regular.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=texgyre]
+        \stoptypescript
+
+    \stoptypescriptcollection
+
+\stopnotmode
+
+\starttypescriptcollection[texgyre-math-bonum]
+
+    \starttypescript [\s!math][bookman,bonum][\s!all]
+        \loadfontgoodies[texgyre]
+        \definefontsynonym[\s!MathRoman][file:texgyre-bonum-math-regular.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=texgyre]
+    \stoptypescript
+
+\stoptypescriptcollection
+
+\starttypescriptcollection[texgyre-math-schola]
+
+    \starttypescript [\s!math][schoolbook,schola][\s!all]
+        \loadfontgoodies[texgyre]
+        \definefontsynonym[\s!MathRoman][file:texgyre-schola-math-regular.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=texgyre]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-unfonts.mkiv b/tex/context/fonts/mkiv/type-imp-unfonts.mkiv
new file mode 100644
index 000000000..91ae3b230
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-unfonts.mkiv
@@ -0,0 +1,142 @@
+%D \module
+%D   [       file=type-imp-unfonts,
+%D        version=2012.03.11,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=UnFonts,
+%D         author=Dalyoung \& Hans,
+%D           date=\currentdate,
+%D      copyright=Dalyoung \& Hans]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% usage: \setupbodyfont[unfonts]
+
+\loadtypescriptfile[texgyre]
+\loadtypescriptfile[xits]
+
+\definefontfeature
+  [kr-default]
+  [mode=node,script=hang,lang=kor]
+
+\definefontfeature
+  [kr-slanted]
+  [mode=node,script=hang,lang=kor,slant=.2]
+
+\definefontfeature
+  [kr-latin-default]
+  [default]
+
+\definefontfeature
+  [kr-latin-slanted]
+  [krlatindefault]
+  [slant=.2]
+
+\definefontfeature
+  [kr-latin-slanted-mono]
+  [slant=.2]
+
+\definefontfeature
+  [kr-latin-smallcaps]
+  [krlatindefault]
+  [smcp=yes]
+
+\definefontfeature
+  [kr-latin-smallcaps-mono]
+  [cmcp=yes]
+
+\definefontfallback[kr-serif]           [texgyrepagella-regular*kr-latin-default]      [0x0000-0x0400][force=yes]
+\definefontfallback[kr-serifbold]       [texgyrepagella-bold*kr-latin-default]         [0x0000-0x0400][force=yes]
+\definefontfallback[kr-serifitalic]     [texgyrepagella-italic*kr-latin-default]       [0x0000-0x0400][force=yes]
+\definefontfallback[kr-serifbolditalic] [texgyrepagella-bolditalic*kr-latin-default]   [0x0000-0x0400][force=yes]
+\definefontfallback[kr-serifslanted]    [texgyrepagella-regular*kr-latin-slanted]      [0x0000-0x0400][force=yes]
+\definefontfallback[kr-serifboldslanted][texgyrepagella-bold*kr-latin-slanted]         [0x0000-0x0400][force=yes]
+\definefontfallback[kr-serifcaps]       [texgyrepagella-regular*kr-latin-smallcaps]    [0x0000-0x0400][force=yes]
+\definefontfallback[kr-sans]            [texgyreheros-regular*kr-latin-default]        [0x0000-0x0400][force=yes]
+\definefontfallback[kr-sansbold]        [texgyreheros-bold*kr-latin-default]           [0x0000-0x0400][force=yes]
+\definefontfallback[kr-sansitalic]      [texgyreheros-italic*kr-latin-default]         [0x0000-0x0400][force=yes]
+\definefontfallback[kr-sansbolditalic]  [texgyreheros-bolditalic*kr-latin-default]     [0x0000-0x0400][force=yes]
+\definefontfallback[kr-sansslanted]     [texgyreheros-regular*kr-latin-slanted]        [0x0000-0x0400][force=yes]
+\definefontfallback[kr-sansboldslanted] [texgyreheros-bold*kr-latin-slanted]           [0x0000-0x0400][force=yes]
+\definefontfallback[kr-sanscaps]        [texgyreheros-regular*kr-latin-smallcaps]      [0x0000-0x0400][force=yes]
+\definefontfallback[kr-mono]            [texgyrecursor-regular]                        [0x0000-0x0400][force=yes]
+\definefontfallback[kr-monobold]        [texgyrecursor-bold]                           [0x0000-0x0400][force=yes]
+\definefontfallback[kr-monoitalic]      [texgyrecursor-italic]                         [0x0000-0x0400][force=yes]
+\definefontfallback[kr-monobolditalic]  [texgyrecursor-bolditalic]                     [0x0000-0x0400][force=yes]
+\definefontfallback[kr-monoslanted]     [texgyrecursor-regular*kr-latin-slanted-mono]  [0x0000-0x0400][force=yes]
+\definefontfallback[kr-monoboldslanted] [texgyrecursor-bold*kr-latin-slanted-mono]     [0x0000-0x0400][force=yes]
+\definefontfallback[kr-monocaps]        [texgyrecursor-regular*kr-latin-smallcaps-mono][0x0000-0x0400][force=yes]
+
+\starttypescriptcollection[unfonts]
+
+    \starttypescript [\s!serif] [unbatang]
+        \definefontsynonym [unbatang]           [\s!file:unbatang]    [\s!features=kr-default,\s!fallbacks=kr-serif]
+        \definefontsynonym [unbatangbold]       [\s!file:unbatangbold][\s!features=kr-default,\s!fallbacks=kr-serifbold]
+        \definefontsynonym [unbatangitalic]     [\s!file:unbatang]    [\s!features=kr-slanted,\s!fallbacks=kr-serifitalic]
+        \definefontsynonym [unbatangbolditalic] [\s!file:unbatangbold][\s!features=kr-slanted,\s!fallbacks=kr-serifbolditalic]
+        \definefontsynonym [unbatangslanted]    [\s!file:unbatang]    [\s!features=kr-slanted,\s!fallbacks=kr-serifslanted]
+        \definefontsynonym [unbatangboldslanted][\s!file:unbatangbold][\s!features=kr-slanted,\s!fallbacks=kr-serifboldslanted]
+        \definefontsynonym [unbatangcaps]       [\s!file:unbatang]    [\s!features=kr-default,\s!fallbacks=kr-serifcaps]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [undotum]
+        \definefontsynonym[undotum]             [\s!file:undotum]     [\s!features=kr-default,\s!fallbacks=kr-sans]
+        \definefontsynonym[undotumbold]         [\s!file:undotumbold] [\s!features=kr-default,\s!fallbacks=kr-sansbold]
+        \definefontsynonym[undotumitalic]       [\s!file:undotum]     [\s!features=kr-slanted,\s!fallbacks=kr-sansitalic]
+        \definefontsynonym[undotumbolditalic]   [\s!file:undotumbold] [\s!features=kr-slanted,\s!fallbacks=kr-sansbolditalic]
+        \definefontsynonym[undotumslanted]      [\s!file:undotum]     [\s!features=kr-slanted,\s!fallbacks=kr-sansslanted]
+        \definefontsynonym[undotumboldslanted]  [\s!file:undotumbold] [\s!features=kr-slanted,\s!fallbacks=kr-sansboldslanted]
+        \definefontsynonym[undotumcaps]         [\s!file:undotum]     [\s!features=kr-default,\s!fallbacks=kr-sanscaps]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [untype]
+        \definefontsynonym[untype]              [\s!file:untaza]      [\s!features=kr-default,\s!fallbacks=kr-mono]
+        \definefontsynonym[untypebold]          [\s!file:untaza]      [\s!features=kr-default,\s!fallbacks=kr-monobold]
+        \definefontsynonym[untypeitalic]        [\s!file:untaza]      [\s!features=kr-slanted,\s!fallbacks=kr-monoitalic]
+        \definefontsynonym[untypebolditalic]    [\s!file:untaza]      [\s!features=kr-slanted,\s!fallbacks=kr-monobolditalic]
+        \definefontsynonym[untypeslanted]       [\s!file:untaza]      [\s!features=kr-slanted,\s!fallbacks=kr-monoslanted]
+        \definefontsynonym[untypeboldslanted]   [\s!file:untaza]      [\s!features=kr-slanted,\s!fallbacks=kr-monoboldslanted]
+        \definefontsynonym[untypecaps]          [\s!file:untaza]      [\s!features=kr-default,\s!fallbacks=kr-monocaps]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [unbatang] [\s!name]
+        \definefontsynonym[\s!Serif]           [unbatang]
+        \definefontsynonym[\s!SerifBold]       [unbatangbold]
+        \definefontsynonym[\s!SerifItalic]     [unbatangitalic]
+        \definefontsynonym[\s!SerifBoldItalic] [unbatangbolditalic]
+        \definefontsynonym[\s!SerifSlanted]    [unbatangslanted]
+        \definefontsynonym[\s!SerifBoldSlanted][unbatangboldslanted]
+        \definefontsynonym[\s!SerifCaps]       [unbatangcaps]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [undotum] [\s!name]
+        \definefontsynonym[\s!Sans]            [undotum]
+        \definefontsynonym[\s!SansBold]        [undotumbold]
+        \definefontsynonym[\s!SansItalic]      [undotumitalic]
+        \definefontsynonym[\s!SansBoldItalic]  [undotumbolditalic]
+        \definefontsynonym[\s!SansSlanted]     [undotumslanted]
+        \definefontsynonym[\s!SansBoldSlanted] [undotumboldslanted]
+        \definefontsynonym[\s!SansCaps]        [undotumcaps]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [untype] [\s!name]
+        \definefontsynonym[\s!Mono]            [untype]
+        \definefontsynonym[\s!MonoBold]        [untypebold]
+        \definefontsynonym[\s!MonoItalic]      [untypeitalic]
+        \definefontsynonym[\s!MonoBoldItalic]  [untypebolditalic]
+        \definefontsynonym[\s!MonoSlanted]     [untypeslanted]
+        \definefontsynonym[\s!MonoBoldSlanted] [untypeboldslanted]
+        \definefontsynonym[\s!MonoCaps]        [untypecaps]
+    \stoptypescript
+
+    % xits might get replaced with a pagella once we have it
+
+    \starttypescript[unfonts]
+        \definetypeface [unfonts] [\s!rm] [\s!serif] [unbatang]
+        \definetypeface [unfonts] [\s!ss] [\s!sans]  [undotum]
+        \definetypeface [unfonts] [\s!tt] [\s!mono]  [untype]
+        \definetypeface [unfonts] [\s!mm] [\s!math]  [xits]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-xits.mkiv b/tex/context/fonts/mkiv/type-imp-xits.mkiv
new file mode 100644
index 000000000..f83050e14
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-xits.mkiv
@@ -0,0 +1,60 @@
+%D \module
+%D   [       file=type-imp-hvmath,
+%D        version=2007.07.30,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Xits,
+%D         author=Khaled Hosny \& Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% This one makes more sense than Stix. Xits uses the glyph collection from stix
+% but packages it in a proper OpenType Math font. From the Stix site:  Version 1.1,
+% which will include fonts packaged for use with Microsoft Office applications, is
+% scheduled for release by the end of 2010. Version 1.2, which will include Type 1
+% fonts for use with LaTeX, will follow in 2011. So, we are on our own anyway.
+
+\loadtypescriptfile[texgyre]
+
+\starttypescriptcollection[xits]
+
+    \starttypescript [\s!math] [xits,xitsbidi] [\s!name]
+        \loadfontgoodies[xits-math]
+        \definefontsynonym[\s!MathRoman        ][\s!file:xits-math.otf]    [\s!features=\s!math\mathsizesuffix,\s!goodies=xits-math]
+        \definefontsynonym[\s!MathRoman     L2R][\s!file:xits-math.otf]    [\s!features=\s!math\mathsizesuffix-l2r,\s!goodies=xits-math]
+        \definefontsynonym[\s!MathRoman     R2L][\s!file:xits-math.otf]    [\s!features=\s!math\mathsizesuffix-r2l,\s!goodies=xits-math]
+        \definefontsynonym[\s!MathRomanBold    ][\s!file:xits-mathbold.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=xits-math]
+        \definefontsynonym[\s!MathRomanBold L2R][\s!file:xits-mathbold.otf][\s!features=\s!math\mathsizesuffix-l2r,\s!goodies=xits-math]
+        \definefontsynonym[\s!MathRomanBold R2L][\s!file:xits-mathbold.otf][\s!features=\s!math\mathsizesuffix-r2l,\s!goodies=xits-math]
+    \stoptypescript
+
+    \starttypescript [\s!serif] [xits] [\s!name]
+        \setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym[\s!Serif]          [\s!file:xits-regular.otf]    [\s!features=\s!default]
+        \definefontsynonym[\s!SerifBold]      [\s!file:xits-bold.otf]       [\s!features=\s!default]
+        \definefontsynonym[\s!SerifItalic]    [\s!file:xits-italic.otf]     [\s!features=\s!default]
+        \definefontsynonym[\s!SerifBoldItalic][\s!file:xits-bolditalic.otf] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript[xits]
+        \definetypeface [xits] [\s!rm] [\s!serif] [xits]   [\s!default]
+        \definetypeface [xits] [\s!ss] [\s!sans]  [heros]  [\s!default] [\s!rscale=0.9]
+        \definetypeface [xits] [\s!tt] [\s!mono]  [modern] [\s!default] [\s!rscale=1.05]
+        \definetypeface [xits] [\s!mm] [\s!math]  [xits]   [\s!default]
+    \stoptypescript
+
+    % for the moment
+
+    \starttypescript[xitsbidi]
+        \definetypeface [xitsbidi] [\s!rm] [\s!serif] [xits]     [\s!default]
+        \definetypeface [xitsbidi] [\s!ss] [\s!sans]  [heros]    [\s!default] [\s!rscale=0.9]
+        \definetypeface [xitsbidi] [\s!tt] [\s!mono]  [modern]   [\s!default] [\s!rscale=1.05]
+        %definetypeface [xitsbidi] [\s!mm] [\s!math]  [xitsbidi] [bidi]       [\s!direction=\s!both]
+        \definetypeface [xitsbidi] [\s!mm] [\s!math]  [xitsbidi] [\s!default] [\s!direction=\s!both]
+    \stoptypescript
+
+\stoptypescriptcollection
+
diff --git a/tex/context/fonts/mkiv/type-imp-xitsbidi.mkiv b/tex/context/fonts/mkiv/type-imp-xitsbidi.mkiv
new file mode 100644
index 000000000..33c4340ed
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-xitsbidi.mkiv
@@ -0,0 +1,16 @@
+%D \module
+%D   [       file=type-imp-hvmath,
+%D        version=2007.07.30,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Xits,
+%D         author=Khaled Hosny \& Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\loadtypescriptfile[xits]
+
+\endinput
diff --git a/tex/context/fonts/unifraktur.lfg b/tex/context/fonts/mkiv/unifraktur.lfg
index 32ffed928..32ffed928 100644
--- a/tex/context/fonts/unifraktur.lfg
+++ b/tex/context/fonts/mkiv/unifraktur.lfg
diff --git a/tex/context/fonts/xits-math.lfg b/tex/context/fonts/mkiv/xits-math.lfg
index 8e1274365..8e1274365 100644
--- a/tex/context/fonts/xits-math.lfg
+++ b/tex/context/fonts/mkiv/xits-math.lfg