autoupdate via tlmgr generate _updmap

git-svn-id: svn://tug.org/texlive/trunk@31555 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 289 insertions, 485 deletions

diff --git a/Master/texmf-dist/fonts/map/dvips/updmap/ps2pk.map b/Master/texmf-dist/fonts/map/dvips/updmap/ps2pk.map
index 5673ead7222..7f5979934f5 100644
--- a/Master/texmf-dist/fonts/map/dvips/updmap/ps2pk.map
+++ b/Master/texmf-dist/fonts/map/dvips/updmap/ps2pk.map
@@ -7876,10 +7876,10 @@ fbb-Bold-lf-sc-ly1--base fbb-Bold " AutoEnc_pqcug3vkt2winko352dcl3e6qf ReEncodeF
 fbb-Bold-lf-sc-t1--base fbb-Bold " AutoEnc_3jy3vuah34aiqicdoblysophza ReEncodeFont " <[fbb_3jy3vu.enc <fbb-Bold.pfb
 fbb-Bold-lf-t1--base fbb-Bold " AutoEnc_eaddwb4gcd3e2c2ecxpzo7ytwg ReEncodeFont " <[fbb_eaddwb.enc <fbb-Bold.pfb
 fbb-Bold-lf-ts1--base fbb-Bold " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Bold.pfb
-fbb-Bold-osf-ly1--base fbb-Bold " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Bold.pfb
-fbb-Bold-osf-sc-ly1--base fbb-Bold " AutoEnc_xoysobuad3k3nr2x77x5ijj3gc ReEncodeFont " <[fbb_xoysob.enc <fbb-Bold.pfb
-fbb-Bold-osf-sc-t1--base fbb-Bold " AutoEnc_22bu64fkwrs6ihh5s3sdhfaw3c ReEncodeFont " <[fbb_22bu64.enc <fbb-Bold.pfb
-fbb-Bold-osf-t1--base fbb-Bold " AutoEnc_6v6t7djji5dahvuxmnljp3tk5g ReEncodeFont " <[fbb_6v6t7d.enc <fbb-Bold.pfb
+fbb-Bold-osf-ly1--base fbb-Bold " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Bold.pfb
+fbb-Bold-osf-sc-ly1--base fbb-Bold " AutoEnc_icb62td6whgedlprygtgnxmvrb ReEncodeFont " <[fbb_icb62t.enc <fbb-Bold.pfb
+fbb-Bold-osf-sc-t1--base fbb-Bold " AutoEnc_eie4y7s2bcujl2vladill6xbaf ReEncodeFont " <[fbb_eie4y7.enc <fbb-Bold.pfb
+fbb-Bold-osf-t1--base fbb-Bold " AutoEnc_5yuftp67d7ahytvmxnmju35d3e ReEncodeFont " <[fbb_5yuftp.enc <fbb-Bold.pfb
 fbb-Bold-osf-ts1--base fbb-Bold " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Bold.pfb
 fbb-Bold-sup-ly1--base fbb-Bold " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Bold.pfb
 fbb-Bold-sup-t1--base fbb-Bold " AutoEnc_ciz6qsfdiju673xpz4pujigche ReEncodeFont " <[fbb_ciz6qs.enc <fbb-Bold.pfb
@@ -7898,10 +7898,10 @@ fbb-BoldItalic-lf-sc-ly1--base fbb-BoldItalic " AutoEnc_2quttajmnn4ocncvvpsvmobo
 fbb-BoldItalic-lf-sc-t1--base fbb-BoldItalic " AutoEnc_ksln4yiq47ru7z2ynez44kd6lb ReEncodeFont " <[fbb_ksln4y.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-lf-t1--base fbb-BoldItalic " AutoEnc_vvs2t7ml7vp3slshul5ixtlraa ReEncodeFont " <[fbb_vvs2t7.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-lf-ts1--base fbb-BoldItalic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-ly1--base fbb-BoldItalic " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-sc-ly1--base fbb-BoldItalic " AutoEnc_xhatrxtqf5t6k6thg2pkbcodpe ReEncodeFont " <[fbb_xhatrx.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-sc-t1--base fbb-BoldItalic " AutoEnc_xlwfeoletkqyqxohsikuwwgnwh ReEncodeFont " <[fbb_xlwfeo.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-t1--base fbb-BoldItalic " AutoEnc_cftewbv4lgxwtuhvjy4tb5bjnh ReEncodeFont " <[fbb_cftewb.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-ly1--base fbb-BoldItalic " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-sc-ly1--base fbb-BoldItalic " AutoEnc_5g5giqun737togfqabrefaj5ma ReEncodeFont " <[fbb_5g5giq.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-sc-t1--base fbb-BoldItalic " AutoEnc_bwe6jmh2rjigwsu7tcqweawnqa ReEncodeFont " <[fbb_bwe6jm.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-t1--base fbb-BoldItalic " AutoEnc_u3ego5ez7he26ghw3gzrknjoxg ReEncodeFont " <[fbb_u3ego5.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-osf-ts1--base fbb-BoldItalic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-sup-ly1--base fbb-BoldItalic " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-sup-t1--base fbb-BoldItalic " AutoEnc_wmijbzmtkibsvc2qvw3znxrrbd ReEncodeFont " <[fbb_wmijbz.enc <fbb-BoldItalic.pfb
@@ -7920,10 +7920,10 @@ fbb-Italic-lf-sc-ly1--base fbb-Italic " AutoEnc_2quttajmnn4ocncvvpsvmoboec ReEnc
 fbb-Italic-lf-sc-t1--base fbb-Italic " AutoEnc_ksln4yiq47ru7z2ynez44kd6lb ReEncodeFont " <[fbb_ksln4y.enc <fbb-Italic.pfb
 fbb-Italic-lf-t1--base fbb-Italic " AutoEnc_vvs2t7ml7vp3slshul5ixtlraa ReEncodeFont " <[fbb_vvs2t7.enc <fbb-Italic.pfb
 fbb-Italic-lf-ts1--base fbb-Italic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-Italic.pfb
-fbb-Italic-osf-ly1--base fbb-Italic " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Italic.pfb
-fbb-Italic-osf-sc-ly1--base fbb-Italic " AutoEnc_xhatrxtqf5t6k6thg2pkbcodpe ReEncodeFont " <[fbb_xhatrx.enc <fbb-Italic.pfb
-fbb-Italic-osf-sc-t1--base fbb-Italic " AutoEnc_xlwfeoletkqyqxohsikuwwgnwh ReEncodeFont " <[fbb_xlwfeo.enc <fbb-Italic.pfb
-fbb-Italic-osf-t1--base fbb-Italic " AutoEnc_cftewbv4lgxwtuhvjy4tb5bjnh ReEncodeFont " <[fbb_cftewb.enc <fbb-Italic.pfb
+fbb-Italic-osf-ly1--base fbb-Italic " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Italic.pfb
+fbb-Italic-osf-sc-ly1--base fbb-Italic " AutoEnc_5g5giqun737togfqabrefaj5ma ReEncodeFont " <[fbb_5g5giq.enc <fbb-Italic.pfb
+fbb-Italic-osf-sc-t1--base fbb-Italic " AutoEnc_bwe6jmh2rjigwsu7tcqweawnqa ReEncodeFont " <[fbb_bwe6jm.enc <fbb-Italic.pfb
+fbb-Italic-osf-t1--base fbb-Italic " AutoEnc_u3ego5ez7he26ghw3gzrknjoxg ReEncodeFont " <[fbb_u3ego5.enc <fbb-Italic.pfb
 fbb-Italic-osf-ts1--base fbb-Italic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-Italic.pfb
 fbb-Italic-sup-ly1--base fbb-Italic " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Italic.pfb
 fbb-Italic-sup-t1--base fbb-Italic " AutoEnc_wmijbzmtkibsvc2qvw3znxrrbd ReEncodeFont " <[fbb_wmijbz.enc <fbb-Italic.pfb
@@ -7942,10 +7942,10 @@ fbb-Regular-lf-sc-ly1--base fbb-Regular " AutoEnc_pqcug3vkt2winko352dcl3e6qf ReE
 fbb-Regular-lf-sc-t1--base fbb-Regular " AutoEnc_3gezysrzrhafltskc7vzrlzj6d ReEncodeFont " <[fbb_3gezys.enc <fbb-Regular.pfb
 fbb-Regular-lf-t1--base fbb-Regular " AutoEnc_p6sgcpz3tnt6s65vowl4nol3ya ReEncodeFont " <[fbb_p6sgcp.enc <fbb-Regular.pfb
 fbb-Regular-lf-ts1--base fbb-Regular " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Regular.pfb
-fbb-Regular-osf-ly1--base fbb-Regular " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Regular.pfb
-fbb-Regular-osf-sc-ly1--base fbb-Regular " AutoEnc_xoysobuad3k3nr2x77x5ijj3gc ReEncodeFont " <[fbb_xoysob.enc <fbb-Regular.pfb
-fbb-Regular-osf-sc-t1--base fbb-Regular " AutoEnc_2gijtigxaqirmd2zg4off4fuob ReEncodeFont " <[fbb_2gijti.enc <fbb-Regular.pfb
-fbb-Regular-osf-t1--base fbb-Regular " AutoEnc_cvknzo75nifc7tfjvsrllnboyf ReEncodeFont " <[fbb_cvknzo.enc <fbb-Regular.pfb
+fbb-Regular-osf-ly1--base fbb-Regular " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Regular.pfb
+fbb-Regular-osf-sc-ly1--base fbb-Regular " AutoEnc_icb62td6whgedlprygtgnxmvrb ReEncodeFont " <[fbb_icb62t.enc <fbb-Regular.pfb
+fbb-Regular-osf-sc-t1--base fbb-Regular " AutoEnc_qyua2i3u7ooq2uaoqdbsgzbs7f ReEncodeFont " <[fbb_qyua2i.enc <fbb-Regular.pfb
+fbb-Regular-osf-t1--base fbb-Regular " AutoEnc_4phrexd4gpjqeosuqg5keqmi5f ReEncodeFont " <[fbb_4phrex.enc <fbb-Regular.pfb
 fbb-Regular-osf-ts1--base fbb-Regular " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Regular.pfb
 fbb-Regular-sup-ly1--base fbb-Regular " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Regular.pfb
 fbb-Regular-sup-t1--base fbb-Regular " AutoEnc_k4t5oa4dqk7sihgf3uqrzkx56h ReEncodeFont " <[fbb_k4t5oa.enc <fbb-Regular.pfb
@@ -11291,44 +11291,55 @@ mcjroma mcjroma <mcjroma.pfb
 mcjrussian mcjrussian <mcjrussian.pfb
 mcjsy mcjsy <mcjsy.pfb
 % mdbch.map
-bchb8y CharterBT-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
-bchbc8a CharterBT-BoldSmallCap <bchbc8a.pfb
-bchbi8y CharterBT-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbi8a.pfb
-bchbo8y CharterBT-Bold " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
-bchr8y CharterBT-Roman " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
-bchrc8a CharterBT-SmallCap <bchrc8a.pfb
-bchri8y CharterBT-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchri8a.pfb
-bchro8y CharterBT-Roman " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
 md-chb7m MathDesign-CH-Bold-MathItalic-10 <md-chb7m.pfb
 md-chb7t MathDesign-CH-Bold-OT1-10 <md-chb7t.pfb
 md-chb7v MathDesign-CH-Bold-Extension-10 <md-chb7v.pfb
 md-chb7y MathDesign-CH-Bold-Symbol-10 <md-chb7y.pfb
 md-chb8c MathDesign-CH-Bold-TS1-10 <md-chb8c.pfb
 md-chb8t MathDesign-CH-Bold-T1-10 <md-chb8t.pfb
+md-chb8y CharterBT-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
+md-chbc8y CharterBT-BoldSmallCap " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbc8a.pfb
 md-chbi7m MathDesign-CH-Bold-Italic-MathItalic-10 <md-chbi7m.pfb
 md-chbi7t MathDesign-CH-Bold-Italic-OT1-10 <md-chbi7t.pfb
 md-chbi8c MathDesign-CH-Bold-Italic-TS1-10 <md-chbi8c.pfb
 md-chbi8t MathDesign-CH-Bold-Italic-T1-10 <md-chbi8t.pfb
+md-chbi8y CharterBT-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbi8a.pfb
 md-chbma MathDesign-CH-Bold-MathDesignSymbolA-10 <md-chbma.pfb
 md-chbmb MathDesign-CH-Bold-MathDesignSymbolB-10 <md-chbmb.pfb
 md-chbo7t MathDesign-CH-Bold-Slanted-OT1-10 " 0.194 SlantFont " <md-chb7t.pfb
 md-chbo8c MathDesign-CH-Bold-Slanted-TS1-10 " 0.194 SlantFont " <md-chb8c.pfb
 md-chbo8t MathDesign-CH-Bold-Slanted-T1-10 " 0.194 SlantFont " <md-chb8t.pfb
+md-chbo8y CharterBT-Bold " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
+md-chboc8y CharterBT-BoldSmallCap " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbc8a.pfb
 md-chr7m MathDesign-CH-Regular-MathItalic-10 <md-chr7m.pfb
 md-chr7t MathDesign-CH-Regular-OT1-10 <md-chr7t.pfb
 md-chr7v MathDesign-CH-Regular-Extension-10 <md-chr7v.pfb
 md-chr7y MathDesign-CH-Regular-Symbol-10 <md-chr7y.pfb
 md-chr8c MathDesign-CH-Regular-TS1-10 <md-chr8c.pfb
 md-chr8t MathDesign-CH-Regular-T1-10 <md-chr8t.pfb
+md-chr8y CharterBT-Roman " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
+md-chrc8y CharterBT-SmallCap " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchrc8a.pfb
 md-chri7m MathDesign-CH-Regular-Italic-MathItalic-10 <md-chri7m.pfb
 md-chri7t MathDesign-CH-Regular-Italic-OT1-10 <md-chri7t.pfb
 md-chri8c MathDesign-CH-Regular-Italic-TS1-10 <md-chri8c.pfb
 md-chri8t MathDesign-CH-Regular-Italic-T1-10 <md-chri8t.pfb
+md-chri8y CharterBT-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchri8a.pfb
 md-chrma MathDesign-CH-Regular-MathDesignSymbolA-10 <md-chrma.pfb
 md-chrmb MathDesign-CH-Regular-MathDesignSymbolB-10 <md-chrmb.pfb
 md-chro7t MathDesign-CH-Regular-Slanted-OT1-10 " 0.194 SlantFont " <md-chr7t.pfb
 md-chro8c MathDesign-CH-Regular-Slanted-TS1-10 " 0.194 SlantFont " <md-chr8c.pfb
 md-chro8t MathDesign-CH-Regular-Slanted-T1-10 " 0.194 SlantFont " <md-chr8t.pfb
+md-chro8y CharterBT-Roman " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
+md-chroc8y CharterBT-SmallCap " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchrc8a.pfb
+% mdgreek.map
+md-grbb7m GFSBodoni-Bold " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSBodoniBold.otf
+md-grbbi7m GFSBodoni-BoldItalic " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSBodoniBoldIt.otf
+md-grbr7m GFSBodoni-Regular " AutoEnc_py5znvjh3poy4qksuktslsc7kc ReEncodeFont " <[a_py5znv.enc <<GFSBodoni.otf
+md-grbri7m GFSBodoni-Italic " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSBodoniIt.otf
+md-grdb7m GFSDidot-Bold " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSDidotBold.otf
+md-grdbi7m GFSDidot-BoldItalic " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSDidotBoldItalic.otf
+md-grdr7m GFSDidot-Regular " AutoEnc_45o73xtpuiy7upxsdrc7cwlagg ReEncodeFont " <[a_45o73x.enc <<GFSDidot.otf
+md-grdri7m GFSDidot-Italic " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSDidotItalic.otf
 % mdput.map
 md-utb7m MathDesign-UT-Bold-MathItalic-10 <md-utb7m.pfb
 md-utb7t MathDesign-UT-Bold-OT1-10 <md-utb7t.pfb
@@ -11336,38 +11347,36 @@ md-utb7v MathDesign-UT-Bold-Extension-10 <md-utb7v.pfb
 md-utb7y MathDesign-UT-Bold-Symbol-10 <md-utb7y.pfb
 md-utb8c MathDesign-UT-Bold-TS1-10 <md-utb8c.pfb
 md-utb8t MathDesign-UT-Bold-T1-10 <md-utb8t.pfb
+md-utb8y Utopia-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
 md-utbi7m MathDesign-UT-Bold-Italic-MathItalic-10 <md-utbi7m.pfb
 md-utbi7t MathDesign-UT-Bold-Italic-OT1-10 <md-utbi7t.pfb
 md-utbi8c MathDesign-UT-Bold-Italic-TS1-10 <md-utbi8c.pfb
 md-utbi8t MathDesign-UT-Bold-Italic-T1-10 <md-utbi8t.pfb
+md-utbi8y Utopia-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putbi8a.pfb
 md-utbma MathDesign-UT-Bold-MathDesignSymbolA-10 <md-utbma.pfb
 md-utbmb MathDesign-UT-Bold-MathDesignSymbolB-10 <md-utbmb.pfb
 md-utbo7t MathDesign-UT-Bold-Slanted-OT1-10 " 0.231 SlantFont " <md-utb7t.pfb
 md-utbo8c MathDesign-UT-Bold-Slanted-TS1-10 " 0.231 SlantFont " <md-utb8c.pfb
 md-utbo8t MathDesign-UT-Bold-Slanted-T1-10 " 0.231 SlantFont " <md-utb8t.pfb
+md-utbo8y Utopia-Bold " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
 md-utr7m MathDesign-UT-Regular-MathItalic-10 <md-utr7m.pfb
 md-utr7t MathDesign-UT-Regular-OT1-10 <md-utr7t.pfb
 md-utr7v MathDesign-UT-Regular-Extension-10 <md-utr7v.pfb
 md-utr7y MathDesign-UT-Regular-Symbol-10 <md-utr7y.pfb
 md-utr8c MathDesign-UT-Regular-TS1-10 <md-utr8c.pfb
 md-utr8t MathDesign-UT-Regular-T1-10 <md-utr8t.pfb
+md-utr8y Utopia-Regular " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
 md-utri7m MathDesign-UT-Regular-Italic-MathItalic-10 <md-utri7m.pfb
 md-utri7t MathDesign-UT-Regular-Italic-OT1-10 <md-utri7t.pfb
 md-utri8c MathDesign-UT-Regular-Italic-TS1-10 <md-utri8c.pfb
 md-utri8t MathDesign-UT-Regular-Italic-T1-10 <md-utri8t.pfb
+md-utri8y Utopia-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putri8a.pfb
 md-utrma MathDesign-UT-Regular-MathDesignSymbolA-10 <md-utrma.pfb
 md-utrmb MathDesign-UT-Regular-MathDesignSymbolB-10 <md-utrmb.pfb
 md-utro7t MathDesign-UT-Regular-Slanted-OT1-10 " 0.231 SlantFont " <md-utr7t.pfb
 md-utro8c MathDesign-UT-Regular-Slanted-TS1-10 " 0.231 SlantFont " <md-utr8c.pfb
 md-utro8t MathDesign-UT-Regular-Slanted-T1-10 " 0.231 SlantFont " <md-utr8t.pfb
-putb8x UtopiaExp-Bold <putb8x.pfb
-putb8y Utopia-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
-putbi8y Utopia-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putbi8a.pfb
-putbo8y Utopia-Bold " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
-putr8x UtopiaExp-Regular <putr8x.pfb
-putr8y Utopia-Regular " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
-putri8y Utopia-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putri8a.pfb
-putro8y Utopia-Regular " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
+md-utro8y Utopia-Regular " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
 % mdsymbol.map
 MdSymbolA-Bold MdSymbolA-Bold <MdSymbolA-Bold.pfb
 MdSymbolA-Light MdSymbolA-Light <MdSymbolA-Light.pfb
@@ -11393,43 +11402,6 @@ MdSymbolF-Bold MdSymbolF-Bold <MdSymbolF-Bold.pfb
 MdSymbolF-Light MdSymbolF-Light <MdSymbolF-Light.pfb
 MdSymbolF-Regular MdSymbolF-Regular <MdSymbolF-Regular.pfb
 MdSymbolF-Semibold MdSymbolF-Semibold <MdSymbolF-Semibold.pfb
-% mdugm.map
-md-gmm7m MathDesign-GM-Medium-MathItalic-10 <md-gmm7m.pfb
-md-gmm7t MathDesign-GM-Medium-OT1-10 <md-gmm7t.pfb
-md-gmm7v MathDesign-GM-Medium-Extension-10 <md-gmm7v.pfb
-md-gmm7y MathDesign-GM-Medium-Symbol-10 <md-gmm7y.pfb
-md-gmm8c MathDesign-GM-Medium-TS1-10 <md-gmm8c.pfb
-md-gmm8t MathDesign-GM-Medium-T1-10 <md-gmm8t.pfb
-md-gmmi7m MathDesign-GM-Medium-Italic-MathItalic-10 <md-gmmi7m.pfb
-md-gmmi7t MathDesign-GM-Medium-Italic-OT1-10 <md-gmmi7t.pfb
-md-gmmi8c MathDesign-GM-Medium-Italic-TS1-10 <md-gmmi8c.pfb
-md-gmmi8t MathDesign-GM-Medium-Italic-T1-10 <md-gmmi8t.pfb
-md-gmmma MathDesign-GM-Medium-MathDesignSymbolA-10 <md-gmmma.pfb
-md-gmmmb MathDesign-GM-Medium-MathDesignSymbolB-10 <md-gmmmb.pfb
-md-gmmo7t MathDesign-GM-Medium-Slanted-OT1-10 " 0.287 SlantFont " <md-gmm7t.pfb
-md-gmmo8c MathDesign-GM-Medium-Slanted-TS1-10 " 0.287 SlantFont " <md-gmm8c.pfb
-md-gmmo8t MathDesign-GM-Medium-Slanted-T1-10 " 0.287 SlantFont " <md-gmm8t.pfb
-md-gmr7m MathDesign-GM-Regular-MathItalic-10 <md-gmr7m.pfb
-md-gmr7t MathDesign-GM-Regular-OT1-10 <md-gmr7t.pfb
-md-gmr7v MathDesign-GM-Regular-Extension-10 <md-gmr7v.pfb
-md-gmr7y MathDesign-GM-Regular-Symbol-10 <md-gmr7y.pfb
-md-gmr8c MathDesign-GM-Regular-TS1-10 <md-gmr8c.pfb
-md-gmr8t MathDesign-GM-Regular-T1-10 <md-gmr8t.pfb
-md-gmri7m MathDesign-GM-Regular-Italic-MathItalic-10 <md-gmri7m.pfb
-md-gmri7t MathDesign-GM-Regular-Italic-OT1-10 <md-gmri7t.pfb
-md-gmri8c MathDesign-GM-Regular-Italic-TS1-10 <md-gmri8c.pfb
-md-gmri8t MathDesign-GM-Regular-Italic-T1-10 <md-gmri8t.pfb
-md-gmrma MathDesign-GM-Regular-MathDesignSymbolA-10 <md-gmrma.pfb
-md-gmrmb MathDesign-GM-Regular-MathDesignSymbolB-10 <md-gmrmb.pfb
-md-gmro7t MathDesign-GM-Regular-Slanted-OT1-10 " 0.287 SlantFont " <md-gmr7t.pfb
-md-gmro8c MathDesign-GM-Regular-Slanted-TS1-10 " 0.287 SlantFont " <md-gmr8c.pfb
-md-gmro8t MathDesign-GM-Regular-Slanted-T1-10 " 0.287 SlantFont " <md-gmr8t.pfb
-ugmm8y GaramondNo8-Med " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmm8a.pfb
-ugmmi8y GaramondNo8-MedIta " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmmi8a.pfb
-ugmmo8y GaramondNo8-Med " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmm8a.pfb
-ugmr8y GaramondNo8-Reg " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
-ugmri8y GaramondNo8-Ita " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmri8a.pfb
-ugmro8y GaramondNo8-Reg " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
 % mr2j.map
 mr2jka mr2jka <mr2jka.pfb
 mr2jkb mr2jkb <mr2jkb.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts.map b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts.map
index 6581773a8a2..3e71ed92f9e 100644
--- a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts.map
+++ b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts.map
@@ -7876,10 +7876,10 @@ fbb-Bold-lf-sc-ly1--base fbb-Bold " AutoEnc_pqcug3vkt2winko352dcl3e6qf ReEncodeF
 fbb-Bold-lf-sc-t1--base fbb-Bold " AutoEnc_3jy3vuah34aiqicdoblysophza ReEncodeFont " <[fbb_3jy3vu.enc <fbb-Bold.pfb
 fbb-Bold-lf-t1--base fbb-Bold " AutoEnc_eaddwb4gcd3e2c2ecxpzo7ytwg ReEncodeFont " <[fbb_eaddwb.enc <fbb-Bold.pfb
 fbb-Bold-lf-ts1--base fbb-Bold " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Bold.pfb
-fbb-Bold-osf-ly1--base fbb-Bold " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Bold.pfb
-fbb-Bold-osf-sc-ly1--base fbb-Bold " AutoEnc_xoysobuad3k3nr2x77x5ijj3gc ReEncodeFont " <[fbb_xoysob.enc <fbb-Bold.pfb
-fbb-Bold-osf-sc-t1--base fbb-Bold " AutoEnc_22bu64fkwrs6ihh5s3sdhfaw3c ReEncodeFont " <[fbb_22bu64.enc <fbb-Bold.pfb
-fbb-Bold-osf-t1--base fbb-Bold " AutoEnc_6v6t7djji5dahvuxmnljp3tk5g ReEncodeFont " <[fbb_6v6t7d.enc <fbb-Bold.pfb
+fbb-Bold-osf-ly1--base fbb-Bold " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Bold.pfb
+fbb-Bold-osf-sc-ly1--base fbb-Bold " AutoEnc_icb62td6whgedlprygtgnxmvrb ReEncodeFont " <[fbb_icb62t.enc <fbb-Bold.pfb
+fbb-Bold-osf-sc-t1--base fbb-Bold " AutoEnc_eie4y7s2bcujl2vladill6xbaf ReEncodeFont " <[fbb_eie4y7.enc <fbb-Bold.pfb
+fbb-Bold-osf-t1--base fbb-Bold " AutoEnc_5yuftp67d7ahytvmxnmju35d3e ReEncodeFont " <[fbb_5yuftp.enc <fbb-Bold.pfb
 fbb-Bold-osf-ts1--base fbb-Bold " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Bold.pfb
 fbb-Bold-sup-ly1--base fbb-Bold " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Bold.pfb
 fbb-Bold-sup-t1--base fbb-Bold " AutoEnc_ciz6qsfdiju673xpz4pujigche ReEncodeFont " <[fbb_ciz6qs.enc <fbb-Bold.pfb
@@ -7898,10 +7898,10 @@ fbb-BoldItalic-lf-sc-ly1--base fbb-BoldItalic " AutoEnc_2quttajmnn4ocncvvpsvmobo
 fbb-BoldItalic-lf-sc-t1--base fbb-BoldItalic " AutoEnc_ksln4yiq47ru7z2ynez44kd6lb ReEncodeFont " <[fbb_ksln4y.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-lf-t1--base fbb-BoldItalic " AutoEnc_vvs2t7ml7vp3slshul5ixtlraa ReEncodeFont " <[fbb_vvs2t7.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-lf-ts1--base fbb-BoldItalic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-ly1--base fbb-BoldItalic " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-sc-ly1--base fbb-BoldItalic " AutoEnc_xhatrxtqf5t6k6thg2pkbcodpe ReEncodeFont " <[fbb_xhatrx.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-sc-t1--base fbb-BoldItalic " AutoEnc_xlwfeoletkqyqxohsikuwwgnwh ReEncodeFont " <[fbb_xlwfeo.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-t1--base fbb-BoldItalic " AutoEnc_cftewbv4lgxwtuhvjy4tb5bjnh ReEncodeFont " <[fbb_cftewb.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-ly1--base fbb-BoldItalic " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-sc-ly1--base fbb-BoldItalic " AutoEnc_5g5giqun737togfqabrefaj5ma ReEncodeFont " <[fbb_5g5giq.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-sc-t1--base fbb-BoldItalic " AutoEnc_bwe6jmh2rjigwsu7tcqweawnqa ReEncodeFont " <[fbb_bwe6jm.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-t1--base fbb-BoldItalic " AutoEnc_u3ego5ez7he26ghw3gzrknjoxg ReEncodeFont " <[fbb_u3ego5.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-osf-ts1--base fbb-BoldItalic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-sup-ly1--base fbb-BoldItalic " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-sup-t1--base fbb-BoldItalic " AutoEnc_wmijbzmtkibsvc2qvw3znxrrbd ReEncodeFont " <[fbb_wmijbz.enc <fbb-BoldItalic.pfb
@@ -7920,10 +7920,10 @@ fbb-Italic-lf-sc-ly1--base fbb-Italic " AutoEnc_2quttajmnn4ocncvvpsvmoboec ReEnc
 fbb-Italic-lf-sc-t1--base fbb-Italic " AutoEnc_ksln4yiq47ru7z2ynez44kd6lb ReEncodeFont " <[fbb_ksln4y.enc <fbb-Italic.pfb
 fbb-Italic-lf-t1--base fbb-Italic " AutoEnc_vvs2t7ml7vp3slshul5ixtlraa ReEncodeFont " <[fbb_vvs2t7.enc <fbb-Italic.pfb
 fbb-Italic-lf-ts1--base fbb-Italic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-Italic.pfb
-fbb-Italic-osf-ly1--base fbb-Italic " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Italic.pfb
-fbb-Italic-osf-sc-ly1--base fbb-Italic " AutoEnc_xhatrxtqf5t6k6thg2pkbcodpe ReEncodeFont " <[fbb_xhatrx.enc <fbb-Italic.pfb
-fbb-Italic-osf-sc-t1--base fbb-Italic " AutoEnc_xlwfeoletkqyqxohsikuwwgnwh ReEncodeFont " <[fbb_xlwfeo.enc <fbb-Italic.pfb
-fbb-Italic-osf-t1--base fbb-Italic " AutoEnc_cftewbv4lgxwtuhvjy4tb5bjnh ReEncodeFont " <[fbb_cftewb.enc <fbb-Italic.pfb
+fbb-Italic-osf-ly1--base fbb-Italic " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Italic.pfb
+fbb-Italic-osf-sc-ly1--base fbb-Italic " AutoEnc_5g5giqun737togfqabrefaj5ma ReEncodeFont " <[fbb_5g5giq.enc <fbb-Italic.pfb
+fbb-Italic-osf-sc-t1--base fbb-Italic " AutoEnc_bwe6jmh2rjigwsu7tcqweawnqa ReEncodeFont " <[fbb_bwe6jm.enc <fbb-Italic.pfb
+fbb-Italic-osf-t1--base fbb-Italic " AutoEnc_u3ego5ez7he26ghw3gzrknjoxg ReEncodeFont " <[fbb_u3ego5.enc <fbb-Italic.pfb
 fbb-Italic-osf-ts1--base fbb-Italic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-Italic.pfb
 fbb-Italic-sup-ly1--base fbb-Italic " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Italic.pfb
 fbb-Italic-sup-t1--base fbb-Italic " AutoEnc_wmijbzmtkibsvc2qvw3znxrrbd ReEncodeFont " <[fbb_wmijbz.enc <fbb-Italic.pfb
@@ -7942,10 +7942,10 @@ fbb-Regular-lf-sc-ly1--base fbb-Regular " AutoEnc_pqcug3vkt2winko352dcl3e6qf ReE
 fbb-Regular-lf-sc-t1--base fbb-Regular " AutoEnc_3gezysrzrhafltskc7vzrlzj6d ReEncodeFont " <[fbb_3gezys.enc <fbb-Regular.pfb
 fbb-Regular-lf-t1--base fbb-Regular " AutoEnc_p6sgcpz3tnt6s65vowl4nol3ya ReEncodeFont " <[fbb_p6sgcp.enc <fbb-Regular.pfb
 fbb-Regular-lf-ts1--base fbb-Regular " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Regular.pfb
-fbb-Regular-osf-ly1--base fbb-Regular " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Regular.pfb
-fbb-Regular-osf-sc-ly1--base fbb-Regular " AutoEnc_xoysobuad3k3nr2x77x5ijj3gc ReEncodeFont " <[fbb_xoysob.enc <fbb-Regular.pfb
-fbb-Regular-osf-sc-t1--base fbb-Regular " AutoEnc_2gijtigxaqirmd2zg4off4fuob ReEncodeFont " <[fbb_2gijti.enc <fbb-Regular.pfb
-fbb-Regular-osf-t1--base fbb-Regular " AutoEnc_cvknzo75nifc7tfjvsrllnboyf ReEncodeFont " <[fbb_cvknzo.enc <fbb-Regular.pfb
+fbb-Regular-osf-ly1--base fbb-Regular " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Regular.pfb
+fbb-Regular-osf-sc-ly1--base fbb-Regular " AutoEnc_icb62td6whgedlprygtgnxmvrb ReEncodeFont " <[fbb_icb62t.enc <fbb-Regular.pfb
+fbb-Regular-osf-sc-t1--base fbb-Regular " AutoEnc_qyua2i3u7ooq2uaoqdbsgzbs7f ReEncodeFont " <[fbb_qyua2i.enc <fbb-Regular.pfb
+fbb-Regular-osf-t1--base fbb-Regular " AutoEnc_4phrexd4gpjqeosuqg5keqmi5f ReEncodeFont " <[fbb_4phrex.enc <fbb-Regular.pfb
 fbb-Regular-osf-ts1--base fbb-Regular " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Regular.pfb
 fbb-Regular-sup-ly1--base fbb-Regular " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Regular.pfb
 fbb-Regular-sup-t1--base fbb-Regular " AutoEnc_k4t5oa4dqk7sihgf3uqrzkx56h ReEncodeFont " <[fbb_k4t5oa.enc <fbb-Regular.pfb
@@ -11291,44 +11291,55 @@ mcjroma mcjroma <mcjroma.pfb
 mcjrussian mcjrussian <mcjrussian.pfb
 mcjsy mcjsy <mcjsy.pfb
 % mdbch.map
-bchb8y CharterBT-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
-bchbc8a CharterBT-BoldSmallCap <bchbc8a.pfb
-bchbi8y CharterBT-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbi8a.pfb
-bchbo8y CharterBT-Bold " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
-bchr8y CharterBT-Roman " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
-bchrc8a CharterBT-SmallCap <bchrc8a.pfb
-bchri8y CharterBT-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchri8a.pfb
-bchro8y CharterBT-Roman " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
 md-chb7m MathDesign-CH-Bold-MathItalic-10 <md-chb7m.pfb
 md-chb7t MathDesign-CH-Bold-OT1-10 <md-chb7t.pfb
 md-chb7v MathDesign-CH-Bold-Extension-10 <md-chb7v.pfb
 md-chb7y MathDesign-CH-Bold-Symbol-10 <md-chb7y.pfb
 md-chb8c MathDesign-CH-Bold-TS1-10 <md-chb8c.pfb
 md-chb8t MathDesign-CH-Bold-T1-10 <md-chb8t.pfb
+md-chb8y CharterBT-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
+md-chbc8y CharterBT-BoldSmallCap " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbc8a.pfb
 md-chbi7m MathDesign-CH-Bold-Italic-MathItalic-10 <md-chbi7m.pfb
 md-chbi7t MathDesign-CH-Bold-Italic-OT1-10 <md-chbi7t.pfb
 md-chbi8c MathDesign-CH-Bold-Italic-TS1-10 <md-chbi8c.pfb
 md-chbi8t MathDesign-CH-Bold-Italic-T1-10 <md-chbi8t.pfb
+md-chbi8y CharterBT-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbi8a.pfb
 md-chbma MathDesign-CH-Bold-MathDesignSymbolA-10 <md-chbma.pfb
 md-chbmb MathDesign-CH-Bold-MathDesignSymbolB-10 <md-chbmb.pfb
 md-chbo7t MathDesign-CH-Bold-Slanted-OT1-10 " 0.194 SlantFont " <md-chb7t.pfb
 md-chbo8c MathDesign-CH-Bold-Slanted-TS1-10 " 0.194 SlantFont " <md-chb8c.pfb
 md-chbo8t MathDesign-CH-Bold-Slanted-T1-10 " 0.194 SlantFont " <md-chb8t.pfb
+md-chbo8y CharterBT-Bold " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
+md-chboc8y CharterBT-BoldSmallCap " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbc8a.pfb
 md-chr7m MathDesign-CH-Regular-MathItalic-10 <md-chr7m.pfb
 md-chr7t MathDesign-CH-Regular-OT1-10 <md-chr7t.pfb
 md-chr7v MathDesign-CH-Regular-Extension-10 <md-chr7v.pfb
 md-chr7y MathDesign-CH-Regular-Symbol-10 <md-chr7y.pfb
 md-chr8c MathDesign-CH-Regular-TS1-10 <md-chr8c.pfb
 md-chr8t MathDesign-CH-Regular-T1-10 <md-chr8t.pfb
+md-chr8y CharterBT-Roman " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
+md-chrc8y CharterBT-SmallCap " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchrc8a.pfb
 md-chri7m MathDesign-CH-Regular-Italic-MathItalic-10 <md-chri7m.pfb
 md-chri7t MathDesign-CH-Regular-Italic-OT1-10 <md-chri7t.pfb
 md-chri8c MathDesign-CH-Regular-Italic-TS1-10 <md-chri8c.pfb
 md-chri8t MathDesign-CH-Regular-Italic-T1-10 <md-chri8t.pfb
+md-chri8y CharterBT-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchri8a.pfb
 md-chrma MathDesign-CH-Regular-MathDesignSymbolA-10 <md-chrma.pfb
 md-chrmb MathDesign-CH-Regular-MathDesignSymbolB-10 <md-chrmb.pfb
 md-chro7t MathDesign-CH-Regular-Slanted-OT1-10 " 0.194 SlantFont " <md-chr7t.pfb
 md-chro8c MathDesign-CH-Regular-Slanted-TS1-10 " 0.194 SlantFont " <md-chr8c.pfb
 md-chro8t MathDesign-CH-Regular-Slanted-T1-10 " 0.194 SlantFont " <md-chr8t.pfb
+md-chro8y CharterBT-Roman " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
+md-chroc8y CharterBT-SmallCap " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchrc8a.pfb
+% mdgreek.map
+md-grbb7m GFSBodoni-Bold " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSBodoniBold.otf
+md-grbbi7m GFSBodoni-BoldItalic " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSBodoniBoldIt.otf
+md-grbr7m GFSBodoni-Regular " AutoEnc_py5znvjh3poy4qksuktslsc7kc ReEncodeFont " <[a_py5znv.enc <<GFSBodoni.otf
+md-grbri7m GFSBodoni-Italic " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSBodoniIt.otf
+md-grdb7m GFSDidot-Bold " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSDidotBold.otf
+md-grdbi7m GFSDidot-BoldItalic " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSDidotBoldItalic.otf
+md-grdr7m GFSDidot-Regular " AutoEnc_45o73xtpuiy7upxsdrc7cwlagg ReEncodeFont " <[a_45o73x.enc <<GFSDidot.otf
+md-grdri7m GFSDidot-Italic " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSDidotItalic.otf
 % mdput.map
 md-utb7m MathDesign-UT-Bold-MathItalic-10 <md-utb7m.pfb
 md-utb7t MathDesign-UT-Bold-OT1-10 <md-utb7t.pfb
@@ -11336,38 +11347,36 @@ md-utb7v MathDesign-UT-Bold-Extension-10 <md-utb7v.pfb
 md-utb7y MathDesign-UT-Bold-Symbol-10 <md-utb7y.pfb
 md-utb8c MathDesign-UT-Bold-TS1-10 <md-utb8c.pfb
 md-utb8t MathDesign-UT-Bold-T1-10 <md-utb8t.pfb
+md-utb8y Utopia-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
 md-utbi7m MathDesign-UT-Bold-Italic-MathItalic-10 <md-utbi7m.pfb
 md-utbi7t MathDesign-UT-Bold-Italic-OT1-10 <md-utbi7t.pfb
 md-utbi8c MathDesign-UT-Bold-Italic-TS1-10 <md-utbi8c.pfb
 md-utbi8t MathDesign-UT-Bold-Italic-T1-10 <md-utbi8t.pfb
+md-utbi8y Utopia-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putbi8a.pfb
 md-utbma MathDesign-UT-Bold-MathDesignSymbolA-10 <md-utbma.pfb
 md-utbmb MathDesign-UT-Bold-MathDesignSymbolB-10 <md-utbmb.pfb
 md-utbo7t MathDesign-UT-Bold-Slanted-OT1-10 " 0.231 SlantFont " <md-utb7t.pfb
 md-utbo8c MathDesign-UT-Bold-Slanted-TS1-10 " 0.231 SlantFont " <md-utb8c.pfb
 md-utbo8t MathDesign-UT-Bold-Slanted-T1-10 " 0.231 SlantFont " <md-utb8t.pfb
+md-utbo8y Utopia-Bold " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
 md-utr7m MathDesign-UT-Regular-MathItalic-10 <md-utr7m.pfb
 md-utr7t MathDesign-UT-Regular-OT1-10 <md-utr7t.pfb
 md-utr7v MathDesign-UT-Regular-Extension-10 <md-utr7v.pfb
 md-utr7y MathDesign-UT-Regular-Symbol-10 <md-utr7y.pfb
 md-utr8c MathDesign-UT-Regular-TS1-10 <md-utr8c.pfb
 md-utr8t MathDesign-UT-Regular-T1-10 <md-utr8t.pfb
+md-utr8y Utopia-Regular " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
 md-utri7m MathDesign-UT-Regular-Italic-MathItalic-10 <md-utri7m.pfb
 md-utri7t MathDesign-UT-Regular-Italic-OT1-10 <md-utri7t.pfb
 md-utri8c MathDesign-UT-Regular-Italic-TS1-10 <md-utri8c.pfb
 md-utri8t MathDesign-UT-Regular-Italic-T1-10 <md-utri8t.pfb
+md-utri8y Utopia-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putri8a.pfb
 md-utrma MathDesign-UT-Regular-MathDesignSymbolA-10 <md-utrma.pfb
 md-utrmb MathDesign-UT-Regular-MathDesignSymbolB-10 <md-utrmb.pfb
 md-utro7t MathDesign-UT-Regular-Slanted-OT1-10 " 0.231 SlantFont " <md-utr7t.pfb
 md-utro8c MathDesign-UT-Regular-Slanted-TS1-10 " 0.231 SlantFont " <md-utr8c.pfb
 md-utro8t MathDesign-UT-Regular-Slanted-T1-10 " 0.231 SlantFont " <md-utr8t.pfb
-putb8x UtopiaExp-Bold <putb8x.pfb
-putb8y Utopia-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
-putbi8y Utopia-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putbi8a.pfb
-putbo8y Utopia-Bold " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
-putr8x UtopiaExp-Regular <putr8x.pfb
-putr8y Utopia-Regular " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
-putri8y Utopia-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putri8a.pfb
-putro8y Utopia-Regular " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
+md-utro8y Utopia-Regular " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
 % mdsymbol.map
 MdSymbolA-Bold MdSymbolA-Bold <MdSymbolA-Bold.pfb
 MdSymbolA-Light MdSymbolA-Light <MdSymbolA-Light.pfb
@@ -11393,43 +11402,6 @@ MdSymbolF-Bold MdSymbolF-Bold <MdSymbolF-Bold.pfb
 MdSymbolF-Light MdSymbolF-Light <MdSymbolF-Light.pfb
 MdSymbolF-Regular MdSymbolF-Regular <MdSymbolF-Regular.pfb
 MdSymbolF-Semibold MdSymbolF-Semibold <MdSymbolF-Semibold.pfb
-% mdugm.map
-md-gmm7m MathDesign-GM-Medium-MathItalic-10 <md-gmm7m.pfb
-md-gmm7t MathDesign-GM-Medium-OT1-10 <md-gmm7t.pfb
-md-gmm7v MathDesign-GM-Medium-Extension-10 <md-gmm7v.pfb
-md-gmm7y MathDesign-GM-Medium-Symbol-10 <md-gmm7y.pfb
-md-gmm8c MathDesign-GM-Medium-TS1-10 <md-gmm8c.pfb
-md-gmm8t MathDesign-GM-Medium-T1-10 <md-gmm8t.pfb
-md-gmmi7m MathDesign-GM-Medium-Italic-MathItalic-10 <md-gmmi7m.pfb
-md-gmmi7t MathDesign-GM-Medium-Italic-OT1-10 <md-gmmi7t.pfb
-md-gmmi8c MathDesign-GM-Medium-Italic-TS1-10 <md-gmmi8c.pfb
-md-gmmi8t MathDesign-GM-Medium-Italic-T1-10 <md-gmmi8t.pfb
-md-gmmma MathDesign-GM-Medium-MathDesignSymbolA-10 <md-gmmma.pfb
-md-gmmmb MathDesign-GM-Medium-MathDesignSymbolB-10 <md-gmmmb.pfb
-md-gmmo7t MathDesign-GM-Medium-Slanted-OT1-10 " 0.287 SlantFont " <md-gmm7t.pfb
-md-gmmo8c MathDesign-GM-Medium-Slanted-TS1-10 " 0.287 SlantFont " <md-gmm8c.pfb
-md-gmmo8t MathDesign-GM-Medium-Slanted-T1-10 " 0.287 SlantFont " <md-gmm8t.pfb
-md-gmr7m MathDesign-GM-Regular-MathItalic-10 <md-gmr7m.pfb
-md-gmr7t MathDesign-GM-Regular-OT1-10 <md-gmr7t.pfb
-md-gmr7v MathDesign-GM-Regular-Extension-10 <md-gmr7v.pfb
-md-gmr7y MathDesign-GM-Regular-Symbol-10 <md-gmr7y.pfb
-md-gmr8c MathDesign-GM-Regular-TS1-10 <md-gmr8c.pfb
-md-gmr8t MathDesign-GM-Regular-T1-10 <md-gmr8t.pfb
-md-gmri7m MathDesign-GM-Regular-Italic-MathItalic-10 <md-gmri7m.pfb
-md-gmri7t MathDesign-GM-Regular-Italic-OT1-10 <md-gmri7t.pfb
-md-gmri8c MathDesign-GM-Regular-Italic-TS1-10 <md-gmri8c.pfb
-md-gmri8t MathDesign-GM-Regular-Italic-T1-10 <md-gmri8t.pfb
-md-gmrma MathDesign-GM-Regular-MathDesignSymbolA-10 <md-gmrma.pfb
-md-gmrmb MathDesign-GM-Regular-MathDesignSymbolB-10 <md-gmrmb.pfb
-md-gmro7t MathDesign-GM-Regular-Slanted-OT1-10 " 0.287 SlantFont " <md-gmr7t.pfb
-md-gmro8c MathDesign-GM-Regular-Slanted-TS1-10 " 0.287 SlantFont " <md-gmr8c.pfb
-md-gmro8t MathDesign-GM-Regular-Slanted-T1-10 " 0.287 SlantFont " <md-gmr8t.pfb
-ugmm8y GaramondNo8-Med " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmm8a.pfb
-ugmmi8y GaramondNo8-MedIta " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmmi8a.pfb
-ugmmo8y GaramondNo8-Med " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmm8a.pfb
-ugmr8y GaramondNo8-Reg " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
-ugmri8y GaramondNo8-Ita " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmri8a.pfb
-ugmro8y GaramondNo8-Reg " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
 % mr2j.map
 mr2jka mr2jka <mr2jka.pfb
 mr2jkb mr2jkb <mr2jkb.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_pk.map b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_pk.map
index 6b938bde154..fbbbc5fb19c 100644
--- a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_pk.map
+++ b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_pk.map
@@ -3410,10 +3410,10 @@ fbb-Bold-lf-sc-ly1--base fbb-Bold " AutoEnc_pqcug3vkt2winko352dcl3e6qf ReEncodeF
 fbb-Bold-lf-sc-t1--base fbb-Bold " AutoEnc_3jy3vuah34aiqicdoblysophza ReEncodeFont " <[fbb_3jy3vu.enc <fbb-Bold.pfb
 fbb-Bold-lf-t1--base fbb-Bold " AutoEnc_eaddwb4gcd3e2c2ecxpzo7ytwg ReEncodeFont " <[fbb_eaddwb.enc <fbb-Bold.pfb
 fbb-Bold-lf-ts1--base fbb-Bold " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Bold.pfb
-fbb-Bold-osf-ly1--base fbb-Bold " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Bold.pfb
-fbb-Bold-osf-sc-ly1--base fbb-Bold " AutoEnc_xoysobuad3k3nr2x77x5ijj3gc ReEncodeFont " <[fbb_xoysob.enc <fbb-Bold.pfb
-fbb-Bold-osf-sc-t1--base fbb-Bold " AutoEnc_22bu64fkwrs6ihh5s3sdhfaw3c ReEncodeFont " <[fbb_22bu64.enc <fbb-Bold.pfb
-fbb-Bold-osf-t1--base fbb-Bold " AutoEnc_6v6t7djji5dahvuxmnljp3tk5g ReEncodeFont " <[fbb_6v6t7d.enc <fbb-Bold.pfb
+fbb-Bold-osf-ly1--base fbb-Bold " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Bold.pfb
+fbb-Bold-osf-sc-ly1--base fbb-Bold " AutoEnc_icb62td6whgedlprygtgnxmvrb ReEncodeFont " <[fbb_icb62t.enc <fbb-Bold.pfb
+fbb-Bold-osf-sc-t1--base fbb-Bold " AutoEnc_eie4y7s2bcujl2vladill6xbaf ReEncodeFont " <[fbb_eie4y7.enc <fbb-Bold.pfb
+fbb-Bold-osf-t1--base fbb-Bold " AutoEnc_5yuftp67d7ahytvmxnmju35d3e ReEncodeFont " <[fbb_5yuftp.enc <fbb-Bold.pfb
 fbb-Bold-osf-ts1--base fbb-Bold " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Bold.pfb
 fbb-Bold-sup-ly1--base fbb-Bold " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Bold.pfb
 fbb-Bold-sup-t1--base fbb-Bold " AutoEnc_ciz6qsfdiju673xpz4pujigche ReEncodeFont " <[fbb_ciz6qs.enc <fbb-Bold.pfb
@@ -3432,10 +3432,10 @@ fbb-BoldItalic-lf-sc-ly1--base fbb-BoldItalic " AutoEnc_2quttajmnn4ocncvvpsvmobo
 fbb-BoldItalic-lf-sc-t1--base fbb-BoldItalic " AutoEnc_ksln4yiq47ru7z2ynez44kd6lb ReEncodeFont " <[fbb_ksln4y.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-lf-t1--base fbb-BoldItalic " AutoEnc_vvs2t7ml7vp3slshul5ixtlraa ReEncodeFont " <[fbb_vvs2t7.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-lf-ts1--base fbb-BoldItalic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-ly1--base fbb-BoldItalic " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-sc-ly1--base fbb-BoldItalic " AutoEnc_xhatrxtqf5t6k6thg2pkbcodpe ReEncodeFont " <[fbb_xhatrx.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-sc-t1--base fbb-BoldItalic " AutoEnc_xlwfeoletkqyqxohsikuwwgnwh ReEncodeFont " <[fbb_xlwfeo.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-t1--base fbb-BoldItalic " AutoEnc_cftewbv4lgxwtuhvjy4tb5bjnh ReEncodeFont " <[fbb_cftewb.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-ly1--base fbb-BoldItalic " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-sc-ly1--base fbb-BoldItalic " AutoEnc_5g5giqun737togfqabrefaj5ma ReEncodeFont " <[fbb_5g5giq.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-sc-t1--base fbb-BoldItalic " AutoEnc_bwe6jmh2rjigwsu7tcqweawnqa ReEncodeFont " <[fbb_bwe6jm.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-t1--base fbb-BoldItalic " AutoEnc_u3ego5ez7he26ghw3gzrknjoxg ReEncodeFont " <[fbb_u3ego5.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-osf-ts1--base fbb-BoldItalic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-sup-ly1--base fbb-BoldItalic " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-sup-t1--base fbb-BoldItalic " AutoEnc_wmijbzmtkibsvc2qvw3znxrrbd ReEncodeFont " <[fbb_wmijbz.enc <fbb-BoldItalic.pfb
@@ -3454,10 +3454,10 @@ fbb-Italic-lf-sc-ly1--base fbb-Italic " AutoEnc_2quttajmnn4ocncvvpsvmoboec ReEnc
 fbb-Italic-lf-sc-t1--base fbb-Italic " AutoEnc_ksln4yiq47ru7z2ynez44kd6lb ReEncodeFont " <[fbb_ksln4y.enc <fbb-Italic.pfb
 fbb-Italic-lf-t1--base fbb-Italic " AutoEnc_vvs2t7ml7vp3slshul5ixtlraa ReEncodeFont " <[fbb_vvs2t7.enc <fbb-Italic.pfb
 fbb-Italic-lf-ts1--base fbb-Italic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-Italic.pfb
-fbb-Italic-osf-ly1--base fbb-Italic " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Italic.pfb
-fbb-Italic-osf-sc-ly1--base fbb-Italic " AutoEnc_xhatrxtqf5t6k6thg2pkbcodpe ReEncodeFont " <[fbb_xhatrx.enc <fbb-Italic.pfb
-fbb-Italic-osf-sc-t1--base fbb-Italic " AutoEnc_xlwfeoletkqyqxohsikuwwgnwh ReEncodeFont " <[fbb_xlwfeo.enc <fbb-Italic.pfb
-fbb-Italic-osf-t1--base fbb-Italic " AutoEnc_cftewbv4lgxwtuhvjy4tb5bjnh ReEncodeFont " <[fbb_cftewb.enc <fbb-Italic.pfb
+fbb-Italic-osf-ly1--base fbb-Italic " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Italic.pfb
+fbb-Italic-osf-sc-ly1--base fbb-Italic " AutoEnc_5g5giqun737togfqabrefaj5ma ReEncodeFont " <[fbb_5g5giq.enc <fbb-Italic.pfb
+fbb-Italic-osf-sc-t1--base fbb-Italic " AutoEnc_bwe6jmh2rjigwsu7tcqweawnqa ReEncodeFont " <[fbb_bwe6jm.enc <fbb-Italic.pfb
+fbb-Italic-osf-t1--base fbb-Italic " AutoEnc_u3ego5ez7he26ghw3gzrknjoxg ReEncodeFont " <[fbb_u3ego5.enc <fbb-Italic.pfb
 fbb-Italic-osf-ts1--base fbb-Italic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-Italic.pfb
 fbb-Italic-sup-ly1--base fbb-Italic " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Italic.pfb
 fbb-Italic-sup-t1--base fbb-Italic " AutoEnc_wmijbzmtkibsvc2qvw3znxrrbd ReEncodeFont " <[fbb_wmijbz.enc <fbb-Italic.pfb
@@ -3476,10 +3476,10 @@ fbb-Regular-lf-sc-ly1--base fbb-Regular " AutoEnc_pqcug3vkt2winko352dcl3e6qf ReE
 fbb-Regular-lf-sc-t1--base fbb-Regular " AutoEnc_3gezysrzrhafltskc7vzrlzj6d ReEncodeFont " <[fbb_3gezys.enc <fbb-Regular.pfb
 fbb-Regular-lf-t1--base fbb-Regular " AutoEnc_p6sgcpz3tnt6s65vowl4nol3ya ReEncodeFont " <[fbb_p6sgcp.enc <fbb-Regular.pfb
 fbb-Regular-lf-ts1--base fbb-Regular " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Regular.pfb
-fbb-Regular-osf-ly1--base fbb-Regular " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Regular.pfb
-fbb-Regular-osf-sc-ly1--base fbb-Regular " AutoEnc_xoysobuad3k3nr2x77x5ijj3gc ReEncodeFont " <[fbb_xoysob.enc <fbb-Regular.pfb
-fbb-Regular-osf-sc-t1--base fbb-Regular " AutoEnc_2gijtigxaqirmd2zg4off4fuob ReEncodeFont " <[fbb_2gijti.enc <fbb-Regular.pfb
-fbb-Regular-osf-t1--base fbb-Regular " AutoEnc_cvknzo75nifc7tfjvsrllnboyf ReEncodeFont " <[fbb_cvknzo.enc <fbb-Regular.pfb
+fbb-Regular-osf-ly1--base fbb-Regular " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Regular.pfb
+fbb-Regular-osf-sc-ly1--base fbb-Regular " AutoEnc_icb62td6whgedlprygtgnxmvrb ReEncodeFont " <[fbb_icb62t.enc <fbb-Regular.pfb
+fbb-Regular-osf-sc-t1--base fbb-Regular " AutoEnc_qyua2i3u7ooq2uaoqdbsgzbs7f ReEncodeFont " <[fbb_qyua2i.enc <fbb-Regular.pfb
+fbb-Regular-osf-t1--base fbb-Regular " AutoEnc_4phrexd4gpjqeosuqg5keqmi5f ReEncodeFont " <[fbb_4phrex.enc <fbb-Regular.pfb
 fbb-Regular-osf-ts1--base fbb-Regular " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Regular.pfb
 fbb-Regular-sup-ly1--base fbb-Regular " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Regular.pfb
 fbb-Regular-sup-t1--base fbb-Regular " AutoEnc_k4t5oa4dqk7sihgf3uqrzkx56h ReEncodeFont " <[fbb_k4t5oa.enc <fbb-Regular.pfb
@@ -6825,44 +6825,55 @@ mcjroma mcjroma <mcjroma.pfb
 mcjrussian mcjrussian <mcjrussian.pfb
 mcjsy mcjsy <mcjsy.pfb
 % mdbch.map
-bchb8y CharterBT-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
-bchbc8a CharterBT-BoldSmallCap <bchbc8a.pfb
-bchbi8y CharterBT-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbi8a.pfb
-bchbo8y CharterBT-Bold " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
-bchr8y CharterBT-Roman " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
-bchrc8a CharterBT-SmallCap <bchrc8a.pfb
-bchri8y CharterBT-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchri8a.pfb
-bchro8y CharterBT-Roman " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
 md-chb7m MathDesign-CH-Bold-MathItalic-10 <md-chb7m.pfb
 md-chb7t MathDesign-CH-Bold-OT1-10 <md-chb7t.pfb
 md-chb7v MathDesign-CH-Bold-Extension-10 <md-chb7v.pfb
 md-chb7y MathDesign-CH-Bold-Symbol-10 <md-chb7y.pfb
 md-chb8c MathDesign-CH-Bold-TS1-10 <md-chb8c.pfb
 md-chb8t MathDesign-CH-Bold-T1-10 <md-chb8t.pfb
+md-chb8y CharterBT-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
+md-chbc8y CharterBT-BoldSmallCap " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbc8a.pfb
 md-chbi7m MathDesign-CH-Bold-Italic-MathItalic-10 <md-chbi7m.pfb
 md-chbi7t MathDesign-CH-Bold-Italic-OT1-10 <md-chbi7t.pfb
 md-chbi8c MathDesign-CH-Bold-Italic-TS1-10 <md-chbi8c.pfb
 md-chbi8t MathDesign-CH-Bold-Italic-T1-10 <md-chbi8t.pfb
+md-chbi8y CharterBT-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbi8a.pfb
 md-chbma MathDesign-CH-Bold-MathDesignSymbolA-10 <md-chbma.pfb
 md-chbmb MathDesign-CH-Bold-MathDesignSymbolB-10 <md-chbmb.pfb
 md-chbo7t MathDesign-CH-Bold-Slanted-OT1-10 " 0.194 SlantFont " <md-chb7t.pfb
 md-chbo8c MathDesign-CH-Bold-Slanted-TS1-10 " 0.194 SlantFont " <md-chb8c.pfb
 md-chbo8t MathDesign-CH-Bold-Slanted-T1-10 " 0.194 SlantFont " <md-chb8t.pfb
+md-chbo8y CharterBT-Bold " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
+md-chboc8y CharterBT-BoldSmallCap " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbc8a.pfb
 md-chr7m MathDesign-CH-Regular-MathItalic-10 <md-chr7m.pfb
 md-chr7t MathDesign-CH-Regular-OT1-10 <md-chr7t.pfb
 md-chr7v MathDesign-CH-Regular-Extension-10 <md-chr7v.pfb
 md-chr7y MathDesign-CH-Regular-Symbol-10 <md-chr7y.pfb
 md-chr8c MathDesign-CH-Regular-TS1-10 <md-chr8c.pfb
 md-chr8t MathDesign-CH-Regular-T1-10 <md-chr8t.pfb
+md-chr8y CharterBT-Roman " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
+md-chrc8y CharterBT-SmallCap " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchrc8a.pfb
 md-chri7m MathDesign-CH-Regular-Italic-MathItalic-10 <md-chri7m.pfb
 md-chri7t MathDesign-CH-Regular-Italic-OT1-10 <md-chri7t.pfb
 md-chri8c MathDesign-CH-Regular-Italic-TS1-10 <md-chri8c.pfb
 md-chri8t MathDesign-CH-Regular-Italic-T1-10 <md-chri8t.pfb
+md-chri8y CharterBT-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchri8a.pfb
 md-chrma MathDesign-CH-Regular-MathDesignSymbolA-10 <md-chrma.pfb
 md-chrmb MathDesign-CH-Regular-MathDesignSymbolB-10 <md-chrmb.pfb
 md-chro7t MathDesign-CH-Regular-Slanted-OT1-10 " 0.194 SlantFont " <md-chr7t.pfb
 md-chro8c MathDesign-CH-Regular-Slanted-TS1-10 " 0.194 SlantFont " <md-chr8c.pfb
 md-chro8t MathDesign-CH-Regular-Slanted-T1-10 " 0.194 SlantFont " <md-chr8t.pfb
+md-chro8y CharterBT-Roman " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
+md-chroc8y CharterBT-SmallCap " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchrc8a.pfb
+% mdgreek.map
+md-grbb7m GFSBodoni-Bold " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSBodoniBold.otf
+md-grbbi7m GFSBodoni-BoldItalic " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSBodoniBoldIt.otf
+md-grbr7m GFSBodoni-Regular " AutoEnc_py5znvjh3poy4qksuktslsc7kc ReEncodeFont " <[a_py5znv.enc <<GFSBodoni.otf
+md-grbri7m GFSBodoni-Italic " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSBodoniIt.otf
+md-grdb7m GFSDidot-Bold " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSDidotBold.otf
+md-grdbi7m GFSDidot-BoldItalic " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSDidotBoldItalic.otf
+md-grdr7m GFSDidot-Regular " AutoEnc_45o73xtpuiy7upxsdrc7cwlagg ReEncodeFont " <[a_45o73x.enc <<GFSDidot.otf
+md-grdri7m GFSDidot-Italic " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSDidotItalic.otf
 % mdput.map
 md-utb7m MathDesign-UT-Bold-MathItalic-10 <md-utb7m.pfb
 md-utb7t MathDesign-UT-Bold-OT1-10 <md-utb7t.pfb
@@ -6870,38 +6881,36 @@ md-utb7v MathDesign-UT-Bold-Extension-10 <md-utb7v.pfb
 md-utb7y MathDesign-UT-Bold-Symbol-10 <md-utb7y.pfb
 md-utb8c MathDesign-UT-Bold-TS1-10 <md-utb8c.pfb
 md-utb8t MathDesign-UT-Bold-T1-10 <md-utb8t.pfb
+md-utb8y Utopia-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
 md-utbi7m MathDesign-UT-Bold-Italic-MathItalic-10 <md-utbi7m.pfb
 md-utbi7t MathDesign-UT-Bold-Italic-OT1-10 <md-utbi7t.pfb
 md-utbi8c MathDesign-UT-Bold-Italic-TS1-10 <md-utbi8c.pfb
 md-utbi8t MathDesign-UT-Bold-Italic-T1-10 <md-utbi8t.pfb
+md-utbi8y Utopia-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putbi8a.pfb
 md-utbma MathDesign-UT-Bold-MathDesignSymbolA-10 <md-utbma.pfb
 md-utbmb MathDesign-UT-Bold-MathDesignSymbolB-10 <md-utbmb.pfb
 md-utbo7t MathDesign-UT-Bold-Slanted-OT1-10 " 0.231 SlantFont " <md-utb7t.pfb
 md-utbo8c MathDesign-UT-Bold-Slanted-TS1-10 " 0.231 SlantFont " <md-utb8c.pfb
 md-utbo8t MathDesign-UT-Bold-Slanted-T1-10 " 0.231 SlantFont " <md-utb8t.pfb
+md-utbo8y Utopia-Bold " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
 md-utr7m MathDesign-UT-Regular-MathItalic-10 <md-utr7m.pfb
 md-utr7t MathDesign-UT-Regular-OT1-10 <md-utr7t.pfb
 md-utr7v MathDesign-UT-Regular-Extension-10 <md-utr7v.pfb
 md-utr7y MathDesign-UT-Regular-Symbol-10 <md-utr7y.pfb
 md-utr8c MathDesign-UT-Regular-TS1-10 <md-utr8c.pfb
 md-utr8t MathDesign-UT-Regular-T1-10 <md-utr8t.pfb
+md-utr8y Utopia-Regular " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
 md-utri7m MathDesign-UT-Regular-Italic-MathItalic-10 <md-utri7m.pfb
 md-utri7t MathDesign-UT-Regular-Italic-OT1-10 <md-utri7t.pfb
 md-utri8c MathDesign-UT-Regular-Italic-TS1-10 <md-utri8c.pfb
 md-utri8t MathDesign-UT-Regular-Italic-T1-10 <md-utri8t.pfb
+md-utri8y Utopia-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putri8a.pfb
 md-utrma MathDesign-UT-Regular-MathDesignSymbolA-10 <md-utrma.pfb
 md-utrmb MathDesign-UT-Regular-MathDesignSymbolB-10 <md-utrmb.pfb
 md-utro7t MathDesign-UT-Regular-Slanted-OT1-10 " 0.231 SlantFont " <md-utr7t.pfb
 md-utro8c MathDesign-UT-Regular-Slanted-TS1-10 " 0.231 SlantFont " <md-utr8c.pfb
 md-utro8t MathDesign-UT-Regular-Slanted-T1-10 " 0.231 SlantFont " <md-utr8t.pfb
-putb8x UtopiaExp-Bold <putb8x.pfb
-putb8y Utopia-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
-putbi8y Utopia-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putbi8a.pfb
-putbo8y Utopia-Bold " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
-putr8x UtopiaExp-Regular <putr8x.pfb
-putr8y Utopia-Regular " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
-putri8y Utopia-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putri8a.pfb
-putro8y Utopia-Regular " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
+md-utro8y Utopia-Regular " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
 % mdsymbol.map
 MdSymbolA-Bold MdSymbolA-Bold <MdSymbolA-Bold.pfb
 MdSymbolA-Light MdSymbolA-Light <MdSymbolA-Light.pfb
@@ -6927,43 +6936,6 @@ MdSymbolF-Bold MdSymbolF-Bold <MdSymbolF-Bold.pfb
 MdSymbolF-Light MdSymbolF-Light <MdSymbolF-Light.pfb
 MdSymbolF-Regular MdSymbolF-Regular <MdSymbolF-Regular.pfb
 MdSymbolF-Semibold MdSymbolF-Semibold <MdSymbolF-Semibold.pfb
-% mdugm.map
-md-gmm7m MathDesign-GM-Medium-MathItalic-10 <md-gmm7m.pfb
-md-gmm7t MathDesign-GM-Medium-OT1-10 <md-gmm7t.pfb
-md-gmm7v MathDesign-GM-Medium-Extension-10 <md-gmm7v.pfb
-md-gmm7y MathDesign-GM-Medium-Symbol-10 <md-gmm7y.pfb
-md-gmm8c MathDesign-GM-Medium-TS1-10 <md-gmm8c.pfb
-md-gmm8t MathDesign-GM-Medium-T1-10 <md-gmm8t.pfb
-md-gmmi7m MathDesign-GM-Medium-Italic-MathItalic-10 <md-gmmi7m.pfb
-md-gmmi7t MathDesign-GM-Medium-Italic-OT1-10 <md-gmmi7t.pfb
-md-gmmi8c MathDesign-GM-Medium-Italic-TS1-10 <md-gmmi8c.pfb
-md-gmmi8t MathDesign-GM-Medium-Italic-T1-10 <md-gmmi8t.pfb
-md-gmmma MathDesign-GM-Medium-MathDesignSymbolA-10 <md-gmmma.pfb
-md-gmmmb MathDesign-GM-Medium-MathDesignSymbolB-10 <md-gmmmb.pfb
-md-gmmo7t MathDesign-GM-Medium-Slanted-OT1-10 " 0.287 SlantFont " <md-gmm7t.pfb
-md-gmmo8c MathDesign-GM-Medium-Slanted-TS1-10 " 0.287 SlantFont " <md-gmm8c.pfb
-md-gmmo8t MathDesign-GM-Medium-Slanted-T1-10 " 0.287 SlantFont " <md-gmm8t.pfb
-md-gmr7m MathDesign-GM-Regular-MathItalic-10 <md-gmr7m.pfb
-md-gmr7t MathDesign-GM-Regular-OT1-10 <md-gmr7t.pfb
-md-gmr7v MathDesign-GM-Regular-Extension-10 <md-gmr7v.pfb
-md-gmr7y MathDesign-GM-Regular-Symbol-10 <md-gmr7y.pfb
-md-gmr8c MathDesign-GM-Regular-TS1-10 <md-gmr8c.pfb
-md-gmr8t MathDesign-GM-Regular-T1-10 <md-gmr8t.pfb
-md-gmri7m MathDesign-GM-Regular-Italic-MathItalic-10 <md-gmri7m.pfb
-md-gmri7t MathDesign-GM-Regular-Italic-OT1-10 <md-gmri7t.pfb
-md-gmri8c MathDesign-GM-Regular-Italic-TS1-10 <md-gmri8c.pfb
-md-gmri8t MathDesign-GM-Regular-Italic-T1-10 <md-gmri8t.pfb
-md-gmrma MathDesign-GM-Regular-MathDesignSymbolA-10 <md-gmrma.pfb
-md-gmrmb MathDesign-GM-Regular-MathDesignSymbolB-10 <md-gmrmb.pfb
-md-gmro7t MathDesign-GM-Regular-Slanted-OT1-10 " 0.287 SlantFont " <md-gmr7t.pfb
-md-gmro8c MathDesign-GM-Regular-Slanted-TS1-10 " 0.287 SlantFont " <md-gmr8c.pfb
-md-gmro8t MathDesign-GM-Regular-Slanted-T1-10 " 0.287 SlantFont " <md-gmr8t.pfb
-ugmm8y GaramondNo8-Med " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmm8a.pfb
-ugmmi8y GaramondNo8-MedIta " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmmi8a.pfb
-ugmmo8y GaramondNo8-Med " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmm8a.pfb
-ugmr8y GaramondNo8-Reg " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
-ugmri8y GaramondNo8-Ita " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmri8a.pfb
-ugmro8y GaramondNo8-Reg " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
 % mr2j.map
 mr2jka mr2jka <mr2jka.pfb
 mr2jkb mr2jkb <mr2jkb.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_t1.map b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_t1.map
index 6581773a8a2..3e71ed92f9e 100644
--- a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_t1.map
+++ b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_t1.map
@@ -7876,10 +7876,10 @@ fbb-Bold-lf-sc-ly1--base fbb-Bold " AutoEnc_pqcug3vkt2winko352dcl3e6qf ReEncodeF
 fbb-Bold-lf-sc-t1--base fbb-Bold " AutoEnc_3jy3vuah34aiqicdoblysophza ReEncodeFont " <[fbb_3jy3vu.enc <fbb-Bold.pfb
 fbb-Bold-lf-t1--base fbb-Bold " AutoEnc_eaddwb4gcd3e2c2ecxpzo7ytwg ReEncodeFont " <[fbb_eaddwb.enc <fbb-Bold.pfb
 fbb-Bold-lf-ts1--base fbb-Bold " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Bold.pfb
-fbb-Bold-osf-ly1--base fbb-Bold " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Bold.pfb
-fbb-Bold-osf-sc-ly1--base fbb-Bold " AutoEnc_xoysobuad3k3nr2x77x5ijj3gc ReEncodeFont " <[fbb_xoysob.enc <fbb-Bold.pfb
-fbb-Bold-osf-sc-t1--base fbb-Bold " AutoEnc_22bu64fkwrs6ihh5s3sdhfaw3c ReEncodeFont " <[fbb_22bu64.enc <fbb-Bold.pfb
-fbb-Bold-osf-t1--base fbb-Bold " AutoEnc_6v6t7djji5dahvuxmnljp3tk5g ReEncodeFont " <[fbb_6v6t7d.enc <fbb-Bold.pfb
+fbb-Bold-osf-ly1--base fbb-Bold " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Bold.pfb
+fbb-Bold-osf-sc-ly1--base fbb-Bold " AutoEnc_icb62td6whgedlprygtgnxmvrb ReEncodeFont " <[fbb_icb62t.enc <fbb-Bold.pfb
+fbb-Bold-osf-sc-t1--base fbb-Bold " AutoEnc_eie4y7s2bcujl2vladill6xbaf ReEncodeFont " <[fbb_eie4y7.enc <fbb-Bold.pfb
+fbb-Bold-osf-t1--base fbb-Bold " AutoEnc_5yuftp67d7ahytvmxnmju35d3e ReEncodeFont " <[fbb_5yuftp.enc <fbb-Bold.pfb
 fbb-Bold-osf-ts1--base fbb-Bold " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Bold.pfb
 fbb-Bold-sup-ly1--base fbb-Bold " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Bold.pfb
 fbb-Bold-sup-t1--base fbb-Bold " AutoEnc_ciz6qsfdiju673xpz4pujigche ReEncodeFont " <[fbb_ciz6qs.enc <fbb-Bold.pfb
@@ -7898,10 +7898,10 @@ fbb-BoldItalic-lf-sc-ly1--base fbb-BoldItalic " AutoEnc_2quttajmnn4ocncvvpsvmobo
 fbb-BoldItalic-lf-sc-t1--base fbb-BoldItalic " AutoEnc_ksln4yiq47ru7z2ynez44kd6lb ReEncodeFont " <[fbb_ksln4y.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-lf-t1--base fbb-BoldItalic " AutoEnc_vvs2t7ml7vp3slshul5ixtlraa ReEncodeFont " <[fbb_vvs2t7.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-lf-ts1--base fbb-BoldItalic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-ly1--base fbb-BoldItalic " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-sc-ly1--base fbb-BoldItalic " AutoEnc_xhatrxtqf5t6k6thg2pkbcodpe ReEncodeFont " <[fbb_xhatrx.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-sc-t1--base fbb-BoldItalic " AutoEnc_xlwfeoletkqyqxohsikuwwgnwh ReEncodeFont " <[fbb_xlwfeo.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-t1--base fbb-BoldItalic " AutoEnc_cftewbv4lgxwtuhvjy4tb5bjnh ReEncodeFont " <[fbb_cftewb.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-ly1--base fbb-BoldItalic " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-sc-ly1--base fbb-BoldItalic " AutoEnc_5g5giqun737togfqabrefaj5ma ReEncodeFont " <[fbb_5g5giq.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-sc-t1--base fbb-BoldItalic " AutoEnc_bwe6jmh2rjigwsu7tcqweawnqa ReEncodeFont " <[fbb_bwe6jm.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-t1--base fbb-BoldItalic " AutoEnc_u3ego5ez7he26ghw3gzrknjoxg ReEncodeFont " <[fbb_u3ego5.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-osf-ts1--base fbb-BoldItalic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-sup-ly1--base fbb-BoldItalic " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-sup-t1--base fbb-BoldItalic " AutoEnc_wmijbzmtkibsvc2qvw3znxrrbd ReEncodeFont " <[fbb_wmijbz.enc <fbb-BoldItalic.pfb
@@ -7920,10 +7920,10 @@ fbb-Italic-lf-sc-ly1--base fbb-Italic " AutoEnc_2quttajmnn4ocncvvpsvmoboec ReEnc
 fbb-Italic-lf-sc-t1--base fbb-Italic " AutoEnc_ksln4yiq47ru7z2ynez44kd6lb ReEncodeFont " <[fbb_ksln4y.enc <fbb-Italic.pfb
 fbb-Italic-lf-t1--base fbb-Italic " AutoEnc_vvs2t7ml7vp3slshul5ixtlraa ReEncodeFont " <[fbb_vvs2t7.enc <fbb-Italic.pfb
 fbb-Italic-lf-ts1--base fbb-Italic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-Italic.pfb
-fbb-Italic-osf-ly1--base fbb-Italic " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Italic.pfb
-fbb-Italic-osf-sc-ly1--base fbb-Italic " AutoEnc_xhatrxtqf5t6k6thg2pkbcodpe ReEncodeFont " <[fbb_xhatrx.enc <fbb-Italic.pfb
-fbb-Italic-osf-sc-t1--base fbb-Italic " AutoEnc_xlwfeoletkqyqxohsikuwwgnwh ReEncodeFont " <[fbb_xlwfeo.enc <fbb-Italic.pfb
-fbb-Italic-osf-t1--base fbb-Italic " AutoEnc_cftewbv4lgxwtuhvjy4tb5bjnh ReEncodeFont " <[fbb_cftewb.enc <fbb-Italic.pfb
+fbb-Italic-osf-ly1--base fbb-Italic " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Italic.pfb
+fbb-Italic-osf-sc-ly1--base fbb-Italic " AutoEnc_5g5giqun737togfqabrefaj5ma ReEncodeFont " <[fbb_5g5giq.enc <fbb-Italic.pfb
+fbb-Italic-osf-sc-t1--base fbb-Italic " AutoEnc_bwe6jmh2rjigwsu7tcqweawnqa ReEncodeFont " <[fbb_bwe6jm.enc <fbb-Italic.pfb
+fbb-Italic-osf-t1--base fbb-Italic " AutoEnc_u3ego5ez7he26ghw3gzrknjoxg ReEncodeFont " <[fbb_u3ego5.enc <fbb-Italic.pfb
 fbb-Italic-osf-ts1--base fbb-Italic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-Italic.pfb
 fbb-Italic-sup-ly1--base fbb-Italic " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Italic.pfb
 fbb-Italic-sup-t1--base fbb-Italic " AutoEnc_wmijbzmtkibsvc2qvw3znxrrbd ReEncodeFont " <[fbb_wmijbz.enc <fbb-Italic.pfb
@@ -7942,10 +7942,10 @@ fbb-Regular-lf-sc-ly1--base fbb-Regular " AutoEnc_pqcug3vkt2winko352dcl3e6qf ReE
 fbb-Regular-lf-sc-t1--base fbb-Regular " AutoEnc_3gezysrzrhafltskc7vzrlzj6d ReEncodeFont " <[fbb_3gezys.enc <fbb-Regular.pfb
 fbb-Regular-lf-t1--base fbb-Regular " AutoEnc_p6sgcpz3tnt6s65vowl4nol3ya ReEncodeFont " <[fbb_p6sgcp.enc <fbb-Regular.pfb
 fbb-Regular-lf-ts1--base fbb-Regular " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Regular.pfb
-fbb-Regular-osf-ly1--base fbb-Regular " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Regular.pfb
-fbb-Regular-osf-sc-ly1--base fbb-Regular " AutoEnc_xoysobuad3k3nr2x77x5ijj3gc ReEncodeFont " <[fbb_xoysob.enc <fbb-Regular.pfb
-fbb-Regular-osf-sc-t1--base fbb-Regular " AutoEnc_2gijtigxaqirmd2zg4off4fuob ReEncodeFont " <[fbb_2gijti.enc <fbb-Regular.pfb
-fbb-Regular-osf-t1--base fbb-Regular " AutoEnc_cvknzo75nifc7tfjvsrllnboyf ReEncodeFont " <[fbb_cvknzo.enc <fbb-Regular.pfb
+fbb-Regular-osf-ly1--base fbb-Regular " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Regular.pfb
+fbb-Regular-osf-sc-ly1--base fbb-Regular " AutoEnc_icb62td6whgedlprygtgnxmvrb ReEncodeFont " <[fbb_icb62t.enc <fbb-Regular.pfb
+fbb-Regular-osf-sc-t1--base fbb-Regular " AutoEnc_qyua2i3u7ooq2uaoqdbsgzbs7f ReEncodeFont " <[fbb_qyua2i.enc <fbb-Regular.pfb
+fbb-Regular-osf-t1--base fbb-Regular " AutoEnc_4phrexd4gpjqeosuqg5keqmi5f ReEncodeFont " <[fbb_4phrex.enc <fbb-Regular.pfb
 fbb-Regular-osf-ts1--base fbb-Regular " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Regular.pfb
 fbb-Regular-sup-ly1--base fbb-Regular " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Regular.pfb
 fbb-Regular-sup-t1--base fbb-Regular " AutoEnc_k4t5oa4dqk7sihgf3uqrzkx56h ReEncodeFont " <[fbb_k4t5oa.enc <fbb-Regular.pfb
@@ -11291,44 +11291,55 @@ mcjroma mcjroma <mcjroma.pfb
 mcjrussian mcjrussian <mcjrussian.pfb
 mcjsy mcjsy <mcjsy.pfb
 % mdbch.map
-bchb8y CharterBT-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
-bchbc8a CharterBT-BoldSmallCap <bchbc8a.pfb
-bchbi8y CharterBT-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbi8a.pfb
-bchbo8y CharterBT-Bold " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
-bchr8y CharterBT-Roman " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
-bchrc8a CharterBT-SmallCap <bchrc8a.pfb
-bchri8y CharterBT-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchri8a.pfb
-bchro8y CharterBT-Roman " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
 md-chb7m MathDesign-CH-Bold-MathItalic-10 <md-chb7m.pfb
 md-chb7t MathDesign-CH-Bold-OT1-10 <md-chb7t.pfb
 md-chb7v MathDesign-CH-Bold-Extension-10 <md-chb7v.pfb
 md-chb7y MathDesign-CH-Bold-Symbol-10 <md-chb7y.pfb
 md-chb8c MathDesign-CH-Bold-TS1-10 <md-chb8c.pfb
 md-chb8t MathDesign-CH-Bold-T1-10 <md-chb8t.pfb
+md-chb8y CharterBT-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
+md-chbc8y CharterBT-BoldSmallCap " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbc8a.pfb
 md-chbi7m MathDesign-CH-Bold-Italic-MathItalic-10 <md-chbi7m.pfb
 md-chbi7t MathDesign-CH-Bold-Italic-OT1-10 <md-chbi7t.pfb
 md-chbi8c MathDesign-CH-Bold-Italic-TS1-10 <md-chbi8c.pfb
 md-chbi8t MathDesign-CH-Bold-Italic-T1-10 <md-chbi8t.pfb
+md-chbi8y CharterBT-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbi8a.pfb
 md-chbma MathDesign-CH-Bold-MathDesignSymbolA-10 <md-chbma.pfb
 md-chbmb MathDesign-CH-Bold-MathDesignSymbolB-10 <md-chbmb.pfb
 md-chbo7t MathDesign-CH-Bold-Slanted-OT1-10 " 0.194 SlantFont " <md-chb7t.pfb
 md-chbo8c MathDesign-CH-Bold-Slanted-TS1-10 " 0.194 SlantFont " <md-chb8c.pfb
 md-chbo8t MathDesign-CH-Bold-Slanted-T1-10 " 0.194 SlantFont " <md-chb8t.pfb
+md-chbo8y CharterBT-Bold " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
+md-chboc8y CharterBT-BoldSmallCap " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbc8a.pfb
 md-chr7m MathDesign-CH-Regular-MathItalic-10 <md-chr7m.pfb
 md-chr7t MathDesign-CH-Regular-OT1-10 <md-chr7t.pfb
 md-chr7v MathDesign-CH-Regular-Extension-10 <md-chr7v.pfb
 md-chr7y MathDesign-CH-Regular-Symbol-10 <md-chr7y.pfb
 md-chr8c MathDesign-CH-Regular-TS1-10 <md-chr8c.pfb
 md-chr8t MathDesign-CH-Regular-T1-10 <md-chr8t.pfb
+md-chr8y CharterBT-Roman " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
+md-chrc8y CharterBT-SmallCap " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchrc8a.pfb
 md-chri7m MathDesign-CH-Regular-Italic-MathItalic-10 <md-chri7m.pfb
 md-chri7t MathDesign-CH-Regular-Italic-OT1-10 <md-chri7t.pfb
 md-chri8c MathDesign-CH-Regular-Italic-TS1-10 <md-chri8c.pfb
 md-chri8t MathDesign-CH-Regular-Italic-T1-10 <md-chri8t.pfb
+md-chri8y CharterBT-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchri8a.pfb
 md-chrma MathDesign-CH-Regular-MathDesignSymbolA-10 <md-chrma.pfb
 md-chrmb MathDesign-CH-Regular-MathDesignSymbolB-10 <md-chrmb.pfb
 md-chro7t MathDesign-CH-Regular-Slanted-OT1-10 " 0.194 SlantFont " <md-chr7t.pfb
 md-chro8c MathDesign-CH-Regular-Slanted-TS1-10 " 0.194 SlantFont " <md-chr8c.pfb
 md-chro8t MathDesign-CH-Regular-Slanted-T1-10 " 0.194 SlantFont " <md-chr8t.pfb
+md-chro8y CharterBT-Roman " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
+md-chroc8y CharterBT-SmallCap " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchrc8a.pfb
+% mdgreek.map
+md-grbb7m GFSBodoni-Bold " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSBodoniBold.otf
+md-grbbi7m GFSBodoni-BoldItalic " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSBodoniBoldIt.otf
+md-grbr7m GFSBodoni-Regular " AutoEnc_py5znvjh3poy4qksuktslsc7kc ReEncodeFont " <[a_py5znv.enc <<GFSBodoni.otf
+md-grbri7m GFSBodoni-Italic " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSBodoniIt.otf
+md-grdb7m GFSDidot-Bold " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSDidotBold.otf
+md-grdbi7m GFSDidot-BoldItalic " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSDidotBoldItalic.otf
+md-grdr7m GFSDidot-Regular " AutoEnc_45o73xtpuiy7upxsdrc7cwlagg ReEncodeFont " <[a_45o73x.enc <<GFSDidot.otf
+md-grdri7m GFSDidot-Italic " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSDidotItalic.otf
 % mdput.map
 md-utb7m MathDesign-UT-Bold-MathItalic-10 <md-utb7m.pfb
 md-utb7t MathDesign-UT-Bold-OT1-10 <md-utb7t.pfb
@@ -11336,38 +11347,36 @@ md-utb7v MathDesign-UT-Bold-Extension-10 <md-utb7v.pfb
 md-utb7y MathDesign-UT-Bold-Symbol-10 <md-utb7y.pfb
 md-utb8c MathDesign-UT-Bold-TS1-10 <md-utb8c.pfb
 md-utb8t MathDesign-UT-Bold-T1-10 <md-utb8t.pfb
+md-utb8y Utopia-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
 md-utbi7m MathDesign-UT-Bold-Italic-MathItalic-10 <md-utbi7m.pfb
 md-utbi7t MathDesign-UT-Bold-Italic-OT1-10 <md-utbi7t.pfb
 md-utbi8c MathDesign-UT-Bold-Italic-TS1-10 <md-utbi8c.pfb
 md-utbi8t MathDesign-UT-Bold-Italic-T1-10 <md-utbi8t.pfb
+md-utbi8y Utopia-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putbi8a.pfb
 md-utbma MathDesign-UT-Bold-MathDesignSymbolA-10 <md-utbma.pfb
 md-utbmb MathDesign-UT-Bold-MathDesignSymbolB-10 <md-utbmb.pfb
 md-utbo7t MathDesign-UT-Bold-Slanted-OT1-10 " 0.231 SlantFont " <md-utb7t.pfb
 md-utbo8c MathDesign-UT-Bold-Slanted-TS1-10 " 0.231 SlantFont " <md-utb8c.pfb
 md-utbo8t MathDesign-UT-Bold-Slanted-T1-10 " 0.231 SlantFont " <md-utb8t.pfb
+md-utbo8y Utopia-Bold " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
 md-utr7m MathDesign-UT-Regular-MathItalic-10 <md-utr7m.pfb
 md-utr7t MathDesign-UT-Regular-OT1-10 <md-utr7t.pfb
 md-utr7v MathDesign-UT-Regular-Extension-10 <md-utr7v.pfb
 md-utr7y MathDesign-UT-Regular-Symbol-10 <md-utr7y.pfb
 md-utr8c MathDesign-UT-Regular-TS1-10 <md-utr8c.pfb
 md-utr8t MathDesign-UT-Regular-T1-10 <md-utr8t.pfb
+md-utr8y Utopia-Regular " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
 md-utri7m MathDesign-UT-Regular-Italic-MathItalic-10 <md-utri7m.pfb
 md-utri7t MathDesign-UT-Regular-Italic-OT1-10 <md-utri7t.pfb
 md-utri8c MathDesign-UT-Regular-Italic-TS1-10 <md-utri8c.pfb
 md-utri8t MathDesign-UT-Regular-Italic-T1-10 <md-utri8t.pfb
+md-utri8y Utopia-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putri8a.pfb
 md-utrma MathDesign-UT-Regular-MathDesignSymbolA-10 <md-utrma.pfb
 md-utrmb MathDesign-UT-Regular-MathDesignSymbolB-10 <md-utrmb.pfb
 md-utro7t MathDesign-UT-Regular-Slanted-OT1-10 " 0.231 SlantFont " <md-utr7t.pfb
 md-utro8c MathDesign-UT-Regular-Slanted-TS1-10 " 0.231 SlantFont " <md-utr8c.pfb
 md-utro8t MathDesign-UT-Regular-Slanted-T1-10 " 0.231 SlantFont " <md-utr8t.pfb
-putb8x UtopiaExp-Bold <putb8x.pfb
-putb8y Utopia-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
-putbi8y Utopia-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putbi8a.pfb
-putbo8y Utopia-Bold " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
-putr8x UtopiaExp-Regular <putr8x.pfb
-putr8y Utopia-Regular " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
-putri8y Utopia-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putri8a.pfb
-putro8y Utopia-Regular " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
+md-utro8y Utopia-Regular " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
 % mdsymbol.map
 MdSymbolA-Bold MdSymbolA-Bold <MdSymbolA-Bold.pfb
 MdSymbolA-Light MdSymbolA-Light <MdSymbolA-Light.pfb
@@ -11393,43 +11402,6 @@ MdSymbolF-Bold MdSymbolF-Bold <MdSymbolF-Bold.pfb
 MdSymbolF-Light MdSymbolF-Light <MdSymbolF-Light.pfb
 MdSymbolF-Regular MdSymbolF-Regular <MdSymbolF-Regular.pfb
 MdSymbolF-Semibold MdSymbolF-Semibold <MdSymbolF-Semibold.pfb
-% mdugm.map
-md-gmm7m MathDesign-GM-Medium-MathItalic-10 <md-gmm7m.pfb
-md-gmm7t MathDesign-GM-Medium-OT1-10 <md-gmm7t.pfb
-md-gmm7v MathDesign-GM-Medium-Extension-10 <md-gmm7v.pfb
-md-gmm7y MathDesign-GM-Medium-Symbol-10 <md-gmm7y.pfb
-md-gmm8c MathDesign-GM-Medium-TS1-10 <md-gmm8c.pfb
-md-gmm8t MathDesign-GM-Medium-T1-10 <md-gmm8t.pfb
-md-gmmi7m MathDesign-GM-Medium-Italic-MathItalic-10 <md-gmmi7m.pfb
-md-gmmi7t MathDesign-GM-Medium-Italic-OT1-10 <md-gmmi7t.pfb
-md-gmmi8c MathDesign-GM-Medium-Italic-TS1-10 <md-gmmi8c.pfb
-md-gmmi8t MathDesign-GM-Medium-Italic-T1-10 <md-gmmi8t.pfb
-md-gmmma MathDesign-GM-Medium-MathDesignSymbolA-10 <md-gmmma.pfb
-md-gmmmb MathDesign-GM-Medium-MathDesignSymbolB-10 <md-gmmmb.pfb
-md-gmmo7t MathDesign-GM-Medium-Slanted-OT1-10 " 0.287 SlantFont " <md-gmm7t.pfb
-md-gmmo8c MathDesign-GM-Medium-Slanted-TS1-10 " 0.287 SlantFont " <md-gmm8c.pfb
-md-gmmo8t MathDesign-GM-Medium-Slanted-T1-10 " 0.287 SlantFont " <md-gmm8t.pfb
-md-gmr7m MathDesign-GM-Regular-MathItalic-10 <md-gmr7m.pfb
-md-gmr7t MathDesign-GM-Regular-OT1-10 <md-gmr7t.pfb
-md-gmr7v MathDesign-GM-Regular-Extension-10 <md-gmr7v.pfb
-md-gmr7y MathDesign-GM-Regular-Symbol-10 <md-gmr7y.pfb
-md-gmr8c MathDesign-GM-Regular-TS1-10 <md-gmr8c.pfb
-md-gmr8t MathDesign-GM-Regular-T1-10 <md-gmr8t.pfb
-md-gmri7m MathDesign-GM-Regular-Italic-MathItalic-10 <md-gmri7m.pfb
-md-gmri7t MathDesign-GM-Regular-Italic-OT1-10 <md-gmri7t.pfb
-md-gmri8c MathDesign-GM-Regular-Italic-TS1-10 <md-gmri8c.pfb
-md-gmri8t MathDesign-GM-Regular-Italic-T1-10 <md-gmri8t.pfb
-md-gmrma MathDesign-GM-Regular-MathDesignSymbolA-10 <md-gmrma.pfb
-md-gmrmb MathDesign-GM-Regular-MathDesignSymbolB-10 <md-gmrmb.pfb
-md-gmro7t MathDesign-GM-Regular-Slanted-OT1-10 " 0.287 SlantFont " <md-gmr7t.pfb
-md-gmro8c MathDesign-GM-Regular-Slanted-TS1-10 " 0.287 SlantFont " <md-gmr8c.pfb
-md-gmro8t MathDesign-GM-Regular-Slanted-T1-10 " 0.287 SlantFont " <md-gmr8t.pfb
-ugmm8y GaramondNo8-Med " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmm8a.pfb
-ugmmi8y GaramondNo8-MedIta " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmmi8a.pfb
-ugmmo8y GaramondNo8-Med " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmm8a.pfb
-ugmr8y GaramondNo8-Reg " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
-ugmri8y GaramondNo8-Ita " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmri8a.pfb
-ugmro8y GaramondNo8-Reg " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
 % mr2j.map
 mr2jka mr2jka <mr2jka.pfb
 mr2jkb mr2jkb <mr2jkb.pfb
diff --git a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex.map b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex.map
index 35951e1c467..bc659180c95 100644
--- a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex.map
+++ b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex.map
@@ -7876,10 +7876,10 @@ fbb-Bold-lf-sc-ly1--base fbb-Bold " AutoEnc_pqcug3vkt2winko352dcl3e6qf ReEncodeF
 fbb-Bold-lf-sc-t1--base fbb-Bold " AutoEnc_3jy3vuah34aiqicdoblysophza ReEncodeFont " <[fbb_3jy3vu.enc <fbb-Bold.pfb
 fbb-Bold-lf-t1--base fbb-Bold " AutoEnc_eaddwb4gcd3e2c2ecxpzo7ytwg ReEncodeFont " <[fbb_eaddwb.enc <fbb-Bold.pfb
 fbb-Bold-lf-ts1--base fbb-Bold " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Bold.pfb
-fbb-Bold-osf-ly1--base fbb-Bold " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Bold.pfb
-fbb-Bold-osf-sc-ly1--base fbb-Bold " AutoEnc_xoysobuad3k3nr2x77x5ijj3gc ReEncodeFont " <[fbb_xoysob.enc <fbb-Bold.pfb
-fbb-Bold-osf-sc-t1--base fbb-Bold " AutoEnc_22bu64fkwrs6ihh5s3sdhfaw3c ReEncodeFont " <[fbb_22bu64.enc <fbb-Bold.pfb
-fbb-Bold-osf-t1--base fbb-Bold " AutoEnc_6v6t7djji5dahvuxmnljp3tk5g ReEncodeFont " <[fbb_6v6t7d.enc <fbb-Bold.pfb
+fbb-Bold-osf-ly1--base fbb-Bold " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Bold.pfb
+fbb-Bold-osf-sc-ly1--base fbb-Bold " AutoEnc_icb62td6whgedlprygtgnxmvrb ReEncodeFont " <[fbb_icb62t.enc <fbb-Bold.pfb
+fbb-Bold-osf-sc-t1--base fbb-Bold " AutoEnc_eie4y7s2bcujl2vladill6xbaf ReEncodeFont " <[fbb_eie4y7.enc <fbb-Bold.pfb
+fbb-Bold-osf-t1--base fbb-Bold " AutoEnc_5yuftp67d7ahytvmxnmju35d3e ReEncodeFont " <[fbb_5yuftp.enc <fbb-Bold.pfb
 fbb-Bold-osf-ts1--base fbb-Bold " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Bold.pfb
 fbb-Bold-sup-ly1--base fbb-Bold " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Bold.pfb
 fbb-Bold-sup-t1--base fbb-Bold " AutoEnc_ciz6qsfdiju673xpz4pujigche ReEncodeFont " <[fbb_ciz6qs.enc <fbb-Bold.pfb
@@ -7898,10 +7898,10 @@ fbb-BoldItalic-lf-sc-ly1--base fbb-BoldItalic " AutoEnc_2quttajmnn4ocncvvpsvmobo
 fbb-BoldItalic-lf-sc-t1--base fbb-BoldItalic " AutoEnc_ksln4yiq47ru7z2ynez44kd6lb ReEncodeFont " <[fbb_ksln4y.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-lf-t1--base fbb-BoldItalic " AutoEnc_vvs2t7ml7vp3slshul5ixtlraa ReEncodeFont " <[fbb_vvs2t7.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-lf-ts1--base fbb-BoldItalic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-ly1--base fbb-BoldItalic " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-sc-ly1--base fbb-BoldItalic " AutoEnc_xhatrxtqf5t6k6thg2pkbcodpe ReEncodeFont " <[fbb_xhatrx.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-sc-t1--base fbb-BoldItalic " AutoEnc_xlwfeoletkqyqxohsikuwwgnwh ReEncodeFont " <[fbb_xlwfeo.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-t1--base fbb-BoldItalic " AutoEnc_cftewbv4lgxwtuhvjy4tb5bjnh ReEncodeFont " <[fbb_cftewb.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-ly1--base fbb-BoldItalic " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-sc-ly1--base fbb-BoldItalic " AutoEnc_5g5giqun737togfqabrefaj5ma ReEncodeFont " <[fbb_5g5giq.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-sc-t1--base fbb-BoldItalic " AutoEnc_bwe6jmh2rjigwsu7tcqweawnqa ReEncodeFont " <[fbb_bwe6jm.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-t1--base fbb-BoldItalic " AutoEnc_u3ego5ez7he26ghw3gzrknjoxg ReEncodeFont " <[fbb_u3ego5.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-osf-ts1--base fbb-BoldItalic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-sup-ly1--base fbb-BoldItalic " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-sup-t1--base fbb-BoldItalic " AutoEnc_wmijbzmtkibsvc2qvw3znxrrbd ReEncodeFont " <[fbb_wmijbz.enc <fbb-BoldItalic.pfb
@@ -7920,10 +7920,10 @@ fbb-Italic-lf-sc-ly1--base fbb-Italic " AutoEnc_2quttajmnn4ocncvvpsvmoboec ReEnc
 fbb-Italic-lf-sc-t1--base fbb-Italic " AutoEnc_ksln4yiq47ru7z2ynez44kd6lb ReEncodeFont " <[fbb_ksln4y.enc <fbb-Italic.pfb
 fbb-Italic-lf-t1--base fbb-Italic " AutoEnc_vvs2t7ml7vp3slshul5ixtlraa ReEncodeFont " <[fbb_vvs2t7.enc <fbb-Italic.pfb
 fbb-Italic-lf-ts1--base fbb-Italic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-Italic.pfb
-fbb-Italic-osf-ly1--base fbb-Italic " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Italic.pfb
-fbb-Italic-osf-sc-ly1--base fbb-Italic " AutoEnc_xhatrxtqf5t6k6thg2pkbcodpe ReEncodeFont " <[fbb_xhatrx.enc <fbb-Italic.pfb
-fbb-Italic-osf-sc-t1--base fbb-Italic " AutoEnc_xlwfeoletkqyqxohsikuwwgnwh ReEncodeFont " <[fbb_xlwfeo.enc <fbb-Italic.pfb
-fbb-Italic-osf-t1--base fbb-Italic " AutoEnc_cftewbv4lgxwtuhvjy4tb5bjnh ReEncodeFont " <[fbb_cftewb.enc <fbb-Italic.pfb
+fbb-Italic-osf-ly1--base fbb-Italic " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Italic.pfb
+fbb-Italic-osf-sc-ly1--base fbb-Italic " AutoEnc_5g5giqun737togfqabrefaj5ma ReEncodeFont " <[fbb_5g5giq.enc <fbb-Italic.pfb
+fbb-Italic-osf-sc-t1--base fbb-Italic " AutoEnc_bwe6jmh2rjigwsu7tcqweawnqa ReEncodeFont " <[fbb_bwe6jm.enc <fbb-Italic.pfb
+fbb-Italic-osf-t1--base fbb-Italic " AutoEnc_u3ego5ez7he26ghw3gzrknjoxg ReEncodeFont " <[fbb_u3ego5.enc <fbb-Italic.pfb
 fbb-Italic-osf-ts1--base fbb-Italic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-Italic.pfb
 fbb-Italic-sup-ly1--base fbb-Italic " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Italic.pfb
 fbb-Italic-sup-t1--base fbb-Italic " AutoEnc_wmijbzmtkibsvc2qvw3znxrrbd ReEncodeFont " <[fbb_wmijbz.enc <fbb-Italic.pfb
@@ -7942,10 +7942,10 @@ fbb-Regular-lf-sc-ly1--base fbb-Regular " AutoEnc_pqcug3vkt2winko352dcl3e6qf ReE
 fbb-Regular-lf-sc-t1--base fbb-Regular " AutoEnc_3gezysrzrhafltskc7vzrlzj6d ReEncodeFont " <[fbb_3gezys.enc <fbb-Regular.pfb
 fbb-Regular-lf-t1--base fbb-Regular " AutoEnc_p6sgcpz3tnt6s65vowl4nol3ya ReEncodeFont " <[fbb_p6sgcp.enc <fbb-Regular.pfb
 fbb-Regular-lf-ts1--base fbb-Regular " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Regular.pfb
-fbb-Regular-osf-ly1--base fbb-Regular " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Regular.pfb
-fbb-Regular-osf-sc-ly1--base fbb-Regular " AutoEnc_xoysobuad3k3nr2x77x5ijj3gc ReEncodeFont " <[fbb_xoysob.enc <fbb-Regular.pfb
-fbb-Regular-osf-sc-t1--base fbb-Regular " AutoEnc_2gijtigxaqirmd2zg4off4fuob ReEncodeFont " <[fbb_2gijti.enc <fbb-Regular.pfb
-fbb-Regular-osf-t1--base fbb-Regular " AutoEnc_cvknzo75nifc7tfjvsrllnboyf ReEncodeFont " <[fbb_cvknzo.enc <fbb-Regular.pfb
+fbb-Regular-osf-ly1--base fbb-Regular " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Regular.pfb
+fbb-Regular-osf-sc-ly1--base fbb-Regular " AutoEnc_icb62td6whgedlprygtgnxmvrb ReEncodeFont " <[fbb_icb62t.enc <fbb-Regular.pfb
+fbb-Regular-osf-sc-t1--base fbb-Regular " AutoEnc_qyua2i3u7ooq2uaoqdbsgzbs7f ReEncodeFont " <[fbb_qyua2i.enc <fbb-Regular.pfb
+fbb-Regular-osf-t1--base fbb-Regular " AutoEnc_4phrexd4gpjqeosuqg5keqmi5f ReEncodeFont " <[fbb_4phrex.enc <fbb-Regular.pfb
 fbb-Regular-osf-ts1--base fbb-Regular " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Regular.pfb
 fbb-Regular-sup-ly1--base fbb-Regular " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Regular.pfb
 fbb-Regular-sup-t1--base fbb-Regular " AutoEnc_k4t5oa4dqk7sihgf3uqrzkx56h ReEncodeFont " <[fbb_k4t5oa.enc <fbb-Regular.pfb
@@ -11291,44 +11291,55 @@ mcjroma mcjroma <mcjroma.pfb
 mcjrussian mcjrussian <mcjrussian.pfb
 mcjsy mcjsy <mcjsy.pfb
 % mdbch.map
-bchb8y CharterBT-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
-bchbc8a CharterBT-BoldSmallCap <bchbc8a.pfb
-bchbi8y CharterBT-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbi8a.pfb
-bchbo8y CharterBT-Bold " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
-bchr8y CharterBT-Roman " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
-bchrc8a CharterBT-SmallCap <bchrc8a.pfb
-bchri8y CharterBT-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchri8a.pfb
-bchro8y CharterBT-Roman " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
 md-chb7m MathDesign-CH-Bold-MathItalic-10 <md-chb7m.pfb
 md-chb7t MathDesign-CH-Bold-OT1-10 <md-chb7t.pfb
 md-chb7v MathDesign-CH-Bold-Extension-10 <md-chb7v.pfb
 md-chb7y MathDesign-CH-Bold-Symbol-10 <md-chb7y.pfb
 md-chb8c MathDesign-CH-Bold-TS1-10 <md-chb8c.pfb
 md-chb8t MathDesign-CH-Bold-T1-10 <md-chb8t.pfb
+md-chb8y CharterBT-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
+md-chbc8y CharterBT-BoldSmallCap " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbc8a.pfb
 md-chbi7m MathDesign-CH-Bold-Italic-MathItalic-10 <md-chbi7m.pfb
 md-chbi7t MathDesign-CH-Bold-Italic-OT1-10 <md-chbi7t.pfb
 md-chbi8c MathDesign-CH-Bold-Italic-TS1-10 <md-chbi8c.pfb
 md-chbi8t MathDesign-CH-Bold-Italic-T1-10 <md-chbi8t.pfb
+md-chbi8y CharterBT-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbi8a.pfb
 md-chbma MathDesign-CH-Bold-MathDesignSymbolA-10 <md-chbma.pfb
 md-chbmb MathDesign-CH-Bold-MathDesignSymbolB-10 <md-chbmb.pfb
 md-chbo7t MathDesign-CH-Bold-Slanted-OT1-10 " 0.194 SlantFont " <md-chb7t.pfb
 md-chbo8c MathDesign-CH-Bold-Slanted-TS1-10 " 0.194 SlantFont " <md-chb8c.pfb
 md-chbo8t MathDesign-CH-Bold-Slanted-T1-10 " 0.194 SlantFont " <md-chb8t.pfb
+md-chbo8y CharterBT-Bold " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
+md-chboc8y CharterBT-BoldSmallCap " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbc8a.pfb
 md-chr7m MathDesign-CH-Regular-MathItalic-10 <md-chr7m.pfb
 md-chr7t MathDesign-CH-Regular-OT1-10 <md-chr7t.pfb
 md-chr7v MathDesign-CH-Regular-Extension-10 <md-chr7v.pfb
 md-chr7y MathDesign-CH-Regular-Symbol-10 <md-chr7y.pfb
 md-chr8c MathDesign-CH-Regular-TS1-10 <md-chr8c.pfb
 md-chr8t MathDesign-CH-Regular-T1-10 <md-chr8t.pfb
+md-chr8y CharterBT-Roman " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
+md-chrc8y CharterBT-SmallCap " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchrc8a.pfb
 md-chri7m MathDesign-CH-Regular-Italic-MathItalic-10 <md-chri7m.pfb
 md-chri7t MathDesign-CH-Regular-Italic-OT1-10 <md-chri7t.pfb
 md-chri8c MathDesign-CH-Regular-Italic-TS1-10 <md-chri8c.pfb
 md-chri8t MathDesign-CH-Regular-Italic-T1-10 <md-chri8t.pfb
+md-chri8y CharterBT-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchri8a.pfb
 md-chrma MathDesign-CH-Regular-MathDesignSymbolA-10 <md-chrma.pfb
 md-chrmb MathDesign-CH-Regular-MathDesignSymbolB-10 <md-chrmb.pfb
 md-chro7t MathDesign-CH-Regular-Slanted-OT1-10 " 0.194 SlantFont " <md-chr7t.pfb
 md-chro8c MathDesign-CH-Regular-Slanted-TS1-10 " 0.194 SlantFont " <md-chr8c.pfb
 md-chro8t MathDesign-CH-Regular-Slanted-T1-10 " 0.194 SlantFont " <md-chr8t.pfb
+md-chro8y CharterBT-Roman " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
+md-chroc8y CharterBT-SmallCap " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchrc8a.pfb
+% mdgreek.map
+md-grbb7m GFSBodoni-Bold " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSBodoniBold.otf
+md-grbbi7m GFSBodoni-BoldItalic " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSBodoniBoldIt.otf
+md-grbr7m GFSBodoni-Regular " AutoEnc_py5znvjh3poy4qksuktslsc7kc ReEncodeFont " <[a_py5znv.enc <<GFSBodoni.otf
+md-grbri7m GFSBodoni-Italic " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSBodoniIt.otf
+md-grdb7m GFSDidot-Bold " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSDidotBold.otf
+md-grdbi7m GFSDidot-BoldItalic " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSDidotBoldItalic.otf
+md-grdr7m GFSDidot-Regular " AutoEnc_45o73xtpuiy7upxsdrc7cwlagg ReEncodeFont " <[a_45o73x.enc <<GFSDidot.otf
+md-grdri7m GFSDidot-Italic " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSDidotItalic.otf
 % mdput.map
 md-utb7m MathDesign-UT-Bold-MathItalic-10 <md-utb7m.pfb
 md-utb7t MathDesign-UT-Bold-OT1-10 <md-utb7t.pfb
@@ -11336,38 +11347,36 @@ md-utb7v MathDesign-UT-Bold-Extension-10 <md-utb7v.pfb
 md-utb7y MathDesign-UT-Bold-Symbol-10 <md-utb7y.pfb
 md-utb8c MathDesign-UT-Bold-TS1-10 <md-utb8c.pfb
 md-utb8t MathDesign-UT-Bold-T1-10 <md-utb8t.pfb
+md-utb8y Utopia-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
 md-utbi7m MathDesign-UT-Bold-Italic-MathItalic-10 <md-utbi7m.pfb
 md-utbi7t MathDesign-UT-Bold-Italic-OT1-10 <md-utbi7t.pfb
 md-utbi8c MathDesign-UT-Bold-Italic-TS1-10 <md-utbi8c.pfb
 md-utbi8t MathDesign-UT-Bold-Italic-T1-10 <md-utbi8t.pfb
+md-utbi8y Utopia-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putbi8a.pfb
 md-utbma MathDesign-UT-Bold-MathDesignSymbolA-10 <md-utbma.pfb
 md-utbmb MathDesign-UT-Bold-MathDesignSymbolB-10 <md-utbmb.pfb
 md-utbo7t MathDesign-UT-Bold-Slanted-OT1-10 " 0.231 SlantFont " <md-utb7t.pfb
 md-utbo8c MathDesign-UT-Bold-Slanted-TS1-10 " 0.231 SlantFont " <md-utb8c.pfb
 md-utbo8t MathDesign-UT-Bold-Slanted-T1-10 " 0.231 SlantFont " <md-utb8t.pfb
+md-utbo8y Utopia-Bold " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
 md-utr7m MathDesign-UT-Regular-MathItalic-10 <md-utr7m.pfb
 md-utr7t MathDesign-UT-Regular-OT1-10 <md-utr7t.pfb
 md-utr7v MathDesign-UT-Regular-Extension-10 <md-utr7v.pfb
 md-utr7y MathDesign-UT-Regular-Symbol-10 <md-utr7y.pfb
 md-utr8c MathDesign-UT-Regular-TS1-10 <md-utr8c.pfb
 md-utr8t MathDesign-UT-Regular-T1-10 <md-utr8t.pfb
+md-utr8y Utopia-Regular " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
 md-utri7m MathDesign-UT-Regular-Italic-MathItalic-10 <md-utri7m.pfb
 md-utri7t MathDesign-UT-Regular-Italic-OT1-10 <md-utri7t.pfb
 md-utri8c MathDesign-UT-Regular-Italic-TS1-10 <md-utri8c.pfb
 md-utri8t MathDesign-UT-Regular-Italic-T1-10 <md-utri8t.pfb
+md-utri8y Utopia-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putri8a.pfb
 md-utrma MathDesign-UT-Regular-MathDesignSymbolA-10 <md-utrma.pfb
 md-utrmb MathDesign-UT-Regular-MathDesignSymbolB-10 <md-utrmb.pfb
 md-utro7t MathDesign-UT-Regular-Slanted-OT1-10 " 0.231 SlantFont " <md-utr7t.pfb
 md-utro8c MathDesign-UT-Regular-Slanted-TS1-10 " 0.231 SlantFont " <md-utr8c.pfb
 md-utro8t MathDesign-UT-Regular-Slanted-T1-10 " 0.231 SlantFont " <md-utr8t.pfb
-putb8x UtopiaExp-Bold <putb8x.pfb
-putb8y Utopia-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
-putbi8y Utopia-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putbi8a.pfb
-putbo8y Utopia-Bold " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
-putr8x UtopiaExp-Regular <putr8x.pfb
-putr8y Utopia-Regular " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
-putri8y Utopia-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putri8a.pfb
-putro8y Utopia-Regular " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
+md-utro8y Utopia-Regular " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
 % mdsymbol.map
 MdSymbolA-Bold MdSymbolA-Bold <MdSymbolA-Bold.pfb
 MdSymbolA-Light MdSymbolA-Light <MdSymbolA-Light.pfb
@@ -11393,43 +11402,6 @@ MdSymbolF-Bold MdSymbolF-Bold <MdSymbolF-Bold.pfb
 MdSymbolF-Light MdSymbolF-Light <MdSymbolF-Light.pfb
 MdSymbolF-Regular MdSymbolF-Regular <MdSymbolF-Regular.pfb
 MdSymbolF-Semibold MdSymbolF-Semibold <MdSymbolF-Semibold.pfb
-% mdugm.map
-md-gmm7m MathDesign-GM-Medium-MathItalic-10 <md-gmm7m.pfb
-md-gmm7t MathDesign-GM-Medium-OT1-10 <md-gmm7t.pfb
-md-gmm7v MathDesign-GM-Medium-Extension-10 <md-gmm7v.pfb
-md-gmm7y MathDesign-GM-Medium-Symbol-10 <md-gmm7y.pfb
-md-gmm8c MathDesign-GM-Medium-TS1-10 <md-gmm8c.pfb
-md-gmm8t MathDesign-GM-Medium-T1-10 <md-gmm8t.pfb
-md-gmmi7m MathDesign-GM-Medium-Italic-MathItalic-10 <md-gmmi7m.pfb
-md-gmmi7t MathDesign-GM-Medium-Italic-OT1-10 <md-gmmi7t.pfb
-md-gmmi8c MathDesign-GM-Medium-Italic-TS1-10 <md-gmmi8c.pfb
-md-gmmi8t MathDesign-GM-Medium-Italic-T1-10 <md-gmmi8t.pfb
-md-gmmma MathDesign-GM-Medium-MathDesignSymbolA-10 <md-gmmma.pfb
-md-gmmmb MathDesign-GM-Medium-MathDesignSymbolB-10 <md-gmmmb.pfb
-md-gmmo7t MathDesign-GM-Medium-Slanted-OT1-10 " 0.287 SlantFont " <md-gmm7t.pfb
-md-gmmo8c MathDesign-GM-Medium-Slanted-TS1-10 " 0.287 SlantFont " <md-gmm8c.pfb
-md-gmmo8t MathDesign-GM-Medium-Slanted-T1-10 " 0.287 SlantFont " <md-gmm8t.pfb
-md-gmr7m MathDesign-GM-Regular-MathItalic-10 <md-gmr7m.pfb
-md-gmr7t MathDesign-GM-Regular-OT1-10 <md-gmr7t.pfb
-md-gmr7v MathDesign-GM-Regular-Extension-10 <md-gmr7v.pfb
-md-gmr7y MathDesign-GM-Regular-Symbol-10 <md-gmr7y.pfb
-md-gmr8c MathDesign-GM-Regular-TS1-10 <md-gmr8c.pfb
-md-gmr8t MathDesign-GM-Regular-T1-10 <md-gmr8t.pfb
-md-gmri7m MathDesign-GM-Regular-Italic-MathItalic-10 <md-gmri7m.pfb
-md-gmri7t MathDesign-GM-Regular-Italic-OT1-10 <md-gmri7t.pfb
-md-gmri8c MathDesign-GM-Regular-Italic-TS1-10 <md-gmri8c.pfb
-md-gmri8t MathDesign-GM-Regular-Italic-T1-10 <md-gmri8t.pfb
-md-gmrma MathDesign-GM-Regular-MathDesignSymbolA-10 <md-gmrma.pfb
-md-gmrmb MathDesign-GM-Regular-MathDesignSymbolB-10 <md-gmrmb.pfb
-md-gmro7t MathDesign-GM-Regular-Slanted-OT1-10 " 0.287 SlantFont " <md-gmr7t.pfb
-md-gmro8c MathDesign-GM-Regular-Slanted-TS1-10 " 0.287 SlantFont " <md-gmr8c.pfb
-md-gmro8t MathDesign-GM-Regular-Slanted-T1-10 " 0.287 SlantFont " <md-gmr8t.pfb
-ugmm8y GaramondNo8-Med " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmm8a.pfb
-ugmmi8y GaramondNo8-MedIta " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmmi8a.pfb
-ugmmo8y GaramondNo8-Med " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmm8a.pfb
-ugmr8y GaramondNo8-Reg " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
-ugmri8y GaramondNo8-Ita " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmri8a.pfb
-ugmro8y GaramondNo8-Reg " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
 % mr2j.map
 mr2jka mr2jka <mr2jka.pfb
 mr2jkb mr2jkb <mr2jkb.pfb
diff --git a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_dl14.map b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_dl14.map
index 35951e1c467..bc659180c95 100644
--- a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_dl14.map
+++ b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_dl14.map
@@ -7876,10 +7876,10 @@ fbb-Bold-lf-sc-ly1--base fbb-Bold " AutoEnc_pqcug3vkt2winko352dcl3e6qf ReEncodeF
 fbb-Bold-lf-sc-t1--base fbb-Bold " AutoEnc_3jy3vuah34aiqicdoblysophza ReEncodeFont " <[fbb_3jy3vu.enc <fbb-Bold.pfb
 fbb-Bold-lf-t1--base fbb-Bold " AutoEnc_eaddwb4gcd3e2c2ecxpzo7ytwg ReEncodeFont " <[fbb_eaddwb.enc <fbb-Bold.pfb
 fbb-Bold-lf-ts1--base fbb-Bold " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Bold.pfb
-fbb-Bold-osf-ly1--base fbb-Bold " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Bold.pfb
-fbb-Bold-osf-sc-ly1--base fbb-Bold " AutoEnc_xoysobuad3k3nr2x77x5ijj3gc ReEncodeFont " <[fbb_xoysob.enc <fbb-Bold.pfb
-fbb-Bold-osf-sc-t1--base fbb-Bold " AutoEnc_22bu64fkwrs6ihh5s3sdhfaw3c ReEncodeFont " <[fbb_22bu64.enc <fbb-Bold.pfb
-fbb-Bold-osf-t1--base fbb-Bold " AutoEnc_6v6t7djji5dahvuxmnljp3tk5g ReEncodeFont " <[fbb_6v6t7d.enc <fbb-Bold.pfb
+fbb-Bold-osf-ly1--base fbb-Bold " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Bold.pfb
+fbb-Bold-osf-sc-ly1--base fbb-Bold " AutoEnc_icb62td6whgedlprygtgnxmvrb ReEncodeFont " <[fbb_icb62t.enc <fbb-Bold.pfb
+fbb-Bold-osf-sc-t1--base fbb-Bold " AutoEnc_eie4y7s2bcujl2vladill6xbaf ReEncodeFont " <[fbb_eie4y7.enc <fbb-Bold.pfb
+fbb-Bold-osf-t1--base fbb-Bold " AutoEnc_5yuftp67d7ahytvmxnmju35d3e ReEncodeFont " <[fbb_5yuftp.enc <fbb-Bold.pfb
 fbb-Bold-osf-ts1--base fbb-Bold " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Bold.pfb
 fbb-Bold-sup-ly1--base fbb-Bold " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Bold.pfb
 fbb-Bold-sup-t1--base fbb-Bold " AutoEnc_ciz6qsfdiju673xpz4pujigche ReEncodeFont " <[fbb_ciz6qs.enc <fbb-Bold.pfb
@@ -7898,10 +7898,10 @@ fbb-BoldItalic-lf-sc-ly1--base fbb-BoldItalic " AutoEnc_2quttajmnn4ocncvvpsvmobo
 fbb-BoldItalic-lf-sc-t1--base fbb-BoldItalic " AutoEnc_ksln4yiq47ru7z2ynez44kd6lb ReEncodeFont " <[fbb_ksln4y.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-lf-t1--base fbb-BoldItalic " AutoEnc_vvs2t7ml7vp3slshul5ixtlraa ReEncodeFont " <[fbb_vvs2t7.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-lf-ts1--base fbb-BoldItalic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-ly1--base fbb-BoldItalic " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-sc-ly1--base fbb-BoldItalic " AutoEnc_xhatrxtqf5t6k6thg2pkbcodpe ReEncodeFont " <[fbb_xhatrx.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-sc-t1--base fbb-BoldItalic " AutoEnc_xlwfeoletkqyqxohsikuwwgnwh ReEncodeFont " <[fbb_xlwfeo.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-t1--base fbb-BoldItalic " AutoEnc_cftewbv4lgxwtuhvjy4tb5bjnh ReEncodeFont " <[fbb_cftewb.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-ly1--base fbb-BoldItalic " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-sc-ly1--base fbb-BoldItalic " AutoEnc_5g5giqun737togfqabrefaj5ma ReEncodeFont " <[fbb_5g5giq.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-sc-t1--base fbb-BoldItalic " AutoEnc_bwe6jmh2rjigwsu7tcqweawnqa ReEncodeFont " <[fbb_bwe6jm.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-t1--base fbb-BoldItalic " AutoEnc_u3ego5ez7he26ghw3gzrknjoxg ReEncodeFont " <[fbb_u3ego5.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-osf-ts1--base fbb-BoldItalic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-sup-ly1--base fbb-BoldItalic " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-sup-t1--base fbb-BoldItalic " AutoEnc_wmijbzmtkibsvc2qvw3znxrrbd ReEncodeFont " <[fbb_wmijbz.enc <fbb-BoldItalic.pfb
@@ -7920,10 +7920,10 @@ fbb-Italic-lf-sc-ly1--base fbb-Italic " AutoEnc_2quttajmnn4ocncvvpsvmoboec ReEnc
 fbb-Italic-lf-sc-t1--base fbb-Italic " AutoEnc_ksln4yiq47ru7z2ynez44kd6lb ReEncodeFont " <[fbb_ksln4y.enc <fbb-Italic.pfb
 fbb-Italic-lf-t1--base fbb-Italic " AutoEnc_vvs2t7ml7vp3slshul5ixtlraa ReEncodeFont " <[fbb_vvs2t7.enc <fbb-Italic.pfb
 fbb-Italic-lf-ts1--base fbb-Italic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-Italic.pfb
-fbb-Italic-osf-ly1--base fbb-Italic " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Italic.pfb
-fbb-Italic-osf-sc-ly1--base fbb-Italic " AutoEnc_xhatrxtqf5t6k6thg2pkbcodpe ReEncodeFont " <[fbb_xhatrx.enc <fbb-Italic.pfb
-fbb-Italic-osf-sc-t1--base fbb-Italic " AutoEnc_xlwfeoletkqyqxohsikuwwgnwh ReEncodeFont " <[fbb_xlwfeo.enc <fbb-Italic.pfb
-fbb-Italic-osf-t1--base fbb-Italic " AutoEnc_cftewbv4lgxwtuhvjy4tb5bjnh ReEncodeFont " <[fbb_cftewb.enc <fbb-Italic.pfb
+fbb-Italic-osf-ly1--base fbb-Italic " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Italic.pfb
+fbb-Italic-osf-sc-ly1--base fbb-Italic " AutoEnc_5g5giqun737togfqabrefaj5ma ReEncodeFont " <[fbb_5g5giq.enc <fbb-Italic.pfb
+fbb-Italic-osf-sc-t1--base fbb-Italic " AutoEnc_bwe6jmh2rjigwsu7tcqweawnqa ReEncodeFont " <[fbb_bwe6jm.enc <fbb-Italic.pfb
+fbb-Italic-osf-t1--base fbb-Italic " AutoEnc_u3ego5ez7he26ghw3gzrknjoxg ReEncodeFont " <[fbb_u3ego5.enc <fbb-Italic.pfb
 fbb-Italic-osf-ts1--base fbb-Italic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-Italic.pfb
 fbb-Italic-sup-ly1--base fbb-Italic " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Italic.pfb
 fbb-Italic-sup-t1--base fbb-Italic " AutoEnc_wmijbzmtkibsvc2qvw3znxrrbd ReEncodeFont " <[fbb_wmijbz.enc <fbb-Italic.pfb
@@ -7942,10 +7942,10 @@ fbb-Regular-lf-sc-ly1--base fbb-Regular " AutoEnc_pqcug3vkt2winko352dcl3e6qf ReE
 fbb-Regular-lf-sc-t1--base fbb-Regular " AutoEnc_3gezysrzrhafltskc7vzrlzj6d ReEncodeFont " <[fbb_3gezys.enc <fbb-Regular.pfb
 fbb-Regular-lf-t1--base fbb-Regular " AutoEnc_p6sgcpz3tnt6s65vowl4nol3ya ReEncodeFont " <[fbb_p6sgcp.enc <fbb-Regular.pfb
 fbb-Regular-lf-ts1--base fbb-Regular " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Regular.pfb
-fbb-Regular-osf-ly1--base fbb-Regular " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Regular.pfb
-fbb-Regular-osf-sc-ly1--base fbb-Regular " AutoEnc_xoysobuad3k3nr2x77x5ijj3gc ReEncodeFont " <[fbb_xoysob.enc <fbb-Regular.pfb
-fbb-Regular-osf-sc-t1--base fbb-Regular " AutoEnc_2gijtigxaqirmd2zg4off4fuob ReEncodeFont " <[fbb_2gijti.enc <fbb-Regular.pfb
-fbb-Regular-osf-t1--base fbb-Regular " AutoEnc_cvknzo75nifc7tfjvsrllnboyf ReEncodeFont " <[fbb_cvknzo.enc <fbb-Regular.pfb
+fbb-Regular-osf-ly1--base fbb-Regular " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Regular.pfb
+fbb-Regular-osf-sc-ly1--base fbb-Regular " AutoEnc_icb62td6whgedlprygtgnxmvrb ReEncodeFont " <[fbb_icb62t.enc <fbb-Regular.pfb
+fbb-Regular-osf-sc-t1--base fbb-Regular " AutoEnc_qyua2i3u7ooq2uaoqdbsgzbs7f ReEncodeFont " <[fbb_qyua2i.enc <fbb-Regular.pfb
+fbb-Regular-osf-t1--base fbb-Regular " AutoEnc_4phrexd4gpjqeosuqg5keqmi5f ReEncodeFont " <[fbb_4phrex.enc <fbb-Regular.pfb
 fbb-Regular-osf-ts1--base fbb-Regular " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Regular.pfb
 fbb-Regular-sup-ly1--base fbb-Regular " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Regular.pfb
 fbb-Regular-sup-t1--base fbb-Regular " AutoEnc_k4t5oa4dqk7sihgf3uqrzkx56h ReEncodeFont " <[fbb_k4t5oa.enc <fbb-Regular.pfb
@@ -11291,44 +11291,55 @@ mcjroma mcjroma <mcjroma.pfb
 mcjrussian mcjrussian <mcjrussian.pfb
 mcjsy mcjsy <mcjsy.pfb
 % mdbch.map
-bchb8y CharterBT-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
-bchbc8a CharterBT-BoldSmallCap <bchbc8a.pfb
-bchbi8y CharterBT-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbi8a.pfb
-bchbo8y CharterBT-Bold " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
-bchr8y CharterBT-Roman " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
-bchrc8a CharterBT-SmallCap <bchrc8a.pfb
-bchri8y CharterBT-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchri8a.pfb
-bchro8y CharterBT-Roman " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
 md-chb7m MathDesign-CH-Bold-MathItalic-10 <md-chb7m.pfb
 md-chb7t MathDesign-CH-Bold-OT1-10 <md-chb7t.pfb
 md-chb7v MathDesign-CH-Bold-Extension-10 <md-chb7v.pfb
 md-chb7y MathDesign-CH-Bold-Symbol-10 <md-chb7y.pfb
 md-chb8c MathDesign-CH-Bold-TS1-10 <md-chb8c.pfb
 md-chb8t MathDesign-CH-Bold-T1-10 <md-chb8t.pfb
+md-chb8y CharterBT-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
+md-chbc8y CharterBT-BoldSmallCap " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbc8a.pfb
 md-chbi7m MathDesign-CH-Bold-Italic-MathItalic-10 <md-chbi7m.pfb
 md-chbi7t MathDesign-CH-Bold-Italic-OT1-10 <md-chbi7t.pfb
 md-chbi8c MathDesign-CH-Bold-Italic-TS1-10 <md-chbi8c.pfb
 md-chbi8t MathDesign-CH-Bold-Italic-T1-10 <md-chbi8t.pfb
+md-chbi8y CharterBT-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbi8a.pfb
 md-chbma MathDesign-CH-Bold-MathDesignSymbolA-10 <md-chbma.pfb
 md-chbmb MathDesign-CH-Bold-MathDesignSymbolB-10 <md-chbmb.pfb
 md-chbo7t MathDesign-CH-Bold-Slanted-OT1-10 " 0.194 SlantFont " <md-chb7t.pfb
 md-chbo8c MathDesign-CH-Bold-Slanted-TS1-10 " 0.194 SlantFont " <md-chb8c.pfb
 md-chbo8t MathDesign-CH-Bold-Slanted-T1-10 " 0.194 SlantFont " <md-chb8t.pfb
+md-chbo8y CharterBT-Bold " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
+md-chboc8y CharterBT-BoldSmallCap " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbc8a.pfb
 md-chr7m MathDesign-CH-Regular-MathItalic-10 <md-chr7m.pfb
 md-chr7t MathDesign-CH-Regular-OT1-10 <md-chr7t.pfb
 md-chr7v MathDesign-CH-Regular-Extension-10 <md-chr7v.pfb
 md-chr7y MathDesign-CH-Regular-Symbol-10 <md-chr7y.pfb
 md-chr8c MathDesign-CH-Regular-TS1-10 <md-chr8c.pfb
 md-chr8t MathDesign-CH-Regular-T1-10 <md-chr8t.pfb
+md-chr8y CharterBT-Roman " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
+md-chrc8y CharterBT-SmallCap " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchrc8a.pfb
 md-chri7m MathDesign-CH-Regular-Italic-MathItalic-10 <md-chri7m.pfb
 md-chri7t MathDesign-CH-Regular-Italic-OT1-10 <md-chri7t.pfb
 md-chri8c MathDesign-CH-Regular-Italic-TS1-10 <md-chri8c.pfb
 md-chri8t MathDesign-CH-Regular-Italic-T1-10 <md-chri8t.pfb
+md-chri8y CharterBT-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchri8a.pfb
 md-chrma MathDesign-CH-Regular-MathDesignSymbolA-10 <md-chrma.pfb
 md-chrmb MathDesign-CH-Regular-MathDesignSymbolB-10 <md-chrmb.pfb
 md-chro7t MathDesign-CH-Regular-Slanted-OT1-10 " 0.194 SlantFont " <md-chr7t.pfb
 md-chro8c MathDesign-CH-Regular-Slanted-TS1-10 " 0.194 SlantFont " <md-chr8c.pfb
 md-chro8t MathDesign-CH-Regular-Slanted-T1-10 " 0.194 SlantFont " <md-chr8t.pfb
+md-chro8y CharterBT-Roman " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
+md-chroc8y CharterBT-SmallCap " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchrc8a.pfb
+% mdgreek.map
+md-grbb7m GFSBodoni-Bold " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSBodoniBold.otf
+md-grbbi7m GFSBodoni-BoldItalic " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSBodoniBoldIt.otf
+md-grbr7m GFSBodoni-Regular " AutoEnc_py5znvjh3poy4qksuktslsc7kc ReEncodeFont " <[a_py5znv.enc <<GFSBodoni.otf
+md-grbri7m GFSBodoni-Italic " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSBodoniIt.otf
+md-grdb7m GFSDidot-Bold " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSDidotBold.otf
+md-grdbi7m GFSDidot-BoldItalic " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSDidotBoldItalic.otf
+md-grdr7m GFSDidot-Regular " AutoEnc_45o73xtpuiy7upxsdrc7cwlagg ReEncodeFont " <[a_45o73x.enc <<GFSDidot.otf
+md-grdri7m GFSDidot-Italic " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSDidotItalic.otf
 % mdput.map
 md-utb7m MathDesign-UT-Bold-MathItalic-10 <md-utb7m.pfb
 md-utb7t MathDesign-UT-Bold-OT1-10 <md-utb7t.pfb
@@ -11336,38 +11347,36 @@ md-utb7v MathDesign-UT-Bold-Extension-10 <md-utb7v.pfb
 md-utb7y MathDesign-UT-Bold-Symbol-10 <md-utb7y.pfb
 md-utb8c MathDesign-UT-Bold-TS1-10 <md-utb8c.pfb
 md-utb8t MathDesign-UT-Bold-T1-10 <md-utb8t.pfb
+md-utb8y Utopia-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
 md-utbi7m MathDesign-UT-Bold-Italic-MathItalic-10 <md-utbi7m.pfb
 md-utbi7t MathDesign-UT-Bold-Italic-OT1-10 <md-utbi7t.pfb
 md-utbi8c MathDesign-UT-Bold-Italic-TS1-10 <md-utbi8c.pfb
 md-utbi8t MathDesign-UT-Bold-Italic-T1-10 <md-utbi8t.pfb
+md-utbi8y Utopia-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putbi8a.pfb
 md-utbma MathDesign-UT-Bold-MathDesignSymbolA-10 <md-utbma.pfb
 md-utbmb MathDesign-UT-Bold-MathDesignSymbolB-10 <md-utbmb.pfb
 md-utbo7t MathDesign-UT-Bold-Slanted-OT1-10 " 0.231 SlantFont " <md-utb7t.pfb
 md-utbo8c MathDesign-UT-Bold-Slanted-TS1-10 " 0.231 SlantFont " <md-utb8c.pfb
 md-utbo8t MathDesign-UT-Bold-Slanted-T1-10 " 0.231 SlantFont " <md-utb8t.pfb
+md-utbo8y Utopia-Bold " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
 md-utr7m MathDesign-UT-Regular-MathItalic-10 <md-utr7m.pfb
 md-utr7t MathDesign-UT-Regular-OT1-10 <md-utr7t.pfb
 md-utr7v MathDesign-UT-Regular-Extension-10 <md-utr7v.pfb
 md-utr7y MathDesign-UT-Regular-Symbol-10 <md-utr7y.pfb
 md-utr8c MathDesign-UT-Regular-TS1-10 <md-utr8c.pfb
 md-utr8t MathDesign-UT-Regular-T1-10 <md-utr8t.pfb
+md-utr8y Utopia-Regular " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
 md-utri7m MathDesign-UT-Regular-Italic-MathItalic-10 <md-utri7m.pfb
 md-utri7t MathDesign-UT-Regular-Italic-OT1-10 <md-utri7t.pfb
 md-utri8c MathDesign-UT-Regular-Italic-TS1-10 <md-utri8c.pfb
 md-utri8t MathDesign-UT-Regular-Italic-T1-10 <md-utri8t.pfb
+md-utri8y Utopia-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putri8a.pfb
 md-utrma MathDesign-UT-Regular-MathDesignSymbolA-10 <md-utrma.pfb
 md-utrmb MathDesign-UT-Regular-MathDesignSymbolB-10 <md-utrmb.pfb
 md-utro7t MathDesign-UT-Regular-Slanted-OT1-10 " 0.231 SlantFont " <md-utr7t.pfb
 md-utro8c MathDesign-UT-Regular-Slanted-TS1-10 " 0.231 SlantFont " <md-utr8c.pfb
 md-utro8t MathDesign-UT-Regular-Slanted-T1-10 " 0.231 SlantFont " <md-utr8t.pfb
-putb8x UtopiaExp-Bold <putb8x.pfb
-putb8y Utopia-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
-putbi8y Utopia-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putbi8a.pfb
-putbo8y Utopia-Bold " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
-putr8x UtopiaExp-Regular <putr8x.pfb
-putr8y Utopia-Regular " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
-putri8y Utopia-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putri8a.pfb
-putro8y Utopia-Regular " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
+md-utro8y Utopia-Regular " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
 % mdsymbol.map
 MdSymbolA-Bold MdSymbolA-Bold <MdSymbolA-Bold.pfb
 MdSymbolA-Light MdSymbolA-Light <MdSymbolA-Light.pfb
@@ -11393,43 +11402,6 @@ MdSymbolF-Bold MdSymbolF-Bold <MdSymbolF-Bold.pfb
 MdSymbolF-Light MdSymbolF-Light <MdSymbolF-Light.pfb
 MdSymbolF-Regular MdSymbolF-Regular <MdSymbolF-Regular.pfb
 MdSymbolF-Semibold MdSymbolF-Semibold <MdSymbolF-Semibold.pfb
-% mdugm.map
-md-gmm7m MathDesign-GM-Medium-MathItalic-10 <md-gmm7m.pfb
-md-gmm7t MathDesign-GM-Medium-OT1-10 <md-gmm7t.pfb
-md-gmm7v MathDesign-GM-Medium-Extension-10 <md-gmm7v.pfb
-md-gmm7y MathDesign-GM-Medium-Symbol-10 <md-gmm7y.pfb
-md-gmm8c MathDesign-GM-Medium-TS1-10 <md-gmm8c.pfb
-md-gmm8t MathDesign-GM-Medium-T1-10 <md-gmm8t.pfb
-md-gmmi7m MathDesign-GM-Medium-Italic-MathItalic-10 <md-gmmi7m.pfb
-md-gmmi7t MathDesign-GM-Medium-Italic-OT1-10 <md-gmmi7t.pfb
-md-gmmi8c MathDesign-GM-Medium-Italic-TS1-10 <md-gmmi8c.pfb
-md-gmmi8t MathDesign-GM-Medium-Italic-T1-10 <md-gmmi8t.pfb
-md-gmmma MathDesign-GM-Medium-MathDesignSymbolA-10 <md-gmmma.pfb
-md-gmmmb MathDesign-GM-Medium-MathDesignSymbolB-10 <md-gmmmb.pfb
-md-gmmo7t MathDesign-GM-Medium-Slanted-OT1-10 " 0.287 SlantFont " <md-gmm7t.pfb
-md-gmmo8c MathDesign-GM-Medium-Slanted-TS1-10 " 0.287 SlantFont " <md-gmm8c.pfb
-md-gmmo8t MathDesign-GM-Medium-Slanted-T1-10 " 0.287 SlantFont " <md-gmm8t.pfb
-md-gmr7m MathDesign-GM-Regular-MathItalic-10 <md-gmr7m.pfb
-md-gmr7t MathDesign-GM-Regular-OT1-10 <md-gmr7t.pfb
-md-gmr7v MathDesign-GM-Regular-Extension-10 <md-gmr7v.pfb
-md-gmr7y MathDesign-GM-Regular-Symbol-10 <md-gmr7y.pfb
-md-gmr8c MathDesign-GM-Regular-TS1-10 <md-gmr8c.pfb
-md-gmr8t MathDesign-GM-Regular-T1-10 <md-gmr8t.pfb
-md-gmri7m MathDesign-GM-Regular-Italic-MathItalic-10 <md-gmri7m.pfb
-md-gmri7t MathDesign-GM-Regular-Italic-OT1-10 <md-gmri7t.pfb
-md-gmri8c MathDesign-GM-Regular-Italic-TS1-10 <md-gmri8c.pfb
-md-gmri8t MathDesign-GM-Regular-Italic-T1-10 <md-gmri8t.pfb
-md-gmrma MathDesign-GM-Regular-MathDesignSymbolA-10 <md-gmrma.pfb
-md-gmrmb MathDesign-GM-Regular-MathDesignSymbolB-10 <md-gmrmb.pfb
-md-gmro7t MathDesign-GM-Regular-Slanted-OT1-10 " 0.287 SlantFont " <md-gmr7t.pfb
-md-gmro8c MathDesign-GM-Regular-Slanted-TS1-10 " 0.287 SlantFont " <md-gmr8c.pfb
-md-gmro8t MathDesign-GM-Regular-Slanted-T1-10 " 0.287 SlantFont " <md-gmr8t.pfb
-ugmm8y GaramondNo8-Med " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmm8a.pfb
-ugmmi8y GaramondNo8-MedIta " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmmi8a.pfb
-ugmmo8y GaramondNo8-Med " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmm8a.pfb
-ugmr8y GaramondNo8-Reg " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
-ugmri8y GaramondNo8-Ita " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmri8a.pfb
-ugmro8y GaramondNo8-Reg " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
 % mr2j.map
 mr2jka mr2jka <mr2jka.pfb
 mr2jkb mr2jkb <mr2jkb.pfb
diff --git a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map
index 60e11471c1b..604c729d20e 100644
--- a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map
+++ b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map
@@ -7876,10 +7876,10 @@ fbb-Bold-lf-sc-ly1--base fbb-Bold " AutoEnc_pqcug3vkt2winko352dcl3e6qf ReEncodeF
 fbb-Bold-lf-sc-t1--base fbb-Bold " AutoEnc_3jy3vuah34aiqicdoblysophza ReEncodeFont " <[fbb_3jy3vu.enc <fbb-Bold.pfb
 fbb-Bold-lf-t1--base fbb-Bold " AutoEnc_eaddwb4gcd3e2c2ecxpzo7ytwg ReEncodeFont " <[fbb_eaddwb.enc <fbb-Bold.pfb
 fbb-Bold-lf-ts1--base fbb-Bold " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Bold.pfb
-fbb-Bold-osf-ly1--base fbb-Bold " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Bold.pfb
-fbb-Bold-osf-sc-ly1--base fbb-Bold " AutoEnc_xoysobuad3k3nr2x77x5ijj3gc ReEncodeFont " <[fbb_xoysob.enc <fbb-Bold.pfb
-fbb-Bold-osf-sc-t1--base fbb-Bold " AutoEnc_22bu64fkwrs6ihh5s3sdhfaw3c ReEncodeFont " <[fbb_22bu64.enc <fbb-Bold.pfb
-fbb-Bold-osf-t1--base fbb-Bold " AutoEnc_6v6t7djji5dahvuxmnljp3tk5g ReEncodeFont " <[fbb_6v6t7d.enc <fbb-Bold.pfb
+fbb-Bold-osf-ly1--base fbb-Bold " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Bold.pfb
+fbb-Bold-osf-sc-ly1--base fbb-Bold " AutoEnc_icb62td6whgedlprygtgnxmvrb ReEncodeFont " <[fbb_icb62t.enc <fbb-Bold.pfb
+fbb-Bold-osf-sc-t1--base fbb-Bold " AutoEnc_eie4y7s2bcujl2vladill6xbaf ReEncodeFont " <[fbb_eie4y7.enc <fbb-Bold.pfb
+fbb-Bold-osf-t1--base fbb-Bold " AutoEnc_5yuftp67d7ahytvmxnmju35d3e ReEncodeFont " <[fbb_5yuftp.enc <fbb-Bold.pfb
 fbb-Bold-osf-ts1--base fbb-Bold " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Bold.pfb
 fbb-Bold-sup-ly1--base fbb-Bold " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Bold.pfb
 fbb-Bold-sup-t1--base fbb-Bold " AutoEnc_ciz6qsfdiju673xpz4pujigche ReEncodeFont " <[fbb_ciz6qs.enc <fbb-Bold.pfb
@@ -7898,10 +7898,10 @@ fbb-BoldItalic-lf-sc-ly1--base fbb-BoldItalic " AutoEnc_2quttajmnn4ocncvvpsvmobo
 fbb-BoldItalic-lf-sc-t1--base fbb-BoldItalic " AutoEnc_ksln4yiq47ru7z2ynez44kd6lb ReEncodeFont " <[fbb_ksln4y.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-lf-t1--base fbb-BoldItalic " AutoEnc_vvs2t7ml7vp3slshul5ixtlraa ReEncodeFont " <[fbb_vvs2t7.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-lf-ts1--base fbb-BoldItalic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-ly1--base fbb-BoldItalic " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-sc-ly1--base fbb-BoldItalic " AutoEnc_xhatrxtqf5t6k6thg2pkbcodpe ReEncodeFont " <[fbb_xhatrx.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-sc-t1--base fbb-BoldItalic " AutoEnc_xlwfeoletkqyqxohsikuwwgnwh ReEncodeFont " <[fbb_xlwfeo.enc <fbb-BoldItalic.pfb
-fbb-BoldItalic-osf-t1--base fbb-BoldItalic " AutoEnc_cftewbv4lgxwtuhvjy4tb5bjnh ReEncodeFont " <[fbb_cftewb.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-ly1--base fbb-BoldItalic " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-sc-ly1--base fbb-BoldItalic " AutoEnc_5g5giqun737togfqabrefaj5ma ReEncodeFont " <[fbb_5g5giq.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-sc-t1--base fbb-BoldItalic " AutoEnc_bwe6jmh2rjigwsu7tcqweawnqa ReEncodeFont " <[fbb_bwe6jm.enc <fbb-BoldItalic.pfb
+fbb-BoldItalic-osf-t1--base fbb-BoldItalic " AutoEnc_u3ego5ez7he26ghw3gzrknjoxg ReEncodeFont " <[fbb_u3ego5.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-osf-ts1--base fbb-BoldItalic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-sup-ly1--base fbb-BoldItalic " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-BoldItalic.pfb
 fbb-BoldItalic-sup-t1--base fbb-BoldItalic " AutoEnc_wmijbzmtkibsvc2qvw3znxrrbd ReEncodeFont " <[fbb_wmijbz.enc <fbb-BoldItalic.pfb
@@ -7920,10 +7920,10 @@ fbb-Italic-lf-sc-ly1--base fbb-Italic " AutoEnc_2quttajmnn4ocncvvpsvmoboec ReEnc
 fbb-Italic-lf-sc-t1--base fbb-Italic " AutoEnc_ksln4yiq47ru7z2ynez44kd6lb ReEncodeFont " <[fbb_ksln4y.enc <fbb-Italic.pfb
 fbb-Italic-lf-t1--base fbb-Italic " AutoEnc_vvs2t7ml7vp3slshul5ixtlraa ReEncodeFont " <[fbb_vvs2t7.enc <fbb-Italic.pfb
 fbb-Italic-lf-ts1--base fbb-Italic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-Italic.pfb
-fbb-Italic-osf-ly1--base fbb-Italic " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Italic.pfb
-fbb-Italic-osf-sc-ly1--base fbb-Italic " AutoEnc_xhatrxtqf5t6k6thg2pkbcodpe ReEncodeFont " <[fbb_xhatrx.enc <fbb-Italic.pfb
-fbb-Italic-osf-sc-t1--base fbb-Italic " AutoEnc_xlwfeoletkqyqxohsikuwwgnwh ReEncodeFont " <[fbb_xlwfeo.enc <fbb-Italic.pfb
-fbb-Italic-osf-t1--base fbb-Italic " AutoEnc_cftewbv4lgxwtuhvjy4tb5bjnh ReEncodeFont " <[fbb_cftewb.enc <fbb-Italic.pfb
+fbb-Italic-osf-ly1--base fbb-Italic " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Italic.pfb
+fbb-Italic-osf-sc-ly1--base fbb-Italic " AutoEnc_5g5giqun737togfqabrefaj5ma ReEncodeFont " <[fbb_5g5giq.enc <fbb-Italic.pfb
+fbb-Italic-osf-sc-t1--base fbb-Italic " AutoEnc_bwe6jmh2rjigwsu7tcqweawnqa ReEncodeFont " <[fbb_bwe6jm.enc <fbb-Italic.pfb
+fbb-Italic-osf-t1--base fbb-Italic " AutoEnc_u3ego5ez7he26ghw3gzrknjoxg ReEncodeFont " <[fbb_u3ego5.enc <fbb-Italic.pfb
 fbb-Italic-osf-ts1--base fbb-Italic " AutoEnc_x6d4ooliv4orlwiqlpujgy6jaf ReEncodeFont " <[fbb_x6d4oo.enc <fbb-Italic.pfb
 fbb-Italic-sup-ly1--base fbb-Italic " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Italic.pfb
 fbb-Italic-sup-t1--base fbb-Italic " AutoEnc_wmijbzmtkibsvc2qvw3znxrrbd ReEncodeFont " <[fbb_wmijbz.enc <fbb-Italic.pfb
@@ -7942,10 +7942,10 @@ fbb-Regular-lf-sc-ly1--base fbb-Regular " AutoEnc_pqcug3vkt2winko352dcl3e6qf ReE
 fbb-Regular-lf-sc-t1--base fbb-Regular " AutoEnc_3gezysrzrhafltskc7vzrlzj6d ReEncodeFont " <[fbb_3gezys.enc <fbb-Regular.pfb
 fbb-Regular-lf-t1--base fbb-Regular " AutoEnc_p6sgcpz3tnt6s65vowl4nol3ya ReEncodeFont " <[fbb_p6sgcp.enc <fbb-Regular.pfb
 fbb-Regular-lf-ts1--base fbb-Regular " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Regular.pfb
-fbb-Regular-osf-ly1--base fbb-Regular " AutoEnc_thsbwcriw2yd5lsxthdorz6pda ReEncodeFont " <[fbb_thsbwc.enc <fbb-Regular.pfb
-fbb-Regular-osf-sc-ly1--base fbb-Regular " AutoEnc_xoysobuad3k3nr2x77x5ijj3gc ReEncodeFont " <[fbb_xoysob.enc <fbb-Regular.pfb
-fbb-Regular-osf-sc-t1--base fbb-Regular " AutoEnc_2gijtigxaqirmd2zg4off4fuob ReEncodeFont " <[fbb_2gijti.enc <fbb-Regular.pfb
-fbb-Regular-osf-t1--base fbb-Regular " AutoEnc_cvknzo75nifc7tfjvsrllnboyf ReEncodeFont " <[fbb_cvknzo.enc <fbb-Regular.pfb
+fbb-Regular-osf-ly1--base fbb-Regular " AutoEnc_yr6epvniwnfwgxu4aqnrruhygg ReEncodeFont " <[fbb_yr6epv.enc <fbb-Regular.pfb
+fbb-Regular-osf-sc-ly1--base fbb-Regular " AutoEnc_icb62td6whgedlprygtgnxmvrb ReEncodeFont " <[fbb_icb62t.enc <fbb-Regular.pfb
+fbb-Regular-osf-sc-t1--base fbb-Regular " AutoEnc_qyua2i3u7ooq2uaoqdbsgzbs7f ReEncodeFont " <[fbb_qyua2i.enc <fbb-Regular.pfb
+fbb-Regular-osf-t1--base fbb-Regular " AutoEnc_4phrexd4gpjqeosuqg5keqmi5f ReEncodeFont " <[fbb_4phrex.enc <fbb-Regular.pfb
 fbb-Regular-osf-ts1--base fbb-Regular " AutoEnc_cbumponbxinf7uosfveoqnnbtd ReEncodeFont " <[fbb_cbumpo.enc <fbb-Regular.pfb
 fbb-Regular-sup-ly1--base fbb-Regular " AutoEnc_fefik644ncdhwze5z7nja2bczf ReEncodeFont " <[fbb_fefik6.enc <fbb-Regular.pfb
 fbb-Regular-sup-t1--base fbb-Regular " AutoEnc_k4t5oa4dqk7sihgf3uqrzkx56h ReEncodeFont " <[fbb_k4t5oa.enc <fbb-Regular.pfb
@@ -11291,44 +11291,55 @@ mcjroma mcjroma <mcjroma.pfb
 mcjrussian mcjrussian <mcjrussian.pfb
 mcjsy mcjsy <mcjsy.pfb
 % mdbch.map
-bchb8y CharterBT-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
-bchbc8a CharterBT-BoldSmallCap <bchbc8a.pfb
-bchbi8y CharterBT-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbi8a.pfb
-bchbo8y CharterBT-Bold " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
-bchr8y CharterBT-Roman " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
-bchrc8a CharterBT-SmallCap <bchrc8a.pfb
-bchri8y CharterBT-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchri8a.pfb
-bchro8y CharterBT-Roman " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
 md-chb7m MathDesign-CH-Bold-MathItalic-10 <md-chb7m.pfb
 md-chb7t MathDesign-CH-Bold-OT1-10 <md-chb7t.pfb
 md-chb7v MathDesign-CH-Bold-Extension-10 <md-chb7v.pfb
 md-chb7y MathDesign-CH-Bold-Symbol-10 <md-chb7y.pfb
 md-chb8c MathDesign-CH-Bold-TS1-10 <md-chb8c.pfb
 md-chb8t MathDesign-CH-Bold-T1-10 <md-chb8t.pfb
+md-chb8y CharterBT-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
+md-chbc8y CharterBT-BoldSmallCap " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbc8a.pfb
 md-chbi7m MathDesign-CH-Bold-Italic-MathItalic-10 <md-chbi7m.pfb
 md-chbi7t MathDesign-CH-Bold-Italic-OT1-10 <md-chbi7t.pfb
 md-chbi8c MathDesign-CH-Bold-Italic-TS1-10 <md-chbi8c.pfb
 md-chbi8t MathDesign-CH-Bold-Italic-T1-10 <md-chbi8t.pfb
+md-chbi8y CharterBT-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbi8a.pfb
 md-chbma MathDesign-CH-Bold-MathDesignSymbolA-10 <md-chbma.pfb
 md-chbmb MathDesign-CH-Bold-MathDesignSymbolB-10 <md-chbmb.pfb
 md-chbo7t MathDesign-CH-Bold-Slanted-OT1-10 " 0.194 SlantFont " <md-chb7t.pfb
 md-chbo8c MathDesign-CH-Bold-Slanted-TS1-10 " 0.194 SlantFont " <md-chb8c.pfb
 md-chbo8t MathDesign-CH-Bold-Slanted-T1-10 " 0.194 SlantFont " <md-chb8t.pfb
+md-chbo8y CharterBT-Bold " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchb8a.pfb
+md-chboc8y CharterBT-BoldSmallCap " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchbc8a.pfb
 md-chr7m MathDesign-CH-Regular-MathItalic-10 <md-chr7m.pfb
 md-chr7t MathDesign-CH-Regular-OT1-10 <md-chr7t.pfb
 md-chr7v MathDesign-CH-Regular-Extension-10 <md-chr7v.pfb
 md-chr7y MathDesign-CH-Regular-Symbol-10 <md-chr7y.pfb
 md-chr8c MathDesign-CH-Regular-TS1-10 <md-chr8c.pfb
 md-chr8t MathDesign-CH-Regular-T1-10 <md-chr8t.pfb
+md-chr8y CharterBT-Roman " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
+md-chrc8y CharterBT-SmallCap " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchrc8a.pfb
 md-chri7m MathDesign-CH-Regular-Italic-MathItalic-10 <md-chri7m.pfb
 md-chri7t MathDesign-CH-Regular-Italic-OT1-10 <md-chri7t.pfb
 md-chri8c MathDesign-CH-Regular-Italic-TS1-10 <md-chri8c.pfb
 md-chri8t MathDesign-CH-Regular-Italic-T1-10 <md-chri8t.pfb
+md-chri8y CharterBT-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchri8a.pfb
 md-chrma MathDesign-CH-Regular-MathDesignSymbolA-10 <md-chrma.pfb
 md-chrmb MathDesign-CH-Regular-MathDesignSymbolB-10 <md-chrmb.pfb
 md-chro7t MathDesign-CH-Regular-Slanted-OT1-10 " 0.194 SlantFont " <md-chr7t.pfb
 md-chro8c MathDesign-CH-Regular-Slanted-TS1-10 " 0.194 SlantFont " <md-chr8c.pfb
 md-chro8t MathDesign-CH-Regular-Slanted-T1-10 " 0.194 SlantFont " <md-chr8t.pfb
+md-chro8y CharterBT-Roman " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchr8a.pfb
+md-chroc8y CharterBT-SmallCap " 0.194 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <bchrc8a.pfb
+% mdgreek.map
+md-grbb7m GFSBodoni-Bold " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSBodoniBold.otf
+md-grbbi7m GFSBodoni-BoldItalic " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSBodoniBoldIt.otf
+md-grbr7m GFSBodoni-Regular " AutoEnc_py5znvjh3poy4qksuktslsc7kc ReEncodeFont " <[a_py5znv.enc <<GFSBodoni.otf
+md-grbri7m GFSBodoni-Italic " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSBodoniIt.otf
+md-grdb7m GFSDidot-Bold " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSDidotBold.otf
+md-grdbi7m GFSDidot-BoldItalic " AutoEnc_rl4tn2dr7yl7pvjznhtbna64dc ReEncodeFont " <[a_rl4tn2.enc <<GFSDidotBoldItalic.otf
+md-grdr7m GFSDidot-Regular " AutoEnc_45o73xtpuiy7upxsdrc7cwlagg ReEncodeFont " <[a_45o73x.enc <<GFSDidot.otf
+md-grdri7m GFSDidot-Italic " AutoEnc_2rwgawua6ejo6lcmev7rxg6fvb ReEncodeFont " <[a_2rwgaw.enc <<GFSDidotItalic.otf
 % mdput.map
 md-utb7m MathDesign-UT-Bold-MathItalic-10 <md-utb7m.pfb
 md-utb7t MathDesign-UT-Bold-OT1-10 <md-utb7t.pfb
@@ -11336,38 +11347,36 @@ md-utb7v MathDesign-UT-Bold-Extension-10 <md-utb7v.pfb
 md-utb7y MathDesign-UT-Bold-Symbol-10 <md-utb7y.pfb
 md-utb8c MathDesign-UT-Bold-TS1-10 <md-utb8c.pfb
 md-utb8t MathDesign-UT-Bold-T1-10 <md-utb8t.pfb
+md-utb8y Utopia-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
 md-utbi7m MathDesign-UT-Bold-Italic-MathItalic-10 <md-utbi7m.pfb
 md-utbi7t MathDesign-UT-Bold-Italic-OT1-10 <md-utbi7t.pfb
 md-utbi8c MathDesign-UT-Bold-Italic-TS1-10 <md-utbi8c.pfb
 md-utbi8t MathDesign-UT-Bold-Italic-T1-10 <md-utbi8t.pfb
+md-utbi8y Utopia-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putbi8a.pfb
 md-utbma MathDesign-UT-Bold-MathDesignSymbolA-10 <md-utbma.pfb
 md-utbmb MathDesign-UT-Bold-MathDesignSymbolB-10 <md-utbmb.pfb
 md-utbo7t MathDesign-UT-Bold-Slanted-OT1-10 " 0.231 SlantFont " <md-utb7t.pfb
 md-utbo8c MathDesign-UT-Bold-Slanted-TS1-10 " 0.231 SlantFont " <md-utb8c.pfb
 md-utbo8t MathDesign-UT-Bold-Slanted-T1-10 " 0.231 SlantFont " <md-utb8t.pfb
+md-utbo8y Utopia-Bold " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
 md-utr7m MathDesign-UT-Regular-MathItalic-10 <md-utr7m.pfb
 md-utr7t MathDesign-UT-Regular-OT1-10 <md-utr7t.pfb
 md-utr7v MathDesign-UT-Regular-Extension-10 <md-utr7v.pfb
 md-utr7y MathDesign-UT-Regular-Symbol-10 <md-utr7y.pfb
 md-utr8c MathDesign-UT-Regular-TS1-10 <md-utr8c.pfb
 md-utr8t MathDesign-UT-Regular-T1-10 <md-utr8t.pfb
+md-utr8y Utopia-Regular " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
 md-utri7m MathDesign-UT-Regular-Italic-MathItalic-10 <md-utri7m.pfb
 md-utri7t MathDesign-UT-Regular-Italic-OT1-10 <md-utri7t.pfb
 md-utri8c MathDesign-UT-Regular-Italic-TS1-10 <md-utri8c.pfb
 md-utri8t MathDesign-UT-Regular-Italic-T1-10 <md-utri8t.pfb
+md-utri8y Utopia-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putri8a.pfb
 md-utrma MathDesign-UT-Regular-MathDesignSymbolA-10 <md-utrma.pfb
 md-utrmb MathDesign-UT-Regular-MathDesignSymbolB-10 <md-utrmb.pfb
 md-utro7t MathDesign-UT-Regular-Slanted-OT1-10 " 0.231 SlantFont " <md-utr7t.pfb
 md-utro8c MathDesign-UT-Regular-Slanted-TS1-10 " 0.231 SlantFont " <md-utr8c.pfb
 md-utro8t MathDesign-UT-Regular-Slanted-T1-10 " 0.231 SlantFont " <md-utr8t.pfb
-putb8x UtopiaExp-Bold <putb8x.pfb
-putb8y Utopia-Bold " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
-putbi8y Utopia-BoldItalic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putbi8a.pfb
-putbo8y Utopia-Bold " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putb8a.pfb
-putr8x UtopiaExp-Regular <putr8x.pfb
-putr8y Utopia-Regular " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
-putri8y Utopia-Italic " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putri8a.pfb
-putro8y Utopia-Regular " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
+md-utro8y Utopia-Regular " 0.231 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <putr8a.pfb
 % mdsymbol.map
 MdSymbolA-Bold MdSymbolA-Bold <MdSymbolA-Bold.pfb
 MdSymbolA-Light MdSymbolA-Light <MdSymbolA-Light.pfb
@@ -11393,43 +11402,6 @@ MdSymbolF-Bold MdSymbolF-Bold <MdSymbolF-Bold.pfb
 MdSymbolF-Light MdSymbolF-Light <MdSymbolF-Light.pfb
 MdSymbolF-Regular MdSymbolF-Regular <MdSymbolF-Regular.pfb
 MdSymbolF-Semibold MdSymbolF-Semibold <MdSymbolF-Semibold.pfb
-% mdugm.map
-md-gmm7m MathDesign-GM-Medium-MathItalic-10 <md-gmm7m.pfb
-md-gmm7t MathDesign-GM-Medium-OT1-10 <md-gmm7t.pfb
-md-gmm7v MathDesign-GM-Medium-Extension-10 <md-gmm7v.pfb
-md-gmm7y MathDesign-GM-Medium-Symbol-10 <md-gmm7y.pfb
-md-gmm8c MathDesign-GM-Medium-TS1-10 <md-gmm8c.pfb
-md-gmm8t MathDesign-GM-Medium-T1-10 <md-gmm8t.pfb
-md-gmmi7m MathDesign-GM-Medium-Italic-MathItalic-10 <md-gmmi7m.pfb
-md-gmmi7t MathDesign-GM-Medium-Italic-OT1-10 <md-gmmi7t.pfb
-md-gmmi8c MathDesign-GM-Medium-Italic-TS1-10 <md-gmmi8c.pfb
-md-gmmi8t MathDesign-GM-Medium-Italic-T1-10 <md-gmmi8t.pfb
-md-gmmma MathDesign-GM-Medium-MathDesignSymbolA-10 <md-gmmma.pfb
-md-gmmmb MathDesign-GM-Medium-MathDesignSymbolB-10 <md-gmmmb.pfb
-md-gmmo7t MathDesign-GM-Medium-Slanted-OT1-10 " 0.287 SlantFont " <md-gmm7t.pfb
-md-gmmo8c MathDesign-GM-Medium-Slanted-TS1-10 " 0.287 SlantFont " <md-gmm8c.pfb
-md-gmmo8t MathDesign-GM-Medium-Slanted-T1-10 " 0.287 SlantFont " <md-gmm8t.pfb
-md-gmr7m MathDesign-GM-Regular-MathItalic-10 <md-gmr7m.pfb
-md-gmr7t MathDesign-GM-Regular-OT1-10 <md-gmr7t.pfb
-md-gmr7v MathDesign-GM-Regular-Extension-10 <md-gmr7v.pfb
-md-gmr7y MathDesign-GM-Regular-Symbol-10 <md-gmr7y.pfb
-md-gmr8c MathDesign-GM-Regular-TS1-10 <md-gmr8c.pfb
-md-gmr8t MathDesign-GM-Regular-T1-10 <md-gmr8t.pfb
-md-gmri7m MathDesign-GM-Regular-Italic-MathItalic-10 <md-gmri7m.pfb
-md-gmri7t MathDesign-GM-Regular-Italic-OT1-10 <md-gmri7t.pfb
-md-gmri8c MathDesign-GM-Regular-Italic-TS1-10 <md-gmri8c.pfb
-md-gmri8t MathDesign-GM-Regular-Italic-T1-10 <md-gmri8t.pfb
-md-gmrma MathDesign-GM-Regular-MathDesignSymbolA-10 <md-gmrma.pfb
-md-gmrmb MathDesign-GM-Regular-MathDesignSymbolB-10 <md-gmrmb.pfb
-md-gmro7t MathDesign-GM-Regular-Slanted-OT1-10 " 0.287 SlantFont " <md-gmr7t.pfb
-md-gmro8c MathDesign-GM-Regular-Slanted-TS1-10 " 0.287 SlantFont " <md-gmr8c.pfb
-md-gmro8t MathDesign-GM-Regular-Slanted-T1-10 " 0.287 SlantFont " <md-gmr8t.pfb
-ugmm8y GaramondNo8-Med " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmm8a.pfb
-ugmmi8y GaramondNo8-MedIta " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmmi8a.pfb
-ugmmo8y GaramondNo8-Med " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmm8a.pfb
-ugmr8y GaramondNo8-Reg " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
-ugmri8y GaramondNo8-Ita " TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmri8a.pfb
-ugmro8y GaramondNo8-Reg " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
 % mr2j.map
 mr2jka mr2jka <mr2jka.pfb
 mr2jkb mr2jkb <mr2jkb.pfb
diff --git a/Master/texmf-dist/web2c/updmap.cfg b/Master/texmf-dist/web2c/updmap.cfg
index e4f76becf22..a3bf9d07a7f 100644
--- a/Master/texmf-dist/web2c/updmap.cfg
+++ b/Master/texmf-dist/web2c/updmap.cfg
@@ -1,4 +1,4 @@
-# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Thu Aug 22 03:20:03 2013
+# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Sun Sep  1 04:29:01 2013
 # $Id: updmap-hdr.cfg 29729 2013-04-08 00:26:46Z karl $
 # 
 # The updmap.cfg in the TEXMFDIST tree is generated by tlmgr by
@@ -248,8 +248,8 @@ MixedMap manfnt.map
 Map marvosym.map
 Map mathabx.map
 Map mdbch.map
+Map mdgreek.map
 Map mdput.map
-Map mdugm.map
 Map mdsymbol.map
 Map troff-updmap.map
 MixedMap mflogo.map