diff options
author | Karl Berry <karl@freefriends.org> | 2020-07-25 21:46:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-07-25 21:46:36 +0000 |
commit | f656798961f04174f844cd71f7c9a87faeed6ad8 (patch) | |
tree | 78d15e43aa29b0d1ffe48b764071f598e528c244 /Master/texmf-dist | |
parent | 01b19bd46be4381ce96458d9a62b338dfbfc0d99 (diff) |
merriweather (25jul20)
git-svn-id: svn://tug.org/texlive/trunk@55942 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
214 files changed, 21 insertions, 2736 deletions
diff --git a/Master/texmf-dist/doc/fonts/merriweather/README b/Master/texmf-dist/doc/fonts/merriweather/README index 687ba68712f..bb7905531d9 100644 --- a/Master/texmf-dist/doc/fonts/merriweather/README +++ b/Master/texmf-dist/doc/fonts/merriweather/README @@ -1,8 +1,8 @@ -This is the README for the merriweather package, version 2019-10-13. +This is the README for the merriweather package, version 2020-07-24. -This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for -the Merriweather and MerriweatherSans families of fonts, designed by -Eben Sorkin. +This package provides the Merriweather and MerriweatherSans +families of fonts, designed by Eben Sorkin, for use with +luaLaTeX and xeLaTeX. Merriweather features a very large x height, slightly condensed letterforms, a mild diagonal stress, sturdy serifs and open forms. @@ -14,8 +14,7 @@ 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. +(e.g., texhash). To use, add @@ -42,9 +41,6 @@ Options light, rmlight, sflight, black, rmblack, and sfblack choose the light or heavy weights instead of the regular and bold weights, respectively, for both or single families. -LuaLaTeX and xeLaTeX users who might prefer type1 fonts or who wish -to avoid fontspec may use the type1 option. - Options scaled=<number> or scale=<number> may be used to scale the MerriweatherSans fonts; the serifed variants are not affected. @@ -53,13 +49,11 @@ and MerriweatherSans families, respectively. Commands \merriweatherlight, \merriweatherblack, \merriweathersanslight, and \merriweathersansblack allow for localized use of light or black variants. -The only figure style supported is proportional semi-oldstyle. Font -encodings supported are OT1, T1, LY1 and TS1. +The only figure style supported is proportional semi-oldstyle. -The original fonts are available at http://www.google.com/webfonts -and are licensed under the SIL Open Font License, (version 1.1); -the text may be found in the doc directory. The type1 versions -were created using fontforge. The support files were created using -autoinst and are licensed under the terms of the LaTeX Project -Public License. The maintainer of this package is Bob Tennent (rdt -at cs.queensu.ca) +The fonts are available at http://www.google.com/webfonts +and are licensed under the SIL Open Font License, (version +1.1); the text may be found in the doc directory. The rest +of the package is licensed under the terms of the LaTeX +Project Public License. The maintainer of this package is +Bob Tennent (rdt at cs.queensu.ca) diff --git a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf Binary files differindex e45ab3c446e..45065c109bc 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/doc/fonts/merriweather/merriweather-samples.tex b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex index 454003f1165..73ed7c3a360 100644 --- a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex +++ b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex @@ -1,5 +1,4 @@ \documentclass{article} -\usepackage[T1]{fontenc} \usepackage{merriweather} \usepackage{lipsum} \begin{document} diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_44qg5v.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_44qg5v.enc deleted file mode 100644 index 1d2548031d7..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_44qg5v.enc +++ /dev/null @@ -1,66 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_44qg5voi43tymivsufwnvthinh -% Encoding created by otftotfm on Sun Jun 2 14:53:43 2019 -% Command line follows encoding -/AutoEnc_44qg5voi43tymivsufwnvthinh [ -%00 - /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek - /.notdef /.notdef /zerowidthnonjoiner /f_f_l /f_f_i /f_f /f_l /f_i -%10 - /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring - /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash -%20 - /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /less /equal /greater /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /tilde /dieresis -%80 - /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl - /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus -%90 - /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash - /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis -%A0 - /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section - /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron -%B0 - /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered - /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls -%E0 - /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla - /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis -%F0 - /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide - /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map -% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI -% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff -% --ligkern=ff i =: ffi --ligkern=ff l =: ffl MerriweatherSans-Bold.ttf -% MerriweatherSans-Bold-osf-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc deleted file mode 100644 index c58c15d26bc..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc +++ /dev/null @@ -1,66 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_5q2vgdqo7txurrtxwuhjydkywc -% Encoding created by otftotfm on Sun Jun 2 14:54:05 2019 -% Command line follows encoding -/AutoEnc_5q2vgdqo7txurrtxwuhjydkywc [ -%00 - /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek - /.notdef /.notdef /zerowidthnonjoiner /f_f_l /f_f_i /f_f /f_l /f_i -%10 - /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring - /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash -%20 - /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /less /equal /greater /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /tilde /dieresis -%80 - /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl - /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus -%90 - /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash - /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis -%A0 - /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section - /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron -%B0 - /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered - /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls -%E0 - /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla - /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis -%F0 - /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide - /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap -% --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --ligkern=f i -% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi -% --ligkern=ff l =: ffl Merriweather-BoldIt.ttf -% Merriweather-BoldItalic-osf-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_6upxhe.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_6upxhe.enc deleted file mode 100644 index feb5992e41d..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_6upxhe.enc +++ /dev/null @@ -1,65 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_6upxhe2m74q2iptst22s37sn3e -% Encoding created by otftotfm on Sun Jun 2 14:54:04 2019 -% Command line follows encoding -/AutoEnc_6upxhe2m74q2iptst22s37sn3e [ -%00 - /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring - /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash -%20 - /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis -%80 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef -%90 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%A0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef -%B0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap -% --no-type1 --coding-scheme=TEX TEXT --ligkern=f i =: fi --ligkern=f l =: -% fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl -% Merriweather-BoldIt.ttf Merriweather-BoldItalic-osf-ot1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_7ytifx.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_7ytifx.enc deleted file mode 100644 index 825fc9d95ba..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_7ytifx.enc +++ /dev/null @@ -1,67 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb -% Encoding created by otftotfm on Sun Jun 2 14:53:42 2019 -% Command line follows encoding -/AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb [ -%00 - /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron - /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright -%10 - /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /zerowidthnonjoiner - /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef -%20 - /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /onesuperior /twosuperior /threesuperior /four /five /six /seven - /eight /nine /colon /semicolon /less /equal /greater /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /asciitilde /hyphen -%80 - /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve - /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute -%90 - /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring - /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section -%A0 - /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve - /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute -%B0 - /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring - /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef -%E0 - /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla - /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis -%F0 - /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe - /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls -] def -% Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map -% --no-updmap --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN -% --feature=liga --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl -% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl -% --ligkern=* {KL} * MerriweatherSans-BoldItalic.ttf -% MerriweatherSans-BoldItalic-sup-t1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_clyrx2.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_clyrx2.enc deleted file mode 100644 index f8ade60d101..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_clyrx2.enc +++ /dev/null @@ -1,66 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe -% Encoding created by otftotfm on Sun Jun 2 14:54:04 2019 -% Command line follows encoding -/AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe [ -%00 - /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron - /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright -%10 - /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /zerowidthnonjoiner - /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef -%20 - /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /less /equal /greater /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /asciitilde /hyphen -%80 - /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve - /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute -%90 - /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring - /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section -%A0 - /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve - /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute -%B0 - /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring - /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef -%E0 - /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla - /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis -%F0 - /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe - /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls -] def -% Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap -% --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --ligkern=f -% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi -% --ligkern=ff l =: ffl Merriweather-BoldIt.ttf -% Merriweather-BoldItalic-osf-t1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_czxicq.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_czxicq.enc deleted file mode 100644 index 7546a2a8ef4..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_czxicq.enc +++ /dev/null @@ -1,66 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_czxicqvoi7gergm2nqp7s2dfph -% Encoding created by otftotfm on Sun Jun 2 14:53:42 2019 -% Command line follows encoding -/AutoEnc_czxicqvoi7gergm2nqp7s2dfph [ -%00 - /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring - /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash -%20 - /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /onesuperior /twosuperior /threesuperior /four /five /six /seven - /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis -%80 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef -%90 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%A0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef -%B0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map -% --no-updmap --no-type1 --coding-scheme=TEX TEXT --feature=liga -% --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff -% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * -% MerriweatherSans-BoldItalic.ttf MerriweatherSans-BoldItalic-sup-ot1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_iuohxq.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_iuohxq.enc deleted file mode 100644 index 93870024d82..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_iuohxq.enc +++ /dev/null @@ -1,66 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_iuohxqr2qb6k5t77legm5nsxle -% Encoding created by otftotfm on Sun Jun 2 14:53:42 2019 -% Command line follows encoding -/AutoEnc_iuohxqr2qb6k5t77legm5nsxle [ -%00 - /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron - /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright -%10 - /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /zerowidthnonjoiner - /f_f /dotlessi /dotlessj /f_i /f_l /f_f_i /f_f_l /.notdef -%20 - /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /less /equal /greater /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /asciitilde /hyphen -%80 - /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve - /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute -%90 - /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring - /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section -%A0 - /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve - /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute -%B0 - /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring - /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef -%E0 - /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla - /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis -%F0 - /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe - /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls -] def -% Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --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 --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff -% --ligkern=ff i =: ffi --ligkern=ff l =: ffl -% MerriweatherSans-BoldItalic.ttf MerriweatherSans-BoldItalic-osf-t1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jlgqyj.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jlgqyj.enc deleted file mode 100644 index 1ee69ca7d93..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jlgqyj.enc +++ /dev/null @@ -1,67 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_jlgqyj7c5umbwggrnybckk46wg -% Encoding created by otftotfm on Sun Jun 2 14:53:43 2019 -% Command line follows encoding -/AutoEnc_jlgqyj7c5umbwggrnybckk46wg [ -%00 - /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek - /.notdef /.notdef /zerowidthnonjoiner /f_f_l /f_f_i /f_f /f_l /f_i -%10 - /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring - /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash -%20 - /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /onesuperior /twosuperior /threesuperior /four /five /six /seven - /eight /nine /colon /semicolon /less /equal /greater /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /tilde /dieresis -%80 - /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl - /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus -%90 - /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash - /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis -%A0 - /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section - /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron -%B0 - /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered - /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls -%E0 - /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla - /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis -%F0 - /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide - /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map -% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI -% --feature=liga --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl -% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl -% --ligkern=* {KL} * MerriweatherSans-Bold.ttf -% MerriweatherSans-Bold-sup-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_l3riwr.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_l3riwr.enc deleted file mode 100644 index 0ed42425adb..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_l3riwr.enc +++ /dev/null @@ -1,65 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_l3riwrv45htepume6iim3qrijh -% Encoding created by otftotfm on Sun Jun 2 14:54:05 2019 -% Command line follows encoding -/AutoEnc_l3riwrv45htepume6iim3qrijh [ -%00 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /C /question -%10 - /questiondown /exclam /quotedblbase /exclamdown /endash /.notdef /.notdef /.notdef - /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /asterisk /.notdef -%20 - /.notdef /bar /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle - /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction -%30 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef -%40 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%50 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown -%60 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%70 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%80 - /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand - /bullet /.notdef /.notdef /.notdef /florin /colonmonetary /won /.notdef -%90 - /.notdef /.notdef /lira /.notdef /.notdef /.notdef /dong /trademark - /.notdef /.notdef /.notdef /afii61352 /.notdef /estimated /.notdef /.notdef -%A0 - /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section - /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef -%B0 - /degree /plusminus /two.superior /three.superior /.notdef /mu /paragraph /periodcentered - /.notdef /one.superior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef - /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap -% --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --ligkern=f -% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi -% --ligkern=ff l =: ffl Merriweather-Bold.ttf Merriweather-Bold-osf-ts1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_rwkhk4.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_rwkhk4.enc deleted file mode 100644 index b98da0f797f..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_rwkhk4.enc +++ /dev/null @@ -1,67 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_rwkhk45r7tkww4m25qeus4mcmb -% Encoding created by otftotfm on Sun Jun 2 14:53:42 2019 -% Command line follows encoding -/AutoEnc_rwkhk45r7tkww4m25qeus4mcmb [ -%00 - /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek - /.notdef /.notdef /zerowidthnonjoiner /f_f_l /f_f_i /f_f /f_l /f_i -%10 - /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring - /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash -%20 - /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /onesuperior /twosuperior /threesuperior /four /five /six /seven - /eight /nine /colon /semicolon /less /equal /greater /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /tilde /dieresis -%80 - /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl - /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus -%90 - /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash - /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis -%A0 - /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section - /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron -%B0 - /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered - /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls -%E0 - /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla - /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis -%F0 - /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide - /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map -% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI -% --feature=liga --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl -% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl -% --ligkern=* {KL} * MerriweatherSans-BoldItalic.ttf -% MerriweatherSans-BoldItalic-sup-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_tvbl63.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_tvbl63.enc deleted file mode 100644 index ba31c9c8460..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_tvbl63.enc +++ /dev/null @@ -1,66 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb -% Encoding created by otftotfm on Sun Jun 2 14:53:42 2019 -% Command line follows encoding -/AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb [ -%00 - /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring - /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash -%20 - /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis -%80 - /f_f /f_i /f_l /f_f_i /f_f_l /.notdef /.notdef /.notdef - /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef -%90 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%A0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef -%B0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --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 --ligkern=f -% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi -% --ligkern=ff l =: ffl MerriweatherSans-BoldItalic.ttf -% MerriweatherSans-BoldItalic-osf-ot1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_vi456v.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_vi456v.enc deleted file mode 100644 index 34bbfd95b94..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_vi456v.enc +++ /dev/null @@ -1,66 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_vi456vknjkllfjnxu4s533uuwe -% Encoding created by otftotfm on Sun Jun 2 14:53:42 2019 -% Command line follows encoding -/AutoEnc_vi456vknjkllfjnxu4s533uuwe [ -%00 - /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek - /.notdef /.notdef /zerowidthnonjoiner /f_f_l /f_f_i /f_f /f_l /f_i -%10 - /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring - /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash -%20 - /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /less /equal /greater /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /tilde /dieresis -%80 - /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl - /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus -%90 - /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash - /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis -%A0 - /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section - /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron -%B0 - /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered - /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls -%E0 - /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla - /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis -%F0 - /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide - /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map -% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI -% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff -% --ligkern=ff i =: ffi --ligkern=ff l =: ffl -% MerriweatherSans-BoldItalic.ttf MerriweatherSans-BoldItalic-osf-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc deleted file mode 100644 index 86efb22bb1b..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc +++ /dev/null @@ -1,66 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve -% Encoding created by otftotfm on Sun Jun 2 14:54:05 2019 -% Command line follows encoding -/AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve [ -%00 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /asterisk /question -%10 - /C /bar /quotedblbase /exclamdown /exclam /.notdef /.notdef /.notdef - /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef -%20 - /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle - /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction -%30 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef -%40 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%50 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown -%60 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%70 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%80 - /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand - /bullet /.notdef /.notdef /.notdef /florin /colonmonetary /won /.notdef -%90 - /.notdef /.notdef /lira /.notdef /.notdef /.notdef /dong /trademark - /.notdef /.notdef /.notdef /afii61352 /.notdef /estimated /.notdef /.notdef -%A0 - /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section - /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef -%B0 - /degree /plusminus /two.superior /three.superior /.notdef /mu /paragraph /periodcentered - /.notdef /one.superior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef - /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap -% --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --ligkern=f -% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi -% --ligkern=ff l =: ffl Merriweather-BoldIt.ttf -% Merriweather-BoldItalic-osf-ts1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_z4e4wk.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_z4e4wk.enc deleted file mode 100644 index 7753bd87ba5..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_z4e4wk.enc +++ /dev/null @@ -1,66 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_z4e4wksqkjuob7lry6demn2pba -% Encoding created by otftotfm on Sun Jun 2 14:53:43 2019 -% Command line follows encoding -/AutoEnc_z4e4wksqkjuob7lry6demn2pba [ -%00 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk -%10 - /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef -%20 - /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle - /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction -%30 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef -%40 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%50 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%60 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%70 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%80 - /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand - /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef -%90 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark - /.notdef /.notdef /.notdef /afii61352 /.notdef /estimated /.notdef /.notdef -%A0 - /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section - /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef -%B0 - /degree /plusminus /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered - /.notdef /onesuperior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef - /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/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' diff --git a/Master/texmf-dist/fonts/map/dvips/merriweather/merriweather.map b/Master/texmf-dist/fonts/map/dvips/merriweather/merriweather.map deleted file mode 100644 index 124fe1381dd..00000000000 --- a/Master/texmf-dist/fonts/map/dvips/merriweather/merriweather.map +++ /dev/null @@ -1,92 +0,0 @@ -% Automatically maintained by otftotfm or other programs. Do not edit. - -Merriweather-BoldItalic-osf-ot1 Merriweather-BoldItalic "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwth_6upxhe.enc <Merriweather-BoldIt.ttf -Merriweather-BoldItalic-osf-t1--base Merriweather-BoldItalic "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwth_clyrx2.enc <Merriweather-BoldIt.ttf -Merriweather-BoldItalic-osf-ly1 Merriweather-BoldItalic "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-BoldIt.ttf -Merriweather-BoldItalic-osf-ts1--base Merriweather-BoldItalic "AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve ReEncodeFont" <[mwth_xz5wux.enc <Merriweather-BoldIt.ttf -Merriweather-Bold-osf-ot1 Merriweather-Bold "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwth_6upxhe.enc <Merriweather-Bold.pfb -Merriweather-Bold-osf-t1--base Merriweather-Bold "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwth_clyrx2.enc <Merriweather-Bold.pfb -Merriweather-Bold-osf-ly1 Merriweather-Bold "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-Bold.pfb -Merriweather-Bold-osf-ts1--base Merriweather-Bold "AutoEnc_l3riwrv45htepume6iim3qrijh ReEncodeFont" <[mwth_l3riwr.enc <Merriweather-Bold.pfb -Merriweather-Italic-osf-ot1 Merriweather-Italic "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwth_6upxhe.enc <Merriweather-Italic.pfb -Merriweather-Italic-osf-t1--base Merriweather-Italic "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwth_clyrx2.enc <Merriweather-Italic.pfb -Merriweather-Italic-osf-ly1 Merriweather-Italic "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-Italic.pfb -Merriweather-Italic-osf-ts1--base Merriweather-Italic "AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve ReEncodeFont" <[mwth_xz5wux.enc <Merriweather-Italic.pfb -Merriweather-LightIt-osf-ot1 Merriweather-LightIt "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwth_6upxhe.enc <Merriweather-LightIt.pfb -Merriweather-LightIt-osf-t1--base Merriweather-LightIt "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwth_clyrx2.enc <Merriweather-LightIt.pfb -Merriweather-LightIt-osf-ly1 Merriweather-LightIt "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-LightIt.pfb -Merriweather-LightIt-osf-ts1--base Merriweather-LightIt "AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve ReEncodeFont" <[mwth_xz5wux.enc <Merriweather-LightIt.pfb -Merriweather-Light-osf-ot1 Merriweather-Light "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwth_6upxhe.enc <Merriweather-Light.pfb -Merriweather-Light-osf-t1--base Merriweather-Light "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwth_clyrx2.enc <Merriweather-Light.pfb -Merriweather-Light-osf-ly1 Merriweather-Light "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-Light.pfb -Merriweather-Light-osf-ts1--base Merriweather-Light "AutoEnc_l3riwrv45htepume6iim3qrijh ReEncodeFont" <[mwth_l3riwr.enc <Merriweather-Light.pfb -Merriweather-Regular-osf-ot1 Merriweather-Regular "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwth_6upxhe.enc <Merriweather-Regular.pfb -Merriweather-Regular-osf-t1--base Merriweather-Regular "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwth_clyrx2.enc <Merriweather-Regular.pfb -Merriweather-Regular-osf-ly1 Merriweather-Regular "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-Regular.pfb -Merriweather-Regular-osf-ts1--base Merriweather-Regular "AutoEnc_l3riwrv45htepume6iim3qrijh ReEncodeFont" <[mwth_l3riwr.enc <Merriweather-Regular.pfb -Merriweather-UltraBdIt-osf-ot1 Merriweather-UltraBdIt "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwth_6upxhe.enc <Merriweather-UltraBdIt.pfb -Merriweather-UltraBdIt-osf-t1--base Merriweather-UltraBdIt "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwth_clyrx2.enc <Merriweather-UltraBdIt.pfb -Merriweather-UltraBdIt-osf-ly1 Merriweather-UltraBdIt "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-UltraBdIt.pfb -Merriweather-UltraBdIt-osf-ts1--base Merriweather-UltraBdIt "AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve ReEncodeFont" <[mwth_xz5wux.enc <Merriweather-UltraBdIt.pfb -Merriweather-UltraBold-osf-ot1 Merriweather-UltraBold "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwth_6upxhe.enc <Merriweather-UltraBold.pfb -Merriweather-UltraBold-osf-t1--base Merriweather-UltraBold "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwth_clyrx2.enc <Merriweather-UltraBold.pfb -Merriweather-UltraBold-osf-ly1 Merriweather-UltraBold "AutoEnc_5q2vgdqo7txurrtxwuhjydkywc ReEncodeFont" <[mwth_5q2vgd.enc <Merriweather-UltraBold.pfb -Merriweather-UltraBold-osf-ts1--base Merriweather-UltraBold "AutoEnc_l3riwrv45htepume6iim3qrijh ReEncodeFont" <[mwth_l3riwr.enc <Merriweather-UltraBold.pfb -% Automatically maintained by otftotfm or other programs. Do not edit. - -MerriweatherSans-BoldItalic-sup-ot1 MerriweatherSans-BoldItalic "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwth_czxicq.enc <MerriweatherSans-BoldItalic.pfb -MerriweatherSans-BoldItalic-sup-t1--base MerriweatherSans-BoldItalic "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwth_7ytifx.enc <MerriweatherSans-BoldItalic.pfb -MerriweatherSans-BoldItalic-sup-ly1 MerriweatherSans-BoldItalic "AutoEnc_rwkhk45r7tkww4m25qeus4mcmb ReEncodeFont" <[mwth_rwkhk4.enc <MerriweatherSans-BoldItalic.pfb -MerriweatherSans-BoldItalic-osf-ot1 MerriweatherSans-BoldItalic "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwth_tvbl63.enc <MerriweatherSans-BoldItalic.pfb -MerriweatherSans-BoldItalic-osf-t1--base MerriweatherSans-BoldItalic "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwth_iuohxq.enc <MerriweatherSans-BoldItalic.pfb -MerriweatherSans-BoldItalic-osf-ly1 MerriweatherSans-BoldItalic "AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont" <[mwth_vi456v.enc <MerriweatherSans-BoldItalic.pfb -MerriweatherSans-BoldItalic-osf-ts1--base MerriweatherSans-BoldItalic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-BoldItalic.pfb -MerriweatherSans-Bold-sup-ot1 MerriweatherSans-Bold "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwth_czxicq.enc <MerriweatherSans-Bold.pfb -MerriweatherSans-Bold-sup-t1--base MerriweatherSans-Bold "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwth_7ytifx.enc <MerriweatherSans-Bold.pfb -MerriweatherSans-Bold-sup-ly1 MerriweatherSans-Bold "AutoEnc_jlgqyj7c5umbwggrnybckk46wg ReEncodeFont" <[mwth_jlgqyj.enc <MerriweatherSans-Bold.pfb -MerriweatherSans-Bold-osf-ot1 MerriweatherSans-Bold "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwth_tvbl63.enc <MerriweatherSans-Bold.pfb -MerriweatherSans-Bold-osf-t1--base MerriweatherSans-Bold "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwth_iuohxq.enc <MerriweatherSans-Bold.pfb -MerriweatherSans-Bold-osf-ly1 MerriweatherSans-Bold "AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont" <[mwth_44qg5v.enc <MerriweatherSans-Bold.pfb -MerriweatherSans-Bold-osf-ts1--base MerriweatherSans-Bold "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Bold.pfb -MerriweatherSans-ExtraBoldItalic-sup-ot1 MerriweatherSans-ExtraBoldItalic "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwth_czxicq.enc <MerriweatherSans-ExBoldIt.ttf -MerriweatherSans-ExtraBoldItalic-sup-t1--base MerriweatherSans-ExtraBoldItalic "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwth_7ytifx.enc <MerriweatherSans-ExBoldIt.ttf -MerriweatherSans-ExtraBoldItalic-sup-ly1 MerriweatherSans-ExtraBoldItalic "AutoEnc_rwkhk45r7tkww4m25qeus4mcmb ReEncodeFont" <[mwth_rwkhk4.enc <MerriweatherSans-ExBoldIt.ttf -MerriweatherSans-ExtraBoldItalic-osf-ot1 MerriweatherSans-ExtraBoldItalic "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwth_tvbl63.enc <MerriweatherSans-ExBoldIt.ttf -MerriweatherSans-ExtraBoldItalic-osf-t1--base MerriweatherSans-ExtraBoldItalic "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwth_iuohxq.enc <MerriweatherSans-ExBoldIt.ttf -MerriweatherSans-ExtraBoldItalic-osf-ly1 MerriweatherSans-ExtraBoldItalic "AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont" <[mwth_vi456v.enc <MerriweatherSans-ExBoldIt.ttf -MerriweatherSans-ExtraBoldItalic-osf-ts1--base MerriweatherSans-ExtraBoldItalic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-ExBoldIt.ttf -MerriweatherSans-ExtraBold-sup-ot1 MerriweatherSans-ExtraBold "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwth_czxicq.enc <MerriweatherSans-ExtraBold.pfb -MerriweatherSans-ExtraBold-sup-t1--base MerriweatherSans-ExtraBold "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwth_7ytifx.enc <MerriweatherSans-ExtraBold.pfb -MerriweatherSans-ExtraBold-sup-ly1 MerriweatherSans-ExtraBold "AutoEnc_jlgqyj7c5umbwggrnybckk46wg ReEncodeFont" <[mwth_jlgqyj.enc <MerriweatherSans-ExtraBold.pfb -MerriweatherSans-ExtraBold-osf-ot1 MerriweatherSans-ExtraBold "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwth_tvbl63.enc <MerriweatherSans-ExtraBold.pfb -MerriweatherSans-ExtraBold-osf-t1--base MerriweatherSans-ExtraBold "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwth_iuohxq.enc <MerriweatherSans-ExtraBold.pfb -MerriweatherSans-ExtraBold-osf-ly1 MerriweatherSans-ExtraBold "AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont" <[mwth_44qg5v.enc <MerriweatherSans-ExtraBold.pfb -MerriweatherSans-ExtraBold-osf-ts1--base MerriweatherSans-ExtraBold "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-ExtraBold.pfb -MerriweatherSans-Italic-sup-ot1 MerriweatherSans-Italic "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwth_czxicq.enc <MerriweatherSans-Italic.pfb -MerriweatherSans-Italic-sup-t1--base MerriweatherSans-Italic "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwth_7ytifx.enc <MerriweatherSans-Italic.pfb -MerriweatherSans-Italic-sup-ly1 MerriweatherSans-Italic "AutoEnc_rwkhk45r7tkww4m25qeus4mcmb ReEncodeFont" <[mwth_rwkhk4.enc <MerriweatherSans-Italic.pfb -MerriweatherSans-Italic-osf-ot1 MerriweatherSans-Italic "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwth_tvbl63.enc <MerriweatherSans-Italic.pfb -MerriweatherSans-Italic-osf-t1--base MerriweatherSans-Italic "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwth_iuohxq.enc <MerriweatherSans-Italic.pfb -MerriweatherSans-Italic-osf-ly1 MerriweatherSans-Italic "AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont" <[mwth_vi456v.enc <MerriweatherSans-Italic.pfb -MerriweatherSans-Italic-osf-ts1--base MerriweatherSans-Italic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Italic.pfb -MerriweatherSans-LightItalic-sup-ot1 MerriweatherSans-LightItalic "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwth_czxicq.enc <MerriweatherSans-LightItalic.pfb -MerriweatherSans-LightItalic-sup-t1--base MerriweatherSans-LightItalic "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwth_7ytifx.enc <MerriweatherSans-LightItalic.pfb -MerriweatherSans-LightItalic-sup-ly1 MerriweatherSans-LightItalic "AutoEnc_rwkhk45r7tkww4m25qeus4mcmb ReEncodeFont" <[mwth_rwkhk4.enc <MerriweatherSans-LightItalic.pfb -MerriweatherSans-LightItalic-osf-ot1 MerriweatherSans-LightItalic "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwth_tvbl63.enc <MerriweatherSans-LightItalic.pfb -MerriweatherSans-LightItalic-osf-t1--base MerriweatherSans-LightItalic "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwth_iuohxq.enc <MerriweatherSans-LightItalic.pfb -MerriweatherSans-LightItalic-osf-ly1 MerriweatherSans-LightItalic "AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont" <[mwth_vi456v.enc <MerriweatherSans-LightItalic.pfb -MerriweatherSans-LightItalic-osf-ts1--base MerriweatherSans-LightItalic "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-LightItalic.pfb -MerriweatherSans-Light-sup-ot1 MerriweatherSans-Light "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwth_czxicq.enc <MerriweatherSans-Light.pfb -MerriweatherSans-Light-sup-t1--base MerriweatherSans-Light "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwth_7ytifx.enc <MerriweatherSans-Light.pfb -MerriweatherSans-Light-sup-ly1 MerriweatherSans-Light "AutoEnc_jlgqyj7c5umbwggrnybckk46wg ReEncodeFont" <[mwth_jlgqyj.enc <MerriweatherSans-Light.pfb -MerriweatherSans-Light-osf-ot1 MerriweatherSans-Light "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwth_tvbl63.enc <MerriweatherSans-Light.pfb -MerriweatherSans-Light-osf-t1--base MerriweatherSans-Light "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwth_iuohxq.enc <MerriweatherSans-Light.pfb -MerriweatherSans-Light-osf-ly1 MerriweatherSans-Light "AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont" <[mwth_44qg5v.enc <MerriweatherSans-Light.pfb -MerriweatherSans-Light-osf-ts1--base MerriweatherSans-Light "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Light.pfb -MerriweatherSans-Regular-sup-ot1 MerriweatherSans-Regular "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwth_czxicq.enc <MerriweatherSans-Regular.pfb -MerriweatherSans-Regular-sup-t1--base MerriweatherSans-Regular "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwth_7ytifx.enc <MerriweatherSans-Regular.pfb -MerriweatherSans-Regular-sup-ly1 MerriweatherSans-Regular "AutoEnc_jlgqyj7c5umbwggrnybckk46wg ReEncodeFont" <[mwth_jlgqyj.enc <MerriweatherSans-Regular.pfb -MerriweatherSans-Regular-osf-ot1 MerriweatherSans-Regular "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwth_tvbl63.enc <MerriweatherSans-Regular.pfb -MerriweatherSans-Regular-osf-t1--base MerriweatherSans-Regular "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwth_iuohxq.enc <MerriweatherSans-Regular.pfb -MerriweatherSans-Regular-osf-ly1 MerriweatherSans-Regular "AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont" <[mwth_44qg5v.enc <MerriweatherSans-Regular.pfb -MerriweatherSans-Regular-osf-ts1--base MerriweatherSans-Regular "AutoEnc_z4e4wksqkjuob7lry6demn2pba ReEncodeFont" <[mwth_z4e4wk.enc <MerriweatherSans-Regular.pfb diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ly1.tfm Binary files differdeleted file mode 100644 index 9160f6dd7ed..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ly1.tfm +++ /dev/null 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 differdeleted file mode 100644 index d3f23fcfe57..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ot1.tfm +++ /dev/null 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 differdeleted file mode 100644 index f70599ea3e4..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1--base.tfm +++ /dev/null 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 differdeleted file mode 100644 index 767a7f16090..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-t1.tfm +++ /dev/null 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 differdeleted file mode 100644 index 874d4c67018..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1--base.tfm +++ /dev/null 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 differdeleted file mode 100644 index 9de1a3ea914..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Bold-osf-ts1.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 differdeleted file mode 100644 index 5bc397ed2b1..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ly1.tfm +++ /dev/null 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 differdeleted file mode 100644 index b3b36894eba..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ot1.tfm +++ /dev/null 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 differdeleted file mode 100644 index 55855b27df6..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1--base.tfm +++ /dev/null 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 differdeleted file mode 100644 index 03202f1731b..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.tfm +++ /dev/null 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 differdeleted file mode 100644 index 6dcbd1cf612..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1--base.tfm +++ /dev/null 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 differdeleted file mode 100644 index ec579569607..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.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 differdeleted file mode 100644 index 3513f44bd31..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ly1.tfm +++ /dev/null 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 differdeleted file mode 100644 index ddcad0a8c24..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ot1.tfm +++ /dev/null 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 differdeleted file mode 100644 index 419a72a875e..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1--base.tfm +++ /dev/null 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 differdeleted file mode 100644 index 74664cb4dc3..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-t1.tfm +++ /dev/null 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 differdeleted file mode 100644 index 296b568c445..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1--base.tfm +++ /dev/null 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 differdeleted file mode 100644 index f91b76489a7..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Italic-osf-ts1.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 differdeleted file mode 100644 index 9d23161819e..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ly1.tfm +++ /dev/null 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 differdeleted file mode 100644 index 7fd5647b5d7..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ot1.tfm +++ /dev/null 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 differdeleted file mode 100644 index 66844fd5202..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1--base.tfm +++ /dev/null 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 differdeleted file mode 100644 index 419cbdf45e8..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-t1.tfm +++ /dev/null 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 differdeleted file mode 100644 index a40bd950ab1..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1--base.tfm +++ /dev/null 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 differdeleted file mode 100644 index d31d880a9ee..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Light-osf-ts1.tfm +++ /dev/null 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 differdeleted file mode 100644 index 301398adf67..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ly1.tfm +++ /dev/null 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 differdeleted file mode 100644 index e2ac84e952a..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ot1.tfm +++ /dev/null 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 differdeleted file mode 100644 index c35cea08858..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1--base.tfm +++ /dev/null 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 differdeleted file mode 100644 index bdd1275d810..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-t1.tfm +++ /dev/null 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 differdeleted file mode 100644 index b75adbbde54..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-osf-ts1--base.tfm +++ /dev/null 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 differdeleted file mode 100644 index 53378e24cbb..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-LightIt-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 differdeleted file mode 100644 index 89ec8fafa01..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ly1.tfm +++ /dev/null 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 differdeleted file mode 100644 index f45d670f69b..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ot1.tfm +++ /dev/null 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 differdeleted file mode 100644 index ecec3d6b83e..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1--base.tfm +++ /dev/null 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 differdeleted file mode 100644 index 1ac381f7cd6..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-t1.tfm +++ /dev/null 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 differdeleted file mode 100644 index e3052b7acf0..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1--base.tfm +++ /dev/null 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 differdeleted file mode 100644 index b26997fdff9..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-Regular-osf-ts1.tfm +++ /dev/null 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 differdeleted file mode 100644 index 112fd9e1108..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ly1.tfm +++ /dev/null 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 differdeleted file mode 100644 index dd8f065e1cc..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ot1.tfm +++ /dev/null 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 differdeleted file mode 100644 index d575850d705..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1--base.tfm +++ /dev/null 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 differdeleted file mode 100644 index a40473d49c6..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.tfm +++ /dev/null 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 differdeleted file mode 100644 index 1f2319165fc..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1--base.tfm +++ /dev/null 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 differdeleted file mode 100644 index 1a510a52b57..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.tfm +++ /dev/null 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 differdeleted file mode 100644 index 3098467fb0a..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ly1.tfm +++ /dev/null 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 differdeleted file mode 100644 index fcd514d81bb..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ot1.tfm +++ /dev/null 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 differdeleted file mode 100644 index 60a7bf0ef67..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1--base.tfm +++ /dev/null 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 differdeleted file mode 100644 index 3068eded1dd..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-t1.tfm +++ /dev/null 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 differdeleted file mode 100644 index c84d720db0a..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1--base.tfm +++ /dev/null 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 differdeleted file mode 100644 index d96fedbabf5..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.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 3786dcc5056..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-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ot1.tfm Binary files differdeleted file mode 100644 index 6e4f3a1ab6e..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ot1.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 fe164e71b29..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-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-t1.tfm Binary files differdeleted file mode 100644 index 955764de65c..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-t1.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 91c33d7bd2d..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-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1.tfm Binary files differdeleted file mode 100644 index d714f32d545..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-ly1.tfm Binary files differdeleted file mode 100644 index 08562e5c478..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-ot1.tfm Binary files differdeleted file mode 100644 index 756f9c7e8d4..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-ot1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-t1--base.tfm Binary files differdeleted file mode 100644 index b28aa5cc2da..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-t1.tfm Binary files differdeleted file mode 100644 index ff07067da7a..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Bold-sup-t1.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 7af1782eac6..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-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ot1.tfm Binary files differdeleted file mode 100644 index e5c43f71e79..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ot1.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 05f1e4b1c12..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-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1.tfm Binary files differdeleted file mode 100644 index 1c8f5ddd4ad..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1.tfm +++ /dev/null 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-osf-ts1--base.tfm Binary files differdeleted file mode 100644 index 1a0bb9561a1..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1--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 261c2e37edd..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-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-ly1.tfm Binary files differdeleted file mode 100644 index 746ee008f1c..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-ot1.tfm Binary files differdeleted file mode 100644 index 54aa1e0062a..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-ot1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1--base.tfm Binary files differdeleted file mode 100644 index 8837e4d8aaf..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1.tfm Binary files differdeleted file mode 100644 index 801fa6d5aba..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1.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-osf-ly1.tfm Binary files differdeleted file mode 100644 index f26cd745ccb..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ot1.tfm Binary files differdeleted file mode 100644 index 24e2704ce86..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ot1.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 f2614b3996f..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-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1.tfm Binary files differdeleted file mode 100644 index 53e0f8bdd75..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1.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 be2910e9fac..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-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.tfm Binary files differdeleted file mode 100644 index fae06d497ce..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-ly1.tfm Binary files differdeleted file mode 100644 index 4cff2d4d024..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-ot1.tfm Binary files differdeleted file mode 100644 index 5c4a51e6575..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-ot1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1--base.tfm Binary files differdeleted file mode 100644 index c691faab183..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1.tfm Binary files differdeleted file mode 100644 index 8e9d4c0f8f2..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ly1.tfm Binary files differdeleted file mode 100644 index c433b5be4e9..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ot1.tfm Binary files differdeleted file mode 100644 index 4f53a388e22..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ot1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1--base.tfm Binary files differdeleted file mode 100644 index cb0adf90190..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1.tfm Binary files differdeleted file mode 100644 index 50401bbae03..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1--base.tfm Binary files differdeleted file mode 100644 index e20d622cf49..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1.tfm Binary files differdeleted file mode 100644 index 67ad0adf2f7..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-ly1.tfm Binary files differdeleted file mode 100644 index f51112a0233..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-ot1.tfm Binary files differdeleted file mode 100644 index 2ecf32521c7..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-ot1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1--base.tfm Binary files differdeleted file mode 100644 index 2afd34399fb..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1.tfm Binary files differdeleted file mode 100644 index c0dbc944161..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1.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 a2606a35e63..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-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ot1.tfm Binary files differdeleted file mode 100644 index 75b411aaca1..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ot1.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 946f4249bde..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-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-t1.tfm Binary files differdeleted file mode 100644 index a740dfde8d9..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-t1.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 2e0a83dcfe4..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-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.tfm Binary files differdeleted file mode 100644 index c5ed5d2c98a..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-ly1.tfm Binary files differdeleted file mode 100644 index cb81d7385fa..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-ot1.tfm Binary files differdeleted file mode 100644 index 56a0db2a255..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-ot1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-t1--base.tfm Binary files differdeleted file mode 100644 index d0bd391b51f..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-t1.tfm Binary files differdeleted file mode 100644 index b5cfd76f79a..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Italic-sup-t1.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 05ea2f42e68..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-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ot1.tfm Binary files differdeleted file mode 100644 index fcf8742b3dc..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ot1.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 65e5e27ebb4..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-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-t1.tfm Binary files differdeleted file mode 100644 index 329b180b0da..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-t1.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 38ea41c4293..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-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ts1.tfm Binary files differdeleted file mode 100644 index 9e751531a8b..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-osf-ts1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-ly1.tfm Binary files differdeleted file mode 100644 index c216000d493..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-ot1.tfm Binary files differdeleted file mode 100644 index 003b1646235..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-ot1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-t1--base.tfm Binary files differdeleted file mode 100644 index 4a101f3e09e..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-t1.tfm Binary files differdeleted file mode 100644 index 2ca43eec040..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Light-sup-t1.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 70bd5825e14..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-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ot1.tfm Binary files differdeleted file mode 100644 index 60af6e8ed2d..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ot1.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 f42c1a82e8b..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 deeabf10ace..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-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1--base.tfm Binary files differdeleted file mode 100644 index 7841a8d3f1a..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.tfm Binary files differdeleted file mode 100644 index e3473984638..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-ly1.tfm Binary files differdeleted file mode 100644 index b63de0d5ff8..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-ot1.tfm Binary files differdeleted file mode 100644 index 79fb78a1030..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-ot1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1--base.tfm Binary files differdeleted file mode 100644 index 0a6c68d608b..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1.tfm Binary files differdeleted file mode 100644 index b6610141386..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1.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 adb3b9fa445..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-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ot1.tfm Binary files differdeleted file mode 100644 index 17114836219..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-ot1.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 944dcbaa6dd..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-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-t1.tfm Binary files differdeleted file mode 100644 index 19c83cab5ab..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-osf-t1.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 9daf22f6be0..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 c13947fd7d4..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-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-ly1.tfm Binary files differdeleted file mode 100644 index 88bb890d618..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-ly1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-ot1.tfm Binary files differdeleted file mode 100644 index 4f0b3d9dd42..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-ot1.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-t1--base.tfm Binary files differdeleted file mode 100644 index f948b6048fe..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-t1--base.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-t1.tfm Binary files differdeleted file mode 100644 index 39cb2a95796..00000000000 --- a/Master/texmf-dist/fonts/tfm/sorkin/merriweather/MerriweatherSans-Regular-sup-t1.tfm +++ /dev/null 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 differdeleted file mode 100644 index aa60d073b75..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Bold.pfb +++ /dev/null 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 differdeleted file mode 100644 index f26a38cf016..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-BoldIt.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 differdeleted file mode 100644 index d76fd083beb..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Italic.pfb +++ /dev/null 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 differdeleted file mode 100644 index 8a87312afd8..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Light.pfb +++ /dev/null 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 differdeleted file mode 100644 index d0b99fca1c4..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-LightIt.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 differdeleted file mode 100644 index f7440e39e2f..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-Regular.pfb +++ /dev/null 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 differdeleted file mode 100644 index ca95303b15e..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-UltraBdIt.pfb +++ /dev/null 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 differdeleted file mode 100644 index c4b46172025..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/Merriweather-UltraBold.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 differdeleted file mode 100644 index 43401ba1985..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Bold.pfb +++ /dev/null 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 differdeleted file mode 100644 index 0c6eb041138..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-BoldItalic.pfb +++ /dev/null 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 differdeleted file mode 100644 index 57fa351bdc0..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-ExBoldIt.pfb +++ /dev/null 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 differdeleted file mode 100644 index 3c7e3122f20..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-ExtraBold.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 differdeleted file mode 100644 index eef256a6bc6..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Italic.pfb +++ /dev/null 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 differdeleted file mode 100644 index dc2aebe001f..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Light.pfb +++ /dev/null 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 differdeleted file mode 100644 index ef9a462ca96..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-LightItalic.pfb +++ /dev/null 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 differdeleted file mode 100644 index 96a006052fa..00000000000 --- a/Master/texmf-dist/fonts/type1/sorkin/merriweather/MerriweatherSans-Regular.pfb +++ /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 differdeleted file mode 100644 index 397d307a577..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-t1.vf +++ /dev/null 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 differdeleted file mode 100644 index a4531aee062..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Bold-osf-ts1.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 differdeleted file mode 100644 index ba87a8ff8c1..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-t1.vf +++ /dev/null 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 differdeleted file mode 100644 index 39d81586005..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-BoldItalic-osf-ts1.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 differdeleted file mode 100644 index 35579f1e6c7..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-t1.vf +++ /dev/null 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 differdeleted file mode 100644 index c17961d74b7..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Italic-osf-ts1.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 differdeleted file mode 100644 index f17aab5496b..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-t1.vf +++ /dev/null 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 differdeleted file mode 100644 index 1ccfa01be14..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Light-osf-ts1.vf +++ /dev/null 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 differdeleted file mode 100644 index 5ba2641a629..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-osf-t1.vf +++ /dev/null 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 differdeleted file mode 100644 index 6badd703d33..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-LightIt-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 differdeleted file mode 100644 index 01043b533ef..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-t1.vf +++ /dev/null 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 differdeleted file mode 100644 index c90b272e81b..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-Regular-osf-ts1.vf +++ /dev/null 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 differdeleted file mode 100644 index 5fbd2ad555d..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-t1.vf +++ /dev/null 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 differdeleted file mode 100644 index 8b64e8b481b..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBdIt-osf-ts1.vf +++ /dev/null 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 differdeleted file mode 100644 index df262a58273..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-t1.vf +++ /dev/null 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 differdeleted file mode 100644 index 9d37d94348c..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/Merriweather-UltraBold-osf-ts1.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-osf-t1.vf Binary files differdeleted file mode 100644 index 2b67836f60a..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-t1.vf +++ /dev/null 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-osf-ts1.vf Binary files differdeleted file mode 100644 index 31fdb149686..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-osf-ts1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-sup-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-sup-t1.vf Binary files differdeleted file mode 100644 index a74404cb13e..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Bold-sup-t1.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-osf-t1.vf Binary files differdeleted file mode 100644 index ea310805f8d..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-t1.vf +++ /dev/null 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-osf-ts1.vf Binary files differdeleted file mode 100644 index 6cd28ff2eb6..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-osf-ts1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1.vf Binary files differdeleted file mode 100644 index a20e42e4aff..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-BoldItalic-sup-t1.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-osf-t1.vf Binary files differdeleted file mode 100644 index 69826102598..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-t1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.vf Binary files differdeleted file mode 100644 index 0641eb73c66..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-osf-ts1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1.vf Binary files differdeleted file mode 100644 index 5de55215ff3..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBold-sup-t1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1.vf Binary files differdeleted file mode 100644 index 9d5483545aa..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-t1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1.vf Binary files differdeleted file mode 100644 index 9a232af6f98..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-osf-ts1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1.vf Binary files differdeleted file mode 100644 index fc78fab70be..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-ExtraBoldItalic-sup-t1.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-osf-t1.vf Binary files differdeleted file mode 100644 index dc507b48e8c..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-t1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.vf Binary files differdeleted file mode 100644 index e20d256bbe8..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-osf-ts1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-sup-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-sup-t1.vf Binary files differdeleted file mode 100644 index 9a76f3c2aee..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Italic-sup-t1.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-osf-t1.vf Binary files differdeleted file mode 100644 index c35c4bfd0ab..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-t1.vf +++ /dev/null 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-osf-ts1.vf Binary files differdeleted file mode 100644 index 1547d3ba5ad..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-osf-ts1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-sup-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-sup-t1.vf Binary files differdeleted file mode 100644 index 06f7bbb99a4..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Light-sup-t1.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-osf-t1.vf Binary files differdeleted file mode 100644 index 17f9ccfbba4..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-t1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.vf Binary files differdeleted file mode 100644 index 92dab0a6427..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-osf-ts1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1.vf Binary files differdeleted file mode 100644 index 8ce93f6a8e0..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-LightItalic-sup-t1.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-osf-t1.vf Binary files differdeleted file mode 100644 index f23fef89a75..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-t1.vf +++ /dev/null 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-osf-ts1.vf Binary files differdeleted file mode 100644 index b7dcf971293..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-osf-ts1.vf +++ /dev/null diff --git a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-sup-t1.vf b/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-sup-t1.vf Binary files differdeleted file mode 100644 index 89bbc15616e..00000000000 --- a/Master/texmf-dist/fonts/vf/sorkin/merriweather/MerriweatherSans-Regular-sup-t1.vf +++ /dev/null diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd deleted file mode 100644 index d7b8c6adec7..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd +++ /dev/null @@ -1,149 +0,0 @@ -%% Generated by autoinst on 2019/06/02 -%% -\ProvidesFile{LY1Merriweather-OsF.fd} - [2019/06/02 (autoinst) Font definitions for LY1/Merriweather-OsF.] - -\expandafter\ifx\csname Merriweather@scale\endcsname\relax - \let\Merriweather@@scale\@empty -\else - \edef\Merriweather@@scale{s*[\csname Merriweather@scale\endcsname]}% -\fi - -\DeclareFontFamily{LY1}{Merriweather-OsF}{} - - -% ---- regular ---- - -\DeclareFontShape{LY1}{Merriweather-OsF}{regular}{n}{ - <-> \Merriweather@@scale Merriweather-Regular-osf-ly1 -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{regular}{it}{ - <-> \Merriweather@@scale Merriweather-Italic-osf-ly1 -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{regular}{sl}{ - <-> ssub * Merriweather-OsF/regular/it -}{} - - -% ---- bold ---- - -\DeclareFontShape{LY1}{Merriweather-OsF}{bold}{n}{ - <-> \Merriweather@@scale Merriweather-Bold-osf-ly1 -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{bold}{it}{ - <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ly1 -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{bold}{sl}{ - <-> ssub * Merriweather-OsF/bold/it -}{} - - -% ---- light ---- - -\DeclareFontShape{LY1}{Merriweather-OsF}{light}{n}{ - <-> \Merriweather@@scale Merriweather-Light-osf-ly1 -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{light}{it}{ - <-> \Merriweather@@scale Merriweather-LightIt-osf-ly1 -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{light}{sl}{ - <-> ssub * Merriweather-OsF/light/it -}{} - - -% ---- ultrabold ---- - -\DeclareFontShape{LY1}{Merriweather-OsF}{ultrabold}{n}{ - <-> \Merriweather@@scale Merriweather-UltraBold-osf-ly1 -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{ultrabold}{it}{ - <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ly1 -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{ultrabold}{sl}{ - <-> ssub * Merriweather-OsF/ultrabold/it -}{} - -% -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names -% - -% l --> light - -\DeclareFontShape{LY1}{Merriweather-OsF}{l}{sl}{ - <-> ssub * Merriweather-OsF/light/sl -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{l}{n}{ - <-> ssub * Merriweather-OsF/light/n -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{l}{it}{ - <-> ssub * Merriweather-OsF/light/it -}{} - - -% m --> regular - -\DeclareFontShape{LY1}{Merriweather-OsF}{m}{sl}{ - <-> ssub * Merriweather-OsF/regular/sl -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{m}{n}{ - <-> ssub * Merriweather-OsF/regular/n -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{m}{it}{ - <-> ssub * Merriweather-OsF/regular/it -}{} - - -% b --> bold - -\DeclareFontShape{LY1}{Merriweather-OsF}{b}{sl}{ - <-> ssub * Merriweather-OsF/bold/sl -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{b}{n}{ - <-> ssub * Merriweather-OsF/bold/n -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{b}{it}{ - <-> ssub * Merriweather-OsF/bold/it -}{} - - -% ub --> ultrabold - -\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{sl}{ - <-> ssub * Merriweather-OsF/ultrabold/sl -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{n}{ - <-> ssub * Merriweather-OsF/ultrabold/n -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{it}{ - <-> ssub * Merriweather-OsF/ultrabold/it -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{bx}{n}{ - <-> ssub * Merriweather-OsF/b/n -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{bx}{sl}{ - <-> ssub * Merriweather-OsF/b/sl -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{bx}{it}{ - <-> ssub * Merriweather-OsF/b/it -}{} - -\endinput 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 1d190f586a3..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd +++ /dev/null @@ -1,149 +0,0 @@ -%% Generated by autoinst on 2019/06/02 -%% -\ProvidesFile{LY1MerriweatherSans-OsF.fd} - [2019/06/02 (autoinst) Font definitions for LY1/MerriweatherSans-OsF.] - -\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax - \let\MerriweatherSans@@scale\@empty -\else - \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% -\fi - -\DeclareFontFamily{LY1}{MerriweatherSans-OsF}{} - - -% ---- regular ---- - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{regular}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{regular}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{regular}{sl}{ - <-> ssub * MerriweatherSans-OsF/regular/it -}{} - - -% ---- bold ---- - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bold}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bold}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bold}{sl}{ - <-> ssub * MerriweatherSans-OsF/bold/it -}{} - - -% ---- light ---- - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{light}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{light}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{light}{sl}{ - <-> ssub * MerriweatherSans-OsF/light/it -}{} - - -% ---- extrabold ---- - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{extrabold}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{extrabold}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{extrabold}{sl}{ - <-> ssub * MerriweatherSans-OsF/extrabold/it -}{} - -% -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names -% - -% l --> light - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{l}{sl}{ - <-> ssub * MerriweatherSans-OsF/light/sl -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{l}{n}{ - <-> ssub * MerriweatherSans-OsF/light/n -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{l}{it}{ - <-> ssub * MerriweatherSans-OsF/light/it -}{} - - -% m --> regular - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{m}{sl}{ - <-> ssub * MerriweatherSans-OsF/regular/sl -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{m}{n}{ - <-> ssub * MerriweatherSans-OsF/regular/n -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{m}{it}{ - <-> ssub * MerriweatherSans-OsF/regular/it -}{} - - -% b --> bold - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{b}{sl}{ - <-> ssub * MerriweatherSans-OsF/bold/sl -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{b}{n}{ - <-> ssub * MerriweatherSans-OsF/bold/n -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{b}{it}{ - <-> ssub * MerriweatherSans-OsF/bold/it -}{} - - -% eb --> extrabold - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{eb}{sl}{ - <-> ssub * MerriweatherSans-OsF/extrabold/sl -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{eb}{n}{ - <-> ssub * MerriweatherSans-OsF/extrabold/n -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{eb}{it}{ - <-> ssub * MerriweatherSans-OsF/extrabold/it -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bx}{n}{ - <-> ssub * MerriweatherSans-OsF/b/n -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bx}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/sl -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bx}{it}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-Sup.fd b/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-Sup.fd deleted file mode 100644 index 094d4e2e46c..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-Sup.fd +++ /dev/null @@ -1,149 +0,0 @@ -%% Generated by autoinst on 2019/06/02 -%% -\ProvidesFile{LY1MerriweatherSans-Sup.fd} - [2019/06/02 (autoinst) Font definitions for LY1/MerriweatherSans-Sup.] - -\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax - \let\MerriweatherSans@@scale\@empty -\else - \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% -\fi - -\DeclareFontFamily{LY1}{MerriweatherSans-Sup}{} - - -% ---- regular ---- - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{regular}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Regular-sup-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{regular}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Italic-sup-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{regular}{sl}{ - <-> ssub * MerriweatherSans-Sup/regular/it -}{} - - -% ---- bold ---- - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bold}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Bold-sup-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bold}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-sup-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bold}{sl}{ - <-> ssub * MerriweatherSans-Sup/bold/it -}{} - - -% ---- light ---- - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{light}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Light-sup-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{light}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-sup-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{light}{sl}{ - <-> ssub * MerriweatherSans-Sup/light/it -}{} - - -% ---- extrabold ---- - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{extrabold}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-sup-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{extrabold}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-sup-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{extrabold}{sl}{ - <-> ssub * MerriweatherSans-Sup/extrabold/it -}{} - -% -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names -% - -% l --> light - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{l}{sl}{ - <-> ssub * MerriweatherSans-Sup/light/sl -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{l}{n}{ - <-> ssub * MerriweatherSans-Sup/light/n -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{l}{it}{ - <-> ssub * MerriweatherSans-Sup/light/it -}{} - - -% m --> regular - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{m}{sl}{ - <-> ssub * MerriweatherSans-Sup/regular/sl -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{m}{n}{ - <-> ssub * MerriweatherSans-Sup/regular/n -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{m}{it}{ - <-> ssub * MerriweatherSans-Sup/regular/it -}{} - - -% b --> bold - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{b}{sl}{ - <-> ssub * MerriweatherSans-Sup/bold/sl -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{b}{n}{ - <-> ssub * MerriweatherSans-Sup/bold/n -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{b}{it}{ - <-> ssub * MerriweatherSans-Sup/bold/it -}{} - - -% eb --> extrabold - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{eb}{sl}{ - <-> ssub * MerriweatherSans-Sup/extrabold/sl -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{eb}{n}{ - <-> ssub * MerriweatherSans-Sup/extrabold/n -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{eb}{it}{ - <-> ssub * MerriweatherSans-Sup/extrabold/it -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bx}{n}{ - <-> ssub * MerriweatherSans-Sup/b/n -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bx}{sl}{ - <-> ssub * MerriweatherSans-Sup/b/sl -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bx}{it}{ - <-> ssub * MerriweatherSans-Sup/b/it -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd deleted file mode 100644 index 1a8a932b03b..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd +++ /dev/null @@ -1,149 +0,0 @@ -%% Generated by autoinst on 2019/06/02 -%% -\ProvidesFile{OT1Merriweather-OsF.fd} - [2019/06/02 (autoinst) Font definitions for OT1/Merriweather-OsF.] - -\expandafter\ifx\csname Merriweather@scale\endcsname\relax - \let\Merriweather@@scale\@empty -\else - \edef\Merriweather@@scale{s*[\csname Merriweather@scale\endcsname]}% -\fi - -\DeclareFontFamily{OT1}{Merriweather-OsF}{} - - -% ---- regular ---- - -\DeclareFontShape{OT1}{Merriweather-OsF}{regular}{n}{ - <-> \Merriweather@@scale Merriweather-Regular-osf-ot1 -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{regular}{it}{ - <-> \Merriweather@@scale Merriweather-Italic-osf-ot1 -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{regular}{sl}{ - <-> ssub * Merriweather-OsF/regular/it -}{} - - -% ---- bold ---- - -\DeclareFontShape{OT1}{Merriweather-OsF}{bold}{n}{ - <-> \Merriweather@@scale Merriweather-Bold-osf-ot1 -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{bold}{it}{ - <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ot1 -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{bold}{sl}{ - <-> ssub * Merriweather-OsF/bold/it -}{} - - -% ---- light ---- - -\DeclareFontShape{OT1}{Merriweather-OsF}{light}{n}{ - <-> \Merriweather@@scale Merriweather-Light-osf-ot1 -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{light}{it}{ - <-> \Merriweather@@scale Merriweather-LightIt-osf-ot1 -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{light}{sl}{ - <-> ssub * Merriweather-OsF/light/it -}{} - - -% ---- ultrabold ---- - -\DeclareFontShape{OT1}{Merriweather-OsF}{ultrabold}{n}{ - <-> \Merriweather@@scale Merriweather-UltraBold-osf-ot1 -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{ultrabold}{it}{ - <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ot1 -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{ultrabold}{sl}{ - <-> ssub * Merriweather-OsF/ultrabold/it -}{} - -% -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names -% - -% l --> light - -\DeclareFontShape{OT1}{Merriweather-OsF}{l}{sl}{ - <-> ssub * Merriweather-OsF/light/sl -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{l}{n}{ - <-> ssub * Merriweather-OsF/light/n -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{l}{it}{ - <-> ssub * Merriweather-OsF/light/it -}{} - - -% m --> regular - -\DeclareFontShape{OT1}{Merriweather-OsF}{m}{sl}{ - <-> ssub * Merriweather-OsF/regular/sl -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{m}{n}{ - <-> ssub * Merriweather-OsF/regular/n -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{m}{it}{ - <-> ssub * Merriweather-OsF/regular/it -}{} - - -% b --> bold - -\DeclareFontShape{OT1}{Merriweather-OsF}{b}{sl}{ - <-> ssub * Merriweather-OsF/bold/sl -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{b}{n}{ - <-> ssub * Merriweather-OsF/bold/n -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{b}{it}{ - <-> ssub * Merriweather-OsF/bold/it -}{} - - -% ub --> ultrabold - -\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{sl}{ - <-> ssub * Merriweather-OsF/ultrabold/sl -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{n}{ - <-> ssub * Merriweather-OsF/ultrabold/n -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{it}{ - <-> ssub * Merriweather-OsF/ultrabold/it -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{bx}{n}{ - <-> ssub * Merriweather-OsF/b/n -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{bx}{sl}{ - <-> ssub * Merriweather-OsF/b/sl -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{bx}{it}{ - <-> ssub * Merriweather-OsF/b/it -}{} - -\endinput 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 e1c734a399c..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd +++ /dev/null @@ -1,149 +0,0 @@ -%% Generated by autoinst on 2019/06/02 -%% -\ProvidesFile{OT1MerriweatherSans-OsF.fd} - [2019/06/02 (autoinst) Font definitions for OT1/MerriweatherSans-OsF.] - -\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax - \let\MerriweatherSans@@scale\@empty -\else - \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% -\fi - -\DeclareFontFamily{OT1}{MerriweatherSans-OsF}{} - - -% ---- regular ---- - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{regular}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{regular}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{regular}{sl}{ - <-> ssub * MerriweatherSans-OsF/regular/it -}{} - - -% ---- bold ---- - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bold}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bold}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bold}{sl}{ - <-> ssub * MerriweatherSans-OsF/bold/it -}{} - - -% ---- light ---- - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{light}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{light}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{light}{sl}{ - <-> ssub * MerriweatherSans-OsF/light/it -}{} - - -% ---- extrabold ---- - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{extrabold}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{extrabold}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{extrabold}{sl}{ - <-> ssub * MerriweatherSans-OsF/extrabold/it -}{} - -% -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names -% - -% l --> light - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{l}{sl}{ - <-> ssub * MerriweatherSans-OsF/light/sl -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{l}{n}{ - <-> ssub * MerriweatherSans-OsF/light/n -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{l}{it}{ - <-> ssub * MerriweatherSans-OsF/light/it -}{} - - -% m --> regular - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{m}{sl}{ - <-> ssub * MerriweatherSans-OsF/regular/sl -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{m}{n}{ - <-> ssub * MerriweatherSans-OsF/regular/n -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{m}{it}{ - <-> ssub * MerriweatherSans-OsF/regular/it -}{} - - -% b --> bold - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{b}{sl}{ - <-> ssub * MerriweatherSans-OsF/bold/sl -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{b}{n}{ - <-> ssub * MerriweatherSans-OsF/bold/n -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{b}{it}{ - <-> ssub * MerriweatherSans-OsF/bold/it -}{} - - -% eb --> extrabold - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{eb}{sl}{ - <-> ssub * MerriweatherSans-OsF/extrabold/sl -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{eb}{n}{ - <-> ssub * MerriweatherSans-OsF/extrabold/n -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{eb}{it}{ - <-> ssub * MerriweatherSans-OsF/extrabold/it -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bx}{n}{ - <-> ssub * MerriweatherSans-OsF/b/n -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bx}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/sl -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bx}{it}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-Sup.fd b/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-Sup.fd deleted file mode 100644 index 77b60c88bd7..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-Sup.fd +++ /dev/null @@ -1,149 +0,0 @@ -%% Generated by autoinst on 2019/06/02 -%% -\ProvidesFile{OT1MerriweatherSans-Sup.fd} - [2019/06/02 (autoinst) Font definitions for OT1/MerriweatherSans-Sup.] - -\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax - \let\MerriweatherSans@@scale\@empty -\else - \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% -\fi - -\DeclareFontFamily{OT1}{MerriweatherSans-Sup}{} - - -% ---- regular ---- - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{regular}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Regular-sup-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{regular}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Italic-sup-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{regular}{sl}{ - <-> ssub * MerriweatherSans-Sup/regular/it -}{} - - -% ---- bold ---- - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bold}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Bold-sup-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bold}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-sup-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bold}{sl}{ - <-> ssub * MerriweatherSans-Sup/bold/it -}{} - - -% ---- light ---- - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{light}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Light-sup-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{light}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-sup-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{light}{sl}{ - <-> ssub * MerriweatherSans-Sup/light/it -}{} - - -% ---- extrabold ---- - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{extrabold}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-sup-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{extrabold}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-sup-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{extrabold}{sl}{ - <-> ssub * MerriweatherSans-Sup/extrabold/it -}{} - -% -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names -% - -% l --> light - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{l}{sl}{ - <-> ssub * MerriweatherSans-Sup/light/sl -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{l}{n}{ - <-> ssub * MerriweatherSans-Sup/light/n -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{l}{it}{ - <-> ssub * MerriweatherSans-Sup/light/it -}{} - - -% m --> regular - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{m}{sl}{ - <-> ssub * MerriweatherSans-Sup/regular/sl -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{m}{n}{ - <-> ssub * MerriweatherSans-Sup/regular/n -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{m}{it}{ - <-> ssub * MerriweatherSans-Sup/regular/it -}{} - - -% b --> bold - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{b}{sl}{ - <-> ssub * MerriweatherSans-Sup/bold/sl -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{b}{n}{ - <-> ssub * MerriweatherSans-Sup/bold/n -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{b}{it}{ - <-> ssub * MerriweatherSans-Sup/bold/it -}{} - - -% eb --> extrabold - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{eb}{sl}{ - <-> ssub * MerriweatherSans-Sup/extrabold/sl -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{eb}{n}{ - <-> ssub * MerriweatherSans-Sup/extrabold/n -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{eb}{it}{ - <-> ssub * MerriweatherSans-Sup/extrabold/it -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bx}{n}{ - <-> ssub * MerriweatherSans-Sup/b/n -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bx}{sl}{ - <-> ssub * MerriweatherSans-Sup/b/sl -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bx}{it}{ - <-> ssub * MerriweatherSans-Sup/b/it -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd deleted file mode 100644 index 46a6c51e0a6..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd +++ /dev/null @@ -1,149 +0,0 @@ -%% Generated by autoinst on 2019/06/02 -%% -\ProvidesFile{T1Merriweather-OsF.fd} - [2019/06/02 (autoinst) Font definitions for T1/Merriweather-OsF.] - -\expandafter\ifx\csname Merriweather@scale\endcsname\relax - \let\Merriweather@@scale\@empty -\else - \edef\Merriweather@@scale{s*[\csname Merriweather@scale\endcsname]}% -\fi - -\DeclareFontFamily{T1}{Merriweather-OsF}{} - - -% ---- regular ---- - -\DeclareFontShape{T1}{Merriweather-OsF}{regular}{n}{ - <-> \Merriweather@@scale Merriweather-Regular-osf-t1 -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{regular}{it}{ - <-> \Merriweather@@scale Merriweather-Italic-osf-t1 -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{regular}{sl}{ - <-> ssub * Merriweather-OsF/regular/it -}{} - - -% ---- bold ---- - -\DeclareFontShape{T1}{Merriweather-OsF}{bold}{n}{ - <-> \Merriweather@@scale Merriweather-Bold-osf-t1 -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{bold}{it}{ - <-> \Merriweather@@scale Merriweather-BoldItalic-osf-t1 -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{bold}{sl}{ - <-> ssub * Merriweather-OsF/bold/it -}{} - - -% ---- light ---- - -\DeclareFontShape{T1}{Merriweather-OsF}{light}{n}{ - <-> \Merriweather@@scale Merriweather-Light-osf-t1 -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{light}{it}{ - <-> \Merriweather@@scale Merriweather-LightIt-osf-t1 -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{light}{sl}{ - <-> ssub * Merriweather-OsF/light/it -}{} - - -% ---- ultrabold ---- - -\DeclareFontShape{T1}{Merriweather-OsF}{ultrabold}{n}{ - <-> \Merriweather@@scale Merriweather-UltraBold-osf-t1 -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{ultrabold}{it}{ - <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-t1 -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{ultrabold}{sl}{ - <-> ssub * Merriweather-OsF/ultrabold/it -}{} - -% -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names -% - -% l --> light - -\DeclareFontShape{T1}{Merriweather-OsF}{l}{sl}{ - <-> ssub * Merriweather-OsF/light/sl -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{l}{n}{ - <-> ssub * Merriweather-OsF/light/n -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{l}{it}{ - <-> ssub * Merriweather-OsF/light/it -}{} - - -% m --> regular - -\DeclareFontShape{T1}{Merriweather-OsF}{m}{sl}{ - <-> ssub * Merriweather-OsF/regular/sl -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{m}{n}{ - <-> ssub * Merriweather-OsF/regular/n -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{m}{it}{ - <-> ssub * Merriweather-OsF/regular/it -}{} - - -% b --> bold - -\DeclareFontShape{T1}{Merriweather-OsF}{b}{sl}{ - <-> ssub * Merriweather-OsF/bold/sl -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{b}{n}{ - <-> ssub * Merriweather-OsF/bold/n -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{b}{it}{ - <-> ssub * Merriweather-OsF/bold/it -}{} - - -% ub --> ultrabold - -\DeclareFontShape{T1}{Merriweather-OsF}{ub}{sl}{ - <-> ssub * Merriweather-OsF/ultrabold/sl -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{ub}{n}{ - <-> ssub * Merriweather-OsF/ultrabold/n -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{ub}{it}{ - <-> ssub * Merriweather-OsF/ultrabold/it -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{bx}{n}{ - <-> ssub * Merriweather-OsF/b/n -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{bx}{sl}{ - <-> ssub * Merriweather-OsF/b/sl -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{bx}{it}{ - <-> ssub * Merriweather-OsF/b/it -}{} - -\endinput 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 6ee2d25c10b..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd +++ /dev/null @@ -1,149 +0,0 @@ -%% Generated by autoinst on 2019/06/02 -%% -\ProvidesFile{T1MerriweatherSans-OsF.fd} - [2019/06/02 (autoinst) Font definitions for T1/MerriweatherSans-OsF.] - -\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax - \let\MerriweatherSans@@scale\@empty -\else - \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% -\fi - -\DeclareFontFamily{T1}{MerriweatherSans-OsF}{} - - -% ---- regular ---- - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{regular}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{regular}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{regular}{sl}{ - <-> ssub * MerriweatherSans-OsF/regular/it -}{} - - -% ---- bold ---- - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{bold}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{bold}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{bold}{sl}{ - <-> ssub * MerriweatherSans-OsF/bold/it -}{} - - -% ---- light ---- - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{light}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{light}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{light}{sl}{ - <-> ssub * MerriweatherSans-OsF/light/it -}{} - - -% ---- extrabold ---- - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{extrabold}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{extrabold}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{extrabold}{sl}{ - <-> ssub * MerriweatherSans-OsF/extrabold/it -}{} - -% -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names -% - -% l --> light - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{l}{sl}{ - <-> ssub * MerriweatherSans-OsF/light/sl -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{l}{n}{ - <-> ssub * MerriweatherSans-OsF/light/n -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{l}{it}{ - <-> ssub * MerriweatherSans-OsF/light/it -}{} - - -% m --> regular - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{m}{sl}{ - <-> ssub * MerriweatherSans-OsF/regular/sl -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{m}{n}{ - <-> ssub * MerriweatherSans-OsF/regular/n -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{m}{it}{ - <-> ssub * MerriweatherSans-OsF/regular/it -}{} - - -% b --> bold - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{b}{sl}{ - <-> ssub * MerriweatherSans-OsF/bold/sl -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{b}{n}{ - <-> ssub * MerriweatherSans-OsF/bold/n -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{b}{it}{ - <-> ssub * MerriweatherSans-OsF/bold/it -}{} - - -% eb --> extrabold - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{eb}{sl}{ - <-> ssub * MerriweatherSans-OsF/extrabold/sl -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{eb}{n}{ - <-> ssub * MerriweatherSans-OsF/extrabold/n -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{eb}{it}{ - <-> ssub * MerriweatherSans-OsF/extrabold/it -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{bx}{n}{ - <-> ssub * MerriweatherSans-OsF/b/n -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{bx}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/sl -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{bx}{it}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-Sup.fd b/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-Sup.fd deleted file mode 100644 index eef4eab37b7..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-Sup.fd +++ /dev/null @@ -1,149 +0,0 @@ -%% Generated by autoinst on 2019/06/02 -%% -\ProvidesFile{T1MerriweatherSans-Sup.fd} - [2019/06/02 (autoinst) Font definitions for T1/MerriweatherSans-Sup.] - -\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax - \let\MerriweatherSans@@scale\@empty -\else - \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% -\fi - -\DeclareFontFamily{T1}{MerriweatherSans-Sup}{} - - -% ---- regular ---- - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{regular}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Regular-sup-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{regular}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Italic-sup-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{regular}{sl}{ - <-> ssub * MerriweatherSans-Sup/regular/it -}{} - - -% ---- bold ---- - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{bold}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Bold-sup-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{bold}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-sup-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{bold}{sl}{ - <-> ssub * MerriweatherSans-Sup/bold/it -}{} - - -% ---- light ---- - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{light}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Light-sup-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{light}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-sup-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{light}{sl}{ - <-> ssub * MerriweatherSans-Sup/light/it -}{} - - -% ---- extrabold ---- - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{extrabold}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-sup-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{extrabold}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-sup-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{extrabold}{sl}{ - <-> ssub * MerriweatherSans-Sup/extrabold/it -}{} - -% -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names -% - -% l --> light - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{l}{sl}{ - <-> ssub * MerriweatherSans-Sup/light/sl -}{} - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{l}{n}{ - <-> ssub * MerriweatherSans-Sup/light/n -}{} - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{l}{it}{ - <-> ssub * MerriweatherSans-Sup/light/it -}{} - - -% m --> regular - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{m}{sl}{ - <-> ssub * MerriweatherSans-Sup/regular/sl -}{} - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{m}{n}{ - <-> ssub * MerriweatherSans-Sup/regular/n -}{} - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{m}{it}{ - <-> ssub * MerriweatherSans-Sup/regular/it -}{} - - -% b --> bold - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{b}{sl}{ - <-> ssub * MerriweatherSans-Sup/bold/sl -}{} - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{b}{n}{ - <-> ssub * MerriweatherSans-Sup/bold/n -}{} - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{b}{it}{ - <-> ssub * MerriweatherSans-Sup/bold/it -}{} - - -% eb --> extrabold - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{eb}{sl}{ - <-> ssub * MerriweatherSans-Sup/extrabold/sl -}{} - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{eb}{n}{ - <-> ssub * MerriweatherSans-Sup/extrabold/n -}{} - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{eb}{it}{ - <-> ssub * MerriweatherSans-Sup/extrabold/it -}{} - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{bx}{n}{ - <-> ssub * MerriweatherSans-Sup/b/n -}{} - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{bx}{sl}{ - <-> ssub * MerriweatherSans-Sup/b/sl -}{} - -\DeclareFontShape{T1}{MerriweatherSans-Sup}{bx}{it}{ - <-> ssub * MerriweatherSans-Sup/b/it -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd deleted file mode 100644 index 7f86bea703f..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd +++ /dev/null @@ -1,149 +0,0 @@ -%% Generated by autoinst on 2019/06/02 -%% -\ProvidesFile{TS1Merriweather-OsF.fd} - [2019/06/02 (autoinst) Font definitions for TS1/Merriweather-OsF.] - -\expandafter\ifx\csname Merriweather@scale\endcsname\relax - \let\Merriweather@@scale\@empty -\else - \edef\Merriweather@@scale{s*[\csname Merriweather@scale\endcsname]}% -\fi - -\DeclareFontFamily{TS1}{Merriweather-OsF}{} - - -% ---- regular ---- - -\DeclareFontShape{TS1}{Merriweather-OsF}{regular}{n}{ - <-> \Merriweather@@scale Merriweather-Regular-osf-ts1 -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{regular}{it}{ - <-> \Merriweather@@scale Merriweather-Italic-osf-ts1 -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{regular}{sl}{ - <-> ssub * Merriweather-OsF/regular/it -}{} - - -% ---- bold ---- - -\DeclareFontShape{TS1}{Merriweather-OsF}{bold}{n}{ - <-> \Merriweather@@scale Merriweather-Bold-osf-ts1 -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{bold}{it}{ - <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ts1 -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{bold}{sl}{ - <-> ssub * Merriweather-OsF/bold/it -}{} - - -% ---- light ---- - -\DeclareFontShape{TS1}{Merriweather-OsF}{light}{n}{ - <-> \Merriweather@@scale Merriweather-Light-osf-ts1 -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{light}{it}{ - <-> \Merriweather@@scale Merriweather-LightIt-osf-ts1 -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{light}{sl}{ - <-> ssub * Merriweather-OsF/light/it -}{} - - -% ---- ultrabold ---- - -\DeclareFontShape{TS1}{Merriweather-OsF}{ultrabold}{n}{ - <-> \Merriweather@@scale Merriweather-UltraBold-osf-ts1 -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{ultrabold}{it}{ - <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ts1 -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{ultrabold}{sl}{ - <-> ssub * Merriweather-OsF/ultrabold/it -}{} - -% -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names -% - -% l --> light - -\DeclareFontShape{TS1}{Merriweather-OsF}{l}{sl}{ - <-> ssub * Merriweather-OsF/light/sl -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{l}{n}{ - <-> ssub * Merriweather-OsF/light/n -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{l}{it}{ - <-> ssub * Merriweather-OsF/light/it -}{} - - -% m --> regular - -\DeclareFontShape{TS1}{Merriweather-OsF}{m}{sl}{ - <-> ssub * Merriweather-OsF/regular/sl -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{m}{n}{ - <-> ssub * Merriweather-OsF/regular/n -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{m}{it}{ - <-> ssub * Merriweather-OsF/regular/it -}{} - - -% b --> bold - -\DeclareFontShape{TS1}{Merriweather-OsF}{b}{sl}{ - <-> ssub * Merriweather-OsF/bold/sl -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{b}{n}{ - <-> ssub * Merriweather-OsF/bold/n -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{b}{it}{ - <-> ssub * Merriweather-OsF/bold/it -}{} - - -% ub --> ultrabold - -\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{sl}{ - <-> ssub * Merriweather-OsF/ultrabold/sl -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{n}{ - <-> ssub * Merriweather-OsF/ultrabold/n -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{it}{ - <-> ssub * Merriweather-OsF/ultrabold/it -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{n}{ - <-> ssub * Merriweather-OsF/b/n -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{sl}{ - <-> ssub * Merriweather-OsF/b/sl -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{it}{ - <-> ssub * Merriweather-OsF/b/it -}{} - -\endinput 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 26cbcb5cfe6..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd +++ /dev/null @@ -1,149 +0,0 @@ -%% Generated by autoinst on 2019/06/02 -%% -\ProvidesFile{TS1MerriweatherSans-OsF.fd} - [2019/06/02 (autoinst) Font definitions for TS1/MerriweatherSans-OsF.] - -\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax - \let\MerriweatherSans@@scale\@empty -\else - \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% -\fi - -\DeclareFontFamily{TS1}{MerriweatherSans-OsF}{} - - -% ---- regular ---- - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{regular}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{regular}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{regular}{sl}{ - <-> ssub * MerriweatherSans-OsF/regular/it -}{} - - -% ---- bold ---- - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bold}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bold}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bold}{sl}{ - <-> ssub * MerriweatherSans-OsF/bold/it -}{} - - -% ---- light ---- - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{light}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{light}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{light}{sl}{ - <-> ssub * MerriweatherSans-OsF/light/it -}{} - - -% ---- extrabold ---- - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{extrabold}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{extrabold}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{extrabold}{sl}{ - <-> ssub * MerriweatherSans-OsF/extrabold/it -}{} - -% -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names -% - -% l --> light - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{l}{sl}{ - <-> ssub * MerriweatherSans-OsF/light/sl -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{l}{n}{ - <-> ssub * MerriweatherSans-OsF/light/n -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{l}{it}{ - <-> ssub * MerriweatherSans-OsF/light/it -}{} - - -% m --> regular - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{m}{sl}{ - <-> ssub * MerriweatherSans-OsF/regular/sl -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{m}{n}{ - <-> ssub * MerriweatherSans-OsF/regular/n -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{m}{it}{ - <-> ssub * MerriweatherSans-OsF/regular/it -}{} - - -% b --> bold - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{b}{sl}{ - <-> ssub * MerriweatherSans-OsF/bold/sl -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{b}{n}{ - <-> ssub * MerriweatherSans-OsF/bold/n -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{b}{it}{ - <-> ssub * MerriweatherSans-OsF/bold/it -}{} - - -% eb --> extrabold - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{eb}{sl}{ - <-> ssub * MerriweatherSans-OsF/extrabold/sl -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{eb}{n}{ - <-> ssub * MerriweatherSans-OsF/extrabold/n -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{eb}{it}{ - <-> ssub * MerriweatherSans-OsF/extrabold/it -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bx}{n}{ - <-> ssub * MerriweatherSans-OsF/b/n -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bx}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/sl -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bx}{it}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty index 6f2f5e07e68..0fd1696f61f 100644 --- a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty +++ b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty @@ -1,16 +1,14 @@ \ProvidesPackage{merriweather}[% - 2019/10/13 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ] + 2020/07/24 (Bob Tennent) Supports Merriweather(Sans) fonts for use with xeLaTeX and luaLaTeX. ] -\RequirePackage{ifxetex,ifluatex,textcomp} +\RequirePackage{iftex} -\newif\ifmerriweather@ttf -\ifxetex - \merriweather@ttftrue -\else\ifluatex - \merriweather@ttftrue -\else % [pdf]LaTeX - \merriweather@ttffalse -\fi\fi +\ifpdftex +\PackageError{merriweather}{% + *****************************************\MessageBreak + Please process using XeLaTeX or luaLaTeX\MessageBreak + *****************************************} +\fi \newcommand*{\Merriweather@scale}{1} % not adjustable \newcommand*{\MerriweatherSans@scale}{1} @@ -29,7 +27,6 @@ \DeclareOptionX{sf}{\merriweather@sftrue} \DeclareOptionX{rm}{\merriweather@rmtrue} \DeclareOptionX{sfdefault}{\merriweather@sftrue\merriweather@sfdefaulttrue} -\DeclareOptionX{type1}{\merriweather@ttffalse} \DeclareOptionX{light}{\merriweather@rmlighttrue\merriweather@sflighttrue} \DeclareOptionX{rmlight}{\merriweather@rmlighttrue} \DeclareOptionX{sflight}{\merriweather@sflighttrue} @@ -39,11 +36,7 @@ \ProcessOptionsX\relax -\ifmerriweather@ttf - \RequirePackage{fontspec} -\else - \RequirePackage{fontenc,fontaxes,mweights} -\fi +\RequirePackage{fontspec} \ifmerriweather@rm\else\ifmerriweather@sf\else \merriweather@rmtrue\merriweather@sftrue % both false -> both true @@ -51,7 +44,6 @@ % Set main and/or sans fonts: -\ifmerriweather@ttf \ifxetex\XeTeXtracingfonts=1\fi \defaultfontfeatures{ @@ -216,53 +208,9 @@ BoldItalicFont = *-ExBoldIt ] {MerriweatherSans} -\else % type1 - - \ifmerriweather@rm - \ifmerriweather@rmlight\def\mdseries@rm{l}\else\def\mdseries@rm{m}\fi - \ifmerriweather@rmblack\def\bfseries@rm{ub}\else\def\bfseries@rm{b}\fi - \else - \def\mdseries@rm{m}\def\bfseries@rm{b} - \fi - \ifmerriweather@sf - \ifmerriweather@sflight\def\mdseries@sf{l}\else\def\mdseries@sf{m}\fi - \ifmerriweather@sfblack\def\bfseries@sf{eb}\else\def\bfseries@sf{b}\fi - \else - \def\mdseries@sf{m}\def\bfseries@sf{b} - \fi - - - - \def\merriweatherfamily{Merriweather-OsF} - \def\merriweathersffamily{MerriweatherSans-OsF} - - \ifmerriweather@rm - \renewcommand*\rmdefault{\merriweatherfamily} - \fi - - \ifmerriweather@sf - \renewcommand*\sfdefault{\merriweathersffamily} - \fi - - \ifmerriweather@sfdefault - \renewcommand*\familydefault{\merriweathersffamily} - \fi - - \renewcommand*\seriesdefault{\mdseries@rm} - - \newcommand*\merriweather{\fontfamily{\merriweatherfamily}\selectfont} - \newcommand*\merriweathersans{\fontfamily{\merriweathersffamily}\selectfont} - \newcommand*\merriweatherlight{\fontfamily{\merriweatherfamily}\fontseries{l}\selectfont} - \newcommand*\merriweathersanslight{\fontfamily{\merriweathersffamily}\fontseries{l}\selectfont} - \newcommand*\merriweatherblack{\fontfamily{\merriweatherfamily}\fontseries{ub}\selectfont} - \newcommand*\merriweathersansblack{\fontfamily{\merriweathersffamily}\fontseries{eb}\selectfont} - -\fi % turn off defaults in case other fonts are selected: -\ifmerriweather@ttf \defaultfontfeatures{} -\fi \endinput |