1 files changed, 89 insertions, 0 deletions
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 0fa450e36df..ff37f49641c 100644
--- a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map
+++ b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map
@@ -26191,6 +26191,95 @@ 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
+Merriwthr-Bold-osf-ly1 Merriwthr-Bold " AutoEnc_hzrl5scqns2jtblgadawedqwjb ReEncodeFont " <[mwthr_hzrl5s.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-osf-ot1 Merriwthr-Bold " AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont " <[mwthr_6upxhe.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-osf-t1--base Merriwthr-Bold " AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont " <[mwthr_clyrx2.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-osf-ts1--base Merriwthr-Bold " AutoEnc_u54ue6qvmldocqxmqypta3d4nc ReEncodeFont " <[mwthr_u54ue6.enc <Merriwthr-Bold.pfb
+Merriwthr-BoldItalic-osf-ly1 Merriwthr-BoldItalic " AutoEnc_hzrl5scqns2jtblgadawedqwjb ReEncodeFont " <[mwthr_hzrl5s.enc <Merriwthr-BoldIt.pfb
+Merriwthr-BoldItalic-osf-ot1 Merriwthr-BoldItalic " AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont " <[mwthr_6upxhe.enc <Merriwthr-BoldIt.pfb
+Merriwthr-BoldItalic-osf-t1--base Merriwthr-BoldItalic " AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont " <[mwthr_clyrx2.enc <Merriwthr-BoldIt.pfb
+Merriwthr-BoldItalic-osf-ts1--base Merriwthr-BoldItalic " AutoEnc_u54ue6qvmldocqxmqypta3d4nc ReEncodeFont " <[mwthr_u54ue6.enc <Merriwthr-BoldIt.pfb
+Merriwthr-Italic-osf-ly1 Merriwthr-Italic " AutoEnc_hzrl5scqns2jtblgadawedqwjb ReEncodeFont " <[mwthr_hzrl5s.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-osf-ot1 Merriwthr-Italic " AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont " <[mwthr_6upxhe.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-osf-t1--base Merriwthr-Italic " AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont " <[mwthr_clyrx2.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-osf-ts1--base Merriwthr-Italic " AutoEnc_u54ue6qvmldocqxmqypta3d4nc ReEncodeFont " <[mwthr_u54ue6.enc <Merriwthr-Italic.pfb
+Merriwthr-Light-osf-ly1 Merriwthr-Light " AutoEnc_hzrl5scqns2jtblgadawedqwjb ReEncodeFont " <[mwthr_hzrl5s.enc <Merriwthr-Light.pfb
+Merriwthr-Light-osf-ot1 Merriwthr-Light " AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont " <[mwthr_6upxhe.enc <Merriwthr-Light.pfb
+Merriwthr-Light-osf-t1--base Merriwthr-Light " AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont " <[mwthr_clyrx2.enc <Merriwthr-Light.pfb
+Merriwthr-Light-osf-ts1--base Merriwthr-Light " AutoEnc_u54ue6qvmldocqxmqypta3d4nc ReEncodeFont " <[mwthr_u54ue6.enc <Merriwthr-Light.pfb
+Merriwthr-LightIt-osf-ly1 Merriwthr-LightIt " AutoEnc_hzrl5scqns2jtblgadawedqwjb ReEncodeFont " <[mwthr_hzrl5s.enc <Merriwthr-LightIt.pfb
+Merriwthr-LightIt-osf-ot1 Merriwthr-LightIt " AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont " <[mwthr_6upxhe.enc <Merriwthr-LightIt.pfb
+Merriwthr-LightIt-osf-t1--base Merriwthr-LightIt " AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont " <[mwthr_clyrx2.enc <Merriwthr-LightIt.pfb
+Merriwthr-LightIt-osf-ts1--base Merriwthr-LightIt " AutoEnc_u54ue6qvmldocqxmqypta3d4nc ReEncodeFont " <[mwthr_u54ue6.enc <Merriwthr-LightIt.pfb
+Merriwthr-Regular-osf-ly1 Merriwthr-Regular " AutoEnc_hzrl5scqns2jtblgadawedqwjb ReEncodeFont " <[mwthr_hzrl5s.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-osf-ot1 Merriwthr-Regular " AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont " <[mwthr_6upxhe.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-osf-t1--base Merriwthr-Regular " AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont " <[mwthr_clyrx2.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-osf-ts1--base Merriwthr-Regular " AutoEnc_u54ue6qvmldocqxmqypta3d4nc ReEncodeFont " <[mwthr_u54ue6.enc <Merriwthr-Regular.pfb
+Merriwthr-UltraBdIt-osf-ly1 Merriwthr-UltraBdIt " AutoEnc_hzrl5scqns2jtblgadawedqwjb ReEncodeFont " <[mwthr_hzrl5s.enc <Merriwthr-UltraBdIt.pfb
+Merriwthr-UltraBdIt-osf-ot1 Merriwthr-UltraBdIt " AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont " <[mwthr_6upxhe.enc <Merriwthr-UltraBdIt.pfb
+Merriwthr-UltraBdIt-osf-t1--base Merriwthr-UltraBdIt " AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont " <[mwthr_clyrx2.enc <Merriwthr-UltraBdIt.pfb
+Merriwthr-UltraBdIt-osf-ts1--base Merriwthr-UltraBdIt " AutoEnc_u54ue6qvmldocqxmqypta3d4nc ReEncodeFont " <[mwthr_u54ue6.enc <Merriwthr-UltraBdIt.pfb
+Merriwthr-UltraBold-osf-ly1 Merriwthr-UltraBold " AutoEnc_hzrl5scqns2jtblgadawedqwjb ReEncodeFont " <[mwthr_hzrl5s.enc <Merriwthr-UltraBold.pfb
+Merriwthr-UltraBold-osf-ot1 Merriwthr-UltraBold " AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont " <[mwthr_6upxhe.enc <Merriwthr-UltraBold.pfb
+Merriwthr-UltraBold-osf-t1--base Merriwthr-UltraBold " AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont " <[mwthr_clyrx2.enc <Merriwthr-UltraBold.pfb
+Merriwthr-UltraBold-osf-ts1--base Merriwthr-UltraBold " AutoEnc_u54ue6qvmldocqxmqypta3d4nc ReEncodeFont " <[mwthr_u54ue6.enc <Merriwthr-UltraBold.pfb
+MerriwthrSans-Bold-osf-ly1 MerriwthrSans-Bold " AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont " <[mwthr_44qg5v.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-osf-ot1 MerriwthrSans-Bold " AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont " <[mwthr_tvbl63.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-osf-t1--base MerriwthrSans-Bold " AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont " <[mwthr_iuohxq.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-osf-ts1--base MerriwthrSans-Bold " AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont " <[mwthr_n7ujmb.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-sup-ly1 MerriwthrSans-Bold " AutoEnc_zwbe7jlcvl2wsktttm4zndfryf ReEncodeFont " <[mwthr_zwbe7j.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-sup-ot1 MerriwthrSans-Bold " AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont " <[mwthr_czxicq.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-sup-t1--base MerriwthrSans-Bold " AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont " <[mwthr_7ytifx.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-BoldItalic-osf-ly1 MerriwthrSans-BoldItalic " AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont " <[mwthr_vi456v.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-osf-ot1 MerriwthrSans-BoldItalic " AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont " <[mwthr_tvbl63.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-osf-t1--base MerriwthrSans-BoldItalic " AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont " <[mwthr_iuohxq.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-osf-ts1--base MerriwthrSans-BoldItalic " AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont " <[mwthr_n7ujmb.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-sup-ly1 MerriwthrSans-BoldItalic " AutoEnc_3g4t7fcjh3tc6ptea3fgbusogg ReEncodeFont " <[mwthr_3g4t7f.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-sup-ot1 MerriwthrSans-BoldItalic " AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont " <[mwthr_czxicq.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-sup-t1--base MerriwthrSans-BoldItalic " AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont " <[mwthr_7ytifx.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-ExtraBold-osf-ly1 MerriwthrSans-ExtraBold " AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont " <[mwthr_44qg5v.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-osf-ot1 MerriwthrSans-ExtraBold " AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont " <[mwthr_tvbl63.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-osf-t1--base MerriwthrSans-ExtraBold " AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont " <[mwthr_iuohxq.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-osf-ts1--base MerriwthrSans-ExtraBold " AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont " <[mwthr_n7ujmb.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-sup-ly1 MerriwthrSans-ExtraBold " AutoEnc_zwbe7jlcvl2wsktttm4zndfryf ReEncodeFont " <[mwthr_zwbe7j.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-sup-ot1 MerriwthrSans-ExtraBold " AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont " <[mwthr_czxicq.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-sup-t1--base MerriwthrSans-ExtraBold " AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont " <[mwthr_7ytifx.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBoldItalic-osf-ly1 MerriwthrSans-ExtraBoldItalic " AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont " <[mwthr_vi456v.enc <MerriwthrSans-ExBoldIt.pfb
+MerriwthrSans-ExtraBoldItalic-osf-ot1 MerriwthrSans-ExtraBoldItalic " AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont " <[mwthr_tvbl63.enc <MerriwthrSans-ExBoldIt.pfb
+MerriwthrSans-ExtraBoldItalic-osf-t1--base MerriwthrSans-ExtraBoldItalic " AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont " <[mwthr_iuohxq.enc <MerriwthrSans-ExBoldIt.pfb
+MerriwthrSans-ExtraBoldItalic-osf-ts1--base MerriwthrSans-ExtraBoldItalic " AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont " <[mwthr_n7ujmb.enc <MerriwthrSans-ExBoldIt.pfb
+MerriwthrSans-ExtraBoldItalic-sup-ly1 MerriwthrSans-ExtraBoldItalic " AutoEnc_3g4t7fcjh3tc6ptea3fgbusogg ReEncodeFont " <[mwthr_3g4t7f.enc <MerriwthrSans-ExBoldIt.pfb
+MerriwthrSans-ExtraBoldItalic-sup-ot1 MerriwthrSans-ExtraBoldItalic " AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont " <[mwthr_czxicq.enc <MerriwthrSans-ExBoldIt.pfb
+MerriwthrSans-ExtraBoldItalic-sup-t1--base MerriwthrSans-ExtraBoldItalic " AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont " <[mwthr_7ytifx.enc <MerriwthrSans-ExBoldIt.pfb
+MerriwthrSans-Italic-osf-ly1 MerriwthrSans-Italic " AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont " <[mwthr_vi456v.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-osf-ot1 MerriwthrSans-Italic " AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont " <[mwthr_tvbl63.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-osf-t1--base MerriwthrSans-Italic " AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont " <[mwthr_iuohxq.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-osf-ts1--base MerriwthrSans-Italic " AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont " <[mwthr_n7ujmb.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-sup-ly1 MerriwthrSans-Italic " AutoEnc_3g4t7fcjh3tc6ptea3fgbusogg ReEncodeFont " <[mwthr_3g4t7f.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-sup-ot1 MerriwthrSans-Italic " AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont " <[mwthr_czxicq.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-sup-t1--base MerriwthrSans-Italic " AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont " <[mwthr_7ytifx.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Light-osf-ly1 MerriwthrSans-Light " AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont " <[mwthr_44qg5v.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-osf-ot1 MerriwthrSans-Light " AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont " <[mwthr_tvbl63.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-osf-t1--base MerriwthrSans-Light " AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont " <[mwthr_iuohxq.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-osf-ts1--base MerriwthrSans-Light " AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont " <[mwthr_n7ujmb.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-sup-ly1 MerriwthrSans-Light " AutoEnc_zwbe7jlcvl2wsktttm4zndfryf ReEncodeFont " <[mwthr_zwbe7j.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-sup-ot1 MerriwthrSans-Light " AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont " <[mwthr_czxicq.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-sup-t1--base MerriwthrSans-Light " AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont " <[mwthr_7ytifx.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-LightItalic-osf-ly1 MerriwthrSans-LightItalic " AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont " <[mwthr_vi456v.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-osf-ot1 MerriwthrSans-LightItalic " AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont " <[mwthr_tvbl63.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-osf-t1--base MerriwthrSans-LightItalic " AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont " <[mwthr_iuohxq.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-osf-ts1--base MerriwthrSans-LightItalic " AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont " <[mwthr_n7ujmb.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-sup-ly1 MerriwthrSans-LightItalic " AutoEnc_3g4t7fcjh3tc6ptea3fgbusogg ReEncodeFont " <[mwthr_3g4t7f.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-sup-ot1 MerriwthrSans-LightItalic " AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont " <[mwthr_czxicq.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-sup-t1--base MerriwthrSans-LightItalic " AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont " <[mwthr_7ytifx.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-Regular-osf-ly1 MerriwthrSans-Regular " AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont " <[mwthr_44qg5v.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-osf-ot1 MerriwthrSans-Regular " AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont " <[mwthr_tvbl63.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-osf-t1--base MerriwthrSans-Regular " AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont " <[mwthr_iuohxq.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-osf-ts1--base MerriwthrSans-Regular " AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont " <[mwthr_n7ujmb.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-sup-ly1 MerriwthrSans-Regular " AutoEnc_zwbe7jlcvl2wsktttm4zndfryf ReEncodeFont " <[mwthr_zwbe7j.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-sup-ot1 MerriwthrSans-Regular " AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont " <[mwthr_czxicq.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-sup-t1--base MerriwthrSans-Regular " AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont " <[mwthr_7ytifx.enc <MerriwthrSans-Regular.pfb
 % miama.map
 miama-lgr MiamaNueva-Regular " LGREncoding ReEncodeFont " <lgr-miama.enc <miama.pfb
 miama-ot1 MiamaNueva-Regular " OT1Encoding ReEncodeFont " <ot1-miama.enc <miama.pfb