overlock (10jul20)

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

267 files changed, 1610 insertions, 254 deletions

diff --git a/Master/texmf-dist/doc/fonts/overlock/README b/Master/texmf-dist/doc/fonts/overlock/README
index 747d528cd58..b598c0f6b88 100644
--- a/Master/texmf-dist/doc/fonts/overlock/README
+++ b/Master/texmf-dist/doc/fonts/overlock/README
@@ -1,11 +1,11 @@
-This is the README for the Overlock package, version 2019-10-15.
+This is the README for the Overlock package, version 2020-07-07.
 
 This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support
-for the Overlock and OverlookSC families of fonts, designed by
+for the Overlock family of fonts, designed by
 Dario Manuel Muhafara of the TIPO foundry (http://www.tipo.net.ar).
 These are "rounded" sans-serif fonts in three weights (Regular,
 Bold, Black) with italic variants for each of them. There are also
-small-caps and old-style figures in the Regular weight.
+small-caps in the Regular weight.
 
 To install this package on a TDS-compliant TeX system download
 the file "tex-archive"/install/fonts/overlock.tds.zip, where the
@@ -19,31 +19,33 @@ To use, add
 
 \usepackage{overlock}
 
-to the preamble of your document. This will activate Overlock and
-OverlockSC as the sans-serif text fonts. To also set these as the
-main text fonts, use
+to the preamble of your document. This will activate
+Overlock as the sans-serif text fonts. To also set these as
+the main text fonts, use
 
 \usepackage[sfdefault]{overlock}
 
 The black option will use that weight as the default bold series.
 
+The oldstyle and lining options will set those figures as the default.
+
 LuaLaTeX and xeLaTeX users who might prefer type1 fonts or who wish
 to avoid fontspec may use the type1 option.
 
 Options scaled=<number> or scale=<number> may be used to scale the
 fonts.
 
-The default figure style is proportional-lining but old-style
-figures are available for the regular weight using the small-cap
-shape. Font encodings supported are OT1, T1, LY1 and TS1.
+Font encodings supported are OT1, T1, LY1 and TS1.
 
-Command \overlook selects the Overlock and OverlockSC families
-and \overlockBlack selects the Black series.
+Command \overlook selects the Overlock family and
+\overlockBlack selects the Black series. To select oldstyle
+or lining figures locally, use \oldstylenums{...} or
+\liningnums{...}, respectively.
 
-The original fonts are available at http://www.google.com and
-are licensed under the SIL Open Font License, (version 1.1); the
-text may be found in the doc directory. The type1 versions were
-created using fontforge. The support files were created using
-autoinst and are licensed under the terms of the LaTeX Project
-Public License. The maintainer of this package is Bob Tennent (rdt
-at cs.queensu.ca).
+The original fonts are available at http://www.google.com
+and are licensed under the SIL Open Font License, (version
+1.1); the text may be found in the doc directory. The type1
+versions were created using cfftot1. The support files
+were created using autoinst and are licensed under the terms
+of the LaTeX Project Public License. The maintainer of this
+package is Bob Tennent (rdt at cs.queensu.ca).
diff --git a/Master/texmf-dist/doc/fonts/overlock/overlock-samples.pdf b/Master/texmf-dist/doc/fonts/overlock/overlock-samples.pdf
index aa937c69161..e64657a7d3a 100644
--- a/Master/texmf-dist/doc/fonts/overlock/overlock-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/overlock/overlock-samples.pdf
diff --git a/Master/texmf-dist/doc/fonts/overlock/overlock-samples.tex b/Master/texmf-dist/doc/fonts/overlock/overlock-samples.tex
index 695f5a5f4d7..1a7cb14f27b 100644
--- a/Master/texmf-dist/doc/fonts/overlock/overlock-samples.tex
+++ b/Master/texmf-dist/doc/fonts/overlock/overlock-samples.tex
@@ -1,6 +1,6 @@
 \documentclass[12pt]{article}
 \usepackage[T1]{fontenc}
-\usepackage[sfdefault]{overlock}
+\usepackage[sfdefault,oldstyle]{overlock}
 \usepackage{lipsum}
 \begin{document}
 \begin{center}\Huge\bfseries
@@ -24,7 +24,7 @@ Overlock
 
 \subsection*{Black}
 
-{\overlockBlack \lipsum[5]}
+{\overlockBlack\lipsum[5]}
 
 \subsection*{Black Italic}
 
@@ -33,12 +33,16 @@ Overlock
 \subsection*{Small Caps}
 \textsc{\lipsum[7]}
 
-\subsection*{Lining Numbers}
+\subsection*{Default Numbers}
 
 1234567890
 
 \subsection*{Old-Style Numbers}
 
-\textsc{1234567890}
+\oldstylenums{1234567890}
+
+\subsection*{Lining Numbers}
+
+\liningnums{1234567890}
 
 \end{document}
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_2sdgnb.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_2sdgnb.enc
new file mode 100644
index 00000000000..f557458b6c3
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_2sdgnb.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_2sdgnb5x563it4jcpbvoqbov4f
+% Encoding created by otftotfm on Tue Jul  7 14:30:26 2020
+% Command line follows encoding
+/AutoEnc_2sdgnb5x563it4jcpbvoqbov4f [
+%00
+  /ft /Eurooldstyle /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /ffl /ffi /ff /fl /fi
+%10
+  /dotlessi /.notdef /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollaroldstyle /percentoldstyle /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zerooldstyle /oneoldstyle /twooldstyle /threeoldstyle /fouroldstyle /fiveoldstyle /sixoldstyle /sevenoldstyle
+  /eightoldstyle /nineoldstyle /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 /florinoldstyle /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousandoldstyle /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /centoldstyle /sterlingoldstyle /.notdef /yenoldstyle /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/muhafara/overlock
+% --vf-directory=texmf/fonts/vf/muhafara/overlock
+% --type1-directory=texmf/fonts/type1/muhafara/overlock
+% --encoding-directory=texmf/fonts/enc/dvips/overlock
+% --map-file=texmf/fonts/map/dvips/overlock/Overlock.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% Overlock-BlackItalic.otf Overlock-BlackItalic-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_325tkf.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_325tkf.enc
new file mode 100644
index 00000000000..b09aaef4934
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_325tkf.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_325tkfjbi4xwiqvm2wgvkvbrmc
+% Encoding created by otftotfm on Tue Jul  7 14:30:27 2020
+% Command line follows encoding
+/AutoEnc_325tkfjbi4xwiqvm2wgvkvbrmc [
+%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 /ff /fi /fl /ffi /ffl
+%20
+  /space /exclam /quotedbl /numbersign /dollaroldstyle /percentoldstyle /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zerooldstyle /oneoldstyle /twooldstyle /threeoldstyle /fouroldstyle /fiveoldstyle /sixoldstyle /sevenoldstyle
+  /eightoldstyle /nineoldstyle /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 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /Scaron /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Ydieresis /.notdef /Zcaron /.notdef /.notdef /.notdef /.notdef /section
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /scaron /.notdef /.notdef /.notdef /.notdef /.notdef
+  /ydieresis /.notdef /zcaron /.notdef /.notdef /exclamdown /questiondown /sterlingoldstyle
+%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/muhafara/overlock
+% --vf-directory=texmf/fonts/vf/muhafara/overlock
+% --type1-directory=texmf/fonts/type1/muhafara/overlock
+% --encoding-directory=texmf/fonts/enc/dvips/overlock
+% --map-file=texmf/fonts/map/dvips/overlock/Overlock.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% Overlock-Black.otf Overlock-Black-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_7l4e47.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_7l4e47.enc
new file mode 100644
index 00000000000..790e511bc7c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_7l4e47.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_7l4e47cng7hvdg3cpm4miymr5a
+% Encoding created by otftotfm on Tue Jul  7 14:30:27 2020
+% Command line follows encoding
+/AutoEnc_7l4e47cng7hvdg3cpm4miymr5a [
+%00
+  /.notdef /Eurooldstyle /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /ffl /ffi /ff /fl /fi
+%10
+  /dotlessi /.notdef /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollaroldstyle /percentoldstyle /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zerooldstyle /oneoldstyle /twooldstyle /threeoldstyle /fouroldstyle /fiveoldstyle /sixoldstyle /sevenoldstyle
+  /eightoldstyle /nineoldstyle /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 /florinoldstyle /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousandoldstyle /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /centoldstyle /sterlingoldstyle /.notdef /yenoldstyle /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/muhafara/overlock
+% --vf-directory=texmf/fonts/vf/muhafara/overlock
+% --type1-directory=texmf/fonts/type1/muhafara/overlock
+% --encoding-directory=texmf/fonts/enc/dvips/overlock
+% --map-file=texmf/fonts/map/dvips/overlock/Overlock.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% Overlock-Black.otf Overlock-Black-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_a4aghc.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_a4aghc.enc
new file mode 100644
index 00000000000..f27f8dbb875
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_a4aghc.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_a4aghcjch6knbm5cm2vj6qwkha
+% Encoding created by otftotfm on Tue Jul  7 14:30:31 2020
+% Command line follows encoding
+/AutoEnc_a4aghcjch6knbm5cm2vj6qwkha [
+%00
+  /grave /Acutesmall /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /Ssmall
+  /.notdef /dotlessi /.notdef /ff /fismall /flsmall /ffi /ffl
+%20
+  /space /exclamsmall /quotedbl /numbersign /dollar /percent /ampersandsmall /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 /questionsmall
+%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 /Asmall /Bsmall /Csmall /Dsmall /Esmall /Fsmall /Gsmall
+  /Hsmall /Ismall /Jsmall /Ksmall /Lsmall /Msmall /Nsmall /Osmall
+%70
+  /Psmall /Qsmall /Rsmall /Ssmall /Tsmall /Usmall /Vsmall /Wsmall
+  /Xsmall /Ysmall /Zsmall /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /Scaron /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Ydieresis /.notdef /Zcaron /.notdef /.notdef /.notdef /.notdef /section
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslashsmall /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /Scaronsmall /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Ydieresissmall /.notdef /Zcaronsmall /.notdef /.notdef /exclamdownsmall /questiondownsmall /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
+  /Agravesmall /Aacutesmall /Acircumflexsmall /Atildesmall /Adieresissmall /Aringsmall /AEsmall /Ccedillasmall
+  /Egravesmall /Eacutesmall /Ecircumflexsmall /Edieresissmall /Igravesmall /Iacutesmall /Icircumflexsmall /Idieresissmall
+%F0
+  /Ethsmall /Ntildesmall /Ogravesmall /Oacutesmall /Ocircumflexsmall /Otildesmall /Odieresissmall /OEsmall
+  /Oslashsmall /Ugravesmall /Uacutesmall /Ucircumflexsmall /Udieresissmall /Yacutesmall /Thornsmall /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/muhafara/overlock
+% --vf-directory=texmf/fonts/vf/muhafara/overlock
+% --type1-directory=texmf/fonts/type1/muhafara/overlock
+% --encoding-directory=texmf/fonts/enc/dvips/overlock
+% --map-file=texmf/fonts/map/dvips/overlock/Overlock.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --unicoding=germandbls =: SSsmall Overlock-Regular.otf
+% Overlock-Regular-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_bhbhyo.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_bhbhyo.enc
index b7466cec5cd..664c9055d36 100644
--- a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_bhbhyo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_bhbhyo.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_bhbhyohpixfjhncxk2ia6hj2ch
-% Encoding created by otftotfm on Sat Jun  8 02:42:37 2019
+% Encoding created by otftotfm on Tue Jul  7 14:30:27 2020
 % Command line follows encoding
 /AutoEnc_bhbhyohpixfjhncxk2ia6hj2ch [
 %00
@@ -57,10 +57,9 @@
 % --tfm-directory=texmf/fonts/tfm/muhafara/overlock
 % --vf-directory=texmf/fonts/vf/muhafara/overlock
 % --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/Overlock.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 Overlock-BlackItalic.ttf
-% Overlock-BlackItalic-lf-t1'
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Overlock-Black.otf
+% Overlock-Black-lf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_cj365g.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_cj365g.enc
new file mode 100644
index 00000000000..2d6386a8779
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_cj365g.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_cj365g2dgf7uotglaibfbctlfh
+% Encoding created by otftotfm on Tue Jul  7 14:30:31 2020
+% Command line follows encoding
+/AutoEnc_cj365g2dgf7uotglaibfbctlfh [
+%00
+  /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Omega /ff /fismall /flsmall /ffi /ffl
+%10
+  /dotlessi /.notdef /grave /Acutesmall /caron /breve /macron /ring
+  /cedilla /.notdef /AEsmall /OEsmall /Oslashsmall /AE /OE /Oslash
+%20
+  /space /exclamsmall /quotedblright /numbersign /dollar /percent /ampersandsmall /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /exclamdownsmall /equal /questiondownsmall /questionsmall
+%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 /Asmall /Bsmall /Csmall /Dsmall /Esmall /Fsmall /Gsmall
+  /Hsmall /Ismall /Jsmall /Ksmall /Lsmall /Msmall /Nsmall /Osmall
+%70
+  /Psmall /Qsmall /Rsmall /Ssmall /Tsmall /Usmall /Vsmall /Wsmall
+  /Xsmall /Ysmall /Zsmall /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /Ssmall /.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 /Lslashsmall /.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/muhafara/overlock
+% --vf-directory=texmf/fonts/vf/muhafara/overlock
+% --type1-directory=texmf/fonts/type1/muhafara/overlock
+% --encoding-directory=texmf/fonts/enc/dvips/overlock
+% --map-file=texmf/fonts/map/dvips/overlock/Overlock.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Overlock-Regular.otf Overlock-Regular-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_cr35rj.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_cr35rj.enc
new file mode 100644
index 00000000000..0dcc6269e86
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_cr35rj.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_cr35rjhfqdj2wxwrpiqxypmmpd
+% Encoding created by otftotfm on Tue Jul  7 14:30:31 2020
+% Command line follows encoding
+/AutoEnc_cr35rjhfqdj2wxwrpiqxypmmpd [
+%00
+  /Ssmall /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /ffl /ffi /ff /flsmall /fismall
+%10
+  /dotlessi /.notdef /grave /Acutesmall /caron /breve /macron /ring
+  /cedilla /.notdef /AEsmall /OEsmall /Oslashsmall /AE /OE /Oslash
+%20
+  /space /exclamsmall /quotedbl /numbersign /dollar /percent /ampersandsmall /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 /questionsmall
+%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 /Asmall /Bsmall /Csmall /Dsmall /Esmall /Fsmall /Gsmall
+  /Hsmall /Ismall /Jsmall /Ksmall /Lsmall /Msmall /Nsmall /Osmall
+%70
+  /Psmall /Qsmall /Rsmall /Ssmall /Tsmall /Usmall /Vsmall /Wsmall
+  /Xsmall /Ysmall /Zsmall /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /Lslashsmall /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /Scaronsmall /guilsinglright /OEsmall /Zcaronsmall /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdownsmall /cent /sterling /.notdef /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /twosuperior /threesuperior /Acutesmall /mu /paragraph /periodcentered
+  /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondownsmall
+%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 /.notdef
+%E0
+  /Agravesmall /Aacutesmall /Acircumflexsmall /Atildesmall /Adieresissmall /Aringsmall /AEsmall /Ccedillasmall
+  /Egravesmall /Eacutesmall /Ecircumflexsmall /Edieresissmall /Igravesmall /Iacutesmall /Icircumflexsmall /Idieresissmall
+%F0
+  /Ethsmall /Ntildesmall /Ogravesmall /Oacutesmall /Ocircumflexsmall /Otildesmall /Odieresissmall /divide
+  /Oslashsmall /Ugravesmall /Uacutesmall /Ucircumflexsmall /Udieresissmall /Yacutesmall /Thornsmall /Ydieresissmall
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/muhafara/overlock
+% --vf-directory=texmf/fonts/vf/muhafara/overlock
+% --type1-directory=texmf/fonts/type1/muhafara/overlock
+% --encoding-directory=texmf/fonts/enc/dvips/overlock
+% --map-file=texmf/fonts/map/dvips/overlock/Overlock.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --unicoding=germandbls =: SSsmall Overlock-Regular.otf
+% Overlock-Regular-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_e3j4ia.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_e3j4ia.enc
new file mode 100644
index 00000000000..2e82ba96dad
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_e3j4ia.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_e3j4iabkytyfkjdzyjnmw7lmvf
+% Encoding created by otftotfm on Tue Jul  7 14:30:32 2020
+% Command line follows encoding
+/AutoEnc_e3j4iabkytyfkjdzyjnmw7lmvf [
+%00
+  /Ssmall /Eurooldstyle /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /ffl /ffi /ff /flsmall /fismall
+%10
+  /dotlessi /.notdef /grave /Acutesmall /caron /breve /macron /ring
+  /cedilla /.notdef /AEsmall /OEsmall /Oslashsmall /AE /OE /Oslash
+%20
+  /space /exclamsmall /quotedbl /numbersign /dollaroldstyle /percentoldstyle /ampersandsmall /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zerooldstyle /oneoldstyle /twooldstyle /threeoldstyle /fouroldstyle /fiveoldstyle /sixoldstyle /sevenoldstyle
+  /eightoldstyle /nineoldstyle /colon /semicolon /less /equal /greater /questionsmall
+%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 /Asmall /Bsmall /Csmall /Dsmall /Esmall /Fsmall /Gsmall
+  /Hsmall /Ismall /Jsmall /Ksmall /Lsmall /Msmall /Nsmall /Osmall
+%70
+  /Psmall /Qsmall /Rsmall /Ssmall /Tsmall /Usmall /Vsmall /Wsmall
+  /Xsmall /Ysmall /Zsmall /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /florinoldstyle /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousandoldstyle /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /Lslashsmall /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /Scaronsmall /guilsinglright /OEsmall /Zcaronsmall /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdownsmall /centoldstyle /sterlingoldstyle /.notdef /yenoldstyle /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /twosuperior /threesuperior /Acutesmall /mu /paragraph /periodcentered
+  /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondownsmall
+%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 /.notdef
+%E0
+  /Agravesmall /Aacutesmall /Acircumflexsmall /Atildesmall /Adieresissmall /Aringsmall /AEsmall /Ccedillasmall
+  /Egravesmall /Eacutesmall /Ecircumflexsmall /Edieresissmall /Igravesmall /Iacutesmall /Icircumflexsmall /Idieresissmall
+%F0
+  /Ethsmall /Ntildesmall /Ogravesmall /Oacutesmall /Ocircumflexsmall /Otildesmall /Odieresissmall /divide
+  /Oslashsmall /Ugravesmall /Uacutesmall /Ucircumflexsmall /Udieresissmall /Yacutesmall /Thornsmall /Ydieresissmall
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/muhafara/overlock
+% --vf-directory=texmf/fonts/vf/muhafara/overlock
+% --type1-directory=texmf/fonts/type1/muhafara/overlock
+% --encoding-directory=texmf/fonts/enc/dvips/overlock
+% --map-file=texmf/fonts/map/dvips/overlock/Overlock.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=smcp --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall Overlock-Regular.otf
+% Overlock-Regular-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_fqfhhf.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_fqfhhf.enc
new file mode 100644
index 00000000000..2332b91be25
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_fqfhhf.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_fqfhhfxomkr3h6polueqah3uyd
+% Encoding created by otftotfm on Tue Jul  7 14:30:26 2020
+% Command line follows encoding
+/AutoEnc_fqfhhfxomkr3h6polueqah3uyd [
+%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
+  /ft /dotlessi /.notdef /ff /fi /fl /ffi /ffl
+%20
+  /space /exclam /quotedbl /numbersign /dollaroldstyle /percentoldstyle /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zerooldstyle /oneoldstyle /twooldstyle /threeoldstyle /fouroldstyle /fiveoldstyle /sixoldstyle /sevenoldstyle
+  /eightoldstyle /nineoldstyle /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 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /Scaron /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Ydieresis /.notdef /Zcaron /.notdef /.notdef /.notdef /.notdef /section
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /scaron /.notdef /.notdef /.notdef /.notdef /.notdef
+  /ydieresis /.notdef /zcaron /.notdef /.notdef /exclamdown /questiondown /sterlingoldstyle
+%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/muhafara/overlock
+% --vf-directory=texmf/fonts/vf/muhafara/overlock
+% --type1-directory=texmf/fonts/type1/muhafara/overlock
+% --encoding-directory=texmf/fonts/enc/dvips/overlock
+% --map-file=texmf/fonts/map/dvips/overlock/Overlock.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% Overlock-BlackItalic.otf Overlock-BlackItalic-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_gmmlzo.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_gmmlzo.enc
new file mode 100644
index 00000000000..4971e67c7ad
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_gmmlzo.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_gmmlzoui4e3cic5m7zm53lkb6b
+% Encoding created by otftotfm on Tue Jul  7 14:30:27 2020
+% Command line follows encoding
+/AutoEnc_gmmlzoui4e3cic5m7zm53lkb6b [
+%00
+  /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Omega /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /.notdef /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedblright /numbersign /dollaroldstyle /percentoldstyle /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zerooldstyle /oneoldstyle /twooldstyle /threeoldstyle /fouroldstyle /fiveoldstyle /sixoldstyle /sevenoldstyle
+  /eightoldstyle /nineoldstyle /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/muhafara/overlock
+% --vf-directory=texmf/fonts/vf/muhafara/overlock
+% --type1-directory=texmf/fonts/type1/muhafara/overlock
+% --encoding-directory=texmf/fonts/enc/dvips/overlock
+% --map-file=texmf/fonts/map/dvips/overlock/Overlock.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl Overlock-Black.otf Overlock-Black-osf-ot1'
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 9ec34316d50..aafd6d2976a 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 Jun  8 02:42:38 2019
+% Encoding created by otftotfm on Tue Jul  7 14:30:27 2020
 % Command line follows encoding
 /AutoEnc_irzqhk73woobpgtstexkoyt5bf [
 %00
@@ -57,10 +57,9 @@
 % --tfm-directory=texmf/fonts/tfm/muhafara/overlock
 % --vf-directory=texmf/fonts/vf/muhafara/overlock
 % --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/Overlock.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 Overlock-BlackItalic.ttf
-% Overlock-BlackItalic-lf-ly1'
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Overlock-Black.otf
+% Overlock-Black-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_fvk6cm.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_j3mq5n.enc
index 7345a85031b..3e5d219e813 100644
--- a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_fvk6cm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_j3mq5n.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_fvk6cmjdl5hhmkz2xf7iot7agh
-% Encoding created by otftotfm on Sat Jun  8 02:42:38 2019
+%%AutoEnc_j3mq5nqbtnsu2eloaceetc2yqc
+% Encoding created by otftotfm on Tue Jul  7 14:30:26 2020
 % Command line follows encoding
-/AutoEnc_fvk6cmjdl5hhmkz2xf7iot7agh [
+/AutoEnc_j3mq5nqbtnsu2eloaceetc2yqc [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -11,7 +11,7 @@
   /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
 %20
-  /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
+  /.notdef /endash /.notdef /.notdef /dollaroldstyle /.notdef /.notdef /quotesingle
   /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
 %30
   /zerooldstyle /oneoldstyle /twooldstyle /threeoldstyle /fouroldstyle /fiveoldstyle /sixoldstyle /sevenoldstyle
@@ -29,17 +29,17 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %80
-  /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
-  /bullet /.notdef /dollaroldstyle /centoldstyle /florin /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousandoldstyle
+  /bullet /.notdef /dollaroldstyle /centoldstyle /florinoldstyle /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
-  /.notdef /.notdef /cent /sterling /.notdef /yen /brokenbar /section
+  /.notdef /.notdef /centoldstyle /sterlingoldstyle /.notdef /yenoldstyle /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
+  /.notdef /onesuperior /ordmasculine /radical /onequarter /onehalf /threequarters /Eurooldstyle
 %C0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,16 +51,13 @@
   /.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
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
 % --tfm-directory=texmf/fonts/tfm/muhafara/overlock
 % --vf-directory=texmf/fonts/vf/muhafara/overlock
 % --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/Overlock.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 Overlock-BlackItalic.ttf
-% Overlock-BlackItalic-lf-ts1'
+% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
+% Overlock-BlackItalic.otf Overlock-BlackItalic-lf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_xweksb.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_k2npiy.enc
index 1472696c708..1c6f8456b15 100644
--- a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_xweksb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_k2npiy.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_xweksbjal3xwinjfchqnb4xzyh
-% Encoding created by otftotfm on Sat Jun  8 02:42:40 2019
+%%AutoEnc_k2npiyfkpjwncss3lgbgdsvdsd
+% Encoding created by otftotfm on Tue Jul  7 14:30:26 2020
 % Command line follows encoding
-/AutoEnc_xweksbjal3xwinjfchqnb4xzyh [
+/AutoEnc_k2npiyfkpjwncss3lgbgdsvdsd [
 %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 /fi /fl /.notdef /.notdef
+  /ft /dotlessi /.notdef /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -51,16 +51,15 @@
   /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
 %F0
   /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
-  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /.notdef
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
 % --tfm-directory=texmf/fonts/tfm/muhafara/overlock
 % --vf-directory=texmf/fonts/vf/muhafara/overlock
 % --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/Overlock.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 --unicoding=germandbls =:
-% SSsmall OverlockSC-Regular.ttf OverlockSC-Regular-lf-sc-t1'
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Overlock-BlackItalic.otf
+% Overlock-BlackItalic-lf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_lhx5go.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_lhx5go.enc
new file mode 100644
index 00000000000..65f2f6e7a56
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_lhx5go.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_lhx5gowcws4zqn3bnkmgld6dfe
+% Encoding created by otftotfm on Tue Jul  7 14:30:32 2020
+% Command line follows encoding
+/AutoEnc_lhx5gowcws4zqn3bnkmgld6dfe [
+%00
+  /grave /Acutesmall /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /Ssmall
+  /.notdef /dotlessi /.notdef /ff /fismall /flsmall /ffi /ffl
+%20
+  /space /exclamsmall /quotedbl /numbersign /dollaroldstyle /percentoldstyle /ampersandsmall /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zerooldstyle /oneoldstyle /twooldstyle /threeoldstyle /fouroldstyle /fiveoldstyle /sixoldstyle /sevenoldstyle
+  /eightoldstyle /nineoldstyle /colon /semicolon /less /equal /greater /questionsmall
+%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 /Asmall /Bsmall /Csmall /Dsmall /Esmall /Fsmall /Gsmall
+  /Hsmall /Ismall /Jsmall /Ksmall /Lsmall /Msmall /Nsmall /Osmall
+%70
+  /Psmall /Qsmall /Rsmall /Ssmall /Tsmall /Usmall /Vsmall /Wsmall
+  /Xsmall /Ysmall /Zsmall /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /Scaron /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Ydieresis /.notdef /Zcaron /.notdef /.notdef /.notdef /.notdef /section
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslashsmall /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /Scaronsmall /.notdef /.notdef /.notdef /.notdef /.notdef
+  /Ydieresissmall /.notdef /Zcaronsmall /.notdef /.notdef /exclamdownsmall /questiondownsmall /sterlingoldstyle
+%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
+  /Agravesmall /Aacutesmall /Acircumflexsmall /Atildesmall /Adieresissmall /Aringsmall /AEsmall /Ccedillasmall
+  /Egravesmall /Eacutesmall /Ecircumflexsmall /Edieresissmall /Igravesmall /Iacutesmall /Icircumflexsmall /Idieresissmall
+%F0
+  /Ethsmall /Ntildesmall /Ogravesmall /Oacutesmall /Ocircumflexsmall /Otildesmall /Odieresissmall /OEsmall
+  /Oslashsmall /Ugravesmall /Uacutesmall /Ucircumflexsmall /Udieresissmall /Yacutesmall /Thornsmall /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/muhafara/overlock
+% --vf-directory=texmf/fonts/vf/muhafara/overlock
+% --type1-directory=texmf/fonts/type1/muhafara/overlock
+% --encoding-directory=texmf/fonts/enc/dvips/overlock
+% --map-file=texmf/fonts/map/dvips/overlock/Overlock.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=smcp --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall Overlock-Regular.otf
+% Overlock-Regular-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_lqqrub.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_lqqrub.enc
new file mode 100644
index 00000000000..ffa3c0822c2
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_lqqrub.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_lqqrub5fsevsuwx76ng2ek2weg
+% Encoding created by otftotfm on Tue Jul  7 14:30:32 2020
+% Command line follows encoding
+/AutoEnc_lqqrub5fsevsuwx76ng2ek2weg [
+%00
+  /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Omega /ff /fismall /flsmall /ffi /ffl
+%10
+  /dotlessi /.notdef /grave /Acutesmall /caron /breve /macron /ring
+  /cedilla /.notdef /AEsmall /OEsmall /Oslashsmall /AE /OE /Oslash
+%20
+  /space /exclamsmall /quotedblright /numbersign /dollaroldstyle /percentoldstyle /ampersandsmall /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zerooldstyle /oneoldstyle /twooldstyle /threeoldstyle /fouroldstyle /fiveoldstyle /sixoldstyle /sevenoldstyle
+  /eightoldstyle /nineoldstyle /colon /semicolon /exclamdownsmall /equal /questiondownsmall /questionsmall
+%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 /Asmall /Bsmall /Csmall /Dsmall /Esmall /Fsmall /Gsmall
+  /Hsmall /Ismall /Jsmall /Ksmall /Lsmall /Msmall /Nsmall /Osmall
+%70
+  /Psmall /Qsmall /Rsmall /Ssmall /Tsmall /Usmall /Vsmall /Wsmall
+  /Xsmall /Ysmall /Zsmall /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /Ssmall /.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 /Lslashsmall /.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/muhafara/overlock
+% --vf-directory=texmf/fonts/vf/muhafara/overlock
+% --type1-directory=texmf/fonts/type1/muhafara/overlock
+% --encoding-directory=texmf/fonts/enc/dvips/overlock
+% --map-file=texmf/fonts/map/dvips/overlock/Overlock.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
+% --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =:
+% SSsmall Overlock-Regular.otf Overlock-Regular-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_siy5zo.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_siy5zo.enc
index 94312a3d64b..b98fc3b8145 100644
--- a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_siy5zo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_siy5zo.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_siy5zo4nxisxjix4nmcp6sm5ub
-% Encoding created by otftotfm on Sat Jun  8 02:42:37 2019
+% Encoding created by otftotfm on Tue Jul  7 14:30:27 2020
 % Command line follows encoding
 /AutoEnc_siy5zo4nxisxjix4nmcp6sm5ub [
 %00
@@ -57,9 +57,8 @@
 % --tfm-directory=texmf/fonts/tfm/muhafara/overlock
 % --vf-directory=texmf/fonts/vf/muhafara/overlock
 % --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/Overlock.map --no-updmap
-% --no-type1 --coding-scheme=TEX TEXT --feature=kern --ligkern=f i =: fi
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl Overlock-BlackItalic.ttf Overlock-BlackItalic-lf-ot1'
+% l =: ffl Overlock-Black.otf Overlock-Black-lf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_tmoia5.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_tmoia5.enc
new file mode 100644
index 00000000000..c0b1d6a070b
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_tmoia5.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_tmoia5mfo53vda5lq5wnmoa5va
+% Encoding created by otftotfm on Tue Jul  7 14:30:26 2020
+% Command line follows encoding
+/AutoEnc_tmoia5mfo53vda5lq5wnmoa5va [
+%00
+  /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Omega /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /.notdef /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedblright /numbersign /dollaroldstyle /percentoldstyle /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zerooldstyle /oneoldstyle /twooldstyle /threeoldstyle /fouroldstyle /fiveoldstyle /sixoldstyle /sevenoldstyle
+  /eightoldstyle /nineoldstyle /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
+  /ft /.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/muhafara/overlock
+% --vf-directory=texmf/fonts/vf/muhafara/overlock
+% --type1-directory=texmf/fonts/type1/muhafara/overlock
+% --encoding-directory=texmf/fonts/enc/dvips/overlock
+% --map-file=texmf/fonts/map/dvips/overlock/Overlock.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl Overlock-BlackItalic.otf
+% Overlock-BlackItalic-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_wjzqlp.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_vvi6px.enc
index eb6b7df6ea8..43e33f10cec 100644
--- a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_wjzqlp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_vvi6px.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_wjzqlpjzfl23softj6cgtvb5sh
-% Encoding created by otftotfm on Sat Jun  8 02:42:40 2019
+%%AutoEnc_vvi6pxx5sx2on2ocn7y5gjmarh
+% Encoding created by otftotfm on Tue Jul  7 14:30:26 2020
 % Command line follows encoding
-/AutoEnc_wjzqlpjzfl23softj6cgtvb5sh [
+/AutoEnc_vvi6pxx5sx2on2ocn7y5gjmarh [
 %00
-  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /fl /fi
+  /ft /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /ffl /ffi /ff /fl /fi
 %10
   /dotlessi /.notdef /grave /acute /caron /breve /macron /ring
-  /cedilla /.notdef /ae /oe /oslash /AE /OE /Oslash
+  /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
@@ -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 /.notdef
+  /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
@@ -57,10 +57,9 @@
 % --tfm-directory=texmf/fonts/tfm/muhafara/overlock
 % --vf-directory=texmf/fonts/vf/muhafara/overlock
 % --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/Overlock.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 --unicoding=germandbls =: SSsmall
-% OverlockSC-Regular.ttf OverlockSC-Regular-lf-sc-ly1'
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl Overlock-BlackItalic.otf
+% Overlock-BlackItalic-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_cbxvns.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_woxjio.enc
index 551ecdec13b..8105b45828d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_cbxvns.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_woxjio.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_cbxvnsci6ezqvbsdbyywxxecyh
-% Encoding created by otftotfm on Sat Jun  8 02:42:40 2019
+%%AutoEnc_woxjioicn57zo7v7snwnj4dtgc
+% Encoding created by otftotfm on Tue Jul  7 14:30:26 2020
 % Command line follows encoding
-/AutoEnc_cbxvnsci6ezqvbsdbyywxxecyh [
+/AutoEnc_woxjioicn57zo7v7snwnj4dtgc [
 %00
   /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /Omega /.notdef /fi /fl /.notdef /.notdef
+  /.notdef /.notdef /Omega /ff /fi /fl /ffi /ffl
 %10
   /dotlessi /.notdef /grave /acute /caron /breve /macron /ring
-  /cedilla /.notdef /ae /oe /oslash /AE /OE /Oslash
+  /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
@@ -29,7 +29,7 @@
   /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
+  /ft /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -57,10 +57,8 @@
 % --tfm-directory=texmf/fonts/tfm/muhafara/overlock
 % --vf-directory=texmf/fonts/vf/muhafara/overlock
 % --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/Overlock.map --no-updmap
-% --no-type1 --coding-scheme=TEX TEXT --feature=kern --ligkern=f i =: fi
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --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.ttf
-% OverlockSC-Regular-lf-sc-ot1'
+% l =: ffl Overlock-BlackItalic.otf Overlock-BlackItalic-lf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_y3zmsf.enc b/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_y3zmsf.enc
deleted file mode 100644
index 79f1b1b4504..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/overlock/ovlk_y3zmsf.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_y3zmsfjq3w6r5gepwqy5ilg27b
-% Encoding created by otftotfm on Sat Jun  8 02:42:41 2019
-% Command line follows encoding
-/AutoEnc_y3zmsfjq3w6r5gepwqy5ilg27b [
-%00
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
-%10
-  /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
-%20
-  /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
-  /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
-%30
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
-%40
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%50
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%60
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%70
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%80
-  /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
-  /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef
-%90
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
-  /.notdef /.notdef /cent /sterling /.notdef /yen /brokenbar /section
-  /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
-%B0
-  /degree /plusminus /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered
-  /.notdef /onesuperior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro
-%C0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
-  /.notdef /.notdef /.notdef /fl /l /fi /i /f
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=texmf/fonts/tfm/muhafara/overlock
-% --vf-directory=texmf/fonts/vf/muhafara/overlock
-% --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/Overlock.map --no-updmap
-% --no-type1 --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.ttf OverlockSC-Regular-lf-sc-ts1'
diff --git a/Master/texmf-dist/fonts/map/dvips/overlock/overlock.map b/Master/texmf-dist/fonts/map/dvips/overlock/overlock.map
index 53975d01525..8b4431e6b9a 100644
--- a/Master/texmf-dist/fonts/map/dvips/overlock/overlock.map
+++ b/Master/texmf-dist/fonts/map/dvips/overlock/overlock.map
@@ -1,30 +1,98 @@
 % Automatically maintained by otftotfm or other programs. Do not edit.
 
-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_siy5zo4nxisxjix4nmcp6sm5ub ReEncodeFont" <[ovlk_siy5zo.enc <Overlock-Black.pfb
+Overlock-BlackItalic-lf-ot1--lcdfj Overlock-BlackItalicLCDFJ "" <Overlock-BlackItalicLCDFJ.pfb
+Overlock-BlackItalic-lf-ot1--base Overlock-BlackItalic "AutoEnc_woxjioicn57zo7v7snwnj4dtgc ReEncodeFont" <[ovlk_woxjio.enc <Overlock-BlackItalic.pfb
+Overlock-BlackItalic-lf-t1--lcdfj Overlock-BlackItalicLCDFJ "" <Overlock-BlackItalicLCDFJ.pfb
+Overlock-BlackItalic-lf-t1--base Overlock-BlackItalic "AutoEnc_k2npiyfkpjwncss3lgbgdsvdsd ReEncodeFont" <[ovlk_k2npiy.enc <Overlock-BlackItalic.pfb
+Overlock-BlackItalic-lf-ly1--lcdfj Overlock-BlackItalicLCDFJ "" <Overlock-BlackItalicLCDFJ.pfb
+Overlock-BlackItalic-lf-ly1--base Overlock-BlackItalic "AutoEnc_vvi6pxx5sx2on2ocn7y5gjmarh ReEncodeFont" <[ovlk_vvi6px.enc <Overlock-BlackItalic.pfb
+Overlock-BlackItalic-lf-ts1--base Overlock-BlackItalic "AutoEnc_j3mq5nqbtnsu2eloaceetc2yqc ReEncodeFont" <[ovlk_j3mq5n.enc <Overlock-BlackItalic.pfb
+Overlock-BlackItalic-osf-ot1--lcdfj Overlock-BlackItalicLCDFJ "" <Overlock-BlackItalicLCDFJ.pfb
+Overlock-BlackItalic-osf-ot1--base Overlock-BlackItalic "AutoEnc_tmoia5mfo53vda5lq5wnmoa5va ReEncodeFont" <[ovlk_tmoia5.enc <Overlock-BlackItalic.pfb
+Overlock-BlackItalic-osf-t1--lcdfj Overlock-BlackItalicLCDFJ "" <Overlock-BlackItalicLCDFJ.pfb
+Overlock-BlackItalic-osf-t1--base Overlock-BlackItalic "AutoEnc_fqfhhfxomkr3h6polueqah3uyd ReEncodeFont" <[ovlk_fqfhhf.enc <Overlock-BlackItalic.pfb
+Overlock-BlackItalic-osf-ly1--lcdfj Overlock-BlackItalicLCDFJ "" <Overlock-BlackItalicLCDFJ.pfb
+Overlock-BlackItalic-osf-ly1--base Overlock-BlackItalic "AutoEnc_2sdgnb5x563it4jcpbvoqbov4f ReEncodeFont" <[ovlk_2sdgnb.enc <Overlock-BlackItalic.pfb
+Overlock-BlackItalic-osf-ts1--base Overlock-BlackItalic "AutoEnc_j3mq5nqbtnsu2eloaceetc2yqc ReEncodeFont" <[ovlk_j3mq5n.enc <Overlock-BlackItalic.pfb
+Overlock-Black-lf-ot1--lcdfj Overlock-BlackLCDFJ "" <Overlock-BlackLCDFJ.pfb
+Overlock-Black-lf-ot1--base Overlock-Black "AutoEnc_siy5zo4nxisxjix4nmcp6sm5ub ReEncodeFont" <[ovlk_siy5zo.enc <Overlock-Black.pfb
+Overlock-Black-lf-t1--lcdfj Overlock-BlackLCDFJ "" <Overlock-BlackLCDFJ.pfb
 Overlock-Black-lf-t1--base Overlock-Black "AutoEnc_bhbhyohpixfjhncxk2ia6hj2ch ReEncodeFont" <[ovlk_bhbhyo.enc <Overlock-Black.pfb
+Overlock-Black-lf-ly1--lcdfj Overlock-BlackLCDFJ "" <Overlock-BlackLCDFJ.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_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_siy5zo4nxisxjix4nmcp6sm5ub ReEncodeFont" <[ovlk_siy5zo.enc <Overlock-Bold.pfb
+Overlock-Black-lf-ts1--base Overlock-Black "AutoEnc_j3mq5nqbtnsu2eloaceetc2yqc ReEncodeFont" <[ovlk_j3mq5n.enc <Overlock-Black.pfb
+Overlock-Black-osf-ot1--lcdfj Overlock-BlackLCDFJ "" <Overlock-BlackLCDFJ.pfb
+Overlock-Black-osf-ot1--base Overlock-Black "AutoEnc_gmmlzoui4e3cic5m7zm53lkb6b ReEncodeFont" <[ovlk_gmmlzo.enc <Overlock-Black.pfb
+Overlock-Black-osf-t1--lcdfj Overlock-BlackLCDFJ "" <Overlock-BlackLCDFJ.pfb
+Overlock-Black-osf-t1--base Overlock-Black "AutoEnc_325tkfjbi4xwiqvm2wgvkvbrmc ReEncodeFont" <[ovlk_325tkf.enc <Overlock-Black.pfb
+Overlock-Black-osf-ly1--lcdfj Overlock-BlackLCDFJ "" <Overlock-BlackLCDFJ.pfb
+Overlock-Black-osf-ly1--base Overlock-Black "AutoEnc_7l4e47cng7hvdg3cpm4miymr5a ReEncodeFont" <[ovlk_7l4e47.enc <Overlock-Black.pfb
+Overlock-Black-osf-ts1--base Overlock-Black "AutoEnc_j3mq5nqbtnsu2eloaceetc2yqc ReEncodeFont" <[ovlk_j3mq5n.enc <Overlock-Black.pfb
+Overlock-BoldItalic-lf-ot1--lcdfj Overlock-BoldItalicLCDFJ "" <Overlock-BoldItalicLCDFJ.pfb
+Overlock-BoldItalic-lf-ot1--base Overlock-BoldItalic "AutoEnc_woxjioicn57zo7v7snwnj4dtgc ReEncodeFont" <[ovlk_woxjio.enc <Overlock-BoldItalic.pfb
+Overlock-BoldItalic-lf-t1--lcdfj Overlock-BoldItalicLCDFJ "" <Overlock-BoldItalicLCDFJ.pfb
+Overlock-BoldItalic-lf-t1--base Overlock-BoldItalic "AutoEnc_k2npiyfkpjwncss3lgbgdsvdsd ReEncodeFont" <[ovlk_k2npiy.enc <Overlock-BoldItalic.pfb
+Overlock-BoldItalic-lf-ly1--lcdfj Overlock-BoldItalicLCDFJ "" <Overlock-BoldItalicLCDFJ.pfb
+Overlock-BoldItalic-lf-ly1--base Overlock-BoldItalic "AutoEnc_vvi6pxx5sx2on2ocn7y5gjmarh ReEncodeFont" <[ovlk_vvi6px.enc <Overlock-BoldItalic.pfb
+Overlock-BoldItalic-lf-ts1--base Overlock-BoldItalic "AutoEnc_j3mq5nqbtnsu2eloaceetc2yqc ReEncodeFont" <[ovlk_j3mq5n.enc <Overlock-BoldItalic.pfb
+Overlock-BoldItalic-osf-ot1--lcdfj Overlock-BoldItalicLCDFJ "" <Overlock-BoldItalicLCDFJ.pfb
+Overlock-BoldItalic-osf-ot1--base Overlock-BoldItalic "AutoEnc_tmoia5mfo53vda5lq5wnmoa5va ReEncodeFont" <[ovlk_tmoia5.enc <Overlock-BoldItalic.pfb
+Overlock-BoldItalic-osf-t1--lcdfj Overlock-BoldItalicLCDFJ "" <Overlock-BoldItalicLCDFJ.pfb
+Overlock-BoldItalic-osf-t1--base Overlock-BoldItalic "AutoEnc_fqfhhfxomkr3h6polueqah3uyd ReEncodeFont" <[ovlk_fqfhhf.enc <Overlock-BoldItalic.pfb
+Overlock-BoldItalic-osf-ly1--lcdfj Overlock-BoldItalicLCDFJ "" <Overlock-BoldItalicLCDFJ.pfb
+Overlock-BoldItalic-osf-ly1--base Overlock-BoldItalic "AutoEnc_2sdgnb5x563it4jcpbvoqbov4f ReEncodeFont" <[ovlk_2sdgnb.enc <Overlock-BoldItalic.pfb
+Overlock-BoldItalic-osf-ts1--base Overlock-BoldItalic "AutoEnc_j3mq5nqbtnsu2eloaceetc2yqc ReEncodeFont" <[ovlk_j3mq5n.enc <Overlock-BoldItalic.pfb
+Overlock-Bold-lf-ot1--lcdfj Overlock-BoldLCDFJ "" <Overlock-BoldLCDFJ.pfb
+Overlock-Bold-lf-ot1--base Overlock-Bold "AutoEnc_siy5zo4nxisxjix4nmcp6sm5ub ReEncodeFont" <[ovlk_siy5zo.enc <Overlock-Bold.pfb
+Overlock-Bold-lf-t1--lcdfj Overlock-BoldLCDFJ "" <Overlock-BoldLCDFJ.pfb
 Overlock-Bold-lf-t1--base Overlock-Bold "AutoEnc_bhbhyohpixfjhncxk2ia6hj2ch ReEncodeFont" <[ovlk_bhbhyo.enc <Overlock-Bold.pfb
+Overlock-Bold-lf-ly1--lcdfj Overlock-BoldLCDFJ "" <Overlock-BoldLCDFJ.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_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_siy5zo4nxisxjix4nmcp6sm5ub ReEncodeFont" <[ovlk_siy5zo.enc <Overlock-Regular.pfb
+Overlock-Bold-lf-ts1--base Overlock-Bold "AutoEnc_j3mq5nqbtnsu2eloaceetc2yqc ReEncodeFont" <[ovlk_j3mq5n.enc <Overlock-Bold.pfb
+Overlock-Bold-osf-ot1--lcdfj Overlock-BoldLCDFJ "" <Overlock-BoldLCDFJ.pfb
+Overlock-Bold-osf-ot1--base Overlock-Bold "AutoEnc_gmmlzoui4e3cic5m7zm53lkb6b ReEncodeFont" <[ovlk_gmmlzo.enc <Overlock-Bold.pfb
+Overlock-Bold-osf-t1--lcdfj Overlock-BoldLCDFJ "" <Overlock-BoldLCDFJ.pfb
+Overlock-Bold-osf-t1--base Overlock-Bold "AutoEnc_325tkfjbi4xwiqvm2wgvkvbrmc ReEncodeFont" <[ovlk_325tkf.enc <Overlock-Bold.pfb
+Overlock-Bold-osf-ly1--lcdfj Overlock-BoldLCDFJ "" <Overlock-BoldLCDFJ.pfb
+Overlock-Bold-osf-ly1--base Overlock-Bold "AutoEnc_7l4e47cng7hvdg3cpm4miymr5a ReEncodeFont" <[ovlk_7l4e47.enc <Overlock-Bold.pfb
+Overlock-Bold-osf-ts1--base Overlock-Bold "AutoEnc_j3mq5nqbtnsu2eloaceetc2yqc ReEncodeFont" <[ovlk_j3mq5n.enc <Overlock-Bold.pfb
+Overlock-Italic-lf-ot1--lcdfj Overlock-ItalicLCDFJ "" <Overlock-ItalicLCDFJ.pfb
+Overlock-Italic-lf-ot1--base Overlock-Italic "AutoEnc_woxjioicn57zo7v7snwnj4dtgc ReEncodeFont" <[ovlk_woxjio.enc <Overlock-Italic.pfb
+Overlock-Italic-lf-t1--lcdfj Overlock-ItalicLCDFJ "" <Overlock-ItalicLCDFJ.pfb
+Overlock-Italic-lf-t1--base Overlock-Italic "AutoEnc_k2npiyfkpjwncss3lgbgdsvdsd ReEncodeFont" <[ovlk_k2npiy.enc <Overlock-Italic.pfb
+Overlock-Italic-lf-ly1--lcdfj Overlock-ItalicLCDFJ "" <Overlock-ItalicLCDFJ.pfb
+Overlock-Italic-lf-ly1--base Overlock-Italic "AutoEnc_vvi6pxx5sx2on2ocn7y5gjmarh ReEncodeFont" <[ovlk_vvi6px.enc <Overlock-Italic.pfb
+Overlock-Italic-lf-ts1--base Overlock-Italic "AutoEnc_j3mq5nqbtnsu2eloaceetc2yqc ReEncodeFont" <[ovlk_j3mq5n.enc <Overlock-Italic.pfb
+Overlock-Italic-osf-ot1--lcdfj Overlock-ItalicLCDFJ "" <Overlock-ItalicLCDFJ.pfb
+Overlock-Italic-osf-ot1--base Overlock-Italic "AutoEnc_tmoia5mfo53vda5lq5wnmoa5va ReEncodeFont" <[ovlk_tmoia5.enc <Overlock-Italic.pfb
+Overlock-Italic-osf-t1--lcdfj Overlock-ItalicLCDFJ "" <Overlock-ItalicLCDFJ.pfb
+Overlock-Italic-osf-t1--base Overlock-Italic "AutoEnc_fqfhhfxomkr3h6polueqah3uyd ReEncodeFont" <[ovlk_fqfhhf.enc <Overlock-Italic.pfb
+Overlock-Italic-osf-ly1--lcdfj Overlock-ItalicLCDFJ "" <Overlock-ItalicLCDFJ.pfb
+Overlock-Italic-osf-ly1--base Overlock-Italic "AutoEnc_2sdgnb5x563it4jcpbvoqbov4f ReEncodeFont" <[ovlk_2sdgnb.enc <Overlock-Italic.pfb
+Overlock-Italic-osf-ts1--base Overlock-Italic "AutoEnc_j3mq5nqbtnsu2eloaceetc2yqc ReEncodeFont" <[ovlk_j3mq5n.enc <Overlock-Italic.pfb
+Overlock-Regular-lf-ot1--lcdfj Overlock-RegularLCDFJ "" <Overlock-RegularLCDFJ.pfb
+Overlock-Regular-lf-ot1--base Overlock-Regular "AutoEnc_siy5zo4nxisxjix4nmcp6sm5ub ReEncodeFont" <[ovlk_siy5zo.enc <Overlock-Regular.pfb
+Overlock-Regular-lf-t1--lcdfj Overlock-RegularLCDFJ "" <Overlock-RegularLCDFJ.pfb
 Overlock-Regular-lf-t1--base Overlock-Regular "AutoEnc_bhbhyohpixfjhncxk2ia6hj2ch ReEncodeFont" <[ovlk_bhbhyo.enc <Overlock-Regular.pfb
+Overlock-Regular-lf-ly1--lcdfj Overlock-RegularLCDFJ "" <Overlock-RegularLCDFJ.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
-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_y3zmsfjq3w6r5gepwqy5ilg27b ReEncodeFont" <[ovlk_y3zmsf.enc <OverlockSC-Regular.pfb
+Overlock-Regular-lf-sc-ot1--lcdfj Overlock-RegularLCDFJ "" <Overlock-RegularLCDFJ.pfb
+Overlock-Regular-lf-sc-ot1--base Overlock-Regular "AutoEnc_cj365g2dgf7uotglaibfbctlfh ReEncodeFont" <[ovlk_cj365g.enc <Overlock-Regular.pfb
+Overlock-Regular-lf-sc-t1--lcdfj Overlock-RegularLCDFJ "" <Overlock-RegularLCDFJ.pfb
+Overlock-Regular-lf-sc-t1--base Overlock-Regular "AutoEnc_a4aghcjch6knbm5cm2vj6qwkha ReEncodeFont" <[ovlk_a4aghc.enc <Overlock-Regular.pfb
+Overlock-Regular-lf-sc-ly1--lcdfj Overlock-RegularLCDFJ "" <Overlock-RegularLCDFJ.pfb
+Overlock-Regular-lf-sc-ly1--base Overlock-Regular "AutoEnc_cr35rjhfqdj2wxwrpiqxypmmpd ReEncodeFont" <[ovlk_cr35rj.enc <Overlock-Regular.pfb
+Overlock-Regular-lf-ts1--base Overlock-Regular "AutoEnc_j3mq5nqbtnsu2eloaceetc2yqc ReEncodeFont" <[ovlk_j3mq5n.enc <Overlock-Regular.pfb
+Overlock-Regular-osf-ot1--lcdfj Overlock-RegularLCDFJ "" <Overlock-RegularLCDFJ.pfb
+Overlock-Regular-osf-ot1--base Overlock-Regular "AutoEnc_gmmlzoui4e3cic5m7zm53lkb6b ReEncodeFont" <[ovlk_gmmlzo.enc <Overlock-Regular.pfb
+Overlock-Regular-osf-t1--lcdfj Overlock-RegularLCDFJ "" <Overlock-RegularLCDFJ.pfb
+Overlock-Regular-osf-t1--base Overlock-Regular "AutoEnc_325tkfjbi4xwiqvm2wgvkvbrmc ReEncodeFont" <[ovlk_325tkf.enc <Overlock-Regular.pfb
+Overlock-Regular-osf-ly1--lcdfj Overlock-RegularLCDFJ "" <Overlock-RegularLCDFJ.pfb
+Overlock-Regular-osf-ly1--base Overlock-Regular "AutoEnc_7l4e47cng7hvdg3cpm4miymr5a ReEncodeFont" <[ovlk_7l4e47.enc <Overlock-Regular.pfb
+Overlock-Regular-osf-sc-ot1--lcdfj Overlock-RegularLCDFJ "" <Overlock-RegularLCDFJ.pfb
+Overlock-Regular-osf-sc-ot1--base Overlock-Regular "AutoEnc_lqqrub5fsevsuwx76ng2ek2weg ReEncodeFont" <[ovlk_lqqrub.enc <Overlock-Regular.pfb
+Overlock-Regular-osf-sc-t1--lcdfj Overlock-RegularLCDFJ "" <Overlock-RegularLCDFJ.pfb
+Overlock-Regular-osf-sc-t1--base Overlock-Regular "AutoEnc_lhx5gowcws4zqn3bnkmgld6dfe ReEncodeFont" <[ovlk_lhx5go.enc <Overlock-Regular.pfb
+Overlock-Regular-osf-sc-ly1--lcdfj Overlock-RegularLCDFJ "" <Overlock-RegularLCDFJ.pfb
+Overlock-Regular-osf-sc-ly1--base Overlock-Regular "AutoEnc_e3j4iabkytyfkjdzyjnmw7lmvf ReEncodeFont" <[ovlk_e3j4ia.enc <Overlock-Regular.pfb
+Overlock-Regular-osf-ts1--base Overlock-Regular "AutoEnc_j3mq5nqbtnsu2eloaceetc2yqc ReEncodeFont" <[ovlk_j3mq5n.enc <Overlock-Regular.pfb
diff --git a/Master/texmf-dist/fonts/opentype/muhafara/overlock/Overlock-Black.otf b/Master/texmf-dist/fonts/opentype/muhafara/overlock/Overlock-Black.otf
new file mode 100644
index 00000000000..7a26cf967a4
--- /dev/null
+++ b/Master/texmf-dist/fonts/opentype/muhafara/overlock/Overlock-Black.otf
diff --git a/Master/texmf-dist/fonts/opentype/muhafara/overlock/Overlock-BlackItalic.otf b/Master/texmf-dist/fonts/opentype/muhafara/overlock/Overlock-BlackItalic.otf
new file mode 100644
index 00000000000..b6a25eafa2b
--- /dev/null
+++ b/Master/texmf-dist/fonts/opentype/muhafara/overlock/Overlock-BlackItalic.otf
diff --git a/Master/texmf-dist/fonts/opentype/muhafara/overlock/Overlock-Bold.otf b/Master/texmf-dist/fonts/opentype/muhafara/overlock/Overlock-Bold.otf
new file mode 100644
index 00000000000..27b7275a408
--- /dev/null
+++ b/Master/texmf-dist/fonts/opentype/muhafara/overlock/Overlock-Bold.otf
diff --git a/Master/texmf-dist/fonts/opentype/muhafara/overlock/Overlock-BoldItalic.otf b/Master/texmf-dist/fonts/opentype/muhafara/overlock/Overlock-BoldItalic.otf
new file mode 100644
index 00000000000..a8156418320
--- /dev/null
+++ b/Master/texmf-dist/fonts/opentype/muhafara/overlock/Overlock-BoldItalic.otf
diff --git a/Master/texmf-dist/fonts/opentype/muhafara/overlock/Overlock-Italic.otf b/Master/texmf-dist/fonts/opentype/muhafara/overlock/Overlock-Italic.otf
new file mode 100644
index 00000000000..276a244fa82
--- /dev/null
+++ b/Master/texmf-dist/fonts/opentype/muhafara/overlock/Overlock-Italic.otf
diff --git a/Master/texmf-dist/fonts/opentype/muhafara/overlock/Overlock-Regular.otf b/Master/texmf-dist/fonts/opentype/muhafara/overlock/Overlock-Regular.otf
new file mode 100644
index 00000000000..442d4945c8f
--- /dev/null
+++ b/Master/texmf-dist/fonts/opentype/muhafara/overlock/Overlock-Regular.otf
diff --git a/Master/texmf-dist/fonts/opentype/muhafara/overlock/OverlockSC-Regular.otf b/Master/texmf-dist/fonts/opentype/muhafara/overlock/OverlockSC-Regular.otf
new file mode 100644
index 00000000000..fba25e1ac71
--- /dev/null
+++ b/Master/texmf-dist/fonts/opentype/muhafara/overlock/OverlockSC-Regular.otf
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ly1--base.tfm
index af2f256e9e6..c623e976d08 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ly1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ly1--lcdfj.tfm
new file mode 100644
index 00000000000..d241bf275ce
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ly1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ly1.tfm
index 297d7b3f887..9f5a009f770 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ot1--base.tfm
new file mode 100644
index 00000000000..99e397e2627
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ot1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ot1--lcdfj.tfm
new file mode 100644
index 00000000000..d241bf275ce
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ot1--lcdfj.tfm
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 b217e5b9926..8d90ddd410d 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 4c4d4af5f33..8c057f20a13 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--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-t1--lcdfj.tfm
new file mode 100644
index 00000000000..d241bf275ce
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-t1--lcdfj.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 037950eb253..8c804b2c915 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--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ts1--base.tfm
index 48bf9a74520..38c8ba304c2 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-lf-ts1--base.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 6c2304f419d..1a3f41e6988 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-Black-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ly1--base.tfm
new file mode 100644
index 00000000000..26887800a11
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ly1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ly1--lcdfj.tfm
new file mode 100644
index 00000000000..d241bf275ce
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ly1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ly1.tfm
new file mode 100644
index 00000000000..85f7994b247
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ot1--base.tfm
new file mode 100644
index 00000000000..bae70ed9982
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ot1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ot1--lcdfj.tfm
new file mode 100644
index 00000000000..d241bf275ce
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ot1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ot1.tfm
new file mode 100644
index 00000000000..ce0e5988ccb
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-t1--base.tfm
new file mode 100644
index 00000000000..52902807e01
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-t1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-t1--lcdfj.tfm
new file mode 100644
index 00000000000..d241bf275ce
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-t1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-t1.tfm
new file mode 100644
index 00000000000..da2eaaadda8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ts1--base.tfm
new file mode 100644
index 00000000000..38c8ba304c2
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ts1.tfm
new file mode 100644
index 00000000000..1a3f41e6988
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Black-osf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ly1--base.tfm
index 25ea00f5842..25029ba061e 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ly1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ly1--lcdfj.tfm
new file mode 100644
index 00000000000..3a4c64e8ab8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ly1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ly1.tfm
index 8de845dd8ac..e70dfb8eba1 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ot1--base.tfm
new file mode 100644
index 00000000000..c4c0ffe6984
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ot1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ot1--lcdfj.tfm
new file mode 100644
index 00000000000..3a4c64e8ab8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ot1--lcdfj.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 3dc0cac677e..dd6a9a2ad9d 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 2d0fc2b1c2f..43a57c55311 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--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-t1--lcdfj.tfm
new file mode 100644
index 00000000000..3a4c64e8ab8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-t1--lcdfj.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 9d2364ca7e2..23bc48c444d 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--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ts1--base.tfm
index b04d8c712b9..ecce3875995 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-lf-ts1--base.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 f648e468944..3d0b02e26d5 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-BlackItalic-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ly1--base.tfm
new file mode 100644
index 00000000000..346b978c758
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ly1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ly1--lcdfj.tfm
new file mode 100644
index 00000000000..3a4c64e8ab8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ly1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ly1.tfm
new file mode 100644
index 00000000000..e7c329df541
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ot1--base.tfm
new file mode 100644
index 00000000000..c5c2489745b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ot1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ot1--lcdfj.tfm
new file mode 100644
index 00000000000..3a4c64e8ab8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ot1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ot1.tfm
new file mode 100644
index 00000000000..6e3c77e6c16
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-t1--base.tfm
new file mode 100644
index 00000000000..0fe1560eec9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-t1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-t1--lcdfj.tfm
new file mode 100644
index 00000000000..3a4c64e8ab8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-t1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-t1.tfm
new file mode 100644
index 00000000000..02cfbc78ea6
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ts1--base.tfm
new file mode 100644
index 00000000000..ecce3875995
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ts1.tfm
new file mode 100644
index 00000000000..3d0b02e26d5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BlackItalic-osf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ly1--base.tfm
index b2c0cf6496f..793f0454dd9 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ly1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ly1--lcdfj.tfm
new file mode 100644
index 00000000000..5a641176a99
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ly1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ly1.tfm
index fa57790ca81..7cad4987988 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ot1--base.tfm
new file mode 100644
index 00000000000..d1dffaf214f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ot1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ot1--lcdfj.tfm
new file mode 100644
index 00000000000..5a641176a99
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ot1--lcdfj.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 b448794009a..28126972e96 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 d106f268324..53c4f6ee1be 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--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-t1--lcdfj.tfm
new file mode 100644
index 00000000000..5a641176a99
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-t1--lcdfj.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 52601e6918a..546fb017f85 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--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ts1--base.tfm
index 879b0f7d776..927bfc30bbe 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-lf-ts1--base.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 689f32028c0..552255d9032 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-Bold-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ly1--base.tfm
new file mode 100644
index 00000000000..c973603061f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ly1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ly1--lcdfj.tfm
new file mode 100644
index 00000000000..5a641176a99
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ly1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ly1.tfm
new file mode 100644
index 00000000000..d1e44c85ba0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ot1--base.tfm
new file mode 100644
index 00000000000..bbc0b67a08c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ot1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ot1--lcdfj.tfm
new file mode 100644
index 00000000000..5a641176a99
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ot1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ot1.tfm
new file mode 100644
index 00000000000..83485bda374
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-t1--base.tfm
new file mode 100644
index 00000000000..cb31c801fae
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-t1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-t1--lcdfj.tfm
new file mode 100644
index 00000000000..5a641176a99
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-t1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-t1.tfm
new file mode 100644
index 00000000000..65181720034
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ts1--base.tfm
new file mode 100644
index 00000000000..927bfc30bbe
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ts1.tfm
new file mode 100644
index 00000000000..552255d9032
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Bold-osf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ly1--base.tfm
index bcd22893855..f7f169cbf5f 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ly1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ly1--lcdfj.tfm
new file mode 100644
index 00000000000..cb5e69487ce
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ly1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ly1.tfm
index 8bbba361eb8..90df48ede0e 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ot1--base.tfm
new file mode 100644
index 00000000000..0a5b36469b8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ot1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ot1--lcdfj.tfm
new file mode 100644
index 00000000000..cb5e69487ce
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ot1--lcdfj.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 17741fc3b7d..12f5a9b3139 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 9d81bf3242a..75941bb6271 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--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-t1--lcdfj.tfm
new file mode 100644
index 00000000000..cb5e69487ce
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-t1--lcdfj.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 eb08e44c26e..5749366d0a3 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--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ts1--base.tfm
index a1b395db4bf..4d66c3dade3 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-lf-ts1--base.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 caecf9aa7b3..6007918d170 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-BoldItalic-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ly1--base.tfm
new file mode 100644
index 00000000000..fb58b176a4c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ly1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ly1--lcdfj.tfm
new file mode 100644
index 00000000000..cb5e69487ce
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ly1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ly1.tfm
new file mode 100644
index 00000000000..0b63bd32a0e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ot1--base.tfm
new file mode 100644
index 00000000000..e69ac423030
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ot1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ot1--lcdfj.tfm
new file mode 100644
index 00000000000..cb5e69487ce
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ot1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ot1.tfm
new file mode 100644
index 00000000000..9f354ec086f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-t1--base.tfm
new file mode 100644
index 00000000000..a2fe7be6216
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-t1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-t1--lcdfj.tfm
new file mode 100644
index 00000000000..cb5e69487ce
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-t1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-t1.tfm
new file mode 100644
index 00000000000..9311eba19d6
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ts1--base.tfm
new file mode 100644
index 00000000000..4d66c3dade3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ts1.tfm
new file mode 100644
index 00000000000..6007918d170
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-BoldItalic-osf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ly1--base.tfm
index 7e9959e740a..ca84c22b1df 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ly1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ly1--lcdfj.tfm
new file mode 100644
index 00000000000..bc396b80588
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ly1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ly1.tfm
index 7627ffeea75..bb31f8136a2 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ot1--base.tfm
new file mode 100644
index 00000000000..eac0baf7205
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ot1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ot1--lcdfj.tfm
new file mode 100644
index 00000000000..bc396b80588
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ot1--lcdfj.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 07aa70d70d3..6fda76ac7c5 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 1b080994a03..72fb450e12c 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--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-t1--lcdfj.tfm
new file mode 100644
index 00000000000..bc396b80588
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-t1--lcdfj.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 e9aae45d291..50632024ed9 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--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ts1--base.tfm
index 00cf77cb806..78afea0da78 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-lf-ts1--base.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 3e311e96dc0..cfc627b0a6e 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-Italic-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ly1--base.tfm
new file mode 100644
index 00000000000..a8fc7eea74a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ly1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ly1--lcdfj.tfm
new file mode 100644
index 00000000000..bc396b80588
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ly1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ly1.tfm
new file mode 100644
index 00000000000..5d7c025230e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ot1--base.tfm
new file mode 100644
index 00000000000..fd94cfddfd9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ot1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ot1--lcdfj.tfm
new file mode 100644
index 00000000000..bc396b80588
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ot1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ot1.tfm
new file mode 100644
index 00000000000..0838c29f583
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-t1--base.tfm
new file mode 100644
index 00000000000..4cdc7fe8ecd
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-t1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-t1--lcdfj.tfm
new file mode 100644
index 00000000000..bc396b80588
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-t1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-t1.tfm
new file mode 100644
index 00000000000..5006f8bf6b0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ts1--base.tfm
new file mode 100644
index 00000000000..78afea0da78
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ts1.tfm
new file mode 100644
index 00000000000..cfc627b0a6e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Italic-osf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ly1--base.tfm
index db5623489af..a713d1e9cb9 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ly1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ly1--lcdfj.tfm
new file mode 100644
index 00000000000..68f02d3554e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ly1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ly1.tfm
index 300fc4899a6..f6baf78771e 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ot1--base.tfm
new file mode 100644
index 00000000000..f70d0d0c823
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ot1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ot1--lcdfj.tfm
new file mode 100644
index 00000000000..68f02d3554e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ot1--lcdfj.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 40d8f679973..a2d911ff06c 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-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-ly1--base.tfm
new file mode 100644
index 00000000000..80c9ba002b0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-ly1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-ly1--lcdfj.tfm
new file mode 100644
index 00000000000..68f02d3554e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-ly1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-ly1.tfm
new file mode 100644
index 00000000000..f586ed7e99a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-ot1--base.tfm
new file mode 100644
index 00000000000..aed1cf17104
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-ot1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-ot1--lcdfj.tfm
new file mode 100644
index 00000000000..68f02d3554e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-ot1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-ot1.tfm
new file mode 100644
index 00000000000..5d8f228d68d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-t1--base.tfm
new file mode 100644
index 00000000000..835d8be1bfe
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-t1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-t1--lcdfj.tfm
new file mode 100644
index 00000000000..68f02d3554e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-t1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-t1.tfm
new file mode 100644
index 00000000000..260aded028d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-sc-t1.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 dc9bbd3e717..6da7e211abe 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--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-t1--lcdfj.tfm
new file mode 100644
index 00000000000..68f02d3554e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-t1--lcdfj.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 134a94d6eb9..f5359a65c9e 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--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ts1--base.tfm
index d41829c9b00..b78ea6e0967 100644
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-lf-ts1--base.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 7b176e82613..82cbcc28654 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/Overlock-Regular-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ly1--base.tfm
new file mode 100644
index 00000000000..9c9a196aff0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ly1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ly1--lcdfj.tfm
new file mode 100644
index 00000000000..68f02d3554e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ly1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ly1.tfm
new file mode 100644
index 00000000000..967936e4ca5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ot1--base.tfm
new file mode 100644
index 00000000000..1fd9bb91d76
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ot1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ot1--lcdfj.tfm
new file mode 100644
index 00000000000..68f02d3554e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ot1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ot1.tfm
new file mode 100644
index 00000000000..237663eaad2
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-ly1--base.tfm
new file mode 100644
index 00000000000..8ccb5573453
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-ly1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-ly1--lcdfj.tfm
new file mode 100644
index 00000000000..68f02d3554e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-ly1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-ly1.tfm
new file mode 100644
index 00000000000..1267e88775a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-ot1--base.tfm
new file mode 100644
index 00000000000..e1dfccf3766
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-ot1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-ot1--lcdfj.tfm
new file mode 100644
index 00000000000..68f02d3554e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-ot1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-ot1.tfm
new file mode 100644
index 00000000000..a4c7bef6e34
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-t1--base.tfm
new file mode 100644
index 00000000000..f6e82171351
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-t1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-t1--lcdfj.tfm
new file mode 100644
index 00000000000..68f02d3554e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-t1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-t1.tfm
new file mode 100644
index 00000000000..ff193b382b0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-t1--base.tfm
new file mode 100644
index 00000000000..3adcc64a2e6
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-t1--lcdfj.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-t1--lcdfj.tfm
new file mode 100644
index 00000000000..68f02d3554e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-t1--lcdfj.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-t1.tfm
new file mode 100644
index 00000000000..ddf16957221
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ts1--base.tfm
new file mode 100644
index 00000000000..b78ea6e0967
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ts1.tfm
new file mode 100644
index 00000000000..82cbcc28654
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/muhafara/overlock/Overlock-Regular-osf-ts1.tfm
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
deleted file mode 100644
index e54561dc4fa..00000000000
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ly1--base.tfm
+++ /dev/null
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
deleted file mode 100644
index 2f942bd4517..00000000000
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ly1.tfm
+++ /dev/null
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
deleted file mode 100644
index 936976f5282..00000000000
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ot1--base.tfm
+++ /dev/null
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
deleted file mode 100644
index 571e9131bd2..00000000000
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ot1.tfm
+++ /dev/null
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
deleted file mode 100644
index dad3ee63eb9..00000000000
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-t1--base.tfm
+++ /dev/null
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
deleted file mode 100644
index 476c6794a3b..00000000000
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-t1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ts1--base.tfm
deleted file mode 100644
index 7434131baad..00000000000
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ts1--base.tfm
+++ /dev/null
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
deleted file mode 100644
index d7e55a30ef7..00000000000
--- a/Master/texmf-dist/fonts/tfm/muhafara/overlock/OverlockSC-Regular-lf-sc-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/truetype/muhafara/overlock/Overlock-Black.ttf b/Master/texmf-dist/fonts/truetype/muhafara/overlock/Overlock-Black.ttf
deleted file mode 100644
index 08a90feaa90..00000000000
--- a/Master/texmf-dist/fonts/truetype/muhafara/overlock/Overlock-Black.ttf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/truetype/muhafara/overlock/Overlock-BlackItalic.ttf b/Master/texmf-dist/fonts/truetype/muhafara/overlock/Overlock-BlackItalic.ttf
deleted file mode 100644
index 020e7ed4f02..00000000000
--- a/Master/texmf-dist/fonts/truetype/muhafara/overlock/Overlock-BlackItalic.ttf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/truetype/muhafara/overlock/Overlock-Bold.ttf b/Master/texmf-dist/fonts/truetype/muhafara/overlock/Overlock-Bold.ttf
deleted file mode 100644
index 4a144b301f1..00000000000
--- a/Master/texmf-dist/fonts/truetype/muhafara/overlock/Overlock-Bold.ttf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/truetype/muhafara/overlock/Overlock-BoldItalic.ttf b/Master/texmf-dist/fonts/truetype/muhafara/overlock/Overlock-BoldItalic.ttf
deleted file mode 100644
index d60ad93c04c..00000000000
--- a/Master/texmf-dist/fonts/truetype/muhafara/overlock/Overlock-BoldItalic.ttf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/truetype/muhafara/overlock/Overlock-Italic.ttf b/Master/texmf-dist/fonts/truetype/muhafara/overlock/Overlock-Italic.ttf
deleted file mode 100644
index 85ef1ffe374..00000000000
--- a/Master/texmf-dist/fonts/truetype/muhafara/overlock/Overlock-Italic.ttf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/truetype/muhafara/overlock/Overlock-Regular.ttf b/Master/texmf-dist/fonts/truetype/muhafara/overlock/Overlock-Regular.ttf
deleted file mode 100644
index 6d14712be2d..00000000000
--- a/Master/texmf-dist/fonts/truetype/muhafara/overlock/Overlock-Regular.ttf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/truetype/muhafara/overlock/OverlockSC-Regular.ttf b/Master/texmf-dist/fonts/truetype/muhafara/overlock/OverlockSC-Regular.ttf
deleted file mode 100644
index 9328c4637e5..00000000000
--- a/Master/texmf-dist/fonts/truetype/muhafara/overlock/OverlockSC-Regular.ttf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-Black.pfb b/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-Black.pfb
index 117433e0cc5..71ec6bbd1e2 100644
--- a/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-Black.pfb
+++ b/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-Black.pfb
diff --git a/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-BlackItalic.pfb b/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-BlackItalic.pfb
index d8b2ceda7e0..d44226914c0 100644
--- a/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-BlackItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-BlackItalic.pfb
diff --git a/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-Bold.pfb b/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-Bold.pfb
index f4d9d8a7b89..106868df5fa 100644
--- a/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-Bold.pfb
+++ b/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-Bold.pfb
diff --git a/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-BoldItalic.pfb b/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-BoldItalic.pfb
index 5551c7d88c8..35c5bf73648 100644
--- a/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-BoldItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-BoldItalic.pfb
diff --git a/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-Italic.pfb b/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-Italic.pfb
index 2019fd6aa83..73adb3941ac 100644
--- a/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-Italic.pfb
+++ b/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-Italic.pfb
diff --git a/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-Regular.pfb b/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-Regular.pfb
index f30aacdc39b..e3e0f984356 100644
--- a/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-Regular.pfb
+++ b/Master/texmf-dist/fonts/type1/muhafara/overlock/Overlock-Regular.pfb
diff --git a/Master/texmf-dist/fonts/type1/muhafara/overlock/OverlockSC-Regular.pfb b/Master/texmf-dist/fonts/type1/muhafara/overlock/OverlockSC-Regular.pfb
deleted file mode 100644
index 6a5f7eb4947..00000000000
--- a/Master/texmf-dist/fonts/type1/muhafara/overlock/OverlockSC-Regular.pfb
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-lf-ly1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-lf-ly1.vf
index ca20c8abe2f..ed093497cc6 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-lf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-lf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-lf-ot1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-lf-ot1.vf
new file mode 100644
index 00000000000..f5811d83d03
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-lf-ot1.vf
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 9cd2d1c921d..83b8eadc724 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 0f2295311d5..60ee8f1a974 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-Black-osf-ly1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-osf-ly1.vf
new file mode 100644
index 00000000000..7baa42a67c5
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-osf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-osf-ot1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-osf-ot1.vf
new file mode 100644
index 00000000000..258c2e24f1e
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-osf-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-osf-t1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-osf-t1.vf
new file mode 100644
index 00000000000..3d70810f6a5
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-osf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-osf-ts1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-osf-ts1.vf
new file mode 100644
index 00000000000..276985d90d4
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Black-osf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-lf-ly1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-lf-ly1.vf
index 0e5ab55c815..570a9d95632 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-lf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-lf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-lf-ot1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-lf-ot1.vf
new file mode 100644
index 00000000000..5b7f4814a1e
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-lf-ot1.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 29aec5da8d5..4654f109e45 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 36d0d9d8188..e6c12eb3db9 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-BlackItalic-osf-ly1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-osf-ly1.vf
new file mode 100644
index 00000000000..23102bd5827
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-osf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-osf-ot1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-osf-ot1.vf
new file mode 100644
index 00000000000..bc462cee442
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-osf-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-osf-t1.vf
new file mode 100644
index 00000000000..ad2c0ab1f64
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-osf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-osf-ts1.vf
new file mode 100644
index 00000000000..a276cd8f239
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BlackItalic-osf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-lf-ly1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-lf-ly1.vf
index 92709f48344..d2cf619aa22 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-lf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-lf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-lf-ot1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-lf-ot1.vf
new file mode 100644
index 00000000000..73e0c9d61ba
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-lf-ot1.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 480cfbcacd4..ca4c55e0304 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 2832809078f..f4fc3472c35 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-Bold-osf-ly1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-osf-ly1.vf
new file mode 100644
index 00000000000..bb5fa326eec
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-osf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-osf-ot1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-osf-ot1.vf
new file mode 100644
index 00000000000..0272d9eca07
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-osf-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-osf-t1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-osf-t1.vf
new file mode 100644
index 00000000000..f4cb96de2db
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-osf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-osf-ts1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-osf-ts1.vf
new file mode 100644
index 00000000000..715cbc9bc31
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Bold-osf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-lf-ly1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-lf-ly1.vf
index d418caabbf7..5eee9bd2eb0 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-lf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-lf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-lf-ot1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-lf-ot1.vf
new file mode 100644
index 00000000000..56121a7b4c6
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-lf-ot1.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 c89f81a525f..7314c2750d4 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 f66f6a7269e..b267199c39e 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-BoldItalic-osf-ly1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-osf-ly1.vf
new file mode 100644
index 00000000000..20fc790a39b
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-osf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-osf-ot1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-osf-ot1.vf
new file mode 100644
index 00000000000..a29e4bb3a41
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-osf-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-osf-t1.vf
new file mode 100644
index 00000000000..10b698a11cc
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-osf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-osf-ts1.vf
new file mode 100644
index 00000000000..b48e3c06f40
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-BoldItalic-osf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-lf-ly1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-lf-ly1.vf
index d546c69bafd..6dcb640c3b0 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-lf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-lf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-lf-ot1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-lf-ot1.vf
new file mode 100644
index 00000000000..e8dd3f990fe
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-lf-ot1.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 303a338878c..e5f703e68f0 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 a5857aa7c0f..2cf4ee959af 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-Italic-osf-ly1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-osf-ly1.vf
new file mode 100644
index 00000000000..111ce641df4
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-osf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-osf-ot1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-osf-ot1.vf
new file mode 100644
index 00000000000..fed982e6d3b
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-osf-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-osf-t1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-osf-t1.vf
new file mode 100644
index 00000000000..c2c6c77bb89
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-osf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-osf-ts1.vf
new file mode 100644
index 00000000000..c8559f677ef
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Italic-osf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-ly1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-ly1.vf
index af1817f6ffb..dd9792a301b 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-ot1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-ot1.vf
new file mode 100644
index 00000000000..f58e2d593ab
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-sc-ly1.vf
new file mode 100644
index 00000000000..40c41f20d69
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-sc-ot1.vf
new file mode 100644
index 00000000000..a65849ee4be
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-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/Overlock-Regular-lf-sc-t1.vf
index 93ee8dc776a..8464d4dff6a 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-lf-sc-t1.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 b52a1ee9aa5..d8f4a7f1ae8 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 e73cf65ec21..bab387c383c 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/Overlock-Regular-osf-ly1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-osf-ly1.vf
new file mode 100644
index 00000000000..a09e93e6ae7
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-osf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-osf-ot1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-osf-ot1.vf
new file mode 100644
index 00000000000..9e342d492ff
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-osf-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-osf-sc-ly1.vf
index 1cc4bd417b2..72d3ebe76fc 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-osf-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/Overlock-Regular-osf-sc-ot1.vf
index 7b0e9c245b6..ee06ac89844 100644
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-osf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-osf-sc-t1.vf
new file mode 100644
index 00000000000..8921fc20c43
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-osf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-osf-t1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-osf-t1.vf
new file mode 100644
index 00000000000..9241d313383
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-osf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-osf-ts1.vf b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-osf-ts1.vf
new file mode 100644
index 00000000000..694f4da2b4c
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/muhafara/overlock/Overlock-Regular-osf-ts1.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
deleted file mode 100644
index e329671c67f..00000000000
--- a/Master/texmf-dist/fonts/vf/muhafara/overlock/OverlockSC-Regular-lf-sc-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 b236465e96c..f2985700e37 100644
--- a/Master/texmf-dist/tex/latex/overlock/LY1Overlock-LF.fd
+++ b/Master/texmf-dist/tex/latex/overlock/LY1Overlock-LF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/06/08
+%% Generated by autoinst on 2020/07/07
 %%
 \ProvidesFile{LY1Overlock-LF.fd}
-    [2019/06/08 (autoinst)  Font definitions for LY1/Overlock-LF.]
+    [2020/07/07 (autoinst)  Font definitions for LY1/Overlock-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Overlock@scale\endcsname\relax
     \let\Overlock@@scale\@empty
@@ -15,7 +23,7 @@
 %   ----  regular  ----
 
 \DeclareFontShape{LY1}{Overlock-LF}{regular}{sc}{
-      <-> \Overlock@@scale OverlockSC-Regular-lf-sc-ly1
+      <-> \Overlock@@scale Overlock-Regular-lf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{Overlock-LF}{regular}{n}{
@@ -61,55 +69,55 @@
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   m --> regular
 
 \DeclareFontShape{LY1}{Overlock-LF}{m}{sl}{
-      <-> ssub * Overlock-LF/regular/sl
+      <-> alias * Overlock-LF/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{Overlock-LF}{m}{sc}{
-      <-> ssub * Overlock-LF/regular/sc
+      <-> alias * Overlock-LF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{Overlock-LF}{m}{n}{
-      <-> ssub * Overlock-LF/regular/n
+      <-> alias * Overlock-LF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{Overlock-LF}{m}{it}{
-      <-> ssub * Overlock-LF/regular/it
+      <-> alias * Overlock-LF/regular/it
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{LY1}{Overlock-LF}{b}{sl}{
-      <-> ssub * Overlock-LF/bold/sl
+      <-> alias * Overlock-LF/bold/sl
 }{}
 
 \DeclareFontShape{LY1}{Overlock-LF}{b}{n}{
-      <-> ssub * Overlock-LF/bold/n
+      <-> alias * Overlock-LF/bold/n
 }{}
 
 \DeclareFontShape{LY1}{Overlock-LF}{b}{it}{
-      <-> ssub * Overlock-LF/bold/it
+      <-> alias * Overlock-LF/bold/it
 }{}
 
 
 %   eb --> black
 
 \DeclareFontShape{LY1}{Overlock-LF}{eb}{sl}{
-      <-> ssub * Overlock-LF/black/sl
+      <-> alias * Overlock-LF/black/sl
 }{}
 
 \DeclareFontShape{LY1}{Overlock-LF}{eb}{n}{
-      <-> ssub * Overlock-LF/black/n
+      <-> alias * Overlock-LF/black/n
 }{}
 
 \DeclareFontShape{LY1}{Overlock-LF}{eb}{it}{
-      <-> ssub * Overlock-LF/black/it
+      <-> alias * Overlock-LF/black/it
 }{}
 
 \DeclareFontShape{LY1}{Overlock-LF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/overlock/LY1Overlock-OsF.fd b/Master/texmf-dist/tex/latex/overlock/LY1Overlock-OsF.fd
new file mode 100644
index 00000000000..c8f631f5c0d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/overlock/LY1Overlock-OsF.fd
@@ -0,0 +1,135 @@
+%% Generated by autoinst on 2020/07/07
+%%
+\ProvidesFile{LY1Overlock-OsF.fd}
+    [2020/07/07 (autoinst)  Font definitions for LY1/Overlock-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Overlock@scale\endcsname\relax
+    \let\Overlock@@scale\@empty
+\else
+    \edef\Overlock@@scale{s*[\csname Overlock@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{Overlock-OsF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{Overlock-OsF}{regular}{sc}{
+      <-> \Overlock@@scale Overlock-Regular-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Overlock-OsF}{regular}{n}{
+      <-> \Overlock@@scale Overlock-Regular-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Overlock-OsF}{regular}{it}{
+      <-> \Overlock@@scale Overlock-Italic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Overlock-OsF}{regular}{sl}{
+      <-> ssub * Overlock-OsF/regular/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{Overlock-OsF}{black}{n}{
+      <-> \Overlock@@scale Overlock-Black-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Overlock-OsF}{black}{it}{
+      <-> \Overlock@@scale Overlock-BlackItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Overlock-OsF}{black}{sl}{
+      <-> ssub * Overlock-OsF/black/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{Overlock-OsF}{bold}{n}{
+      <-> \Overlock@@scale Overlock-Bold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Overlock-OsF}{bold}{it}{
+      <-> \Overlock@@scale Overlock-BoldItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Overlock-OsF}{bold}{sl}{
+      <-> ssub * Overlock-OsF/bold/it
+}{}
+
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{Overlock-OsF}{m}{sl}{
+      <-> alias * Overlock-OsF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{Overlock-OsF}{m}{sc}{
+      <-> alias * Overlock-OsF/regular/sc
+}{}
+
+\DeclareFontShape{LY1}{Overlock-OsF}{m}{n}{
+      <-> alias * Overlock-OsF/regular/n
+}{}
+
+\DeclareFontShape{LY1}{Overlock-OsF}{m}{it}{
+      <-> alias * Overlock-OsF/regular/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{Overlock-OsF}{b}{sl}{
+      <-> alias * Overlock-OsF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{Overlock-OsF}{b}{n}{
+      <-> alias * Overlock-OsF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{Overlock-OsF}{b}{it}{
+      <-> alias * Overlock-OsF/bold/it
+}{}
+
+
+%   eb --> black
+
+\DeclareFontShape{LY1}{Overlock-OsF}{eb}{sl}{
+      <-> alias * Overlock-OsF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{Overlock-OsF}{eb}{n}{
+      <-> alias * Overlock-OsF/black/n
+}{}
+
+\DeclareFontShape{LY1}{Overlock-OsF}{eb}{it}{
+      <-> alias * Overlock-OsF/black/it
+}{}
+
+\DeclareFontShape{LY1}{Overlock-OsF}{bx}{n}{
+      <-> ssub * Overlock-OsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Overlock-OsF}{bx}{sl}{
+      <-> ssub * Overlock-OsF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{Overlock-OsF}{bx}{it}{
+      <-> ssub * Overlock-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/OT1Overlock-LF.fd b/Master/texmf-dist/tex/latex/overlock/OT1Overlock-LF.fd
index 29aa2d9111e..4f7c72b81fe 100644
--- a/Master/texmf-dist/tex/latex/overlock/OT1Overlock-LF.fd
+++ b/Master/texmf-dist/tex/latex/overlock/OT1Overlock-LF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/06/08
+%% Generated by autoinst on 2020/07/07
 %%
 \ProvidesFile{OT1Overlock-LF.fd}
-    [2019/06/08 (autoinst)  Font definitions for OT1/Overlock-LF.]
+    [2020/07/07 (autoinst)  Font definitions for OT1/Overlock-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Overlock@scale\endcsname\relax
     \let\Overlock@@scale\@empty
@@ -15,7 +23,7 @@
 %   ----  regular  ----
 
 \DeclareFontShape{OT1}{Overlock-LF}{regular}{sc}{
-      <-> \Overlock@@scale OverlockSC-Regular-lf-sc-ot1
+      <-> \Overlock@@scale Overlock-Regular-lf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{Overlock-LF}{regular}{n}{
@@ -61,55 +69,55 @@
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   m --> regular
 
 \DeclareFontShape{OT1}{Overlock-LF}{m}{sl}{
-      <-> ssub * Overlock-LF/regular/sl
+      <-> alias * Overlock-LF/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{Overlock-LF}{m}{sc}{
-      <-> ssub * Overlock-LF/regular/sc
+      <-> alias * Overlock-LF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{Overlock-LF}{m}{n}{
-      <-> ssub * Overlock-LF/regular/n
+      <-> alias * Overlock-LF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{Overlock-LF}{m}{it}{
-      <-> ssub * Overlock-LF/regular/it
+      <-> alias * Overlock-LF/regular/it
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{OT1}{Overlock-LF}{b}{sl}{
-      <-> ssub * Overlock-LF/bold/sl
+      <-> alias * Overlock-LF/bold/sl
 }{}
 
 \DeclareFontShape{OT1}{Overlock-LF}{b}{n}{
-      <-> ssub * Overlock-LF/bold/n
+      <-> alias * Overlock-LF/bold/n
 }{}
 
 \DeclareFontShape{OT1}{Overlock-LF}{b}{it}{
-      <-> ssub * Overlock-LF/bold/it
+      <-> alias * Overlock-LF/bold/it
 }{}
 
 
 %   eb --> black
 
 \DeclareFontShape{OT1}{Overlock-LF}{eb}{sl}{
-      <-> ssub * Overlock-LF/black/sl
+      <-> alias * Overlock-LF/black/sl
 }{}
 
 \DeclareFontShape{OT1}{Overlock-LF}{eb}{n}{
-      <-> ssub * Overlock-LF/black/n
+      <-> alias * Overlock-LF/black/n
 }{}
 
 \DeclareFontShape{OT1}{Overlock-LF}{eb}{it}{
-      <-> ssub * Overlock-LF/black/it
+      <-> alias * Overlock-LF/black/it
 }{}
 
 \DeclareFontShape{OT1}{Overlock-LF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/overlock/OT1Overlock-OsF.fd b/Master/texmf-dist/tex/latex/overlock/OT1Overlock-OsF.fd
new file mode 100644
index 00000000000..41b65d28154
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/overlock/OT1Overlock-OsF.fd
@@ -0,0 +1,135 @@
+%% Generated by autoinst on 2020/07/07
+%%
+\ProvidesFile{OT1Overlock-OsF.fd}
+    [2020/07/07 (autoinst)  Font definitions for OT1/Overlock-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Overlock@scale\endcsname\relax
+    \let\Overlock@@scale\@empty
+\else
+    \edef\Overlock@@scale{s*[\csname Overlock@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{Overlock-OsF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{Overlock-OsF}{regular}{sc}{
+      <-> \Overlock@@scale Overlock-Regular-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Overlock-OsF}{regular}{n}{
+      <-> \Overlock@@scale Overlock-Regular-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Overlock-OsF}{regular}{it}{
+      <-> \Overlock@@scale Overlock-Italic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Overlock-OsF}{regular}{sl}{
+      <-> ssub * Overlock-OsF/regular/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{Overlock-OsF}{black}{n}{
+      <-> \Overlock@@scale Overlock-Black-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Overlock-OsF}{black}{it}{
+      <-> \Overlock@@scale Overlock-BlackItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Overlock-OsF}{black}{sl}{
+      <-> ssub * Overlock-OsF/black/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{Overlock-OsF}{bold}{n}{
+      <-> \Overlock@@scale Overlock-Bold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Overlock-OsF}{bold}{it}{
+      <-> \Overlock@@scale Overlock-BoldItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Overlock-OsF}{bold}{sl}{
+      <-> ssub * Overlock-OsF/bold/it
+}{}
+
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{Overlock-OsF}{m}{sl}{
+      <-> alias * Overlock-OsF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{Overlock-OsF}{m}{sc}{
+      <-> alias * Overlock-OsF/regular/sc
+}{}
+
+\DeclareFontShape{OT1}{Overlock-OsF}{m}{n}{
+      <-> alias * Overlock-OsF/regular/n
+}{}
+
+\DeclareFontShape{OT1}{Overlock-OsF}{m}{it}{
+      <-> alias * Overlock-OsF/regular/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{Overlock-OsF}{b}{sl}{
+      <-> alias * Overlock-OsF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{Overlock-OsF}{b}{n}{
+      <-> alias * Overlock-OsF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{Overlock-OsF}{b}{it}{
+      <-> alias * Overlock-OsF/bold/it
+}{}
+
+
+%   eb --> black
+
+\DeclareFontShape{OT1}{Overlock-OsF}{eb}{sl}{
+      <-> alias * Overlock-OsF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{Overlock-OsF}{eb}{n}{
+      <-> alias * Overlock-OsF/black/n
+}{}
+
+\DeclareFontShape{OT1}{Overlock-OsF}{eb}{it}{
+      <-> alias * Overlock-OsF/black/it
+}{}
+
+\DeclareFontShape{OT1}{Overlock-OsF}{bx}{n}{
+      <-> ssub * Overlock-OsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Overlock-OsF}{bx}{sl}{
+      <-> ssub * Overlock-OsF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{Overlock-OsF}{bx}{it}{
+      <-> ssub * Overlock-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/T1Overlock-LF.fd b/Master/texmf-dist/tex/latex/overlock/T1Overlock-LF.fd
index bc3c7d83791..e581db9c373 100644
--- a/Master/texmf-dist/tex/latex/overlock/T1Overlock-LF.fd
+++ b/Master/texmf-dist/tex/latex/overlock/T1Overlock-LF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/06/08
+%% Generated by autoinst on 2020/07/07
 %%
 \ProvidesFile{T1Overlock-LF.fd}
-    [2019/06/08 (autoinst)  Font definitions for T1/Overlock-LF.]
+    [2020/07/07 (autoinst)  Font definitions for T1/Overlock-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Overlock@scale\endcsname\relax
     \let\Overlock@@scale\@empty
@@ -15,7 +23,7 @@
 %   ----  regular  ----
 
 \DeclareFontShape{T1}{Overlock-LF}{regular}{sc}{
-      <-> \Overlock@@scale OverlockSC-Regular-lf-sc-t1
+      <-> \Overlock@@scale Overlock-Regular-lf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{Overlock-LF}{regular}{n}{
@@ -61,55 +69,55 @@
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   m --> regular
 
 \DeclareFontShape{T1}{Overlock-LF}{m}{sl}{
-      <-> ssub * Overlock-LF/regular/sl
+      <-> alias * Overlock-LF/regular/sl
 }{}
 
 \DeclareFontShape{T1}{Overlock-LF}{m}{sc}{
-      <-> ssub * Overlock-LF/regular/sc
+      <-> alias * Overlock-LF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{Overlock-LF}{m}{n}{
-      <-> ssub * Overlock-LF/regular/n
+      <-> alias * Overlock-LF/regular/n
 }{}
 
 \DeclareFontShape{T1}{Overlock-LF}{m}{it}{
-      <-> ssub * Overlock-LF/regular/it
+      <-> alias * Overlock-LF/regular/it
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{T1}{Overlock-LF}{b}{sl}{
-      <-> ssub * Overlock-LF/bold/sl
+      <-> alias * Overlock-LF/bold/sl
 }{}
 
 \DeclareFontShape{T1}{Overlock-LF}{b}{n}{
-      <-> ssub * Overlock-LF/bold/n
+      <-> alias * Overlock-LF/bold/n
 }{}
 
 \DeclareFontShape{T1}{Overlock-LF}{b}{it}{
-      <-> ssub * Overlock-LF/bold/it
+      <-> alias * Overlock-LF/bold/it
 }{}
 
 
 %   eb --> black
 
 \DeclareFontShape{T1}{Overlock-LF}{eb}{sl}{
-      <-> ssub * Overlock-LF/black/sl
+      <-> alias * Overlock-LF/black/sl
 }{}
 
 \DeclareFontShape{T1}{Overlock-LF}{eb}{n}{
-      <-> ssub * Overlock-LF/black/n
+      <-> alias * Overlock-LF/black/n
 }{}
 
 \DeclareFontShape{T1}{Overlock-LF}{eb}{it}{
-      <-> ssub * Overlock-LF/black/it
+      <-> alias * Overlock-LF/black/it
 }{}
 
 \DeclareFontShape{T1}{Overlock-LF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/overlock/T1Overlock-OsF.fd b/Master/texmf-dist/tex/latex/overlock/T1Overlock-OsF.fd
new file mode 100644
index 00000000000..37a31ce234c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/overlock/T1Overlock-OsF.fd
@@ -0,0 +1,135 @@
+%% Generated by autoinst on 2020/07/07
+%%
+\ProvidesFile{T1Overlock-OsF.fd}
+    [2020/07/07 (autoinst)  Font definitions for T1/Overlock-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Overlock@scale\endcsname\relax
+    \let\Overlock@@scale\@empty
+\else
+    \edef\Overlock@@scale{s*[\csname Overlock@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{Overlock-OsF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{Overlock-OsF}{regular}{sc}{
+      <-> \Overlock@@scale Overlock-Regular-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Overlock-OsF}{regular}{n}{
+      <-> \Overlock@@scale Overlock-Regular-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Overlock-OsF}{regular}{it}{
+      <-> \Overlock@@scale Overlock-Italic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Overlock-OsF}{regular}{sl}{
+      <-> ssub * Overlock-OsF/regular/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{Overlock-OsF}{black}{n}{
+      <-> \Overlock@@scale Overlock-Black-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Overlock-OsF}{black}{it}{
+      <-> \Overlock@@scale Overlock-BlackItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Overlock-OsF}{black}{sl}{
+      <-> ssub * Overlock-OsF/black/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{Overlock-OsF}{bold}{n}{
+      <-> \Overlock@@scale Overlock-Bold-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Overlock-OsF}{bold}{it}{
+      <-> \Overlock@@scale Overlock-BoldItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Overlock-OsF}{bold}{sl}{
+      <-> ssub * Overlock-OsF/bold/it
+}{}
+
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{Overlock-OsF}{m}{sl}{
+      <-> alias * Overlock-OsF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{Overlock-OsF}{m}{sc}{
+      <-> alias * Overlock-OsF/regular/sc
+}{}
+
+\DeclareFontShape{T1}{Overlock-OsF}{m}{n}{
+      <-> alias * Overlock-OsF/regular/n
+}{}
+
+\DeclareFontShape{T1}{Overlock-OsF}{m}{it}{
+      <-> alias * Overlock-OsF/regular/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{Overlock-OsF}{b}{sl}{
+      <-> alias * Overlock-OsF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{Overlock-OsF}{b}{n}{
+      <-> alias * Overlock-OsF/bold/n
+}{}
+
+\DeclareFontShape{T1}{Overlock-OsF}{b}{it}{
+      <-> alias * Overlock-OsF/bold/it
+}{}
+
+
+%   eb --> black
+
+\DeclareFontShape{T1}{Overlock-OsF}{eb}{sl}{
+      <-> alias * Overlock-OsF/black/sl
+}{}
+
+\DeclareFontShape{T1}{Overlock-OsF}{eb}{n}{
+      <-> alias * Overlock-OsF/black/n
+}{}
+
+\DeclareFontShape{T1}{Overlock-OsF}{eb}{it}{
+      <-> alias * Overlock-OsF/black/it
+}{}
+
+\DeclareFontShape{T1}{Overlock-OsF}{bx}{n}{
+      <-> ssub * Overlock-OsF/b/n
+}{}
+
+\DeclareFontShape{T1}{Overlock-OsF}{bx}{sl}{
+      <-> ssub * Overlock-OsF/b/sl
+}{}
+
+\DeclareFontShape{T1}{Overlock-OsF}{bx}{it}{
+      <-> ssub * Overlock-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/TS1Overlock-LF.fd b/Master/texmf-dist/tex/latex/overlock/TS1Overlock-LF.fd
index c7da8c2d86f..8923928dde8 100644
--- a/Master/texmf-dist/tex/latex/overlock/TS1Overlock-LF.fd
+++ b/Master/texmf-dist/tex/latex/overlock/TS1Overlock-LF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/06/08
+%% Generated by autoinst on 2020/07/07
 %%
 \ProvidesFile{TS1Overlock-LF.fd}
-    [2019/06/08 (autoinst)  Font definitions for TS1/Overlock-LF.]
+    [2020/07/07 (autoinst)  Font definitions for TS1/Overlock-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Overlock@scale\endcsname\relax
     \let\Overlock@@scale\@empty
@@ -14,10 +22,6 @@
 
 %   ----  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
 }{}
@@ -61,55 +65,51 @@
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' 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
+      <-> alias * Overlock-LF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{Overlock-LF}{m}{n}{
-      <-> ssub * Overlock-LF/regular/n
+      <-> alias * Overlock-LF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{Overlock-LF}{m}{it}{
-      <-> ssub * Overlock-LF/regular/it
+      <-> alias * Overlock-LF/regular/it
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{TS1}{Overlock-LF}{b}{sl}{
-      <-> ssub * Overlock-LF/bold/sl
+      <-> alias * Overlock-LF/bold/sl
 }{}
 
 \DeclareFontShape{TS1}{Overlock-LF}{b}{n}{
-      <-> ssub * Overlock-LF/bold/n
+      <-> alias * Overlock-LF/bold/n
 }{}
 
 \DeclareFontShape{TS1}{Overlock-LF}{b}{it}{
-      <-> ssub * Overlock-LF/bold/it
+      <-> alias * Overlock-LF/bold/it
 }{}
 
 
 %   eb --> black
 
 \DeclareFontShape{TS1}{Overlock-LF}{eb}{sl}{
-      <-> ssub * Overlock-LF/black/sl
+      <-> alias * Overlock-LF/black/sl
 }{}
 
 \DeclareFontShape{TS1}{Overlock-LF}{eb}{n}{
-      <-> ssub * Overlock-LF/black/n
+      <-> alias * Overlock-LF/black/n
 }{}
 
 \DeclareFontShape{TS1}{Overlock-LF}{eb}{it}{
-      <-> ssub * Overlock-LF/black/it
+      <-> alias * Overlock-LF/black/it
 }{}
 
 \DeclareFontShape{TS1}{Overlock-LF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/overlock/TS1Overlock-OsF.fd b/Master/texmf-dist/tex/latex/overlock/TS1Overlock-OsF.fd
new file mode 100644
index 00000000000..279b24217eb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/overlock/TS1Overlock-OsF.fd
@@ -0,0 +1,127 @@
+%% Generated by autoinst on 2020/07/07
+%%
+\ProvidesFile{TS1Overlock-OsF.fd}
+    [2020/07/07 (autoinst)  Font definitions for TS1/Overlock-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Overlock@scale\endcsname\relax
+    \let\Overlock@@scale\@empty
+\else
+    \edef\Overlock@@scale{s*[\csname Overlock@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{Overlock-OsF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{Overlock-OsF}{regular}{n}{
+      <-> \Overlock@@scale Overlock-Regular-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Overlock-OsF}{regular}{it}{
+      <-> \Overlock@@scale Overlock-Italic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Overlock-OsF}{regular}{sl}{
+      <-> ssub * Overlock-OsF/regular/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{Overlock-OsF}{black}{n}{
+      <-> \Overlock@@scale Overlock-Black-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Overlock-OsF}{black}{it}{
+      <-> \Overlock@@scale Overlock-BlackItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Overlock-OsF}{black}{sl}{
+      <-> ssub * Overlock-OsF/black/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{Overlock-OsF}{bold}{n}{
+      <-> \Overlock@@scale Overlock-Bold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Overlock-OsF}{bold}{it}{
+      <-> \Overlock@@scale Overlock-BoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Overlock-OsF}{bold}{sl}{
+      <-> ssub * Overlock-OsF/bold/it
+}{}
+
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{Overlock-OsF}{m}{sl}{
+      <-> alias * Overlock-OsF/regular/sl
+}{}
+
+\DeclareFontShape{TS1}{Overlock-OsF}{m}{n}{
+      <-> alias * Overlock-OsF/regular/n
+}{}
+
+\DeclareFontShape{TS1}{Overlock-OsF}{m}{it}{
+      <-> alias * Overlock-OsF/regular/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{Overlock-OsF}{b}{sl}{
+      <-> alias * Overlock-OsF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{Overlock-OsF}{b}{n}{
+      <-> alias * Overlock-OsF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{Overlock-OsF}{b}{it}{
+      <-> alias * Overlock-OsF/bold/it
+}{}
+
+
+%   eb --> black
+
+\DeclareFontShape{TS1}{Overlock-OsF}{eb}{sl}{
+      <-> alias * Overlock-OsF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{Overlock-OsF}{eb}{n}{
+      <-> alias * Overlock-OsF/black/n
+}{}
+
+\DeclareFontShape{TS1}{Overlock-OsF}{eb}{it}{
+      <-> alias * Overlock-OsF/black/it
+}{}
+
+\DeclareFontShape{TS1}{Overlock-OsF}{bx}{n}{
+      <-> ssub * Overlock-OsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Overlock-OsF}{bx}{sl}{
+      <-> ssub * Overlock-OsF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{Overlock-OsF}{bx}{it}{
+      <-> ssub * Overlock-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/overlock.sty b/Master/texmf-dist/tex/latex/overlock/overlock.sty
index 622b9a03523..c9c69e3c5be 100644
--- a/Master/texmf-dist/tex/latex/overlock/overlock.sty
+++ b/Master/texmf-dist/tex/latex/overlock/overlock.sty
@@ -1,93 +1,112 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{overlock}
-    [2019/10/15 (Bob Tennent)  Supports Overlock fonts for all LaTeX engines.]
+    [2020/07/07 (Bob Tennent)  Supports Overlock fonts for all LaTeX engines.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
-\newif\ifoverlock@ttf 
+\newif\ifoverlock@otf 
 \ifxetex
-  \overlock@ttftrue
+  \overlock@otftrue
 \else\ifluatex
-  \overlock@ttftrue
+  \overlock@otftrue
 \else  % [pdf]LaTeX
-  \overlock@ttffalse
+  \overlock@otffalse
 \fi\fi
 
 \newif\ifoverlock@default \overlock@defaultfalse
 \newif\ifoverlock@black \overlock@blackfalse
-
+\newif\ifoverlock@lining \overlock@liningtrue
 \newcommand*{\Overlock@scale}{1}
 \DeclareOptionX{scaled}{\renewcommand*{\Overlock@scale}{#1}}
 \DeclareOptionX{scale}{\renewcommand*{\Overlock@scale}{#1}}
 
+\DeclareOptionX{lining}{\overlock@liningtrue}
+\DeclareOptionX{oldstyle}{\overlock@liningfalse}
 \DeclareOptionX{default}{\overlock@defaulttrue}
 \DeclareOptionX{sfdefault}{\overlock@defaulttrue}
-\DeclareOptionX{type1}{\overlock@ttffalse}
+\DeclareOptionX{type1}{\overlock@otffalse}
 \DeclareOptionX{black}{\overlock@blacktrue}
 
 \ProcessOptionsX\relax
 
-\ifoverlock@ttf
+\ifoverlock@otf
   \def\overlock@boldstyle{Bold}
   \ifoverlock@black\def\overlock@boldstyle{Black}\fi
+  \ifoverlock@lining
+    \def\overlock@figurestyle{}
+  \else
+    \def\overlock@figurestyle{OldStyle}
+  \fi
 
 \else % type1
 
   \def\bfseries@sf{b}
-  \ifoverlock@black\def\bfseries@sf{eb}\fi
+  \ifoverlock@black\def\bfseries@sf{k}\fi
+  \ifoverlock@lining
+    \def\overlock@figurestyle{LF}
+  \else
+    \def\overlock@figurestyle{OsF}
+  \fi
+
 \fi
 
-\ifoverlock@ttf
+\ifoverlock@otf
   \RequirePackage{fontspec}
 \else
   \RequirePackage{fontenc,fontaxes,mweights}
 \fi
 
-\ifoverlock@ttf
+\ifoverlock@otf
   \ifxetex\XeTeXtracingfonts=1\fi
   \defaultfontfeatures{
         Ligatures = TeX ,
         Scale     = \Overlock@scale ,
-        Extension = .ttf }
+        Extension = .otf }
   \setsansfont
-      [ UprightFont    = *-Regular ,
+      [ Numbers = {\overlock@figurestyle}, 
+        UprightFont    = *-Regular ,
         ItalicFont     = *-Italic ,
         BoldFont       = *-\overlock@boldstyle , 
-        SmallCapsFont = {OverlockSC-Regular},
         BoldItalicFont = *-\overlock@boldstyle Italic ]
       {Overlock}
   % grab current family in case of subsequent change:
   \let\overlockfamily\sfdefault  
   \newfontfamily\overlock
-      [ UprightFont    = *-Regular ,
+      [ Numbers = {\overlock@figurestyle}, 
+        UprightFont    = *-Regular ,
         ItalicFont     = *-Italic ,
         BoldFont       = *-\overlock@boldstyle , 
-        SmallCapsFont = {OverlockSC-Regular},
         BoldItalicFont = *-\overlock@boldstyle Italic ]
       {Overlock}
   \newfontfamily\overlockBlack
-      [ UprightFont    = *-Black ,
+      [ Numbers = {\overlock@figurestyle},
+        UprightFont    = *-Black ,
         ItalicFont     = *-BlackItalic ,
         BoldFont       = *-Black , 
         BoldItalicFont = *-BlackItalic ]
       {Overlock}
+  \DeclareTextFontCommand{\oldstylenums}{\addfontfeatures{Numbers={OldStyle}}}
+  \DeclareTextFontCommand{\liningnums}{\addfontfeatures{Numbers={Lining}}}
   \def\sffamily{\overlock}
   \ifoverlock@default
     \edef\familydefault{\overlockfamily}
   \fi
 \else % type1
-  \def\overlockfamily{Overlock-LF}
+  \def\overlockfamily{Overlock-\overlock@figurestyle}
   \def\sfdefault{\overlockfamily}
   \def\sffamily{\fontfamily{\overlockfamily}\selectfont}
   \def\overlock{\fontfamily{\overlockfamily}\selectfont}
-  \def\overlockBlack{\fontfamily{\overlockfamily}\fontseries{eb}\selectfont}
+  \def\overlockBlack{\fontfamily{\overlockfamily}\fontseries{black}\selectfont}
   \ifoverlock@default\def\familydefault{\sfdefault}
   \fi
+  \DeclareTextFontCommand{\oldstylenums}{\fontfamily{Overlock-OsF}\selectfont}
+  \DeclareTextFontCommand{\liningnums}{\fontfamily{Overlock-LF}\selectfont}
+
   
 \fi
 
 
-\ifoverlock@ttf
+\ifoverlock@otf
 % turn off defaults in case other fonts are selected:
   \defaultfontfeatures{}
 \fi