overlock (2jun19)

git-svn-id: svn://tug.org/texlive/trunk@51294 c570f23f-e606-0410-a88d-b1316a301751

75 files changed, 404 insertions, 221 deletions

diff --git a/Master/texmf-dist/doc/fonts/overlock/README b/Master/texmf-dist/doc/fonts/overlock/README
index 0e656afae3d..e98828ecc13 100644
--- a/Master/texmf-dist/doc/fonts/overlock/README
+++ b/Master/texmf-dist/doc/fonts/overlock/README
@@ -1,4 +1,4 @@
-This is the README for the Overlock package, version 2014-05-24.
+This is the README for the Overlock package, version 2019-06-01.
 
 This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support
 for the Overlock and OverlookSC families of fonts, designed by
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_y3zmsf.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_4sbkqf.enc
index 6bcf23f3521..282a328b72f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_y3zmsf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_4sbkqf.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_y3zmsfjq3w6r5gepwqy5ilg27b
-% Encoding created by otftotfm on Sat May 24 06:52:45 2014
+%%AutoEnc_4sbkqffb2s6my7ozqecydrtmhe
+% Encoding created by otftotfm on Sat Jun  1 18:45:42 2019
 % Command line follows encoding
-/AutoEnc_y3zmsfjq3w6r5gepwqy5ilg27b [
+/AutoEnc_4sbkqffb2s6my7ozqecydrtmhe [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
+  /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /C /asterisk
 %10
-  /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
+  /bar /endash /quotedblbase /exclamdown /exclam /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
 %20
-  /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
+  /.notdef /question /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
   /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
 %30
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -59,7 +59,8 @@
 % --type1-directory=texmf/fonts/type1/muhafara/overlock
 % --truetype-directory=texmf/fonts/truetype/muhafara/overlock
 % --encoding-directory=texmf/fonts/enc/dvips/overlock
-% --map-file=texmf/fonts/map/dvips/overlock/OverlockSC.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 OverlockSC-Regular.ttf OverlockSC-Regular-lf-ts1'
+% --map-file=texmf/fonts/map/dvips/overlock/Overlock.map --no-updmap
+% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=kern
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% OverlockSC-Regular.otf OverlockSC-Regular-lf-sc-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_yaegef.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_bhbhyo.enc
index 9f8b99ac5ad..74b43f51d4e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_yaegef.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_bhbhyo.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_yaegef5lounubfdkieionjvcrc
-% Encoding created by otftotfm on Sat May 24 06:51:50 2014
+%%AutoEnc_bhbhyohpixfjhncxk2ia6hj2ch
+% Encoding created by otftotfm on Sat Jun  1 18:45:39 2019
 % Command line follows encoding
-/AutoEnc_yaegef5lounubfdkieionjvcrc [
+/AutoEnc_bhbhyohpixfjhncxk2ia6hj2ch [
 %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 /.notdef /ffl /ffi /ff /fl /fi
+  /.notdef /dotlessi /.notdef /ff /fi /fl /ffi /ffl
 %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/overlock/ovlk_k6z3ge.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_cbxvns.enc
index 99a92e507f7..8956a443e1e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_k6z3ge.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_cbxvns.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_k6z3gecwro7ayfjhhk2i7i2wgc
-% Encoding created by otftotfm on Sat May 24 06:52:45 2014
+%%AutoEnc_cbxvnsci6ezqvbsdbyywxxecyh
+% Encoding created by otftotfm on Sat Jun  1 18:45:42 2019
 % Command line follows encoding
-/AutoEnc_k6z3gecwro7ayfjhhk2i7i2wgc [
+/AutoEnc_cbxvnsci6ezqvbsdbyywxxecyh [
 %00
   /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /Omega /.notdef /fi /fl /.notdef /.notdef
 %10
   /dotlessi /.notdef /grave /acute /caron /breve /macron /ring
-  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+  /cedilla /.notdef /ae /oe /oslash /AE /OE /Oslash
 %20
   /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -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
@@ -59,7 +59,8 @@
 % --type1-directory=texmf/fonts/type1/muhafara/overlock
 % --truetype-directory=texmf/fonts/truetype/muhafara/overlock
 % --encoding-directory=texmf/fonts/enc/dvips/overlock
-% --map-file=texmf/fonts/map/dvips/overlock/OverlockSC.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 OverlockSC-Regular.ttf OverlockSC-Regular-lf-ot1'
+% --map-file=texmf/fonts/map/dvips/overlock/Overlock.map --no-updmap
+% --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
+% --unicoding=germandbls =: SSsmall OverlockSC-Regular.otf
+% OverlockSC-Regular-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_fvk6cm.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_fvk6cm.enc
index ee3147d0634..570f08788ac 100644
--- a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_fvk6cm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_fvk6cm.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_fvk6cmjdl5hhmkz2xf7iot7agh
-% Encoding created by otftotfm on Sat May 24 06:51:50 2014
+% Encoding created by otftotfm on Sat Jun  1 18:45:39 2019
 % Command line follows encoding
 /AutoEnc_fvk6cmjdl5hhmkz2xf7iot7agh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_irzqhk.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_irzqhk.enc
index 782845ce982..57eb7e3b5f8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_irzqhk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_irzqhk.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_irzqhk73woobpgtstexkoyt5bf
-% Encoding created by otftotfm on Sat May 24 06:51:50 2014
+% Encoding created by otftotfm on Sat Jun  1 18:45:39 2019
 % Command line follows encoding
 /AutoEnc_irzqhk73woobpgtstexkoyt5bf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_47cn4f.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_siy5zo.enc
index ea7403a69a1..811c7e8b5da 100644
--- a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_47cn4f.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_siy5zo.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_47cn4f26yhncbpvocpkncv5qie
-% Encoding created by otftotfm on Sat May 24 06:51:50 2014
+%%AutoEnc_siy5zo4nxisxjix4nmcp6sm5ub
+% Encoding created by otftotfm on Sat Jun  1 18:45:39 2019
 % Command line follows encoding
-/AutoEnc_47cn4f26yhncbpvocpkncv5qie [
+/AutoEnc_siy5zo4nxisxjix4nmcp6sm5ub [
 %00
   /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /Omega /ff /fi /fl /ffi /ffl
@@ -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/overlock/ovlk_aqjbqj.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_wjzqlp.enc
index 71c36c76348..436330ada6b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_aqjbqj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_wjzqlp.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_aqjbqjpa266vlzefhpklbjmfwe
-% Encoding created by otftotfm on Sat May 24 06:52:45 2014
+%%AutoEnc_wjzqlpjzfl23softj6cgtvb5sh
+% Encoding created by otftotfm on Sat Jun  1 18:45:42 2019
 % Command line follows encoding
-/AutoEnc_aqjbqjpa266vlzefhpklbjmfwe [
+/AutoEnc_wjzqlpjzfl23softj6cgtvb5sh [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /fl /fi
 %10
   /dotlessi /.notdef /grave /acute /caron /breve /macron /ring
-  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+  /cedilla /.notdef /ae /oe /oslash /AE /OE /Oslash
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -45,7 +45,7 @@
   /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
+  /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
@@ -59,8 +59,8 @@
 % --type1-directory=texmf/fonts/type1/muhafara/overlock
 % --truetype-directory=texmf/fonts/truetype/muhafara/overlock
 % --encoding-directory=texmf/fonts/enc/dvips/overlock
-% --map-file=texmf/fonts/map/dvips/overlock/OverlockSC.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 OverlockSC-Regular.ttf
-% OverlockSC-Regular-lf-ly1'
+% --map-file=texmf/fonts/map/dvips/overlock/Overlock.map --no-updmap
+% --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 --unicoding=germandbls =: SSsmall
+% OverlockSC-Regular.otf OverlockSC-Regular-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_u2ziis.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_xweksb.enc
index 2042f0a0897..8a823e316d9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_u2ziis.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_xweksb.enc
@@ -1,17 +1,17 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_u2ziishc6diq5k64frzk4nstqf
-% Encoding created by otftotfm on Sat May 24 06:52:45 2014
+%%AutoEnc_xweksbjal3xwinjfchqnb4xzyh
+% Encoding created by otftotfm on Sat Jun  1 18:45:42 2019
 % Command line follows encoding
-/AutoEnc_u2ziishc6diq5k64frzk4nstqf [
+/AutoEnc_xweksbjal3xwinjfchqnb4xzyh [
 %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 /.notdef /.notdef /.notdef /.notdef /fl /fi
+  /.notdef /dotlessi /.notdef /.notdef /fi /fl /.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
@@ -51,7 +51,7 @@
   /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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
 % --tfm-directory=texmf/fonts/tfm/muhafara/overlock
@@ -59,8 +59,8 @@
 % --type1-directory=texmf/fonts/type1/muhafara/overlock
 % --truetype-directory=texmf/fonts/truetype/muhafara/overlock
 % --encoding-directory=texmf/fonts/enc/dvips/overlock
-% --map-file=texmf/fonts/map/dvips/overlock/OverlockSC.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 OverlockSC-Regular.ttf
-% OverlockSC-Regular-lf-t1'
+% --map-file=texmf/fonts/map/dvips/overlock/Overlock.map --no-updmap
+% --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 --unicoding=germandbls =: SSsmall
+% OverlockSC-Regular.otf OverlockSC-Regular-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/map/dvips/overlock/overlock.map b/Master/texmf-dist/fonts/map/dvips/overlock/overlock.map
index 8554cd2e111..1936c55b8e6 100644
--- a/Master/texmf-dist/fonts/map/dvips/overlock/overlock.map
+++ b/Master/texmf-dist/fonts/map/dvips/overlock/overlock.map
@@ -1,34 +1,30 @@
-
 % Automatically maintained by otftotfm or other programs. Do not edit.
 
-Overlock-BlackItalic-lf-ot1 Overlock-BlackItalic "AutoEnc_47cn4f26yhncbpvocpkncv5qie ReEncodeFont" <[ovlk_47cn4f.enc <Overlock-BlackItalic.pfb
-Overlock-BlackItalic-lf-t1--base Overlock-BlackItalic "AutoEnc_yaegef5lounubfdkieionjvcrc ReEncodeFont" <[ovlk_yaegef.enc <Overlock-BlackItalic.pfb
+Overlock-BlackItalic-lf-ot1 Overlock-BlackItalic "AutoEnc_siy5zo4nxisxjix4nmcp6sm5ub ReEncodeFont" <[ovlk_siy5zo.enc <Overlock-BlackItalic.pfb
+Overlock-BlackItalic-lf-t1--base Overlock-BlackItalic "AutoEnc_bhbhyohpixfjhncxk2ia6hj2ch ReEncodeFont" <[ovlk_bhbhyo.enc <Overlock-BlackItalic.pfb
 Overlock-BlackItalic-lf-ly1--base Overlock-BlackItalic "AutoEnc_irzqhk73woobpgtstexkoyt5bf ReEncodeFont" <[ovlk_irzqhk.enc <Overlock-BlackItalic.pfb
 Overlock-BlackItalic-lf-ts1--base Overlock-BlackItalic "AutoEnc_fvk6cmjdl5hhmkz2xf7iot7agh ReEncodeFont" <[ovlk_fvk6cm.enc <Overlock-BlackItalic.pfb
-Overlock-Black-lf-ot1 Overlock-Black "AutoEnc_47cn4f26yhncbpvocpkncv5qie ReEncodeFont" <[ovlk_47cn4f.enc <Overlock-Black.pfb
-Overlock-Black-lf-t1--base Overlock-Black "AutoEnc_yaegef5lounubfdkieionjvcrc ReEncodeFont" <[ovlk_yaegef.enc <Overlock-Black.pfb
+Overlock-Black-lf-ot1 Overlock-Black "AutoEnc_siy5zo4nxisxjix4nmcp6sm5ub ReEncodeFont" <[ovlk_siy5zo.enc <Overlock-Black.pfb
+Overlock-Black-lf-t1--base Overlock-Black "AutoEnc_bhbhyohpixfjhncxk2ia6hj2ch ReEncodeFont" <[ovlk_bhbhyo.enc <Overlock-Black.pfb
 Overlock-Black-lf-ly1--base Overlock-Black "AutoEnc_irzqhk73woobpgtstexkoyt5bf ReEncodeFont" <[ovlk_irzqhk.enc <Overlock-Black.pfb
 Overlock-Black-lf-ts1--base Overlock-Black "AutoEnc_fvk6cmjdl5hhmkz2xf7iot7agh ReEncodeFont" <[ovlk_fvk6cm.enc <Overlock-Black.pfb
-Overlock-BoldItalic-lf-ot1 Overlock-BoldItalic "AutoEnc_47cn4f26yhncbpvocpkncv5qie ReEncodeFont" <[ovlk_47cn4f.enc <Overlock-BoldItalic.pfb
-Overlock-BoldItalic-lf-t1--base Overlock-BoldItalic "AutoEnc_yaegef5lounubfdkieionjvcrc ReEncodeFont" <[ovlk_yaegef.enc <Overlock-BoldItalic.pfb
+Overlock-BoldItalic-lf-ot1 Overlock-BoldItalic "AutoEnc_siy5zo4nxisxjix4nmcp6sm5ub ReEncodeFont" <[ovlk_siy5zo.enc <Overlock-BoldItalic.pfb
+Overlock-BoldItalic-lf-t1--base Overlock-BoldItalic "AutoEnc_bhbhyohpixfjhncxk2ia6hj2ch ReEncodeFont" <[ovlk_bhbhyo.enc <Overlock-BoldItalic.pfb
 Overlock-BoldItalic-lf-ly1--base Overlock-BoldItalic "AutoEnc_irzqhk73woobpgtstexkoyt5bf ReEncodeFont" <[ovlk_irzqhk.enc <Overlock-BoldItalic.pfb
 Overlock-BoldItalic-lf-ts1--base Overlock-BoldItalic "AutoEnc_fvk6cmjdl5hhmkz2xf7iot7agh ReEncodeFont" <[ovlk_fvk6cm.enc <Overlock-BoldItalic.pfb
-Overlock-Bold-lf-ot1 Overlock-Bold "AutoEnc_47cn4f26yhncbpvocpkncv5qie ReEncodeFont" <[ovlk_47cn4f.enc <Overlock-Bold.pfb
-Overlock-Bold-lf-t1--base Overlock-Bold "AutoEnc_yaegef5lounubfdkieionjvcrc ReEncodeFont" <[ovlk_yaegef.enc <Overlock-Bold.pfb
+Overlock-Bold-lf-ot1 Overlock-Bold "AutoEnc_siy5zo4nxisxjix4nmcp6sm5ub ReEncodeFont" <[ovlk_siy5zo.enc <Overlock-Bold.pfb
+Overlock-Bold-lf-t1--base Overlock-Bold "AutoEnc_bhbhyohpixfjhncxk2ia6hj2ch ReEncodeFont" <[ovlk_bhbhyo.enc <Overlock-Bold.pfb
 Overlock-Bold-lf-ly1--base Overlock-Bold "AutoEnc_irzqhk73woobpgtstexkoyt5bf ReEncodeFont" <[ovlk_irzqhk.enc <Overlock-Bold.pfb
 Overlock-Bold-lf-ts1--base Overlock-Bold "AutoEnc_fvk6cmjdl5hhmkz2xf7iot7agh ReEncodeFont" <[ovlk_fvk6cm.enc <Overlock-Bold.pfb
-Overlock-Italic-lf-ot1 Overlock-Italic "AutoEnc_47cn4f26yhncbpvocpkncv5qie ReEncodeFont" <[ovlk_47cn4f.enc <Overlock-Italic.pfb
-Overlock-Italic-lf-t1--base Overlock-Italic "AutoEnc_yaegef5lounubfdkieionjvcrc ReEncodeFont" <[ovlk_yaegef.enc <Overlock-Italic.pfb
+Overlock-Italic-lf-ot1 Overlock-Italic "AutoEnc_siy5zo4nxisxjix4nmcp6sm5ub ReEncodeFont" <[ovlk_siy5zo.enc <Overlock-Italic.pfb
+Overlock-Italic-lf-t1--base Overlock-Italic "AutoEnc_bhbhyohpixfjhncxk2ia6hj2ch ReEncodeFont" <[ovlk_bhbhyo.enc <Overlock-Italic.pfb
 Overlock-Italic-lf-ly1--base Overlock-Italic "AutoEnc_irzqhk73woobpgtstexkoyt5bf ReEncodeFont" <[ovlk_irzqhk.enc <Overlock-Italic.pfb
 Overlock-Italic-lf-ts1--base Overlock-Italic "AutoEnc_fvk6cmjdl5hhmkz2xf7iot7agh ReEncodeFont" <[ovlk_fvk6cm.enc <Overlock-Italic.pfb
-Overlock-Regular-lf-ot1 Overlock-Regular "AutoEnc_47cn4f26yhncbpvocpkncv5qie ReEncodeFont" <[ovlk_47cn4f.enc <Overlock-Regular.pfb
-Overlock-Regular-lf-t1--base Overlock-Regular "AutoEnc_yaegef5lounubfdkieionjvcrc ReEncodeFont" <[ovlk_yaegef.enc <Overlock-Regular.pfb
+Overlock-Regular-lf-ot1 Overlock-Regular "AutoEnc_siy5zo4nxisxjix4nmcp6sm5ub ReEncodeFont" <[ovlk_siy5zo.enc <Overlock-Regular.pfb
+Overlock-Regular-lf-t1--base Overlock-Regular "AutoEnc_bhbhyohpixfjhncxk2ia6hj2ch ReEncodeFont" <[ovlk_bhbhyo.enc <Overlock-Regular.pfb
 Overlock-Regular-lf-ly1--base Overlock-Regular "AutoEnc_irzqhk73woobpgtstexkoyt5bf ReEncodeFont" <[ovlk_irzqhk.enc <Overlock-Regular.pfb
 Overlock-Regular-lf-ts1--base Overlock-Regular "AutoEnc_fvk6cmjdl5hhmkz2xf7iot7agh ReEncodeFont" <[ovlk_fvk6cm.enc <Overlock-Regular.pfb
-
-% Automatically maintained by otftotfm or other programs. Do not edit.
-
-OverlockSC-Regular-lf-ot1 OverlockSC-Regular "AutoEnc_k6z3gecwro7ayfjhhk2i7i2wgc ReEncodeFont" <[ovlk_k6z3ge.enc <OverlockSC-Regular.pfb
-OverlockSC-Regular-lf-t1--base OverlockSC-Regular "AutoEnc_u2ziishc6diq5k64frzk4nstqf ReEncodeFont" <[ovlk_u2ziis.enc <OverlockSC-Regular.pfb
-OverlockSC-Regular-lf-ly1--base OverlockSC-Regular "AutoEnc_aqjbqjpa266vlzefhpklbjmfwe ReEncodeFont" <[ovlk_aqjbqj.enc <OverlockSC-Regular.pfb
-OverlockSC-Regular-lf-ts1--base OverlockSC-Regular "AutoEnc_y3zmsfjq3w6r5gepwqy5ilg27b ReEncodeFont" <[ovlk_y3zmsf.enc <OverlockSC-Regular.pfb
+OverlockSC-Regular-lf-sc-ot1--base OverlockSC-Regular "AutoEnc_cbxvnsci6ezqvbsdbyywxxecyh ReEncodeFont" <[ovlk_cbxvns.enc <OverlockSC-Regular.pfb
+OverlockSC-Regular-lf-sc-t1--base OverlockSC-Regular "AutoEnc_xweksbjal3xwinjfchqnb4xzyh ReEncodeFont" <[ovlk_xweksb.enc <OverlockSC-Regular.pfb
+OverlockSC-Regular-lf-sc-ly1--base OverlockSC-Regular "AutoEnc_wjzqlpjzfl23softj6cgtvb5sh ReEncodeFont" <[ovlk_wjzqlp.enc <OverlockSC-Regular.pfb
+OverlockSC-Regular-lf-sc-ts1--base OverlockSC-Regular "AutoEnc_4sbkqffb2s6my7ozqecydrtmhe ReEncodeFont" <[ovlk_4sbkqf.enc <OverlockSC-Regular.pfb
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ot1.tfm
index 71cfcfabdf8..b217e5b9926 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-t1--base.tfm
index b79e15238d6..4c4d4af5f33 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-t1.tfm
index 0e1460cda83..037950eb253 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ts1.tfm
index 060283d6855..6c2304f419d 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ot1.tfm
index 6c9b358f475..3dc0cac677e 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-t1--base.tfm
index bc39ec09c35..2d0fc2b1c2f 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-t1.tfm
index 6a6d8723c7f..9d2364ca7e2 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ts1.tfm
index 048630b5bec..f648e468944 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ot1.tfm
index 7561854fd12..b448794009a 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-t1--base.tfm
index 899cf1f6681..d106f268324 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-t1.tfm
index b2cebbdfb48..52601e6918a 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ts1.tfm
index 12409d3f18f..689f32028c0 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ot1.tfm
index 93f96126223..17741fc3b7d 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-t1--base.tfm
index 4ecc5e270db..9d81bf3242a 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-t1.tfm
index aaa49382e06..eb08e44c26e 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ts1.tfm
index 0eede30b70a..caecf9aa7b3 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ot1.tfm
index 699fd14b759..07aa70d70d3 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-t1--base.tfm
index dc41aa13098..1b080994a03 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-t1.tfm
index 403549a1cf3..e9aae45d291 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ts1.tfm
index 60cda587312..3e311e96dc0 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ot1.tfm
index 26dd51af0fd..40d8f679973 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-t1--base.tfm
index 3daa35f55b4..dc9bbd3e717 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-t1.tfm
index a9ad9732c7b..134a94d6eb9 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ts1.tfm
index a6b74da493f..7b176e82613 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-ly1--base.tfm
deleted file mode 100644
index 36223cc1161..00000000000
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-ly1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-ly1.tfm
deleted file mode 100644
index 08cea1e621a..00000000000
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-ly1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-ot1.tfm
deleted file mode 100644
index 8f4aafb1a3a..00000000000
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-ot1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ly1--base.tfm
new file mode 100644
index 00000000000..e54561dc4fa
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ly1.tfm
new file mode 100644
index 00000000000..eb781efabb6
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ot1--base.tfm
new file mode 100644
index 00000000000..936976f5282
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ot1.tfm
new file mode 100644
index 00000000000..552ae0fca11
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-t1--base.tfm
new file mode 100644
index 00000000000..dad3ee63eb9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-t1.tfm
new file mode 100644
index 00000000000..3e7692bbea5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ts1--base.tfm
index 7434131baad..fffa162954a 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ts1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ts1.tfm
new file mode 100644
index 00000000000..08dfaaf998a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-t1--base.tfm
deleted file mode 100644
index 85daab648a1..00000000000
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-t1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-t1.tfm
deleted file mode 100644
index bffc46e82b5..00000000000
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-t1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-ts1.tfm
deleted file mode 100644
index 4384c851a48..00000000000
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-lf-t1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-lf-t1.vf
index 3638b904ef9..9cd2d1c921d 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-lf-ts1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-lf-ts1.vf
index d72eaaf6224..0f2295311d5 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-lf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-lf-t1.vf
index 2942dba0678..29aec5da8d5 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-lf-ts1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-lf-ts1.vf
index 4270327f54d..36d0d9d8188 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-lf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-lf-t1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-lf-t1.vf
index 12f9ac22234..480cfbcacd4 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-lf-ts1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-lf-ts1.vf
index b75aa9f02c1..2832809078f 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-lf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-lf-t1.vf
index 21bf1b7642c..c89f81a525f 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-lf-ts1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-lf-ts1.vf
index 711de1f02ff..f66f6a7269e 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-lf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-lf-t1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-lf-t1.vf
index b74991f489c..303a338878c 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-lf-ts1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-lf-ts1.vf
index c206dfdeb66..a5857aa7c0f 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-lf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-t1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-t1.vf
index fda3e83990a..b52a1ee9aa5 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-ts1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-ts1.vf
index c5286d425ea..e73cf65ec21 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-ly1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-sc-ly1.vf
index 7c97a5607ab..761a5cc0dc5 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-sc-ot1.vf
new file mode 100644
index 00000000000..bb3cee86c3d
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-sc-t1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-sc-t1.vf
new file mode 100644
index 00000000000..31f0b106253
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-sc-ts1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-sc-ts1.vf
new file mode 100644
index 00000000000..5710fd2be77
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-sc-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-t1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-t1.vf
deleted file mode 100644
index 538fa1412af..00000000000
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-t1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-ts1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-ts1.vf
deleted file mode 100644
index 09ed74b3b3f..00000000000
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/overlock/LY1Overlock-LF.fd b/Master/texmf-dist/tex/latex/overlock/LY1Overlock-LF.fd
index e4e2b61beb6..02c230e4880 100644
--- a/Master/texmf-dist/tex/latex/overlock/LY1Overlock-LF.fd
+++ b/Master/texmf-dist/tex/latex/overlock/LY1Overlock-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/05/24
+%% Generated by autoinst on 2019/06/01
 %%
 \ProvidesFile{LY1Overlock-LF.fd}
-    [2014/05/24 (autoinst)  Font definitions for LY1/Overlock-LF.]
+    [2019/06/01 (autoinst)  Font definitions for LY1/Overlock-LF.]
 
 \expandafter\ifx\csname Overlock@scale\endcsname\relax
     \let\Overlock@@scale\@empty
@@ -11,50 +11,115 @@
 
 \DeclareFontFamily{LY1}{Overlock-LF}{}
 
-\DeclareFontShape{LY1}{Overlock-LF}{k}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{Overlock-LF}{regular}{sc}{
+      <-> \Overlock@@scale OverlockSC-Regular-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Overlock-LF}{regular}{n}{
+      <-> \Overlock@@scale Overlock-Regular-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Overlock-LF}{regular}{it}{
+      <-> \Overlock@@scale Overlock-Italic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Overlock-LF}{regular}{sl}{
+      <-> ssub * Overlock-LF/regular/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{Overlock-LF}{black}{n}{
       <-> \Overlock@@scale Overlock-Black-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Overlock-LF}{k}{it}{
+\DeclareFontShape{LY1}{Overlock-LF}{black}{it}{
       <-> \Overlock@@scale Overlock-BlackItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Overlock-LF}{k}{sl}{
-      <-> ssub * Overlock-LF/k/it
+\DeclareFontShape{LY1}{Overlock-LF}{black}{sl}{
+      <-> ssub * Overlock-LF/black/it
 }{}
 
-\DeclareFontShape{LY1}{Overlock-LF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{Overlock-LF}{bold}{n}{
       <-> \Overlock@@scale Overlock-Bold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Overlock-LF}{b}{it}{
+\DeclareFontShape{LY1}{Overlock-LF}{bold}{it}{
       <-> \Overlock@@scale Overlock-BoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Overlock-LF}{b}{sl}{
-      <-> ssub * Overlock-LF/b/it
+\DeclareFontShape{LY1}{Overlock-LF}{bold}{sl}{
+      <-> ssub * Overlock-LF/bold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{Overlock-LF}{m}{sl}{
+      <-> ssub * Overlock-LF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{Overlock-LF}{m}{sc}{
+      <-> ssub * Overlock-LF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{Overlock-LF}{m}{n}{
-      <-> \Overlock@@scale Overlock-Regular-lf-ly1
+      <-> ssub * Overlock-LF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{Overlock-LF}{m}{it}{
-      <-> \Overlock@@scale Overlock-Italic-lf-ly1
+      <-> ssub * Overlock-LF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{Overlock-LF}{m}{sl}{
-      <-> ssub * Overlock-LF/m/it
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{Overlock-LF}{b}{sl}{
+      <-> ssub * Overlock-LF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{Overlock-LF}{bx}{sl}{
-      <-> ssub * Overlock-LF/b/sl
+\DeclareFontShape{LY1}{Overlock-LF}{b}{n}{
+      <-> ssub * Overlock-LF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{Overlock-LF}{b}{it}{
+      <-> ssub * Overlock-LF/bold/it
+}{}
+
+
+%   eb --> black
+
+\DeclareFontShape{LY1}{Overlock-LF}{eb}{sl}{
+      <-> ssub * Overlock-LF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{Overlock-LF}{eb}{n}{
+      <-> ssub * Overlock-LF/black/n
+}{}
+
+\DeclareFontShape{LY1}{Overlock-LF}{eb}{it}{
+      <-> ssub * Overlock-LF/black/it
 }{}
 
 \DeclareFontShape{LY1}{Overlock-LF}{bx}{n}{
       <-> ssub * Overlock-LF/b/n
 }{}
 
+\DeclareFontShape{LY1}{Overlock-LF}{bx}{sl}{
+      <-> ssub * Overlock-LF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{Overlock-LF}{bx}{it}{
       <-> ssub * Overlock-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/overlock/LY1OverlockSC-LF.fd b/Master/texmf-dist/tex/latex/overlock/LY1OverlockSC-LF.fd
deleted file mode 100644
index dbc183a8b8d..00000000000
--- a/Master/texmf-dist/tex/latex/overlock/LY1OverlockSC-LF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2014/05/24
-%%
-\ProvidesFile{LY1OverlockSC-LF.fd}
-    [2014/05/24 (autoinst)  Font definitions for LY1/OverlockSC-LF.]
-
-\expandafter\ifx\csname OverlockSC@scale\endcsname\relax
-    \let\OverlockSC@@scale\@empty
-\else
-    \edef\OverlockSC@@scale{s*[\csname OverlockSC@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{OverlockSC-LF}{}
-
-\DeclareFontShape{LY1}{OverlockSC-LF}{m}{n}{
-      <-> \OverlockSC@@scale OverlockSC-Regular-lf-ly1
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/OT1Overlock-LF.fd b/Master/texmf-dist/tex/latex/overlock/OT1Overlock-LF.fd
index 668f2b6ed39..a5907765f0c 100644
--- a/Master/texmf-dist/tex/latex/overlock/OT1Overlock-LF.fd
+++ b/Master/texmf-dist/tex/latex/overlock/OT1Overlock-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/05/24
+%% Generated by autoinst on 2019/06/01
 %%
 \ProvidesFile{OT1Overlock-LF.fd}
-    [2014/05/24 (autoinst)  Font definitions for OT1/Overlock-LF.]
+    [2019/06/01 (autoinst)  Font definitions for OT1/Overlock-LF.]
 
 \expandafter\ifx\csname Overlock@scale\endcsname\relax
     \let\Overlock@@scale\@empty
@@ -11,50 +11,115 @@
 
 \DeclareFontFamily{OT1}{Overlock-LF}{}
 
-\DeclareFontShape{OT1}{Overlock-LF}{k}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{Overlock-LF}{regular}{sc}{
+      <-> \Overlock@@scale OverlockSC-Regular-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Overlock-LF}{regular}{n}{
+      <-> \Overlock@@scale Overlock-Regular-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Overlock-LF}{regular}{it}{
+      <-> \Overlock@@scale Overlock-Italic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Overlock-LF}{regular}{sl}{
+      <-> ssub * Overlock-LF/regular/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{Overlock-LF}{black}{n}{
       <-> \Overlock@@scale Overlock-Black-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Overlock-LF}{k}{it}{
+\DeclareFontShape{OT1}{Overlock-LF}{black}{it}{
       <-> \Overlock@@scale Overlock-BlackItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Overlock-LF}{k}{sl}{
-      <-> ssub * Overlock-LF/k/it
+\DeclareFontShape{OT1}{Overlock-LF}{black}{sl}{
+      <-> ssub * Overlock-LF/black/it
 }{}
 
-\DeclareFontShape{OT1}{Overlock-LF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{Overlock-LF}{bold}{n}{
       <-> \Overlock@@scale Overlock-Bold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Overlock-LF}{b}{it}{
+\DeclareFontShape{OT1}{Overlock-LF}{bold}{it}{
       <-> \Overlock@@scale Overlock-BoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Overlock-LF}{b}{sl}{
-      <-> ssub * Overlock-LF/b/it
+\DeclareFontShape{OT1}{Overlock-LF}{bold}{sl}{
+      <-> ssub * Overlock-LF/bold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{Overlock-LF}{m}{sl}{
+      <-> ssub * Overlock-LF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{Overlock-LF}{m}{sc}{
+      <-> ssub * Overlock-LF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{Overlock-LF}{m}{n}{
-      <-> \Overlock@@scale Overlock-Regular-lf-ot1
+      <-> ssub * Overlock-LF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{Overlock-LF}{m}{it}{
-      <-> \Overlock@@scale Overlock-Italic-lf-ot1
+      <-> ssub * Overlock-LF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{Overlock-LF}{m}{sl}{
-      <-> ssub * Overlock-LF/m/it
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{Overlock-LF}{b}{sl}{
+      <-> ssub * Overlock-LF/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{Overlock-LF}{bx}{sl}{
-      <-> ssub * Overlock-LF/b/sl
+\DeclareFontShape{OT1}{Overlock-LF}{b}{n}{
+      <-> ssub * Overlock-LF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{Overlock-LF}{b}{it}{
+      <-> ssub * Overlock-LF/bold/it
+}{}
+
+
+%   eb --> black
+
+\DeclareFontShape{OT1}{Overlock-LF}{eb}{sl}{
+      <-> ssub * Overlock-LF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{Overlock-LF}{eb}{n}{
+      <-> ssub * Overlock-LF/black/n
+}{}
+
+\DeclareFontShape{OT1}{Overlock-LF}{eb}{it}{
+      <-> ssub * Overlock-LF/black/it
 }{}
 
 \DeclareFontShape{OT1}{Overlock-LF}{bx}{n}{
       <-> ssub * Overlock-LF/b/n
 }{}
 
+\DeclareFontShape{OT1}{Overlock-LF}{bx}{sl}{
+      <-> ssub * Overlock-LF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{Overlock-LF}{bx}{it}{
       <-> ssub * Overlock-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/overlock/OT1OverlockSC-LF.fd b/Master/texmf-dist/tex/latex/overlock/OT1OverlockSC-LF.fd
deleted file mode 100644
index b19e955a15f..00000000000
--- a/Master/texmf-dist/tex/latex/overlock/OT1OverlockSC-LF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2014/05/24
-%%
-\ProvidesFile{OT1OverlockSC-LF.fd}
-    [2014/05/24 (autoinst)  Font definitions for OT1/OverlockSC-LF.]
-
-\expandafter\ifx\csname OverlockSC@scale\endcsname\relax
-    \let\OverlockSC@@scale\@empty
-\else
-    \edef\OverlockSC@@scale{s*[\csname OverlockSC@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{OverlockSC-LF}{}
-
-\DeclareFontShape{OT1}{OverlockSC-LF}{m}{n}{
-      <-> \OverlockSC@@scale OverlockSC-Regular-lf-ot1
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/T1Overlock-LF.fd b/Master/texmf-dist/tex/latex/overlock/T1Overlock-LF.fd
index 790120fa3c8..1d74bdb950d 100644
--- a/Master/texmf-dist/tex/latex/overlock/T1Overlock-LF.fd
+++ b/Master/texmf-dist/tex/latex/overlock/T1Overlock-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/05/24
+%% Generated by autoinst on 2019/06/01
 %%
 \ProvidesFile{T1Overlock-LF.fd}
-    [2014/05/24 (autoinst)  Font definitions for T1/Overlock-LF.]
+    [2019/06/01 (autoinst)  Font definitions for T1/Overlock-LF.]
 
 \expandafter\ifx\csname Overlock@scale\endcsname\relax
     \let\Overlock@@scale\@empty
@@ -11,50 +11,115 @@
 
 \DeclareFontFamily{T1}{Overlock-LF}{}
 
-\DeclareFontShape{T1}{Overlock-LF}{k}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{Overlock-LF}{regular}{sc}{
+      <-> \Overlock@@scale OverlockSC-Regular-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Overlock-LF}{regular}{n}{
+      <-> \Overlock@@scale Overlock-Regular-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Overlock-LF}{regular}{it}{
+      <-> \Overlock@@scale Overlock-Italic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Overlock-LF}{regular}{sl}{
+      <-> ssub * Overlock-LF/regular/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{Overlock-LF}{black}{n}{
       <-> \Overlock@@scale Overlock-Black-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Overlock-LF}{k}{it}{
+\DeclareFontShape{T1}{Overlock-LF}{black}{it}{
       <-> \Overlock@@scale Overlock-BlackItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Overlock-LF}{k}{sl}{
-      <-> ssub * Overlock-LF/k/it
+\DeclareFontShape{T1}{Overlock-LF}{black}{sl}{
+      <-> ssub * Overlock-LF/black/it
 }{}
 
-\DeclareFontShape{T1}{Overlock-LF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{Overlock-LF}{bold}{n}{
       <-> \Overlock@@scale Overlock-Bold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Overlock-LF}{b}{it}{
+\DeclareFontShape{T1}{Overlock-LF}{bold}{it}{
       <-> \Overlock@@scale Overlock-BoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Overlock-LF}{b}{sl}{
-      <-> ssub * Overlock-LF/b/it
+\DeclareFontShape{T1}{Overlock-LF}{bold}{sl}{
+      <-> ssub * Overlock-LF/bold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{Overlock-LF}{m}{sl}{
+      <-> ssub * Overlock-LF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{Overlock-LF}{m}{sc}{
+      <-> ssub * Overlock-LF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{Overlock-LF}{m}{n}{
-      <-> \Overlock@@scale Overlock-Regular-lf-t1
+      <-> ssub * Overlock-LF/regular/n
 }{}
 
 \DeclareFontShape{T1}{Overlock-LF}{m}{it}{
-      <-> \Overlock@@scale Overlock-Italic-lf-t1
+      <-> ssub * Overlock-LF/regular/it
 }{}
 
-\DeclareFontShape{T1}{Overlock-LF}{m}{sl}{
-      <-> ssub * Overlock-LF/m/it
+
+%   b --> bold
+
+\DeclareFontShape{T1}{Overlock-LF}{b}{sl}{
+      <-> ssub * Overlock-LF/bold/sl
 }{}
 
-\DeclareFontShape{T1}{Overlock-LF}{bx}{sl}{
-      <-> ssub * Overlock-LF/b/sl
+\DeclareFontShape{T1}{Overlock-LF}{b}{n}{
+      <-> ssub * Overlock-LF/bold/n
+}{}
+
+\DeclareFontShape{T1}{Overlock-LF}{b}{it}{
+      <-> ssub * Overlock-LF/bold/it
+}{}
+
+
+%   eb --> black
+
+\DeclareFontShape{T1}{Overlock-LF}{eb}{sl}{
+      <-> ssub * Overlock-LF/black/sl
+}{}
+
+\DeclareFontShape{T1}{Overlock-LF}{eb}{n}{
+      <-> ssub * Overlock-LF/black/n
+}{}
+
+\DeclareFontShape{T1}{Overlock-LF}{eb}{it}{
+      <-> ssub * Overlock-LF/black/it
 }{}
 
 \DeclareFontShape{T1}{Overlock-LF}{bx}{n}{
       <-> ssub * Overlock-LF/b/n
 }{}
 
+\DeclareFontShape{T1}{Overlock-LF}{bx}{sl}{
+      <-> ssub * Overlock-LF/b/sl
+}{}
+
 \DeclareFontShape{T1}{Overlock-LF}{bx}{it}{
       <-> ssub * Overlock-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/overlock/T1OverlockSC-LF.fd b/Master/texmf-dist/tex/latex/overlock/T1OverlockSC-LF.fd
deleted file mode 100644
index 415a5a4a034..00000000000
--- a/Master/texmf-dist/tex/latex/overlock/T1OverlockSC-LF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2014/05/24
-%%
-\ProvidesFile{T1OverlockSC-LF.fd}
-    [2014/05/24 (autoinst)  Font definitions for T1/OverlockSC-LF.]
-
-\expandafter\ifx\csname OverlockSC@scale\endcsname\relax
-    \let\OverlockSC@@scale\@empty
-\else
-    \edef\OverlockSC@@scale{s*[\csname OverlockSC@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{OverlockSC-LF}{}
-
-\DeclareFontShape{T1}{OverlockSC-LF}{m}{n}{
-      <-> \OverlockSC@@scale OverlockSC-Regular-lf-t1
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/TS1Overlock-LF.fd b/Master/texmf-dist/tex/latex/overlock/TS1Overlock-LF.fd
index 659bcddc7da..4e9cde22594 100644
--- a/Master/texmf-dist/tex/latex/overlock/TS1Overlock-LF.fd
+++ b/Master/texmf-dist/tex/latex/overlock/TS1Overlock-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/05/24
+%% Generated by autoinst on 2019/06/01
 %%
 \ProvidesFile{TS1Overlock-LF.fd}
-    [2014/05/24 (autoinst)  Font definitions for TS1/Overlock-LF.]
+    [2019/06/01 (autoinst)  Font definitions for TS1/Overlock-LF.]
 
 \expandafter\ifx\csname Overlock@scale\endcsname\relax
     \let\Overlock@@scale\@empty
@@ -11,50 +11,115 @@
 
 \DeclareFontFamily{TS1}{Overlock-LF}{}
 
-\DeclareFontShape{TS1}{Overlock-LF}{k}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{Overlock-LF}{regular}{sc}{
+      <-> \Overlock@@scale OverlockSC-Regular-lf-sc-ts1
+}{}
+
+\DeclareFontShape{TS1}{Overlock-LF}{regular}{n}{
+      <-> \Overlock@@scale Overlock-Regular-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Overlock-LF}{regular}{it}{
+      <-> \Overlock@@scale Overlock-Italic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Overlock-LF}{regular}{sl}{
+      <-> ssub * Overlock-LF/regular/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{Overlock-LF}{black}{n}{
       <-> \Overlock@@scale Overlock-Black-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Overlock-LF}{k}{it}{
+\DeclareFontShape{TS1}{Overlock-LF}{black}{it}{
       <-> \Overlock@@scale Overlock-BlackItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Overlock-LF}{k}{sl}{
-      <-> ssub * Overlock-LF/k/it
+\DeclareFontShape{TS1}{Overlock-LF}{black}{sl}{
+      <-> ssub * Overlock-LF/black/it
 }{}
 
-\DeclareFontShape{TS1}{Overlock-LF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{Overlock-LF}{bold}{n}{
       <-> \Overlock@@scale Overlock-Bold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Overlock-LF}{b}{it}{
+\DeclareFontShape{TS1}{Overlock-LF}{bold}{it}{
       <-> \Overlock@@scale Overlock-BoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Overlock-LF}{b}{sl}{
-      <-> ssub * Overlock-LF/b/it
+\DeclareFontShape{TS1}{Overlock-LF}{bold}{sl}{
+      <-> ssub * Overlock-LF/bold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{Overlock-LF}{m}{sl}{
+      <-> ssub * Overlock-LF/regular/sl
+}{}
+
+\DeclareFontShape{TS1}{Overlock-LF}{m}{sc}{
+      <-> ssub * Overlock-LF/regular/sc
 }{}
 
 \DeclareFontShape{TS1}{Overlock-LF}{m}{n}{
-      <-> \Overlock@@scale Overlock-Regular-lf-ts1
+      <-> ssub * Overlock-LF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{Overlock-LF}{m}{it}{
-      <-> \Overlock@@scale Overlock-Italic-lf-ts1
+      <-> ssub * Overlock-LF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{Overlock-LF}{m}{sl}{
-      <-> ssub * Overlock-LF/m/it
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{Overlock-LF}{b}{sl}{
+      <-> ssub * Overlock-LF/bold/sl
 }{}
 
-\DeclareFontShape{TS1}{Overlock-LF}{bx}{sl}{
-      <-> ssub * Overlock-LF/b/sl
+\DeclareFontShape{TS1}{Overlock-LF}{b}{n}{
+      <-> ssub * Overlock-LF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{Overlock-LF}{b}{it}{
+      <-> ssub * Overlock-LF/bold/it
+}{}
+
+
+%   eb --> black
+
+\DeclareFontShape{TS1}{Overlock-LF}{eb}{sl}{
+      <-> ssub * Overlock-LF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{Overlock-LF}{eb}{n}{
+      <-> ssub * Overlock-LF/black/n
+}{}
+
+\DeclareFontShape{TS1}{Overlock-LF}{eb}{it}{
+      <-> ssub * Overlock-LF/black/it
 }{}
 
 \DeclareFontShape{TS1}{Overlock-LF}{bx}{n}{
       <-> ssub * Overlock-LF/b/n
 }{}
 
+\DeclareFontShape{TS1}{Overlock-LF}{bx}{sl}{
+      <-> ssub * Overlock-LF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{Overlock-LF}{bx}{it}{
       <-> ssub * Overlock-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/overlock/TS1OverlockSC-LF.fd b/Master/texmf-dist/tex/latex/overlock/TS1OverlockSC-LF.fd
deleted file mode 100644
index 11358c0ce64..00000000000
--- a/Master/texmf-dist/tex/latex/overlock/TS1OverlockSC-LF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2014/05/24
-%%
-\ProvidesFile{TS1OverlockSC-LF.fd}
-    [2014/05/24 (autoinst)  Font definitions for TS1/OverlockSC-LF.]
-
-\expandafter\ifx\csname OverlockSC@scale\endcsname\relax
-    \let\OverlockSC@@scale\@empty
-\else
-    \edef\OverlockSC@@scale{s*[\csname OverlockSC@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{OverlockSC-LF}{}
-
-\DeclareFontShape{TS1}{OverlockSC-LF}{m}{n}{
-      <-> \OverlockSC@@scale OverlockSC-Regular-lf-ts1
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/overlock.sty b/Master/texmf-dist/tex/latex/overlock/overlock.sty
index ca74de2005b..307c1c16018 100644
--- a/Master/texmf-dist/tex/latex/overlock/overlock.sty
+++ b/Master/texmf-dist/tex/latex/overlock/overlock.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{overlock}
-    [2014/05/25 (Bob Tennent)  Supports Overlock fonts for all LaTeX engines.]
+    [2019/06/01 (Bob Tennent)  Supports Overlock fonts for all LaTeX engines.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -53,6 +53,7 @@
       [ UprightFont    = *-Regular ,
         ItalicFont     = *-Italic ,
         BoldFont       = *-\overlock@boldstyle , 
+        SmallCapsFont = {OverlockSC-Regular},
         BoldItalicFont = *-\overlock@boldstyle Italic ]
       {Overlock}
   % grab current family in case of subsequent change:
@@ -61,6 +62,7 @@
       [ UprightFont    = *-Regular ,
         ItalicFont     = *-Italic ,
         BoldFont       = *-\overlock@boldstyle , 
+        SmallCapsFont = {OverlockSC-Regular},
         BoldItalicFont = *-\overlock@boldstyle Italic ]
       {Overlock}
   \newfontfamily\overlockBlack
@@ -69,22 +71,17 @@
         BoldFont       = *-Black , 
         BoldItalicFont = *-BlackItalic ]
       {Overlock}
-  \newfontface\overlocksc{OverlockSC-Regular}
-  \def\sffamily{\overlock\def\scshape{\overlocksc}}
+  \def\sffamily{\overlock}
   \ifoverlock@default
     \edef\familydefault{\overlockfamily}
-    \def\scshape{\overlocksc}
   \fi
 \else % type1
   \def\overlockfamily{Overlock-LF}
-  \def\overlockscfamily{OverlockSC-LF}
   \def\sfdefault{\overlockfamily}
-  \def\sffamily{\fontfamily{\overlockfamily}\selectfont\def\scshape{\fontfamily{\overlockscfamily}\selectfont}}
-  \def\overlock{\fontfamily{\overlockfamily}\selectfont\def\scshape{\fontfamily{\overlockscfamily}\selectfont}}
-  \def\overlockBlack{\fontfamily{\overlockfamily}\fontseries{k}\selectfont\def\scshape{\fontfamily{\overlockscfamily}\selectfont}}
-  \ifoverlock@default
-    \def\familydefault{\sfdefault}
-    \renewcommand\scshape{\fontfamily{\overlockscfamily}\selectfont}
+  \def\sffamily{\fontfamily{\overlockfamily}\selectfont}
+  \def\overlock{\fontfamily{\overlockfamily}\selectfont}
+  \def\overlockBlack{\fontfamily{\overlockfamily}\fontseries{black}\selectfont}
+  \ifoverlock@default\def\familydefault{\sfdefault}
   \fi
   
 \fi