From 545097774851316dfcb923ebf87501026949a9b4 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 16 Jul 2020 03:02:38 +0000 Subject: CTAN sync 202007160302 --- fonts/cabin/latex/LGRCabin-Sup.fd | 239 ---------------------- fonts/cabin/latex/LGRCabin-TLF.fd | 419 -------------------------------------- fonts/cabin/latex/LY1Cabin-Sup.fd | 66 +++--- fonts/cabin/latex/LY1Cabin-TLF.fd | 168 +++++---------- fonts/cabin/latex/OT1Cabin-Sup.fd | 66 +++--- fonts/cabin/latex/OT1Cabin-TLF.fd | 168 +++++---------- fonts/cabin/latex/T1Cabin-Sup.fd | 66 +++--- fonts/cabin/latex/T1Cabin-TLF.fd | 168 +++++---------- fonts/cabin/latex/TS1Cabin-TLF.fd | 66 +++--- fonts/cabin/latex/cabin.sty | 31 ++- 10 files changed, 306 insertions(+), 1151 deletions(-) delete mode 100644 fonts/cabin/latex/LGRCabin-Sup.fd delete mode 100644 fonts/cabin/latex/LGRCabin-TLF.fd (limited to 'fonts/cabin/latex') diff --git a/fonts/cabin/latex/LGRCabin-Sup.fd b/fonts/cabin/latex/LGRCabin-Sup.fd deleted file mode 100644 index 781d3be9f5..0000000000 --- a/fonts/cabin/latex/LGRCabin-Sup.fd +++ /dev/null @@ -1,239 +0,0 @@ -%% Generated by autoinst on 2019/10/21 -%% -\ProvidesFile{LGRCabin-Sup.fd} - [2019/10/21 (autoinst) Font definitions for LGR/Cabin-Sup.] - -\expandafter\ifx\csname Cabin@scale\endcsname\relax - \let\Cabin@@scale\@empty -\else - \edef\Cabin@@scale{s*[\csname Cabin@scale\endcsname]}% -\fi - -\DeclareFontFamily{LGR}{Cabin-Sup}{} - - -% ---- regular ---- - -\DeclareFontShape{LGR}{Cabin-Sup}{regular}{n}{ - <-> \Cabin@@scale Cabin-Regular-sup-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{regular}{it}{ - <-> \Cabin@@scale Cabin-Italic-sup-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{regular}{sl}{ - <-> ssub * Cabin-Sup/regular/it -}{} - - -% ---- semibold ---- - -\DeclareFontShape{LGR}{Cabin-Sup}{semibold}{n}{ - <-> \Cabin@@scale Cabin-SemiBold-sup-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{semibold}{it}{ - <-> \Cabin@@scale Cabin-SemiBoldItalic-sup-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{semibold}{sl}{ - <-> ssub * Cabin-Sup/semibold/it -}{} - - -% ---- bold ---- - -\DeclareFontShape{LGR}{Cabin-Sup}{bold}{n}{ - <-> \Cabin@@scale Cabin-Bold-sup-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{bold}{it}{ - <-> \Cabin@@scale Cabin-BoldItalic-sup-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{bold}{sl}{ - <-> ssub * Cabin-Sup/bold/it -}{} - - -% ---- boldcondensed ---- - -\DeclareFontShape{LGR}{Cabin-Sup}{boldcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Bold-sup-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{boldcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-BoldItalic-sup-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{boldcondensed}{sl}{ - <-> ssub * Cabin-Sup/boldcondensed/it -}{} - - -% ---- condensed ---- - -\DeclareFontShape{LGR}{Cabin-Sup}{condensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Regular-sup-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{condensed}{it}{ - <-> \Cabin@@scale CabinCondensed-Italic-sup-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{condensed}{sl}{ - <-> ssub * Cabin-Sup/condensed/it -}{} - - -% ---- medium ---- - -\DeclareFontShape{LGR}{Cabin-Sup}{medium}{n}{ - <-> \Cabin@@scale Cabin-Medium-sup-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{medium}{it}{ - <-> \Cabin@@scale Cabin-MediumItalic-sup-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{medium}{sl}{ - <-> ssub * Cabin-Sup/medium/it -}{} - - -% ---- mediumcondensed ---- - -\DeclareFontShape{LGR}{Cabin-Sup}{mediumcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Medium-sup-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{mediumcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-MediumItalic-sup-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{mediumcondensed}{sl}{ - <-> ssub * Cabin-Sup/mediumcondensed/it -}{} - - -% ---- semiboldcondensed ---- - -\DeclareFontShape{LGR}{Cabin-Sup}{semiboldcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-SemiBold-sup-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{semiboldcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-sup-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{semiboldcondensed}{sl}{ - <-> ssub * Cabin-Sup/semiboldcondensed/it -}{} - -% -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names -% - -% c --> condensed - -\DeclareFontShape{LGR}{Cabin-Sup}{c}{sl}{ - <-> ssub * Cabin-Sup/condensed/sl -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{c}{n}{ - <-> ssub * Cabin-Sup/condensed/n -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{c}{it}{ - <-> ssub * Cabin-Sup/condensed/it -}{} - - -% m --> regular - -\DeclareFontShape{LGR}{Cabin-Sup}{m}{sl}{ - <-> ssub * Cabin-Sup/regular/sl -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{m}{n}{ - <-> ssub * Cabin-Sup/regular/n -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{m}{it}{ - <-> ssub * Cabin-Sup/regular/it -}{} - - -% sbc --> semiboldcondensed - -\DeclareFontShape{LGR}{Cabin-Sup}{sbc}{sl}{ - <-> ssub * Cabin-Sup/semiboldcondensed/sl -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{sbc}{n}{ - <-> ssub * Cabin-Sup/semiboldcondensed/n -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{sbc}{it}{ - <-> ssub * Cabin-Sup/semiboldcondensed/it -}{} - - -% sb --> semibold - -\DeclareFontShape{LGR}{Cabin-Sup}{sb}{sl}{ - <-> ssub * Cabin-Sup/semibold/sl -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{sb}{n}{ - <-> ssub * Cabin-Sup/semibold/n -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{sb}{it}{ - <-> ssub * Cabin-Sup/semibold/it -}{} - - -% bc --> boldcondensed - -\DeclareFontShape{LGR}{Cabin-Sup}{bc}{sl}{ - <-> ssub * Cabin-Sup/boldcondensed/sl -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{bc}{n}{ - <-> ssub * Cabin-Sup/boldcondensed/n -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{bc}{it}{ - <-> ssub * Cabin-Sup/boldcondensed/it -}{} - - -% b --> bold - -\DeclareFontShape{LGR}{Cabin-Sup}{b}{sl}{ - <-> ssub * Cabin-Sup/bold/sl -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{b}{n}{ - <-> ssub * Cabin-Sup/bold/n -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{b}{it}{ - <-> ssub * Cabin-Sup/bold/it -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{bx}{n}{ - <-> ssub * Cabin-Sup/b/n -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{bx}{sl}{ - <-> ssub * Cabin-Sup/b/sl -}{} - -\DeclareFontShape{LGR}{Cabin-Sup}{bx}{it}{ - <-> ssub * Cabin-Sup/b/it -}{} - -\endinput diff --git a/fonts/cabin/latex/LGRCabin-TLF.fd b/fonts/cabin/latex/LGRCabin-TLF.fd deleted file mode 100644 index 7fd939ed01..0000000000 --- a/fonts/cabin/latex/LGRCabin-TLF.fd +++ /dev/null @@ -1,419 +0,0 @@ -%% Generated by autoinst on 2019/10/21 -%% -\ProvidesFile{LGRCabin-TLF.fd} - [2019/10/21 (autoinst) Font definitions for LGR/Cabin-TLF.] - -\expandafter\ifx\csname Cabin@scale\endcsname\relax - \let\Cabin@@scale\@empty -\else - \edef\Cabin@@scale{s*[\csname Cabin@scale\endcsname]}% -\fi - -\DeclareFontFamily{LGR}{Cabin-TLF}{} - - -% ---- regular ---- - -\DeclareFontShape{LGR}{Cabin-TLF}{regular}{sc}{ - <-> \Cabin@@scale Cabin-Regular-tlf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{regular}{n}{ - <-> \Cabin@@scale Cabin-Regular-tlf-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{regular}{it}{ - <-> \Cabin@@scale Cabin-Italic-tlf-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{regular}{scit}{ - <-> \Cabin@@scale Cabin-Italic-tlf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{regular}{scsl}{ - <-> ssub * Cabin-TLF/regular/scit -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{regular}{sl}{ - <-> ssub * Cabin-TLF/regular/it -}{} - - -% ---- semibold ---- - -\DeclareFontShape{LGR}{Cabin-TLF}{semibold}{sc}{ - <-> \Cabin@@scale Cabin-SemiBold-tlf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{semibold}{n}{ - <-> \Cabin@@scale Cabin-SemiBold-tlf-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{semibold}{it}{ - <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{semibold}{scit}{ - <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{semibold}{scsl}{ - <-> ssub * Cabin-TLF/semibold/scit -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{semibold}{sl}{ - <-> ssub * Cabin-TLF/semibold/it -}{} - - -% ---- bold ---- - -\DeclareFontShape{LGR}{Cabin-TLF}{bold}{sc}{ - <-> \Cabin@@scale Cabin-Bold-tlf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{bold}{n}{ - <-> \Cabin@@scale Cabin-Bold-tlf-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{bold}{it}{ - <-> \Cabin@@scale Cabin-BoldItalic-tlf-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{bold}{scit}{ - <-> \Cabin@@scale Cabin-BoldItalic-tlf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{bold}{scsl}{ - <-> ssub * Cabin-TLF/bold/scit -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{bold}{sl}{ - <-> ssub * Cabin-TLF/bold/it -}{} - - -% ---- boldcondensed ---- - -\DeclareFontShape{LGR}{Cabin-TLF}{boldcondensed}{sc}{ - <-> \Cabin@@scale CabinCondensed-Bold-tlf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{boldcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Bold-tlf-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{boldcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{boldcondensed}{scit}{ - <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{boldcondensed}{scsl}{ - <-> ssub * Cabin-TLF/boldcondensed/scit -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{boldcondensed}{sl}{ - <-> ssub * Cabin-TLF/boldcondensed/it -}{} - - -% ---- condensed ---- - -\DeclareFontShape{LGR}{Cabin-TLF}{condensed}{sc}{ - <-> \Cabin@@scale CabinCondensed-Regular-tlf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{condensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Regular-tlf-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{condensed}{it}{ - <-> \Cabin@@scale CabinCondensed-Italic-tlf-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{condensed}{scit}{ - <-> \Cabin@@scale CabinCondensed-Italic-tlf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{condensed}{scsl}{ - <-> ssub * Cabin-TLF/condensed/scit -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{condensed}{sl}{ - <-> ssub * Cabin-TLF/condensed/it -}{} - - -% ---- medium ---- - -\DeclareFontShape{LGR}{Cabin-TLF}{medium}{sc}{ - <-> \Cabin@@scale Cabin-Medium-tlf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{medium}{n}{ - <-> \Cabin@@scale Cabin-Medium-tlf-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{medium}{it}{ - <-> \Cabin@@scale Cabin-MediumItalic-tlf-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{medium}{scit}{ - <-> \Cabin@@scale Cabin-MediumItalic-tlf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{medium}{scsl}{ - <-> ssub * Cabin-TLF/medium/scit -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{medium}{sl}{ - <-> ssub * Cabin-TLF/medium/it -}{} - - -% ---- mediumcondensed ---- - -\DeclareFontShape{LGR}{Cabin-TLF}{mediumcondensed}{sc}{ - <-> \Cabin@@scale CabinCondensed-Medium-tlf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{mediumcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Medium-tlf-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{mediumcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{mediumcondensed}{scit}{ - <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{mediumcondensed}{scsl}{ - <-> ssub * Cabin-TLF/mediumcondensed/scit -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{mediumcondensed}{sl}{ - <-> ssub * Cabin-TLF/mediumcondensed/it -}{} - - -% ---- semiboldcondensed ---- - -\DeclareFontShape{LGR}{Cabin-TLF}{semiboldcondensed}{sc}{ - <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{semiboldcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{semiboldcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{semiboldcondensed}{scit}{ - <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{semiboldcondensed}{scsl}{ - <-> ssub * Cabin-TLF/semiboldcondensed/scit -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{semiboldcondensed}{sl}{ - <-> ssub * Cabin-TLF/semiboldcondensed/it -}{} - -% -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names -% - -% c --> condensed - -\DeclareFontShape{LGR}{Cabin-TLF}{c}{sl}{ - <-> ssub * Cabin-TLF/condensed/sl -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{c}{scsl}{ - <-> ssub * Cabin-TLF/condensed/scsl -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{c}{sc}{ - <-> ssub * Cabin-TLF/condensed/sc -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{c}{n}{ - <-> ssub * Cabin-TLF/condensed/n -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{c}{it}{ - <-> ssub * Cabin-TLF/condensed/it -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{c}{scit}{ - <-> ssub * Cabin-TLF/condensed/scit -}{} - - -% m --> regular - -\DeclareFontShape{LGR}{Cabin-TLF}{m}{sl}{ - <-> ssub * Cabin-TLF/regular/sl -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{m}{scsl}{ - <-> ssub * Cabin-TLF/regular/scsl -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{m}{sc}{ - <-> ssub * Cabin-TLF/regular/sc -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{m}{n}{ - <-> ssub * Cabin-TLF/regular/n -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{m}{it}{ - <-> ssub * Cabin-TLF/regular/it -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{m}{scit}{ - <-> ssub * Cabin-TLF/regular/scit -}{} - - -% sbc --> semiboldcondensed - -\DeclareFontShape{LGR}{Cabin-TLF}{sbc}{sl}{ - <-> ssub * Cabin-TLF/semiboldcondensed/sl -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{sbc}{scsl}{ - <-> ssub * Cabin-TLF/semiboldcondensed/scsl -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{sbc}{sc}{ - <-> ssub * Cabin-TLF/semiboldcondensed/sc -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{sbc}{n}{ - <-> ssub * Cabin-TLF/semiboldcondensed/n -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{sbc}{it}{ - <-> ssub * Cabin-TLF/semiboldcondensed/it -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{sbc}{scit}{ - <-> ssub * Cabin-TLF/semiboldcondensed/scit -}{} - - -% sb --> semibold - -\DeclareFontShape{LGR}{Cabin-TLF}{sb}{sl}{ - <-> ssub * Cabin-TLF/semibold/sl -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{sb}{scsl}{ - <-> ssub * Cabin-TLF/semibold/scsl -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{sb}{sc}{ - <-> ssub * Cabin-TLF/semibold/sc -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{sb}{n}{ - <-> ssub * Cabin-TLF/semibold/n -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{sb}{it}{ - <-> ssub * Cabin-TLF/semibold/it -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{sb}{scit}{ - <-> ssub * Cabin-TLF/semibold/scit -}{} - - -% bc --> boldcondensed - -\DeclareFontShape{LGR}{Cabin-TLF}{bc}{sl}{ - <-> ssub * Cabin-TLF/boldcondensed/sl -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{bc}{scsl}{ - <-> ssub * Cabin-TLF/boldcondensed/scsl -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{bc}{sc}{ - <-> ssub * Cabin-TLF/boldcondensed/sc -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{bc}{n}{ - <-> ssub * Cabin-TLF/boldcondensed/n -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{bc}{it}{ - <-> ssub * Cabin-TLF/boldcondensed/it -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{bc}{scit}{ - <-> ssub * Cabin-TLF/boldcondensed/scit -}{} - - -% b --> bold - -\DeclareFontShape{LGR}{Cabin-TLF}{b}{sl}{ - <-> ssub * Cabin-TLF/bold/sl -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{b}{scsl}{ - <-> ssub * Cabin-TLF/bold/scsl -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{b}{sc}{ - <-> ssub * Cabin-TLF/bold/sc -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{b}{n}{ - <-> ssub * Cabin-TLF/bold/n -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{b}{it}{ - <-> ssub * Cabin-TLF/bold/it -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{b}{scit}{ - <-> ssub * Cabin-TLF/bold/scit -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{bx}{n}{ - <-> ssub * Cabin-TLF/b/n -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{bx}{sc}{ - <-> ssub * Cabin-TLF/b/sc -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{bx}{scsl}{ - <-> ssub * Cabin-TLF/b/scsl -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{bx}{sl}{ - <-> ssub * Cabin-TLF/b/sl -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{bx}{it}{ - <-> ssub * Cabin-TLF/b/it -}{} - -\DeclareFontShape{LGR}{Cabin-TLF}{bx}{scit}{ - <-> ssub * Cabin-TLF/b/scit -}{} - -\endinput diff --git a/fonts/cabin/latex/LY1Cabin-Sup.fd b/fonts/cabin/latex/LY1Cabin-Sup.fd index f686c60dbb..63352bcb76 100644 --- a/fonts/cabin/latex/LY1Cabin-Sup.fd +++ b/fonts/cabin/latex/LY1Cabin-Sup.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/10/21 +%% Generated by autoinst on 2020/07/15 %% \ProvidesFile{LY1Cabin-Sup.fd} - [2019/10/21 (autoinst) Font definitions for LY1/Cabin-Sup.] + [2020/07/15 (autoinst) Font definitions for LY1/Cabin-Sup.] + +\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 Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -60,11 +68,11 @@ % ---- boldcondensed ---- \DeclareFontShape{LY1}{Cabin-Sup}{boldcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Bold-sup-ly1 + <-> \Cabin@@scale CabinCondensed-BoldCondensed-sup-ly1 }{} \DeclareFontShape{LY1}{Cabin-Sup}{boldcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-BoldItalic-sup-ly1 + <-> \Cabin@@scale CabinCondensed-BoldItalicCondensed-sup-ly1 }{} \DeclareFontShape{LY1}{Cabin-Sup}{boldcondensed}{sl}{ @@ -75,11 +83,11 @@ % ---- condensed ---- \DeclareFontShape{LY1}{Cabin-Sup}{condensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Regular-sup-ly1 + <-> \Cabin@@scale CabinCondensed-RegularCondensed-sup-ly1 }{} \DeclareFontShape{LY1}{Cabin-Sup}{condensed}{it}{ - <-> \Cabin@@scale CabinCondensed-Italic-sup-ly1 + <-> \Cabin@@scale CabinCondensed-ItalicCondensed-sup-ly1 }{} \DeclareFontShape{LY1}{Cabin-Sup}{condensed}{sl}{ @@ -105,11 +113,11 @@ % ---- mediumcondensed ---- \DeclareFontShape{LY1}{Cabin-Sup}{mediumcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Medium-sup-ly1 + <-> \Cabin@@scale CabinCondensed-MediumCondensed-sup-ly1 }{} \DeclareFontShape{LY1}{Cabin-Sup}{mediumcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-MediumItalic-sup-ly1 + <-> \Cabin@@scale CabinCondensed-MediumItalicCondensed-sup-ly1 }{} \DeclareFontShape{LY1}{Cabin-Sup}{mediumcondensed}{sl}{ @@ -120,11 +128,11 @@ % ---- semiboldcondensed ---- \DeclareFontShape{LY1}{Cabin-Sup}{semiboldcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-SemiBold-sup-ly1 + <-> \Cabin@@scale CabinCondensed-SemiBoldCondensed-sup-ly1 }{} \DeclareFontShape{LY1}{Cabin-Sup}{semiboldcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-sup-ly1 + <-> \Cabin@@scale CabinCondensed-SemiboldItalicCondensed-sup-ly1 }{} \DeclareFontShape{LY1}{Cabin-Sup}{semiboldcondensed}{sl}{ @@ -132,96 +140,96 @@ }{} % -% 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 % % c --> condensed \DeclareFontShape{LY1}{Cabin-Sup}{c}{sl}{ - <-> ssub * Cabin-Sup/condensed/sl + <-> alias * Cabin-Sup/condensed/sl }{} \DeclareFontShape{LY1}{Cabin-Sup}{c}{n}{ - <-> ssub * Cabin-Sup/condensed/n + <-> alias * Cabin-Sup/condensed/n }{} \DeclareFontShape{LY1}{Cabin-Sup}{c}{it}{ - <-> ssub * Cabin-Sup/condensed/it + <-> alias * Cabin-Sup/condensed/it }{} % m --> regular \DeclareFontShape{LY1}{Cabin-Sup}{m}{sl}{ - <-> ssub * Cabin-Sup/regular/sl + <-> alias * Cabin-Sup/regular/sl }{} \DeclareFontShape{LY1}{Cabin-Sup}{m}{n}{ - <-> ssub * Cabin-Sup/regular/n + <-> alias * Cabin-Sup/regular/n }{} \DeclareFontShape{LY1}{Cabin-Sup}{m}{it}{ - <-> ssub * Cabin-Sup/regular/it + <-> alias * Cabin-Sup/regular/it }{} % sbc --> semiboldcondensed \DeclareFontShape{LY1}{Cabin-Sup}{sbc}{sl}{ - <-> ssub * Cabin-Sup/semiboldcondensed/sl + <-> alias * Cabin-Sup/semiboldcondensed/sl }{} \DeclareFontShape{LY1}{Cabin-Sup}{sbc}{n}{ - <-> ssub * Cabin-Sup/semiboldcondensed/n + <-> alias * Cabin-Sup/semiboldcondensed/n }{} \DeclareFontShape{LY1}{Cabin-Sup}{sbc}{it}{ - <-> ssub * Cabin-Sup/semiboldcondensed/it + <-> alias * Cabin-Sup/semiboldcondensed/it }{} % sb --> semibold \DeclareFontShape{LY1}{Cabin-Sup}{sb}{sl}{ - <-> ssub * Cabin-Sup/semibold/sl + <-> alias * Cabin-Sup/semibold/sl }{} \DeclareFontShape{LY1}{Cabin-Sup}{sb}{n}{ - <-> ssub * Cabin-Sup/semibold/n + <-> alias * Cabin-Sup/semibold/n }{} \DeclareFontShape{LY1}{Cabin-Sup}{sb}{it}{ - <-> ssub * Cabin-Sup/semibold/it + <-> alias * Cabin-Sup/semibold/it }{} % bc --> boldcondensed \DeclareFontShape{LY1}{Cabin-Sup}{bc}{sl}{ - <-> ssub * Cabin-Sup/boldcondensed/sl + <-> alias * Cabin-Sup/boldcondensed/sl }{} \DeclareFontShape{LY1}{Cabin-Sup}{bc}{n}{ - <-> ssub * Cabin-Sup/boldcondensed/n + <-> alias * Cabin-Sup/boldcondensed/n }{} \DeclareFontShape{LY1}{Cabin-Sup}{bc}{it}{ - <-> ssub * Cabin-Sup/boldcondensed/it + <-> alias * Cabin-Sup/boldcondensed/it }{} % b --> bold \DeclareFontShape{LY1}{Cabin-Sup}{b}{sl}{ - <-> ssub * Cabin-Sup/bold/sl + <-> alias * Cabin-Sup/bold/sl }{} \DeclareFontShape{LY1}{Cabin-Sup}{b}{n}{ - <-> ssub * Cabin-Sup/bold/n + <-> alias * Cabin-Sup/bold/n }{} \DeclareFontShape{LY1}{Cabin-Sup}{b}{it}{ - <-> ssub * Cabin-Sup/bold/it + <-> alias * Cabin-Sup/bold/it }{} \DeclareFontShape{LY1}{Cabin-Sup}{bx}{n}{ diff --git a/fonts/cabin/latex/LY1Cabin-TLF.fd b/fonts/cabin/latex/LY1Cabin-TLF.fd index 1532107967..28ff26bc34 100644 --- a/fonts/cabin/latex/LY1Cabin-TLF.fd +++ b/fonts/cabin/latex/LY1Cabin-TLF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/10/21 +%% Generated by autoinst on 2020/07/15 %% \ProvidesFile{LY1Cabin-TLF.fd} - [2019/10/21 (autoinst) Font definitions for LY1/Cabin-TLF.] + [2020/07/15 (autoinst) Font definitions for LY1/Cabin-TLF.] + +\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 Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -95,24 +103,12 @@ % ---- boldcondensed ---- -\DeclareFontShape{LY1}{Cabin-TLF}{boldcondensed}{sc}{ - <-> \Cabin@@scale CabinCondensed-Bold-tlf-sc-ly1 -}{} - \DeclareFontShape{LY1}{Cabin-TLF}{boldcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Bold-tlf-ly1 + <-> \Cabin@@scale CabinCondensed-BoldCondensed-tlf-ly1 }{} \DeclareFontShape{LY1}{Cabin-TLF}{boldcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-ly1 -}{} - -\DeclareFontShape{LY1}{Cabin-TLF}{boldcondensed}{scit}{ - <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-sc-ly1 -}{} - -\DeclareFontShape{LY1}{Cabin-TLF}{boldcondensed}{scsl}{ - <-> ssub * Cabin-TLF/boldcondensed/scit + <-> \Cabin@@scale CabinCondensed-BoldItalicCondensed-tlf-ly1 }{} \DeclareFontShape{LY1}{Cabin-TLF}{boldcondensed}{sl}{ @@ -122,24 +118,12 @@ % ---- condensed ---- -\DeclareFontShape{LY1}{Cabin-TLF}{condensed}{sc}{ - <-> \Cabin@@scale CabinCondensed-Regular-tlf-sc-ly1 -}{} - \DeclareFontShape{LY1}{Cabin-TLF}{condensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Regular-tlf-ly1 + <-> \Cabin@@scale CabinCondensed-RegularCondensed-tlf-ly1 }{} \DeclareFontShape{LY1}{Cabin-TLF}{condensed}{it}{ - <-> \Cabin@@scale CabinCondensed-Italic-tlf-ly1 -}{} - -\DeclareFontShape{LY1}{Cabin-TLF}{condensed}{scit}{ - <-> \Cabin@@scale CabinCondensed-Italic-tlf-sc-ly1 -}{} - -\DeclareFontShape{LY1}{Cabin-TLF}{condensed}{scsl}{ - <-> ssub * Cabin-TLF/condensed/scit + <-> \Cabin@@scale CabinCondensed-ItalicCondensed-tlf-ly1 }{} \DeclareFontShape{LY1}{Cabin-TLF}{condensed}{sl}{ @@ -176,24 +160,12 @@ % ---- mediumcondensed ---- -\DeclareFontShape{LY1}{Cabin-TLF}{mediumcondensed}{sc}{ - <-> \Cabin@@scale CabinCondensed-Medium-tlf-sc-ly1 -}{} - \DeclareFontShape{LY1}{Cabin-TLF}{mediumcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Medium-tlf-ly1 + <-> \Cabin@@scale CabinCondensed-MediumCondensed-tlf-ly1 }{} \DeclareFontShape{LY1}{Cabin-TLF}{mediumcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-ly1 -}{} - -\DeclareFontShape{LY1}{Cabin-TLF}{mediumcondensed}{scit}{ - <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-sc-ly1 -}{} - -\DeclareFontShape{LY1}{Cabin-TLF}{mediumcondensed}{scsl}{ - <-> ssub * Cabin-TLF/mediumcondensed/scit + <-> \Cabin@@scale CabinCondensed-MediumItalicCondensed-tlf-ly1 }{} \DeclareFontShape{LY1}{Cabin-TLF}{mediumcondensed}{sl}{ @@ -203,24 +175,12 @@ % ---- semiboldcondensed ---- -\DeclareFontShape{LY1}{Cabin-TLF}{semiboldcondensed}{sc}{ - <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-sc-ly1 -}{} - \DeclareFontShape{LY1}{Cabin-TLF}{semiboldcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-ly1 + <-> \Cabin@@scale CabinCondensed-SemiBoldCondensed-tlf-ly1 }{} \DeclareFontShape{LY1}{Cabin-TLF}{semiboldcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-ly1 -}{} - -\DeclareFontShape{LY1}{Cabin-TLF}{semiboldcondensed}{scit}{ - <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-sc-ly1 -}{} - -\DeclareFontShape{LY1}{Cabin-TLF}{semiboldcondensed}{scsl}{ - <-> ssub * Cabin-TLF/semiboldcondensed/scit + <-> \Cabin@@scale CabinCondensed-SemiboldItalicCondensed-tlf-ly1 }{} \DeclareFontShape{LY1}{Cabin-TLF}{semiboldcondensed}{sl}{ @@ -228,168 +188,132 @@ }{} % -% 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 % % c --> condensed \DeclareFontShape{LY1}{Cabin-TLF}{c}{sl}{ - <-> ssub * Cabin-TLF/condensed/sl -}{} - -\DeclareFontShape{LY1}{Cabin-TLF}{c}{scsl}{ - <-> ssub * Cabin-TLF/condensed/scsl -}{} - -\DeclareFontShape{LY1}{Cabin-TLF}{c}{sc}{ - <-> ssub * Cabin-TLF/condensed/sc + <-> alias * Cabin-TLF/condensed/sl }{} \DeclareFontShape{LY1}{Cabin-TLF}{c}{n}{ - <-> ssub * Cabin-TLF/condensed/n + <-> alias * Cabin-TLF/condensed/n }{} \DeclareFontShape{LY1}{Cabin-TLF}{c}{it}{ - <-> ssub * Cabin-TLF/condensed/it -}{} - -\DeclareFontShape{LY1}{Cabin-TLF}{c}{scit}{ - <-> ssub * Cabin-TLF/condensed/scit + <-> alias * Cabin-TLF/condensed/it }{} % m --> regular \DeclareFontShape{LY1}{Cabin-TLF}{m}{sl}{ - <-> ssub * Cabin-TLF/regular/sl + <-> alias * Cabin-TLF/regular/sl }{} \DeclareFontShape{LY1}{Cabin-TLF}{m}{scsl}{ - <-> ssub * Cabin-TLF/regular/scsl + <-> alias * Cabin-TLF/regular/scsl }{} \DeclareFontShape{LY1}{Cabin-TLF}{m}{sc}{ - <-> ssub * Cabin-TLF/regular/sc + <-> alias * Cabin-TLF/regular/sc }{} \DeclareFontShape{LY1}{Cabin-TLF}{m}{n}{ - <-> ssub * Cabin-TLF/regular/n + <-> alias * Cabin-TLF/regular/n }{} \DeclareFontShape{LY1}{Cabin-TLF}{m}{it}{ - <-> ssub * Cabin-TLF/regular/it + <-> alias * Cabin-TLF/regular/it }{} \DeclareFontShape{LY1}{Cabin-TLF}{m}{scit}{ - <-> ssub * Cabin-TLF/regular/scit + <-> alias * Cabin-TLF/regular/scit }{} % sbc --> semiboldcondensed \DeclareFontShape{LY1}{Cabin-TLF}{sbc}{sl}{ - <-> ssub * Cabin-TLF/semiboldcondensed/sl -}{} - -\DeclareFontShape{LY1}{Cabin-TLF}{sbc}{scsl}{ - <-> ssub * Cabin-TLF/semiboldcondensed/scsl -}{} - -\DeclareFontShape{LY1}{Cabin-TLF}{sbc}{sc}{ - <-> ssub * Cabin-TLF/semiboldcondensed/sc + <-> alias * Cabin-TLF/semiboldcondensed/sl }{} \DeclareFontShape{LY1}{Cabin-TLF}{sbc}{n}{ - <-> ssub * Cabin-TLF/semiboldcondensed/n + <-> alias * Cabin-TLF/semiboldcondensed/n }{} \DeclareFontShape{LY1}{Cabin-TLF}{sbc}{it}{ - <-> ssub * Cabin-TLF/semiboldcondensed/it -}{} - -\DeclareFontShape{LY1}{Cabin-TLF}{sbc}{scit}{ - <-> ssub * Cabin-TLF/semiboldcondensed/scit + <-> alias * Cabin-TLF/semiboldcondensed/it }{} % sb --> semibold \DeclareFontShape{LY1}{Cabin-TLF}{sb}{sl}{ - <-> ssub * Cabin-TLF/semibold/sl + <-> alias * Cabin-TLF/semibold/sl }{} \DeclareFontShape{LY1}{Cabin-TLF}{sb}{scsl}{ - <-> ssub * Cabin-TLF/semibold/scsl + <-> alias * Cabin-TLF/semibold/scsl }{} \DeclareFontShape{LY1}{Cabin-TLF}{sb}{sc}{ - <-> ssub * Cabin-TLF/semibold/sc + <-> alias * Cabin-TLF/semibold/sc }{} \DeclareFontShape{LY1}{Cabin-TLF}{sb}{n}{ - <-> ssub * Cabin-TLF/semibold/n + <-> alias * Cabin-TLF/semibold/n }{} \DeclareFontShape{LY1}{Cabin-TLF}{sb}{it}{ - <-> ssub * Cabin-TLF/semibold/it + <-> alias * Cabin-TLF/semibold/it }{} \DeclareFontShape{LY1}{Cabin-TLF}{sb}{scit}{ - <-> ssub * Cabin-TLF/semibold/scit + <-> alias * Cabin-TLF/semibold/scit }{} % bc --> boldcondensed \DeclareFontShape{LY1}{Cabin-TLF}{bc}{sl}{ - <-> ssub * Cabin-TLF/boldcondensed/sl -}{} - -\DeclareFontShape{LY1}{Cabin-TLF}{bc}{scsl}{ - <-> ssub * Cabin-TLF/boldcondensed/scsl -}{} - -\DeclareFontShape{LY1}{Cabin-TLF}{bc}{sc}{ - <-> ssub * Cabin-TLF/boldcondensed/sc + <-> alias * Cabin-TLF/boldcondensed/sl }{} \DeclareFontShape{LY1}{Cabin-TLF}{bc}{n}{ - <-> ssub * Cabin-TLF/boldcondensed/n + <-> alias * Cabin-TLF/boldcondensed/n }{} \DeclareFontShape{LY1}{Cabin-TLF}{bc}{it}{ - <-> ssub * Cabin-TLF/boldcondensed/it -}{} - -\DeclareFontShape{LY1}{Cabin-TLF}{bc}{scit}{ - <-> ssub * Cabin-TLF/boldcondensed/scit + <-> alias * Cabin-TLF/boldcondensed/it }{} % b --> bold \DeclareFontShape{LY1}{Cabin-TLF}{b}{sl}{ - <-> ssub * Cabin-TLF/bold/sl + <-> alias * Cabin-TLF/bold/sl }{} \DeclareFontShape{LY1}{Cabin-TLF}{b}{scsl}{ - <-> ssub * Cabin-TLF/bold/scsl + <-> alias * Cabin-TLF/bold/scsl }{} \DeclareFontShape{LY1}{Cabin-TLF}{b}{sc}{ - <-> ssub * Cabin-TLF/bold/sc + <-> alias * Cabin-TLF/bold/sc }{} \DeclareFontShape{LY1}{Cabin-TLF}{b}{n}{ - <-> ssub * Cabin-TLF/bold/n + <-> alias * Cabin-TLF/bold/n }{} \DeclareFontShape{LY1}{Cabin-TLF}{b}{it}{ - <-> ssub * Cabin-TLF/bold/it + <-> alias * Cabin-TLF/bold/it }{} \DeclareFontShape{LY1}{Cabin-TLF}{b}{scit}{ - <-> ssub * Cabin-TLF/bold/scit + <-> alias * Cabin-TLF/bold/scit }{} \DeclareFontShape{LY1}{Cabin-TLF}{bx}{n}{ diff --git a/fonts/cabin/latex/OT1Cabin-Sup.fd b/fonts/cabin/latex/OT1Cabin-Sup.fd index eb6f39195e..7b9dcd1c78 100644 --- a/fonts/cabin/latex/OT1Cabin-Sup.fd +++ b/fonts/cabin/latex/OT1Cabin-Sup.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/10/21 +%% Generated by autoinst on 2020/07/15 %% \ProvidesFile{OT1Cabin-Sup.fd} - [2019/10/21 (autoinst) Font definitions for OT1/Cabin-Sup.] + [2020/07/15 (autoinst) Font definitions for OT1/Cabin-Sup.] + +\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 Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -60,11 +68,11 @@ % ---- boldcondensed ---- \DeclareFontShape{OT1}{Cabin-Sup}{boldcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Bold-sup-ot1 + <-> \Cabin@@scale CabinCondensed-BoldCondensed-sup-ot1 }{} \DeclareFontShape{OT1}{Cabin-Sup}{boldcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-BoldItalic-sup-ot1 + <-> \Cabin@@scale CabinCondensed-BoldItalicCondensed-sup-ot1 }{} \DeclareFontShape{OT1}{Cabin-Sup}{boldcondensed}{sl}{ @@ -75,11 +83,11 @@ % ---- condensed ---- \DeclareFontShape{OT1}{Cabin-Sup}{condensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Regular-sup-ot1 + <-> \Cabin@@scale CabinCondensed-RegularCondensed-sup-ot1 }{} \DeclareFontShape{OT1}{Cabin-Sup}{condensed}{it}{ - <-> \Cabin@@scale CabinCondensed-Italic-sup-ot1 + <-> \Cabin@@scale CabinCondensed-ItalicCondensed-sup-ot1 }{} \DeclareFontShape{OT1}{Cabin-Sup}{condensed}{sl}{ @@ -105,11 +113,11 @@ % ---- mediumcondensed ---- \DeclareFontShape{OT1}{Cabin-Sup}{mediumcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Medium-sup-ot1 + <-> \Cabin@@scale CabinCondensed-MediumCondensed-sup-ot1 }{} \DeclareFontShape{OT1}{Cabin-Sup}{mediumcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-MediumItalic-sup-ot1 + <-> \Cabin@@scale CabinCondensed-MediumItalicCondensed-sup-ot1 }{} \DeclareFontShape{OT1}{Cabin-Sup}{mediumcondensed}{sl}{ @@ -120,11 +128,11 @@ % ---- semiboldcondensed ---- \DeclareFontShape{OT1}{Cabin-Sup}{semiboldcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-SemiBold-sup-ot1 + <-> \Cabin@@scale CabinCondensed-SemiBoldCondensed-sup-ot1 }{} \DeclareFontShape{OT1}{Cabin-Sup}{semiboldcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-sup-ot1 + <-> \Cabin@@scale CabinCondensed-SemiboldItalicCondensed-sup-ot1 }{} \DeclareFontShape{OT1}{Cabin-Sup}{semiboldcondensed}{sl}{ @@ -132,96 +140,96 @@ }{} % -% 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 % % c --> condensed \DeclareFontShape{OT1}{Cabin-Sup}{c}{sl}{ - <-> ssub * Cabin-Sup/condensed/sl + <-> alias * Cabin-Sup/condensed/sl }{} \DeclareFontShape{OT1}{Cabin-Sup}{c}{n}{ - <-> ssub * Cabin-Sup/condensed/n + <-> alias * Cabin-Sup/condensed/n }{} \DeclareFontShape{OT1}{Cabin-Sup}{c}{it}{ - <-> ssub * Cabin-Sup/condensed/it + <-> alias * Cabin-Sup/condensed/it }{} % m --> regular \DeclareFontShape{OT1}{Cabin-Sup}{m}{sl}{ - <-> ssub * Cabin-Sup/regular/sl + <-> alias * Cabin-Sup/regular/sl }{} \DeclareFontShape{OT1}{Cabin-Sup}{m}{n}{ - <-> ssub * Cabin-Sup/regular/n + <-> alias * Cabin-Sup/regular/n }{} \DeclareFontShape{OT1}{Cabin-Sup}{m}{it}{ - <-> ssub * Cabin-Sup/regular/it + <-> alias * Cabin-Sup/regular/it }{} % sbc --> semiboldcondensed \DeclareFontShape{OT1}{Cabin-Sup}{sbc}{sl}{ - <-> ssub * Cabin-Sup/semiboldcondensed/sl + <-> alias * Cabin-Sup/semiboldcondensed/sl }{} \DeclareFontShape{OT1}{Cabin-Sup}{sbc}{n}{ - <-> ssub * Cabin-Sup/semiboldcondensed/n + <-> alias * Cabin-Sup/semiboldcondensed/n }{} \DeclareFontShape{OT1}{Cabin-Sup}{sbc}{it}{ - <-> ssub * Cabin-Sup/semiboldcondensed/it + <-> alias * Cabin-Sup/semiboldcondensed/it }{} % sb --> semibold \DeclareFontShape{OT1}{Cabin-Sup}{sb}{sl}{ - <-> ssub * Cabin-Sup/semibold/sl + <-> alias * Cabin-Sup/semibold/sl }{} \DeclareFontShape{OT1}{Cabin-Sup}{sb}{n}{ - <-> ssub * Cabin-Sup/semibold/n + <-> alias * Cabin-Sup/semibold/n }{} \DeclareFontShape{OT1}{Cabin-Sup}{sb}{it}{ - <-> ssub * Cabin-Sup/semibold/it + <-> alias * Cabin-Sup/semibold/it }{} % bc --> boldcondensed \DeclareFontShape{OT1}{Cabin-Sup}{bc}{sl}{ - <-> ssub * Cabin-Sup/boldcondensed/sl + <-> alias * Cabin-Sup/boldcondensed/sl }{} \DeclareFontShape{OT1}{Cabin-Sup}{bc}{n}{ - <-> ssub * Cabin-Sup/boldcondensed/n + <-> alias * Cabin-Sup/boldcondensed/n }{} \DeclareFontShape{OT1}{Cabin-Sup}{bc}{it}{ - <-> ssub * Cabin-Sup/boldcondensed/it + <-> alias * Cabin-Sup/boldcondensed/it }{} % b --> bold \DeclareFontShape{OT1}{Cabin-Sup}{b}{sl}{ - <-> ssub * Cabin-Sup/bold/sl + <-> alias * Cabin-Sup/bold/sl }{} \DeclareFontShape{OT1}{Cabin-Sup}{b}{n}{ - <-> ssub * Cabin-Sup/bold/n + <-> alias * Cabin-Sup/bold/n }{} \DeclareFontShape{OT1}{Cabin-Sup}{b}{it}{ - <-> ssub * Cabin-Sup/bold/it + <-> alias * Cabin-Sup/bold/it }{} \DeclareFontShape{OT1}{Cabin-Sup}{bx}{n}{ diff --git a/fonts/cabin/latex/OT1Cabin-TLF.fd b/fonts/cabin/latex/OT1Cabin-TLF.fd index 9dfbb17f9b..c9e0354629 100644 --- a/fonts/cabin/latex/OT1Cabin-TLF.fd +++ b/fonts/cabin/latex/OT1Cabin-TLF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/10/21 +%% Generated by autoinst on 2020/07/15 %% \ProvidesFile{OT1Cabin-TLF.fd} - [2019/10/21 (autoinst) Font definitions for OT1/Cabin-TLF.] + [2020/07/15 (autoinst) Font definitions for OT1/Cabin-TLF.] + +\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 Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -95,24 +103,12 @@ % ---- boldcondensed ---- -\DeclareFontShape{OT1}{Cabin-TLF}{boldcondensed}{sc}{ - <-> \Cabin@@scale CabinCondensed-Bold-tlf-sc-ot1 -}{} - \DeclareFontShape{OT1}{Cabin-TLF}{boldcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Bold-tlf-ot1 + <-> \Cabin@@scale CabinCondensed-BoldCondensed-tlf-ot1 }{} \DeclareFontShape{OT1}{Cabin-TLF}{boldcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-ot1 -}{} - -\DeclareFontShape{OT1}{Cabin-TLF}{boldcondensed}{scit}{ - <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-sc-ot1 -}{} - -\DeclareFontShape{OT1}{Cabin-TLF}{boldcondensed}{scsl}{ - <-> ssub * Cabin-TLF/boldcondensed/scit + <-> \Cabin@@scale CabinCondensed-BoldItalicCondensed-tlf-ot1 }{} \DeclareFontShape{OT1}{Cabin-TLF}{boldcondensed}{sl}{ @@ -122,24 +118,12 @@ % ---- condensed ---- -\DeclareFontShape{OT1}{Cabin-TLF}{condensed}{sc}{ - <-> \Cabin@@scale CabinCondensed-Regular-tlf-sc-ot1 -}{} - \DeclareFontShape{OT1}{Cabin-TLF}{condensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Regular-tlf-ot1 + <-> \Cabin@@scale CabinCondensed-RegularCondensed-tlf-ot1 }{} \DeclareFontShape{OT1}{Cabin-TLF}{condensed}{it}{ - <-> \Cabin@@scale CabinCondensed-Italic-tlf-ot1 -}{} - -\DeclareFontShape{OT1}{Cabin-TLF}{condensed}{scit}{ - <-> \Cabin@@scale CabinCondensed-Italic-tlf-sc-ot1 -}{} - -\DeclareFontShape{OT1}{Cabin-TLF}{condensed}{scsl}{ - <-> ssub * Cabin-TLF/condensed/scit + <-> \Cabin@@scale CabinCondensed-ItalicCondensed-tlf-ot1 }{} \DeclareFontShape{OT1}{Cabin-TLF}{condensed}{sl}{ @@ -176,24 +160,12 @@ % ---- mediumcondensed ---- -\DeclareFontShape{OT1}{Cabin-TLF}{mediumcondensed}{sc}{ - <-> \Cabin@@scale CabinCondensed-Medium-tlf-sc-ot1 -}{} - \DeclareFontShape{OT1}{Cabin-TLF}{mediumcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Medium-tlf-ot1 + <-> \Cabin@@scale CabinCondensed-MediumCondensed-tlf-ot1 }{} \DeclareFontShape{OT1}{Cabin-TLF}{mediumcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-ot1 -}{} - -\DeclareFontShape{OT1}{Cabin-TLF}{mediumcondensed}{scit}{ - <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-sc-ot1 -}{} - -\DeclareFontShape{OT1}{Cabin-TLF}{mediumcondensed}{scsl}{ - <-> ssub * Cabin-TLF/mediumcondensed/scit + <-> \Cabin@@scale CabinCondensed-MediumItalicCondensed-tlf-ot1 }{} \DeclareFontShape{OT1}{Cabin-TLF}{mediumcondensed}{sl}{ @@ -203,24 +175,12 @@ % ---- semiboldcondensed ---- -\DeclareFontShape{OT1}{Cabin-TLF}{semiboldcondensed}{sc}{ - <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-sc-ot1 -}{} - \DeclareFontShape{OT1}{Cabin-TLF}{semiboldcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-ot1 + <-> \Cabin@@scale CabinCondensed-SemiBoldCondensed-tlf-ot1 }{} \DeclareFontShape{OT1}{Cabin-TLF}{semiboldcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-ot1 -}{} - -\DeclareFontShape{OT1}{Cabin-TLF}{semiboldcondensed}{scit}{ - <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-sc-ot1 -}{} - -\DeclareFontShape{OT1}{Cabin-TLF}{semiboldcondensed}{scsl}{ - <-> ssub * Cabin-TLF/semiboldcondensed/scit + <-> \Cabin@@scale CabinCondensed-SemiboldItalicCondensed-tlf-ot1 }{} \DeclareFontShape{OT1}{Cabin-TLF}{semiboldcondensed}{sl}{ @@ -228,168 +188,132 @@ }{} % -% 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 % % c --> condensed \DeclareFontShape{OT1}{Cabin-TLF}{c}{sl}{ - <-> ssub * Cabin-TLF/condensed/sl -}{} - -\DeclareFontShape{OT1}{Cabin-TLF}{c}{scsl}{ - <-> ssub * Cabin-TLF/condensed/scsl -}{} - -\DeclareFontShape{OT1}{Cabin-TLF}{c}{sc}{ - <-> ssub * Cabin-TLF/condensed/sc + <-> alias * Cabin-TLF/condensed/sl }{} \DeclareFontShape{OT1}{Cabin-TLF}{c}{n}{ - <-> ssub * Cabin-TLF/condensed/n + <-> alias * Cabin-TLF/condensed/n }{} \DeclareFontShape{OT1}{Cabin-TLF}{c}{it}{ - <-> ssub * Cabin-TLF/condensed/it -}{} - -\DeclareFontShape{OT1}{Cabin-TLF}{c}{scit}{ - <-> ssub * Cabin-TLF/condensed/scit + <-> alias * Cabin-TLF/condensed/it }{} % m --> regular \DeclareFontShape{OT1}{Cabin-TLF}{m}{sl}{ - <-> ssub * Cabin-TLF/regular/sl + <-> alias * Cabin-TLF/regular/sl }{} \DeclareFontShape{OT1}{Cabin-TLF}{m}{scsl}{ - <-> ssub * Cabin-TLF/regular/scsl + <-> alias * Cabin-TLF/regular/scsl }{} \DeclareFontShape{OT1}{Cabin-TLF}{m}{sc}{ - <-> ssub * Cabin-TLF/regular/sc + <-> alias * Cabin-TLF/regular/sc }{} \DeclareFontShape{OT1}{Cabin-TLF}{m}{n}{ - <-> ssub * Cabin-TLF/regular/n + <-> alias * Cabin-TLF/regular/n }{} \DeclareFontShape{OT1}{Cabin-TLF}{m}{it}{ - <-> ssub * Cabin-TLF/regular/it + <-> alias * Cabin-TLF/regular/it }{} \DeclareFontShape{OT1}{Cabin-TLF}{m}{scit}{ - <-> ssub * Cabin-TLF/regular/scit + <-> alias * Cabin-TLF/regular/scit }{} % sbc --> semiboldcondensed \DeclareFontShape{OT1}{Cabin-TLF}{sbc}{sl}{ - <-> ssub * Cabin-TLF/semiboldcondensed/sl -}{} - -\DeclareFontShape{OT1}{Cabin-TLF}{sbc}{scsl}{ - <-> ssub * Cabin-TLF/semiboldcondensed/scsl -}{} - -\DeclareFontShape{OT1}{Cabin-TLF}{sbc}{sc}{ - <-> ssub * Cabin-TLF/semiboldcondensed/sc + <-> alias * Cabin-TLF/semiboldcondensed/sl }{} \DeclareFontShape{OT1}{Cabin-TLF}{sbc}{n}{ - <-> ssub * Cabin-TLF/semiboldcondensed/n + <-> alias * Cabin-TLF/semiboldcondensed/n }{} \DeclareFontShape{OT1}{Cabin-TLF}{sbc}{it}{ - <-> ssub * Cabin-TLF/semiboldcondensed/it -}{} - -\DeclareFontShape{OT1}{Cabin-TLF}{sbc}{scit}{ - <-> ssub * Cabin-TLF/semiboldcondensed/scit + <-> alias * Cabin-TLF/semiboldcondensed/it }{} % sb --> semibold \DeclareFontShape{OT1}{Cabin-TLF}{sb}{sl}{ - <-> ssub * Cabin-TLF/semibold/sl + <-> alias * Cabin-TLF/semibold/sl }{} \DeclareFontShape{OT1}{Cabin-TLF}{sb}{scsl}{ - <-> ssub * Cabin-TLF/semibold/scsl + <-> alias * Cabin-TLF/semibold/scsl }{} \DeclareFontShape{OT1}{Cabin-TLF}{sb}{sc}{ - <-> ssub * Cabin-TLF/semibold/sc + <-> alias * Cabin-TLF/semibold/sc }{} \DeclareFontShape{OT1}{Cabin-TLF}{sb}{n}{ - <-> ssub * Cabin-TLF/semibold/n + <-> alias * Cabin-TLF/semibold/n }{} \DeclareFontShape{OT1}{Cabin-TLF}{sb}{it}{ - <-> ssub * Cabin-TLF/semibold/it + <-> alias * Cabin-TLF/semibold/it }{} \DeclareFontShape{OT1}{Cabin-TLF}{sb}{scit}{ - <-> ssub * Cabin-TLF/semibold/scit + <-> alias * Cabin-TLF/semibold/scit }{} % bc --> boldcondensed \DeclareFontShape{OT1}{Cabin-TLF}{bc}{sl}{ - <-> ssub * Cabin-TLF/boldcondensed/sl -}{} - -\DeclareFontShape{OT1}{Cabin-TLF}{bc}{scsl}{ - <-> ssub * Cabin-TLF/boldcondensed/scsl -}{} - -\DeclareFontShape{OT1}{Cabin-TLF}{bc}{sc}{ - <-> ssub * Cabin-TLF/boldcondensed/sc + <-> alias * Cabin-TLF/boldcondensed/sl }{} \DeclareFontShape{OT1}{Cabin-TLF}{bc}{n}{ - <-> ssub * Cabin-TLF/boldcondensed/n + <-> alias * Cabin-TLF/boldcondensed/n }{} \DeclareFontShape{OT1}{Cabin-TLF}{bc}{it}{ - <-> ssub * Cabin-TLF/boldcondensed/it -}{} - -\DeclareFontShape{OT1}{Cabin-TLF}{bc}{scit}{ - <-> ssub * Cabin-TLF/boldcondensed/scit + <-> alias * Cabin-TLF/boldcondensed/it }{} % b --> bold \DeclareFontShape{OT1}{Cabin-TLF}{b}{sl}{ - <-> ssub * Cabin-TLF/bold/sl + <-> alias * Cabin-TLF/bold/sl }{} \DeclareFontShape{OT1}{Cabin-TLF}{b}{scsl}{ - <-> ssub * Cabin-TLF/bold/scsl + <-> alias * Cabin-TLF/bold/scsl }{} \DeclareFontShape{OT1}{Cabin-TLF}{b}{sc}{ - <-> ssub * Cabin-TLF/bold/sc + <-> alias * Cabin-TLF/bold/sc }{} \DeclareFontShape{OT1}{Cabin-TLF}{b}{n}{ - <-> ssub * Cabin-TLF/bold/n + <-> alias * Cabin-TLF/bold/n }{} \DeclareFontShape{OT1}{Cabin-TLF}{b}{it}{ - <-> ssub * Cabin-TLF/bold/it + <-> alias * Cabin-TLF/bold/it }{} \DeclareFontShape{OT1}{Cabin-TLF}{b}{scit}{ - <-> ssub * Cabin-TLF/bold/scit + <-> alias * Cabin-TLF/bold/scit }{} \DeclareFontShape{OT1}{Cabin-TLF}{bx}{n}{ diff --git a/fonts/cabin/latex/T1Cabin-Sup.fd b/fonts/cabin/latex/T1Cabin-Sup.fd index e36ceec83a..db3c6ac32d 100644 --- a/fonts/cabin/latex/T1Cabin-Sup.fd +++ b/fonts/cabin/latex/T1Cabin-Sup.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/10/21 +%% Generated by autoinst on 2020/07/15 %% \ProvidesFile{T1Cabin-Sup.fd} - [2019/10/21 (autoinst) Font definitions for T1/Cabin-Sup.] + [2020/07/15 (autoinst) Font definitions for T1/Cabin-Sup.] + +\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 Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -60,11 +68,11 @@ % ---- boldcondensed ---- \DeclareFontShape{T1}{Cabin-Sup}{boldcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Bold-sup-t1 + <-> \Cabin@@scale CabinCondensed-BoldCondensed-sup-t1 }{} \DeclareFontShape{T1}{Cabin-Sup}{boldcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-BoldItalic-sup-t1 + <-> \Cabin@@scale CabinCondensed-BoldItalicCondensed-sup-t1 }{} \DeclareFontShape{T1}{Cabin-Sup}{boldcondensed}{sl}{ @@ -75,11 +83,11 @@ % ---- condensed ---- \DeclareFontShape{T1}{Cabin-Sup}{condensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Regular-sup-t1 + <-> \Cabin@@scale CabinCondensed-RegularCondensed-sup-t1 }{} \DeclareFontShape{T1}{Cabin-Sup}{condensed}{it}{ - <-> \Cabin@@scale CabinCondensed-Italic-sup-t1 + <-> \Cabin@@scale CabinCondensed-ItalicCondensed-sup-t1 }{} \DeclareFontShape{T1}{Cabin-Sup}{condensed}{sl}{ @@ -105,11 +113,11 @@ % ---- mediumcondensed ---- \DeclareFontShape{T1}{Cabin-Sup}{mediumcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Medium-sup-t1 + <-> \Cabin@@scale CabinCondensed-MediumCondensed-sup-t1 }{} \DeclareFontShape{T1}{Cabin-Sup}{mediumcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-MediumItalic-sup-t1 + <-> \Cabin@@scale CabinCondensed-MediumItalicCondensed-sup-t1 }{} \DeclareFontShape{T1}{Cabin-Sup}{mediumcondensed}{sl}{ @@ -120,11 +128,11 @@ % ---- semiboldcondensed ---- \DeclareFontShape{T1}{Cabin-Sup}{semiboldcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-SemiBold-sup-t1 + <-> \Cabin@@scale CabinCondensed-SemiBoldCondensed-sup-t1 }{} \DeclareFontShape{T1}{Cabin-Sup}{semiboldcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-sup-t1 + <-> \Cabin@@scale CabinCondensed-SemiboldItalicCondensed-sup-t1 }{} \DeclareFontShape{T1}{Cabin-Sup}{semiboldcondensed}{sl}{ @@ -132,96 +140,96 @@ }{} % -% 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 % % c --> condensed \DeclareFontShape{T1}{Cabin-Sup}{c}{sl}{ - <-> ssub * Cabin-Sup/condensed/sl + <-> alias * Cabin-Sup/condensed/sl }{} \DeclareFontShape{T1}{Cabin-Sup}{c}{n}{ - <-> ssub * Cabin-Sup/condensed/n + <-> alias * Cabin-Sup/condensed/n }{} \DeclareFontShape{T1}{Cabin-Sup}{c}{it}{ - <-> ssub * Cabin-Sup/condensed/it + <-> alias * Cabin-Sup/condensed/it }{} % m --> regular \DeclareFontShape{T1}{Cabin-Sup}{m}{sl}{ - <-> ssub * Cabin-Sup/regular/sl + <-> alias * Cabin-Sup/regular/sl }{} \DeclareFontShape{T1}{Cabin-Sup}{m}{n}{ - <-> ssub * Cabin-Sup/regular/n + <-> alias * Cabin-Sup/regular/n }{} \DeclareFontShape{T1}{Cabin-Sup}{m}{it}{ - <-> ssub * Cabin-Sup/regular/it + <-> alias * Cabin-Sup/regular/it }{} % sbc --> semiboldcondensed \DeclareFontShape{T1}{Cabin-Sup}{sbc}{sl}{ - <-> ssub * Cabin-Sup/semiboldcondensed/sl + <-> alias * Cabin-Sup/semiboldcondensed/sl }{} \DeclareFontShape{T1}{Cabin-Sup}{sbc}{n}{ - <-> ssub * Cabin-Sup/semiboldcondensed/n + <-> alias * Cabin-Sup/semiboldcondensed/n }{} \DeclareFontShape{T1}{Cabin-Sup}{sbc}{it}{ - <-> ssub * Cabin-Sup/semiboldcondensed/it + <-> alias * Cabin-Sup/semiboldcondensed/it }{} % sb --> semibold \DeclareFontShape{T1}{Cabin-Sup}{sb}{sl}{ - <-> ssub * Cabin-Sup/semibold/sl + <-> alias * Cabin-Sup/semibold/sl }{} \DeclareFontShape{T1}{Cabin-Sup}{sb}{n}{ - <-> ssub * Cabin-Sup/semibold/n + <-> alias * Cabin-Sup/semibold/n }{} \DeclareFontShape{T1}{Cabin-Sup}{sb}{it}{ - <-> ssub * Cabin-Sup/semibold/it + <-> alias * Cabin-Sup/semibold/it }{} % bc --> boldcondensed \DeclareFontShape{T1}{Cabin-Sup}{bc}{sl}{ - <-> ssub * Cabin-Sup/boldcondensed/sl + <-> alias * Cabin-Sup/boldcondensed/sl }{} \DeclareFontShape{T1}{Cabin-Sup}{bc}{n}{ - <-> ssub * Cabin-Sup/boldcondensed/n + <-> alias * Cabin-Sup/boldcondensed/n }{} \DeclareFontShape{T1}{Cabin-Sup}{bc}{it}{ - <-> ssub * Cabin-Sup/boldcondensed/it + <-> alias * Cabin-Sup/boldcondensed/it }{} % b --> bold \DeclareFontShape{T1}{Cabin-Sup}{b}{sl}{ - <-> ssub * Cabin-Sup/bold/sl + <-> alias * Cabin-Sup/bold/sl }{} \DeclareFontShape{T1}{Cabin-Sup}{b}{n}{ - <-> ssub * Cabin-Sup/bold/n + <-> alias * Cabin-Sup/bold/n }{} \DeclareFontShape{T1}{Cabin-Sup}{b}{it}{ - <-> ssub * Cabin-Sup/bold/it + <-> alias * Cabin-Sup/bold/it }{} \DeclareFontShape{T1}{Cabin-Sup}{bx}{n}{ diff --git a/fonts/cabin/latex/T1Cabin-TLF.fd b/fonts/cabin/latex/T1Cabin-TLF.fd index 9a7a30fc0d..0e891dc1af 100644 --- a/fonts/cabin/latex/T1Cabin-TLF.fd +++ b/fonts/cabin/latex/T1Cabin-TLF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/10/21 +%% Generated by autoinst on 2020/07/15 %% \ProvidesFile{T1Cabin-TLF.fd} - [2019/10/21 (autoinst) Font definitions for T1/Cabin-TLF.] + [2020/07/15 (autoinst) Font definitions for T1/Cabin-TLF.] + +\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 Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -95,24 +103,12 @@ % ---- boldcondensed ---- -\DeclareFontShape{T1}{Cabin-TLF}{boldcondensed}{sc}{ - <-> \Cabin@@scale CabinCondensed-Bold-tlf-sc-t1 -}{} - \DeclareFontShape{T1}{Cabin-TLF}{boldcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Bold-tlf-t1 + <-> \Cabin@@scale CabinCondensed-BoldCondensed-tlf-t1 }{} \DeclareFontShape{T1}{Cabin-TLF}{boldcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-t1 -}{} - -\DeclareFontShape{T1}{Cabin-TLF}{boldcondensed}{scit}{ - <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-sc-t1 -}{} - -\DeclareFontShape{T1}{Cabin-TLF}{boldcondensed}{scsl}{ - <-> ssub * Cabin-TLF/boldcondensed/scit + <-> \Cabin@@scale CabinCondensed-BoldItalicCondensed-tlf-t1 }{} \DeclareFontShape{T1}{Cabin-TLF}{boldcondensed}{sl}{ @@ -122,24 +118,12 @@ % ---- condensed ---- -\DeclareFontShape{T1}{Cabin-TLF}{condensed}{sc}{ - <-> \Cabin@@scale CabinCondensed-Regular-tlf-sc-t1 -}{} - \DeclareFontShape{T1}{Cabin-TLF}{condensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Regular-tlf-t1 + <-> \Cabin@@scale CabinCondensed-RegularCondensed-tlf-t1 }{} \DeclareFontShape{T1}{Cabin-TLF}{condensed}{it}{ - <-> \Cabin@@scale CabinCondensed-Italic-tlf-t1 -}{} - -\DeclareFontShape{T1}{Cabin-TLF}{condensed}{scit}{ - <-> \Cabin@@scale CabinCondensed-Italic-tlf-sc-t1 -}{} - -\DeclareFontShape{T1}{Cabin-TLF}{condensed}{scsl}{ - <-> ssub * Cabin-TLF/condensed/scit + <-> \Cabin@@scale CabinCondensed-ItalicCondensed-tlf-t1 }{} \DeclareFontShape{T1}{Cabin-TLF}{condensed}{sl}{ @@ -176,24 +160,12 @@ % ---- mediumcondensed ---- -\DeclareFontShape{T1}{Cabin-TLF}{mediumcondensed}{sc}{ - <-> \Cabin@@scale CabinCondensed-Medium-tlf-sc-t1 -}{} - \DeclareFontShape{T1}{Cabin-TLF}{mediumcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Medium-tlf-t1 + <-> \Cabin@@scale CabinCondensed-MediumCondensed-tlf-t1 }{} \DeclareFontShape{T1}{Cabin-TLF}{mediumcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-t1 -}{} - -\DeclareFontShape{T1}{Cabin-TLF}{mediumcondensed}{scit}{ - <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-sc-t1 -}{} - -\DeclareFontShape{T1}{Cabin-TLF}{mediumcondensed}{scsl}{ - <-> ssub * Cabin-TLF/mediumcondensed/scit + <-> \Cabin@@scale CabinCondensed-MediumItalicCondensed-tlf-t1 }{} \DeclareFontShape{T1}{Cabin-TLF}{mediumcondensed}{sl}{ @@ -203,24 +175,12 @@ % ---- semiboldcondensed ---- -\DeclareFontShape{T1}{Cabin-TLF}{semiboldcondensed}{sc}{ - <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-sc-t1 -}{} - \DeclareFontShape{T1}{Cabin-TLF}{semiboldcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-t1 + <-> \Cabin@@scale CabinCondensed-SemiBoldCondensed-tlf-t1 }{} \DeclareFontShape{T1}{Cabin-TLF}{semiboldcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-t1 -}{} - -\DeclareFontShape{T1}{Cabin-TLF}{semiboldcondensed}{scit}{ - <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-sc-t1 -}{} - -\DeclareFontShape{T1}{Cabin-TLF}{semiboldcondensed}{scsl}{ - <-> ssub * Cabin-TLF/semiboldcondensed/scit + <-> \Cabin@@scale CabinCondensed-SemiboldItalicCondensed-tlf-t1 }{} \DeclareFontShape{T1}{Cabin-TLF}{semiboldcondensed}{sl}{ @@ -228,168 +188,132 @@ }{} % -% 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 % % c --> condensed \DeclareFontShape{T1}{Cabin-TLF}{c}{sl}{ - <-> ssub * Cabin-TLF/condensed/sl -}{} - -\DeclareFontShape{T1}{Cabin-TLF}{c}{scsl}{ - <-> ssub * Cabin-TLF/condensed/scsl -}{} - -\DeclareFontShape{T1}{Cabin-TLF}{c}{sc}{ - <-> ssub * Cabin-TLF/condensed/sc + <-> alias * Cabin-TLF/condensed/sl }{} \DeclareFontShape{T1}{Cabin-TLF}{c}{n}{ - <-> ssub * Cabin-TLF/condensed/n + <-> alias * Cabin-TLF/condensed/n }{} \DeclareFontShape{T1}{Cabin-TLF}{c}{it}{ - <-> ssub * Cabin-TLF/condensed/it -}{} - -\DeclareFontShape{T1}{Cabin-TLF}{c}{scit}{ - <-> ssub * Cabin-TLF/condensed/scit + <-> alias * Cabin-TLF/condensed/it }{} % m --> regular \DeclareFontShape{T1}{Cabin-TLF}{m}{sl}{ - <-> ssub * Cabin-TLF/regular/sl + <-> alias * Cabin-TLF/regular/sl }{} \DeclareFontShape{T1}{Cabin-TLF}{m}{scsl}{ - <-> ssub * Cabin-TLF/regular/scsl + <-> alias * Cabin-TLF/regular/scsl }{} \DeclareFontShape{T1}{Cabin-TLF}{m}{sc}{ - <-> ssub * Cabin-TLF/regular/sc + <-> alias * Cabin-TLF/regular/sc }{} \DeclareFontShape{T1}{Cabin-TLF}{m}{n}{ - <-> ssub * Cabin-TLF/regular/n + <-> alias * Cabin-TLF/regular/n }{} \DeclareFontShape{T1}{Cabin-TLF}{m}{it}{ - <-> ssub * Cabin-TLF/regular/it + <-> alias * Cabin-TLF/regular/it }{} \DeclareFontShape{T1}{Cabin-TLF}{m}{scit}{ - <-> ssub * Cabin-TLF/regular/scit + <-> alias * Cabin-TLF/regular/scit }{} % sbc --> semiboldcondensed \DeclareFontShape{T1}{Cabin-TLF}{sbc}{sl}{ - <-> ssub * Cabin-TLF/semiboldcondensed/sl -}{} - -\DeclareFontShape{T1}{Cabin-TLF}{sbc}{scsl}{ - <-> ssub * Cabin-TLF/semiboldcondensed/scsl -}{} - -\DeclareFontShape{T1}{Cabin-TLF}{sbc}{sc}{ - <-> ssub * Cabin-TLF/semiboldcondensed/sc + <-> alias * Cabin-TLF/semiboldcondensed/sl }{} \DeclareFontShape{T1}{Cabin-TLF}{sbc}{n}{ - <-> ssub * Cabin-TLF/semiboldcondensed/n + <-> alias * Cabin-TLF/semiboldcondensed/n }{} \DeclareFontShape{T1}{Cabin-TLF}{sbc}{it}{ - <-> ssub * Cabin-TLF/semiboldcondensed/it -}{} - -\DeclareFontShape{T1}{Cabin-TLF}{sbc}{scit}{ - <-> ssub * Cabin-TLF/semiboldcondensed/scit + <-> alias * Cabin-TLF/semiboldcondensed/it }{} % sb --> semibold \DeclareFontShape{T1}{Cabin-TLF}{sb}{sl}{ - <-> ssub * Cabin-TLF/semibold/sl + <-> alias * Cabin-TLF/semibold/sl }{} \DeclareFontShape{T1}{Cabin-TLF}{sb}{scsl}{ - <-> ssub * Cabin-TLF/semibold/scsl + <-> alias * Cabin-TLF/semibold/scsl }{} \DeclareFontShape{T1}{Cabin-TLF}{sb}{sc}{ - <-> ssub * Cabin-TLF/semibold/sc + <-> alias * Cabin-TLF/semibold/sc }{} \DeclareFontShape{T1}{Cabin-TLF}{sb}{n}{ - <-> ssub * Cabin-TLF/semibold/n + <-> alias * Cabin-TLF/semibold/n }{} \DeclareFontShape{T1}{Cabin-TLF}{sb}{it}{ - <-> ssub * Cabin-TLF/semibold/it + <-> alias * Cabin-TLF/semibold/it }{} \DeclareFontShape{T1}{Cabin-TLF}{sb}{scit}{ - <-> ssub * Cabin-TLF/semibold/scit + <-> alias * Cabin-TLF/semibold/scit }{} % bc --> boldcondensed \DeclareFontShape{T1}{Cabin-TLF}{bc}{sl}{ - <-> ssub * Cabin-TLF/boldcondensed/sl -}{} - -\DeclareFontShape{T1}{Cabin-TLF}{bc}{scsl}{ - <-> ssub * Cabin-TLF/boldcondensed/scsl -}{} - -\DeclareFontShape{T1}{Cabin-TLF}{bc}{sc}{ - <-> ssub * Cabin-TLF/boldcondensed/sc + <-> alias * Cabin-TLF/boldcondensed/sl }{} \DeclareFontShape{T1}{Cabin-TLF}{bc}{n}{ - <-> ssub * Cabin-TLF/boldcondensed/n + <-> alias * Cabin-TLF/boldcondensed/n }{} \DeclareFontShape{T1}{Cabin-TLF}{bc}{it}{ - <-> ssub * Cabin-TLF/boldcondensed/it -}{} - -\DeclareFontShape{T1}{Cabin-TLF}{bc}{scit}{ - <-> ssub * Cabin-TLF/boldcondensed/scit + <-> alias * Cabin-TLF/boldcondensed/it }{} % b --> bold \DeclareFontShape{T1}{Cabin-TLF}{b}{sl}{ - <-> ssub * Cabin-TLF/bold/sl + <-> alias * Cabin-TLF/bold/sl }{} \DeclareFontShape{T1}{Cabin-TLF}{b}{scsl}{ - <-> ssub * Cabin-TLF/bold/scsl + <-> alias * Cabin-TLF/bold/scsl }{} \DeclareFontShape{T1}{Cabin-TLF}{b}{sc}{ - <-> ssub * Cabin-TLF/bold/sc + <-> alias * Cabin-TLF/bold/sc }{} \DeclareFontShape{T1}{Cabin-TLF}{b}{n}{ - <-> ssub * Cabin-TLF/bold/n + <-> alias * Cabin-TLF/bold/n }{} \DeclareFontShape{T1}{Cabin-TLF}{b}{it}{ - <-> ssub * Cabin-TLF/bold/it + <-> alias * Cabin-TLF/bold/it }{} \DeclareFontShape{T1}{Cabin-TLF}{b}{scit}{ - <-> ssub * Cabin-TLF/bold/scit + <-> alias * Cabin-TLF/bold/scit }{} \DeclareFontShape{T1}{Cabin-TLF}{bx}{n}{ diff --git a/fonts/cabin/latex/TS1Cabin-TLF.fd b/fonts/cabin/latex/TS1Cabin-TLF.fd index 62f4c2e7a0..08892c46f3 100644 --- a/fonts/cabin/latex/TS1Cabin-TLF.fd +++ b/fonts/cabin/latex/TS1Cabin-TLF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/10/21 +%% Generated by autoinst on 2020/07/15 %% \ProvidesFile{TS1Cabin-TLF.fd} - [2019/10/21 (autoinst) Font definitions for TS1/Cabin-TLF.] + [2020/07/15 (autoinst) Font definitions for TS1/Cabin-TLF.] + +\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 Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -60,11 +68,11 @@ % ---- boldcondensed ---- \DeclareFontShape{TS1}{Cabin-TLF}{boldcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Bold-tlf-ts1 + <-> \Cabin@@scale CabinCondensed-BoldCondensed-tlf-ts1 }{} \DeclareFontShape{TS1}{Cabin-TLF}{boldcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-ts1 + <-> \Cabin@@scale CabinCondensed-BoldItalicCondensed-tlf-ts1 }{} \DeclareFontShape{TS1}{Cabin-TLF}{boldcondensed}{sl}{ @@ -75,11 +83,11 @@ % ---- condensed ---- \DeclareFontShape{TS1}{Cabin-TLF}{condensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Regular-tlf-ts1 + <-> \Cabin@@scale CabinCondensed-RegularCondensed-tlf-ts1 }{} \DeclareFontShape{TS1}{Cabin-TLF}{condensed}{it}{ - <-> \Cabin@@scale CabinCondensed-Italic-tlf-ts1 + <-> \Cabin@@scale CabinCondensed-ItalicCondensed-tlf-ts1 }{} \DeclareFontShape{TS1}{Cabin-TLF}{condensed}{sl}{ @@ -105,11 +113,11 @@ % ---- mediumcondensed ---- \DeclareFontShape{TS1}{Cabin-TLF}{mediumcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-Medium-tlf-ts1 + <-> \Cabin@@scale CabinCondensed-MediumCondensed-tlf-ts1 }{} \DeclareFontShape{TS1}{Cabin-TLF}{mediumcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-ts1 + <-> \Cabin@@scale CabinCondensed-MediumItalicCondensed-tlf-ts1 }{} \DeclareFontShape{TS1}{Cabin-TLF}{mediumcondensed}{sl}{ @@ -120,11 +128,11 @@ % ---- semiboldcondensed ---- \DeclareFontShape{TS1}{Cabin-TLF}{semiboldcondensed}{n}{ - <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-ts1 + <-> \Cabin@@scale CabinCondensed-SemiBoldCondensed-tlf-ts1 }{} \DeclareFontShape{TS1}{Cabin-TLF}{semiboldcondensed}{it}{ - <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-ts1 + <-> \Cabin@@scale CabinCondensed-SemiboldItalicCondensed-tlf-ts1 }{} \DeclareFontShape{TS1}{Cabin-TLF}{semiboldcondensed}{sl}{ @@ -132,96 +140,96 @@ }{} % -% 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 % % c --> condensed \DeclareFontShape{TS1}{Cabin-TLF}{c}{sl}{ - <-> ssub * Cabin-TLF/condensed/sl + <-> alias * Cabin-TLF/condensed/sl }{} \DeclareFontShape{TS1}{Cabin-TLF}{c}{n}{ - <-> ssub * Cabin-TLF/condensed/n + <-> alias * Cabin-TLF/condensed/n }{} \DeclareFontShape{TS1}{Cabin-TLF}{c}{it}{ - <-> ssub * Cabin-TLF/condensed/it + <-> alias * Cabin-TLF/condensed/it }{} % m --> regular \DeclareFontShape{TS1}{Cabin-TLF}{m}{sl}{ - <-> ssub * Cabin-TLF/regular/sl + <-> alias * Cabin-TLF/regular/sl }{} \DeclareFontShape{TS1}{Cabin-TLF}{m}{n}{ - <-> ssub * Cabin-TLF/regular/n + <-> alias * Cabin-TLF/regular/n }{} \DeclareFontShape{TS1}{Cabin-TLF}{m}{it}{ - <-> ssub * Cabin-TLF/regular/it + <-> alias * Cabin-TLF/regular/it }{} % sbc --> semiboldcondensed \DeclareFontShape{TS1}{Cabin-TLF}{sbc}{sl}{ - <-> ssub * Cabin-TLF/semiboldcondensed/sl + <-> alias * Cabin-TLF/semiboldcondensed/sl }{} \DeclareFontShape{TS1}{Cabin-TLF}{sbc}{n}{ - <-> ssub * Cabin-TLF/semiboldcondensed/n + <-> alias * Cabin-TLF/semiboldcondensed/n }{} \DeclareFontShape{TS1}{Cabin-TLF}{sbc}{it}{ - <-> ssub * Cabin-TLF/semiboldcondensed/it + <-> alias * Cabin-TLF/semiboldcondensed/it }{} % sb --> semibold \DeclareFontShape{TS1}{Cabin-TLF}{sb}{sl}{ - <-> ssub * Cabin-TLF/semibold/sl + <-> alias * Cabin-TLF/semibold/sl }{} \DeclareFontShape{TS1}{Cabin-TLF}{sb}{n}{ - <-> ssub * Cabin-TLF/semibold/n + <-> alias * Cabin-TLF/semibold/n }{} \DeclareFontShape{TS1}{Cabin-TLF}{sb}{it}{ - <-> ssub * Cabin-TLF/semibold/it + <-> alias * Cabin-TLF/semibold/it }{} % bc --> boldcondensed \DeclareFontShape{TS1}{Cabin-TLF}{bc}{sl}{ - <-> ssub * Cabin-TLF/boldcondensed/sl + <-> alias * Cabin-TLF/boldcondensed/sl }{} \DeclareFontShape{TS1}{Cabin-TLF}{bc}{n}{ - <-> ssub * Cabin-TLF/boldcondensed/n + <-> alias * Cabin-TLF/boldcondensed/n }{} \DeclareFontShape{TS1}{Cabin-TLF}{bc}{it}{ - <-> ssub * Cabin-TLF/boldcondensed/it + <-> alias * Cabin-TLF/boldcondensed/it }{} % b --> bold \DeclareFontShape{TS1}{Cabin-TLF}{b}{sl}{ - <-> ssub * Cabin-TLF/bold/sl + <-> alias * Cabin-TLF/bold/sl }{} \DeclareFontShape{TS1}{Cabin-TLF}{b}{n}{ - <-> ssub * Cabin-TLF/bold/n + <-> alias * Cabin-TLF/bold/n }{} \DeclareFontShape{TS1}{Cabin-TLF}{b}{it}{ - <-> ssub * Cabin-TLF/bold/it + <-> alias * Cabin-TLF/bold/it }{} \DeclareFontShape{TS1}{Cabin-TLF}{bx}{n}{ diff --git a/fonts/cabin/latex/cabin.sty b/fonts/cabin/latex/cabin.sty index af10192061..266612754b 100644 --- a/fonts/cabin/latex/cabin.sty +++ b/fonts/cabin/latex/cabin.sty @@ -1,6 +1,6 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{cabin} - [2019/10/21 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.] + [2020/07/15 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.] \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp} @@ -37,10 +37,18 @@ \ProcessOptionsX\relax \ifcabin@otf - \def\cabin@boldstyle{Bold} - \ifcabin@semibold\def\cabin@boldstyle{SemiBold}\fi - \def\cabin@regstyle{Regular} - \ifcabin@medium\def\cabin@regstyle{Medium}\fi + + \ifcabin@condensed + \def\cabin@boldstyle{BoldCondensed} + \ifcabin@semibold\def\cabin@boldstyle{SemiBoldCondensed}\fi + \def\cabin@regstyle{RegularCondensed} + \ifcabin@medium\def\cabin@regstyle{MediumCondensed}\fi + \else + \def\cabin@boldstyle{Bold} + \ifcabin@semibold\def\cabin@boldstyle{SemiBold}\fi + \def\cabin@regstyle{Regular} + \ifcabin@medium\def\cabin@regstyle{Medium}\fi + \fi \else % type1 @@ -54,7 +62,7 @@ \def\bfseries@sf{b} \ifcabin@semibold\def\bfseries@sf{sb}\fi \def\mdseries@sf{m} - \ifcabin@medium\def\mdseries@sf{mediumcondensed}\fi + \ifcabin@medium\def\mdseries@sf{medium}\fi \fi \fi @@ -66,6 +74,7 @@ \ifcabin@otf \def\cabin@regular{Regular} + \def\cabin@semibold{SemiBold} \ifxetex\XeTeXtracingfonts=1\fi \defaultfontfeatures{ Ligatures = TeX , @@ -76,7 +85,7 @@ [ UprightFont = *-\cabin@regstyle , ItalicFont = *-\ifx\cabin@regstyle\cabin@regular Italic\else\cabin@regstyle Italic\fi , BoldFont = *-\cabin@boldstyle , - BoldItalicFont = *-\cabin@boldstyle Italic ] + BoldItalicFont = *-\ifx\cabin@boldstyle\cabin@semibold Semibold\else\cabin@boldstyle\fi Italic ] {CabinCondensed} \else \setsansfont @@ -96,10 +105,10 @@ BoldItalicFont = *-\cabin@boldstyle Italic ] {Cabin} \newfontfamily\cabincondensed - [ UprightFont = *-\cabin@regstyle , - ItalicFont = *-\ifx\cabin@regstyle\cabin@regular Italic\else\cabin@regstyle Italic\fi , - BoldFont = *-\cabin@boldstyle , - BoldItalicFont = *-\cabin@boldstyle Italic ] + [ UprightFont = *-\ifcabin@medium MediumCondensed\else RegularCondensed\fi, + ItalicFont = *-\ifcabin@medium MediumItalicCondensed\else ItalicCondensed\fi, + BoldFont = *-\ifcabin@semibold SemiBoldCondensed\else BoldCondensed\fi, + BoldItalicFont = *-\ifcabin@semibold SemiboldItalicCondensed\else BoldItalicCondensed\fi] {CabinCondensed} \else % type1 \def\cabinfamily{Cabin-TLF} -- cgit v1.2.3