12 files changed, 3093 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