diff options
author | Karl Berry <karl@freefriends.org> | 2020-07-09 22:31:58 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-07-09 22:31:58 +0000 |
commit | 1efae57dfac93679c71c3be5a5257e1bb4e2985a (patch) | |
tree | 98f8098547d5a605bb534647c9117ef82ddb1012 /Master/texmf-dist/tex | |
parent | 64073b64339848e2a92b41d66c3417e6beeb5146 (diff) |
overlock (10jul20)
git-svn-id: svn://tug.org/texlive/trunk@55791 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
9 files changed, 657 insertions, 82 deletions
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 |