From fb11371c19b57c4115ba465bf2c49afe3bf03be4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 30 Jul 2020 21:15:51 +0000 Subject: merriweather (30jul20) git-svn-id: svn://tug.org/texlive/trunk@55996 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/fonts/merriweather/README | 28 ++-- .../fonts/merriweather/merriweather-samples.pdf | Bin 150055 -> 111135 bytes .../fonts/merriweather/merriweather-samples.tex | 1 + .../fonts/enc/dvips/merriweather/mwthr_3g4t7f.enc | 64 +++++++++ .../fonts/enc/dvips/merriweather/mwthr_44qg5v.enc | 65 +++++++++ .../fonts/enc/dvips/merriweather/mwthr_6upxhe.enc | 63 +++++++++ .../fonts/enc/dvips/merriweather/mwthr_7ytifx.enc | 64 +++++++++ .../fonts/enc/dvips/merriweather/mwthr_clyrx2.enc | 63 +++++++++ .../fonts/enc/dvips/merriweather/mwthr_czxicq.enc | 63 +++++++++ .../fonts/enc/dvips/merriweather/mwthr_hzrl5s.enc | 63 +++++++++ .../fonts/enc/dvips/merriweather/mwthr_iuohxq.enc | 65 +++++++++ .../fonts/enc/dvips/merriweather/mwthr_n7ujmb.enc | 63 +++++++++ .../fonts/enc/dvips/merriweather/mwthr_tvbl63.enc | 65 +++++++++ .../fonts/enc/dvips/merriweather/mwthr_u54ue6.enc | 63 +++++++++ .../fonts/enc/dvips/merriweather/mwthr_vi456v.enc | 65 +++++++++ .../fonts/enc/dvips/merriweather/mwthr_zwbe7j.enc | 64 +++++++++ .../fonts/map/dvips/merriweather/merriweather.map | 153 ++++++++++++++++++++ .../sorkin/merriweather/Merriwthr-Bold-osf-ly1.tfm | Bin 0 -> 1936 bytes .../sorkin/merriweather/Merriwthr-Bold-osf-ot1.tfm | Bin 0 -> 1396 bytes .../merriweather/Merriwthr-Bold-osf-t1--base.tfm | Bin 0 -> 1836 bytes .../sorkin/merriweather/Merriwthr-Bold-osf-t1.tfm | Bin 0 -> 1884 bytes .../merriweather/Merriwthr-Bold-osf-ts1--base.tfm | Bin 0 -> 1412 bytes .../sorkin/merriweather/Merriwthr-Bold-osf-ts1.tfm | Bin 0 -> 1424 bytes .../merriweather/Merriwthr-BoldItalic-osf-ly1.tfm | Bin 0 -> 2036 bytes .../merriweather/Merriwthr-BoldItalic-osf-ot1.tfm | Bin 0 -> 1504 bytes .../Merriwthr-BoldItalic-osf-t1--base.tfm | Bin 0 -> 1980 bytes .../merriweather/Merriwthr-BoldItalic-osf-t1.tfm | Bin 0 -> 2028 bytes .../Merriwthr-BoldItalic-osf-ts1--base.tfm | Bin 0 -> 1412 bytes .../merriweather/Merriwthr-BoldItalic-osf-ts1.tfm | Bin 0 -> 1432 bytes .../merriweather/Merriwthr-Italic-osf-ly1.tfm | Bin 0 -> 1968 bytes .../merriweather/Merriwthr-Italic-osf-ot1.tfm | Bin 0 -> 1452 bytes .../merriweather/Merriwthr-Italic-osf-t1--base.tfm | Bin 0 -> 1924 bytes .../merriweather/Merriwthr-Italic-osf-t1.tfm | Bin 0 -> 1972 bytes .../Merriwthr-Italic-osf-ts1--base.tfm | Bin 0 -> 1400 bytes .../merriweather/Merriwthr-Italic-osf-ts1.tfm | Bin 0 -> 1416 bytes .../merriweather/Merriwthr-Light-osf-ly1.tfm | Bin 0 -> 1900 bytes .../merriweather/Merriwthr-Light-osf-ot1.tfm | Bin 0 -> 1392 bytes .../merriweather/Merriwthr-Light-osf-t1--base.tfm | Bin 0 -> 1812 bytes .../sorkin/merriweather/Merriwthr-Light-osf-t1.tfm | Bin 0 -> 1860 bytes .../merriweather/Merriwthr-Light-osf-ts1--base.tfm | Bin 0 -> 1404 bytes .../merriweather/Merriwthr-Light-osf-ts1.tfm | Bin 0 -> 1416 bytes .../merriweather/Merriwthr-LightIt-osf-ly1.tfm | Bin 0 -> 1928 bytes .../merriweather/Merriwthr-LightIt-osf-ot1.tfm | Bin 0 -> 1428 bytes .../Merriwthr-LightIt-osf-t1--base.tfm | Bin 0 -> 1892 bytes .../merriweather/Merriwthr-LightIt-osf-t1.tfm | Bin 0 -> 1940 bytes .../Merriwthr-LightIt-osf-ts1--base.tfm | Bin 0 -> 1384 bytes .../merriweather/Merriwthr-LightIt-osf-ts1.tfm | Bin 0 -> 1400 bytes .../merriweather/Merriwthr-Regular-osf-ly1.tfm | Bin 0 -> 1924 bytes .../merriweather/Merriwthr-Regular-osf-ot1.tfm | Bin 0 -> 1396 bytes .../Merriwthr-Regular-osf-t1--base.tfm | Bin 0 -> 1836 bytes .../merriweather/Merriwthr-Regular-osf-t1.tfm | Bin 0 -> 1884 bytes .../Merriwthr-Regular-osf-ts1--base.tfm | Bin 0 -> 1412 bytes .../merriweather/Merriwthr-Regular-osf-ts1.tfm | Bin 0 -> 1420 bytes .../merriweather/Merriwthr-UltraBdIt-osf-ly1.tfm | Bin 0 -> 2060 bytes .../merriweather/Merriwthr-UltraBdIt-osf-ot1.tfm | Bin 0 -> 1524 bytes .../Merriwthr-UltraBdIt-osf-t1--base.tfm | Bin 0 -> 2004 bytes .../merriweather/Merriwthr-UltraBdIt-osf-t1.tfm | Bin 0 -> 2052 bytes .../Merriwthr-UltraBdIt-osf-ts1--base.tfm | Bin 0 -> 1420 bytes .../merriweather/Merriwthr-UltraBdIt-osf-ts1.tfm | Bin 0 -> 1440 bytes .../merriweather/Merriwthr-UltraBold-osf-ly1.tfm | Bin 0 -> 1948 bytes .../merriweather/Merriwthr-UltraBold-osf-ot1.tfm | Bin 0 -> 1416 bytes .../Merriwthr-UltraBold-osf-t1--base.tfm | Bin 0 -> 1860 bytes .../merriweather/Merriwthr-UltraBold-osf-t1.tfm | Bin 0 -> 1908 bytes .../Merriwthr-UltraBold-osf-ts1--base.tfm | Bin 0 -> 1412 bytes .../merriweather/Merriwthr-UltraBold-osf-ts1.tfm | Bin 0 -> 1424 bytes .../merriweather/MerriwthrSans-Bold-osf-ly1.tfm | Bin 0 -> 1936 bytes .../merriweather/MerriwthrSans-Bold-osf-ot1.tfm | Bin 0 -> 1428 bytes .../MerriwthrSans-Bold-osf-t1--base.tfm | Bin 0 -> 1840 bytes .../merriweather/MerriwthrSans-Bold-osf-t1.tfm | Bin 0 -> 1908 bytes .../MerriwthrSans-Bold-osf-ts1--base.tfm | Bin 0 -> 1364 bytes .../merriweather/MerriwthrSans-Bold-osf-ts1.tfm | Bin 0 -> 1384 bytes .../merriweather/MerriwthrSans-Bold-sup-ly1.tfm | Bin 0 -> 1840 bytes .../merriweather/MerriwthrSans-Bold-sup-ot1.tfm | Bin 0 -> 1352 bytes .../MerriwthrSans-Bold-sup-t1--base.tfm | Bin 0 -> 1816 bytes .../merriweather/MerriwthrSans-Bold-sup-t1.tfm | Bin 0 -> 1820 bytes .../MerriwthrSans-BoldItalic-osf-ly1.tfm | Bin 0 -> 2048 bytes .../MerriwthrSans-BoldItalic-osf-ot1.tfm | Bin 0 -> 1480 bytes .../MerriwthrSans-BoldItalic-osf-t1--base.tfm | Bin 0 -> 1992 bytes .../MerriwthrSans-BoldItalic-osf-t1.tfm | Bin 0 -> 2060 bytes .../MerriwthrSans-BoldItalic-osf-ts1--base.tfm | Bin 0 -> 1412 bytes .../MerriwthrSans-BoldItalic-osf-ts1.tfm | Bin 0 -> 1428 bytes .../MerriwthrSans-BoldItalic-sup-ly1.tfm | Bin 0 -> 1952 bytes .../MerriwthrSans-BoldItalic-sup-ot1.tfm | Bin 0 -> 1408 bytes .../MerriwthrSans-BoldItalic-sup-t1--base.tfm | Bin 0 -> 1972 bytes .../MerriwthrSans-BoldItalic-sup-t1.tfm | Bin 0 -> 1976 bytes .../MerriwthrSans-ExtraBold-osf-ly1.tfm | Bin 0 -> 1964 bytes .../MerriwthrSans-ExtraBold-osf-ot1.tfm | Bin 0 -> 1444 bytes .../MerriwthrSans-ExtraBold-osf-t1--base.tfm | Bin 0 -> 1856 bytes .../MerriwthrSans-ExtraBold-osf-t1.tfm | Bin 0 -> 1924 bytes .../MerriwthrSans-ExtraBold-osf-ts1--base.tfm | Bin 0 -> 1380 bytes .../MerriwthrSans-ExtraBold-osf-ts1.tfm | Bin 0 -> 1400 bytes .../MerriwthrSans-ExtraBold-sup-ly1.tfm | Bin 0 -> 1868 bytes .../MerriwthrSans-ExtraBold-sup-ot1.tfm | Bin 0 -> 1372 bytes .../MerriwthrSans-ExtraBold-sup-t1--base.tfm | Bin 0 -> 1836 bytes .../MerriwthrSans-ExtraBold-sup-t1.tfm | Bin 0 -> 1840 bytes .../MerriwthrSans-ExtraBoldItalic-osf-ly1.tfm | Bin 0 -> 2084 bytes .../MerriwthrSans-ExtraBoldItalic-osf-ot1.tfm | Bin 0 -> 1512 bytes .../MerriwthrSans-ExtraBoldItalic-osf-t1--base.tfm | Bin 0 -> 2016 bytes .../MerriwthrSans-ExtraBoldItalic-osf-t1.tfm | Bin 0 -> 2084 bytes ...MerriwthrSans-ExtraBoldItalic-osf-ts1--base.tfm | Bin 0 -> 1420 bytes .../MerriwthrSans-ExtraBoldItalic-osf-ts1.tfm | Bin 0 -> 1432 bytes .../MerriwthrSans-ExtraBoldItalic-sup-ly1.tfm | Bin 0 -> 1984 bytes .../MerriwthrSans-ExtraBoldItalic-sup-ot1.tfm | Bin 0 -> 1436 bytes .../MerriwthrSans-ExtraBoldItalic-sup-t1--base.tfm | Bin 0 -> 1992 bytes .../MerriwthrSans-ExtraBoldItalic-sup-t1.tfm | Bin 0 -> 1996 bytes .../merriweather/MerriwthrSans-Italic-osf-ly1.tfm | Bin 0 -> 1936 bytes .../merriweather/MerriwthrSans-Italic-osf-ot1.tfm | Bin 0 -> 1428 bytes .../MerriwthrSans-Italic-osf-t1--base.tfm | Bin 0 -> 1876 bytes .../merriweather/MerriwthrSans-Italic-osf-t1.tfm | Bin 0 -> 1944 bytes .../MerriwthrSans-Italic-osf-ts1--base.tfm | Bin 0 -> 1380 bytes .../merriweather/MerriwthrSans-Italic-osf-ts1.tfm | Bin 0 -> 1396 bytes .../merriweather/MerriwthrSans-Italic-sup-ly1.tfm | Bin 0 -> 1848 bytes .../merriweather/MerriwthrSans-Italic-sup-ot1.tfm | Bin 0 -> 1356 bytes .../MerriwthrSans-Italic-sup-t1--base.tfm | Bin 0 -> 1856 bytes .../merriweather/MerriwthrSans-Italic-sup-t1.tfm | Bin 0 -> 1860 bytes .../merriweather/MerriwthrSans-Light-osf-ly1.tfm | Bin 0 -> 1908 bytes .../merriweather/MerriwthrSans-Light-osf-ot1.tfm | Bin 0 -> 1400 bytes .../MerriwthrSans-Light-osf-t1--base.tfm | Bin 0 -> 1816 bytes .../merriweather/MerriwthrSans-Light-osf-t1.tfm | Bin 0 -> 1884 bytes .../MerriwthrSans-Light-osf-ts1--base.tfm | Bin 0 -> 1364 bytes .../merriweather/MerriwthrSans-Light-osf-ts1.tfm | Bin 0 -> 1384 bytes .../merriweather/MerriwthrSans-Light-sup-ly1.tfm | Bin 0 -> 1812 bytes .../merriweather/MerriwthrSans-Light-sup-ot1.tfm | Bin 0 -> 1324 bytes .../MerriwthrSans-Light-sup-t1--base.tfm | Bin 0 -> 1792 bytes .../merriweather/MerriwthrSans-Light-sup-t1.tfm | Bin 0 -> 1796 bytes .../MerriwthrSans-LightItalic-osf-ly1.tfm | Bin 0 -> 1980 bytes .../MerriwthrSans-LightItalic-osf-ot1.tfm | Bin 0 -> 1452 bytes .../MerriwthrSans-LightItalic-osf-t1--base.tfm | Bin 0 -> 1888 bytes .../MerriwthrSans-LightItalic-osf-t1.tfm | Bin 0 -> 1956 bytes .../MerriwthrSans-LightItalic-osf-ts1--base.tfm | Bin 0 -> 1396 bytes .../MerriwthrSans-LightItalic-osf-ts1.tfm | Bin 0 -> 1408 bytes .../MerriwthrSans-LightItalic-sup-ly1.tfm | Bin 0 -> 1896 bytes .../MerriwthrSans-LightItalic-sup-ot1.tfm | Bin 0 -> 1392 bytes .../MerriwthrSans-LightItalic-sup-t1--base.tfm | Bin 0 -> 1880 bytes .../MerriwthrSans-LightItalic-sup-t1.tfm | Bin 0 -> 1884 bytes .../merriweather/MerriwthrSans-Regular-osf-ly1.tfm | Bin 0 -> 1888 bytes .../merriweather/MerriwthrSans-Regular-osf-ot1.tfm | Bin 0 -> 1396 bytes .../MerriwthrSans-Regular-osf-t1--base.tfm | Bin 0 -> 1792 bytes .../merriweather/MerriwthrSans-Regular-osf-t1.tfm | Bin 0 -> 1860 bytes .../MerriwthrSans-Regular-osf-ts1--base.tfm | Bin 0 -> 1352 bytes .../merriweather/MerriwthrSans-Regular-osf-ts1.tfm | Bin 0 -> 1372 bytes .../merriweather/MerriwthrSans-Regular-sup-ly1.tfm | Bin 0 -> 1792 bytes .../merriweather/MerriwthrSans-Regular-sup-ot1.tfm | Bin 0 -> 1320 bytes .../MerriwthrSans-Regular-sup-t1--base.tfm | Bin 0 -> 1768 bytes .../merriweather/MerriwthrSans-Regular-sup-t1.tfm | Bin 0 -> 1772 bytes .../type1/sorkin/merriweather/Merriwthr-Bold.pfb | Bin 0 -> 130032 bytes .../type1/sorkin/merriweather/Merriwthr-BoldIt.pfb | Bin 0 -> 140757 bytes .../type1/sorkin/merriweather/Merriwthr-Italic.pfb | Bin 0 -> 140571 bytes .../type1/sorkin/merriweather/Merriwthr-Light.pfb | Bin 0 -> 127524 bytes .../sorkin/merriweather/Merriwthr-LightIt.pfb | Bin 0 -> 141029 bytes .../sorkin/merriweather/Merriwthr-Regular.pfb | Bin 0 -> 134279 bytes .../sorkin/merriweather/Merriwthr-UltraBdIt.pfb | Bin 0 -> 140313 bytes .../sorkin/merriweather/Merriwthr-UltraBold.pfb | Bin 0 -> 129903 bytes .../sorkin/merriweather/MerriwthrSans-Bold.pfb | Bin 0 -> 76203 bytes .../merriweather/MerriwthrSans-BoldItalic.pfb | Bin 0 -> 77839 bytes .../sorkin/merriweather/MerriwthrSans-ExBoldIt.pfb | Bin 0 -> 76529 bytes .../merriweather/MerriwthrSans-ExtraBold.pfb | Bin 0 -> 77136 bytes .../sorkin/merriweather/MerriwthrSans-Italic.pfb | Bin 0 -> 75833 bytes .../sorkin/merriweather/MerriwthrSans-Light.pfb | Bin 0 -> 76279 bytes .../merriweather/MerriwthrSans-LightItalic.pfb | Bin 0 -> 78328 bytes .../sorkin/merriweather/MerriwthrSans-Regular.pfb | Bin 0 -> 76519 bytes .../sorkin/merriweather/Merriwthr-Bold-osf-t1.vf | Bin 0 -> 1684 bytes .../sorkin/merriweather/Merriwthr-Bold-osf-ts1.vf | Bin 0 -> 568 bytes .../merriweather/Merriwthr-BoldItalic-osf-t1.vf | Bin 0 -> 1692 bytes .../merriweather/Merriwthr-BoldItalic-osf-ts1.vf | Bin 0 -> 572 bytes .../sorkin/merriweather/Merriwthr-Italic-osf-t1.vf | Bin 0 -> 1688 bytes .../merriweather/Merriwthr-Italic-osf-ts1.vf | Bin 0 -> 568 bytes .../sorkin/merriweather/Merriwthr-Light-osf-t1.vf | Bin 0 -> 1684 bytes .../sorkin/merriweather/Merriwthr-Light-osf-ts1.vf | Bin 0 -> 568 bytes .../merriweather/Merriwthr-LightIt-osf-t1.vf | Bin 0 -> 1688 bytes .../merriweather/Merriwthr-LightIt-osf-ts1.vf | Bin 0 -> 572 bytes .../merriweather/Merriwthr-Regular-osf-t1.vf | Bin 0 -> 1688 bytes .../merriweather/Merriwthr-Regular-osf-ts1.vf | Bin 0 -> 572 bytes .../merriweather/Merriwthr-UltraBdIt-osf-t1.vf | Bin 0 -> 1688 bytes .../merriweather/Merriwthr-UltraBdIt-osf-ts1.vf | Bin 0 -> 572 bytes .../merriweather/Merriwthr-UltraBold-osf-t1.vf | Bin 0 -> 1688 bytes .../merriweather/Merriwthr-UltraBold-osf-ts1.vf | Bin 0 -> 572 bytes .../merriweather/MerriwthrSans-Bold-osf-t1.vf | Bin 0 -> 1720 bytes .../merriweather/MerriwthrSans-Bold-osf-ts1.vf | Bin 0 -> 520 bytes .../merriweather/MerriwthrSans-Bold-sup-t1.vf | Bin 0 -> 1688 bytes .../MerriwthrSans-BoldItalic-osf-t1.vf | Bin 0 -> 1724 bytes .../MerriwthrSans-BoldItalic-osf-ts1.vf | Bin 0 -> 524 bytes .../MerriwthrSans-BoldItalic-sup-t1.vf | Bin 0 -> 1696 bytes .../merriweather/MerriwthrSans-ExtraBold-osf-t1.vf | Bin 0 -> 1724 bytes .../MerriwthrSans-ExtraBold-osf-ts1.vf | Bin 0 -> 524 bytes .../merriweather/MerriwthrSans-ExtraBold-sup-t1.vf | Bin 0 -> 1692 bytes .../MerriwthrSans-ExtraBoldItalic-osf-t1.vf | Bin 0 -> 1728 bytes .../MerriwthrSans-ExtraBoldItalic-osf-ts1.vf | Bin 0 -> 532 bytes .../MerriwthrSans-ExtraBoldItalic-sup-t1.vf | Bin 0 -> 1700 bytes .../merriweather/MerriwthrSans-Italic-osf-t1.vf | Bin 0 -> 1720 bytes .../merriweather/MerriwthrSans-Italic-osf-ts1.vf | Bin 0 -> 520 bytes .../merriweather/MerriwthrSans-Italic-sup-t1.vf | Bin 0 -> 1692 bytes .../merriweather/MerriwthrSans-Light-osf-t1.vf | Bin 0 -> 1720 bytes .../merriweather/MerriwthrSans-Light-osf-ts1.vf | Bin 0 -> 520 bytes .../merriweather/MerriwthrSans-Light-sup-t1.vf | Bin 0 -> 1688 bytes .../MerriwthrSans-LightItalic-osf-t1.vf | Bin 0 -> 1724 bytes .../MerriwthrSans-LightItalic-osf-ts1.vf | Bin 0 -> 528 bytes .../MerriwthrSans-LightItalic-sup-t1.vf | Bin 0 -> 1696 bytes .../merriweather/MerriwthrSans-Regular-osf-t1.vf | Bin 0 -> 1720 bytes .../merriweather/MerriwthrSans-Regular-osf-ts1.vf | Bin 0 -> 524 bytes .../merriweather/MerriwthrSans-Regular-sup-t1.vf | Bin 0 -> 1692 bytes .../tex/latex/merriweather/LY1Merriwthr-OsF.fd | 157 +++++++++++++++++++++ .../tex/latex/merriweather/LY1MerriwthrSans-OsF.fd | 157 +++++++++++++++++++++ .../tex/latex/merriweather/LY1MerriwthrSans-Sup.fd | 157 +++++++++++++++++++++ .../tex/latex/merriweather/OT1Merriwthr-OsF.fd | 157 +++++++++++++++++++++ .../tex/latex/merriweather/OT1MerriwthrSans-OsF.fd | 157 +++++++++++++++++++++ .../tex/latex/merriweather/OT1MerriwthrSans-Sup.fd | 157 +++++++++++++++++++++ .../tex/latex/merriweather/T1Merriwthr-OsF.fd | 157 +++++++++++++++++++++ .../tex/latex/merriweather/T1MerriwthrSans-OsF.fd | 157 +++++++++++++++++++++ .../tex/latex/merriweather/T1MerriwthrSans-Sup.fd | 157 +++++++++++++++++++++ .../tex/latex/merriweather/TS1Merriwthr-OsF.fd | 157 +++++++++++++++++++++ .../tex/latex/merriweather/TS1MerriwthrSans-OsF.fd | 157 +++++++++++++++++++++ .../tex/latex/merriweather/merriweather.sty | 70 +++++++-- 213 files changed, 2790 insertions(+), 19 deletions(-) create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_3g4t7f.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_44qg5v.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_6upxhe.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_7ytifx.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_clyrx2.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_czxicq.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_hzrl5s.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_iuohxq.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_n7ujmb.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_tvbl63.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_u54ue6.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_vi456v.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_zwbe7j.enc create mode 100644 Master/texmf-dist/fonts/map/dvips/merriweather/merriweather.map create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Bold-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Bold-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Bold-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Bold-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Bold-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Bold-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-BoldItalic-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-BoldItalic-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-BoldItalic-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-BoldItalic-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-BoldItalic-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-BoldItalic-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Italic-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Italic-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Italic-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Italic-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Italic-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Italic-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Light-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Light-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Light-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Light-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Light-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Light-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-LightIt-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-LightIt-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-LightIt-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-LightIt-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-LightIt-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-LightIt-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Regular-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Regular-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Regular-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Regular-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Regular-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Regular-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBdIt-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBdIt-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBdIt-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBdIt-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBdIt-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBdIt-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBold-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBold-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBold-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBold-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBold-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBold-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-sup-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-sup-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-sup-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-sup-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-sup-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-sup-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-sup-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-sup-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-sup-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-sup-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-sup-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-sup-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-sup-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-sup-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-sup-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-sup-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-sup-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-sup-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-sup-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-sup-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-sup-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-sup-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-sup-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-sup-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-sup-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-sup-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-sup-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-sup-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-sup-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-sup-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-sup-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-sup-t1.tfm create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriwthr-Bold.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriwthr-BoldIt.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriwthr-Italic.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriwthr-Light.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriwthr-LightIt.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriwthr-Regular.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriwthr-UltraBdIt.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriwthr-UltraBold.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriwthrSans-Bold.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriwthrSans-BoldItalic.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriwthrSans-ExBoldIt.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriwthrSans-ExtraBold.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriwthrSans-Italic.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriwthrSans-Light.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriwthrSans-LightItalic.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriwthrSans-Regular.pfb create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-Bold-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-Bold-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-BoldItalic-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-BoldItalic-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-Italic-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-Italic-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-Light-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-Light-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-LightIt-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-LightIt-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-Regular-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-Regular-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-UltraBdIt-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-UltraBdIt-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-UltraBold-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-UltraBold-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Bold-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Bold-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Bold-sup-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-BoldItalic-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-BoldItalic-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-BoldItalic-sup-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-ExtraBold-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-ExtraBold-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-ExtraBold-sup-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-sup-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Italic-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Italic-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Italic-sup-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Light-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Light-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Light-sup-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-LightItalic-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-LightItalic-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-LightItalic-sup-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Regular-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Regular-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Regular-sup-t1.vf create mode 100644 Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-OsF.fd create mode 100644 Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-OsF.fd create mode 100644 Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-Sup.fd create mode 100644 Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-OsF.fd create mode 100644 Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-OsF.fd create mode 100644 Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-Sup.fd create mode 100644 Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-OsF.fd create mode 100644 Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-OsF.fd create mode 100644 Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-Sup.fd create mode 100644 Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-OsF.fd create mode 100644 Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-OsF.fd (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/fonts/merriweather/README b/Master/texmf-dist/doc/fonts/merriweather/README index bb7905531d9..5f1b0336a8d 100644 --- a/Master/texmf-dist/doc/fonts/merriweather/README +++ b/Master/texmf-dist/doc/fonts/merriweather/README @@ -1,8 +1,8 @@ -This is the README for the merriweather package, version 2020-07-24. +This is the README for the merriweather package, version 2020-07-30. -This package provides the Merriweather and MerriweatherSans -families of fonts, designed by Eben Sorkin, for use with -luaLaTeX and xeLaTeX. +This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for +the Merriweather and MerriweatherSans families of fonts, designed by +Eben Sorkin. Merriweather features a very large x height, slightly condensed letterforms, a mild diagonal stress, sturdy serifs and open forms. @@ -14,7 +14,8 @@ file "tex-archive"/install/fonts/merriweather.tds.zip, where the preferred URL for "tex-archive" is http://mirror.ctan.org. Unzip the archive at the root of an appropriate texmf tree, likely a personal or local tree. If necessary, update the file-name database -(e.g., texhash). +(e.g., texhash). Update the font-map files by enabling the Map file +merriweather.map. To use, add @@ -41,6 +42,9 @@ Options light, rmlight, sflight, black, rmblack, and sfblack choose the light or heavy weights instead of the regular and bold weights, respectively, for both or single families. +LuaLaTeX and xeLaTeX users who might prefer type1 fonts or who wish +to avoid fontspec may use the type1 option. + Options scaled= or scale= may be used to scale the MerriweatherSans fonts; the serifed variants are not affected. @@ -49,11 +53,15 @@ and MerriweatherSans families, respectively. Commands \merriweatherlight, \merriweatherblack, \merriweathersanslight, and \merriweathersansblack allow for localized use of light or black variants. -The only figure style supported is proportional semi-oldstyle. +The only figure style supported is proportional semi-oldstyle. Font +encodings supported are OT1, T1, LY1 and TS1. -The fonts are available at http://www.google.com/webfonts -and are licensed under the SIL Open Font License, (version -1.1); the text may be found in the doc directory. The rest -of the package is licensed under the terms of the LaTeX +The original fonts are available at +http://www.google.com/webfonts and are licensed under the +SIL Open Font License, (version 1.1); the text may be found +in the doc directory. The type1 versions were created using +fontforge and re-named in compliance with the Reserved +Font Name provision. The support files were created using +autoinst and are licensed under the terms of the LaTeX Project Public License. The maintainer of this package is Bob Tennent (rdt at cs.queensu.ca) diff --git a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf index 45065c109bc..4ac91da309a 100644 Binary files a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf and b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf differ diff --git a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex index 73ed7c3a360..454003f1165 100644 --- a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex +++ b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex @@ -1,4 +1,5 @@ \documentclass{article} +\usepackage[T1]{fontenc} \usepackage{merriweather} \usepackage{lipsum} \begin{document} diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_3g4t7f.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_3g4t7f.enc new file mode 100644 index 00000000000..23e296c33c3 --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_3g4t7f.enc @@ -0,0 +1,64 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_3g4t7fcjh3tc6ptea3fgbusogg +% Encoding created by otftotfm on Thu Jul 30 08:43:50 2020 +% Command line follows encoding +/AutoEnc_3g4t7fcjh3tc6ptea3fgbusogg [ +%00 + /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek + /.notdef /.notdef /zerowidthnonjoiner /.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 /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 +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map +% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=sups --ligkern=* {KL} * MerriwthrSans-BoldItalic.ttf +% MerriwthrSans-BoldItalic-sup-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_44qg5v.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_44qg5v.enc new file mode 100644 index 00000000000..c2107a40cb9 --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_44qg5v.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_44qg5voi43tymivsufwnvthinh +% Encoding created by otftotfm on Thu Jul 30 08:43:51 2020 +% Command line follows encoding +/AutoEnc_44qg5voi43tymivsufwnvthinh [ +%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 /one /two /three /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 +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map +% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl MerriwthrSans-Bold.ttf +% MerriwthrSans-Bold-osf-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_6upxhe.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_6upxhe.enc new file mode 100644 index 00000000000..d606c690ad6 --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_6upxhe.enc @@ -0,0 +1,63 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_6upxhe2m74q2iptst22s37sn3e +% Encoding created by otftotfm on Thu Jul 30 08:43:35 2020 +% Command line follows encoding +/AutoEnc_6upxhe2m74q2iptst22s37sn3e [ +%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 /one /two /three /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 +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap +% --no-type1 --coding-scheme=TEX TEXT Merriwthr-BoldIt.ttf +% Merriwthr-BoldItalic-osf-ot1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_7ytifx.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_7ytifx.enc new file mode 100644 index 00000000000..bed0d440dce --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_7ytifx.enc @@ -0,0 +1,64 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb +% Encoding created by otftotfm on Thu Jul 30 08:43:50 2020 +% 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 +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map +% --no-updmap --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --feature=sups --ligkern=* {KL} * MerriwthrSans-BoldItalic.ttf +% MerriwthrSans-BoldItalic-sup-t1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_clyrx2.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_clyrx2.enc new file mode 100644 index 00000000000..59e7895bd97 --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_clyrx2.enc @@ -0,0 +1,63 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe +% Encoding created by otftotfm on Thu Jul 30 08:43:35 2020 +% Command line follows encoding +/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 /.notdef /.notdef /.notdef /.notdef /.notdef +%20 + /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 + /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 +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap +% --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% Merriwthr-BoldIt.ttf Merriwthr-BoldItalic-osf-t1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_czxicq.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_czxicq.enc new file mode 100644 index 00000000000..69656bea24a --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_czxicq.enc @@ -0,0 +1,63 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_czxicqvoi7gergm2nqp7s2dfph +% Encoding created by otftotfm on Thu Jul 30 08:43:50 2020 +% 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 +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map +% --no-updmap --no-type1 --coding-scheme=TEX TEXT --feature=sups --ligkern=* +% {KL} * MerriwthrSans-BoldItalic.ttf MerriwthrSans-BoldItalic-sup-ot1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_hzrl5s.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_hzrl5s.enc new file mode 100644 index 00000000000..b6ad3b8a222 --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_hzrl5s.enc @@ -0,0 +1,63 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_hzrl5scqns2jtblgadawedqwjb +% Encoding created by otftotfm on Thu Jul 30 08:43:35 2020 +% Command line follows encoding +/AutoEnc_hzrl5scqns2jtblgadawedqwjb [ +%00 + /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek + /.notdef /.notdef /zerowidthnonjoiner /.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 /quotedbl /numbersign /dollar /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero /one /two /three /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 /two.superior /three.superior /acute /mu /paragraph /periodcentered + /cedilla /one.superior /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 +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap +% --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% Merriwthr-BoldIt.ttf Merriwthr-BoldItalic-osf-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_iuohxq.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_iuohxq.enc new file mode 100644 index 00000000000..1d79aeb94ce --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_iuohxq.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_iuohxqr2qb6k5t77legm5nsxle +% Encoding created by otftotfm on Thu Jul 30 08:43:50 2020 +% Command line follows encoding +/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 + /f_f /dotlessi /dotlessj /f_i /f_l /f_f_i /f_f_l /.notdef +%20 + /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 + /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 +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map +% --no-updmap --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl MerriwthrSans-BoldItalic.ttf +% MerriwthrSans-BoldItalic-osf-t1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_n7ujmb.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_n7ujmb.enc new file mode 100644 index 00000000000..b57e6479e04 --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_n7ujmb.enc @@ -0,0 +1,63 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_n7ujmbrloaigamcc6xrat5ctxd +% Encoding created by otftotfm on Thu Jul 30 08:43:51 2020 +% Command line follows encoding +/AutoEnc_n7ujmbrloaigamcc6xrat5ctxd [ +%00 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk +%10 + /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef +%20 + /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle + /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction +%30 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef +%40 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%50 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%60 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%70 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%80 + /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand + /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark + /.notdef /.notdef /.notdef /afii61352 /.notdef /estimated /.notdef /.notdef +%A0 + /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section + /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef +%B0 + /degree /plusminus /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered + /.notdef /onesuperior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro +%C0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%D0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.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 /divide /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ts1 +% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather +% --vf-directory=texmf/fonts/vf/sorkin/merriweather +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map +% --no-updmap --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 +% MerriwthrSans-BoldItalic.ttf MerriwthrSans-BoldItalic-osf-ts1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_tvbl63.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_tvbl63.enc new file mode 100644 index 00000000000..c16d6c1324b --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_tvbl63.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb +% Encoding created by otftotfm on Thu Jul 30 08:43:50 2020 +% Command line follows encoding +/AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb [ +%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 /one /two /three /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 + /f_f /f_i /f_l /f_f_i /f_f_l /.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 +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map +% --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 MerriwthrSans-BoldItalic.ttf +% MerriwthrSans-BoldItalic-osf-ot1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_u54ue6.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_u54ue6.enc new file mode 100644 index 00000000000..86d40997fd4 --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_u54ue6.enc @@ -0,0 +1,63 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_u54ue6qvmldocqxmqypta3d4nc +% Encoding created by otftotfm on Thu Jul 30 08:43:35 2020 +% Command line follows encoding +/AutoEnc_u54ue6qvmldocqxmqypta3d4nc [ +%00 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk +%10 + /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef + /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef +%20 + /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle + /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction +%30 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef +%40 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%50 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown +%60 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%70 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%80 + /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand + /bullet /.notdef /.notdef /.notdef /florin /colonmonetary /won /.notdef +%90 + /.notdef /.notdef /lira /.notdef /.notdef /.notdef /dong /trademark + /.notdef /.notdef /.notdef /afii61352 /.notdef /estimated /.notdef /.notdef +%A0 + /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section + /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef +%B0 + /degree /plusminus /two.superior /three.superior /.notdef /mu /paragraph /periodcentered + /.notdef /one.superior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro +%C0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%D0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.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 /divide /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ts1 +% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather +% --vf-directory=texmf/fonts/vf/sorkin/merriweather +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap +% --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 +% Merriwthr-BoldIt.ttf Merriwthr-BoldItalic-osf-ts1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_vi456v.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_vi456v.enc new file mode 100644 index 00000000000..0984ed35e79 --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_vi456v.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_vi456vknjkllfjnxu4s533uuwe +% Encoding created by otftotfm on Thu Jul 30 08:43:50 2020 +% Command line follows encoding +/AutoEnc_vi456vknjkllfjnxu4s533uuwe [ +%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 /one /two /three /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 +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map +% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl MerriwthrSans-BoldItalic.ttf +% MerriwthrSans-BoldItalic-osf-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_zwbe7j.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_zwbe7j.enc new file mode 100644 index 00000000000..5a8e41edea3 --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwthr_zwbe7j.enc @@ -0,0 +1,64 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_zwbe7jlcvl2wsktttm4zndfryf +% Encoding created by otftotfm on Thu Jul 30 08:43:51 2020 +% Command line follows encoding +/AutoEnc_zwbe7jlcvl2wsktttm4zndfryf [ +%00 + /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek + /.notdef /.notdef /zerowidthnonjoiner /.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 /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 +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map +% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=sups --ligkern=* {KL} * MerriwthrSans-Bold.ttf +% MerriwthrSans-Bold-sup-ly1' diff --git a/Master/texmf-dist/fonts/map/dvips/merriweather/merriweather.map b/Master/texmf-dist/fonts/map/dvips/merriweather/merriweather.map new file mode 100644 index 00000000000..b4176d3e06a --- /dev/null +++ b/Master/texmf-dist/fonts/map/dvips/merriweather/merriweather.map @@ -0,0 +1,153 @@ + +% Automatically maintained by otftotfm or other programs. Do not edit. + +Merriwthr-BoldItalic-osf-ot1 Merriwthr-BoldItalic "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwthr_6upxhe.enc \Merriwthr@@scale Merriwthr-Regular-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{it}{ + <-> \Merriwthr@@scale Merriwthr-Italic-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{sl}{ + <-> ssub * Merriwthr-OsF/regular/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{n}{ + <-> \Merriwthr@@scale Merriwthr-Bold-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{it}{ + <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{sl}{ + <-> ssub * Merriwthr-OsF/bold/it +}{} + + +% ---- light ---- + +\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{n}{ + <-> \Merriwthr@@scale Merriwthr-Light-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{it}{ + <-> \Merriwthr@@scale Merriwthr-LightIt-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{sl}{ + <-> ssub * Merriwthr-OsF/light/it +}{} + + +% ---- ultrabold ---- + +\DeclareFontShape{LY1}{Merriwthr-OsF}{ultrabold}{n}{ + <-> \Merriwthr@@scale Merriwthr-UltraBold-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Merriwthr-OsF}{ultrabold}{it}{ + <-> \Merriwthr@@scale Merriwthr-UltraBdIt-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Merriwthr-OsF}{ultrabold}{sl}{ + <-> ssub * Merriwthr-OsF/ultrabold/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% l --> light + +\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{sl}{ + <-> alias * Merriwthr-OsF/light/sl +}{} + +\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{n}{ + <-> alias * Merriwthr-OsF/light/n +}{} + +\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{it}{ + <-> alias * Merriwthr-OsF/light/it +}{} + + +% m --> regular + +\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{sl}{ + <-> alias * Merriwthr-OsF/regular/sl +}{} + +\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{n}{ + <-> alias * Merriwthr-OsF/regular/n +}{} + +\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{it}{ + <-> alias * Merriwthr-OsF/regular/it +}{} + + +% b --> bold + +\DeclareFontShape{LY1}{Merriwthr-OsF}{b}{sl}{ + <-> alias * Merriwthr-OsF/bold/sl +}{} + +\DeclareFontShape{LY1}{Merriwthr-OsF}{b}{n}{ + <-> alias * Merriwthr-OsF/bold/n +}{} + +\DeclareFontShape{LY1}{Merriwthr-OsF}{b}{it}{ + <-> alias * Merriwthr-OsF/bold/it +}{} + + +% ub --> ultrabold + +\DeclareFontShape{LY1}{Merriwthr-OsF}{ub}{sl}{ + <-> alias * Merriwthr-OsF/ultrabold/sl +}{} + +\DeclareFontShape{LY1}{Merriwthr-OsF}{ub}{n}{ + <-> alias * Merriwthr-OsF/ultrabold/n +}{} + +\DeclareFontShape{LY1}{Merriwthr-OsF}{ub}{it}{ + <-> alias * Merriwthr-OsF/ultrabold/it +}{} + +\DeclareFontShape{LY1}{Merriwthr-OsF}{bx}{n}{ + <-> ssub * Merriwthr-OsF/b/n +}{} + +\DeclareFontShape{LY1}{Merriwthr-OsF}{bx}{sl}{ + <-> ssub * Merriwthr-OsF/b/sl +}{} + +\DeclareFontShape{LY1}{Merriwthr-OsF}{bx}{it}{ + <-> ssub * Merriwthr-OsF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-OsF.fd new file mode 100644 index 00000000000..d29d07c99e6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-OsF.fd @@ -0,0 +1,157 @@ +%% Generated by autoinst on 2020/07/30 +%% +\ProvidesFile{LY1MerriwthrSans-OsF.fd} + [2020/07/30 (autoinst) Font definitions for LY1/MerriwthrSans-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax + \let\MerriwthrSans@@scale\@empty +\else + \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{MerriwthrSans-OsF}{} + + +% ---- regular ---- + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{regular}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Regular-osf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{regular}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{regular}{sl}{ + <-> ssub * MerriwthrSans-OsF/regular/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{sl}{ + <-> ssub * MerriwthrSans-OsF/bold/it +}{} + + +% ---- light ---- + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{sl}{ + <-> ssub * MerriwthrSans-OsF/light/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{sl}{ + <-> ssub * MerriwthrSans-OsF/extrabold/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% l --> light + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{sl}{ + <-> alias * MerriwthrSans-OsF/light/sl +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{n}{ + <-> alias * MerriwthrSans-OsF/light/n +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{it}{ + <-> alias * MerriwthrSans-OsF/light/it +}{} + + +% m --> regular + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{sl}{ + <-> alias * MerriwthrSans-OsF/regular/sl +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{n}{ + <-> alias * MerriwthrSans-OsF/regular/n +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{it}{ + <-> alias * MerriwthrSans-OsF/regular/it +}{} + + +% b --> bold + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{sl}{ + <-> alias * MerriwthrSans-OsF/bold/sl +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{n}{ + <-> alias * MerriwthrSans-OsF/bold/n +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{it}{ + <-> alias * MerriwthrSans-OsF/bold/it +}{} + + +% eb --> extrabold + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{sl}{ + <-> alias * MerriwthrSans-OsF/extrabold/sl +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{n}{ + <-> alias * MerriwthrSans-OsF/extrabold/n +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{it}{ + <-> alias * MerriwthrSans-OsF/extrabold/it +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bx}{n}{ + <-> ssub * MerriwthrSans-OsF/b/n +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bx}{sl}{ + <-> ssub * MerriwthrSans-OsF/b/sl +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bx}{it}{ + <-> ssub * MerriwthrSans-OsF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-Sup.fd b/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-Sup.fd new file mode 100644 index 00000000000..f17c9b867dc --- /dev/null +++ b/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-Sup.fd @@ -0,0 +1,157 @@ +%% Generated by autoinst on 2020/07/30 +%% +\ProvidesFile{LY1MerriwthrSans-Sup.fd} + [2020/07/30 (autoinst) Font definitions for LY1/MerriwthrSans-Sup.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax + \let\MerriwthrSans@@scale\@empty +\else + \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{MerriwthrSans-Sup}{} + + +% ---- regular ---- + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{regular}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Regular-sup-ly1 +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{regular}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Italic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{regular}{sl}{ + <-> ssub * MerriwthrSans-Sup/regular/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bold}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Bold-sup-ly1 +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bold}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bold}{sl}{ + <-> ssub * MerriwthrSans-Sup/bold/it +}{} + + +% ---- light ---- + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{light}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Light-sup-ly1 +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{light}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{light}{sl}{ + <-> ssub * MerriwthrSans-Sup/light/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{extrabold}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-sup-ly1 +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{extrabold}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{extrabold}{sl}{ + <-> ssub * MerriwthrSans-Sup/extrabold/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% l --> light + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{l}{sl}{ + <-> alias * MerriwthrSans-Sup/light/sl +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{l}{n}{ + <-> alias * MerriwthrSans-Sup/light/n +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{l}{it}{ + <-> alias * MerriwthrSans-Sup/light/it +}{} + + +% m --> regular + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{m}{sl}{ + <-> alias * MerriwthrSans-Sup/regular/sl +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{m}{n}{ + <-> alias * MerriwthrSans-Sup/regular/n +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{m}{it}{ + <-> alias * MerriwthrSans-Sup/regular/it +}{} + + +% b --> bold + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{b}{sl}{ + <-> alias * MerriwthrSans-Sup/bold/sl +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{b}{n}{ + <-> alias * MerriwthrSans-Sup/bold/n +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{b}{it}{ + <-> alias * MerriwthrSans-Sup/bold/it +}{} + + +% eb --> extrabold + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{eb}{sl}{ + <-> alias * MerriwthrSans-Sup/extrabold/sl +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{eb}{n}{ + <-> alias * MerriwthrSans-Sup/extrabold/n +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{eb}{it}{ + <-> alias * MerriwthrSans-Sup/extrabold/it +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bx}{n}{ + <-> ssub * MerriwthrSans-Sup/b/n +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bx}{sl}{ + <-> ssub * MerriwthrSans-Sup/b/sl +}{} + +\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bx}{it}{ + <-> ssub * MerriwthrSans-Sup/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-OsF.fd new file mode 100644 index 00000000000..e6c211f1e7d --- /dev/null +++ b/Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-OsF.fd @@ -0,0 +1,157 @@ +%% Generated by autoinst on 2020/07/30 +%% +\ProvidesFile{OT1Merriwthr-OsF.fd} + [2020/07/30 (autoinst) Font definitions for OT1/Merriwthr-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname Merriwthr@scale\endcsname\relax + \let\Merriwthr@@scale\@empty +\else + \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{Merriwthr-OsF}{} + + +% ---- regular ---- + +\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{n}{ + <-> \Merriwthr@@scale Merriwthr-Regular-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{it}{ + <-> \Merriwthr@@scale Merriwthr-Italic-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{sl}{ + <-> ssub * Merriwthr-OsF/regular/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{n}{ + <-> \Merriwthr@@scale Merriwthr-Bold-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{it}{ + <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{sl}{ + <-> ssub * Merriwthr-OsF/bold/it +}{} + + +% ---- light ---- + +\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{n}{ + <-> \Merriwthr@@scale Merriwthr-Light-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{it}{ + <-> \Merriwthr@@scale Merriwthr-LightIt-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{sl}{ + <-> ssub * Merriwthr-OsF/light/it +}{} + + +% ---- ultrabold ---- + +\DeclareFontShape{OT1}{Merriwthr-OsF}{ultrabold}{n}{ + <-> \Merriwthr@@scale Merriwthr-UltraBold-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Merriwthr-OsF}{ultrabold}{it}{ + <-> \Merriwthr@@scale Merriwthr-UltraBdIt-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Merriwthr-OsF}{ultrabold}{sl}{ + <-> ssub * Merriwthr-OsF/ultrabold/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% l --> light + +\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{sl}{ + <-> alias * Merriwthr-OsF/light/sl +}{} + +\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{n}{ + <-> alias * Merriwthr-OsF/light/n +}{} + +\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{it}{ + <-> alias * Merriwthr-OsF/light/it +}{} + + +% m --> regular + +\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{sl}{ + <-> alias * Merriwthr-OsF/regular/sl +}{} + +\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{n}{ + <-> alias * Merriwthr-OsF/regular/n +}{} + +\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{it}{ + <-> alias * Merriwthr-OsF/regular/it +}{} + + +% b --> bold + +\DeclareFontShape{OT1}{Merriwthr-OsF}{b}{sl}{ + <-> alias * Merriwthr-OsF/bold/sl +}{} + +\DeclareFontShape{OT1}{Merriwthr-OsF}{b}{n}{ + <-> alias * Merriwthr-OsF/bold/n +}{} + +\DeclareFontShape{OT1}{Merriwthr-OsF}{b}{it}{ + <-> alias * Merriwthr-OsF/bold/it +}{} + + +% ub --> ultrabold + +\DeclareFontShape{OT1}{Merriwthr-OsF}{ub}{sl}{ + <-> alias * Merriwthr-OsF/ultrabold/sl +}{} + +\DeclareFontShape{OT1}{Merriwthr-OsF}{ub}{n}{ + <-> alias * Merriwthr-OsF/ultrabold/n +}{} + +\DeclareFontShape{OT1}{Merriwthr-OsF}{ub}{it}{ + <-> alias * Merriwthr-OsF/ultrabold/it +}{} + +\DeclareFontShape{OT1}{Merriwthr-OsF}{bx}{n}{ + <-> ssub * Merriwthr-OsF/b/n +}{} + +\DeclareFontShape{OT1}{Merriwthr-OsF}{bx}{sl}{ + <-> ssub * Merriwthr-OsF/b/sl +}{} + +\DeclareFontShape{OT1}{Merriwthr-OsF}{bx}{it}{ + <-> ssub * Merriwthr-OsF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-OsF.fd new file mode 100644 index 00000000000..1464a5e0c73 --- /dev/null +++ b/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-OsF.fd @@ -0,0 +1,157 @@ +%% Generated by autoinst on 2020/07/30 +%% +\ProvidesFile{OT1MerriwthrSans-OsF.fd} + [2020/07/30 (autoinst) Font definitions for OT1/MerriwthrSans-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax + \let\MerriwthrSans@@scale\@empty +\else + \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{MerriwthrSans-OsF}{} + + +% ---- regular ---- + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{regular}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Regular-osf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{regular}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{regular}{sl}{ + <-> ssub * MerriwthrSans-OsF/regular/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{sl}{ + <-> ssub * MerriwthrSans-OsF/bold/it +}{} + + +% ---- light ---- + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{sl}{ + <-> ssub * MerriwthrSans-OsF/light/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{sl}{ + <-> ssub * MerriwthrSans-OsF/extrabold/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% l --> light + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{sl}{ + <-> alias * MerriwthrSans-OsF/light/sl +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{n}{ + <-> alias * MerriwthrSans-OsF/light/n +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{it}{ + <-> alias * MerriwthrSans-OsF/light/it +}{} + + +% m --> regular + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{sl}{ + <-> alias * MerriwthrSans-OsF/regular/sl +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{n}{ + <-> alias * MerriwthrSans-OsF/regular/n +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{it}{ + <-> alias * MerriwthrSans-OsF/regular/it +}{} + + +% b --> bold + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{sl}{ + <-> alias * MerriwthrSans-OsF/bold/sl +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{n}{ + <-> alias * MerriwthrSans-OsF/bold/n +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{it}{ + <-> alias * MerriwthrSans-OsF/bold/it +}{} + + +% eb --> extrabold + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{sl}{ + <-> alias * MerriwthrSans-OsF/extrabold/sl +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{n}{ + <-> alias * MerriwthrSans-OsF/extrabold/n +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{it}{ + <-> alias * MerriwthrSans-OsF/extrabold/it +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bx}{n}{ + <-> ssub * MerriwthrSans-OsF/b/n +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bx}{sl}{ + <-> ssub * MerriwthrSans-OsF/b/sl +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bx}{it}{ + <-> ssub * MerriwthrSans-OsF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-Sup.fd b/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-Sup.fd new file mode 100644 index 00000000000..5542aa6451c --- /dev/null +++ b/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-Sup.fd @@ -0,0 +1,157 @@ +%% Generated by autoinst on 2020/07/30 +%% +\ProvidesFile{OT1MerriwthrSans-Sup.fd} + [2020/07/30 (autoinst) Font definitions for OT1/MerriwthrSans-Sup.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax + \let\MerriwthrSans@@scale\@empty +\else + \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{MerriwthrSans-Sup}{} + + +% ---- regular ---- + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{regular}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Regular-sup-ot1 +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{regular}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Italic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{regular}{sl}{ + <-> ssub * MerriwthrSans-Sup/regular/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bold}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Bold-sup-ot1 +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bold}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bold}{sl}{ + <-> ssub * MerriwthrSans-Sup/bold/it +}{} + + +% ---- light ---- + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{light}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Light-sup-ot1 +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{light}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{light}{sl}{ + <-> ssub * MerriwthrSans-Sup/light/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{extrabold}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-sup-ot1 +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{extrabold}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{extrabold}{sl}{ + <-> ssub * MerriwthrSans-Sup/extrabold/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% l --> light + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{l}{sl}{ + <-> alias * MerriwthrSans-Sup/light/sl +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{l}{n}{ + <-> alias * MerriwthrSans-Sup/light/n +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{l}{it}{ + <-> alias * MerriwthrSans-Sup/light/it +}{} + + +% m --> regular + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{m}{sl}{ + <-> alias * MerriwthrSans-Sup/regular/sl +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{m}{n}{ + <-> alias * MerriwthrSans-Sup/regular/n +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{m}{it}{ + <-> alias * MerriwthrSans-Sup/regular/it +}{} + + +% b --> bold + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{b}{sl}{ + <-> alias * MerriwthrSans-Sup/bold/sl +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{b}{n}{ + <-> alias * MerriwthrSans-Sup/bold/n +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{b}{it}{ + <-> alias * MerriwthrSans-Sup/bold/it +}{} + + +% eb --> extrabold + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{eb}{sl}{ + <-> alias * MerriwthrSans-Sup/extrabold/sl +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{eb}{n}{ + <-> alias * MerriwthrSans-Sup/extrabold/n +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{eb}{it}{ + <-> alias * MerriwthrSans-Sup/extrabold/it +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bx}{n}{ + <-> ssub * MerriwthrSans-Sup/b/n +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bx}{sl}{ + <-> ssub * MerriwthrSans-Sup/b/sl +}{} + +\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bx}{it}{ + <-> ssub * MerriwthrSans-Sup/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-OsF.fd new file mode 100644 index 00000000000..14a66d32e11 --- /dev/null +++ b/Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-OsF.fd @@ -0,0 +1,157 @@ +%% Generated by autoinst on 2020/07/30 +%% +\ProvidesFile{T1Merriwthr-OsF.fd} + [2020/07/30 (autoinst) Font definitions for T1/Merriwthr-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname Merriwthr@scale\endcsname\relax + \let\Merriwthr@@scale\@empty +\else + \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{Merriwthr-OsF}{} + + +% ---- regular ---- + +\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{n}{ + <-> \Merriwthr@@scale Merriwthr-Regular-osf-t1 +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{it}{ + <-> \Merriwthr@@scale Merriwthr-Italic-osf-t1 +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{sl}{ + <-> ssub * Merriwthr-OsF/regular/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{n}{ + <-> \Merriwthr@@scale Merriwthr-Bold-osf-t1 +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{it}{ + <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-t1 +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{sl}{ + <-> ssub * Merriwthr-OsF/bold/it +}{} + + +% ---- light ---- + +\DeclareFontShape{T1}{Merriwthr-OsF}{light}{n}{ + <-> \Merriwthr@@scale Merriwthr-Light-osf-t1 +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{light}{it}{ + <-> \Merriwthr@@scale Merriwthr-LightIt-osf-t1 +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{light}{sl}{ + <-> ssub * Merriwthr-OsF/light/it +}{} + + +% ---- ultrabold ---- + +\DeclareFontShape{T1}{Merriwthr-OsF}{ultrabold}{n}{ + <-> \Merriwthr@@scale Merriwthr-UltraBold-osf-t1 +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{ultrabold}{it}{ + <-> \Merriwthr@@scale Merriwthr-UltraBdIt-osf-t1 +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{ultrabold}{sl}{ + <-> ssub * Merriwthr-OsF/ultrabold/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% l --> light + +\DeclareFontShape{T1}{Merriwthr-OsF}{l}{sl}{ + <-> alias * Merriwthr-OsF/light/sl +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{l}{n}{ + <-> alias * Merriwthr-OsF/light/n +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{l}{it}{ + <-> alias * Merriwthr-OsF/light/it +}{} + + +% m --> regular + +\DeclareFontShape{T1}{Merriwthr-OsF}{m}{sl}{ + <-> alias * Merriwthr-OsF/regular/sl +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{m}{n}{ + <-> alias * Merriwthr-OsF/regular/n +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{m}{it}{ + <-> alias * Merriwthr-OsF/regular/it +}{} + + +% b --> bold + +\DeclareFontShape{T1}{Merriwthr-OsF}{b}{sl}{ + <-> alias * Merriwthr-OsF/bold/sl +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{b}{n}{ + <-> alias * Merriwthr-OsF/bold/n +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{b}{it}{ + <-> alias * Merriwthr-OsF/bold/it +}{} + + +% ub --> ultrabold + +\DeclareFontShape{T1}{Merriwthr-OsF}{ub}{sl}{ + <-> alias * Merriwthr-OsF/ultrabold/sl +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{ub}{n}{ + <-> alias * Merriwthr-OsF/ultrabold/n +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{ub}{it}{ + <-> alias * Merriwthr-OsF/ultrabold/it +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{bx}{n}{ + <-> ssub * Merriwthr-OsF/b/n +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{bx}{sl}{ + <-> ssub * Merriwthr-OsF/b/sl +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{bx}{it}{ + <-> ssub * Merriwthr-OsF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-OsF.fd new file mode 100644 index 00000000000..d8bc181b249 --- /dev/null +++ b/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-OsF.fd @@ -0,0 +1,157 @@ +%% Generated by autoinst on 2020/07/30 +%% +\ProvidesFile{T1MerriwthrSans-OsF.fd} + [2020/07/30 (autoinst) Font definitions for T1/MerriwthrSans-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax + \let\MerriwthrSans@@scale\@empty +\else + \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{MerriwthrSans-OsF}{} + + +% ---- regular ---- + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{regular}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Regular-osf-t1 +}{} + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{regular}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-t1 +}{} + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{regular}{sl}{ + <-> ssub * MerriwthrSans-OsF/regular/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-t1 +}{} + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-t1 +}{} + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{sl}{ + <-> ssub * MerriwthrSans-OsF/bold/it +}{} + + +% ---- light ---- + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-t1 +}{} + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-t1 +}{} + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{sl}{ + <-> ssub * MerriwthrSans-OsF/light/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-t1 +}{} + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-t1 +}{} + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{sl}{ + <-> ssub * MerriwthrSans-OsF/extrabold/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% l --> light + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{sl}{ + <-> alias * MerriwthrSans-OsF/light/sl +}{} + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{n}{ + <-> alias * MerriwthrSans-OsF/light/n +}{} + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{it}{ + <-> alias * MerriwthrSans-OsF/light/it +}{} + + +% m --> regular + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{sl}{ + <-> alias * MerriwthrSans-OsF/regular/sl +}{} + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{n}{ + <-> alias * MerriwthrSans-OsF/regular/n +}{} + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{it}{ + <-> alias * MerriwthrSans-OsF/regular/it +}{} + + +% b --> bold + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{sl}{ + <-> alias * MerriwthrSans-OsF/bold/sl +}{} + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{n}{ + <-> alias * MerriwthrSans-OsF/bold/n +}{} + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{it}{ + <-> alias * MerriwthrSans-OsF/bold/it +}{} + + +% eb --> extrabold + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{sl}{ + <-> alias * MerriwthrSans-OsF/extrabold/sl +}{} + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{n}{ + <-> alias * MerriwthrSans-OsF/extrabold/n +}{} + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{it}{ + <-> alias * MerriwthrSans-OsF/extrabold/it +}{} + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{bx}{n}{ + <-> ssub * MerriwthrSans-OsF/b/n +}{} + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{bx}{sl}{ + <-> ssub * MerriwthrSans-OsF/b/sl +}{} + +\DeclareFontShape{T1}{MerriwthrSans-OsF}{bx}{it}{ + <-> ssub * MerriwthrSans-OsF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-Sup.fd b/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-Sup.fd new file mode 100644 index 00000000000..10c24943910 --- /dev/null +++ b/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-Sup.fd @@ -0,0 +1,157 @@ +%% Generated by autoinst on 2020/07/30 +%% +\ProvidesFile{T1MerriwthrSans-Sup.fd} + [2020/07/30 (autoinst) Font definitions for T1/MerriwthrSans-Sup.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax + \let\MerriwthrSans@@scale\@empty +\else + \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{MerriwthrSans-Sup}{} + + +% ---- regular ---- + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Regular-sup-t1 +}{} + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Italic-sup-t1 +}{} + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{sl}{ + <-> ssub * MerriwthrSans-Sup/regular/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Bold-sup-t1 +}{} + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{sl}{ + <-> ssub * MerriwthrSans-Sup/bold/it +}{} + + +% ---- light ---- + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Light-sup-t1 +}{} + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{sl}{ + <-> ssub * MerriwthrSans-Sup/light/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-sup-t1 +}{} + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{sl}{ + <-> ssub * MerriwthrSans-Sup/extrabold/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% l --> light + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{l}{sl}{ + <-> alias * MerriwthrSans-Sup/light/sl +}{} + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{l}{n}{ + <-> alias * MerriwthrSans-Sup/light/n +}{} + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{l}{it}{ + <-> alias * MerriwthrSans-Sup/light/it +}{} + + +% m --> regular + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{sl}{ + <-> alias * MerriwthrSans-Sup/regular/sl +}{} + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{n}{ + <-> alias * MerriwthrSans-Sup/regular/n +}{} + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{it}{ + <-> alias * MerriwthrSans-Sup/regular/it +}{} + + +% b --> bold + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{sl}{ + <-> alias * MerriwthrSans-Sup/bold/sl +}{} + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{n}{ + <-> alias * MerriwthrSans-Sup/bold/n +}{} + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{it}{ + <-> alias * MerriwthrSans-Sup/bold/it +}{} + + +% eb --> extrabold + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{eb}{sl}{ + <-> alias * MerriwthrSans-Sup/extrabold/sl +}{} + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{eb}{n}{ + <-> alias * MerriwthrSans-Sup/extrabold/n +}{} + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{eb}{it}{ + <-> alias * MerriwthrSans-Sup/extrabold/it +}{} + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{bx}{n}{ + <-> ssub * MerriwthrSans-Sup/b/n +}{} + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{bx}{sl}{ + <-> ssub * MerriwthrSans-Sup/b/sl +}{} + +\DeclareFontShape{T1}{MerriwthrSans-Sup}{bx}{it}{ + <-> ssub * MerriwthrSans-Sup/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-OsF.fd new file mode 100644 index 00000000000..cdb6daa679e --- /dev/null +++ b/Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-OsF.fd @@ -0,0 +1,157 @@ +%% Generated by autoinst on 2020/07/30 +%% +\ProvidesFile{TS1Merriwthr-OsF.fd} + [2020/07/30 (autoinst) Font definitions for TS1/Merriwthr-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname Merriwthr@scale\endcsname\relax + \let\Merriwthr@@scale\@empty +\else + \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS1}{Merriwthr-OsF}{} + + +% ---- regular ---- + +\DeclareFontShape{TS1}{Merriwthr-OsF}{regular}{n}{ + <-> \Merriwthr@@scale Merriwthr-Regular-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Merriwthr-OsF}{regular}{it}{ + <-> \Merriwthr@@scale Merriwthr-Italic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Merriwthr-OsF}{regular}{sl}{ + <-> ssub * Merriwthr-OsF/regular/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{TS1}{Merriwthr-OsF}{bold}{n}{ + <-> \Merriwthr@@scale Merriwthr-Bold-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Merriwthr-OsF}{bold}{it}{ + <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Merriwthr-OsF}{bold}{sl}{ + <-> ssub * Merriwthr-OsF/bold/it +}{} + + +% ---- light ---- + +\DeclareFontShape{TS1}{Merriwthr-OsF}{light}{n}{ + <-> \Merriwthr@@scale Merriwthr-Light-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Merriwthr-OsF}{light}{it}{ + <-> \Merriwthr@@scale Merriwthr-LightIt-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Merriwthr-OsF}{light}{sl}{ + <-> ssub * Merriwthr-OsF/light/it +}{} + + +% ---- ultrabold ---- + +\DeclareFontShape{TS1}{Merriwthr-OsF}{ultrabold}{n}{ + <-> \Merriwthr@@scale Merriwthr-UltraBold-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Merriwthr-OsF}{ultrabold}{it}{ + <-> \Merriwthr@@scale Merriwthr-UltraBdIt-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Merriwthr-OsF}{ultrabold}{sl}{ + <-> ssub * Merriwthr-OsF/ultrabold/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% l --> light + +\DeclareFontShape{TS1}{Merriwthr-OsF}{l}{sl}{ + <-> alias * Merriwthr-OsF/light/sl +}{} + +\DeclareFontShape{TS1}{Merriwthr-OsF}{l}{n}{ + <-> alias * Merriwthr-OsF/light/n +}{} + +\DeclareFontShape{TS1}{Merriwthr-OsF}{l}{it}{ + <-> alias * Merriwthr-OsF/light/it +}{} + + +% m --> regular + +\DeclareFontShape{TS1}{Merriwthr-OsF}{m}{sl}{ + <-> alias * Merriwthr-OsF/regular/sl +}{} + +\DeclareFontShape{TS1}{Merriwthr-OsF}{m}{n}{ + <-> alias * Merriwthr-OsF/regular/n +}{} + +\DeclareFontShape{TS1}{Merriwthr-OsF}{m}{it}{ + <-> alias * Merriwthr-OsF/regular/it +}{} + + +% b --> bold + +\DeclareFontShape{TS1}{Merriwthr-OsF}{b}{sl}{ + <-> alias * Merriwthr-OsF/bold/sl +}{} + +\DeclareFontShape{TS1}{Merriwthr-OsF}{b}{n}{ + <-> alias * Merriwthr-OsF/bold/n +}{} + +\DeclareFontShape{TS1}{Merriwthr-OsF}{b}{it}{ + <-> alias * Merriwthr-OsF/bold/it +}{} + + +% ub --> ultrabold + +\DeclareFontShape{TS1}{Merriwthr-OsF}{ub}{sl}{ + <-> alias * Merriwthr-OsF/ultrabold/sl +}{} + +\DeclareFontShape{TS1}{Merriwthr-OsF}{ub}{n}{ + <-> alias * Merriwthr-OsF/ultrabold/n +}{} + +\DeclareFontShape{TS1}{Merriwthr-OsF}{ub}{it}{ + <-> alias * Merriwthr-OsF/ultrabold/it +}{} + +\DeclareFontShape{TS1}{Merriwthr-OsF}{bx}{n}{ + <-> ssub * Merriwthr-OsF/b/n +}{} + +\DeclareFontShape{TS1}{Merriwthr-OsF}{bx}{sl}{ + <-> ssub * Merriwthr-OsF/b/sl +}{} + +\DeclareFontShape{TS1}{Merriwthr-OsF}{bx}{it}{ + <-> ssub * Merriwthr-OsF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-OsF.fd new file mode 100644 index 00000000000..e347fa5662d --- /dev/null +++ b/Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-OsF.fd @@ -0,0 +1,157 @@ +%% Generated by autoinst on 2020/07/30 +%% +\ProvidesFile{TS1MerriwthrSans-OsF.fd} + [2020/07/30 (autoinst) Font definitions for TS1/MerriwthrSans-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax + \let\MerriwthrSans@@scale\@empty +\else + \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS1}{MerriwthrSans-OsF}{} + + +% ---- regular ---- + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{regular}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Regular-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{regular}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{regular}{sl}{ + <-> ssub * MerriwthrSans-OsF/regular/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bold}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bold}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bold}{sl}{ + <-> ssub * MerriwthrSans-OsF/bold/it +}{} + + +% ---- light ---- + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{light}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{light}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{light}{sl}{ + <-> ssub * MerriwthrSans-OsF/light/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{extrabold}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{extrabold}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{extrabold}{sl}{ + <-> ssub * MerriwthrSans-OsF/extrabold/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% l --> light + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{l}{sl}{ + <-> alias * MerriwthrSans-OsF/light/sl +}{} + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{l}{n}{ + <-> alias * MerriwthrSans-OsF/light/n +}{} + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{l}{it}{ + <-> alias * MerriwthrSans-OsF/light/it +}{} + + +% m --> regular + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{m}{sl}{ + <-> alias * MerriwthrSans-OsF/regular/sl +}{} + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{m}{n}{ + <-> alias * MerriwthrSans-OsF/regular/n +}{} + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{m}{it}{ + <-> alias * MerriwthrSans-OsF/regular/it +}{} + + +% b --> bold + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{b}{sl}{ + <-> alias * MerriwthrSans-OsF/bold/sl +}{} + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{b}{n}{ + <-> alias * MerriwthrSans-OsF/bold/n +}{} + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{b}{it}{ + <-> alias * MerriwthrSans-OsF/bold/it +}{} + + +% eb --> extrabold + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{eb}{sl}{ + <-> alias * MerriwthrSans-OsF/extrabold/sl +}{} + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{eb}{n}{ + <-> alias * MerriwthrSans-OsF/extrabold/n +}{} + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{eb}{it}{ + <-> alias * MerriwthrSans-OsF/extrabold/it +}{} + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bx}{n}{ + <-> ssub * MerriwthrSans-OsF/b/n +}{} + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bx}{sl}{ + <-> ssub * MerriwthrSans-OsF/b/sl +}{} + +\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bx}{it}{ + <-> ssub * MerriwthrSans-OsF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty index 0fd1696f61f..3c3c73d1d34 100644 --- a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty +++ b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty @@ -1,14 +1,16 @@ \ProvidesPackage{merriweather}[% - 2020/07/24 (Bob Tennent) Supports Merriweather(Sans) fonts for use with xeLaTeX and luaLaTeX. ] + 2020/07/30 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ] -\RequirePackage{iftex} +\RequirePackage{ifxetex,ifluatex,textcomp} -\ifpdftex -\PackageError{merriweather}{% - *****************************************\MessageBreak - Please process using XeLaTeX or luaLaTeX\MessageBreak - *****************************************} -\fi +\newif\ifmerriweather@ttf +\ifxetex + \merriweather@ttftrue +\else\ifluatex + \merriweather@ttftrue +\else % [pdf]LaTeX + \merriweather@ttffalse +\fi\fi \newcommand*{\Merriweather@scale}{1} % not adjustable \newcommand*{\MerriweatherSans@scale}{1} @@ -27,6 +29,7 @@ \DeclareOptionX{sf}{\merriweather@sftrue} \DeclareOptionX{rm}{\merriweather@rmtrue} \DeclareOptionX{sfdefault}{\merriweather@sftrue\merriweather@sfdefaulttrue} +\DeclareOptionX{type1}{\merriweather@ttffalse} \DeclareOptionX{light}{\merriweather@rmlighttrue\merriweather@sflighttrue} \DeclareOptionX{rmlight}{\merriweather@rmlighttrue} \DeclareOptionX{sflight}{\merriweather@sflighttrue} @@ -36,7 +39,11 @@ \ProcessOptionsX\relax -\RequirePackage{fontspec} +\ifmerriweather@ttf + \RequirePackage{fontspec} +\else + \RequirePackage{fontenc,fontaxes,mweights} +\fi \ifmerriweather@rm\else\ifmerriweather@sf\else \merriweather@rmtrue\merriweather@sftrue % both false -> both true @@ -44,6 +51,7 @@ % Set main and/or sans fonts: +\ifmerriweather@ttf \ifxetex\XeTeXtracingfonts=1\fi \defaultfontfeatures{ @@ -208,9 +216,53 @@ BoldItalicFont = *-ExBoldIt ] {MerriweatherSans} +\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 + \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 + \else + \def\mdseries@sf{m}\def\bfseries@sf{b} + \fi + + + + \def\merriweatherfamily{Merriwthr-OsF} + \def\merriweathersffamily{MerriwthrSans-OsF} + + \ifmerriweather@rm + \renewcommand*\rmdefault{\merriweatherfamily} + \fi + + \ifmerriweather@sf + \renewcommand*\sfdefault{\merriweathersffamily} + \fi + + \ifmerriweather@sfdefault + \renewcommand*\familydefault{\merriweathersffamily} + \fi + + \renewcommand*\seriesdefault{\mdseries@rm} + + \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} + +\fi % turn off defaults in case other fonts are selected: +\ifmerriweather@ttf \defaultfontfeatures{} +\fi \endinput -- cgit v1.2.3