diff options
| author | Karl Berry <karl@freefriends.org> | 2014-06-16 23:14:13 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2014-06-16 23:14:13 +0000 |
| commit | c34d7811fa0e8cbe77c0625c5720c1821b242d52 (patch) | |
| tree | 94535d4e2b1845e64afa55c6cc1d470c7b551e23 | |
| parent | 172eddb635379ff047035e8a5fdc0e436711bd97 (diff) | |
merriweather
git-svn-id: svn://tug.org/texlive/trunk@34263 c570f23f-e606-0410-a88d-b1316a301751
291 files changed, 675 insertions, 839 deletions
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 Binary files differindex 41f50672224..e45ab3c446e 100644 --- a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf +++ b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_r5mufr.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc index e7414cdc99f..16f57fa4cb1 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_r5mufr.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc @@ -1,12 +1,12 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_r5mufrbd5lxejo566tpmscskrf -% Encoding created by otftotfm on Sun Nov 10 13:54:42 2013 +%%AutoEnc_5q2vgdqo7txurrtxwuhjydkywc +% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014 % Command line follows encoding -/AutoEnc_r5mufrbd5lxejo566tpmscskrf [ +/AutoEnc_5q2vgdqo7txurrtxwuhjydkywc [ %00 - /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek - /f_f_i /f_f_l /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek + /.notdef /.notdef /zerowidthnonjoiner /f_f_l /f_f_i /f_f /f_l /f_i %10 /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash @@ -38,8 +38,8 @@ /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 + /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 @@ -54,12 +54,13 @@ /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' +% --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_t226xz.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_cn5sfl.enc index 0c5311d3016..9bd30bf6cd2 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_t226xz.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_cn5sfl.enc @@ -1,12 +1,12 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_t226xz6ygy6sf2627mglfmb4cf -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 +%%AutoEnc_cn5sfli3xjnpjitjpli7wpzcng +% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014 % Command line follows encoding -/AutoEnc_t226xz6ygy6sf2627mglfmb4cf [ +/AutoEnc_cn5sfli3xjnpjitjpli7wpzcng [ %00 - /f_i /Euro /f_l /f_f /fraction /dotaccent /hungarumlaut /ogonek - /f_f_i /f_f_l /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /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 @@ -59,7 +59,7 @@ % --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' +% --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_v4a7hp.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fuknsh.enc index 3cb936aef3f..8989a672ba8 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_v4a7hp.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fuknsh.enc @@ -1,12 +1,12 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_v4a7hpkqcqwcnabd77njio5kmc -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 +%%AutoEnc_fuknshterpxw2flapoda5bxt5e +% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014 % Command line follows encoding -/AutoEnc_v4a7hpkqcqwcnabd77njio5kmc [ +/AutoEnc_fuknshterpxw2flapoda5bxt5e [ %00 - /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /Omega /ff /fi /fl /ffi /ffl + /.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 @@ -60,6 +60,6 @@ % --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' +% --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_pyutxj.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jnnjab.enc index 8841ffd9b19..8518499a21d 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_pyutxj.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jnnjab.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_pyutxj5eda5ufhkmrxym4g7axc -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 +%%AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d +% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014 % Command line follows encoding -/AutoEnc_pyutxj5eda5ufhkmrxym4g7axc [ +/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 /.notdef - /.notdef /dotlessi /dotlessj /f_i /f_l /f_f /f_f_i /f_f_l + /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 @@ -60,6 +60,7 @@ % --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 +% --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_aynzzm.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_libw2m.enc index 3959221d533..991e695d162 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_aynzzm.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_libw2m.enc @@ -1,14 +1,14 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_aynzzmmhmqucetr76d43bpu3kb -% Encoding created by otftotfm on Sun Nov 10 13:54:42 2013 +%%AutoEnc_libw2mm3qgkydsmoydm6r5agjf +% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014 % Command line follows encoding -/AutoEnc_aynzzmmhmqucetr76d43bpu3kb [ +/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 /.notdef + /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 @@ -54,12 +54,12 @@ /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 +% --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-osf-t1' +% MerriweatherSans-BoldItalic-tlf-t1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ioeeie.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_lnkfbl.enc index 63e75cba1e3..669d667a71e 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ioeeie.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_lnkfbl.enc @@ -1,12 +1,12 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_ioeeietzkgubb2ua32lkfra3fb -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 +%%AutoEnc_lnkfblgauyqz3eufwp3wby646h +% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014 % Command line follows encoding -/AutoEnc_ioeeietzkgubb2ua32lkfra3fb [ +/AutoEnc_lnkfblgauyqz3eufwp3wby646h [ %00 - /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek - /.notdef /.notdef /.notdef /ffl /ffi /ff /fl /fi + /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 @@ -59,7 +59,6 @@ % --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' +% --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_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_oorhm5.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc index fd2335a37b9..f7febb31f35 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oorhm5.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_oorhm54fi5wv6dwymf2cdxejnb -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 +%%AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve +% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014 % Command line follows encoding -/AutoEnc_oorhm54fi5wv6dwymf2cdxejnb [ +/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 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.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 @@ -21,7 +21,7 @@ /.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 + /.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 @@ -30,16 +30,16 @@ /.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 + /bullet /.notdef /.notdef /.notdef /florin /colonmonetary /won /.notdef %90 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark + /.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 /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered - /.notdef /onesuperior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro + /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 @@ -62,5 +62,5 @@ % --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 +% --ligkern=ff l =: ffl Merriweather-BoldIt.ttf % Merriweather-BoldItalic-osf-ts1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5n6vkx.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ywgpba.enc index d58610f658a..94b0a66706e 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5n6vkx.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ywgpba.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 +%%AutoEnc_ywgpbabmor6izux7hcbqcb56qa +% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014 % Command line follows encoding -/AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob [ +/AutoEnc_ywgpbabmor6izux7hcbqcb56qa [ %00 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk + /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /C /question %10 - /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef + /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 @@ -21,7 +21,7 @@ /.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 + /.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 @@ -30,16 +30,16 @@ /.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 + /bullet /.notdef /.notdef /.notdef /florin /colonmonetary /won /.notdef %90 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.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 /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered - /.notdef /onesuperior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro + /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 @@ -51,7 +51,7 @@ /.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 + /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 @@ -62,4 +62,4 @@ % --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' +% --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-BoldIt.ttf +Merriweather-Bold-osf-ly1 Merriweather-Bold "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[a_5q2vgd.enc <Merriweather-Bold.ttf +Merriweather-Italic-osf-ly1 Merriweather-Italic "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[a_5q2vgd.enc <Merriweather-Italic.ttf +Merriweather-LightIt-osf-ly1 Merriweather-LightIt "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[a_5q2vgd.enc <Merriweather-LightIt.ttf +Merriweather-Light-osf-ly1 Merriweather-Light "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[a_5q2vgd.enc <Merriweather-Light.ttf +Merriweather-Regular-osf-ly1 Merriweather-Regular "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[a_5q2vgd.enc <Merriweather-Regular.ttf +Merriweather-UltraBdIt-osf-ly1 Merriweather-UltraBdIt "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[a_5q2vgd.enc <Merriweather-UltraBdIt.ttf +Merriweather-UltraBold-osf-ly1 Merriweather-UltraBold "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[a_5q2vgd.enc <Merriweather-UltraBold.ttf diff --git a/Master/texmf-dist/fonts/map/dvips/merriweather/merriweather.map b/Master/texmf-dist/fonts/map/dvips/merriweather/merriweather.map index 059c73fc7a2..54dc28afce0 100644 --- a/Master/texmf-dist/fonts/map/dvips/merriweather/merriweather.map +++ b/Master/texmf-dist/fonts/map/dvips/merriweather/merriweather.map @@ -1,65 +1,65 @@ -Merriweather-osf-ot1 Merriweather "AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont" <[mwth_v4a7hp.enc <Merriweather.pfb -Merriweather-osf-t1--base Merriweather "AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont" <[mwth_fmhdb5.enc <Merriweather.pfb -Merriweather-osf-ly1--base Merriweather "AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont" <[mwth_ioeeie.enc <Merriweather.pfb -Merriweather-osf-ts1--base Merriweather "AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont" <[mwth_5n6vkx.enc <Merriweather.pfb -Merriweather-BoldItalic-osf-ot1 Merriweather-BoldItalic "AutoEnc_rheu2iw5zbylrll3yvwgs2uwsf ReEncodeFont" <[mwth_rheu2i.enc <Merriweather-BoldItalic.pfb -Merriweather-BoldItalic-osf-t1--base Merriweather-BoldItalic "AutoEnc_pyutxj5eda5ufhkmrxym4g7axc ReEncodeFont" <[mwth_pyutxj.enc <Merriweather-BoldItalic.pfb -Merriweather-BoldItalic-osf-ly1--base Merriweather-BoldItalic "AutoEnc_t226xz6ygy6sf2627mglfmb4cf ReEncodeFont" <[mwth_t226xz.enc <Merriweather-BoldItalic.pfb -Merriweather-BoldItalic-osf-ts1--base Merriweather-BoldItalic "AutoEnc_oorhm54fi5wv6dwymf2cdxejnb ReEncodeFont" <[mwth_oorhm5.enc <Merriweather-BoldItalic.pfb -Merriweather-Bold-osf-ot1 Merriweather-Bold "AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont" <[mwth_v4a7hp.enc <Merriweather-Bold.pfb -Merriweather-Bold-osf-t1--base Merriweather-Bold "AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont" <[mwth_fmhdb5.enc <Merriweather-Bold.pfb -Merriweather-Bold-osf-ly1--base Merriweather-Bold "AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont" <[mwth_ioeeie.enc <Merriweather-Bold.pfb -Merriweather-Bold-osf-ts1--base Merriweather-Bold "AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont" <[mwth_5n6vkx.enc <Merriweather-Bold.pfb -Merriweather-HeavyItalic-osf-ot1 Merriweather-HeavyItalic "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <Merriweather-HeavyItalic.pfb -Merriweather-HeavyItalic-osf-t1--base Merriweather-HeavyItalic "AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont" <[mwth_aynzzm.enc <Merriweather-HeavyItalic.pfb -Merriweather-HeavyItalic-osf-ly1--base Merriweather-HeavyItalic "AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont" <[mwth_oehznb.enc <Merriweather-HeavyItalic.pfb -Merriweather-HeavyItalic-osf-ts1--base Merriweather-HeavyItalic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <Merriweather-HeavyItalic.pfb -Merriweather-Heavy-osf-ot1 Merriweather-Heavy "AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont" <[mwth_v4a7hp.enc <Merriweather-Heavy.pfb -Merriweather-Heavy-osf-t1--base Merriweather-Heavy "AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont" <[mwth_fmhdb5.enc <Merriweather-Heavy.pfb -Merriweather-Heavy-osf-ly1--base Merriweather-Heavy "AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont" <[mwth_ioeeie.enc <Merriweather-Heavy.pfb -Merriweather-Heavy-osf-ts1--base Merriweather-Heavy "AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont" <[mwth_5n6vkx.enc <Merriweather-Heavy.pfb -Merriweather-Italic-osf-ot1 Merriweather-Italic "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <Merriweather-Italic.pfb -Merriweather-Italic-osf-t1--base Merriweather-Italic "AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont" <[mwth_aynzzm.enc <Merriweather-Italic.pfb -Merriweather-Italic-osf-ly1--base Merriweather-Italic "AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont" <[mwth_r5mufr.enc <Merriweather-Italic.pfb -Merriweather-Italic-osf-ts1--base Merriweather-Italic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <Merriweather-Italic.pfb -Merriweather-LightItalic-osf-ot1 Merriweather-LightItalic "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <Merriweather-LightItalic.pfb -Merriweather-LightItalic-osf-t1--base Merriweather-LightItalic "AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont" <[mwth_aynzzm.enc <Merriweather-LightItalic.pfb -Merriweather-LightItalic-osf-ly1--base Merriweather-LightItalic "AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont" <[mwth_r5mufr.enc <Merriweather-LightItalic.pfb -Merriweather-LightItalic-osf-ts1--base Merriweather-LightItalic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <Merriweather-LightItalic.pfb -Merriweather-Light-osf-ot1 Merriweather-Light "AutoEnc_v4a7hpkqcqwcnabd77njio5kmc ReEncodeFont" <[mwth_v4a7hp.enc <Merriweather-Light.pfb -Merriweather-Light-osf-t1--base Merriweather-Light "AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb ReEncodeFont" <[mwth_fmhdb5.enc <Merriweather-Light.pfb -Merriweather-Light-osf-ly1--base Merriweather-Light "AutoEnc_ioeeietzkgubb2ua32lkfra3fb ReEncodeFont" <[mwth_ioeeie.enc <Merriweather-Light.pfb -Merriweather-Light-osf-ts1--base Merriweather-Light "AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob ReEncodeFont" <[mwth_5n6vkx.enc <Merriweather-Light.pfb +Merriweather-BoldItalic-osf-ot1 Merriweather-BoldItalic "AutoEnc_fuknshterpxw2flapoda5bxt5e ReEncodeFont" <[mwth_fuknsh.enc <Merriweather-BoldIt.pfb +Merriweather-BoldItalic-osf-t1--base Merriweather-BoldItalic "AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d ReEncodeFont" <[mwth_jnnjab.enc <Merriweather-BoldIt.pfb +Merriweather-BoldItalic-osf-ly1 Merriweather-BoldItalic "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-BoldIt.pfb +Merriweather-BoldItalic-osf-ts1--base Merriweather-BoldItalic "AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve ReEncodeFont" <[mwth_xz5wux.enc <Merriweather-BoldIt.pfb +Merriweather-Bold-osf-ot1 Merriweather-Bold "AutoEnc_fuknshterpxw2flapoda5bxt5e ReEncodeFont" <[mwth_fuknsh.enc <Merriweather-Bold.pfb +Merriweather-Bold-osf-t1--base Merriweather-Bold "AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d ReEncodeFont" <[mwth_jnnjab.enc <Merriweather-Bold.pfb +Merriweather-Bold-osf-ly1 Merriweather-Bold "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-Bold.pfb +Merriweather-Bold-osf-ts1--base Merriweather-Bold "AutoEnc_ywgpbabmor6izux7hcbqcb56qa ReEncodeFont" <[mwth_ywgpba.enc <Merriweather-Bold.pfb +Merriweather-Italic-osf-ot1 Merriweather-Italic "AutoEnc_fuknshterpxw2flapoda5bxt5e ReEncodeFont" <[mwth_fuknsh.enc <Merriweather-Italic.pfb +Merriweather-Italic-osf-t1--base Merriweather-Italic "AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d ReEncodeFont" <[mwth_jnnjab.enc <Merriweather-Italic.pfb +Merriweather-Italic-osf-ly1 Merriweather-Italic "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-Italic.pfb +Merriweather-Italic-osf-ts1--base Merriweather-Italic "AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve ReEncodeFont" <[mwth_xz5wux.enc <Merriweather-Italic.pfb +Merriweather-LightIt-osf-ot1 Merriweather-LightIt "AutoEnc_fuknshterpxw2flapoda5bxt5e ReEncodeFont" <[mwth_fuknsh.enc <Merriweather-LightIt.pfb +Merriweather-LightIt-osf-t1--base Merriweather-LightIt "AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d ReEncodeFont" <[mwth_jnnjab.enc <Merriweather-LightIt.pfb +Merriweather-LightIt-osf-ly1 Merriweather-LightIt "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-LightIt.pfb +Merriweather-LightIt-osf-ts1--base Merriweather-LightIt "AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve ReEncodeFont" <[mwth_xz5wux.enc <Merriweather-LightIt.pfb +Merriweather-Light-osf-ot1 Merriweather-Light "AutoEnc_fuknshterpxw2flapoda5bxt5e ReEncodeFont" <[mwth_fuknsh.enc <Merriweather-Light.pfb +Merriweather-Light-osf-t1--base Merriweather-Light "AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d ReEncodeFont" <[mwth_jnnjab.enc <Merriweather-Light.pfb +Merriweather-Light-osf-ly1 Merriweather-Light "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-Light.pfb +Merriweather-Light-osf-ts1--base Merriweather-Light "AutoEnc_ywgpbabmor6izux7hcbqcb56qa ReEncodeFont" <[mwth_ywgpba.enc <Merriweather-Light.pfb +Merriweather-Regular-osf-ot1 Merriweather-Regular "AutoEnc_fuknshterpxw2flapoda5bxt5e ReEncodeFont" <[mwth_fuknsh.enc <Merriweather-Regular.pfb +Merriweather-Regular-osf-t1--base Merriweather-Regular "AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d ReEncodeFont" <[mwth_jnnjab.enc <Merriweather-Regular.pfb +Merriweather-Regular-osf-ly1 Merriweather-Regular "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-Regular.pfb +Merriweather-Regular-osf-ts1--base Merriweather-Regular "AutoEnc_ywgpbabmor6izux7hcbqcb56qa ReEncodeFont" <[mwth_ywgpba.enc <Merriweather-Regular.pfb +Merriweather-UltraBdIt-osf-ot1 Merriweather-UltraBdIt "AutoEnc_fuknshterpxw2flapoda5bxt5e ReEncodeFont" <[mwth_fuknsh.enc <Merriweather-UltraBdIt.pfb +Merriweather-UltraBdIt-osf-t1--base Merriweather-UltraBdIt "AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d ReEncodeFont" <[mwth_jnnjab.enc <Merriweather-UltraBdIt.pfb +Merriweather-UltraBdIt-osf-ly1 Merriweather-UltraBdIt "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-UltraBdIt.pfb +Merriweather-UltraBdIt-osf-ts1--base Merriweather-UltraBdIt "AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve ReEncodeFont" <[mwth_xz5wux.enc <Merriweather-UltraBdIt.pfb +Merriweather-UltraBold-osf-ot1 Merriweather-UltraBold "AutoEnc_fuknshterpxw2flapoda5bxt5e ReEncodeFont" <[mwth_fuknsh.enc <Merriweather-UltraBold.pfb +Merriweather-UltraBold-osf-t1--base Merriweather-UltraBold "AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d ReEncodeFont" <[mwth_jnnjab.enc <Merriweather-UltraBold.pfb +Merriweather-UltraBold-osf-ly1 Merriweather-UltraBold "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-UltraBold.pfb +Merriweather-UltraBold-osf-ts1--base Merriweather-UltraBold "AutoEnc_ywgpbabmor6izux7hcbqcb56qa ReEncodeFont" <[mwth_ywgpba.enc <Merriweather-UltraBold.pfb -MerriweatherSans-BoldItalic-osf-ot1 MerriweatherSans-BoldItalic "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-BoldItalic.pfb -MerriweatherSans-BoldItalic-osf-t1--base MerriweatherSans-BoldItalic "AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont" <[mwth_aynzzm.enc <MerriweatherSans-BoldItalic.pfb -MerriweatherSans-BoldItalic-osf-ly1--base MerriweatherSans-BoldItalic "AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont" <[mwth_r5mufr.enc <MerriweatherSans-BoldItalic.pfb -MerriweatherSans-BoldItalic-osf-ts1--base MerriweatherSans-BoldItalic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-BoldItalic.pfb -MerriweatherSans-Bold-osf-ot1 MerriweatherSans-Bold "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-Bold.pfb -MerriweatherSans-Bold-osf-t1--base MerriweatherSans-Bold "AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont" <[mwth_aynzzm.enc <MerriweatherSans-Bold.pfb -MerriweatherSans-Bold-osf-ly1--base MerriweatherSans-Bold "AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont" <[mwth_oehznb.enc <MerriweatherSans-Bold.pfb -MerriweatherSans-Bold-osf-ts1--base MerriweatherSans-Bold "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Bold.pfb -MerriweatherSans-ExtraBldItalic-osf-ot1 MerriweatherSans-ExtraBldItalic "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-ExtraBoldItalic.pfb -MerriweatherSans-ExtraBldItalic-osf-t1--base MerriweatherSans-ExtraBldItalic "AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont" <[mwth_aynzzm.enc <MerriweatherSans-ExtraBoldItalic.pfb -MerriweatherSans-ExtraBldItalic-osf-ly1--base MerriweatherSans-ExtraBldItalic "AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont" <[mwth_r5mufr.enc <MerriweatherSans-ExtraBoldItalic.pfb -MerriweatherSans-ExtraBldItalic-osf-ts1--base MerriweatherSans-ExtraBldItalic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBoldItalic.pfb -MerriweatherSans-ExtraBold-osf-ot1 MerriweatherSans-ExtraBold "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-ExtraBold.pfb -MerriweatherSans-ExtraBold-osf-t1--base MerriweatherSans-ExtraBold "AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont" <[mwth_aynzzm.enc <MerriweatherSans-ExtraBold.pfb -MerriweatherSans-ExtraBold-osf-ly1--base MerriweatherSans-ExtraBold "AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont" <[mwth_oehznb.enc <MerriweatherSans-ExtraBold.pfb -MerriweatherSans-ExtraBold-osf-ts1--base MerriweatherSans-ExtraBold "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBold.pfb -MerriweatherSans-Italic-osf-ot1 MerriweatherSans-Italic "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-Italic.pfb -MerriweatherSans-Italic-osf-t1--base MerriweatherSans-Italic "AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont" <[mwth_aynzzm.enc <MerriweatherSans-Italic.pfb -MerriweatherSans-Italic-osf-ly1--base MerriweatherSans-Italic "AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont" <[mwth_r5mufr.enc <MerriweatherSans-Italic.pfb -MerriweatherSans-Italic-osf-ts1--base MerriweatherSans-Italic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Italic.pfb -MerriweatherSans-LightItalic-osf-ot1 MerriweatherSans-LightItalic "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-LightItalic.pfb -MerriweatherSans-LightItalic-osf-t1--base MerriweatherSans-LightItalic "AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont" <[mwth_aynzzm.enc <MerriweatherSans-LightItalic.pfb -MerriweatherSans-LightItalic-osf-ly1--base MerriweatherSans-LightItalic "AutoEnc_r5mufrbd5lxejo566tpmscskrf ReEncodeFont" <[mwth_r5mufr.enc <MerriweatherSans-LightItalic.pfb -MerriweatherSans-LightItalic-osf-ts1--base MerriweatherSans-LightItalic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-LightItalic.pfb -MerriweatherSans-Light-osf-ot1 MerriweatherSans-Light "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-Light.pfb -MerriweatherSans-Light-osf-t1--base MerriweatherSans-Light "AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont" <[mwth_aynzzm.enc <MerriweatherSans-Light.pfb -MerriweatherSans-Light-osf-ly1--base MerriweatherSans-Light "AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont" <[mwth_oehznb.enc <MerriweatherSans-Light.pfb -MerriweatherSans-Light-osf-ts1--base MerriweatherSans-Light "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Light.pfb -MerriweatherSans-Regular-osf-ot1 MerriweatherSans-Regular "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-Regular.pfb -MerriweatherSans-Regular-osf-t1--base MerriweatherSans-Regular "AutoEnc_aynzzmmhmqucetr76d43bpu3kb ReEncodeFont" <[mwth_aynzzm.enc <MerriweatherSans-Regular.pfb -MerriweatherSans-Regular-osf-ly1--base MerriweatherSans-Regular "AutoEnc_oehznbo2r4zcimhdrv5eox5qwa ReEncodeFont" <[mwth_oehznb.enc <MerriweatherSans-Regular.pfb -MerriweatherSans-Regular-osf-ts1--base MerriweatherSans-Regular "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Regular.pfb +MerriweatherSans-BoldItalic-tlf-ot1 MerriweatherSans-BoldItalic "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-BoldItalic.pfb +MerriweatherSans-BoldItalic-tlf-t1--base MerriweatherSans-BoldItalic "AutoEnc_libw2mm3qgkydsmoydm6r5agjf ReEncodeFont" <[mwth_libw2m.enc <MerriweatherSans-BoldItalic.pfb +MerriweatherSans-BoldItalic-tlf-ly1 MerriweatherSans-BoldItalic "AutoEnc_cn5sfli3xjnpjitjpli7wpzcng ReEncodeFont" <[mwth_cn5sfl.enc <MerriweatherSans-BoldItalic.pfb +MerriweatherSans-BoldItalic-tlf-ts1--base MerriweatherSans-BoldItalic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-BoldItalic.pfb +MerriweatherSans-Bold-tlf-ot1 MerriweatherSans-Bold "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-Bold.pfb +MerriweatherSans-Bold-tlf-t1--base MerriweatherSans-Bold "AutoEnc_libw2mm3qgkydsmoydm6r5agjf ReEncodeFont" <[mwth_libw2m.enc <MerriweatherSans-Bold.pfb +MerriweatherSans-Bold-tlf-ly1 MerriweatherSans-Bold "AutoEnc_lnkfblgauyqz3eufwp3wby646h ReEncodeFont" <[mwth_lnkfbl.enc <MerriweatherSans-Bold.pfb +MerriweatherSans-Bold-tlf-ts1--base MerriweatherSans-Bold "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Bold.pfb +MerriweatherSans-ExtraBoldItalic-tlf-ot1 MerriweatherSans-ExtraBoldItalic "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-ExBoldIt.pfb +MerriweatherSans-ExtraBoldItalic-tlf-t1--base MerriweatherSans-ExtraBoldItalic "AutoEnc_libw2mm3qgkydsmoydm6r5agjf ReEncodeFont" <[mwth_libw2m.enc <MerriweatherSans-ExBoldIt.pfb +MerriweatherSans-ExtraBoldItalic-tlf-ly1 MerriweatherSans-ExtraBoldItalic "AutoEnc_cn5sfli3xjnpjitjpli7wpzcng ReEncodeFont" <[mwth_cn5sfl.enc <MerriweatherSans-ExBoldIt.pfb +MerriweatherSans-ExtraBoldItalic-tlf-ts1--base MerriweatherSans-ExtraBoldItalic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-ExBoldIt.pfb +MerriweatherSans-ExtraBold-tlf-ot1 MerriweatherSans-ExtraBold "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-ExtraBold.pfb +MerriweatherSans-ExtraBold-tlf-t1--base MerriweatherSans-ExtraBold "AutoEnc_libw2mm3qgkydsmoydm6r5agjf ReEncodeFont" <[mwth_libw2m.enc <MerriweatherSans-ExtraBold.pfb +MerriweatherSans-ExtraBold-tlf-ly1 MerriweatherSans-ExtraBold "AutoEnc_lnkfblgauyqz3eufwp3wby646h ReEncodeFont" <[mwth_lnkfbl.enc <MerriweatherSans-ExtraBold.pfb +MerriweatherSans-ExtraBold-tlf-ts1--base MerriweatherSans-ExtraBold "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBold.pfb +MerriweatherSans-Italic-tlf-ot1 MerriweatherSans-Italic "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-Italic.pfb +MerriweatherSans-Italic-tlf-t1--base MerriweatherSans-Italic "AutoEnc_libw2mm3qgkydsmoydm6r5agjf ReEncodeFont" <[mwth_libw2m.enc <MerriweatherSans-Italic.pfb +MerriweatherSans-Italic-tlf-ly1 MerriweatherSans-Italic "AutoEnc_cn5sfli3xjnpjitjpli7wpzcng ReEncodeFont" <[mwth_cn5sfl.enc <MerriweatherSans-Italic.pfb +MerriweatherSans-Italic-tlf-ts1--base MerriweatherSans-Italic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Italic.pfb +MerriweatherSans-LightItalic-tlf-ot1 MerriweatherSans-LightItalic "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-LightItalic.pfb +MerriweatherSans-LightItalic-tlf-t1--base MerriweatherSans-LightItalic "AutoEnc_libw2mm3qgkydsmoydm6r5agjf ReEncodeFont" <[mwth_libw2m.enc <MerriweatherSans-LightItalic.pfb +MerriweatherSans-LightItalic-tlf-ly1 MerriweatherSans-LightItalic "AutoEnc_cn5sfli3xjnpjitjpli7wpzcng ReEncodeFont" <[mwth_cn5sfl.enc <MerriweatherSans-LightItalic.pfb +MerriweatherSans-LightItalic-tlf-ts1--base MerriweatherSans-LightItalic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-LightItalic.pfb +MerriweatherSans-Light-tlf-ot1 MerriweatherSans-Light "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-Light.pfb +MerriweatherSans-Light-tlf-t1--base MerriweatherSans-Light "AutoEnc_libw2mm3qgkydsmoydm6r5agjf ReEncodeFont" <[mwth_libw2m.enc <MerriweatherSans-Light.pfb +MerriweatherSans-Light-tlf-ly1 MerriweatherSans-Light "AutoEnc_lnkfblgauyqz3eufwp3wby646h ReEncodeFont" <[mwth_lnkfbl.enc <MerriweatherSans-Light.pfb +MerriweatherSans-Light-tlf-ts1--base MerriweatherSans-Light "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Light.pfb +MerriweatherSans-Regular-tlf-ot1 MerriweatherSans-Regular "AutoEnc_oaf34pf2gi7ej2vclku475canf ReEncodeFont" <[mwth_oaf34p.enc <MerriweatherSans-Regular.pfb +MerriweatherSans-Regular-tlf-t1--base MerriweatherSans-Regular "AutoEnc_libw2mm3qgkydsmoydm6r5agjf ReEncodeFont" <[mwth_libw2m.enc <MerriweatherSans-Regular.pfb +MerriweatherSans-Regular-tlf-ly1 MerriweatherSans-Regular "AutoEnc_lnkfblgauyqz3eufwp3wby646h ReEncodeFont" <[mwth_lnkfbl.enc <MerriweatherSans-Regular.pfb +MerriweatherSans-Regular-tlf-ts1--base MerriweatherSans-Regular "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Regular.pfb diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ly1--base.tfm Binary files differdeleted file mode 100644 index 44885af7084..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ly1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ly1.tfm Binary files differindex be6c03ded39..9160f6dd7ed 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ly1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ot1.tfm Binary files differindex 41ae163de16..787d33b1372 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ot1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1--base.tfm Binary files differindex 26f58c0c791..41dd404b3f5 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1--base.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1.tfm Binary files differindex 49e1bd3cddc..33b4c31432f 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1--base.tfm Binary files differindex 4313fc36447..851f9ebe941 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1--base.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1.tfm Binary files differindex 54d318aa200..89189413d01 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ly1--base.tfm Binary files differdeleted file mode 100644 index ea4c1cc071c..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ly1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ly1.tfm Binary files differindex 4008ca80905..5bc397ed2b1 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ly1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ot1.tfm Binary files differindex 5f6309dcaec..95db79afbfe 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ot1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1--base.tfm Binary files differindex fb7a7d8f479..47974368755 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1--base.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.tfm Binary files differindex 9b472bcbbc3..8dcc2ca3269 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1--base.tfm Binary files differindex 95c64421fca..6dcbd1cf612 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1--base.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.tfm Binary files differindex 47ce7af6118..e40b7888a79 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ly1--base.tfm Binary files differdeleted file mode 100644 index d7262d2bb1c..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ly1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ly1.tfm Binary files differdeleted file mode 100644 index 8303b75dd6f..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ot1.tfm Binary files differdeleted file mode 100644 index 935e7dc2d41..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ot1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-t1--base.tfm Binary files differdeleted file mode 100644 index 099f12a4d82..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-t1.tfm Binary files differdeleted file mode 100644 index 352a2f387cb..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-t1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ts1--base.tfm Binary files differdeleted file mode 100644 index 6adae65b419..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ts1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ts1.tfm Binary files differdeleted file mode 100644 index 545c15a7591..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Heavy-osf-ts1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ly1--base.tfm Binary files differdeleted file mode 100644 index 314b03731ef..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ly1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ly1.tfm Binary files differdeleted file mode 100644 index 05cea3c1c42..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ot1.tfm Binary files differdeleted file mode 100644 index 4756595762d..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ot1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-t1--base.tfm Binary files differdeleted file mode 100644 index a7ab59a0cd4..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-t1.tfm Binary files differdeleted file mode 100644 index ce403595e35..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-t1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ts1--base.tfm Binary files differdeleted file mode 100644 index 497cc8d987a..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ts1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ts1.tfm Binary files differdeleted file mode 100644 index 576155fe40e..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-HeavyItalic-osf-ts1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ly1--base.tfm Binary files differdeleted file mode 100644 index a05b7d08227..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ly1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ly1.tfm Binary files differindex 8e2d172129c..22d3390dadd 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ly1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ot1.tfm Binary files differindex 70f6deda95b..81ede17ade8 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ot1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1--base.tfm Binary files differindex 2fb65b11269..efd27856e14 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1--base.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1.tfm Binary files differindex d82520f8b63..218e014e36e 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1--base.tfm Binary files differindex f0566d00eec..3707362f7fd 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1--base.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1.tfm Binary files differindex 69e36448954..b2068d36ab6 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ly1--base.tfm Binary files differdeleted file mode 100644 index 46676ad44bf..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ly1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ly1.tfm Binary files differindex 572952ab760..9d23161819e 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ly1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ot1.tfm Binary files differindex 2f9384a933d..b279486aa5c 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ot1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1--base.tfm Binary files differindex 5cee10c9a8a..90735e22eb7 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1--base.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1.tfm Binary files differindex 921f72a1fc3..b56208dfbdd 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1--base.tfm Binary files differindex a90b6a392d5..86780321cfd 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1--base.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1.tfm Binary files differindex e0b1deb09e8..2c484ec80e0 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ly1.tfm Binary files differnew file mode 100644 index 00000000000..301398adf67 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ot1.tfm Binary files differnew file mode 100644 index 00000000000..175c6e1c496 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1--base.tfm Binary files differnew file mode 100644 index 00000000000..a2dcb3f351b --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1.tfm Binary files differnew file mode 100644 index 00000000000..1340025d932 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ts1--base.tfm Binary files differnew file mode 100644 index 00000000000..b75adbbde54 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ts1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ts1.tfm Binary files differnew file mode 100644 index 00000000000..092b61f1317 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ts1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ly1--base.tfm Binary files differdeleted file mode 100644 index dec85442469..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ly1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ly1.tfm Binary files differdeleted file mode 100644 index 29896942eb0..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ot1.tfm Binary files differdeleted file mode 100644 index 739d772cd27..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ot1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-t1--base.tfm Binary files differdeleted file mode 100644 index 319c45e4caf..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-t1.tfm Binary files differdeleted file mode 100644 index 537f483d3c0..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-t1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ts1--base.tfm Binary files differdeleted file mode 100644 index 21c27dde16b..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ts1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ts1.tfm Binary files differdeleted file mode 100644 index ff85142c20a..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightItalic-osf-ts1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ly1.tfm Binary files differnew file mode 100644 index 00000000000..bfbe6dafe26 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ot1.tfm Binary files differnew file mode 100644 index 00000000000..2a096ed2433 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1--base.tfm Binary files differnew file mode 100644 index 00000000000..25efb0efdcc --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1.tfm Binary files differnew file mode 100644 index 00000000000..efee9985e1b --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1--base.tfm Binary files differnew file mode 100644 index 00000000000..e0cb8551de1 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1.tfm Binary files differnew file mode 100644 index 00000000000..9b90474a37c --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ly1.tfm Binary files differnew file mode 100644 index 00000000000..bf118bdb98b --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ot1.tfm Binary files differnew file mode 100644 index 00000000000..8e4e46c9949 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1--base.tfm Binary files differnew file mode 100644 index 00000000000..1fd7e79d699 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.tfm Binary files differnew file mode 100644 index 00000000000..65aed8f35dd --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1--base.tfm Binary files differnew file mode 100644 index 00000000000..166b3e28f46 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.tfm Binary files differnew file mode 100644 index 00000000000..e01edb2b3c8 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ly1.tfm Binary files differnew file mode 100644 index 00000000000..99f4815bc47 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ot1.tfm Binary files differnew file mode 100644 index 00000000000..dfbaea1d271 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1--base.tfm Binary files differnew file mode 100644 index 00000000000..738e4fcdfe4 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1.tfm Binary files differnew file mode 100644 index 00000000000..64b98e7d5d7 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1--base.tfm Binary files differnew file mode 100644 index 00000000000..faba5c6b971 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.tfm Binary files differnew file mode 100644 index 00000000000..1e9d5d9eef8 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ly1--base.tfm Binary files differdeleted file mode 100644 index 355a96e3735..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ly1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ly1.tfm Binary files differdeleted file mode 100644 index 9d83258a4ca..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ot1.tfm Binary files differdeleted file mode 100644 index 75c11ae2921..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ot1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-t1--base.tfm Binary files differdeleted file mode 100644 index 111c344107a..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-t1.tfm Binary files differdeleted file mode 100644 index af2ae6a2206..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-t1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ts1--base.tfm Binary files differdeleted file mode 100644 index 4f50362f4ef..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ts1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ts1.tfm Binary files differdeleted file mode 100644 index b7a2db611bd..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-osf-ts1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ly1--base.tfm Binary files differdeleted file mode 100644 index c13bc5f8c15..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ly1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ly1.tfm Binary files differdeleted file mode 100644 index 693c271b026..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-t1--base.tfm Binary files differdeleted file mode 100644 index a4c21ddf2cd..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1--base.tfm Binary files differdeleted file mode 100644 index 57a881f5726..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ly1.tfm Binary files differnew file mode 100644 index 00000000000..6007f66441c --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ot1.tfm Binary files differindex c9b74c5f3d9..552377def06 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ot1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1--base.tfm Binary files differnew file mode 100644 index 00000000000..02402e27807 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1.tfm Binary files differindex bb9beadabad..2b79108e045 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-t1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1--base.tfm Binary files differnew file mode 100644 index 00000000000..91c33d7bd2d --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1.tfm Binary files differindex 96eaed4d8a0..09eee7da958 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ly1--base.tfm Binary files differdeleted file mode 100644 index d160d1b2cce..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ly1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ly1.tfm Binary files differdeleted file mode 100644 index 9f5ece1eb1b..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1--base.tfm Binary files differdeleted file mode 100644 index 563e84423c5..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1.tfm Binary files differdeleted file mode 100644 index 1fdac722cfa..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ly1.tfm Binary files differnew file mode 100644 index 00000000000..3a225b6ba5d --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ot1.tfm Binary files differindex 4116e86e564..cb7a735bcbe 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ot1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1--base.tfm Binary files differnew file mode 100644 index 00000000000..6129e4909fb --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1.tfm Binary files differindex 6aa3e9423cc..813210eab5e 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1--base.tfm Binary files differindex 215079da5eb..1a0bb9561a1 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1--base.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1.tfm Binary files differnew file mode 100644 index 00000000000..35f1e4d2b73 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ly1--base.tfm Binary files differdeleted file mode 100644 index 9ffe2b85436..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ly1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-t1--base.tfm Binary files differdeleted file mode 100644 index 140aba96190..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ts1.tfm Binary files differdeleted file mode 100644 index 1cc67037caa..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ts1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ly1--base.tfm Binary files differdeleted file mode 100644 index 1cee157e616..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ly1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1--base.tfm Binary files differdeleted file mode 100644 index 0db3cd6ef30..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1--base.tfm Binary files differdeleted file mode 100644 index 3486303ffdf..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ly1.tfm Binary files differindex 458cdc34013..163cb2ba86d 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ly1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ot1.tfm Binary files differindex c1f701975ae..832b8398d9a 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ot1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1--base.tfm Binary files differnew file mode 100644 index 00000000000..67e1a0a3985 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1.tfm Binary files differindex 6102c83e96b..106240654f8 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1--base.tfm Binary files differnew file mode 100644 index 00000000000..be2910e9fac --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1.tfm Binary files differindex 5b8330027f3..03741551bc4 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ly1.tfm Binary files differindex c70db17d956..0813bf86fe7 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ly1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ot1.tfm Binary files differindex b0ed0fc8b9c..f9d9a6c4741 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ot1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1--base.tfm Binary files differnew file mode 100644 index 00000000000..f8a790c8d1b --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1.tfm Binary files differindex e8e15f57058..823fa5989db 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-t1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1--base.tfm Binary files differindex 91589cdad7b..e20d622cf49 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ts1--base.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1.tfm Binary files differnew file mode 100644 index 00000000000..6b51daa16ad --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ly1--base.tfm Binary files differdeleted file mode 100644 index 624b569272b..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ly1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ly1.tfm Binary files differdeleted file mode 100644 index 9847cad6680..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-t1--base.tfm Binary files differdeleted file mode 100644 index a5bb4817bfd..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1--base.tfm Binary files differdeleted file mode 100644 index 35f2ab80e40..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ly1.tfm Binary files differnew file mode 100644 index 00000000000..93a87263f24 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ot1.tfm Binary files differindex fd1bb3001d1..bb80e2f0003 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ot1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1--base.tfm Binary files differnew file mode 100644 index 00000000000..7ac16841062 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1.tfm Binary files differindex a30c9234d9a..e407c8f9ead 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-t1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1--base.tfm Binary files differnew file mode 100644 index 00000000000..2e0a83dcfe4 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1.tfm Binary files differindex 6ee52e53b69..3c08a60176b 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ly1--base.tfm Binary files differdeleted file mode 100644 index 0405e042307..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ly1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ly1.tfm Binary files differdeleted file mode 100644 index 55068f842a3..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-t1--base.tfm Binary files differdeleted file mode 100644 index 1e658acaba9..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ts1--base.tfm Binary files differdeleted file mode 100644 index 903b8f33cd0..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ts1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ly1.tfm Binary files differnew file mode 100644 index 00000000000..5c5f4c3069d --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ot1.tfm Binary files differindex 69d923483cf..a4be2ddb512 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ot1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-t1--base.tfm Binary files differnew file mode 100644 index 00000000000..9f0040aa4c6 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-t1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-t1.tfm Binary files differindex ec0dcc7f8a3..7fd45a8ab8c 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-t1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1--base.tfm Binary files differnew file mode 100644 index 00000000000..38ea41c4293 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1.tfm Binary files differindex bbf34543ef0..c3d19370e03 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ts1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ly1--base.tfm Binary files differdeleted file mode 100644 index 8cac209c267..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ly1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ly1.tfm Binary files differdeleted file mode 100644 index f5450214dfd..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1--base.tfm Binary files differdeleted file mode 100644 index bef4214c68b..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1.tfm Binary files differdeleted file mode 100644 index a776165215a..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ly1.tfm Binary files differnew file mode 100644 index 00000000000..69c311658fb --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ot1.tfm Binary files differindex 22e74b998e5..9c790763af0 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ot1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1--base.tfm Binary files differnew file mode 100644 index 00000000000..1d44a58f17b --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1.tfm Binary files differnew file mode 100644 index 00000000000..acab0e46b12 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1--base.tfm Binary files differindex a5ffb4d0415..35f5515d067 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1--base.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1.tfm Binary files differindex dc903940b40..7e1d249f866 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ly1--base.tfm Binary files differdeleted file mode 100644 index 4eacd22327e..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ly1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ly1.tfm Binary files differdeleted file mode 100644 index e37a5ecff49..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-t1--base.tfm Binary files differdeleted file mode 100644 index e0d1ba1a1dd..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1--base.tfm Binary files differdeleted file mode 100644 index 0c4b5822d0f..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1.tfm Binary files differdeleted file mode 100644 index 3337b8d1389..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ly1.tfm Binary files differnew file mode 100644 index 00000000000..72e6f927dd9 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ot1.tfm Binary files differindex 230d6402b9d..6d81990e040 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ot1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1--base.tfm Binary files differnew file mode 100644 index 00000000000..3c1112ab3bf --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1.tfm Binary files differindex e84f31c1015..6f47d347a5d 100644 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-t1.tfm +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1--base.tfm Binary files differnew file mode 100644 index 00000000000..9daf22f6be0 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1--base.tfm diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1.tfm Binary files differnew file mode 100644 index 00000000000..a2197ee2641 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1.tfm diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Bold.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Bold.ttf Binary files differindex 2340777c83a..4431bddc46e 100644 --- a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Bold.ttf +++ b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Bold.ttf diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-BoldIt.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-BoldIt.ttf Binary files differnew file mode 100644 index 00000000000..d6f11c8c7a8 --- /dev/null +++ b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-BoldIt.ttf diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-BoldItalic.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-BoldItalic.ttf Binary files differdeleted file mode 100644 index f67d7e588af..00000000000 --- a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-BoldItalic.ttf +++ /dev/null diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Heavy.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Heavy.ttf Binary files differdeleted file mode 100644 index 51864574e4e..00000000000 --- a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Heavy.ttf +++ /dev/null diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-HeavyItalic.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-HeavyItalic.ttf Binary files differdeleted file mode 100644 index f94d0ccca50..00000000000 --- a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-HeavyItalic.ttf +++ /dev/null diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Italic.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Italic.ttf Binary files differindex 58335865233..c5ab14a434d 100644 --- a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Italic.ttf +++ b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Italic.ttf diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Light.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Light.ttf Binary files differindex ee7adbd44f5..9364fd8cbba 100644 --- a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Light.ttf +++ b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Light.ttf diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-LightIt.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-LightIt.ttf Binary files differnew file mode 100644 index 00000000000..c9713d1e4d5 --- /dev/null +++ b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-LightIt.ttf diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-LightItalic.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-LightItalic.ttf Binary files differdeleted file mode 100644 index 3373e618696..00000000000 --- a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-LightItalic.ttf +++ /dev/null diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Regular.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Regular.ttf Binary files differnew file mode 100644 index 00000000000..f0270653134 --- /dev/null +++ b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Regular.ttf diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-UltraBdIt.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-UltraBdIt.ttf Binary files differnew file mode 100644 index 00000000000..6127f3072ca --- /dev/null +++ b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-UltraBdIt.ttf diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-UltraBold.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-UltraBold.ttf Binary files differnew file mode 100644 index 00000000000..74114bb3002 --- /dev/null +++ b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-UltraBold.ttf diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather.ttf Binary files differdeleted file mode 100644 index 28a80e48730..00000000000 --- a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather.ttf +++ /dev/null diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-Bold.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-Bold.ttf Binary files differindex 1d623bfe9e4..b9aa9608c1a 100644 --- a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-Bold.ttf +++ b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-Bold.ttf diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-BoldItalic.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-BoldItalic.ttf Binary files differindex 89e1809d32f..1a132754e7f 100644 --- a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-BoldItalic.ttf +++ b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-BoldItalic.ttf diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-ExBoldIt.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-ExBoldIt.ttf Binary files differnew file mode 100644 index 00000000000..d8fa71fa8fe --- /dev/null +++ b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-ExBoldIt.ttf diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-ExtraBold.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-ExtraBold.ttf Binary files differindex 1d1662ff624..c0191277818 100644 --- a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-ExtraBold.ttf +++ b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-ExtraBold.ttf diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic.ttf Binary files differdeleted file mode 100644 index 5decede3858..00000000000 --- a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic.ttf +++ /dev/null diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-Italic.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-Italic.ttf Binary files differindex ed36a44f8d1..c7ee07a8774 100644 --- a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-Italic.ttf +++ b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-Italic.ttf diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-Light.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-Light.ttf Binary files differindex bb0294779fd..a1ef4037ade 100644 --- a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-Light.ttf +++ b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-Light.ttf diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-LightItalic.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-LightItalic.ttf Binary files differindex affa9ca50aa..794ce73bf2c 100644 --- a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-LightItalic.ttf +++ b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-LightItalic.ttf diff --git a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-Regular.ttf b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-Regular.ttf Binary files differindex 78c5910991c..1c544cf0852 100644 --- a/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-Regular.ttf +++ b/Master/texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-Regular.ttf diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Bold.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Bold.pfb Binary files differindex 2e612848a5c..aa60d073b75 100644 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Bold.pfb +++ b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Bold.pfb diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-BoldIt.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-BoldIt.pfb Binary files differnew file mode 100644 index 00000000000..f26a38cf016 --- /dev/null +++ b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-BoldIt.pfb diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-BoldItalic.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-BoldItalic.pfb Binary files differdeleted file mode 100644 index d4dadcb5549..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-BoldItalic.pfb +++ /dev/null diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Heavy.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Heavy.pfb Binary files differdeleted file mode 100644 index 03f7766b6b0..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Heavy.pfb +++ /dev/null diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-HeavyItalic.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-HeavyItalic.pfb Binary files differdeleted file mode 100644 index ad434ee5562..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-HeavyItalic.pfb +++ /dev/null diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Italic.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Italic.pfb Binary files differindex 6b54efb9a97..d76fd083beb 100644 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Italic.pfb +++ b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Italic.pfb diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Light.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Light.pfb Binary files differindex c229d54803a..8a87312afd8 100644 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Light.pfb +++ b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Light.pfb diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-LightIt.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-LightIt.pfb Binary files differnew file mode 100644 index 00000000000..d0b99fca1c4 --- /dev/null +++ b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-LightIt.pfb diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-LightItalic.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-LightItalic.pfb Binary files differdeleted file mode 100644 index ea863e52e79..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-LightItalic.pfb +++ /dev/null diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Regular.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Regular.pfb Binary files differnew file mode 100644 index 00000000000..f7440e39e2f --- /dev/null +++ b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Regular.pfb diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-UltraBdIt.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-UltraBdIt.pfb Binary files differnew file mode 100644 index 00000000000..ca95303b15e --- /dev/null +++ b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-UltraBdIt.pfb diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-UltraBold.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-UltraBold.pfb Binary files differnew file mode 100644 index 00000000000..c4b46172025 --- /dev/null +++ b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-UltraBold.pfb diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather.pfb Binary files differdeleted file mode 100644 index 043a83a9a79..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather.pfb +++ /dev/null diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Bold.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Bold.pfb Binary files differindex a35875c1468..43401ba1985 100644 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Bold.pfb +++ b/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Bold.pfb diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-BoldItalic.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-BoldItalic.pfb Binary files differindex 2fc66ba29b9..0c6eb041138 100644 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-BoldItalic.pfb +++ b/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-BoldItalic.pfb diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-ExBoldIt.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-ExBoldIt.pfb Binary files differnew file mode 100644 index 00000000000..57fa351bdc0 --- /dev/null +++ b/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-ExBoldIt.pfb diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-ExtraBold.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-ExtraBold.pfb Binary files differindex 55be6f6d643..3c7e3122f20 100644 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-ExtraBold.pfb +++ b/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-ExtraBold.pfb diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic.pfb Binary files differdeleted file mode 100644 index 1ac155e8987..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic.pfb +++ /dev/null diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Italic.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Italic.pfb Binary files differindex b84659c70e4..eef256a6bc6 100644 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Italic.pfb +++ b/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Italic.pfb diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Light.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Light.pfb Binary files differindex 727c2f38196..dc2aebe001f 100644 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Light.pfb +++ b/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Light.pfb diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-LightItalic.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-LightItalic.pfb Binary files differindex 5cb17674b6c..ef9a462ca96 100644 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-LightItalic.pfb +++ b/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-LightItalic.pfb diff --git a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Regular.pfb b/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Regular.pfb Binary files differindex 9fa30ef0e08..96a006052fa 100644 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Regular.pfb +++ b/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Regular.pfb diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-ly1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-ly1.vf Binary files differdeleted file mode 100644 index a639908dc94..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-ly1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-t1.vf Binary files differindex a72030f67b5..4b0b445a01e 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-t1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-t1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-ts1.vf Binary files differindex cca3b845c32..1dd0d4ebbc3 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-ts1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-ts1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-ly1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-ly1.vf Binary files differdeleted file mode 100644 index b80b886e6a8..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-ly1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.vf Binary files differindex dbc5d025832..4b131590c95 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.vf Binary files differindex 07727564b8a..8c5b4af8167 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Heavy-osf-ly1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Heavy-osf-ly1.vf Binary files differdeleted file mode 100644 index 510899349bc..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Heavy-osf-ly1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Heavy-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Heavy-osf-t1.vf Binary files differdeleted file mode 100644 index 49eacd52008..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Heavy-osf-t1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Heavy-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Heavy-osf-ts1.vf Binary files differdeleted file mode 100644 index 5fd6866ff40..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Heavy-osf-ts1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-HeavyItalic-osf-ly1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-HeavyItalic-osf-ly1.vf Binary files differdeleted file mode 100644 index c3a12aae874..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-HeavyItalic-osf-ly1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-HeavyItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-HeavyItalic-osf-t1.vf Binary files differdeleted file mode 100644 index ff293cd1a18..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-HeavyItalic-osf-t1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-HeavyItalic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-HeavyItalic-osf-ts1.vf Binary files differdeleted file mode 100644 index 8ff4324861f..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-HeavyItalic-osf-ts1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-ly1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-ly1.vf Binary files differdeleted file mode 100644 index 0e6776c5e27..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-ly1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-t1.vf Binary files differindex 13c4226d64a..e71ecf124aa 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-t1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-t1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-ts1.vf Binary files differindex bd19efc808e..6caf9fc2e53 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-ts1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-ts1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-ly1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-ly1.vf Binary files differdeleted file mode 100644 index 330e3e949e8..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-ly1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-t1.vf Binary files differindex 40911933389..429f0a8f8cb 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-t1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-t1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-ts1.vf Binary files differindex b80354d6480..018a98f00b6 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-ts1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-ts1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-osf-t1.vf Binary files differnew file mode 100644 index 00000000000..0edf794d1a7 --- /dev/null +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-osf-t1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-osf-ts1.vf Binary files differnew file mode 100644 index 00000000000..8f97fc63774 --- /dev/null +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-osf-ts1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightItalic-osf-ly1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightItalic-osf-ly1.vf Binary files differdeleted file mode 100644 index 1a21c6dd77e..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightItalic-osf-ly1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightItalic-osf-t1.vf Binary files differdeleted file mode 100644 index ec618bcff26..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightItalic-osf-t1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightItalic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightItalic-osf-ts1.vf Binary files differdeleted file mode 100644 index f5cccb61474..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightItalic-osf-ts1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-t1.vf Binary files differnew file mode 100644 index 00000000000..e437aacf45d --- /dev/null +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-t1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-ts1.vf Binary files differnew file mode 100644 index 00000000000..b686457da0a --- /dev/null +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-ts1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.vf Binary files differnew file mode 100644 index 00000000000..89c36471d87 --- /dev/null +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.vf Binary files differnew file mode 100644 index 00000000000..08bce410c8d --- /dev/null +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-t1.vf Binary files differnew file mode 100644 index 00000000000..d58ad5b0d1f --- /dev/null +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-t1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.vf Binary files differnew file mode 100644 index 00000000000..9d4528e77bb --- /dev/null +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-osf-ly1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-osf-ly1.vf Binary files differdeleted file mode 100644 index e150f2c498e..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-osf-ly1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-osf-t1.vf Binary files differdeleted file mode 100644 index 96589b2c16f..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-osf-t1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-osf-ts1.vf Binary files differdeleted file mode 100644 index 816c5f04a28..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-osf-ts1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-ly1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-ly1.vf Binary files differdeleted file mode 100644 index 5e301db69d1..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-ly1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1.vf Binary files differindex 7642f1cc494..0606058cf0f 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-t1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-tlf-t1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1.vf Binary files differindex 40aa8000b94..d20d1d94196 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-tlf-ts1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ly1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ly1.vf Binary files differdeleted file mode 100644 index fe8dd77aa44..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ly1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1.vf Binary files differindex 7227a98431f..10cf1b64691 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-t1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1.vf Binary files differindex b4cabeb7a05..12a312a9b9f 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-tlf-ts1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ly1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ly1.vf Binary files differdeleted file mode 100644 index daa8e664d59..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ly1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ly1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ly1.vf Binary files differdeleted file mode 100644 index f4cdba4f6ff..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ly1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1.vf Binary files differindex 398f399236f..89eb9a8f2f0 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-t1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1.vf Binary files differindex d7f0c928e71..123141cdf99 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-tlf-ts1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1.vf Binary files differindex 0230309ab79..2c7aac001de 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-t1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-t1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1.vf Binary files differindex 6d1d4961f1c..29ec8eed2de 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBldItalic-osf-ts1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-tlf-ts1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-ly1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-ly1.vf Binary files differdeleted file mode 100644 index eff6b325cdb..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-ly1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1.vf Binary files differindex 5abed1b633c..8508f3603f5 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-t1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-tlf-t1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1.vf Binary files differindex c5564995991..f6a85202070 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-tlf-ts1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-ly1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-ly1.vf Binary files differdeleted file mode 100644 index d153cb8a3cc..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-ly1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-tlf-t1.vf Binary files differindex b65d5d2f795..f02b5fffaac 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-t1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-tlf-t1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1.vf Binary files differindex 640d0923c04..3b2a55557a7 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-ts1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-tlf-ts1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ly1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ly1.vf Binary files differdeleted file mode 100644 index c1463f47624..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ly1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1.vf Binary files differindex 273163d8a9d..2d1d50d653e 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-t1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1.vf Binary files differindex 916862c7cf5..276ee18e133 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-tlf-ts1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-ly1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-ly1.vf Binary files differdeleted file mode 100644 index 79844e2fba8..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-ly1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1.vf Binary files differindex cfc8b1e36fa..deada412980 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-t1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-tlf-t1.vf diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1.vf Binary files differindex 5966043635c..54d58fec2a8 100644 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1.vf +++ b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-tlf-ts1.vf diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd index 0814f744ee5..2b118321df5 100644 --- a/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd +++ b/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/11/10 +%% Generated by autoinst on 2014/01/24 %% \ProvidesFile{LY1Merriweather-OsF.fd} - [2013/11/10 (autoinst) Font definitions for LY1/Merriweather-OsF.] + [2014/01/24 (autoinst) Font definitions for LY1/Merriweather-OsF.] \expandafter\ifx\csname Merriweather@scale\endcsname\relax \let\Merriweather@@scale\@empty @@ -16,25 +16,13 @@ }{} \DeclareFontShape{LY1}{Merriweather-OsF}{l}{it}{ - <-> \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 |