summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/overlock
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-06-02 21:40:32 +0000
committerKarl Berry <karl@freefriends.org>2019-06-02 21:40:32 +0000
commit3e87b140e4207577926d5abc9dd15ff1998d0289 (patch)
treeb3644fdc1a5852ce5b48c1ce052b81dea974961c /Master/texmf-dist/tex/latex/overlock
parent8b7e6be096284c1d03f046240327b8ede4bd5479 (diff)
overlock (2jun19)
git-svn-id: svn://tug.org/texlive/trunk@51294 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.fd97
-rw-r--r--Master/texmf-dist/tex/latex/overlock/LY1OverlockSC-LF.fd18
-rw-r--r--Master/texmf-dist/tex/latex/overlock/OT1Overlock-LF.fd97
-rw-r--r--Master/texmf-dist/tex/latex/overlock/OT1OverlockSC-LF.fd18
-rw-r--r--Master/texmf-dist/tex/latex/overlock/T1Overlock-LF.fd97
-rw-r--r--Master/texmf-dist/tex/latex/overlock/T1OverlockSC-LF.fd18
-rw-r--r--Master/texmf-dist/tex/latex/overlock/TS1Overlock-LF.fd97
-rw-r--r--Master/texmf-dist/tex/latex/overlock/TS1OverlockSC-LF.fd18
-rw-r--r--Master/texmf-dist/tex/latex/overlock/overlock.sty19
9 files changed, 332 insertions, 147 deletions
diff --git a/Master/texmf-dist/tex/latex/overlock/LY1Overlock-LF.fd b/Master/texmf-dist/tex/latex/overlock/LY1Overlock-LF.fd
index e4e2b61beb6..02c230e4880 100644
--- a/Master/texmf-dist/tex/latex/overlock/LY1Overlock-LF.fd
+++ b/Master/texmf-dist/tex/latex/overlock/LY1Overlock-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/05/24
+%% Generated by autoinst on 2019/06/01
%%
\ProvidesFile{LY1Overlock-LF.fd}
- [2014/05/24 (autoinst) Font definitions for LY1/Overlock-LF.]
+ [2019/06/01 (autoinst) Font definitions for LY1/Overlock-LF.]
\expandafter\ifx\csname Overlock@scale\endcsname\relax
\let\Overlock@@scale\@empty
@@ -11,50 +11,115 @@
\DeclareFontFamily{LY1}{Overlock-LF}{}
-\DeclareFontShape{LY1}{Overlock-LF}{k}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{Overlock-LF}{regular}{sc}{
+ <-> \Overlock@@scale OverlockSC-Regular-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Overlock-LF}{regular}{n}{
+ <-> \Overlock@@scale Overlock-Regular-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Overlock-LF}{regular}{it}{
+ <-> \Overlock@@scale Overlock-Italic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Overlock-LF}{regular}{sl}{
+ <-> ssub * Overlock-LF/regular/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{LY1}{Overlock-LF}{black}{n}{
<-> \Overlock@@scale Overlock-Black-lf-ly1
}{}
-\DeclareFontShape{LY1}{Overlock-LF}{k}{it}{
+\DeclareFontShape{LY1}{Overlock-LF}{black}{it}{
<-> \Overlock@@scale Overlock-BlackItalic-lf-ly1
}{}
-\DeclareFontShape{LY1}{Overlock-LF}{k}{sl}{
- <-> ssub * Overlock-LF/k/it
+\DeclareFontShape{LY1}{Overlock-LF}{black}{sl}{
+ <-> ssub * Overlock-LF/black/it
}{}
-\DeclareFontShape{LY1}{Overlock-LF}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{Overlock-LF}{bold}{n}{
<-> \Overlock@@scale Overlock-Bold-lf-ly1
}{}
-\DeclareFontShape{LY1}{Overlock-LF}{b}{it}{
+\DeclareFontShape{LY1}{Overlock-LF}{bold}{it}{
<-> \Overlock@@scale Overlock-BoldItalic-lf-ly1
}{}
-\DeclareFontShape{LY1}{Overlock-LF}{b}{sl}{
- <-> ssub * Overlock-LF/b/it
+\DeclareFontShape{LY1}{Overlock-LF}{bold}{sl}{
+ <-> ssub * Overlock-LF/bold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{LY1}{Overlock-LF}{m}{sl}{
+ <-> ssub * Overlock-LF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{Overlock-LF}{m}{sc}{
+ <-> ssub * Overlock-LF/regular/sc
}{}
\DeclareFontShape{LY1}{Overlock-LF}{m}{n}{
- <-> \Overlock@@scale Overlock-Regular-lf-ly1
+ <-> ssub * Overlock-LF/regular/n
}{}
\DeclareFontShape{LY1}{Overlock-LF}{m}{it}{
- <-> \Overlock@@scale Overlock-Italic-lf-ly1
+ <-> ssub * Overlock-LF/regular/it
}{}
-\DeclareFontShape{LY1}{Overlock-LF}{m}{sl}{
- <-> ssub * Overlock-LF/m/it
+
+% b --> bold
+
+\DeclareFontShape{LY1}{Overlock-LF}{b}{sl}{
+ <-> ssub * Overlock-LF/bold/sl
}{}
-\DeclareFontShape{LY1}{Overlock-LF}{bx}{sl}{
- <-> ssub * Overlock-LF/b/sl
+\DeclareFontShape{LY1}{Overlock-LF}{b}{n}{
+ <-> ssub * Overlock-LF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{Overlock-LF}{b}{it}{
+ <-> ssub * Overlock-LF/bold/it
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{LY1}{Overlock-LF}{eb}{sl}{
+ <-> ssub * Overlock-LF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{Overlock-LF}{eb}{n}{
+ <-> ssub * Overlock-LF/black/n
+}{}
+
+\DeclareFontShape{LY1}{Overlock-LF}{eb}{it}{
+ <-> ssub * Overlock-LF/black/it
}{}
\DeclareFontShape{LY1}{Overlock-LF}{bx}{n}{
<-> ssub * Overlock-LF/b/n
}{}
+\DeclareFontShape{LY1}{Overlock-LF}{bx}{sl}{
+ <-> ssub * Overlock-LF/b/sl
+}{}
+
\DeclareFontShape{LY1}{Overlock-LF}{bx}{it}{
<-> ssub * Overlock-LF/b/it
}{}
diff --git a/Master/texmf-dist/tex/latex/overlock/LY1OverlockSC-LF.fd b/Master/texmf-dist/tex/latex/overlock/LY1OverlockSC-LF.fd
deleted file mode 100644
index dbc183a8b8d..00000000000
--- a/Master/texmf-dist/tex/latex/overlock/LY1OverlockSC-LF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2014/05/24
-%%
-\ProvidesFile{LY1OverlockSC-LF.fd}
- [2014/05/24 (autoinst) Font definitions for LY1/OverlockSC-LF.]
-
-\expandafter\ifx\csname OverlockSC@scale\endcsname\relax
- \let\OverlockSC@@scale\@empty
-\else
- \edef\OverlockSC@@scale{s*[\csname OverlockSC@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{OverlockSC-LF}{}
-
-\DeclareFontShape{LY1}{OverlockSC-LF}{m}{n}{
- <-> \OverlockSC@@scale OverlockSC-Regular-lf-ly1
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/OT1Overlock-LF.fd b/Master/texmf-dist/tex/latex/overlock/OT1Overlock-LF.fd
index 668f2b6ed39..a5907765f0c 100644
--- a/Master/texmf-dist/tex/latex/overlock/OT1Overlock-LF.fd
+++ b/Master/texmf-dist/tex/latex/overlock/OT1Overlock-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/05/24
+%% Generated by autoinst on 2019/06/01
%%
\ProvidesFile{OT1Overlock-LF.fd}
- [2014/05/24 (autoinst) Font definitions for OT1/Overlock-LF.]
+ [2019/06/01 (autoinst) Font definitions for OT1/Overlock-LF.]
\expandafter\ifx\csname Overlock@scale\endcsname\relax
\let\Overlock@@scale\@empty
@@ -11,50 +11,115 @@
\DeclareFontFamily{OT1}{Overlock-LF}{}
-\DeclareFontShape{OT1}{Overlock-LF}{k}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{Overlock-LF}{regular}{sc}{
+ <-> \Overlock@@scale OverlockSC-Regular-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Overlock-LF}{regular}{n}{
+ <-> \Overlock@@scale Overlock-Regular-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Overlock-LF}{regular}{it}{
+ <-> \Overlock@@scale Overlock-Italic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Overlock-LF}{regular}{sl}{
+ <-> ssub * Overlock-LF/regular/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{OT1}{Overlock-LF}{black}{n}{
<-> \Overlock@@scale Overlock-Black-lf-ot1
}{}
-\DeclareFontShape{OT1}{Overlock-LF}{k}{it}{
+\DeclareFontShape{OT1}{Overlock-LF}{black}{it}{
<-> \Overlock@@scale Overlock-BlackItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{Overlock-LF}{k}{sl}{
- <-> ssub * Overlock-LF/k/it
+\DeclareFontShape{OT1}{Overlock-LF}{black}{sl}{
+ <-> ssub * Overlock-LF/black/it
}{}
-\DeclareFontShape{OT1}{Overlock-LF}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{Overlock-LF}{bold}{n}{
<-> \Overlock@@scale Overlock-Bold-lf-ot1
}{}
-\DeclareFontShape{OT1}{Overlock-LF}{b}{it}{
+\DeclareFontShape{OT1}{Overlock-LF}{bold}{it}{
<-> \Overlock@@scale Overlock-BoldItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{Overlock-LF}{b}{sl}{
- <-> ssub * Overlock-LF/b/it
+\DeclareFontShape{OT1}{Overlock-LF}{bold}{sl}{
+ <-> ssub * Overlock-LF/bold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{OT1}{Overlock-LF}{m}{sl}{
+ <-> ssub * Overlock-LF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{Overlock-LF}{m}{sc}{
+ <-> ssub * Overlock-LF/regular/sc
}{}
\DeclareFontShape{OT1}{Overlock-LF}{m}{n}{
- <-> \Overlock@@scale Overlock-Regular-lf-ot1
+ <-> ssub * Overlock-LF/regular/n
}{}
\DeclareFontShape{OT1}{Overlock-LF}{m}{it}{
- <-> \Overlock@@scale Overlock-Italic-lf-ot1
+ <-> ssub * Overlock-LF/regular/it
}{}
-\DeclareFontShape{OT1}{Overlock-LF}{m}{sl}{
- <-> ssub * Overlock-LF/m/it
+
+% b --> bold
+
+\DeclareFontShape{OT1}{Overlock-LF}{b}{sl}{
+ <-> ssub * Overlock-LF/bold/sl
}{}
-\DeclareFontShape{OT1}{Overlock-LF}{bx}{sl}{
- <-> ssub * Overlock-LF/b/sl
+\DeclareFontShape{OT1}{Overlock-LF}{b}{n}{
+ <-> ssub * Overlock-LF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{Overlock-LF}{b}{it}{
+ <-> ssub * Overlock-LF/bold/it
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{OT1}{Overlock-LF}{eb}{sl}{
+ <-> ssub * Overlock-LF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{Overlock-LF}{eb}{n}{
+ <-> ssub * Overlock-LF/black/n
+}{}
+
+\DeclareFontShape{OT1}{Overlock-LF}{eb}{it}{
+ <-> ssub * Overlock-LF/black/it
}{}
\DeclareFontShape{OT1}{Overlock-LF}{bx}{n}{
<-> ssub * Overlock-LF/b/n
}{}
+\DeclareFontShape{OT1}{Overlock-LF}{bx}{sl}{
+ <-> ssub * Overlock-LF/b/sl
+}{}
+
\DeclareFontShape{OT1}{Overlock-LF}{bx}{it}{
<-> ssub * Overlock-LF/b/it
}{}
diff --git a/Master/texmf-dist/tex/latex/overlock/OT1OverlockSC-LF.fd b/Master/texmf-dist/tex/latex/overlock/OT1OverlockSC-LF.fd
deleted file mode 100644
index b19e955a15f..00000000000
--- a/Master/texmf-dist/tex/latex/overlock/OT1OverlockSC-LF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2014/05/24
-%%
-\ProvidesFile{OT1OverlockSC-LF.fd}
- [2014/05/24 (autoinst) Font definitions for OT1/OverlockSC-LF.]
-
-\expandafter\ifx\csname OverlockSC@scale\endcsname\relax
- \let\OverlockSC@@scale\@empty
-\else
- \edef\OverlockSC@@scale{s*[\csname OverlockSC@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{OverlockSC-LF}{}
-
-\DeclareFontShape{OT1}{OverlockSC-LF}{m}{n}{
- <-> \OverlockSC@@scale OverlockSC-Regular-lf-ot1
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/T1Overlock-LF.fd b/Master/texmf-dist/tex/latex/overlock/T1Overlock-LF.fd
index 790120fa3c8..1d74bdb950d 100644
--- a/Master/texmf-dist/tex/latex/overlock/T1Overlock-LF.fd
+++ b/Master/texmf-dist/tex/latex/overlock/T1Overlock-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/05/24
+%% Generated by autoinst on 2019/06/01
%%
\ProvidesFile{T1Overlock-LF.fd}
- [2014/05/24 (autoinst) Font definitions for T1/Overlock-LF.]
+ [2019/06/01 (autoinst) Font definitions for T1/Overlock-LF.]
\expandafter\ifx\csname Overlock@scale\endcsname\relax
\let\Overlock@@scale\@empty
@@ -11,50 +11,115 @@
\DeclareFontFamily{T1}{Overlock-LF}{}
-\DeclareFontShape{T1}{Overlock-LF}{k}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{Overlock-LF}{regular}{sc}{
+ <-> \Overlock@@scale OverlockSC-Regular-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Overlock-LF}{regular}{n}{
+ <-> \Overlock@@scale Overlock-Regular-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Overlock-LF}{regular}{it}{
+ <-> \Overlock@@scale Overlock-Italic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Overlock-LF}{regular}{sl}{
+ <-> ssub * Overlock-LF/regular/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{T1}{Overlock-LF}{black}{n}{
<-> \Overlock@@scale Overlock-Black-lf-t1
}{}
-\DeclareFontShape{T1}{Overlock-LF}{k}{it}{
+\DeclareFontShape{T1}{Overlock-LF}{black}{it}{
<-> \Overlock@@scale Overlock-BlackItalic-lf-t1
}{}
-\DeclareFontShape{T1}{Overlock-LF}{k}{sl}{
- <-> ssub * Overlock-LF/k/it
+\DeclareFontShape{T1}{Overlock-LF}{black}{sl}{
+ <-> ssub * Overlock-LF/black/it
}{}
-\DeclareFontShape{T1}{Overlock-LF}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{Overlock-LF}{bold}{n}{
<-> \Overlock@@scale Overlock-Bold-lf-t1
}{}
-\DeclareFontShape{T1}{Overlock-LF}{b}{it}{
+\DeclareFontShape{T1}{Overlock-LF}{bold}{it}{
<-> \Overlock@@scale Overlock-BoldItalic-lf-t1
}{}
-\DeclareFontShape{T1}{Overlock-LF}{b}{sl}{
- <-> ssub * Overlock-LF/b/it
+\DeclareFontShape{T1}{Overlock-LF}{bold}{sl}{
+ <-> ssub * Overlock-LF/bold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{T1}{Overlock-LF}{m}{sl}{
+ <-> ssub * Overlock-LF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{Overlock-LF}{m}{sc}{
+ <-> ssub * Overlock-LF/regular/sc
}{}
\DeclareFontShape{T1}{Overlock-LF}{m}{n}{
- <-> \Overlock@@scale Overlock-Regular-lf-t1
+ <-> ssub * Overlock-LF/regular/n
}{}
\DeclareFontShape{T1}{Overlock-LF}{m}{it}{
- <-> \Overlock@@scale Overlock-Italic-lf-t1
+ <-> ssub * Overlock-LF/regular/it
}{}
-\DeclareFontShape{T1}{Overlock-LF}{m}{sl}{
- <-> ssub * Overlock-LF/m/it
+
+% b --> bold
+
+\DeclareFontShape{T1}{Overlock-LF}{b}{sl}{
+ <-> ssub * Overlock-LF/bold/sl
}{}
-\DeclareFontShape{T1}{Overlock-LF}{bx}{sl}{
- <-> ssub * Overlock-LF/b/sl
+\DeclareFontShape{T1}{Overlock-LF}{b}{n}{
+ <-> ssub * Overlock-LF/bold/n
+}{}
+
+\DeclareFontShape{T1}{Overlock-LF}{b}{it}{
+ <-> ssub * Overlock-LF/bold/it
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{T1}{Overlock-LF}{eb}{sl}{
+ <-> ssub * Overlock-LF/black/sl
+}{}
+
+\DeclareFontShape{T1}{Overlock-LF}{eb}{n}{
+ <-> ssub * Overlock-LF/black/n
+}{}
+
+\DeclareFontShape{T1}{Overlock-LF}{eb}{it}{
+ <-> ssub * Overlock-LF/black/it
}{}
\DeclareFontShape{T1}{Overlock-LF}{bx}{n}{
<-> ssub * Overlock-LF/b/n
}{}
+\DeclareFontShape{T1}{Overlock-LF}{bx}{sl}{
+ <-> ssub * Overlock-LF/b/sl
+}{}
+
\DeclareFontShape{T1}{Overlock-LF}{bx}{it}{
<-> ssub * Overlock-LF/b/it
}{}
diff --git a/Master/texmf-dist/tex/latex/overlock/T1OverlockSC-LF.fd b/Master/texmf-dist/tex/latex/overlock/T1OverlockSC-LF.fd
deleted file mode 100644
index 415a5a4a034..00000000000
--- a/Master/texmf-dist/tex/latex/overlock/T1OverlockSC-LF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2014/05/24
-%%
-\ProvidesFile{T1OverlockSC-LF.fd}
- [2014/05/24 (autoinst) Font definitions for T1/OverlockSC-LF.]
-
-\expandafter\ifx\csname OverlockSC@scale\endcsname\relax
- \let\OverlockSC@@scale\@empty
-\else
- \edef\OverlockSC@@scale{s*[\csname OverlockSC@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{OverlockSC-LF}{}
-
-\DeclareFontShape{T1}{OverlockSC-LF}{m}{n}{
- <-> \OverlockSC@@scale OverlockSC-Regular-lf-t1
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/TS1Overlock-LF.fd b/Master/texmf-dist/tex/latex/overlock/TS1Overlock-LF.fd
index 659bcddc7da..4e9cde22594 100644
--- a/Master/texmf-dist/tex/latex/overlock/TS1Overlock-LF.fd
+++ b/Master/texmf-dist/tex/latex/overlock/TS1Overlock-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/05/24
+%% Generated by autoinst on 2019/06/01
%%
\ProvidesFile{TS1Overlock-LF.fd}
- [2014/05/24 (autoinst) Font definitions for TS1/Overlock-LF.]
+ [2019/06/01 (autoinst) Font definitions for TS1/Overlock-LF.]
\expandafter\ifx\csname Overlock@scale\endcsname\relax
\let\Overlock@@scale\@empty
@@ -11,50 +11,115 @@
\DeclareFontFamily{TS1}{Overlock-LF}{}
-\DeclareFontShape{TS1}{Overlock-LF}{k}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{TS1}{Overlock-LF}{regular}{sc}{
+ <-> \Overlock@@scale OverlockSC-Regular-lf-sc-ts1
+}{}
+
+\DeclareFontShape{TS1}{Overlock-LF}{regular}{n}{
+ <-> \Overlock@@scale Overlock-Regular-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Overlock-LF}{regular}{it}{
+ <-> \Overlock@@scale Overlock-Italic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Overlock-LF}{regular}{sl}{
+ <-> ssub * Overlock-LF/regular/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{TS1}{Overlock-LF}{black}{n}{
<-> \Overlock@@scale Overlock-Black-lf-ts1
}{}
-\DeclareFontShape{TS1}{Overlock-LF}{k}{it}{
+\DeclareFontShape{TS1}{Overlock-LF}{black}{it}{
<-> \Overlock@@scale Overlock-BlackItalic-lf-ts1
}{}
-\DeclareFontShape{TS1}{Overlock-LF}{k}{sl}{
- <-> ssub * Overlock-LF/k/it
+\DeclareFontShape{TS1}{Overlock-LF}{black}{sl}{
+ <-> ssub * Overlock-LF/black/it
}{}
-\DeclareFontShape{TS1}{Overlock-LF}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{TS1}{Overlock-LF}{bold}{n}{
<-> \Overlock@@scale Overlock-Bold-lf-ts1
}{}
-\DeclareFontShape{TS1}{Overlock-LF}{b}{it}{
+\DeclareFontShape{TS1}{Overlock-LF}{bold}{it}{
<-> \Overlock@@scale Overlock-BoldItalic-lf-ts1
}{}
-\DeclareFontShape{TS1}{Overlock-LF}{b}{sl}{
- <-> ssub * Overlock-LF/b/it
+\DeclareFontShape{TS1}{Overlock-LF}{bold}{sl}{
+ <-> ssub * Overlock-LF/bold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{TS1}{Overlock-LF}{m}{sl}{
+ <-> ssub * Overlock-LF/regular/sl
+}{}
+
+\DeclareFontShape{TS1}{Overlock-LF}{m}{sc}{
+ <-> ssub * Overlock-LF/regular/sc
}{}
\DeclareFontShape{TS1}{Overlock-LF}{m}{n}{
- <-> \Overlock@@scale Overlock-Regular-lf-ts1
+ <-> ssub * Overlock-LF/regular/n
}{}
\DeclareFontShape{TS1}{Overlock-LF}{m}{it}{
- <-> \Overlock@@scale Overlock-Italic-lf-ts1
+ <-> ssub * Overlock-LF/regular/it
}{}
-\DeclareFontShape{TS1}{Overlock-LF}{m}{sl}{
- <-> ssub * Overlock-LF/m/it
+
+% b --> bold
+
+\DeclareFontShape{TS1}{Overlock-LF}{b}{sl}{
+ <-> ssub * Overlock-LF/bold/sl
}{}
-\DeclareFontShape{TS1}{Overlock-LF}{bx}{sl}{
- <-> ssub * Overlock-LF/b/sl
+\DeclareFontShape{TS1}{Overlock-LF}{b}{n}{
+ <-> ssub * Overlock-LF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{Overlock-LF}{b}{it}{
+ <-> ssub * Overlock-LF/bold/it
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{TS1}{Overlock-LF}{eb}{sl}{
+ <-> ssub * Overlock-LF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{Overlock-LF}{eb}{n}{
+ <-> ssub * Overlock-LF/black/n
+}{}
+
+\DeclareFontShape{TS1}{Overlock-LF}{eb}{it}{
+ <-> ssub * Overlock-LF/black/it
}{}
\DeclareFontShape{TS1}{Overlock-LF}{bx}{n}{
<-> ssub * Overlock-LF/b/n
}{}
+\DeclareFontShape{TS1}{Overlock-LF}{bx}{sl}{
+ <-> ssub * Overlock-LF/b/sl
+}{}
+
\DeclareFontShape{TS1}{Overlock-LF}{bx}{it}{
<-> ssub * Overlock-LF/b/it
}{}
diff --git a/Master/texmf-dist/tex/latex/overlock/TS1OverlockSC-LF.fd b/Master/texmf-dist/tex/latex/overlock/TS1OverlockSC-LF.fd
deleted file mode 100644
index 11358c0ce64..00000000000
--- a/Master/texmf-dist/tex/latex/overlock/TS1OverlockSC-LF.fd
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Generated by autoinst on 2014/05/24
-%%
-\ProvidesFile{TS1OverlockSC-LF.fd}
- [2014/05/24 (autoinst) Font definitions for TS1/OverlockSC-LF.]
-
-\expandafter\ifx\csname OverlockSC@scale\endcsname\relax
- \let\OverlockSC@@scale\@empty
-\else
- \edef\OverlockSC@@scale{s*[\csname OverlockSC@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{OverlockSC-LF}{}
-
-\DeclareFontShape{TS1}{OverlockSC-LF}{m}{n}{
- <-> \OverlockSC@@scale OverlockSC-Regular-lf-ts1
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/overlock/overlock.sty b/Master/texmf-dist/tex/latex/overlock/overlock.sty
index ca74de2005b..307c1c16018 100644
--- a/Master/texmf-dist/tex/latex/overlock/overlock.sty
+++ b/Master/texmf-dist/tex/latex/overlock/overlock.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{overlock}
- [2014/05/25 (Bob Tennent) Supports Overlock fonts for all LaTeX engines.]
+ [2019/06/01 (Bob Tennent) Supports Overlock fonts for all LaTeX engines.]
\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
@@ -53,6 +53,7 @@
[ UprightFont = *-Regular ,
ItalicFont = *-Italic ,
BoldFont = *-\overlock@boldstyle ,
+ SmallCapsFont = {OverlockSC-Regular},
BoldItalicFont = *-\overlock@boldstyle Italic ]
{Overlock}
% grab current family in case of subsequent change:
@@ -61,6 +62,7 @@
[ UprightFont = *-Regular ,
ItalicFont = *-Italic ,
BoldFont = *-\overlock@boldstyle ,
+ SmallCapsFont = {OverlockSC-Regular},
BoldItalicFont = *-\overlock@boldstyle Italic ]
{Overlock}
\newfontfamily\overlockBlack
@@ -69,22 +71,17 @@
BoldFont = *-Black ,
BoldItalicFont = *-BlackItalic ]
{Overlock}
- \newfontface\overlocksc{OverlockSC-Regular}
- \def\sffamily{\overlock\def\scshape{\overlocksc}}
+ \def\sffamily{\overlock}
\ifoverlock@default
\edef\familydefault{\overlockfamily}
- \def\scshape{\overlocksc}
\fi
\else % type1
\def\overlockfamily{Overlock-LF}
- \def\overlockscfamily{OverlockSC-LF}
\def\sfdefault{\overlockfamily}
- \def\sffamily{\fontfamily{\overlockfamily}\selectfont\def\scshape{\fontfamily{\overlockscfamily}\selectfont}}
- \def\overlock{\fontfamily{\overlockfamily}\selectfont\def\scshape{\fontfamily{\overlockscfamily}\selectfont}}
- \def\overlockBlack{\fontfamily{\overlockfamily}\fontseries{k}\selectfont\def\scshape{\fontfamily{\overlockscfamily}\selectfont}}
- \ifoverlock@default
- \def\familydefault{\sfdefault}
- \renewcommand\scshape{\fontfamily{\overlockscfamily}\selectfont}
+ \def\sffamily{\fontfamily{\overlockfamily}\selectfont}
+ \def\overlock{\fontfamily{\overlockfamily}\selectfont}
+ \def\overlockBlack{\fontfamily{\overlockfamily}\fontseries{black}\selectfont}
+ \ifoverlock@default\def\familydefault{\sfdefault}
\fi
\fi