autoupdate via tlmgr generate _updmap

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

7 files changed, 455 insertions, 0 deletions

diff --git a/Master/texmf-dist/fonts/map/dvips/updmap/ps2pk.map b/Master/texmf-dist/fonts/map/dvips/updmap/ps2pk.map
index 9c5084c121b..683a4cbe5f0 100644
--- a/Master/texmf-dist/fonts/map/dvips/updmap/ps2pk.map
+++ b/Master/texmf-dist/fonts/map/dvips/updmap/ps2pk.map
@@ -12085,6 +12085,71 @@ 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
 md-gmro8y GaramondNo8-Reg " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
+% merriweather.map
+Merriweather-Bold-osf-ly1--base Merriweather-Bold " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-ot1 Merriweather-Bold " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-t1--base Merriweather-Bold " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-ts1--base Merriweather-Bold " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Bold.pfb
+Merriweather-BoldItalic-osf-ly1--base Merriweather-BoldItalic " AutoEnc_t226xz6ygy6sf2627mglfmb4cf ReEncodeFont " <[mwth_t226xz.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-ot1 Merriweather-BoldItalic " AutoEnc_rheu2iw5zbylrll3yvwgs2uwsf ReEncodeFont " <[mwth_rheu2i.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-t1--base Merriweather-BoldItalic " AutoEnc_pyutxj5eda5ufhkmrxym4g7axc ReEncodeFont " <[mwth_pyutxj.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-ts1--base Merriweather-BoldItalic " AutoEnc_oorhm54fi5wv6dwymf2cdxejnb ReEncodeFont " <[mwth_oorhm5.enc <Merriweather-BoldItalic.pfb
+Merriweather-Heavy-osf-ly1--base Merriweather-Heavy " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-ot1 Merriweather-Heavy " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-t1--base Merriweather-Heavy " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-ts1--base Merriweather-Heavy " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Heavy.pfb
+Merriweather-HeavyItalic-osf-ly1--base Merriweather-HeavyItalic " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-ot1 Merriweather-HeavyItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-t1--base Merriweather-HeavyItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-ts1--base Merriweather-HeavyItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-HeavyItalic.pfb
+Merriweather-Italic-osf-ly1--base Merriweather-Italic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-ot1 Merriweather-Italic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-t1--base Merriweather-Italic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-ts1--base Merriweather-Italic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-Italic.pfb
+Merriweather-Light-osf-ly1--base Merriweather-Light " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-ot1 Merriweather-Light " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-t1--base Merriweather-Light " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-ts1--base Merriweather-Light " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Light.pfb
+Merriweather-LightItalic-osf-ly1--base Merriweather-LightItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-ot1 Merriweather-LightItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-t1--base Merriweather-LightItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-ts1--base Merriweather-LightItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-LightItalic.pfb
+Merriweather-osf-ly1--base Merriweather " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather.pfb
+Merriweather-osf-ot1 Merriweather " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather.pfb
+Merriweather-osf-t1--base Merriweather " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather.pfb
+Merriweather-osf-ts1--base Merriweather " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather.pfb
+MerriweatherSans-Bold-osf-ly1--base MerriweatherSans-Bold " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-ot1 MerriweatherSans-Bold " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-t1--base MerriweatherSans-Bold " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-ts1--base MerriweatherSans-Bold " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-BoldItalic-osf-ly1--base MerriweatherSans-BoldItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-ot1 MerriweatherSans-BoldItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-t1--base MerriweatherSans-BoldItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-ts1--base MerriweatherSans-BoldItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ly1--base MerriweatherSans-ExtraBldItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ot1 MerriweatherSans-ExtraBldItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-t1--base MerriweatherSans-ExtraBldItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ts1--base MerriweatherSans-ExtraBldItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBold-osf-ly1--base MerriweatherSans-ExtraBold " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-ot1 MerriweatherSans-ExtraBold " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-t1--base MerriweatherSans-ExtraBold " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-ts1--base MerriweatherSans-ExtraBold " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-Italic-osf-ly1--base MerriweatherSans-Italic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-ot1 MerriweatherSans-Italic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-t1--base MerriweatherSans-Italic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-ts1--base MerriweatherSans-Italic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Light-osf-ly1--base MerriweatherSans-Light " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-ot1 MerriweatherSans-Light " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-t1--base MerriweatherSans-Light " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-ts1--base MerriweatherSans-Light " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-LightItalic-osf-ly1--base MerriweatherSans-LightItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-ot1 MerriweatherSans-LightItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-t1--base MerriweatherSans-LightItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-ts1--base MerriweatherSans-LightItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-Regular-osf-ly1--base MerriweatherSans-Regular " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-ot1 MerriweatherSans-Regular " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-t1--base MerriweatherSans-Regular " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-ts1--base MerriweatherSans-Regular " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Regular.pfb
 % mintspirit.map
 MintSpirit-Bold-inf-ly1--base MintSpirit-Bold " AutoEnc_opresw7ec7dn6aaqhgh2mdvdya ReEncodeFont " <[mntsprt_opresw.enc <MintSpirit-Bold.pfb
 MintSpirit-Bold-inf-ot1 MintSpirit-Bold " AutoEnc_gr6qqqt5cibzbxmozmuijim4vg ReEncodeFont " <[mntsprt_gr6qqq.enc <MintSpirit-Bold.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts.map b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts.map
index 9dd5dddbf5d..fa992e7a697 100644
--- a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts.map
+++ b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts.map
@@ -12085,6 +12085,71 @@ 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
 md-gmro8y GaramondNo8-Reg " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
+% merriweather.map
+Merriweather-Bold-osf-ly1--base Merriweather-Bold " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-ot1 Merriweather-Bold " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-t1--base Merriweather-Bold " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-ts1--base Merriweather-Bold " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Bold.pfb
+Merriweather-BoldItalic-osf-ly1--base Merriweather-BoldItalic " AutoEnc_t226xz6ygy6sf2627mglfmb4cf ReEncodeFont " <[mwth_t226xz.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-ot1 Merriweather-BoldItalic " AutoEnc_rheu2iw5zbylrll3yvwgs2uwsf ReEncodeFont " <[mwth_rheu2i.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-t1--base Merriweather-BoldItalic " AutoEnc_pyutxj5eda5ufhkmrxym4g7axc ReEncodeFont " <[mwth_pyutxj.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-ts1--base Merriweather-BoldItalic " AutoEnc_oorhm54fi5wv6dwymf2cdxejnb ReEncodeFont " <[mwth_oorhm5.enc <Merriweather-BoldItalic.pfb
+Merriweather-Heavy-osf-ly1--base Merriweather-Heavy " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-ot1 Merriweather-Heavy " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-t1--base Merriweather-Heavy " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-ts1--base Merriweather-Heavy " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Heavy.pfb
+Merriweather-HeavyItalic-osf-ly1--base Merriweather-HeavyItalic " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-ot1 Merriweather-HeavyItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-t1--base Merriweather-HeavyItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-ts1--base Merriweather-HeavyItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-HeavyItalic.pfb
+Merriweather-Italic-osf-ly1--base Merriweather-Italic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-ot1 Merriweather-Italic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-t1--base Merriweather-Italic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-ts1--base Merriweather-Italic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-Italic.pfb
+Merriweather-Light-osf-ly1--base Merriweather-Light " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-ot1 Merriweather-Light " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-t1--base Merriweather-Light " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-ts1--base Merriweather-Light " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Light.pfb
+Merriweather-LightItalic-osf-ly1--base Merriweather-LightItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-ot1 Merriweather-LightItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-t1--base Merriweather-LightItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-ts1--base Merriweather-LightItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-LightItalic.pfb
+Merriweather-osf-ly1--base Merriweather " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather.pfb
+Merriweather-osf-ot1 Merriweather " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather.pfb
+Merriweather-osf-t1--base Merriweather " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather.pfb
+Merriweather-osf-ts1--base Merriweather " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather.pfb
+MerriweatherSans-Bold-osf-ly1--base MerriweatherSans-Bold " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-ot1 MerriweatherSans-Bold " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-t1--base MerriweatherSans-Bold " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-ts1--base MerriweatherSans-Bold " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-BoldItalic-osf-ly1--base MerriweatherSans-BoldItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-ot1 MerriweatherSans-BoldItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-t1--base MerriweatherSans-BoldItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-ts1--base MerriweatherSans-BoldItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ly1--base MerriweatherSans-ExtraBldItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ot1 MerriweatherSans-ExtraBldItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-t1--base MerriweatherSans-ExtraBldItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ts1--base MerriweatherSans-ExtraBldItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBold-osf-ly1--base MerriweatherSans-ExtraBold " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-ot1 MerriweatherSans-ExtraBold " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-t1--base MerriweatherSans-ExtraBold " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-ts1--base MerriweatherSans-ExtraBold " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-Italic-osf-ly1--base MerriweatherSans-Italic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-ot1 MerriweatherSans-Italic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-t1--base MerriweatherSans-Italic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-ts1--base MerriweatherSans-Italic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Light-osf-ly1--base MerriweatherSans-Light " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-ot1 MerriweatherSans-Light " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-t1--base MerriweatherSans-Light " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-ts1--base MerriweatherSans-Light " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-LightItalic-osf-ly1--base MerriweatherSans-LightItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-ot1 MerriweatherSans-LightItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-t1--base MerriweatherSans-LightItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-ts1--base MerriweatherSans-LightItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-Regular-osf-ly1--base MerriweatherSans-Regular " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-ot1 MerriweatherSans-Regular " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-t1--base MerriweatherSans-Regular " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-ts1--base MerriweatherSans-Regular " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Regular.pfb
 % mintspirit.map
 MintSpirit-Bold-inf-ly1--base MintSpirit-Bold " AutoEnc_opresw7ec7dn6aaqhgh2mdvdya ReEncodeFont " <[mntsprt_opresw.enc <MintSpirit-Bold.pfb
 MintSpirit-Bold-inf-ot1 MintSpirit-Bold " AutoEnc_gr6qqqt5cibzbxmozmuijim4vg ReEncodeFont " <[mntsprt_gr6qqq.enc <MintSpirit-Bold.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 0e90b3acd2c..6b51cdb85ef 100644
--- a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_pk.map
+++ b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_pk.map
@@ -7619,6 +7619,71 @@ 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
 md-gmro8y GaramondNo8-Reg " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
+% merriweather.map
+Merriweather-Bold-osf-ly1--base Merriweather-Bold " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-ot1 Merriweather-Bold " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-t1--base Merriweather-Bold " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-ts1--base Merriweather-Bold " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Bold.pfb
+Merriweather-BoldItalic-osf-ly1--base Merriweather-BoldItalic " AutoEnc_t226xz6ygy6sf2627mglfmb4cf ReEncodeFont " <[mwth_t226xz.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-ot1 Merriweather-BoldItalic " AutoEnc_rheu2iw5zbylrll3yvwgs2uwsf ReEncodeFont " <[mwth_rheu2i.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-t1--base Merriweather-BoldItalic " AutoEnc_pyutxj5eda5ufhkmrxym4g7axc ReEncodeFont " <[mwth_pyutxj.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-ts1--base Merriweather-BoldItalic " AutoEnc_oorhm54fi5wv6dwymf2cdxejnb ReEncodeFont " <[mwth_oorhm5.enc <Merriweather-BoldItalic.pfb
+Merriweather-Heavy-osf-ly1--base Merriweather-Heavy " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-ot1 Merriweather-Heavy " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-t1--base Merriweather-Heavy " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-ts1--base Merriweather-Heavy " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Heavy.pfb
+Merriweather-HeavyItalic-osf-ly1--base Merriweather-HeavyItalic " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-ot1 Merriweather-HeavyItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-t1--base Merriweather-HeavyItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-ts1--base Merriweather-HeavyItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-HeavyItalic.pfb
+Merriweather-Italic-osf-ly1--base Merriweather-Italic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-ot1 Merriweather-Italic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-t1--base Merriweather-Italic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-ts1--base Merriweather-Italic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-Italic.pfb
+Merriweather-Light-osf-ly1--base Merriweather-Light " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-ot1 Merriweather-Light " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-t1--base Merriweather-Light " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-ts1--base Merriweather-Light " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Light.pfb
+Merriweather-LightItalic-osf-ly1--base Merriweather-LightItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-ot1 Merriweather-LightItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-t1--base Merriweather-LightItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-ts1--base Merriweather-LightItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-LightItalic.pfb
+Merriweather-osf-ly1--base Merriweather " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather.pfb
+Merriweather-osf-ot1 Merriweather " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather.pfb
+Merriweather-osf-t1--base Merriweather " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather.pfb
+Merriweather-osf-ts1--base Merriweather " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather.pfb
+MerriweatherSans-Bold-osf-ly1--base MerriweatherSans-Bold " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-ot1 MerriweatherSans-Bold " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-t1--base MerriweatherSans-Bold " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-ts1--base MerriweatherSans-Bold " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-BoldItalic-osf-ly1--base MerriweatherSans-BoldItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-ot1 MerriweatherSans-BoldItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-t1--base MerriweatherSans-BoldItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-ts1--base MerriweatherSans-BoldItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ly1--base MerriweatherSans-ExtraBldItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ot1 MerriweatherSans-ExtraBldItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-t1--base MerriweatherSans-ExtraBldItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ts1--base MerriweatherSans-ExtraBldItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBold-osf-ly1--base MerriweatherSans-ExtraBold " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-ot1 MerriweatherSans-ExtraBold " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-t1--base MerriweatherSans-ExtraBold " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-ts1--base MerriweatherSans-ExtraBold " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-Italic-osf-ly1--base MerriweatherSans-Italic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-ot1 MerriweatherSans-Italic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-t1--base MerriweatherSans-Italic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-ts1--base MerriweatherSans-Italic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Light-osf-ly1--base MerriweatherSans-Light " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-ot1 MerriweatherSans-Light " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-t1--base MerriweatherSans-Light " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-ts1--base MerriweatherSans-Light " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-LightItalic-osf-ly1--base MerriweatherSans-LightItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-ot1 MerriweatherSans-LightItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-t1--base MerriweatherSans-LightItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-ts1--base MerriweatherSans-LightItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-Regular-osf-ly1--base MerriweatherSans-Regular " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-ot1 MerriweatherSans-Regular " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-t1--base MerriweatherSans-Regular " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-ts1--base MerriweatherSans-Regular " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Regular.pfb
 % mintspirit.map
 MintSpirit-Bold-inf-ly1--base MintSpirit-Bold " AutoEnc_opresw7ec7dn6aaqhgh2mdvdya ReEncodeFont " <[mntsprt_opresw.enc <MintSpirit-Bold.pfb
 MintSpirit-Bold-inf-ot1 MintSpirit-Bold " AutoEnc_gr6qqqt5cibzbxmozmuijim4vg ReEncodeFont " <[mntsprt_gr6qqq.enc <MintSpirit-Bold.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 9dd5dddbf5d..fa992e7a697 100644
--- a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_t1.map
+++ b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_t1.map
@@ -12085,6 +12085,71 @@ 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
 md-gmro8y GaramondNo8-Reg " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
+% merriweather.map
+Merriweather-Bold-osf-ly1--base Merriweather-Bold " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-ot1 Merriweather-Bold " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-t1--base Merriweather-Bold " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-ts1--base Merriweather-Bold " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Bold.pfb
+Merriweather-BoldItalic-osf-ly1--base Merriweather-BoldItalic " AutoEnc_t226xz6ygy6sf2627mglfmb4cf ReEncodeFont " <[mwth_t226xz.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-ot1 Merriweather-BoldItalic " AutoEnc_rheu2iw5zbylrll3yvwgs2uwsf ReEncodeFont " <[mwth_rheu2i.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-t1--base Merriweather-BoldItalic " AutoEnc_pyutxj5eda5ufhkmrxym4g7axc ReEncodeFont " <[mwth_pyutxj.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-ts1--base Merriweather-BoldItalic " AutoEnc_oorhm54fi5wv6dwymf2cdxejnb ReEncodeFont " <[mwth_oorhm5.enc <Merriweather-BoldItalic.pfb
+Merriweather-Heavy-osf-ly1--base Merriweather-Heavy " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-ot1 Merriweather-Heavy " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-t1--base Merriweather-Heavy " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-ts1--base Merriweather-Heavy " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Heavy.pfb
+Merriweather-HeavyItalic-osf-ly1--base Merriweather-HeavyItalic " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-ot1 Merriweather-HeavyItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-t1--base Merriweather-HeavyItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-ts1--base Merriweather-HeavyItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-HeavyItalic.pfb
+Merriweather-Italic-osf-ly1--base Merriweather-Italic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-ot1 Merriweather-Italic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-t1--base Merriweather-Italic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-ts1--base Merriweather-Italic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-Italic.pfb
+Merriweather-Light-osf-ly1--base Merriweather-Light " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-ot1 Merriweather-Light " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-t1--base Merriweather-Light " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-ts1--base Merriweather-Light " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Light.pfb
+Merriweather-LightItalic-osf-ly1--base Merriweather-LightItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-ot1 Merriweather-LightItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-t1--base Merriweather-LightItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-ts1--base Merriweather-LightItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-LightItalic.pfb
+Merriweather-osf-ly1--base Merriweather " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather.pfb
+Merriweather-osf-ot1 Merriweather " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather.pfb
+Merriweather-osf-t1--base Merriweather " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather.pfb
+Merriweather-osf-ts1--base Merriweather " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather.pfb
+MerriweatherSans-Bold-osf-ly1--base MerriweatherSans-Bold " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-ot1 MerriweatherSans-Bold " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-t1--base MerriweatherSans-Bold " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-ts1--base MerriweatherSans-Bold " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-BoldItalic-osf-ly1--base MerriweatherSans-BoldItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-ot1 MerriweatherSans-BoldItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-t1--base MerriweatherSans-BoldItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-ts1--base MerriweatherSans-BoldItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ly1--base MerriweatherSans-ExtraBldItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ot1 MerriweatherSans-ExtraBldItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-t1--base MerriweatherSans-ExtraBldItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ts1--base MerriweatherSans-ExtraBldItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBold-osf-ly1--base MerriweatherSans-ExtraBold " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-ot1 MerriweatherSans-ExtraBold " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-t1--base MerriweatherSans-ExtraBold " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-ts1--base MerriweatherSans-ExtraBold " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-Italic-osf-ly1--base MerriweatherSans-Italic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-ot1 MerriweatherSans-Italic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-t1--base MerriweatherSans-Italic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-ts1--base MerriweatherSans-Italic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Light-osf-ly1--base MerriweatherSans-Light " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-ot1 MerriweatherSans-Light " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-t1--base MerriweatherSans-Light " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-ts1--base MerriweatherSans-Light " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-LightItalic-osf-ly1--base MerriweatherSans-LightItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-ot1 MerriweatherSans-LightItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-t1--base MerriweatherSans-LightItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-ts1--base MerriweatherSans-LightItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-Regular-osf-ly1--base MerriweatherSans-Regular " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-ot1 MerriweatherSans-Regular " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-t1--base MerriweatherSans-Regular " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-ts1--base MerriweatherSans-Regular " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Regular.pfb
 % mintspirit.map
 MintSpirit-Bold-inf-ly1--base MintSpirit-Bold " AutoEnc_opresw7ec7dn6aaqhgh2mdvdya ReEncodeFont " <[mntsprt_opresw.enc <MintSpirit-Bold.pfb
 MintSpirit-Bold-inf-ot1 MintSpirit-Bold " AutoEnc_gr6qqqt5cibzbxmozmuijim4vg ReEncodeFont " <[mntsprt_gr6qqq.enc <MintSpirit-Bold.pfb
diff --git a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex.map b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex.map
index 54e60303eda..dc54083ce16 100644
--- a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex.map
+++ b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex.map
@@ -12085,6 +12085,71 @@ 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
 md-gmro8y GaramondNo8-Reg " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
+% merriweather.map
+Merriweather-Bold-osf-ly1--base Merriweather-Bold " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-ot1 Merriweather-Bold " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-t1--base Merriweather-Bold " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-ts1--base Merriweather-Bold " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Bold.pfb
+Merriweather-BoldItalic-osf-ly1--base Merriweather-BoldItalic " AutoEnc_t226xz6ygy6sf2627mglfmb4cf ReEncodeFont " <[mwth_t226xz.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-ot1 Merriweather-BoldItalic " AutoEnc_rheu2iw5zbylrll3yvwgs2uwsf ReEncodeFont " <[mwth_rheu2i.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-t1--base Merriweather-BoldItalic " AutoEnc_pyutxj5eda5ufhkmrxym4g7axc ReEncodeFont " <[mwth_pyutxj.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-ts1--base Merriweather-BoldItalic " AutoEnc_oorhm54fi5wv6dwymf2cdxejnb ReEncodeFont " <[mwth_oorhm5.enc <Merriweather-BoldItalic.pfb
+Merriweather-Heavy-osf-ly1--base Merriweather-Heavy " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-ot1 Merriweather-Heavy " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-t1--base Merriweather-Heavy " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-ts1--base Merriweather-Heavy " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Heavy.pfb
+Merriweather-HeavyItalic-osf-ly1--base Merriweather-HeavyItalic " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-ot1 Merriweather-HeavyItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-t1--base Merriweather-HeavyItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-ts1--base Merriweather-HeavyItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-HeavyItalic.pfb
+Merriweather-Italic-osf-ly1--base Merriweather-Italic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-ot1 Merriweather-Italic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-t1--base Merriweather-Italic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-ts1--base Merriweather-Italic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-Italic.pfb
+Merriweather-Light-osf-ly1--base Merriweather-Light " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-ot1 Merriweather-Light " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-t1--base Merriweather-Light " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-ts1--base Merriweather-Light " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Light.pfb
+Merriweather-LightItalic-osf-ly1--base Merriweather-LightItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-ot1 Merriweather-LightItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-t1--base Merriweather-LightItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-ts1--base Merriweather-LightItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-LightItalic.pfb
+Merriweather-osf-ly1--base Merriweather " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather.pfb
+Merriweather-osf-ot1 Merriweather " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather.pfb
+Merriweather-osf-t1--base Merriweather " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather.pfb
+Merriweather-osf-ts1--base Merriweather " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather.pfb
+MerriweatherSans-Bold-osf-ly1--base MerriweatherSans-Bold " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-ot1 MerriweatherSans-Bold " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-t1--base MerriweatherSans-Bold " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-ts1--base MerriweatherSans-Bold " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-BoldItalic-osf-ly1--base MerriweatherSans-BoldItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-ot1 MerriweatherSans-BoldItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-t1--base MerriweatherSans-BoldItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-ts1--base MerriweatherSans-BoldItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ly1--base MerriweatherSans-ExtraBldItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ot1 MerriweatherSans-ExtraBldItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-t1--base MerriweatherSans-ExtraBldItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ts1--base MerriweatherSans-ExtraBldItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBold-osf-ly1--base MerriweatherSans-ExtraBold " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-ot1 MerriweatherSans-ExtraBold " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-t1--base MerriweatherSans-ExtraBold " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-ts1--base MerriweatherSans-ExtraBold " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-Italic-osf-ly1--base MerriweatherSans-Italic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-ot1 MerriweatherSans-Italic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-t1--base MerriweatherSans-Italic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-ts1--base MerriweatherSans-Italic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Light-osf-ly1--base MerriweatherSans-Light " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-ot1 MerriweatherSans-Light " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-t1--base MerriweatherSans-Light " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-ts1--base MerriweatherSans-Light " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-LightItalic-osf-ly1--base MerriweatherSans-LightItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-ot1 MerriweatherSans-LightItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-t1--base MerriweatherSans-LightItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-ts1--base MerriweatherSans-LightItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-Regular-osf-ly1--base MerriweatherSans-Regular " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-ot1 MerriweatherSans-Regular " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-t1--base MerriweatherSans-Regular " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-ts1--base MerriweatherSans-Regular " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Regular.pfb
 % mintspirit.map
 MintSpirit-Bold-inf-ly1--base MintSpirit-Bold " AutoEnc_opresw7ec7dn6aaqhgh2mdvdya ReEncodeFont " <[mntsprt_opresw.enc <MintSpirit-Bold.pfb
 MintSpirit-Bold-inf-ot1 MintSpirit-Bold " AutoEnc_gr6qqqt5cibzbxmozmuijim4vg ReEncodeFont " <[mntsprt_gr6qqq.enc <MintSpirit-Bold.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 54e60303eda..dc54083ce16 100644
--- a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_dl14.map
+++ b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_dl14.map
@@ -12085,6 +12085,71 @@ 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
 md-gmro8y GaramondNo8-Reg " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
+% merriweather.map
+Merriweather-Bold-osf-ly1--base Merriweather-Bold " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-ot1 Merriweather-Bold " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-t1--base Merriweather-Bold " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-ts1--base Merriweather-Bold " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Bold.pfb
+Merriweather-BoldItalic-osf-ly1--base Merriweather-BoldItalic " AutoEnc_t226xz6ygy6sf2627mglfmb4cf ReEncodeFont " <[mwth_t226xz.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-ot1 Merriweather-BoldItalic " AutoEnc_rheu2iw5zbylrll3yvwgs2uwsf ReEncodeFont " <[mwth_rheu2i.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-t1--base Merriweather-BoldItalic " AutoEnc_pyutxj5eda5ufhkmrxym4g7axc ReEncodeFont " <[mwth_pyutxj.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-ts1--base Merriweather-BoldItalic " AutoEnc_oorhm54fi5wv6dwymf2cdxejnb ReEncodeFont " <[mwth_oorhm5.enc <Merriweather-BoldItalic.pfb
+Merriweather-Heavy-osf-ly1--base Merriweather-Heavy " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-ot1 Merriweather-Heavy " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-t1--base Merriweather-Heavy " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-ts1--base Merriweather-Heavy " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Heavy.pfb
+Merriweather-HeavyItalic-osf-ly1--base Merriweather-HeavyItalic " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-ot1 Merriweather-HeavyItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-t1--base Merriweather-HeavyItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-ts1--base Merriweather-HeavyItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-HeavyItalic.pfb
+Merriweather-Italic-osf-ly1--base Merriweather-Italic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-ot1 Merriweather-Italic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-t1--base Merriweather-Italic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-ts1--base Merriweather-Italic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-Italic.pfb
+Merriweather-Light-osf-ly1--base Merriweather-Light " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-ot1 Merriweather-Light " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-t1--base Merriweather-Light " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-ts1--base Merriweather-Light " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Light.pfb
+Merriweather-LightItalic-osf-ly1--base Merriweather-LightItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-ot1 Merriweather-LightItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-t1--base Merriweather-LightItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-ts1--base Merriweather-LightItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-LightItalic.pfb
+Merriweather-osf-ly1--base Merriweather " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather.pfb
+Merriweather-osf-ot1 Merriweather " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather.pfb
+Merriweather-osf-t1--base Merriweather " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather.pfb
+Merriweather-osf-ts1--base Merriweather " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather.pfb
+MerriweatherSans-Bold-osf-ly1--base MerriweatherSans-Bold " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-ot1 MerriweatherSans-Bold " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-t1--base MerriweatherSans-Bold " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-ts1--base MerriweatherSans-Bold " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-BoldItalic-osf-ly1--base MerriweatherSans-BoldItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-ot1 MerriweatherSans-BoldItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-t1--base MerriweatherSans-BoldItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-ts1--base MerriweatherSans-BoldItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ly1--base MerriweatherSans-ExtraBldItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ot1 MerriweatherSans-ExtraBldItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-t1--base MerriweatherSans-ExtraBldItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ts1--base MerriweatherSans-ExtraBldItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBold-osf-ly1--base MerriweatherSans-ExtraBold " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-ot1 MerriweatherSans-ExtraBold " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-t1--base MerriweatherSans-ExtraBold " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-ts1--base MerriweatherSans-ExtraBold " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-Italic-osf-ly1--base MerriweatherSans-Italic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-ot1 MerriweatherSans-Italic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-t1--base MerriweatherSans-Italic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-ts1--base MerriweatherSans-Italic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Light-osf-ly1--base MerriweatherSans-Light " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-ot1 MerriweatherSans-Light " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-t1--base MerriweatherSans-Light " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-ts1--base MerriweatherSans-Light " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-LightItalic-osf-ly1--base MerriweatherSans-LightItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-ot1 MerriweatherSans-LightItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-t1--base MerriweatherSans-LightItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-ts1--base MerriweatherSans-LightItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-Regular-osf-ly1--base MerriweatherSans-Regular " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-ot1 MerriweatherSans-Regular " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-t1--base MerriweatherSans-Regular " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-ts1--base MerriweatherSans-Regular " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Regular.pfb
 % mintspirit.map
 MintSpirit-Bold-inf-ly1--base MintSpirit-Bold " AutoEnc_opresw7ec7dn6aaqhgh2mdvdya ReEncodeFont " <[mntsprt_opresw.enc <MintSpirit-Bold.pfb
 MintSpirit-Bold-inf-ot1 MintSpirit-Bold " AutoEnc_gr6qqqt5cibzbxmozmuijim4vg ReEncodeFont " <[mntsprt_gr6qqq.enc <MintSpirit-Bold.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 d5db9c7f8d0..1e5785aa654 100644
--- a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map
+++ b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map
@@ -12085,6 +12085,71 @@ 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
 md-gmro8y GaramondNo8-Reg " 0.287 SlantFont TeXnANSIEncoding ReEncodeFont " <texnansi.enc <ugmr8a.pfb
+% merriweather.map
+Merriweather-Bold-osf-ly1--base Merriweather-Bold " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-ot1 Merriweather-Bold " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-t1--base Merriweather-Bold " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-ts1--base Merriweather-Bold " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Bold.pfb
+Merriweather-BoldItalic-osf-ly1--base Merriweather-BoldItalic " AutoEnc_t226xz6ygy6sf2627mglfmb4cf ReEncodeFont " <[mwth_t226xz.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-ot1 Merriweather-BoldItalic " AutoEnc_rheu2iw5zbylrll3yvwgs2uwsf ReEncodeFont " <[mwth_rheu2i.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-t1--base Merriweather-BoldItalic " AutoEnc_pyutxj5eda5ufhkmrxym4g7axc ReEncodeFont " <[mwth_pyutxj.enc <Merriweather-BoldItalic.pfb
+Merriweather-BoldItalic-osf-ts1--base Merriweather-BoldItalic " AutoEnc_oorhm54fi5wv6dwymf2cdxejnb ReEncodeFont " <[mwth_oorhm5.enc <Merriweather-BoldItalic.pfb
+Merriweather-Heavy-osf-ly1--base Merriweather-Heavy " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-ot1 Merriweather-Heavy " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-t1--base Merriweather-Heavy " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Heavy.pfb
+Merriweather-Heavy-osf-ts1--base Merriweather-Heavy " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Heavy.pfb
+Merriweather-HeavyItalic-osf-ly1--base Merriweather-HeavyItalic " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-ot1 Merriweather-HeavyItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-t1--base Merriweather-HeavyItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-HeavyItalic.pfb
+Merriweather-HeavyItalic-osf-ts1--base Merriweather-HeavyItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-HeavyItalic.pfb
+Merriweather-Italic-osf-ly1--base Merriweather-Italic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-ot1 Merriweather-Italic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-t1--base Merriweather-Italic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-ts1--base Merriweather-Italic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-Italic.pfb
+Merriweather-Light-osf-ly1--base Merriweather-Light " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-ot1 Merriweather-Light " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-t1--base Merriweather-Light " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-ts1--base Merriweather-Light " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather-Light.pfb
+Merriweather-LightItalic-osf-ly1--base Merriweather-LightItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-ot1 Merriweather-LightItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-t1--base Merriweather-LightItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <Merriweather-LightItalic.pfb
+Merriweather-LightItalic-osf-ts1--base Merriweather-LightItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <Merriweather-LightItalic.pfb
+Merriweather-osf-ly1--base Merriweather " AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont " <[mwth_ioeeie.enc <Merriweather.pfb
+Merriweather-osf-ot1 Merriweather " AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont " <[mwth_v4a7hp.enc <Merriweather.pfb
+Merriweather-osf-t1--base Merriweather " AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont " <[mwth_fmhdb5.enc <Merriweather.pfb
+Merriweather-osf-ts1--base Merriweather " AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont " <[mwth_5n6vkx.enc <Merriweather.pfb
+MerriweatherSans-Bold-osf-ly1--base MerriweatherSans-Bold " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-ot1 MerriweatherSans-Bold " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-t1--base MerriweatherSans-Bold " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-ts1--base MerriweatherSans-Bold " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-BoldItalic-osf-ly1--base MerriweatherSans-BoldItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-ot1 MerriweatherSans-BoldItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-t1--base MerriweatherSans-BoldItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-ts1--base MerriweatherSans-BoldItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ly1--base MerriweatherSans-ExtraBldItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ot1 MerriweatherSans-ExtraBldItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-t1--base MerriweatherSans-ExtraBldItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBldItalic-osf-ts1--base MerriweatherSans-ExtraBldItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBoldItalic.pfb
+MerriweatherSans-ExtraBold-osf-ly1--base MerriweatherSans-ExtraBold " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-ot1 MerriweatherSans-ExtraBold " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-t1--base MerriweatherSans-ExtraBold " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-ts1--base MerriweatherSans-ExtraBold " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-Italic-osf-ly1--base MerriweatherSans-Italic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-ot1 MerriweatherSans-Italic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-t1--base MerriweatherSans-Italic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-ts1--base MerriweatherSans-Italic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Light-osf-ly1--base MerriweatherSans-Light " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-ot1 MerriweatherSans-Light " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-t1--base MerriweatherSans-Light " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-ts1--base MerriweatherSans-Light " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-LightItalic-osf-ly1--base MerriweatherSans-LightItalic " AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont " <[mwth_r5mufr.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-ot1 MerriweatherSans-LightItalic " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-t1--base MerriweatherSans-LightItalic " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-ts1--base MerriweatherSans-LightItalic " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-Regular-osf-ly1--base MerriweatherSans-Regular " AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont " <[mwth_oehznb.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-ot1 MerriweatherSans-Regular " AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont " <[mwth_oaf34p.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-t1--base MerriweatherSans-Regular " AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont " <[mwth_aynzzm.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-ts1--base MerriweatherSans-Regular " AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont " <[mwth_z4e4wk.enc <MerriweatherSans-Regular.pfb
 % mintspirit.map
 MintSpirit-Bold-inf-ly1--base MintSpirit-Bold " AutoEnc_opresw7ec7dn6aaqhgh2mdvdya ReEncodeFont " <[mntsprt_opresw.enc <MintSpirit-Bold.pfb
 MintSpirit-Bold-inf-ot1 MintSpirit-Bold " AutoEnc_gr6qqqt5cibzbxmozmuijim4vg ReEncodeFont " <[mntsprt_gr6qqq.enc <MintSpirit-Bold.pfb