summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/fonts/merriweather/README2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_44qg5v.enc (renamed from Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_lnkfbl.enc)14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_6upxhe.enc (renamed from Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fuknsh.enc)14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_7ytifx.enc67
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_clyrx2.enc (renamed from Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jnnjab.enc)10
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_czxicq.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_iuohxq.enc (renamed from Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_libw2m.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jlgqyj.enc67
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_l3riwr.enc (renamed from Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ywgpba.enc)12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_rwkhk4.enc67
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_tvbl63.enc (renamed from Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oaf34p.enc)20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_vi456v.enc (renamed from Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_cn5sfl.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_z4e4wk.enc4
-rw-r--r--Master/texmf-dist/fonts/map/dvips/merriweather/merriweather.map135
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ot1.tfmbin1216 -> 1396 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1--base.tfmbin1848 -> 1836 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1.tfmbin1912 -> 1884 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1--base.tfmbin1480 -> 1480 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1.tfmbin1520 -> 1512 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ot1.tfmbin1320 -> 1504 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1--base.tfmbin1996 -> 1980 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.tfmbin2060 -> 2028 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.tfmbin1524 -> 1520 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ly1.tfmbin2008 -> 2008 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ot1.tfmbin1268 -> 1452 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1--base.tfmbin1940 -> 1924 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1.tfmbin2004 -> 1972 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1--base.tfmbin1476 -> 1476 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1.tfmbin1520 -> 1512 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ot1.tfmbin1208 -> 1392 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1--base.tfmbin1828 -> 1812 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1.tfmbin1892 -> 1860 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1--base.tfmbin1476 -> 1476 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1.tfmbin1516 -> 1508 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ot1.tfmbin1244 -> 1428 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1--base.tfmbin1912 -> 1892 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1.tfmbin1976 -> 1940 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ts1.tfmbin1504 -> 1496 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ly1.tfmbin1964 -> 1964 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ot1.tfmbin1212 -> 1396 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1--base.tfmbin1852 -> 1836 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1.tfmbin1916 -> 1884 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1--base.tfmbin1488 -> 1488 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1.tfmbin1528 -> 1516 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ly1.tfmbin2104 -> 2104 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ot1.tfmbin1340 -> 1524 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1--base.tfmbin2024 -> 2004 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.tfmbin2088 -> 2052 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1--base.tfmbin1496 -> 1496 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.tfmbin1540 -> 1536 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ly1.tfmbin1988 -> 1988 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ot1.tfmbin1236 -> 1416 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1--base.tfmbin1876 -> 1860 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1.tfmbin1940 -> 1908 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1--base.tfmbin1484 -> 1484 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.tfmbin1524 -> 1516 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ly1.tfm (renamed from Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ly1.tfm)bin1940 -> 1936 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ot1.tfmbin0 -> 1428 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-t1--base.tfmbin0 -> 1840 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-t1.tfmbin0 -> 1908 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1--base.tfm (renamed from Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1--base.tfm)bin1436 -> 1436 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1.tfmbin0 -> 1476 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-ly1.tfmbin0 -> 1860 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-ot1.tfmbin0 -> 1352 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-t1--base.tfmbin0 -> 1816 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-t1.tfmbin0 -> 1820 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ot1.tfmbin1264 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1--base.tfmbin1836 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1.tfmbin1900 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1.tfmbin1480 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ly1.tfm (renamed from Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ly1.tfm)bin2048 -> 2044 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ot1.tfmbin0 -> 1480 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1--base.tfmbin0 -> 1996 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1.tfmbin0 -> 2064 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1--base.tfm (renamed from Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1--base.tfm)bin1484 -> 1484 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1.tfmbin0 -> 1520 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-ly1.tfmbin0 -> 1968 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-ot1.tfmbin0 -> 1408 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1--base.tfmbin0 -> 1976 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1.tfmbin0 -> 1980 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ot1.tfmbin1312 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1--base.tfmbin1992 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1.tfmbin2056 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1.tfmbin1528 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ly1.tfm (renamed from Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ly1.tfm)bin1968 -> 1964 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ot1.tfmbin0 -> 1444 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1--base.tfmbin0 -> 1856 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1.tfmbin0 -> 1924 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1--base.tfm (renamed from Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1--base.tfm)bin1452 -> 1452 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.tfmbin0 -> 1492 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-ly1.tfmbin0 -> 1888 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-ot1.tfmbin0 -> 1372 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1--base.tfmbin0 -> 1836 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1.tfmbin0 -> 1840 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ot1.tfmbin1280 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1--base.tfmbin1852 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1.tfmbin1916 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1.tfmbin1496 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ly1.tfm (renamed from Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ly1.tfm)bin2084 -> 2080 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ot1.tfmbin0 -> 1512 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1--base.tfmbin0 -> 2008 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1.tfmbin0 -> 2076 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1--base.tfm (renamed from Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1--base.tfm)bin1500 -> 1500 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1.tfmbin0 -> 1532 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-ly1.tfmbin0 -> 2004 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-ot1.tfmbin0 -> 1436 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1--base.tfmbin0 -> 1988 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1.tfmbin0 -> 1992 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ot1.tfmbin1348 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1--base.tfmbin2004 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1.tfmbin2064 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1.tfmbin1536 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ly1.tfm (renamed from Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ly1.tfm)bin1940 -> 1936 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ot1.tfmbin0 -> 1428 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-t1--base.tfmbin0 -> 1876 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-t1.tfmbin0 -> 1944 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1--base.tfm (renamed from Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1--base.tfm)bin1440 -> 1440 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.tfmbin0 -> 1476 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-ly1.tfmbin0 -> 1860 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-ot1.tfmbin0 -> 1356 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-t1--base.tfmbin0 -> 1856 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-t1.tfmbin0 -> 1860 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ot1.tfmbin1268 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1--base.tfmbin1872 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1.tfmbin1936 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1.tfmbin1484 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ly1.tfm (renamed from Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ly1.tfm)bin1912 -> 1908 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ot1.tfmbin0 -> 1400 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-t1--base.tfmbin0 -> 1816 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-t1.tfmbin0 -> 1884 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ts1--base.tfm (renamed from Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1--base.tfm)bin1428 -> 1428 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ts1.tfmbin0 -> 1468 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-ly1.tfmbin0 -> 1832 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-ot1.tfmbin0 -> 1324 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-t1--base.tfmbin0 -> 1792 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-t1.tfmbin0 -> 1796 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ot1.tfmbin1236 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-t1--base.tfmbin1812 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-t1.tfmbin1876 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1.tfmbin1472 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ly1.tfm (renamed from Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ly1.tfm)bin1984 -> 1980 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ot1.tfmbin0 -> 1452 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1--base.tfmbin0 -> 1884 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1.tfmbin0 -> 1952 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1--base.tfm (renamed from Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1--base.tfm)bin1464 -> 1464 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.tfmbin0 -> 1496 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-ly1.tfmbin0 -> 1912 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-ot1.tfmbin0 -> 1392 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1--base.tfmbin0 -> 1876 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1.tfmbin0 -> 1880 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ot1.tfmbin1288 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1--base.tfmbin1880 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1.tfmbin1944 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1.tfmbin1504 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ly1.tfm (renamed from Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ly1.tfm)bin1892 -> 1888 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ot1.tfmbin0 -> 1396 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-t1--base.tfmbin0 -> 1792 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-t1.tfmbin0 -> 1860 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1--base.tfm (renamed from Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1--base.tfm)bin1420 -> 1420 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1.tfmbin0 -> 1460 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-ly1.tfmbin0 -> 1812 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-ot1.tfmbin0 -> 1320 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-t1--base.tfmbin0 -> 1768 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-t1.tfmbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ot1.tfmbin1232 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1--base.tfmbin1788 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1.tfmbin1852 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1.tfmbin1464 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-t1.vfbin1756 -> 1688 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-ts1.vfbin624 -> 628 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.vfbin1760 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.vfbin632 -> 632 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-t1.vfbin1756 -> 1688 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-ts1.vfbin628 -> 628 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-t1.vfbin1756 -> 1688 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-ts1.vfbin628 -> 628 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-osf-t1.vfbin1760 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-osf-ts1.vfbin628 -> 628 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-t1.vfbin1760 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-ts1.vfbin628 -> 628 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.vfbin1760 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.vfbin632 -> 632 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-t1.vfbin1760 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.vfbin632 -> 632 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-t1.vf (renamed from Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1.vf)bin1760 -> 1720 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1.vf (renamed from Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1.vf)bin576 -> 580 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-sup-t1.vfbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1.vf (renamed from Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1.vf)bin1764 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1.vf (renamed from Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1.vf)bin584 -> 584 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1.vfbin0 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1.vf (renamed from Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1.vf)bin1764 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.vfbin0 -> 584 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1.vfbin0 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1.vfbin584 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1.vf (renamed from Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1.vf)bin1772 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1.vfbin0 -> 588 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1.vfbin0 -> 1704 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1.vfbin588 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-t1.vf (renamed from Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1.vf)bin1760 -> 1724 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.vfbin0 -> 580 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-sup-t1.vfbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1.vfbin580 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-t1.vf (renamed from Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-tlf-t1.vf)bin1760 -> 1724 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-ts1.vf (renamed from Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1.vf)bin580 -> 580 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-sup-t1.vfbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1.vf (renamed from Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1.vf)bin1768 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.vfbin0 -> 584 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1.vfbin0 -> 1700 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1.vfbin584 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-t1.vf (renamed from Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1.vf)bin1764 -> 1724 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1.vf (renamed from Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1.vf)bin580 -> 580 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-sup-t1.vfbin0 -> 1696 bytes
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd119
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd149
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-Sup.fd149
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-TLF.fd74
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd119
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd149
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-Sup.fd149
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-TLF.fd74
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd119
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd149
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-Sup.fd149
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-TLF.fd74
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd119
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd149
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-TLF.fd74
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/merriweather.sty20
230 files changed, 1847 insertions, 500 deletions
diff --git a/Master/texmf-dist/doc/fonts/merriweather/README b/Master/texmf-dist/doc/fonts/merriweather/README
index d6db01edd9c..acd1f26638f 100644
--- a/Master/texmf-dist/doc/fonts/merriweather/README
+++ b/Master/texmf-dist/doc/fonts/merriweather/README
@@ -1,4 +1,4 @@
-This is the README for the merriweather package, version 2014-06-19.
+This is the README for the merriweather package, version 2019-06-02.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
the Merriweather and MerriweatherSans families of fonts, designed by
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_lnkfbl.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_44qg5v.enc
index 669d667a71e..1d2548031d7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_lnkfbl.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_44qg5v.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_lnkfblgauyqz3eufwp3wby646h
-% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014
+%%AutoEnc_44qg5voi43tymivsufwnvthinh
+% Encoding created by otftotfm on Sun Jun 2 14:53:43 2019
% Command line follows encoding
-/AutoEnc_lnkfblgauyqz3eufwp3wby646h [
+/AutoEnc_44qg5voi43tymivsufwnvthinh [
%00
- /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
- /f_f_i /f_f_l /zerowidthnonjoiner /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /zerowidthnonjoiner /f_f_l /f_f_i /f_f /f_l /f_i
%10
/dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -61,4 +61,6 @@
% --encoding-directory=texmf/fonts/enc/dvips/merriweather
% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map
% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=liga MerriweatherSans-Bold.ttf MerriweatherSans-Bold-tlf-ly1'
+% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl MerriweatherSans-Bold.ttf
+% MerriweatherSans-Bold-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc
index 16f57fa4cb1..c58c15d26bc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_5q2vgdqo7txurrtxwuhjydkywc
-% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014
+% Encoding created by otftotfm on Sun Jun 2 14:54:05 2019
% Command line follows encoding
/AutoEnc_5q2vgdqo7txurrtxwuhjydkywc [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fuknsh.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_6upxhe.enc
index 8989a672ba8..feb5992e41d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fuknsh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_6upxhe.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_fuknshterpxw2flapoda5bxt5e
-% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014
+%%AutoEnc_6upxhe2m74q2iptst22s37sn3e
+% Encoding created by otftotfm on Sun Jun 2 14:54:04 2019
% Command line follows encoding
-/AutoEnc_fuknshterpxw2flapoda5bxt5e [
+/AutoEnc_6upxhe2m74q2iptst22s37sn3e [
%00
- /.notdef /Deltagreek /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /Omegagreek /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
%10
/dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -30,13 +30,13 @@
/x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
%80
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%A0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
%B0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_7ytifx.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_7ytifx.enc
new file mode 100644
index 00000000000..825fc9d95ba
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_7ytifx.enc
@@ -0,0 +1,67 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb
+% Encoding created by otftotfm on Sun Jun 2 14:53:42 2019
+% Command line follows encoding
+/AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /zerowidthnonjoiner
+ /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /onesuperior /twosuperior /threesuperior /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map
+% --no-updmap --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=liga --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --ligkern=* {KL} * MerriweatherSans-BoldItalic.ttf
+% MerriweatherSans-BoldItalic-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jnnjab.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_clyrx2.enc
index 8518499a21d..f8ade60d101 100644
--- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jnnjab.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_clyrx2.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d
-% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014
+%%AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe
+% Encoding created by otftotfm on Sun Jun 2 14:54:04 2019
% Command line follows encoding
-/AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d [
+/AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
%10
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /zerowidthnonjoiner
- /.notdef /dotlessi /dotlessj /f_f_l /f_f_i /f_f /f_l /f_i
+ /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero /one /two /three /four /five /six /seven
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_czxicq.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_czxicq.enc
new file mode 100644
index 00000000000..7546a2a8ef4
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_czxicq.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_czxicqvoi7gergm2nqp7s2dfph
+% Encoding created by otftotfm on Sun Jun 2 14:53:42 2019
+% Command line follows encoding
+/AutoEnc_czxicqvoi7gergm2nqp7s2dfph [
+%00
+ /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /onesuperior /twosuperior /threesuperior /four /five /six /seven
+ /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map
+% --no-updmap --no-type1 --coding-scheme=TEX TEXT --feature=liga
+% --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} *
+% MerriweatherSans-BoldItalic.ttf MerriweatherSans-BoldItalic-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_libw2m.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_iuohxq.enc
index 991e695d162..93870024d82 100644
--- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_libw2m.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_iuohxq.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_libw2mm3qgkydsmoydm6r5agjf
-% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014
+%%AutoEnc_iuohxqr2qb6k5t77legm5nsxle
+% Encoding created by otftotfm on Sun Jun 2 14:53:42 2019
% Command line follows encoding
-/AutoEnc_libw2mm3qgkydsmoydm6r5agjf [
+/AutoEnc_iuohxqr2qb6k5t77legm5nsxle [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
%10
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /zerowidthnonjoiner
- /.notdef /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
+ /f_f /dotlessi /dotlessj /f_i /f_l /f_f_i /f_f_l /.notdef
%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero /one /two /three /four /five /six /seven
@@ -61,5 +61,6 @@
% --encoding-directory=texmf/fonts/enc/dvips/merriweather
% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map
% --no-updmap --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=liga MerriweatherSans-BoldItalic.ttf
-% MerriweatherSans-BoldItalic-tlf-t1'
+% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% MerriweatherSans-BoldItalic.ttf MerriweatherSans-BoldItalic-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jlgqyj.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jlgqyj.enc
new file mode 100644
index 00000000000..1ee69ca7d93
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jlgqyj.enc
@@ -0,0 +1,67 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_jlgqyj7c5umbwggrnybckk46wg
+% Encoding created by otftotfm on Sun Jun 2 14:53:43 2019
+% Command line follows encoding
+/AutoEnc_jlgqyj7c5umbwggrnybckk46wg [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /zerowidthnonjoiner /f_f_l /f_f_i /f_f /f_l /f_i
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /onesuperior /twosuperior /threesuperior /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+ /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
+ /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map
+% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=liga --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --ligkern=* {KL} * MerriweatherSans-Bold.ttf
+% MerriweatherSans-Bold-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ywgpba.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_l3riwr.enc
index 94b0a66706e..0ed42425adb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ywgpba.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_l3riwr.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_ywgpbabmor6izux7hcbqcb56qa
-% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014
+%%AutoEnc_l3riwrv45htepume6iim3qrijh
+% Encoding created by otftotfm on Sun Jun 2 14:54:05 2019
% Command line follows encoding
-/AutoEnc_ywgpbabmor6izux7hcbqcb56qa [
+/AutoEnc_l3riwrv45htepume6iim3qrijh [
%00
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /C /question
%10
- /questiondown /exclam /quotedblbase /exclamdown /asterisk /.notdef /.notdef /.notdef
- /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /bar /.notdef
+ /questiondown /exclam /quotedblbase /exclamdown /endash /.notdef /.notdef /.notdef
+ /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /asterisk /.notdef
%20
- /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
+ /.notdef /bar /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
/.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
%30
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_rwkhk4.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_rwkhk4.enc
new file mode 100644
index 00000000000..b98da0f797f
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_rwkhk4.enc
@@ -0,0 +1,67 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_rwkhk45r7tkww4m25qeus4mcmb
+% Encoding created by otftotfm on Sun Jun 2 14:53:42 2019
+% Command line follows encoding
+/AutoEnc_rwkhk45r7tkww4m25qeus4mcmb [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /zerowidthnonjoiner /f_f_l /f_f_i /f_f /f_l /f_i
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /onesuperior /twosuperior /threesuperior /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
+ /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map
+% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=liga --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --ligkern=* {KL} * MerriweatherSans-BoldItalic.ttf
+% MerriweatherSans-BoldItalic-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oaf34p.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_tvbl63.enc
index 1fe8ea6800e..ba31c9c8460 100644
--- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oaf34p.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_tvbl63.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_oaf34pf2gi7ej2vclku475canf
-% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014
+%%AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb
+% Encoding created by otftotfm on Sun Jun 2 14:53:42 2019
% Command line follows encoding
-/AutoEnc_oaf34pf2gi7ej2vclku475canf [
+/AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb [
%00
- /.notdef /uni0394 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
%10
/dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -30,13 +30,13 @@
/x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
%80
/f_f /f_i /f_l /f_f_i /f_f_l /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%A0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
%B0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -60,5 +60,7 @@
% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather
% --encoding-directory=texmf/fonts/enc/dvips/merriweather
% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map
-% --no-updmap --no-type1 --coding-scheme=TEX TEXT --feature=liga
-% MerriweatherSans-BoldItalic.ttf MerriweatherSans-BoldItalic-tlf-ot1'
+% --no-updmap --no-type1 --coding-scheme=TEX TEXT --feature=liga --ligkern=f
+% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl MerriweatherSans-BoldItalic.ttf
+% MerriweatherSans-BoldItalic-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_cn5sfl.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_vi456v.enc
index 9bd30bf6cd2..34bbfd95b94 100644
--- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_cn5sfl.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_vi456v.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_cn5sfli3xjnpjitjpli7wpzcng
-% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014
+%%AutoEnc_vi456vknjkllfjnxu4s533uuwe
+% Encoding created by otftotfm on Sun Jun 2 14:53:42 2019
% Command line follows encoding
-/AutoEnc_cn5sfli3xjnpjitjpli7wpzcng [
+/AutoEnc_vi456vknjkllfjnxu4s533uuwe [
%00
- /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
- /f_f_i /f_f_l /zerowidthnonjoiner /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /zerowidthnonjoiner /f_f_l /f_f_i /f_f /f_l /f_i
%10
/dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -61,5 +61,6 @@
% --encoding-directory=texmf/fonts/enc/dvips/merriweather
% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map
% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=liga MerriweatherSans-BoldItalic.ttf
-% MerriweatherSans-BoldItalic-tlf-ly1'
+% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% MerriweatherSans-BoldItalic.ttf MerriweatherSans-BoldItalic-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc
index f7febb31f35..86efb22bb1b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve
-% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014
+% Encoding created by otftotfm on Sun Jun 2 14:54:05 2019
% Command line follows encoding
/AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_z4e4wk.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_z4e4wk.enc
index 703800e5c19..7753bd87ba5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_z4e4wk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_z4e4wk.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_z4e4wksqkjuob7lry6demn2pba
-% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014
+% Encoding created by otftotfm on Sun Jun 2 14:53:43 2019
% Command line follows encoding
/AutoEnc_z4e4wksqkjuob7lry6demn2pba [
%00
@@ -63,4 +63,4 @@
% --no-updmap --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl MerriweatherSans-BoldItalic.ttf
-% MerriweatherSans-BoldItalic-tlf-ts1'
+% MerriweatherSans-BoldItalic-osf-ts1'
diff --git a/Master/texmf-dist/fonts/map/dvips/merriweather/merriweather.map b/Master/texmf-dist/fonts/map/dvips/merriweather/merriweather.map
index 54dc28afce0..124fe1381dd 100644
--- a/Master/texmf-dist/fonts/map/dvips/merriweather/merriweather.map
+++ b/Master/texmf-dist/fonts/map/dvips/merriweather/merriweather.map
@@ -1,65 +1,92 @@
-Merriweather-BoldItalic-osf-ot1 Merriweather-BoldItalic "AutoEnc_fuknshterpxw2flapoda5bxt5e ReEncodeFont" <[mwth_fuknsh.enc <Merriweather-BoldIt.pfb
-Merriweather-BoldItalic-osf-t1--base Merriweather-BoldItalic "AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d ReEncodeFont" <[mwth_jnnjab.enc <Merriweather-BoldIt.pfb
-Merriweather-BoldItalic-osf-ly1 Merriweather-BoldItalic "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-BoldIt.pfb
-Merriweather-BoldItalic-osf-ts1--base Merriweather-BoldItalic "AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve ReEncodeFont" <[mwth_xz5wux.enc <Merriweather-BoldIt.pfb
-Merriweather-Bold-osf-ot1 Merriweather-Bold "AutoEnc_fuknshterpxw2flapoda5bxt5e ReEncodeFont" <[mwth_fuknsh.enc <Merriweather-Bold.pfb
-Merriweather-Bold-osf-t1--base Merriweather-Bold "AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d ReEncodeFont" <[mwth_jnnjab.enc <Merriweather-Bold.pfb
+% Automatically maintained by otftotfm or other programs. Do not edit.
+
+Merriweather-BoldItalic-osf-ot1 Merriweather-BoldItalic "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwth_6upxhe.enc <Merriweather-BoldIt.ttf
+Merriweather-BoldItalic-osf-t1--base Merriweather-BoldItalic "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwth_clyrx2.enc <Merriweather-BoldIt.ttf
+Merriweather-BoldItalic-osf-ly1 Merriweather-BoldItalic "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-BoldIt.ttf
+Merriweather-BoldItalic-osf-ts1--base Merriweather-BoldItalic "AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve ReEncodeFont" <[mwth_xz5wux.enc <Merriweather-BoldIt.ttf
+Merriweather-Bold-osf-ot1 Merriweather-Bold "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwth_6upxhe.enc <Merriweather-Bold.pfb
+Merriweather-Bold-osf-t1--base Merriweather-Bold "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwth_clyrx2.enc <Merriweather-Bold.pfb
Merriweather-Bold-osf-ly1 Merriweather-Bold "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-Bold.pfb
-Merriweather-Bold-osf-ts1--base Merriweather-Bold "AutoEnc_ywgpbabmor6izux7hcbqcb56qa ReEncodeFont" <[mwth_ywgpba.enc <Merriweather-Bold.pfb
-Merriweather-Italic-osf-ot1 Merriweather-Italic "AutoEnc_fuknshterpxw2flapoda5bxt5e ReEncodeFont" <[mwth_fuknsh.enc <Merriweather-Italic.pfb
-Merriweather-Italic-osf-t1--base Merriweather-Italic "AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d ReEncodeFont" <[mwth_jnnjab.enc <Merriweather-Italic.pfb
+Merriweather-Bold-osf-ts1--base Merriweather-Bold "AutoEnc_l3riwrv45htepume6iim3qrijh ReEncodeFont" <[mwth_l3riwr.enc <Merriweather-Bold.pfb
+Merriweather-Italic-osf-ot1 Merriweather-Italic "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwth_6upxhe.enc <Merriweather-Italic.pfb
+Merriweather-Italic-osf-t1--base Merriweather-Italic "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwth_clyrx2.enc <Merriweather-Italic.pfb
Merriweather-Italic-osf-ly1 Merriweather-Italic "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-Italic.pfb
Merriweather-Italic-osf-ts1--base Merriweather-Italic "AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve ReEncodeFont" <[mwth_xz5wux.enc <Merriweather-Italic.pfb
-Merriweather-LightIt-osf-ot1 Merriweather-LightIt "AutoEnc_fuknshterpxw2flapoda5bxt5e ReEncodeFont" <[mwth_fuknsh.enc <Merriweather-LightIt.pfb
-Merriweather-LightIt-osf-t1--base Merriweather-LightIt "AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d ReEncodeFont" <[mwth_jnnjab.enc <Merriweather-LightIt.pfb
+Merriweather-LightIt-osf-ot1 Merriweather-LightIt "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwth_6upxhe.enc <Merriweather-LightIt.pfb
+Merriweather-LightIt-osf-t1--base Merriweather-LightIt "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwth_clyrx2.enc <Merriweather-LightIt.pfb
Merriweather-LightIt-osf-ly1 Merriweather-LightIt "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-LightIt.pfb
Merriweather-LightIt-osf-ts1--base Merriweather-LightIt "AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve ReEncodeFont" <[mwth_xz5wux.enc <Merriweather-LightIt.pfb
-Merriweather-Light-osf-ot1 Merriweather-Light "AutoEnc_fuknshterpxw2flapoda5bxt5e ReEncodeFont" <[mwth_fuknsh.enc <Merriweather-Light.pfb
-Merriweather-Light-osf-t1--base Merriweather-Light "AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d ReEncodeFont" <[mwth_jnnjab.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-ot1 Merriweather-Light "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwth_6upxhe.enc <Merriweather-Light.pfb
+Merriweather-Light-osf-t1--base Merriweather-Light "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwth_clyrx2.enc <Merriweather-Light.pfb
Merriweather-Light-osf-ly1 Merriweather-Light "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-Light.pfb
-Merriweather-Light-osf-ts1--base Merriweather-Light "AutoEnc_ywgpbabmor6izux7hcbqcb56qa ReEncodeFont" <[mwth_ywgpba.enc <Merriweather-Light.pfb
-Merriweather-Regular-osf-ot1 Merriweather-Regular "AutoEnc_fuknshterpxw2flapoda5bxt5e ReEncodeFont" <[mwth_fuknsh.enc <Merriweather-Regular.pfb
-Merriweather-Regular-osf-t1--base Merriweather-Regular "AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d ReEncodeFont" <[mwth_jnnjab.enc <Merriweather-Regular.pfb
+Merriweather-Light-osf-ts1--base Merriweather-Light "AutoEnc_l3riwrv45htepume6iim3qrijh ReEncodeFont" <[mwth_l3riwr.enc <Merriweather-Light.pfb
+Merriweather-Regular-osf-ot1 Merriweather-Regular "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwth_6upxhe.enc <Merriweather-Regular.pfb
+Merriweather-Regular-osf-t1--base Merriweather-Regular "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwth_clyrx2.enc <Merriweather-Regular.pfb
Merriweather-Regular-osf-ly1 Merriweather-Regular "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-Regular.pfb
-Merriweather-Regular-osf-ts1--base Merriweather-Regular "AutoEnc_ywgpbabmor6izux7hcbqcb56qa ReEncodeFont" <[mwth_ywgpba.enc <Merriweather-Regular.pfb
-Merriweather-UltraBdIt-osf-ot1 Merriweather-UltraBdIt "AutoEnc_fuknshterpxw2flapoda5bxt5e ReEncodeFont" <[mwth_fuknsh.enc <Merriweather-UltraBdIt.pfb
-Merriweather-UltraBdIt-osf-t1--base Merriweather-UltraBdIt "AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d ReEncodeFont" <[mwth_jnnjab.enc <Merriweather-UltraBdIt.pfb
+Merriweather-Regular-osf-ts1--base Merriweather-Regular "AutoEnc_l3riwrv45htepume6iim3qrijh ReEncodeFont" <[mwth_l3riwr.enc <Merriweather-Regular.pfb
+Merriweather-UltraBdIt-osf-ot1 Merriweather-UltraBdIt "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwth_6upxhe.enc <Merriweather-UltraBdIt.pfb
+Merriweather-UltraBdIt-osf-t1--base Merriweather-UltraBdIt "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwth_clyrx2.enc <Merriweather-UltraBdIt.pfb
Merriweather-UltraBdIt-osf-ly1 Merriweather-UltraBdIt "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-UltraBdIt.pfb
Merriweather-UltraBdIt-osf-ts1--base Merriweather-UltraBdIt "AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve ReEncodeFont" <[mwth_xz5wux.enc <Merriweather-UltraBdIt.pfb
-Merriweather-UltraBold-osf-ot1 Merriweather-UltraBold "AutoEnc_fuknshterpxw2flapoda5bxt5e ReEncodeFont" <[mwth_fuknsh.enc <Merriweather-UltraBold.pfb
-Merriweather-UltraBold-osf-t1--base Merriweather-UltraBold "AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d ReEncodeFont" <[mwth_jnnjab.enc <Merriweather-UltraBold.pfb
+Merriweather-UltraBold-osf-ot1 Merriweather-UltraBold "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwth_6upxhe.enc <Merriweather-UltraBold.pfb
+Merriweather-UltraBold-osf-t1--base Merriweather-UltraBold "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwth_clyrx2.enc <Merriweather-UltraBold.pfb
Merriweather-UltraBold-osf-ly1 Merriweather-UltraBold "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-UltraBold.pfb
-Merriweather-UltraBold-osf-ts1--base Merriweather-UltraBold "AutoEnc_ywgpbabmor6izux7hcbqcb56qa ReEncodeFont" <[mwth_ywgpba.enc <Merriweather-UltraBold.pfb
+Merriweather-UltraBold-osf-ts1--base Merriweather-UltraBold "AutoEnc_l3riwrv45htepume6iim3qrijh ReEncodeFont" <[mwth_l3riwr.enc <Merriweather-UltraBold.pfb
+% Automatically maintained by otftotfm or other programs. Do not edit.
-MerriweatherSans-BoldItalic-tlf-ot1 MerriweatherSans-BoldItalic "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-BoldItalic.pfb
-MerriweatherSans-BoldItalic-tlf-t1--base MerriweatherSans-BoldItalic "AutoEnc_libw2mm3qgkydsmoydm6r5agjf ReEncodeFont" <[mwth_libw2m.enc <MerriweatherSans-BoldItalic.pfb
-MerriweatherSans-BoldItalic-tlf-ly1 MerriweatherSans-BoldItalic "AutoEnc_cn5sfli3xjnpjitjpli7wpzcng ReEncodeFont" <[mwth_cn5sfl.enc <MerriweatherSans-BoldItalic.pfb
-MerriweatherSans-BoldItalic-tlf-ts1--base MerriweatherSans-BoldItalic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-BoldItalic.pfb
-MerriweatherSans-Bold-tlf-ot1 MerriweatherSans-Bold "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-Bold.pfb
-MerriweatherSans-Bold-tlf-t1--base MerriweatherSans-Bold "AutoEnc_libw2mm3qgkydsmoydm6r5agjf ReEncodeFont" <[mwth_libw2m.enc <MerriweatherSans-Bold.pfb
-MerriweatherSans-Bold-tlf-ly1 MerriweatherSans-Bold "AutoEnc_lnkfblgauyqz3eufwp3wby646h ReEncodeFont" <[mwth_lnkfbl.enc <MerriweatherSans-Bold.pfb
-MerriweatherSans-Bold-tlf-ts1--base MerriweatherSans-Bold "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Bold.pfb
-MerriweatherSans-ExtraBoldItalic-tlf-ot1 MerriweatherSans-ExtraBoldItalic "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-ExBoldIt.pfb
-MerriweatherSans-ExtraBoldItalic-tlf-t1--base MerriweatherSans-ExtraBoldItalic "AutoEnc_libw2mm3qgkydsmoydm6r5agjf ReEncodeFont" <[mwth_libw2m.enc <MerriweatherSans-ExBoldIt.pfb
-MerriweatherSans-ExtraBoldItalic-tlf-ly1 MerriweatherSans-ExtraBoldItalic "AutoEnc_cn5sfli3xjnpjitjpli7wpzcng ReEncodeFont" <[mwth_cn5sfl.enc <MerriweatherSans-ExBoldIt.pfb
-MerriweatherSans-ExtraBoldItalic-tlf-ts1--base MerriweatherSans-ExtraBoldItalic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-ExBoldIt.pfb
-MerriweatherSans-ExtraBold-tlf-ot1 MerriweatherSans-ExtraBold "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-ExtraBold.pfb
-MerriweatherSans-ExtraBold-tlf-t1--base MerriweatherSans-ExtraBold "AutoEnc_libw2mm3qgkydsmoydm6r5agjf ReEncodeFont" <[mwth_libw2m.enc <MerriweatherSans-ExtraBold.pfb
-MerriweatherSans-ExtraBold-tlf-ly1 MerriweatherSans-ExtraBold "AutoEnc_lnkfblgauyqz3eufwp3wby646h ReEncodeFont" <[mwth_lnkfbl.enc <MerriweatherSans-ExtraBold.pfb
-MerriweatherSans-ExtraBold-tlf-ts1--base MerriweatherSans-ExtraBold "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBold.pfb
-MerriweatherSans-Italic-tlf-ot1 MerriweatherSans-Italic "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-Italic.pfb
-MerriweatherSans-Italic-tlf-t1--base MerriweatherSans-Italic "AutoEnc_libw2mm3qgkydsmoydm6r5agjf ReEncodeFont" <[mwth_libw2m.enc <MerriweatherSans-Italic.pfb
-MerriweatherSans-Italic-tlf-ly1 MerriweatherSans-Italic "AutoEnc_cn5sfli3xjnpjitjpli7wpzcng ReEncodeFont" <[mwth_cn5sfl.enc <MerriweatherSans-Italic.pfb
-MerriweatherSans-Italic-tlf-ts1--base MerriweatherSans-Italic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Italic.pfb
-MerriweatherSans-LightItalic-tlf-ot1 MerriweatherSans-LightItalic "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-LightItalic.pfb
-MerriweatherSans-LightItalic-tlf-t1--base MerriweatherSans-LightItalic "AutoEnc_libw2mm3qgkydsmoydm6r5agjf ReEncodeFont" <[mwth_libw2m.enc <MerriweatherSans-LightItalic.pfb
-MerriweatherSans-LightItalic-tlf-ly1 MerriweatherSans-LightItalic "AutoEnc_cn5sfli3xjnpjitjpli7wpzcng ReEncodeFont" <[mwth_cn5sfl.enc <MerriweatherSans-LightItalic.pfb
-MerriweatherSans-LightItalic-tlf-ts1--base MerriweatherSans-LightItalic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-LightItalic.pfb
-MerriweatherSans-Light-tlf-ot1 MerriweatherSans-Light "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-Light.pfb
-MerriweatherSans-Light-tlf-t1--base MerriweatherSans-Light "AutoEnc_libw2mm3qgkydsmoydm6r5agjf ReEncodeFont" <[mwth_libw2m.enc <MerriweatherSans-Light.pfb
-MerriweatherSans-Light-tlf-ly1 MerriweatherSans-Light "AutoEnc_lnkfblgauyqz3eufwp3wby646h ReEncodeFont" <[mwth_lnkfbl.enc <MerriweatherSans-Light.pfb
-MerriweatherSans-Light-tlf-ts1--base MerriweatherSans-Light "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Light.pfb
-MerriweatherSans-Regular-tlf-ot1 MerriweatherSans-Regular "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-Regular.pfb
-MerriweatherSans-Regular-tlf-t1--base MerriweatherSans-Regular "AutoEnc_libw2mm3qgkydsmoydm6r5agjf ReEncodeFont" <[mwth_libw2m.enc <MerriweatherSans-Regular.pfb
-MerriweatherSans-Regular-tlf-ly1 MerriweatherSans-Regular "AutoEnc_lnkfblgauyqz3eufwp3wby646h ReEncodeFont" <[mwth_lnkfbl.enc <MerriweatherSans-Regular.pfb
-MerriweatherSans-Regular-tlf-ts1--base MerriweatherSans-Regular "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-BoldItalic-sup-ot1 MerriweatherSans-BoldItalic "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwth_czxicq.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-sup-t1--base MerriweatherSans-BoldItalic "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwth_7ytifx.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-sup-ly1 MerriweatherSans-BoldItalic "AutoEnc_rwkhk45r7tkww4m25qeus4mcmb ReEncodeFont" <[mwth_rwkhk4.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-ot1 MerriweatherSans-BoldItalic "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwth_tvbl63.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-t1--base MerriweatherSans-BoldItalic "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwth_iuohxq.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-ly1 MerriweatherSans-BoldItalic "AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont" <[mwth_vi456v.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-BoldItalic-osf-ts1--base MerriweatherSans-BoldItalic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-BoldItalic.pfb
+MerriweatherSans-Bold-sup-ot1 MerriweatherSans-Bold "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwth_czxicq.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-sup-t1--base MerriweatherSans-Bold "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwth_7ytifx.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-sup-ly1 MerriweatherSans-Bold "AutoEnc_jlgqyj7c5umbwggrnybckk46wg ReEncodeFont" <[mwth_jlgqyj.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-ot1 MerriweatherSans-Bold "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwth_tvbl63.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-t1--base MerriweatherSans-Bold "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwth_iuohxq.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-ly1 MerriweatherSans-Bold "AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont" <[mwth_44qg5v.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-Bold-osf-ts1--base MerriweatherSans-Bold "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Bold.pfb
+MerriweatherSans-ExtraBoldItalic-sup-ot1 MerriweatherSans-ExtraBoldItalic "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwth_czxicq.enc <MerriweatherSans-ExBoldIt.ttf
+MerriweatherSans-ExtraBoldItalic-sup-t1--base MerriweatherSans-ExtraBoldItalic "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwth_7ytifx.enc <MerriweatherSans-ExBoldIt.ttf
+MerriweatherSans-ExtraBoldItalic-sup-ly1 MerriweatherSans-ExtraBoldItalic "AutoEnc_rwkhk45r7tkww4m25qeus4mcmb ReEncodeFont" <[mwth_rwkhk4.enc <MerriweatherSans-ExBoldIt.ttf
+MerriweatherSans-ExtraBoldItalic-osf-ot1 MerriweatherSans-ExtraBoldItalic "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwth_tvbl63.enc <MerriweatherSans-ExBoldIt.ttf
+MerriweatherSans-ExtraBoldItalic-osf-t1--base MerriweatherSans-ExtraBoldItalic "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwth_iuohxq.enc <MerriweatherSans-ExBoldIt.ttf
+MerriweatherSans-ExtraBoldItalic-osf-ly1 MerriweatherSans-ExtraBoldItalic "AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont" <[mwth_vi456v.enc <MerriweatherSans-ExBoldIt.ttf
+MerriweatherSans-ExtraBoldItalic-osf-ts1--base MerriweatherSans-ExtraBoldItalic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-ExBoldIt.ttf
+MerriweatherSans-ExtraBold-sup-ot1 MerriweatherSans-ExtraBold "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwth_czxicq.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-sup-t1--base MerriweatherSans-ExtraBold "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwth_7ytifx.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-sup-ly1 MerriweatherSans-ExtraBold "AutoEnc_jlgqyj7c5umbwggrnybckk46wg ReEncodeFont" <[mwth_jlgqyj.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-ot1 MerriweatherSans-ExtraBold "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwth_tvbl63.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-t1--base MerriweatherSans-ExtraBold "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwth_iuohxq.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-ly1 MerriweatherSans-ExtraBold "AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont" <[mwth_44qg5v.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-ExtraBold-osf-ts1--base MerriweatherSans-ExtraBold "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBold.pfb
+MerriweatherSans-Italic-sup-ot1 MerriweatherSans-Italic "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwth_czxicq.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-sup-t1--base MerriweatherSans-Italic "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwth_7ytifx.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-sup-ly1 MerriweatherSans-Italic "AutoEnc_rwkhk45r7tkww4m25qeus4mcmb ReEncodeFont" <[mwth_rwkhk4.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-ot1 MerriweatherSans-Italic "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwth_tvbl63.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-t1--base MerriweatherSans-Italic "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwth_iuohxq.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-ly1 MerriweatherSans-Italic "AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont" <[mwth_vi456v.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-Italic-osf-ts1--base MerriweatherSans-Italic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Italic.pfb
+MerriweatherSans-LightItalic-sup-ot1 MerriweatherSans-LightItalic "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwth_czxicq.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-sup-t1--base MerriweatherSans-LightItalic "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwth_7ytifx.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-sup-ly1 MerriweatherSans-LightItalic "AutoEnc_rwkhk45r7tkww4m25qeus4mcmb ReEncodeFont" <[mwth_rwkhk4.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-ot1 MerriweatherSans-LightItalic "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwth_tvbl63.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-t1--base MerriweatherSans-LightItalic "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwth_iuohxq.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-ly1 MerriweatherSans-LightItalic "AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont" <[mwth_vi456v.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-LightItalic-osf-ts1--base MerriweatherSans-LightItalic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-LightItalic.pfb
+MerriweatherSans-Light-sup-ot1 MerriweatherSans-Light "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwth_czxicq.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-sup-t1--base MerriweatherSans-Light "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwth_7ytifx.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-sup-ly1 MerriweatherSans-Light "AutoEnc_jlgqyj7c5umbwggrnybckk46wg ReEncodeFont" <[mwth_jlgqyj.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-ot1 MerriweatherSans-Light "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwth_tvbl63.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-t1--base MerriweatherSans-Light "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwth_iuohxq.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-ly1 MerriweatherSans-Light "AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont" <[mwth_44qg5v.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Light-osf-ts1--base MerriweatherSans-Light "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Light.pfb
+MerriweatherSans-Regular-sup-ot1 MerriweatherSans-Regular "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwth_czxicq.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-sup-t1--base MerriweatherSans-Regular "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwth_7ytifx.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-sup-ly1 MerriweatherSans-Regular "AutoEnc_jlgqyj7c5umbwggrnybckk46wg ReEncodeFont" <[mwth_jlgqyj.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-ot1 MerriweatherSans-Regular "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwth_tvbl63.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-t1--base MerriweatherSans-Regular "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwth_iuohxq.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-ly1 MerriweatherSans-Regular "AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont" <[mwth_44qg5v.enc <MerriweatherSans-Regular.pfb
+MerriweatherSans-Regular-osf-ts1--base MerriweatherSans-Regular "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Regular.pfb
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ot1.tfm
index 787d33b1372..d3f23fcfe57 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1--base.tfm
index 41dd404b3f5..f70599ea3e4 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1.tfm
index 33b4c31432f..767a7f16090 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1--base.tfm
index 851f9ebe941..874d4c67018 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1.tfm
index 89189413d01..9de1a3ea914 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ot1.tfm
index 95db79afbfe..b3b36894eba 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1--base.tfm
index 47974368755..55855b27df6 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.tfm
index 8dcc2ca3269..03202f1731b 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.tfm
index e40b7888a79..ec579569607 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ly1.tfm
index 22d3390dadd..3513f44bd31 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ot1.tfm
index 81ede17ade8..ddcad0a8c24 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1--base.tfm
index efd27856e14..419a72a875e 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1.tfm
index 218e014e36e..74664cb4dc3 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1--base.tfm
index 3707362f7fd..296b568c445 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1.tfm
index b2068d36ab6..f91b76489a7 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ot1.tfm
index b279486aa5c..7fd5647b5d7 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1--base.tfm
index 90735e22eb7..66844fd5202 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1.tfm
index b56208dfbdd..419cbdf45e8 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1--base.tfm
index 86780321cfd..a40bd950ab1 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1.tfm
index 2c484ec80e0..d31d880a9ee 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ot1.tfm
index 175c6e1c496..e2ac84e952a 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1--base.tfm
index a2dcb3f351b..c35cea08858 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1.tfm
index 1340025d932..bdd1275d810 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ts1.tfm
index 092b61f1317..53378e24cbb 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ly1.tfm
index bfbe6dafe26..89ec8fafa01 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ot1.tfm
index 2a096ed2433..f45d670f69b 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1--base.tfm
index 25efb0efdcc..ecec3d6b83e 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1.tfm
index efee9985e1b..1ac381f7cd6 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1--base.tfm
index e0cb8551de1..e3052b7acf0 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1.tfm
index 9b90474a37c..b26997fdff9 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ly1.tfm
index bf118bdb98b..112fd9e1108 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ot1.tfm
index 8e4e46c9949..dd8f065e1cc 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1--base.tfm
index 1fd7e79d699..d575850d705 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.tfm
index 65aed8f35dd..a40473d49c6 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1--base.tfm
index 166b3e28f46..1f2319165fc 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.tfm
index e01edb2b3c8..1a510a52b57 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ly1.tfm
index 99f4815bc47..3098467fb0a 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ot1.tfm
index dfbaea1d271..fcd514d81bb 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1--base.tfm
index 738e4fcdfe4..60a7bf0ef67 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1.tfm
index 64b98e7d5d7..3068eded1dd 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1--base.tfm
index faba5c6b971..c84d720db0a 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.tfm
index 1e9d5d9eef8..d96fedbabf5 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ly1.tfm
index 6007f66441c..3786dcc5056 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ot1.tfm
new file mode 100644
index 00000000000..6e4f3a1ab6e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-t1--base.tfm
new file mode 100644
index 00000000000..fe164e71b29
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-t1.tfm
new file mode 100644
index 00000000000..955764de65c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1--base.tfm
index 91c33d7bd2d..91c33d7bd2d 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1.tfm
new file mode 100644
index 00000000000..d714f32d545
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-ly1.tfm
new file mode 100644
index 00000000000..08562e5c478
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-ot1.tfm
new file mode 100644
index 00000000000..756f9c7e8d4
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-t1--base.tfm
new file mode 100644
index 00000000000..b28aa5cc2da
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-t1.tfm
new file mode 100644
index 00000000000..ff07067da7a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ot1.tfm
deleted file mode 100644
index 552377def06..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ot1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1--base.tfm
deleted file mode 100644
index 02402e27807..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1.tfm
deleted file mode 100644
index 2b79108e045..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1.tfm
deleted file mode 100644
index 09eee7da958..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ly1.tfm
index 3a225b6ba5d..7af1782eac6 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ot1.tfm
new file mode 100644
index 00000000000..e5c43f71e79
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1--base.tfm
new file mode 100644
index 00000000000..05f1e4b1c12
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1.tfm
new file mode 100644
index 00000000000..1c8f5ddd4ad
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1--base.tfm
index 1a0bb9561a1..1a0bb9561a1 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1.tfm
new file mode 100644
index 00000000000..261c2e37edd
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-ly1.tfm
new file mode 100644
index 00000000000..746ee008f1c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-ot1.tfm
new file mode 100644
index 00000000000..54aa1e0062a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1--base.tfm
new file mode 100644
index 00000000000..8837e4d8aaf
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1.tfm
new file mode 100644
index 00000000000..801fa6d5aba
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ot1.tfm
deleted file mode 100644
index cb7a735bcbe..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ot1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1--base.tfm
deleted file mode 100644
index 6129e4909fb..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1.tfm
deleted file mode 100644
index 813210eab5e..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1.tfm
deleted file mode 100644
index 35f1e4d2b73..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ly1.tfm
index 163cb2ba86d..f26cd745ccb 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ot1.tfm
new file mode 100644
index 00000000000..24e2704ce86
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1--base.tfm
new file mode 100644
index 00000000000..f2614b3996f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1.tfm
new file mode 100644
index 00000000000..53e0f8bdd75
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1--base.tfm
index be2910e9fac..be2910e9fac 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.tfm
new file mode 100644
index 00000000000..fae06d497ce
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-ly1.tfm
new file mode 100644
index 00000000000..4cff2d4d024
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-ot1.tfm
new file mode 100644
index 00000000000..5c4a51e6575
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1--base.tfm
new file mode 100644
index 00000000000..c691faab183
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1.tfm
new file mode 100644
index 00000000000..8e9d4c0f8f2
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ot1.tfm
deleted file mode 100644
index 832b8398d9a..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ot1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1--base.tfm
deleted file mode 100644
index 67e1a0a3985..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1.tfm
deleted file mode 100644
index 106240654f8..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1.tfm
deleted file mode 100644
index 03741551bc4..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ly1.tfm
index 0813bf86fe7..c433b5be4e9 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ot1.tfm
new file mode 100644
index 00000000000..4f53a388e22
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1--base.tfm
new file mode 100644
index 00000000000..cb0adf90190
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1.tfm
new file mode 100644
index 00000000000..50401bbae03
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1--base.tfm
index e20d622cf49..e20d622cf49 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1.tfm
new file mode 100644
index 00000000000..67ad0adf2f7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-ly1.tfm
new file mode 100644
index 00000000000..f51112a0233
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-ot1.tfm
new file mode 100644
index 00000000000..2ecf32521c7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1--base.tfm
new file mode 100644
index 00000000000..2afd34399fb
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1.tfm
new file mode 100644
index 00000000000..c0dbc944161
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ot1.tfm
deleted file mode 100644
index f9d9a6c4741..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ot1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1--base.tfm
deleted file mode 100644
index f8a790c8d1b..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1.tfm
deleted file mode 100644
index 823fa5989db..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1.tfm
deleted file mode 100644
index 6b51daa16ad..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ly1.tfm
index 93a87263f24..a2606a35e63 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ot1.tfm
new file mode 100644
index 00000000000..75b411aaca1
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-t1--base.tfm
new file mode 100644
index 00000000000..946f4249bde
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-t1.tfm
new file mode 100644
index 00000000000..a740dfde8d9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1--base.tfm
index 2e0a83dcfe4..2e0a83dcfe4 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.tfm
new file mode 100644
index 00000000000..c5ed5d2c98a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-ly1.tfm
new file mode 100644
index 00000000000..cb81d7385fa
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-ot1.tfm
new file mode 100644
index 00000000000..56a0db2a255
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-t1--base.tfm
new file mode 100644
index 00000000000..d0bd391b51f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-t1.tfm
new file mode 100644
index 00000000000..b5cfd76f79a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ot1.tfm
deleted file mode 100644
index bb80e2f0003..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ot1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1--base.tfm
deleted file mode 100644
index 7ac16841062..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1.tfm
deleted file mode 100644
index e407c8f9ead..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1.tfm
deleted file mode 100644
index 3c08a60176b..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ly1.tfm
index 5c5f4c3069d..05ea2f42e68 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ot1.tfm
new file mode 100644
index 00000000000..fcf8742b3dc
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-t1--base.tfm
new file mode 100644
index 00000000000..65e5e27ebb4
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-t1.tfm
new file mode 100644
index 00000000000..329b180b0da
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ts1--base.tfm
index 38ea41c4293..38ea41c4293 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ts1.tfm
new file mode 100644
index 00000000000..9e751531a8b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-ly1.tfm
new file mode 100644
index 00000000000..c216000d493
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-ot1.tfm
new file mode 100644
index 00000000000..003b1646235
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-t1--base.tfm
new file mode 100644
index 00000000000..4a101f3e09e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-t1.tfm
new file mode 100644
index 00000000000..2ca43eec040
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ot1.tfm
deleted file mode 100644
index a4be2ddb512..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ot1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-t1--base.tfm
deleted file mode 100644
index 9f0040aa4c6..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-t1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-t1.tfm
deleted file mode 100644
index 7fd45a8ab8c..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-t1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1.tfm
deleted file mode 100644
index c3d19370e03..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ly1.tfm
index 69c311658fb..70bd5825e14 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ot1.tfm
new file mode 100644
index 00000000000..60af6e8ed2d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1--base.tfm
new file mode 100644
index 00000000000..f42c1a82e8b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1.tfm
new file mode 100644
index 00000000000..deeabf10ace
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1--base.tfm
index 35f5515d067..7841a8d3f1a 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.tfm
new file mode 100644
index 00000000000..e3473984638
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-ly1.tfm
new file mode 100644
index 00000000000..b63de0d5ff8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-ot1.tfm
new file mode 100644
index 00000000000..79fb78a1030
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1--base.tfm
new file mode 100644
index 00000000000..0a6c68d608b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1.tfm
new file mode 100644
index 00000000000..b6610141386
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ot1.tfm
deleted file mode 100644
index 9c790763af0..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ot1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1--base.tfm
deleted file mode 100644
index 1d44a58f17b..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1.tfm
deleted file mode 100644
index acab0e46b12..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1.tfm
deleted file mode 100644
index 7e1d249f866..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ly1.tfm
index 72e6f927dd9..adb3b9fa445 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ot1.tfm
new file mode 100644
index 00000000000..17114836219
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-t1--base.tfm
new file mode 100644
index 00000000000..944dcbaa6dd
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-t1.tfm
new file mode 100644
index 00000000000..19c83cab5ab
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1--base.tfm
index 9daf22f6be0..9daf22f6be0 100644
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1.tfm
new file mode 100644
index 00000000000..c13947fd7d4
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-ly1.tfm
new file mode 100644
index 00000000000..88bb890d618
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-ot1.tfm
new file mode 100644
index 00000000000..4f0b3d9dd42
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-t1--base.tfm
new file mode 100644
index 00000000000..f948b6048fe
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-t1.tfm
new file mode 100644
index 00000000000..39cb2a95796
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ot1.tfm
deleted file mode 100644
index 6d81990e040..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ot1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1--base.tfm
deleted file mode 100644
index 3c1112ab3bf..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1.tfm
deleted file mode 100644
index 6f47d347a5d..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1.tfm
deleted file mode 100644
index a2197ee2641..00000000000
--- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1.tfm
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-t1.vf
index 4b0b445a01e..397d307a577 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-ts1.vf
index 1dd0d4ebbc3..a4531aee062 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.vf
index 4b131590c95..ba87a8ff8c1 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.vf
index 8c5b4af8167..39d81586005 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-t1.vf
index e71ecf124aa..35579f1e6c7 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-ts1.vf
index 6caf9fc2e53..c17961d74b7 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-t1.vf
index 429f0a8f8cb..f17aab5496b 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-ts1.vf
index 018a98f00b6..1ccfa01be14 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-osf-t1.vf
index 0edf794d1a7..5ba2641a629 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-osf-ts1.vf
index 8f97fc63774..6badd703d33 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-t1.vf
index e437aacf45d..01043b533ef 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-ts1.vf
index b686457da0a..c90b272e81b 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.vf
index 89c36471d87..5fbd2ad555d 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.vf
index 08bce410c8d..8b64e8b481b 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-t1.vf
index d58ad5b0d1f..df262a58273 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.vf
index 9d4528e77bb..9d37d94348c 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-t1.vf
index 0606058cf0f..2b67836f60a 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1.vf
index d20d1d94196..31fdb149686 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-sup-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-sup-t1.vf
new file mode 100644
index 00000000000..a74404cb13e
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1.vf
index 10cf1b64691..ea310805f8d 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1.vf
index 12a312a9b9f..6cd28ff2eb6 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1.vf
new file mode 100644
index 00000000000..a20e42e4aff
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1.vf
index 89eb9a8f2f0..69826102598 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.vf
new file mode 100644
index 00000000000..0641eb73c66
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1.vf
new file mode 100644
index 00000000000..5de55215ff3
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1.vf
deleted file mode 100644
index 123141cdf99..00000000000
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1.vf
index 2c7aac001de..9d5483545aa 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1.vf
new file mode 100644
index 00000000000..9a232af6f98
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1.vf
new file mode 100644
index 00000000000..fc78fab70be
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1.vf
deleted file mode 100644
index 29ec8eed2de..00000000000
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-t1.vf
index 8508f3603f5..dc507b48e8c 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.vf
new file mode 100644
index 00000000000..e20d256bbe8
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-sup-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-sup-t1.vf
new file mode 100644
index 00000000000..9a76f3c2aee
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1.vf
deleted file mode 100644
index f6a85202070..00000000000
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-tlf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-t1.vf
index f02b5fffaac..c35c4bfd0ab 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-ts1.vf
index 3b2a55557a7..1547d3ba5ad 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-sup-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-sup-t1.vf
new file mode 100644
index 00000000000..06f7bbb99a4
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1.vf
index 2d1d50d653e..17f9ccfbba4 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.vf
new file mode 100644
index 00000000000..92dab0a6427
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1.vf
new file mode 100644
index 00000000000..8ce93f6a8e0
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1.vf
deleted file mode 100644
index 276ee18e133..00000000000
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1.vf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-t1.vf
index deada412980..f23fef89a75 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1.vf
index 54d58fec2a8..b7dcf971293 100644
--- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-sup-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-sup-t1.vf
new file mode 100644
index 00000000000..89bbc15616e
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd
index 2b118321df5..d7b8c6adec7 100644
--- a/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd
+++ b/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/01/24
+%% Generated by autoinst on 2019/06/02
%%
\ProvidesFile{LY1Merriweather-OsF.fd}
- [2014/01/24 (autoinst) Font definitions for LY1/Merriweather-OsF.]
+ [2019/06/02 (autoinst) Font definitions for LY1/Merriweather-OsF.]
\expandafter\ifx\csname Merriweather@scale\endcsname\relax
\let\Merriweather@@scale\@empty
@@ -11,62 +11,137 @@
\DeclareFontFamily{LY1}{Merriweather-OsF}{}
-\DeclareFontShape{LY1}{Merriweather-OsF}{l}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{regular}{n}{
+ <-> \Merriweather@@scale Merriweather-Regular-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{regular}{it}{
+ <-> \Merriweather@@scale Merriweather-Italic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{regular}{sl}{
+ <-> ssub * Merriweather-OsF/regular/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{bold}{n}{
+ <-> \Merriweather@@scale Merriweather-Bold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{bold}{it}{
+ <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{bold}{sl}{
+ <-> ssub * Merriweather-OsF/bold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{light}{n}{
<-> \Merriweather@@scale Merriweather-Light-osf-ly1
}{}
-\DeclareFontShape{LY1}{Merriweather-OsF}{l}{it}{
+\DeclareFontShape{LY1}{Merriweather-OsF}{light}{it}{
<-> \Merriweather@@scale Merriweather-LightIt-osf-ly1
}{}
+\DeclareFontShape{LY1}{Merriweather-OsF}{light}{sl}{
+ <-> ssub * Merriweather-OsF/light/it
+}{}
+
+
+% ---- ultrabold ----
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{ultrabold}{n}{
+ <-> \Merriweather@@scale Merriweather-UltraBold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{ultrabold}{it}{
+ <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{ultrabold}{sl}{
+ <-> ssub * Merriweather-OsF/ultrabold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% l --> light
+
\DeclareFontShape{LY1}{Merriweather-OsF}{l}{sl}{
- <-> ssub * Merriweather-OsF/l/it
+ <-> ssub * Merriweather-OsF/light/sl
}{}
-\DeclareFontShape{LY1}{Merriweather-OsF}{b}{n}{
- <-> \Merriweather@@scale Merriweather-Bold-osf-ly1
+\DeclareFontShape{LY1}{Merriweather-OsF}{l}{n}{
+ <-> ssub * Merriweather-OsF/light/n
}{}
-\DeclareFontShape{LY1}{Merriweather-OsF}{b}{it}{
- <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ly1
+\DeclareFontShape{LY1}{Merriweather-OsF}{l}{it}{
+ <-> ssub * Merriweather-OsF/light/it
}{}
-\DeclareFontShape{LY1}{Merriweather-OsF}{b}{sl}{
- <-> ssub * Merriweather-OsF/b/it
+
+% m --> regular
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{m}{sl}{
+ <-> ssub * Merriweather-OsF/regular/sl
}{}
\DeclareFontShape{LY1}{Merriweather-OsF}{m}{n}{
- <-> \Merriweather@@scale Merriweather-Regular-osf-ly1
+ <-> ssub * Merriweather-OsF/regular/n
}{}
\DeclareFontShape{LY1}{Merriweather-OsF}{m}{it}{
- <-> \Merriweather@@scale Merriweather-Italic-osf-ly1
+ <-> ssub * Merriweather-OsF/regular/it
}{}
-\DeclareFontShape{LY1}{Merriweather-OsF}{m}{sl}{
- <-> ssub * Merriweather-OsF/m/it
+
+% b --> bold
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{b}{sl}{
+ <-> ssub * Merriweather-OsF/bold/sl
}{}
-\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{n}{
- <-> \Merriweather@@scale Merriweather-UltraBold-osf-ly1
+\DeclareFontShape{LY1}{Merriweather-OsF}{b}{n}{
+ <-> ssub * Merriweather-OsF/bold/n
}{}
-\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{it}{
- <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ly1
+\DeclareFontShape{LY1}{Merriweather-OsF}{b}{it}{
+ <-> ssub * Merriweather-OsF/bold/it
}{}
+
+% ub --> ultrabold
+
\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{sl}{
- <-> ssub * Merriweather-OsF/ub/it
+ <-> ssub * Merriweather-OsF/ultrabold/sl
}{}
-\DeclareFontShape{LY1}{Merriweather-OsF}{bx}{sl}{
- <-> ssub * Merriweather-OsF/b/sl
+\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{n}{
+ <-> ssub * Merriweather-OsF/ultrabold/n
+}{}
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{it}{
+ <-> ssub * Merriweather-OsF/ultrabold/it
}{}
\DeclareFontShape{LY1}{Merriweather-OsF}{bx}{n}{
<-> ssub * Merriweather-OsF/b/n
}{}
+\DeclareFontShape{LY1}{Merriweather-OsF}{bx}{sl}{
+ <-> ssub * Merriweather-OsF/b/sl
+}{}
+
\DeclareFontShape{LY1}{Merriweather-OsF}{bx}{it}{
<-> ssub * Merriweather-OsF/b/it
}{}
diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd
new file mode 100644
index 00000000000..1d190f586a3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd
@@ -0,0 +1,149 @@
+%% Generated by autoinst on 2019/06/02
+%%
+\ProvidesFile{LY1MerriweatherSans-OsF.fd}
+ [2019/06/02 (autoinst) Font definitions for LY1/MerriweatherSans-OsF.]
+
+\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax
+ \let\MerriweatherSans@@scale\@empty
+\else
+ \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{MerriweatherSans-OsF}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{regular}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{regular}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{regular}{sl}{
+ <-> ssub * MerriweatherSans-OsF/regular/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bold}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bold}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bold}{sl}{
+ <-> ssub * MerriweatherSans-OsF/bold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{light}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{light}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{light}{sl}{
+ <-> ssub * MerriweatherSans-OsF/light/it
+}{}
+
+
+% ---- extrabold ----
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{extrabold}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{extrabold}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{extrabold}{sl}{
+ <-> ssub * MerriweatherSans-OsF/extrabold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% l --> light
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{l}{sl}{
+ <-> ssub * MerriweatherSans-OsF/light/sl
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{l}{n}{
+ <-> ssub * MerriweatherSans-OsF/light/n
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{l}{it}{
+ <-> ssub * MerriweatherSans-OsF/light/it
+}{}
+
+
+% m --> regular
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{m}{sl}{
+ <-> ssub * MerriweatherSans-OsF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{m}{n}{
+ <-> ssub * MerriweatherSans-OsF/regular/n
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{m}{it}{
+ <-> ssub * MerriweatherSans-OsF/regular/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{b}{sl}{
+ <-> ssub * MerriweatherSans-OsF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{b}{n}{
+ <-> ssub * MerriweatherSans-OsF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{b}{it}{
+ <-> ssub * MerriweatherSans-OsF/bold/it
+}{}
+
+
+% eb --> extrabold
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{eb}{sl}{
+ <-> ssub * MerriweatherSans-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{eb}{n}{
+ <-> ssub * MerriweatherSans-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{eb}{it}{
+ <-> ssub * MerriweatherSans-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bx}{n}{
+ <-> ssub * MerriweatherSans-OsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bx}{sl}{
+ <-> ssub * MerriweatherSans-OsF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bx}{it}{
+ <-> ssub * MerriweatherSans-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-Sup.fd b/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-Sup.fd
new file mode 100644
index 00000000000..094d4e2e46c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-Sup.fd
@@ -0,0 +1,149 @@
+%% Generated by autoinst on 2019/06/02
+%%
+\ProvidesFile{LY1MerriweatherSans-Sup.fd}
+ [2019/06/02 (autoinst) Font definitions for LY1/MerriweatherSans-Sup.]
+
+\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax
+ \let\MerriweatherSans@@scale\@empty
+\else
+ \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{MerriweatherSans-Sup}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{regular}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Regular-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{regular}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Italic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{regular}{sl}{
+ <-> ssub * MerriweatherSans-Sup/regular/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bold}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Bold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bold}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bold}{sl}{
+ <-> ssub * MerriweatherSans-Sup/bold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{light}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Light-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{light}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{light}{sl}{
+ <-> ssub * MerriweatherSans-Sup/light/it
+}{}
+
+
+% ---- extrabold ----
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{extrabold}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{extrabold}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{extrabold}{sl}{
+ <-> ssub * MerriweatherSans-Sup/extrabold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% l --> light
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{l}{sl}{
+ <-> ssub * MerriweatherSans-Sup/light/sl
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{l}{n}{
+ <-> ssub * MerriweatherSans-Sup/light/n
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{l}{it}{
+ <-> ssub * MerriweatherSans-Sup/light/it
+}{}
+
+
+% m --> regular
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{m}{sl}{
+ <-> ssub * MerriweatherSans-Sup/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{m}{n}{
+ <-> ssub * MerriweatherSans-Sup/regular/n
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{m}{it}{
+ <-> ssub * MerriweatherSans-Sup/regular/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{b}{sl}{
+ <-> ssub * MerriweatherSans-Sup/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{b}{n}{
+ <-> ssub * MerriweatherSans-Sup/bold/n
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{b}{it}{
+ <-> ssub * MerriweatherSans-Sup/bold/it
+}{}
+
+
+% eb --> extrabold
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{eb}{sl}{
+ <-> ssub * MerriweatherSans-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{eb}{n}{
+ <-> ssub * MerriweatherSans-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{eb}{it}{
+ <-> ssub * MerriweatherSans-Sup/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bx}{n}{
+ <-> ssub * MerriweatherSans-Sup/b/n
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bx}{sl}{
+ <-> ssub * MerriweatherSans-Sup/b/sl
+}{}
+
+\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bx}{it}{
+ <-> ssub * MerriweatherSans-Sup/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-TLF.fd
deleted file mode 100644
index 0b5642a3b3e..00000000000
--- a/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-TLF.fd
+++ /dev/null
@@ -1,74 +0,0 @@
-%% Generated by autoinst on 2014/01/22
-%%
-\ProvidesFile{LY1MerriweatherSans-TLF.fd}
- [2014/01/22 (autoinst) Font definitions for LY1/MerriweatherSans-TLF.]
-
-\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax
- \let\MerriweatherSans@@scale\@empty
-\else
- \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{MerriweatherSans-TLF}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-TLF}{l}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Light-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-TLF}{l}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-TLF}{l}{sl}{
- <-> ssub * MerriweatherSans-TLF/l/it
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-TLF}{eb}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-TLF}{eb}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-TLF}{eb}{sl}{
- <-> ssub * MerriweatherSans-TLF/eb/it
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-TLF}{b}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Bold-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-TLF}{b}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-TLF}{b}{sl}{
- <-> ssub * MerriweatherSans-TLF/b/it
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-TLF}{m}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Regular-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-TLF}{m}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Italic-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-TLF}{m}{sl}{
- <-> ssub * MerriweatherSans-TLF/m/it
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-TLF}{bx}{sl}{
- <-> ssub * MerriweatherSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-TLF}{bx}{n}{
- <-> ssub * MerriweatherSans-TLF/b/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-TLF}{bx}{it}{
- <-> ssub * MerriweatherSans-TLF/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd
index 31ea2fc671b..1a8a932b03b 100644
--- a/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd
+++ b/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/01/22
+%% Generated by autoinst on 2019/06/02
%%
\ProvidesFile{OT1Merriweather-OsF.fd}
- [2014/01/22 (autoinst) Font definitions for OT1/Merriweather-OsF.]
+ [2019/06/02 (autoinst) Font definitions for OT1/Merriweather-OsF.]
\expandafter\ifx\csname Merriweather@scale\endcsname\relax
\let\Merriweather@@scale\@empty
@@ -11,62 +11,137 @@
\DeclareFontFamily{OT1}{Merriweather-OsF}{}
-\DeclareFontShape{OT1}{Merriweather-OsF}{l}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{regular}{n}{
+ <-> \Merriweather@@scale Merriweather-Regular-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{regular}{it}{
+ <-> \Merriweather@@scale Merriweather-Italic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{regular}{sl}{
+ <-> ssub * Merriweather-OsF/regular/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{bold}{n}{
+ <-> \Merriweather@@scale Merriweather-Bold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{bold}{it}{
+ <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{bold}{sl}{
+ <-> ssub * Merriweather-OsF/bold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{light}{n}{
<-> \Merriweather@@scale Merriweather-Light-osf-ot1
}{}
-\DeclareFontShape{OT1}{Merriweather-OsF}{l}{it}{
+\DeclareFontShape{OT1}{Merriweather-OsF}{light}{it}{
<-> \Merriweather@@scale Merriweather-LightIt-osf-ot1
}{}
+\DeclareFontShape{OT1}{Merriweather-OsF}{light}{sl}{
+ <-> ssub * Merriweather-OsF/light/it
+}{}
+
+
+% ---- ultrabold ----
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{ultrabold}{n}{
+ <-> \Merriweather@@scale Merriweather-UltraBold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{ultrabold}{it}{
+ <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{ultrabold}{sl}{
+ <-> ssub * Merriweather-OsF/ultrabold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% l --> light
+
\DeclareFontShape{OT1}{Merriweather-OsF}{l}{sl}{
- <-> ssub * Merriweather-OsF/l/it
+ <-> ssub * Merriweather-OsF/light/sl
}{}
-\DeclareFontShape{OT1}{Merriweather-OsF}{b}{n}{
- <-> \Merriweather@@scale Merriweather-Bold-osf-ot1
+\DeclareFontShape{OT1}{Merriweather-OsF}{l}{n}{
+ <-> ssub * Merriweather-OsF/light/n
}{}
-\DeclareFontShape{OT1}{Merriweather-OsF}{b}{it}{
- <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ot1
+\DeclareFontShape{OT1}{Merriweather-OsF}{l}{it}{
+ <-> ssub * Merriweather-OsF/light/it
}{}
-\DeclareFontShape{OT1}{Merriweather-OsF}{b}{sl}{
- <-> ssub * Merriweather-OsF/b/it
+
+% m --> regular
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{m}{sl}{
+ <-> ssub * Merriweather-OsF/regular/sl
}{}
\DeclareFontShape{OT1}{Merriweather-OsF}{m}{n}{
- <-> \Merriweather@@scale Merriweather-Regular-osf-ot1
+ <-> ssub * Merriweather-OsF/regular/n
}{}
\DeclareFontShape{OT1}{Merriweather-OsF}{m}{it}{
- <-> \Merriweather@@scale Merriweather-Italic-osf-ot1
+ <-> ssub * Merriweather-OsF/regular/it
}{}
-\DeclareFontShape{OT1}{Merriweather-OsF}{m}{sl}{
- <-> ssub * Merriweather-OsF/m/it
+
+% b --> bold
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{b}{sl}{
+ <-> ssub * Merriweather-OsF/bold/sl
}{}
-\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{n}{
- <-> \Merriweather@@scale Merriweather-UltraBold-osf-ot1
+\DeclareFontShape{OT1}{Merriweather-OsF}{b}{n}{
+ <-> ssub * Merriweather-OsF/bold/n
}{}
-\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{it}{
- <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ot1
+\DeclareFontShape{OT1}{Merriweather-OsF}{b}{it}{
+ <-> ssub * Merriweather-OsF/bold/it
}{}
+
+% ub --> ultrabold
+
\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{sl}{
- <-> ssub * Merriweather-OsF/ub/it
+ <-> ssub * Merriweather-OsF/ultrabold/sl
}{}
-\DeclareFontShape{OT1}{Merriweather-OsF}{bx}{sl}{
- <-> ssub * Merriweather-OsF/b/sl
+\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{n}{
+ <-> ssub * Merriweather-OsF/ultrabold/n
+}{}
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{it}{
+ <-> ssub * Merriweather-OsF/ultrabold/it
}{}
\DeclareFontShape{OT1}{Merriweather-OsF}{bx}{n}{
<-> ssub * Merriweather-OsF/b/n
}{}
+\DeclareFontShape{OT1}{Merriweather-OsF}{bx}{sl}{
+ <-> ssub * Merriweather-OsF/b/sl
+}{}
+
\DeclareFontShape{OT1}{Merriweather-OsF}{bx}{it}{
<-> ssub * Merriweather-OsF/b/it
}{}
diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd
new file mode 100644
index 00000000000..e1c734a399c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd
@@ -0,0 +1,149 @@
+%% Generated by autoinst on 2019/06/02
+%%
+\ProvidesFile{OT1MerriweatherSans-OsF.fd}
+ [2019/06/02 (autoinst) Font definitions for OT1/MerriweatherSans-OsF.]
+
+\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax
+ \let\MerriweatherSans@@scale\@empty
+\else
+ \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{MerriweatherSans-OsF}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{regular}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{regular}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{regular}{sl}{
+ <-> ssub * MerriweatherSans-OsF/regular/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bold}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bold}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bold}{sl}{
+ <-> ssub * MerriweatherSans-OsF/bold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{light}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{light}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{light}{sl}{
+ <-> ssub * MerriweatherSans-OsF/light/it
+}{}
+
+
+% ---- extrabold ----
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{extrabold}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{extrabold}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{extrabold}{sl}{
+ <-> ssub * MerriweatherSans-OsF/extrabold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% l --> light
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{l}{sl}{
+ <-> ssub * MerriweatherSans-OsF/light/sl
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{l}{n}{
+ <-> ssub * MerriweatherSans-OsF/light/n
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{l}{it}{
+ <-> ssub * MerriweatherSans-OsF/light/it
+}{}
+
+
+% m --> regular
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{m}{sl}{
+ <-> ssub * MerriweatherSans-OsF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{m}{n}{
+ <-> ssub * MerriweatherSans-OsF/regular/n
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{m}{it}{
+ <-> ssub * MerriweatherSans-OsF/regular/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{b}{sl}{
+ <-> ssub * MerriweatherSans-OsF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{b}{n}{
+ <-> ssub * MerriweatherSans-OsF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{b}{it}{
+ <-> ssub * MerriweatherSans-OsF/bold/it
+}{}
+
+
+% eb --> extrabold
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{eb}{sl}{
+ <-> ssub * MerriweatherSans-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{eb}{n}{
+ <-> ssub * MerriweatherSans-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{eb}{it}{
+ <-> ssub * MerriweatherSans-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bx}{n}{
+ <-> ssub * MerriweatherSans-OsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bx}{sl}{
+ <-> ssub * MerriweatherSans-OsF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bx}{it}{
+ <-> ssub * MerriweatherSans-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-Sup.fd b/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-Sup.fd
new file mode 100644
index 00000000000..77b60c88bd7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-Sup.fd
@@ -0,0 +1,149 @@
+%% Generated by autoinst on 2019/06/02
+%%
+\ProvidesFile{OT1MerriweatherSans-Sup.fd}
+ [2019/06/02 (autoinst) Font definitions for OT1/MerriweatherSans-Sup.]
+
+\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax
+ \let\MerriweatherSans@@scale\@empty
+\else
+ \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{MerriweatherSans-Sup}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{regular}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Regular-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{regular}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Italic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{regular}{sl}{
+ <-> ssub * MerriweatherSans-Sup/regular/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bold}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Bold-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bold}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bold}{sl}{
+ <-> ssub * MerriweatherSans-Sup/bold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{light}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Light-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{light}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{light}{sl}{
+ <-> ssub * MerriweatherSans-Sup/light/it
+}{}
+
+
+% ---- extrabold ----
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{extrabold}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{extrabold}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{extrabold}{sl}{
+ <-> ssub * MerriweatherSans-Sup/extrabold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% l --> light
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{l}{sl}{
+ <-> ssub * MerriweatherSans-Sup/light/sl
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{l}{n}{
+ <-> ssub * MerriweatherSans-Sup/light/n
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{l}{it}{
+ <-> ssub * MerriweatherSans-Sup/light/it
+}{}
+
+
+% m --> regular
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{m}{sl}{
+ <-> ssub * MerriweatherSans-Sup/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{m}{n}{
+ <-> ssub * MerriweatherSans-Sup/regular/n
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{m}{it}{
+ <-> ssub * MerriweatherSans-Sup/regular/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{b}{sl}{
+ <-> ssub * MerriweatherSans-Sup/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{b}{n}{
+ <-> ssub * MerriweatherSans-Sup/bold/n
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{b}{it}{
+ <-> ssub * MerriweatherSans-Sup/bold/it
+}{}
+
+
+% eb --> extrabold
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{eb}{sl}{
+ <-> ssub * MerriweatherSans-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{eb}{n}{
+ <-> ssub * MerriweatherSans-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{eb}{it}{
+ <-> ssub * MerriweatherSans-Sup/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bx}{n}{
+ <-> ssub * MerriweatherSans-Sup/b/n
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bx}{sl}{
+ <-> ssub * MerriweatherSans-Sup/b/sl
+}{}
+
+\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bx}{it}{
+ <-> ssub * MerriweatherSans-Sup/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-TLF.fd
deleted file mode 100644
index 8b257f4a70e..00000000000
--- a/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-TLF.fd
+++ /dev/null
@@ -1,74 +0,0 @@
-%% Generated by autoinst on 2014/01/22
-%%
-\ProvidesFile{OT1MerriweatherSans-TLF.fd}
- [2014/01/22 (autoinst) Font definitions for OT1/MerriweatherSans-TLF.]
-
-\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax
- \let\MerriweatherSans@@scale\@empty
-\else
- \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{MerriweatherSans-TLF}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-TLF}{l}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Light-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-TLF}{l}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-TLF}{l}{sl}{
- <-> ssub * MerriweatherSans-TLF/l/it
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-TLF}{eb}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-TLF}{eb}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-TLF}{eb}{sl}{
- <-> ssub * MerriweatherSans-TLF/eb/it
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-TLF}{b}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Bold-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-TLF}{b}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-TLF}{b}{sl}{
- <-> ssub * MerriweatherSans-TLF/b/it
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-TLF}{m}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Regular-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-TLF}{m}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Italic-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-TLF}{m}{sl}{
- <-> ssub * MerriweatherSans-TLF/m/it
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-TLF}{bx}{sl}{
- <-> ssub * MerriweatherSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-TLF}{bx}{n}{
- <-> ssub * MerriweatherSans-TLF/b/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-TLF}{bx}{it}{
- <-> ssub * MerriweatherSans-TLF/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd
index 93b7b387d71..46a6c51e0a6 100644
--- a/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd
+++ b/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/01/22
+%% Generated by autoinst on 2019/06/02
%%
\ProvidesFile{T1Merriweather-OsF.fd}
- [2014/01/22 (autoinst) Font definitions for T1/Merriweather-OsF.]
+ [2019/06/02 (autoinst) Font definitions for T1/Merriweather-OsF.]
\expandafter\ifx\csname Merriweather@scale\endcsname\relax
\let\Merriweather@@scale\@empty
@@ -11,62 +11,137 @@
\DeclareFontFamily{T1}{Merriweather-OsF}{}
-\DeclareFontShape{T1}{Merriweather-OsF}{l}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{Merriweather-OsF}{regular}{n}{
+ <-> \Merriweather@@scale Merriweather-Regular-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriweather-OsF}{regular}{it}{
+ <-> \Merriweather@@scale Merriweather-Italic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriweather-OsF}{regular}{sl}{
+ <-> ssub * Merriweather-OsF/regular/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{Merriweather-OsF}{bold}{n}{
+ <-> \Merriweather@@scale Merriweather-Bold-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriweather-OsF}{bold}{it}{
+ <-> \Merriweather@@scale Merriweather-BoldItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriweather-OsF}{bold}{sl}{
+ <-> ssub * Merriweather-OsF/bold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{T1}{Merriweather-OsF}{light}{n}{
<-> \Merriweather@@scale Merriweather-Light-osf-t1
}{}
-\DeclareFontShape{T1}{Merriweather-OsF}{l}{it}{
+\DeclareFontShape{T1}{Merriweather-OsF}{light}{it}{
<-> \Merriweather@@scale Merriweather-LightIt-osf-t1
}{}
+\DeclareFontShape{T1}{Merriweather-OsF}{light}{sl}{
+ <-> ssub * Merriweather-OsF/light/it
+}{}
+
+
+% ---- ultrabold ----
+
+\DeclareFontShape{T1}{Merriweather-OsF}{ultrabold}{n}{
+ <-> \Merriweather@@scale Merriweather-UltraBold-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriweather-OsF}{ultrabold}{it}{
+ <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriweather-OsF}{ultrabold}{sl}{
+ <-> ssub * Merriweather-OsF/ultrabold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% l --> light
+
\DeclareFontShape{T1}{Merriweather-OsF}{l}{sl}{
- <-> ssub * Merriweather-OsF/l/it
+ <-> ssub * Merriweather-OsF/light/sl
}{}
-\DeclareFontShape{T1}{Merriweather-OsF}{b}{n}{
- <-> \Merriweather@@scale Merriweather-Bold-osf-t1
+\DeclareFontShape{T1}{Merriweather-OsF}{l}{n}{
+ <-> ssub * Merriweather-OsF/light/n
}{}
-\DeclareFontShape{T1}{Merriweather-OsF}{b}{it}{
- <-> \Merriweather@@scale Merriweather-BoldItalic-osf-t1
+\DeclareFontShape{T1}{Merriweather-OsF}{l}{it}{
+ <-> ssub * Merriweather-OsF/light/it
}{}
-\DeclareFontShape{T1}{Merriweather-OsF}{b}{sl}{
- <-> ssub * Merriweather-OsF/b/it
+
+% m --> regular
+
+\DeclareFontShape{T1}{Merriweather-OsF}{m}{sl}{
+ <-> ssub * Merriweather-OsF/regular/sl
}{}
\DeclareFontShape{T1}{Merriweather-OsF}{m}{n}{
- <-> \Merriweather@@scale Merriweather-Regular-osf-t1
+ <-> ssub * Merriweather-OsF/regular/n
}{}
\DeclareFontShape{T1}{Merriweather-OsF}{m}{it}{
- <-> \Merriweather@@scale Merriweather-Italic-osf-t1
+ <-> ssub * Merriweather-OsF/regular/it
}{}
-\DeclareFontShape{T1}{Merriweather-OsF}{m}{sl}{
- <-> ssub * Merriweather-OsF/m/it
+
+% b --> bold
+
+\DeclareFontShape{T1}{Merriweather-OsF}{b}{sl}{
+ <-> ssub * Merriweather-OsF/bold/sl
}{}
-\DeclareFontShape{T1}{Merriweather-OsF}{ub}{n}{
- <-> \Merriweather@@scale Merriweather-UltraBold-osf-t1
+\DeclareFontShape{T1}{Merriweather-OsF}{b}{n}{
+ <-> ssub * Merriweather-OsF/bold/n
}{}
-\DeclareFontShape{T1}{Merriweather-OsF}{ub}{it}{
- <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-t1
+\DeclareFontShape{T1}{Merriweather-OsF}{b}{it}{
+ <-> ssub * Merriweather-OsF/bold/it
}{}
+
+% ub --> ultrabold
+
\DeclareFontShape{T1}{Merriweather-OsF}{ub}{sl}{
- <-> ssub * Merriweather-OsF/ub/it
+ <-> ssub * Merriweather-OsF/ultrabold/sl
}{}
-\DeclareFontShape{T1}{Merriweather-OsF}{bx}{sl}{
- <-> ssub * Merriweather-OsF/b/sl
+\DeclareFontShape{T1}{Merriweather-OsF}{ub}{n}{
+ <-> ssub * Merriweather-OsF/ultrabold/n
+}{}
+
+\DeclareFontShape{T1}{Merriweather-OsF}{ub}{it}{
+ <-> ssub * Merriweather-OsF/ultrabold/it
}{}
\DeclareFontShape{T1}{Merriweather-OsF}{bx}{n}{
<-> ssub * Merriweather-OsF/b/n
}{}
+\DeclareFontShape{T1}{Merriweather-OsF}{bx}{sl}{
+ <-> ssub * Merriweather-OsF/b/sl
+}{}
+
\DeclareFontShape{T1}{Merriweather-OsF}{bx}{it}{
<-> ssub * Merriweather-OsF/b/it
}{}
diff --git a/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd
new file mode 100644
index 00000000000..6ee2d25c10b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd
@@ -0,0 +1,149 @@
+%% Generated by autoinst on 2019/06/02
+%%
+\ProvidesFile{T1MerriweatherSans-OsF.fd}
+ [2019/06/02 (autoinst) Font definitions for T1/MerriweatherSans-OsF.]
+
+\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax
+ \let\MerriweatherSans@@scale\@empty
+\else
+ \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{MerriweatherSans-OsF}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{regular}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{regular}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{regular}{sl}{
+ <-> ssub * MerriweatherSans-OsF/regular/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{bold}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{bold}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{bold}{sl}{
+ <-> ssub * MerriweatherSans-OsF/bold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{light}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{light}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{light}{sl}{
+ <-> ssub * MerriweatherSans-OsF/light/it
+}{}
+
+
+% ---- extrabold ----
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{extrabold}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{extrabold}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{extrabold}{sl}{
+ <-> ssub * MerriweatherSans-OsF/extrabold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% l --> light
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{l}{sl}{
+ <-> ssub * MerriweatherSans-OsF/light/sl
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{l}{n}{
+ <-> ssub * MerriweatherSans-OsF/light/n
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{l}{it}{
+ <-> ssub * MerriweatherSans-OsF/light/it
+}{}
+
+
+% m --> regular
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{m}{sl}{
+ <-> ssub * MerriweatherSans-OsF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{m}{n}{
+ <-> ssub * MerriweatherSans-OsF/regular/n
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{m}{it}{
+ <-> ssub * MerriweatherSans-OsF/regular/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{b}{sl}{
+ <-> ssub * MerriweatherSans-OsF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{b}{n}{
+ <-> ssub * MerriweatherSans-OsF/bold/n
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{b}{it}{
+ <-> ssub * MerriweatherSans-OsF/bold/it
+}{}
+
+
+% eb --> extrabold
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{eb}{sl}{
+ <-> ssub * MerriweatherSans-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{eb}{n}{
+ <-> ssub * MerriweatherSans-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{eb}{it}{
+ <-> ssub * MerriweatherSans-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{bx}{n}{
+ <-> ssub * MerriweatherSans-OsF/b/n
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{bx}{sl}{
+ <-> ssub * MerriweatherSans-OsF/b/sl
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-OsF}{bx}{it}{
+ <-> ssub * MerriweatherSans-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-Sup.fd b/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-Sup.fd
new file mode 100644
index 00000000000..eef4eab37b7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-Sup.fd
@@ -0,0 +1,149 @@
+%% Generated by autoinst on 2019/06/02
+%%
+\ProvidesFile{T1MerriweatherSans-Sup.fd}
+ [2019/06/02 (autoinst) Font definitions for T1/MerriweatherSans-Sup.]
+
+\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax
+ \let\MerriweatherSans@@scale\@empty
+\else
+ \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{MerriweatherSans-Sup}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{regular}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Regular-sup-t1
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{regular}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Italic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{regular}{sl}{
+ <-> ssub * MerriweatherSans-Sup/regular/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{bold}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Bold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{bold}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{bold}{sl}{
+ <-> ssub * MerriweatherSans-Sup/bold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{light}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Light-sup-t1
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{light}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{light}{sl}{
+ <-> ssub * MerriweatherSans-Sup/light/it
+}{}
+
+
+% ---- extrabold ----
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{extrabold}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{extrabold}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{extrabold}{sl}{
+ <-> ssub * MerriweatherSans-Sup/extrabold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% l --> light
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{l}{sl}{
+ <-> ssub * MerriweatherSans-Sup/light/sl
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{l}{n}{
+ <-> ssub * MerriweatherSans-Sup/light/n
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{l}{it}{
+ <-> ssub * MerriweatherSans-Sup/light/it
+}{}
+
+
+% m --> regular
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{m}{sl}{
+ <-> ssub * MerriweatherSans-Sup/regular/sl
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{m}{n}{
+ <-> ssub * MerriweatherSans-Sup/regular/n
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{m}{it}{
+ <-> ssub * MerriweatherSans-Sup/regular/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{b}{sl}{
+ <-> ssub * MerriweatherSans-Sup/bold/sl
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{b}{n}{
+ <-> ssub * MerriweatherSans-Sup/bold/n
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{b}{it}{
+ <-> ssub * MerriweatherSans-Sup/bold/it
+}{}
+
+
+% eb --> extrabold
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{eb}{sl}{
+ <-> ssub * MerriweatherSans-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{eb}{n}{
+ <-> ssub * MerriweatherSans-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{eb}{it}{
+ <-> ssub * MerriweatherSans-Sup/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{bx}{n}{
+ <-> ssub * MerriweatherSans-Sup/b/n
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{bx}{sl}{
+ <-> ssub * MerriweatherSans-Sup/b/sl
+}{}
+
+\DeclareFontShape{T1}{MerriweatherSans-Sup}{bx}{it}{
+ <-> ssub * MerriweatherSans-Sup/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-TLF.fd
deleted file mode 100644
index b0e0be3a0d2..00000000000
--- a/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-TLF.fd
+++ /dev/null
@@ -1,74 +0,0 @@
-%% Generated by autoinst on 2014/01/22
-%%
-\ProvidesFile{T1MerriweatherSans-TLF.fd}
- [2014/01/22 (autoinst) Font definitions for T1/MerriweatherSans-TLF.]
-
-\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax
- \let\MerriweatherSans@@scale\@empty
-\else
- \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{MerriweatherSans-TLF}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-TLF}{l}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Light-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-TLF}{l}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-TLF}{l}{sl}{
- <-> ssub * MerriweatherSans-TLF/l/it
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-TLF}{eb}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-TLF}{eb}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-TLF}{eb}{sl}{
- <-> ssub * MerriweatherSans-TLF/eb/it
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-TLF}{b}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Bold-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-TLF}{b}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-TLF}{b}{sl}{
- <-> ssub * MerriweatherSans-TLF/b/it
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-TLF}{m}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Regular-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-TLF}{m}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Italic-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-TLF}{m}{sl}{
- <-> ssub * MerriweatherSans-TLF/m/it
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-TLF}{bx}{sl}{
- <-> ssub * MerriweatherSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-TLF}{bx}{n}{
- <-> ssub * MerriweatherSans-TLF/b/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-TLF}{bx}{it}{
- <-> ssub * MerriweatherSans-TLF/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd
index 75dd3b220ce..7f86bea703f 100644
--- a/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd
+++ b/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/01/22
+%% Generated by autoinst on 2019/06/02
%%
\ProvidesFile{TS1Merriweather-OsF.fd}
- [2014/01/22 (autoinst) Font definitions for TS1/Merriweather-OsF.]
+ [2019/06/02 (autoinst) Font definitions for TS1/Merriweather-OsF.]
\expandafter\ifx\csname Merriweather@scale\endcsname\relax
\let\Merriweather@@scale\@empty
@@ -11,62 +11,137 @@
\DeclareFontFamily{TS1}{Merriweather-OsF}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{l}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{regular}{n}{
+ <-> \Merriweather@@scale Merriweather-Regular-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{regular}{it}{
+ <-> \Merriweather@@scale Merriweather-Italic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{regular}{sl}{
+ <-> ssub * Merriweather-OsF/regular/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{bold}{n}{
+ <-> \Merriweather@@scale Merriweather-Bold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{bold}{it}{
+ <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{bold}{sl}{
+ <-> ssub * Merriweather-OsF/bold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{light}{n}{
<-> \Merriweather@@scale Merriweather-Light-osf-ts1
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{l}{it}{
+\DeclareFontShape{TS1}{Merriweather-OsF}{light}{it}{
<-> \Merriweather@@scale Merriweather-LightIt-osf-ts1
}{}
+\DeclareFontShape{TS1}{Merriweather-OsF}{light}{sl}{
+ <-> ssub * Merriweather-OsF/light/it
+}{}
+
+
+% ---- ultrabold ----
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{ultrabold}{n}{
+ <-> \Merriweather@@scale Merriweather-UltraBold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{ultrabold}{it}{
+ <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{ultrabold}{sl}{
+ <-> ssub * Merriweather-OsF/ultrabold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% l --> light
+
\DeclareFontShape{TS1}{Merriweather-OsF}{l}{sl}{
- <-> ssub * Merriweather-OsF/l/it
+ <-> ssub * Merriweather-OsF/light/sl
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{b}{n}{
- <-> \Merriweather@@scale Merriweather-Bold-osf-ts1
+\DeclareFontShape{TS1}{Merriweather-OsF}{l}{n}{
+ <-> ssub * Merriweather-OsF/light/n
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{b}{it}{
- <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ts1
+\DeclareFontShape{TS1}{Merriweather-OsF}{l}{it}{
+ <-> ssub * Merriweather-OsF/light/it
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{b}{sl}{
- <-> ssub * Merriweather-OsF/b/it
+
+% m --> regular
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{m}{sl}{
+ <-> ssub * Merriweather-OsF/regular/sl
}{}
\DeclareFontShape{TS1}{Merriweather-OsF}{m}{n}{
- <-> \Merriweather@@scale Merriweather-Regular-osf-ts1
+ <-> ssub * Merriweather-OsF/regular/n
}{}
\DeclareFontShape{TS1}{Merriweather-OsF}{m}{it}{
- <-> \Merriweather@@scale Merriweather-Italic-osf-ts1
+ <-> ssub * Merriweather-OsF/regular/it
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{m}{sl}{
- <-> ssub * Merriweather-OsF/m/it
+
+% b --> bold
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{b}{sl}{
+ <-> ssub * Merriweather-OsF/bold/sl
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{n}{
- <-> \Merriweather@@scale Merriweather-UltraBold-osf-ts1
+\DeclareFontShape{TS1}{Merriweather-OsF}{b}{n}{
+ <-> ssub * Merriweather-OsF/bold/n
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{it}{
- <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ts1
+\DeclareFontShape{TS1}{Merriweather-OsF}{b}{it}{
+ <-> ssub * Merriweather-OsF/bold/it
}{}
+
+% ub --> ultrabold
+
\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{sl}{
- <-> ssub * Merriweather-OsF/ub/it
+ <-> ssub * Merriweather-OsF/ultrabold/sl
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{sl}{
- <-> ssub * Merriweather-OsF/b/sl
+\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{n}{
+ <-> ssub * Merriweather-OsF/ultrabold/n
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{it}{
+ <-> ssub * Merriweather-OsF/ultrabold/it
}{}
\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{n}{
<-> ssub * Merriweather-OsF/b/n
}{}
+\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{sl}{
+ <-> ssub * Merriweather-OsF/b/sl
+}{}
+
\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{it}{
<-> ssub * Merriweather-OsF/b/it
}{}
diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd
new file mode 100644
index 00000000000..26cbcb5cfe6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd
@@ -0,0 +1,149 @@
+%% Generated by autoinst on 2019/06/02
+%%
+\ProvidesFile{TS1MerriweatherSans-OsF.fd}
+ [2019/06/02 (autoinst) Font definitions for TS1/MerriweatherSans-OsF.]
+
+\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax
+ \let\MerriweatherSans@@scale\@empty
+\else
+ \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{MerriweatherSans-OsF}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{regular}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{regular}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{regular}{sl}{
+ <-> ssub * MerriweatherSans-OsF/regular/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bold}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bold}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bold}{sl}{
+ <-> ssub * MerriweatherSans-OsF/bold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{light}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{light}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{light}{sl}{
+ <-> ssub * MerriweatherSans-OsF/light/it
+}{}
+
+
+% ---- extrabold ----
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{extrabold}{n}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{extrabold}{it}{
+ <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{extrabold}{sl}{
+ <-> ssub * MerriweatherSans-OsF/extrabold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% l --> light
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{l}{sl}{
+ <-> ssub * MerriweatherSans-OsF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{l}{n}{
+ <-> ssub * MerriweatherSans-OsF/light/n
+}{}
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{l}{it}{
+ <-> ssub * MerriweatherSans-OsF/light/it
+}{}
+
+
+% m --> regular
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{m}{sl}{
+ <-> ssub * MerriweatherSans-OsF/regular/sl
+}{}
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{m}{n}{
+ <-> ssub * MerriweatherSans-OsF/regular/n
+}{}
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{m}{it}{
+ <-> ssub * MerriweatherSans-OsF/regular/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{b}{sl}{
+ <-> ssub * MerriweatherSans-OsF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{b}{n}{
+ <-> ssub * MerriweatherSans-OsF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{b}{it}{
+ <-> ssub * MerriweatherSans-OsF/bold/it
+}{}
+
+
+% eb --> extrabold
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{eb}{sl}{
+ <-> ssub * MerriweatherSans-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{eb}{n}{
+ <-> ssub * MerriweatherSans-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{eb}{it}{
+ <-> ssub * MerriweatherSans-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bx}{n}{
+ <-> ssub * MerriweatherSans-OsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bx}{sl}{
+ <-> ssub * MerriweatherSans-OsF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bx}{it}{
+ <-> ssub * MerriweatherSans-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-TLF.fd
deleted file mode 100644
index b8a6fdde783..00000000000
--- a/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-TLF.fd
+++ /dev/null
@@ -1,74 +0,0 @@
-%% Generated by autoinst on 2014/01/22
-%%
-\ProvidesFile{TS1MerriweatherSans-TLF.fd}
- [2014/01/22 (autoinst) Font definitions for TS1/MerriweatherSans-TLF.]
-
-\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax
- \let\MerriweatherSans@@scale\@empty
-\else
- \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{MerriweatherSans-TLF}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-TLF}{l}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Light-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-TLF}{l}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-TLF}{l}{sl}{
- <-> ssub * MerriweatherSans-TLF/l/it
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-TLF}{eb}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-TLF}{eb}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-TLF}{eb}{sl}{
- <-> ssub * MerriweatherSans-TLF/eb/it
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-TLF}{b}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Bold-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-TLF}{b}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-TLF}{b}{sl}{
- <-> ssub * MerriweatherSans-TLF/b/it
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-TLF}{m}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Regular-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-TLF}{m}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Italic-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-TLF}{m}{sl}{
- <-> ssub * MerriweatherSans-TLF/m/it
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-TLF}{bx}{sl}{
- <-> ssub * MerriweatherSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-TLF}{bx}{n}{
- <-> ssub * MerriweatherSans-TLF/b/n
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-TLF}{bx}{it}{
- <-> ssub * MerriweatherSans-TLF/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty
index cd4500fb662..231fc152c1b 100644
--- a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty
+++ b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{merriweather}[%
- 2014/01/22 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ]
+ 2019/06/02 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ]
\RequirePackage{ifxetex,ifluatex,textcomp}
@@ -219,14 +219,14 @@
\else % type1
\ifmerriweather@rm
- \ifmerriweather@rmlight\def\mdseries@rm{l}\else\def\mdseries@rm{m}\fi
- \ifmerriweather@rmblack\def\bfseries@rm{ub}\else\def\bfseries@rm{b}\fi
+ \ifmerriweather@rmlight\def\mdseries@rm{light}\else\def\mdseries@rm{regular}\fi
+ \ifmerriweather@rmblack\def\bfseries@rm{ultrabold}\else\def\bfseries@rm{bold}\fi
\else
\def\mdseries@rm{m}\def\bfseries@rm{b}
\fi
\ifmerriweather@sf
- \ifmerriweather@sflight\def\mdseries@sf{l}\else\def\mdseries@sf{m}\fi
- \ifmerriweather@sfblack\def\bfseries@sf{eb}\else\def\bfseries@sf{b}\fi
+ \ifmerriweather@sflight\def\mdseries@sf{light}\else\def\mdseries@sf{regular}\fi
+ \ifmerriweather@sfblack\def\bfseries@sf{extrabold}\else\def\bfseries@sf{bold}\fi
\else
\def\mdseries@sf{m}\def\bfseries@sf{b}
\fi
@@ -234,7 +234,7 @@
\def\merriweatherfamily{Merriweather-OsF}
- \def\merriweathersffamily{MerriweatherSans-TLF}
+ \def\merriweathersffamily{MerriweatherSans-OsF}
\ifmerriweather@rm
\renewcommand*\rmdefault{\merriweatherfamily}
@@ -252,10 +252,10 @@
\newcommand*\merriweather{\fontfamily{\merriweatherfamily}\selectfont}
\newcommand*\merriweathersans{\fontfamily{\merriweathersffamily}\selectfont}
- \newcommand*\merriweatherlight{\fontfamily{\merriweatherfamily}\fontseries{l}\selectfont}
- \newcommand*\merriweathersanslight{\fontfamily{\merriweathersffamily}\fontseries{l}\selectfont}
- \newcommand*\merriweatherblack{\fontfamily{\merriweatherfamily}\fontseries{ub}\selectfont}
- \newcommand*\merriweathersansblack{\fontfamily{\merriweathersffamily}\fontseries{eb}\selectfont}
+ \newcommand*\merriweatherlight{\fontfamily{\merriweatherfamily}\fontseries{light}\selectfont}
+ \newcommand*\merriweathersanslight{\fontfamily{\merriweathersffamily}\fontseries{light}\selectfont}
+ \newcommand*\merriweatherblack{\fontfamily{\merriweatherfamily}\fontseries{ultrabold}\selectfont}
+ \newcommand*\merriweathersansblack{\fontfamily{\merriweathersffamily}\fontseries{extrabold}\selectfont}
\fi