2015-05-15 23:06:00

1 files changed, 77 insertions, 105 deletions

diff --git a/fonts/map/pdftex/context/mkiv-base.map b/fonts/map/pdftex/context/mkiv-base.map
index 482bf0894..fc2aa643b 100644
--- a/fonts/map/pdftex/context/mkiv-base.map
+++ b/fonts/map/pdftex/context/mkiv-base.map
@@ -135,110 +135,8 @@ eusm5  EUSM5  <eusm5.pfb
 eusm7  EUSM7  <eusm7.pfb
 eusm10 EUSM10 <eusm10.pfb
 
-% lm leftovers, used by inclusion
-
-cmb10     CMB10     <lm-rep-cmrm.enc  <lmb10.pfb
-cmbx10    CMBX10    <lm-rep-cmrm.enc  <lmbx10.pfb
-cmbx12    CMBX12    <lm-rep-cmrm.enc  <lmbx12.pfb
-cmbx5     CMBX5     <lm-rep-cmrm.enc  <lmbx5.pfb
-cmbx6     CMBX6     <lm-rep-cmrm.enc  <lmbx6.pfb
-cmbx7     CMBX7     <lm-rep-cmrm.enc  <lmbx7.pfb
-cmbx8     CMBX8     <lm-rep-cmrm.enc  <lmbx8.pfb
-cmbx9     CMBX9     <lm-rep-cmrm.enc  <lmbx9.pfb
-cmbxsl10  CMBXSL10  <lm-rep-cmrm.enc  <lmbxo10.pfb
-cmbxti10  CMBXTI10  <lm-rep-cmit.enc  <lmbxi10.pfb
-cmbxti12  CMBXTI12  <lm-rep-cmit.enc  <lmbxti10.pfb
-cmbxti7   CMBXTI7   <lm-rep-cmit.enc  <lmbxti10.pfb
-cmcsc10   CMCSC10   <lm-rep-cmsc.enc  <lmcsc10.pfb
-cmcsc8    CMCSC8    <lm-rep-cmsc.enc  <lmcsc10.pfb
-cmcsc9    CMCSC9    <lm-rep-cmsc.enc  <lmcsc10.pfb
-cminch    CMINCH    <lm-rep-cmin.enc  <lmssbx10.pfb
-cmitt10   CMITT10   <lm-rep-cmitt.enc <lmtti10.pfb
-cmitt12   CMITT12   <lm-rep-cmitt.enc <lmtti10.pfb
-cmitt9    CMITT9    <lm-rep-cmitt.enc <lmtti10.pfb
-cmr10     CMR10     <lm-rep-cmrm.enc  <lmr10.pfb
-cmr12     CMR12     <lm-rep-cmrm.enc  <lmr12.pfb
-cmr17     CMR17     <lm-rep-cmrm.enc  <lmr17.pfb
-cmr5      CMR5      <lm-rep-cmsc.enc  <lmr5.pfb
-cmr6      CMR6      <lm-rep-cmrm.enc  <lmr6.pfb
-cmr7      CMR7      <lm-rep-cmrm.enc  <lmr7.pfb
-cmr8      CMR8      <lm-rep-cmrm.enc  <lmr8.pfb
-cmr9      CMR9      <lm-rep-cmrm.enc  <lmr9.pfb
-cmsl10    CMSL10    <lm-rep-cmrm.enc  <lmro10.pfb
-cmsl12    CMSL12    <lm-rep-cmrm.enc  <lmro12.pfb
-cmsl6     CMSL6     <lm-rep-cmrm.enc  <lmro8.pfb
-cmsl8     CMSL8     <lm-rep-cmrm.enc  <lmro8.pfb
-cmsl9     CMSL9     <lm-rep-cmrm.enc  <lmro9.pfb
-cmsltt10  CMSLTT10  <lm-rep-cmtt.enc  <lmtto10.pfb
-cmsltt9   CMSLTT9   <lm-rep-cmtt.enc  <lmtto10.pfb
-cmss10    CMS10     <lm-rep-cmrm.enc  <lmss10.pfb
-cmss12    CMS12     <lm-rep-cmrm.enc  <lmss12.pfb
-cmss17    CMS17     <lm-rep-cmrm.enc  <lmss17.pfb
-cmss8     CMS8      <lm-rep-cmrm.enc  <lmss8.pfb
-cmss9     CMS9      <lm-rep-cmrm.enc  <lmss9.pfb
-cmssbx10  CMSSBX10  <lm-rep-cmrm.enc  <lmssbx10.pfb
-cmssbxo10 CMSSBXO10 <lm-rep-cmrm.enc  <lmssbo10.pfb
-cmssdc10  CMSSDC10  <lm-rep-cmrm.enc  <lmssdc10.pfb
-cmssi10   CMSI10    <lm-rep-cmrm.enc  <lmsso10.pfb
-cmssi12   CMSI12    <lm-rep-cmrm.enc  <lmsso12.pfb
-cmssi17   CMSI17    <lm-rep-cmrm.enc  <lmsso17.pfb
-cmssi8    CMSSI8    <lm-rep-cmrm.enc  <lmsso8.pfb
-cmssi9    CMSSI9    <lm-rep-cmrm.enc  <lmsso9.pfb
-cmssq8    CMSQ8     <lm-rep-cmrm.enc  <lmssq8.pfb
-cmssqi8   CMSSQI8   <lm-rep-cmrm.enc  <lmssqo8.pfb
-cmtcsc10  CMTCSC10  <lm-rep-cmtt.enc  <lmtcsc10.pfb
-cmti10    CMTI10    <lm-rep-cmit.enc  <lmri10.pfb
-cmti12    CMTI12    <lm-rep-cmit.enc  <lmri12.pfb
-cmti7     CMTI7     <lm-rep-cmit.enc  <lmri7.pfb
-cmti8     CMTI8     <lm-rep-cmit.enc  <lmri8.pfb
-cmti9     CMTI9     <lm-rep-cmit.enc  <lmri9.pfb
-cmtt10    CMTT10    <lm-rep-cmtt.enc  <lmtt10.pfb
-cmtt12    CMTT12    <lm-rep-cmtt.enc  <lmtt12.pfb
-cmtt8     CMTT8     <lm-rep-cmtt.enc  <lmtt8.pfb
-cmtt9     CMTT9     <lm-rep-cmtt.enc  <lmtt9.pfb
-cmvtt10   CMVTT10   <lm-rep-cmrm.enc  <lmvtt10.pfb
-
-% math
-
-cmex10  LMMathExtension10-Regular   "enclmmathex ReEncodeFont" <lm-mathex.enc  <lmex10.pfb
-cmex9   LMMathExtension10-Regular   "enclmmathex ReEncodeFont" <lm-mathex.enc  <lmex10.pfb
-cmex8   LMMathExtension10-Regular   "enclmmathex ReEncodeFont" <lm-mathex.enc  <lmex10.pfb
-cmex7   LMMathExtension10-Regular   "enclmmathex ReEncodeFont" <lm-mathex.enc  <lmex10.pfb
-
-cmmi5   LMMathItalic5-Italic        "enclmmathit ReEncodeFont" <lm-mathit.enc  <lmmi5.pfb
-cmmi6   LMMathItalic6-Italic        "enclmmathit ReEncodeFont" <lm-mathit.enc  <lmmi6.pfb
-cmmi7   LMMathItalic7-Italic        "enclmmathit ReEncodeFont" <lm-mathit.enc  <lmmi7.pfb
-cmmi8   LMMathItalic8-Italic        "enclmmathit ReEncodeFont" <lm-mathit.enc  <lmmi8.pfb
-cmmi9   LMMathItalic9-Italic        "enclmmathit ReEncodeFont" <lm-mathit.enc  <lmmi9.pfb
-cmmi10  LMMathItalic10-Italic       "enclmmathit ReEncodeFont" <lm-mathit.enc  <lmmi10.pfb
-cmmi12  LMMathItalic12-Italic       "enclmmathit ReEncodeFont" <lm-mathit.enc  <lmmi12.pfb
-
-cmmib5   LMMathItalic5-BoldItalic    "enclmmathit ReEncodeFont" <lm-mathit.enc  <lmmib5.pfb
-cmmib6   LMMathItalic6-BoldItalic    "enclmmathit ReEncodeFont" <lm-mathit.enc  <lmmib6.pfb
-cmmib7   LMMathItalic7-BoldItalic    "enclmmathit ReEncodeFont" <lm-mathit.enc  <lmmib7.pfb
-cmmib8   LMMathItalic8-BoldItalic    "enclmmathit ReEncodeFont" <lm-mathit.enc  <lmmib8.pfb
-cmmib9   LMMathItalic9-BoldItalic    "enclmmathit ReEncodeFont" <lm-mathit.enc  <lmmib9.pfb
-cmmib10  LMMathItalic10-BoldItalic   "enclmmathit ReEncodeFont" <lm-mathit.enc  <lmmib10.pfb
-cmmib12  LMMathItalic12-BoldItalic   "enclmmathit ReEncodeFont" <lm-mathit.enc  <lmmib12.pfb
-
-cmsy5   LMMathSymbols5-Italic        "enclmmathsy ReEncodeFont" <lm-mathsy.enc  <lmsy5.pfb
-cmsy6   LMMathSymbols6-Italic        "enclmmathsy ReEncodeFont" <lm-mathsy.enc  <lmsy6.pfb
-cmsy7   LMMathSymbols7-Italic        "enclmmathsy ReEncodeFont" <lm-mathsy.enc  <lmsy7.pfb
-cmsy8   LMMathSymbols8-Italic        "enclmmathsy ReEncodeFont" <lm-mathsy.enc  <lmsy8.pfb
-cmsy9   LMMathSymbols9-Italic        "enclmmathsy ReEncodeFont" <lm-mathsy.enc  <lmsy9.pfb
-cmsy10  LMMathSymbols10-Italic       "enclmmathsy ReEncodeFont" <lm-mathsy.enc  <lmsy10.pfb
-
-cmbsy5   LMMathSymbols5-BoldItalic   "enclmmathsy ReEncodeFont" <lm-mathsy.enc  <lmbsy5.pfb
-cmbsy6   LMMathSymbols6-BoldItalic   "enclmmathsy ReEncodeFont" <lm-mathsy.enc  <lmbsy6.pfb
-cmbsy7   LMMathSymbols7-BoldItalic   "enclmmathsy ReEncodeFont" <lm-mathsy.enc  <lmbsy7.pfb
-cmbsy8   LMMathSymbols8-BoldItalic   "enclmmathsy ReEncodeFont" <lm-mathsy.enc  <lmbsy8.pfb
-cmbsy9   LMMathSymbols9-BoldItalic   "enclmmathsy ReEncodeFont" <lm-mathsy.enc  <lmbsy9.pfb
-cmbsy10  LMMathSymbols10-BoldItalic  "enclmmathsy ReEncodeFont" <lm-mathsy.enc  <lmbsy10.pfb
-
 % original
 
-cmdunh10  CMDUNH10 <cmdunh10.pfb
-
 cmtex10   CMTEX10  <cmtex10.pfb
 cmtex8    CMTEX8   <cmtex8.pfb
 cmtex9    CMTEX9   <cmtex9.pfb
@@ -247,6 +145,80 @@ cmff10    CMFF10   <cmff10.pfb
 cmfi10    CMFI10   <cmfi10.pfb
 cmfib8    CMFIB8   <cmfib8.pfb
 
-% a weird one, not used in context
-
-cmu10     LMRoman10-Italic "-0.25 SlantFont" <lm-rep-cmit.enc <lmri10.pfb
+% the latest gust list
+
+cmb10     LMRomanDemi10-Regular     "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmb10.pfb
+cmbx10    LMRoman10-Bold            "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmbx10.pfb
+cmbx5     LMRoman5-Bold             "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmbx5.pfb
+cmbx6     LMRoman6-Bold             "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmbx6.pfb
+cmbx7     LMRoman7-Bold             "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmbx7.pfb
+cmbx8     LMRoman8-Bold             "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmbx8.pfb
+cmbx9     LMRoman9-Bold             "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmbx9.pfb
+cmbxsl10  LMRomanSlant10-Bold       "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmbxo10.pfb
+cmbxti10  LMRoman10-BoldItalic      "enclmrepcmit ReEncodeFont"  <lm-rep-cmit.enc  <lmbxi10.pfb
+cmcsc10   LMRomanCaps10-Regular     "enclmrepcmsc ReEncodeFont"  <lm-rep-cmsc.enc  <lmcsc10.pfb
+cmcscsl10 LMRomanCaps10-Oblique     "enclmrepcmsc ReEncodeFont"  <lm-rep-cmsc.enc  <lmcsco10.pfb
+cmdunh10  LMRomanDunh10-Regular     "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmdunh10.pfb
+cminch    LMSans10-Bold             "enclmrepcmin ReEncodeFont"  <lm-rep-cmin.enc  <lmssbx10.pfb
+cmitt10   LMMono10-Italic           "enclmrepcmitt ReEncodeFont" <lm-rep-cmitt.enc <lmtti10.pfb
+cmr10     LMRoman10-Regular         "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmr10.pfb
+cmr12     LMRoman12-Regular         "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmr12.pfb
+cmr17     LMRoman17-Regular         "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmr17.pfb
+cmr5      LMRoman5-Regular          "enclmrepcmsc ReEncodeFont"  <lm-rep-cmsc.enc  <lmr5.pfb
+cmr6      LMRoman6-Regular          "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmr6.pfb
+cmr7      LMRoman7-Regular          "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmr7.pfb
+cmr8      LMRoman8-Regular          "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmr8.pfb
+cmr9      LMRoman9-Regular          "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmr9.pfb
+cmsl10    LMRomanSlant10-Regular    "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmro10.pfb
+cmsl12    LMRomanSlant12-Regular    "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmro12.pfb
+cmsl8     LMRomanSlant8-Regular     "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmro8.pfb
+cmsl9     LMRomanSlant9-Regular     "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmro9.pfb
+cmsltt10  LMMonoSlant10-Regular     "enclmrepcmtt ReEncodeFont"  <lm-rep-cmtt.enc  <lmtto10.pfb
+cmss10    LMSans10-Regular          "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmss10.pfb
+cmss12    LMSans12-Regular          "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmss12.pfb
+cmss17    LMSans17-Regular          "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmss17.pfb
+cmss8     LMSans8-Regular           "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmss8.pfb
+cmss9     LMSans9-Regular           "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmss9.pfb
+cmssbx10  LMSans10-Bold             "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmssbx10.pfb
+cmssbxo10 LMSans10-BoldOblique      "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmssbo10.pfb
+cmssdc10  LMSansDemiCond10-Regular  "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmssdc10.pfb
+cmssi10   LMSans10-Oblique          "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmsso10.pfb
+cmssi12   LMSans12-Oblique          "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmsso12.pfb
+cmssi17   LMSans17-Oblique          "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmsso17.pfb
+cmssi8    LMSans8-Oblique           "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmsso8.pfb
+cmssi9    LMSans9-Oblique           "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmsso9.pfb
+cmssq8    LMSansQuot8-Regular       "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmssq8.pfb
+cmssqi8   LMSansQuot8-Oblique       "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmssqo8.pfb
+cmtcsc10  LMMonoCaps10-Regular      "enclmrepcmtt ReEncodeFont"  <lm-rep-cmtt.enc  <lmtcsc10.pfb
+cmti10    LMRoman10-Italic          "enclmrepcmit ReEncodeFont"  <lm-rep-cmit.enc  <lmri10.pfb
+cmti12    LMRoman12-Italic          "enclmrepcmit ReEncodeFont"  <lm-rep-cmit.enc  <lmri12.pfb
+cmti7     LMRoman7-Italic           "enclmrepcmit ReEncodeFont"  <lm-rep-cmit.enc  <lmri7.pfb
+cmti8     LMRoman8-Italic           "enclmrepcmit ReEncodeFont"  <lm-rep-cmit.enc  <lmri8.pfb
+cmti9     LMRoman9-Italic           "enclmrepcmit ReEncodeFont"  <lm-rep-cmit.enc  <lmri9.pfb
+cmtt10    LMMono10-Regular          "enclmrepcmtt ReEncodeFont"  <lm-rep-cmtt.enc  <lmtt10.pfb
+cmtt12    LMMono12-Regular          "enclmrepcmtt ReEncodeFont"  <lm-rep-cmtt.enc  <lmtt12.pfb
+cmtt8     LMMono8-Regular           "enclmrepcmtt ReEncodeFont"  <lm-rep-cmtt.enc  <lmtt8.pfb
+cmtt9     LMMono9-Regular           "enclmrepcmtt ReEncodeFont"  <lm-rep-cmtt.enc  <lmtt9.pfb
+cmu10     LMRomanUnsl10-Regular     "enclmrepcmit ReEncodeFont"  <lm-rep-cmit.enc  <lmu10.pfb
+cmvtt10   LMMonoProp10-Regular      "enclmrepcmrm ReEncodeFont"  <lm-rep-cmrm.enc  <lmvtt10.pfb
+
+cmbsy5    LMMathSymbols5-Bold       "enclmmathsy ReEncodeFont"   <lm-mathsy.enc    <lmbsy5.pfb
+cmbsy7    LMMathSymbols7-Bold       "enclmmathsy ReEncodeFont"   <lm-mathsy.enc    <lmbsy7.pfb
+cmbsy10   LMMathSymbols10-Bold      "enclmmathsy ReEncodeFont"   <lm-mathsy.enc    <lmbsy10.pfb
+cmsy5     LMMathSymbols5-Regular    "enclmmathsy ReEncodeFont"   <lm-mathsy.enc    <lmsy5.pfb
+cmsy6     LMMathSymbols6-Regular    "enclmmathsy ReEncodeFont"   <lm-mathsy.enc    <lmsy6.pfb
+cmsy7     LMMathSymbols7-Regular    "enclmmathsy ReEncodeFont"   <lm-mathsy.enc    <lmsy7.pfb
+cmsy8     LMMathSymbols8-Regular    "enclmmathsy ReEncodeFont"   <lm-mathsy.enc    <lmsy8.pfb
+cmsy9     LMMathSymbols9-Regular    "enclmmathsy ReEncodeFont"   <lm-mathsy.enc    <lmsy9.pfb
+cmsy10    LMMathSymbols10-Regular   "enclmmathsy ReEncodeFont"   <lm-mathsy.enc    <lmsy10.pfb
+cmex10    LMMathExtension10-Regular "enclmmathex ReEncodeFont"   <lm-mathex.enc    <lmex10.pfb
+cmmi5     LMMathItalic5-Regular     "enclmmathit ReEncodeFont"   <lm-mathit.enc    <lmmi5.pfb
+cmmi6     LMMathItalic6-Regular     "enclmmathit ReEncodeFont"   <lm-mathit.enc    <lmmi6.pfb
+cmmi7     LMMathItalic7-Regular     "enclmmathit ReEncodeFont"   <lm-mathit.enc    <lmmi7.pfb
+cmmi8     LMMathItalic8-Regular     "enclmmathit ReEncodeFont"   <lm-mathit.enc    <lmmi8.pfb
+cmmi9     LMMathItalic9-Regular     "enclmmathit ReEncodeFont"   <lm-mathit.enc    <lmmi9.pfb
+cmmi10    LMMathItalic10-Regular    "enclmmathit ReEncodeFont"   <lm-mathit.enc    <lmmi10.pfb
+cmmi12    LMMathItalic12-Regular    "enclmmathit ReEncodeFont"   <lm-mathit.enc    <lmmi12.pfb
+cmmib5    LMMathItalic5-Bold        "enclmmathit ReEncodeFont"   <lm-mathit.enc    <lmmib5.pfb
+cmmib7    LMMathItalic7-Bold        "enclmmathit ReEncodeFont"   <lm-mathit.enc    <lmmib7.pfb
+cmmib10   LMMathItalic10-Bold       "enclmmathit ReEncodeFont"   <lm-mathit.enc    <lmmib10.pfb