diff options
author | Karl Berry <karl@freefriends.org> | 2014-06-16 23:14:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-06-16 23:14:13 +0000 |
commit | c34d7811fa0e8cbe77c0625c5720c1821b242d52 (patch) | |
tree | 94535d4e2b1845e64afa55c6cc1d470c7b551e23 /Master/texmf-dist/fonts/enc | |
parent | 172eddb635379ff047035e8a5fdc0e436711bd97 (diff) |
merriweather
git-svn-id: svn://tug.org/texlive/trunk@34263 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/fonts/enc')
13 files changed, 101 insertions, 294 deletions
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_r5mufr.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc index e7414cdc99f..16f57fa4cb1 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_r5mufr.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc @@ -1,12 +1,12 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_r5mufrbd5lxejo566tpmscskrf -% Encoding created by otftotfm on Sun Nov 10 13:54:42 2013 +%%AutoEnc_5q2vgdqo7txurrtxwuhjydkywc +% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014 % Command line follows encoding -/AutoEnc_r5mufrbd5lxejo566tpmscskrf [ +/AutoEnc_5q2vgdqo7txurrtxwuhjydkywc [ %00 - /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek - /f_f_i /f_f_l /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek + /.notdef /.notdef /zerowidthnonjoiner /f_f_l /f_f_i /f_f /f_l /f_i %10 /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash @@ -38,8 +38,8 @@ /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron %B0 - /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered - /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown + /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered + /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown %C0 /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis @@ -54,12 +54,13 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis ] def % Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=texmfSC/fonts/tfm/sorkin/merriweather -% --vf-directory=texmfSC/fonts/vf/sorkin/merriweather -% --type1-directory=texmfSC/fonts/type1/sorkin/merriweather -% --truetype-directory=texmfSC/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmfSC/fonts/enc/dvips/merriweather -% --map-file=texmfSC/fonts/map/dvips/merriweather/MerriweatherSans.map -% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI -% --feature=liga MerriweatherSans-BoldItalic.ttf -% MerriweatherSans-BoldItalic-osf-ly1' +% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather +% --vf-directory=texmf/fonts/vf/sorkin/merriweather +% --type1-directory=texmf/fonts/type1/sorkin/merriweather +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap +% --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --ligkern=f i +% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi +% --ligkern=ff l =: ffl Merriweather-BoldIt.ttf +% Merriweather-BoldItalic-osf-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_t226xz.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_cn5sfl.enc index 0c5311d3016..9bd30bf6cd2 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_t226xz.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_cn5sfl.enc @@ -1,12 +1,12 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_t226xz6ygy6sf2627mglfmb4cf -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 +%%AutoEnc_cn5sfli3xjnpjitjpli7wpzcng +% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014 % Command line follows encoding -/AutoEnc_t226xz6ygy6sf2627mglfmb4cf [ +/AutoEnc_cn5sfli3xjnpjitjpli7wpzcng [ %00 - /f_i /Euro /f_l /f_f /fraction /dotaccent /hungarumlaut /ogonek - /f_f_i /f_f_l /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek + /f_f_i /f_f_l /zerowidthnonjoiner /.notdef /.notdef /.notdef /.notdef /.notdef %10 /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/sorkin/merriweather % --truetype-directory=texmf/fonts/truetype/sorkin/merriweather % --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap -% --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --feature=liga Merriweather-BoldItalic.ttf -% Merriweather-BoldItalic-osf-ly1' +% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map +% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=liga MerriweatherSans-BoldItalic.ttf +% MerriweatherSans-BoldItalic-tlf-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fmhdb5.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fmhdb5.enc deleted file mode 100644 index 9c3a4766079..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fmhdb5.enc +++ /dev/null @@ -1,66 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 -% Command line follows encoding -/AutoEnc_fmhdb5pmm4ukiyngzyqmlp4dfb [ -%00 - /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron - /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright -%10 - /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef - /.notdef /dotlessi /dotlessj /ffl /ffi /ff /fl /fi -%20 - /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /less /equal /greater /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /asciitilde /hyphen -%80 - /.notdef /Aogonek /.notdef /.notdef /.notdef /.notdef /Eogonek /.notdef - /.notdef /.notdef /Lslash /Nacute /.notdef /.notdef /.notdef /Racute -%90 - /Rcaron /.notdef /Scaron /.notdef /.notdef /.notdef /.notdef /.notdef - /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /.notdef /.notdef /section -%A0 - /.notdef /aogonek /.notdef /.notdef /.notdef /.notdef /eogonek /.notdef - /.notdef /.notdef /lslash /nacute /.notdef /.notdef /.notdef /.notdef -%B0 - /rcaron /.notdef /scaron /.notdef /.notdef /.notdef /.notdef /.notdef - /ydieresis /.notdef /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef -%E0 - /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla - /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis -%F0 - /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe - /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls -] def -% Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap -% --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN -% --feature=kern --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff -% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Merriweather.ttf -% Merriweather-osf-t1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_v4a7hp.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fuknsh.enc index 3cb936aef3f..8989a672ba8 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_v4a7hp.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fuknsh.enc @@ -1,12 +1,12 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_v4a7hpkqcqwcnabd77njio5kmc -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 +%%AutoEnc_fuknshterpxw2flapoda5bxt5e +% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014 % Command line follows encoding -/AutoEnc_v4a7hpkqcqwcnabd77njio5kmc [ +/AutoEnc_fuknshterpxw2flapoda5bxt5e [ %00 - /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /Omega /ff /fi /fl /ffi /ffl + /.notdef /Deltagreek /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /Omegagreek /.notdef /.notdef /.notdef /.notdef /.notdef %10 /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash @@ -60,6 +60,6 @@ % --truetype-directory=texmf/fonts/truetype/sorkin/merriweather % --encoding-directory=texmf/fonts/enc/dvips/merriweather % --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap -% --no-type1 --coding-scheme=TEX TEXT --feature=kern --ligkern=f i =: fi -% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff -% l =: ffl Merriweather.ttf Merriweather-osf-ot1' +% --no-type1 --coding-scheme=TEX TEXT --ligkern=f i =: fi --ligkern=f l =: +% fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% Merriweather-BoldIt.ttf Merriweather-BoldItalic-osf-ot1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_pyutxj.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jnnjab.enc index 8841ffd9b19..8518499a21d 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_pyutxj.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jnnjab.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_pyutxj5eda5ufhkmrxym4g7axc -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 +%%AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d +% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014 % Command line follows encoding -/AutoEnc_pyutxj5eda5ufhkmrxym4g7axc [ +/AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright %10 - /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef - /.notdef /dotlessi /dotlessj /f_i /f_l /f_f /f_f_i /f_f_l + /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /zerowidthnonjoiner + /.notdef /dotlessi /dotlessj /f_f_l /f_f_i /f_f /f_l /f_i %20 /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash @@ -60,6 +60,7 @@ % --truetype-directory=texmf/fonts/truetype/sorkin/merriweather % --encoding-directory=texmf/fonts/enc/dvips/merriweather % --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap -% --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN -% --feature=kern --feature=liga Merriweather-BoldItalic.ttf +% --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --ligkern=f +% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi +% --ligkern=ff l =: ffl Merriweather-BoldIt.ttf % Merriweather-BoldItalic-osf-t1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_aynzzm.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_libw2m.enc index 3959221d533..991e695d162 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_aynzzm.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_libw2m.enc @@ -1,14 +1,14 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_aynzzmmhmqucetr76d43bpu3kb -% Encoding created by otftotfm on Sun Nov 10 13:54:42 2013 +%%AutoEnc_libw2mm3qgkydsmoydm6r5agjf +% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014 % Command line follows encoding -/AutoEnc_aynzzmmhmqucetr76d43bpu3kb [ +/AutoEnc_libw2mm3qgkydsmoydm6r5agjf [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright %10 - /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef + /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /zerowidthnonjoiner /.notdef /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l %20 /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright @@ -54,12 +54,12 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls ] def % Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=texmfSC/fonts/tfm/sorkin/merriweather -% --vf-directory=texmfSC/fonts/vf/sorkin/merriweather -% --type1-directory=texmfSC/fonts/type1/sorkin/merriweather -% --truetype-directory=texmfSC/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmfSC/fonts/enc/dvips/merriweather -% --map-file=texmfSC/fonts/map/dvips/merriweather/MerriweatherSans.map +% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather +% --vf-directory=texmf/fonts/vf/sorkin/merriweather +% --type1-directory=texmf/fonts/type1/sorkin/merriweather +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map % --no-updmap --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN % --feature=liga MerriweatherSans-BoldItalic.ttf -% MerriweatherSans-BoldItalic-osf-t1' +% MerriweatherSans-BoldItalic-tlf-t1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ioeeie.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_lnkfbl.enc index 63e75cba1e3..669d667a71e 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ioeeie.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_lnkfbl.enc @@ -1,12 +1,12 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_ioeeietzkgubb2ua32lkfra3fb -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 +%%AutoEnc_lnkfblgauyqz3eufwp3wby646h +% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014 % Command line follows encoding -/AutoEnc_ioeeietzkgubb2ua32lkfra3fb [ +/AutoEnc_lnkfblgauyqz3eufwp3wby646h [ %00 - /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek - /.notdef /.notdef /.notdef /ffl /ffi /ff /fl /fi + /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek + /f_f_i /f_f_l /zerowidthnonjoiner /.notdef /.notdef /.notdef /.notdef /.notdef %10 /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash @@ -59,7 +59,6 @@ % --type1-directory=texmf/fonts/type1/sorkin/merriweather % --truetype-directory=texmf/fonts/truetype/sorkin/merriweather % --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap -% --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i -% =: ffi --ligkern=ff l =: ffl Merriweather.ttf Merriweather-osf-ly1' +% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map +% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=liga MerriweatherSans-Bold.ttf MerriweatherSans-Bold-tlf-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oaf34p.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oaf34p.enc index 15f0baf5d2b..1fe8ea6800e 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oaf34p.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oaf34p.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_oaf34pf2gi7ej2vclku475canf -% Encoding created by otftotfm on Sun Nov 10 13:54:42 2013 +% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014 % Command line follows encoding /AutoEnc_oaf34pf2gi7ej2vclku475canf [ %00 @@ -54,11 +54,11 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmfSC/fonts/tfm/sorkin/merriweather -% --vf-directory=texmfSC/fonts/vf/sorkin/merriweather -% --type1-directory=texmfSC/fonts/type1/sorkin/merriweather -% --truetype-directory=texmfSC/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmfSC/fonts/enc/dvips/merriweather -% --map-file=texmfSC/fonts/map/dvips/merriweather/MerriweatherSans.map +% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather +% --vf-directory=texmf/fonts/vf/sorkin/merriweather +% --type1-directory=texmf/fonts/type1/sorkin/merriweather +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map % --no-updmap --no-type1 --coding-scheme=TEX TEXT --feature=liga -% MerriweatherSans-BoldItalic.ttf MerriweatherSans-BoldItalic-osf-ot1' +% MerriweatherSans-BoldItalic.ttf MerriweatherSans-BoldItalic-tlf-ot1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oehznb.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oehznb.enc deleted file mode 100644 index 5ab8dc3e223..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oehznb.enc +++ /dev/null @@ -1,64 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_oehznbo2r4zcimhdrv5eox5qwa -% Encoding created by otftotfm on Sun Nov 10 13:54:42 2013 -% Command line follows encoding -/AutoEnc_oehznbo2r4zcimhdrv5eox5qwa [ -%00 - /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek - /f_f_i /f_f_l /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring - /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash -%20 - /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /less /equal /greater /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /tilde /dieresis -%80 - /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl - /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus -%90 - /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash - /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis -%A0 - /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section - /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron -%B0 - /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered - /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls -%E0 - /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla - /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis -%F0 - /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide - /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=texmfSC/fonts/tfm/sorkin/merriweather -% --vf-directory=texmfSC/fonts/vf/sorkin/merriweather -% --type1-directory=texmfSC/fonts/type1/sorkin/merriweather -% --truetype-directory=texmfSC/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmfSC/fonts/enc/dvips/merriweather -% --map-file=texmfSC/fonts/map/dvips/merriweather/MerriweatherSans.map -% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI -% --feature=liga MerriweatherSans-Bold.ttf MerriweatherSans-Bold-osf-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_rheu2i.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_rheu2i.enc deleted file mode 100644 index 5a102f5f871..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_rheu2i.enc +++ /dev/null @@ -1,64 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_rheu2iw5zbylrll3yvwgs2uwsf -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 -% Command line follows encoding -/AutoEnc_rheu2iw5zbylrll3yvwgs2uwsf [ -%00 - /.notdef /uni0394 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring - /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash -%20 - /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis -%80 - /f_i /f_l /f_f /f_f_i /f_f_l /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%90 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%A0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%B0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather -% --vf-directory=texmf/fonts/vf/sorkin/merriweather -% --type1-directory=texmf/fonts/type1/sorkin/merriweather -% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmf/fonts/enc/dvips/merriweather -% --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap -% --no-type1 --coding-scheme=TEX TEXT --feature=kern --feature=liga -% Merriweather-BoldItalic.ttf Merriweather-BoldItalic-osf-ot1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oorhm5.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc index fd2335a37b9..f7febb31f35 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oorhm5.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_oorhm54fi5wv6dwymf2cdxejnb -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 +%%AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve +% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014 % Command line follows encoding -/AutoEnc_oorhm54fi5wv6dwymf2cdxejnb [ +/AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve [ %00 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /asterisk /question %10 /C /bar /quotedblbase /exclamdown /exclam /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef + /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef %20 /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction @@ -21,7 +21,7 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef %50 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown %60 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef @@ -30,16 +30,16 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef %80 /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand - /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef + /bullet /.notdef /.notdef /.notdef /florin /colonmonetary /won /.notdef %90 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark + /.notdef /.notdef /lira /.notdef /.notdef /.notdef /dong /trademark /.notdef /.notdef /.notdef /afii61352 /.notdef /estimated /.notdef /.notdef %A0 /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef %B0 - /degree /plusminus /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered - /.notdef /onesuperior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro + /degree /plusminus /two.superior /three.superior /.notdef /mu /paragraph /periodcentered + /.notdef /one.superior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro %C0 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef @@ -62,5 +62,5 @@ % --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap % --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --ligkern=f % i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi -% --ligkern=ff l =: ffl Merriweather-BoldItalic.ttf +% --ligkern=ff l =: ffl Merriweather-BoldIt.ttf % Merriweather-BoldItalic-osf-ts1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5n6vkx.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ywgpba.enc index d58610f658a..94b0a66706e 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5n6vkx.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ywgpba.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob -% Encoding created by otftotfm on Sun Nov 10 14:45:47 2013 +%%AutoEnc_ywgpbabmor6izux7hcbqcb56qa +% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014 % Command line follows encoding -/AutoEnc_5n6vkxo7kkxhhxze4tfpwu4iob [ +/AutoEnc_ywgpbabmor6izux7hcbqcb56qa [ %00 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk + /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /C /question %10 - /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef + /questiondown /exclam /quotedblbase /exclamdown /asterisk /.notdef /.notdef /.notdef + /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /bar /.notdef %20 /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction @@ -21,7 +21,7 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef %50 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown %60 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef @@ -30,16 +30,16 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef %80 /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand - /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef + /bullet /.notdef /.notdef /.notdef /florin /colonmonetary /won /.notdef %90 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /lira /.notdef /.notdef /.notdef /dong /trademark + /.notdef /.notdef /.notdef /afii61352 /.notdef /estimated /.notdef /.notdef %A0 /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef %B0 - /degree /plusminus /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered - /.notdef /onesuperior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro + /degree /plusminus /two.superior /three.superior /.notdef /mu /paragraph /periodcentered + /.notdef /one.superior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro %C0 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef @@ -51,7 +51,7 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef %F0 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef - /ffl /ffi /ff /fl /l /fi /i /f + /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f ] def % Command line: 'otftotfm --automatic --encoding=fontools_ts1 % --tfm-directory=texmf/fonts/tfm/sorkin/merriweather @@ -62,4 +62,4 @@ % --map-file=texmf/fonts/map/dvips/merriweather/Merriweather.map --no-updmap % --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --ligkern=f % i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi -% --ligkern=ff l =: ffl Merriweather.ttf Merriweather-osf-ts1' +% --ligkern=ff l =: ffl Merriweather-Bold.ttf Merriweather-Bold-osf-ts1' diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_z4e4wk.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_z4e4wk.enc index 8277045c8e2..703800e5c19 100644 --- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_z4e4wk.enc +++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_z4e4wk.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_z4e4wksqkjuob7lry6demn2pba -% Encoding created by otftotfm on Sun Nov 10 13:54:42 2013 +% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014 % Command line follows encoding /AutoEnc_z4e4wksqkjuob7lry6demn2pba [ %00 @@ -54,13 +54,13 @@ /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f ] def % Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=texmfSC/fonts/tfm/sorkin/merriweather -% --vf-directory=texmfSC/fonts/vf/sorkin/merriweather -% --type1-directory=texmfSC/fonts/type1/sorkin/merriweather -% --truetype-directory=texmfSC/fonts/truetype/sorkin/merriweather -% --encoding-directory=texmfSC/fonts/enc/dvips/merriweather -% --map-file=texmfSC/fonts/map/dvips/merriweather/MerriweatherSans.map +% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather +% --vf-directory=texmf/fonts/vf/sorkin/merriweather +% --type1-directory=texmf/fonts/type1/sorkin/merriweather +% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather +% --encoding-directory=texmf/fonts/enc/dvips/merriweather +% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map % --no-updmap --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i % =: ffi --ligkern=ff l =: ffl MerriweatherSans-BoldItalic.ttf -% MerriweatherSans-BoldItalic-osf-ts1' +% MerriweatherSans-BoldItalic-tlf-ts1' |