From 83d30a92b6960fc30543a4d0aef9ae396460f4d8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 4 May 2020 21:15:09 +0000 Subject: etbb (4may20) git-svn-id: svn://tug.org/texlive/trunk@55005 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/etbb/ETbb.fontspec | 8 ++ Master/texmf-dist/tex/latex/etbb/ETbb.sty | 11 ++- Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd | 32 +++---- Master/texmf-dist/tex/latex/etbb/LY1ETbb-LF.fd | 96 ++++++++++---------- Master/texmf-dist/tex/latex/etbb/LY1ETbb-OsF.fd | 96 ++++++++++---------- Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd | 52 +++++------ Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd | 80 ++++++++--------- Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd | 108 +++++++++++------------ Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd | 52 +++++------ Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd | 96 ++++++++++---------- Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd | 92 +++++++++---------- Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd | 44 ++++----- Master/texmf-dist/tex/latex/etbb/OT1ETbb-TLF.fd | 86 +++++++++--------- Master/texmf-dist/tex/latex/etbb/OT1ETbb-TOsF.fd | 104 +++++++++++----------- Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd | 56 ++++++------ Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd | 32 +++---- Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd | 36 ++++---- Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd | 28 +++--- Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd | 52 +++++------ Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd | 28 +++--- Master/texmf-dist/tex/latex/etbb/etbb.fontspec | 8 -- 21 files changed, 600 insertions(+), 597 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/etbb/ETbb.fontspec delete mode 100644 Master/texmf-dist/tex/latex/etbb/etbb.fontspec (limited to 'Master/texmf-dist/tex/latex/etbb') diff --git a/Master/texmf-dist/tex/latex/etbb/ETbb.fontspec b/Master/texmf-dist/tex/latex/etbb/ETbb.fontspec new file mode 100644 index 00000000000..789f3d3c27c --- /dev/null +++ b/Master/texmf-dist/tex/latex/etbb/ETbb.fontspec @@ -0,0 +1,8 @@ +\defaultfontfeatures[ETbb] + { + Extension = .otf , + UprightFont = ETbb-Regular , + BoldFont = ETbb-Bold , + ItalicFont = ETbb-Italic , + BoldItalicFont = ETbb-BoldItalic , + } diff --git a/Master/texmf-dist/tex/latex/etbb/ETbb.sty b/Master/texmf-dist/tex/latex/etbb/ETbb.sty index 0c85885eaaf..d08e27032bd 100644 --- a/Master/texmf-dist/tex/latex/etbb/ETbb.sty +++ b/Master/texmf-dist/tex/latex/etbb/ETbb.sty @@ -1,9 +1,9 @@ %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{1.00} -\def\filedate{2020/02/14} -\ProvidesPackage{etbb} - [\filedate\space v\fileversion. Style file for etbb.] +\def\fileversion{1.01} +\def\filedate{2020/05/03} +\ProvidesPackage{ETbb} + [\filedate\space v\fileversion. Style file for ETbb.] \RequirePackage[T1,LY1]{fontenc} \RequirePackage[full]{textcomp} @@ -60,7 +60,10 @@ \DeclareOptionX{altP}{} \DeclareOptionX{lining}{\edef\ETbb@figurestyle{LF}} +\DeclareOptionX{lf}{\edef\ETbb@figurestyle{LF}} \DeclareOptionX{oldstyle}{\useosf} +\DeclareOptionX{osf}{\useosf} +\DeclareOptionX{useosf}{\useosf} \DeclareOptionX{tabular}{\edef\ETbb@figurealign{T}} \DeclareOptionX{t}{\edef\ETbb@figurealign{T}} \DeclareOptionX{proportional}{\useproportional} diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd index aa40612e29d..c28d1a36944 100644 --- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd +++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/02/17 +%% Generated by autoinst on 2020/05/03 %% \ProvidesFile{LY1ETbb-Inf.fd} - [2020/02/17 (autoinst) Font definitions for LY1/ETbb-Inf.] + [2020/05/03 (autoinst) Font definitions for LY1/ETbb-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,33 +20,33 @@ \DeclareFontFamily{LY1}{ETbb-Inf}{} -% ---- regular ---- +% ---- bold ---- -\DeclareFontShape{LY1}{ETbb-Inf}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-inf-ly1 +\DeclareFontShape{LY1}{ETbb-Inf}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Inf}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-inf-ly1 +\DeclareFontShape{LY1}{ETbb-Inf}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-inf-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Inf}{regular}{sl}{ - <-> ssub * ETbb-Inf/regular/it +\DeclareFontShape{LY1}{ETbb-Inf}{bold}{sl}{ + <-> ssub * ETbb-Inf/bold/it }{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{LY1}{ETbb-Inf}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-inf-ly1 +\DeclareFontShape{LY1}{ETbb-Inf}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-inf-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Inf}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-inf-ly1 +\DeclareFontShape{LY1}{ETbb-Inf}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-inf-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Inf}{bold}{sl}{ - <-> ssub * ETbb-Inf/bold/it +\DeclareFontShape{LY1}{ETbb-Inf}{regular}{sl}{ + <-> ssub * ETbb-Inf/regular/it }{} % diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-LF.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-LF.fd index fa8ac664f95..4741690b3f5 100644 --- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-LF.fd +++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/02/17 +%% Generated by autoinst on 2020/05/03 %% \ProvidesFile{LY1ETbb-LF.fd} - [2020/02/17 (autoinst) Font definitions for LY1/ETbb-LF.] + [2020/05/03 (autoinst) Font definitions for LY1/ETbb-LF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -22,57 +22,57 @@ % ---- regular ---- -\DeclareFontShape{LY1}{ETbb-LF}{regular}{scit}{ - <-> \ETbb@@scale ETbb-Italic-lf-sc-ly1 -}{} - -\DeclareFontShape{LY1}{ETbb-LF}{regular}{sc}{ - <-> \ETbb@@scale ETbb-Regular-lf-sc-ly1 +\DeclareFontShape{LY1}{ETbb-LF}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-lf-ly1 }{} \DeclareFontShape{LY1}{ETbb-LF}{regular}{n}{ <-> \ETbb@@scale ETbb-Regular-lf-ly1 }{} -\DeclareFontShape{LY1}{ETbb-LF}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-lf-ly1 +\DeclareFontShape{LY1}{ETbb-LF}{regular}{sc}{ + <-> \ETbb@@scale ETbb-Regular-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{ETbb-LF}{regular}{scsl}{ - <-> ssub * ETbb-LF/regular/scit +\DeclareFontShape{LY1}{ETbb-LF}{regular}{scit}{ + <-> \ETbb@@scale ETbb-Italic-lf-sc-ly1 }{} \DeclareFontShape{LY1}{ETbb-LF}{regular}{sl}{ <-> ssub * ETbb-LF/regular/it }{} +\DeclareFontShape{LY1}{ETbb-LF}{regular}{scsl}{ + <-> ssub * ETbb-LF/regular/scit +}{} + % ---- bold ---- -\DeclareFontShape{LY1}{ETbb-LF}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-lf-ly1 +\DeclareFontShape{LY1}{ETbb-LF}{bold}{scit}{ + <-> \ETbb@@scale ETbb-BoldItalic-lf-sc-ly1 }{} \DeclareFontShape{LY1}{ETbb-LF}{bold}{sc}{ <-> \ETbb@@scale ETbb-Bold-lf-sc-ly1 }{} +\DeclareFontShape{LY1}{ETbb-LF}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-lf-ly1 +}{} + \DeclareFontShape{LY1}{ETbb-LF}{bold}{n}{ <-> \ETbb@@scale ETbb-Bold-lf-ly1 }{} -\DeclareFontShape{LY1}{ETbb-LF}{bold}{scit}{ - <-> \ETbb@@scale ETbb-BoldItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{ETbb-LF}{bold}{sl}{ + <-> ssub * ETbb-LF/bold/it }{} \DeclareFontShape{LY1}{ETbb-LF}{bold}{scsl}{ <-> ssub * ETbb-LF/bold/scit }{} -\DeclareFontShape{LY1}{ETbb-LF}{bold}{sl}{ - <-> ssub * ETbb-LF/bold/it -}{} - % % Extra 'alias' rules to map the standard NFSS codes to our fancy names % @@ -83,45 +83,33 @@ <-> alias * ETbb-LF/regular/scit }{} -\DeclareFontShape{LY1}{ETbb-LF}{m}{sc}{ - <-> alias * ETbb-LF/regular/sc +\DeclareFontShape{LY1}{ETbb-LF}{m}{sl}{ + <-> alias * ETbb-LF/regular/sl +}{} + +\DeclareFontShape{LY1}{ETbb-LF}{m}{it}{ + <-> alias * ETbb-LF/regular/it }{} \DeclareFontShape{LY1}{ETbb-LF}{m}{n}{ <-> alias * ETbb-LF/regular/n }{} -\DeclareFontShape{LY1}{ETbb-LF}{m}{sl}{ - <-> alias * ETbb-LF/regular/sl +\DeclareFontShape{LY1}{ETbb-LF}{m}{sc}{ + <-> alias * ETbb-LF/regular/sc }{} \DeclareFontShape{LY1}{ETbb-LF}{m}{scsl}{ <-> alias * ETbb-LF/regular/scsl }{} -\DeclareFontShape{LY1}{ETbb-LF}{m}{it}{ - <-> alias * ETbb-LF/regular/it -}{} - % b --> bold -\DeclareFontShape{LY1}{ETbb-LF}{b}{sc}{ - <-> alias * ETbb-LF/bold/sc -}{} - -\DeclareFontShape{LY1}{ETbb-LF}{b}{n}{ - <-> alias * ETbb-LF/bold/n -}{} - \DeclareFontShape{LY1}{ETbb-LF}{b}{scit}{ <-> alias * ETbb-LF/bold/scit }{} -\DeclareFontShape{LY1}{ETbb-LF}{b}{scsl}{ - <-> alias * ETbb-LF/bold/scsl -}{} - \DeclareFontShape{LY1}{ETbb-LF}{b}{sl}{ <-> alias * ETbb-LF/bold/sl }{} @@ -130,28 +118,40 @@ <-> alias * ETbb-LF/bold/it }{} -\DeclareFontShape{LY1}{ETbb-LF}{bx}{sc}{ - <-> ssub * ETbb-LF/b/sc +\DeclareFontShape{LY1}{ETbb-LF}{b}{n}{ + <-> alias * ETbb-LF/bold/n }{} -\DeclareFontShape{LY1}{ETbb-LF}{bx}{n}{ - <-> ssub * ETbb-LF/b/n +\DeclareFontShape{LY1}{ETbb-LF}{b}{sc}{ + <-> alias * ETbb-LF/bold/sc }{} -\DeclareFontShape{LY1}{ETbb-LF}{bx}{scit}{ - <-> ssub * ETbb-LF/b/scit +\DeclareFontShape{LY1}{ETbb-LF}{b}{scsl}{ + <-> alias * ETbb-LF/bold/scsl }{} \DeclareFontShape{LY1}{ETbb-LF}{bx}{sl}{ <-> ssub * ETbb-LF/b/sl }{} +\DeclareFontShape{LY1}{ETbb-LF}{bx}{it}{ + <-> ssub * ETbb-LF/b/it +}{} + +\DeclareFontShape{LY1}{ETbb-LF}{bx}{n}{ + <-> ssub * ETbb-LF/b/n +}{} + +\DeclareFontShape{LY1}{ETbb-LF}{bx}{sc}{ + <-> ssub * ETbb-LF/b/sc +}{} + \DeclareFontShape{LY1}{ETbb-LF}{bx}{scsl}{ <-> ssub * ETbb-LF/b/scsl }{} -\DeclareFontShape{LY1}{ETbb-LF}{bx}{it}{ - <-> ssub * ETbb-LF/b/it +\DeclareFontShape{LY1}{ETbb-LF}{bx}{scit}{ + <-> ssub * ETbb-LF/b/scit }{} \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-OsF.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-OsF.fd index 209766eddf0..117140bff0b 100644 --- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-OsF.fd +++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/02/17 +%% Generated by autoinst on 2020/05/03 %% \ProvidesFile{LY1ETbb-OsF.fd} - [2020/02/17 (autoinst) Font definitions for LY1/ETbb-OsF.] + [2020/05/03 (autoinst) Font definitions for LY1/ETbb-OsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,57 +20,57 @@ \DeclareFontFamily{LY1}{ETbb-OsF}{} -% ---- regular ---- +% ---- bold ---- -\DeclareFontShape{LY1}{ETbb-OsF}{regular}{sc}{ - <-> \ETbb@@scale ETbb-Regular-osf-sc-ly1 +\DeclareFontShape{LY1}{ETbb-OsF}{bold}{scit}{ + <-> \ETbb@@scale ETbb-BoldItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{ETbb-OsF}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-osf-ly1 +\DeclareFontShape{LY1}{ETbb-OsF}{bold}{sc}{ + <-> \ETbb@@scale ETbb-Bold-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{ETbb-OsF}{regular}{scit}{ - <-> \ETbb@@scale ETbb-Italic-osf-sc-ly1 +\DeclareFontShape{LY1}{ETbb-OsF}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{ETbb-OsF}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-osf-ly1 +\DeclareFontShape{LY1}{ETbb-OsF}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-osf-ly1 }{} -\DeclareFontShape{LY1}{ETbb-OsF}{regular}{scsl}{ - <-> ssub * ETbb-OsF/regular/scit +\DeclareFontShape{LY1}{ETbb-OsF}{bold}{sl}{ + <-> ssub * ETbb-OsF/bold/it }{} -\DeclareFontShape{LY1}{ETbb-OsF}{regular}{sl}{ - <-> ssub * ETbb-OsF/regular/it +\DeclareFontShape{LY1}{ETbb-OsF}{bold}{scsl}{ + <-> ssub * ETbb-OsF/bold/scit }{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{LY1}{ETbb-OsF}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-osf-ly1 +\DeclareFontShape{LY1}{ETbb-OsF}{regular}{scit}{ + <-> \ETbb@@scale ETbb-Italic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{ETbb-OsF}{bold}{sc}{ - <-> \ETbb@@scale ETbb-Bold-osf-sc-ly1 +\DeclareFontShape{LY1}{ETbb-OsF}{regular}{sc}{ + <-> \ETbb@@scale ETbb-Regular-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{ETbb-OsF}{bold}{scit}{ - <-> \ETbb@@scale ETbb-BoldItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{ETbb-OsF}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-osf-ly1 }{} -\DeclareFontShape{LY1}{ETbb-OsF}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-osf-ly1 +\DeclareFontShape{LY1}{ETbb-OsF}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-osf-ly1 }{} -\DeclareFontShape{LY1}{ETbb-OsF}{bold}{scsl}{ - <-> ssub * ETbb-OsF/bold/scit +\DeclareFontShape{LY1}{ETbb-OsF}{regular}{sl}{ + <-> ssub * ETbb-OsF/regular/it }{} -\DeclareFontShape{LY1}{ETbb-OsF}{bold}{sl}{ - <-> ssub * ETbb-OsF/bold/it +\DeclareFontShape{LY1}{ETbb-OsF}{regular}{scsl}{ + <-> ssub * ETbb-OsF/regular/scit }{} % @@ -83,6 +83,10 @@ <-> alias * ETbb-OsF/regular/it }{} +\DeclareFontShape{LY1}{ETbb-OsF}{m}{n}{ + <-> alias * ETbb-OsF/regular/n +}{} + \DeclareFontShape{LY1}{ETbb-OsF}{m}{sl}{ <-> alias * ETbb-OsF/regular/sl }{} @@ -91,16 +95,12 @@ <-> alias * ETbb-OsF/regular/scsl }{} -\DeclareFontShape{LY1}{ETbb-OsF}{m}{scit}{ - <-> alias * ETbb-OsF/regular/scit -}{} - \DeclareFontShape{LY1}{ETbb-OsF}{m}{sc}{ <-> alias * ETbb-OsF/regular/sc }{} -\DeclareFontShape{LY1}{ETbb-OsF}{m}{n}{ - <-> alias * ETbb-OsF/regular/n +\DeclareFontShape{LY1}{ETbb-OsF}{m}{scit}{ + <-> alias * ETbb-OsF/regular/scit }{} @@ -110,12 +110,12 @@ <-> alias * ETbb-OsF/bold/scit }{} -\DeclareFontShape{LY1}{ETbb-OsF}{b}{n}{ - <-> alias * ETbb-OsF/bold/n +\DeclareFontShape{LY1}{ETbb-OsF}{b}{it}{ + <-> alias * ETbb-OsF/bold/it }{} -\DeclareFontShape{LY1}{ETbb-OsF}{b}{sc}{ - <-> alias * ETbb-OsF/bold/sc +\DeclareFontShape{LY1}{ETbb-OsF}{b}{n}{ + <-> alias * ETbb-OsF/bold/n }{} \DeclareFontShape{LY1}{ETbb-OsF}{b}{sl}{ @@ -126,14 +126,22 @@ <-> alias * ETbb-OsF/bold/scsl }{} -\DeclareFontShape{LY1}{ETbb-OsF}{b}{it}{ - <-> alias * ETbb-OsF/bold/it +\DeclareFontShape{LY1}{ETbb-OsF}{b}{sc}{ + <-> alias * ETbb-OsF/bold/sc +}{} + +\DeclareFontShape{LY1}{ETbb-OsF}{bx}{scit}{ + <-> ssub * ETbb-OsF/b/scit }{} \DeclareFontShape{LY1}{ETbb-OsF}{bx}{it}{ <-> ssub * ETbb-OsF/b/it }{} +\DeclareFontShape{LY1}{ETbb-OsF}{bx}{n}{ + <-> ssub * ETbb-OsF/b/n +}{} + \DeclareFontShape{LY1}{ETbb-OsF}{bx}{sl}{ <-> ssub * ETbb-OsF/b/sl }{} @@ -142,16 +150,8 @@ <-> ssub * ETbb-OsF/b/scsl }{} -\DeclareFontShape{LY1}{ETbb-OsF}{bx}{scit}{ - <-> ssub * ETbb-OsF/b/scit -}{} - \DeclareFontShape{LY1}{ETbb-OsF}{bx}{sc}{ <-> ssub * ETbb-OsF/b/sc }{} -\DeclareFontShape{LY1}{ETbb-OsF}{bx}{n}{ - <-> ssub * ETbb-OsF/b/n -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd index 443256e8ca7..12fed257717 100644 --- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd +++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/02/17 +%% Generated by autoinst on 2020/05/03 %% \ProvidesFile{LY1ETbb-Sup.fd} - [2020/02/17 (autoinst) Font definitions for LY1/ETbb-Sup.] + [2020/05/03 (autoinst) Font definitions for LY1/ETbb-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,33 +20,33 @@ \DeclareFontFamily{LY1}{ETbb-Sup}{} -% ---- regular ---- +% ---- bold ---- -\DeclareFontShape{LY1}{ETbb-Sup}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-sup-ly1 +\DeclareFontShape{LY1}{ETbb-Sup}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-sup-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Sup}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-sup-ly1 +\DeclareFontShape{LY1}{ETbb-Sup}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Sup}{regular}{sl}{ - <-> ssub * ETbb-Sup/regular/it +\DeclareFontShape{LY1}{ETbb-Sup}{bold}{sl}{ + <-> ssub * ETbb-Sup/bold/it }{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{LY1}{ETbb-Sup}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-sup-ly1 +\DeclareFontShape{LY1}{ETbb-Sup}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-sup-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Sup}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-sup-ly1 +\DeclareFontShape{LY1}{ETbb-Sup}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-sup-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Sup}{bold}{sl}{ - <-> ssub * ETbb-Sup/bold/it +\DeclareFontShape{LY1}{ETbb-Sup}{regular}{sl}{ + <-> ssub * ETbb-Sup/regular/it }{} % @@ -59,14 +59,14 @@ <-> alias * ETbb-Sup/regular/sl }{} -\DeclareFontShape{LY1}{ETbb-Sup}{m}{it}{ - <-> alias * ETbb-Sup/regular/it -}{} - \DeclareFontShape{LY1}{ETbb-Sup}{m}{n}{ <-> alias * ETbb-Sup/regular/n }{} +\DeclareFontShape{LY1}{ETbb-Sup}{m}{it}{ + <-> alias * ETbb-Sup/regular/it +}{} + % b --> bold @@ -74,12 +74,16 @@ <-> alias * ETbb-Sup/bold/n }{} +\DeclareFontShape{LY1}{ETbb-Sup}{b}{it}{ + <-> alias * ETbb-Sup/bold/it +}{} + \DeclareFontShape{LY1}{ETbb-Sup}{b}{sl}{ <-> alias * ETbb-Sup/bold/sl }{} -\DeclareFontShape{LY1}{ETbb-Sup}{b}{it}{ - <-> alias * ETbb-Sup/bold/it +\DeclareFontShape{LY1}{ETbb-Sup}{bx}{n}{ + <-> ssub * ETbb-Sup/b/n }{} \DeclareFontShape{LY1}{ETbb-Sup}{bx}{it}{ @@ -90,8 +94,4 @@ <-> ssub * ETbb-Sup/b/sl }{} -\DeclareFontShape{LY1}{ETbb-Sup}{bx}{n}{ - <-> ssub * ETbb-Sup/b/n -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd index 9f9444367c2..cd8ef9481fb 100644 --- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd +++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/02/17 +%% Generated by autoinst on 2020/05/03 %% \ProvidesFile{LY1ETbb-TLF.fd} - [2020/02/17 (autoinst) Font definitions for LY1/ETbb-TLF.] + [2020/05/03 (autoinst) Font definitions for LY1/ETbb-TLF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -26,26 +26,26 @@ <-> \ETbb@@scale ETbb-Italic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{ETbb-TLF}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-tlf-ly1 -}{} - \DeclareFontShape{LY1}{ETbb-TLF}{regular}{sc}{ <-> \ETbb@@scale ETbb-Regular-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{ETbb-TLF}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-tlf-ly1 +\DeclareFontShape{LY1}{ETbb-TLF}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-tlf-ly1 }{} -\DeclareFontShape{LY1}{ETbb-TLF}{regular}{scsl}{ - <-> ssub * ETbb-TLF/regular/scit +\DeclareFontShape{LY1}{ETbb-TLF}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-tlf-ly1 }{} \DeclareFontShape{LY1}{ETbb-TLF}{regular}{sl}{ <-> ssub * ETbb-TLF/regular/it }{} +\DeclareFontShape{LY1}{ETbb-TLF}{regular}{scsl}{ + <-> ssub * ETbb-TLF/regular/scit +}{} + % ---- bold ---- @@ -65,59 +65,59 @@ <-> \ETbb@@scale ETbb-BoldItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{ETbb-TLF}{bold}{scsl}{ - <-> ssub * ETbb-TLF/bold/scit -}{} - \DeclareFontShape{LY1}{ETbb-TLF}{bold}{sl}{ <-> ssub * ETbb-TLF/bold/it }{} +\DeclareFontShape{LY1}{ETbb-TLF}{bold}{scsl}{ + <-> ssub * ETbb-TLF/bold/scit +}{} + % % Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular -\DeclareFontShape{LY1}{ETbb-TLF}{m}{scit}{ - <-> alias * ETbb-TLF/regular/scit +\DeclareFontShape{LY1}{ETbb-TLF}{m}{sl}{ + <-> alias * ETbb-TLF/regular/sl }{} \DeclareFontShape{LY1}{ETbb-TLF}{m}{n}{ <-> alias * ETbb-TLF/regular/n }{} -\DeclareFontShape{LY1}{ETbb-TLF}{m}{sc}{ - <-> alias * ETbb-TLF/regular/sc +\DeclareFontShape{LY1}{ETbb-TLF}{m}{it}{ + <-> alias * ETbb-TLF/regular/it }{} -\DeclareFontShape{LY1}{ETbb-TLF}{m}{sl}{ - <-> alias * ETbb-TLF/regular/sl +\DeclareFontShape{LY1}{ETbb-TLF}{m}{sc}{ + <-> alias * ETbb-TLF/regular/sc }{} \DeclareFontShape{LY1}{ETbb-TLF}{m}{scsl}{ <-> alias * ETbb-TLF/regular/scsl }{} -\DeclareFontShape{LY1}{ETbb-TLF}{m}{it}{ - <-> alias * ETbb-TLF/regular/it +\DeclareFontShape{LY1}{ETbb-TLF}{m}{scit}{ + <-> alias * ETbb-TLF/regular/scit }{} % b --> bold -\DeclareFontShape{LY1}{ETbb-TLF}{b}{it}{ - <-> alias * ETbb-TLF/bold/it -}{} - -\DeclareFontShape{LY1}{ETbb-TLF}{b}{scsl}{ - <-> alias * ETbb-TLF/bold/scsl +\DeclareFontShape{LY1}{ETbb-TLF}{b}{scit}{ + <-> alias * ETbb-TLF/bold/scit }{} \DeclareFontShape{LY1}{ETbb-TLF}{b}{sl}{ <-> alias * ETbb-TLF/bold/sl }{} +\DeclareFontShape{LY1}{ETbb-TLF}{b}{it}{ + <-> alias * ETbb-TLF/bold/it +}{} + \DeclareFontShape{LY1}{ETbb-TLF}{b}{n}{ <-> alias * ETbb-TLF/bold/n }{} @@ -126,12 +126,16 @@ <-> alias * ETbb-TLF/bold/sc }{} -\DeclareFontShape{LY1}{ETbb-TLF}{b}{scit}{ - <-> alias * ETbb-TLF/bold/scit +\DeclareFontShape{LY1}{ETbb-TLF}{b}{scsl}{ + <-> alias * ETbb-TLF/bold/scsl }{} -\DeclareFontShape{LY1}{ETbb-TLF}{bx}{it}{ - <-> ssub * ETbb-TLF/b/it +\DeclareFontShape{LY1}{ETbb-TLF}{bx}{scit}{ + <-> ssub * ETbb-TLF/b/scit +}{} + +\DeclareFontShape{LY1}{ETbb-TLF}{bx}{sc}{ + <-> ssub * ETbb-TLF/b/sc }{} \DeclareFontShape{LY1}{ETbb-TLF}{bx}{scsl}{ @@ -142,16 +146,12 @@ <-> ssub * ETbb-TLF/b/sl }{} -\DeclareFontShape{LY1}{ETbb-TLF}{bx}{scit}{ - <-> ssub * ETbb-TLF/b/scit -}{} - -\DeclareFontShape{LY1}{ETbb-TLF}{bx}{sc}{ - <-> ssub * ETbb-TLF/b/sc -}{} - \DeclareFontShape{LY1}{ETbb-TLF}{bx}{n}{ <-> ssub * ETbb-TLF/b/n }{} +\DeclareFontShape{LY1}{ETbb-TLF}{bx}{it}{ + <-> ssub * ETbb-TLF/b/it +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd index 0c1c4152f93..7dc159599ce 100644 --- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd +++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/02/17 +%% Generated by autoinst on 2020/05/03 %% \ProvidesFile{LY1ETbb-TOsF.fd} - [2020/02/17 (autoinst) Font definitions for LY1/ETbb-TOsF.] + [2020/05/03 (autoinst) Font definitions for LY1/ETbb-TOsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,57 +20,57 @@ \DeclareFontFamily{LY1}{ETbb-TOsF}{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-tosf-ly1 +\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-tosf-ly1 }{} -\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{scit}{ - <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-tosf-ly1 }{} -\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{sc}{ - <-> \ETbb@@scale ETbb-Bold-tosf-sc-ly1 +\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{sc}{ + <-> \ETbb@@scale ETbb-Regular-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-tosf-ly1 +\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{scit}{ + <-> \ETbb@@scale ETbb-Italic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{scsl}{ - <-> ssub * ETbb-TOsF/bold/scit +\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{sl}{ + <-> ssub * ETbb-TOsF/regular/it }{} -\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{sl}{ - <-> ssub * ETbb-TOsF/bold/it +\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{scsl}{ + <-> ssub * ETbb-TOsF/regular/scit }{} -% ---- regular ---- +% ---- bold ---- -\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-tosf-ly1 +\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{sc}{ + <-> \ETbb@@scale ETbb-Bold-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{scit}{ - <-> \ETbb@@scale ETbb-Italic-tosf-sc-ly1 +\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-tosf-ly1 }{} -\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{sc}{ - <-> \ETbb@@scale ETbb-Regular-tosf-sc-ly1 +\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-tosf-ly1 +\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{scit}{ + <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{scsl}{ - <-> ssub * ETbb-TOsF/regular/scit +\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{sl}{ + <-> ssub * ETbb-TOsF/bold/it }{} -\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{sl}{ - <-> ssub * ETbb-TOsF/regular/it +\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{scsl}{ + <-> ssub * ETbb-TOsF/bold/scit }{} % @@ -79,69 +79,65 @@ % m --> regular -\DeclareFontShape{LY1}{ETbb-TOsF}{m}{it}{ - <-> alias * ETbb-TOsF/regular/it +\DeclareFontShape{LY1}{ETbb-TOsF}{m}{scit}{ + <-> alias * ETbb-TOsF/regular/scit }{} -\DeclareFontShape{LY1}{ETbb-TOsF}{m}{sl}{ - <-> alias * ETbb-TOsF/regular/sl +\DeclareFontShape{LY1}{ETbb-TOsF}{m}{sc}{ + <-> alias * ETbb-TOsF/regular/sc }{} \DeclareFontShape{LY1}{ETbb-TOsF}{m}{scsl}{ <-> alias * ETbb-TOsF/regular/scsl }{} -\DeclareFontShape{LY1}{ETbb-TOsF}{m}{scit}{ - <-> alias * ETbb-TOsF/regular/scit -}{} - -\DeclareFontShape{LY1}{ETbb-TOsF}{m}{sc}{ - <-> alias * ETbb-TOsF/regular/sc +\DeclareFontShape{LY1}{ETbb-TOsF}{m}{sl}{ + <-> alias * ETbb-TOsF/regular/sl }{} \DeclareFontShape{LY1}{ETbb-TOsF}{m}{n}{ <-> alias * ETbb-TOsF/regular/n }{} - -% b --> bold - -\DeclareFontShape{LY1}{ETbb-TOsF}{b}{sc}{ - <-> alias * ETbb-TOsF/bold/sc +\DeclareFontShape{LY1}{ETbb-TOsF}{m}{it}{ + <-> alias * ETbb-TOsF/regular/it }{} -\DeclareFontShape{LY1}{ETbb-TOsF}{b}{n}{ - <-> alias * ETbb-TOsF/bold/n -}{} + +% b --> bold \DeclareFontShape{LY1}{ETbb-TOsF}{b}{scit}{ <-> alias * ETbb-TOsF/bold/scit }{} -\DeclareFontShape{LY1}{ETbb-TOsF}{b}{scsl}{ - <-> alias * ETbb-TOsF/bold/scsl -}{} - \DeclareFontShape{LY1}{ETbb-TOsF}{b}{sl}{ <-> alias * ETbb-TOsF/bold/sl }{} +\DeclareFontShape{LY1}{ETbb-TOsF}{b}{n}{ + <-> alias * ETbb-TOsF/bold/n +}{} + \DeclareFontShape{LY1}{ETbb-TOsF}{b}{it}{ <-> alias * ETbb-TOsF/bold/it }{} -\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{sc}{ - <-> ssub * ETbb-TOsF/b/sc +\DeclareFontShape{LY1}{ETbb-TOsF}{b}{sc}{ + <-> alias * ETbb-TOsF/bold/sc }{} -\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{n}{ - <-> ssub * ETbb-TOsF/b/n +\DeclareFontShape{LY1}{ETbb-TOsF}{b}{scsl}{ + <-> alias * ETbb-TOsF/bold/scsl }{} \DeclareFontShape{LY1}{ETbb-TOsF}{bx}{scit}{ <-> ssub * ETbb-TOsF/b/scit }{} +\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{n}{ + <-> ssub * ETbb-TOsF/b/n +}{} + \DeclareFontShape{LY1}{ETbb-TOsF}{bx}{it}{ <-> ssub * ETbb-TOsF/b/it }{} @@ -154,4 +150,8 @@ <-> ssub * ETbb-TOsF/b/scsl }{} +\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{sc}{ + <-> ssub * ETbb-TOsF/b/sc +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd index be8ad0902ca..2c9b6be3058 100644 --- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd +++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/02/17 +%% Generated by autoinst on 2020/05/03 %% \ProvidesFile{OT1ETbb-Inf.fd} - [2020/02/17 (autoinst) Font definitions for OT1/ETbb-Inf.] + [2020/05/03 (autoinst) Font definitions for OT1/ETbb-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,33 +20,33 @@ \DeclareFontFamily{OT1}{ETbb-Inf}{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{OT1}{ETbb-Inf}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-inf-ot1 +\DeclareFontShape{OT1}{ETbb-Inf}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-inf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-Inf}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-inf-ot1 +\DeclareFontShape{OT1}{ETbb-Inf}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-inf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-Inf}{bold}{sl}{ - <-> ssub * ETbb-Inf/bold/it +\DeclareFontShape{OT1}{ETbb-Inf}{regular}{sl}{ + <-> ssub * ETbb-Inf/regular/it }{} -% ---- regular ---- +% ---- bold ---- -\DeclareFontShape{OT1}{ETbb-Inf}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-inf-ot1 +\DeclareFontShape{OT1}{ETbb-Inf}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-inf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-Inf}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-inf-ot1 +\DeclareFontShape{OT1}{ETbb-Inf}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-Inf}{regular}{sl}{ - <-> ssub * ETbb-Inf/regular/it +\DeclareFontShape{OT1}{ETbb-Inf}{bold}{sl}{ + <-> ssub * ETbb-Inf/bold/it }{} % @@ -55,14 +55,14 @@ % m --> regular -\DeclareFontShape{OT1}{ETbb-Inf}{m}{n}{ - <-> alias * ETbb-Inf/regular/n -}{} - \DeclareFontShape{OT1}{ETbb-Inf}{m}{sl}{ <-> alias * ETbb-Inf/regular/sl }{} +\DeclareFontShape{OT1}{ETbb-Inf}{m}{n}{ + <-> alias * ETbb-Inf/regular/n +}{} + \DeclareFontShape{OT1}{ETbb-Inf}{m}{it}{ <-> alias * ETbb-Inf/regular/it }{} @@ -74,16 +74,12 @@ <-> alias * ETbb-Inf/bold/sl }{} -\DeclareFontShape{OT1}{ETbb-Inf}{b}{it}{ - <-> alias * ETbb-Inf/bold/it -}{} - \DeclareFontShape{OT1}{ETbb-Inf}{b}{n}{ <-> alias * ETbb-Inf/bold/n }{} -\DeclareFontShape{OT1}{ETbb-Inf}{bx}{it}{ - <-> ssub * ETbb-Inf/b/it +\DeclareFontShape{OT1}{ETbb-Inf}{b}{it}{ + <-> alias * ETbb-Inf/bold/it }{} \DeclareFontShape{OT1}{ETbb-Inf}{bx}{sl}{ @@ -94,4 +90,8 @@ <-> ssub * ETbb-Inf/b/n }{} +\DeclareFontShape{OT1}{ETbb-Inf}{bx}{it}{ + <-> ssub * ETbb-Inf/b/it +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd index 7498372de9e..c60a2ee5ef7 100644 --- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd +++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/02/17 +%% Generated by autoinst on 2020/05/03 %% \ProvidesFile{OT1ETbb-LF.fd} - [2020/02/17 (autoinst) Font definitions for OT1/ETbb-LF.] + [2020/05/03 (autoinst) Font definitions for OT1/ETbb-LF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -22,10 +22,6 @@ % ---- bold ---- -\DeclareFontShape{OT1}{ETbb-LF}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-lf-ot1 -}{} - \DeclareFontShape{OT1}{ETbb-LF}{bold}{scit}{ <-> \ETbb@@scale ETbb-BoldItalic-lf-sc-ot1 }{} @@ -34,18 +30,22 @@ <-> \ETbb@@scale ETbb-Bold-lf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-LF}{bold}{sc}{ - <-> \ETbb@@scale ETbb-Bold-lf-sc-ot1 +\DeclareFontShape{OT1}{ETbb-LF}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-LF}{bold}{scsl}{ - <-> ssub * ETbb-LF/bold/scit +\DeclareFontShape{OT1}{ETbb-LF}{bold}{sc}{ + <-> \ETbb@@scale ETbb-Bold-lf-sc-ot1 }{} \DeclareFontShape{OT1}{ETbb-LF}{bold}{sl}{ <-> ssub * ETbb-LF/bold/it }{} +\DeclareFontShape{OT1}{ETbb-LF}{bold}{scsl}{ + <-> ssub * ETbb-LF/bold/scit +}{} + % ---- regular ---- @@ -57,101 +57,101 @@ <-> \ETbb@@scale ETbb-Regular-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{ETbb-LF}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-lf-ot1 -}{} - \DeclareFontShape{OT1}{ETbb-LF}{regular}{it}{ <-> \ETbb@@scale ETbb-Italic-lf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-LF}{regular}{scsl}{ - <-> ssub * ETbb-LF/regular/scit +\DeclareFontShape{OT1}{ETbb-LF}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-lf-ot1 }{} \DeclareFontShape{OT1}{ETbb-LF}{regular}{sl}{ <-> ssub * ETbb-LF/regular/it }{} +\DeclareFontShape{OT1}{ETbb-LF}{regular}{scsl}{ + <-> ssub * ETbb-LF/regular/scit +}{} + % % Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular -\DeclareFontShape{OT1}{ETbb-LF}{m}{scsl}{ - <-> alias * ETbb-LF/regular/scsl -}{} - -\DeclareFontShape{OT1}{ETbb-LF}{m}{sl}{ - <-> alias * ETbb-LF/regular/sl +\DeclareFontShape{OT1}{ETbb-LF}{m}{scit}{ + <-> alias * ETbb-LF/regular/scit }{} \DeclareFontShape{OT1}{ETbb-LF}{m}{it}{ <-> alias * ETbb-LF/regular/it }{} -\DeclareFontShape{OT1}{ETbb-LF}{m}{sc}{ - <-> alias * ETbb-LF/regular/sc -}{} - \DeclareFontShape{OT1}{ETbb-LF}{m}{n}{ <-> alias * ETbb-LF/regular/n }{} -\DeclareFontShape{OT1}{ETbb-LF}{m}{scit}{ - <-> alias * ETbb-LF/regular/scit +\DeclareFontShape{OT1}{ETbb-LF}{m}{sl}{ + <-> alias * ETbb-LF/regular/sl +}{} + +\DeclareFontShape{OT1}{ETbb-LF}{m}{scsl}{ + <-> alias * ETbb-LF/regular/scsl +}{} + +\DeclareFontShape{OT1}{ETbb-LF}{m}{sc}{ + <-> alias * ETbb-LF/regular/sc }{} % b --> bold -\DeclareFontShape{OT1}{ETbb-LF}{b}{n}{ - <-> alias * ETbb-LF/bold/n +\DeclareFontShape{OT1}{ETbb-LF}{b}{scit}{ + <-> alias * ETbb-LF/bold/scit }{} -\DeclareFontShape{OT1}{ETbb-LF}{b}{sc}{ - <-> alias * ETbb-LF/bold/sc +\DeclareFontShape{OT1}{ETbb-LF}{b}{sl}{ + <-> alias * ETbb-LF/bold/sl }{} -\DeclareFontShape{OT1}{ETbb-LF}{b}{scit}{ - <-> alias * ETbb-LF/bold/scit +\DeclareFontShape{OT1}{ETbb-LF}{b}{n}{ + <-> alias * ETbb-LF/bold/n }{} \DeclareFontShape{OT1}{ETbb-LF}{b}{it}{ <-> alias * ETbb-LF/bold/it }{} -\DeclareFontShape{OT1}{ETbb-LF}{b}{scsl}{ - <-> alias * ETbb-LF/bold/scsl -}{} - -\DeclareFontShape{OT1}{ETbb-LF}{b}{sl}{ - <-> alias * ETbb-LF/bold/sl +\DeclareFontShape{OT1}{ETbb-LF}{b}{sc}{ + <-> alias * ETbb-LF/bold/sc }{} -\DeclareFontShape{OT1}{ETbb-LF}{bx}{scit}{ - <-> ssub * ETbb-LF/b/scit +\DeclareFontShape{OT1}{ETbb-LF}{b}{scsl}{ + <-> alias * ETbb-LF/bold/scsl }{} \DeclareFontShape{OT1}{ETbb-LF}{bx}{n}{ <-> ssub * ETbb-LF/b/n }{} -\DeclareFontShape{OT1}{ETbb-LF}{bx}{sc}{ - <-> ssub * ETbb-LF/b/sc -}{} - \DeclareFontShape{OT1}{ETbb-LF}{bx}{it}{ <-> ssub * ETbb-LF/b/it }{} +\DeclareFontShape{OT1}{ETbb-LF}{bx}{sl}{ + <-> ssub * ETbb-LF/b/sl +}{} + \DeclareFontShape{OT1}{ETbb-LF}{bx}{scsl}{ <-> ssub * ETbb-LF/b/scsl }{} -\DeclareFontShape{OT1}{ETbb-LF}{bx}{sl}{ - <-> ssub * ETbb-LF/b/sl +\DeclareFontShape{OT1}{ETbb-LF}{bx}{sc}{ + <-> ssub * ETbb-LF/b/sc +}{} + +\DeclareFontShape{OT1}{ETbb-LF}{bx}{scit}{ + <-> ssub * ETbb-LF/b/scit }{} \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd index e3ed62e0375..030ee538467 100644 --- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd +++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/02/17 +%% Generated by autoinst on 2020/05/03 %% \ProvidesFile{OT1ETbb-OsF.fd} - [2020/02/17 (autoinst) Font definitions for OT1/ETbb-OsF.] + [2020/05/03 (autoinst) Font definitions for OT1/ETbb-OsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -22,85 +22,85 @@ % ---- regular ---- -\DeclareFontShape{OT1}{ETbb-OsF}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-osf-ot1 -}{} - -\DeclareFontShape{OT1}{ETbb-OsF}{regular}{scit}{ - <-> \ETbb@@scale ETbb-Italic-osf-sc-ot1 -}{} - \DeclareFontShape{OT1}{ETbb-OsF}{regular}{n}{ <-> \ETbb@@scale ETbb-Regular-osf-ot1 }{} +\DeclareFontShape{OT1}{ETbb-OsF}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-osf-ot1 +}{} + \DeclareFontShape{OT1}{ETbb-OsF}{regular}{sc}{ <-> \ETbb@@scale ETbb-Regular-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{ETbb-OsF}{regular}{scsl}{ - <-> ssub * ETbb-OsF/regular/scit +\DeclareFontShape{OT1}{ETbb-OsF}{regular}{scit}{ + <-> \ETbb@@scale ETbb-Italic-osf-sc-ot1 }{} \DeclareFontShape{OT1}{ETbb-OsF}{regular}{sl}{ <-> ssub * ETbb-OsF/regular/it }{} +\DeclareFontShape{OT1}{ETbb-OsF}{regular}{scsl}{ + <-> ssub * ETbb-OsF/regular/scit +}{} + % ---- bold ---- -\DeclareFontShape{OT1}{ETbb-OsF}{bold}{sc}{ - <-> \ETbb@@scale ETbb-Bold-osf-sc-ot1 +\DeclareFontShape{OT1}{ETbb-OsF}{bold}{scit}{ + <-> \ETbb@@scale ETbb-BoldItalic-osf-sc-ot1 }{} \DeclareFontShape{OT1}{ETbb-OsF}{bold}{n}{ <-> \ETbb@@scale ETbb-Bold-osf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-OsF}{bold}{scit}{ - <-> \ETbb@@scale ETbb-BoldItalic-osf-sc-ot1 -}{} - \DeclareFontShape{OT1}{ETbb-OsF}{bold}{it}{ <-> \ETbb@@scale ETbb-BoldItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-OsF}{bold}{scsl}{ - <-> ssub * ETbb-OsF/bold/scit +\DeclareFontShape{OT1}{ETbb-OsF}{bold}{sc}{ + <-> \ETbb@@scale ETbb-Bold-osf-sc-ot1 }{} \DeclareFontShape{OT1}{ETbb-OsF}{bold}{sl}{ <-> ssub * ETbb-OsF/bold/it }{} +\DeclareFontShape{OT1}{ETbb-OsF}{bold}{scsl}{ + <-> ssub * ETbb-OsF/bold/scit +}{} + % % Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular -\DeclareFontShape{OT1}{ETbb-OsF}{m}{scit}{ - <-> alias * ETbb-OsF/regular/scit +\DeclareFontShape{OT1}{ETbb-OsF}{m}{sl}{ + <-> alias * ETbb-OsF/regular/sl }{} \DeclareFontShape{OT1}{ETbb-OsF}{m}{n}{ <-> alias * ETbb-OsF/regular/n }{} -\DeclareFontShape{OT1}{ETbb-OsF}{m}{sc}{ - <-> alias * ETbb-OsF/regular/sc +\DeclareFontShape{OT1}{ETbb-OsF}{m}{it}{ + <-> alias * ETbb-OsF/regular/it }{} -\DeclareFontShape{OT1}{ETbb-OsF}{m}{sl}{ - <-> alias * ETbb-OsF/regular/sl +\DeclareFontShape{OT1}{ETbb-OsF}{m}{sc}{ + <-> alias * ETbb-OsF/regular/sc }{} \DeclareFontShape{OT1}{ETbb-OsF}{m}{scsl}{ <-> alias * ETbb-OsF/regular/scsl }{} -\DeclareFontShape{OT1}{ETbb-OsF}{m}{it}{ - <-> alias * ETbb-OsF/regular/it +\DeclareFontShape{OT1}{ETbb-OsF}{m}{scit}{ + <-> alias * ETbb-OsF/regular/scit }{} @@ -110,14 +110,6 @@ <-> alias * ETbb-OsF/bold/scsl }{} -\DeclareFontShape{OT1}{ETbb-OsF}{b}{sl}{ - <-> alias * ETbb-OsF/bold/sl -}{} - -\DeclareFontShape{OT1}{ETbb-OsF}{b}{it}{ - <-> alias * ETbb-OsF/bold/it -}{} - \DeclareFontShape{OT1}{ETbb-OsF}{b}{sc}{ <-> alias * ETbb-OsF/bold/sc }{} @@ -126,20 +118,16 @@ <-> alias * ETbb-OsF/bold/n }{} -\DeclareFontShape{OT1}{ETbb-OsF}{b}{scit}{ - <-> alias * ETbb-OsF/bold/scit -}{} - -\DeclareFontShape{OT1}{ETbb-OsF}{bx}{sl}{ - <-> ssub * ETbb-OsF/b/sl +\DeclareFontShape{OT1}{ETbb-OsF}{b}{it}{ + <-> alias * ETbb-OsF/bold/it }{} -\DeclareFontShape{OT1}{ETbb-OsF}{bx}{scsl}{ - <-> ssub * ETbb-OsF/b/scsl +\DeclareFontShape{OT1}{ETbb-OsF}{b}{sl}{ + <-> alias * ETbb-OsF/bold/sl }{} -\DeclareFontShape{OT1}{ETbb-OsF}{bx}{it}{ - <-> ssub * ETbb-OsF/b/it +\DeclareFontShape{OT1}{ETbb-OsF}{b}{scit}{ + <-> alias * ETbb-OsF/bold/scit }{} \DeclareFontShape{OT1}{ETbb-OsF}{bx}{scit}{ @@ -150,6 +138,18 @@ <-> ssub * ETbb-OsF/b/sc }{} +\DeclareFontShape{OT1}{ETbb-OsF}{bx}{scsl}{ + <-> ssub * ETbb-OsF/b/scsl +}{} + +\DeclareFontShape{OT1}{ETbb-OsF}{bx}{sl}{ + <-> ssub * ETbb-OsF/b/sl +}{} + +\DeclareFontShape{OT1}{ETbb-OsF}{bx}{it}{ + <-> ssub * ETbb-OsF/b/it +}{} + \DeclareFontShape{OT1}{ETbb-OsF}{bx}{n}{ <-> ssub * ETbb-OsF/b/n }{} diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd index bb0d32d0c23..ad09169b2f4 100644 --- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd +++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/02/17 +%% Generated by autoinst on 2020/05/03 %% \ProvidesFile{OT1ETbb-Sup.fd} - [2020/02/17 (autoinst) Font definitions for OT1/ETbb-Sup.] + [2020/05/03 (autoinst) Font definitions for OT1/ETbb-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -22,14 +22,14 @@ % ---- bold ---- -\DeclareFontShape{OT1}{ETbb-Sup}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-sup-ot1 -}{} - \DeclareFontShape{OT1}{ETbb-Sup}{bold}{it}{ <-> \ETbb@@scale ETbb-BoldItalic-sup-ot1 }{} +\DeclareFontShape{OT1}{ETbb-Sup}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-sup-ot1 +}{} + \DeclareFontShape{OT1}{ETbb-Sup}{bold}{sl}{ <-> ssub * ETbb-Sup/bold/it }{} @@ -37,14 +37,14 @@ % ---- regular ---- -\DeclareFontShape{OT1}{ETbb-Sup}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-sup-ot1 -}{} - \DeclareFontShape{OT1}{ETbb-Sup}{regular}{n}{ <-> \ETbb@@scale ETbb-Regular-sup-ot1 }{} +\DeclareFontShape{OT1}{ETbb-Sup}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-sup-ot1 +}{} + \DeclareFontShape{OT1}{ETbb-Sup}{regular}{sl}{ <-> ssub * ETbb-Sup/regular/it }{} @@ -55,10 +55,6 @@ % m --> regular -\DeclareFontShape{OT1}{ETbb-Sup}{m}{it}{ - <-> alias * ETbb-Sup/regular/it -}{} - \DeclareFontShape{OT1}{ETbb-Sup}{m}{sl}{ <-> alias * ETbb-Sup/regular/sl }{} @@ -67,9 +63,17 @@ <-> alias * ETbb-Sup/regular/n }{} +\DeclareFontShape{OT1}{ETbb-Sup}{m}{it}{ + <-> alias * ETbb-Sup/regular/it +}{} + % b --> bold +\DeclareFontShape{OT1}{ETbb-Sup}{b}{it}{ + <-> alias * ETbb-Sup/bold/it +}{} + \DeclareFontShape{OT1}{ETbb-Sup}{b}{n}{ <-> alias * ETbb-Sup/bold/n }{} @@ -78,20 +82,16 @@ <-> alias * ETbb-Sup/bold/sl }{} -\DeclareFontShape{OT1}{ETbb-Sup}{b}{it}{ - <-> alias * ETbb-Sup/bold/it -}{} - -\DeclareFontShape{OT1}{ETbb-Sup}{bx}{sl}{ - <-> ssub * ETbb-Sup/b/sl +\DeclareFontShape{OT1}{ETbb-Sup}{bx}{n}{ + <-> ssub * ETbb-Sup/b/n }{} \DeclareFontShape{OT1}{ETbb-Sup}{bx}{it}{ <-> ssub * ETbb-Sup/b/it }{} -\DeclareFontShape{OT1}{ETbb-Sup}{bx}{n}{ - <-> ssub * ETbb-Sup/b/n +\DeclareFontShape{OT1}{ETbb-Sup}{bx}{sl}{ + <-> ssub * ETbb-Sup/b/sl }{} \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TLF.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TLF.fd index ae8a2d12e66..254851cc7df 100644 --- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TLF.fd +++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/02/17 +%% Generated by autoinst on 2020/05/03 %% \ProvidesFile{OT1ETbb-TLF.fd} - [2020/02/17 (autoinst) Font definitions for OT1/ETbb-TLF.] + [2020/05/03 (autoinst) Font definitions for OT1/ETbb-TLF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -22,14 +22,6 @@ % ---- bold ---- -\DeclareFontShape{OT1}{ETbb-TLF}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-tlf-ot1 -}{} - -\DeclareFontShape{OT1}{ETbb-TLF}{bold}{scit}{ - <-> \ETbb@@scale ETbb-BoldItalic-tlf-sc-ot1 -}{} - \DeclareFontShape{OT1}{ETbb-TLF}{bold}{sc}{ <-> \ETbb@@scale ETbb-Bold-tlf-sc-ot1 }{} @@ -38,14 +30,22 @@ <-> \ETbb@@scale ETbb-Bold-tlf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-TLF}{bold}{scsl}{ - <-> ssub * ETbb-TLF/bold/scit +\DeclareFontShape{OT1}{ETbb-TLF}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{ETbb-TLF}{bold}{scit}{ + <-> \ETbb@@scale ETbb-BoldItalic-tlf-sc-ot1 }{} \DeclareFontShape{OT1}{ETbb-TLF}{bold}{sl}{ <-> ssub * ETbb-TLF/bold/it }{} +\DeclareFontShape{OT1}{ETbb-TLF}{bold}{scsl}{ + <-> ssub * ETbb-TLF/bold/scit +}{} + % ---- regular ---- @@ -53,10 +53,6 @@ <-> \ETbb@@scale ETbb-Italic-tlf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-TLF}{regular}{scit}{ - <-> \ETbb@@scale ETbb-Italic-tlf-sc-ot1 -}{} - \DeclareFontShape{OT1}{ETbb-TLF}{regular}{n}{ <-> \ETbb@@scale ETbb-Regular-tlf-ot1 }{} @@ -65,28 +61,24 @@ <-> \ETbb@@scale ETbb-Regular-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{ETbb-TLF}{regular}{scsl}{ - <-> ssub * ETbb-TLF/regular/scit +\DeclareFontShape{OT1}{ETbb-TLF}{regular}{scit}{ + <-> \ETbb@@scale ETbb-Italic-tlf-sc-ot1 }{} \DeclareFontShape{OT1}{ETbb-TLF}{regular}{sl}{ <-> ssub * ETbb-TLF/regular/it }{} +\DeclareFontShape{OT1}{ETbb-TLF}{regular}{scsl}{ + <-> ssub * ETbb-TLF/regular/scit +}{} + % % Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular -\DeclareFontShape{OT1}{ETbb-TLF}{m}{n}{ - <-> alias * ETbb-TLF/regular/n -}{} - -\DeclareFontShape{OT1}{ETbb-TLF}{m}{sc}{ - <-> alias * ETbb-TLF/regular/sc -}{} - \DeclareFontShape{OT1}{ETbb-TLF}{m}{scit}{ <-> alias * ETbb-TLF/regular/scit }{} @@ -95,29 +87,33 @@ <-> alias * ETbb-TLF/regular/it }{} -\DeclareFontShape{OT1}{ETbb-TLF}{m}{scsl}{ - <-> alias * ETbb-TLF/regular/scsl +\DeclareFontShape{OT1}{ETbb-TLF}{m}{n}{ + <-> alias * ETbb-TLF/regular/n }{} \DeclareFontShape{OT1}{ETbb-TLF}{m}{sl}{ <-> alias * ETbb-TLF/regular/sl }{} - -% b --> bold - -\DeclareFontShape{OT1}{ETbb-TLF}{b}{sc}{ - <-> alias * ETbb-TLF/bold/sc +\DeclareFontShape{OT1}{ETbb-TLF}{m}{scsl}{ + <-> alias * ETbb-TLF/regular/scsl }{} -\DeclareFontShape{OT1}{ETbb-TLF}{b}{n}{ - <-> alias * ETbb-TLF/bold/n +\DeclareFontShape{OT1}{ETbb-TLF}{m}{sc}{ + <-> alias * ETbb-TLF/regular/sc }{} + +% b --> bold + \DeclareFontShape{OT1}{ETbb-TLF}{b}{scit}{ <-> alias * ETbb-TLF/bold/scit }{} +\DeclareFontShape{OT1}{ETbb-TLF}{b}{sc}{ + <-> alias * ETbb-TLF/bold/sc +}{} + \DeclareFontShape{OT1}{ETbb-TLF}{b}{scsl}{ <-> alias * ETbb-TLF/bold/scsl }{} @@ -126,16 +122,16 @@ <-> alias * ETbb-TLF/bold/sl }{} -\DeclareFontShape{OT1}{ETbb-TLF}{b}{it}{ - <-> alias * ETbb-TLF/bold/it +\DeclareFontShape{OT1}{ETbb-TLF}{b}{n}{ + <-> alias * ETbb-TLF/bold/n }{} -\DeclareFontShape{OT1}{ETbb-TLF}{bx}{scit}{ - <-> ssub * ETbb-TLF/b/scit +\DeclareFontShape{OT1}{ETbb-TLF}{b}{it}{ + <-> alias * ETbb-TLF/bold/it }{} -\DeclareFontShape{OT1}{ETbb-TLF}{bx}{n}{ - <-> ssub * ETbb-TLF/b/n +\DeclareFontShape{OT1}{ETbb-TLF}{bx}{scsl}{ + <-> ssub * ETbb-TLF/b/scsl }{} \DeclareFontShape{OT1}{ETbb-TLF}{bx}{sc}{ @@ -146,12 +142,16 @@ <-> ssub * ETbb-TLF/b/it }{} +\DeclareFontShape{OT1}{ETbb-TLF}{bx}{n}{ + <-> ssub * ETbb-TLF/b/n +}{} + \DeclareFontShape{OT1}{ETbb-TLF}{bx}{sl}{ <-> ssub * ETbb-TLF/b/sl }{} -\DeclareFontShape{OT1}{ETbb-TLF}{bx}{scsl}{ - <-> ssub * ETbb-TLF/b/scsl +\DeclareFontShape{OT1}{ETbb-TLF}{bx}{scit}{ + <-> ssub * ETbb-TLF/b/scit }{} \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TOsF.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TOsF.fd index 9d109f535bc..4d5219f2455 100644 --- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TOsF.fd +++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/02/17 +%% Generated by autoinst on 2020/05/03 %% \ProvidesFile{OT1ETbb-TOsF.fd} - [2020/02/17 (autoinst) Font definitions for OT1/ETbb-TOsF.] + [2020/05/03 (autoinst) Font definitions for OT1/ETbb-TOsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,57 +20,57 @@ \DeclareFontFamily{OT1}{ETbb-TOsF}{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-tosf-ot1 +\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{scit}{ + <-> \ETbb@@scale ETbb-Italic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scit}{ - <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-ot1 +\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sc}{ + <-> \ETbb@@scale ETbb-Regular-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-tosf-ot1 +\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-tosf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sc}{ - <-> \ETbb@@scale ETbb-Bold-tosf-sc-ot1 +\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-tosf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scsl}{ - <-> ssub * ETbb-TOsF/bold/scit +\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sl}{ + <-> ssub * ETbb-TOsF/regular/it }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sl}{ - <-> ssub * ETbb-TOsF/bold/it +\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{scsl}{ + <-> ssub * ETbb-TOsF/regular/scit }{} -% ---- regular ---- +% ---- bold ---- -\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-tosf-ot1 +\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scit}{ + <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-tosf-ot1 +\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-tosf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sc}{ - <-> \ETbb@@scale ETbb-Regular-tosf-sc-ot1 +\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{scit}{ - <-> \ETbb@@scale ETbb-Italic-tosf-sc-ot1 +\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sc}{ + <-> \ETbb@@scale ETbb-Bold-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{scsl}{ - <-> ssub * ETbb-TOsF/regular/scit +\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sl}{ + <-> ssub * ETbb-TOsF/bold/it }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sl}{ - <-> ssub * ETbb-TOsF/regular/it +\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scsl}{ + <-> ssub * ETbb-TOsF/bold/scit }{} % @@ -79,75 +79,75 @@ % m --> regular -\DeclareFontShape{OT1}{ETbb-TOsF}{m}{n}{ - <-> alias * ETbb-TOsF/regular/n +\DeclareFontShape{OT1}{ETbb-TOsF}{m}{scsl}{ + <-> alias * ETbb-TOsF/regular/scsl }{} \DeclareFontShape{OT1}{ETbb-TOsF}{m}{sc}{ <-> alias * ETbb-TOsF/regular/sc }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{m}{scit}{ - <-> alias * ETbb-TOsF/regular/scit +\DeclareFontShape{OT1}{ETbb-TOsF}{m}{n}{ + <-> alias * ETbb-TOsF/regular/n }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{m}{scsl}{ - <-> alias * ETbb-TOsF/regular/scsl +\DeclareFontShape{OT1}{ETbb-TOsF}{m}{it}{ + <-> alias * ETbb-TOsF/regular/it }{} \DeclareFontShape{OT1}{ETbb-TOsF}{m}{sl}{ <-> alias * ETbb-TOsF/regular/sl }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{m}{it}{ - <-> alias * ETbb-TOsF/regular/it +\DeclareFontShape{OT1}{ETbb-TOsF}{m}{scit}{ + <-> alias * ETbb-TOsF/regular/scit }{} % b --> bold -\DeclareFontShape{OT1}{ETbb-TOsF}{b}{it}{ - <-> alias * ETbb-TOsF/bold/it +\DeclareFontShape{OT1}{ETbb-TOsF}{b}{scit}{ + <-> alias * ETbb-TOsF/bold/scit }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{b}{sl}{ - <-> alias * ETbb-TOsF/bold/sl +\DeclareFontShape{OT1}{ETbb-TOsF}{b}{sc}{ + <-> alias * ETbb-TOsF/bold/sc }{} \DeclareFontShape{OT1}{ETbb-TOsF}{b}{scsl}{ <-> alias * ETbb-TOsF/bold/scsl }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{b}{scit}{ - <-> alias * ETbb-TOsF/bold/scit +\DeclareFontShape{OT1}{ETbb-TOsF}{b}{sl}{ + <-> alias * ETbb-TOsF/bold/sl }{} \DeclareFontShape{OT1}{ETbb-TOsF}{b}{n}{ <-> alias * ETbb-TOsF/bold/n }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{b}{sc}{ - <-> alias * ETbb-TOsF/bold/sc +\DeclareFontShape{OT1}{ETbb-TOsF}{b}{it}{ + <-> alias * ETbb-TOsF/bold/it }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{scsl}{ - <-> ssub * ETbb-TOsF/b/scsl +\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{scit}{ + <-> ssub * ETbb-TOsF/b/scit }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sl}{ - <-> ssub * ETbb-TOsF/b/sl +\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{n}{ + <-> ssub * ETbb-TOsF/b/n }{} \DeclareFontShape{OT1}{ETbb-TOsF}{bx}{it}{ <-> ssub * ETbb-TOsF/b/it }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{scit}{ - <-> ssub * ETbb-TOsF/b/scit +\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sl}{ + <-> ssub * ETbb-TOsF/b/sl }{} -\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{n}{ - <-> ssub * ETbb-TOsF/b/n +\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{scsl}{ + <-> ssub * ETbb-TOsF/b/scsl }{} \DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sc}{ diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd index c26a5afb30e..d3d353cbe64 100644 --- a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd +++ b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/02/17 +%% Generated by autoinst on 2020/05/03 %% \ProvidesFile{T1ETbb-Inf.fd} - [2020/02/17 (autoinst) Font definitions for T1/ETbb-Inf.] + [2020/05/03 (autoinst) Font definitions for T1/ETbb-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,33 +20,33 @@ \DeclareFontFamily{T1}{ETbb-Inf}{} -% ---- regular ---- +% ---- bold ---- -\DeclareFontShape{T1}{ETbb-Inf}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-inf-t1 +\DeclareFontShape{T1}{ETbb-Inf}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-inf-t1 }{} -\DeclareFontShape{T1}{ETbb-Inf}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-inf-t1 +\DeclareFontShape{T1}{ETbb-Inf}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-inf-t1 }{} -\DeclareFontShape{T1}{ETbb-Inf}{regular}{sl}{ - <-> ssub * ETbb-Inf/regular/it +\DeclareFontShape{T1}{ETbb-Inf}{bold}{sl}{ + <-> ssub * ETbb-Inf/bold/it }{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{T1}{ETbb-Inf}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-inf-t1 +\DeclareFontShape{T1}{ETbb-Inf}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-inf-t1 }{} -\DeclareFontShape{T1}{ETbb-Inf}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-inf-t1 +\DeclareFontShape{T1}{ETbb-Inf}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-inf-t1 }{} -\DeclareFontShape{T1}{ETbb-Inf}{bold}{sl}{ - <-> ssub * ETbb-Inf/bold/it +\DeclareFontShape{T1}{ETbb-Inf}{regular}{sl}{ + <-> ssub * ETbb-Inf/regular/it }{} % @@ -55,6 +55,10 @@ % m --> regular +\DeclareFontShape{T1}{ETbb-Inf}{m}{n}{ + <-> alias * ETbb-Inf/regular/n +}{} + \DeclareFontShape{T1}{ETbb-Inf}{m}{it}{ <-> alias * ETbb-Inf/regular/it }{} @@ -63,17 +67,9 @@ <-> alias * ETbb-Inf/regular/sl }{} -\DeclareFontShape{T1}{ETbb-Inf}{m}{n}{ - <-> alias * ETbb-Inf/regular/n -}{} - % b --> bold -\DeclareFontShape{T1}{ETbb-Inf}{b}{it}{ - <-> alias * ETbb-Inf/bold/it -}{} - \DeclareFontShape{T1}{ETbb-Inf}{b}{sl}{ <-> alias * ETbb-Inf/bold/sl }{} @@ -82,16 +78,20 @@ <-> alias * ETbb-Inf/bold/n }{} -\DeclareFontShape{T1}{ETbb-Inf}{bx}{n}{ - <-> ssub * ETbb-Inf/b/n +\DeclareFontShape{T1}{ETbb-Inf}{b}{it}{ + <-> alias * ETbb-Inf/bold/it +}{} + +\DeclareFontShape{T1}{ETbb-Inf}{bx}{sl}{ + <-> ssub * ETbb-Inf/b/sl }{} \DeclareFontShape{T1}{ETbb-Inf}{bx}{it}{ <-> ssub * ETbb-Inf/b/it }{} -\DeclareFontShape{T1}{ETbb-Inf}{bx}{sl}{ - <-> ssub * ETbb-Inf/b/sl +\DeclareFontShape{T1}{ETbb-Inf}{bx}{n}{ + <-> ssub * ETbb-Inf/b/n }{} \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd index 3f52b89b4b1..439d803e1e8 100644 --- a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd +++ b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/02/17 +%% Generated by autoinst on 2020/05/03 %% \ProvidesFile{T1ETbb-Sup.fd} - [2020/02/17 (autoinst) Font definitions for T1/ETbb-Sup.] + [2020/05/03 (autoinst) Font definitions for T1/ETbb-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -22,14 +22,14 @@ % ---- regular ---- -\DeclareFontShape{T1}{ETbb-Sup}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-sup-t1 -}{} - \DeclareFontShape{T1}{ETbb-Sup}{regular}{n}{ <-> \ETbb@@scale ETbb-Regular-sup-t1 }{} +\DeclareFontShape{T1}{ETbb-Sup}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-sup-t1 +}{} + \DeclareFontShape{T1}{ETbb-Sup}{regular}{sl}{ <-> ssub * ETbb-Sup/regular/it }{} @@ -55,6 +55,10 @@ % m --> regular +\DeclareFontShape{T1}{ETbb-Sup}{m}{n}{ + <-> alias * ETbb-Sup/regular/n +}{} + \DeclareFontShape{T1}{ETbb-Sup}{m}{it}{ <-> alias * ETbb-Sup/regular/it }{} @@ -63,10 +67,6 @@ <-> alias * ETbb-Sup/regular/sl }{} -\DeclareFontShape{T1}{ETbb-Sup}{m}{n}{ - <-> alias * ETbb-Sup/regular/n -}{} - % b --> bold @@ -74,16 +74,12 @@ <-> alias * ETbb-Sup/bold/it }{} -\DeclareFontShape{T1}{ETbb-Sup}{b}{sl}{ - <-> alias * ETbb-Sup/bold/sl -}{} - \DeclareFontShape{T1}{ETbb-Sup}{b}{n}{ <-> alias * ETbb-Sup/bold/n }{} -\DeclareFontShape{T1}{ETbb-Sup}{bx}{n}{ - <-> ssub * ETbb-Sup/b/n +\DeclareFontShape{T1}{ETbb-Sup}{b}{sl}{ + <-> alias * ETbb-Sup/bold/sl }{} \DeclareFontShape{T1}{ETbb-Sup}{bx}{sl}{ @@ -94,4 +90,8 @@ <-> ssub * ETbb-Sup/b/it }{} +\DeclareFontShape{T1}{ETbb-Sup}{bx}{n}{ + <-> ssub * ETbb-Sup/b/n +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd index 311a9e13b18..0b4590bc05d 100644 --- a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd +++ b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/02/17 +%% Generated by autoinst on 2020/05/03 %% \ProvidesFile{TS1ETbb-LF.fd} - [2020/02/17 (autoinst) Font definitions for TS1/ETbb-LF.] + [2020/05/03 (autoinst) Font definitions for TS1/ETbb-LF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -37,14 +37,14 @@ % ---- bold ---- -\DeclareFontShape{TS1}{ETbb-LF}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-lf-ts1 -}{} - \DeclareFontShape{TS1}{ETbb-LF}{bold}{n}{ <-> \ETbb@@scale ETbb-Bold-lf-ts1 }{} +\DeclareFontShape{TS1}{ETbb-LF}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-lf-ts1 +}{} + \DeclareFontShape{TS1}{ETbb-LF}{bold}{sl}{ <-> ssub * ETbb-LF/bold/it }{} @@ -59,17 +59,21 @@ <-> alias * ETbb-LF/regular/it }{} -\DeclareFontShape{TS1}{ETbb-LF}{m}{sl}{ - <-> alias * ETbb-LF/regular/sl -}{} - \DeclareFontShape{TS1}{ETbb-LF}{m}{n}{ <-> alias * ETbb-LF/regular/n }{} +\DeclareFontShape{TS1}{ETbb-LF}{m}{sl}{ + <-> alias * ETbb-LF/regular/sl +}{} + % b --> bold +\DeclareFontShape{TS1}{ETbb-LF}{b}{n}{ + <-> alias * ETbb-LF/bold/n +}{} + \DeclareFontShape{TS1}{ETbb-LF}{b}{it}{ <-> alias * ETbb-LF/bold/it }{} @@ -78,20 +82,16 @@ <-> alias * ETbb-LF/bold/sl }{} -\DeclareFontShape{TS1}{ETbb-LF}{b}{n}{ - <-> alias * ETbb-LF/bold/n -}{} - -\DeclareFontShape{TS1}{ETbb-LF}{bx}{sl}{ - <-> ssub * ETbb-LF/b/sl +\DeclareFontShape{TS1}{ETbb-LF}{bx}{n}{ + <-> ssub * ETbb-LF/b/n }{} \DeclareFontShape{TS1}{ETbb-LF}{bx}{it}{ <-> ssub * ETbb-LF/b/it }{} -\DeclareFontShape{TS1}{ETbb-LF}{bx}{n}{ - <-> ssub * ETbb-LF/b/n +\DeclareFontShape{TS1}{ETbb-LF}{bx}{sl}{ + <-> ssub * ETbb-LF/b/sl }{} \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd index a7fb626e79c..6824a0cf966 100644 --- a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd +++ b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/02/17 +%% Generated by autoinst on 2020/05/03 %% \ProvidesFile{TS1ETbb-OsF.fd} - [2020/02/17 (autoinst) Font definitions for TS1/ETbb-OsF.] + [2020/05/03 (autoinst) Font definitions for TS1/ETbb-OsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -37,14 +37,14 @@ % ---- regular ---- -\DeclareFontShape{TS1}{ETbb-OsF}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-osf-ts1 -}{} - \DeclareFontShape{TS1}{ETbb-OsF}{regular}{it}{ <-> \ETbb@@scale ETbb-Italic-osf-ts1 }{} +\DeclareFontShape{TS1}{ETbb-OsF}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-osf-ts1 +}{} + \DeclareFontShape{TS1}{ETbb-OsF}{regular}{sl}{ <-> ssub * ETbb-OsF/regular/it }{} @@ -59,14 +59,14 @@ <-> alias * ETbb-OsF/regular/it }{} -\DeclareFontShape{TS1}{ETbb-OsF}{m}{sl}{ - <-> alias * ETbb-OsF/regular/sl -}{} - \DeclareFontShape{TS1}{ETbb-OsF}{m}{n}{ <-> alias * ETbb-OsF/regular/n }{} +\DeclareFontShape{TS1}{ETbb-OsF}{m}{sl}{ + <-> alias * ETbb-OsF/regular/sl +}{} + % b --> bold @@ -82,16 +82,16 @@ <-> alias * ETbb-OsF/bold/n }{} -\DeclareFontShape{TS1}{ETbb-OsF}{bx}{n}{ - <-> ssub * ETbb-OsF/b/n +\DeclareFontShape{TS1}{ETbb-OsF}{bx}{sl}{ + <-> ssub * ETbb-OsF/b/sl }{} \DeclareFontShape{TS1}{ETbb-OsF}{bx}{it}{ <-> ssub * ETbb-OsF/b/it }{} -\DeclareFontShape{TS1}{ETbb-OsF}{bx}{sl}{ - <-> ssub * ETbb-OsF/b/sl +\DeclareFontShape{TS1}{ETbb-OsF}{bx}{n}{ + <-> ssub * ETbb-OsF/b/n }{} \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd index c9aeaedc3a5..91a0197778a 100644 --- a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd +++ b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/02/17 +%% Generated by autoinst on 2020/05/03 %% \ProvidesFile{TS1ETbb-TLF.fd} - [2020/02/17 (autoinst) Font definitions for TS1/ETbb-TLF.] + [2020/05/03 (autoinst) Font definitions for TS1/ETbb-TLF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,33 +20,33 @@ \DeclareFontFamily{TS1}{ETbb-TLF}{} -% ---- regular ---- +% ---- bold ---- -\DeclareFontShape{TS1}{ETbb-TLF}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-tlf-ts1 +\DeclareFontShape{TS1}{ETbb-TLF}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-tlf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-TLF}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-tlf-ts1 +\DeclareFontShape{TS1}{ETbb-TLF}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-TLF}{regular}{sl}{ - <-> ssub * ETbb-TLF/regular/it +\DeclareFontShape{TS1}{ETbb-TLF}{bold}{sl}{ + <-> ssub * ETbb-TLF/bold/it }{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{TS1}{ETbb-TLF}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-tlf-ts1 +\DeclareFontShape{TS1}{ETbb-TLF}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-tlf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-TLF}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-tlf-ts1 +\DeclareFontShape{TS1}{ETbb-TLF}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-tlf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-TLF}{bold}{sl}{ - <-> ssub * ETbb-TLF/bold/it +\DeclareFontShape{TS1}{ETbb-TLF}{regular}{sl}{ + <-> ssub * ETbb-TLF/regular/it }{} % @@ -55,14 +55,14 @@ % m --> regular -\DeclareFontShape{TS1}{ETbb-TLF}{m}{n}{ - <-> alias * ETbb-TLF/regular/n -}{} - \DeclareFontShape{TS1}{ETbb-TLF}{m}{it}{ <-> alias * ETbb-TLF/regular/it }{} +\DeclareFontShape{TS1}{ETbb-TLF}{m}{n}{ + <-> alias * ETbb-TLF/regular/n +}{} + \DeclareFontShape{TS1}{ETbb-TLF}{m}{sl}{ <-> alias * ETbb-TLF/regular/sl }{} @@ -74,16 +74,12 @@ <-> alias * ETbb-TLF/bold/n }{} -\DeclareFontShape{TS1}{ETbb-TLF}{b}{sl}{ - <-> alias * ETbb-TLF/bold/sl -}{} - \DeclareFontShape{TS1}{ETbb-TLF}{b}{it}{ <-> alias * ETbb-TLF/bold/it }{} -\DeclareFontShape{TS1}{ETbb-TLF}{bx}{n}{ - <-> ssub * ETbb-TLF/b/n +\DeclareFontShape{TS1}{ETbb-TLF}{b}{sl}{ + <-> alias * ETbb-TLF/bold/sl }{} \DeclareFontShape{TS1}{ETbb-TLF}{bx}{sl}{ @@ -94,4 +90,8 @@ <-> ssub * ETbb-TLF/b/it }{} +\DeclareFontShape{TS1}{ETbb-TLF}{bx}{n}{ + <-> ssub * ETbb-TLF/b/n +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd index 3c42e533e17..a1457269532 100644 --- a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd +++ b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/02/17 +%% Generated by autoinst on 2020/05/03 %% \ProvidesFile{TS1ETbb-TOsF.fd} - [2020/02/17 (autoinst) Font definitions for TS1/ETbb-TOsF.] + [2020/05/03 (autoinst) Font definitions for TS1/ETbb-TOsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -55,10 +55,6 @@ % m --> regular -\DeclareFontShape{TS1}{ETbb-TOsF}{m}{it}{ - <-> alias * ETbb-TOsF/regular/it -}{} - \DeclareFontShape{TS1}{ETbb-TOsF}{m}{sl}{ <-> alias * ETbb-TOsF/regular/sl }{} @@ -67,17 +63,21 @@ <-> alias * ETbb-TOsF/regular/n }{} +\DeclareFontShape{TS1}{ETbb-TOsF}{m}{it}{ + <-> alias * ETbb-TOsF/regular/it +}{} + % b --> bold -\DeclareFontShape{TS1}{ETbb-TOsF}{b}{n}{ - <-> alias * ETbb-TOsF/bold/n -}{} - \DeclareFontShape{TS1}{ETbb-TOsF}{b}{sl}{ <-> alias * ETbb-TOsF/bold/sl }{} +\DeclareFontShape{TS1}{ETbb-TOsF}{b}{n}{ + <-> alias * ETbb-TOsF/bold/n +}{} + \DeclareFontShape{TS1}{ETbb-TOsF}{b}{it}{ <-> alias * ETbb-TOsF/bold/it }{} @@ -86,12 +86,12 @@ <-> ssub * ETbb-TOsF/b/it }{} -\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{sl}{ - <-> ssub * ETbb-TOsF/b/sl -}{} - \DeclareFontShape{TS1}{ETbb-TOsF}{bx}{n}{ <-> ssub * ETbb-TOsF/b/n }{} +\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{sl}{ + <-> ssub * ETbb-TOsF/b/sl +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/etbb.fontspec b/Master/texmf-dist/tex/latex/etbb/etbb.fontspec deleted file mode 100644 index 789f3d3c27c..00000000000 --- a/Master/texmf-dist/tex/latex/etbb/etbb.fontspec +++ /dev/null @@ -1,8 +0,0 @@ -\defaultfontfeatures[ETbb] - { - Extension = .otf , - UprightFont = ETbb-Regular , - BoldFont = ETbb-Bold , - ItalicFont = ETbb-Italic , - BoldItalicFont = ETbb-BoldItalic , - } -- cgit v1.2.3