From c34d7811fa0e8cbe77c0625c5720c1821b242d52 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 16 Jun 2014 23:14:13 +0000 Subject: merriweather git-svn-id: svn://tug.org/texlive/trunk@34263 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/fonts/merriweather/README | 14 +- .../fonts/merriweather/merriweather-samples.pdf | Bin 133918 -> 109132 bytes .../fonts/enc/dvips/merriweather/mwth_5n6vkx.enc | 65 ------- .../fonts/enc/dvips/merriweather/mwth_5q2vgd.enc | 66 +++++++ .../fonts/enc/dvips/merriweather/mwth_aynzzm.enc | 65 ------- .../fonts/enc/dvips/merriweather/mwth_cn5sfl.enc | 65 +++++++ .../fonts/enc/dvips/merriweather/mwth_fmhdb5.enc | 66 ------- .../fonts/enc/dvips/merriweather/mwth_fuknsh.enc | 65 +++++++ .../fonts/enc/dvips/merriweather/mwth_ioeeie.enc | 65 ------- .../fonts/enc/dvips/merriweather/mwth_jnnjab.enc | 66 +++++++ .../fonts/enc/dvips/merriweather/mwth_libw2m.enc | 65 +++++++ .../fonts/enc/dvips/merriweather/mwth_lnkfbl.enc | 64 +++++++ .../fonts/enc/dvips/merriweather/mwth_oaf34p.enc | 16 +- .../fonts/enc/dvips/merriweather/mwth_oehznb.enc | 64 ------- .../fonts/enc/dvips/merriweather/mwth_oorhm5.enc | 66 ------- .../fonts/enc/dvips/merriweather/mwth_pyutxj.enc | 65 ------- .../fonts/enc/dvips/merriweather/mwth_r5mufr.enc | 65 ------- .../fonts/enc/dvips/merriweather/mwth_rheu2i.enc | 64 ------- .../fonts/enc/dvips/merriweather/mwth_t226xz.enc | 65 ------- .../fonts/enc/dvips/merriweather/mwth_v4a7hp.enc | 65 ------- .../fonts/enc/dvips/merriweather/mwth_xz5wux.enc | 66 +++++++ .../fonts/enc/dvips/merriweather/mwth_ywgpba.enc | 65 +++++++ .../fonts/enc/dvips/merriweather/mwth_z4e4wk.enc | 16 +- .../fonts/map/dvips/merriweather/Merriweather.map | 10 + .../fonts/map/dvips/merriweather/merriweather.map | 128 ++++++------- .../Merriweather-Bold-osf-ly1--base.tfm | Bin 1908 -> 0 bytes .../merriweather/Merriweather-Bold-osf-ly1.tfm | Bin 2068 -> 1972 bytes .../merriweather/Merriweather-Bold-osf-ot1.tfm | Bin 1336 -> 1216 bytes .../Merriweather-Bold-osf-t1--base.tfm | Bin 1812 -> 1848 bytes .../merriweather/Merriweather-Bold-osf-t1.tfm | Bin 1972 -> 1912 bytes .../Merriweather-Bold-osf-ts1--base.tfm | Bin 1460 -> 1480 bytes .../merriweather/Merriweather-Bold-osf-ts1.tfm | Bin 1496 -> 1520 bytes .../Merriweather-BoldItalic-osf-ly1--base.tfm | Bin 2020 -> 0 bytes .../Merriweather-BoldItalic-osf-ly1.tfm | Bin 2168 -> 2076 bytes .../Merriweather-BoldItalic-osf-ot1.tfm | Bin 1436 -> 1320 bytes .../Merriweather-BoldItalic-osf-t1--base.tfm | Bin 1996 -> 1996 bytes .../Merriweather-BoldItalic-osf-t1.tfm | Bin 2144 -> 2060 bytes .../Merriweather-BoldItalic-osf-ts1--base.tfm | Bin 1480 -> 1480 bytes .../Merriweather-BoldItalic-osf-ts1.tfm | Bin 1524 -> 1524 bytes .../Merriweather-Heavy-osf-ly1--base.tfm | Bin 1920 -> 0 bytes .../merriweather/Merriweather-Heavy-osf-ly1.tfm | Bin 2080 -> 0 bytes .../merriweather/Merriweather-Heavy-osf-ot1.tfm | Bin 1340 -> 0 bytes .../Merriweather-Heavy-osf-t1--base.tfm | Bin 1820 -> 0 bytes .../merriweather/Merriweather-Heavy-osf-t1.tfm | Bin 1980 -> 0 bytes .../Merriweather-Heavy-osf-ts1--base.tfm | Bin 1452 -> 0 bytes .../merriweather/Merriweather-Heavy-osf-ts1.tfm | Bin 1492 -> 0 bytes .../Merriweather-HeavyItalic-osf-ly1--base.tfm | Bin 2056 -> 0 bytes .../Merriweather-HeavyItalic-osf-ly1.tfm | Bin 2204 -> 0 bytes .../Merriweather-HeavyItalic-osf-ot1.tfm | Bin 1464 -> 0 bytes .../Merriweather-HeavyItalic-osf-t1--base.tfm | Bin 2036 -> 0 bytes .../Merriweather-HeavyItalic-osf-t1.tfm | Bin 2184 -> 0 bytes .../Merriweather-HeavyItalic-osf-ts1--base.tfm | Bin 1484 -> 0 bytes .../Merriweather-HeavyItalic-osf-ts1.tfm | Bin 1528 -> 0 bytes .../Merriweather-Italic-osf-ly1--base.tfm | Bin 1972 -> 0 bytes .../merriweather/Merriweather-Italic-osf-ly1.tfm | Bin 2120 -> 2008 bytes .../merriweather/Merriweather-Italic-osf-ot1.tfm | Bin 1400 -> 1268 bytes .../Merriweather-Italic-osf-t1--base.tfm | Bin 1964 -> 1940 bytes .../merriweather/Merriweather-Italic-osf-t1.tfm | Bin 2112 -> 2004 bytes .../Merriweather-Italic-osf-ts1--base.tfm | Bin 1460 -> 1476 bytes .../merriweather/Merriweather-Italic-osf-ts1.tfm | Bin 1504 -> 1520 bytes .../Merriweather-Light-osf-ly1--base.tfm | Bin 1856 -> 0 bytes .../merriweather/Merriweather-Light-osf-ly1.tfm | Bin 2048 -> 1940 bytes .../merriweather/Merriweather-Light-osf-ot1.tfm | Bin 1368 -> 1208 bytes .../Merriweather-Light-osf-t1--base.tfm | Bin 1780 -> 1828 bytes .../merriweather/Merriweather-Light-osf-t1.tfm | Bin 1972 -> 1892 bytes .../Merriweather-Light-osf-ts1--base.tfm | Bin 1460 -> 1476 bytes .../merriweather/Merriweather-Light-osf-ts1.tfm | Bin 1504 -> 1516 bytes .../merriweather/Merriweather-LightIt-osf-ly1.tfm | Bin 0 -> 1972 bytes .../merriweather/Merriweather-LightIt-osf-ot1.tfm | Bin 0 -> 1244 bytes .../Merriweather-LightIt-osf-t1--base.tfm | Bin 0 -> 1912 bytes .../merriweather/Merriweather-LightIt-osf-t1.tfm | Bin 0 -> 1976 bytes .../Merriweather-LightIt-osf-ts1--base.tfm | Bin 0 -> 1460 bytes .../merriweather/Merriweather-LightIt-osf-ts1.tfm | Bin 0 -> 1504 bytes .../Merriweather-LightItalic-osf-ly1--base.tfm | Bin 1944 -> 0 bytes .../Merriweather-LightItalic-osf-ly1.tfm | Bin 2092 -> 0 bytes .../Merriweather-LightItalic-osf-ot1.tfm | Bin 1388 -> 0 bytes .../Merriweather-LightItalic-osf-t1--base.tfm | Bin 1896 -> 0 bytes .../Merriweather-LightItalic-osf-t1.tfm | Bin 2044 -> 0 bytes .../Merriweather-LightItalic-osf-ts1--base.tfm | Bin 1472 -> 0 bytes .../Merriweather-LightItalic-osf-ts1.tfm | Bin 1516 -> 0 bytes .../merriweather/Merriweather-Regular-osf-ly1.tfm | Bin 0 -> 1964 bytes .../merriweather/Merriweather-Regular-osf-ot1.tfm | Bin 0 -> 1212 bytes .../Merriweather-Regular-osf-t1--base.tfm | Bin 0 -> 1852 bytes .../merriweather/Merriweather-Regular-osf-t1.tfm | Bin 0 -> 1916 bytes .../Merriweather-Regular-osf-ts1--base.tfm | Bin 0 -> 1488 bytes .../merriweather/Merriweather-Regular-osf-ts1.tfm | Bin 0 -> 1528 bytes .../Merriweather-UltraBdIt-osf-ly1.tfm | Bin 0 -> 2104 bytes .../Merriweather-UltraBdIt-osf-ot1.tfm | Bin 0 -> 1340 bytes .../Merriweather-UltraBdIt-osf-t1--base.tfm | Bin 0 -> 2024 bytes .../merriweather/Merriweather-UltraBdIt-osf-t1.tfm | Bin 0 -> 2088 bytes .../Merriweather-UltraBdIt-osf-ts1--base.tfm | Bin 0 -> 1496 bytes .../Merriweather-UltraBdIt-osf-ts1.tfm | Bin 0 -> 1540 bytes .../Merriweather-UltraBold-osf-ly1.tfm | Bin 0 -> 1988 bytes .../Merriweather-UltraBold-osf-ot1.tfm | Bin 0 -> 1236 bytes .../Merriweather-UltraBold-osf-t1--base.tfm | Bin 0 -> 1876 bytes .../merriweather/Merriweather-UltraBold-osf-t1.tfm | Bin 0 -> 1940 bytes .../Merriweather-UltraBold-osf-ts1--base.tfm | Bin 0 -> 1484 bytes .../Merriweather-UltraBold-osf-ts1.tfm | Bin 0 -> 1524 bytes .../merriweather/Merriweather-osf-ly1--base.tfm | Bin 1816 -> 0 bytes .../sorkin/merriweather/Merriweather-osf-ly1.tfm | Bin 1976 -> 0 bytes .../sorkin/merriweather/Merriweather-osf-ot1.tfm | Bin 1312 -> 0 bytes .../merriweather/Merriweather-osf-t1--base.tfm | Bin 1752 -> 0 bytes .../sorkin/merriweather/Merriweather-osf-t1.tfm | Bin 1912 -> 0 bytes .../merriweather/Merriweather-osf-ts1--base.tfm | Bin 1448 -> 0 bytes .../sorkin/merriweather/Merriweather-osf-ts1.tfm | Bin 1488 -> 0 bytes .../MerriweatherSans-Bold-osf-ly1--base.tfm | Bin 1872 -> 0 bytes .../merriweather/MerriweatherSans-Bold-osf-ly1.tfm | Bin 1940 -> 0 bytes .../merriweather/MerriweatherSans-Bold-osf-ot1.tfm | Bin 1264 -> 0 bytes .../MerriweatherSans-Bold-osf-t1--base.tfm | Bin 1832 -> 0 bytes .../merriweather/MerriweatherSans-Bold-osf-t1.tfm | Bin 1900 -> 0 bytes .../MerriweatherSans-Bold-osf-ts1--base.tfm | Bin 1436 -> 0 bytes .../merriweather/MerriweatherSans-Bold-osf-ts1.tfm | Bin 1480 -> 0 bytes .../merriweather/MerriweatherSans-Bold-tlf-ly1.tfm | Bin 0 -> 1940 bytes .../merriweather/MerriweatherSans-Bold-tlf-ot1.tfm | Bin 0 -> 1264 bytes .../MerriweatherSans-Bold-tlf-t1--base.tfm | Bin 0 -> 1836 bytes .../merriweather/MerriweatherSans-Bold-tlf-t1.tfm | Bin 0 -> 1900 bytes .../MerriweatherSans-Bold-tlf-ts1--base.tfm | Bin 0 -> 1436 bytes .../merriweather/MerriweatherSans-Bold-tlf-ts1.tfm | Bin 0 -> 1480 bytes .../MerriweatherSans-BoldItalic-osf-ly1--base.tfm | Bin 1980 -> 0 bytes .../MerriweatherSans-BoldItalic-osf-ly1.tfm | Bin 2048 -> 0 bytes .../MerriweatherSans-BoldItalic-osf-ot1.tfm | Bin 1312 -> 0 bytes .../MerriweatherSans-BoldItalic-osf-t1--base.tfm | Bin 1988 -> 0 bytes .../MerriweatherSans-BoldItalic-osf-t1.tfm | Bin 2056 -> 0 bytes .../MerriweatherSans-BoldItalic-osf-ts1--base.tfm | Bin 1484 -> 0 bytes .../MerriweatherSans-BoldItalic-osf-ts1.tfm | Bin 1528 -> 0 bytes .../MerriweatherSans-BoldItalic-tlf-ly1.tfm | Bin 0 -> 2048 bytes .../MerriweatherSans-BoldItalic-tlf-ot1.tfm | Bin 0 -> 1312 bytes .../MerriweatherSans-BoldItalic-tlf-t1--base.tfm | Bin 0 -> 1992 bytes .../MerriweatherSans-BoldItalic-tlf-t1.tfm | Bin 0 -> 2056 bytes .../MerriweatherSans-BoldItalic-tlf-ts1--base.tfm | Bin 0 -> 1484 bytes .../MerriweatherSans-BoldItalic-tlf-ts1.tfm | Bin 0 -> 1528 bytes ...rriweatherSans-ExtraBldItalic-osf-ly1--base.tfm | Bin 2016 -> 0 bytes .../MerriweatherSans-ExtraBldItalic-osf-ly1.tfm | Bin 2084 -> 0 bytes .../MerriweatherSans-ExtraBldItalic-osf-ot1.tfm | Bin 1348 -> 0 bytes ...erriweatherSans-ExtraBldItalic-osf-t1--base.tfm | Bin 2000 -> 0 bytes .../MerriweatherSans-ExtraBldItalic-osf-t1.tfm | Bin 2064 -> 0 bytes ...rriweatherSans-ExtraBldItalic-osf-ts1--base.tfm | Bin 1500 -> 0 bytes .../MerriweatherSans-ExtraBldItalic-osf-ts1.tfm | Bin 1536 -> 0 bytes .../MerriweatherSans-ExtraBold-osf-ly1--base.tfm | Bin 1904 -> 0 bytes .../MerriweatherSans-ExtraBold-osf-ly1.tfm | Bin 1972 -> 0 bytes .../MerriweatherSans-ExtraBold-osf-ot1.tfm | Bin 1280 -> 0 bytes .../MerriweatherSans-ExtraBold-osf-t1--base.tfm | Bin 1852 -> 0 bytes .../MerriweatherSans-ExtraBold-osf-t1.tfm | Bin 1920 -> 0 bytes .../MerriweatherSans-ExtraBold-osf-ts1--base.tfm | Bin 1452 -> 0 bytes .../MerriweatherSans-ExtraBold-osf-ts1.tfm | Bin 1496 -> 0 bytes .../MerriweatherSans-ExtraBold-tlf-ly1.tfm | Bin 0 -> 1968 bytes .../MerriweatherSans-ExtraBold-tlf-ot1.tfm | Bin 0 -> 1280 bytes .../MerriweatherSans-ExtraBold-tlf-t1--base.tfm | Bin 0 -> 1852 bytes .../MerriweatherSans-ExtraBold-tlf-t1.tfm | Bin 0 -> 1916 bytes .../MerriweatherSans-ExtraBold-tlf-ts1--base.tfm | Bin 0 -> 1452 bytes .../MerriweatherSans-ExtraBold-tlf-ts1.tfm | Bin 0 -> 1496 bytes .../MerriweatherSans-ExtraBoldItalic-tlf-ly1.tfm | Bin 0 -> 2084 bytes .../MerriweatherSans-ExtraBoldItalic-tlf-ot1.tfm | Bin 0 -> 1348 bytes ...rriweatherSans-ExtraBoldItalic-tlf-t1--base.tfm | Bin 0 -> 2004 bytes .../MerriweatherSans-ExtraBoldItalic-tlf-t1.tfm | Bin 0 -> 2064 bytes ...riweatherSans-ExtraBoldItalic-tlf-ts1--base.tfm | Bin 0 -> 1500 bytes .../MerriweatherSans-ExtraBoldItalic-tlf-ts1.tfm | Bin 0 -> 1536 bytes .../MerriweatherSans-Italic-osf-ly1--base.tfm | Bin 1872 -> 0 bytes .../MerriweatherSans-Italic-osf-ly1.tfm | Bin 1940 -> 0 bytes .../MerriweatherSans-Italic-osf-ot1.tfm | Bin 1268 -> 0 bytes .../MerriweatherSans-Italic-osf-t1--base.tfm | Bin 1868 -> 0 bytes .../MerriweatherSans-Italic-osf-t1.tfm | Bin 1936 -> 0 bytes .../MerriweatherSans-Italic-osf-ts1--base.tfm | Bin 1440 -> 0 bytes .../MerriweatherSans-Italic-osf-ts1.tfm | Bin 1484 -> 0 bytes .../MerriweatherSans-Italic-tlf-ly1.tfm | Bin 0 -> 1940 bytes .../MerriweatherSans-Italic-tlf-ot1.tfm | Bin 0 -> 1268 bytes .../MerriweatherSans-Italic-tlf-t1--base.tfm | Bin 0 -> 1872 bytes .../MerriweatherSans-Italic-tlf-t1.tfm | Bin 0 -> 1936 bytes .../MerriweatherSans-Italic-tlf-ts1--base.tfm | Bin 0 -> 1440 bytes .../MerriweatherSans-Italic-tlf-ts1.tfm | Bin 0 -> 1484 bytes .../MerriweatherSans-Light-osf-ly1--base.tfm | Bin 1844 -> 0 bytes .../MerriweatherSans-Light-osf-ly1.tfm | Bin 1912 -> 0 bytes .../MerriweatherSans-Light-osf-ot1.tfm | Bin 1236 -> 0 bytes .../MerriweatherSans-Light-osf-t1--base.tfm | Bin 1808 -> 0 bytes .../merriweather/MerriweatherSans-Light-osf-t1.tfm | Bin 1876 -> 0 bytes .../MerriweatherSans-Light-osf-ts1--base.tfm | Bin 1428 -> 0 bytes .../MerriweatherSans-Light-osf-ts1.tfm | Bin 1472 -> 0 bytes .../MerriweatherSans-Light-tlf-ly1.tfm | Bin 0 -> 1912 bytes .../MerriweatherSans-Light-tlf-ot1.tfm | Bin 0 -> 1236 bytes .../MerriweatherSans-Light-tlf-t1--base.tfm | Bin 0 -> 1812 bytes .../merriweather/MerriweatherSans-Light-tlf-t1.tfm | Bin 0 -> 1876 bytes .../MerriweatherSans-Light-tlf-ts1--base.tfm | Bin 0 -> 1428 bytes .../MerriweatherSans-Light-tlf-ts1.tfm | Bin 0 -> 1472 bytes .../MerriweatherSans-LightItalic-osf-ly1--base.tfm | Bin 1920 -> 0 bytes .../MerriweatherSans-LightItalic-osf-ly1.tfm | Bin 1988 -> 0 bytes .../MerriweatherSans-LightItalic-osf-ot1.tfm | Bin 1288 -> 0 bytes .../MerriweatherSans-LightItalic-osf-t1--base.tfm | Bin 1880 -> 0 bytes .../MerriweatherSans-LightItalic-osf-t1.tfm | Bin 1948 -> 0 bytes .../MerriweatherSans-LightItalic-osf-ts1--base.tfm | Bin 1464 -> 0 bytes .../MerriweatherSans-LightItalic-osf-ts1.tfm | Bin 1504 -> 0 bytes .../MerriweatherSans-LightItalic-tlf-ly1.tfm | Bin 0 -> 1984 bytes .../MerriweatherSans-LightItalic-tlf-ot1.tfm | Bin 0 -> 1288 bytes .../MerriweatherSans-LightItalic-tlf-t1--base.tfm | Bin 0 -> 1880 bytes .../MerriweatherSans-LightItalic-tlf-t1.tfm | Bin 0 -> 1944 bytes .../MerriweatherSans-LightItalic-tlf-ts1--base.tfm | Bin 0 -> 1464 bytes .../MerriweatherSans-LightItalic-tlf-ts1.tfm | Bin 0 -> 1504 bytes .../MerriweatherSans-Regular-osf-ly1--base.tfm | Bin 1820 -> 0 bytes .../MerriweatherSans-Regular-osf-ly1.tfm | Bin 1888 -> 0 bytes .../MerriweatherSans-Regular-osf-ot1.tfm | Bin 1232 -> 0 bytes .../MerriweatherSans-Regular-osf-t1--base.tfm | Bin 1784 -> 0 bytes .../MerriweatherSans-Regular-osf-t1.tfm | Bin 1852 -> 0 bytes .../MerriweatherSans-Regular-osf-ts1--base.tfm | Bin 1420 -> 0 bytes .../MerriweatherSans-Regular-osf-ts1.tfm | Bin 1464 -> 0 bytes .../MerriweatherSans-Regular-tlf-ly1.tfm | Bin 0 -> 1892 bytes .../MerriweatherSans-Regular-tlf-ot1.tfm | Bin 0 -> 1232 bytes .../MerriweatherSans-Regular-tlf-t1--base.tfm | Bin 0 -> 1788 bytes .../MerriweatherSans-Regular-tlf-t1.tfm | Bin 0 -> 1852 bytes .../MerriweatherSans-Regular-tlf-ts1--base.tfm | Bin 0 -> 1420 bytes .../MerriweatherSans-Regular-tlf-ts1.tfm | Bin 0 -> 1464 bytes .../sorkin/merriweather/Merriweather-Bold.ttf | Bin 46796 -> 167640 bytes .../sorkin/merriweather/Merriweather-BoldIt.ttf | Bin 0 -> 175076 bytes .../merriweather/Merriweather-BoldItalic.ttf | Bin 59316 -> 0 bytes .../sorkin/merriweather/Merriweather-Heavy.ttf | Bin 46816 -> 0 bytes .../merriweather/Merriweather-HeavyItalic.ttf | Bin 52432 -> 0 bytes .../sorkin/merriweather/Merriweather-Italic.ttf | Bin 53140 -> 174316 bytes .../sorkin/merriweather/Merriweather-Light.ttf | Bin 46900 -> 168640 bytes .../sorkin/merriweather/Merriweather-LightIt.ttf | Bin 0 -> 175092 bytes .../merriweather/Merriweather-LightItalic.ttf | Bin 53492 -> 0 bytes .../sorkin/merriweather/Merriweather-Regular.ttf | Bin 0 -> 170016 bytes .../sorkin/merriweather/Merriweather-UltraBdIt.ttf | Bin 0 -> 174436 bytes .../sorkin/merriweather/Merriweather-UltraBold.ttf | Bin 0 -> 170180 bytes .../truetype/sorkin/merriweather/Merriweather.ttf | Bin 46576 -> 0 bytes .../sorkin/merriweather/MerriweatherSans-Bold.ttf | Bin 51068 -> 88132 bytes .../merriweather/MerriweatherSans-BoldItalic.ttf | Bin 47572 -> 90400 bytes .../merriweather/MerriweatherSans-ExBoldIt.ttf | Bin 0 -> 90264 bytes .../merriweather/MerriweatherSans-ExtraBold.ttf | Bin 50968 -> 88188 bytes .../MerriweatherSans-ExtraBoldItalic.ttf | Bin 47668 -> 0 bytes .../merriweather/MerriweatherSans-Italic.ttf | Bin 47560 -> 89820 bytes .../sorkin/merriweather/MerriweatherSans-Light.ttf | Bin 47112 -> 87752 bytes .../merriweather/MerriweatherSans-LightItalic.ttf | Bin 47888 -> 89356 bytes .../merriweather/MerriweatherSans-Regular.ttf | Bin 48528 -> 88316 bytes .../sorkin/merriweather/Merriweather-Bold.pfb | Bin 71980 -> 129458 bytes .../sorkin/merriweather/Merriweather-BoldIt.pfb | Bin 0 -> 139845 bytes .../merriweather/Merriweather-BoldItalic.pfb | Bin 79984 -> 0 bytes .../sorkin/merriweather/Merriweather-Heavy.pfb | Bin 67187 -> 0 bytes .../merriweather/Merriweather-HeavyItalic.pfb | Bin 62176 -> 0 bytes .../sorkin/merriweather/Merriweather-Italic.pfb | Bin 62311 -> 139345 bytes .../sorkin/merriweather/Merriweather-Light.pfb | Bin 70699 -> 127334 bytes .../sorkin/merriweather/Merriweather-LightIt.pfb | Bin 0 -> 139480 bytes .../merriweather/Merriweather-LightItalic.pfb | Bin 62838 -> 0 bytes .../sorkin/merriweather/Merriweather-Regular.pfb | Bin 0 -> 133761 bytes .../sorkin/merriweather/Merriweather-UltraBdIt.pfb | Bin 0 -> 139603 bytes .../sorkin/merriweather/Merriweather-UltraBold.pfb | Bin 0 -> 129412 bytes .../type1/sorkin/merriweather/Merriweather.pfb | Bin 64510 -> 0 bytes .../sorkin/merriweather/MerriweatherSans-Bold.pfb | Bin 57639 -> 76118 bytes .../merriweather/MerriweatherSans-BoldItalic.pfb | Bin 58617 -> 77848 bytes .../merriweather/MerriweatherSans-ExBoldIt.pfb | Bin 0 -> 76394 bytes .../merriweather/MerriweatherSans-ExtraBold.pfb | Bin 57353 -> 77026 bytes .../MerriweatherSans-ExtraBoldItalic.pfb | Bin 58110 -> 0 bytes .../merriweather/MerriweatherSans-Italic.pfb | Bin 58222 -> 75225 bytes .../sorkin/merriweather/MerriweatherSans-Light.pfb | Bin 56850 -> 76238 bytes .../merriweather/MerriweatherSans-LightItalic.pfb | Bin 59793 -> 77336 bytes .../merriweather/MerriweatherSans-Regular.pfb | Bin 58013 -> 76157 bytes .../merriweather/Merriweather-Bold-osf-ly1.vf | Bin 1696 -> 0 bytes .../merriweather/Merriweather-Bold-osf-t1.vf | Bin 1496 -> 1756 bytes .../merriweather/Merriweather-Bold-osf-ts1.vf | Bin 560 -> 624 bytes .../Merriweather-BoldItalic-osf-ly1.vf | Bin 1708 -> 0 bytes .../merriweather/Merriweather-BoldItalic-osf-t1.vf | Bin 1768 -> 1760 bytes .../Merriweather-BoldItalic-osf-ts1.vf | Bin 580 -> 632 bytes .../merriweather/Merriweather-Heavy-osf-ly1.vf | Bin 1696 -> 0 bytes .../merriweather/Merriweather-Heavy-osf-t1.vf | Bin 1500 -> 0 bytes .../merriweather/Merriweather-Heavy-osf-ts1.vf | Bin 560 -> 0 bytes .../Merriweather-HeavyItalic-osf-ly1.vf | Bin 1704 -> 0 bytes .../Merriweather-HeavyItalic-osf-t1.vf | Bin 1772 -> 0 bytes .../Merriweather-HeavyItalic-osf-ts1.vf | Bin 580 -> 0 bytes .../merriweather/Merriweather-Italic-osf-ly1.vf | Bin 1704 -> 0 bytes .../merriweather/Merriweather-Italic-osf-t1.vf | Bin 1764 -> 1756 bytes .../merriweather/Merriweather-Italic-osf-ts1.vf | Bin 576 -> 628 bytes .../merriweather/Merriweather-Light-osf-ly1.vf | Bin 1696 -> 0 bytes .../merriweather/Merriweather-Light-osf-t1.vf | Bin 1500 -> 1756 bytes .../merriweather/Merriweather-Light-osf-ts1.vf | Bin 560 -> 628 bytes .../merriweather/Merriweather-LightIt-osf-t1.vf | Bin 0 -> 1760 bytes .../merriweather/Merriweather-LightIt-osf-ts1.vf | Bin 0 -> 628 bytes .../Merriweather-LightItalic-osf-ly1.vf | Bin 1708 -> 0 bytes .../Merriweather-LightItalic-osf-t1.vf | Bin 1772 -> 0 bytes .../Merriweather-LightItalic-osf-ts1.vf | Bin 580 -> 0 bytes .../merriweather/Merriweather-Regular-osf-t1.vf | Bin 0 -> 1760 bytes .../merriweather/Merriweather-Regular-osf-ts1.vf | Bin 0 -> 628 bytes .../merriweather/Merriweather-UltraBdIt-osf-t1.vf | Bin 0 -> 1760 bytes .../merriweather/Merriweather-UltraBdIt-osf-ts1.vf | Bin 0 -> 632 bytes .../merriweather/Merriweather-UltraBold-osf-t1.vf | Bin 0 -> 1760 bytes .../merriweather/Merriweather-UltraBold-osf-ts1.vf | Bin 0 -> 632 bytes .../vf/sorkin/merriweather/Merriweather-osf-ly1.vf | Bin 1692 -> 0 bytes .../vf/sorkin/merriweather/Merriweather-osf-t1.vf | Bin 1492 -> 0 bytes .../vf/sorkin/merriweather/Merriweather-osf-ts1.vf | Bin 556 -> 0 bytes .../merriweather/MerriweatherSans-Bold-osf-ly1.vf | Bin 1700 -> 0 bytes .../merriweather/MerriweatherSans-Bold-osf-t1.vf | Bin 1768 -> 0 bytes .../merriweather/MerriweatherSans-Bold-osf-ts1.vf | Bin 576 -> 0 bytes .../merriweather/MerriweatherSans-Bold-tlf-t1.vf | Bin 0 -> 1760 bytes .../merriweather/MerriweatherSans-Bold-tlf-ts1.vf | Bin 0 -> 576 bytes .../MerriweatherSans-BoldItalic-osf-ly1.vf | Bin 1712 -> 0 bytes .../MerriweatherSans-BoldItalic-osf-t1.vf | Bin 1772 -> 0 bytes .../MerriweatherSans-BoldItalic-osf-ts1.vf | Bin 584 -> 0 bytes .../MerriweatherSans-BoldItalic-tlf-t1.vf | Bin 0 -> 1764 bytes .../MerriweatherSans-BoldItalic-tlf-ts1.vf | Bin 0 -> 584 bytes .../MerriweatherSans-ExtraBldItalic-osf-ly1.vf | Bin 1716 -> 0 bytes .../MerriweatherSans-ExtraBldItalic-osf-t1.vf | Bin 1776 -> 0 bytes .../MerriweatherSans-ExtraBldItalic-osf-ts1.vf | Bin 588 -> 0 bytes .../MerriweatherSans-ExtraBold-osf-ly1.vf | Bin 1704 -> 0 bytes .../MerriweatherSans-ExtraBold-osf-t1.vf | Bin 1772 -> 0 bytes .../MerriweatherSans-ExtraBold-osf-ts1.vf | Bin 584 -> 0 bytes .../MerriweatherSans-ExtraBold-tlf-t1.vf | Bin 0 -> 1764 bytes .../MerriweatherSans-ExtraBold-tlf-ts1.vf | Bin 0 -> 584 bytes .../MerriweatherSans-ExtraBoldItalic-tlf-t1.vf | Bin 0 -> 1772 bytes .../MerriweatherSans-ExtraBoldItalic-tlf-ts1.vf | Bin 0 -> 588 bytes .../MerriweatherSans-Italic-osf-ly1.vf | Bin 1708 -> 0 bytes .../merriweather/MerriweatherSans-Italic-osf-t1.vf | Bin 1768 -> 0 bytes .../MerriweatherSans-Italic-osf-ts1.vf | Bin 580 -> 0 bytes .../merriweather/MerriweatherSans-Italic-tlf-t1.vf | Bin 0 -> 1760 bytes .../MerriweatherSans-Italic-tlf-ts1.vf | Bin 0 -> 580 bytes .../merriweather/MerriweatherSans-Light-osf-ly1.vf | Bin 1700 -> 0 bytes .../merriweather/MerriweatherSans-Light-osf-t1.vf | Bin 1768 -> 0 bytes .../merriweather/MerriweatherSans-Light-osf-ts1.vf | Bin 580 -> 0 bytes .../merriweather/MerriweatherSans-Light-tlf-t1.vf | Bin 0 -> 1760 bytes .../merriweather/MerriweatherSans-Light-tlf-ts1.vf | Bin 0 -> 580 bytes .../MerriweatherSans-LightItalic-osf-ly1.vf | Bin 1712 -> 0 bytes .../MerriweatherSans-LightItalic-osf-t1.vf | Bin 1776 -> 0 bytes .../MerriweatherSans-LightItalic-osf-ts1.vf | Bin 584 -> 0 bytes .../MerriweatherSans-LightItalic-tlf-t1.vf | Bin 0 -> 1768 bytes .../MerriweatherSans-LightItalic-tlf-ts1.vf | Bin 0 -> 584 bytes .../MerriweatherSans-Regular-osf-ly1.vf | Bin 1704 -> 0 bytes .../MerriweatherSans-Regular-osf-t1.vf | Bin 1772 -> 0 bytes .../MerriweatherSans-Regular-osf-ts1.vf | Bin 580 -> 0 bytes .../MerriweatherSans-Regular-tlf-t1.vf | Bin 0 -> 1764 bytes .../MerriweatherSans-Regular-tlf-ts1.vf | Bin 0 -> 580 bytes .../tex/latex/merriweather/LY1Merriweather-OsF.fd | 32 ++-- .../latex/merriweather/LY1MerriweatherSans-OsF.fd | 74 -------- .../latex/merriweather/LY1MerriweatherSans-TLF.fd | 74 ++++++++ .../tex/latex/merriweather/Merriweather.sty | 39 ---- .../tex/latex/merriweather/OT1Merriweather-OsF.fd | 32 ++-- .../latex/merriweather/OT1MerriweatherSans-OsF.fd | 74 -------- .../latex/merriweather/OT1MerriweatherSans-TLF.fd | 74 ++++++++ .../tex/latex/merriweather/T1Merriweather-OsF.fd | 32 ++-- .../latex/merriweather/T1MerriweatherSans-OsF.fd | 74 -------- .../latex/merriweather/T1MerriweatherSans-TLF.fd | 74 ++++++++ .../tex/latex/merriweather/TS1Merriweather-OsF.fd | 32 ++-- .../latex/merriweather/TS1MerriweatherSans-OsF.fd | 74 -------- .../latex/merriweather/TS1MerriweatherSans-TLF.fd | 74 ++++++++ .../tex/latex/merriweather/merriweather.sty | 205 +++++++++++++-------- Master/tlpkg/bin/ctan2tl | 3 + 340 files changed, 1112 insertions(+), 1276 deletions(-) delete mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5n6vkx.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc delete mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_aynzzm.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_cn5sfl.enc delete mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fmhdb5.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fuknsh.enc delete mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ioeeie.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jnnjab.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_libw2m.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_lnkfbl.enc delete mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oehznb.enc delete mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oorhm5.enc delete mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_pyutxj.enc delete mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_r5mufr.enc delete mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_rheu2i.enc delete mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_t226xz.enc delete mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_v4a7hp.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ywgpba.enc create mode 100644 Master/texmf-dist/fonts/map/dvips/merriweather/Merriweather.map delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ly1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ly1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ly1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ly1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ot1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-t1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-t1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ts1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ts1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ly1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ly1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ot1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-t1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-t1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ts1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ts1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ly1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ly1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ts1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ly1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ly1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ot1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-t1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-t1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ts1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ly1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ly1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ot1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-t1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-t1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ts1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ts1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ly1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ly1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ot1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-t1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-t1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ly1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ly1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ot1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ly1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ly1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ot1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-t1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-t1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ts1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ts1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ly1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ly1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ot1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ly1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ly1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ot1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-t1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-t1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ly1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ly1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ot1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-t1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-t1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ts1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ly1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ly1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ot1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ly1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ly1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ot1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-t1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-t1.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1--base.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ly1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ot1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1--base.tfm create mode 100644 Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1.tfm create mode 100644 Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-BoldIt.ttf delete mode 100644 Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-BoldItalic.ttf delete mode 100644 Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Heavy.ttf delete mode 100644 Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-HeavyItalic.ttf create mode 100644 Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-LightIt.ttf delete mode 100644 Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-LightItalic.ttf create mode 100644 Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Regular.ttf create mode 100644 Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-UltraBdIt.ttf create mode 100644 Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-UltraBold.ttf delete mode 100644 Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather.ttf create mode 100644 Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-ExBoldIt.ttf delete mode 100644 Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic.ttf create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-BoldIt.pfb delete mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-BoldItalic.pfb delete mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Heavy.pfb delete mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-HeavyItalic.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-LightIt.pfb delete mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-LightItalic.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Regular.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-UltraBdIt.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-UltraBold.pfb delete mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather.pfb create mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-ExBoldIt.pfb delete mode 100644 Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic.pfb delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-ly1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-ly1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Heavy-osf-ly1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Heavy-osf-t1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Heavy-osf-ts1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-HeavyItalic-osf-ly1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-HeavyItalic-osf-t1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-HeavyItalic-osf-ts1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-ly1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-ly1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-osf-ts1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightItalic-osf-ly1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightItalic-osf-t1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightItalic-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-osf-ly1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-osf-t1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-osf-ts1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-ly1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-t1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ly1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ly1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-t1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ts1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ly1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-ly1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-t1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-ly1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-t1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-tlf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ly1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-ly1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-t1.vf delete mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1.vf create mode 100644 Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1.vf delete mode 100644 Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd create mode 100644 Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-TLF.fd delete mode 100644 Master/texmf-dist/tex/latex/merriweather/Merriweather.sty delete mode 100644 Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd create mode 100644 Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-TLF.fd delete mode 100644 Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd create mode 100644 Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-TLF.fd delete mode 100644 Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd create mode 100644 Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-TLF.fd (limited to 'Master') diff --git a/Master/texmf-dist/doc/fonts/merriweather/README b/Master/texmf-dist/doc/fonts/merriweather/README index d7a676ef516..ce70a47036f 100644 --- a/Master/texmf-dist/doc/fonts/merriweather/README +++ b/Master/texmf-dist/doc/fonts/merriweather/README @@ -1,4 +1,4 @@ -This is the README for the merriweather package, version 2013-11-14. +This is the README for the merriweather package, version 2014-01-22. This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for the Merriweather and MerriweatherSans families of fonts, designed by @@ -10,10 +10,12 @@ The Sans family closely harmonizes with the weights and styles of the serif family. There are four weights and italics for each. To install this package on a TDS-compliant TeX system download the -file tex-archive/install/fonts/merriweather.tds.zip and unzip at the -root of an appropriate texmf tree, likely a personal or local tree. If -necessary, update the file-name database (e.g., texhash). Update the -font-map files by enabling the Map file merriweather.map. +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). Update the font-map files by enabling the Map file +merriweather.map. To use, add @@ -51,7 +53,7 @@ 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-oldstyle. Font +The only figure style supported is proportional semi-oldstyle. Font encodings supported are OT1, T1, LY1 and TS1. The original fonts are available at http://www.google.com/webfonts diff --git a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf index 41f50672224..e45ab3c446e 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/fonts/enc/dvips/merriweather/mwth_5n6vkx.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5n6vkx.enc deleted file mode 100644 index d58610f658a..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5n6vkx.enc +++ /dev/null @@ -1,65 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 -% Command line follows encoding -/AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob [ -%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 /.notdef /.notdef /.notdef /.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 - /ffl /ffi /ff /fl /l /fi /i /f -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap -% --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --ligkern=f -% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi -% --ligkern=ff l =: ffl Merriweather.ttf Merriweather-osf-ts1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc new file mode 100644 index 00000000000..16f57fa4cb1 --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc @@ -0,0 +1,66 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_5q2vgdqo7txurrtxwuhjydkywc +% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014 +% Command line follows encoding +/AutoEnc_5q2vgdqo7txurrtxwuhjydkywc [ +%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 /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 +% --type1-directory=texmf/fonts/type1/sorkin/merriweather +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap +% --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --ligkern=f i +% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi +% --ligkern=ff l =: ffl Merriweather-BoldIt.ttf +% Merriweather-BoldItalic-osf-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_aynzzm.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_aynzzm.enc deleted file mode 100644 index 3959221d533..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_aynzzm.enc +++ /dev/null @@ -1,65 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_aynzzmmhmqucetr76d43bpu3kb -% Encoding created by otftotfm on Sun Nov 10 13:54:42 2013 -% Command line follows encoding -/AutoEnc_aynzzmmhmqucetr76d43bpu3kb [ -%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 /.notdef - /.notdef /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l -%20 - /.notdef /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=texmfSC/fonts/tfm/sorkin/merriweather -% --vf-directory=texmfSC/fonts/vf/sorkin/merriweather -% --type1-directory=texmfSC/fonts/type1/sorkin/merriweather -% --truetype-directory=texmfSC/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmfSC/fonts/enc/dvips/merriweather -% --map-file=texmfSC/fonts/map/dvips/merriweather/MerriweatherSans.map -% --no-updmap --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN -% --feature=liga MerriweatherSans-BoldItalic.ttf -% MerriweatherSans-BoldItalic-osf-t1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_cn5sfl.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_cn5sfl.enc new file mode 100644 index 00000000000..9bd30bf6cd2 --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_cn5sfl.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_cn5sfli3xjnpjitjpli7wpzcng +% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014 +% Command line follows encoding +/AutoEnc_cn5sfli3xjnpjitjpli7wpzcng [ +%00 + /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek + /f_f_i /f_f_l /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 /twosuperior /threesuperior /acute /mu /paragraph /periodcentered + /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown +%C0 + /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla + /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis +%D0 + /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply + /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls +%E0 + /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla + /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis +%F0 + /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide + /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ly1 +% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather +% --vf-directory=texmf/fonts/vf/sorkin/merriweather +% --type1-directory=texmf/fonts/type1/sorkin/merriweather +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map +% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=liga MerriweatherSans-BoldItalic.ttf +% MerriweatherSans-BoldItalic-tlf-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fmhdb5.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fmhdb5.enc deleted file mode 100644 index 9c3a4766079..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fmhdb5.enc +++ /dev/null @@ -1,66 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 -% Command line follows encoding -/AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb [ -%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 /.notdef - /.notdef /dotlessi /dotlessj /ffl /ffi /ff /fl /fi -%20 - /.notdef /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 - /.notdef /Aogonek /.notdef /.notdef /.notdef /.notdef /Eogonek /.notdef - /.notdef /.notdef /Lslash /Nacute /.notdef /.notdef /.notdef /Racute -%90 - /Rcaron /.notdef /Scaron /.notdef /.notdef /.notdef /.notdef /.notdef - /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /.notdef /.notdef /section -%A0 - /.notdef /aogonek /.notdef /.notdef /.notdef /.notdef /eogonek /.notdef - /.notdef /.notdef /lslash /nacute /.notdef /.notdef /.notdef /.notdef -%B0 - /rcaron /.notdef /scaron /.notdef /.notdef /.notdef /.notdef /.notdef - /ydieresis /.notdef /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef -%E0 - /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla - /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis -%F0 - /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe - /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls -] def -% Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap -% --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN -% --feature=kern --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff -% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Merriweather.ttf -% Merriweather-osf-t1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fuknsh.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fuknsh.enc new file mode 100644 index 00000000000..8989a672ba8 --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fuknsh.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_fuknshterpxw2flapoda5bxt5e +% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014 +% Command line follows encoding +/AutoEnc_fuknshterpxw2flapoda5bxt5e [ +%00 + /.notdef /Deltagreek /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /Omegagreek /.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 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%A0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%B0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%C0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%D0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%E0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%F0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ot1 +% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather +% --vf-directory=texmf/fonts/vf/sorkin/merriweather +% --type1-directory=texmf/fonts/type1/sorkin/merriweather +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap +% --no-type1 --coding-scheme=TEX TEXT --ligkern=f i =: fi --ligkern=f l =: +% fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% Merriweather-BoldIt.ttf Merriweather-BoldItalic-osf-ot1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ioeeie.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ioeeie.enc deleted file mode 100644 index 63e75cba1e3..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ioeeie.enc +++ /dev/null @@ -1,65 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_ioeeietzkgubb2ua32lkfra3fb -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 -% Command line follows encoding -/AutoEnc_ioeeietzkgubb2ua32lkfra3fb [ -%00 - /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek - /.notdef /.notdef /.notdef /ffl /ffi /ff /fl /fi -%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 -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap -% --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i -% =: ffi --ligkern=ff l =: ffl Merriweather.ttf Merriweather-osf-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jnnjab.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jnnjab.enc new file mode 100644 index 00000000000..8518499a21d --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jnnjab.enc @@ -0,0 +1,66 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d +% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014 +% Command line follows encoding +/AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright +%10 + /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /zerowidthnonjoiner + /.notdef /dotlessi /dotlessj /f_f_l /f_f_i /f_f /f_l /f_i +%20 + /.notdef /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 +% --type1-directory=texmf/fonts/type1/sorkin/merriweather +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap +% --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --ligkern=f +% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi +% --ligkern=ff l =: ffl Merriweather-BoldIt.ttf +% Merriweather-BoldItalic-osf-t1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_libw2m.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_libw2m.enc new file mode 100644 index 00000000000..991e695d162 --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_libw2m.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_libw2mm3qgkydsmoydm6r5agjf +% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014 +% Command line follows encoding +/AutoEnc_libw2mm3qgkydsmoydm6r5agjf [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright +%10 + /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /zerowidthnonjoiner + /.notdef /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l +%20 + /.notdef /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 +% --type1-directory=texmf/fonts/type1/sorkin/merriweather +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map +% --no-updmap --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --feature=liga MerriweatherSans-BoldItalic.ttf +% MerriweatherSans-BoldItalic-tlf-t1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_lnkfbl.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_lnkfbl.enc new file mode 100644 index 00000000000..669d667a71e --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_lnkfbl.enc @@ -0,0 +1,64 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_lnkfblgauyqz3eufwp3wby646h +% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014 +% Command line follows encoding +/AutoEnc_lnkfblgauyqz3eufwp3wby646h [ +%00 + /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek + /f_f_i /f_f_l /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 /.notdef /registered /macron +%B0 + /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered + /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown +%C0 + /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla + /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis +%D0 + /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply + /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls +%E0 + /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla + /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis +%F0 + /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide + /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ly1 +% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather +% --vf-directory=texmf/fonts/vf/sorkin/merriweather +% --type1-directory=texmf/fonts/type1/sorkin/merriweather +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map +% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=liga MerriweatherSans-Bold.ttf MerriweatherSans-Bold-tlf-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oaf34p.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oaf34p.enc index 15f0baf5d2b..1fe8ea6800e 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oaf34p.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oaf34p.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_oaf34pf2gi7ej2vclku475canf -% Encoding created by otftotfm on Sun Nov 10 13:54:42 2013 +% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014 % Command line follows encoding /AutoEnc_oaf34pf2gi7ej2vclku475canf [ %00 @@ -54,11 +54,11 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmfSC/fonts/tfm/sorkin/merriweather -% --vf-directory=texmfSC/fonts/vf/sorkin/merriweather -% --type1-directory=texmfSC/fonts/type1/sorkin/merriweather -% --truetype-directory=texmfSC/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmfSC/fonts/enc/dvips/merriweather -% --map-file=texmfSC/fonts/map/dvips/merriweather/MerriweatherSans.map +% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather +% --vf-directory=texmf/fonts/vf/sorkin/merriweather +% --type1-directory=texmf/fonts/type1/sorkin/merriweather +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map % --no-updmap --no-type1 --coding-scheme=TEX TEXT --feature=liga -% MerriweatherSans-BoldItalic.ttf MerriweatherSans-BoldItalic-osf-ot1' +% MerriweatherSans-BoldItalic.ttf MerriweatherSans-BoldItalic-tlf-ot1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oehznb.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oehznb.enc deleted file mode 100644 index 5ab8dc3e223..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oehznb.enc +++ /dev/null @@ -1,64 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_oehznbo2r4zcimhdrv5eox5qwa -% Encoding created by otftotfm on Sun Nov 10 13:54:42 2013 -% Command line follows encoding -/AutoEnc_oehznbo2r4zcimhdrv5eox5qwa [ -%00 - /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek - /f_f_i /f_f_l /.notdef /.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 /.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=texmfSC/fonts/tfm/sorkin/merriweather -% --vf-directory=texmfSC/fonts/vf/sorkin/merriweather -% --type1-directory=texmfSC/fonts/type1/sorkin/merriweather -% --truetype-directory=texmfSC/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmfSC/fonts/enc/dvips/merriweather -% --map-file=texmfSC/fonts/map/dvips/merriweather/MerriweatherSans.map -% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI -% --feature=liga MerriweatherSans-Bold.ttf MerriweatherSans-Bold-osf-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oorhm5.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oorhm5.enc deleted file mode 100644 index fd2335a37b9..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oorhm5.enc +++ /dev/null @@ -1,66 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_oorhm54fi5wv6dwymf2cdxejnb -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 -% Command line follows encoding -/AutoEnc_oorhm54fi5wv6dwymf2cdxejnb [ -%00 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /asterisk /question -%10 - /C /bar /quotedblbase /exclamdown /exclam /.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 - /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap -% --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --ligkern=f -% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi -% --ligkern=ff l =: ffl Merriweather-BoldItalic.ttf -% Merriweather-BoldItalic-osf-ts1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_pyutxj.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_pyutxj.enc deleted file mode 100644 index 8841ffd9b19..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_pyutxj.enc +++ /dev/null @@ -1,65 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_pyutxj5eda5ufhkmrxym4g7axc -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 -% Command line follows encoding -/AutoEnc_pyutxj5eda5ufhkmrxym4g7axc [ -%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 /.notdef - /.notdef /dotlessi /dotlessj /f_i /f_l /f_f /f_f_i /f_f_l -%20 - /.notdef /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 -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap -% --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN -% --feature=kern --feature=liga Merriweather-BoldItalic.ttf -% Merriweather-BoldItalic-osf-t1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_r5mufr.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_r5mufr.enc deleted file mode 100644 index e7414cdc99f..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_r5mufr.enc +++ /dev/null @@ -1,65 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_r5mufrbd5lxejo566tpmscskrf -% Encoding created by otftotfm on Sun Nov 10 13:54:42 2013 -% Command line follows encoding -/AutoEnc_r5mufrbd5lxejo566tpmscskrf [ -%00 - /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek - /f_f_i /f_f_l /.notdef /.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 /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=texmfSC/fonts/tfm/sorkin/merriweather -% --vf-directory=texmfSC/fonts/vf/sorkin/merriweather -% --type1-directory=texmfSC/fonts/type1/sorkin/merriweather -% --truetype-directory=texmfSC/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmfSC/fonts/enc/dvips/merriweather -% --map-file=texmfSC/fonts/map/dvips/merriweather/MerriweatherSans.map -% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI -% --feature=liga MerriweatherSans-BoldItalic.ttf -% MerriweatherSans-BoldItalic-osf-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_rheu2i.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_rheu2i.enc deleted file mode 100644 index 5a102f5f871..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_rheu2i.enc +++ /dev/null @@ -1,64 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_rheu2iw5zbylrll3yvwgs2uwsf -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 -% Command line follows encoding -/AutoEnc_rheu2iw5zbylrll3yvwgs2uwsf [ -%00 - /.notdef /uni0394 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /uni03A9 /.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_i /f_l /f_f /f_f_i /f_f_l /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%90 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%A0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%B0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap -% --no-type1 --coding-scheme=TEX TEXT --feature=kern --feature=liga -% Merriweather-BoldItalic.ttf Merriweather-BoldItalic-osf-ot1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_t226xz.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_t226xz.enc deleted file mode 100644 index 0c5311d3016..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_t226xz.enc +++ /dev/null @@ -1,65 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_t226xz6ygy6sf2627mglfmb4cf -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 -% Command line follows encoding -/AutoEnc_t226xz6ygy6sf2627mglfmb4cf [ -%00 - /f_i /Euro /f_l /f_f /fraction /dotaccent /hungarumlaut /ogonek - /f_f_i /f_f_l /.notdef /.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 /twosuperior /threesuperior /acute /mu /paragraph /periodcentered - /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls -%E0 - /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla - /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis -%F0 - /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide - /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap -% --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --feature=liga Merriweather-BoldItalic.ttf -% Merriweather-BoldItalic-osf-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_v4a7hp.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_v4a7hp.enc deleted file mode 100644 index 3cb936aef3f..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_v4a7hp.enc +++ /dev/null @@ -1,65 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_v4a7hpkqcqwcnabd77njio5kmc -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 -% Command line follows encoding -/AutoEnc_v4a7hpkqcqwcnabd77njio5kmc [ -%00 - /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /Omega /ff /fi /fl /ffi /ffl -%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 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%90 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%A0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%B0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap -% --no-type1 --coding-scheme=TEX TEXT --feature=kern --ligkern=f i =: fi -% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff -% l =: ffl Merriweather.ttf Merriweather-osf-ot1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc new file mode 100644 index 00000000000..f7febb31f35 --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc @@ -0,0 +1,66 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve +% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014 +% Command line follows encoding +/AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve [ +%00 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /asterisk /question +%10 + /C /bar /quotedblbase /exclamdown /exclam /.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 + /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ts1 +% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather +% --vf-directory=texmf/fonts/vf/sorkin/merriweather +% --type1-directory=texmf/fonts/type1/sorkin/merriweather +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap +% --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --ligkern=f +% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi +% --ligkern=ff l =: ffl Merriweather-BoldIt.ttf +% Merriweather-BoldItalic-osf-ts1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ywgpba.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ywgpba.enc new file mode 100644 index 00000000000..94b0a66706e --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ywgpba.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_ywgpbabmor6izux7hcbqcb56qa +% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014 +% Command line follows encoding +/AutoEnc_ywgpbabmor6izux7hcbqcb56qa [ +%00 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /C /question +%10 + /questiondown /exclam /quotedblbase /exclamdown /asterisk /.notdef /.notdef /.notdef + /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /bar /.notdef +%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 + /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ts1 +% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather +% --vf-directory=texmf/fonts/vf/sorkin/merriweather +% --type1-directory=texmf/fonts/type1/sorkin/merriweather +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap +% --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --ligkern=f +% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi +% --ligkern=ff l =: ffl Merriweather-Bold.ttf Merriweather-Bold-osf-ts1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_z4e4wk.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_z4e4wk.enc index 8277045c8e2..703800e5c19 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_z4e4wk.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_z4e4wk.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_z4e4wksqkjuob7lry6demn2pba -% Encoding created by otftotfm on Sun Nov 10 13:54:42 2013 +% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014 % Command line follows encoding /AutoEnc_z4e4wksqkjuob7lry6demn2pba [ %00 @@ -54,13 +54,13 @@ /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f ] def % Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=texmfSC/fonts/tfm/sorkin/merriweather -% --vf-directory=texmfSC/fonts/vf/sorkin/merriweather -% --type1-directory=texmfSC/fonts/type1/sorkin/merriweather -% --truetype-directory=texmfSC/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmfSC/fonts/enc/dvips/merriweather -% --map-file=texmfSC/fonts/map/dvips/merriweather/MerriweatherSans.map +% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather +% --vf-directory=texmf/fonts/vf/sorkin/merriweather +% --type1-directory=texmf/fonts/type1/sorkin/merriweather +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map % --no-updmap --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i % =: ffi --ligkern=ff l =: ffl MerriweatherSans-BoldItalic.ttf -% MerriweatherSans-BoldItalic-osf-ts1' +% MerriweatherSans-BoldItalic-tlf-ts1' 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..e2060960394 --- /dev/null +++ b/Master/texmf-dist/fonts/map/dvips/merriweather/Merriweather.map @@ -0,0 +1,10 @@ +% Automatically maintained by otftotfm or other programs. Do not edit. + +Merriweather-BoldItalic-osf-ly1 Merriweather-BoldItalic "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[a_5q2vgd.enc \Merriweather@@scale Merriweather-LightItalic-osf-ly1 + <-> \Merriweather@@scale Merriweather-LightIt-osf-ly1 }{} \DeclareFontShape{LY1}{Merriweather-OsF}{l}{sl}{ <-> ssub * Merriweather-OsF/l/it }{} -\DeclareFontShape{LY1}{Merriweather-OsF}{h}{n}{ - <-> \Merriweather@@scale Merriweather-Heavy-osf-ly1 -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{h}{it}{ - <-> \Merriweather@@scale Merriweather-HeavyItalic-osf-ly1 -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{h}{sl}{ - <-> ssub * Merriweather-OsF/h/it -}{} - \DeclareFontShape{LY1}{Merriweather-OsF}{b}{n}{ <-> \Merriweather@@scale Merriweather-Bold-osf-ly1 }{} @@ -48,7 +36,7 @@ }{} \DeclareFontShape{LY1}{Merriweather-OsF}{m}{n}{ - <-> \Merriweather@@scale Merriweather-osf-ly1 + <-> \Merriweather@@scale Merriweather-Regular-osf-ly1 }{} \DeclareFontShape{LY1}{Merriweather-OsF}{m}{it}{ @@ -59,6 +47,18 @@ <-> ssub * Merriweather-OsF/m/it }{} +\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{n}{ + <-> \Merriweather@@scale Merriweather-UltraBold-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{it}{ + <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{sl}{ + <-> ssub * Merriweather-OsF/ub/it +}{} + \DeclareFontShape{LY1}{Merriweather-OsF}{bx}{sl}{ <-> ssub * Merriweather-OsF/b/sl }{} diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd deleted file mode 100644 index 5b878e18a03..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd +++ /dev/null @@ -1,74 +0,0 @@ -%% Generated by autoinst on 2013/11/10 -%% -\ProvidesFile{LY1MerriweatherSans-OsF.fd} - [2013/11/10 (autoinst) Font definitions for LY1/MerriweatherSans-OsF.] - -\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax - \let\MerriweatherSans@@scale\@empty -\else - \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% -\fi - -\DeclareFontFamily{LY1}{MerriweatherSans-OsF}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{l}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{l}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{l}{sl}{ - <-> ssub * MerriweatherSans-OsF/l/it -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{eb}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{eb}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBldItalic-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{eb}{sl}{ - <-> ssub * MerriweatherSans-OsF/eb/it -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{b}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{b}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{b}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{m}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{m}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{m}{sl}{ - <-> ssub * MerriweatherSans-OsF/m/it -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bx}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/sl -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bx}{n}{ - <-> ssub * MerriweatherSans-OsF/b/n -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bx}{it}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-TLF.fd new file mode 100644 index 00000000000..0b5642a3b3e --- /dev/null +++ b/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-TLF.fd @@ -0,0 +1,74 @@ +%% Generated by autoinst on 2014/01/22 +%% +\ProvidesFile{LY1MerriweatherSans-TLF.fd} + [2014/01/22 (autoinst) Font definitions for LY1/MerriweatherSans-TLF.] + +\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax + \let\MerriweatherSans@@scale\@empty +\else + \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{MerriweatherSans-TLF}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{l}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Light-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{l}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{l}{sl}{ + <-> ssub * MerriweatherSans-TLF/l/it +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{eb}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{eb}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{eb}{sl}{ + <-> ssub * MerriweatherSans-TLF/eb/it +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{b}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Bold-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{b}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{b}{sl}{ + <-> ssub * MerriweatherSans-TLF/b/it +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{m}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Regular-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{m}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Italic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{m}{sl}{ + <-> ssub * MerriweatherSans-TLF/m/it +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{bx}{sl}{ + <-> ssub * MerriweatherSans-TLF/b/sl +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{bx}{n}{ + <-> ssub * MerriweatherSans-TLF/b/n +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{bx}{it}{ + <-> ssub * MerriweatherSans-TLF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/Merriweather.sty b/Master/texmf-dist/tex/latex/merriweather/Merriweather.sty deleted file mode 100644 index 5ad107a4760..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/Merriweather.sty +++ /dev/null @@ -1,39 +0,0 @@ -%% Generated by autoinst on 2013/11/10 -%% -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{Merriweather} - [2013/11/10 (autoinst) Style file for Merriweather.] - -\RequirePackage[T1,LY1]{fontenc} -\RequirePackage{textcomp} -\IfFileExists{mweights.sty}{\RequirePackage{mweights}}{} -\IfFileExists{fontaxes.sty}{ - \RequirePackage{fontaxes} -}{} - -\IfFileExists{xkeyval.sty}{ - \newcommand*{\Merriweather@scale}{1} - \RequirePackage{xkeyval} - \DeclareOptionX{scale}{\renewcommand*{\Merriweather@scale}{##1}} - \DeclareOptionX{scaled}{\renewcommand*{\Merriweather@scale}{##1}} -}{ - \let\DeclareOptionX\DeclareOption - \let\ExecuteOptionsX\ExecuteOptions - \let\ProcessOptionsX\ProcessOptions -} - -\DeclareOptionX{oldstyle}{\edef\Merriweather@figurestyle{OsF}} -\DeclareOptionX{proportional}{\edef\Merriweather@figurealign{}} -\DeclareOptionX{heavy}{\edef\bfseries@rm{h}} -\DeclareOptionX{bold}{\edef\bfseries@rm{b}} -\DeclareOptionX{light}{\edef\mdseries@rm{l}} -\DeclareOptionX{regular}{\edef\mdseries@rm{m}} -\ExecuteOptionsX{oldstyle,proportional,bold,regular} -\ProcessOptionsX\relax - -\renewcommand* - {\rmdefault} - {Merriweather-\Merriweather@figurealign\Merriweather@figurestyle} -\renewcommand*{\familydefault}{\rmdefault} - -\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd index 2342ada7497..31ea2fc671b 100644 --- a/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd +++ b/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/11/10 +%% Generated by autoinst on 2014/01/22 %% \ProvidesFile{OT1Merriweather-OsF.fd} - [2013/11/10 (autoinst) Font definitions for OT1/Merriweather-OsF.] + [2014/01/22 (autoinst) Font definitions for OT1/Merriweather-OsF.] \expandafter\ifx\csname Merriweather@scale\endcsname\relax \let\Merriweather@@scale\@empty @@ -16,25 +16,13 @@ }{} \DeclareFontShape{OT1}{Merriweather-OsF}{l}{it}{ - <-> \Merriweather@@scale Merriweather-LightItalic-osf-ot1 + <-> \Merriweather@@scale Merriweather-LightIt-osf-ot1 }{} \DeclareFontShape{OT1}{Merriweather-OsF}{l}{sl}{ <-> ssub * Merriweather-OsF/l/it }{} -\DeclareFontShape{OT1}{Merriweather-OsF}{h}{n}{ - <-> \Merriweather@@scale Merriweather-Heavy-osf-ot1 -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{h}{it}{ - <-> \Merriweather@@scale Merriweather-HeavyItalic-osf-ot1 -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{h}{sl}{ - <-> ssub * Merriweather-OsF/h/it -}{} - \DeclareFontShape{OT1}{Merriweather-OsF}{b}{n}{ <-> \Merriweather@@scale Merriweather-Bold-osf-ot1 }{} @@ -48,7 +36,7 @@ }{} \DeclareFontShape{OT1}{Merriweather-OsF}{m}{n}{ - <-> \Merriweather@@scale Merriweather-osf-ot1 + <-> \Merriweather@@scale Merriweather-Regular-osf-ot1 }{} \DeclareFontShape{OT1}{Merriweather-OsF}{m}{it}{ @@ -59,6 +47,18 @@ <-> ssub * Merriweather-OsF/m/it }{} +\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{n}{ + <-> \Merriweather@@scale Merriweather-UltraBold-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{it}{ + <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{sl}{ + <-> ssub * Merriweather-OsF/ub/it +}{} + \DeclareFontShape{OT1}{Merriweather-OsF}{bx}{sl}{ <-> ssub * Merriweather-OsF/b/sl }{} diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd deleted file mode 100644 index a4d9063b5a4..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd +++ /dev/null @@ -1,74 +0,0 @@ -%% Generated by autoinst on 2013/11/10 -%% -\ProvidesFile{OT1MerriweatherSans-OsF.fd} - [2013/11/10 (autoinst) Font definitions for OT1/MerriweatherSans-OsF.] - -\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax - \let\MerriweatherSans@@scale\@empty -\else - \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% -\fi - -\DeclareFontFamily{OT1}{MerriweatherSans-OsF}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{l}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{l}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{l}{sl}{ - <-> ssub * MerriweatherSans-OsF/l/it -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{eb}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{eb}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBldItalic-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{eb}{sl}{ - <-> ssub * MerriweatherSans-OsF/eb/it -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{b}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{b}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{b}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{m}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{m}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{m}{sl}{ - <-> ssub * MerriweatherSans-OsF/m/it -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bx}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/sl -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bx}{n}{ - <-> ssub * MerriweatherSans-OsF/b/n -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bx}{it}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-TLF.fd new file mode 100644 index 00000000000..8b257f4a70e --- /dev/null +++ b/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-TLF.fd @@ -0,0 +1,74 @@ +%% Generated by autoinst on 2014/01/22 +%% +\ProvidesFile{OT1MerriweatherSans-TLF.fd} + [2014/01/22 (autoinst) Font definitions for OT1/MerriweatherSans-TLF.] + +\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax + \let\MerriweatherSans@@scale\@empty +\else + \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{MerriweatherSans-TLF}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{l}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Light-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{l}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{l}{sl}{ + <-> ssub * MerriweatherSans-TLF/l/it +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{eb}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{eb}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{eb}{sl}{ + <-> ssub * MerriweatherSans-TLF/eb/it +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{b}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Bold-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{b}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{b}{sl}{ + <-> ssub * MerriweatherSans-TLF/b/it +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{m}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Regular-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{m}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Italic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{m}{sl}{ + <-> ssub * MerriweatherSans-TLF/m/it +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{bx}{sl}{ + <-> ssub * MerriweatherSans-TLF/b/sl +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{bx}{n}{ + <-> ssub * MerriweatherSans-TLF/b/n +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{bx}{it}{ + <-> ssub * MerriweatherSans-TLF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd index cae2e3a699a..93b7b387d71 100644 --- a/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd +++ b/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/11/10 +%% Generated by autoinst on 2014/01/22 %% \ProvidesFile{T1Merriweather-OsF.fd} - [2013/11/10 (autoinst) Font definitions for T1/Merriweather-OsF.] + [2014/01/22 (autoinst) Font definitions for T1/Merriweather-OsF.] \expandafter\ifx\csname Merriweather@scale\endcsname\relax \let\Merriweather@@scale\@empty @@ -16,25 +16,13 @@ }{} \DeclareFontShape{T1}{Merriweather-OsF}{l}{it}{ - <-> \Merriweather@@scale Merriweather-LightItalic-osf-t1 + <-> \Merriweather@@scale Merriweather-LightIt-osf-t1 }{} \DeclareFontShape{T1}{Merriweather-OsF}{l}{sl}{ <-> ssub * Merriweather-OsF/l/it }{} -\DeclareFontShape{T1}{Merriweather-OsF}{h}{n}{ - <-> \Merriweather@@scale Merriweather-Heavy-osf-t1 -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{h}{it}{ - <-> \Merriweather@@scale Merriweather-HeavyItalic-osf-t1 -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{h}{sl}{ - <-> ssub * Merriweather-OsF/h/it -}{} - \DeclareFontShape{T1}{Merriweather-OsF}{b}{n}{ <-> \Merriweather@@scale Merriweather-Bold-osf-t1 }{} @@ -48,7 +36,7 @@ }{} \DeclareFontShape{T1}{Merriweather-OsF}{m}{n}{ - <-> \Merriweather@@scale Merriweather-osf-t1 + <-> \Merriweather@@scale Merriweather-Regular-osf-t1 }{} \DeclareFontShape{T1}{Merriweather-OsF}{m}{it}{ @@ -59,6 +47,18 @@ <-> ssub * Merriweather-OsF/m/it }{} +\DeclareFontShape{T1}{Merriweather-OsF}{ub}{n}{ + <-> \Merriweather@@scale Merriweather-UltraBold-osf-t1 +}{} + +\DeclareFontShape{T1}{Merriweather-OsF}{ub}{it}{ + <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-t1 +}{} + +\DeclareFontShape{T1}{Merriweather-OsF}{ub}{sl}{ + <-> ssub * Merriweather-OsF/ub/it +}{} + \DeclareFontShape{T1}{Merriweather-OsF}{bx}{sl}{ <-> ssub * Merriweather-OsF/b/sl }{} diff --git a/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd deleted file mode 100644 index eef2f1d171a..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd +++ /dev/null @@ -1,74 +0,0 @@ -%% Generated by autoinst on 2013/11/10 -%% -\ProvidesFile{T1MerriweatherSans-OsF.fd} - [2013/11/10 (autoinst) Font definitions for T1/MerriweatherSans-OsF.] - -\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax - \let\MerriweatherSans@@scale\@empty -\else - \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% -\fi - -\DeclareFontFamily{T1}{MerriweatherSans-OsF}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{l}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{l}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{l}{sl}{ - <-> ssub * MerriweatherSans-OsF/l/it -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{eb}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{eb}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBldItalic-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{eb}{sl}{ - <-> ssub * MerriweatherSans-OsF/eb/it -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{b}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{b}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{b}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{m}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{m}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{m}{sl}{ - <-> ssub * MerriweatherSans-OsF/m/it -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{bx}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/sl -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{bx}{n}{ - <-> ssub * MerriweatherSans-OsF/b/n -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{bx}{it}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-TLF.fd new file mode 100644 index 00000000000..b0e0be3a0d2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-TLF.fd @@ -0,0 +1,74 @@ +%% Generated by autoinst on 2014/01/22 +%% +\ProvidesFile{T1MerriweatherSans-TLF.fd} + [2014/01/22 (autoinst) Font definitions for T1/MerriweatherSans-TLF.] + +\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax + \let\MerriweatherSans@@scale\@empty +\else + \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{MerriweatherSans-TLF}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{l}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Light-tlf-t1 +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{l}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-tlf-t1 +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{l}{sl}{ + <-> ssub * MerriweatherSans-TLF/l/it +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{eb}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-tlf-t1 +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{eb}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-tlf-t1 +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{eb}{sl}{ + <-> ssub * MerriweatherSans-TLF/eb/it +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{b}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Bold-tlf-t1 +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{b}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-tlf-t1 +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{b}{sl}{ + <-> ssub * MerriweatherSans-TLF/b/it +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{m}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Regular-tlf-t1 +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{m}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Italic-tlf-t1 +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{m}{sl}{ + <-> ssub * MerriweatherSans-TLF/m/it +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{bx}{sl}{ + <-> ssub * MerriweatherSans-TLF/b/sl +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{bx}{n}{ + <-> ssub * MerriweatherSans-TLF/b/n +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{bx}{it}{ + <-> ssub * MerriweatherSans-TLF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd index b136f111362..75dd3b220ce 100644 --- a/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd +++ b/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/11/10 +%% Generated by autoinst on 2014/01/22 %% \ProvidesFile{TS1Merriweather-OsF.fd} - [2013/11/10 (autoinst) Font definitions for TS1/Merriweather-OsF.] + [2014/01/22 (autoinst) Font definitions for TS1/Merriweather-OsF.] \expandafter\ifx\csname Merriweather@scale\endcsname\relax \let\Merriweather@@scale\@empty @@ -16,25 +16,13 @@ }{} \DeclareFontShape{TS1}{Merriweather-OsF}{l}{it}{ - <-> \Merriweather@@scale Merriweather-LightItalic-osf-ts1 + <-> \Merriweather@@scale Merriweather-LightIt-osf-ts1 }{} \DeclareFontShape{TS1}{Merriweather-OsF}{l}{sl}{ <-> ssub * Merriweather-OsF/l/it }{} -\DeclareFontShape{TS1}{Merriweather-OsF}{h}{n}{ - <-> \Merriweather@@scale Merriweather-Heavy-osf-ts1 -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{h}{it}{ - <-> \Merriweather@@scale Merriweather-HeavyItalic-osf-ts1 -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{h}{sl}{ - <-> ssub * Merriweather-OsF/h/it -}{} - \DeclareFontShape{TS1}{Merriweather-OsF}{b}{n}{ <-> \Merriweather@@scale Merriweather-Bold-osf-ts1 }{} @@ -48,7 +36,7 @@ }{} \DeclareFontShape{TS1}{Merriweather-OsF}{m}{n}{ - <-> \Merriweather@@scale Merriweather-osf-ts1 + <-> \Merriweather@@scale Merriweather-Regular-osf-ts1 }{} \DeclareFontShape{TS1}{Merriweather-OsF}{m}{it}{ @@ -59,6 +47,18 @@ <-> ssub * Merriweather-OsF/m/it }{} +\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{n}{ + <-> \Merriweather@@scale Merriweather-UltraBold-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{it}{ + <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{sl}{ + <-> ssub * Merriweather-OsF/ub/it +}{} + \DeclareFontShape{TS1}{Merriweather-OsF}{bx}{sl}{ <-> ssub * Merriweather-OsF/b/sl }{} diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd deleted file mode 100644 index a42d873f4fc..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd +++ /dev/null @@ -1,74 +0,0 @@ -%% Generated by autoinst on 2013/11/10 -%% -\ProvidesFile{TS1MerriweatherSans-OsF.fd} - [2013/11/10 (autoinst) Font definitions for TS1/MerriweatherSans-OsF.] - -\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax - \let\MerriweatherSans@@scale\@empty -\else - \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% -\fi - -\DeclareFontFamily{TS1}{MerriweatherSans-OsF}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{l}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{l}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{l}{sl}{ - <-> ssub * MerriweatherSans-OsF/l/it -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{eb}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{eb}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBldItalic-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{eb}{sl}{ - <-> ssub * MerriweatherSans-OsF/eb/it -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{b}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{b}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{b}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{m}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{m}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{m}{sl}{ - <-> ssub * MerriweatherSans-OsF/m/it -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bx}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/sl -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bx}{n}{ - <-> ssub * MerriweatherSans-OsF/b/n -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bx}{it}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-TLF.fd new file mode 100644 index 00000000000..b8a6fdde783 --- /dev/null +++ b/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-TLF.fd @@ -0,0 +1,74 @@ +%% Generated by autoinst on 2014/01/22 +%% +\ProvidesFile{TS1MerriweatherSans-TLF.fd} + [2014/01/22 (autoinst) Font definitions for TS1/MerriweatherSans-TLF.] + +\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax + \let\MerriweatherSans@@scale\@empty +\else + \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS1}{MerriweatherSans-TLF}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{l}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Light-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{l}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{l}{sl}{ + <-> ssub * MerriweatherSans-TLF/l/it +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{eb}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{eb}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{eb}{sl}{ + <-> ssub * MerriweatherSans-TLF/eb/it +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{b}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Bold-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{b}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{b}{sl}{ + <-> ssub * MerriweatherSans-TLF/b/it +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{m}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Regular-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{m}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Italic-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{m}{sl}{ + <-> ssub * MerriweatherSans-TLF/m/it +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{bx}{sl}{ + <-> ssub * MerriweatherSans-TLF/b/sl +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{bx}{n}{ + <-> ssub * MerriweatherSans-TLF/b/n +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{bx}{it}{ + <-> ssub * MerriweatherSans-TLF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty index db74160f0f3..cd4500fb662 100644 --- a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty +++ b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty @@ -1,5 +1,5 @@ \ProvidesPackage{merriweather}[% - 2013/11/10 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ] + 2014/01/22 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ] \RequirePackage{ifxetex,ifluatex,textcomp} @@ -53,11 +53,6 @@ % Set main and/or sans fonts: \ifmerriweather@ttf - \def\merriweather@rmboldstyle{Bold} - \def\merriweather@sfboldstyle{Bold} - \ifmerriweather@rmblack\def\merriweather@rmboldstyle{Heavy}\fi - \ifmerriweather@sfblack\def\merriweather@sfboldstyle{ExtraBold}\fi - \ifxetex\XeTeXtracingfonts=1\fi \defaultfontfeatures{ Ligatures = TeX , @@ -65,38 +60,128 @@ } \ifmerriweather@rm \ifmerriweather@rmlight - \setmainfont - [ UprightFont = *-Light , - ItalicFont = *-LightItalic , - BoldFont = *-\merriweather@rmboldstyle , - BoldItalicFont = *-\merriweather@rmboldstyle Italic ] - {Merriweather} + \ifmerriweather@rmblack + \setmainfont + [ UprightFont = *-Light , + ItalicFont = *-LightIt , + BoldFont = *-UltraBold , + BoldItalicFont = *-UltraBdIt ] + {Merriweather} + \newfontfamily\merriweather + [ UprightFont = *-Light , + ItalicFont = *-LightIt , + BoldFont = *-UltraBold , + BoldItalicFont = *-UltraBdIt ] + {Merriweather} + \else + \setmainfont + [ UprightFont = *-Light , + ItalicFont = *-LightIt , + BoldFont = *-Bold , + BoldItalicFont = *-BoldIt ] + {Merriweather} + \newfontfamily\merriweather + [ UprightFont = *-Light , + ItalicFont = *-LightIt , + BoldFont = *-Bold , + BoldItalicFont = *-BoldIt ] + {Merriweather} + \fi \else - \setmainfont - [ UprightFont = * , - ItalicFont = *-Italic , - BoldFont = *-\merriweather@rmboldstyle , - BoldItalicFont = *-\merriweather@rmboldstyle Italic ] - {Merriweather} + \ifmerriweather@rmblack + \setmainfont + [ UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-UltraBold , + BoldItalicFont = *-UltraBdIt ] + {Merriweather} + \newfontfamily\merriweather + [ UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-UltraBold , + BoldItalicFont = *-UltraBdIt ] + {Merriweather} + \else + \setmainfont + [ UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldIt ] + {Merriweather} + \newfontfamily\merriweather + [ UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldIt ] + {Merriweather} + \fi \fi \fi \ifmerriweather@sf \ifmerriweather@sflight - \setsansfont - [ Scale = \MerriweatherSans@scale , - UprightFont = *-Light , - ItalicFont = *-LightItalic , - BoldFont = *-\merriweather@sfboldstyle , - BoldItalicFont = *-\merriweather@sfboldstyle Italic ] - {MerriweatherSans} + \ifmerriweather@sfblack + \setsansfont + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Light , + ItalicFont = *-LightItalic , + BoldFont = *-ExtraBold , + BoldItalicFont = *-ExBoldIt ] + {MerriweatherSans} + \newfontfamily\merriweathersans + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Light , + ItalicFont = *-LightItalic , + BoldFont = *-ExtraBold , + BoldItalicFont = *-ExBoldIt ] + {MerriweatherSans} + \else + \setsansfont + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Light , + ItalicFont = *-LightItalic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] + {MerriweatherSans} + \newfontfamily\merriweathersans + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Light , + ItalicFont = *-LightItalic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] + {MerriweatherSans} + \fi \else - \setsansfont - [ Scale = \MerriweatherSans@scale , - UprightFont = *-Regular , - ItalicFont = *-Italic , - BoldFont = *-\merriweather@sfboldstyle , - BoldItalicFont = *-\merriweather@sfboldstyle Italic ] - {MerriweatherSans} + \ifmerriweather@sfblack + \setsansfont + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-ExtraBold , + BoldItalicFont = *-ExBoldIt ] + {MerriweatherSans} + \newfontfamily\merriweathersans + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-ExtraBold , + BoldItalicFont = *-ExBoldIt ] + {MerriweatherSans} + \else + \setsansfont + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] + {MerriweatherSans} + \newfontfamily\merriweathersans + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] + {MerriweatherSans} + \fi \fi \fi % grab the \sfdefault in case it changes subsequently: @@ -104,43 +189,11 @@ \ifmerriweather@sfdefault \renewcommand*\familydefault{\merriweathersffamily} \fi - \ifmerriweather@rmlight - \newfontfamily\merriweather - [ UprightFont = *-Light , - ItalicFont = *-LightItalic , - BoldFont = *-\merriweather@rmboldstyle , - BoldItalicFont = *-\merriweather@rmboldstyle Italic ] - {Merriweather} - \else - \newfontfamily\merriweather - [ UprightFont = * , - ItalicFont = *-Italic , - BoldFont = *-\merriweather@rmboldstyle , - BoldItalicFont = *-\merriweather@rmboldstyle Italic ] - {Merriweather} - \fi - \ifmerriweather@sflight - \newfontfamily\merriweathersans - [ Scale = \MerriweatherSans@scale , - UprightFont = *-Light , - ItalicFont = *-LightItalic , - BoldFont = *-\merriweather@sfboldstyle , - BoldItalicFont = *-\merriweather@sfboldstyle Italic ] - {MerriweatherSans} - \else - \newfontfamily\merriweathersans - [ Scale = \MerriweatherSans@scale , - UprightFont = *-Regular , - ItalicFont = *-Italic , - BoldFont = *-\merriweather@sfboldstyle , - BoldItalicFont = *-\merriweather@sfboldstyle Italic ] - {MerriweatherSans} - \fi \newfontfamily\merriweatherlight [ UprightFont = *-Light , - ItalicFont = *-LightItalic , - BoldFont = *-\merriweather@rmboldstyle , - BoldItalicFont = *-\merriweather@rmboldstyle Italic ] + ItalicFont = *-LightIt , + BoldFont = *-Light , + BoldItalicFont = *-LightIt ] {Merriweather} \newfontfamily\merriweathersanslight [ Scale = \MerriweatherSans@scale , @@ -150,24 +203,24 @@ BoldItalicFont = *-LightItalic ] {MerriweatherSans} \newfontfamily\merriweatherblack - [ UprightFont = *-Heavy , - ItalicFont = *-HeavyItalic , - BoldFont = *-Heavy , - BoldItalicFont = *-HeavyItalic ] + [ UprightFont = *-UltraBold , + ItalicFont = *-UltraBdIt , + BoldFont = *-UltraBold , + BoldItalicFont = *-UltraBdIt ] {Merriweather} \newfontfamily\merriweathersansblack [ Scale = \MerriweatherSans@scale , UprightFont = *-ExtraBold , - ItalicFont = *-ExtraBoldItalic , + ItalicFont = *-ExBoldIt , BoldFont = *-ExtraBold , - BoldItalicFont = *-ExtraBoldItalic ] + BoldItalicFont = *-ExBoldIt ] {MerriweatherSans} \else % type1 \ifmerriweather@rm \ifmerriweather@rmlight\def\mdseries@rm{l}\else\def\mdseries@rm{m}\fi - \ifmerriweather@rmblack\def\bfseries@rm{h}\else\def\bfseries@rm{b}\fi + \ifmerriweather@rmblack\def\bfseries@rm{ub}\else\def\bfseries@rm{b}\fi \else \def\mdseries@rm{m}\def\bfseries@rm{b} \fi @@ -181,7 +234,7 @@ \def\merriweatherfamily{Merriweather-OsF} - \def\merriweathersffamily{MerriweatherSans-OsF} + \def\merriweathersffamily{MerriweatherSans-TLF} \ifmerriweather@rm \renewcommand*\rmdefault{\merriweatherfamily} @@ -201,7 +254,7 @@ \newcommand*\merriweathersans{\fontfamily{\merriweathersffamily}\selectfont} \newcommand*\merriweatherlight{\fontfamily{\merriweatherfamily}\fontseries{l}\selectfont} \newcommand*\merriweathersanslight{\fontfamily{\merriweathersffamily}\fontseries{l}\selectfont} - \newcommand*\merriweatherblack{\fontfamily{\merriweatherfamily}\fontseries{h}\selectfont} + \newcommand*\merriweatherblack{\fontfamily{\merriweatherfamily}\fontseries{ub}\selectfont} \newcommand*\merriweathersansblack{\fontfamily{\merriweathersffamily}\fontseries{eb}\selectfont} \fi diff --git a/Master/tlpkg/bin/ctan2tl b/Master/tlpkg/bin/ctan2tl index 7f857c1fe02..430e83a85c0 100755 --- a/Master/tlpkg/bin/ctan2tl +++ b/Master/tlpkg/bin/ctan2tl @@ -135,6 +135,9 @@ if test -n "`find -name \*\ \*`"; then exit 1 fi +# check for file names differing in case only. +find $refroot \( -name .svn \) -prune -o -print | sort -f | uniq -i -d >&2 + # show list of files (and tee to tmp). find $pkg \! -type d -printf "%TY%Tm%Td.%TH%TM %p\n" | sort -k2 \ | tee ${TMPDIR-/tmp}/ctan2tl.files -- cgit v1.2.3