2016-01-06 17:32:00

1 files changed, 276 insertions, 234 deletions

diff --git a/tex/context/base/type-one.mkii b/tex/context/base/type-one.mkii
index e98f6864a..4f6e43745 100644
--- a/tex/context/base/type-one.mkii
+++ b/tex/context/base/type-one.mkii
@@ -188,66 +188,66 @@
     %D {NNN}, i.e.\ four digit numbers).
 
     \starttypescript [serif] [computer-modern] [cyr]
-      \definefontsynonym [cmb10]    [wcmb10]    [encoding=t2a]
-      \definefontsynonym [cmbsy10]  [wcmbsy10]  [encoding=t2a]
-      \definefontsynonym [cmbx10]   [wcmbx10]   [encoding=t2a]
-      \definefontsynonym [cmbx12]   [wcmbx12]   [encoding=t2a]
-      \definefontsynonym [cmbx5]    [wcmbx5]    [encoding=t2a]
-      \definefontsynonym [cmbx6]    [wcmbx6]    [encoding=t2a]
-      \definefontsynonym [cmbx7]    [wcmbx7]    [encoding=t2a]
-      \definefontsynonym [cmbx8]    [wcmbx8]    [encoding=t2a]
-      \definefontsynonym [cmbx9]    [wcmbx9]    [encoding=t2a]
-      \definefontsynonym [cmbxsl10] [wcmbxsl10] [encoding=t2a]
-      \definefontsynonym [cmbxti10] [wcmbxti10] [encoding=t2a]
-      \definefontsynonym [cmcsc10]  [wcmcsc10]  [encoding=t2a]
-      %definefontsynonym [cmdunh10] [wcmdunh10] [encoding=t2a]
-      \definefontsynonym [cminch]   [wcminch]   [encoding=t2a]
-      \definefontsynonym [cmr10]    [wcmr10]    [encoding=t2a]
-      \definefontsynonym [cmr12]    [wcmr12]    [encoding=t2a]
-      \definefontsynonym [cmr17]    [wcmr17]    [encoding=t2a]
-      \definefontsynonym [cmr5]     [wcmr5]     [encoding=t2a]
-      \definefontsynonym [cmr6]     [wcmr6]     [encoding=t2a]
-      \definefontsynonym [cmr7]     [wcmr7]     [encoding=t2a]
-      \definefontsynonym [cmr8]     [wcmr8]     [encoding=t2a]
-      \definefontsynonym [cmr9]     [wcmr9]     [encoding=t2a]
-      \definefontsynonym [cmsl10]   [wcmsl10]   [encoding=t2a]
-      \definefontsynonym [cmsl12]   [wcmsl12]   [encoding=t2a]
-      \definefontsynonym [cmsl8]    [wcmsl8]    [encoding=t2a]
-      \definefontsynonym [cmsl9]    [wcmsl9]    [encoding=t2a]
-      \definefontsynonym [cmti10]   [wcmti10]   [encoding=t2a]
-      \definefontsynonym [cmti12]   [wcmti12]   [encoding=t2a]
-      \definefontsynonym [cmti7]    [wcmti7]    [encoding=t2a]
-      \definefontsynonym [cmti8]    [wcmti8]    [encoding=t2a]
-      \definefontsynonym [cmti9]    [wcmti9]    [encoding=t2a]
-      \definefontsynonym [cmu10]    [wcmu10]    [encoding=t2a]
+        \definefontsynonym [cmb10]    [wcmb10]    [encoding=t2a]
+        \definefontsynonym [cmbsy10]  [wcmbsy10]  [encoding=t2a]
+        \definefontsynonym [cmbx10]   [wcmbx10]   [encoding=t2a]
+        \definefontsynonym [cmbx12]   [wcmbx12]   [encoding=t2a]
+        \definefontsynonym [cmbx5]    [wcmbx5]    [encoding=t2a]
+        \definefontsynonym [cmbx6]    [wcmbx6]    [encoding=t2a]
+        \definefontsynonym [cmbx7]    [wcmbx7]    [encoding=t2a]
+        \definefontsynonym [cmbx8]    [wcmbx8]    [encoding=t2a]
+        \definefontsynonym [cmbx9]    [wcmbx9]    [encoding=t2a]
+        \definefontsynonym [cmbxsl10] [wcmbxsl10] [encoding=t2a]
+        \definefontsynonym [cmbxti10] [wcmbxti10] [encoding=t2a]
+        \definefontsynonym [cmcsc10]  [wcmcsc10]  [encoding=t2a]
+        %definefontsynonym [cmdunh10] [wcmdunh10] [encoding=t2a]
+        \definefontsynonym [cminch]   [wcminch]   [encoding=t2a]
+        \definefontsynonym [cmr10]    [wcmr10]    [encoding=t2a]
+        \definefontsynonym [cmr12]    [wcmr12]    [encoding=t2a]
+        \definefontsynonym [cmr17]    [wcmr17]    [encoding=t2a]
+        \definefontsynonym [cmr5]     [wcmr5]     [encoding=t2a]
+        \definefontsynonym [cmr6]     [wcmr6]     [encoding=t2a]
+        \definefontsynonym [cmr7]     [wcmr7]     [encoding=t2a]
+        \definefontsynonym [cmr8]     [wcmr8]     [encoding=t2a]
+        \definefontsynonym [cmr9]     [wcmr9]     [encoding=t2a]
+        \definefontsynonym [cmsl10]   [wcmsl10]   [encoding=t2a]
+        \definefontsynonym [cmsl12]   [wcmsl12]   [encoding=t2a]
+        \definefontsynonym [cmsl8]    [wcmsl8]    [encoding=t2a]
+        \definefontsynonym [cmsl9]    [wcmsl9]    [encoding=t2a]
+        \definefontsynonym [cmti10]   [wcmti10]   [encoding=t2a]
+        \definefontsynonym [cmti12]   [wcmti12]   [encoding=t2a]
+        \definefontsynonym [cmti7]    [wcmti7]    [encoding=t2a]
+        \definefontsynonym [cmti8]    [wcmti8]    [encoding=t2a]
+        \definefontsynonym [cmti9]    [wcmti9]    [encoding=t2a]
+        \definefontsynonym [cmu10]    [wcmu10]    [encoding=t2a]
     \stoptypescript
 
     \starttypescript [sans] [computer-modern] [cyr]
-      \definefontsynonym [cmss10]   [wcmss10]   [encoding=t2a]
-      \definefontsynonym [cmss12]   [wcmss12]   [encoding=t2a]
-      \definefontsynonym [cmss17]   [wcmss17]   [encoding=t2a]
-      \definefontsynonym [cmss8]    [wcmss8]    [encoding=t2a]
-      \definefontsynonym [cmss9]    [wcmss9]    [encoding=t2a]
-      %definefontsynonym [cmssbi10] [wcmssbi10] [encoding=t2a]
-      \definefontsynonym [cmssbx10] [wcmssbx10] [encoding=t2a]
-      \definefontsynonym [cmssdc10] [wcmssdc10] [encoding=t2a]
-      \definefontsynonym [cmssi10]  [wcmssi10]  [encoding=t2a]
-      \definefontsynonym [cmssi12]  [wcmssi12]  [encoding=t2a]
-      \definefontsynonym [cmssi17]  [wcmssi17]  [encoding=t2a]
-      \definefontsynonym [cmssi8]   [wcmssi8]   [encoding=t2a]
-      \definefontsynonym [cmssi9]   [wcmssi9]   [encoding=t2a]
-      \definefontsynonym [cmssq8]   [wcmssq8]   [encoding=t2a]
-      \definefontsynonym [cmssqi8]  [wcmssqi8]  [encoding=t2a]
+        \definefontsynonym [cmss10]   [wcmss10]   [encoding=t2a]
+        \definefontsynonym [cmss12]   [wcmss12]   [encoding=t2a]
+        \definefontsynonym [cmss17]   [wcmss17]   [encoding=t2a]
+        \definefontsynonym [cmss8]    [wcmss8]    [encoding=t2a]
+        \definefontsynonym [cmss9]    [wcmss9]    [encoding=t2a]
+        %definefontsynonym [cmssbi10] [wcmssbi10] [encoding=t2a]
+        \definefontsynonym [cmssbx10] [wcmssbx10] [encoding=t2a]
+        \definefontsynonym [cmssdc10] [wcmssdc10] [encoding=t2a]
+        \definefontsynonym [cmssi10]  [wcmssi10]  [encoding=t2a]
+        \definefontsynonym [cmssi12]  [wcmssi12]  [encoding=t2a]
+        \definefontsynonym [cmssi17]  [wcmssi17]  [encoding=t2a]
+        \definefontsynonym [cmssi8]   [wcmssi8]   [encoding=t2a]
+        \definefontsynonym [cmssi9]   [wcmssi9]   [encoding=t2a]
+        \definefontsynonym [cmssq8]   [wcmssq8]   [encoding=t2a]
+        \definefontsynonym [cmssqi8]  [wcmssqi8]  [encoding=t2a]
     \stoptypescript
 
     \starttypescript [mono] [computer-modern] [cyr]
-      \definefontsynonym [cmitt10]  [wcmitt10]  [encoding=t2a]
-      \definefontsynonym [cmsltt10] [wcmsltt10] [encoding=t2a]
-      \definefontsynonym [cmtt10]   [wcmtt10]   [encoding=t2a]
-      \definefontsynonym [cmtt12]   [wcmtt12]   [encoding=t2a]
-      \definefontsynonym [cmtt8]    [wcmtt8]    [encoding=t2a]
-      \definefontsynonym [cmtt9]    [wcmtt9]    [encoding=t2a]
-      %definefontsynonym [cmvtt10]  [wcmvtt10]  [encoding=t2a]
+        \definefontsynonym [cmitt10]  [wcmitt10]  [encoding=t2a]
+        \definefontsynonym [cmsltt10] [wcmsltt10] [encoding=t2a]
+        \definefontsynonym [cmtt10]   [wcmtt10]   [encoding=t2a]
+        \definefontsynonym [cmtt12]   [wcmtt12]   [encoding=t2a]
+        \definefontsynonym [cmtt8]    [wcmtt8]    [encoding=t2a]
+        \definefontsynonym [cmtt9]    [wcmtt9]    [encoding=t2a]
+        %definefontsynonym [cmvtt10]  [wcmvtt10]  [encoding=t2a]
     \stoptypescript
 
     \definetypescriptprefix [c:t2a] [la]
@@ -262,155 +262,155 @@
     \stoptypescript
 
     \starttypescript [serif] [computer-modern] [t2a,t2b,t2c,x2]
-      \definefontsynonym [cmb10]    [\typescriptprefix{c:\typescriptthree}rb1000]   [encoding=\typescriptthree]
-      \definefontsynonym [cmbx10]   [\typescriptprefix{c:\typescriptthree}bx1000]   [encoding=\typescriptthree]
-      \definefontsynonym [cmbx12]   [\typescriptprefix{c:\typescriptthree}bx1200]   [encoding=\typescriptthree]
-      \definefontsynonym [cmbx5]    [\typescriptprefix{c:\typescriptthree}bx0500]   [encoding=\typescriptthree]
-      \definefontsynonym [cmbx6]    [\typescriptprefix{c:\typescriptthree}bx0600]   [encoding=\typescriptthree]
-      \definefontsynonym [cmbx7]    [\typescriptprefix{c:\typescriptthree}bx0700]   [encoding=\typescriptthree]
-      \definefontsynonym [cmbx8]    [\typescriptprefix{c:\typescriptthree}bx0800]   [encoding=\typescriptthree]
-      \definefontsynonym [cmbx9]    [\typescriptprefix{c:\typescriptthree}bx0900]   [encoding=\typescriptthree]
-      \definefontsynonym [cmbxsl10] [\typescriptprefix{c:\typescriptthree}bl1000]   [encoding=\typescriptthree]
-      \definefontsynonym [cmbxti10] [\typescriptprefix{c:\typescriptthree}bi1000]   [encoding=\typescriptthree]
-      \definefontsynonym [cmcsc10]  [\typescriptprefix{c:\typescriptthree}cc1000]   [encoding=\typescriptthree]
-      \definefontsynonym [cmdunh10] [\typescriptprefix{c:\typescriptthree}dh1000]   [encoding=\typescriptthree]
-      \definefontsynonym [cmff10]   [\typescriptprefix{c:\typescriptthree}ff1000]   [encoding=\typescriptthree]
-      \definefontsynonym [cmfi10]   [\typescriptprefix{c:\typescriptthree}fi1000]   [encoding=\typescriptthree]
-      \definefontsynonym [cmfib8]   [\typescriptprefix{c:\typescriptthree}fb0800]   [encoding=\typescriptthree]
-     %\definefontsynonym [cminch]   [\typescriptprefix{c:\typescriptthree}inch00]   [encoding=\typescriptthree]
-      \definefontsynonym [cmr10]    [\typescriptprefix{c:\typescriptthree}rm1000]   [encoding=\typescriptthree]
-      \definefontsynonym [cmr12]    [\typescriptprefix{c:\typescriptthree}rm1200]   [encoding=\typescriptthree]
-      \definefontsynonym [cmr17]    [\typescriptprefix{c:\typescriptthree}rm1700]   [encoding=\typescriptthree]
-      \definefontsynonym [cmr5]     [\typescriptprefix{c:\typescriptthree}rm0500]   [encoding=\typescriptthree]
-      \definefontsynonym [cmr6]     [\typescriptprefix{c:\typescriptthree}rm0600]   [encoding=\typescriptthree]
-      \definefontsynonym [cmr7]     [\typescriptprefix{c:\typescriptthree}rm0700]   [encoding=\typescriptthree]
-      \definefontsynonym [cmr8]     [\typescriptprefix{c:\typescriptthree}rm0800]   [encoding=\typescriptthree]
-      \definefontsynonym [cmr9]     [\typescriptprefix{c:\typescriptthree}rm0900]   [encoding=\typescriptthree]
-      \definefontsynonym [cmsl10]   [\typescriptprefix{c:\typescriptthree}sl1000]   [encoding=\typescriptthree]
-      \definefontsynonym [cmsl12]   [\typescriptprefix{c:\typescriptthree}sl1200]   [encoding=\typescriptthree]
-      \definefontsynonym [cmsl8]    [\typescriptprefix{c:\typescriptthree}sl0800]   [encoding=\typescriptthree]
-      \definefontsynonym [cmsl9]    [\typescriptprefix{c:\typescriptthree}sl0900]   [encoding=\typescriptthree]
-      \definefontsynonym [cmtcsc10] [\typescriptprefix{c:\typescriptthree}tc1000]   [encoding=\typescriptthree]
-      \definefontsynonym [cmti10]   [\typescriptprefix{c:\typescriptthree}ti1000]   [encoding=\typescriptthree]
-      \definefontsynonym [cmti12]   [\typescriptprefix{c:\typescriptthree}ti1200]   [encoding=\typescriptthree]
-      \definefontsynonym [cmti7]    [\typescriptprefix{c:\typescriptthree}ti0700]   [encoding=\typescriptthree]
-      \definefontsynonym [cmti8]    [\typescriptprefix{c:\typescriptthree}ti0800]   [encoding=\typescriptthree]
-      \definefontsynonym [cmti9]    [\typescriptprefix{c:\typescriptthree}ti0900]   [encoding=\typescriptthree]
-      \definefontsynonym [cmu10]    [\typescriptprefix{c:\typescriptthree}ui1000]   [encoding=\typescriptthree]
+        \definefontsynonym [cmb10]    [\typescriptprefix{c:\typescriptthree}rb1000]   [encoding=\typescriptthree]
+        \definefontsynonym [cmbx10]   [\typescriptprefix{c:\typescriptthree}bx1000]   [encoding=\typescriptthree]
+        \definefontsynonym [cmbx12]   [\typescriptprefix{c:\typescriptthree}bx1200]   [encoding=\typescriptthree]
+        \definefontsynonym [cmbx5]    [\typescriptprefix{c:\typescriptthree}bx0500]   [encoding=\typescriptthree]
+        \definefontsynonym [cmbx6]    [\typescriptprefix{c:\typescriptthree}bx0600]   [encoding=\typescriptthree]
+        \definefontsynonym [cmbx7]    [\typescriptprefix{c:\typescriptthree}bx0700]   [encoding=\typescriptthree]
+        \definefontsynonym [cmbx8]    [\typescriptprefix{c:\typescriptthree}bx0800]   [encoding=\typescriptthree]
+        \definefontsynonym [cmbx9]    [\typescriptprefix{c:\typescriptthree}bx0900]   [encoding=\typescriptthree]
+        \definefontsynonym [cmbxsl10] [\typescriptprefix{c:\typescriptthree}bl1000]   [encoding=\typescriptthree]
+        \definefontsynonym [cmbxti10] [\typescriptprefix{c:\typescriptthree}bi1000]   [encoding=\typescriptthree]
+        \definefontsynonym [cmcsc10]  [\typescriptprefix{c:\typescriptthree}cc1000]   [encoding=\typescriptthree]
+        \definefontsynonym [cmdunh10] [\typescriptprefix{c:\typescriptthree}dh1000]   [encoding=\typescriptthree]
+        \definefontsynonym [cmff10]   [\typescriptprefix{c:\typescriptthree}ff1000]   [encoding=\typescriptthree]
+        \definefontsynonym [cmfi10]   [\typescriptprefix{c:\typescriptthree}fi1000]   [encoding=\typescriptthree]
+        \definefontsynonym [cmfib8]   [\typescriptprefix{c:\typescriptthree}fb0800]   [encoding=\typescriptthree]
+       %\definefontsynonym [cminch]   [\typescriptprefix{c:\typescriptthree}inch00]   [encoding=\typescriptthree]
+        \definefontsynonym [cmr10]    [\typescriptprefix{c:\typescriptthree}rm1000]   [encoding=\typescriptthree]
+        \definefontsynonym [cmr12]    [\typescriptprefix{c:\typescriptthree}rm1200]   [encoding=\typescriptthree]
+        \definefontsynonym [cmr17]    [\typescriptprefix{c:\typescriptthree}rm1700]   [encoding=\typescriptthree]
+        \definefontsynonym [cmr5]     [\typescriptprefix{c:\typescriptthree}rm0500]   [encoding=\typescriptthree]
+        \definefontsynonym [cmr6]     [\typescriptprefix{c:\typescriptthree}rm0600]   [encoding=\typescriptthree]
+        \definefontsynonym [cmr7]     [\typescriptprefix{c:\typescriptthree}rm0700]   [encoding=\typescriptthree]
+        \definefontsynonym [cmr8]     [\typescriptprefix{c:\typescriptthree}rm0800]   [encoding=\typescriptthree]
+        \definefontsynonym [cmr9]     [\typescriptprefix{c:\typescriptthree}rm0900]   [encoding=\typescriptthree]
+        \definefontsynonym [cmsl10]   [\typescriptprefix{c:\typescriptthree}sl1000]   [encoding=\typescriptthree]
+        \definefontsynonym [cmsl12]   [\typescriptprefix{c:\typescriptthree}sl1200]   [encoding=\typescriptthree]
+        \definefontsynonym [cmsl8]    [\typescriptprefix{c:\typescriptthree}sl0800]   [encoding=\typescriptthree]
+        \definefontsynonym [cmsl9]    [\typescriptprefix{c:\typescriptthree}sl0900]   [encoding=\typescriptthree]
+        \definefontsynonym [cmtcsc10] [\typescriptprefix{c:\typescriptthree}tc1000]   [encoding=\typescriptthree]
+        \definefontsynonym [cmti10]   [\typescriptprefix{c:\typescriptthree}ti1000]   [encoding=\typescriptthree]
+        \definefontsynonym [cmti12]   [\typescriptprefix{c:\typescriptthree}ti1200]   [encoding=\typescriptthree]
+        \definefontsynonym [cmti7]    [\typescriptprefix{c:\typescriptthree}ti0700]   [encoding=\typescriptthree]
+        \definefontsynonym [cmti8]    [\typescriptprefix{c:\typescriptthree}ti0800]   [encoding=\typescriptthree]
+        \definefontsynonym [cmti9]    [\typescriptprefix{c:\typescriptthree}ti0900]   [encoding=\typescriptthree]
+        \definefontsynonym [cmu10]    [\typescriptprefix{c:\typescriptthree}ui1000]   [encoding=\typescriptthree]
     \stoptypescript
 
     \starttypescript [sans] [computer-modern] [t2a,t2b,t2c,x2]
-      \definefontsynonym [cmss10]   [\typescriptprefix{c:\typescriptthree}ss1000]   [encoding=\typescriptthree]
-      \definefontsynonym [cmss12]   [\typescriptprefix{c:\typescriptthree}ss1200]   [encoding=\typescriptthree]
-      \definefontsynonym [cmss17]   [\typescriptprefix{c:\typescriptthree}ss1700]   [encoding=\typescriptthree]
-      \definefontsynonym [cmss8]    [\typescriptprefix{c:\typescriptthree}ss0800]   [encoding=\typescriptthree]
-      \definefontsynonym [cmss9]    [\typescriptprefix{c:\typescriptthree}ss0900]   [encoding=\typescriptthree]
-      \definefontsynonym [cmssbx10] [\typescriptprefix{c:\typescriptthree}sx1000]   [encoding=\typescriptthree]
-     %\definefontsynonym [cmssdc10] [\typescriptprefix{c:\typescriptthree}ssdc1000] [encoding=\typescriptthree]
-      \definefontsynonym [cmssi10]  [\typescriptprefix{c:\typescriptthree}si1000]   [encoding=\typescriptthree]
-      \definefontsynonym [cmssi12]  [\typescriptprefix{c:\typescriptthree}si1200]   [encoding=\typescriptthree]
-      \definefontsynonym [cmssi17]  [\typescriptprefix{c:\typescriptthree}si1700]   [encoding=\typescriptthree]
-      \definefontsynonym [cmssi8]   [\typescriptprefix{c:\typescriptthree}si0800]   [encoding=\typescriptthree]
-      \definefontsynonym [cmssi9]   [\typescriptprefix{c:\typescriptthree}si0900]   [encoding=\typescriptthree]
-      \definefontsynonym [cmssq8]   [\typescriptprefix{c:\typescriptthree}ss0800]   [encoding=\typescriptthree]
-      \definefontsynonym [cmssqi8]  [\typescriptprefix{c:\typescriptthree}si0800]   [encoding=\typescriptthree]
+        \definefontsynonym [cmss10]   [\typescriptprefix{c:\typescriptthree}ss1000]   [encoding=\typescriptthree]
+        \definefontsynonym [cmss12]   [\typescriptprefix{c:\typescriptthree}ss1200]   [encoding=\typescriptthree]
+        \definefontsynonym [cmss17]   [\typescriptprefix{c:\typescriptthree}ss1700]   [encoding=\typescriptthree]
+        \definefontsynonym [cmss8]    [\typescriptprefix{c:\typescriptthree}ss0800]   [encoding=\typescriptthree]
+        \definefontsynonym [cmss9]    [\typescriptprefix{c:\typescriptthree}ss0900]   [encoding=\typescriptthree]
+        \definefontsynonym [cmssbx10] [\typescriptprefix{c:\typescriptthree}sx1000]   [encoding=\typescriptthree]
+       %\definefontsynonym [cmssdc10] [\typescriptprefix{c:\typescriptthree}ssdc1000] [encoding=\typescriptthree]
+        \definefontsynonym [cmssi10]  [\typescriptprefix{c:\typescriptthree}si1000]   [encoding=\typescriptthree]
+        \definefontsynonym [cmssi12]  [\typescriptprefix{c:\typescriptthree}si1200]   [encoding=\typescriptthree]
+        \definefontsynonym [cmssi17]  [\typescriptprefix{c:\typescriptthree}si1700]   [encoding=\typescriptthree]
+        \definefontsynonym [cmssi8]   [\typescriptprefix{c:\typescriptthree}si0800]   [encoding=\typescriptthree]
+        \definefontsynonym [cmssi9]   [\typescriptprefix{c:\typescriptthree}si0900]   [encoding=\typescriptthree]
+        \definefontsynonym [cmssq8]   [\typescriptprefix{c:\typescriptthree}ss0800]   [encoding=\typescriptthree]
+        \definefontsynonym [cmssqi8]  [\typescriptprefix{c:\typescriptthree}si0800]   [encoding=\typescriptthree]
     \stoptypescript
 
     \starttypescript [mono] [computer-modern] [t2a,t2b,t2c,x2]
-      \definefontsynonym [cmitt10]  [\typescriptprefix{c:\typescriptthree}it1000]   [encoding=\typescriptthree]
-      \definefontsynonym [cmsltt10] [\typescriptprefix{c:\typescriptthree}st1000]   [encoding=\typescriptthree]
-      \definefontsynonym [cmtt10]   [\typescriptprefix{c:\typescriptthree}tt1000]   [encoding=\typescriptthree]
-      \definefontsynonym [cmtt12]   [\typescriptprefix{c:\typescriptthree}tt1200]   [encoding=\typescriptthree]
-      \definefontsynonym [cmtt8]    [\typescriptprefix{c:\typescriptthree}tt0800]   [encoding=\typescriptthree]
-      \definefontsynonym [cmtt9]    [\typescriptprefix{c:\typescriptthree}tt0900]   [encoding=\typescriptthree]
-      \definefontsynonym [cmvtt10]  [\typescriptprefix{c:\typescriptthree}vt1000]   [encoding=\typescriptthree]
+        \definefontsynonym [cmitt10]  [\typescriptprefix{c:\typescriptthree}it1000]   [encoding=\typescriptthree]
+        \definefontsynonym [cmsltt10] [\typescriptprefix{c:\typescriptthree}st1000]   [encoding=\typescriptthree]
+        \definefontsynonym [cmtt10]   [\typescriptprefix{c:\typescriptthree}tt1000]   [encoding=\typescriptthree]
+        \definefontsynonym [cmtt12]   [\typescriptprefix{c:\typescriptthree}tt1200]   [encoding=\typescriptthree]
+        \definefontsynonym [cmtt8]    [\typescriptprefix{c:\typescriptthree}tt0800]   [encoding=\typescriptthree]
+        \definefontsynonym [cmtt9]    [\typescriptprefix{c:\typescriptthree}tt0900]   [encoding=\typescriptthree]
+        \definefontsynonym [cmvtt10]  [\typescriptprefix{c:\typescriptthree}vt1000]   [encoding=\typescriptthree]
     \stoptypescript
 
     \starttypescript [serif] [computer-modern] [lcy]
-      \definefontsynonym [cmb10]    [lhb10]    [encoding=lcy]
-      \definefontsynonym [cmbx10]   [lhbx10]   [encoding=lcy]
-      \definefontsynonym [cmbx12]   [lhbx12]   [encoding=lcy]
-      \definefontsynonym [cmbx5]    [lhbx5]    [encoding=lcy]
-      \definefontsynonym [cmbx6]    [lhbx6]    [encoding=lcy]
-      \definefontsynonym [cmbx7]    [lhbx7]    [encoding=lcy]
-      \definefontsynonym [cmbx8]    [lhbx8]    [encoding=lcy]
-      \definefontsynonym [cmbx9]    [lhbx9]    [encoding=lcy]
-      \definefontsynonym [cmbxsl10] [lhbxsl10] [encoding=lcy]
-      \definefontsynonym [cmbxti10] [lhbxti10] [encoding=lcy]
-      \definefontsynonym [cmcsc10]  [lhcsc10]  [encoding=lcy]
-      \definefontsynonym [cmdunh10] [lhdunh10] [encoding=lcy]
-      \definefontsynonym [cmff10]   [lhff10]   [encoding=lcy]
-      \definefontsynonym [cmfi10]   [lhfi10]   [encoding=lcy]
-      \definefontsynonym [cmfib8]   [lhfib8]   [encoding=lcy]
-      \definefontsynonym [cminch]   [lhinch]   [encoding=lcy]
-      \definefontsynonym [cmr10]    [lhr10]    [encoding=lcy]
-      \definefontsynonym [cmr12]    [lhr12]    [encoding=lcy]
-      \definefontsynonym [cmr17]    [lhr17]    [encoding=lcy]
-      \definefontsynonym [cmr5]     [lhr5]     [encoding=lcy]
-      \definefontsynonym [cmr6]     [lhr6]     [encoding=lcy]
-      \definefontsynonym [cmr7]     [lhr7]     [encoding=lcy]
-      \definefontsynonym [cmr8]     [lhr8]     [encoding=lcy]
-      \definefontsynonym [cmr9]     [lhr9]     [encoding=lcy]
-      \definefontsynonym [cmsl10]   [lhsl10]   [encoding=lcy]
-      \definefontsynonym [cmsl12]   [lhsl12]   [encoding=lcy]
-      \definefontsynonym [cmsl8]    [lhsl8]    [encoding=lcy]
-      \definefontsynonym [cmsl9]    [lhsl9]    [encoding=lcy]
-      \definefontsynonym [cmtcsc10] [lhtcsc10] [encoding=lcy]
-      \definefontsynonym [cmtex10]  [lhtex10]  [encoding=lcy]
-      \definefontsynonym [cmtex8]   [lhtex8]   [encoding=lcy]
-      \definefontsynonym [cmtex9]   [lhtex9]   [encoding=lcy]
-      \definefontsynonym [cmti10]   [lhti10]   [encoding=lcy]
-      \definefontsynonym [cmti12]   [lhti12]   [encoding=lcy]
-      \definefontsynonym [cmti7]    [lhti7]    [encoding=lcy]
-      \definefontsynonym [cmti8]    [lhti8]    [encoding=lcy]
-      \definefontsynonym [cmti9]    [lhti9]    [encoding=lcy]
-      \definefontsynonym [cmu10]    [lhu10]    [encoding=lcy]
+        \definefontsynonym [cmb10]    [lhb10]    [encoding=lcy]
+        \definefontsynonym [cmbx10]   [lhbx10]   [encoding=lcy]
+        \definefontsynonym [cmbx12]   [lhbx12]   [encoding=lcy]
+        \definefontsynonym [cmbx5]    [lhbx5]    [encoding=lcy]
+        \definefontsynonym [cmbx6]    [lhbx6]    [encoding=lcy]
+        \definefontsynonym [cmbx7]    [lhbx7]    [encoding=lcy]
+        \definefontsynonym [cmbx8]    [lhbx8]    [encoding=lcy]
+        \definefontsynonym [cmbx9]    [lhbx9]    [encoding=lcy]
+        \definefontsynonym [cmbxsl10] [lhbxsl10] [encoding=lcy]
+        \definefontsynonym [cmbxti10] [lhbxti10] [encoding=lcy]
+        \definefontsynonym [cmcsc10]  [lhcsc10]  [encoding=lcy]
+        \definefontsynonym [cmdunh10] [lhdunh10] [encoding=lcy]
+        \definefontsynonym [cmff10]   [lhff10]   [encoding=lcy]
+        \definefontsynonym [cmfi10]   [lhfi10]   [encoding=lcy]
+        \definefontsynonym [cmfib8]   [lhfib8]   [encoding=lcy]
+        \definefontsynonym [cminch]   [lhinch]   [encoding=lcy]
+        \definefontsynonym [cmr10]    [lhr10]    [encoding=lcy]
+        \definefontsynonym [cmr12]    [lhr12]    [encoding=lcy]
+        \definefontsynonym [cmr17]    [lhr17]    [encoding=lcy]
+        \definefontsynonym [cmr5]     [lhr5]     [encoding=lcy]
+        \definefontsynonym [cmr6]     [lhr6]     [encoding=lcy]
+        \definefontsynonym [cmr7]     [lhr7]     [encoding=lcy]
+        \definefontsynonym [cmr8]     [lhr8]     [encoding=lcy]
+        \definefontsynonym [cmr9]     [lhr9]     [encoding=lcy]
+        \definefontsynonym [cmsl10]   [lhsl10]   [encoding=lcy]
+        \definefontsynonym [cmsl12]   [lhsl12]   [encoding=lcy]
+        \definefontsynonym [cmsl8]    [lhsl8]    [encoding=lcy]
+        \definefontsynonym [cmsl9]    [lhsl9]    [encoding=lcy]
+        \definefontsynonym [cmtcsc10] [lhtcsc10] [encoding=lcy]
+        \definefontsynonym [cmtex10]  [lhtex10]  [encoding=lcy]
+        \definefontsynonym [cmtex8]   [lhtex8]   [encoding=lcy]
+        \definefontsynonym [cmtex9]   [lhtex9]   [encoding=lcy]
+        \definefontsynonym [cmti10]   [lhti10]   [encoding=lcy]
+        \definefontsynonym [cmti12]   [lhti12]   [encoding=lcy]
+        \definefontsynonym [cmti7]    [lhti7]    [encoding=lcy]
+        \definefontsynonym [cmti8]    [lhti8]    [encoding=lcy]
+        \definefontsynonym [cmti9]    [lhti9]    [encoding=lcy]
+        \definefontsynonym [cmu10]    [lhu10]    [encoding=lcy]
     \stoptypescript
 
     \starttypescript [sans] [computer-modern] [lcy]
-      \definefontsynonym [cmss10]   [lhss10]   [encoding=lcy]
-      \definefontsynonym [cmss12]   [lhss12]   [encoding=lcy]
-      \definefontsynonym [cmss17]   [lhss17]   [encoding=lcy]
-      \definefontsynonym [cmss8]    [lhss8]    [encoding=lcy]
-      \definefontsynonym [cmss9]    [lhss9]    [encoding=lcy]
-      \definefontsynonym [cmssbi10] [lhssbi10] [encoding=lcy]
-      \definefontsynonym [cmssbx10] [lhssbx10] [encoding=lcy]
-      \definefontsynonym [cmssdc10] [lhssdc10] [encoding=lcy]
-      \definefontsynonym [cmssi10]  [lhssi10]  [encoding=lcy]
-      \definefontsynonym [cmssi12]  [lhssi12]  [encoding=lcy]
-      \definefontsynonym [cmssi17]  [lhssi17]  [encoding=lcy]
-      \definefontsynonym [cmssi8]   [lhssi8]   [encoding=lcy]
-      \definefontsynonym [cmssi9]   [lhssi9]   [encoding=lcy]
-      \definefontsynonym [cmssq8]   [lhssq8]   [encoding=lcy]
-      \definefontsynonym [cmssqi8]  [lhssqi8]  [encoding=lcy]
+        \definefontsynonym [cmss10]   [lhss10]   [encoding=lcy]
+        \definefontsynonym [cmss12]   [lhss12]   [encoding=lcy]
+        \definefontsynonym [cmss17]   [lhss17]   [encoding=lcy]
+        \definefontsynonym [cmss8]    [lhss8]    [encoding=lcy]
+        \definefontsynonym [cmss9]    [lhss9]    [encoding=lcy]
+        \definefontsynonym [cmssbi10] [lhssbi10] [encoding=lcy]
+        \definefontsynonym [cmssbx10] [lhssbx10] [encoding=lcy]
+        \definefontsynonym [cmssdc10] [lhssdc10] [encoding=lcy]
+        \definefontsynonym [cmssi10]  [lhssi10]  [encoding=lcy]
+        \definefontsynonym [cmssi12]  [lhssi12]  [encoding=lcy]
+        \definefontsynonym [cmssi17]  [lhssi17]  [encoding=lcy]
+        \definefontsynonym [cmssi8]   [lhssi8]   [encoding=lcy]
+        \definefontsynonym [cmssi9]   [lhssi9]   [encoding=lcy]
+        \definefontsynonym [cmssq8]   [lhssq8]   [encoding=lcy]
+        \definefontsynonym [cmssqi8]  [lhssqi8]  [encoding=lcy]
     \stoptypescript
 
     \starttypescript [mono] [computer-modern] [lcy]
-      \definefontsynonym [cmitt10]  [lhitt10]  [encoding=lcy]
-      \definefontsynonym [cmsltt10] [lhsltt10] [encoding=lcy]
-      \definefontsynonym [cmtt10]   [lhtt10]   [encoding=lcy]
-      \definefontsynonym [cmtt12]   [lhtt12]   [encoding=lcy]
-      \definefontsynonym [cmtt8]    [lhtt8]    [encoding=lcy]
-      \definefontsynonym [cmtt9]    [lhtt9]    [encoding=lcy]
-      \definefontsynonym [cmvtt10]  [lhvtt10]  [encoding=lcy]
+        \definefontsynonym [cmitt10]  [lhitt10]  [encoding=lcy]
+        \definefontsynonym [cmsltt10] [lhsltt10] [encoding=lcy]
+        \definefontsynonym [cmtt10]   [lhtt10]   [encoding=lcy]
+        \definefontsynonym [cmtt12]   [lhtt12]   [encoding=lcy]
+        \definefontsynonym [cmtt8]    [lhtt8]    [encoding=lcy]
+        \definefontsynonym [cmtt9]    [lhtt9]    [encoding=lcy]
+        \definefontsynonym [cmvtt10]  [lhvtt10]  [encoding=lcy]
     \stoptypescript
 
     %
 
     \starttypescript [math] [modern,computer-modern,latin-modern] % [default]
-      % watch the space, it prevents remapping
-      \definefontsynonym [ComputerModernMath-Roman]     [rm-lmr10]% [lmr10 ]
-      \definefontsynonym [ComputerModernMath-Extension] [lmex10]
-      \definefontsynonym [ComputerModernMath-Italic]    [lmmi10]
-      \definefontsynonym [ComputerModernMath-Symbol]    [lmsy10]
+        % watch the space, it prevents remapping
+        \definefontsynonym [ComputerModernMath-Roman]     [rm-lmr10]% [lmr10 ]
+        \definefontsynonym [ComputerModernMath-Extension] [lmex10]
+        \definefontsynonym [ComputerModernMath-Italic]    [lmmi10]
+        \definefontsynonym [ComputerModernMath-Symbol]    [lmsy10]
     \stoptypescript
 
     \starttypescript [boldmath,bfmath] [modern,computer-modern,latin-modern] % [default]
-      % watch the space, it prevents remapping
-      \definefontsynonym [ComputerModernMath-Roman-Bold]  [rm-lmb10] % [lmb10 ]
-      \definefontsynonym [ComputerModernMath-Extension]   [lmex10]
-      \definefontsynonym [ComputerModernMath-Italic-Bold] [lmmib10]
-      \definefontsynonym [ComputerModernMath-Symbol-Bold] [lmbsy10]
+        % watch the space, it prevents remapping
+        \definefontsynonym [ComputerModernMath-Roman-Bold]  [rm-lmb10] % [lmb10 ]
+        \definefontsynonym [ComputerModernMath-Extension]   [lmex10]
+        \definefontsynonym [ComputerModernMath-Italic-Bold] [lmmib10]
+        \definefontsynonym [ComputerModernMath-Symbol-Bold] [lmbsy10]
     \stoptypescript
 
     % Till we have cyrilic in lm:
@@ -419,48 +419,48 @@
     % \setupbodyfont[modern,10pt]
 
     \starttypescript [serif] [computer-modern] [t2a,t2b,t2c,x2]
-      \definefontsynonym [Serif]                [\typescriptprefix{c:\typescriptthree}rm1000] [encoding=\typescriptthree]
-      \definefontsynonym [SerifItalic]          [\typescriptprefix{c:\typescriptthree}ti1000] [encoding=\typescriptthree]
-      \definefontsynonym [SerifSlanted]         [\typescriptprefix{c:\typescriptthree}sl1000] [encoding=\typescriptthree]
-      \definefontsynonym [SerifBold]            [\typescriptprefix{c:\typescriptthree}bx1000] [encoding=\typescriptthree]
-      \definefontsynonym [SerifBoldItalic]      [\typescriptprefix{c:\typescriptthree}bi1000] [encoding=\typescriptthree]
-      \definefontsynonym [SerifBoldSlanted]     [\typescriptprefix{c:\typescriptthree}bl1000] [encoding=\typescriptthree]
-      \definefontsynonym [SerifCaps]            [\typescriptprefix{c:\typescriptthree}cc1000] [encoding=\typescriptthree]
-      \definefontsynonym [SerifCapsSlanted]     [\typescriptprefix{c:\typescriptthree}sc1000] [encoding=\typescriptthree]
+        \definefontsynonym [Serif]                [\typescriptprefix{c:\typescriptthree}rm1000] [encoding=\typescriptthree]
+        \definefontsynonym [SerifItalic]          [\typescriptprefix{c:\typescriptthree}ti1000] [encoding=\typescriptthree]
+        \definefontsynonym [SerifSlanted]         [\typescriptprefix{c:\typescriptthree}sl1000] [encoding=\typescriptthree]
+        \definefontsynonym [SerifBold]            [\typescriptprefix{c:\typescriptthree}bx1000] [encoding=\typescriptthree]
+        \definefontsynonym [SerifBoldItalic]      [\typescriptprefix{c:\typescriptthree}bi1000] [encoding=\typescriptthree]
+        \definefontsynonym [SerifBoldSlanted]     [\typescriptprefix{c:\typescriptthree}bl1000] [encoding=\typescriptthree]
+        \definefontsynonym [SerifCaps]            [\typescriptprefix{c:\typescriptthree}cc1000] [encoding=\typescriptthree]
+        \definefontsynonym [SerifCapsSlanted]     [\typescriptprefix{c:\typescriptthree}sc1000] [encoding=\typescriptthree]
     \stoptypescript
 
     \starttypescript [sans] [computer-modern] [t2a,t2b,t2c,x2]
-      \definefontsynonym [Sans]            [\typescriptprefix{c:\typescriptthree}ss1000] [encoding=\typescriptthree]
-      \definefontsynonym [SansItalic]      [\typescriptprefix{c:\typescriptthree}si1000] [encoding=\typescriptthree]
-      \definefontsynonym [SansSlanted]     [\typescriptprefix{c:\typescriptthree}si1000] [encoding=\typescriptthree]
-      \definefontsynonym [SansBold]        [\typescriptprefix{c:\typescriptthree}sx1000] [encoding=\typescriptthree]
-      \definefontsynonym [SansBoldItalic]  [\typescriptprefix{c:\typescriptthree}so1000] [encoding=\typescriptthree]
-      \definefontsynonym [SansBoldSlanted] [\typescriptprefix{c:\typescriptthree}so1000] [encoding=\typescriptthree]
-      \definefontsynonym [SansCaps]        [\typescriptprefix{c:\typescriptthree}ss1000] [encoding=\typescriptthree]
-      \definefontsynonym [SansCapsSlanted] [\typescriptprefix{c:\typescriptthree}si1000] [encoding=\typescriptthree]
+        \definefontsynonym [Sans]            [\typescriptprefix{c:\typescriptthree}ss1000] [encoding=\typescriptthree]
+        \definefontsynonym [SansItalic]      [\typescriptprefix{c:\typescriptthree}si1000] [encoding=\typescriptthree]
+        \definefontsynonym [SansSlanted]     [\typescriptprefix{c:\typescriptthree}si1000] [encoding=\typescriptthree]
+        \definefontsynonym [SansBold]        [\typescriptprefix{c:\typescriptthree}sx1000] [encoding=\typescriptthree]
+        \definefontsynonym [SansBoldItalic]  [\typescriptprefix{c:\typescriptthree}so1000] [encoding=\typescriptthree]
+        \definefontsynonym [SansBoldSlanted] [\typescriptprefix{c:\typescriptthree}so1000] [encoding=\typescriptthree]
+        \definefontsynonym [SansCaps]        [\typescriptprefix{c:\typescriptthree}ss1000] [encoding=\typescriptthree]
+        \definefontsynonym [SansCapsSlanted] [\typescriptprefix{c:\typescriptthree}si1000] [encoding=\typescriptthree]
     \stoptypescript
 
     \starttypescript [mono] [computer-modern] [t2a,t2b,t2c,x2]
-      \definefontsynonym [Mono]            [\typescriptprefix{c:\typescriptthree}tt1000] [encoding=\typescriptthree]
-      \definefontsynonym [MonoItalic]      [\typescriptprefix{c:\typescriptthree}it1000] [encoding=\typescriptthree]
-      \definefontsynonym [MonoSlanted]     [\typescriptprefix{c:\typescriptthree}st1000] [encoding=\typescriptthree]
-      \definefontsynonym [MonoBold]        [\typescriptprefix{c:\typescriptthree}tt1000] [encoding=\typescriptthree]
-      \definefontsynonym [MonoBoldItalic]  [\typescriptprefix{c:\typescriptthree}it1000] [encoding=\typescriptthree]
-      \definefontsynonym [MonoBoldSlanted] [\typescriptprefix{c:\typescriptthree}st1000] [encoding=\typescriptthree]
-      \definefontsynonym [MonoCaps]        [\typescriptprefix{c:\typescriptthree}tc1000] [encoding=\typescriptthree]
-      \definefontsynonym [MonoCapsSlanted] [\typescriptprefix{c:\typescriptthree}tc1000] [encoding=\typescriptthree]
+        \definefontsynonym [Mono]            [\typescriptprefix{c:\typescriptthree}tt1000] [encoding=\typescriptthree]
+        \definefontsynonym [MonoItalic]      [\typescriptprefix{c:\typescriptthree}it1000] [encoding=\typescriptthree]
+        \definefontsynonym [MonoSlanted]     [\typescriptprefix{c:\typescriptthree}st1000] [encoding=\typescriptthree]
+        \definefontsynonym [MonoBold]        [\typescriptprefix{c:\typescriptthree}tt1000] [encoding=\typescriptthree]
+        \definefontsynonym [MonoBoldItalic]  [\typescriptprefix{c:\typescriptthree}it1000] [encoding=\typescriptthree]
+        \definefontsynonym [MonoBoldSlanted] [\typescriptprefix{c:\typescriptthree}st1000] [encoding=\typescriptthree]
+        \definefontsynonym [MonoCaps]        [\typescriptprefix{c:\typescriptthree}tc1000] [encoding=\typescriptthree]
+        \definefontsynonym [MonoCapsSlanted] [\typescriptprefix{c:\typescriptthree}tc1000] [encoding=\typescriptthree]
     \stoptypescript
 
     % Computer Concrete (AMS)
 
     \starttypescript [serif] [concrete] [default]
-      \definefontsynonym [ComputerConcrete]             [ccr10]
-      \definefontsynonym [ComputerConcrete-Italic]      [ccti10]
-      \definefontsynonym [ComputerConcrete-Slanted]     [ccsl10]
-      \definefontsynonym [ComputerConcrete-Bold]        [ComputerConcrete]
-      \definefontsynonym [ComputerConcrete-BoldItalic]  [ComputerConcrete-Italic]
-      \definefontsynonym [ComputerConcrete-BoldSlanted] [ComputerConcrete-Slanted]
-      \definefontsynonym [ComputerConcrete-Caps]        [cccsc10]
+        \definefontsynonym [ComputerConcrete]             [ccr10]
+        \definefontsynonym [ComputerConcrete-Italic]      [ccti10]
+        \definefontsynonym [ComputerConcrete-Slanted]     [ccsl10]
+        \definefontsynonym [ComputerConcrete-Bold]        [ComputerConcrete]
+        \definefontsynonym [ComputerConcrete-BoldItalic]  [ComputerConcrete-Italic]
+        \definefontsynonym [ComputerConcrete-BoldSlanted] [ComputerConcrete-Slanted]
+        \definefontsynonym [ComputerConcrete-Caps]        [cccsc10]
     \stoptypescript
 
     \starttypescript [serif] [modern,computer-modern,latin-modern] [name]
@@ -2553,13 +2553,13 @@
     % so we keep using that as default
 
     % \starttypescript [mono] [lucida] [name]
-    % 	\definefontsynonym [Mono]            [LucidaTypewriter]
-    % 	\definefontsynonym [MonoBold]        [LucidaTypewriterBold]
-    % 	\definefontsynonym [MonoItalic]      [LucidaTypewriterOblique]
-    % 	\definefontsynonym [MonoBoldItalic]  [LucidaTypewriterBoldOblique]
-    % 	\definefontsynonym [MonoSlanted]     [LucidaTypewriterOblique]
-    % 	\definefontsynonym [MonoBoldSlanted] [LucidaTypewriterBoldOblique]
-    % 	\definefontsynonym [MonoCaps]        [LucidaTypewriter]
+    %     \definefontsynonym [Mono]            [LucidaTypewriter]
+    %     \definefontsynonym [MonoBold]        [LucidaTypewriterBold]
+    %     \definefontsynonym [MonoItalic]      [LucidaTypewriterOblique]
+    %     \definefontsynonym [MonoBoldItalic]  [LucidaTypewriterBoldOblique]
+    %     \definefontsynonym [MonoSlanted]     [LucidaTypewriterOblique]
+    %     \definefontsynonym [MonoBoldSlanted] [LucidaTypewriterBoldOblique]
+    %     \definefontsynonym [MonoCaps]        [LucidaTypewriter]
     % \stoptypescript
 
     % Lucida Bright Sans Typewriter
@@ -2790,14 +2790,14 @@
         \loadmapfile[dejavu-truetype.map]
     \stoptypescript
 
-  \starttypescript [mono] [dejavu,dejavu-condensed] [ec,qx,t2a]
-      \definefontsynonym [DejaVuSansMono]                      [DejaVuSansMono-tlf-\typescriptprefix{e:\typescriptthree}]            [encoding=\typescriptthree]
-      \definefontsynonym [DejaVuSansMono-Italic]               [DejaVuSansMono-Italic-tlf-\typescriptprefix{e:\typescriptthree}]     [encoding=\typescriptthree]
-      \definefontsynonym [DejaVuSansMono-Bold]                 [DejaVuSansMono-Bold-tlf-\typescriptprefix{e:\typescriptthree}]       [encoding=\typescriptthree]
-      \definefontsynonym [DejaVuSansMono-BoldItalic]           [DejaVuSansMono-BoldItalic-tlf-\typescriptprefix{e:\typescriptthree}] [encoding=\typescriptthree]
+    \starttypescript [mono] [dejavu,dejavu-condensed] [ec,qx,t2a]
+        \definefontsynonym [DejaVuSansMono]                      [DejaVuSansMono-tlf-\typescriptprefix{e:\typescriptthree}]            [encoding=\typescriptthree]
+        \definefontsynonym [DejaVuSansMono-Italic]               [DejaVuSansMono-Italic-tlf-\typescriptprefix{e:\typescriptthree}]     [encoding=\typescriptthree]
+        \definefontsynonym [DejaVuSansMono-Bold]                 [DejaVuSansMono-Bold-tlf-\typescriptprefix{e:\typescriptthree}]       [encoding=\typescriptthree]
+        \definefontsynonym [DejaVuSansMono-BoldItalic]           [DejaVuSansMono-BoldItalic-tlf-\typescriptprefix{e:\typescriptthree}] [encoding=\typescriptthree]
 
-      \loadmapfile[dejavu-truetype.map]
-  \stoptypescript
+        \loadmapfile[dejavu-truetype.map]
+    \stoptypescript
 
     \starttypescript [serif] [dejavu] [name]
         \definefontsynonym [Serif]            [DejaVuSerif]
@@ -2843,16 +2843,16 @@
         \definefontsynonym [SansCaps]         [Sans]
     \stoptypescript
 
-  \starttypescript [mono] [dejavu,dejavu-condensed] [name]
-      \definefontsynonym [Mono]             [DejaVuSansMono]
-      \definefontsynonym [MonoItalic]       [DejaVuSansMono-Italic]
-      \definefontsynonym [MonoBold]         [DejaVuSansMono-Bold]
-      \definefontsynonym [MonoBoldItalic]   [DejaVuSansMono-BoldItalic]
+    \starttypescript [mono] [dejavu,dejavu-condensed] [name]
+        \definefontsynonym [Mono]             [DejaVuSansMono]
+        \definefontsynonym [MonoItalic]       [DejaVuSansMono-Italic]
+        \definefontsynonym [MonoBold]         [DejaVuSansMono-Bold]
+        \definefontsynonym [MonoBoldItalic]   [DejaVuSansMono-BoldItalic]
 
-      \definefontsynonym [MonoSlanted]      [MonoItalic]
-      \definefontsynonym [MonoBoldSlanted]  [MonoBoldItalic]
-      \definefontsynonym [MonoCaps]         [Mono]
-  \stoptypescript
+        \definefontsynonym [MonoSlanted]      [MonoItalic]
+        \definefontsynonym [MonoBoldSlanted]  [MonoBoldItalic]
+        \definefontsynonym [MonoCaps]         [Mono]
+    \stoptypescript
 
     \starttypescript [dejavu] [ec,qx,t2a]
         \definetypeface [dejavu] [rm] [serif] [dejavu] [default] [encoding=\typescripttwo]
@@ -2872,4 +2872,46 @@
 
 \stoptypescriptcollection
 
+\starttypescriptcollection[gentium]
+
+    \starttypescript [serif] [gentium] [ec,texnansi,qx,t5,l7x]
+        \definefontsynonym [Gentium-Roman]       [\typescriptthree-gentiumplus-regular]     [encoding=\typescriptthree]
+        \definefontsynonym [Gentium-Italic]      [\typescriptthree-gentiumplus-italic]      [encoding=\typescriptthree]
+        \definefontsynonym [Gentium-Bold]        [\typescriptthree-gentiumbasic-bold]       [encoding=\typescriptthree]
+        \definefontsynonym [Gentium-BoldItalic]  [\typescriptthree-gentiumbasic-bolditalic] [encoding=\typescriptthree]
+        \definefontsynonym [Gentium-RomanCaps]   [\typescriptthree-gentiumplus-regular-sc]  [encoding=\typescriptthree]
+        \definefontsynonym [Gentium-Slanted]     [Gentium-Italic]
+        \definefontsynonym [Gentium-BoldSlanted] [Gentium-BoldItalic]
+        \loadmapfile[gentium-\typescriptthree.map]
+    \stoptypescript
+
+    \starttypescript [serif] [gentium] [agr,t2a]
+        \definefontsynonym [Gentium-Roman]       [\typescriptthree-gentiumplus-regular]    [encoding=\typescriptthree]
+        \definefontsynonym [Gentium-Italic]      [\typescriptthree-gentiumplus-italic]     [encoding=\typescriptthree]
+        \definefontsynonym [Gentium-RomanCaps]   [\typescriptthree-gentiumplus-regular-sc] [encoding=\typescriptthree]
+        \definefontsynonym [Gentium-Bold]        [Gentium-Roman]
+        \definefontsynonym [Gentium-BoldItalic]  [Gentium-Italic]
+        \definefontsynonym [Gentium-Slanted]     [Gentium-Italic]
+        \definefontsynonym [Gentium-BoldSlanted] [Gentium-Italic]
+        \loadmapfile[gentium-\typescriptthree.map]
+    \stoptypescript
+
+    \starttypescript [serif] [gentium] [name]
+        \usetypescript[serif][fallback]
+        \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]        [Gentium-RomanCaps]
+        \definefontsynonym [OldStyle]         [Serif]
+    \stoptypescript
+
+    \starttypescript [gentium] [ec,texnansi,qx,t5,t2a,agr,l7x]
+        \definetypeface [gentium] [rm] [serif] [gentium] [default] [encoding=\typescripttwo]
+    \stoptypescript
+
+\stoptypescriptcollection
+
 \endinput