summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/fonts/enc
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/fonts/enc')
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_44qg5v.enc (renamed from Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_lnkfbl.enc)14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_6upxhe.enc (renamed from Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fuknsh.enc)14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_7ytifx.enc67
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_clyrx2.enc (renamed from Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jnnjab.enc)10
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_czxicq.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_iuohxq.enc (renamed from Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_libw2m.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jlgqyj.enc67
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_l3riwr.enc (renamed from Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ywgpba.enc)12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_rwkhk4.enc67
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_tvbl63.enc (renamed from Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oaf34p.enc)20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_vi456v.enc (renamed from Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_cn5sfl.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_z4e4wk.enc4
14 files changed, 324 insertions, 51 deletions
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_lnkfbl.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_44qg5v.enc
index 669d667a71e..1d2548031d7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_lnkfbl.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_44qg5v.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_lnkfblgauyqz3eufwp3wby646h
-% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014
+%%AutoEnc_44qg5voi43tymivsufwnvthinh
+% Encoding created by otftotfm on Sun Jun 2 14:53:43 2019
% Command line follows encoding
-/AutoEnc_lnkfblgauyqz3eufwp3wby646h [
+/AutoEnc_44qg5voi43tymivsufwnvthinh [
%00
- /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
- /f_f_i /f_f_l /zerowidthnonjoiner /.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
@@ -61,4 +61,6 @@
% --encoding-directory=texmf/fonts/enc/dvips/merriweather
% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map
% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=liga MerriweatherSans-Bold.ttf MerriweatherSans-Bold-tlf-ly1'
+% --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
index 16f57fa4cb1..c58c15d26bc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_5q2vgd.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_5q2vgdqo7txurrtxwuhjydkywc
-% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014
+% Encoding created by otftotfm on Sun Jun 2 14:54:05 2019
% Command line follows encoding
/AutoEnc_5q2vgdqo7txurrtxwuhjydkywc [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fuknsh.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_6upxhe.enc
index 8989a672ba8..feb5992e41d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_fuknsh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_6upxhe.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_fuknshterpxw2flapoda5bxt5e
-% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014
+%%AutoEnc_6upxhe2m74q2iptst22s37sn3e
+% Encoding created by otftotfm on Sun Jun 2 14:54:04 2019
% Command line follows encoding
-/AutoEnc_fuknshterpxw2flapoda5bxt5e [
+/AutoEnc_6upxhe2m74q2iptst22s37sn3e [
%00
- /.notdef /Deltagreek /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /Omegagreek /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.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
@@ -30,13 +30,13 @@
/x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
%80
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.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 /.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
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_7ytifx.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_7ytifx.enc
new file mode 100644
index 00000000000..825fc9d95ba
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_7ytifx.enc
@@ -0,0 +1,67 @@
+% 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_jnnjab.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_clyrx2.enc
index 8518499a21d..f8ade60d101 100644
--- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jnnjab.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_clyrx2.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d
-% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014
+%%AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe
+% Encoding created by otftotfm on Sun Jun 2 14:54:04 2019
% Command line follows encoding
-/AutoEnc_jnnjab4gr5tw3ghgn5ls4drh3d [
+/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 /f_f_l /f_f_i /f_f /f_l /f_i
+ /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /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
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_czxicq.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_czxicq.enc
new file mode 100644
index 00000000000..7546a2a8ef4
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_czxicq.enc
@@ -0,0 +1,66 @@
+% 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_libw2m.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_iuohxq.enc
index 991e695d162..93870024d82 100644
--- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_libw2m.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_iuohxq.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_libw2mm3qgkydsmoydm6r5agjf
-% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014
+%%AutoEnc_iuohxqr2qb6k5t77legm5nsxle
+% Encoding created by otftotfm on Sun Jun 2 14:53:42 2019
% Command line follows encoding
-/AutoEnc_libw2mm3qgkydsmoydm6r5agjf [
+/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
- /.notdef /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
+ /f_f /dotlessi /dotlessj /f_i /f_l /f_f_i /f_f_l /.notdef
%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /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
@@ -61,5 +61,6 @@
% --encoding-directory=texmf/fonts/enc/dvips/merriweather
% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map
% --no-updmap --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=liga MerriweatherSans-BoldItalic.ttf
-% MerriweatherSans-BoldItalic-tlf-t1'
+% --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
new file mode 100644
index 00000000000..1ee69ca7d93
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_jlgqyj.enc
@@ -0,0 +1,67 @@
+% 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_ywgpba.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_l3riwr.enc
index 94b0a66706e..0ed42425adb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_ywgpba.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_l3riwr.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_ywgpbabmor6izux7hcbqcb56qa
-% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014
+%%AutoEnc_l3riwrv45htepume6iim3qrijh
+% Encoding created by otftotfm on Sun Jun 2 14:54:05 2019
% Command line follows encoding
-/AutoEnc_ywgpbabmor6izux7hcbqcb56qa [
+/AutoEnc_l3riwrv45htepume6iim3qrijh [
%00
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /C /question
%10
- /questiondown /exclam /quotedblbase /exclamdown /asterisk /.notdef /.notdef /.notdef
- /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /bar /.notdef
+ /questiondown /exclam /quotedblbase /exclamdown /endash /.notdef /.notdef /.notdef
+ /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /asterisk /.notdef
%20
- /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
+ /.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
diff --git a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_rwkhk4.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_rwkhk4.enc
new file mode 100644
index 00000000000..b98da0f797f
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_rwkhk4.enc
@@ -0,0 +1,67 @@
+% 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_oaf34p.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_tvbl63.enc
index 1fe8ea6800e..ba31c9c8460 100644
--- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_oaf34p.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_tvbl63.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_oaf34pf2gi7ej2vclku475canf
-% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014
+%%AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb
+% Encoding created by otftotfm on Sun Jun 2 14:53:42 2019
% Command line follows encoding
-/AutoEnc_oaf34pf2gi7ej2vclku475canf [
+/AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb [
%00
- /.notdef /uni0394 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.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
@@ -30,13 +30,13 @@
/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 /.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 /.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
@@ -60,5 +60,7 @@
% --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-tlf-ot1'
+% --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_cn5sfl.enc b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_vi456v.enc
index 9bd30bf6cd2..34bbfd95b94 100644
--- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_cn5sfl.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_vi456v.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_cn5sfli3xjnpjitjpli7wpzcng
-% Encoding created by otftotfm on Wed Jan 22 14:36:18 2014
+%%AutoEnc_vi456vknjkllfjnxu4s533uuwe
+% Encoding created by otftotfm on Sun Jun 2 14:53:42 2019
% Command line follows encoding
-/AutoEnc_cn5sfli3xjnpjitjpli7wpzcng [
+/AutoEnc_vi456vknjkllfjnxu4s533uuwe [
%00
- /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
- /f_f_i /f_f_l /zerowidthnonjoiner /.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
@@ -61,5 +61,6 @@
% --encoding-directory=texmf/fonts/enc/dvips/merriweather
% --map-file=texmf/fonts/map/dvips/merriweather/MerriweatherSans.map
% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=liga MerriweatherSans-BoldItalic.ttf
-% MerriweatherSans-BoldItalic-tlf-ly1'
+% --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
index f7febb31f35..86efb22bb1b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/merriweather/mwth_xz5wux.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve
-% Encoding created by otftotfm on Wed Jan 22 14:34:13 2014
+% Encoding created by otftotfm on Sun Jun 2 14:54:05 2019
% Command line follows encoding
/AutoEnc_xz5wuxljkmlqmiisgakqtdt2ve [
%00
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 703800e5c19..7753bd87ba5 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 Wed Jan 22 14:36:18 2014
+% Encoding created by otftotfm on Sun Jun 2 14:53:43 2019
% Command line follows encoding
/AutoEnc_z4e4wksqkjuob7lry6demn2pba [
%00
@@ -63,4 +63,4 @@
% --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-tlf-ts1'
+% MerriweatherSans-BoldItalic-osf-ts1'