summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/overlock
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-08-09 21:28:37 +0000
committerKarl Berry <karl@freefriends.org>2020-08-09 21:28:37 +0000
commitc9737a2ee4cf592045c6adec069daa9a866ef695 (patch)
tree754cb92847c900c5fc221000b08f8a5ea8668c86 /Master/texmf-dist/tex/latex/overlock
parent15b56d29d27d378a7f6b3ee9c8235a76e5f79608 (diff)
overlock (9aug20)
git-svn-id: svn://tug.org/texlive/trunk@56079 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/overlock')
-rw-r--r--Master/texmf-dist/tex/latex/overlock/LY1Overlock-LF.fd135
-rw-r--r--Master/texmf-dist/tex/latex/overlock/LY1Overlock-OsF.fd135
-rw-r--r--Master/texmf-dist/tex/latex/overlock/LY1Ovrlck-LF.fd126
-rw-r--r--Master/texmf-dist/tex/latex/overlock/LY1Ovrlck-OsF.fd126
-rw-r--r--Master/texmf-dist/tex/latex/overlock/OT1Overlock-LF.fd135
-rw-r--r--Master/texmf-dist/tex/latex/overlock/OT1Overlock-OsF.fd135
-rw-r--r--Master/texmf-dist/tex/latex/overlock/OT1Ovrlck-LF.fd126
-rw-r--r--Master/texmf-dist/tex/latex/overlock/OT1Ovrlck-OsF.fd126
-rw-r--r--Master/texmf-dist/tex/latex/overlock/T1Overlock-LF.fd135
-rw-r--r--Master/texmf-dist/tex/latex/overlock/T1Overlock-OsF.fd135
-rw-r--r--Master/texmf-dist/tex/latex/overlock/T1Ovrlck-LF.fd126
-rw-r--r--Master/texmf-dist/tex/latex/overlock/T1Ovrlck-OsF.fd126
-rw-r--r--Master/texmf-dist/tex/latex/overlock/TS1Overlock-LF.fd127
-rw-r--r--Master/texmf-dist/tex/latex/overlock/TS1Overlock-OsF.fd127
-rw-r--r--Master/texmf-dist/tex/latex/overlock/TS1Ovrlck-LF.fd118
-rw-r--r--Master/texmf-dist/tex/latex/overlock/TS1Ovrlck-OsF.fd118
-rw-r--r--Master/texmf-dist/tex/latex/overlock/overlock.sty40
17 files changed, 1012 insertions, 1084 deletions
diff --git a/Master/texmf-dist/tex/latex/overlock/LY1Overlock-LF.fd b/Master/texmf-dist/tex/latex/overlock/LY1Overlock-LF.fd
deleted file mode 100644
index 13b7f191ecc..00000000000
--- a/Master/texmf-dist/tex/latex/overlock/LY1Overlock-LF.fd
+++ /dev/null
@@ -1,135 +0,0 @@
-%% Generated by autoinst on 2020/07/10
-%%
-\ProvidesFile{LY1Overlock-LF.fd}
- [2020/07/10 (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
-\else
- \edef\Overlock@@scale{s*[\csname Overlock@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{Overlock-LF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{LY1}{Overlock-LF}{regular}{sc}{
- <-> \Overlock@@scale Overlock-Regular-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{Overlock-LF}{regular}{n}{
- <-> \Overlock@@scale Overlock-Regular-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Overlock-LF}{regular}{it}{
- <-> \Overlock@@scale Overlock-Italic-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Overlock-LF}{regular}{sl}{
- <-> ssub * Overlock-LF/regular/it
-}{}
-
-
-% ---- black ----
-
-\DeclareFontShape{LY1}{Overlock-LF}{black}{n}{
- <-> \Overlock@@scale Overlock-Black-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Overlock-LF}{black}{it}{
- <-> \Overlock@@scale Overlock-BlackItalic-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Overlock-LF}{black}{sl}{
- <-> ssub * Overlock-LF/black/it
-}{}
-
-
-% ---- bold ----
-
-\DeclareFontShape{LY1}{Overlock-LF}{bold}{n}{
- <-> \Overlock@@scale Overlock-Bold-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Overlock-LF}{bold}{it}{
- <-> \Overlock@@scale Overlock-BoldItalic-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Overlock-LF}{bold}{sl}{
- <-> ssub * Overlock-LF/bold/it
-}{}
-
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-
-% m --> regular
-
-\DeclareFontShape{LY1}{Overlock-LF}{m}{sl}{
- <-> alias * Overlock-LF/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{Overlock-LF}{m}{sc}{
- <-> alias * Overlock-LF/regular/sc
-}{}
-
-\DeclareFontShape{LY1}{Overlock-LF}{m}{n}{
- <-> alias * Overlock-LF/regular/n
-}{}
-
-\DeclareFontShape{LY1}{Overlock-LF}{m}{it}{
- <-> alias * Overlock-LF/regular/it
-}{}
-
-
-% b --> bold
-
-\DeclareFontShape{LY1}{Overlock-LF}{b}{sl}{
- <-> alias * Overlock-LF/bold/sl
-}{}
-
-\DeclareFontShape{LY1}{Overlock-LF}{b}{n}{
- <-> alias * Overlock-LF/bold/n
-}{}
-
-\DeclareFontShape{LY1}{Overlock-LF}{b}{it}{
- <-> alias * Overlock-LF/bold/it
-}{}
-
-
-% eb --> black
-
-\DeclareFontShape{LY1}{Overlock-LF}{eb}{sl}{
- <-> alias * Overlock-LF/black/sl
-}{}
-
-\DeclareFontShape{LY1}{Overlock-LF}{eb}{n}{
- <-> alias * Overlock-LF/black/n
-}{}
-
-\DeclareFontShape{LY1}{Overlock-LF}{eb}{it}{
- <-> alias * Overlock-LF/black/it
-}{}
-
-\DeclareFontShape{LY1}{Overlock-LF}{bx}{n}{
- <-> ssub * Overlock-LF/b/n
-}{}
-
-\DeclareFontShape{LY1}{Overlock-LF}{bx}{sl}{
- <-> ssub * Overlock-LF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{Overlock-LF}{bx}{it}{
- <-> ssub * Overlock-LF/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/LY1Overlock-OsF.fd b/Master/texmf-dist/tex/latex/overlock/LY1Overlock-OsF.fd
deleted file mode 100644
index 14d7ed6a1bb..00000000000
--- a/Master/texmf-dist/tex/latex/overlock/LY1Overlock-OsF.fd
+++ /dev/null
@@ -1,135 +0,0 @@
-%% Generated by autoinst on 2020/07/10
-%%
-\ProvidesFile{LY1Overlock-OsF.fd}
- [2020/07/10 (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/LY1Ovrlck-LF.fd b/Master/texmf-dist/tex/latex/overlock/LY1Ovrlck-LF.fd
new file mode 100644
index 00000000000..699488e4e70
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/overlock/LY1Ovrlck-LF.fd
@@ -0,0 +1,126 @@
+%% Generated by autoinst on 2020/08/09
+%%
+\ProvidesFile{LY1Ovrlck-LF.fd}
+ [2020/08/09 (autoinst) Font definitions for LY1/Ovrlck-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 Ovrlck@scale\endcsname\relax
+ \let\Ovrlck@@scale\@empty
+\else
+ \edef\Ovrlck@@scale{s*[\csname Ovrlck@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{Ovrlck-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{m}{sc}{
+ <-> \Ovrlck@@scale Ovrlck-Regular-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{regular}{sc}{
+ <-> alias * Ovrlck-LF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{m}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Regular-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{regular}{n}{
+ <-> alias * Ovrlck-LF/m/n
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{m}{it}{
+ <-> \Ovrlck@@scale Ovrlck-Italic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{regular}{it}{
+ <-> alias * Ovrlck-LF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{m}{sl}{
+ <-> ssub * Ovrlck-LF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{regular}{sl}{
+ <-> ssub * Ovrlck-LF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{eb}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Black-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{black}{n}{
+ <-> alias * Ovrlck-LF/eb/n
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{eb}{it}{
+ <-> \Ovrlck@@scale Ovrlck-BlackItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{black}{it}{
+ <-> alias * Ovrlck-LF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{eb}{sl}{
+ <-> ssub * Ovrlck-LF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{black}{sl}{
+ <-> ssub * Ovrlck-LF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{b}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Bold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{bold}{n}{
+ <-> alias * Ovrlck-LF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{b}{it}{
+ <-> \Ovrlck@@scale Ovrlck-BoldItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{bold}{it}{
+ <-> alias * Ovrlck-LF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{b}{sl}{
+ <-> ssub * Ovrlck-LF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{bold}{sl}{
+ <-> ssub * Ovrlck-LF/bold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{bx}{n}{
+ <-> ssub * Ovrlck-LF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{bx}{sl}{
+ <-> ssub * Ovrlck-LF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-LF}{bx}{it}{
+ <-> ssub * Ovrlck-LF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/LY1Ovrlck-OsF.fd b/Master/texmf-dist/tex/latex/overlock/LY1Ovrlck-OsF.fd
new file mode 100644
index 00000000000..eec927251fd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/overlock/LY1Ovrlck-OsF.fd
@@ -0,0 +1,126 @@
+%% Generated by autoinst on 2020/08/09
+%%
+\ProvidesFile{LY1Ovrlck-OsF.fd}
+ [2020/08/09 (autoinst) Font definitions for LY1/Ovrlck-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 Ovrlck@scale\endcsname\relax
+ \let\Ovrlck@@scale\@empty
+\else
+ \edef\Ovrlck@@scale{s*[\csname Ovrlck@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{Ovrlck-OsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{m}{sc}{
+ <-> \Ovrlck@@scale Ovrlck-Regular-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{regular}{sc}{
+ <-> alias * Ovrlck-OsF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{m}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Regular-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{regular}{n}{
+ <-> alias * Ovrlck-OsF/m/n
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{m}{it}{
+ <-> \Ovrlck@@scale Ovrlck-Italic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{regular}{it}{
+ <-> alias * Ovrlck-OsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{m}{sl}{
+ <-> ssub * Ovrlck-OsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{regular}{sl}{
+ <-> ssub * Ovrlck-OsF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{eb}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Black-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{black}{n}{
+ <-> alias * Ovrlck-OsF/eb/n
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{eb}{it}{
+ <-> \Ovrlck@@scale Ovrlck-BlackItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{black}{it}{
+ <-> alias * Ovrlck-OsF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{eb}{sl}{
+ <-> ssub * Ovrlck-OsF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{black}{sl}{
+ <-> ssub * Ovrlck-OsF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{b}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Bold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{bold}{n}{
+ <-> alias * Ovrlck-OsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{b}{it}{
+ <-> \Ovrlck@@scale Ovrlck-BoldItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{bold}{it}{
+ <-> alias * Ovrlck-OsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{b}{sl}{
+ <-> ssub * Ovrlck-OsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{bold}{sl}{
+ <-> ssub * Ovrlck-OsF/bold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{bx}{n}{
+ <-> ssub * Ovrlck-OsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{bx}{sl}{
+ <-> ssub * Ovrlck-OsF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{Ovrlck-OsF}{bx}{it}{
+ <-> ssub * Ovrlck-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
deleted file mode 100644
index 9a2adea09d4..00000000000
--- a/Master/texmf-dist/tex/latex/overlock/OT1Overlock-LF.fd
+++ /dev/null
@@ -1,135 +0,0 @@
-%% Generated by autoinst on 2020/07/10
-%%
-\ProvidesFile{OT1Overlock-LF.fd}
- [2020/07/10 (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
-\else
- \edef\Overlock@@scale{s*[\csname Overlock@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{Overlock-LF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{OT1}{Overlock-LF}{regular}{sc}{
- <-> \Overlock@@scale Overlock-Regular-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Overlock-LF}{regular}{n}{
- <-> \Overlock@@scale Overlock-Regular-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Overlock-LF}{regular}{it}{
- <-> \Overlock@@scale Overlock-Italic-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Overlock-LF}{regular}{sl}{
- <-> ssub * Overlock-LF/regular/it
-}{}
-
-
-% ---- black ----
-
-\DeclareFontShape{OT1}{Overlock-LF}{black}{n}{
- <-> \Overlock@@scale Overlock-Black-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Overlock-LF}{black}{it}{
- <-> \Overlock@@scale Overlock-BlackItalic-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Overlock-LF}{black}{sl}{
- <-> ssub * Overlock-LF/black/it
-}{}
-
-
-% ---- bold ----
-
-\DeclareFontShape{OT1}{Overlock-LF}{bold}{n}{
- <-> \Overlock@@scale Overlock-Bold-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Overlock-LF}{bold}{it}{
- <-> \Overlock@@scale Overlock-BoldItalic-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Overlock-LF}{bold}{sl}{
- <-> ssub * Overlock-LF/bold/it
-}{}
-
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-
-% m --> regular
-
-\DeclareFontShape{OT1}{Overlock-LF}{m}{sl}{
- <-> alias * Overlock-LF/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{Overlock-LF}{m}{sc}{
- <-> alias * Overlock-LF/regular/sc
-}{}
-
-\DeclareFontShape{OT1}{Overlock-LF}{m}{n}{
- <-> alias * Overlock-LF/regular/n
-}{}
-
-\DeclareFontShape{OT1}{Overlock-LF}{m}{it}{
- <-> alias * Overlock-LF/regular/it
-}{}
-
-
-% b --> bold
-
-\DeclareFontShape{OT1}{Overlock-LF}{b}{sl}{
- <-> alias * Overlock-LF/bold/sl
-}{}
-
-\DeclareFontShape{OT1}{Overlock-LF}{b}{n}{
- <-> alias * Overlock-LF/bold/n
-}{}
-
-\DeclareFontShape{OT1}{Overlock-LF}{b}{it}{
- <-> alias * Overlock-LF/bold/it
-}{}
-
-
-% eb --> black
-
-\DeclareFontShape{OT1}{Overlock-LF}{eb}{sl}{
- <-> alias * Overlock-LF/black/sl
-}{}
-
-\DeclareFontShape{OT1}{Overlock-LF}{eb}{n}{
- <-> alias * Overlock-LF/black/n
-}{}
-
-\DeclareFontShape{OT1}{Overlock-LF}{eb}{it}{
- <-> alias * Overlock-LF/black/it
-}{}
-
-\DeclareFontShape{OT1}{Overlock-LF}{bx}{n}{
- <-> ssub * Overlock-LF/b/n
-}{}
-
-\DeclareFontShape{OT1}{Overlock-LF}{bx}{sl}{
- <-> ssub * Overlock-LF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{Overlock-LF}{bx}{it}{
- <-> ssub * Overlock-LF/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/OT1Overlock-OsF.fd b/Master/texmf-dist/tex/latex/overlock/OT1Overlock-OsF.fd
deleted file mode 100644
index 840cb201ce9..00000000000
--- a/Master/texmf-dist/tex/latex/overlock/OT1Overlock-OsF.fd
+++ /dev/null
@@ -1,135 +0,0 @@
-%% Generated by autoinst on 2020/07/10
-%%
-\ProvidesFile{OT1Overlock-OsF.fd}
- [2020/07/10 (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/OT1Ovrlck-LF.fd b/Master/texmf-dist/tex/latex/overlock/OT1Ovrlck-LF.fd
new file mode 100644
index 00000000000..5f6b88a53ed
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/overlock/OT1Ovrlck-LF.fd
@@ -0,0 +1,126 @@
+%% Generated by autoinst on 2020/08/09
+%%
+\ProvidesFile{OT1Ovrlck-LF.fd}
+ [2020/08/09 (autoinst) Font definitions for OT1/Ovrlck-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 Ovrlck@scale\endcsname\relax
+ \let\Ovrlck@@scale\@empty
+\else
+ \edef\Ovrlck@@scale{s*[\csname Ovrlck@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{Ovrlck-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{m}{sc}{
+ <-> \Ovrlck@@scale Ovrlck-Regular-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{regular}{sc}{
+ <-> alias * Ovrlck-LF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{m}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Regular-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{regular}{n}{
+ <-> alias * Ovrlck-LF/m/n
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{m}{it}{
+ <-> \Ovrlck@@scale Ovrlck-Italic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{regular}{it}{
+ <-> alias * Ovrlck-LF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{m}{sl}{
+ <-> ssub * Ovrlck-LF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{regular}{sl}{
+ <-> ssub * Ovrlck-LF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{eb}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Black-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{black}{n}{
+ <-> alias * Ovrlck-LF/eb/n
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{eb}{it}{
+ <-> \Ovrlck@@scale Ovrlck-BlackItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{black}{it}{
+ <-> alias * Ovrlck-LF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{eb}{sl}{
+ <-> ssub * Ovrlck-LF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{black}{sl}{
+ <-> ssub * Ovrlck-LF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{b}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Bold-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{bold}{n}{
+ <-> alias * Ovrlck-LF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{b}{it}{
+ <-> \Ovrlck@@scale Ovrlck-BoldItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{bold}{it}{
+ <-> alias * Ovrlck-LF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{b}{sl}{
+ <-> ssub * Ovrlck-LF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{bold}{sl}{
+ <-> ssub * Ovrlck-LF/bold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{bx}{n}{
+ <-> ssub * Ovrlck-LF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{bx}{sl}{
+ <-> ssub * Ovrlck-LF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-LF}{bx}{it}{
+ <-> ssub * Ovrlck-LF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/OT1Ovrlck-OsF.fd b/Master/texmf-dist/tex/latex/overlock/OT1Ovrlck-OsF.fd
new file mode 100644
index 00000000000..210ec686ed4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/overlock/OT1Ovrlck-OsF.fd
@@ -0,0 +1,126 @@
+%% Generated by autoinst on 2020/08/09
+%%
+\ProvidesFile{OT1Ovrlck-OsF.fd}
+ [2020/08/09 (autoinst) Font definitions for OT1/Ovrlck-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 Ovrlck@scale\endcsname\relax
+ \let\Ovrlck@@scale\@empty
+\else
+ \edef\Ovrlck@@scale{s*[\csname Ovrlck@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{Ovrlck-OsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{m}{sc}{
+ <-> \Ovrlck@@scale Ovrlck-Regular-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{regular}{sc}{
+ <-> alias * Ovrlck-OsF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{m}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Regular-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{regular}{n}{
+ <-> alias * Ovrlck-OsF/m/n
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{m}{it}{
+ <-> \Ovrlck@@scale Ovrlck-Italic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{regular}{it}{
+ <-> alias * Ovrlck-OsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{m}{sl}{
+ <-> ssub * Ovrlck-OsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{regular}{sl}{
+ <-> ssub * Ovrlck-OsF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{eb}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Black-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{black}{n}{
+ <-> alias * Ovrlck-OsF/eb/n
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{eb}{it}{
+ <-> \Ovrlck@@scale Ovrlck-BlackItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{black}{it}{
+ <-> alias * Ovrlck-OsF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{eb}{sl}{
+ <-> ssub * Ovrlck-OsF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{black}{sl}{
+ <-> ssub * Ovrlck-OsF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{b}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Bold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{bold}{n}{
+ <-> alias * Ovrlck-OsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{b}{it}{
+ <-> \Ovrlck@@scale Ovrlck-BoldItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{bold}{it}{
+ <-> alias * Ovrlck-OsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{b}{sl}{
+ <-> ssub * Ovrlck-OsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{bold}{sl}{
+ <-> ssub * Ovrlck-OsF/bold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{bx}{n}{
+ <-> ssub * Ovrlck-OsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{bx}{sl}{
+ <-> ssub * Ovrlck-OsF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{Ovrlck-OsF}{bx}{it}{
+ <-> ssub * Ovrlck-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
deleted file mode 100644
index ca3317fbc76..00000000000
--- a/Master/texmf-dist/tex/latex/overlock/T1Overlock-LF.fd
+++ /dev/null
@@ -1,135 +0,0 @@
-%% Generated by autoinst on 2020/07/10
-%%
-\ProvidesFile{T1Overlock-LF.fd}
- [2020/07/10 (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
-\else
- \edef\Overlock@@scale{s*[\csname Overlock@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{Overlock-LF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{T1}{Overlock-LF}{regular}{sc}{
- <-> \Overlock@@scale Overlock-Regular-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{Overlock-LF}{regular}{n}{
- <-> \Overlock@@scale Overlock-Regular-lf-t1
-}{}
-
-\DeclareFontShape{T1}{Overlock-LF}{regular}{it}{
- <-> \Overlock@@scale Overlock-Italic-lf-t1
-}{}
-
-\DeclareFontShape{T1}{Overlock-LF}{regular}{sl}{
- <-> ssub * Overlock-LF/regular/it
-}{}
-
-
-% ---- black ----
-
-\DeclareFontShape{T1}{Overlock-LF}{black}{n}{
- <-> \Overlock@@scale Overlock-Black-lf-t1
-}{}
-
-\DeclareFontShape{T1}{Overlock-LF}{black}{it}{
- <-> \Overlock@@scale Overlock-BlackItalic-lf-t1
-}{}
-
-\DeclareFontShape{T1}{Overlock-LF}{black}{sl}{
- <-> ssub * Overlock-LF/black/it
-}{}
-
-
-% ---- bold ----
-
-\DeclareFontShape{T1}{Overlock-LF}{bold}{n}{
- <-> \Overlock@@scale Overlock-Bold-lf-t1
-}{}
-
-\DeclareFontShape{T1}{Overlock-LF}{bold}{it}{
- <-> \Overlock@@scale Overlock-BoldItalic-lf-t1
-}{}
-
-\DeclareFontShape{T1}{Overlock-LF}{bold}{sl}{
- <-> ssub * Overlock-LF/bold/it
-}{}
-
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-
-% m --> regular
-
-\DeclareFontShape{T1}{Overlock-LF}{m}{sl}{
- <-> alias * Overlock-LF/regular/sl
-}{}
-
-\DeclareFontShape{T1}{Overlock-LF}{m}{sc}{
- <-> alias * Overlock-LF/regular/sc
-}{}
-
-\DeclareFontShape{T1}{Overlock-LF}{m}{n}{
- <-> alias * Overlock-LF/regular/n
-}{}
-
-\DeclareFontShape{T1}{Overlock-LF}{m}{it}{
- <-> alias * Overlock-LF/regular/it
-}{}
-
-
-% b --> bold
-
-\DeclareFontShape{T1}{Overlock-LF}{b}{sl}{
- <-> alias * Overlock-LF/bold/sl
-}{}
-
-\DeclareFontShape{T1}{Overlock-LF}{b}{n}{
- <-> alias * Overlock-LF/bold/n
-}{}
-
-\DeclareFontShape{T1}{Overlock-LF}{b}{it}{
- <-> alias * Overlock-LF/bold/it
-}{}
-
-
-% eb --> black
-
-\DeclareFontShape{T1}{Overlock-LF}{eb}{sl}{
- <-> alias * Overlock-LF/black/sl
-}{}
-
-\DeclareFontShape{T1}{Overlock-LF}{eb}{n}{
- <-> alias * Overlock-LF/black/n
-}{}
-
-\DeclareFontShape{T1}{Overlock-LF}{eb}{it}{
- <-> alias * Overlock-LF/black/it
-}{}
-
-\DeclareFontShape{T1}{Overlock-LF}{bx}{n}{
- <-> ssub * Overlock-LF/b/n
-}{}
-
-\DeclareFontShape{T1}{Overlock-LF}{bx}{sl}{
- <-> ssub * Overlock-LF/b/sl
-}{}
-
-\DeclareFontShape{T1}{Overlock-LF}{bx}{it}{
- <-> ssub * Overlock-LF/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/T1Overlock-OsF.fd b/Master/texmf-dist/tex/latex/overlock/T1Overlock-OsF.fd
deleted file mode 100644
index ef9e39b5152..00000000000
--- a/Master/texmf-dist/tex/latex/overlock/T1Overlock-OsF.fd
+++ /dev/null
@@ -1,135 +0,0 @@
-%% Generated by autoinst on 2020/07/10
-%%
-\ProvidesFile{T1Overlock-OsF.fd}
- [2020/07/10 (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/T1Ovrlck-LF.fd b/Master/texmf-dist/tex/latex/overlock/T1Ovrlck-LF.fd
new file mode 100644
index 00000000000..2a4574a810c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/overlock/T1Ovrlck-LF.fd
@@ -0,0 +1,126 @@
+%% Generated by autoinst on 2020/08/09
+%%
+\ProvidesFile{T1Ovrlck-LF.fd}
+ [2020/08/09 (autoinst) Font definitions for T1/Ovrlck-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 Ovrlck@scale\endcsname\relax
+ \let\Ovrlck@@scale\@empty
+\else
+ \edef\Ovrlck@@scale{s*[\csname Ovrlck@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{Ovrlck-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{Ovrlck-LF}{m}{sc}{
+ <-> \Ovrlck@@scale Ovrlck-Regular-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-LF}{regular}{sc}{
+ <-> alias * Ovrlck-LF/m/sc
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-LF}{m}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Regular-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-LF}{regular}{n}{
+ <-> alias * Ovrlck-LF/m/n
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-LF}{m}{it}{
+ <-> \Ovrlck@@scale Ovrlck-Italic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-LF}{regular}{it}{
+ <-> alias * Ovrlck-LF/m/it
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-LF}{m}{sl}{
+ <-> ssub * Ovrlck-LF/m/it
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-LF}{regular}{sl}{
+ <-> ssub * Ovrlck-LF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{T1}{Ovrlck-LF}{eb}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Black-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-LF}{black}{n}{
+ <-> alias * Ovrlck-LF/eb/n
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-LF}{eb}{it}{
+ <-> \Ovrlck@@scale Ovrlck-BlackItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-LF}{black}{it}{
+ <-> alias * Ovrlck-LF/eb/it
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-LF}{eb}{sl}{
+ <-> ssub * Ovrlck-LF/eb/it
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-LF}{black}{sl}{
+ <-> ssub * Ovrlck-LF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{Ovrlck-LF}{b}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Bold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-LF}{bold}{n}{
+ <-> alias * Ovrlck-LF/b/n
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-LF}{b}{it}{
+ <-> \Ovrlck@@scale Ovrlck-BoldItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-LF}{bold}{it}{
+ <-> alias * Ovrlck-LF/b/it
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-LF}{b}{sl}{
+ <-> ssub * Ovrlck-LF/b/it
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-LF}{bold}{sl}{
+ <-> ssub * Ovrlck-LF/bold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{Ovrlck-LF}{bx}{n}{
+ <-> ssub * Ovrlck-LF/b/n
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-LF}{bx}{sl}{
+ <-> ssub * Ovrlck-LF/b/sl
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-LF}{bx}{it}{
+ <-> ssub * Ovrlck-LF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/T1Ovrlck-OsF.fd b/Master/texmf-dist/tex/latex/overlock/T1Ovrlck-OsF.fd
new file mode 100644
index 00000000000..036a529ba37
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/overlock/T1Ovrlck-OsF.fd
@@ -0,0 +1,126 @@
+%% Generated by autoinst on 2020/08/09
+%%
+\ProvidesFile{T1Ovrlck-OsF.fd}
+ [2020/08/09 (autoinst) Font definitions for T1/Ovrlck-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 Ovrlck@scale\endcsname\relax
+ \let\Ovrlck@@scale\@empty
+\else
+ \edef\Ovrlck@@scale{s*[\csname Ovrlck@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{Ovrlck-OsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{m}{sc}{
+ <-> \Ovrlck@@scale Ovrlck-Regular-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{regular}{sc}{
+ <-> alias * Ovrlck-OsF/m/sc
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{m}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Regular-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{regular}{n}{
+ <-> alias * Ovrlck-OsF/m/n
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{m}{it}{
+ <-> \Ovrlck@@scale Ovrlck-Italic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{regular}{it}{
+ <-> alias * Ovrlck-OsF/m/it
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{m}{sl}{
+ <-> ssub * Ovrlck-OsF/m/it
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{regular}{sl}{
+ <-> ssub * Ovrlck-OsF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{eb}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Black-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{black}{n}{
+ <-> alias * Ovrlck-OsF/eb/n
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{eb}{it}{
+ <-> \Ovrlck@@scale Ovrlck-BlackItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{black}{it}{
+ <-> alias * Ovrlck-OsF/eb/it
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{eb}{sl}{
+ <-> ssub * Ovrlck-OsF/eb/it
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{black}{sl}{
+ <-> ssub * Ovrlck-OsF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{b}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Bold-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{bold}{n}{
+ <-> alias * Ovrlck-OsF/b/n
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{b}{it}{
+ <-> \Ovrlck@@scale Ovrlck-BoldItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{bold}{it}{
+ <-> alias * Ovrlck-OsF/b/it
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{b}{sl}{
+ <-> ssub * Ovrlck-OsF/b/it
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{bold}{sl}{
+ <-> ssub * Ovrlck-OsF/bold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{bx}{n}{
+ <-> ssub * Ovrlck-OsF/b/n
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{bx}{sl}{
+ <-> ssub * Ovrlck-OsF/b/sl
+}{}
+
+\DeclareFontShape{T1}{Ovrlck-OsF}{bx}{it}{
+ <-> ssub * Ovrlck-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
deleted file mode 100644
index d88fc658643..00000000000
--- a/Master/texmf-dist/tex/latex/overlock/TS1Overlock-LF.fd
+++ /dev/null
@@ -1,127 +0,0 @@
-%% Generated by autoinst on 2020/07/10
-%%
-\ProvidesFile{TS1Overlock-LF.fd}
- [2020/07/10 (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
-\else
- \edef\Overlock@@scale{s*[\csname Overlock@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{Overlock-LF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{TS1}{Overlock-LF}{regular}{n}{
- <-> \Overlock@@scale Overlock-Regular-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Overlock-LF}{regular}{it}{
- <-> \Overlock@@scale Overlock-Italic-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Overlock-LF}{regular}{sl}{
- <-> ssub * Overlock-LF/regular/it
-}{}
-
-
-% ---- black ----
-
-\DeclareFontShape{TS1}{Overlock-LF}{black}{n}{
- <-> \Overlock@@scale Overlock-Black-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Overlock-LF}{black}{it}{
- <-> \Overlock@@scale Overlock-BlackItalic-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Overlock-LF}{black}{sl}{
- <-> ssub * Overlock-LF/black/it
-}{}
-
-
-% ---- bold ----
-
-\DeclareFontShape{TS1}{Overlock-LF}{bold}{n}{
- <-> \Overlock@@scale Overlock-Bold-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Overlock-LF}{bold}{it}{
- <-> \Overlock@@scale Overlock-BoldItalic-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Overlock-LF}{bold}{sl}{
- <-> ssub * Overlock-LF/bold/it
-}{}
-
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-
-% m --> regular
-
-\DeclareFontShape{TS1}{Overlock-LF}{m}{sl}{
- <-> alias * Overlock-LF/regular/sl
-}{}
-
-\DeclareFontShape{TS1}{Overlock-LF}{m}{n}{
- <-> alias * Overlock-LF/regular/n
-}{}
-
-\DeclareFontShape{TS1}{Overlock-LF}{m}{it}{
- <-> alias * Overlock-LF/regular/it
-}{}
-
-
-% b --> bold
-
-\DeclareFontShape{TS1}{Overlock-LF}{b}{sl}{
- <-> alias * Overlock-LF/bold/sl
-}{}
-
-\DeclareFontShape{TS1}{Overlock-LF}{b}{n}{
- <-> alias * Overlock-LF/bold/n
-}{}
-
-\DeclareFontShape{TS1}{Overlock-LF}{b}{it}{
- <-> alias * Overlock-LF/bold/it
-}{}
-
-
-% eb --> black
-
-\DeclareFontShape{TS1}{Overlock-LF}{eb}{sl}{
- <-> alias * Overlock-LF/black/sl
-}{}
-
-\DeclareFontShape{TS1}{Overlock-LF}{eb}{n}{
- <-> alias * Overlock-LF/black/n
-}{}
-
-\DeclareFontShape{TS1}{Overlock-LF}{eb}{it}{
- <-> alias * Overlock-LF/black/it
-}{}
-
-\DeclareFontShape{TS1}{Overlock-LF}{bx}{n}{
- <-> ssub * Overlock-LF/b/n
-}{}
-
-\DeclareFontShape{TS1}{Overlock-LF}{bx}{sl}{
- <-> ssub * Overlock-LF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{Overlock-LF}{bx}{it}{
- <-> ssub * Overlock-LF/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/TS1Overlock-OsF.fd b/Master/texmf-dist/tex/latex/overlock/TS1Overlock-OsF.fd
deleted file mode 100644
index bc209e4b59c..00000000000
--- a/Master/texmf-dist/tex/latex/overlock/TS1Overlock-OsF.fd
+++ /dev/null
@@ -1,127 +0,0 @@
-%% Generated by autoinst on 2020/07/10
-%%
-\ProvidesFile{TS1Overlock-OsF.fd}
- [2020/07/10 (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/TS1Ovrlck-LF.fd b/Master/texmf-dist/tex/latex/overlock/TS1Ovrlck-LF.fd
new file mode 100644
index 00000000000..3296b686120
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/overlock/TS1Ovrlck-LF.fd
@@ -0,0 +1,118 @@
+%% Generated by autoinst on 2020/08/09
+%%
+\ProvidesFile{TS1Ovrlck-LF.fd}
+ [2020/08/09 (autoinst) Font definitions for TS1/Ovrlck-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 Ovrlck@scale\endcsname\relax
+ \let\Ovrlck@@scale\@empty
+\else
+ \edef\Ovrlck@@scale{s*[\csname Ovrlck@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{Ovrlck-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{m}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Regular-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{regular}{n}{
+ <-> alias * Ovrlck-LF/m/n
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{m}{it}{
+ <-> \Ovrlck@@scale Ovrlck-Italic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{regular}{it}{
+ <-> alias * Ovrlck-LF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{m}{sl}{
+ <-> ssub * Ovrlck-LF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{regular}{sl}{
+ <-> ssub * Ovrlck-LF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{eb}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Black-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{black}{n}{
+ <-> alias * Ovrlck-LF/eb/n
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{eb}{it}{
+ <-> \Ovrlck@@scale Ovrlck-BlackItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{black}{it}{
+ <-> alias * Ovrlck-LF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{eb}{sl}{
+ <-> ssub * Ovrlck-LF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{black}{sl}{
+ <-> ssub * Ovrlck-LF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{b}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Bold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{bold}{n}{
+ <-> alias * Ovrlck-LF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{b}{it}{
+ <-> \Ovrlck@@scale Ovrlck-BoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{bold}{it}{
+ <-> alias * Ovrlck-LF/b/it
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{b}{sl}{
+ <-> ssub * Ovrlck-LF/b/it
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{bold}{sl}{
+ <-> ssub * Ovrlck-LF/bold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{bx}{n}{
+ <-> ssub * Ovrlck-LF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{bx}{sl}{
+ <-> ssub * Ovrlck-LF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-LF}{bx}{it}{
+ <-> ssub * Ovrlck-LF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/TS1Ovrlck-OsF.fd b/Master/texmf-dist/tex/latex/overlock/TS1Ovrlck-OsF.fd
new file mode 100644
index 00000000000..f21c2c646fe
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/overlock/TS1Ovrlck-OsF.fd
@@ -0,0 +1,118 @@
+%% Generated by autoinst on 2020/08/09
+%%
+\ProvidesFile{TS1Ovrlck-OsF.fd}
+ [2020/08/09 (autoinst) Font definitions for TS1/Ovrlck-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 Ovrlck@scale\endcsname\relax
+ \let\Ovrlck@@scale\@empty
+\else
+ \edef\Ovrlck@@scale{s*[\csname Ovrlck@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{Ovrlck-OsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{m}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Regular-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{regular}{n}{
+ <-> alias * Ovrlck-OsF/m/n
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{m}{it}{
+ <-> \Ovrlck@@scale Ovrlck-Italic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{regular}{it}{
+ <-> alias * Ovrlck-OsF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{m}{sl}{
+ <-> ssub * Ovrlck-OsF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{regular}{sl}{
+ <-> ssub * Ovrlck-OsF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{eb}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Black-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{black}{n}{
+ <-> alias * Ovrlck-OsF/eb/n
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{eb}{it}{
+ <-> \Ovrlck@@scale Ovrlck-BlackItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{black}{it}{
+ <-> alias * Ovrlck-OsF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{eb}{sl}{
+ <-> ssub * Ovrlck-OsF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{black}{sl}{
+ <-> ssub * Ovrlck-OsF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{b}{n}{
+ <-> \Ovrlck@@scale Ovrlck-Bold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{bold}{n}{
+ <-> alias * Ovrlck-OsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{b}{it}{
+ <-> \Ovrlck@@scale Ovrlck-BoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{bold}{it}{
+ <-> alias * Ovrlck-OsF/b/it
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{b}{sl}{
+ <-> ssub * Ovrlck-OsF/b/it
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{bold}{sl}{
+ <-> ssub * Ovrlck-OsF/bold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{bx}{n}{
+ <-> ssub * Ovrlck-OsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{bx}{sl}{
+ <-> ssub * Ovrlck-OsF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{Ovrlck-OsF}{bx}{it}{
+ <-> ssub * Ovrlck-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 5a335c792d5..9c1adc19280 100644
--- a/Master/texmf-dist/tex/latex/overlock/overlock.sty
+++ b/Master/texmf-dist/tex/latex/overlock/overlock.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{overlock}
- [2020/07/10 (Bob Tennent) Supports Overlock fonts for all LaTeX engines.]
+ [2020/08/09 (Bob Tennent) Supports Overlock fonts for all LaTeX engines.]
\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
@@ -16,9 +16,9 @@
\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}}
+\newcommand*{\Ovrlck@scale}{1}
+\DeclareOptionX{scaled}{\renewcommand*{\Ovrlck@scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\Ovrlck@scale}{#1}}
\DeclareOptionX{lining}{\overlock@liningtrue}
\DeclareOptionX{oldstyle}{\overlock@liningfalse}
@@ -60,30 +60,30 @@
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
Ligatures = TeX ,
- Scale = \Overlock@scale ,
+ Scale = \Ovrlck@scale ,
Extension = .otf }
\setsansfont
[ Numbers = {\overlock@figurestyle},
- UprightFont = *-Regular ,
- ItalicFont = *-Italic ,
- BoldFont = *-\overlock@boldstyle ,
- BoldItalicFont = *-\overlock@boldstyle Italic ]
+ UprightFont = *-Regular-OTF ,
+ ItalicFont = *-Italic-OTF ,
+ BoldFont = *-\overlock@boldstyle-OTF,
+ BoldItalicFont = *-\overlock@boldstyle Italic-OTF ]
{Overlock}
% grab current family in case of subsequent change:
\let\overlockfamily\sfdefault
\newfontfamily\overlock
[ Numbers = {\overlock@figurestyle},
- UprightFont = *-Regular ,
- ItalicFont = *-Italic ,
- BoldFont = *-\overlock@boldstyle ,
- BoldItalicFont = *-\overlock@boldstyle Italic ]
+ UprightFont = *-Regular-OTF ,
+ ItalicFont = *-Italic-OTF ,
+ BoldFont = *-\overlock@boldstyle-OTF,
+ BoldItalicFont = *-\overlock@boldstyle Italic-OTF ]
{Overlock}
\newfontfamily\overlockBlack
[ Numbers = {\overlock@figurestyle},
- UprightFont = *-Black ,
- ItalicFont = *-BlackItalic ,
- BoldFont = *-Black ,
- BoldItalicFont = *-BlackItalic ]
+ UprightFont = *-Black-OTF ,
+ ItalicFont = *-BlackItalic-OTF ,
+ BoldFont = *-Black-OTF ,
+ BoldItalicFont = *-BlackItalic-OTF ]
{Overlock}
\DeclareTextFontCommand{\oldstylenums}{\addfontfeatures{Numbers={OldStyle}}}
\DeclareTextFontCommand{\liningnums}{\addfontfeatures{Numbers={Lining}}}
@@ -92,15 +92,15 @@
\edef\familydefault{\overlockfamily}
\fi
\else % type1
- \def\overlockfamily{Overlock-\overlock@figurestyle}
+ \def\overlockfamily{Ovrlck-\overlock@figurestyle}
\def\sfdefault{\overlockfamily}
\def\sffamily{\fontfamily{\overlockfamily}\selectfont}
\def\overlock{\fontfamily{\overlockfamily}\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}
+ \DeclareTextFontCommand{\oldstylenums}{\fontfamily{Ovrlck-OsF}\selectfont}
+ \DeclareTextFontCommand{\liningnums}{\fontfamily{Ovrlck-LF}\selectfont}
\fi