From ffca6128b5bd8fa5b9bb40b9394e9721a67b7245 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 19 Oct 2019 21:13:50 +0000 Subject: montserrat (19oct19) git-svn-id: svn://tug.org/texlive/trunk@52443 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/montserrat/LY1Montserrat-Dnom.fd | 261 +++++++++-- .../tex/latex/montserrat/LY1Montserrat-Inf.fd | 269 ++++++++--- .../tex/latex/montserrat/LY1Montserrat-LF.fd | 483 ++++++++++++++----- .../tex/latex/montserrat/LY1Montserrat-Numr.fd | 265 +++++++++-- .../tex/latex/montserrat/LY1Montserrat-OsF.fd | 479 ++++++++++++++----- .../tex/latex/montserrat/LY1Montserrat-Sup.fd | 259 +++++++++-- .../tex/latex/montserrat/LY1Montserrat-TLF.fd | 481 ++++++++++++++----- .../tex/latex/montserrat/LY1Montserrat-TOsF.fd | 491 +++++++++++++++----- .../montserrat/LY1MontserratAlternates-Dnom.fd | 279 ++++++++--- .../montserrat/LY1MontserratAlternates-Inf.fd | 281 ++++++++--- .../latex/montserrat/LY1MontserratAlternates-LF.fd | 503 +++++++++++++++----- .../montserrat/LY1MontserratAlternates-Numr.fd | 269 ++++++++--- .../montserrat/LY1MontserratAlternates-OsF.fd | 499 +++++++++++++++----- .../montserrat/LY1MontserratAlternates-Sup.fd | 279 ++++++++--- .../montserrat/LY1MontserratAlternates-TLF.fd | 503 +++++++++++++++----- .../montserrat/LY1MontserratAlternates-TOsF.fd | 499 +++++++++++++++----- .../tex/latex/montserrat/OT1Montserrat-Dnom.fd | 265 +++++++++-- .../tex/latex/montserrat/OT1Montserrat-Inf.fd | 263 +++++++++-- .../tex/latex/montserrat/OT1Montserrat-LF.fd | 491 +++++++++++++++----- .../tex/latex/montserrat/OT1Montserrat-Numr.fd | 267 +++++++++-- .../tex/latex/montserrat/OT1Montserrat-OsF.fd | 489 +++++++++++++++----- .../tex/latex/montserrat/OT1Montserrat-Sup.fd | 267 +++++++++-- .../tex/latex/montserrat/OT1Montserrat-TLF.fd | 481 ++++++++++++++----- .../tex/latex/montserrat/OT1Montserrat-TOsF.fd | 471 +++++++++++++++---- .../montserrat/OT1MontserratAlternates-Dnom.fd | 279 ++++++++--- .../montserrat/OT1MontserratAlternates-Inf.fd | 283 +++++++++--- .../latex/montserrat/OT1MontserratAlternates-LF.fd | 501 +++++++++++++++----- .../montserrat/OT1MontserratAlternates-Numr.fd | 277 ++++++++--- .../montserrat/OT1MontserratAlternates-OsF.fd | 495 +++++++++++++++----- .../montserrat/OT1MontserratAlternates-Sup.fd | 285 +++++++++--- .../montserrat/OT1MontserratAlternates-TLF.fd | 503 +++++++++++++++----- .../montserrat/OT1MontserratAlternates-TOsF.fd | 503 +++++++++++++++----- .../tex/latex/montserrat/T1Montserrat-Dnom.fd | 271 ++++++++--- .../tex/latex/montserrat/T1Montserrat-Inf.fd | 269 ++++++++--- .../tex/latex/montserrat/T1Montserrat-LF.fd | 485 ++++++++++++++----- .../tex/latex/montserrat/T1Montserrat-Numr.fd | 263 +++++++++-- .../tex/latex/montserrat/T1Montserrat-OsF.fd | 473 +++++++++++++++---- .../tex/latex/montserrat/T1Montserrat-Sup.fd | 271 ++++++++--- .../tex/latex/montserrat/T1Montserrat-TLF.fd | 491 +++++++++++++++----- .../tex/latex/montserrat/T1Montserrat-TOsF.fd | 479 ++++++++++++++----- .../montserrat/T1MontserratAlternates-Dnom.fd | 279 ++++++++--- .../latex/montserrat/T1MontserratAlternates-Inf.fd | 275 ++++++++--- .../latex/montserrat/T1MontserratAlternates-LF.fd | 503 +++++++++++++++----- .../montserrat/T1MontserratAlternates-Numr.fd | 269 ++++++++--- .../latex/montserrat/T1MontserratAlternates-OsF.fd | 499 +++++++++++++++----- .../latex/montserrat/T1MontserratAlternates-Sup.fd | 285 +++++++++--- .../latex/montserrat/T1MontserratAlternates-TLF.fd | 513 ++++++++++++++++----- .../montserrat/T1MontserratAlternates-TOsF.fd | 501 +++++++++++++++----- .../tex/latex/montserrat/TS1Montserrat-LF.fd | 261 +++++++++-- .../tex/latex/montserrat/TS1Montserrat-OsF.fd | 271 ++++++++--- .../tex/latex/montserrat/TS1Montserrat-TLF.fd | 271 ++++++++--- .../tex/latex/montserrat/TS1Montserrat-TOsF.fd | 261 +++++++++-- .../latex/montserrat/TS1MontserratAlternates-LF.fd | 281 ++++++++--- .../montserrat/TS1MontserratAlternates-OsF.fd | 283 +++++++++--- .../montserrat/TS1MontserratAlternates-TLF.fd | 279 ++++++++--- .../montserrat/TS1MontserratAlternates-TOsF.fd | 281 ++++++++--- .../texmf-dist/tex/latex/montserrat/montserrat.sty | 37 +- 57 files changed, 16209 insertions(+), 4362 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-Dnom.fd b/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-Dnom.fd index 3e79048047f..0df427784c2 100644 --- a/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-Dnom.fd +++ b/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-Dnom.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{LY1Montserrat-Dnom.fd} - [2017/01/25 (autoinst) Font definitions for LY1/Montserrat-Dnom.] + [2019/10/18 (autoinst) Font definitions for LY1/Montserrat-Dnom.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,112 +11,277 @@ \DeclareFontFamily{LY1}{Montserrat-Dnom}{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-dnom-ly1 + +% ---- bold ---- + +\DeclareFontShape{LY1}{Montserrat-Dnom}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Dnom}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Dnom}{bold}{sl}{ + <-> ssub * Montserrat-Dnom/bold/it +}{} + + +% ---- semibold ---- + +\DeclareFontShape{LY1}{Montserrat-Dnom}{semibold}{it}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Dnom}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Dnom}{semibold}{sl}{ + <-> ssub * Montserrat-Dnom/semibold/it }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{k}{it}{ + +% ---- black ---- + +\DeclareFontShape{LY1}{Montserrat-Dnom}{black}{it}{ <-> \Montserrat@@scale Montserrat-BlackItalic-dnom-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{k}{sl}{ - <-> ssub * Montserrat-Dnom/k/it +\DeclareFontShape{LY1}{Montserrat-Dnom}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-dnom-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{el}{it}{ +\DeclareFontShape{LY1}{Montserrat-Dnom}{black}{sl}{ + <-> ssub * Montserrat-Dnom/black/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{LY1}{Montserrat-Dnom}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Dnom}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Dnom}{regular}{sl}{ + <-> ssub * Montserrat-Dnom/regular/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{LY1}{Montserrat-Dnom}{extralight}{it}{ <-> \Montserrat@@scale Montserrat-ExtraLightItalic-dnom-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{el}{n}{ +\DeclareFontShape{LY1}{Montserrat-Dnom}{extralight}{n}{ <-> \Montserrat@@scale Montserrat-ExtraLight-dnom-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{el}{sl}{ - <-> ssub * Montserrat-Dnom/el/it +\DeclareFontShape{LY1}{Montserrat-Dnom}{extralight}{sl}{ + <-> ssub * Montserrat-Dnom/extralight/it }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-dnom-ly1 + +% ---- light ---- + +\DeclareFontShape{LY1}{Montserrat-Dnom}{light}{n}{ + <-> \Montserrat@@scale Montserrat-Light-dnom-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-dnom-ly1 +\DeclareFontShape{LY1}{Montserrat-Dnom}{light}{it}{ + <-> \Montserrat@@scale Montserrat-LightItalic-dnom-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{b}{sl}{ - <-> ssub * Montserrat-Dnom/b/it +\DeclareFontShape{LY1}{Montserrat-Dnom}{light}{sl}{ + <-> ssub * Montserrat-Dnom/light/it }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-dnom-ly1 + +% ---- medium ---- + +\DeclareFontShape{LY1}{Montserrat-Dnom}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-dnom-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{eb}{n}{ +\DeclareFontShape{LY1}{Montserrat-Dnom}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Dnom}{medium}{sl}{ + <-> ssub * Montserrat-Dnom/medium/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{LY1}{Montserrat-Dnom}{extrabold}{n}{ <-> \Montserrat@@scale Montserrat-ExtraBold-dnom-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{eb}{sl}{ - <-> ssub * Montserrat-Dnom/eb/it +\DeclareFontShape{LY1}{Montserrat-Dnom}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-dnom-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-dnom-ly1 +\DeclareFontShape{LY1}{Montserrat-Dnom}{extrabold}{sl}{ + <-> ssub * Montserrat-Dnom/extrabold/it }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-dnom-ly1 + +% ---- thin ---- + +\DeclareFontShape{LY1}{Montserrat-Dnom}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-dnom-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{m}{sl}{ - <-> ssub * Montserrat-Dnom/m/it +\DeclareFontShape{LY1}{Montserrat-Dnom}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-dnom-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-dnom-ly1 +\DeclareFontShape{LY1}{Montserrat-Dnom}{thin}{sl}{ + <-> ssub * Montserrat-Dnom/thin/it }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-dnom-ly1 +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{LY1}{Montserrat-Dnom}{ul}{it}{ + <-> ssub * Montserrat-Dnom/thin/it }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{mb}{sl}{ - <-> ssub * Montserrat-Dnom/mb/it +\DeclareFontShape{LY1}{Montserrat-Dnom}{ul}{sl}{ + <-> ssub * Montserrat-Dnom/thin/sl }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{l}{n}{ - <-> \Montserrat@@scale Montserrat-Light-dnom-ly1 +\DeclareFontShape{LY1}{Montserrat-Dnom}{ul}{n}{ + <-> ssub * Montserrat-Dnom/thin/n +}{} + + +% el --> extralight + +\DeclareFontShape{LY1}{Montserrat-Dnom}{el}{n}{ + <-> ssub * Montserrat-Dnom/extralight/n }{} +\DeclareFontShape{LY1}{Montserrat-Dnom}{el}{sl}{ + <-> ssub * Montserrat-Dnom/extralight/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-Dnom}{el}{it}{ + <-> ssub * Montserrat-Dnom/extralight/it +}{} + + +% l --> light + \DeclareFontShape{LY1}{Montserrat-Dnom}{l}{it}{ - <-> \Montserrat@@scale Montserrat-LightItalic-dnom-ly1 + <-> ssub * Montserrat-Dnom/light/it +}{} + +\DeclareFontShape{LY1}{Montserrat-Dnom}{l}{n}{ + <-> ssub * Montserrat-Dnom/light/n }{} \DeclareFontShape{LY1}{Montserrat-Dnom}{l}{sl}{ - <-> ssub * Montserrat-Dnom/l/it + <-> ssub * Montserrat-Dnom/light/sl +}{} + + +% sl --> regular + +\DeclareFontShape{LY1}{Montserrat-Dnom}{sl}{it}{ + <-> ssub * Montserrat-Dnom/regular/it +}{} + +\DeclareFontShape{LY1}{Montserrat-Dnom}{sl}{sl}{ + <-> ssub * Montserrat-Dnom/regular/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-Dnom}{sl}{n}{ + <-> ssub * Montserrat-Dnom/regular/n +}{} + + +% m --> medium + +\DeclareFontShape{LY1}{Montserrat-Dnom}{m}{sl}{ + <-> ssub * Montserrat-Dnom/medium/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-Dnom}{m}{n}{ + <-> ssub * Montserrat-Dnom/medium/n +}{} + +\DeclareFontShape{LY1}{Montserrat-Dnom}{m}{it}{ + <-> ssub * Montserrat-Dnom/medium/it +}{} + + +% sb --> semibold + +\DeclareFontShape{LY1}{Montserrat-Dnom}{sb}{sl}{ + <-> ssub * Montserrat-Dnom/semibold/sl }{} \DeclareFontShape{LY1}{Montserrat-Dnom}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-dnom-ly1 + <-> ssub * Montserrat-Dnom/semibold/n }{} \DeclareFontShape{LY1}{Montserrat-Dnom}{sb}{it}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-dnom-ly1 + <-> ssub * Montserrat-Dnom/semibold/it }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{sb}{sl}{ - <-> ssub * Montserrat-Dnom/sb/it + +% b --> bold + +\DeclareFontShape{LY1}{Montserrat-Dnom}{b}{it}{ + <-> ssub * Montserrat-Dnom/bold/it }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-dnom-ly1 +\DeclareFontShape{LY1}{Montserrat-Dnom}{b}{n}{ + <-> ssub * Montserrat-Dnom/bold/n }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-dnom-ly1 +\DeclareFontShape{LY1}{Montserrat-Dnom}{b}{sl}{ + <-> ssub * Montserrat-Dnom/bold/sl +}{} + + +% eb --> extrabold + +\DeclareFontShape{LY1}{Montserrat-Dnom}{eb}{it}{ + <-> ssub * Montserrat-Dnom/extrabold/it +}{} + +\DeclareFontShape{LY1}{Montserrat-Dnom}{eb}{sl}{ + <-> ssub * Montserrat-Dnom/extrabold/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-Dnom}{eb}{n}{ + <-> ssub * Montserrat-Dnom/extrabold/n +}{} + + +% ub --> black + +\DeclareFontShape{LY1}{Montserrat-Dnom}{ub}{it}{ + <-> ssub * Montserrat-Dnom/black/it +}{} + +\DeclareFontShape{LY1}{Montserrat-Dnom}{ub}{sl}{ + <-> ssub * Montserrat-Dnom/black/sl }{} -\DeclareFontShape{LY1}{Montserrat-Dnom}{t}{sl}{ - <-> ssub * Montserrat-Dnom/t/it +\DeclareFontShape{LY1}{Montserrat-Dnom}{ub}{n}{ + <-> ssub * Montserrat-Dnom/black/n }{} \DeclareFontShape{LY1}{Montserrat-Dnom}{bx}{n}{ diff --git a/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-Inf.fd b/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-Inf.fd index 8676c8ca8d2..72f2e0f741a 100644 --- a/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-Inf.fd +++ b/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{LY1Montserrat-Inf.fd} - [2017/01/25 (autoinst) Font definitions for LY1/Montserrat-Inf.] + [2019/10/18 (autoinst) Font definitions for LY1/Montserrat-Inf.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,122 +11,287 @@ \DeclareFontFamily{LY1}{Montserrat-Inf}{} -\DeclareFontShape{LY1}{Montserrat-Inf}{el}{n}{ + +% ---- semibold ---- + +\DeclareFontShape{LY1}{Montserrat-Inf}{semibold}{it}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-inf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Inf}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-inf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Inf}{semibold}{sl}{ + <-> ssub * Montserrat-Inf/semibold/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{LY1}{Montserrat-Inf}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-inf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Inf}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-inf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Inf}{bold}{sl}{ + <-> ssub * Montserrat-Inf/bold/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{LY1}{Montserrat-Inf}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-inf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Inf}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-inf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Inf}{regular}{sl}{ + <-> ssub * Montserrat-Inf/regular/it +}{} + + +% ---- black ---- + +\DeclareFontShape{LY1}{Montserrat-Inf}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-inf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Inf}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-inf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Inf}{black}{sl}{ + <-> ssub * Montserrat-Inf/black/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{LY1}{Montserrat-Inf}{extralight}{n}{ <-> \Montserrat@@scale Montserrat-ExtraLight-inf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{el}{it}{ +\DeclareFontShape{LY1}{Montserrat-Inf}{extralight}{it}{ <-> \Montserrat@@scale Montserrat-ExtraLightItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{el}{sl}{ - <-> ssub * Montserrat-Inf/el/it +\DeclareFontShape{LY1}{Montserrat-Inf}{extralight}{sl}{ + <-> ssub * Montserrat-Inf/extralight/it }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-inf-ly1 + +% ---- light ---- + +\DeclareFontShape{LY1}{Montserrat-Inf}{light}{n}{ + <-> \Montserrat@@scale Montserrat-Light-inf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-inf-ly1 +\DeclareFontShape{LY1}{Montserrat-Inf}{light}{it}{ + <-> \Montserrat@@scale Montserrat-LightItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{k}{sl}{ - <-> ssub * Montserrat-Inf/k/it +\DeclareFontShape{LY1}{Montserrat-Inf}{light}{sl}{ + <-> ssub * Montserrat-Inf/light/it }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{eb}{it}{ + +% ---- medium ---- + +\DeclareFontShape{LY1}{Montserrat-Inf}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-inf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Inf}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-inf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Inf}{medium}{sl}{ + <-> ssub * Montserrat-Inf/medium/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{LY1}{Montserrat-Inf}{extrabold}{it}{ <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{eb}{n}{ +\DeclareFontShape{LY1}{Montserrat-Inf}{extrabold}{n}{ <-> \Montserrat@@scale Montserrat-ExtraBold-inf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{eb}{sl}{ - <-> ssub * Montserrat-Inf/eb/it +\DeclareFontShape{LY1}{Montserrat-Inf}{extrabold}{sl}{ + <-> ssub * Montserrat-Inf/extrabold/it }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-inf-ly1 + +% ---- thin ---- + +\DeclareFontShape{LY1}{Montserrat-Inf}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-inf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-inf-ly1 +\DeclareFontShape{LY1}{Montserrat-Inf}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{b}{sl}{ - <-> ssub * Montserrat-Inf/b/it +\DeclareFontShape{LY1}{Montserrat-Inf}{thin}{sl}{ + <-> ssub * Montserrat-Inf/thin/it }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-inf-ly1 +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{LY1}{Montserrat-Inf}{ul}{n}{ + <-> ssub * Montserrat-Inf/thin/n }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{sb}{it}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-inf-ly1 +\DeclareFontShape{LY1}{Montserrat-Inf}{ul}{sl}{ + <-> ssub * Montserrat-Inf/thin/sl }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{sb}{sl}{ - <-> ssub * Montserrat-Inf/sb/it +\DeclareFontShape{LY1}{Montserrat-Inf}{ul}{it}{ + <-> ssub * Montserrat-Inf/thin/it }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-inf-ly1 + +% el --> extralight + +\DeclareFontShape{LY1}{Montserrat-Inf}{el}{n}{ + <-> ssub * Montserrat-Inf/extralight/n }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-inf-ly1 +\DeclareFontShape{LY1}{Montserrat-Inf}{el}{sl}{ + <-> ssub * Montserrat-Inf/extralight/sl }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{t}{sl}{ - <-> ssub * Montserrat-Inf/t/it +\DeclareFontShape{LY1}{Montserrat-Inf}{el}{it}{ + <-> ssub * Montserrat-Inf/extralight/it }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-inf-ly1 + +% l --> light + +\DeclareFontShape{LY1}{Montserrat-Inf}{l}{sl}{ + <-> ssub * Montserrat-Inf/light/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-Inf}{l}{n}{ + <-> ssub * Montserrat-Inf/light/n }{} +\DeclareFontShape{LY1}{Montserrat-Inf}{l}{it}{ + <-> ssub * Montserrat-Inf/light/it +}{} + + +% sl --> regular + +\DeclareFontShape{LY1}{Montserrat-Inf}{sl}{it}{ + <-> ssub * Montserrat-Inf/regular/it +}{} + +\DeclareFontShape{LY1}{Montserrat-Inf}{sl}{n}{ + <-> ssub * Montserrat-Inf/regular/n +}{} + +\DeclareFontShape{LY1}{Montserrat-Inf}{sl}{sl}{ + <-> ssub * Montserrat-Inf/regular/sl +}{} + + +% m --> medium + \DeclareFontShape{LY1}{Montserrat-Inf}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-inf-ly1 + <-> ssub * Montserrat-Inf/medium/it }{} \DeclareFontShape{LY1}{Montserrat-Inf}{m}{sl}{ - <-> ssub * Montserrat-Inf/m/it + <-> ssub * Montserrat-Inf/medium/sl }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{l}{n}{ - <-> \Montserrat@@scale Montserrat-Light-inf-ly1 +\DeclareFontShape{LY1}{Montserrat-Inf}{m}{n}{ + <-> ssub * Montserrat-Inf/medium/n }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{l}{it}{ - <-> \Montserrat@@scale Montserrat-LightItalic-inf-ly1 + +% sb --> semibold + +\DeclareFontShape{LY1}{Montserrat-Inf}{sb}{sl}{ + <-> ssub * Montserrat-Inf/semibold/sl }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{l}{sl}{ - <-> ssub * Montserrat-Inf/l/it +\DeclareFontShape{LY1}{Montserrat-Inf}{sb}{n}{ + <-> ssub * Montserrat-Inf/semibold/n }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-inf-ly1 +\DeclareFontShape{LY1}{Montserrat-Inf}{sb}{it}{ + <-> ssub * Montserrat-Inf/semibold/it }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-inf-ly1 + +% b --> bold + +\DeclareFontShape{LY1}{Montserrat-Inf}{b}{n}{ + <-> ssub * Montserrat-Inf/bold/n }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{mb}{sl}{ - <-> ssub * Montserrat-Inf/mb/it +\DeclareFontShape{LY1}{Montserrat-Inf}{b}{sl}{ + <-> ssub * Montserrat-Inf/bold/sl }{} -\DeclareFontShape{LY1}{Montserrat-Inf}{bx}{n}{ - <-> ssub * Montserrat-Inf/b/n +\DeclareFontShape{LY1}{Montserrat-Inf}{b}{it}{ + <-> ssub * Montserrat-Inf/bold/it +}{} + + +% eb --> extrabold + +\DeclareFontShape{LY1}{Montserrat-Inf}{eb}{it}{ + <-> ssub * Montserrat-Inf/extrabold/it +}{} + +\DeclareFontShape{LY1}{Montserrat-Inf}{eb}{sl}{ + <-> ssub * Montserrat-Inf/extrabold/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-Inf}{eb}{n}{ + <-> ssub * Montserrat-Inf/extrabold/n +}{} + + +% ub --> black + +\DeclareFontShape{LY1}{Montserrat-Inf}{ub}{sl}{ + <-> ssub * Montserrat-Inf/black/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-Inf}{ub}{n}{ + <-> ssub * Montserrat-Inf/black/n +}{} + +\DeclareFontShape{LY1}{Montserrat-Inf}{ub}{it}{ + <-> ssub * Montserrat-Inf/black/it }{} \DeclareFontShape{LY1}{Montserrat-Inf}{bx}{it}{ <-> ssub * Montserrat-Inf/b/it }{} +\DeclareFontShape{LY1}{Montserrat-Inf}{bx}{n}{ + <-> ssub * Montserrat-Inf/b/n +}{} + \DeclareFontShape{LY1}{Montserrat-Inf}{bx}{sl}{ <-> ssub * Montserrat-Inf/b/sl }{} diff --git a/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-LF.fd b/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-LF.fd index c9a4116e3e7..09c5b4a5f38 100644 --- a/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-LF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{LY1Montserrat-LF.fd} - [2017/01/25 (autoinst) Font definitions for LY1/Montserrat-LF.] + [2019/10/18 (autoinst) Font definitions for LY1/Montserrat-LF.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,242 +11,515 @@ \DeclareFontFamily{LY1}{Montserrat-LF}{} -\DeclareFontShape{LY1}{Montserrat-LF}{b}{sc}{ - <-> \Montserrat@@scale Montserrat-Bold-lf-sc-ly1 + +% ---- semibold ---- + +\DeclareFontShape{LY1}{Montserrat-LF}{semibold}{sc}{ + <-> \Montserrat@@scale Montserrat-SemiBold-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{b}{scit}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-lf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-lf-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{semibold}{scit}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-lf-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{semibold}{it}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{b}{scsl}{ - <-> ssub * Montserrat-LF/b/scit +\DeclareFontShape{LY1}{Montserrat-LF}{semibold}{sl}{ + <-> ssub * Montserrat-LF/semibold/it }{} -\DeclareFontShape{LY1}{Montserrat-LF}{b}{sl}{ - <-> ssub * Montserrat-LF/b/it +\DeclareFontShape{LY1}{Montserrat-LF}{semibold}{scsl}{ + <-> ssub * Montserrat-LF/semibold/scit }{} -\DeclareFontShape{LY1}{Montserrat-LF}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-ly1 + +% ---- bold ---- + +\DeclareFontShape{LY1}{Montserrat-LF}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{eb}{scit}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{bold}{scit}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{eb}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-lf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{bold}{sc}{ + <-> \Montserrat@@scale Montserrat-Bold-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-lf-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-lf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{eb}{scsl}{ - <-> ssub * Montserrat-LF/eb/scit +\DeclareFontShape{LY1}{Montserrat-LF}{bold}{sl}{ + <-> ssub * Montserrat-LF/bold/it }{} -\DeclareFontShape{LY1}{Montserrat-LF}{eb}{sl}{ - <-> ssub * Montserrat-LF/eb/it +\DeclareFontShape{LY1}{Montserrat-LF}{bold}{scsl}{ + <-> ssub * Montserrat-LF/bold/scit }{} -\DeclareFontShape{LY1}{Montserrat-LF}{el}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-lf-ly1 + +% ---- extralight ---- + +\DeclareFontShape{LY1}{Montserrat-LF}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{el}{scit}{ +\DeclareFontShape{LY1}{Montserrat-LF}{extralight}{scit}{ <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{el}{sc}{ +\DeclareFontShape{LY1}{Montserrat-LF}{extralight}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-lf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{extralight}{sc}{ <-> \Montserrat@@scale Montserrat-ExtraLight-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{extralight}{sl}{ + <-> ssub * Montserrat-LF/extralight/it }{} -\DeclareFontShape{LY1}{Montserrat-LF}{el}{scsl}{ - <-> ssub * Montserrat-LF/el/scit +\DeclareFontShape{LY1}{Montserrat-LF}{extralight}{scsl}{ + <-> ssub * Montserrat-LF/extralight/scit }{} -\DeclareFontShape{LY1}{Montserrat-LF}{el}{sl}{ - <-> ssub * Montserrat-LF/el/it + +% ---- regular ---- + +\DeclareFontShape{LY1}{Montserrat-LF}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-lf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-lf-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{regular}{sc}{ + <-> \Montserrat@@scale Montserrat-Regular-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-lf-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-lf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{regular}{scit}{ + <-> \Montserrat@@scale Montserrat-Italic-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{regular}{sl}{ + <-> ssub * Montserrat-LF/regular/it +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{regular}{scsl}{ + <-> ssub * Montserrat-LF/regular/scit }{} -\DeclareFontShape{LY1}{Montserrat-LF}{k}{scit}{ + +% ---- black ---- + +\DeclareFontShape{LY1}{Montserrat-LF}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-lf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{black}{scit}{ <-> \Montserrat@@scale Montserrat-BlackItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{k}{sc}{ +\DeclareFontShape{LY1}{Montserrat-LF}{black}{sc}{ <-> \Montserrat@@scale Montserrat-Black-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{k}{scsl}{ - <-> ssub * Montserrat-LF/k/scit +\DeclareFontShape{LY1}{Montserrat-LF}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-lf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{black}{sl}{ + <-> ssub * Montserrat-LF/black/it }{} -\DeclareFontShape{LY1}{Montserrat-LF}{k}{sl}{ - <-> ssub * Montserrat-LF/k/it +\DeclareFontShape{LY1}{Montserrat-LF}{black}{scsl}{ + <-> ssub * Montserrat-LF/black/scit }{} -\DeclareFontShape{LY1}{Montserrat-LF}{mb}{it}{ + +% ---- light ---- + +\DeclareFontShape{LY1}{Montserrat-LF}{light}{sc}{ + <-> \Montserrat@@scale Montserrat-Light-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{light}{n}{ + <-> \Montserrat@@scale Montserrat-Light-lf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{light}{scit}{ + <-> \Montserrat@@scale Montserrat-LightItalic-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{light}{it}{ + <-> \Montserrat@@scale Montserrat-LightItalic-lf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{light}{sl}{ + <-> ssub * Montserrat-LF/light/it +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{light}{scsl}{ + <-> ssub * Montserrat-LF/light/scit +}{} + + +% ---- medium ---- + +\DeclareFontShape{LY1}{Montserrat-LF}{medium}{it}{ <-> \Montserrat@@scale Montserrat-MediumItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{mb}{scit}{ +\DeclareFontShape{LY1}{Montserrat-LF}{medium}{scit}{ <-> \Montserrat@@scale Montserrat-MediumItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{mb}{sc}{ +\DeclareFontShape{LY1}{Montserrat-LF}{medium}{sc}{ <-> \Montserrat@@scale Montserrat-Medium-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{mb}{n}{ +\DeclareFontShape{LY1}{Montserrat-LF}{medium}{n}{ <-> \Montserrat@@scale Montserrat-Medium-lf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{mb}{scsl}{ - <-> ssub * Montserrat-LF/mb/scit +\DeclareFontShape{LY1}{Montserrat-LF}{medium}{sl}{ + <-> ssub * Montserrat-LF/medium/it }{} -\DeclareFontShape{LY1}{Montserrat-LF}{mb}{sl}{ - <-> ssub * Montserrat-LF/mb/it +\DeclareFontShape{LY1}{Montserrat-LF}{medium}{scsl}{ + <-> ssub * Montserrat-LF/medium/scit }{} -\DeclareFontShape{LY1}{Montserrat-LF}{l}{it}{ - <-> \Montserrat@@scale Montserrat-LightItalic-lf-ly1 + +% ---- thin ---- + +\DeclareFontShape{LY1}{Montserrat-LF}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-lf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-LF}{l}{sc}{ - <-> \Montserrat@@scale Montserrat-Light-lf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{thin}{sc}{ + <-> \Montserrat@@scale Montserrat-Thin-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{thin}{scit}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-lf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{thin}{sl}{ + <-> ssub * Montserrat-LF/thin/it +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{thin}{scsl}{ + <-> ssub * Montserrat-LF/thin/scit +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{LY1}{Montserrat-LF}{extrabold}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-lf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{extrabold}{scit}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{extrabold}{sl}{ + <-> ssub * Montserrat-LF/extrabold/it +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{extrabold}{scsl}{ + <-> ssub * Montserrat-LF/extrabold/scit +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{LY1}{Montserrat-LF}{ul}{n}{ + <-> ssub * Montserrat-LF/thin/n +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{ul}{sc}{ + <-> ssub * Montserrat-LF/thin/sc +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{ul}{scsl}{ + <-> ssub * Montserrat-LF/thin/scsl +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{ul}{sl}{ + <-> ssub * Montserrat-LF/thin/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{ul}{it}{ + <-> ssub * Montserrat-LF/thin/it +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{ul}{scit}{ + <-> ssub * Montserrat-LF/thin/scit }{} + +% el --> extralight + +\DeclareFontShape{LY1}{Montserrat-LF}{el}{n}{ + <-> ssub * Montserrat-LF/extralight/n +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{el}{sc}{ + <-> ssub * Montserrat-LF/extralight/sc +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{el}{scsl}{ + <-> ssub * Montserrat-LF/extralight/scsl +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{el}{sl}{ + <-> ssub * Montserrat-LF/extralight/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{el}{it}{ + <-> ssub * Montserrat-LF/extralight/it +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{el}{scit}{ + <-> ssub * Montserrat-LF/extralight/scit +}{} + + +% l --> light + \DeclareFontShape{LY1}{Montserrat-LF}{l}{scit}{ - <-> \Montserrat@@scale Montserrat-LightItalic-lf-sc-ly1 + <-> ssub * Montserrat-LF/light/scit }{} -\DeclareFontShape{LY1}{Montserrat-LF}{l}{n}{ - <-> \Montserrat@@scale Montserrat-Light-lf-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{l}{it}{ + <-> ssub * Montserrat-LF/light/it +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{l}{sl}{ + <-> ssub * Montserrat-LF/light/sl }{} \DeclareFontShape{LY1}{Montserrat-LF}{l}{scsl}{ - <-> ssub * Montserrat-LF/l/scit + <-> ssub * Montserrat-LF/light/scsl }{} -\DeclareFontShape{LY1}{Montserrat-LF}{l}{sl}{ - <-> ssub * Montserrat-LF/l/it +\DeclareFontShape{LY1}{Montserrat-LF}{l}{sc}{ + <-> ssub * Montserrat-LF/light/sc }{} -\DeclareFontShape{LY1}{Montserrat-LF}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-lf-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{l}{n}{ + <-> ssub * Montserrat-LF/light/n }{} -\DeclareFontShape{LY1}{Montserrat-LF}{m}{scit}{ - <-> \Montserrat@@scale Montserrat-Italic-lf-sc-ly1 + +% sl --> regular + +\DeclareFontShape{LY1}{Montserrat-LF}{sl}{scit}{ + <-> ssub * Montserrat-LF/regular/scit }{} -\DeclareFontShape{LY1}{Montserrat-LF}{m}{sc}{ - <-> \Montserrat@@scale Montserrat-Regular-lf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{sl}{it}{ + <-> ssub * Montserrat-LF/regular/it }{} -\DeclareFontShape{LY1}{Montserrat-LF}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-lf-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{sl}{sl}{ + <-> ssub * Montserrat-LF/regular/sl }{} -\DeclareFontShape{LY1}{Montserrat-LF}{m}{scsl}{ - <-> ssub * Montserrat-LF/m/scit +\DeclareFontShape{LY1}{Montserrat-LF}{sl}{n}{ + <-> ssub * Montserrat-LF/regular/n +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{sl}{sc}{ + <-> ssub * Montserrat-LF/regular/sc +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{sl}{scsl}{ + <-> ssub * Montserrat-LF/regular/scsl }{} + +% m --> medium + \DeclareFontShape{LY1}{Montserrat-LF}{m}{sl}{ - <-> ssub * Montserrat-LF/m/it + <-> ssub * Montserrat-LF/medium/sl }{} -\DeclareFontShape{LY1}{Montserrat-LF}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-lf-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{m}{sc}{ + <-> ssub * Montserrat-LF/medium/sc }{} -\DeclareFontShape{LY1}{Montserrat-LF}{t}{scit}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{m}{n}{ + <-> ssub * Montserrat-LF/medium/n }{} -\DeclareFontShape{LY1}{Montserrat-LF}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-lf-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{m}{scsl}{ + <-> ssub * Montserrat-LF/medium/scsl }{} -\DeclareFontShape{LY1}{Montserrat-LF}{t}{sc}{ - <-> \Montserrat@@scale Montserrat-Thin-lf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{m}{scit}{ + <-> ssub * Montserrat-LF/medium/scit }{} -\DeclareFontShape{LY1}{Montserrat-LF}{t}{scsl}{ - <-> ssub * Montserrat-LF/t/scit +\DeclareFontShape{LY1}{Montserrat-LF}{m}{it}{ + <-> ssub * Montserrat-LF/medium/it }{} -\DeclareFontShape{LY1}{Montserrat-LF}{t}{sl}{ - <-> ssub * Montserrat-LF/t/it + +% sb --> semibold + +\DeclareFontShape{LY1}{Montserrat-LF}{sb}{sl}{ + <-> ssub * Montserrat-LF/semibold/sl }{} \DeclareFontShape{LY1}{Montserrat-LF}{sb}{sc}{ - <-> \Montserrat@@scale Montserrat-SemiBold-lf-sc-ly1 + <-> ssub * Montserrat-LF/semibold/sc }{} -\DeclareFontShape{LY1}{Montserrat-LF}{sb}{scit}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{sb}{n}{ + <-> ssub * Montserrat-LF/semibold/n }{} -\DeclareFontShape{LY1}{Montserrat-LF}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-lf-ly1 +\DeclareFontShape{LY1}{Montserrat-LF}{sb}{scsl}{ + <-> ssub * Montserrat-LF/semibold/scsl +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{sb}{scit}{ + <-> ssub * Montserrat-LF/semibold/scit }{} \DeclareFontShape{LY1}{Montserrat-LF}{sb}{it}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-ly1 + <-> ssub * Montserrat-LF/semibold/it }{} -\DeclareFontShape{LY1}{Montserrat-LF}{sb}{scsl}{ - <-> ssub * Montserrat-LF/sb/scit + +% b --> bold + +\DeclareFontShape{LY1}{Montserrat-LF}{b}{sc}{ + <-> ssub * Montserrat-LF/bold/sc }{} -\DeclareFontShape{LY1}{Montserrat-LF}{sb}{sl}{ - <-> ssub * Montserrat-LF/sb/it +\DeclareFontShape{LY1}{Montserrat-LF}{b}{n}{ + <-> ssub * Montserrat-LF/bold/n }{} -\DeclareFontShape{LY1}{Montserrat-LF}{bx}{scsl}{ - <-> ssub * Montserrat-LF/b/scsl +\DeclareFontShape{LY1}{Montserrat-LF}{b}{scsl}{ + <-> ssub * Montserrat-LF/bold/scsl }{} -\DeclareFontShape{LY1}{Montserrat-LF}{bx}{sc}{ - <-> ssub * Montserrat-LF/b/sc +\DeclareFontShape{LY1}{Montserrat-LF}{b}{sl}{ + <-> ssub * Montserrat-LF/bold/sl }{} -\DeclareFontShape{LY1}{Montserrat-LF}{bx}{scit}{ - <-> ssub * Montserrat-LF/b/scit +\DeclareFontShape{LY1}{Montserrat-LF}{b}{it}{ + <-> ssub * Montserrat-LF/bold/it }{} -\DeclareFontShape{LY1}{Montserrat-LF}{bx}{n}{ - <-> ssub * Montserrat-LF/b/n +\DeclareFontShape{LY1}{Montserrat-LF}{b}{scit}{ + <-> ssub * Montserrat-LF/bold/scit +}{} + + +% eb --> extrabold + +\DeclareFontShape{LY1}{Montserrat-LF}{eb}{scit}{ + <-> ssub * Montserrat-LF/extrabold/scit +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{eb}{it}{ + <-> ssub * Montserrat-LF/extrabold/it +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{eb}{sl}{ + <-> ssub * Montserrat-LF/extrabold/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{eb}{sc}{ + <-> ssub * Montserrat-LF/extrabold/sc +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{eb}{n}{ + <-> ssub * Montserrat-LF/extrabold/n +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{eb}{scsl}{ + <-> ssub * Montserrat-LF/extrabold/scsl +}{} + + +% ub --> black + +\DeclareFontShape{LY1}{Montserrat-LF}{ub}{scit}{ + <-> ssub * Montserrat-LF/black/scit +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{ub}{it}{ + <-> ssub * Montserrat-LF/black/it +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{ub}{sl}{ + <-> ssub * Montserrat-LF/black/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{ub}{sc}{ + <-> ssub * Montserrat-LF/black/sc +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{ub}{n}{ + <-> ssub * Montserrat-LF/black/n +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{ub}{scsl}{ + <-> ssub * Montserrat-LF/black/scsl }{} \DeclareFontShape{LY1}{Montserrat-LF}{bx}{sl}{ <-> ssub * Montserrat-LF/b/sl }{} +\DeclareFontShape{LY1}{Montserrat-LF}{bx}{sc}{ + <-> ssub * Montserrat-LF/b/sc +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{bx}{n}{ + <-> ssub * Montserrat-LF/b/n +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{bx}{scsl}{ + <-> ssub * Montserrat-LF/b/scsl +}{} + +\DeclareFontShape{LY1}{Montserrat-LF}{bx}{scit}{ + <-> ssub * Montserrat-LF/b/scit +}{} + \DeclareFontShape{LY1}{Montserrat-LF}{bx}{it}{ <-> ssub * Montserrat-LF/b/it }{} diff --git a/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-Numr.fd b/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-Numr.fd index 95e99034548..236e894bf00 100644 --- a/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-Numr.fd +++ b/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-Numr.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{LY1Montserrat-Numr.fd} - [2017/01/25 (autoinst) Font definitions for LY1/Montserrat-Numr.] + [2019/10/18 (autoinst) Font definitions for LY1/Montserrat-Numr.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,124 +11,289 @@ \DeclareFontFamily{LY1}{Montserrat-Numr}{} -\DeclareFontShape{LY1}{Montserrat-Numr}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-numr-ly1 + +% ---- bold ---- + +\DeclareFontShape{LY1}{Montserrat-Numr}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-numr-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{m}{n}{ +\DeclareFontShape{LY1}{Montserrat-Numr}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-numr-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Numr}{bold}{sl}{ + <-> ssub * Montserrat-Numr/bold/it +}{} + + +% ---- semibold ---- + +\DeclareFontShape{LY1}{Montserrat-Numr}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-numr-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Numr}{semibold}{it}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-numr-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Numr}{semibold}{sl}{ + <-> ssub * Montserrat-Numr/semibold/it +}{} + + +% ---- black ---- + +\DeclareFontShape{LY1}{Montserrat-Numr}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-numr-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Numr}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-numr-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Numr}{black}{sl}{ + <-> ssub * Montserrat-Numr/black/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{LY1}{Montserrat-Numr}{regular}{n}{ <-> \Montserrat@@scale Montserrat-Regular-numr-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{m}{sl}{ - <-> ssub * Montserrat-Numr/m/it +\DeclareFontShape{LY1}{Montserrat-Numr}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-numr-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-numr-ly1 +\DeclareFontShape{LY1}{Montserrat-Numr}{regular}{sl}{ + <-> ssub * Montserrat-Numr/regular/it }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-numr-ly1 + +% ---- extralight ---- + +\DeclareFontShape{LY1}{Montserrat-Numr}{extralight}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-numr-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{mb}{sl}{ - <-> ssub * Montserrat-Numr/mb/it +\DeclareFontShape{LY1}{Montserrat-Numr}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-numr-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{l}{it}{ +\DeclareFontShape{LY1}{Montserrat-Numr}{extralight}{sl}{ + <-> ssub * Montserrat-Numr/extralight/it +}{} + + +% ---- light ---- + +\DeclareFontShape{LY1}{Montserrat-Numr}{light}{it}{ <-> \Montserrat@@scale Montserrat-LightItalic-numr-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{l}{n}{ +\DeclareFontShape{LY1}{Montserrat-Numr}{light}{n}{ <-> \Montserrat@@scale Montserrat-Light-numr-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{l}{sl}{ - <-> ssub * Montserrat-Numr/l/it +\DeclareFontShape{LY1}{Montserrat-Numr}{light}{sl}{ + <-> ssub * Montserrat-Numr/light/it }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-numr-ly1 + +% ---- medium ---- + +\DeclareFontShape{LY1}{Montserrat-Numr}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-numr-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{sb}{it}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-numr-ly1 +\DeclareFontShape{LY1}{Montserrat-Numr}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-numr-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{sb}{sl}{ - <-> ssub * Montserrat-Numr/sb/it +\DeclareFontShape{LY1}{Montserrat-Numr}{medium}{sl}{ + <-> ssub * Montserrat-Numr/medium/it }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-numr-ly1 + +% ---- extrabold ---- + +\DeclareFontShape{LY1}{Montserrat-Numr}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-numr-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Numr}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-numr-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{t}{it}{ +\DeclareFontShape{LY1}{Montserrat-Numr}{extrabold}{sl}{ + <-> ssub * Montserrat-Numr/extrabold/it +}{} + + +% ---- thin ---- + +\DeclareFontShape{LY1}{Montserrat-Numr}{thin}{it}{ <-> \Montserrat@@scale Montserrat-ThinItalic-numr-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{t}{sl}{ - <-> ssub * Montserrat-Numr/t/it +\DeclareFontShape{LY1}{Montserrat-Numr}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-numr-ly1 }{} +\DeclareFontShape{LY1}{Montserrat-Numr}{thin}{sl}{ + <-> ssub * Montserrat-Numr/thin/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{LY1}{Montserrat-Numr}{ul}{n}{ + <-> ssub * Montserrat-Numr/thin/n +}{} + +\DeclareFontShape{LY1}{Montserrat-Numr}{ul}{sl}{ + <-> ssub * Montserrat-Numr/thin/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-Numr}{ul}{it}{ + <-> ssub * Montserrat-Numr/thin/it +}{} + + +% el --> extralight + \DeclareFontShape{LY1}{Montserrat-Numr}{el}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-numr-ly1 + <-> ssub * Montserrat-Numr/extralight/n +}{} + +\DeclareFontShape{LY1}{Montserrat-Numr}{el}{sl}{ + <-> ssub * Montserrat-Numr/extralight/sl }{} \DeclareFontShape{LY1}{Montserrat-Numr}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-numr-ly1 + <-> ssub * Montserrat-Numr/extralight/it }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{el}{sl}{ - <-> ssub * Montserrat-Numr/el/it + +% l --> light + +\DeclareFontShape{LY1}{Montserrat-Numr}{l}{it}{ + <-> ssub * Montserrat-Numr/light/it }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-numr-ly1 +\DeclareFontShape{LY1}{Montserrat-Numr}{l}{n}{ + <-> ssub * Montserrat-Numr/light/n }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-numr-ly1 +\DeclareFontShape{LY1}{Montserrat-Numr}{l}{sl}{ + <-> ssub * Montserrat-Numr/light/sl +}{} + + +% sl --> regular + +\DeclareFontShape{LY1}{Montserrat-Numr}{sl}{it}{ + <-> ssub * Montserrat-Numr/regular/it }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{k}{sl}{ - <-> ssub * Montserrat-Numr/k/it +\DeclareFontShape{LY1}{Montserrat-Numr}{sl}{sl}{ + <-> ssub * Montserrat-Numr/regular/sl }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-numr-ly1 +\DeclareFontShape{LY1}{Montserrat-Numr}{sl}{n}{ + <-> ssub * Montserrat-Numr/regular/n +}{} + + +% m --> medium + +\DeclareFontShape{LY1}{Montserrat-Numr}{m}{sl}{ + <-> ssub * Montserrat-Numr/medium/sl }{} +\DeclareFontShape{LY1}{Montserrat-Numr}{m}{n}{ + <-> ssub * Montserrat-Numr/medium/n +}{} + +\DeclareFontShape{LY1}{Montserrat-Numr}{m}{it}{ + <-> ssub * Montserrat-Numr/medium/it +}{} + + +% sb --> semibold + +\DeclareFontShape{LY1}{Montserrat-Numr}{sb}{n}{ + <-> ssub * Montserrat-Numr/semibold/n +}{} + +\DeclareFontShape{LY1}{Montserrat-Numr}{sb}{sl}{ + <-> ssub * Montserrat-Numr/semibold/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-Numr}{sb}{it}{ + <-> ssub * Montserrat-Numr/semibold/it +}{} + + +% b --> bold + \DeclareFontShape{LY1}{Montserrat-Numr}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-numr-ly1 + <-> ssub * Montserrat-Numr/bold/it }{} \DeclareFontShape{LY1}{Montserrat-Numr}{b}{sl}{ - <-> ssub * Montserrat-Numr/b/it + <-> ssub * Montserrat-Numr/bold/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-Numr}{b}{n}{ + <-> ssub * Montserrat-Numr/bold/n }{} + +% eb --> extrabold + \DeclareFontShape{LY1}{Montserrat-Numr}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-numr-ly1 + <-> ssub * Montserrat-Numr/extrabold/it +}{} + +\DeclareFontShape{LY1}{Montserrat-Numr}{eb}{sl}{ + <-> ssub * Montserrat-Numr/extrabold/sl }{} \DeclareFontShape{LY1}{Montserrat-Numr}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-numr-ly1 + <-> ssub * Montserrat-Numr/extrabold/n }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{eb}{sl}{ - <-> ssub * Montserrat-Numr/eb/it + +% ub --> black + +\DeclareFontShape{LY1}{Montserrat-Numr}{ub}{sl}{ + <-> ssub * Montserrat-Numr/black/sl }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{bx}{sl}{ - <-> ssub * Montserrat-Numr/b/sl +\DeclareFontShape{LY1}{Montserrat-Numr}{ub}{n}{ + <-> ssub * Montserrat-Numr/black/n }{} -\DeclareFontShape{LY1}{Montserrat-Numr}{bx}{it}{ - <-> ssub * Montserrat-Numr/b/it +\DeclareFontShape{LY1}{Montserrat-Numr}{ub}{it}{ + <-> ssub * Montserrat-Numr/black/it }{} \DeclareFontShape{LY1}{Montserrat-Numr}{bx}{n}{ <-> ssub * Montserrat-Numr/b/n }{} +\DeclareFontShape{LY1}{Montserrat-Numr}{bx}{sl}{ + <-> ssub * Montserrat-Numr/b/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-Numr}{bx}{it}{ + <-> ssub * Montserrat-Numr/b/it +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-OsF.fd b/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-OsF.fd index c344a7e9b9d..314dcc9aaaa 100644 --- a/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-OsF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{LY1Montserrat-OsF.fd} - [2017/01/25 (autoinst) Font definitions for LY1/Montserrat-OsF.] + [2019/10/18 (autoinst) Font definitions for LY1/Montserrat-OsF.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,230 +11,507 @@ \DeclareFontFamily{LY1}{Montserrat-OsF}{} -\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{it}{ + +% ---- black ---- + +\DeclareFontShape{LY1}{Montserrat-OsF}{black}{scit}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-osf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{black}{sc}{ + <-> \Montserrat@@scale Montserrat-Black-osf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{black}{sl}{ + <-> ssub * Montserrat-OsF/black/it +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{black}{scsl}{ + <-> ssub * Montserrat-OsF/black/scit +}{} + + +% ---- regular ---- + +\DeclareFontShape{LY1}{Montserrat-OsF}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{regular}{scit}{ + <-> \Montserrat@@scale Montserrat-Italic-osf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{regular}{sc}{ + <-> \Montserrat@@scale Montserrat-Regular-osf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{regular}{sl}{ + <-> ssub * Montserrat-OsF/regular/it +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{regular}{scsl}{ + <-> ssub * Montserrat-OsF/regular/scit +}{} + + +% ---- extralight ---- + +\DeclareFontShape{LY1}{Montserrat-OsF}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{extralight}{scit}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{extralight}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{extralight}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-osf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{extralight}{sl}{ + <-> ssub * Montserrat-OsF/extralight/it +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{extralight}{scsl}{ + <-> ssub * Montserrat-OsF/extralight/scit +}{} + + +% ---- bold ---- + +\DeclareFontShape{LY1}{Montserrat-OsF}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{bold}{sc}{ + <-> \Montserrat@@scale Montserrat-Bold-osf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{bold}{scit}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-osf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{bold}{sl}{ + <-> ssub * Montserrat-OsF/bold/it +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{bold}{scsl}{ + <-> ssub * Montserrat-OsF/bold/scit +}{} + + +% ---- semibold ---- + +\DeclareFontShape{LY1}{Montserrat-OsF}{semibold}{it}{ <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{scit}{ +\DeclareFontShape{LY1}{Montserrat-OsF}{semibold}{scit}{ <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{n}{ +\DeclareFontShape{LY1}{Montserrat-OsF}{semibold}{sc}{ + <-> \Montserrat@@scale Montserrat-SemiBold-osf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{semibold}{n}{ <-> \Montserrat@@scale Montserrat-SemiBold-osf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{sc}{ - <-> \Montserrat@@scale Montserrat-SemiBold-osf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{semibold}{sl}{ + <-> ssub * Montserrat-OsF/semibold/it }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{scsl}{ - <-> ssub * Montserrat-OsF/sb/scit +\DeclareFontShape{LY1}{Montserrat-OsF}{semibold}{scsl}{ + <-> ssub * Montserrat-OsF/semibold/scit }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{sl}{ - <-> ssub * Montserrat-OsF/sb/it + +% ---- extrabold ---- + +\DeclareFontShape{LY1}{Montserrat-OsF}{extrabold}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{t}{scit}{ +\DeclareFontShape{LY1}{Montserrat-OsF}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{extrabold}{scit}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{extrabold}{sl}{ + <-> ssub * Montserrat-OsF/extrabold/it +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{extrabold}{scsl}{ + <-> ssub * Montserrat-OsF/extrabold/scit +}{} + + +% ---- thin ---- + +\DeclareFontShape{LY1}{Montserrat-OsF}{thin}{scit}{ <-> \Montserrat@@scale Montserrat-ThinItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{t}{sc}{ +\DeclareFontShape{LY1}{Montserrat-OsF}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{thin}{sc}{ <-> \Montserrat@@scale Montserrat-Thin-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{t}{n}{ +\DeclareFontShape{LY1}{Montserrat-OsF}{thin}{n}{ <-> \Montserrat@@scale Montserrat-Thin-osf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-osf-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{thin}{sl}{ + <-> ssub * Montserrat-OsF/thin/it }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{t}{scsl}{ - <-> ssub * Montserrat-OsF/t/scit +\DeclareFontShape{LY1}{Montserrat-OsF}{thin}{scsl}{ + <-> ssub * Montserrat-OsF/thin/scit }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{t}{sl}{ - <-> ssub * Montserrat-OsF/t/it + +% ---- medium ---- + +\DeclareFontShape{LY1}{Montserrat-OsF}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-osf-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{medium}{scit}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{m}{scit}{ - <-> \Montserrat@@scale Montserrat-Italic-osf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{medium}{sc}{ + <-> \Montserrat@@scale Montserrat-Medium-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{m}{sc}{ - <-> \Montserrat@@scale Montserrat-Regular-osf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-osf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-osf-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{medium}{sl}{ + <-> ssub * Montserrat-OsF/medium/it }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{m}{scsl}{ - <-> ssub * Montserrat-OsF/m/scit +\DeclareFontShape{LY1}{Montserrat-OsF}{medium}{scsl}{ + <-> ssub * Montserrat-OsF/medium/scit }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{m}{sl}{ - <-> ssub * Montserrat-OsF/m/it + +% ---- light ---- + +\DeclareFontShape{LY1}{Montserrat-OsF}{light}{n}{ + <-> \Montserrat@@scale Montserrat-Light-osf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{l}{it}{ +\DeclareFontShape{LY1}{Montserrat-OsF}{light}{sc}{ + <-> \Montserrat@@scale Montserrat-Light-osf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{light}{it}{ <-> \Montserrat@@scale Montserrat-LightItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{l}{scit}{ +\DeclareFontShape{LY1}{Montserrat-OsF}{light}{scit}{ <-> \Montserrat@@scale Montserrat-LightItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{l}{sc}{ - <-> \Montserrat@@scale Montserrat-Light-osf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{light}{sl}{ + <-> ssub * Montserrat-OsF/light/it }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{l}{n}{ - <-> \Montserrat@@scale Montserrat-Light-osf-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{light}{scsl}{ + <-> ssub * Montserrat-OsF/light/scit +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{LY1}{Montserrat-OsF}{ul}{it}{ + <-> ssub * Montserrat-OsF/thin/it }{} +\DeclareFontShape{LY1}{Montserrat-OsF}{ul}{scit}{ + <-> ssub * Montserrat-OsF/thin/scit +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{ul}{scsl}{ + <-> ssub * Montserrat-OsF/thin/scsl +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{ul}{sc}{ + <-> ssub * Montserrat-OsF/thin/sc +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{ul}{n}{ + <-> ssub * Montserrat-OsF/thin/n +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{ul}{sl}{ + <-> ssub * Montserrat-OsF/thin/sl +}{} + + +% el --> extralight + +\DeclareFontShape{LY1}{Montserrat-OsF}{el}{scit}{ + <-> ssub * Montserrat-OsF/extralight/scit +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{el}{it}{ + <-> ssub * Montserrat-OsF/extralight/it +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{el}{sl}{ + <-> ssub * Montserrat-OsF/extralight/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{el}{scsl}{ + <-> ssub * Montserrat-OsF/extralight/scsl +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{el}{n}{ + <-> ssub * Montserrat-OsF/extralight/n +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{el}{sc}{ + <-> ssub * Montserrat-OsF/extralight/sc +}{} + + +% l --> light + \DeclareFontShape{LY1}{Montserrat-OsF}{l}{scsl}{ - <-> ssub * Montserrat-OsF/l/scit + <-> ssub * Montserrat-OsF/light/scsl +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{l}{n}{ + <-> ssub * Montserrat-OsF/light/n +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{l}{sc}{ + <-> ssub * Montserrat-OsF/light/sc }{} \DeclareFontShape{LY1}{Montserrat-OsF}{l}{sl}{ - <-> ssub * Montserrat-OsF/l/it + <-> ssub * Montserrat-OsF/light/sl }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-osf-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{l}{it}{ + <-> ssub * Montserrat-OsF/light/it }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{mb}{scit}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{l}{scit}{ + <-> ssub * Montserrat-OsF/light/scit }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-osf-ly1 + +% sl --> regular + +\DeclareFontShape{LY1}{Montserrat-OsF}{sl}{sl}{ + <-> ssub * Montserrat-OsF/regular/sl }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{mb}{sc}{ - <-> \Montserrat@@scale Montserrat-Medium-osf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{sl}{n}{ + <-> ssub * Montserrat-OsF/regular/n }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{mb}{scsl}{ - <-> ssub * Montserrat-OsF/mb/scit +\DeclareFontShape{LY1}{Montserrat-OsF}{sl}{sc}{ + <-> ssub * Montserrat-OsF/regular/sc }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{mb}{sl}{ - <-> ssub * Montserrat-OsF/mb/it +\DeclareFontShape{LY1}{Montserrat-OsF}{sl}{scsl}{ + <-> ssub * Montserrat-OsF/regular/scsl }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-osf-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{sl}{scit}{ + <-> ssub * Montserrat-OsF/regular/scit }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{k}{scit}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{sl}{it}{ + <-> ssub * Montserrat-OsF/regular/it }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{k}{sc}{ - <-> \Montserrat@@scale Montserrat-Black-osf-sc-ly1 + +% m --> medium + +\DeclareFontShape{LY1}{Montserrat-OsF}{m}{sl}{ + <-> ssub * Montserrat-OsF/medium/sl }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-osf-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{m}{sc}{ + <-> ssub * Montserrat-OsF/medium/sc }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{k}{scsl}{ - <-> ssub * Montserrat-OsF/k/scit +\DeclareFontShape{LY1}{Montserrat-OsF}{m}{n}{ + <-> ssub * Montserrat-OsF/medium/n }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{k}{sl}{ - <-> ssub * Montserrat-OsF/k/it +\DeclareFontShape{LY1}{Montserrat-OsF}{m}{scsl}{ + <-> ssub * Montserrat-OsF/medium/scsl }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{el}{scit}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{m}{scit}{ + <-> ssub * Montserrat-OsF/medium/scit }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{el}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-osf-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{m}{it}{ + <-> ssub * Montserrat-OsF/medium/it }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{el}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-osf-sc-ly1 + +% sb --> semibold + +\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{scsl}{ + <-> ssub * Montserrat-OsF/semibold/scsl }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{sc}{ + <-> ssub * Montserrat-OsF/semibold/sc }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{el}{scsl}{ - <-> ssub * Montserrat-OsF/el/scit +\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{n}{ + <-> ssub * Montserrat-OsF/semibold/n }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{el}{sl}{ - <-> ssub * Montserrat-OsF/el/it +\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{sl}{ + <-> ssub * Montserrat-OsF/semibold/sl }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{eb}{scit}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{it}{ + <-> ssub * Montserrat-OsF/semibold/it }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-osf-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{scit}{ + <-> ssub * Montserrat-OsF/semibold/scit }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{eb}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-osf-sc-ly1 + +% b --> bold + +\DeclareFontShape{LY1}{Montserrat-OsF}{b}{sl}{ + <-> ssub * Montserrat-OsF/bold/sl }{} +\DeclareFontShape{LY1}{Montserrat-OsF}{b}{n}{ + <-> ssub * Montserrat-OsF/bold/n +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{b}{sc}{ + <-> ssub * Montserrat-OsF/bold/sc +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{b}{scsl}{ + <-> ssub * Montserrat-OsF/bold/scsl +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{b}{scit}{ + <-> ssub * Montserrat-OsF/bold/scit +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{b}{it}{ + <-> ssub * Montserrat-OsF/bold/it +}{} + + +% eb --> extrabold + \DeclareFontShape{LY1}{Montserrat-OsF}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-ly1 + <-> ssub * Montserrat-OsF/extrabold/it +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{eb}{scit}{ + <-> ssub * Montserrat-OsF/extrabold/scit }{} \DeclareFontShape{LY1}{Montserrat-OsF}{eb}{scsl}{ - <-> ssub * Montserrat-OsF/eb/scit + <-> ssub * Montserrat-OsF/extrabold/scsl +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{eb}{sc}{ + <-> ssub * Montserrat-OsF/extrabold/sc +}{} + +\DeclareFontShape{LY1}{Montserrat-OsF}{eb}{n}{ + <-> ssub * Montserrat-OsF/extrabold/n }{} \DeclareFontShape{LY1}{Montserrat-OsF}{eb}{sl}{ - <-> ssub * Montserrat-OsF/eb/it + <-> ssub * Montserrat-OsF/extrabold/sl }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{b}{scit}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-osf-sc-ly1 + +% ub --> black + +\DeclareFontShape{LY1}{Montserrat-OsF}{ub}{scit}{ + <-> ssub * Montserrat-OsF/black/scit }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{b}{sc}{ - <-> \Montserrat@@scale Montserrat-Bold-osf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{ub}{it}{ + <-> ssub * Montserrat-OsF/black/it }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-osf-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{ub}{sl}{ + <-> ssub * Montserrat-OsF/black/sl }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-osf-ly1 +\DeclareFontShape{LY1}{Montserrat-OsF}{ub}{scsl}{ + <-> ssub * Montserrat-OsF/black/scsl }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{b}{scsl}{ - <-> ssub * Montserrat-OsF/b/scit +\DeclareFontShape{LY1}{Montserrat-OsF}{ub}{n}{ + <-> ssub * Montserrat-OsF/black/n }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{b}{sl}{ - <-> ssub * Montserrat-OsF/b/it +\DeclareFontShape{LY1}{Montserrat-OsF}{ub}{sc}{ + <-> ssub * Montserrat-OsF/black/sc }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{bx}{scsl}{ - <-> ssub * Montserrat-OsF/b/scsl +\DeclareFontShape{LY1}{Montserrat-OsF}{bx}{it}{ + <-> ssub * Montserrat-OsF/b/it }{} \DeclareFontShape{LY1}{Montserrat-OsF}{bx}{scit}{ <-> ssub * Montserrat-OsF/b/scit }{} +\DeclareFontShape{LY1}{Montserrat-OsF}{bx}{scsl}{ + <-> ssub * Montserrat-OsF/b/scsl +}{} + \DeclareFontShape{LY1}{Montserrat-OsF}{bx}{sc}{ <-> ssub * Montserrat-OsF/b/sc }{} @@ -247,8 +524,4 @@ <-> ssub * Montserrat-OsF/b/sl }{} -\DeclareFontShape{LY1}{Montserrat-OsF}{bx}{it}{ - <-> ssub * Montserrat-OsF/b/it -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-Sup.fd b/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-Sup.fd index cb157e74a18..62d097bbee8 100644 --- a/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-Sup.fd +++ b/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{LY1Montserrat-Sup.fd} - [2017/01/25 (autoinst) Font definitions for LY1/Montserrat-Sup.] + [2019/10/18 (autoinst) Font definitions for LY1/Montserrat-Sup.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,112 +11,277 @@ \DeclareFontFamily{LY1}{Montserrat-Sup}{} -\DeclareFontShape{LY1}{Montserrat-Sup}{b}{n}{ + +% ---- regular ---- + +\DeclareFontShape{LY1}{Montserrat-Sup}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Sup}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Sup}{regular}{sl}{ + <-> ssub * Montserrat-Sup/regular/it +}{} + + +% ---- black ---- + +\DeclareFontShape{LY1}{Montserrat-Sup}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Sup}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Sup}{black}{sl}{ + <-> ssub * Montserrat-Sup/black/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{LY1}{Montserrat-Sup}{extralight}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Sup}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Sup}{extralight}{sl}{ + <-> ssub * Montserrat-Sup/extralight/it +}{} + + +% ---- semibold ---- + +\DeclareFontShape{LY1}{Montserrat-Sup}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Sup}{semibold}{it}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-Sup}{semibold}{sl}{ + <-> ssub * Montserrat-Sup/semibold/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{LY1}{Montserrat-Sup}{bold}{n}{ <-> \Montserrat@@scale Montserrat-Bold-sup-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{b}{it}{ +\DeclareFontShape{LY1}{Montserrat-Sup}{bold}{it}{ <-> \Montserrat@@scale Montserrat-BoldItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{b}{sl}{ - <-> ssub * Montserrat-Sup/b/it +\DeclareFontShape{LY1}{Montserrat-Sup}{bold}{sl}{ + <-> ssub * Montserrat-Sup/bold/it }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{eb}{it}{ + +% ---- extrabold ---- + +\DeclareFontShape{LY1}{Montserrat-Sup}{extrabold}{it}{ <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{eb}{n}{ +\DeclareFontShape{LY1}{Montserrat-Sup}{extrabold}{n}{ <-> \Montserrat@@scale Montserrat-ExtraBold-sup-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{eb}{sl}{ - <-> ssub * Montserrat-Sup/eb/it +\DeclareFontShape{LY1}{Montserrat-Sup}{extrabold}{sl}{ + <-> ssub * Montserrat-Sup/extrabold/it }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-sup-ly1 + +% ---- thin ---- + +\DeclareFontShape{LY1}{Montserrat-Sup}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-sup-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{el}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-sup-ly1 +\DeclareFontShape{LY1}{Montserrat-Sup}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{el}{sl}{ - <-> ssub * Montserrat-Sup/el/it +\DeclareFontShape{LY1}{Montserrat-Sup}{thin}{sl}{ + <-> ssub * Montserrat-Sup/thin/it }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-sup-ly1 + +% ---- medium ---- + +\DeclareFontShape{LY1}{Montserrat-Sup}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-sup-ly1 +\DeclareFontShape{LY1}{Montserrat-Sup}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-sup-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{k}{sl}{ - <-> ssub * Montserrat-Sup/k/it +\DeclareFontShape{LY1}{Montserrat-Sup}{medium}{sl}{ + <-> ssub * Montserrat-Sup/medium/it }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-sup-ly1 + +% ---- light ---- + +\DeclareFontShape{LY1}{Montserrat-Sup}{light}{n}{ + <-> \Montserrat@@scale Montserrat-Light-sup-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-sup-ly1 +\DeclareFontShape{LY1}{Montserrat-Sup}{light}{it}{ + <-> \Montserrat@@scale Montserrat-LightItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{t}{sl}{ - <-> ssub * Montserrat-Sup/t/it +\DeclareFontShape{LY1}{Montserrat-Sup}{light}{sl}{ + <-> ssub * Montserrat-Sup/light/it }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{sb}{it}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-sup-ly1 +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{LY1}{Montserrat-Sup}{ul}{it}{ + <-> ssub * Montserrat-Sup/thin/it }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-sup-ly1 +\DeclareFontShape{LY1}{Montserrat-Sup}{ul}{sl}{ + <-> ssub * Montserrat-Sup/thin/sl }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{sb}{sl}{ - <-> ssub * Montserrat-Sup/sb/it +\DeclareFontShape{LY1}{Montserrat-Sup}{ul}{n}{ + <-> ssub * Montserrat-Sup/thin/n +}{} + + +% el --> extralight + +\DeclareFontShape{LY1}{Montserrat-Sup}{el}{sl}{ + <-> ssub * Montserrat-Sup/extralight/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-Sup}{el}{n}{ + <-> ssub * Montserrat-Sup/extralight/n }{} +\DeclareFontShape{LY1}{Montserrat-Sup}{el}{it}{ + <-> ssub * Montserrat-Sup/extralight/it +}{} + + +% l --> light + \DeclareFontShape{LY1}{Montserrat-Sup}{l}{it}{ - <-> \Montserrat@@scale Montserrat-LightItalic-sup-ly1 + <-> ssub * Montserrat-Sup/light/it }{} \DeclareFontShape{LY1}{Montserrat-Sup}{l}{n}{ - <-> \Montserrat@@scale Montserrat-Light-sup-ly1 + <-> ssub * Montserrat-Sup/light/n }{} \DeclareFontShape{LY1}{Montserrat-Sup}{l}{sl}{ - <-> ssub * Montserrat-Sup/l/it + <-> ssub * Montserrat-Sup/light/sl }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-sup-ly1 + +% sl --> regular + +\DeclareFontShape{LY1}{Montserrat-Sup}{sl}{sl}{ + <-> ssub * Montserrat-Sup/regular/sl }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-sup-ly1 +\DeclareFontShape{LY1}{Montserrat-Sup}{sl}{n}{ + <-> ssub * Montserrat-Sup/regular/n }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{mb}{sl}{ - <-> ssub * Montserrat-Sup/mb/it +\DeclareFontShape{LY1}{Montserrat-Sup}{sl}{it}{ + <-> ssub * Montserrat-Sup/regular/it }{} + +% m --> medium + \DeclareFontShape{LY1}{Montserrat-Sup}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-sup-ly1 + <-> ssub * Montserrat-Sup/medium/n +}{} + +\DeclareFontShape{LY1}{Montserrat-Sup}{m}{sl}{ + <-> ssub * Montserrat-Sup/medium/sl }{} \DeclareFontShape{LY1}{Montserrat-Sup}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-sup-ly1 + <-> ssub * Montserrat-Sup/medium/it }{} -\DeclareFontShape{LY1}{Montserrat-Sup}{m}{sl}{ - <-> ssub * Montserrat-Sup/m/it + +% sb --> semibold + +\DeclareFontShape{LY1}{Montserrat-Sup}{sb}{it}{ + <-> ssub * Montserrat-Sup/semibold/it +}{} + +\DeclareFontShape{LY1}{Montserrat-Sup}{sb}{sl}{ + <-> ssub * Montserrat-Sup/semibold/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-Sup}{sb}{n}{ + <-> ssub * Montserrat-Sup/semibold/n +}{} + + +% b --> bold + +\DeclareFontShape{LY1}{Montserrat-Sup}{b}{it}{ + <-> ssub * Montserrat-Sup/bold/it +}{} + +\DeclareFontShape{LY1}{Montserrat-Sup}{b}{sl}{ + <-> ssub * Montserrat-Sup/bold/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-Sup}{b}{n}{ + <-> ssub * Montserrat-Sup/bold/n +}{} + + +% eb --> extrabold + +\DeclareFontShape{LY1}{Montserrat-Sup}{eb}{it}{ + <-> ssub * Montserrat-Sup/extrabold/it +}{} + +\DeclareFontShape{LY1}{Montserrat-Sup}{eb}{sl}{ + <-> ssub * Montserrat-Sup/extrabold/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-Sup}{eb}{n}{ + <-> ssub * Montserrat-Sup/extrabold/n +}{} + + +% ub --> black + +\DeclareFontShape{LY1}{Montserrat-Sup}{ub}{n}{ + <-> ssub * Montserrat-Sup/black/n +}{} + +\DeclareFontShape{LY1}{Montserrat-Sup}{ub}{sl}{ + <-> ssub * Montserrat-Sup/black/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-Sup}{ub}{it}{ + <-> ssub * Montserrat-Sup/black/it }{} \DeclareFontShape{LY1}{Montserrat-Sup}{bx}{n}{ diff --git a/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-TLF.fd b/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-TLF.fd index df1e1c52053..abade38640a 100644 --- a/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-TLF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{LY1Montserrat-TLF.fd} - [2017/01/25 (autoinst) Font definitions for LY1/Montserrat-TLF.] + [2019/10/18 (autoinst) Font definitions for LY1/Montserrat-TLF.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,244 +11,517 @@ \DeclareFontFamily{LY1}{Montserrat-TLF}{} -\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{scit}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-sc-ly1 + +% ---- extralight ---- + +\DeclareFontShape{LY1}{Montserrat-TLF}{extralight}{scit}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{sc}{ - <-> \Montserrat@@scale Montserrat-SemiBold-tlf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-TLF}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{n}{ +\DeclareFontShape{LY1}{Montserrat-TLF}{extralight}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{extralight}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{extralight}{sl}{ + <-> ssub * Montserrat-TLF/extralight/it +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{extralight}{scsl}{ + <-> ssub * Montserrat-TLF/extralight/scit +}{} + + +% ---- black ---- + +\DeclareFontShape{LY1}{Montserrat-TLF}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{black}{sc}{ + <-> \Montserrat@@scale Montserrat-Black-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{black}{scit}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{black}{sl}{ + <-> ssub * Montserrat-TLF/black/it +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{black}{scsl}{ + <-> ssub * Montserrat-TLF/black/scit +}{} + + +% ---- regular ---- + +\DeclareFontShape{LY1}{Montserrat-TLF}{regular}{scit}{ + <-> \Montserrat@@scale Montserrat-Italic-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{regular}{sc}{ + <-> \Montserrat@@scale Montserrat-Regular-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{regular}{sl}{ + <-> ssub * Montserrat-TLF/regular/it +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{regular}{scsl}{ + <-> ssub * Montserrat-TLF/regular/scit +}{} + + +% ---- bold ---- + +\DeclareFontShape{LY1}{Montserrat-TLF}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{bold}{scit}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{bold}{sc}{ + <-> \Montserrat@@scale Montserrat-Bold-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{bold}{sl}{ + <-> ssub * Montserrat-TLF/bold/it +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{bold}{scsl}{ + <-> ssub * Montserrat-TLF/bold/scit +}{} + + +% ---- semibold ---- + +\DeclareFontShape{LY1}{Montserrat-TLF}{semibold}{n}{ <-> \Montserrat@@scale Montserrat-SemiBold-tlf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{it}{ +\DeclareFontShape{LY1}{Montserrat-TLF}{semibold}{sc}{ + <-> \Montserrat@@scale Montserrat-SemiBold-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{semibold}{it}{ <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{scsl}{ - <-> ssub * Montserrat-TLF/sb/scit +\DeclareFontShape{LY1}{Montserrat-TLF}{semibold}{scit}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{sl}{ - <-> ssub * Montserrat-TLF/sb/it +\DeclareFontShape{LY1}{Montserrat-TLF}{semibold}{sl}{ + <-> ssub * Montserrat-TLF/semibold/it }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-ly1 +\DeclareFontShape{LY1}{Montserrat-TLF}{semibold}{scsl}{ + <-> ssub * Montserrat-TLF/semibold/scit }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{t}{sc}{ + +% ---- thin ---- + +\DeclareFontShape{LY1}{Montserrat-TLF}{thin}{sc}{ <-> \Montserrat@@scale Montserrat-Thin-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{t}{scit}{ +\DeclareFontShape{LY1}{Montserrat-TLF}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{thin}{scit}{ <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-tlf-ly1 +\DeclareFontShape{LY1}{Montserrat-TLF}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{t}{scsl}{ - <-> ssub * Montserrat-TLF/t/scit +\DeclareFontShape{LY1}{Montserrat-TLF}{thin}{sl}{ + <-> ssub * Montserrat-TLF/thin/it }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{t}{sl}{ - <-> ssub * Montserrat-TLF/t/it +\DeclareFontShape{LY1}{Montserrat-TLF}{thin}{scsl}{ + <-> ssub * Montserrat-TLF/thin/scit }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-tlf-ly1 + +% ---- extrabold ---- + +\DeclareFontShape{LY1}{Montserrat-TLF}{extrabold}{scit}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{m}{sc}{ - <-> \Montserrat@@scale Montserrat-Regular-tlf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-TLF}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{m}{scit}{ - <-> \Montserrat@@scale Montserrat-Italic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-TLF}{extrabold}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-tlf-ly1 +\DeclareFontShape{LY1}{Montserrat-TLF}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{m}{scsl}{ - <-> ssub * Montserrat-TLF/m/scit +\DeclareFontShape{LY1}{Montserrat-TLF}{extrabold}{sl}{ + <-> ssub * Montserrat-TLF/extrabold/it }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{m}{sl}{ - <-> ssub * Montserrat-TLF/m/it +\DeclareFontShape{LY1}{Montserrat-TLF}{extrabold}{scsl}{ + <-> ssub * Montserrat-TLF/extrabold/scit }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{l}{sc}{ - <-> \Montserrat@@scale Montserrat-Light-tlf-sc-ly1 + +% ---- light ---- + +\DeclareFontShape{LY1}{Montserrat-TLF}{light}{n}{ + <-> \Montserrat@@scale Montserrat-Light-tlf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{l}{scit}{ - <-> \Montserrat@@scale Montserrat-LightItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-TLF}{light}{sc}{ + <-> \Montserrat@@scale Montserrat-Light-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{l}{n}{ - <-> \Montserrat@@scale Montserrat-Light-tlf-ly1 +\DeclareFontShape{LY1}{Montserrat-TLF}{light}{scit}{ + <-> \Montserrat@@scale Montserrat-LightItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{l}{it}{ +\DeclareFontShape{LY1}{Montserrat-TLF}{light}{it}{ <-> \Montserrat@@scale Montserrat-LightItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{l}{scsl}{ - <-> ssub * Montserrat-TLF/l/scit +\DeclareFontShape{LY1}{Montserrat-TLF}{light}{sl}{ + <-> ssub * Montserrat-TLF/light/it }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{l}{sl}{ - <-> ssub * Montserrat-TLF/l/it +\DeclareFontShape{LY1}{Montserrat-TLF}{light}{scsl}{ + <-> ssub * Montserrat-TLF/light/scit }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{mb}{scit}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-sc-ly1 -}{} -\DeclareFontShape{LY1}{Montserrat-TLF}{mb}{sc}{ +% ---- medium ---- + +\DeclareFontShape{LY1}{Montserrat-TLF}{medium}{sc}{ <-> \Montserrat@@scale Montserrat-Medium-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{mb}{n}{ +\DeclareFontShape{LY1}{Montserrat-TLF}{medium}{n}{ <-> \Montserrat@@scale Montserrat-Medium-tlf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{mb}{it}{ +\DeclareFontShape{LY1}{Montserrat-TLF}{medium}{it}{ <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{mb}{scsl}{ - <-> ssub * Montserrat-TLF/mb/scit +\DeclareFontShape{LY1}{Montserrat-TLF}{medium}{scit}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{mb}{sl}{ - <-> ssub * Montserrat-TLF/mb/it +\DeclareFontShape{LY1}{Montserrat-TLF}{medium}{sl}{ + <-> ssub * Montserrat-TLF/medium/it }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-ly1 +\DeclareFontShape{LY1}{Montserrat-TLF}{medium}{scsl}{ + <-> ssub * Montserrat-TLF/medium/scit }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{k}{scit}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-sc-ly1 +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{LY1}{Montserrat-TLF}{ul}{sl}{ + <-> ssub * Montserrat-TLF/thin/sl }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-tlf-ly1 +\DeclareFontShape{LY1}{Montserrat-TLF}{ul}{scsl}{ + <-> ssub * Montserrat-TLF/thin/scsl }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{k}{sc}{ - <-> \Montserrat@@scale Montserrat-Black-tlf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-TLF}{ul}{sc}{ + <-> ssub * Montserrat-TLF/thin/sc }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{k}{scsl}{ - <-> ssub * Montserrat-TLF/k/scit +\DeclareFontShape{LY1}{Montserrat-TLF}{ul}{n}{ + <-> ssub * Montserrat-TLF/thin/n }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{k}{sl}{ - <-> ssub * Montserrat-TLF/k/it +\DeclareFontShape{LY1}{Montserrat-TLF}{ul}{scit}{ + <-> ssub * Montserrat-TLF/thin/scit +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{ul}{it}{ + <-> ssub * Montserrat-TLF/thin/it +}{} + + +% el --> extralight + +\DeclareFontShape{LY1}{Montserrat-TLF}{el}{it}{ + <-> ssub * Montserrat-TLF/extralight/it }{} \DeclareFontShape{LY1}{Montserrat-TLF}{el}{scit}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-sc-ly1 + <-> ssub * Montserrat-TLF/extralight/scit }{} \DeclareFontShape{LY1}{Montserrat-TLF}{el}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-ly1 + <-> ssub * Montserrat-TLF/extralight/n }{} \DeclareFontShape{LY1}{Montserrat-TLF}{el}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-sc-ly1 -}{} - -\DeclareFontShape{LY1}{Montserrat-TLF}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-ly1 + <-> ssub * Montserrat-TLF/extralight/sc }{} \DeclareFontShape{LY1}{Montserrat-TLF}{el}{scsl}{ - <-> ssub * Montserrat-TLF/el/scit + <-> ssub * Montserrat-TLF/extralight/scsl }{} \DeclareFontShape{LY1}{Montserrat-TLF}{el}{sl}{ - <-> ssub * Montserrat-TLF/el/it + <-> ssub * Montserrat-TLF/extralight/sl }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{scit}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-sc-ly1 + +% l --> light + +\DeclareFontShape{LY1}{Montserrat-TLF}{l}{sl}{ + <-> ssub * Montserrat-TLF/light/sl }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-TLF}{l}{n}{ + <-> ssub * Montserrat-TLF/light/n }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-ly1 +\DeclareFontShape{LY1}{Montserrat-TLF}{l}{sc}{ + <-> ssub * Montserrat-TLF/light/sc }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-ly1 +\DeclareFontShape{LY1}{Montserrat-TLF}{l}{scsl}{ + <-> ssub * Montserrat-TLF/light/scsl }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{scsl}{ - <-> ssub * Montserrat-TLF/eb/scit +\DeclareFontShape{LY1}{Montserrat-TLF}{l}{scit}{ + <-> ssub * Montserrat-TLF/light/scit }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{sl}{ - <-> ssub * Montserrat-TLF/eb/it +\DeclareFontShape{LY1}{Montserrat-TLF}{l}{it}{ + <-> ssub * Montserrat-TLF/light/it }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{b}{sc}{ - <-> \Montserrat@@scale Montserrat-Bold-tlf-sc-ly1 + +% sl --> regular + +\DeclareFontShape{LY1}{Montserrat-TLF}{sl}{scit}{ + <-> ssub * Montserrat-TLF/regular/scit +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{sl}{it}{ + <-> ssub * Montserrat-TLF/regular/it +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{sl}{sl}{ + <-> ssub * Montserrat-TLF/regular/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{sl}{scsl}{ + <-> ssub * Montserrat-TLF/regular/scsl +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{sl}{n}{ + <-> ssub * Montserrat-TLF/regular/n +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{sl}{sc}{ + <-> ssub * Montserrat-TLF/regular/sc +}{} + + +% m --> medium + +\DeclareFontShape{LY1}{Montserrat-TLF}{m}{sc}{ + <-> ssub * Montserrat-TLF/medium/sc +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{m}{n}{ + <-> ssub * Montserrat-TLF/medium/n +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{m}{scsl}{ + <-> ssub * Montserrat-TLF/medium/scsl +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{m}{sl}{ + <-> ssub * Montserrat-TLF/medium/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{m}{it}{ + <-> ssub * Montserrat-TLF/medium/it +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{m}{scit}{ + <-> ssub * Montserrat-TLF/medium/scit +}{} + + +% sb --> semibold + +\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{scit}{ + <-> ssub * Montserrat-TLF/semibold/scit +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{it}{ + <-> ssub * Montserrat-TLF/semibold/it +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{sl}{ + <-> ssub * Montserrat-TLF/semibold/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{scsl}{ + <-> ssub * Montserrat-TLF/semibold/scsl +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{n}{ + <-> ssub * Montserrat-TLF/semibold/n +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{sc}{ + <-> ssub * Montserrat-TLF/semibold/sc +}{} + + +% b --> bold + +\DeclareFontShape{LY1}{Montserrat-TLF}{b}{it}{ + <-> ssub * Montserrat-TLF/bold/it }{} \DeclareFontShape{LY1}{Montserrat-TLF}{b}{scit}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-sc-ly1 + <-> ssub * Montserrat-TLF/bold/scit }{} \DeclareFontShape{LY1}{Montserrat-TLF}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-tlf-ly1 + <-> ssub * Montserrat-TLF/bold/n }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-ly1 +\DeclareFontShape{LY1}{Montserrat-TLF}{b}{sc}{ + <-> ssub * Montserrat-TLF/bold/sc }{} \DeclareFontShape{LY1}{Montserrat-TLF}{b}{scsl}{ - <-> ssub * Montserrat-TLF/b/scit + <-> ssub * Montserrat-TLF/bold/scsl }{} \DeclareFontShape{LY1}{Montserrat-TLF}{b}{sl}{ - <-> ssub * Montserrat-TLF/b/it + <-> ssub * Montserrat-TLF/bold/sl }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{bx}{scsl}{ - <-> ssub * Montserrat-TLF/b/scsl + +% eb --> extrabold + +\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{it}{ + <-> ssub * Montserrat-TLF/extrabold/it }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{bx}{sc}{ - <-> ssub * Montserrat-TLF/b/sc +\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{scit}{ + <-> ssub * Montserrat-TLF/extrabold/scit }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{bx}{scit}{ - <-> ssub * Montserrat-TLF/b/scit +\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{scsl}{ + <-> ssub * Montserrat-TLF/extrabold/scsl +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{sc}{ + <-> ssub * Montserrat-TLF/extrabold/sc +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{n}{ + <-> ssub * Montserrat-TLF/extrabold/n +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{sl}{ + <-> ssub * Montserrat-TLF/extrabold/sl +}{} + + +% ub --> black + +\DeclareFontShape{LY1}{Montserrat-TLF}{ub}{scit}{ + <-> ssub * Montserrat-TLF/black/scit +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{ub}{it}{ + <-> ssub * Montserrat-TLF/black/it +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{ub}{sl}{ + <-> ssub * Montserrat-TLF/black/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{ub}{n}{ + <-> ssub * Montserrat-TLF/black/n +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{ub}{sc}{ + <-> ssub * Montserrat-TLF/black/sc +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{ub}{scsl}{ + <-> ssub * Montserrat-TLF/black/scsl +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{bx}{sc}{ + <-> ssub * Montserrat-TLF/b/sc }{} \DeclareFontShape{LY1}{Montserrat-TLF}{bx}{n}{ <-> ssub * Montserrat-TLF/b/n }{} -\DeclareFontShape{LY1}{Montserrat-TLF}{bx}{it}{ - <-> ssub * Montserrat-TLF/b/it +\DeclareFontShape{LY1}{Montserrat-TLF}{bx}{scsl}{ + <-> ssub * Montserrat-TLF/b/scsl }{} \DeclareFontShape{LY1}{Montserrat-TLF}{bx}{sl}{ <-> ssub * Montserrat-TLF/b/sl }{} +\DeclareFontShape{LY1}{Montserrat-TLF}{bx}{it}{ + <-> ssub * Montserrat-TLF/b/it +}{} + +\DeclareFontShape{LY1}{Montserrat-TLF}{bx}{scit}{ + <-> ssub * Montserrat-TLF/b/scit +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-TOsF.fd b/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-TOsF.fd index 181531a13d4..fae137715df 100644 --- a/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-TOsF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/LY1Montserrat-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{LY1Montserrat-TOsF.fd} - [2017/01/25 (autoinst) Font definitions for LY1/Montserrat-TOsF.] + [2019/10/18 (autoinst) Font definitions for LY1/Montserrat-TOsF.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,244 +11,517 @@ \DeclareFontFamily{LY1}{Montserrat-TOsF}{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-ly1 + +% ---- extralight ---- + +\DeclareFontShape{LY1}{Montserrat-TOsF}{extralight}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{t}{sc}{ - <-> \Montserrat@@scale Montserrat-Thin-tosf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{extralight}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{t}{scit}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-tosf-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{extralight}{scit}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{t}{scsl}{ - <-> ssub * Montserrat-TOsF/t/scit +\DeclareFontShape{LY1}{Montserrat-TOsF}{extralight}{sl}{ + <-> ssub * Montserrat-TOsF/extralight/it }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{t}{sl}{ - <-> ssub * Montserrat-TOsF/t/it +\DeclareFontShape{LY1}{Montserrat-TOsF}{extralight}{scsl}{ + <-> ssub * Montserrat-TOsF/extralight/scit }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-tosf-ly1 + +% ---- regular ---- + +\DeclareFontShape{LY1}{Montserrat-TOsF}{regular}{scit}{ + <-> \Montserrat@@scale Montserrat-Italic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{scit}{ +\DeclareFontShape{LY1}{Montserrat-TOsF}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{regular}{sc}{ + <-> \Montserrat@@scale Montserrat-Regular-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{regular}{sl}{ + <-> ssub * Montserrat-TOsF/regular/it +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{regular}{scsl}{ + <-> ssub * Montserrat-TOsF/regular/scit +}{} + + +% ---- black ---- + +\DeclareFontShape{LY1}{Montserrat-TOsF}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{black}{sc}{ + <-> \Montserrat@@scale Montserrat-Black-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{black}{scit}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{black}{sl}{ + <-> ssub * Montserrat-TOsF/black/it +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{black}{scsl}{ + <-> ssub * Montserrat-TOsF/black/scit +}{} + + +% ---- semibold ---- + +\DeclareFontShape{LY1}{Montserrat-TOsF}{semibold}{it}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{semibold}{scit}{ <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{sc}{ +\DeclareFontShape{LY1}{Montserrat-TOsF}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{semibold}{sc}{ <-> \Montserrat@@scale Montserrat-SemiBold-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{it}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{semibold}{sl}{ + <-> ssub * Montserrat-TOsF/semibold/it }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{scsl}{ - <-> ssub * Montserrat-TOsF/sb/scit +\DeclareFontShape{LY1}{Montserrat-TOsF}{semibold}{scsl}{ + <-> ssub * Montserrat-TOsF/semibold/scit }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{sl}{ - <-> ssub * Montserrat-TOsF/sb/it + +% ---- bold ---- + +\DeclareFontShape{LY1}{Montserrat-TOsF}{bold}{sc}{ + <-> \Montserrat@@scale Montserrat-Bold-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-tosf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{mb}{sc}{ - <-> \Montserrat@@scale Montserrat-Medium-tosf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{bold}{scit}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{bold}{sl}{ + <-> ssub * Montserrat-TOsF/bold/it }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{mb}{scit}{ +\DeclareFontShape{LY1}{Montserrat-TOsF}{bold}{scsl}{ + <-> ssub * Montserrat-TOsF/bold/scit +}{} + + +% ---- thin ---- + +\DeclareFontShape{LY1}{Montserrat-TOsF}{thin}{scit}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{thin}{sc}{ + <-> \Montserrat@@scale Montserrat-Thin-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{thin}{sl}{ + <-> ssub * Montserrat-TOsF/thin/it +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{thin}{scsl}{ + <-> ssub * Montserrat-TOsF/thin/scit +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{LY1}{Montserrat-TOsF}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{extrabold}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{extrabold}{scit}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{extrabold}{sl}{ + <-> ssub * Montserrat-TOsF/extrabold/it +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{extrabold}{scsl}{ + <-> ssub * Montserrat-TOsF/extrabold/scit +}{} + + +% ---- medium ---- + +\DeclareFontShape{LY1}{Montserrat-TOsF}{medium}{scit}{ <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{mb}{n}{ +\DeclareFontShape{LY1}{Montserrat-TOsF}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{medium}{n}{ <-> \Montserrat@@scale Montserrat-Medium-tosf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{mb}{scsl}{ - <-> ssub * Montserrat-TOsF/mb/scit +\DeclareFontShape{LY1}{Montserrat-TOsF}{medium}{sc}{ + <-> \Montserrat@@scale Montserrat-Medium-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{mb}{sl}{ - <-> ssub * Montserrat-TOsF/mb/it +\DeclareFontShape{LY1}{Montserrat-TOsF}{medium}{sl}{ + <-> ssub * Montserrat-TOsF/medium/it }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{l}{n}{ +\DeclareFontShape{LY1}{Montserrat-TOsF}{medium}{scsl}{ + <-> ssub * Montserrat-TOsF/medium/scit +}{} + + +% ---- light ---- + +\DeclareFontShape{LY1}{Montserrat-TOsF}{light}{sc}{ + <-> \Montserrat@@scale Montserrat-Light-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{light}{n}{ <-> \Montserrat@@scale Montserrat-Light-tosf-ly1 }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{l}{scit}{ +\DeclareFontShape{LY1}{Montserrat-TOsF}{light}{scit}{ <-> \Montserrat@@scale Montserrat-LightItalic-tosf-sc-ly1 }{} +\DeclareFontShape{LY1}{Montserrat-TOsF}{light}{it}{ + <-> \Montserrat@@scale Montserrat-LightItalic-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{light}{sl}{ + <-> ssub * Montserrat-TOsF/light/it +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{light}{scsl}{ + <-> ssub * Montserrat-TOsF/light/scit +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{LY1}{Montserrat-TOsF}{ul}{it}{ + <-> ssub * Montserrat-TOsF/thin/it +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{ul}{scit}{ + <-> ssub * Montserrat-TOsF/thin/scit +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{ul}{sc}{ + <-> ssub * Montserrat-TOsF/thin/sc +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{ul}{n}{ + <-> ssub * Montserrat-TOsF/thin/n +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{ul}{scsl}{ + <-> ssub * Montserrat-TOsF/thin/scsl +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{ul}{sl}{ + <-> ssub * Montserrat-TOsF/thin/sl +}{} + + +% el --> extralight + +\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{scit}{ + <-> ssub * Montserrat-TOsF/extralight/scit +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{it}{ + <-> ssub * Montserrat-TOsF/extralight/it +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{sl}{ + <-> ssub * Montserrat-TOsF/extralight/sl +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{n}{ + <-> ssub * Montserrat-TOsF/extralight/n +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{sc}{ + <-> ssub * Montserrat-TOsF/extralight/sc +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{scsl}{ + <-> ssub * Montserrat-TOsF/extralight/scsl +}{} + + +% l --> light + +\DeclareFontShape{LY1}{Montserrat-TOsF}{l}{sl}{ + <-> ssub * Montserrat-TOsF/light/sl +}{} + \DeclareFontShape{LY1}{Montserrat-TOsF}{l}{sc}{ - <-> \Montserrat@@scale Montserrat-Light-tosf-sc-ly1 + <-> ssub * Montserrat-TOsF/light/sc }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{l}{it}{ - <-> \Montserrat@@scale Montserrat-LightItalic-tosf-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{l}{n}{ + <-> ssub * Montserrat-TOsF/light/n }{} \DeclareFontShape{LY1}{Montserrat-TOsF}{l}{scsl}{ - <-> ssub * Montserrat-TOsF/l/scit + <-> ssub * Montserrat-TOsF/light/scsl }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{l}{sl}{ - <-> ssub * Montserrat-TOsF/l/it +\DeclareFontShape{LY1}{Montserrat-TOsF}{l}{scit}{ + <-> ssub * Montserrat-TOsF/light/scit }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-tosf-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{l}{it}{ + <-> ssub * Montserrat-TOsF/light/it }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{m}{sc}{ - <-> \Montserrat@@scale Montserrat-Regular-tosf-sc-ly1 + +% sl --> regular + +\DeclareFontShape{LY1}{Montserrat-TOsF}{sl}{scit}{ + <-> ssub * Montserrat-TOsF/regular/scit }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-tosf-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{sl}{it}{ + <-> ssub * Montserrat-TOsF/regular/it }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{m}{scit}{ - <-> \Montserrat@@scale Montserrat-Italic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{sl}{sl}{ + <-> ssub * Montserrat-TOsF/regular/sl }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{m}{scsl}{ - <-> ssub * Montserrat-TOsF/m/scit +\DeclareFontShape{LY1}{Montserrat-TOsF}{sl}{n}{ + <-> ssub * Montserrat-TOsF/regular/n }{} +\DeclareFontShape{LY1}{Montserrat-TOsF}{sl}{sc}{ + <-> ssub * Montserrat-TOsF/regular/sc +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{sl}{scsl}{ + <-> ssub * Montserrat-TOsF/regular/scsl +}{} + + +% m --> medium + \DeclareFontShape{LY1}{Montserrat-TOsF}{m}{sl}{ - <-> ssub * Montserrat-TOsF/m/it + <-> ssub * Montserrat-TOsF/medium/sl }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-tosf-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{m}{scsl}{ + <-> ssub * Montserrat-TOsF/medium/scsl }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{scit}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{m}{n}{ + <-> ssub * Montserrat-TOsF/medium/n }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{sc}{ - <-> \Montserrat@@scale Montserrat-Bold-tosf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{m}{sc}{ + <-> ssub * Montserrat-TOsF/medium/sc }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{m}{scit}{ + <-> ssub * Montserrat-TOsF/medium/scit }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{scsl}{ - <-> ssub * Montserrat-TOsF/b/scit +\DeclareFontShape{LY1}{Montserrat-TOsF}{m}{it}{ + <-> ssub * Montserrat-TOsF/medium/it }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{sl}{ - <-> ssub * Montserrat-TOsF/b/it + +% sb --> semibold + +\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{scit}{ + <-> ssub * Montserrat-TOsF/semibold/scit }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{it}{ + <-> ssub * Montserrat-TOsF/semibold/it }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{sl}{ + <-> ssub * Montserrat-TOsF/semibold/sl }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{scit}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{scsl}{ + <-> ssub * Montserrat-TOsF/semibold/scsl }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{n}{ + <-> ssub * Montserrat-TOsF/semibold/n }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{scsl}{ - <-> ssub * Montserrat-TOsF/eb/scit +\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{sc}{ + <-> ssub * Montserrat-TOsF/semibold/sc }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{sl}{ - <-> ssub * Montserrat-TOsF/eb/it + +% b --> bold + +\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{it}{ + <-> ssub * Montserrat-TOsF/bold/it }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{scit}{ + <-> ssub * Montserrat-TOsF/bold/scit }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-tosf-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{scsl}{ + <-> ssub * Montserrat-TOsF/bold/scsl }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{k}{scit}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{sc}{ + <-> ssub * Montserrat-TOsF/bold/sc }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{k}{sc}{ - <-> \Montserrat@@scale Montserrat-Black-tosf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{n}{ + <-> ssub * Montserrat-TOsF/bold/n }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{k}{scsl}{ - <-> ssub * Montserrat-TOsF/k/scit +\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{sl}{ + <-> ssub * Montserrat-TOsF/bold/sl }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{k}{sl}{ - <-> ssub * Montserrat-TOsF/k/it + +% eb --> extrabold + +\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{scit}{ + <-> ssub * Montserrat-TOsF/extrabold/scit }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{it}{ + <-> ssub * Montserrat-TOsF/extrabold/it }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{sl}{ + <-> ssub * Montserrat-TOsF/extrabold/sl }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{scit}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{scsl}{ + <-> ssub * Montserrat-TOsF/extrabold/scsl }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-sc-ly1 +\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{n}{ + <-> ssub * Montserrat-TOsF/extrabold/n }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{scsl}{ - <-> ssub * Montserrat-TOsF/el/scit +\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{sc}{ + <-> ssub * Montserrat-TOsF/extrabold/sc }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{sl}{ - <-> ssub * Montserrat-TOsF/el/it + +% ub --> black + +\DeclareFontShape{LY1}{Montserrat-TOsF}{ub}{scit}{ + <-> ssub * Montserrat-TOsF/black/scit }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{bx}{scsl}{ - <-> ssub * Montserrat-TOsF/b/scsl +\DeclareFontShape{LY1}{Montserrat-TOsF}{ub}{it}{ + <-> ssub * Montserrat-TOsF/black/it }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{bx}{n}{ - <-> ssub * Montserrat-TOsF/b/n +\DeclareFontShape{LY1}{Montserrat-TOsF}{ub}{sl}{ + <-> ssub * Montserrat-TOsF/black/sl }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{bx}{scit}{ - <-> ssub * Montserrat-TOsF/b/scit +\DeclareFontShape{LY1}{Montserrat-TOsF}{ub}{n}{ + <-> ssub * Montserrat-TOsF/black/n +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{ub}{sc}{ + <-> ssub * Montserrat-TOsF/black/sc +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{ub}{scsl}{ + <-> ssub * Montserrat-TOsF/black/scsl +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{bx}{scsl}{ + <-> ssub * Montserrat-TOsF/b/scsl }{} \DeclareFontShape{LY1}{Montserrat-TOsF}{bx}{sc}{ <-> ssub * Montserrat-TOsF/b/sc }{} -\DeclareFontShape{LY1}{Montserrat-TOsF}{bx}{it}{ - <-> ssub * Montserrat-TOsF/b/it +\DeclareFontShape{LY1}{Montserrat-TOsF}{bx}{n}{ + <-> ssub * Montserrat-TOsF/b/n }{} \DeclareFontShape{LY1}{Montserrat-TOsF}{bx}{sl}{ <-> ssub * Montserrat-TOsF/b/sl }{} +\DeclareFontShape{LY1}{Montserrat-TOsF}{bx}{it}{ + <-> ssub * Montserrat-TOsF/b/it +}{} + +\DeclareFontShape{LY1}{Montserrat-TOsF}{bx}{scit}{ + <-> ssub * Montserrat-TOsF/b/scit +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-Dnom.fd b/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-Dnom.fd index c31c1f2b0b4..47915e6c6b1 100644 --- a/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-Dnom.fd +++ b/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-Dnom.fd @@ -1,126 +1,287 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{LY1MontserratAlternates-Dnom.fd} - [2017/01/25 (autoinst) Font definitions for LY1/MontserratAlternates-Dnom.] + [2019/10/18 (autoinst) Font definitions for LY1/MontserratAlternates-Dnom.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{LY1}{MontserratAlternates-Dnom}{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-dnom-ly1 + +% ---- extrabold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-dnom-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-dnom-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-dnom-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{k}{sl}{ - <-> ssub * MontserratAlternates-Dnom/k/it +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-Dnom/extrabold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-dnom-ly1 + +% ---- extralight ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{extralight}{sl}{ + <-> ssub * MontserratAlternates-Dnom/extralight/it +}{} + + +% ---- thin ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{thin}{sl}{ + <-> ssub * MontserratAlternates-Dnom/thin/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{bold}{sl}{ + <-> ssub * MontserratAlternates-Dnom/bold/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-dnom-ly1 }{} +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{medium}{sl}{ + <-> ssub * MontserratAlternates-Dnom/medium/it +}{} + + +% ---- light ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{light}{sl}{ + <-> ssub * MontserratAlternates-Dnom/light/it +}{} + + +% ---- semibold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{semibold}{sl}{ + <-> ssub * MontserratAlternates-Dnom/semibold/it +}{} + + +% ---- black ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{black}{sl}{ + <-> ssub * MontserratAlternates-Dnom/black/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{regular}{sl}{ + <-> ssub * MontserratAlternates-Dnom/regular/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{ul}{n}{ + <-> ssub * MontserratAlternates-Dnom/thin/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{ul}{it}{ + <-> ssub * MontserratAlternates-Dnom/thin/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{ul}{sl}{ + <-> ssub * MontserratAlternates-Dnom/thin/sl +}{} + + +% el --> extralight + \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-dnom-ly1 + <-> ssub * MontserratAlternates-Dnom/extralight/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{el}{it}{ + <-> ssub * MontserratAlternates-Dnom/extralight/it }{} \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{el}{sl}{ - <-> ssub * MontserratAlternates-Dnom/el/it + <-> ssub * MontserratAlternates-Dnom/extralight/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-dnom-ly1 + +% l --> light + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{l}{sl}{ + <-> ssub * MontserratAlternates-Dnom/light/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-dnom-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{l}{it}{ + <-> ssub * MontserratAlternates-Dnom/light/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{b}{sl}{ - <-> ssub * MontserratAlternates-Dnom/b/it +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{l}{n}{ + <-> ssub * MontserratAlternates-Dnom/light/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-dnom-ly1 + +% sl --> regular + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{sl}{n}{ + <-> ssub * MontserratAlternates-Dnom/regular/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-dnom-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{sl}{sl}{ + <-> ssub * MontserratAlternates-Dnom/regular/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{eb}{sl}{ - <-> ssub * MontserratAlternates-Dnom/eb/it +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{sl}{it}{ + <-> ssub * MontserratAlternates-Dnom/regular/it }{} + +% m --> medium + \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-dnom-ly1 + <-> ssub * MontserratAlternates-Dnom/medium/n }{} \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-dnom-ly1 + <-> ssub * MontserratAlternates-Dnom/medium/it }{} \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{m}{sl}{ - <-> ssub * MontserratAlternates-Dnom/m/it + <-> ssub * MontserratAlternates-Dnom/medium/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-dnom-ly1 -}{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-dnom-ly1 +% sb --> semibold + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{sb}{it}{ + <-> ssub * MontserratAlternates-Dnom/semibold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{mb}{sl}{ - <-> ssub * MontserratAlternates-Dnom/mb/it +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{sb}{sl}{ + <-> ssub * MontserratAlternates-Dnom/semibold/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-dnom-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{sb}{n}{ + <-> ssub * MontserratAlternates-Dnom/semibold/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-dnom-ly1 + +% b --> bold + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{b}{n}{ + <-> ssub * MontserratAlternates-Dnom/bold/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{l}{sl}{ - <-> ssub * MontserratAlternates-Dnom/l/it +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{b}{it}{ + <-> ssub * MontserratAlternates-Dnom/bold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-dnom-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{b}{sl}{ + <-> ssub * MontserratAlternates-Dnom/bold/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-dnom-ly1 + +% eb --> extrabold + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{eb}{it}{ + <-> ssub * MontserratAlternates-Dnom/extrabold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{sb}{sl}{ - <-> ssub * MontserratAlternates-Dnom/sb/it +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{eb}{sl}{ + <-> ssub * MontserratAlternates-Dnom/extrabold/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-dnom-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{eb}{n}{ + <-> ssub * MontserratAlternates-Dnom/extrabold/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-dnom-ly1 + +% ub --> black + +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{ub}{sl}{ + <-> ssub * MontserratAlternates-Dnom/black/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{t}{sl}{ - <-> ssub * MontserratAlternates-Dnom/t/it +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{ub}{it}{ + <-> ssub * MontserratAlternates-Dnom/black/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{bx}{n}{ - <-> ssub * MontserratAlternates-Dnom/b/n +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{ub}{n}{ + <-> ssub * MontserratAlternates-Dnom/black/n }{} \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{bx}{sl}{ @@ -131,4 +292,8 @@ <-> ssub * MontserratAlternates-Dnom/b/it }{} +\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{bx}{n}{ + <-> ssub * MontserratAlternates-Dnom/b/n +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-Inf.fd b/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-Inf.fd index 272df1856eb..cfcaeb1209f 100644 --- a/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-Inf.fd +++ b/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-Inf.fd @@ -1,126 +1,287 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{LY1MontserratAlternates-Inf.fd} - [2017/01/25 (autoinst) Font definitions for LY1/MontserratAlternates-Inf.] + [2019/10/18 (autoinst) Font definitions for LY1/MontserratAlternates-Inf.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{LY1}{MontserratAlternates-Inf}{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-inf-ly1 + +% ---- extralight ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-inf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-inf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{el}{sl}{ - <-> ssub * MontserratAlternates-Inf/el/it +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{extralight}{sl}{ + <-> ssub * MontserratAlternates-Inf/extralight/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-inf-ly1 + +% ---- extrabold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-inf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-inf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{k}{sl}{ - <-> ssub * MontserratAlternates-Inf/k/it +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-Inf/extrabold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-inf-ly1 + +% ---- bold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-inf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-inf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{eb}{sl}{ - <-> ssub * MontserratAlternates-Inf/eb/it +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{bold}{sl}{ + <-> ssub * MontserratAlternates-Inf/bold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-inf-ly1 + +% ---- thin ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-inf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-inf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{b}{sl}{ - <-> ssub * MontserratAlternates-Inf/b/it +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{thin}{sl}{ + <-> ssub * MontserratAlternates-Inf/thin/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-inf-ly1 + +% ---- regular ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-inf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-inf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-inf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{sb}{sl}{ - <-> ssub * MontserratAlternates-Inf/sb/it +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{regular}{sl}{ + <-> ssub * MontserratAlternates-Inf/regular/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-inf-ly1 + +% ---- black ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-inf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-inf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{t}{sl}{ - <-> ssub * MontserratAlternates-Inf/t/it +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{black}{sl}{ + <-> ssub * MontserratAlternates-Inf/black/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-inf-ly1 + +% ---- semibold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-inf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-inf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{m}{sl}{ - <-> ssub * MontserratAlternates-Inf/m/it +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{semibold}{sl}{ + <-> ssub * MontserratAlternates-Inf/semibold/it }{} + +% ---- light ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-inf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-inf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{light}{sl}{ + <-> ssub * MontserratAlternates-Inf/light/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-inf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-inf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{medium}{sl}{ + <-> ssub * MontserratAlternates-Inf/medium/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{ul}{n}{ + <-> ssub * MontserratAlternates-Inf/thin/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{ul}{it}{ + <-> ssub * MontserratAlternates-Inf/thin/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{ul}{sl}{ + <-> ssub * MontserratAlternates-Inf/thin/sl +}{} + + +% el --> extralight + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{el}{it}{ + <-> ssub * MontserratAlternates-Inf/extralight/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{el}{sl}{ + <-> ssub * MontserratAlternates-Inf/extralight/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{el}{n}{ + <-> ssub * MontserratAlternates-Inf/extralight/n +}{} + + +% l --> light + \DeclareFontShape{LY1}{MontserratAlternates-Inf}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-inf-ly1 + <-> ssub * MontserratAlternates-Inf/light/n }{} \DeclareFontShape{LY1}{MontserratAlternates-Inf}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-inf-ly1 + <-> ssub * MontserratAlternates-Inf/light/it }{} \DeclareFontShape{LY1}{MontserratAlternates-Inf}{l}{sl}{ - <-> ssub * MontserratAlternates-Inf/l/it + <-> ssub * MontserratAlternates-Inf/light/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-inf-ly1 + +% sl --> regular + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{sl}{n}{ + <-> ssub * MontserratAlternates-Inf/regular/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-inf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{sl}{it}{ + <-> ssub * MontserratAlternates-Inf/regular/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{mb}{sl}{ - <-> ssub * MontserratAlternates-Inf/mb/it +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{sl}{sl}{ + <-> ssub * MontserratAlternates-Inf/regular/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-Inf}{bx}{n}{ - <-> ssub * MontserratAlternates-Inf/b/n + +% m --> medium + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{m}{sl}{ + <-> ssub * MontserratAlternates-Inf/medium/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{m}{it}{ + <-> ssub * MontserratAlternates-Inf/medium/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{m}{n}{ + <-> ssub * MontserratAlternates-Inf/medium/n +}{} + + +% sb --> semibold + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{sb}{n}{ + <-> ssub * MontserratAlternates-Inf/semibold/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{sb}{it}{ + <-> ssub * MontserratAlternates-Inf/semibold/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{sb}{sl}{ + <-> ssub * MontserratAlternates-Inf/semibold/sl +}{} + + +% b --> bold + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{b}{n}{ + <-> ssub * MontserratAlternates-Inf/bold/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{b}{it}{ + <-> ssub * MontserratAlternates-Inf/bold/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{b}{sl}{ + <-> ssub * MontserratAlternates-Inf/bold/sl +}{} + + +% eb --> extrabold + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{eb}{n}{ + <-> ssub * MontserratAlternates-Inf/extrabold/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{eb}{it}{ + <-> ssub * MontserratAlternates-Inf/extrabold/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{eb}{sl}{ + <-> ssub * MontserratAlternates-Inf/extrabold/sl +}{} + + +% ub --> black + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{ub}{n}{ + <-> ssub * MontserratAlternates-Inf/black/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{ub}{it}{ + <-> ssub * MontserratAlternates-Inf/black/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{ub}{sl}{ + <-> ssub * MontserratAlternates-Inf/black/sl }{} \DeclareFontShape{LY1}{MontserratAlternates-Inf}{bx}{it}{ @@ -131,4 +292,8 @@ <-> ssub * MontserratAlternates-Inf/b/sl }{} +\DeclareFontShape{LY1}{MontserratAlternates-Inf}{bx}{n}{ + <-> ssub * MontserratAlternates-Inf/b/n +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-LF.fd b/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-LF.fd index 26e96132ece..fa358098135 100644 --- a/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-LF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-LF.fd @@ -1,246 +1,507 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{LY1MontserratAlternates-LF.fd} - [2017/01/25 (autoinst) Font definitions for LY1/MontserratAlternates-LF.] + [2019/10/18 (autoinst) Font definitions for LY1/MontserratAlternates-LF.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{LY1}{MontserratAlternates-LF}{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-lf-sc-ly1 + +% ---- medium ---- + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-lf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{medium}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-lf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-lf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{medium}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{scsl}{ - <-> ssub * MontserratAlternates-LF/b/scit +\DeclareFontShape{LY1}{MontserratAlternates-LF}{medium}{scsl}{ + <-> ssub * MontserratAlternates-LF/medium/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{sl}{ - <-> ssub * MontserratAlternates-LF/b/it +\DeclareFontShape{LY1}{MontserratAlternates-LF}{medium}{sl}{ + <-> ssub * MontserratAlternates-LF/medium/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-lf-ly1 + +% ---- light ---- + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{light}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-lf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-lf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-lf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{light}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{scsl}{ - <-> ssub * MontserratAlternates-LF/eb/scit +\DeclareFontShape{LY1}{MontserratAlternates-LF}{light}{scsl}{ + <-> ssub * MontserratAlternates-LF/light/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{sl}{ - <-> ssub * MontserratAlternates-LF/eb/it +\DeclareFontShape{LY1}{MontserratAlternates-LF}{light}{sl}{ + <-> ssub * MontserratAlternates-LF/light/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-lf-ly1 + +% ---- semibold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{semibold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-lf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-lf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{semibold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{scsl}{ - <-> ssub * MontserratAlternates-LF/el/scit +\DeclareFontShape{LY1}{MontserratAlternates-LF}{semibold}{scsl}{ + <-> ssub * MontserratAlternates-LF/semibold/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{sl}{ - <-> ssub * MontserratAlternates-LF/el/it +\DeclareFontShape{LY1}{MontserratAlternates-LF}{semibold}{sl}{ + <-> ssub * MontserratAlternates-LF/semibold/it +}{} + + +% ---- black ---- + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{black}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-lf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{black}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-lf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{black}{scsl}{ + <-> ssub * MontserratAlternates-LF/black/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{black}{sl}{ + <-> ssub * MontserratAlternates-LF/black/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{regular}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{regular}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{regular}{scsl}{ + <-> ssub * MontserratAlternates-LF/regular/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-lf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{regular}{sl}{ + <-> ssub * MontserratAlternates-LF/regular/it +}{} + + +% ---- thin ---- + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{thin}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{thin}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{thin}{scsl}{ + <-> ssub * MontserratAlternates-LF/thin/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{thin}{sl}{ + <-> ssub * MontserratAlternates-LF/thin/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{bold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-lf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-lf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{bold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{bold}{scsl}{ + <-> ssub * MontserratAlternates-LF/bold/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{bold}{sl}{ + <-> ssub * MontserratAlternates-LF/bold/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{extrabold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{extrabold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{extrabold}{scsl}{ + <-> ssub * MontserratAlternates-LF/extrabold/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-LF/extrabold/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-lf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{extralight}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-lf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{extralight}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{extralight}{scsl}{ + <-> ssub * MontserratAlternates-LF/extralight/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{extralight}{sl}{ + <-> ssub * MontserratAlternates-LF/extralight/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{ul}{n}{ + <-> ssub * MontserratAlternates-LF/thin/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-lf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{ul}{scit}{ + <-> ssub * MontserratAlternates-LF/thin/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{k}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{ul}{scsl}{ + <-> ssub * MontserratAlternates-LF/thin/scsl }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{k}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Black-lf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{ul}{sl}{ + <-> ssub * MontserratAlternates-LF/thin/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{k}{scsl}{ - <-> ssub * MontserratAlternates-LF/k/scit +\DeclareFontShape{LY1}{MontserratAlternates-LF}{ul}{sc}{ + <-> ssub * MontserratAlternates-LF/thin/sc }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{k}{sl}{ - <-> ssub * MontserratAlternates-LF/k/it +\DeclareFontShape{LY1}{MontserratAlternates-LF}{ul}{it}{ + <-> ssub * MontserratAlternates-LF/thin/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-lf-ly1 + +% el --> extralight + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{scsl}{ + <-> ssub * MontserratAlternates-LF/extralight/scsl }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{mb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{n}{ + <-> ssub * MontserratAlternates-LF/extralight/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{mb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-lf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{scit}{ + <-> ssub * MontserratAlternates-LF/extralight/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-lf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{it}{ + <-> ssub * MontserratAlternates-LF/extralight/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{mb}{scsl}{ - <-> ssub * MontserratAlternates-LF/mb/scit +\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{sc}{ + <-> ssub * MontserratAlternates-LF/extralight/sc }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{mb}{sl}{ - <-> ssub * MontserratAlternates-LF/mb/it +\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{sl}{ + <-> ssub * MontserratAlternates-LF/extralight/sl }{} + +% l --> light + \DeclareFontShape{LY1}{MontserratAlternates-LF}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-lf-ly1 + <-> ssub * MontserratAlternates-LF/light/it }{} \DeclareFontShape{LY1}{MontserratAlternates-LF}{l}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Light-lf-sc-ly1 + <-> ssub * MontserratAlternates-LF/light/sc +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{l}{sl}{ + <-> ssub * MontserratAlternates-LF/light/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{l}{scsl}{ + <-> ssub * MontserratAlternates-LF/light/scsl }{} \DeclareFontShape{LY1}{MontserratAlternates-LF}{l}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-lf-sc-ly1 + <-> ssub * MontserratAlternates-LF/light/scit }{} \DeclareFontShape{LY1}{MontserratAlternates-LF}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-lf-ly1 + <-> ssub * MontserratAlternates-LF/light/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{l}{scsl}{ - <-> ssub * MontserratAlternates-LF/l/scit + +% sl --> regular + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{sl}{sl}{ + <-> ssub * MontserratAlternates-LF/regular/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{l}{sl}{ - <-> ssub * MontserratAlternates-LF/l/it +\DeclareFontShape{LY1}{MontserratAlternates-LF}{sl}{sc}{ + <-> ssub * MontserratAlternates-LF/regular/sc }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-lf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{sl}{it}{ + <-> ssub * MontserratAlternates-LF/regular/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-lf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{sl}{scit}{ + <-> ssub * MontserratAlternates-LF/regular/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-lf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{sl}{n}{ + <-> ssub * MontserratAlternates-LF/regular/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-lf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{sl}{scsl}{ + <-> ssub * MontserratAlternates-LF/regular/scsl }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{scsl}{ - <-> ssub * MontserratAlternates-LF/m/scit + +% m --> medium + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{it}{ + <-> ssub * MontserratAlternates-LF/medium/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{sc}{ + <-> ssub * MontserratAlternates-LF/medium/sc }{} \DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{sl}{ - <-> ssub * MontserratAlternates-LF/m/it + <-> ssub * MontserratAlternates-LF/medium/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{scsl}{ + <-> ssub * MontserratAlternates-LF/medium/scsl }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-lf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{scit}{ + <-> ssub * MontserratAlternates-LF/medium/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{t}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{n}{ + <-> ssub * MontserratAlternates-LF/medium/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-lf-ly1 + +% sb --> semibold + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{scit}{ + <-> ssub * MontserratAlternates-LF/semibold/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{t}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-lf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{n}{ + <-> ssub * MontserratAlternates-LF/semibold/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{t}{scsl}{ - <-> ssub * MontserratAlternates-LF/t/scit +\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{scsl}{ + <-> ssub * MontserratAlternates-LF/semibold/scsl }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{t}{sl}{ - <-> ssub * MontserratAlternates-LF/t/it +\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{sl}{ + <-> ssub * MontserratAlternates-LF/semibold/sl }{} \DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-lf-sc-ly1 + <-> ssub * MontserratAlternates-LF/semibold/sc }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{it}{ + <-> ssub * MontserratAlternates-LF/semibold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-lf-ly1 + +% b --> bold + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{sl}{ + <-> ssub * MontserratAlternates-LF/bold/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-lf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{sc}{ + <-> ssub * MontserratAlternates-LF/bold/sc }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{scsl}{ - <-> ssub * MontserratAlternates-LF/sb/scit +\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{it}{ + <-> ssub * MontserratAlternates-LF/bold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{sl}{ - <-> ssub * MontserratAlternates-LF/sb/it +\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{scit}{ + <-> ssub * MontserratAlternates-LF/bold/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{bx}{scsl}{ - <-> ssub * MontserratAlternates-LF/b/scsl +\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{n}{ + <-> ssub * MontserratAlternates-LF/bold/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{bx}{sc}{ - <-> ssub * MontserratAlternates-LF/b/sc +\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{scsl}{ + <-> ssub * MontserratAlternates-LF/bold/scsl }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{bx}{scit}{ - <-> ssub * MontserratAlternates-LF/b/scit + +% eb --> extrabold + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{scit}{ + <-> ssub * MontserratAlternates-LF/extrabold/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-LF}{bx}{n}{ - <-> ssub * MontserratAlternates-LF/b/n +\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{n}{ + <-> ssub * MontserratAlternates-LF/extrabold/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{scsl}{ + <-> ssub * MontserratAlternates-LF/extrabold/scsl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{sl}{ + <-> ssub * MontserratAlternates-LF/extrabold/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{sc}{ + <-> ssub * MontserratAlternates-LF/extrabold/sc +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{it}{ + <-> ssub * MontserratAlternates-LF/extrabold/it +}{} + + +% ub --> black + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{ub}{scit}{ + <-> ssub * MontserratAlternates-LF/black/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{ub}{n}{ + <-> ssub * MontserratAlternates-LF/black/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{ub}{scsl}{ + <-> ssub * MontserratAlternates-LF/black/scsl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{ub}{sl}{ + <-> ssub * MontserratAlternates-LF/black/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{ub}{sc}{ + <-> ssub * MontserratAlternates-LF/black/sc +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{ub}{it}{ + <-> ssub * MontserratAlternates-LF/black/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{bx}{sc}{ + <-> ssub * MontserratAlternates-LF/b/sc }{} \DeclareFontShape{LY1}{MontserratAlternates-LF}{bx}{sl}{ @@ -251,4 +512,16 @@ <-> ssub * MontserratAlternates-LF/b/it }{} +\DeclareFontShape{LY1}{MontserratAlternates-LF}{bx}{n}{ + <-> ssub * MontserratAlternates-LF/b/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{bx}{scit}{ + <-> ssub * MontserratAlternates-LF/b/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-LF}{bx}{scsl}{ + <-> ssub * MontserratAlternates-LF/b/scsl +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-Numr.fd b/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-Numr.fd index dd1ef541aa2..d4abbdf79f1 100644 --- a/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-Numr.fd +++ b/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-Numr.fd @@ -1,122 +1,287 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{LY1MontserratAlternates-Numr.fd} - [2017/01/25 (autoinst) Font definitions for LY1/MontserratAlternates-Numr.] + [2019/10/18 (autoinst) Font definitions for LY1/MontserratAlternates-Numr.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{LY1}{MontserratAlternates-Numr}{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-numr-ly1 + +% ---- thin ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-numr-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-numr-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-numr-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{m}{sl}{ - <-> ssub * MontserratAlternates-Numr/m/it +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{thin}{sl}{ + <-> ssub * MontserratAlternates-Numr/thin/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-numr-ly1 + +% ---- bold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-numr-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-numr-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-numr-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{mb}{sl}{ - <-> ssub * MontserratAlternates-Numr/mb/it +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{bold}{sl}{ + <-> ssub * MontserratAlternates-Numr/bold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-numr-ly1 + +% ---- regular ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-numr-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-numr-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-numr-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{l}{sl}{ - <-> ssub * MontserratAlternates-Numr/l/it +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{regular}{sl}{ + <-> ssub * MontserratAlternates-Numr/regular/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-numr-ly1 + +% ---- black ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-numr-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-numr-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-numr-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{sb}{sl}{ - <-> ssub * MontserratAlternates-Numr/sb/it +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{black}{sl}{ + <-> ssub * MontserratAlternates-Numr/black/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-numr-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-numr-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{medium}{sl}{ + <-> ssub * MontserratAlternates-Numr/medium/it +}{} + + +% ---- light ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-numr-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-numr-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-numr-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-numr-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{light}{sl}{ + <-> ssub * MontserratAlternates-Numr/light/it +}{} + + +% ---- semibold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-numr-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-numr-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{semibold}{sl}{ + <-> ssub * MontserratAlternates-Numr/semibold/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-numr-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-numr-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{extralight}{sl}{ + <-> ssub * MontserratAlternates-Numr/extralight/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-numr-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-numr-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-Numr/extrabold/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{ul}{sl}{ + <-> ssub * MontserratAlternates-Numr/thin/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{t}{sl}{ - <-> ssub * MontserratAlternates-Numr/t/it +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{ul}{it}{ + <-> ssub * MontserratAlternates-Numr/thin/it }{} +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{ul}{n}{ + <-> ssub * MontserratAlternates-Numr/thin/n +}{} + + +% el --> extralight + \DeclareFontShape{LY1}{MontserratAlternates-Numr}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-numr-ly1 + <-> ssub * MontserratAlternates-Numr/extralight/n }{} \DeclareFontShape{LY1}{MontserratAlternates-Numr}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-numr-ly1 + <-> ssub * MontserratAlternates-Numr/extralight/it }{} \DeclareFontShape{LY1}{MontserratAlternates-Numr}{el}{sl}{ - <-> ssub * MontserratAlternates-Numr/el/it + <-> ssub * MontserratAlternates-Numr/extralight/sl +}{} + + +% l --> light + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{l}{it}{ + <-> ssub * MontserratAlternates-Numr/light/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{l}{sl}{ + <-> ssub * MontserratAlternates-Numr/light/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{l}{n}{ + <-> ssub * MontserratAlternates-Numr/light/n +}{} + + +% sl --> regular + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{sl}{it}{ + <-> ssub * MontserratAlternates-Numr/regular/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{sl}{sl}{ + <-> ssub * MontserratAlternates-Numr/regular/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{sl}{n}{ + <-> ssub * MontserratAlternates-Numr/regular/n +}{} + + +% m --> medium + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{m}{sl}{ + <-> ssub * MontserratAlternates-Numr/medium/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-numr-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{m}{it}{ + <-> ssub * MontserratAlternates-Numr/medium/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{m}{n}{ + <-> ssub * MontserratAlternates-Numr/medium/n +}{} + + +% sb --> semibold + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{sb}{n}{ + <-> ssub * MontserratAlternates-Numr/semibold/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-numr-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{sb}{it}{ + <-> ssub * MontserratAlternates-Numr/semibold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{k}{sl}{ - <-> ssub * MontserratAlternates-Numr/k/it +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{sb}{sl}{ + <-> ssub * MontserratAlternates-Numr/semibold/sl }{} + +% b --> bold + \DeclareFontShape{LY1}{MontserratAlternates-Numr}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-numr-ly1 + <-> ssub * MontserratAlternates-Numr/bold/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{b}{sl}{ + <-> ssub * MontserratAlternates-Numr/bold/sl }{} \DeclareFontShape{LY1}{MontserratAlternates-Numr}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-numr-ly1 + <-> ssub * MontserratAlternates-Numr/bold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{b}{sl}{ - <-> ssub * MontserratAlternates-Numr/b/it + +% eb --> extrabold + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{eb}{sl}{ + <-> ssub * MontserratAlternates-Numr/extrabold/sl }{} \DeclareFontShape{LY1}{MontserratAlternates-Numr}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-numr-ly1 + <-> ssub * MontserratAlternates-Numr/extrabold/it }{} \DeclareFontShape{LY1}{MontserratAlternates-Numr}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-numr-ly1 + <-> ssub * MontserratAlternates-Numr/extrabold/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-Numr}{eb}{sl}{ - <-> ssub * MontserratAlternates-Numr/eb/it + +% ub --> black + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{ub}{n}{ + <-> ssub * MontserratAlternates-Numr/black/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{ub}{it}{ + <-> ssub * MontserratAlternates-Numr/black/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Numr}{ub}{sl}{ + <-> ssub * MontserratAlternates-Numr/black/sl }{} \DeclareFontShape{LY1}{MontserratAlternates-Numr}{bx}{sl}{ diff --git a/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-OsF.fd b/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-OsF.fd index 337e1e9de0f..d21345234d1 100644 --- a/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-OsF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-OsF.fd @@ -1,248 +1,521 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{LY1MontserratAlternates-OsF.fd} - [2017/01/25 (autoinst) Font definitions for LY1/MontserratAlternates-OsF.] + [2019/10/18 (autoinst) Font definitions for LY1/MontserratAlternates-OsF.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{LY1}{MontserratAlternates-OsF}{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-osf-ly1 + +% ---- thin ---- + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-osf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-osf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{scsl}{ - <-> ssub * MontserratAlternates-OsF/sb/scit +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{scsl}{ + <-> ssub * MontserratAlternates-OsF/thin/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{sl}{ - <-> ssub * MontserratAlternates-OsF/sb/it +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{sl}{ + <-> ssub * MontserratAlternates-OsF/thin/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{t}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-osf-sc-ly1 + +% ---- bold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{t}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-osf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-osf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-osf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{t}{scsl}{ - <-> ssub * MontserratAlternates-OsF/t/scit +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{scsl}{ + <-> ssub * MontserratAlternates-OsF/bold/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{t}{sl}{ - <-> ssub * MontserratAlternates-OsF/t/it +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{sl}{ + <-> ssub * MontserratAlternates-OsF/bold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-osf-ly1 + +% ---- medium ---- + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-osf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-osf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-osf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{scsl}{ - <-> ssub * MontserratAlternates-OsF/m/scit +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{scsl}{ + <-> ssub * MontserratAlternates-OsF/medium/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{sl}{ - <-> ssub * MontserratAlternates-OsF/m/it +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{sl}{ + <-> ssub * MontserratAlternates-OsF/medium/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-osf-ly1 + +% ---- light ---- + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Light-osf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-osf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{scsl}{ - <-> ssub * MontserratAlternates-OsF/l/scit +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{scsl}{ + <-> ssub * MontserratAlternates-OsF/light/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{sl}{ - <-> ssub * MontserratAlternates-OsF/l/it +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{sl}{ + <-> ssub * MontserratAlternates-OsF/light/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-osf-ly1 + +% ---- semibold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{mb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-osf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{mb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-osf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{mb}{scsl}{ - <-> ssub * MontserratAlternates-OsF/mb/scit +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{scsl}{ + <-> ssub * MontserratAlternates-OsF/semibold/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{mb}{sl}{ - <-> ssub * MontserratAlternates-OsF/mb/it +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{sl}{ + <-> ssub * MontserratAlternates-OsF/semibold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-osf-ly1 + +% ---- black ---- + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{scsl}{ + <-> ssub * MontserratAlternates-OsF/black/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{k}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{sl}{ + <-> ssub * MontserratAlternates-OsF/black/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{k}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Black-osf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-osf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{k}{scsl}{ - <-> ssub * MontserratAlternates-OsF/k/scit +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{k}{sl}{ - <-> ssub * MontserratAlternates-OsF/k/it +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{scsl}{ + <-> ssub * MontserratAlternates-OsF/regular/scit }{} +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{sl}{ + <-> ssub * MontserratAlternates-OsF/regular/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{scsl}{ + <-> ssub * MontserratAlternates-OsF/extralight/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{sl}{ + <-> ssub * MontserratAlternates-OsF/extralight/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{scsl}{ + <-> ssub * MontserratAlternates-OsF/extrabold/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-OsF/extrabold/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{scsl}{ + <-> ssub * MontserratAlternates-OsF/thin/scsl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{n}{ + <-> ssub * MontserratAlternates-OsF/thin/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{scit}{ + <-> ssub * MontserratAlternates-OsF/thin/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{it}{ + <-> ssub * MontserratAlternates-OsF/thin/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{sc}{ + <-> ssub * MontserratAlternates-OsF/thin/sc +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{sl}{ + <-> ssub * MontserratAlternates-OsF/thin/sl +}{} + + +% el --> extralight + \DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-osf-sc-ly1 + <-> ssub * MontserratAlternates-OsF/extralight/scit }{} \DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-osf-ly1 + <-> ssub * MontserratAlternates-OsF/extralight/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{scsl}{ + <-> ssub * MontserratAlternates-OsF/extralight/scsl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{sl}{ + <-> ssub * MontserratAlternates-OsF/extralight/sl }{} \DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-osf-sc-ly1 + <-> ssub * MontserratAlternates-OsF/extralight/sc }{} \DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-osf-ly1 + <-> ssub * MontserratAlternates-OsF/extralight/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{scsl}{ - <-> ssub * MontserratAlternates-OsF/el/scit + +% l --> light + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{it}{ + <-> ssub * MontserratAlternates-OsF/light/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{sl}{ - <-> ssub * MontserratAlternates-OsF/el/it +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{sc}{ + <-> ssub * MontserratAlternates-OsF/light/sc }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{sl}{ + <-> ssub * MontserratAlternates-OsF/light/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-osf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{scsl}{ + <-> ssub * MontserratAlternates-OsF/light/scsl }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-osf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{n}{ + <-> ssub * MontserratAlternates-OsF/light/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-osf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{scit}{ + <-> ssub * MontserratAlternates-OsF/light/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{scsl}{ - <-> ssub * MontserratAlternates-OsF/eb/scit + +% sl --> regular + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sl}{sl}{ + <-> ssub * MontserratAlternates-OsF/regular/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{sl}{ - <-> ssub * MontserratAlternates-OsF/eb/it +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sl}{sc}{ + <-> ssub * MontserratAlternates-OsF/regular/sc }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sl}{it}{ + <-> ssub * MontserratAlternates-OsF/regular/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-osf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sl}{scit}{ + <-> ssub * MontserratAlternates-OsF/regular/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-osf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sl}{n}{ + <-> ssub * MontserratAlternates-OsF/regular/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sl}{scsl}{ + <-> ssub * MontserratAlternates-OsF/regular/scsl +}{} + + +% m --> medium + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{sl}{ + <-> ssub * MontserratAlternates-OsF/medium/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{sc}{ + <-> ssub * MontserratAlternates-OsF/medium/sc +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{it}{ + <-> ssub * MontserratAlternates-OsF/medium/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{n}{ + <-> ssub * MontserratAlternates-OsF/medium/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{scit}{ + <-> ssub * MontserratAlternates-OsF/medium/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{scsl}{ + <-> ssub * MontserratAlternates-OsF/medium/scsl }{} + +% sb --> semibold + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{it}{ + <-> ssub * MontserratAlternates-OsF/semibold/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{sc}{ + <-> ssub * MontserratAlternates-OsF/semibold/sc +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{sl}{ + <-> ssub * MontserratAlternates-OsF/semibold/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{scsl}{ + <-> ssub * MontserratAlternates-OsF/semibold/scsl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{n}{ + <-> ssub * MontserratAlternates-OsF/semibold/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{scit}{ + <-> ssub * MontserratAlternates-OsF/semibold/scit +}{} + + +% b --> bold + \DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-osf-ly1 + <-> ssub * MontserratAlternates-OsF/bold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{scsl}{ - <-> ssub * MontserratAlternates-OsF/b/scit +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{sc}{ + <-> ssub * MontserratAlternates-OsF/bold/sc }{} \DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{sl}{ - <-> ssub * MontserratAlternates-OsF/b/it + <-> ssub * MontserratAlternates-OsF/bold/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{scsl}{ - <-> ssub * MontserratAlternates-OsF/b/scsl +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{scsl}{ + <-> ssub * MontserratAlternates-OsF/bold/scsl }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{scit}{ - <-> ssub * MontserratAlternates-OsF/b/scit +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{scit}{ + <-> ssub * MontserratAlternates-OsF/bold/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{sc}{ - <-> ssub * MontserratAlternates-OsF/b/sc +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{n}{ + <-> ssub * MontserratAlternates-OsF/bold/n +}{} + + +% eb --> extrabold + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{sl}{ + <-> ssub * MontserratAlternates-OsF/extrabold/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{sc}{ + <-> ssub * MontserratAlternates-OsF/extrabold/sc +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{it}{ + <-> ssub * MontserratAlternates-OsF/extrabold/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{scit}{ + <-> ssub * MontserratAlternates-OsF/extrabold/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{n}{ + <-> ssub * MontserratAlternates-OsF/extrabold/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{scsl}{ + <-> ssub * MontserratAlternates-OsF/extrabold/scsl +}{} + + +% ub --> black + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{scsl}{ + <-> ssub * MontserratAlternates-OsF/black/scsl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{n}{ + <-> ssub * MontserratAlternates-OsF/black/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{scit}{ + <-> ssub * MontserratAlternates-OsF/black/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{it}{ + <-> ssub * MontserratAlternates-OsF/black/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{sc}{ + <-> ssub * MontserratAlternates-OsF/black/sc +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{sl}{ + <-> ssub * MontserratAlternates-OsF/black/sl }{} \DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{n}{ <-> ssub * MontserratAlternates-OsF/b/n }{} +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{scit}{ + <-> ssub * MontserratAlternates-OsF/b/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{scsl}{ + <-> ssub * MontserratAlternates-OsF/b/scsl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{sc}{ + <-> ssub * MontserratAlternates-OsF/b/sc +}{} + \DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{sl}{ <-> ssub * MontserratAlternates-OsF/b/sl }{} diff --git a/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-Sup.fd b/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-Sup.fd index d708f259cf8..1efc8710eec 100644 --- a/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-Sup.fd +++ b/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-Sup.fd @@ -1,126 +1,287 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{LY1MontserratAlternates-Sup.fd} - [2017/01/25 (autoinst) Font definitions for LY1/MontserratAlternates-Sup.] + [2019/10/18 (autoinst) Font definitions for LY1/MontserratAlternates-Sup.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{LY1}{MontserratAlternates-Sup}{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-sup-ly1 + +% ---- extrabold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-sup-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-sup-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{b}{sl}{ - <-> ssub * MontserratAlternates-Sup/b/it +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-Sup/extrabold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-sup-ly1 + +% ---- extralight ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-sup-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-sup-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{eb}{sl}{ - <-> ssub * MontserratAlternates-Sup/eb/it +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{extralight}{sl}{ + <-> ssub * MontserratAlternates-Sup/extralight/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-sup-ly1 + +% ---- thin ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-sup-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-sup-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{el}{sl}{ - <-> ssub * MontserratAlternates-Sup/el/it +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{thin}{sl}{ + <-> ssub * MontserratAlternates-Sup/thin/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-sup-ly1 + +% ---- bold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-sup-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-sup-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{k}{sl}{ - <-> ssub * MontserratAlternates-Sup/k/it +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{bold}{sl}{ + <-> ssub * MontserratAlternates-Sup/bold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-sup-ly1 + +% ---- light ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-sup-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-sup-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{t}{sl}{ - <-> ssub * MontserratAlternates-Sup/t/it +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{light}{sl}{ + <-> ssub * MontserratAlternates-Sup/light/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-sup-ly1 + +% ---- medium ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-sup-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-sup-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{sb}{sl}{ - <-> ssub * MontserratAlternates-Sup/sb/it +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{medium}{sl}{ + <-> ssub * MontserratAlternates-Sup/medium/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-sup-ly1 + +% ---- semibold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-sup-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-sup-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{semibold}{sl}{ + <-> ssub * MontserratAlternates-Sup/semibold/it +}{} + + +% ---- black ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-sup-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{black}{sl}{ + <-> ssub * MontserratAlternates-Sup/black/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-sup-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{regular}{sl}{ + <-> ssub * MontserratAlternates-Sup/regular/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{ul}{n}{ + <-> ssub * MontserratAlternates-Sup/thin/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{ul}{sl}{ + <-> ssub * MontserratAlternates-Sup/thin/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{ul}{it}{ + <-> ssub * MontserratAlternates-Sup/thin/it +}{} + + +% el --> extralight + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{el}{sl}{ + <-> ssub * MontserratAlternates-Sup/extralight/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{el}{it}{ + <-> ssub * MontserratAlternates-Sup/extralight/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{el}{n}{ + <-> ssub * MontserratAlternates-Sup/extralight/n +}{} + + +% l --> light + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{l}{it}{ + <-> ssub * MontserratAlternates-Sup/light/it }{} \DeclareFontShape{LY1}{MontserratAlternates-Sup}{l}{sl}{ - <-> ssub * MontserratAlternates-Sup/l/it + <-> ssub * MontserratAlternates-Sup/light/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{l}{n}{ + <-> ssub * MontserratAlternates-Sup/light/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-sup-ly1 + +% sl --> regular + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{sl}{sl}{ + <-> ssub * MontserratAlternates-Sup/regular/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-sup-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{sl}{it}{ + <-> ssub * MontserratAlternates-Sup/regular/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{mb}{sl}{ - <-> ssub * MontserratAlternates-Sup/mb/it +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{sl}{n}{ + <-> ssub * MontserratAlternates-Sup/regular/n }{} + +% m --> medium + \DeclareFontShape{LY1}{MontserratAlternates-Sup}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-sup-ly1 + <-> ssub * MontserratAlternates-Sup/medium/n }{} \DeclareFontShape{LY1}{MontserratAlternates-Sup}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-sup-ly1 + <-> ssub * MontserratAlternates-Sup/medium/it }{} \DeclareFontShape{LY1}{MontserratAlternates-Sup}{m}{sl}{ - <-> ssub * MontserratAlternates-Sup/m/it + <-> ssub * MontserratAlternates-Sup/medium/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-Sup}{bx}{n}{ - <-> ssub * MontserratAlternates-Sup/b/n + +% sb --> semibold + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{sb}{sl}{ + <-> ssub * MontserratAlternates-Sup/semibold/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{sb}{it}{ + <-> ssub * MontserratAlternates-Sup/semibold/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{sb}{n}{ + <-> ssub * MontserratAlternates-Sup/semibold/n +}{} + + +% b --> bold + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{b}{n}{ + <-> ssub * MontserratAlternates-Sup/bold/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{b}{sl}{ + <-> ssub * MontserratAlternates-Sup/bold/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{b}{it}{ + <-> ssub * MontserratAlternates-Sup/bold/it +}{} + + +% eb --> extrabold + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{eb}{n}{ + <-> ssub * MontserratAlternates-Sup/extrabold/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{eb}{it}{ + <-> ssub * MontserratAlternates-Sup/extrabold/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{eb}{sl}{ + <-> ssub * MontserratAlternates-Sup/extrabold/sl +}{} + + +% ub --> black + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{ub}{it}{ + <-> ssub * MontserratAlternates-Sup/black/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{ub}{sl}{ + <-> ssub * MontserratAlternates-Sup/black/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{ub}{n}{ + <-> ssub * MontserratAlternates-Sup/black/n }{} \DeclareFontShape{LY1}{MontserratAlternates-Sup}{bx}{sl}{ @@ -131,4 +292,8 @@ <-> ssub * MontserratAlternates-Sup/b/it }{} +\DeclareFontShape{LY1}{MontserratAlternates-Sup}{bx}{n}{ + <-> ssub * MontserratAlternates-Sup/b/n +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-TLF.fd b/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-TLF.fd index f570b15e1be..a653313f53e 100644 --- a/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-TLF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-TLF.fd @@ -1,254 +1,527 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{LY1MontserratAlternates-TLF.fd} - [2017/01/25 (autoinst) Font definitions for LY1/MontserratAlternates-TLF.] + [2019/10/18 (autoinst) Font definitions for LY1/MontserratAlternates-TLF.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{LY1}{MontserratAlternates-TLF}{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-tlf-sc-ly1 + +% ---- extralight ---- + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-tlf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extralight}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-tlf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-tlf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extralight}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{scsl}{ - <-> ssub * MontserratAlternates-TLF/sb/scit +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extralight}{scsl}{ + <-> ssub * MontserratAlternates-TLF/extralight/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{sl}{ - <-> ssub * MontserratAlternates-TLF/sb/it +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extralight}{sl}{ + <-> ssub * MontserratAlternates-TLF/extralight/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-tlf-ly1 + +% ---- extrabold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{t}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-tlf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extrabold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{t}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-tlf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extrabold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{t}{scsl}{ - <-> ssub * MontserratAlternates-TLF/t/scit +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extrabold}{scsl}{ + <-> ssub * MontserratAlternates-TLF/extrabold/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{t}{sl}{ - <-> ssub * MontserratAlternates-TLF/t/it +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-TLF/extrabold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-tlf-ly1 + +% ---- thin ---- + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-tlf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{thin}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-tlf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-tlf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{thin}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{scsl}{ - <-> ssub * MontserratAlternates-TLF/m/scit +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{thin}{scsl}{ + <-> ssub * MontserratAlternates-TLF/thin/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{sl}{ - <-> ssub * MontserratAlternates-TLF/m/it +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{thin}{sl}{ + <-> ssub * MontserratAlternates-TLF/thin/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Light-tlf-sc-ly1 + +% ---- bold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-tlf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-tlf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{scsl}{ - <-> ssub * MontserratAlternates-TLF/l/scit +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bold}{scsl}{ + <-> ssub * MontserratAlternates-TLF/bold/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{sl}{ - <-> ssub * MontserratAlternates-TLF/l/it +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bold}{sl}{ + <-> ssub * MontserratAlternates-TLF/bold/it +}{} + + +% ---- black ---- + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{black}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{mb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{mb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-tlf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{black}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-tlf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-tlf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{black}{scsl}{ + <-> ssub * MontserratAlternates-TLF/black/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{mb}{scsl}{ - <-> ssub * MontserratAlternates-TLF/mb/scit +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{black}{sl}{ + <-> ssub * MontserratAlternates-TLF/black/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{mb}{sl}{ - <-> ssub * MontserratAlternates-TLF/mb/it + +% ---- regular ---- + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-tlf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{regular}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{k}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-tlf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{regular}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{k}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Black-tlf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{regular}{scsl}{ + <-> ssub * MontserratAlternates-TLF/regular/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{k}{scsl}{ - <-> ssub * MontserratAlternates-TLF/k/scit +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{regular}{sl}{ + <-> ssub * MontserratAlternates-TLF/regular/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{k}{sl}{ - <-> ssub * MontserratAlternates-TLF/k/it + +% ---- light ---- + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{light}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-tlf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-tlf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{light}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{light}{scsl}{ + <-> ssub * MontserratAlternates-TLF/light/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{light}{sl}{ + <-> ssub * MontserratAlternates-TLF/light/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{medium}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{medium}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-sc-ly1 }{} +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{medium}{scsl}{ + <-> ssub * MontserratAlternates-TLF/medium/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{medium}{sl}{ + <-> ssub * MontserratAlternates-TLF/medium/it +}{} + + +% ---- semibold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{semibold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{semibold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{semibold}{scsl}{ + <-> ssub * MontserratAlternates-TLF/semibold/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{semibold}{sl}{ + <-> ssub * MontserratAlternates-TLF/semibold/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ul}{sl}{ + <-> ssub * MontserratAlternates-TLF/thin/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ul}{sc}{ + <-> ssub * MontserratAlternates-TLF/thin/sc +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ul}{it}{ + <-> ssub * MontserratAlternates-TLF/thin/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ul}{scit}{ + <-> ssub * MontserratAlternates-TLF/thin/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ul}{n}{ + <-> ssub * MontserratAlternates-TLF/thin/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ul}{scsl}{ + <-> ssub * MontserratAlternates-TLF/thin/scsl +}{} + + +% el --> extralight + \DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-tlf-ly1 + <-> ssub * MontserratAlternates-TLF/extralight/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{scsl}{ - <-> ssub * MontserratAlternates-TLF/el/scit +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{sc}{ + <-> ssub * MontserratAlternates-TLF/extralight/sc }{} \DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{sl}{ - <-> ssub * MontserratAlternates-TLF/el/it + <-> ssub * MontserratAlternates-TLF/extralight/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{scsl}{ + <-> ssub * MontserratAlternates-TLF/extralight/scsl }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-tlf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{n}{ + <-> ssub * MontserratAlternates-TLF/extralight/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-tlf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{scit}{ + <-> ssub * MontserratAlternates-TLF/extralight/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-tlf-ly1 + +% l --> light + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{it}{ + <-> ssub * MontserratAlternates-TLF/light/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{scsl}{ - <-> ssub * MontserratAlternates-TLF/eb/scit +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{sc}{ + <-> ssub * MontserratAlternates-TLF/light/sc }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{sl}{ - <-> ssub * MontserratAlternates-TLF/eb/it +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{sl}{ + <-> ssub * MontserratAlternates-TLF/light/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-tlf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{scsl}{ + <-> ssub * MontserratAlternates-TLF/light/scsl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{n}{ + <-> ssub * MontserratAlternates-TLF/light/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{scit}{ + <-> ssub * MontserratAlternates-TLF/light/scit +}{} + + +% sl --> regular + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sl}{scit}{ + <-> ssub * MontserratAlternates-TLF/regular/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sl}{n}{ + <-> ssub * MontserratAlternates-TLF/regular/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sl}{scsl}{ + <-> ssub * MontserratAlternates-TLF/regular/scsl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sl}{sl}{ + <-> ssub * MontserratAlternates-TLF/regular/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sl}{sc}{ + <-> ssub * MontserratAlternates-TLF/regular/sc +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sl}{it}{ + <-> ssub * MontserratAlternates-TLF/regular/it +}{} + + +% m --> medium + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{scsl}{ + <-> ssub * MontserratAlternates-TLF/medium/scsl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{n}{ + <-> ssub * MontserratAlternates-TLF/medium/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{scit}{ + <-> ssub * MontserratAlternates-TLF/medium/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{it}{ + <-> ssub * MontserratAlternates-TLF/medium/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{sc}{ + <-> ssub * MontserratAlternates-TLF/medium/sc +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{sl}{ + <-> ssub * MontserratAlternates-TLF/medium/sl +}{} + + +% sb --> semibold + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{sl}{ + <-> ssub * MontserratAlternates-TLF/semibold/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{sc}{ + <-> ssub * MontserratAlternates-TLF/semibold/sc +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{it}{ + <-> ssub * MontserratAlternates-TLF/semibold/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{scit}{ + <-> ssub * MontserratAlternates-TLF/semibold/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{n}{ + <-> ssub * MontserratAlternates-TLF/semibold/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{scsl}{ + <-> ssub * MontserratAlternates-TLF/semibold/scsl +}{} + + +% b --> bold + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{scsl}{ + <-> ssub * MontserratAlternates-TLF/bold/scsl }{} \DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-tlf-sc-ly1 + <-> ssub * MontserratAlternates-TLF/bold/scit }{} \DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-tlf-ly1 + <-> ssub * MontserratAlternates-TLF/bold/n }{} \DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-tlf-ly1 + <-> ssub * MontserratAlternates-TLF/bold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{scsl}{ - <-> ssub * MontserratAlternates-TLF/b/scit +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{sc}{ + <-> ssub * MontserratAlternates-TLF/bold/sc }{} \DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{sl}{ - <-> ssub * MontserratAlternates-TLF/b/it + <-> ssub * MontserratAlternates-TLF/bold/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bx}{scsl}{ - <-> ssub * MontserratAlternates-TLF/b/scsl + +% eb --> extrabold + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{it}{ + <-> ssub * MontserratAlternates-TLF/extrabold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bx}{sc}{ - <-> ssub * MontserratAlternates-TLF/b/sc +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{sc}{ + <-> ssub * MontserratAlternates-TLF/extrabold/sc }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bx}{scit}{ - <-> ssub * MontserratAlternates-TLF/b/scit +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{sl}{ + <-> ssub * MontserratAlternates-TLF/extrabold/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{scsl}{ + <-> ssub * MontserratAlternates-TLF/extrabold/scsl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{scit}{ + <-> ssub * MontserratAlternates-TLF/extrabold/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{n}{ + <-> ssub * MontserratAlternates-TLF/extrabold/n +}{} + + +% ub --> black + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ub}{scsl}{ + <-> ssub * MontserratAlternates-TLF/black/scsl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ub}{n}{ + <-> ssub * MontserratAlternates-TLF/black/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ub}{scit}{ + <-> ssub * MontserratAlternates-TLF/black/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ub}{it}{ + <-> ssub * MontserratAlternates-TLF/black/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ub}{sc}{ + <-> ssub * MontserratAlternates-TLF/black/sc +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ub}{sl}{ + <-> ssub * MontserratAlternates-TLF/black/sl }{} \DeclareFontShape{LY1}{MontserratAlternates-TLF}{bx}{n}{ <-> ssub * MontserratAlternates-TLF/b/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bx}{it}{ - <-> ssub * MontserratAlternates-TLF/b/it +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bx}{scit}{ + <-> ssub * MontserratAlternates-TLF/b/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bx}{scsl}{ + <-> ssub * MontserratAlternates-TLF/b/scsl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bx}{sc}{ + <-> ssub * MontserratAlternates-TLF/b/sc }{} \DeclareFontShape{LY1}{MontserratAlternates-TLF}{bx}{sl}{ <-> ssub * MontserratAlternates-TLF/b/sl }{} +\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bx}{it}{ + <-> ssub * MontserratAlternates-TLF/b/it +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-TOsF.fd b/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-TOsF.fd index bb88d0a00c0..fa8343f4efa 100644 --- a/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-TOsF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-TOsF.fd @@ -1,246 +1,515 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{LY1MontserratAlternates-TOsF.fd} - [2017/01/25 (autoinst) Font definitions for LY1/MontserratAlternates-TOsF.] + [2019/10/18 (autoinst) Font definitions for LY1/MontserratAlternates-TOsF.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{LY1}{MontserratAlternates-TOsF}{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-tosf-ly1 + +% ---- regular ---- + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{t}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-tosf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{regular}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{t}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{regular}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-tosf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{t}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/t/scit +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{regular}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/regular/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{t}{sl}{ - <-> ssub * MontserratAlternates-TOsF/t/it +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{regular}{sl}{ + <-> ssub * MontserratAlternates-TOsF/regular/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-tosf-ly1 + +% ---- black ---- + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-tosf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{black}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-tosf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-tosf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{black}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/sb/scit +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{black}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/black/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{sl}{ - <-> ssub * MontserratAlternates-TOsF/sb/it +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{black}{sl}{ + <-> ssub * MontserratAlternates-TOsF/black/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-tosf-ly1 + +% ---- light ---- + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-tosf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{mb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-tosf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{light}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{mb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-tosf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{light}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{mb}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/mb/scit +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{light}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/light/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{mb}{sl}{ - <-> ssub * MontserratAlternates-TOsF/mb/it +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{light}{sl}{ + <-> ssub * MontserratAlternates-TOsF/light/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-tosf-ly1 + +% ---- medium ---- + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{medium}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{medium}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{medium}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/medium/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{medium}{sl}{ + <-> ssub * MontserratAlternates-TOsF/medium/it +}{} + + +% ---- semibold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{semibold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{semibold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{semibold}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/semibold/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{semibold}{sl}{ + <-> ssub * MontserratAlternates-TOsF/semibold/it +}{} + + +% ---- thin ---- + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{thin}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{thin}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{thin}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/thin/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{thin}{sl}{ + <-> ssub * MontserratAlternates-TOsF/thin/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bold}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/bold/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bold}{sl}{ + <-> ssub * MontserratAlternates-TOsF/bold/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extrabold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extrabold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extrabold}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extralight}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extralight}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extralight}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/extralight/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extralight}{sl}{ + <-> ssub * MontserratAlternates-TOsF/extralight/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ul}{it}{ + <-> ssub * MontserratAlternates-TOsF/thin/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ul}{sc}{ + <-> ssub * MontserratAlternates-TOsF/thin/sc +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ul}{sl}{ + <-> ssub * MontserratAlternates-TOsF/thin/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ul}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/thin/scsl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ul}{scit}{ + <-> ssub * MontserratAlternates-TOsF/thin/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ul}{n}{ + <-> ssub * MontserratAlternates-TOsF/thin/n +}{} + + +% el --> extralight + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/extralight/scsl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{n}{ + <-> ssub * MontserratAlternates-TOsF/extralight/n +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{scit}{ + <-> ssub * MontserratAlternates-TOsF/extralight/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{it}{ + <-> ssub * MontserratAlternates-TOsF/extralight/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{sc}{ + <-> ssub * MontserratAlternates-TOsF/extralight/sc +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{sl}{ + <-> ssub * MontserratAlternates-TOsF/extralight/sl +}{} + + +% l --> light + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{l}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/light/scsl }{} \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{l}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-tosf-sc-ly1 + <-> ssub * MontserratAlternates-TOsF/light/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{l}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Light-tosf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{l}{n}{ + <-> ssub * MontserratAlternates-TOsF/light/n }{} \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-tosf-ly1 + <-> ssub * MontserratAlternates-TOsF/light/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{l}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/l/scit +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{l}{sc}{ + <-> ssub * MontserratAlternates-TOsF/light/sc }{} \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{l}{sl}{ - <-> ssub * MontserratAlternates-TOsF/l/it + <-> ssub * MontserratAlternates-TOsF/light/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-tosf-ly1 + +% sl --> regular + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sl}{n}{ + <-> ssub * MontserratAlternates-TOsF/regular/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-tosf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sl}{scit}{ + <-> ssub * MontserratAlternates-TOsF/regular/scit +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sl}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/regular/scsl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sl}{sl}{ + <-> ssub * MontserratAlternates-TOsF/regular/sl +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sl}{sc}{ + <-> ssub * MontserratAlternates-TOsF/regular/sc +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sl}{it}{ + <-> ssub * MontserratAlternates-TOsF/regular/it +}{} + + +% m --> medium + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/medium/scsl }{} \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-tosf-ly1 + <-> ssub * MontserratAlternates-TOsF/medium/n }{} \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-tosf-sc-ly1 + <-> ssub * MontserratAlternates-TOsF/medium/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/m/scit +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{it}{ + <-> ssub * MontserratAlternates-TOsF/medium/it +}{} + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{sc}{ + <-> ssub * MontserratAlternates-TOsF/medium/sc }{} \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{sl}{ - <-> ssub * MontserratAlternates-TOsF/m/it + <-> ssub * MontserratAlternates-TOsF/medium/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-tosf-ly1 + +% sb --> semibold + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/semibold/scsl }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{scit}{ + <-> ssub * MontserratAlternates-TOsF/semibold/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-tosf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{n}{ + <-> ssub * MontserratAlternates-TOsF/semibold/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-tosf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{it}{ + <-> ssub * MontserratAlternates-TOsF/semibold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/b/scit +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{sc}{ + <-> ssub * MontserratAlternates-TOsF/semibold/sc }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{sl}{ - <-> ssub * MontserratAlternates-TOsF/b/it +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{sl}{ + <-> ssub * MontserratAlternates-TOsF/semibold/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-tosf-ly1 + +% b --> bold + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/bold/scsl }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-tosf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{n}{ + <-> ssub * MontserratAlternates-TOsF/bold/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{scit}{ + <-> ssub * MontserratAlternates-TOsF/bold/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-tosf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{it}{ + <-> ssub * MontserratAlternates-TOsF/bold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/eb/scit +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{sc}{ + <-> ssub * MontserratAlternates-TOsF/bold/sc }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{sl}{ - <-> ssub * MontserratAlternates-TOsF/eb/it +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{sl}{ + <-> ssub * MontserratAlternates-TOsF/bold/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-tosf-ly1 + +% eb --> extrabold + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/scsl }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-tosf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{n}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{k}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{scit}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{k}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Black-tosf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{it}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/it }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{k}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/k/scit +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{sc}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/sc }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{k}{sl}{ - <-> ssub * MontserratAlternates-TOsF/k/it +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{sl}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-tosf-ly1 + +% ub --> black + +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ub}{n}{ + <-> ssub * MontserratAlternates-TOsF/black/n }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-tosf-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ub}{scit}{ + <-> ssub * MontserratAlternates-TOsF/black/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ub}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/black/scsl }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-tosf-sc-ly1 +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ub}{sl}{ + <-> ssub * MontserratAlternates-TOsF/black/sl }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/el/scit +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ub}{sc}{ + <-> ssub * MontserratAlternates-TOsF/black/sc }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{sl}{ - <-> ssub * MontserratAlternates-TOsF/el/it +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ub}{it}{ + <-> ssub * MontserratAlternates-TOsF/black/it }{} \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bx}{scsl}{ <-> ssub * MontserratAlternates-TOsF/b/scsl }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bx}{n}{ - <-> ssub * MontserratAlternates-TOsF/b/n -}{} - \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bx}{scit}{ <-> ssub * MontserratAlternates-TOsF/b/scit }{} -\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bx}{sc}{ - <-> ssub * MontserratAlternates-TOsF/b/sc +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bx}{n}{ + <-> ssub * MontserratAlternates-TOsF/b/n }{} \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bx}{it}{ @@ -251,4 +520,8 @@ <-> ssub * MontserratAlternates-TOsF/b/sl }{} +\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bx}{sc}{ + <-> ssub * MontserratAlternates-TOsF/b/sc +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Dnom.fd b/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Dnom.fd index 18996f72cbb..daecd99d25e 100644 --- a/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Dnom.fd +++ b/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Dnom.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{OT1Montserrat-Dnom.fd} - [2017/01/25 (autoinst) Font definitions for OT1/Montserrat-Dnom.] + [2019/10/18 (autoinst) Font definitions for OT1/Montserrat-Dnom.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,116 +11,277 @@ \DeclareFontFamily{OT1}{Montserrat-Dnom}{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{sb}{it}{ + +% ---- regular ---- + +\DeclareFontShape{OT1}{Montserrat-Dnom}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-dnom-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Dnom}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-dnom-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Dnom}{regular}{sl}{ + <-> ssub * Montserrat-Dnom/regular/it +}{} + + +% ---- black ---- + +\DeclareFontShape{OT1}{Montserrat-Dnom}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-dnom-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Dnom}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-dnom-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Dnom}{black}{sl}{ + <-> ssub * Montserrat-Dnom/black/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{OT1}{Montserrat-Dnom}{extralight}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-dnom-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Dnom}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-dnom-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Dnom}{extralight}{sl}{ + <-> ssub * Montserrat-Dnom/extralight/it +}{} + + +% ---- semibold ---- + +\DeclareFontShape{OT1}{Montserrat-Dnom}{semibold}{it}{ <-> \Montserrat@@scale Montserrat-SemiBoldItalic-dnom-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{sb}{n}{ +\DeclareFontShape{OT1}{Montserrat-Dnom}{semibold}{n}{ <-> \Montserrat@@scale Montserrat-SemiBold-dnom-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{sb}{sl}{ - <-> ssub * Montserrat-Dnom/sb/it +\DeclareFontShape{OT1}{Montserrat-Dnom}{semibold}{sl}{ + <-> ssub * Montserrat-Dnom/semibold/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{OT1}{Montserrat-Dnom}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-dnom-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Dnom}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-dnom-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{t}{it}{ +\DeclareFontShape{OT1}{Montserrat-Dnom}{bold}{sl}{ + <-> ssub * Montserrat-Dnom/bold/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{OT1}{Montserrat-Dnom}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-dnom-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Dnom}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-dnom-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Dnom}{extrabold}{sl}{ + <-> ssub * Montserrat-Dnom/extrabold/it +}{} + + +% ---- thin ---- + +\DeclareFontShape{OT1}{Montserrat-Dnom}{thin}{it}{ <-> \Montserrat@@scale Montserrat-ThinItalic-dnom-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{t}{n}{ +\DeclareFontShape{OT1}{Montserrat-Dnom}{thin}{n}{ <-> \Montserrat@@scale Montserrat-Thin-dnom-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{t}{sl}{ - <-> ssub * Montserrat-Dnom/t/it +\DeclareFontShape{OT1}{Montserrat-Dnom}{thin}{sl}{ + <-> ssub * Montserrat-Dnom/thin/it }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-dnom-ot1 + +% ---- medium ---- + +\DeclareFontShape{OT1}{Montserrat-Dnom}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-dnom-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-dnom-ot1 +\DeclareFontShape{OT1}{Montserrat-Dnom}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-dnom-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{m}{sl}{ - <-> ssub * Montserrat-Dnom/m/it +\DeclareFontShape{OT1}{Montserrat-Dnom}{medium}{sl}{ + <-> ssub * Montserrat-Dnom/medium/it }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{l}{it}{ + +% ---- light ---- + +\DeclareFontShape{OT1}{Montserrat-Dnom}{light}{it}{ <-> \Montserrat@@scale Montserrat-LightItalic-dnom-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{l}{n}{ +\DeclareFontShape{OT1}{Montserrat-Dnom}{light}{n}{ <-> \Montserrat@@scale Montserrat-Light-dnom-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{l}{sl}{ - <-> ssub * Montserrat-Dnom/l/it +\DeclareFontShape{OT1}{Montserrat-Dnom}{light}{sl}{ + <-> ssub * Montserrat-Dnom/light/it }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-dnom-ot1 +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{OT1}{Montserrat-Dnom}{ul}{it}{ + <-> ssub * Montserrat-Dnom/thin/it }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-dnom-ot1 +\DeclareFontShape{OT1}{Montserrat-Dnom}{ul}{sl}{ + <-> ssub * Montserrat-Dnom/thin/sl }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{mb}{sl}{ - <-> ssub * Montserrat-Dnom/mb/it +\DeclareFontShape{OT1}{Montserrat-Dnom}{ul}{n}{ + <-> ssub * Montserrat-Dnom/thin/n }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-dnom-ot1 + +% el --> extralight + +\DeclareFontShape{OT1}{Montserrat-Dnom}{el}{n}{ + <-> ssub * Montserrat-Dnom/extralight/n }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-dnom-ot1 +\DeclareFontShape{OT1}{Montserrat-Dnom}{el}{sl}{ + <-> ssub * Montserrat-Dnom/extralight/sl }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{k}{sl}{ - <-> ssub * Montserrat-Dnom/k/it +\DeclareFontShape{OT1}{Montserrat-Dnom}{el}{it}{ + <-> ssub * Montserrat-Dnom/extralight/it }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{el}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-dnom-ot1 + +% l --> light + +\DeclareFontShape{OT1}{Montserrat-Dnom}{l}{sl}{ + <-> ssub * Montserrat-Dnom/light/sl }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-dnom-ot1 +\DeclareFontShape{OT1}{Montserrat-Dnom}{l}{n}{ + <-> ssub * Montserrat-Dnom/light/n }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{el}{sl}{ - <-> ssub * Montserrat-Dnom/el/it +\DeclareFontShape{OT1}{Montserrat-Dnom}{l}{it}{ + <-> ssub * Montserrat-Dnom/light/it }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-dnom-ot1 + +% sl --> regular + +\DeclareFontShape{OT1}{Montserrat-Dnom}{sl}{n}{ + <-> ssub * Montserrat-Dnom/regular/n }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-dnom-ot1 +\DeclareFontShape{OT1}{Montserrat-Dnom}{sl}{sl}{ + <-> ssub * Montserrat-Dnom/regular/sl }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{eb}{sl}{ - <-> ssub * Montserrat-Dnom/eb/it +\DeclareFontShape{OT1}{Montserrat-Dnom}{sl}{it}{ + <-> ssub * Montserrat-Dnom/regular/it }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-dnom-ot1 + +% m --> medium + +\DeclareFontShape{OT1}{Montserrat-Dnom}{m}{n}{ + <-> ssub * Montserrat-Dnom/medium/n }{} +\DeclareFontShape{OT1}{Montserrat-Dnom}{m}{sl}{ + <-> ssub * Montserrat-Dnom/medium/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-Dnom}{m}{it}{ + <-> ssub * Montserrat-Dnom/medium/it +}{} + + +% sb --> semibold + +\DeclareFontShape{OT1}{Montserrat-Dnom}{sb}{it}{ + <-> ssub * Montserrat-Dnom/semibold/it +}{} + +\DeclareFontShape{OT1}{Montserrat-Dnom}{sb}{n}{ + <-> ssub * Montserrat-Dnom/semibold/n +}{} + +\DeclareFontShape{OT1}{Montserrat-Dnom}{sb}{sl}{ + <-> ssub * Montserrat-Dnom/semibold/sl +}{} + + +% b --> bold + \DeclareFontShape{OT1}{Montserrat-Dnom}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-dnom-ot1 + <-> ssub * Montserrat-Dnom/bold/it +}{} + +\DeclareFontShape{OT1}{Montserrat-Dnom}{b}{n}{ + <-> ssub * Montserrat-Dnom/bold/n }{} \DeclareFontShape{OT1}{Montserrat-Dnom}{b}{sl}{ - <-> ssub * Montserrat-Dnom/b/it + <-> ssub * Montserrat-Dnom/bold/sl }{} -\DeclareFontShape{OT1}{Montserrat-Dnom}{bx}{n}{ - <-> ssub * Montserrat-Dnom/b/n + +% eb --> extrabold + +\DeclareFontShape{OT1}{Montserrat-Dnom}{eb}{sl}{ + <-> ssub * Montserrat-Dnom/extrabold/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-Dnom}{eb}{n}{ + <-> ssub * Montserrat-Dnom/extrabold/n +}{} + +\DeclareFontShape{OT1}{Montserrat-Dnom}{eb}{it}{ + <-> ssub * Montserrat-Dnom/extrabold/it +}{} + + +% ub --> black + +\DeclareFontShape{OT1}{Montserrat-Dnom}{ub}{sl}{ + <-> ssub * Montserrat-Dnom/black/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-Dnom}{ub}{n}{ + <-> ssub * Montserrat-Dnom/black/n +}{} + +\DeclareFontShape{OT1}{Montserrat-Dnom}{ub}{it}{ + <-> ssub * Montserrat-Dnom/black/it }{} \DeclareFontShape{OT1}{Montserrat-Dnom}{bx}{it}{ @@ -131,4 +292,8 @@ <-> ssub * Montserrat-Dnom/b/sl }{} +\DeclareFontShape{OT1}{Montserrat-Dnom}{bx}{n}{ + <-> ssub * Montserrat-Dnom/b/n +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Inf.fd b/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Inf.fd index c018344a02c..208f9621a93 100644 --- a/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Inf.fd +++ b/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{OT1Montserrat-Inf.fd} - [2017/01/25 (autoinst) Font definitions for OT1/Montserrat-Inf.] + [2019/10/18 (autoinst) Font definitions for OT1/Montserrat-Inf.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,112 +11,277 @@ \DeclareFontFamily{OT1}{Montserrat-Inf}{} -\DeclareFontShape{OT1}{Montserrat-Inf}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-inf-ot1 + +% ---- thin ---- + +\DeclareFontShape{OT1}{Montserrat-Inf}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-inf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-inf-ot1 +\DeclareFontShape{OT1}{Montserrat-Inf}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{b}{sl}{ - <-> ssub * Montserrat-Inf/b/it +\DeclareFontShape{OT1}{Montserrat-Inf}{thin}{sl}{ + <-> ssub * Montserrat-Inf/thin/it }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{eb}{it}{ + +% ---- extrabold ---- + +\DeclareFontShape{OT1}{Montserrat-Inf}{extrabold}{it}{ <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{eb}{n}{ +\DeclareFontShape{OT1}{Montserrat-Inf}{extrabold}{n}{ <-> \Montserrat@@scale Montserrat-ExtraBold-inf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{eb}{sl}{ - <-> ssub * Montserrat-Inf/eb/it +\DeclareFontShape{OT1}{Montserrat-Inf}{extrabold}{sl}{ + <-> ssub * Montserrat-Inf/extrabold/it }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-inf-ot1 + +% ---- medium ---- + +\DeclareFontShape{OT1}{Montserrat-Inf}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-inf-ot1 +\DeclareFontShape{OT1}{Montserrat-Inf}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-inf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{k}{sl}{ - <-> ssub * Montserrat-Inf/k/it +\DeclareFontShape{OT1}{Montserrat-Inf}{medium}{sl}{ + <-> ssub * Montserrat-Inf/medium/it }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-inf-ot1 + +% ---- light ---- + +\DeclareFontShape{OT1}{Montserrat-Inf}{light}{it}{ + <-> \Montserrat@@scale Montserrat-LightItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{el}{n}{ +\DeclareFontShape{OT1}{Montserrat-Inf}{light}{n}{ + <-> \Montserrat@@scale Montserrat-Light-inf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Inf}{light}{sl}{ + <-> ssub * Montserrat-Inf/light/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{OT1}{Montserrat-Inf}{extralight}{n}{ <-> \Montserrat@@scale Montserrat-ExtraLight-inf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{el}{sl}{ - <-> ssub * Montserrat-Inf/el/it +\DeclareFontShape{OT1}{Montserrat-Inf}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-inf-ot1 +\DeclareFontShape{OT1}{Montserrat-Inf}{extralight}{sl}{ + <-> ssub * Montserrat-Inf/extralight/it }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-inf-ot1 + +% ---- black ---- + +\DeclareFontShape{OT1}{Montserrat-Inf}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{t}{sl}{ - <-> ssub * Montserrat-Inf/t/it +\DeclareFontShape{OT1}{Montserrat-Inf}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-inf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-inf-ot1 +\DeclareFontShape{OT1}{Montserrat-Inf}{black}{sl}{ + <-> ssub * Montserrat-Inf/black/it }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{sb}{it}{ + +% ---- regular ---- + +\DeclareFontShape{OT1}{Montserrat-Inf}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-inf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Inf}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-inf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Inf}{regular}{sl}{ + <-> ssub * Montserrat-Inf/regular/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{OT1}{Montserrat-Inf}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-inf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Inf}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-inf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Inf}{bold}{sl}{ + <-> ssub * Montserrat-Inf/bold/it +}{} + + +% ---- semibold ---- + +\DeclareFontShape{OT1}{Montserrat-Inf}{semibold}{it}{ <-> \Montserrat@@scale Montserrat-SemiBoldItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{sb}{sl}{ - <-> ssub * Montserrat-Inf/sb/it +\DeclareFontShape{OT1}{Montserrat-Inf}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-inf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Inf}{semibold}{sl}{ + <-> ssub * Montserrat-Inf/semibold/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{OT1}{Montserrat-Inf}{ul}{it}{ + <-> ssub * Montserrat-Inf/thin/it }{} +\DeclareFontShape{OT1}{Montserrat-Inf}{ul}{n}{ + <-> ssub * Montserrat-Inf/thin/n +}{} + +\DeclareFontShape{OT1}{Montserrat-Inf}{ul}{sl}{ + <-> ssub * Montserrat-Inf/thin/sl +}{} + + +% el --> extralight + +\DeclareFontShape{OT1}{Montserrat-Inf}{el}{it}{ + <-> ssub * Montserrat-Inf/extralight/it +}{} + +\DeclareFontShape{OT1}{Montserrat-Inf}{el}{sl}{ + <-> ssub * Montserrat-Inf/extralight/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-Inf}{el}{n}{ + <-> ssub * Montserrat-Inf/extralight/n +}{} + + +% l --> light + \DeclareFontShape{OT1}{Montserrat-Inf}{l}{it}{ - <-> \Montserrat@@scale Montserrat-LightItalic-inf-ot1 + <-> ssub * Montserrat-Inf/light/it +}{} + +\DeclareFontShape{OT1}{Montserrat-Inf}{l}{sl}{ + <-> ssub * Montserrat-Inf/light/sl }{} \DeclareFontShape{OT1}{Montserrat-Inf}{l}{n}{ - <-> \Montserrat@@scale Montserrat-Light-inf-ot1 + <-> ssub * Montserrat-Inf/light/n }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{l}{sl}{ - <-> ssub * Montserrat-Inf/l/it + +% sl --> regular + +\DeclareFontShape{OT1}{Montserrat-Inf}{sl}{sl}{ + <-> ssub * Montserrat-Inf/regular/sl }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-inf-ot1 +\DeclareFontShape{OT1}{Montserrat-Inf}{sl}{n}{ + <-> ssub * Montserrat-Inf/regular/n }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-inf-ot1 +\DeclareFontShape{OT1}{Montserrat-Inf}{sl}{it}{ + <-> ssub * Montserrat-Inf/regular/it +}{} + + +% m --> medium + +\DeclareFontShape{OT1}{Montserrat-Inf}{m}{sl}{ + <-> ssub * Montserrat-Inf/medium/sl }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{mb}{sl}{ - <-> ssub * Montserrat-Inf/mb/it +\DeclareFontShape{OT1}{Montserrat-Inf}{m}{n}{ + <-> ssub * Montserrat-Inf/medium/n }{} \DeclareFontShape{OT1}{Montserrat-Inf}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-inf-ot1 + <-> ssub * Montserrat-Inf/medium/it }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-inf-ot1 + +% sb --> semibold + +\DeclareFontShape{OT1}{Montserrat-Inf}{sb}{it}{ + <-> ssub * Montserrat-Inf/semibold/it }{} -\DeclareFontShape{OT1}{Montserrat-Inf}{m}{sl}{ - <-> ssub * Montserrat-Inf/m/it +\DeclareFontShape{OT1}{Montserrat-Inf}{sb}{sl}{ + <-> ssub * Montserrat-Inf/semibold/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-Inf}{sb}{n}{ + <-> ssub * Montserrat-Inf/semibold/n +}{} + + +% b --> bold + +\DeclareFontShape{OT1}{Montserrat-Inf}{b}{it}{ + <-> ssub * Montserrat-Inf/bold/it +}{} + +\DeclareFontShape{OT1}{Montserrat-Inf}{b}{sl}{ + <-> ssub * Montserrat-Inf/bold/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-Inf}{b}{n}{ + <-> ssub * Montserrat-Inf/bold/n +}{} + + +% eb --> extrabold + +\DeclareFontShape{OT1}{Montserrat-Inf}{eb}{it}{ + <-> ssub * Montserrat-Inf/extrabold/it +}{} + +\DeclareFontShape{OT1}{Montserrat-Inf}{eb}{n}{ + <-> ssub * Montserrat-Inf/extrabold/n +}{} + +\DeclareFontShape{OT1}{Montserrat-Inf}{eb}{sl}{ + <-> ssub * Montserrat-Inf/extrabold/sl +}{} + + +% ub --> black + +\DeclareFontShape{OT1}{Montserrat-Inf}{ub}{n}{ + <-> ssub * Montserrat-Inf/black/n +}{} + +\DeclareFontShape{OT1}{Montserrat-Inf}{ub}{sl}{ + <-> ssub * Montserrat-Inf/black/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-Inf}{ub}{it}{ + <-> ssub * Montserrat-Inf/black/it }{} \DeclareFontShape{OT1}{Montserrat-Inf}{bx}{it}{ diff --git a/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-LF.fd b/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-LF.fd index fe982c87570..4faf2707ff9 100644 --- a/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-LF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{OT1Montserrat-LF.fd} - [2017/01/25 (autoinst) Font definitions for OT1/Montserrat-LF.] + [2019/10/18 (autoinst) Font definitions for OT1/Montserrat-LF.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,244 +11,517 @@ \DeclareFontFamily{OT1}{Montserrat-LF}{} -\DeclareFontShape{OT1}{Montserrat-LF}{k}{sc}{ - <-> \Montserrat@@scale Montserrat-Black-lf-sc-ot1 + +% ---- bold ---- + +\DeclareFontShape{OT1}{Montserrat-LF}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-lf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{bold}{scit}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-lf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-lf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{bold}{sc}{ + <-> \Montserrat@@scale Montserrat-Bold-lf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{bold}{sl}{ + <-> ssub * Montserrat-LF/bold/it +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{bold}{scsl}{ + <-> ssub * Montserrat-LF/bold/scit +}{} + + +% ---- semibold ---- + +\DeclareFontShape{OT1}{Montserrat-LF}{semibold}{scit}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{semibold}{it}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-lf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{k}{scit}{ +\DeclareFontShape{OT1}{Montserrat-LF}{semibold}{sc}{ + <-> \Montserrat@@scale Montserrat-SemiBold-lf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{semibold}{sl}{ + <-> ssub * Montserrat-LF/semibold/it +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{semibold}{scsl}{ + <-> ssub * Montserrat-LF/semibold/scit +}{} + + +% ---- black ---- + +\DeclareFontShape{OT1}{Montserrat-LF}{black}{scit}{ <-> \Montserrat@@scale Montserrat-BlackItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{k}{n}{ +\DeclareFontShape{OT1}{Montserrat-LF}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-lf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{black}{sc}{ + <-> \Montserrat@@scale Montserrat-Black-lf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{black}{n}{ <-> \Montserrat@@scale Montserrat-Black-lf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-lf-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{black}{sl}{ + <-> ssub * Montserrat-LF/black/it }{} -\DeclareFontShape{OT1}{Montserrat-LF}{k}{scsl}{ - <-> ssub * Montserrat-LF/k/scit +\DeclareFontShape{OT1}{Montserrat-LF}{black}{scsl}{ + <-> ssub * Montserrat-LF/black/scit }{} -\DeclareFontShape{OT1}{Montserrat-LF}{k}{sl}{ - <-> ssub * Montserrat-LF/k/it + +% ---- regular ---- + +\DeclareFontShape{OT1}{Montserrat-LF}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-lf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{el}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-lf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{regular}{scit}{ + <-> \Montserrat@@scale Montserrat-Italic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{el}{scit}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{regular}{sc}{ + <-> \Montserrat@@scale Montserrat-Regular-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{el}{n}{ +\DeclareFontShape{OT1}{Montserrat-LF}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-lf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{regular}{sl}{ + <-> ssub * Montserrat-LF/regular/it +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{regular}{scsl}{ + <-> ssub * Montserrat-LF/regular/scit +}{} + + +% ---- extralight ---- + +\DeclareFontShape{OT1}{Montserrat-LF}{extralight}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-lf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{extralight}{n}{ <-> \Montserrat@@scale Montserrat-ExtraLight-lf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{el}{it}{ +\DeclareFontShape{OT1}{Montserrat-LF}{extralight}{scit}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{extralight}{it}{ <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{el}{scsl}{ - <-> ssub * Montserrat-LF/el/scit +\DeclareFontShape{OT1}{Montserrat-LF}{extralight}{sl}{ + <-> ssub * Montserrat-LF/extralight/it }{} -\DeclareFontShape{OT1}{Montserrat-LF}{el}{sl}{ - <-> ssub * Montserrat-LF/el/it +\DeclareFontShape{OT1}{Montserrat-LF}{extralight}{scsl}{ + <-> ssub * Montserrat-LF/extralight/scit }{} -\DeclareFontShape{OT1}{Montserrat-LF}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-ot1 + +% ---- light ---- + +\DeclareFontShape{OT1}{Montserrat-LF}{light}{scit}{ + <-> \Montserrat@@scale Montserrat-LightItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{eb}{scit}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{light}{it}{ + <-> \Montserrat@@scale Montserrat-LightItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-lf-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{light}{n}{ + <-> \Montserrat@@scale Montserrat-Light-lf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{eb}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-lf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{light}{sc}{ + <-> \Montserrat@@scale Montserrat-Light-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{eb}{scsl}{ - <-> ssub * Montserrat-LF/eb/scit +\DeclareFontShape{OT1}{Montserrat-LF}{light}{sl}{ + <-> ssub * Montserrat-LF/light/it }{} -\DeclareFontShape{OT1}{Montserrat-LF}{eb}{sl}{ - <-> ssub * Montserrat-LF/eb/it +\DeclareFontShape{OT1}{Montserrat-LF}{light}{scsl}{ + <-> ssub * Montserrat-LF/light/scit }{} -\DeclareFontShape{OT1}{Montserrat-LF}{b}{scit}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-lf-sc-ot1 + +% ---- medium ---- + +\DeclareFontShape{OT1}{Montserrat-LF}{medium}{sc}{ + <-> \Montserrat@@scale Montserrat-Medium-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{b}{sc}{ - <-> \Montserrat@@scale Montserrat-Bold-lf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-lf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-lf-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-lf-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{medium}{scit}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{b}{scsl}{ - <-> ssub * Montserrat-LF/b/scit +\DeclareFontShape{OT1}{Montserrat-LF}{medium}{sl}{ + <-> ssub * Montserrat-LF/medium/it }{} -\DeclareFontShape{OT1}{Montserrat-LF}{b}{sl}{ - <-> ssub * Montserrat-LF/b/it +\DeclareFontShape{OT1}{Montserrat-LF}{medium}{scsl}{ + <-> ssub * Montserrat-LF/medium/scit }{} -\DeclareFontShape{OT1}{Montserrat-LF}{sb}{it}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-ot1 + +% ---- extrabold ---- + +\DeclareFontShape{OT1}{Montserrat-LF}{extrabold}{scit}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-lf-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{sb}{scit}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{extrabold}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{sb}{sc}{ - <-> \Montserrat@@scale Montserrat-SemiBold-lf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-lf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{sb}{scsl}{ - <-> ssub * Montserrat-LF/sb/scit +\DeclareFontShape{OT1}{Montserrat-LF}{extrabold}{sl}{ + <-> ssub * Montserrat-LF/extrabold/it }{} -\DeclareFontShape{OT1}{Montserrat-LF}{sb}{sl}{ - <-> ssub * Montserrat-LF/sb/it +\DeclareFontShape{OT1}{Montserrat-LF}{extrabold}{scsl}{ + <-> ssub * Montserrat-LF/extrabold/scit }{} -\DeclareFontShape{OT1}{Montserrat-LF}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-lf-ot1 + +% ---- thin ---- + +\DeclareFontShape{OT1}{Montserrat-LF}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{t}{scit}{ +\DeclareFontShape{OT1}{Montserrat-LF}{thin}{scit}{ <-> \Montserrat@@scale Montserrat-ThinItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{t}{sc}{ +\DeclareFontShape{OT1}{Montserrat-LF}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-lf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{thin}{sc}{ <-> \Montserrat@@scale Montserrat-Thin-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-LF}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-lf-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{thin}{sl}{ + <-> ssub * Montserrat-LF/thin/it }{} -\DeclareFontShape{OT1}{Montserrat-LF}{t}{scsl}{ - <-> ssub * Montserrat-LF/t/scit +\DeclareFontShape{OT1}{Montserrat-LF}{thin}{scsl}{ + <-> ssub * Montserrat-LF/thin/scit }{} -\DeclareFontShape{OT1}{Montserrat-LF}{t}{sl}{ - <-> ssub * Montserrat-LF/t/it +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{OT1}{Montserrat-LF}{ul}{n}{ + <-> ssub * Montserrat-LF/thin/n }{} -\DeclareFontShape{OT1}{Montserrat-LF}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-lf-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{ul}{sc}{ + <-> ssub * Montserrat-LF/thin/sc }{} -\DeclareFontShape{OT1}{Montserrat-LF}{m}{sc}{ - <-> \Montserrat@@scale Montserrat-Regular-lf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{ul}{scsl}{ + <-> ssub * Montserrat-LF/thin/scsl }{} -\DeclareFontShape{OT1}{Montserrat-LF}{m}{scit}{ - <-> \Montserrat@@scale Montserrat-Italic-lf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{ul}{sl}{ + <-> ssub * Montserrat-LF/thin/sl }{} -\DeclareFontShape{OT1}{Montserrat-LF}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-lf-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{ul}{it}{ + <-> ssub * Montserrat-LF/thin/it }{} -\DeclareFontShape{OT1}{Montserrat-LF}{m}{scsl}{ - <-> ssub * Montserrat-LF/m/scit +\DeclareFontShape{OT1}{Montserrat-LF}{ul}{scit}{ + <-> ssub * Montserrat-LF/thin/scit }{} -\DeclareFontShape{OT1}{Montserrat-LF}{m}{sl}{ - <-> ssub * Montserrat-LF/m/it + +% el --> extralight + +\DeclareFontShape{OT1}{Montserrat-LF}{el}{sl}{ + <-> ssub * Montserrat-LF/extralight/sl }{} -\DeclareFontShape{OT1}{Montserrat-LF}{l}{it}{ - <-> \Montserrat@@scale Montserrat-LightItalic-lf-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{el}{sc}{ + <-> ssub * Montserrat-LF/extralight/sc }{} -\DeclareFontShape{OT1}{Montserrat-LF}{l}{scit}{ - <-> \Montserrat@@scale Montserrat-LightItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{el}{n}{ + <-> ssub * Montserrat-LF/extralight/n }{} -\DeclareFontShape{OT1}{Montserrat-LF}{l}{sc}{ - <-> \Montserrat@@scale Montserrat-Light-lf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{el}{scsl}{ + <-> ssub * Montserrat-LF/extralight/scsl }{} +\DeclareFontShape{OT1}{Montserrat-LF}{el}{scit}{ + <-> ssub * Montserrat-LF/extralight/scit +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{el}{it}{ + <-> ssub * Montserrat-LF/extralight/it +}{} + + +% l --> light + \DeclareFontShape{OT1}{Montserrat-LF}{l}{n}{ - <-> \Montserrat@@scale Montserrat-Light-lf-ot1 + <-> ssub * Montserrat-LF/light/n +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{l}{sc}{ + <-> ssub * Montserrat-LF/light/sc }{} \DeclareFontShape{OT1}{Montserrat-LF}{l}{scsl}{ - <-> ssub * Montserrat-LF/l/scit + <-> ssub * Montserrat-LF/light/scsl }{} \DeclareFontShape{OT1}{Montserrat-LF}{l}{sl}{ - <-> ssub * Montserrat-LF/l/it + <-> ssub * Montserrat-LF/light/sl }{} -\DeclareFontShape{OT1}{Montserrat-LF}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-lf-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{l}{it}{ + <-> ssub * Montserrat-LF/light/it }{} -\DeclareFontShape{OT1}{Montserrat-LF}{mb}{scit}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{l}{scit}{ + <-> ssub * Montserrat-LF/light/scit }{} -\DeclareFontShape{OT1}{Montserrat-LF}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-lf-ot1 + +% sl --> regular + +\DeclareFontShape{OT1}{Montserrat-LF}{sl}{scsl}{ + <-> ssub * Montserrat-LF/regular/scsl }{} -\DeclareFontShape{OT1}{Montserrat-LF}{mb}{sc}{ - <-> \Montserrat@@scale Montserrat-Medium-lf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-LF}{sl}{sc}{ + <-> ssub * Montserrat-LF/regular/sc }{} -\DeclareFontShape{OT1}{Montserrat-LF}{mb}{scsl}{ - <-> ssub * Montserrat-LF/mb/scit +\DeclareFontShape{OT1}{Montserrat-LF}{sl}{n}{ + <-> ssub * Montserrat-LF/regular/n }{} -\DeclareFontShape{OT1}{Montserrat-LF}{mb}{sl}{ - <-> ssub * Montserrat-LF/mb/it +\DeclareFontShape{OT1}{Montserrat-LF}{sl}{sl}{ + <-> ssub * Montserrat-LF/regular/sl }{} -\DeclareFontShape{OT1}{Montserrat-LF}{bx}{it}{ - <-> ssub * Montserrat-LF/b/it +\DeclareFontShape{OT1}{Montserrat-LF}{sl}{it}{ + <-> ssub * Montserrat-LF/regular/it }{} -\DeclareFontShape{OT1}{Montserrat-LF}{bx}{sl}{ - <-> ssub * Montserrat-LF/b/sl +\DeclareFontShape{OT1}{Montserrat-LF}{sl}{scit}{ + <-> ssub * Montserrat-LF/regular/scit }{} -\DeclareFontShape{OT1}{Montserrat-LF}{bx}{scit}{ - <-> ssub * Montserrat-LF/b/scit + +% m --> medium + +\DeclareFontShape{OT1}{Montserrat-LF}{m}{scsl}{ + <-> ssub * Montserrat-LF/medium/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{m}{sc}{ + <-> ssub * Montserrat-LF/medium/sc +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{m}{n}{ + <-> ssub * Montserrat-LF/medium/n +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{m}{sl}{ + <-> ssub * Montserrat-LF/medium/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{m}{it}{ + <-> ssub * Montserrat-LF/medium/it +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{m}{scit}{ + <-> ssub * Montserrat-LF/medium/scit +}{} + + +% sb --> semibold + +\DeclareFontShape{OT1}{Montserrat-LF}{sb}{scit}{ + <-> ssub * Montserrat-LF/semibold/scit +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{sb}{it}{ + <-> ssub * Montserrat-LF/semibold/it +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{sb}{sl}{ + <-> ssub * Montserrat-LF/semibold/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{sb}{scsl}{ + <-> ssub * Montserrat-LF/semibold/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{sb}{n}{ + <-> ssub * Montserrat-LF/semibold/n +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{sb}{sc}{ + <-> ssub * Montserrat-LF/semibold/sc +}{} + + +% b --> bold + +\DeclareFontShape{OT1}{Montserrat-LF}{b}{n}{ + <-> ssub * Montserrat-LF/bold/n +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{b}{sc}{ + <-> ssub * Montserrat-LF/bold/sc +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{b}{scsl}{ + <-> ssub * Montserrat-LF/bold/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{b}{sl}{ + <-> ssub * Montserrat-LF/bold/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{b}{it}{ + <-> ssub * Montserrat-LF/bold/it +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{b}{scit}{ + <-> ssub * Montserrat-LF/bold/scit +}{} + + +% eb --> extrabold + +\DeclareFontShape{OT1}{Montserrat-LF}{eb}{it}{ + <-> ssub * Montserrat-LF/extrabold/it +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{eb}{scit}{ + <-> ssub * Montserrat-LF/extrabold/scit +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{eb}{sc}{ + <-> ssub * Montserrat-LF/extrabold/sc +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{eb}{n}{ + <-> ssub * Montserrat-LF/extrabold/n +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{eb}{scsl}{ + <-> ssub * Montserrat-LF/extrabold/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{eb}{sl}{ + <-> ssub * Montserrat-LF/extrabold/sl +}{} + + +% ub --> black + +\DeclareFontShape{OT1}{Montserrat-LF}{ub}{sl}{ + <-> ssub * Montserrat-LF/black/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{ub}{sc}{ + <-> ssub * Montserrat-LF/black/sc +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{ub}{n}{ + <-> ssub * Montserrat-LF/black/n +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{ub}{scsl}{ + <-> ssub * Montserrat-LF/black/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{ub}{scit}{ + <-> ssub * Montserrat-LF/black/scit +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{ub}{it}{ + <-> ssub * Montserrat-LF/black/it +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{bx}{sl}{ + <-> ssub * Montserrat-LF/b/sl }{} \DeclareFontShape{OT1}{Montserrat-LF}{bx}{scsl}{ <-> ssub * Montserrat-LF/b/scsl }{} +\DeclareFontShape{OT1}{Montserrat-LF}{bx}{n}{ + <-> ssub * Montserrat-LF/b/n +}{} + \DeclareFontShape{OT1}{Montserrat-LF}{bx}{sc}{ <-> ssub * Montserrat-LF/b/sc }{} -\DeclareFontShape{OT1}{Montserrat-LF}{bx}{n}{ - <-> ssub * Montserrat-LF/b/n +\DeclareFontShape{OT1}{Montserrat-LF}{bx}{scit}{ + <-> ssub * Montserrat-LF/b/scit +}{} + +\DeclareFontShape{OT1}{Montserrat-LF}{bx}{it}{ + <-> ssub * Montserrat-LF/b/it }{} \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Numr.fd b/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Numr.fd index 27af0cef5e5..dbde1dc62fd 100644 --- a/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Numr.fd +++ b/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Numr.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{OT1Montserrat-Numr.fd} - [2017/01/25 (autoinst) Font definitions for OT1/Montserrat-Numr.] + [2019/10/18 (autoinst) Font definitions for OT1/Montserrat-Numr.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,112 +11,281 @@ \DeclareFontFamily{OT1}{Montserrat-Numr}{} -\DeclareFontShape{OT1}{Montserrat-Numr}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-numr-ot1 + +% ---- extralight ---- + +\DeclareFontShape{OT1}{Montserrat-Numr}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-numr-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-numr-ot1 +\DeclareFontShape{OT1}{Montserrat-Numr}{extralight}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-numr-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{t}{sl}{ - <-> ssub * Montserrat-Numr/t/it +\DeclareFontShape{OT1}{Montserrat-Numr}{extralight}{sl}{ + <-> ssub * Montserrat-Numr/extralight/it }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{sb}{it}{ + +% ---- regular ---- + +\DeclareFontShape{OT1}{Montserrat-Numr}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-numr-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Numr}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-numr-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Numr}{regular}{sl}{ + <-> ssub * Montserrat-Numr/regular/it +}{} + + +% ---- black ---- + +\DeclareFontShape{OT1}{Montserrat-Numr}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-numr-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Numr}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-numr-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Numr}{black}{sl}{ + <-> ssub * Montserrat-Numr/black/it +}{} + + +% ---- semibold ---- + +\DeclareFontShape{OT1}{Montserrat-Numr}{semibold}{it}{ <-> \Montserrat@@scale Montserrat-SemiBoldItalic-numr-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{sb}{n}{ +\DeclareFontShape{OT1}{Montserrat-Numr}{semibold}{n}{ <-> \Montserrat@@scale Montserrat-SemiBold-numr-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{sb}{sl}{ - <-> ssub * Montserrat-Numr/sb/it +\DeclareFontShape{OT1}{Montserrat-Numr}{semibold}{sl}{ + <-> ssub * Montserrat-Numr/semibold/it }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{l}{it}{ + +% ---- bold ---- + +\DeclareFontShape{OT1}{Montserrat-Numr}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-numr-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Numr}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-numr-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Numr}{bold}{sl}{ + <-> ssub * Montserrat-Numr/bold/it +}{} + + +% ---- thin ---- + +\DeclareFontShape{OT1}{Montserrat-Numr}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-numr-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Numr}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-numr-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Numr}{thin}{sl}{ + <-> ssub * Montserrat-Numr/thin/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{OT1}{Montserrat-Numr}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-numr-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Numr}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-numr-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Numr}{extrabold}{sl}{ + <-> ssub * Montserrat-Numr/extrabold/it +}{} + + +% ---- light ---- + +\DeclareFontShape{OT1}{Montserrat-Numr}{light}{it}{ <-> \Montserrat@@scale Montserrat-LightItalic-numr-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{l}{n}{ +\DeclareFontShape{OT1}{Montserrat-Numr}{light}{n}{ <-> \Montserrat@@scale Montserrat-Light-numr-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{l}{sl}{ - <-> ssub * Montserrat-Numr/l/it +\DeclareFontShape{OT1}{Montserrat-Numr}{light}{sl}{ + <-> ssub * Montserrat-Numr/light/it }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{mb}{n}{ + +% ---- medium ---- + +\DeclareFontShape{OT1}{Montserrat-Numr}{medium}{n}{ <-> \Montserrat@@scale Montserrat-Medium-numr-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{mb}{it}{ +\DeclareFontShape{OT1}{Montserrat-Numr}{medium}{it}{ <-> \Montserrat@@scale Montserrat-MediumItalic-numr-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{mb}{sl}{ - <-> ssub * Montserrat-Numr/mb/it +\DeclareFontShape{OT1}{Montserrat-Numr}{medium}{sl}{ + <-> ssub * Montserrat-Numr/medium/it }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-numr-ot1 +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{OT1}{Montserrat-Numr}{ul}{sl}{ + <-> ssub * Montserrat-Numr/thin/sl }{} +\DeclareFontShape{OT1}{Montserrat-Numr}{ul}{n}{ + <-> ssub * Montserrat-Numr/thin/n +}{} + +\DeclareFontShape{OT1}{Montserrat-Numr}{ul}{it}{ + <-> ssub * Montserrat-Numr/thin/it +}{} + + +% el --> extralight + +\DeclareFontShape{OT1}{Montserrat-Numr}{el}{it}{ + <-> ssub * Montserrat-Numr/extralight/it +}{} + +\DeclareFontShape{OT1}{Montserrat-Numr}{el}{sl}{ + <-> ssub * Montserrat-Numr/extralight/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-Numr}{el}{n}{ + <-> ssub * Montserrat-Numr/extralight/n +}{} + + +% l --> light + +\DeclareFontShape{OT1}{Montserrat-Numr}{l}{it}{ + <-> ssub * Montserrat-Numr/light/it +}{} + +\DeclareFontShape{OT1}{Montserrat-Numr}{l}{sl}{ + <-> ssub * Montserrat-Numr/light/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-Numr}{l}{n}{ + <-> ssub * Montserrat-Numr/light/n +}{} + + +% sl --> regular + +\DeclareFontShape{OT1}{Montserrat-Numr}{sl}{it}{ + <-> ssub * Montserrat-Numr/regular/it +}{} + +\DeclareFontShape{OT1}{Montserrat-Numr}{sl}{sl}{ + <-> ssub * Montserrat-Numr/regular/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-Numr}{sl}{n}{ + <-> ssub * Montserrat-Numr/regular/n +}{} + + +% m --> medium + \DeclareFontShape{OT1}{Montserrat-Numr}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-numr-ot1 + <-> ssub * Montserrat-Numr/medium/it }{} \DeclareFontShape{OT1}{Montserrat-Numr}{m}{sl}{ - <-> ssub * Montserrat-Numr/m/it + <-> ssub * Montserrat-Numr/medium/sl }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-numr-ot1 +\DeclareFontShape{OT1}{Montserrat-Numr}{m}{n}{ + <-> ssub * Montserrat-Numr/medium/n +}{} + + +% sb --> semibold + +\DeclareFontShape{OT1}{Montserrat-Numr}{sb}{n}{ + <-> ssub * Montserrat-Numr/semibold/n +}{} + +\DeclareFontShape{OT1}{Montserrat-Numr}{sb}{sl}{ + <-> ssub * Montserrat-Numr/semibold/sl }{} +\DeclareFontShape{OT1}{Montserrat-Numr}{sb}{it}{ + <-> ssub * Montserrat-Numr/semibold/it +}{} + + +% b --> bold + \DeclareFontShape{OT1}{Montserrat-Numr}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-numr-ot1 + <-> ssub * Montserrat-Numr/bold/it }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{b}{sl}{ - <-> ssub * Montserrat-Numr/b/it +\DeclareFontShape{OT1}{Montserrat-Numr}{b}{n}{ + <-> ssub * Montserrat-Numr/bold/n }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-numr-ot1 +\DeclareFontShape{OT1}{Montserrat-Numr}{b}{sl}{ + <-> ssub * Montserrat-Numr/bold/sl }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-numr-ot1 + +% eb --> extrabold + +\DeclareFontShape{OT1}{Montserrat-Numr}{eb}{it}{ + <-> ssub * Montserrat-Numr/extrabold/it }{} \DeclareFontShape{OT1}{Montserrat-Numr}{eb}{sl}{ - <-> ssub * Montserrat-Numr/eb/it + <-> ssub * Montserrat-Numr/extrabold/sl }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-numr-ot1 +\DeclareFontShape{OT1}{Montserrat-Numr}{eb}{n}{ + <-> ssub * Montserrat-Numr/extrabold/n }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-numr-ot1 -}{} -\DeclareFontShape{OT1}{Montserrat-Numr}{k}{sl}{ - <-> ssub * Montserrat-Numr/k/it +% ub --> black + +\DeclareFontShape{OT1}{Montserrat-Numr}{ub}{it}{ + <-> ssub * Montserrat-Numr/black/it }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{el}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-numr-ot1 +\DeclareFontShape{OT1}{Montserrat-Numr}{ub}{sl}{ + <-> ssub * Montserrat-Numr/black/sl }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-numr-ot1 +\DeclareFontShape{OT1}{Montserrat-Numr}{ub}{n}{ + <-> ssub * Montserrat-Numr/black/n }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{el}{sl}{ - <-> ssub * Montserrat-Numr/el/it +\DeclareFontShape{OT1}{Montserrat-Numr}{bx}{n}{ + <-> ssub * Montserrat-Numr/b/n }{} \DeclareFontShape{OT1}{Montserrat-Numr}{bx}{sl}{ @@ -127,8 +296,4 @@ <-> ssub * Montserrat-Numr/b/it }{} -\DeclareFontShape{OT1}{Montserrat-Numr}{bx}{n}{ - <-> ssub * Montserrat-Numr/b/n -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-OsF.fd b/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-OsF.fd index d16a86f9e15..95e017aa95f 100644 --- a/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-OsF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{OT1Montserrat-OsF.fd} - [2017/01/25 (autoinst) Font definitions for OT1/Montserrat-OsF.] + [2019/10/18 (autoinst) Font definitions for OT1/Montserrat-OsF.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,228 +11,497 @@ \DeclareFontFamily{OT1}{Montserrat-OsF}{} -\DeclareFontShape{OT1}{Montserrat-OsF}{b}{sc}{ - <-> \Montserrat@@scale Montserrat-Bold-osf-sc-ot1 + +% ---- medium ---- + +\DeclareFontShape{OT1}{Montserrat-OsF}{medium}{scit}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{b}{scit}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-osf-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-osf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-osf-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{medium}{sc}{ + <-> \Montserrat@@scale Montserrat-Medium-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{b}{scsl}{ - <-> ssub * Montserrat-OsF/b/scit +\DeclareFontShape{OT1}{Montserrat-OsF}{medium}{sl}{ + <-> ssub * Montserrat-OsF/medium/it }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{b}{sl}{ - <-> ssub * Montserrat-OsF/b/it +\DeclareFontShape{OT1}{Montserrat-OsF}{medium}{scsl}{ + <-> ssub * Montserrat-OsF/medium/scit }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{eb}{scit}{ + +% ---- light ---- + +\DeclareFontShape{OT1}{Montserrat-OsF}{light}{n}{ + <-> \Montserrat@@scale Montserrat-Light-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{light}{sc}{ + <-> \Montserrat@@scale Montserrat-Light-osf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{light}{it}{ + <-> \Montserrat@@scale Montserrat-LightItalic-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{light}{scit}{ + <-> \Montserrat@@scale Montserrat-LightItalic-osf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{light}{sl}{ + <-> ssub * Montserrat-OsF/light/it +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{light}{scsl}{ + <-> ssub * Montserrat-OsF/light/scit +}{} + + +% ---- thin ---- + +\DeclareFontShape{OT1}{Montserrat-OsF}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{thin}{sc}{ + <-> \Montserrat@@scale Montserrat-Thin-osf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{thin}{scit}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-osf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{thin}{sl}{ + <-> ssub * Montserrat-OsF/thin/it +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{thin}{scsl}{ + <-> ssub * Montserrat-OsF/thin/scit +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{OT1}{Montserrat-OsF}{extrabold}{scit}{ <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{eb}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-osf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{eb}{n}{ +\DeclareFontShape{OT1}{Montserrat-OsF}{extrabold}{n}{ <-> \Montserrat@@scale Montserrat-ExtraBold-osf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{extrabold}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{eb}{scsl}{ - <-> ssub * Montserrat-OsF/eb/scit +\DeclareFontShape{OT1}{Montserrat-OsF}{extrabold}{sl}{ + <-> ssub * Montserrat-OsF/extrabold/it }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{eb}{sl}{ - <-> ssub * Montserrat-OsF/eb/it +\DeclareFontShape{OT1}{Montserrat-OsF}{extrabold}{scsl}{ + <-> ssub * Montserrat-OsF/extrabold/scit }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{k}{scit}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-osf-sc-ot1 + +% ---- semibold ---- + +\DeclareFontShape{OT1}{Montserrat-OsF}{semibold}{sc}{ + <-> \Montserrat@@scale Montserrat-SemiBold-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{k}{sc}{ - <-> \Montserrat@@scale Montserrat-Black-osf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-osf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-osf-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{semibold}{scit}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-osf-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{semibold}{it}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{k}{scsl}{ - <-> ssub * Montserrat-OsF/k/scit +\DeclareFontShape{OT1}{Montserrat-OsF}{semibold}{sl}{ + <-> ssub * Montserrat-OsF/semibold/it }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{k}{sl}{ - <-> ssub * Montserrat-OsF/k/it +\DeclareFontShape{OT1}{Montserrat-OsF}{semibold}{scsl}{ + <-> ssub * Montserrat-OsF/semibold/scit }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{el}{it}{ + +% ---- bold ---- + +\DeclareFontShape{OT1}{Montserrat-OsF}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{bold}{sc}{ + <-> \Montserrat@@scale Montserrat-Bold-osf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{bold}{scit}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-osf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{bold}{sl}{ + <-> ssub * Montserrat-OsF/bold/it +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{bold}{scsl}{ + <-> ssub * Montserrat-OsF/bold/scit +}{} + + +% ---- extralight ---- + +\DeclareFontShape{OT1}{Montserrat-OsF}{extralight}{it}{ <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{el}{scit}{ +\DeclareFontShape{OT1}{Montserrat-OsF}{extralight}{scit}{ <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{el}{sc}{ +\DeclareFontShape{OT1}{Montserrat-OsF}{extralight}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{extralight}{sc}{ <-> \Montserrat@@scale Montserrat-ExtraLight-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{el}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-osf-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{extralight}{sl}{ + <-> ssub * Montserrat-OsF/extralight/it }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{el}{scsl}{ - <-> ssub * Montserrat-OsF/el/scit +\DeclareFontShape{OT1}{Montserrat-OsF}{extralight}{scsl}{ + <-> ssub * Montserrat-OsF/extralight/scit }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{el}{sl}{ - <-> ssub * Montserrat-OsF/el/it + +% ---- regular ---- + +\DeclareFontShape{OT1}{Montserrat-OsF}{regular}{scit}{ + <-> \Montserrat@@scale Montserrat-Italic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{t}{sc}{ - <-> \Montserrat@@scale Montserrat-Thin-osf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-osf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{t}{scit}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-osf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-osf-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{regular}{sc}{ + <-> \Montserrat@@scale Montserrat-Regular-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-osf-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{regular}{sl}{ + <-> ssub * Montserrat-OsF/regular/it }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{t}{scsl}{ - <-> ssub * Montserrat-OsF/t/scit +\DeclareFontShape{OT1}{Montserrat-OsF}{regular}{scsl}{ + <-> ssub * Montserrat-OsF/regular/scit }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{t}{sl}{ - <-> ssub * Montserrat-OsF/t/it + +% ---- black ---- + +\DeclareFontShape{OT1}{Montserrat-OsF}{black}{sc}{ + <-> \Montserrat@@scale Montserrat-Black-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{it}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-osf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{scit}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{sc}{ - <-> \Montserrat@@scale Montserrat-SemiBold-osf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{black}{scit}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-osf-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{black}{sl}{ + <-> ssub * Montserrat-OsF/black/it }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{scsl}{ - <-> ssub * Montserrat-OsF/sb/scit +\DeclareFontShape{OT1}{Montserrat-OsF}{black}{scsl}{ + <-> ssub * Montserrat-OsF/black/scit }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{sl}{ - <-> ssub * Montserrat-OsF/sb/it +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{OT1}{Montserrat-OsF}{ul}{n}{ + <-> ssub * Montserrat-OsF/thin/n }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{l}{sc}{ - <-> \Montserrat@@scale Montserrat-Light-osf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{ul}{sc}{ + <-> ssub * Montserrat-OsF/thin/sc }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{l}{scit}{ - <-> \Montserrat@@scale Montserrat-LightItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{ul}{scsl}{ + <-> ssub * Montserrat-OsF/thin/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{ul}{sl}{ + <-> ssub * Montserrat-OsF/thin/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{ul}{it}{ + <-> ssub * Montserrat-OsF/thin/it +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{ul}{scit}{ + <-> ssub * Montserrat-OsF/thin/scit +}{} + + +% el --> extralight + +\DeclareFontShape{OT1}{Montserrat-OsF}{el}{sl}{ + <-> ssub * Montserrat-OsF/extralight/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{el}{n}{ + <-> ssub * Montserrat-OsF/extralight/n +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{el}{sc}{ + <-> ssub * Montserrat-OsF/extralight/sc +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{el}{scsl}{ + <-> ssub * Montserrat-OsF/extralight/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{el}{scit}{ + <-> ssub * Montserrat-OsF/extralight/scit }{} +\DeclareFontShape{OT1}{Montserrat-OsF}{el}{it}{ + <-> ssub * Montserrat-OsF/extralight/it +}{} + + +% l --> light + \DeclareFontShape{OT1}{Montserrat-OsF}{l}{n}{ - <-> \Montserrat@@scale Montserrat-Light-osf-ot1 + <-> ssub * Montserrat-OsF/light/n }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{l}{it}{ - <-> \Montserrat@@scale Montserrat-LightItalic-osf-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{l}{sc}{ + <-> ssub * Montserrat-OsF/light/sc }{} \DeclareFontShape{OT1}{Montserrat-OsF}{l}{scsl}{ - <-> ssub * Montserrat-OsF/l/scit + <-> ssub * Montserrat-OsF/light/scsl }{} \DeclareFontShape{OT1}{Montserrat-OsF}{l}{sl}{ - <-> ssub * Montserrat-OsF/l/it + <-> ssub * Montserrat-OsF/light/sl }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-osf-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{l}{it}{ + <-> ssub * Montserrat-OsF/light/it }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{mb}{scit}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{l}{scit}{ + <-> ssub * Montserrat-OsF/light/scit }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{mb}{sc}{ - <-> \Montserrat@@scale Montserrat-Medium-osf-sc-ot1 + +% sl --> regular + +\DeclareFontShape{OT1}{Montserrat-OsF}{sl}{scit}{ + <-> ssub * Montserrat-OsF/regular/scit }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-osf-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{sl}{it}{ + <-> ssub * Montserrat-OsF/regular/it }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{mb}{scsl}{ - <-> ssub * Montserrat-OsF/mb/scit +\DeclareFontShape{OT1}{Montserrat-OsF}{sl}{sl}{ + <-> ssub * Montserrat-OsF/regular/sl }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{mb}{sl}{ - <-> ssub * Montserrat-OsF/mb/it +\DeclareFontShape{OT1}{Montserrat-OsF}{sl}{scsl}{ + <-> ssub * Montserrat-OsF/regular/scsl }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-osf-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{sl}{n}{ + <-> ssub * Montserrat-OsF/regular/n }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{m}{scit}{ - <-> \Montserrat@@scale Montserrat-Italic-osf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-OsF}{sl}{sc}{ + <-> ssub * Montserrat-OsF/regular/sc }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{m}{sc}{ - <-> \Montserrat@@scale Montserrat-Regular-osf-sc-ot1 + +% m --> medium + +\DeclareFontShape{OT1}{Montserrat-OsF}{m}{sl}{ + <-> ssub * Montserrat-OsF/medium/sl }{} \DeclareFontShape{OT1}{Montserrat-OsF}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-osf-ot1 + <-> ssub * Montserrat-OsF/medium/n +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{m}{sc}{ + <-> ssub * Montserrat-OsF/medium/sc }{} \DeclareFontShape{OT1}{Montserrat-OsF}{m}{scsl}{ - <-> ssub * Montserrat-OsF/m/scit + <-> ssub * Montserrat-OsF/medium/scsl }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{m}{sl}{ - <-> ssub * Montserrat-OsF/m/it +\DeclareFontShape{OT1}{Montserrat-OsF}{m}{scit}{ + <-> ssub * Montserrat-OsF/medium/scit }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{bx}{sc}{ - <-> ssub * Montserrat-OsF/b/sc +\DeclareFontShape{OT1}{Montserrat-OsF}{m}{it}{ + <-> ssub * Montserrat-OsF/medium/it }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{bx}{scsl}{ - <-> ssub * Montserrat-OsF/b/scsl + +% sb --> semibold + +\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{scit}{ + <-> ssub * Montserrat-OsF/semibold/scit +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{it}{ + <-> ssub * Montserrat-OsF/semibold/it +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{sl}{ + <-> ssub * Montserrat-OsF/semibold/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{sc}{ + <-> ssub * Montserrat-OsF/semibold/sc +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{n}{ + <-> ssub * Montserrat-OsF/semibold/n +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{scsl}{ + <-> ssub * Montserrat-OsF/semibold/scsl +}{} + + +% b --> bold + +\DeclareFontShape{OT1}{Montserrat-OsF}{b}{scsl}{ + <-> ssub * Montserrat-OsF/bold/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{b}{n}{ + <-> ssub * Montserrat-OsF/bold/n +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{b}{sc}{ + <-> ssub * Montserrat-OsF/bold/sc +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{b}{sl}{ + <-> ssub * Montserrat-OsF/bold/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{b}{it}{ + <-> ssub * Montserrat-OsF/bold/it +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{b}{scit}{ + <-> ssub * Montserrat-OsF/bold/scit +}{} + + +% eb --> extrabold + +\DeclareFontShape{OT1}{Montserrat-OsF}{eb}{scit}{ + <-> ssub * Montserrat-OsF/extrabold/scit +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{eb}{it}{ + <-> ssub * Montserrat-OsF/extrabold/it +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{eb}{sl}{ + <-> ssub * Montserrat-OsF/extrabold/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{eb}{n}{ + <-> ssub * Montserrat-OsF/extrabold/n +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{eb}{sc}{ + <-> ssub * Montserrat-OsF/extrabold/sc +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{eb}{scsl}{ + <-> ssub * Montserrat-OsF/extrabold/scsl +}{} + + +% ub --> black + +\DeclareFontShape{OT1}{Montserrat-OsF}{ub}{sl}{ + <-> ssub * Montserrat-OsF/black/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{ub}{scsl}{ + <-> ssub * Montserrat-OsF/black/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{ub}{sc}{ + <-> ssub * Montserrat-OsF/black/sc +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{ub}{n}{ + <-> ssub * Montserrat-OsF/black/n +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{ub}{scit}{ + <-> ssub * Montserrat-OsF/black/scit +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{ub}{it}{ + <-> ssub * Montserrat-OsF/black/it +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{bx}{it}{ + <-> ssub * Montserrat-OsF/b/it }{} \DeclareFontShape{OT1}{Montserrat-OsF}{bx}{scit}{ @@ -243,12 +512,16 @@ <-> ssub * Montserrat-OsF/b/n }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{bx}{sl}{ - <-> ssub * Montserrat-OsF/b/sl +\DeclareFontShape{OT1}{Montserrat-OsF}{bx}{sc}{ + <-> ssub * Montserrat-OsF/b/sc }{} -\DeclareFontShape{OT1}{Montserrat-OsF}{bx}{it}{ - <-> ssub * Montserrat-OsF/b/it +\DeclareFontShape{OT1}{Montserrat-OsF}{bx}{scsl}{ + <-> ssub * Montserrat-OsF/b/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-OsF}{bx}{sl}{ + <-> ssub * Montserrat-OsF/b/sl }{} \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Sup.fd b/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Sup.fd index 7ad3cf6db9f..b0c88156eec 100644 --- a/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Sup.fd +++ b/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{OT1Montserrat-Sup.fd} - [2017/01/25 (autoinst) Font definitions for OT1/Montserrat-Sup.] + [2019/10/18 (autoinst) Font definitions for OT1/Montserrat-Sup.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,112 +11,277 @@ \DeclareFontFamily{OT1}{Montserrat-Sup}{} -\DeclareFontShape{OT1}{Montserrat-Sup}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-sup-ot1 -}{} - -\DeclareFontShape{OT1}{Montserrat-Sup}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-sup-ot1 -}{} -\DeclareFontShape{OT1}{Montserrat-Sup}{k}{sl}{ - <-> ssub * Montserrat-Sup/k/it -}{} +% ---- extralight ---- -\DeclareFontShape{OT1}{Montserrat-Sup}{el}{it}{ +\DeclareFontShape{OT1}{Montserrat-Sup}{extralight}{it}{ <-> \Montserrat@@scale Montserrat-ExtraLightItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{el}{n}{ +\DeclareFontShape{OT1}{Montserrat-Sup}{extralight}{n}{ <-> \Montserrat@@scale Montserrat-ExtraLight-sup-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{el}{sl}{ - <-> ssub * Montserrat-Sup/el/it +\DeclareFontShape{OT1}{Montserrat-Sup}{extralight}{sl}{ + <-> ssub * Montserrat-Sup/extralight/it }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-sup-ot1 + +% ---- regular ---- + +\DeclareFontShape{OT1}{Montserrat-Sup}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-sup-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-sup-ot1 +\DeclareFontShape{OT1}{Montserrat-Sup}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-sup-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{eb}{sl}{ - <-> ssub * Montserrat-Sup/eb/it +\DeclareFontShape{OT1}{Montserrat-Sup}{regular}{sl}{ + <-> ssub * Montserrat-Sup/regular/it }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-sup-ot1 + +% ---- black ---- + +\DeclareFontShape{OT1}{Montserrat-Sup}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-sup-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-sup-ot1 +\DeclareFontShape{OT1}{Montserrat-Sup}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{b}{sl}{ - <-> ssub * Montserrat-Sup/b/it +\DeclareFontShape{OT1}{Montserrat-Sup}{black}{sl}{ + <-> ssub * Montserrat-Sup/black/it }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{sb}{n}{ + +% ---- semibold ---- + +\DeclareFontShape{OT1}{Montserrat-Sup}{semibold}{n}{ <-> \Montserrat@@scale Montserrat-SemiBold-sup-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{sb}{it}{ +\DeclareFontShape{OT1}{Montserrat-Sup}{semibold}{it}{ <-> \Montserrat@@scale Montserrat-SemiBoldItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{sb}{sl}{ - <-> ssub * Montserrat-Sup/sb/it +\DeclareFontShape{OT1}{Montserrat-Sup}{semibold}{sl}{ + <-> ssub * Montserrat-Sup/semibold/it }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{t}{it}{ + +% ---- bold ---- + +\DeclareFontShape{OT1}{Montserrat-Sup}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-sup-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Sup}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Sup}{bold}{sl}{ + <-> ssub * Montserrat-Sup/bold/it +}{} + + +% ---- thin ---- + +\DeclareFontShape{OT1}{Montserrat-Sup}{thin}{it}{ <-> \Montserrat@@scale Montserrat-ThinItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{t}{n}{ +\DeclareFontShape{OT1}{Montserrat-Sup}{thin}{n}{ <-> \Montserrat@@scale Montserrat-Thin-sup-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{t}{sl}{ - <-> ssub * Montserrat-Sup/t/it +\DeclareFontShape{OT1}{Montserrat-Sup}{thin}{sl}{ + <-> ssub * Montserrat-Sup/thin/it }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-sup-ot1 + +% ---- extrabold ---- + +\DeclareFontShape{OT1}{Montserrat-Sup}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-sup-ot1 +\DeclareFontShape{OT1}{Montserrat-Sup}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-sup-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{m}{sl}{ - <-> ssub * Montserrat-Sup/m/it +\DeclareFontShape{OT1}{Montserrat-Sup}{extrabold}{sl}{ + <-> ssub * Montserrat-Sup/extrabold/it }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{l}{n}{ + +% ---- medium ---- + +\DeclareFontShape{OT1}{Montserrat-Sup}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-sup-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Sup}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-Sup}{medium}{sl}{ + <-> ssub * Montserrat-Sup/medium/it +}{} + + +% ---- light ---- + +\DeclareFontShape{OT1}{Montserrat-Sup}{light}{n}{ <-> \Montserrat@@scale Montserrat-Light-sup-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{l}{it}{ +\DeclareFontShape{OT1}{Montserrat-Sup}{light}{it}{ <-> \Montserrat@@scale Montserrat-LightItalic-sup-ot1 }{} +\DeclareFontShape{OT1}{Montserrat-Sup}{light}{sl}{ + <-> ssub * Montserrat-Sup/light/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{OT1}{Montserrat-Sup}{ul}{it}{ + <-> ssub * Montserrat-Sup/thin/it +}{} + +\DeclareFontShape{OT1}{Montserrat-Sup}{ul}{n}{ + <-> ssub * Montserrat-Sup/thin/n +}{} + +\DeclareFontShape{OT1}{Montserrat-Sup}{ul}{sl}{ + <-> ssub * Montserrat-Sup/thin/sl +}{} + + +% el --> extralight + +\DeclareFontShape{OT1}{Montserrat-Sup}{el}{n}{ + <-> ssub * Montserrat-Sup/extralight/n +}{} + +\DeclareFontShape{OT1}{Montserrat-Sup}{el}{sl}{ + <-> ssub * Montserrat-Sup/extralight/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-Sup}{el}{it}{ + <-> ssub * Montserrat-Sup/extralight/it +}{} + + +% l --> light + +\DeclareFontShape{OT1}{Montserrat-Sup}{l}{it}{ + <-> ssub * Montserrat-Sup/light/it +}{} + \DeclareFontShape{OT1}{Montserrat-Sup}{l}{sl}{ - <-> ssub * Montserrat-Sup/l/it + <-> ssub * Montserrat-Sup/light/sl }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-sup-ot1 +\DeclareFontShape{OT1}{Montserrat-Sup}{l}{n}{ + <-> ssub * Montserrat-Sup/light/n }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-sup-ot1 + +% sl --> regular + +\DeclareFontShape{OT1}{Montserrat-Sup}{sl}{sl}{ + <-> ssub * Montserrat-Sup/regular/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-Sup}{sl}{n}{ + <-> ssub * Montserrat-Sup/regular/n +}{} + +\DeclareFontShape{OT1}{Montserrat-Sup}{sl}{it}{ + <-> ssub * Montserrat-Sup/regular/it +}{} + + +% m --> medium + +\DeclareFontShape{OT1}{Montserrat-Sup}{m}{sl}{ + <-> ssub * Montserrat-Sup/medium/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-Sup}{m}{n}{ + <-> ssub * Montserrat-Sup/medium/n +}{} + +\DeclareFontShape{OT1}{Montserrat-Sup}{m}{it}{ + <-> ssub * Montserrat-Sup/medium/it +}{} + + +% sb --> semibold + +\DeclareFontShape{OT1}{Montserrat-Sup}{sb}{n}{ + <-> ssub * Montserrat-Sup/semibold/n +}{} + +\DeclareFontShape{OT1}{Montserrat-Sup}{sb}{sl}{ + <-> ssub * Montserrat-Sup/semibold/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-Sup}{sb}{it}{ + <-> ssub * Montserrat-Sup/semibold/it +}{} + + +% b --> bold + +\DeclareFontShape{OT1}{Montserrat-Sup}{b}{it}{ + <-> ssub * Montserrat-Sup/bold/it +}{} + +\DeclareFontShape{OT1}{Montserrat-Sup}{b}{n}{ + <-> ssub * Montserrat-Sup/bold/n +}{} + +\DeclareFontShape{OT1}{Montserrat-Sup}{b}{sl}{ + <-> ssub * Montserrat-Sup/bold/sl +}{} + + +% eb --> extrabold + +\DeclareFontShape{OT1}{Montserrat-Sup}{eb}{it}{ + <-> ssub * Montserrat-Sup/extrabold/it +}{} + +\DeclareFontShape{OT1}{Montserrat-Sup}{eb}{n}{ + <-> ssub * Montserrat-Sup/extrabold/n +}{} + +\DeclareFontShape{OT1}{Montserrat-Sup}{eb}{sl}{ + <-> ssub * Montserrat-Sup/extrabold/sl +}{} + + +% ub --> black + +\DeclareFontShape{OT1}{Montserrat-Sup}{ub}{it}{ + <-> ssub * Montserrat-Sup/black/it +}{} + +\DeclareFontShape{OT1}{Montserrat-Sup}{ub}{sl}{ + <-> ssub * Montserrat-Sup/black/sl }{} -\DeclareFontShape{OT1}{Montserrat-Sup}{mb}{sl}{ - <-> ssub * Montserrat-Sup/mb/it +\DeclareFontShape{OT1}{Montserrat-Sup}{ub}{n}{ + <-> ssub * Montserrat-Sup/black/n }{} \DeclareFontShape{OT1}{Montserrat-Sup}{bx}{n}{ diff --git a/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-TLF.fd b/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-TLF.fd index 196765bfc9c..09794a7d262 100644 --- a/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-TLF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{OT1Montserrat-TLF.fd} - [2017/01/25 (autoinst) Font definitions for OT1/Montserrat-TLF.] + [2019/10/18 (autoinst) Font definitions for OT1/Montserrat-TLF.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,228 +11,497 @@ \DeclareFontFamily{OT1}{Montserrat-TLF}{} -\DeclareFontShape{OT1}{Montserrat-TLF}{el}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-sc-ot1 -}{} -\DeclareFontShape{OT1}{Montserrat-TLF}{el}{scit}{ +% ---- extralight ---- + +\DeclareFontShape{OT1}{Montserrat-TLF}{extralight}{scit}{ <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{el}{n}{ +\DeclareFontShape{OT1}{Montserrat-TLF}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{extralight}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{extralight}{n}{ <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-ot1 +\DeclareFontShape{OT1}{Montserrat-TLF}{extralight}{sl}{ + <-> ssub * Montserrat-TLF/extralight/it }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{el}{scsl}{ - <-> ssub * Montserrat-TLF/el/scit +\DeclareFontShape{OT1}{Montserrat-TLF}{extralight}{scsl}{ + <-> ssub * Montserrat-TLF/extralight/scit }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{el}{sl}{ - <-> ssub * Montserrat-TLF/el/it + +% ---- black ---- + +\DeclareFontShape{OT1}{Montserrat-TLF}{black}{scit}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{k}{it}{ +\DeclareFontShape{OT1}{Montserrat-TLF}{black}{it}{ <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{k}{sc}{ +\DeclareFontShape{OT1}{Montserrat-TLF}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{black}{sc}{ <-> \Montserrat@@scale Montserrat-Black-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{k}{scit}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-TLF}{black}{sl}{ + <-> ssub * Montserrat-TLF/black/it }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-tlf-ot1 +\DeclareFontShape{OT1}{Montserrat-TLF}{black}{scsl}{ + <-> ssub * Montserrat-TLF/black/scit }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{k}{scsl}{ - <-> ssub * Montserrat-TLF/k/scit + +% ---- regular ---- + +\DeclareFontShape{OT1}{Montserrat-TLF}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{k}{sl}{ - <-> ssub * Montserrat-TLF/k/it +\DeclareFontShape{OT1}{Montserrat-TLF}{regular}{scit}{ + <-> \Montserrat@@scale Montserrat-Italic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-ot1 +\DeclareFontShape{OT1}{Montserrat-TLF}{regular}{sc}{ + <-> \Montserrat@@scale Montserrat-Regular-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{b}{sc}{ - <-> \Montserrat@@scale Montserrat-Bold-tlf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-TLF}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-tlf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{b}{scit}{ +\DeclareFontShape{OT1}{Montserrat-TLF}{regular}{sl}{ + <-> ssub * Montserrat-TLF/regular/it +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{regular}{scsl}{ + <-> ssub * Montserrat-TLF/regular/scit +}{} + + +% ---- bold ---- + +\DeclareFontShape{OT1}{Montserrat-TLF}{bold}{scit}{ <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{b}{n}{ +\DeclareFontShape{OT1}{Montserrat-TLF}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{bold}{sc}{ + <-> \Montserrat@@scale Montserrat-Bold-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{bold}{n}{ <-> \Montserrat@@scale Montserrat-Bold-tlf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{b}{scsl}{ - <-> ssub * Montserrat-TLF/b/scit +\DeclareFontShape{OT1}{Montserrat-TLF}{bold}{sl}{ + <-> ssub * Montserrat-TLF/bold/it }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{b}{sl}{ - <-> ssub * Montserrat-TLF/b/it +\DeclareFontShape{OT1}{Montserrat-TLF}{bold}{scsl}{ + <-> ssub * Montserrat-TLF/bold/scit }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-ot1 + +% ---- semibold ---- + +\DeclareFontShape{OT1}{Montserrat-TLF}{semibold}{scit}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{scit}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-TLF}{semibold}{it}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-TLF}{semibold}{sc}{ + <-> \Montserrat@@scale Montserrat-SemiBold-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-ot1 +\DeclareFontShape{OT1}{Montserrat-TLF}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-tlf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{scsl}{ - <-> ssub * Montserrat-TLF/eb/scit +\DeclareFontShape{OT1}{Montserrat-TLF}{semibold}{sl}{ + <-> ssub * Montserrat-TLF/semibold/it }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{sl}{ - <-> ssub * Montserrat-TLF/eb/it +\DeclareFontShape{OT1}{Montserrat-TLF}{semibold}{scsl}{ + <-> ssub * Montserrat-TLF/semibold/scit }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{m}{sc}{ - <-> \Montserrat@@scale Montserrat-Regular-tlf-sc-ot1 + +% ---- thin ---- + +\DeclareFontShape{OT1}{Montserrat-TLF}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{m}{scit}{ - <-> \Montserrat@@scale Montserrat-Italic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-TLF}{thin}{scit}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-tlf-ot1 +\DeclareFontShape{OT1}{Montserrat-TLF}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-tlf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-tlf-ot1 +\DeclareFontShape{OT1}{Montserrat-TLF}{thin}{sc}{ + <-> \Montserrat@@scale Montserrat-Thin-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{m}{scsl}{ - <-> ssub * Montserrat-TLF/m/scit +\DeclareFontShape{OT1}{Montserrat-TLF}{thin}{sl}{ + <-> ssub * Montserrat-TLF/thin/it }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{m}{sl}{ - <-> ssub * Montserrat-TLF/m/it +\DeclareFontShape{OT1}{Montserrat-TLF}{thin}{scsl}{ + <-> ssub * Montserrat-TLF/thin/scit }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{l}{it}{ - <-> \Montserrat@@scale Montserrat-LightItalic-tlf-ot1 + +% ---- extrabold ---- + +\DeclareFontShape{OT1}{Montserrat-TLF}{extrabold}{scit}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{l}{sc}{ - <-> \Montserrat@@scale Montserrat-Light-tlf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-TLF}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{l}{scit}{ +\DeclareFontShape{OT1}{Montserrat-TLF}{extrabold}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{extrabold}{sl}{ + <-> ssub * Montserrat-TLF/extrabold/it +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{extrabold}{scsl}{ + <-> ssub * Montserrat-TLF/extrabold/scit +}{} + + +% ---- light ---- + +\DeclareFontShape{OT1}{Montserrat-TLF}{light}{it}{ + <-> \Montserrat@@scale Montserrat-LightItalic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{light}{scit}{ <-> \Montserrat@@scale Montserrat-LightItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{l}{n}{ +\DeclareFontShape{OT1}{Montserrat-TLF}{light}{sc}{ + <-> \Montserrat@@scale Montserrat-Light-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{light}{n}{ <-> \Montserrat@@scale Montserrat-Light-tlf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{l}{scsl}{ - <-> ssub * Montserrat-TLF/l/scit +\DeclareFontShape{OT1}{Montserrat-TLF}{light}{sl}{ + <-> ssub * Montserrat-TLF/light/it }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{l}{sl}{ - <-> ssub * Montserrat-TLF/l/it +\DeclareFontShape{OT1}{Montserrat-TLF}{light}{scsl}{ + <-> ssub * Montserrat-TLF/light/scit }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{mb}{scit}{ + +% ---- medium ---- + +\DeclareFontShape{OT1}{Montserrat-TLF}{medium}{scit}{ <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{mb}{sc}{ +\DeclareFontShape{OT1}{Montserrat-TLF}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{medium}{sc}{ <-> \Montserrat@@scale Montserrat-Medium-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{mb}{n}{ +\DeclareFontShape{OT1}{Montserrat-TLF}{medium}{n}{ <-> \Montserrat@@scale Montserrat-Medium-tlf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-ot1 +\DeclareFontShape{OT1}{Montserrat-TLF}{medium}{sl}{ + <-> ssub * Montserrat-TLF/medium/it +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{medium}{scsl}{ + <-> ssub * Montserrat-TLF/medium/scit }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{mb}{scsl}{ - <-> ssub * Montserrat-TLF/mb/scit +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{OT1}{Montserrat-TLF}{ul}{n}{ + <-> ssub * Montserrat-TLF/thin/n }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{mb}{sl}{ - <-> ssub * Montserrat-TLF/mb/it +\DeclareFontShape{OT1}{Montserrat-TLF}{ul}{sc}{ + <-> ssub * Montserrat-TLF/thin/sc }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{sb}{it}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-ot1 +\DeclareFontShape{OT1}{Montserrat-TLF}{ul}{scsl}{ + <-> ssub * Montserrat-TLF/thin/scsl }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{sb}{scit}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-TLF}{ul}{sl}{ + <-> ssub * Montserrat-TLF/thin/sl }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-tlf-ot1 +\DeclareFontShape{OT1}{Montserrat-TLF}{ul}{it}{ + <-> ssub * Montserrat-TLF/thin/it +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{ul}{scit}{ + <-> ssub * Montserrat-TLF/thin/scit +}{} + + +% el --> extralight + +\DeclareFontShape{OT1}{Montserrat-TLF}{el}{scsl}{ + <-> ssub * Montserrat-TLF/extralight/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{el}{sc}{ + <-> ssub * Montserrat-TLF/extralight/sc +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{el}{n}{ + <-> ssub * Montserrat-TLF/extralight/n +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{el}{sl}{ + <-> ssub * Montserrat-TLF/extralight/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{el}{it}{ + <-> ssub * Montserrat-TLF/extralight/it +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{el}{scit}{ + <-> ssub * Montserrat-TLF/extralight/scit +}{} + + +% l --> light + +\DeclareFontShape{OT1}{Montserrat-TLF}{l}{sl}{ + <-> ssub * Montserrat-TLF/light/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{l}{scsl}{ + <-> ssub * Montserrat-TLF/light/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{l}{sc}{ + <-> ssub * Montserrat-TLF/light/sc +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{l}{n}{ + <-> ssub * Montserrat-TLF/light/n +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{l}{scit}{ + <-> ssub * Montserrat-TLF/light/scit +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{l}{it}{ + <-> ssub * Montserrat-TLF/light/it +}{} + + +% sl --> regular + +\DeclareFontShape{OT1}{Montserrat-TLF}{sl}{sc}{ + <-> ssub * Montserrat-TLF/regular/sc +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{sl}{n}{ + <-> ssub * Montserrat-TLF/regular/n +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{sl}{scsl}{ + <-> ssub * Montserrat-TLF/regular/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{sl}{sl}{ + <-> ssub * Montserrat-TLF/regular/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{sl}{it}{ + <-> ssub * Montserrat-TLF/regular/it +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{sl}{scit}{ + <-> ssub * Montserrat-TLF/regular/scit +}{} + + +% m --> medium + +\DeclareFontShape{OT1}{Montserrat-TLF}{m}{it}{ + <-> ssub * Montserrat-TLF/medium/it +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{m}{scit}{ + <-> ssub * Montserrat-TLF/medium/scit +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{m}{scsl}{ + <-> ssub * Montserrat-TLF/medium/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{m}{sc}{ + <-> ssub * Montserrat-TLF/medium/sc +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{m}{n}{ + <-> ssub * Montserrat-TLF/medium/n +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{m}{sl}{ + <-> ssub * Montserrat-TLF/medium/sl +}{} + + +% sb --> semibold + +\DeclareFontShape{OT1}{Montserrat-TLF}{sb}{sl}{ + <-> ssub * Montserrat-TLF/semibold/sl }{} \DeclareFontShape{OT1}{Montserrat-TLF}{sb}{sc}{ - <-> \Montserrat@@scale Montserrat-SemiBold-tlf-sc-ot1 + <-> ssub * Montserrat-TLF/semibold/sc +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{sb}{n}{ + <-> ssub * Montserrat-TLF/semibold/n }{} \DeclareFontShape{OT1}{Montserrat-TLF}{sb}{scsl}{ - <-> ssub * Montserrat-TLF/sb/scit + <-> ssub * Montserrat-TLF/semibold/scsl }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{sb}{sl}{ - <-> ssub * Montserrat-TLF/sb/it +\DeclareFontShape{OT1}{Montserrat-TLF}{sb}{scit}{ + <-> ssub * Montserrat-TLF/semibold/scit }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-ot1 +\DeclareFontShape{OT1}{Montserrat-TLF}{sb}{it}{ + <-> ssub * Montserrat-TLF/semibold/it }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{t}{sc}{ - <-> \Montserrat@@scale Montserrat-Thin-tlf-sc-ot1 + +% b --> bold + +\DeclareFontShape{OT1}{Montserrat-TLF}{b}{scit}{ + <-> ssub * Montserrat-TLF/bold/scit }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{t}{scit}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-TLF}{b}{it}{ + <-> ssub * Montserrat-TLF/bold/it }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-tlf-ot1 +\DeclareFontShape{OT1}{Montserrat-TLF}{b}{sl}{ + <-> ssub * Montserrat-TLF/bold/sl }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{t}{scsl}{ - <-> ssub * Montserrat-TLF/t/scit +\DeclareFontShape{OT1}{Montserrat-TLF}{b}{scsl}{ + <-> ssub * Montserrat-TLF/bold/scsl }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{t}{sl}{ - <-> ssub * Montserrat-TLF/t/it +\DeclareFontShape{OT1}{Montserrat-TLF}{b}{sc}{ + <-> ssub * Montserrat-TLF/bold/sc }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{bx}{sl}{ - <-> ssub * Montserrat-TLF/b/sl +\DeclareFontShape{OT1}{Montserrat-TLF}{b}{n}{ + <-> ssub * Montserrat-TLF/bold/n }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{bx}{it}{ - <-> ssub * Montserrat-TLF/b/it + +% eb --> extrabold + +\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{scit}{ + <-> ssub * Montserrat-TLF/extrabold/scit +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{it}{ + <-> ssub * Montserrat-TLF/extrabold/it +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{sl}{ + <-> ssub * Montserrat-TLF/extrabold/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{scsl}{ + <-> ssub * Montserrat-TLF/extrabold/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{sc}{ + <-> ssub * Montserrat-TLF/extrabold/sc +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{n}{ + <-> ssub * Montserrat-TLF/extrabold/n +}{} + + +% ub --> black + +\DeclareFontShape{OT1}{Montserrat-TLF}{ub}{sl}{ + <-> ssub * Montserrat-TLF/black/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{ub}{n}{ + <-> ssub * Montserrat-TLF/black/n +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{ub}{sc}{ + <-> ssub * Montserrat-TLF/black/sc +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{ub}{scsl}{ + <-> ssub * Montserrat-TLF/black/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{ub}{scit}{ + <-> ssub * Montserrat-TLF/black/scit +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{ub}{it}{ + <-> ssub * Montserrat-TLF/black/it +}{} + +\DeclareFontShape{OT1}{Montserrat-TLF}{bx}{sl}{ + <-> ssub * Montserrat-TLF/b/sl }{} \DeclareFontShape{OT1}{Montserrat-TLF}{bx}{scsl}{ @@ -243,12 +512,16 @@ <-> ssub * Montserrat-TLF/b/sc }{} +\DeclareFontShape{OT1}{Montserrat-TLF}{bx}{n}{ + <-> ssub * Montserrat-TLF/b/n +}{} + \DeclareFontShape{OT1}{Montserrat-TLF}{bx}{scit}{ <-> ssub * Montserrat-TLF/b/scit }{} -\DeclareFontShape{OT1}{Montserrat-TLF}{bx}{n}{ - <-> ssub * Montserrat-TLF/b/n +\DeclareFontShape{OT1}{Montserrat-TLF}{bx}{it}{ + <-> ssub * Montserrat-TLF/b/it }{} \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-TOsF.fd b/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-TOsF.fd index 9c7addfbde8..ec88d2668b4 100644 --- a/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-TOsF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{OT1Montserrat-TOsF.fd} - [2017/01/25 (autoinst) Font definitions for OT1/Montserrat-TOsF.] + [2019/10/18 (autoinst) Font definitions for OT1/Montserrat-TOsF.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,240 +11,513 @@ \DeclareFontFamily{OT1}{Montserrat-TOsF}{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{it}{ + +% ---- light ---- + +\DeclareFontShape{OT1}{Montserrat-TOsF}{light}{scit}{ + <-> \Montserrat@@scale Montserrat-LightItalic-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{light}{it}{ + <-> \Montserrat@@scale Montserrat-LightItalic-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{light}{sc}{ + <-> \Montserrat@@scale Montserrat-Light-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{light}{n}{ + <-> \Montserrat@@scale Montserrat-Light-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{light}{sl}{ + <-> ssub * Montserrat-TOsF/light/it +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{light}{scsl}{ + <-> ssub * Montserrat-TOsF/light/scit +}{} + + +% ---- medium ---- + +\DeclareFontShape{OT1}{Montserrat-TOsF}{medium}{sc}{ + <-> \Montserrat@@scale Montserrat-Medium-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{medium}{scit}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{medium}{sl}{ + <-> ssub * Montserrat-TOsF/medium/it +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{medium}{scsl}{ + <-> ssub * Montserrat-TOsF/medium/scit +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{OT1}{Montserrat-TOsF}{extrabold}{it}{ <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{scit}{ +\DeclareFontShape{OT1}{Montserrat-TOsF}{extrabold}{scit}{ <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{n}{ +\DeclareFontShape{OT1}{Montserrat-TOsF}{extrabold}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{extrabold}{n}{ <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-TOsF}{extrabold}{sl}{ + <-> ssub * Montserrat-TOsF/extrabold/it }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{scsl}{ - <-> ssub * Montserrat-TOsF/eb/scit +\DeclareFontShape{OT1}{Montserrat-TOsF}{extrabold}{scsl}{ + <-> ssub * Montserrat-TOsF/extrabold/scit }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{sl}{ - <-> ssub * Montserrat-TOsF/eb/it + +% ---- thin ---- + +\DeclareFontShape{OT1}{Montserrat-TOsF}{thin}{sc}{ + <-> \Montserrat@@scale Montserrat-Thin-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{scit}{ +\DeclareFontShape{OT1}{Montserrat-TOsF}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{thin}{scit}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{thin}{sl}{ + <-> ssub * Montserrat-TOsF/thin/it +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{thin}{scsl}{ + <-> ssub * Montserrat-TOsF/thin/scit +}{} + + +% ---- bold ---- + +\DeclareFontShape{OT1}{Montserrat-TOsF}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{bold}{scit}{ <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{sc}{ +\DeclareFontShape{OT1}{Montserrat-TOsF}{bold}{sc}{ <-> \Montserrat@@scale Montserrat-Bold-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{n}{ +\DeclareFontShape{OT1}{Montserrat-TOsF}{bold}{n}{ <-> \Montserrat@@scale Montserrat-Bold-tosf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-ot1 +\DeclareFontShape{OT1}{Montserrat-TOsF}{bold}{sl}{ + <-> ssub * Montserrat-TOsF/bold/it }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{scsl}{ - <-> ssub * Montserrat-TOsF/b/scit +\DeclareFontShape{OT1}{Montserrat-TOsF}{bold}{scsl}{ + <-> ssub * Montserrat-TOsF/bold/scit }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{sl}{ - <-> ssub * Montserrat-TOsF/b/it + +% ---- semibold ---- + +\DeclareFontShape{OT1}{Montserrat-TOsF}{semibold}{sc}{ + <-> \Montserrat@@scale Montserrat-SemiBold-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-tosf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{k}{scit}{ +\DeclareFontShape{OT1}{Montserrat-TOsF}{semibold}{it}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{semibold}{scit}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{semibold}{sl}{ + <-> ssub * Montserrat-TOsF/semibold/it +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{semibold}{scsl}{ + <-> ssub * Montserrat-TOsF/semibold/scit +}{} + + +% ---- black ---- + +\DeclareFontShape{OT1}{Montserrat-TOsF}{black}{scit}{ <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-tosf-ot1 +\DeclareFontShape{OT1}{Montserrat-TOsF}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{k}{sc}{ +\DeclareFontShape{OT1}{Montserrat-TOsF}{black}{sc}{ <-> \Montserrat@@scale Montserrat-Black-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-ot1 +\DeclareFontShape{OT1}{Montserrat-TOsF}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-tosf-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{k}{scsl}{ - <-> ssub * Montserrat-TOsF/k/scit +\DeclareFontShape{OT1}{Montserrat-TOsF}{black}{sl}{ + <-> ssub * Montserrat-TOsF/black/it }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{k}{sl}{ - <-> ssub * Montserrat-TOsF/k/it +\DeclareFontShape{OT1}{Montserrat-TOsF}{black}{scsl}{ + <-> ssub * Montserrat-TOsF/black/scit }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{el}{scit}{ + +% ---- regular ---- + +\DeclareFontShape{OT1}{Montserrat-TOsF}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{regular}{scit}{ + <-> \Montserrat@@scale Montserrat-Italic-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{regular}{sc}{ + <-> \Montserrat@@scale Montserrat-Regular-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{regular}{sl}{ + <-> ssub * Montserrat-TOsF/regular/it +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{regular}{scsl}{ + <-> ssub * Montserrat-TOsF/regular/scit +}{} + + +% ---- extralight ---- + +\DeclareFontShape{OT1}{Montserrat-TOsF}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{extralight}{scit}{ <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{el}{n}{ +\DeclareFontShape{OT1}{Montserrat-TOsF}{extralight}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{extralight}{n}{ <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-ot1 }{} +\DeclareFontShape{OT1}{Montserrat-TOsF}{extralight}{sl}{ + <-> ssub * Montserrat-TOsF/extralight/it +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{extralight}{scsl}{ + <-> ssub * Montserrat-TOsF/extralight/scit +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{OT1}{Montserrat-TOsF}{ul}{sc}{ + <-> ssub * Montserrat-TOsF/thin/sc +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{ul}{n}{ + <-> ssub * Montserrat-TOsF/thin/n +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{ul}{scsl}{ + <-> ssub * Montserrat-TOsF/thin/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{ul}{sl}{ + <-> ssub * Montserrat-TOsF/thin/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{ul}{it}{ + <-> ssub * Montserrat-TOsF/thin/it +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{ul}{scit}{ + <-> ssub * Montserrat-TOsF/thin/scit +}{} + + +% el --> extralight + \DeclareFontShape{OT1}{Montserrat-TOsF}{el}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-sc-ot1 + <-> ssub * Montserrat-TOsF/extralight/sc }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-ot1 +\DeclareFontShape{OT1}{Montserrat-TOsF}{el}{n}{ + <-> ssub * Montserrat-TOsF/extralight/n }{} \DeclareFontShape{OT1}{Montserrat-TOsF}{el}{scsl}{ - <-> ssub * Montserrat-TOsF/el/scit + <-> ssub * Montserrat-TOsF/extralight/scsl }{} \DeclareFontShape{OT1}{Montserrat-TOsF}{el}{sl}{ - <-> ssub * Montserrat-TOsF/el/it + <-> ssub * Montserrat-TOsF/extralight/sl }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{mb}{scit}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-TOsF}{el}{it}{ + <-> ssub * Montserrat-TOsF/extralight/it }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-tosf-ot1 +\DeclareFontShape{OT1}{Montserrat-TOsF}{el}{scit}{ + <-> ssub * Montserrat-TOsF/extralight/scit }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{mb}{sc}{ - <-> \Montserrat@@scale Montserrat-Medium-tosf-sc-ot1 + +% l --> light + +\DeclareFontShape{OT1}{Montserrat-TOsF}{l}{scsl}{ + <-> ssub * Montserrat-TOsF/light/scsl }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-ot1 +\DeclareFontShape{OT1}{Montserrat-TOsF}{l}{sc}{ + <-> ssub * Montserrat-TOsF/light/sc +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{l}{n}{ + <-> ssub * Montserrat-TOsF/light/n }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{mb}{scsl}{ - <-> ssub * Montserrat-TOsF/mb/scit +\DeclareFontShape{OT1}{Montserrat-TOsF}{l}{sl}{ + <-> ssub * Montserrat-TOsF/light/sl }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{mb}{sl}{ - <-> ssub * Montserrat-TOsF/mb/it +\DeclareFontShape{OT1}{Montserrat-TOsF}{l}{it}{ + <-> ssub * Montserrat-TOsF/light/it }{} \DeclareFontShape{OT1}{Montserrat-TOsF}{l}{scit}{ - <-> \Montserrat@@scale Montserrat-LightItalic-tosf-sc-ot1 + <-> ssub * Montserrat-TOsF/light/scit }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{l}{sc}{ - <-> \Montserrat@@scale Montserrat-Light-tosf-sc-ot1 + +% sl --> regular + +\DeclareFontShape{OT1}{Montserrat-TOsF}{sl}{it}{ + <-> ssub * Montserrat-TOsF/regular/it }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{l}{n}{ - <-> \Montserrat@@scale Montserrat-Light-tosf-ot1 +\DeclareFontShape{OT1}{Montserrat-TOsF}{sl}{scit}{ + <-> ssub * Montserrat-TOsF/regular/scit }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{l}{it}{ - <-> \Montserrat@@scale Montserrat-LightItalic-tosf-ot1 +\DeclareFontShape{OT1}{Montserrat-TOsF}{sl}{sc}{ + <-> ssub * Montserrat-TOsF/regular/sc }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{l}{scsl}{ - <-> ssub * Montserrat-TOsF/l/scit +\DeclareFontShape{OT1}{Montserrat-TOsF}{sl}{n}{ + <-> ssub * Montserrat-TOsF/regular/n }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{l}{sl}{ - <-> ssub * Montserrat-TOsF/l/it +\DeclareFontShape{OT1}{Montserrat-TOsF}{sl}{scsl}{ + <-> ssub * Montserrat-TOsF/regular/scsl }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{m}{scit}{ - <-> \Montserrat@@scale Montserrat-Italic-tosf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-TOsF}{sl}{sl}{ + <-> ssub * Montserrat-TOsF/regular/sl +}{} + + +% m --> medium + +\DeclareFontShape{OT1}{Montserrat-TOsF}{m}{sl}{ + <-> ssub * Montserrat-TOsF/medium/sl }{} \DeclareFontShape{OT1}{Montserrat-TOsF}{m}{sc}{ - <-> \Montserrat@@scale Montserrat-Regular-tosf-sc-ot1 + <-> ssub * Montserrat-TOsF/medium/sc }{} \DeclareFontShape{OT1}{Montserrat-TOsF}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-tosf-ot1 + <-> ssub * Montserrat-TOsF/medium/n +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{m}{scsl}{ + <-> ssub * Montserrat-TOsF/medium/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{m}{scit}{ + <-> ssub * Montserrat-TOsF/medium/scit }{} \DeclareFontShape{OT1}{Montserrat-TOsF}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-tosf-ot1 + <-> ssub * Montserrat-TOsF/medium/it }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{m}{scsl}{ - <-> ssub * Montserrat-TOsF/m/scit + +% sb --> semibold + +\DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{scsl}{ + <-> ssub * Montserrat-TOsF/semibold/scsl }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{m}{sl}{ - <-> ssub * Montserrat-TOsF/m/it +\DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{sc}{ + <-> ssub * Montserrat-TOsF/semibold/sc }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{t}{sc}{ - <-> \Montserrat@@scale Montserrat-Thin-tosf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{n}{ + <-> ssub * Montserrat-TOsF/semibold/n }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{t}{scit}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{sl}{ + <-> ssub * Montserrat-TOsF/semibold/sl }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-tosf-ot1 +\DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{it}{ + <-> ssub * Montserrat-TOsF/semibold/it }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-ot1 +\DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{scit}{ + <-> ssub * Montserrat-TOsF/semibold/scit }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{t}{scsl}{ - <-> ssub * Montserrat-TOsF/t/scit + +% b --> bold + +\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{scit}{ + <-> ssub * Montserrat-TOsF/bold/scit }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{t}{sl}{ - <-> ssub * Montserrat-TOsF/t/it +\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{it}{ + <-> ssub * Montserrat-TOsF/bold/it }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{scit}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{sl}{ + <-> ssub * Montserrat-TOsF/bold/sl }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-tosf-ot1 +\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{sc}{ + <-> ssub * Montserrat-TOsF/bold/sc }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{sc}{ - <-> \Montserrat@@scale Montserrat-SemiBold-tosf-sc-ot1 +\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{n}{ + <-> ssub * Montserrat-TOsF/bold/n }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{it}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-ot1 +\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{scsl}{ + <-> ssub * Montserrat-TOsF/bold/scsl }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{scsl}{ - <-> ssub * Montserrat-TOsF/sb/scit + +% eb --> extrabold + +\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{sc}{ + <-> ssub * Montserrat-TOsF/extrabold/sc }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{sl}{ - <-> ssub * Montserrat-TOsF/sb/it +\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{n}{ + <-> ssub * Montserrat-TOsF/extrabold/n }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{bx}{scsl}{ - <-> ssub * Montserrat-TOsF/b/scsl +\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{scsl}{ + <-> ssub * Montserrat-TOsF/extrabold/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{sl}{ + <-> ssub * Montserrat-TOsF/extrabold/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{it}{ + <-> ssub * Montserrat-TOsF/extrabold/it +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{scit}{ + <-> ssub * Montserrat-TOsF/extrabold/scit +}{} + + +% ub --> black + +\DeclareFontShape{OT1}{Montserrat-TOsF}{ub}{sl}{ + <-> ssub * Montserrat-TOsF/black/sl +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{ub}{scsl}{ + <-> ssub * Montserrat-TOsF/black/scsl +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{ub}{sc}{ + <-> ssub * Montserrat-TOsF/black/sc +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{ub}{n}{ + <-> ssub * Montserrat-TOsF/black/n +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{ub}{scit}{ + <-> ssub * Montserrat-TOsF/black/scit +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{ub}{it}{ + <-> ssub * Montserrat-TOsF/black/it +}{} + +\DeclareFontShape{OT1}{Montserrat-TOsF}{bx}{it}{ + <-> ssub * Montserrat-TOsF/b/it }{} \DeclareFontShape{OT1}{Montserrat-TOsF}{bx}{scit}{ <-> ssub * Montserrat-TOsF/b/scit }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{bx}{sc}{ - <-> ssub * Montserrat-TOsF/b/sc +\DeclareFontShape{OT1}{Montserrat-TOsF}{bx}{scsl}{ + <-> ssub * Montserrat-TOsF/b/scsl }{} \DeclareFontShape{OT1}{Montserrat-TOsF}{bx}{n}{ <-> ssub * Montserrat-TOsF/b/n }{} -\DeclareFontShape{OT1}{Montserrat-TOsF}{bx}{it}{ - <-> ssub * Montserrat-TOsF/b/it +\DeclareFontShape{OT1}{Montserrat-TOsF}{bx}{sc}{ + <-> ssub * Montserrat-TOsF/b/sc }{} \DeclareFontShape{OT1}{Montserrat-TOsF}{bx}{sl}{ diff --git a/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-Dnom.fd b/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-Dnom.fd index 8285079a683..66a83e66da1 100644 --- a/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-Dnom.fd +++ b/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-Dnom.fd @@ -1,126 +1,287 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{OT1MontserratAlternates-Dnom.fd} - [2017/01/25 (autoinst) Font definitions for OT1/MontserratAlternates-Dnom.] + [2019/10/18 (autoinst) Font definitions for OT1/MontserratAlternates-Dnom.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{OT1}{MontserratAlternates-Dnom}{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-dnom-ot1 + +% ---- extrabold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-dnom-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-dnom-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-dnom-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{sb}{sl}{ - <-> ssub * MontserratAlternates-Dnom/sb/it +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-Dnom/extrabold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-dnom-ot1 + +% ---- extralight ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-dnom-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-dnom-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-dnom-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{t}{sl}{ - <-> ssub * MontserratAlternates-Dnom/t/it +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{extralight}{sl}{ + <-> ssub * MontserratAlternates-Dnom/extralight/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-dnom-ot1 + +% ---- thin ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-dnom-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-dnom-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-dnom-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{m}{sl}{ - <-> ssub * MontserratAlternates-Dnom/m/it +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{thin}{sl}{ + <-> ssub * MontserratAlternates-Dnom/thin/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-dnom-ot1 + +% ---- bold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-dnom-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-dnom-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-dnom-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{l}{sl}{ - <-> ssub * MontserratAlternates-Dnom/l/it +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{bold}{sl}{ + <-> ssub * MontserratAlternates-Dnom/bold/it +}{} + + +% ---- black ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-dnom-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-dnom-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{black}{sl}{ + <-> ssub * MontserratAlternates-Dnom/black/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-dnom-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-dnom-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-dnom-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{regular}{sl}{ + <-> ssub * MontserratAlternates-Dnom/regular/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-dnom-ot1 + +% ---- medium ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-dnom-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-dnom-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{medium}{sl}{ + <-> ssub * MontserratAlternates-Dnom/medium/it +}{} + + +% ---- light ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-dnom-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-dnom-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{mb}{sl}{ - <-> ssub * MontserratAlternates-Dnom/mb/it +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{light}{sl}{ + <-> ssub * MontserratAlternates-Dnom/light/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-dnom-ot1 + +% ---- semibold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-dnom-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-dnom-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-dnom-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{k}{sl}{ - <-> ssub * MontserratAlternates-Dnom/k/it +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{semibold}{sl}{ + <-> ssub * MontserratAlternates-Dnom/semibold/it }{} +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{ul}{n}{ + <-> ssub * MontserratAlternates-Dnom/thin/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{ul}{sl}{ + <-> ssub * MontserratAlternates-Dnom/thin/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{ul}{it}{ + <-> ssub * MontserratAlternates-Dnom/thin/it +}{} + + +% el --> extralight + \DeclareFontShape{OT1}{MontserratAlternates-Dnom}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-dnom-ot1 + <-> ssub * MontserratAlternates-Dnom/extralight/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{el}{sl}{ + <-> ssub * MontserratAlternates-Dnom/extralight/sl }{} \DeclareFontShape{OT1}{MontserratAlternates-Dnom}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-dnom-ot1 + <-> ssub * MontserratAlternates-Dnom/extralight/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{el}{sl}{ - <-> ssub * MontserratAlternates-Dnom/el/it + +% l --> light + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{l}{sl}{ + <-> ssub * MontserratAlternates-Dnom/light/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-dnom-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{l}{it}{ + <-> ssub * MontserratAlternates-Dnom/light/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-dnom-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{l}{n}{ + <-> ssub * MontserratAlternates-Dnom/light/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{eb}{sl}{ - <-> ssub * MontserratAlternates-Dnom/eb/it + +% sl --> regular + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{sl}{it}{ + <-> ssub * MontserratAlternates-Dnom/regular/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{sl}{sl}{ + <-> ssub * MontserratAlternates-Dnom/regular/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{sl}{n}{ + <-> ssub * MontserratAlternates-Dnom/regular/n +}{} + + +% m --> medium + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{m}{n}{ + <-> ssub * MontserratAlternates-Dnom/medium/n }{} +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{m}{it}{ + <-> ssub * MontserratAlternates-Dnom/medium/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{m}{sl}{ + <-> ssub * MontserratAlternates-Dnom/medium/sl +}{} + + +% sb --> semibold + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{sb}{n}{ + <-> ssub * MontserratAlternates-Dnom/semibold/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{sb}{sl}{ + <-> ssub * MontserratAlternates-Dnom/semibold/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{sb}{it}{ + <-> ssub * MontserratAlternates-Dnom/semibold/it +}{} + + +% b --> bold + \DeclareFontShape{OT1}{MontserratAlternates-Dnom}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-dnom-ot1 + <-> ssub * MontserratAlternates-Dnom/bold/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{b}{sl}{ + <-> ssub * MontserratAlternates-Dnom/bold/sl }{} \DeclareFontShape{OT1}{MontserratAlternates-Dnom}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-dnom-ot1 + <-> ssub * MontserratAlternates-Dnom/bold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{b}{sl}{ - <-> ssub * MontserratAlternates-Dnom/b/it + +% eb --> extrabold + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{eb}{n}{ + <-> ssub * MontserratAlternates-Dnom/extrabold/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{bx}{n}{ - <-> ssub * MontserratAlternates-Dnom/b/n +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{eb}{sl}{ + <-> ssub * MontserratAlternates-Dnom/extrabold/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{eb}{it}{ + <-> ssub * MontserratAlternates-Dnom/extrabold/it +}{} + + +% ub --> black + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{ub}{n}{ + <-> ssub * MontserratAlternates-Dnom/black/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{ub}{sl}{ + <-> ssub * MontserratAlternates-Dnom/black/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{ub}{it}{ + <-> ssub * MontserratAlternates-Dnom/black/it }{} \DeclareFontShape{OT1}{MontserratAlternates-Dnom}{bx}{it}{ @@ -131,4 +292,8 @@ <-> ssub * MontserratAlternates-Dnom/b/sl }{} +\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{bx}{n}{ + <-> ssub * MontserratAlternates-Dnom/b/n +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-Inf.fd b/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-Inf.fd index 452cea24bde..204095c899b 100644 --- a/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-Inf.fd +++ b/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-Inf.fd @@ -1,134 +1,299 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{OT1MontserratAlternates-Inf.fd} - [2017/01/25 (autoinst) Font definitions for OT1/MontserratAlternates-Inf.] + [2019/10/18 (autoinst) Font definitions for OT1/MontserratAlternates-Inf.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{OT1}{MontserratAlternates-Inf}{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-inf-ot1 + +% ---- thin ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-inf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-inf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{b}{sl}{ - <-> ssub * MontserratAlternates-Inf/b/it +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{thin}{sl}{ + <-> ssub * MontserratAlternates-Inf/thin/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-inf-ot1 + +% ---- bold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-inf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-inf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{eb}{sl}{ - <-> ssub * MontserratAlternates-Inf/eb/it +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{bold}{sl}{ + <-> ssub * MontserratAlternates-Inf/bold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-inf-ot1 + +% ---- light ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-inf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-inf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{k}{sl}{ - <-> ssub * MontserratAlternates-Inf/k/it +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{light}{sl}{ + <-> ssub * MontserratAlternates-Inf/light/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-inf-ot1 + +% ---- medium ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-inf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-inf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{el}{sl}{ - <-> ssub * MontserratAlternates-Inf/el/it +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{medium}{sl}{ + <-> ssub * MontserratAlternates-Inf/medium/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-inf-ot1 + +% ---- semibold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-inf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-inf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{t}{sl}{ - <-> ssub * MontserratAlternates-Inf/t/it +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{semibold}{sl}{ + <-> ssub * MontserratAlternates-Inf/semibold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-inf-ot1 + +% ---- black ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-inf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-inf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{sb}{sl}{ - <-> ssub * MontserratAlternates-Inf/sb/it +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{black}{sl}{ + <-> ssub * MontserratAlternates-Inf/black/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-inf-ot1 + +% ---- regular ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-inf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-inf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{regular}{sl}{ + <-> ssub * MontserratAlternates-Inf/regular/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-inf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-inf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-Inf/extrabold/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-inf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-inf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{extralight}{sl}{ + <-> ssub * MontserratAlternates-Inf/extralight/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{ul}{sl}{ + <-> ssub * MontserratAlternates-Inf/thin/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{ul}{it}{ + <-> ssub * MontserratAlternates-Inf/thin/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{ul}{n}{ + <-> ssub * MontserratAlternates-Inf/thin/n +}{} + + +% el --> extralight + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{el}{n}{ + <-> ssub * MontserratAlternates-Inf/extralight/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{el}{sl}{ + <-> ssub * MontserratAlternates-Inf/extralight/sl }{} +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{el}{it}{ + <-> ssub * MontserratAlternates-Inf/extralight/it +}{} + + +% l --> light + \DeclareFontShape{OT1}{MontserratAlternates-Inf}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-inf-ot1 + <-> ssub * MontserratAlternates-Inf/light/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{l}{it}{ + <-> ssub * MontserratAlternates-Inf/light/it }{} \DeclareFontShape{OT1}{MontserratAlternates-Inf}{l}{sl}{ - <-> ssub * MontserratAlternates-Inf/l/it + <-> ssub * MontserratAlternates-Inf/light/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-inf-ot1 + +% sl --> regular + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{sl}{it}{ + <-> ssub * MontserratAlternates-Inf/regular/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{sl}{sl}{ + <-> ssub * MontserratAlternates-Inf/regular/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-inf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{sl}{n}{ + <-> ssub * MontserratAlternates-Inf/regular/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{mb}{sl}{ - <-> ssub * MontserratAlternates-Inf/mb/it + +% m --> medium + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{m}{sl}{ + <-> ssub * MontserratAlternates-Inf/medium/sl }{} \DeclareFontShape{OT1}{MontserratAlternates-Inf}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-inf-ot1 + <-> ssub * MontserratAlternates-Inf/medium/it }{} \DeclareFontShape{OT1}{MontserratAlternates-Inf}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-inf-ot1 + <-> ssub * MontserratAlternates-Inf/medium/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{m}{sl}{ - <-> ssub * MontserratAlternates-Inf/m/it + +% sb --> semibold + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{sb}{it}{ + <-> ssub * MontserratAlternates-Inf/semibold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{bx}{it}{ - <-> ssub * MontserratAlternates-Inf/b/it +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{sb}{sl}{ + <-> ssub * MontserratAlternates-Inf/semibold/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-Inf}{bx}{sl}{ - <-> ssub * MontserratAlternates-Inf/b/sl +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{sb}{n}{ + <-> ssub * MontserratAlternates-Inf/semibold/n +}{} + + +% b --> bold + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{b}{it}{ + <-> ssub * MontserratAlternates-Inf/bold/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{b}{sl}{ + <-> ssub * MontserratAlternates-Inf/bold/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{b}{n}{ + <-> ssub * MontserratAlternates-Inf/bold/n +}{} + + +% eb --> extrabold + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{eb}{sl}{ + <-> ssub * MontserratAlternates-Inf/extrabold/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{eb}{it}{ + <-> ssub * MontserratAlternates-Inf/extrabold/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{eb}{n}{ + <-> ssub * MontserratAlternates-Inf/extrabold/n +}{} + + +% ub --> black + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{ub}{sl}{ + <-> ssub * MontserratAlternates-Inf/black/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{ub}{it}{ + <-> ssub * MontserratAlternates-Inf/black/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{ub}{n}{ + <-> ssub * MontserratAlternates-Inf/black/n }{} \DeclareFontShape{OT1}{MontserratAlternates-Inf}{bx}{n}{ <-> ssub * MontserratAlternates-Inf/b/n }{} +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{bx}{it}{ + <-> ssub * MontserratAlternates-Inf/b/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Inf}{bx}{sl}{ + <-> ssub * MontserratAlternates-Inf/b/sl +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-LF.fd b/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-LF.fd index 8cfa5b10d2e..5bf05de7eec 100644 --- a/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-LF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-LF.fd @@ -1,230 +1,503 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{OT1MontserratAlternates-LF.fd} - [2017/01/25 (autoinst) Font definitions for OT1/MontserratAlternates-LF.] + [2019/10/18 (autoinst) Font definitions for OT1/MontserratAlternates-LF.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{OT1}{MontserratAlternates-LF}{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{k}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Black-lf-sc-ot1 + +% ---- bold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-lf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{k}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{bold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-lf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{bold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-lf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{k}{scsl}{ - <-> ssub * MontserratAlternates-LF/k/scit +\DeclareFontShape{OT1}{MontserratAlternates-LF}{bold}{scsl}{ + <-> ssub * MontserratAlternates-LF/bold/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{k}{sl}{ - <-> ssub * MontserratAlternates-LF/k/it +\DeclareFontShape{OT1}{MontserratAlternates-LF}{bold}{sl}{ + <-> ssub * MontserratAlternates-LF/bold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-lf-sc-ot1 + +% ---- thin ---- + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{thin}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-lf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{thin}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-lf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{scsl}{ - <-> ssub * MontserratAlternates-LF/el/scit +\DeclareFontShape{OT1}{MontserratAlternates-LF}{thin}{scsl}{ + <-> ssub * MontserratAlternates-LF/thin/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{sl}{ - <-> ssub * MontserratAlternates-LF/el/it +\DeclareFontShape{OT1}{MontserratAlternates-LF}{thin}{sl}{ + <-> ssub * MontserratAlternates-LF/thin/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-lf-ot1 + +% ---- semibold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{semibold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-lf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-lf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{semibold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{scsl}{ - <-> ssub * MontserratAlternates-LF/eb/scit +\DeclareFontShape{OT1}{MontserratAlternates-LF}{semibold}{scsl}{ + <-> ssub * MontserratAlternates-LF/semibold/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{sl}{ - <-> ssub * MontserratAlternates-LF/eb/it +\DeclareFontShape{OT1}{MontserratAlternates-LF}{semibold}{sl}{ + <-> ssub * MontserratAlternates-LF/semibold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-lf-sc-ot1 + +% ---- light ---- + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-lf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-lf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{light}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-lf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-lf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{light}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{scsl}{ - <-> ssub * MontserratAlternates-LF/b/scit +\DeclareFontShape{OT1}{MontserratAlternates-LF}{light}{scsl}{ + <-> ssub * MontserratAlternates-LF/light/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{sl}{ - <-> ssub * MontserratAlternates-LF/b/it +\DeclareFontShape{OT1}{MontserratAlternates-LF}{light}{sl}{ + <-> ssub * MontserratAlternates-LF/light/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-lf-ot1 + +% ---- medium ---- + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-lf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{medium}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{medium}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-lf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-lf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{scsl}{ - <-> ssub * MontserratAlternates-LF/sb/scit +\DeclareFontShape{OT1}{MontserratAlternates-LF}{medium}{scsl}{ + <-> ssub * MontserratAlternates-LF/medium/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{sl}{ - <-> ssub * MontserratAlternates-LF/sb/it +\DeclareFontShape{OT1}{MontserratAlternates-LF}{medium}{sl}{ + <-> ssub * MontserratAlternates-LF/medium/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-lf-ot1 + +% ---- black ---- + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{black}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{t}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{t}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-lf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-lf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-lf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{black}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{t}{scsl}{ - <-> ssub * MontserratAlternates-LF/t/scit +\DeclareFontShape{OT1}{MontserratAlternates-LF}{black}{scsl}{ + <-> ssub * MontserratAlternates-LF/black/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{t}{sl}{ - <-> ssub * MontserratAlternates-LF/t/it +\DeclareFontShape{OT1}{MontserratAlternates-LF}{black}{sl}{ + <-> ssub * MontserratAlternates-LF/black/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-lf-ot1 + +% ---- regular ---- + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{regular}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-lf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-lf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{regular}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-lf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{scsl}{ - <-> ssub * MontserratAlternates-LF/m/scit +\DeclareFontShape{OT1}{MontserratAlternates-LF}{regular}{scsl}{ + <-> ssub * MontserratAlternates-LF/regular/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{sl}{ - <-> ssub * MontserratAlternates-LF/m/it +\DeclareFontShape{OT1}{MontserratAlternates-LF}{regular}{sl}{ + <-> ssub * MontserratAlternates-LF/regular/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-lf-ot1 + +% ---- extrabold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{extrabold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Light-lf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{extrabold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{extrabold}{scsl}{ + <-> ssub * MontserratAlternates-LF/extrabold/scit }{} +\DeclareFontShape{OT1}{MontserratAlternates-LF}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-LF/extrabold/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{extralight}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-lf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-lf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-lf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{extralight}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-lf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{extralight}{scsl}{ + <-> ssub * MontserratAlternates-LF/extralight/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{extralight}{sl}{ + <-> ssub * MontserratAlternates-LF/extralight/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{ul}{sl}{ + <-> ssub * MontserratAlternates-LF/thin/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{ul}{sc}{ + <-> ssub * MontserratAlternates-LF/thin/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{ul}{it}{ + <-> ssub * MontserratAlternates-LF/thin/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{ul}{scit}{ + <-> ssub * MontserratAlternates-LF/thin/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{ul}{n}{ + <-> ssub * MontserratAlternates-LF/thin/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{ul}{scsl}{ + <-> ssub * MontserratAlternates-LF/thin/scsl +}{} + + +% el --> extralight + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{it}{ + <-> ssub * MontserratAlternates-LF/extralight/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{sc}{ + <-> ssub * MontserratAlternates-LF/extralight/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{sl}{ + <-> ssub * MontserratAlternates-LF/extralight/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{scsl}{ + <-> ssub * MontserratAlternates-LF/extralight/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{scit}{ + <-> ssub * MontserratAlternates-LF/extralight/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{n}{ + <-> ssub * MontserratAlternates-LF/extralight/n +}{} + + +% l --> light + \DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-lf-ot1 + <-> ssub * MontserratAlternates-LF/light/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{scit}{ + <-> ssub * MontserratAlternates-LF/light/scit }{} \DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{scsl}{ - <-> ssub * MontserratAlternates-LF/l/scit + <-> ssub * MontserratAlternates-LF/light/scsl }{} \DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{sl}{ - <-> ssub * MontserratAlternates-LF/l/it + <-> ssub * MontserratAlternates-LF/light/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-lf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{sc}{ + <-> ssub * MontserratAlternates-LF/light/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{it}{ + <-> ssub * MontserratAlternates-LF/light/it +}{} + + +% sl --> regular + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{sl}{sl}{ + <-> ssub * MontserratAlternates-LF/regular/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{sl}{sc}{ + <-> ssub * MontserratAlternates-LF/regular/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{sl}{it}{ + <-> ssub * MontserratAlternates-LF/regular/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{sl}{scit}{ + <-> ssub * MontserratAlternates-LF/regular/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{sl}{n}{ + <-> ssub * MontserratAlternates-LF/regular/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{sl}{scsl}{ + <-> ssub * MontserratAlternates-LF/regular/scsl +}{} + + +% m --> medium + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{n}{ + <-> ssub * MontserratAlternates-LF/medium/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{scit}{ + <-> ssub * MontserratAlternates-LF/medium/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{scsl}{ + <-> ssub * MontserratAlternates-LF/medium/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{sl}{ + <-> ssub * MontserratAlternates-LF/medium/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{sc}{ + <-> ssub * MontserratAlternates-LF/medium/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{it}{ + <-> ssub * MontserratAlternates-LF/medium/it +}{} + + +% sb --> semibold + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{it}{ + <-> ssub * MontserratAlternates-LF/semibold/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{sc}{ + <-> ssub * MontserratAlternates-LF/semibold/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{sl}{ + <-> ssub * MontserratAlternates-LF/semibold/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{scsl}{ + <-> ssub * MontserratAlternates-LF/semibold/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{scit}{ + <-> ssub * MontserratAlternates-LF/semibold/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{mb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{n}{ + <-> ssub * MontserratAlternates-LF/semibold/n +}{} + + +% b --> bold + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{scit}{ + <-> ssub * MontserratAlternates-LF/bold/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{n}{ + <-> ssub * MontserratAlternates-LF/bold/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{scsl}{ + <-> ssub * MontserratAlternates-LF/bold/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{sl}{ + <-> ssub * MontserratAlternates-LF/bold/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{sc}{ + <-> ssub * MontserratAlternates-LF/bold/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{it}{ + <-> ssub * MontserratAlternates-LF/bold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-lf-ot1 + +% eb --> extrabold + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{scsl}{ + <-> ssub * MontserratAlternates-LF/extrabold/scsl }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{mb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-lf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{scit}{ + <-> ssub * MontserratAlternates-LF/extrabold/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{mb}{scsl}{ - <-> ssub * MontserratAlternates-LF/mb/scit +\DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{n}{ + <-> ssub * MontserratAlternates-LF/extrabold/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{mb}{sl}{ - <-> ssub * MontserratAlternates-LF/mb/it +\DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{it}{ + <-> ssub * MontserratAlternates-LF/extrabold/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{sc}{ + <-> ssub * MontserratAlternates-LF/extrabold/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{sl}{ + <-> ssub * MontserratAlternates-LF/extrabold/sl +}{} + + +% ub --> black + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{ub}{scit}{ + <-> ssub * MontserratAlternates-LF/black/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{ub}{n}{ + <-> ssub * MontserratAlternates-LF/black/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{ub}{scsl}{ + <-> ssub * MontserratAlternates-LF/black/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{ub}{sl}{ + <-> ssub * MontserratAlternates-LF/black/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{ub}{sc}{ + <-> ssub * MontserratAlternates-LF/black/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-LF}{ub}{it}{ + <-> ssub * MontserratAlternates-LF/black/it }{} \DeclareFontShape{OT1}{MontserratAlternates-LF}{bx}{it}{ @@ -235,16 +508,16 @@ <-> ssub * MontserratAlternates-LF/b/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{bx}{scit}{ - <-> ssub * MontserratAlternates-LF/b/scit +\DeclareFontShape{OT1}{MontserratAlternates-LF}{bx}{sc}{ + <-> ssub * MontserratAlternates-LF/b/sc }{} \DeclareFontShape{OT1}{MontserratAlternates-LF}{bx}{scsl}{ <-> ssub * MontserratAlternates-LF/b/scsl }{} -\DeclareFontShape{OT1}{MontserratAlternates-LF}{bx}{sc}{ - <-> ssub * MontserratAlternates-LF/b/sc +\DeclareFontShape{OT1}{MontserratAlternates-LF}{bx}{scit}{ + <-> ssub * MontserratAlternates-LF/b/scit }{} \DeclareFontShape{OT1}{MontserratAlternates-LF}{bx}{n}{ diff --git a/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-Numr.fd b/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-Numr.fd index 26c15466fc8..7d7aeeed6d0 100644 --- a/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-Numr.fd +++ b/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-Numr.fd @@ -1,122 +1,287 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{OT1MontserratAlternates-Numr.fd} - [2017/01/25 (autoinst) Font definitions for OT1/MontserratAlternates-Numr.] + [2019/10/18 (autoinst) Font definitions for OT1/MontserratAlternates-Numr.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{OT1}{MontserratAlternates-Numr}{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-numr-ot1 + +% ---- semibold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-numr-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-numr-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-numr-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{t}{sl}{ - <-> ssub * MontserratAlternates-Numr/t/it +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{semibold}{sl}{ + <-> ssub * MontserratAlternates-Numr/semibold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-numr-ot1 + +% ---- medium ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-numr-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-numr-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-numr-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{sb}{sl}{ - <-> ssub * MontserratAlternates-Numr/sb/it +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{medium}{sl}{ + <-> ssub * MontserratAlternates-Numr/medium/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-numr-ot1 + +% ---- light ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-numr-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-numr-ot1 }{} +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{light}{sl}{ + <-> ssub * MontserratAlternates-Numr/light/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-numr-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-numr-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{regular}{sl}{ + <-> ssub * MontserratAlternates-Numr/regular/it +}{} + + +% ---- black ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-numr-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-numr-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{black}{sl}{ + <-> ssub * MontserratAlternates-Numr/black/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-numr-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-numr-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{bold}{sl}{ + <-> ssub * MontserratAlternates-Numr/bold/it +}{} + + +% ---- thin ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-numr-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-numr-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{thin}{sl}{ + <-> ssub * MontserratAlternates-Numr/thin/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-numr-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-numr-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-Numr/extrabold/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-numr-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-numr-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{extralight}{sl}{ + <-> ssub * MontserratAlternates-Numr/extralight/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{ul}{it}{ + <-> ssub * MontserratAlternates-Numr/thin/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{ul}{sl}{ + <-> ssub * MontserratAlternates-Numr/thin/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{ul}{n}{ + <-> ssub * MontserratAlternates-Numr/thin/n +}{} + + +% el --> extralight + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{el}{n}{ + <-> ssub * MontserratAlternates-Numr/extralight/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{el}{sl}{ + <-> ssub * MontserratAlternates-Numr/extralight/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{el}{it}{ + <-> ssub * MontserratAlternates-Numr/extralight/it +}{} + + +% l --> light + \DeclareFontShape{OT1}{MontserratAlternates-Numr}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-numr-ot1 + <-> ssub * MontserratAlternates-Numr/light/n }{} \DeclareFontShape{OT1}{MontserratAlternates-Numr}{l}{sl}{ - <-> ssub * MontserratAlternates-Numr/l/it + <-> ssub * MontserratAlternates-Numr/light/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-numr-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{l}{it}{ + <-> ssub * MontserratAlternates-Numr/light/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-numr-ot1 + +% sl --> regular + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{sl}{n}{ + <-> ssub * MontserratAlternates-Numr/regular/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{mb}{sl}{ - <-> ssub * MontserratAlternates-Numr/mb/it +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{sl}{sl}{ + <-> ssub * MontserratAlternates-Numr/regular/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-numr-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{sl}{it}{ + <-> ssub * MontserratAlternates-Numr/regular/it +}{} + + +% m --> medium + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{m}{sl}{ + <-> ssub * MontserratAlternates-Numr/medium/sl }{} \DeclareFontShape{OT1}{MontserratAlternates-Numr}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-numr-ot1 + <-> ssub * MontserratAlternates-Numr/medium/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{m}{sl}{ - <-> ssub * MontserratAlternates-Numr/m/it +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{m}{n}{ + <-> ssub * MontserratAlternates-Numr/medium/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-numr-ot1 + +% sb --> semibold + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{sb}{it}{ + <-> ssub * MontserratAlternates-Numr/semibold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-numr-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{sb}{sl}{ + <-> ssub * MontserratAlternates-Numr/semibold/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{b}{sl}{ - <-> ssub * MontserratAlternates-Numr/b/it +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{sb}{n}{ + <-> ssub * MontserratAlternates-Numr/semibold/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-numr-ot1 + +% b --> bold + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{b}{n}{ + <-> ssub * MontserratAlternates-Numr/bold/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-numr-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{b}{sl}{ + <-> ssub * MontserratAlternates-Numr/bold/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{eb}{sl}{ - <-> ssub * MontserratAlternates-Numr/eb/it +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{b}{it}{ + <-> ssub * MontserratAlternates-Numr/bold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-numr-ot1 + +% eb --> extrabold + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{eb}{sl}{ + <-> ssub * MontserratAlternates-Numr/extrabold/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-numr-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{eb}{it}{ + <-> ssub * MontserratAlternates-Numr/extrabold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{k}{sl}{ - <-> ssub * MontserratAlternates-Numr/k/it +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{eb}{n}{ + <-> ssub * MontserratAlternates-Numr/extrabold/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-numr-ot1 + +% ub --> black + +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{ub}{n}{ + <-> ssub * MontserratAlternates-Numr/black/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-numr-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{ub}{sl}{ + <-> ssub * MontserratAlternates-Numr/black/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-Numr}{el}{sl}{ - <-> ssub * MontserratAlternates-Numr/el/it +\DeclareFontShape{OT1}{MontserratAlternates-Numr}{ub}{it}{ + <-> ssub * MontserratAlternates-Numr/black/it }{} \DeclareFontShape{OT1}{MontserratAlternates-Numr}{bx}{sl}{ diff --git a/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-OsF.fd b/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-OsF.fd index 11df570b04d..4e67de75e02 100644 --- a/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-OsF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-OsF.fd @@ -1,238 +1,503 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{OT1MontserratAlternates-OsF.fd} - [2017/01/25 (autoinst) Font definitions for OT1/MontserratAlternates-OsF.] + [2019/10/18 (autoinst) Font definitions for OT1/MontserratAlternates-OsF.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{OT1}{MontserratAlternates-OsF}{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-osf-sc-ot1 + +% ---- extralight ---- + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extralight}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-osf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-osf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extralight}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{scsl}{ - <-> ssub * MontserratAlternates-OsF/b/scit +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extralight}{scsl}{ + <-> ssub * MontserratAlternates-OsF/extralight/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{sl}{ - <-> ssub * MontserratAlternates-OsF/b/it +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extralight}{sl}{ + <-> ssub * MontserratAlternates-OsF/extralight/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-osf-sc-ot1 + +% ---- extrabold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extrabold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-osf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-osf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extrabold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-osf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{scsl}{ - <-> ssub * MontserratAlternates-OsF/eb/scit +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extrabold}{scsl}{ + <-> ssub * MontserratAlternates-OsF/extrabold/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{sl}{ - <-> ssub * MontserratAlternates-OsF/eb/it +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-OsF/extrabold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{k}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-osf-sc-ot1 + +% ---- medium ---- + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{medium}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{k}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Black-osf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-osf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{medium}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-osf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{k}{scsl}{ - <-> ssub * MontserratAlternates-OsF/k/scit +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{medium}{scsl}{ + <-> ssub * MontserratAlternates-OsF/medium/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{k}{sl}{ - <-> ssub * MontserratAlternates-OsF/k/it +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{medium}{sl}{ + <-> ssub * MontserratAlternates-OsF/medium/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-osf-ot1 + +% ---- light ---- + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{light}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-osf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{light}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-osf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{scsl}{ - <-> ssub * MontserratAlternates-OsF/el/scit +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{light}{scsl}{ + <-> ssub * MontserratAlternates-OsF/light/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{sl}{ - <-> ssub * MontserratAlternates-OsF/el/it +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{light}{sl}{ + <-> ssub * MontserratAlternates-OsF/light/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{t}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-osf-sc-ot1 + +% ---- semibold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{semibold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{t}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-osf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{semibold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-osf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{t}{scsl}{ - <-> ssub * MontserratAlternates-OsF/t/scit +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{semibold}{scsl}{ + <-> ssub * MontserratAlternates-OsF/semibold/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{t}{sl}{ - <-> ssub * MontserratAlternates-OsF/t/it +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{semibold}{sl}{ + <-> ssub * MontserratAlternates-OsF/semibold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-osf-ot1 + +% ---- regular ---- + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{regular}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-osf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-osf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{regular}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{scsl}{ - <-> ssub * MontserratAlternates-OsF/sb/scit +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{regular}{scsl}{ + <-> ssub * MontserratAlternates-OsF/regular/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{sl}{ - <-> ssub * MontserratAlternates-OsF/sb/it +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{regular}{sl}{ + <-> ssub * MontserratAlternates-OsF/regular/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{l}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Light-osf-sc-ot1 + +% ---- black ---- + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{black}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{l}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{black}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{black}{scsl}{ + <-> ssub * MontserratAlternates-OsF/black/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{black}{sl}{ + <-> ssub * MontserratAlternates-OsF/black/it +}{} + + +% ---- thin ---- + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{thin}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{thin}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{thin}{scsl}{ + <-> ssub * MontserratAlternates-OsF/thin/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{thin}{sl}{ + <-> ssub * MontserratAlternates-OsF/thin/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bold}{scsl}{ + <-> ssub * MontserratAlternates-OsF/bold/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bold}{sl}{ + <-> ssub * MontserratAlternates-OsF/bold/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ul}{scit}{ + <-> ssub * MontserratAlternates-OsF/thin/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ul}{n}{ + <-> ssub * MontserratAlternates-OsF/thin/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ul}{scsl}{ + <-> ssub * MontserratAlternates-OsF/thin/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ul}{sl}{ + <-> ssub * MontserratAlternates-OsF/thin/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ul}{sc}{ + <-> ssub * MontserratAlternates-OsF/thin/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ul}{it}{ + <-> ssub * MontserratAlternates-OsF/thin/it +}{} + + +% el --> extralight + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{scit}{ + <-> ssub * MontserratAlternates-OsF/extralight/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{n}{ + <-> ssub * MontserratAlternates-OsF/extralight/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{scsl}{ + <-> ssub * MontserratAlternates-OsF/extralight/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{sl}{ + <-> ssub * MontserratAlternates-OsF/extralight/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{sc}{ + <-> ssub * MontserratAlternates-OsF/extralight/sc }{} +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{it}{ + <-> ssub * MontserratAlternates-OsF/extralight/it +}{} + + +% l --> light + \DeclareFontShape{OT1}{MontserratAlternates-OsF}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-osf-ot1 + <-> ssub * MontserratAlternates-OsF/light/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-osf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{l}{scit}{ + <-> ssub * MontserratAlternates-OsF/light/scit }{} \DeclareFontShape{OT1}{MontserratAlternates-OsF}{l}{scsl}{ - <-> ssub * MontserratAlternates-OsF/l/scit + <-> ssub * MontserratAlternates-OsF/light/scsl }{} \DeclareFontShape{OT1}{MontserratAlternates-OsF}{l}{sl}{ - <-> ssub * MontserratAlternates-OsF/l/it + <-> ssub * MontserratAlternates-OsF/light/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-osf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{l}{sc}{ + <-> ssub * MontserratAlternates-OsF/light/sc }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{mb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{l}{it}{ + <-> ssub * MontserratAlternates-OsF/light/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{mb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-osf-sc-ot1 + +% sl --> regular + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sl}{it}{ + <-> ssub * MontserratAlternates-OsF/regular/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-osf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sl}{sc}{ + <-> ssub * MontserratAlternates-OsF/regular/sc }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{mb}{scsl}{ - <-> ssub * MontserratAlternates-OsF/mb/scit +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sl}{sl}{ + <-> ssub * MontserratAlternates-OsF/regular/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{mb}{sl}{ - <-> ssub * MontserratAlternates-OsF/mb/it +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sl}{scsl}{ + <-> ssub * MontserratAlternates-OsF/regular/scsl }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-osf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sl}{n}{ + <-> ssub * MontserratAlternates-OsF/regular/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{m}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-osf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sl}{scit}{ + <-> ssub * MontserratAlternates-OsF/regular/scit +}{} + + +% m --> medium + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{m}{sl}{ + <-> ssub * MontserratAlternates-OsF/medium/sl }{} \DeclareFontShape{OT1}{MontserratAlternates-OsF}{m}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-osf-sc-ot1 + <-> ssub * MontserratAlternates-OsF/medium/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{m}{it}{ + <-> ssub * MontserratAlternates-OsF/medium/it }{} \DeclareFontShape{OT1}{MontserratAlternates-OsF}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-osf-ot1 + <-> ssub * MontserratAlternates-OsF/medium/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{m}{scit}{ + <-> ssub * MontserratAlternates-OsF/medium/scit }{} \DeclareFontShape{OT1}{MontserratAlternates-OsF}{m}{scsl}{ - <-> ssub * MontserratAlternates-OsF/m/scit + <-> ssub * MontserratAlternates-OsF/medium/scsl }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{m}{sl}{ - <-> ssub * MontserratAlternates-OsF/m/it + +% sb --> semibold + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{scsl}{ + <-> ssub * MontserratAlternates-OsF/semibold/scsl }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bx}{sc}{ - <-> ssub * MontserratAlternates-OsF/b/sc +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{scit}{ + <-> ssub * MontserratAlternates-OsF/semibold/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bx}{scsl}{ - <-> ssub * MontserratAlternates-OsF/b/scsl +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{n}{ + <-> ssub * MontserratAlternates-OsF/semibold/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{it}{ + <-> ssub * MontserratAlternates-OsF/semibold/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{sc}{ + <-> ssub * MontserratAlternates-OsF/semibold/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{sl}{ + <-> ssub * MontserratAlternates-OsF/semibold/sl +}{} + + +% b --> bold + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{sl}{ + <-> ssub * MontserratAlternates-OsF/bold/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{sc}{ + <-> ssub * MontserratAlternates-OsF/bold/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{it}{ + <-> ssub * MontserratAlternates-OsF/bold/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{n}{ + <-> ssub * MontserratAlternates-OsF/bold/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{scit}{ + <-> ssub * MontserratAlternates-OsF/bold/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{scsl}{ + <-> ssub * MontserratAlternates-OsF/bold/scsl +}{} + + +% eb --> extrabold + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{sl}{ + <-> ssub * MontserratAlternates-OsF/extrabold/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{sc}{ + <-> ssub * MontserratAlternates-OsF/extrabold/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{it}{ + <-> ssub * MontserratAlternates-OsF/extrabold/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{n}{ + <-> ssub * MontserratAlternates-OsF/extrabold/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{scit}{ + <-> ssub * MontserratAlternates-OsF/extrabold/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{scsl}{ + <-> ssub * MontserratAlternates-OsF/extrabold/scsl +}{} + + +% ub --> black + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ub}{it}{ + <-> ssub * MontserratAlternates-OsF/black/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ub}{sc}{ + <-> ssub * MontserratAlternates-OsF/black/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ub}{sl}{ + <-> ssub * MontserratAlternates-OsF/black/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ub}{scsl}{ + <-> ssub * MontserratAlternates-OsF/black/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ub}{scit}{ + <-> ssub * MontserratAlternates-OsF/black/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ub}{n}{ + <-> ssub * MontserratAlternates-OsF/black/n }{} \DeclareFontShape{OT1}{MontserratAlternates-OsF}{bx}{scit}{ @@ -243,6 +508,14 @@ <-> ssub * MontserratAlternates-OsF/b/n }{} +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bx}{scsl}{ + <-> ssub * MontserratAlternates-OsF/b/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bx}{sc}{ + <-> ssub * MontserratAlternates-OsF/b/sc +}{} + \DeclareFontShape{OT1}{MontserratAlternates-OsF}{bx}{sl}{ <-> ssub * MontserratAlternates-OsF/b/sl }{} diff --git a/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-Sup.fd b/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-Sup.fd index e9d1ac95e43..be24153e230 100644 --- a/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-Sup.fd +++ b/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-Sup.fd @@ -1,134 +1,299 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{OT1MontserratAlternates-Sup.fd} - [2017/01/25 (autoinst) Font definitions for OT1/MontserratAlternates-Sup.] + [2019/10/18 (autoinst) Font definitions for OT1/MontserratAlternates-Sup.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{OT1}{MontserratAlternates-Sup}{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-sup-ot1 + +% ---- extralight ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-sup-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-sup-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{k}{sl}{ - <-> ssub * MontserratAlternates-Sup/k/it +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{extralight}{sl}{ + <-> ssub * MontserratAlternates-Sup/extralight/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-sup-ot1 + +% ---- extrabold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-sup-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-sup-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{el}{sl}{ - <-> ssub * MontserratAlternates-Sup/el/it +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-Sup/extrabold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-sup-ot1 + +% ---- bold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-sup-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-sup-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{eb}{sl}{ - <-> ssub * MontserratAlternates-Sup/eb/it +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{bold}{sl}{ + <-> ssub * MontserratAlternates-Sup/bold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-sup-ot1 + +% ---- thin ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-sup-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-sup-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{b}{sl}{ - <-> ssub * MontserratAlternates-Sup/b/it +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{thin}{sl}{ + <-> ssub * MontserratAlternates-Sup/thin/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-sup-ot1 + +% ---- semibold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-sup-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-sup-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{sb}{sl}{ - <-> ssub * MontserratAlternates-Sup/sb/it +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{semibold}{sl}{ + <-> ssub * MontserratAlternates-Sup/semibold/it +}{} + + +% ---- light ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-sup-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-sup-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-sup-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{light}{sl}{ + <-> ssub * MontserratAlternates-Sup/light/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{t}{sl}{ - <-> ssub * MontserratAlternates-Sup/t/it + +% ---- medium ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-sup-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-sup-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-sup-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{medium}{sl}{ + <-> ssub * MontserratAlternates-Sup/medium/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{m}{sl}{ - <-> ssub * MontserratAlternates-Sup/m/it + +% ---- black ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-sup-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{black}{sl}{ + <-> ssub * MontserratAlternates-Sup/black/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-sup-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{regular}{sl}{ + <-> ssub * MontserratAlternates-Sup/regular/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{ul}{n}{ + <-> ssub * MontserratAlternates-Sup/thin/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{ul}{sl}{ + <-> ssub * MontserratAlternates-Sup/thin/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{ul}{it}{ + <-> ssub * MontserratAlternates-Sup/thin/it +}{} + + +% el --> extralight + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{el}{it}{ + <-> ssub * MontserratAlternates-Sup/extralight/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{el}{sl}{ + <-> ssub * MontserratAlternates-Sup/extralight/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{el}{n}{ + <-> ssub * MontserratAlternates-Sup/extralight/n }{} + +% l --> light + \DeclareFontShape{OT1}{MontserratAlternates-Sup}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-sup-ot1 + <-> ssub * MontserratAlternates-Sup/light/n }{} \DeclareFontShape{OT1}{MontserratAlternates-Sup}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-sup-ot1 + <-> ssub * MontserratAlternates-Sup/light/it }{} \DeclareFontShape{OT1}{MontserratAlternates-Sup}{l}{sl}{ - <-> ssub * MontserratAlternates-Sup/l/it + <-> ssub * MontserratAlternates-Sup/light/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-sup-ot1 + +% sl --> regular + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{sl}{it}{ + <-> ssub * MontserratAlternates-Sup/regular/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-sup-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{sl}{sl}{ + <-> ssub * MontserratAlternates-Sup/regular/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{mb}{sl}{ - <-> ssub * MontserratAlternates-Sup/mb/it +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{sl}{n}{ + <-> ssub * MontserratAlternates-Sup/regular/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{bx}{n}{ - <-> ssub * MontserratAlternates-Sup/b/n + +% m --> medium + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{m}{n}{ + <-> ssub * MontserratAlternates-Sup/medium/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-Sup}{bx}{sl}{ - <-> ssub * MontserratAlternates-Sup/b/sl +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{m}{it}{ + <-> ssub * MontserratAlternates-Sup/medium/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{m}{sl}{ + <-> ssub * MontserratAlternates-Sup/medium/sl +}{} + + +% sb --> semibold + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{sb}{it}{ + <-> ssub * MontserratAlternates-Sup/semibold/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{sb}{sl}{ + <-> ssub * MontserratAlternates-Sup/semibold/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{sb}{n}{ + <-> ssub * MontserratAlternates-Sup/semibold/n +}{} + + +% b --> bold + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{b}{sl}{ + <-> ssub * MontserratAlternates-Sup/bold/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{b}{it}{ + <-> ssub * MontserratAlternates-Sup/bold/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{b}{n}{ + <-> ssub * MontserratAlternates-Sup/bold/n +}{} + + +% eb --> extrabold + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{eb}{n}{ + <-> ssub * MontserratAlternates-Sup/extrabold/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{eb}{it}{ + <-> ssub * MontserratAlternates-Sup/extrabold/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{eb}{sl}{ + <-> ssub * MontserratAlternates-Sup/extrabold/sl +}{} + + +% ub --> black + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{ub}{sl}{ + <-> ssub * MontserratAlternates-Sup/black/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{ub}{it}{ + <-> ssub * MontserratAlternates-Sup/black/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{ub}{n}{ + <-> ssub * MontserratAlternates-Sup/black/n }{} \DeclareFontShape{OT1}{MontserratAlternates-Sup}{bx}{it}{ <-> ssub * MontserratAlternates-Sup/b/it }{} +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{bx}{sl}{ + <-> ssub * MontserratAlternates-Sup/b/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-Sup}{bx}{n}{ + <-> ssub * MontserratAlternates-Sup/b/n +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-TLF.fd b/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-TLF.fd index 97800f62cda..0b1e3012175 100644 --- a/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-TLF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-TLF.fd @@ -1,248 +1,517 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{OT1MontserratAlternates-TLF.fd} - [2017/01/25 (autoinst) Font definitions for OT1/MontserratAlternates-TLF.] + [2019/10/18 (autoinst) Font definitions for OT1/MontserratAlternates-TLF.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{OT1}{MontserratAlternates-TLF}{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-tlf-sc-ot1 + +% ---- extrabold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extrabold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-tlf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extrabold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-tlf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{scsl}{ - <-> ssub * MontserratAlternates-TLF/el/scit +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extrabold}{scsl}{ + <-> ssub * MontserratAlternates-TLF/extrabold/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{sl}{ - <-> ssub * MontserratAlternates-TLF/el/it +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-TLF/extrabold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-tlf-ot1 + +% ---- extralight ---- + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extralight}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{k}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Black-tlf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{k}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-tlf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extralight}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{k}{scsl}{ - <-> ssub * MontserratAlternates-TLF/k/scit +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extralight}{scsl}{ + <-> ssub * MontserratAlternates-TLF/extralight/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{k}{sl}{ - <-> ssub * MontserratAlternates-TLF/k/it +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extralight}{sl}{ + <-> ssub * MontserratAlternates-TLF/extralight/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-tlf-ot1 + +% ---- bold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-tlf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-tlf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{scsl}{ - <-> ssub * MontserratAlternates-TLF/b/scit +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bold}{scsl}{ + <-> ssub * MontserratAlternates-TLF/bold/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{sl}{ - <-> ssub * MontserratAlternates-TLF/b/it +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bold}{sl}{ + <-> ssub * MontserratAlternates-TLF/bold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-tlf-ot1 + +% ---- thin ---- + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{thin}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-tlf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-tlf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{thin}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{scsl}{ - <-> ssub * MontserratAlternates-TLF/eb/scit +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{thin}{scsl}{ + <-> ssub * MontserratAlternates-TLF/thin/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{sl}{ - <-> ssub * MontserratAlternates-TLF/eb/it +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{thin}{sl}{ + <-> ssub * MontserratAlternates-TLF/thin/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-tlf-sc-ot1 + +% ---- black ---- + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-tlf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{black}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-tlf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-tlf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{black}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{scsl}{ - <-> ssub * MontserratAlternates-TLF/m/scit +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{black}{scsl}{ + <-> ssub * MontserratAlternates-TLF/black/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{sl}{ - <-> ssub * MontserratAlternates-TLF/m/it +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{black}{sl}{ + <-> ssub * MontserratAlternates-TLF/black/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-tlf-ot1 + +% ---- regular ---- + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{regular}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Light-tlf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{regular}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-tlf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{regular}{scsl}{ + <-> ssub * MontserratAlternates-TLF/regular/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{regular}{sl}{ + <-> ssub * MontserratAlternates-TLF/regular/it +}{} + + +% ---- semibold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{semibold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{semibold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{semibold}{scsl}{ + <-> ssub * MontserratAlternates-TLF/semibold/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{semibold}{sl}{ + <-> ssub * MontserratAlternates-TLF/semibold/it +}{} + + +% ---- light ---- + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{light}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{light}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{light}{scsl}{ + <-> ssub * MontserratAlternates-TLF/light/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{light}{sl}{ + <-> ssub * MontserratAlternates-TLF/light/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{medium}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{medium}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{medium}{scsl}{ + <-> ssub * MontserratAlternates-TLF/medium/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{medium}{sl}{ + <-> ssub * MontserratAlternates-TLF/medium/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ul}{scit}{ + <-> ssub * MontserratAlternates-TLF/thin/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ul}{n}{ + <-> ssub * MontserratAlternates-TLF/thin/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ul}{scsl}{ + <-> ssub * MontserratAlternates-TLF/thin/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ul}{sl}{ + <-> ssub * MontserratAlternates-TLF/thin/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ul}{sc}{ + <-> ssub * MontserratAlternates-TLF/thin/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ul}{it}{ + <-> ssub * MontserratAlternates-TLF/thin/it +}{} + + +% el --> extralight + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{scit}{ + <-> ssub * MontserratAlternates-TLF/extralight/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{n}{ + <-> ssub * MontserratAlternates-TLF/extralight/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{scsl}{ + <-> ssub * MontserratAlternates-TLF/extralight/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{sl}{ + <-> ssub * MontserratAlternates-TLF/extralight/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{sc}{ + <-> ssub * MontserratAlternates-TLF/extralight/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{it}{ + <-> ssub * MontserratAlternates-TLF/extralight/it }{} + +% l --> light + \DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{scsl}{ - <-> ssub * MontserratAlternates-TLF/l/scit + <-> ssub * MontserratAlternates-TLF/light/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{n}{ + <-> ssub * MontserratAlternates-TLF/light/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{scit}{ + <-> ssub * MontserratAlternates-TLF/light/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{it}{ + <-> ssub * MontserratAlternates-TLF/light/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{sc}{ + <-> ssub * MontserratAlternates-TLF/light/sc }{} \DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{sl}{ - <-> ssub * MontserratAlternates-TLF/l/it + <-> ssub * MontserratAlternates-TLF/light/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{mb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-tlf-sc-ot1 + +% sl --> regular + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sl}{n}{ + <-> ssub * MontserratAlternates-TLF/regular/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{mb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-tlf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sl}{scit}{ + <-> ssub * MontserratAlternates-TLF/regular/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-tlf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sl}{scsl}{ + <-> ssub * MontserratAlternates-TLF/regular/scsl }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-tlf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sl}{sl}{ + <-> ssub * MontserratAlternates-TLF/regular/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{mb}{scsl}{ - <-> ssub * MontserratAlternates-TLF/mb/scit +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sl}{sc}{ + <-> ssub * MontserratAlternates-TLF/regular/sc }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{mb}{sl}{ - <-> ssub * MontserratAlternates-TLF/mb/it +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sl}{it}{ + <-> ssub * MontserratAlternates-TLF/regular/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-tlf-ot1 + +% m --> medium + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{it}{ + <-> ssub * MontserratAlternates-TLF/medium/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{sc}{ + <-> ssub * MontserratAlternates-TLF/medium/sc }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-tlf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{sl}{ + <-> ssub * MontserratAlternates-TLF/medium/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-tlf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{scsl}{ + <-> ssub * MontserratAlternates-TLF/medium/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{n}{ + <-> ssub * MontserratAlternates-TLF/medium/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{scit}{ + <-> ssub * MontserratAlternates-TLF/medium/scit }{} + +% sb --> semibold + \DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{scsl}{ - <-> ssub * MontserratAlternates-TLF/sb/scit + <-> ssub * MontserratAlternates-TLF/semibold/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{n}{ + <-> ssub * MontserratAlternates-TLF/semibold/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{scit}{ + <-> ssub * MontserratAlternates-TLF/semibold/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{it}{ + <-> ssub * MontserratAlternates-TLF/semibold/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{sc}{ + <-> ssub * MontserratAlternates-TLF/semibold/sc }{} \DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{sl}{ - <-> ssub * MontserratAlternates-TLF/sb/it + <-> ssub * MontserratAlternates-TLF/semibold/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-tlf-ot1 + +% b --> bold + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{sl}{ + <-> ssub * MontserratAlternates-TLF/bold/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{t}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-tlf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{sc}{ + <-> ssub * MontserratAlternates-TLF/bold/sc }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{t}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{it}{ + <-> ssub * MontserratAlternates-TLF/bold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-tlf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{n}{ + <-> ssub * MontserratAlternates-TLF/bold/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{t}{scsl}{ - <-> ssub * MontserratAlternates-TLF/t/scit +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{scit}{ + <-> ssub * MontserratAlternates-TLF/bold/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{t}{sl}{ - <-> ssub * MontserratAlternates-TLF/t/it +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{scsl}{ + <-> ssub * MontserratAlternates-TLF/bold/scsl }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bx}{sl}{ - <-> ssub * MontserratAlternates-TLF/b/sl + +% eb --> extrabold + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{sl}{ + <-> ssub * MontserratAlternates-TLF/extrabold/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bx}{it}{ - <-> ssub * MontserratAlternates-TLF/b/it +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{sc}{ + <-> ssub * MontserratAlternates-TLF/extrabold/sc }{} -\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bx}{scsl}{ - <-> ssub * MontserratAlternates-TLF/b/scsl +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{it}{ + <-> ssub * MontserratAlternates-TLF/extrabold/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{scit}{ + <-> ssub * MontserratAlternates-TLF/extrabold/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{n}{ + <-> ssub * MontserratAlternates-TLF/extrabold/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{scsl}{ + <-> ssub * MontserratAlternates-TLF/extrabold/scsl +}{} + + +% ub --> black + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ub}{it}{ + <-> ssub * MontserratAlternates-TLF/black/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ub}{sc}{ + <-> ssub * MontserratAlternates-TLF/black/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ub}{sl}{ + <-> ssub * MontserratAlternates-TLF/black/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ub}{scsl}{ + <-> ssub * MontserratAlternates-TLF/black/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ub}{n}{ + <-> ssub * MontserratAlternates-TLF/black/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ub}{scit}{ + <-> ssub * MontserratAlternates-TLF/black/scit }{} \DeclareFontShape{OT1}{MontserratAlternates-TLF}{bx}{sc}{ <-> ssub * MontserratAlternates-TLF/b/sc }{} +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bx}{sl}{ + <-> ssub * MontserratAlternates-TLF/b/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bx}{it}{ + <-> ssub * MontserratAlternates-TLF/b/it +}{} + \DeclareFontShape{OT1}{MontserratAlternates-TLF}{bx}{scit}{ <-> ssub * MontserratAlternates-TLF/b/scit }{} @@ -251,4 +520,8 @@ <-> ssub * MontserratAlternates-TLF/b/n }{} +\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bx}{scsl}{ + <-> ssub * MontserratAlternates-TLF/b/scsl +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-TOsF.fd b/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-TOsF.fd index 0d4850128d3..e62b583044a 100644 --- a/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-TOsF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/OT1MontserratAlternates-TOsF.fd @@ -1,254 +1,527 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{OT1MontserratAlternates-TOsF.fd} - [2017/01/25 (autoinst) Font definitions for OT1/MontserratAlternates-TOsF.] + [2019/10/18 (autoinst) Font definitions for OT1/MontserratAlternates-TOsF.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{OT1}{MontserratAlternates-TOsF}{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-tosf-ot1 + +% ---- bold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-tosf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-tosf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-tosf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/eb/scit +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bold}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/bold/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{sl}{ - <-> ssub * MontserratAlternates-TOsF/eb/it +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bold}{sl}{ + <-> ssub * MontserratAlternates-TOsF/bold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-tosf-sc-ot1 + +% ---- thin ---- + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-tosf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{thin}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-tosf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tosf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-tosf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{thin}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/b/scit +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{thin}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/thin/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{sl}{ - <-> ssub * MontserratAlternates-TOsF/b/it +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{thin}{sl}{ + <-> ssub * MontserratAlternates-TOsF/thin/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{k}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-tosf-sc-ot1 + +% ---- black ---- + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{black}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-tosf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-tosf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{k}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Black-tosf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-tosf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{black}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{k}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/k/scit +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{black}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/black/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{k}{sl}{ - <-> ssub * MontserratAlternates-TOsF/k/it +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{black}{sl}{ + <-> ssub * MontserratAlternates-TOsF/black/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-tosf-sc-ot1 + +% ---- regular ---- + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-tosf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{regular}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-tosf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-tosf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{regular}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/el/scit +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{regular}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/regular/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{sl}{ - <-> ssub * MontserratAlternates-TOsF/el/it +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{regular}{sl}{ + <-> ssub * MontserratAlternates-TOsF/regular/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{mb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-tosf-sc-ot1 + +% ---- semibold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{semibold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-tosf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{mb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-tosf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{semibold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-tosf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{mb}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/mb/scit +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{semibold}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/semibold/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{mb}{sl}{ - <-> ssub * MontserratAlternates-TOsF/mb/it +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{semibold}{sl}{ + <-> ssub * MontserratAlternates-TOsF/semibold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{l}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-tosf-sc-ot1 + +% ---- light ---- + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-tosf-ot1 }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{l}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Light-tosf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{light}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{light}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{light}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/light/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{light}{sl}{ + <-> ssub * MontserratAlternates-TOsF/light/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{medium}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{medium}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{medium}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/medium/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{medium}{sl}{ + <-> ssub * MontserratAlternates-TOsF/medium/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extralight}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extralight}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extralight}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/extralight/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extralight}{sl}{ + <-> ssub * MontserratAlternates-TOsF/extralight/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extrabold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extrabold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extrabold}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ul}{sl}{ + <-> ssub * MontserratAlternates-TOsF/thin/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ul}{sc}{ + <-> ssub * MontserratAlternates-TOsF/thin/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ul}{it}{ + <-> ssub * MontserratAlternates-TOsF/thin/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ul}{n}{ + <-> ssub * MontserratAlternates-TOsF/thin/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ul}{scit}{ + <-> ssub * MontserratAlternates-TOsF/thin/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ul}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/thin/scsl +}{} + + +% el --> extralight + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{sl}{ + <-> ssub * MontserratAlternates-TOsF/extralight/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{sc}{ + <-> ssub * MontserratAlternates-TOsF/extralight/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{it}{ + <-> ssub * MontserratAlternates-TOsF/extralight/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{scit}{ + <-> ssub * MontserratAlternates-TOsF/extralight/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{n}{ + <-> ssub * MontserratAlternates-TOsF/extralight/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/extralight/scsl +}{} + + +% l --> light + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{l}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/light/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{l}{scit}{ + <-> ssub * MontserratAlternates-TOsF/light/scit }{} \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-tosf-ot1 + <-> ssub * MontserratAlternates-TOsF/light/n }{} \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-tosf-ot1 + <-> ssub * MontserratAlternates-TOsF/light/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{l}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/l/scit +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{l}{sc}{ + <-> ssub * MontserratAlternates-TOsF/light/sc }{} \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{l}{sl}{ - <-> ssub * MontserratAlternates-TOsF/l/it + <-> ssub * MontserratAlternates-TOsF/light/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{m}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-tosf-sc-ot1 + +% sl --> regular + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sl}{it}{ + <-> ssub * MontserratAlternates-TOsF/regular/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{m}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-tosf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sl}{sc}{ + <-> ssub * MontserratAlternates-TOsF/regular/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sl}{sl}{ + <-> ssub * MontserratAlternates-TOsF/regular/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sl}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/regular/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sl}{n}{ + <-> ssub * MontserratAlternates-TOsF/regular/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sl}{scit}{ + <-> ssub * MontserratAlternates-TOsF/regular/scit +}{} + + +% m --> medium + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{m}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/medium/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{m}{scit}{ + <-> ssub * MontserratAlternates-TOsF/medium/scit }{} \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-tosf-ot1 + <-> ssub * MontserratAlternates-TOsF/medium/n }{} \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-tosf-ot1 + <-> ssub * MontserratAlternates-TOsF/medium/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{m}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/m/scit +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{m}{sc}{ + <-> ssub * MontserratAlternates-TOsF/medium/sc }{} \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{m}{sl}{ - <-> ssub * MontserratAlternates-TOsF/m/it + <-> ssub * MontserratAlternates-TOsF/medium/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{t}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-tosf-sc-ot1 -}{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{t}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-tosf-sc-ot1 +% sb --> semibold + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{it}{ + <-> ssub * MontserratAlternates-TOsF/semibold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-tosf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{sc}{ + <-> ssub * MontserratAlternates-TOsF/semibold/sc }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-tosf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{sl}{ + <-> ssub * MontserratAlternates-TOsF/semibold/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{t}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/t/scit +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/semibold/scsl }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{t}{sl}{ - <-> ssub * MontserratAlternates-TOsF/t/it +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{n}{ + <-> ssub * MontserratAlternates-TOsF/semibold/n }{} \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-tosf-sc-ot1 + <-> ssub * MontserratAlternates-TOsF/semibold/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-tosf-ot1 + +% b --> bold + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{sl}{ + <-> ssub * MontserratAlternates-TOsF/bold/sl }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-tosf-sc-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{sc}{ + <-> ssub * MontserratAlternates-TOsF/bold/sc }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-tosf-ot1 +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{it}{ + <-> ssub * MontserratAlternates-TOsF/bold/it }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/sb/scit +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{scit}{ + <-> ssub * MontserratAlternates-TOsF/bold/scit }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{sl}{ - <-> ssub * MontserratAlternates-TOsF/sb/it +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{n}{ + <-> ssub * MontserratAlternates-TOsF/bold/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bx}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/b/scsl +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/bold/scsl }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bx}{scit}{ - <-> ssub * MontserratAlternates-TOsF/b/scit + +% eb --> extrabold + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{n}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bx}{sc}{ - <-> ssub * MontserratAlternates-TOsF/b/sc +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{scit}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{sl}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/sl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{sc}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{it}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/it +}{} + + +% ub --> black + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ub}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/black/scsl +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ub}{scit}{ + <-> ssub * MontserratAlternates-TOsF/black/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ub}{n}{ + <-> ssub * MontserratAlternates-TOsF/black/n +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ub}{it}{ + <-> ssub * MontserratAlternates-TOsF/black/it +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ub}{sc}{ + <-> ssub * MontserratAlternates-TOsF/black/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ub}{sl}{ + <-> ssub * MontserratAlternates-TOsF/black/sl }{} \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bx}{n}{ <-> ssub * MontserratAlternates-TOsF/b/n }{} -\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bx}{it}{ - <-> ssub * MontserratAlternates-TOsF/b/it +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bx}{scit}{ + <-> ssub * MontserratAlternates-TOsF/b/scit +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bx}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/b/scsl }{} \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bx}{sl}{ <-> ssub * MontserratAlternates-TOsF/b/sl }{} +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bx}{sc}{ + <-> ssub * MontserratAlternates-TOsF/b/sc +}{} + +\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bx}{it}{ + <-> ssub * MontserratAlternates-TOsF/b/it +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-Dnom.fd b/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-Dnom.fd index 6518c37a380..a96f33b0302 100644 --- a/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-Dnom.fd +++ b/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-Dnom.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{T1Montserrat-Dnom.fd} - [2017/01/25 (autoinst) Font definitions for T1/Montserrat-Dnom.] + [2019/10/18 (autoinst) Font definitions for T1/Montserrat-Dnom.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,124 +11,289 @@ \DeclareFontFamily{T1}{Montserrat-Dnom}{} -\DeclareFontShape{T1}{Montserrat-Dnom}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-dnom-t1 + +% ---- light ---- + +\DeclareFontShape{T1}{Montserrat-Dnom}{light}{n}{ + <-> \Montserrat@@scale Montserrat-Light-dnom-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Dnom}{light}{it}{ + <-> \Montserrat@@scale Montserrat-LightItalic-dnom-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Dnom}{light}{sl}{ + <-> ssub * Montserrat-Dnom/light/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{T1}{Montserrat-Dnom}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-dnom-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Dnom}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-dnom-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Dnom}{medium}{sl}{ + <-> ssub * Montserrat-Dnom/medium/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{T1}{Montserrat-Dnom}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-dnom-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Dnom}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-dnom-t1 }{} -\DeclareFontShape{T1}{Montserrat-Dnom}{t}{n}{ +\DeclareFontShape{T1}{Montserrat-Dnom}{extrabold}{sl}{ + <-> ssub * Montserrat-Dnom/extrabold/it +}{} + + +% ---- thin ---- + +\DeclareFontShape{T1}{Montserrat-Dnom}{thin}{n}{ <-> \Montserrat@@scale Montserrat-Thin-dnom-t1 }{} -\DeclareFontShape{T1}{Montserrat-Dnom}{t}{sl}{ - <-> ssub * Montserrat-Dnom/t/it +\DeclareFontShape{T1}{Montserrat-Dnom}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-dnom-t1 }{} -\DeclareFontShape{T1}{Montserrat-Dnom}{sb}{it}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-dnom-t1 +\DeclareFontShape{T1}{Montserrat-Dnom}{thin}{sl}{ + <-> ssub * Montserrat-Dnom/thin/it }{} -\DeclareFontShape{T1}{Montserrat-Dnom}{sb}{n}{ + +% ---- bold ---- + +\DeclareFontShape{T1}{Montserrat-Dnom}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-dnom-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Dnom}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-dnom-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Dnom}{bold}{sl}{ + <-> ssub * Montserrat-Dnom/bold/it +}{} + + +% ---- semibold ---- + +\DeclareFontShape{T1}{Montserrat-Dnom}{semibold}{n}{ <-> \Montserrat@@scale Montserrat-SemiBold-dnom-t1 }{} -\DeclareFontShape{T1}{Montserrat-Dnom}{sb}{sl}{ - <-> ssub * Montserrat-Dnom/sb/it +\DeclareFontShape{T1}{Montserrat-Dnom}{semibold}{it}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-dnom-t1 }{} -\DeclareFontShape{T1}{Montserrat-Dnom}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-dnom-t1 +\DeclareFontShape{T1}{Montserrat-Dnom}{semibold}{sl}{ + <-> ssub * Montserrat-Dnom/semibold/it }{} -\DeclareFontShape{T1}{Montserrat-Dnom}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-dnom-t1 + +% ---- black ---- + +\DeclareFontShape{T1}{Montserrat-Dnom}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-dnom-t1 }{} -\DeclareFontShape{T1}{Montserrat-Dnom}{mb}{sl}{ - <-> ssub * Montserrat-Dnom/mb/it +\DeclareFontShape{T1}{Montserrat-Dnom}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-dnom-t1 }{} -\DeclareFontShape{T1}{Montserrat-Dnom}{l}{it}{ - <-> \Montserrat@@scale Montserrat-LightItalic-dnom-t1 +\DeclareFontShape{T1}{Montserrat-Dnom}{black}{sl}{ + <-> ssub * Montserrat-Dnom/black/it }{} + +% ---- regular ---- + +\DeclareFontShape{T1}{Montserrat-Dnom}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-dnom-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Dnom}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-dnom-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Dnom}{regular}{sl}{ + <-> ssub * Montserrat-Dnom/regular/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{T1}{Montserrat-Dnom}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-dnom-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Dnom}{extralight}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-dnom-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Dnom}{extralight}{sl}{ + <-> ssub * Montserrat-Dnom/extralight/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{T1}{Montserrat-Dnom}{ul}{sl}{ + <-> ssub * Montserrat-Dnom/thin/sl +}{} + +\DeclareFontShape{T1}{Montserrat-Dnom}{ul}{n}{ + <-> ssub * Montserrat-Dnom/thin/n +}{} + +\DeclareFontShape{T1}{Montserrat-Dnom}{ul}{it}{ + <-> ssub * Montserrat-Dnom/thin/it +}{} + + +% el --> extralight + +\DeclareFontShape{T1}{Montserrat-Dnom}{el}{n}{ + <-> ssub * Montserrat-Dnom/extralight/n +}{} + +\DeclareFontShape{T1}{Montserrat-Dnom}{el}{sl}{ + <-> ssub * Montserrat-Dnom/extralight/sl +}{} + +\DeclareFontShape{T1}{Montserrat-Dnom}{el}{it}{ + <-> ssub * Montserrat-Dnom/extralight/it +}{} + + +% l --> light + \DeclareFontShape{T1}{Montserrat-Dnom}{l}{n}{ - <-> \Montserrat@@scale Montserrat-Light-dnom-t1 + <-> ssub * Montserrat-Dnom/light/n }{} \DeclareFontShape{T1}{Montserrat-Dnom}{l}{sl}{ - <-> ssub * Montserrat-Dnom/l/it + <-> ssub * Montserrat-Dnom/light/sl }{} -\DeclareFontShape{T1}{Montserrat-Dnom}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-dnom-t1 +\DeclareFontShape{T1}{Montserrat-Dnom}{l}{it}{ + <-> ssub * Montserrat-Dnom/light/it }{} -\DeclareFontShape{T1}{Montserrat-Dnom}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-dnom-t1 + +% sl --> regular + +\DeclareFontShape{T1}{Montserrat-Dnom}{sl}{sl}{ + <-> ssub * Montserrat-Dnom/regular/sl }{} +\DeclareFontShape{T1}{Montserrat-Dnom}{sl}{n}{ + <-> ssub * Montserrat-Dnom/regular/n +}{} + +\DeclareFontShape{T1}{Montserrat-Dnom}{sl}{it}{ + <-> ssub * Montserrat-Dnom/regular/it +}{} + + +% m --> medium + \DeclareFontShape{T1}{Montserrat-Dnom}{m}{sl}{ - <-> ssub * Montserrat-Dnom/m/it + <-> ssub * Montserrat-Dnom/medium/sl }{} -\DeclareFontShape{T1}{Montserrat-Dnom}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-dnom-t1 +\DeclareFontShape{T1}{Montserrat-Dnom}{m}{n}{ + <-> ssub * Montserrat-Dnom/medium/n +}{} + +\DeclareFontShape{T1}{Montserrat-Dnom}{m}{it}{ + <-> ssub * Montserrat-Dnom/medium/it }{} + +% sb --> semibold + +\DeclareFontShape{T1}{Montserrat-Dnom}{sb}{n}{ + <-> ssub * Montserrat-Dnom/semibold/n +}{} + +\DeclareFontShape{T1}{Montserrat-Dnom}{sb}{sl}{ + <-> ssub * Montserrat-Dnom/semibold/sl +}{} + +\DeclareFontShape{T1}{Montserrat-Dnom}{sb}{it}{ + <-> ssub * Montserrat-Dnom/semibold/it +}{} + + +% b --> bold + \DeclareFontShape{T1}{Montserrat-Dnom}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-dnom-t1 + <-> ssub * Montserrat-Dnom/bold/it }{} \DeclareFontShape{T1}{Montserrat-Dnom}{b}{sl}{ - <-> ssub * Montserrat-Dnom/b/it + <-> ssub * Montserrat-Dnom/bold/sl }{} -\DeclareFontShape{T1}{Montserrat-Dnom}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-dnom-t1 +\DeclareFontShape{T1}{Montserrat-Dnom}{b}{n}{ + <-> ssub * Montserrat-Dnom/bold/n }{} + +% eb --> extrabold + \DeclareFontShape{T1}{Montserrat-Dnom}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-dnom-t1 + <-> ssub * Montserrat-Dnom/extrabold/n }{} \DeclareFontShape{T1}{Montserrat-Dnom}{eb}{sl}{ - <-> ssub * Montserrat-Dnom/eb/it + <-> ssub * Montserrat-Dnom/extrabold/sl }{} -\DeclareFontShape{T1}{Montserrat-Dnom}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-dnom-t1 +\DeclareFontShape{T1}{Montserrat-Dnom}{eb}{it}{ + <-> ssub * Montserrat-Dnom/extrabold/it }{} -\DeclareFontShape{T1}{Montserrat-Dnom}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-dnom-t1 -}{} -\DeclareFontShape{T1}{Montserrat-Dnom}{k}{sl}{ - <-> ssub * Montserrat-Dnom/k/it -}{} +% ub --> black -\DeclareFontShape{T1}{Montserrat-Dnom}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-dnom-t1 +\DeclareFontShape{T1}{Montserrat-Dnom}{ub}{it}{ + <-> ssub * Montserrat-Dnom/black/it }{} -\DeclareFontShape{T1}{Montserrat-Dnom}{el}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-dnom-t1 +\DeclareFontShape{T1}{Montserrat-Dnom}{ub}{n}{ + <-> ssub * Montserrat-Dnom/black/n }{} -\DeclareFontShape{T1}{Montserrat-Dnom}{el}{sl}{ - <-> ssub * Montserrat-Dnom/el/it +\DeclareFontShape{T1}{Montserrat-Dnom}{ub}{sl}{ + <-> ssub * Montserrat-Dnom/black/sl }{} \DeclareFontShape{T1}{Montserrat-Dnom}{bx}{it}{ <-> ssub * Montserrat-Dnom/b/it }{} -\DeclareFontShape{T1}{Montserrat-Dnom}{bx}{sl}{ - <-> ssub * Montserrat-Dnom/b/sl -}{} - \DeclareFontShape{T1}{Montserrat-Dnom}{bx}{n}{ <-> ssub * Montserrat-Dnom/b/n }{} +\DeclareFontShape{T1}{Montserrat-Dnom}{bx}{sl}{ + <-> ssub * Montserrat-Dnom/b/sl +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-Inf.fd b/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-Inf.fd index fbee75c5fb9..27ef201f8bf 100644 --- a/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-Inf.fd +++ b/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{T1Montserrat-Inf.fd} - [2017/01/25 (autoinst) Font definitions for T1/Montserrat-Inf.] + [2019/10/18 (autoinst) Font definitions for T1/Montserrat-Inf.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,116 +11,277 @@ \DeclareFontFamily{T1}{Montserrat-Inf}{} -\DeclareFontShape{T1}{Montserrat-Inf}{el}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-inf-t1 + +% ---- light ---- + +\DeclareFontShape{T1}{Montserrat-Inf}{light}{it}{ + <-> \Montserrat@@scale Montserrat-LightItalic-inf-t1 }{} -\DeclareFontShape{T1}{Montserrat-Inf}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-inf-t1 +\DeclareFontShape{T1}{Montserrat-Inf}{light}{n}{ + <-> \Montserrat@@scale Montserrat-Light-inf-t1 }{} -\DeclareFontShape{T1}{Montserrat-Inf}{el}{sl}{ - <-> ssub * Montserrat-Inf/el/it +\DeclareFontShape{T1}{Montserrat-Inf}{light}{sl}{ + <-> ssub * Montserrat-Inf/light/it }{} -\DeclareFontShape{T1}{Montserrat-Inf}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-inf-t1 + +% ---- medium ---- + +\DeclareFontShape{T1}{Montserrat-Inf}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-inf-t1 }{} -\DeclareFontShape{T1}{Montserrat-Inf}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-inf-t1 +\DeclareFontShape{T1}{Montserrat-Inf}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-inf-t1 }{} -\DeclareFontShape{T1}{Montserrat-Inf}{k}{sl}{ - <-> ssub * Montserrat-Inf/k/it +\DeclareFontShape{T1}{Montserrat-Inf}{medium}{sl}{ + <-> ssub * Montserrat-Inf/medium/it }{} -\DeclareFontShape{T1}{Montserrat-Inf}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-inf-t1 + +% ---- thin ---- + +\DeclareFontShape{T1}{Montserrat-Inf}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-inf-t1 }{} -\DeclareFontShape{T1}{Montserrat-Inf}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-inf-t1 +\DeclareFontShape{T1}{Montserrat-Inf}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-inf-t1 }{} -\DeclareFontShape{T1}{Montserrat-Inf}{b}{sl}{ - <-> ssub * Montserrat-Inf/b/it +\DeclareFontShape{T1}{Montserrat-Inf}{thin}{sl}{ + <-> ssub * Montserrat-Inf/thin/it }{} -\DeclareFontShape{T1}{Montserrat-Inf}{eb}{it}{ + +% ---- extrabold ---- + +\DeclareFontShape{T1}{Montserrat-Inf}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-inf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Inf}{extrabold}{it}{ <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-inf-t1 }{} -\DeclareFontShape{T1}{Montserrat-Inf}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-inf-t1 +\DeclareFontShape{T1}{Montserrat-Inf}{extrabold}{sl}{ + <-> ssub * Montserrat-Inf/extrabold/it }{} -\DeclareFontShape{T1}{Montserrat-Inf}{eb}{sl}{ - <-> ssub * Montserrat-Inf/eb/it + +% ---- semibold ---- + +\DeclareFontShape{T1}{Montserrat-Inf}{semibold}{it}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-inf-t1 }{} -\DeclareFontShape{T1}{Montserrat-Inf}{m}{it}{ +\DeclareFontShape{T1}{Montserrat-Inf}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-inf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Inf}{semibold}{sl}{ + <-> ssub * Montserrat-Inf/semibold/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{T1}{Montserrat-Inf}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-inf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Inf}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-inf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Inf}{bold}{sl}{ + <-> ssub * Montserrat-Inf/bold/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{T1}{Montserrat-Inf}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-inf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Inf}{extralight}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-inf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Inf}{extralight}{sl}{ + <-> ssub * Montserrat-Inf/extralight/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{T1}{Montserrat-Inf}{regular}{it}{ <-> \Montserrat@@scale Montserrat-Italic-inf-t1 }{} -\DeclareFontShape{T1}{Montserrat-Inf}{m}{n}{ +\DeclareFontShape{T1}{Montserrat-Inf}{regular}{n}{ <-> \Montserrat@@scale Montserrat-Regular-inf-t1 }{} -\DeclareFontShape{T1}{Montserrat-Inf}{m}{sl}{ - <-> ssub * Montserrat-Inf/m/it +\DeclareFontShape{T1}{Montserrat-Inf}{regular}{sl}{ + <-> ssub * Montserrat-Inf/regular/it }{} -\DeclareFontShape{T1}{Montserrat-Inf}{l}{it}{ - <-> \Montserrat@@scale Montserrat-LightItalic-inf-t1 + +% ---- black ---- + +\DeclareFontShape{T1}{Montserrat-Inf}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-inf-t1 }{} -\DeclareFontShape{T1}{Montserrat-Inf}{l}{n}{ - <-> \Montserrat@@scale Montserrat-Light-inf-t1 +\DeclareFontShape{T1}{Montserrat-Inf}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-inf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Inf}{black}{sl}{ + <-> ssub * Montserrat-Inf/black/it }{} +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{T1}{Montserrat-Inf}{ul}{it}{ + <-> ssub * Montserrat-Inf/thin/it +}{} + +\DeclareFontShape{T1}{Montserrat-Inf}{ul}{n}{ + <-> ssub * Montserrat-Inf/thin/n +}{} + +\DeclareFontShape{T1}{Montserrat-Inf}{ul}{sl}{ + <-> ssub * Montserrat-Inf/thin/sl +}{} + + +% el --> extralight + +\DeclareFontShape{T1}{Montserrat-Inf}{el}{sl}{ + <-> ssub * Montserrat-Inf/extralight/sl +}{} + +\DeclareFontShape{T1}{Montserrat-Inf}{el}{n}{ + <-> ssub * Montserrat-Inf/extralight/n +}{} + +\DeclareFontShape{T1}{Montserrat-Inf}{el}{it}{ + <-> ssub * Montserrat-Inf/extralight/it +}{} + + +% l --> light + \DeclareFontShape{T1}{Montserrat-Inf}{l}{sl}{ - <-> ssub * Montserrat-Inf/l/it + <-> ssub * Montserrat-Inf/light/sl }{} -\DeclareFontShape{T1}{Montserrat-Inf}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-inf-t1 +\DeclareFontShape{T1}{Montserrat-Inf}{l}{n}{ + <-> ssub * Montserrat-Inf/light/n }{} -\DeclareFontShape{T1}{Montserrat-Inf}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-inf-t1 +\DeclareFontShape{T1}{Montserrat-Inf}{l}{it}{ + <-> ssub * Montserrat-Inf/light/it +}{} + + +% sl --> regular + +\DeclareFontShape{T1}{Montserrat-Inf}{sl}{it}{ + <-> ssub * Montserrat-Inf/regular/it }{} -\DeclareFontShape{T1}{Montserrat-Inf}{mb}{sl}{ - <-> ssub * Montserrat-Inf/mb/it +\DeclareFontShape{T1}{Montserrat-Inf}{sl}{sl}{ + <-> ssub * Montserrat-Inf/regular/sl }{} -\DeclareFontShape{T1}{Montserrat-Inf}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-inf-t1 +\DeclareFontShape{T1}{Montserrat-Inf}{sl}{n}{ + <-> ssub * Montserrat-Inf/regular/n }{} + +% m --> medium + +\DeclareFontShape{T1}{Montserrat-Inf}{m}{n}{ + <-> ssub * Montserrat-Inf/medium/n +}{} + +\DeclareFontShape{T1}{Montserrat-Inf}{m}{sl}{ + <-> ssub * Montserrat-Inf/medium/sl +}{} + +\DeclareFontShape{T1}{Montserrat-Inf}{m}{it}{ + <-> ssub * Montserrat-Inf/medium/it +}{} + + +% sb --> semibold + \DeclareFontShape{T1}{Montserrat-Inf}{sb}{it}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-inf-t1 + <-> ssub * Montserrat-Inf/semibold/it +}{} + +\DeclareFontShape{T1}{Montserrat-Inf}{sb}{n}{ + <-> ssub * Montserrat-Inf/semibold/n }{} \DeclareFontShape{T1}{Montserrat-Inf}{sb}{sl}{ - <-> ssub * Montserrat-Inf/sb/it + <-> ssub * Montserrat-Inf/semibold/sl }{} -\DeclareFontShape{T1}{Montserrat-Inf}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-inf-t1 + +% b --> bold + +\DeclareFontShape{T1}{Montserrat-Inf}{b}{it}{ + <-> ssub * Montserrat-Inf/bold/it }{} -\DeclareFontShape{T1}{Montserrat-Inf}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-inf-t1 +\DeclareFontShape{T1}{Montserrat-Inf}{b}{n}{ + <-> ssub * Montserrat-Inf/bold/n }{} -\DeclareFontShape{T1}{Montserrat-Inf}{t}{sl}{ - <-> ssub * Montserrat-Inf/t/it +\DeclareFontShape{T1}{Montserrat-Inf}{b}{sl}{ + <-> ssub * Montserrat-Inf/bold/sl }{} -\DeclareFontShape{T1}{Montserrat-Inf}{bx}{sl}{ - <-> ssub * Montserrat-Inf/b/sl + +% eb --> extrabold + +\DeclareFontShape{T1}{Montserrat-Inf}{eb}{it}{ + <-> ssub * Montserrat-Inf/extrabold/it +}{} + +\DeclareFontShape{T1}{Montserrat-Inf}{eb}{n}{ + <-> ssub * Montserrat-Inf/extrabold/n +}{} + +\DeclareFontShape{T1}{Montserrat-Inf}{eb}{sl}{ + <-> ssub * Montserrat-Inf/extrabold/sl +}{} + + +% ub --> black + +\DeclareFontShape{T1}{Montserrat-Inf}{ub}{n}{ + <-> ssub * Montserrat-Inf/black/n +}{} + +\DeclareFontShape{T1}{Montserrat-Inf}{ub}{sl}{ + <-> ssub * Montserrat-Inf/black/sl +}{} + +\DeclareFontShape{T1}{Montserrat-Inf}{ub}{it}{ + <-> ssub * Montserrat-Inf/black/it }{} \DeclareFontShape{T1}{Montserrat-Inf}{bx}{it}{ @@ -131,4 +292,8 @@ <-> ssub * Montserrat-Inf/b/n }{} +\DeclareFontShape{T1}{Montserrat-Inf}{bx}{sl}{ + <-> ssub * Montserrat-Inf/b/sl +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-LF.fd b/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-LF.fd index 5683ebf66bd..c010c42cdd2 100644 --- a/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-LF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{T1Montserrat-LF.fd} - [2017/01/25 (autoinst) Font definitions for T1/Montserrat-LF.] + [2019/10/18 (autoinst) Font definitions for T1/Montserrat-LF.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,224 +11,497 @@ \DeclareFontFamily{T1}{Montserrat-LF}{} -\DeclareFontShape{T1}{Montserrat-LF}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-lf-t1 + +% ---- medium ---- + +\DeclareFontShape{T1}{Montserrat-LF}{medium}{scit}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-lf-t1 +\DeclareFontShape{T1}{Montserrat-LF}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-lf-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{mb}{scit}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-lf-sc-t1 +\DeclareFontShape{T1}{Montserrat-LF}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-lf-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{mb}{sc}{ +\DeclareFontShape{T1}{Montserrat-LF}{medium}{sc}{ <-> \Montserrat@@scale Montserrat-Medium-lf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{mb}{scsl}{ - <-> ssub * Montserrat-LF/mb/scit +\DeclareFontShape{T1}{Montserrat-LF}{medium}{sl}{ + <-> ssub * Montserrat-LF/medium/it }{} -\DeclareFontShape{T1}{Montserrat-LF}{mb}{sl}{ - <-> ssub * Montserrat-LF/mb/it +\DeclareFontShape{T1}{Montserrat-LF}{medium}{scsl}{ + <-> ssub * Montserrat-LF/medium/scit }{} -\DeclareFontShape{T1}{Montserrat-LF}{l}{scit}{ - <-> \Montserrat@@scale Montserrat-LightItalic-lf-sc-t1 + +% ---- light ---- + +\DeclareFontShape{T1}{Montserrat-LF}{light}{sc}{ + <-> \Montserrat@@scale Montserrat-Light-lf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{l}{n}{ +\DeclareFontShape{T1}{Montserrat-LF}{light}{n}{ <-> \Montserrat@@scale Montserrat-Light-lf-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{l}{sc}{ - <-> \Montserrat@@scale Montserrat-Light-lf-sc-t1 +\DeclareFontShape{T1}{Montserrat-LF}{light}{it}{ + <-> \Montserrat@@scale Montserrat-LightItalic-lf-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{l}{it}{ - <-> \Montserrat@@scale Montserrat-LightItalic-lf-t1 +\DeclareFontShape{T1}{Montserrat-LF}{light}{scit}{ + <-> \Montserrat@@scale Montserrat-LightItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{l}{scsl}{ - <-> ssub * Montserrat-LF/l/scit +\DeclareFontShape{T1}{Montserrat-LF}{light}{sl}{ + <-> ssub * Montserrat-LF/light/it }{} -\DeclareFontShape{T1}{Montserrat-LF}{l}{sl}{ - <-> ssub * Montserrat-LF/l/it +\DeclareFontShape{T1}{Montserrat-LF}{light}{scsl}{ + <-> ssub * Montserrat-LF/light/scit }{} -\DeclareFontShape{T1}{Montserrat-LF}{m}{sc}{ - <-> \Montserrat@@scale Montserrat-Regular-lf-sc-t1 + +% ---- thin ---- + +\DeclareFontShape{T1}{Montserrat-LF}{thin}{sc}{ + <-> \Montserrat@@scale Montserrat-Thin-lf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-lf-t1 +\DeclareFontShape{T1}{Montserrat-LF}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-lf-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{m}{scit}{ - <-> \Montserrat@@scale Montserrat-Italic-lf-sc-t1 +\DeclareFontShape{T1}{Montserrat-LF}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-lf-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-lf-t1 +\DeclareFontShape{T1}{Montserrat-LF}{thin}{scit}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{m}{scsl}{ - <-> ssub * Montserrat-LF/m/scit +\DeclareFontShape{T1}{Montserrat-LF}{thin}{sl}{ + <-> ssub * Montserrat-LF/thin/it }{} -\DeclareFontShape{T1}{Montserrat-LF}{m}{sl}{ - <-> ssub * Montserrat-LF/m/it +\DeclareFontShape{T1}{Montserrat-LF}{thin}{scsl}{ + <-> ssub * Montserrat-LF/thin/scit }{} -\DeclareFontShape{T1}{Montserrat-LF}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-lf-t1 + +% ---- extrabold ---- + +\DeclareFontShape{T1}{Montserrat-LF}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-lf-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{t}{scit}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-lf-sc-t1 +\DeclareFontShape{T1}{Montserrat-LF}{extrabold}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-lf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{t}{sc}{ - <-> \Montserrat@@scale Montserrat-Thin-lf-sc-t1 +\DeclareFontShape{T1}{Montserrat-LF}{extrabold}{scit}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-lf-t1 +\DeclareFontShape{T1}{Montserrat-LF}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{t}{scsl}{ - <-> ssub * Montserrat-LF/t/scit +\DeclareFontShape{T1}{Montserrat-LF}{extrabold}{sl}{ + <-> ssub * Montserrat-LF/extrabold/it }{} -\DeclareFontShape{T1}{Montserrat-LF}{t}{sl}{ - <-> ssub * Montserrat-LF/t/it +\DeclareFontShape{T1}{Montserrat-LF}{extrabold}{scsl}{ + <-> ssub * Montserrat-LF/extrabold/scit }{} -\DeclareFontShape{T1}{Montserrat-LF}{sb}{it}{ + +% ---- semibold ---- + +\DeclareFontShape{T1}{Montserrat-LF}{semibold}{it}{ <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-lf-t1 +\DeclareFontShape{T1}{Montserrat-LF}{semibold}{scit}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{sb}{scit}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-sc-t1 +\DeclareFontShape{T1}{Montserrat-LF}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-lf-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{sb}{sc}{ +\DeclareFontShape{T1}{Montserrat-LF}{semibold}{sc}{ <-> \Montserrat@@scale Montserrat-SemiBold-lf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{sb}{scsl}{ - <-> ssub * Montserrat-LF/sb/scit +\DeclareFontShape{T1}{Montserrat-LF}{semibold}{sl}{ + <-> ssub * Montserrat-LF/semibold/it }{} -\DeclareFontShape{T1}{Montserrat-LF}{sb}{sl}{ - <-> ssub * Montserrat-LF/sb/it +\DeclareFontShape{T1}{Montserrat-LF}{semibold}{scsl}{ + <-> ssub * Montserrat-LF/semibold/scit }{} -\DeclareFontShape{T1}{Montserrat-LF}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-t1 + +% ---- bold ---- + +\DeclareFontShape{T1}{Montserrat-LF}{bold}{scit}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-lf-t1 +\DeclareFontShape{T1}{Montserrat-LF}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-lf-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{eb}{scit}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-sc-t1 +\DeclareFontShape{T1}{Montserrat-LF}{bold}{sc}{ + <-> \Montserrat@@scale Montserrat-Bold-lf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{eb}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-lf-sc-t1 +\DeclareFontShape{T1}{Montserrat-LF}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-lf-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{eb}{scsl}{ - <-> ssub * Montserrat-LF/eb/scit +\DeclareFontShape{T1}{Montserrat-LF}{bold}{sl}{ + <-> ssub * Montserrat-LF/bold/it }{} -\DeclareFontShape{T1}{Montserrat-LF}{eb}{sl}{ - <-> ssub * Montserrat-LF/eb/it +\DeclareFontShape{T1}{Montserrat-LF}{bold}{scsl}{ + <-> ssub * Montserrat-LF/bold/scit }{} -\DeclareFontShape{T1}{Montserrat-LF}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-lf-t1 + +% ---- extralight ---- + +\DeclareFontShape{T1}{Montserrat-LF}{extralight}{scit}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{b}{scit}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-lf-sc-t1 +\DeclareFontShape{T1}{Montserrat-LF}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-lf-t1 +\DeclareFontShape{T1}{Montserrat-LF}{extralight}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-lf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{b}{sc}{ - <-> \Montserrat@@scale Montserrat-Bold-lf-sc-t1 +\DeclareFontShape{T1}{Montserrat-LF}{extralight}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-lf-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{b}{scsl}{ - <-> ssub * Montserrat-LF/b/scit +\DeclareFontShape{T1}{Montserrat-LF}{extralight}{sl}{ + <-> ssub * Montserrat-LF/extralight/it }{} -\DeclareFontShape{T1}{Montserrat-LF}{b}{sl}{ - <-> ssub * Montserrat-LF/b/it +\DeclareFontShape{T1}{Montserrat-LF}{extralight}{scsl}{ + <-> ssub * Montserrat-LF/extralight/scit }{} -\DeclareFontShape{T1}{Montserrat-LF}{k}{scit}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-lf-sc-t1 + +% ---- regular ---- + +\DeclareFontShape{T1}{Montserrat-LF}{regular}{sc}{ + <-> \Montserrat@@scale Montserrat-Regular-lf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{k}{sc}{ - <-> \Montserrat@@scale Montserrat-Black-lf-sc-t1 +\DeclareFontShape{T1}{Montserrat-LF}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-lf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-lf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{regular}{scit}{ + <-> \Montserrat@@scale Montserrat-Italic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{k}{n}{ +\DeclareFontShape{T1}{Montserrat-LF}{regular}{sl}{ + <-> ssub * Montserrat-LF/regular/it +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{regular}{scsl}{ + <-> ssub * Montserrat-LF/regular/scit +}{} + + +% ---- black ---- + +\DeclareFontShape{T1}{Montserrat-LF}{black}{n}{ <-> \Montserrat@@scale Montserrat-Black-lf-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{k}{it}{ +\DeclareFontShape{T1}{Montserrat-LF}{black}{sc}{ + <-> \Montserrat@@scale Montserrat-Black-lf-sc-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{black}{it}{ <-> \Montserrat@@scale Montserrat-BlackItalic-lf-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{k}{scsl}{ - <-> ssub * Montserrat-LF/k/scit +\DeclareFontShape{T1}{Montserrat-LF}{black}{scit}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-LF}{k}{sl}{ - <-> ssub * Montserrat-LF/k/it +\DeclareFontShape{T1}{Montserrat-LF}{black}{sl}{ + <-> ssub * Montserrat-LF/black/it }{} -\DeclareFontShape{T1}{Montserrat-LF}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-t1 +\DeclareFontShape{T1}{Montserrat-LF}{black}{scsl}{ + <-> ssub * Montserrat-LF/black/scit }{} -\DeclareFontShape{T1}{Montserrat-LF}{el}{scit}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-sc-t1 +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{T1}{Montserrat-LF}{ul}{sl}{ + <-> ssub * Montserrat-LF/thin/sl +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{ul}{scsl}{ + <-> ssub * Montserrat-LF/thin/scsl }{} +\DeclareFontShape{T1}{Montserrat-LF}{ul}{sc}{ + <-> ssub * Montserrat-LF/thin/sc +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{ul}{n}{ + <-> ssub * Montserrat-LF/thin/n +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{ul}{scit}{ + <-> ssub * Montserrat-LF/thin/scit +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{ul}{it}{ + <-> ssub * Montserrat-LF/thin/it +}{} + + +% el --> extralight + \DeclareFontShape{T1}{Montserrat-LF}{el}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-lf-sc-t1 + <-> ssub * Montserrat-LF/extralight/sc }{} \DeclareFontShape{T1}{Montserrat-LF}{el}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-lf-t1 + <-> ssub * Montserrat-LF/extralight/n }{} \DeclareFontShape{T1}{Montserrat-LF}{el}{scsl}{ - <-> ssub * Montserrat-LF/el/scit + <-> ssub * Montserrat-LF/extralight/scsl }{} \DeclareFontShape{T1}{Montserrat-LF}{el}{sl}{ - <-> ssub * Montserrat-LF/el/it + <-> ssub * Montserrat-LF/extralight/sl }{} -\DeclareFontShape{T1}{Montserrat-LF}{bx}{scit}{ - <-> ssub * Montserrat-LF/b/scit +\DeclareFontShape{T1}{Montserrat-LF}{el}{it}{ + <-> ssub * Montserrat-LF/extralight/it +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{el}{scit}{ + <-> ssub * Montserrat-LF/extralight/scit +}{} + + +% l --> light + +\DeclareFontShape{T1}{Montserrat-LF}{l}{sl}{ + <-> ssub * Montserrat-LF/light/sl +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{l}{scsl}{ + <-> ssub * Montserrat-LF/light/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{l}{sc}{ + <-> ssub * Montserrat-LF/light/sc +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{l}{n}{ + <-> ssub * Montserrat-LF/light/n +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{l}{scit}{ + <-> ssub * Montserrat-LF/light/scit +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{l}{it}{ + <-> ssub * Montserrat-LF/light/it +}{} + + +% sl --> regular + +\DeclareFontShape{T1}{Montserrat-LF}{sl}{scit}{ + <-> ssub * Montserrat-LF/regular/scit +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{sl}{it}{ + <-> ssub * Montserrat-LF/regular/it +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{sl}{sl}{ + <-> ssub * Montserrat-LF/regular/sl +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{sl}{scsl}{ + <-> ssub * Montserrat-LF/regular/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{sl}{sc}{ + <-> ssub * Montserrat-LF/regular/sc +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{sl}{n}{ + <-> ssub * Montserrat-LF/regular/n +}{} + + +% m --> medium + +\DeclareFontShape{T1}{Montserrat-LF}{m}{it}{ + <-> ssub * Montserrat-LF/medium/it +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{m}{scit}{ + <-> ssub * Montserrat-LF/medium/scit +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{m}{scsl}{ + <-> ssub * Montserrat-LF/medium/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{m}{n}{ + <-> ssub * Montserrat-LF/medium/n +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{m}{sc}{ + <-> ssub * Montserrat-LF/medium/sc +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{m}{sl}{ + <-> ssub * Montserrat-LF/medium/sl +}{} + + +% sb --> semibold + +\DeclareFontShape{T1}{Montserrat-LF}{sb}{it}{ + <-> ssub * Montserrat-LF/semibold/it +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{sb}{scit}{ + <-> ssub * Montserrat-LF/semibold/scit +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{sb}{scsl}{ + <-> ssub * Montserrat-LF/semibold/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{sb}{n}{ + <-> ssub * Montserrat-LF/semibold/n +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{sb}{sc}{ + <-> ssub * Montserrat-LF/semibold/sc +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{sb}{sl}{ + <-> ssub * Montserrat-LF/semibold/sl +}{} + + +% b --> bold + +\DeclareFontShape{T1}{Montserrat-LF}{b}{it}{ + <-> ssub * Montserrat-LF/bold/it +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{b}{scit}{ + <-> ssub * Montserrat-LF/bold/scit +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{b}{sc}{ + <-> ssub * Montserrat-LF/bold/sc +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{b}{n}{ + <-> ssub * Montserrat-LF/bold/n +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{b}{scsl}{ + <-> ssub * Montserrat-LF/bold/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{b}{sl}{ + <-> ssub * Montserrat-LF/bold/sl +}{} + + +% eb --> extrabold + +\DeclareFontShape{T1}{Montserrat-LF}{eb}{sl}{ + <-> ssub * Montserrat-LF/extrabold/sl +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{eb}{scsl}{ + <-> ssub * Montserrat-LF/extrabold/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{eb}{n}{ + <-> ssub * Montserrat-LF/extrabold/n +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{eb}{sc}{ + <-> ssub * Montserrat-LF/extrabold/sc +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{eb}{scit}{ + <-> ssub * Montserrat-LF/extrabold/scit +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{eb}{it}{ + <-> ssub * Montserrat-LF/extrabold/it +}{} + + +% ub --> black + +\DeclareFontShape{T1}{Montserrat-LF}{ub}{sl}{ + <-> ssub * Montserrat-LF/black/sl +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{ub}{n}{ + <-> ssub * Montserrat-LF/black/n +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{ub}{sc}{ + <-> ssub * Montserrat-LF/black/sc +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{ub}{scsl}{ + <-> ssub * Montserrat-LF/black/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{ub}{scit}{ + <-> ssub * Montserrat-LF/black/scit +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{ub}{it}{ + <-> ssub * Montserrat-LF/black/it +}{} + +\DeclareFontShape{T1}{Montserrat-LF}{bx}{sl}{ + <-> ssub * Montserrat-LF/b/sl }{} \DeclareFontShape{T1}{Montserrat-LF}{bx}{scsl}{ @@ -243,12 +516,12 @@ <-> ssub * Montserrat-LF/b/sc }{} -\DeclareFontShape{T1}{Montserrat-LF}{bx}{it}{ - <-> ssub * Montserrat-LF/b/it +\DeclareFontShape{T1}{Montserrat-LF}{bx}{scit}{ + <-> ssub * Montserrat-LF/b/scit }{} -\DeclareFontShape{T1}{Montserrat-LF}{bx}{sl}{ - <-> ssub * Montserrat-LF/b/sl +\DeclareFontShape{T1}{Montserrat-LF}{bx}{it}{ + <-> ssub * Montserrat-LF/b/it }{} \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-Numr.fd b/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-Numr.fd index d23132c5a0b..286b9e87f8c 100644 --- a/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-Numr.fd +++ b/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-Numr.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{T1Montserrat-Numr.fd} - [2017/01/25 (autoinst) Font definitions for T1/Montserrat-Numr.] + [2019/10/18 (autoinst) Font definitions for T1/Montserrat-Numr.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,124 +11,289 @@ \DeclareFontFamily{T1}{Montserrat-Numr}{} -\DeclareFontShape{T1}{Montserrat-Numr}{m}{it}{ + +% ---- semibold ---- + +\DeclareFontShape{T1}{Montserrat-Numr}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-numr-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Numr}{semibold}{it}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-numr-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Numr}{semibold}{sl}{ + <-> ssub * Montserrat-Numr/semibold/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{T1}{Montserrat-Numr}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-numr-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Numr}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-numr-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Numr}{bold}{sl}{ + <-> ssub * Montserrat-Numr/bold/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{T1}{Montserrat-Numr}{extralight}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-numr-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Numr}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-numr-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Numr}{extralight}{sl}{ + <-> ssub * Montserrat-Numr/extralight/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{T1}{Montserrat-Numr}{regular}{it}{ <-> \Montserrat@@scale Montserrat-Italic-numr-t1 }{} -\DeclareFontShape{T1}{Montserrat-Numr}{m}{n}{ +\DeclareFontShape{T1}{Montserrat-Numr}{regular}{n}{ <-> \Montserrat@@scale Montserrat-Regular-numr-t1 }{} -\DeclareFontShape{T1}{Montserrat-Numr}{m}{sl}{ - <-> ssub * Montserrat-Numr/m/it +\DeclareFontShape{T1}{Montserrat-Numr}{regular}{sl}{ + <-> ssub * Montserrat-Numr/regular/it }{} -\DeclareFontShape{T1}{Montserrat-Numr}{l}{n}{ + +% ---- black ---- + +\DeclareFontShape{T1}{Montserrat-Numr}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-numr-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Numr}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-numr-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Numr}{black}{sl}{ + <-> ssub * Montserrat-Numr/black/it +}{} + + +% ---- light ---- + +\DeclareFontShape{T1}{Montserrat-Numr}{light}{n}{ <-> \Montserrat@@scale Montserrat-Light-numr-t1 }{} -\DeclareFontShape{T1}{Montserrat-Numr}{l}{it}{ +\DeclareFontShape{T1}{Montserrat-Numr}{light}{it}{ <-> \Montserrat@@scale Montserrat-LightItalic-numr-t1 }{} -\DeclareFontShape{T1}{Montserrat-Numr}{l}{sl}{ - <-> ssub * Montserrat-Numr/l/it +\DeclareFontShape{T1}{Montserrat-Numr}{light}{sl}{ + <-> ssub * Montserrat-Numr/light/it }{} -\DeclareFontShape{T1}{Montserrat-Numr}{mb}{it}{ + +% ---- medium ---- + +\DeclareFontShape{T1}{Montserrat-Numr}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-numr-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Numr}{medium}{it}{ <-> \Montserrat@@scale Montserrat-MediumItalic-numr-t1 }{} -\DeclareFontShape{T1}{Montserrat-Numr}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-numr-t1 +\DeclareFontShape{T1}{Montserrat-Numr}{medium}{sl}{ + <-> ssub * Montserrat-Numr/medium/it }{} -\DeclareFontShape{T1}{Montserrat-Numr}{mb}{sl}{ - <-> ssub * Montserrat-Numr/mb/it + +% ---- thin ---- + +\DeclareFontShape{T1}{Montserrat-Numr}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-numr-t1 }{} -\DeclareFontShape{T1}{Montserrat-Numr}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-numr-t1 +\DeclareFontShape{T1}{Montserrat-Numr}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-numr-t1 }{} -\DeclareFontShape{T1}{Montserrat-Numr}{sb}{it}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-numr-t1 +\DeclareFontShape{T1}{Montserrat-Numr}{thin}{sl}{ + <-> ssub * Montserrat-Numr/thin/it }{} -\DeclareFontShape{T1}{Montserrat-Numr}{sb}{sl}{ - <-> ssub * Montserrat-Numr/sb/it + +% ---- extrabold ---- + +\DeclareFontShape{T1}{Montserrat-Numr}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-numr-t1 }{} -\DeclareFontShape{T1}{Montserrat-Numr}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-numr-t1 +\DeclareFontShape{T1}{Montserrat-Numr}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-numr-t1 }{} -\DeclareFontShape{T1}{Montserrat-Numr}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-numr-t1 +\DeclareFontShape{T1}{Montserrat-Numr}{extrabold}{sl}{ + <-> ssub * Montserrat-Numr/extrabold/it }{} -\DeclareFontShape{T1}{Montserrat-Numr}{t}{sl}{ - <-> ssub * Montserrat-Numr/t/it +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{T1}{Montserrat-Numr}{ul}{it}{ + <-> ssub * Montserrat-Numr/thin/it }{} -\DeclareFontShape{T1}{Montserrat-Numr}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-numr-t1 +\DeclareFontShape{T1}{Montserrat-Numr}{ul}{n}{ + <-> ssub * Montserrat-Numr/thin/n }{} -\DeclareFontShape{T1}{Montserrat-Numr}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-numr-t1 +\DeclareFontShape{T1}{Montserrat-Numr}{ul}{sl}{ + <-> ssub * Montserrat-Numr/thin/sl }{} -\DeclareFontShape{T1}{Montserrat-Numr}{k}{sl}{ - <-> ssub * Montserrat-Numr/k/it + +% el --> extralight + +\DeclareFontShape{T1}{Montserrat-Numr}{el}{sl}{ + <-> ssub * Montserrat-Numr/extralight/sl }{} \DeclareFontShape{T1}{Montserrat-Numr}{el}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-numr-t1 + <-> ssub * Montserrat-Numr/extralight/n }{} \DeclareFontShape{T1}{Montserrat-Numr}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-numr-t1 + <-> ssub * Montserrat-Numr/extralight/it }{} -\DeclareFontShape{T1}{Montserrat-Numr}{el}{sl}{ - <-> ssub * Montserrat-Numr/el/it + +% l --> light + +\DeclareFontShape{T1}{Montserrat-Numr}{l}{n}{ + <-> ssub * Montserrat-Numr/light/n +}{} + +\DeclareFontShape{T1}{Montserrat-Numr}{l}{sl}{ + <-> ssub * Montserrat-Numr/light/sl +}{} + +\DeclareFontShape{T1}{Montserrat-Numr}{l}{it}{ + <-> ssub * Montserrat-Numr/light/it +}{} + + +% sl --> regular + +\DeclareFontShape{T1}{Montserrat-Numr}{sl}{it}{ + <-> ssub * Montserrat-Numr/regular/it +}{} + +\DeclareFontShape{T1}{Montserrat-Numr}{sl}{sl}{ + <-> ssub * Montserrat-Numr/regular/sl +}{} + +\DeclareFontShape{T1}{Montserrat-Numr}{sl}{n}{ + <-> ssub * Montserrat-Numr/regular/n +}{} + + +% m --> medium + +\DeclareFontShape{T1}{Montserrat-Numr}{m}{it}{ + <-> ssub * Montserrat-Numr/medium/it +}{} + +\DeclareFontShape{T1}{Montserrat-Numr}{m}{n}{ + <-> ssub * Montserrat-Numr/medium/n +}{} + +\DeclareFontShape{T1}{Montserrat-Numr}{m}{sl}{ + <-> ssub * Montserrat-Numr/medium/sl +}{} + + +% sb --> semibold + +\DeclareFontShape{T1}{Montserrat-Numr}{sb}{sl}{ + <-> ssub * Montserrat-Numr/semibold/sl +}{} + +\DeclareFontShape{T1}{Montserrat-Numr}{sb}{n}{ + <-> ssub * Montserrat-Numr/semibold/n }{} +\DeclareFontShape{T1}{Montserrat-Numr}{sb}{it}{ + <-> ssub * Montserrat-Numr/semibold/it +}{} + + +% b --> bold + \DeclareFontShape{T1}{Montserrat-Numr}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-numr-t1 + <-> ssub * Montserrat-Numr/bold/n +}{} + +\DeclareFontShape{T1}{Montserrat-Numr}{b}{sl}{ + <-> ssub * Montserrat-Numr/bold/sl }{} \DeclareFontShape{T1}{Montserrat-Numr}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-numr-t1 + <-> ssub * Montserrat-Numr/bold/it }{} -\DeclareFontShape{T1}{Montserrat-Numr}{b}{sl}{ - <-> ssub * Montserrat-Numr/b/it + +% eb --> extrabold + +\DeclareFontShape{T1}{Montserrat-Numr}{eb}{sl}{ + <-> ssub * Montserrat-Numr/extrabold/sl }{} \DeclareFontShape{T1}{Montserrat-Numr}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-numr-t1 + <-> ssub * Montserrat-Numr/extrabold/n }{} \DeclareFontShape{T1}{Montserrat-Numr}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-numr-t1 + <-> ssub * Montserrat-Numr/extrabold/it }{} -\DeclareFontShape{T1}{Montserrat-Numr}{eb}{sl}{ - <-> ssub * Montserrat-Numr/eb/it + +% ub --> black + +\DeclareFontShape{T1}{Montserrat-Numr}{ub}{it}{ + <-> ssub * Montserrat-Numr/black/it }{} -\DeclareFontShape{T1}{Montserrat-Numr}{bx}{it}{ - <-> ssub * Montserrat-Numr/b/it +\DeclareFontShape{T1}{Montserrat-Numr}{ub}{sl}{ + <-> ssub * Montserrat-Numr/black/sl }{} -\DeclareFontShape{T1}{Montserrat-Numr}{bx}{sl}{ - <-> ssub * Montserrat-Numr/b/sl +\DeclareFontShape{T1}{Montserrat-Numr}{ub}{n}{ + <-> ssub * Montserrat-Numr/black/n }{} \DeclareFontShape{T1}{Montserrat-Numr}{bx}{n}{ <-> ssub * Montserrat-Numr/b/n }{} +\DeclareFontShape{T1}{Montserrat-Numr}{bx}{sl}{ + <-> ssub * Montserrat-Numr/b/sl +}{} + +\DeclareFontShape{T1}{Montserrat-Numr}{bx}{it}{ + <-> ssub * Montserrat-Numr/b/it +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-OsF.fd b/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-OsF.fd index 0d60cd7b25a..3c91f2a20a5 100644 --- a/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-OsF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{T1Montserrat-OsF.fd} - [2017/01/25 (autoinst) Font definitions for T1/Montserrat-OsF.] + [2019/10/18 (autoinst) Font definitions for T1/Montserrat-OsF.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,224 +11,493 @@ \DeclareFontFamily{T1}{Montserrat-OsF}{} -\DeclareFontShape{T1}{Montserrat-OsF}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-osf-t1 + +% ---- light ---- + +\DeclareFontShape{T1}{Montserrat-OsF}{light}{n}{ + <-> \Montserrat@@scale Montserrat-Light-osf-t1 }{} -\DeclareFontShape{T1}{Montserrat-OsF}{b}{scit}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-osf-sc-t1 +\DeclareFontShape{T1}{Montserrat-OsF}{light}{sc}{ + <-> \Montserrat@@scale Montserrat-Light-osf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-OsF}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-osf-t1 +\DeclareFontShape{T1}{Montserrat-OsF}{light}{scit}{ + <-> \Montserrat@@scale Montserrat-LightItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-OsF}{b}{sc}{ - <-> \Montserrat@@scale Montserrat-Bold-osf-sc-t1 +\DeclareFontShape{T1}{Montserrat-OsF}{light}{it}{ + <-> \Montserrat@@scale Montserrat-LightItalic-osf-t1 }{} -\DeclareFontShape{T1}{Montserrat-OsF}{b}{scsl}{ - <-> ssub * Montserrat-OsF/b/scit +\DeclareFontShape{T1}{Montserrat-OsF}{light}{sl}{ + <-> ssub * Montserrat-OsF/light/it }{} -\DeclareFontShape{T1}{Montserrat-OsF}{b}{sl}{ - <-> ssub * Montserrat-OsF/b/it +\DeclareFontShape{T1}{Montserrat-OsF}{light}{scsl}{ + <-> ssub * Montserrat-OsF/light/scit }{} -\DeclareFontShape{T1}{Montserrat-OsF}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-t1 + +% ---- medium ---- + +\DeclareFontShape{T1}{Montserrat-OsF}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-osf-t1 }{} -\DeclareFontShape{T1}{Montserrat-OsF}{eb}{sc}{ +\DeclareFontShape{T1}{Montserrat-OsF}{medium}{scit}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{medium}{sc}{ + <-> \Montserrat@@scale Montserrat-Medium-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-osf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{medium}{sl}{ + <-> ssub * Montserrat-OsF/medium/it +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{medium}{scsl}{ + <-> ssub * Montserrat-OsF/medium/scit +}{} + + +% ---- thin ---- + +\DeclareFontShape{T1}{Montserrat-OsF}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-osf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{thin}{scit}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-osf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{thin}{sc}{ + <-> \Montserrat@@scale Montserrat-Thin-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{thin}{sl}{ + <-> ssub * Montserrat-OsF/thin/it +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{thin}{scsl}{ + <-> ssub * Montserrat-OsF/thin/scit +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{sc}{ <-> \Montserrat@@scale Montserrat-ExtraBold-osf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-OsF}{eb}{scit}{ +\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-osf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{scit}{ <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-OsF}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-osf-t1 +\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{sl}{ + <-> ssub * Montserrat-OsF/extrabold/it }{} -\DeclareFontShape{T1}{Montserrat-OsF}{eb}{scsl}{ - <-> ssub * Montserrat-OsF/eb/scit +\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{scsl}{ + <-> ssub * Montserrat-OsF/extrabold/scit }{} -\DeclareFontShape{T1}{Montserrat-OsF}{eb}{sl}{ - <-> ssub * Montserrat-OsF/eb/it + +% ---- bold ---- + +\DeclareFontShape{T1}{Montserrat-OsF}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-osf-t1 }{} -\DeclareFontShape{T1}{Montserrat-OsF}{el}{scit}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-sc-t1 +\DeclareFontShape{T1}{Montserrat-OsF}{bold}{sc}{ + <-> \Montserrat@@scale Montserrat-Bold-osf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-OsF}{el}{sc}{ +\DeclareFontShape{T1}{Montserrat-OsF}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-osf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{bold}{scit}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{bold}{sl}{ + <-> ssub * Montserrat-OsF/bold/it +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{bold}{scsl}{ + <-> ssub * Montserrat-OsF/bold/scit +}{} + + +% ---- semibold ---- + +\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{scit}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{it}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{sc}{ + <-> \Montserrat@@scale Montserrat-SemiBold-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-osf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{sl}{ + <-> ssub * Montserrat-OsF/semibold/it +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{scsl}{ + <-> ssub * Montserrat-OsF/semibold/scit +}{} + + +% ---- extralight ---- + +\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{sc}{ <-> \Montserrat@@scale Montserrat-ExtraLight-osf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-OsF}{el}{n}{ +\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{n}{ <-> \Montserrat@@scale Montserrat-ExtraLight-osf-t1 }{} -\DeclareFontShape{T1}{Montserrat-OsF}{el}{it}{ +\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{scit}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{it}{ <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-t1 }{} -\DeclareFontShape{T1}{Montserrat-OsF}{el}{scsl}{ - <-> ssub * Montserrat-OsF/el/scit +\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{sl}{ + <-> ssub * Montserrat-OsF/extralight/it }{} -\DeclareFontShape{T1}{Montserrat-OsF}{el}{sl}{ - <-> ssub * Montserrat-OsF/el/it +\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{scsl}{ + <-> ssub * Montserrat-OsF/extralight/scit }{} -\DeclareFontShape{T1}{Montserrat-OsF}{k}{it}{ + +% ---- black ---- + +\DeclareFontShape{T1}{Montserrat-OsF}{black}{it}{ <-> \Montserrat@@scale Montserrat-BlackItalic-osf-t1 }{} -\DeclareFontShape{T1}{Montserrat-OsF}{k}{scit}{ +\DeclareFontShape{T1}{Montserrat-OsF}{black}{scit}{ <-> \Montserrat@@scale Montserrat-BlackItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-OsF}{k}{sc}{ +\DeclareFontShape{T1}{Montserrat-OsF}{black}{sc}{ <-> \Montserrat@@scale Montserrat-Black-osf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-OsF}{k}{n}{ +\DeclareFontShape{T1}{Montserrat-OsF}{black}{n}{ <-> \Montserrat@@scale Montserrat-Black-osf-t1 }{} -\DeclareFontShape{T1}{Montserrat-OsF}{k}{scsl}{ - <-> ssub * Montserrat-OsF/k/scit +\DeclareFontShape{T1}{Montserrat-OsF}{black}{sl}{ + <-> ssub * Montserrat-OsF/black/it }{} -\DeclareFontShape{T1}{Montserrat-OsF}{k}{sl}{ - <-> ssub * Montserrat-OsF/k/it +\DeclareFontShape{T1}{Montserrat-OsF}{black}{scsl}{ + <-> ssub * Montserrat-OsF/black/scit }{} -\DeclareFontShape{T1}{Montserrat-OsF}{l}{it}{ - <-> \Montserrat@@scale Montserrat-LightItalic-osf-t1 + +% ---- regular ---- + +\DeclareFontShape{T1}{Montserrat-OsF}{regular}{sc}{ + <-> \Montserrat@@scale Montserrat-Regular-osf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-OsF}{l}{scit}{ - <-> \Montserrat@@scale Montserrat-LightItalic-osf-sc-t1 +\DeclareFontShape{T1}{Montserrat-OsF}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-osf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{regular}{scit}{ + <-> \Montserrat@@scale Montserrat-Italic-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-osf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{regular}{sl}{ + <-> ssub * Montserrat-OsF/regular/it +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{regular}{scsl}{ + <-> ssub * Montserrat-OsF/regular/scit +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{T1}{Montserrat-OsF}{ul}{it}{ + <-> ssub * Montserrat-OsF/thin/it +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{ul}{scit}{ + <-> ssub * Montserrat-OsF/thin/scit +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{ul}{n}{ + <-> ssub * Montserrat-OsF/thin/n +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{ul}{sc}{ + <-> ssub * Montserrat-OsF/thin/sc +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{ul}{scsl}{ + <-> ssub * Montserrat-OsF/thin/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{ul}{sl}{ + <-> ssub * Montserrat-OsF/thin/sl +}{} + + +% el --> extralight + +\DeclareFontShape{T1}{Montserrat-OsF}{el}{sc}{ + <-> ssub * Montserrat-OsF/extralight/sc +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{el}{n}{ + <-> ssub * Montserrat-OsF/extralight/n +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{el}{scsl}{ + <-> ssub * Montserrat-OsF/extralight/scsl }{} +\DeclareFontShape{T1}{Montserrat-OsF}{el}{sl}{ + <-> ssub * Montserrat-OsF/extralight/sl +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{el}{it}{ + <-> ssub * Montserrat-OsF/extralight/it +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{el}{scit}{ + <-> ssub * Montserrat-OsF/extralight/scit +}{} + + +% l --> light + \DeclareFontShape{T1}{Montserrat-OsF}{l}{n}{ - <-> \Montserrat@@scale Montserrat-Light-osf-t1 + <-> ssub * Montserrat-OsF/light/n }{} \DeclareFontShape{T1}{Montserrat-OsF}{l}{sc}{ - <-> \Montserrat@@scale Montserrat-Light-osf-sc-t1 + <-> ssub * Montserrat-OsF/light/sc }{} \DeclareFontShape{T1}{Montserrat-OsF}{l}{scsl}{ - <-> ssub * Montserrat-OsF/l/scit + <-> ssub * Montserrat-OsF/light/scsl }{} \DeclareFontShape{T1}{Montserrat-OsF}{l}{sl}{ - <-> ssub * Montserrat-OsF/l/it + <-> ssub * Montserrat-OsF/light/sl }{} -\DeclareFontShape{T1}{Montserrat-OsF}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-osf-t1 +\DeclareFontShape{T1}{Montserrat-OsF}{l}{it}{ + <-> ssub * Montserrat-OsF/light/it }{} -\DeclareFontShape{T1}{Montserrat-OsF}{mb}{sc}{ - <-> \Montserrat@@scale Montserrat-Medium-osf-sc-t1 +\DeclareFontShape{T1}{Montserrat-OsF}{l}{scit}{ + <-> ssub * Montserrat-OsF/light/scit }{} -\DeclareFontShape{T1}{Montserrat-OsF}{mb}{scit}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-osf-sc-t1 + +% sl --> regular + +\DeclareFontShape{T1}{Montserrat-OsF}{sl}{sl}{ + <-> ssub * Montserrat-OsF/regular/sl }{} -\DeclareFontShape{T1}{Montserrat-OsF}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-osf-t1 +\DeclareFontShape{T1}{Montserrat-OsF}{sl}{scsl}{ + <-> ssub * Montserrat-OsF/regular/scsl }{} -\DeclareFontShape{T1}{Montserrat-OsF}{mb}{scsl}{ - <-> ssub * Montserrat-OsF/mb/scit +\DeclareFontShape{T1}{Montserrat-OsF}{sl}{sc}{ + <-> ssub * Montserrat-OsF/regular/sc }{} -\DeclareFontShape{T1}{Montserrat-OsF}{mb}{sl}{ - <-> ssub * Montserrat-OsF/mb/it +\DeclareFontShape{T1}{Montserrat-OsF}{sl}{n}{ + <-> ssub * Montserrat-OsF/regular/n }{} +\DeclareFontShape{T1}{Montserrat-OsF}{sl}{scit}{ + <-> ssub * Montserrat-OsF/regular/scit +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{sl}{it}{ + <-> ssub * Montserrat-OsF/regular/it +}{} + + +% m --> medium + \DeclareFontShape{T1}{Montserrat-OsF}{m}{scit}{ - <-> \Montserrat@@scale Montserrat-Italic-osf-sc-t1 + <-> ssub * Montserrat-OsF/medium/scit +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{m}{it}{ + <-> ssub * Montserrat-OsF/medium/it +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{m}{sl}{ + <-> ssub * Montserrat-OsF/medium/sl +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{m}{scsl}{ + <-> ssub * Montserrat-OsF/medium/scsl }{} \DeclareFontShape{T1}{Montserrat-OsF}{m}{sc}{ - <-> \Montserrat@@scale Montserrat-Regular-osf-sc-t1 + <-> ssub * Montserrat-OsF/medium/sc }{} \DeclareFontShape{T1}{Montserrat-OsF}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-osf-t1 + <-> ssub * Montserrat-OsF/medium/n }{} -\DeclareFontShape{T1}{Montserrat-OsF}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-osf-t1 + +% sb --> semibold + +\DeclareFontShape{T1}{Montserrat-OsF}{sb}{it}{ + <-> ssub * Montserrat-OsF/semibold/it }{} -\DeclareFontShape{T1}{Montserrat-OsF}{m}{scsl}{ - <-> ssub * Montserrat-OsF/m/scit +\DeclareFontShape{T1}{Montserrat-OsF}{sb}{scit}{ + <-> ssub * Montserrat-OsF/semibold/scit }{} -\DeclareFontShape{T1}{Montserrat-OsF}{m}{sl}{ - <-> ssub * Montserrat-OsF/m/it +\DeclareFontShape{T1}{Montserrat-OsF}{sb}{sc}{ + <-> ssub * Montserrat-OsF/semibold/sc }{} -\DeclareFontShape{T1}{Montserrat-OsF}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-osf-t1 +\DeclareFontShape{T1}{Montserrat-OsF}{sb}{n}{ + <-> ssub * Montserrat-OsF/semibold/n }{} -\DeclareFontShape{T1}{Montserrat-OsF}{t}{scit}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-osf-sc-t1 +\DeclareFontShape{T1}{Montserrat-OsF}{sb}{scsl}{ + <-> ssub * Montserrat-OsF/semibold/scsl }{} -\DeclareFontShape{T1}{Montserrat-OsF}{t}{sc}{ - <-> \Montserrat@@scale Montserrat-Thin-osf-sc-t1 +\DeclareFontShape{T1}{Montserrat-OsF}{sb}{sl}{ + <-> ssub * Montserrat-OsF/semibold/sl }{} -\DeclareFontShape{T1}{Montserrat-OsF}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-osf-t1 + +% b --> bold + +\DeclareFontShape{T1}{Montserrat-OsF}{b}{scsl}{ + <-> ssub * Montserrat-OsF/bold/scsl }{} -\DeclareFontShape{T1}{Montserrat-OsF}{t}{scsl}{ - <-> ssub * Montserrat-OsF/t/scit +\DeclareFontShape{T1}{Montserrat-OsF}{b}{n}{ + <-> ssub * Montserrat-OsF/bold/n }{} -\DeclareFontShape{T1}{Montserrat-OsF}{t}{sl}{ - <-> ssub * Montserrat-OsF/t/it +\DeclareFontShape{T1}{Montserrat-OsF}{b}{sc}{ + <-> ssub * Montserrat-OsF/bold/sc }{} -\DeclareFontShape{T1}{Montserrat-OsF}{sb}{scit}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-sc-t1 +\DeclareFontShape{T1}{Montserrat-OsF}{b}{sl}{ + <-> ssub * Montserrat-OsF/bold/sl }{} -\DeclareFontShape{T1}{Montserrat-OsF}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-osf-t1 +\DeclareFontShape{T1}{Montserrat-OsF}{b}{it}{ + <-> ssub * Montserrat-OsF/bold/it }{} -\DeclareFontShape{T1}{Montserrat-OsF}{sb}{sc}{ - <-> \Montserrat@@scale Montserrat-SemiBold-osf-sc-t1 +\DeclareFontShape{T1}{Montserrat-OsF}{b}{scit}{ + <-> ssub * Montserrat-OsF/bold/scit }{} -\DeclareFontShape{T1}{Montserrat-OsF}{sb}{it}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-t1 + +% eb --> extrabold + +\DeclareFontShape{T1}{Montserrat-OsF}{eb}{scit}{ + <-> ssub * Montserrat-OsF/extrabold/scit }{} -\DeclareFontShape{T1}{Montserrat-OsF}{sb}{scsl}{ - <-> ssub * Montserrat-OsF/sb/scit +\DeclareFontShape{T1}{Montserrat-OsF}{eb}{it}{ + <-> ssub * Montserrat-OsF/extrabold/it }{} -\DeclareFontShape{T1}{Montserrat-OsF}{sb}{sl}{ - <-> ssub * Montserrat-OsF/sb/it +\DeclareFontShape{T1}{Montserrat-OsF}{eb}{sl}{ + <-> ssub * Montserrat-OsF/extrabold/sl }{} -\DeclareFontShape{T1}{Montserrat-OsF}{bx}{it}{ - <-> ssub * Montserrat-OsF/b/it +\DeclareFontShape{T1}{Montserrat-OsF}{eb}{sc}{ + <-> ssub * Montserrat-OsF/extrabold/sc +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{eb}{n}{ + <-> ssub * Montserrat-OsF/extrabold/n +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{eb}{scsl}{ + <-> ssub * Montserrat-OsF/extrabold/scsl +}{} + + +% ub --> black + +\DeclareFontShape{T1}{Montserrat-OsF}{ub}{scsl}{ + <-> ssub * Montserrat-OsF/black/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{ub}{sc}{ + <-> ssub * Montserrat-OsF/black/sc +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{ub}{n}{ + <-> ssub * Montserrat-OsF/black/n +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{ub}{sl}{ + <-> ssub * Montserrat-OsF/black/sl +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{ub}{it}{ + <-> ssub * Montserrat-OsF/black/it +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{ub}{scit}{ + <-> ssub * Montserrat-OsF/black/scit }{} \DeclareFontShape{T1}{Montserrat-OsF}{bx}{sl}{ @@ -239,16 +508,20 @@ <-> ssub * Montserrat-OsF/b/scsl }{} -\DeclareFontShape{T1}{Montserrat-OsF}{bx}{scit}{ - <-> ssub * Montserrat-OsF/b/scit +\DeclareFontShape{T1}{Montserrat-OsF}{bx}{sc}{ + <-> ssub * Montserrat-OsF/b/sc }{} \DeclareFontShape{T1}{Montserrat-OsF}{bx}{n}{ <-> ssub * Montserrat-OsF/b/n }{} -\DeclareFontShape{T1}{Montserrat-OsF}{bx}{sc}{ - <-> ssub * Montserrat-OsF/b/sc +\DeclareFontShape{T1}{Montserrat-OsF}{bx}{scit}{ + <-> ssub * Montserrat-OsF/b/scit +}{} + +\DeclareFontShape{T1}{Montserrat-OsF}{bx}{it}{ + <-> ssub * Montserrat-OsF/b/it }{} \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-Sup.fd b/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-Sup.fd index 13ae81d2400..30eab1bc6a7 100644 --- a/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-Sup.fd +++ b/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{T1Montserrat-Sup.fd} - [2017/01/25 (autoinst) Font definitions for T1/Montserrat-Sup.] + [2019/10/18 (autoinst) Font definitions for T1/Montserrat-Sup.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,124 +11,289 @@ \DeclareFontFamily{T1}{Montserrat-Sup}{} -\DeclareFontShape{T1}{Montserrat-Sup}{el}{it}{ + +% ---- bold ---- + +\DeclareFontShape{T1}{Montserrat-Sup}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Sup}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-sup-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Sup}{bold}{sl}{ + <-> ssub * Montserrat-Sup/bold/it +}{} + + +% ---- semibold ---- + +\DeclareFontShape{T1}{Montserrat-Sup}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-sup-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Sup}{semibold}{it}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Sup}{semibold}{sl}{ + <-> ssub * Montserrat-Sup/semibold/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{T1}{Montserrat-Sup}{extralight}{it}{ <-> \Montserrat@@scale Montserrat-ExtraLightItalic-sup-t1 }{} -\DeclareFontShape{T1}{Montserrat-Sup}{el}{n}{ +\DeclareFontShape{T1}{Montserrat-Sup}{extralight}{n}{ <-> \Montserrat@@scale Montserrat-ExtraLight-sup-t1 }{} -\DeclareFontShape{T1}{Montserrat-Sup}{el}{sl}{ - <-> ssub * Montserrat-Sup/el/it +\DeclareFontShape{T1}{Montserrat-Sup}{extralight}{sl}{ + <-> ssub * Montserrat-Sup/extralight/it +}{} + + +% ---- black ---- + +\DeclareFontShape{T1}{Montserrat-Sup}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-sup-t1 }{} -\DeclareFontShape{T1}{Montserrat-Sup}{k}{it}{ +\DeclareFontShape{T1}{Montserrat-Sup}{black}{it}{ <-> \Montserrat@@scale Montserrat-BlackItalic-sup-t1 }{} -\DeclareFontShape{T1}{Montserrat-Sup}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-sup-t1 +\DeclareFontShape{T1}{Montserrat-Sup}{black}{sl}{ + <-> ssub * Montserrat-Sup/black/it }{} -\DeclareFontShape{T1}{Montserrat-Sup}{k}{sl}{ - <-> ssub * Montserrat-Sup/k/it + +% ---- regular ---- + +\DeclareFontShape{T1}{Montserrat-Sup}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-sup-t1 }{} -\DeclareFontShape{T1}{Montserrat-Sup}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-sup-t1 +\DeclareFontShape{T1}{Montserrat-Sup}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-sup-t1 }{} -\DeclareFontShape{T1}{Montserrat-Sup}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-sup-t1 +\DeclareFontShape{T1}{Montserrat-Sup}{regular}{sl}{ + <-> ssub * Montserrat-Sup/regular/it }{} -\DeclareFontShape{T1}{Montserrat-Sup}{b}{sl}{ - <-> ssub * Montserrat-Sup/b/it + +% ---- light ---- + +\DeclareFontShape{T1}{Montserrat-Sup}{light}{n}{ + <-> \Montserrat@@scale Montserrat-Light-sup-t1 }{} -\DeclareFontShape{T1}{Montserrat-Sup}{eb}{it}{ +\DeclareFontShape{T1}{Montserrat-Sup}{light}{it}{ + <-> \Montserrat@@scale Montserrat-LightItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Sup}{light}{sl}{ + <-> ssub * Montserrat-Sup/light/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{T1}{Montserrat-Sup}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-sup-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Sup}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Sup}{medium}{sl}{ + <-> ssub * Montserrat-Sup/medium/it +}{} + + +% ---- thin ---- + +\DeclareFontShape{T1}{Montserrat-Sup}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-sup-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Sup}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-Sup}{thin}{sl}{ + <-> ssub * Montserrat-Sup/thin/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{T1}{Montserrat-Sup}{extrabold}{it}{ <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-sup-t1 }{} -\DeclareFontShape{T1}{Montserrat-Sup}{eb}{n}{ +\DeclareFontShape{T1}{Montserrat-Sup}{extrabold}{n}{ <-> \Montserrat@@scale Montserrat-ExtraBold-sup-t1 }{} -\DeclareFontShape{T1}{Montserrat-Sup}{eb}{sl}{ - <-> ssub * Montserrat-Sup/eb/it +\DeclareFontShape{T1}{Montserrat-Sup}{extrabold}{sl}{ + <-> ssub * Montserrat-Sup/extrabold/it }{} -\DeclareFontShape{T1}{Montserrat-Sup}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-sup-t1 +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{T1}{Montserrat-Sup}{ul}{sl}{ + <-> ssub * Montserrat-Sup/thin/sl }{} -\DeclareFontShape{T1}{Montserrat-Sup}{sb}{it}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-sup-t1 +\DeclareFontShape{T1}{Montserrat-Sup}{ul}{n}{ + <-> ssub * Montserrat-Sup/thin/n }{} -\DeclareFontShape{T1}{Montserrat-Sup}{sb}{sl}{ - <-> ssub * Montserrat-Sup/sb/it +\DeclareFontShape{T1}{Montserrat-Sup}{ul}{it}{ + <-> ssub * Montserrat-Sup/thin/it }{} -\DeclareFontShape{T1}{Montserrat-Sup}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-sup-t1 + +% el --> extralight + +\DeclareFontShape{T1}{Montserrat-Sup}{el}{sl}{ + <-> ssub * Montserrat-Sup/extralight/sl }{} -\DeclareFontShape{T1}{Montserrat-Sup}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-sup-t1 +\DeclareFontShape{T1}{Montserrat-Sup}{el}{n}{ + <-> ssub * Montserrat-Sup/extralight/n +}{} + +\DeclareFontShape{T1}{Montserrat-Sup}{el}{it}{ + <-> ssub * Montserrat-Sup/extralight/it +}{} + + +% l --> light + +\DeclareFontShape{T1}{Montserrat-Sup}{l}{it}{ + <-> ssub * Montserrat-Sup/light/it }{} -\DeclareFontShape{T1}{Montserrat-Sup}{t}{sl}{ - <-> ssub * Montserrat-Sup/t/it +\DeclareFontShape{T1}{Montserrat-Sup}{l}{sl}{ + <-> ssub * Montserrat-Sup/light/sl +}{} + +\DeclareFontShape{T1}{Montserrat-Sup}{l}{n}{ + <-> ssub * Montserrat-Sup/light/n }{} + +% sl --> regular + +\DeclareFontShape{T1}{Montserrat-Sup}{sl}{it}{ + <-> ssub * Montserrat-Sup/regular/it +}{} + +\DeclareFontShape{T1}{Montserrat-Sup}{sl}{sl}{ + <-> ssub * Montserrat-Sup/regular/sl +}{} + +\DeclareFontShape{T1}{Montserrat-Sup}{sl}{n}{ + <-> ssub * Montserrat-Sup/regular/n +}{} + + +% m --> medium + \DeclareFontShape{T1}{Montserrat-Sup}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-sup-t1 + <-> ssub * Montserrat-Sup/medium/n +}{} + +\DeclareFontShape{T1}{Montserrat-Sup}{m}{sl}{ + <-> ssub * Montserrat-Sup/medium/sl }{} \DeclareFontShape{T1}{Montserrat-Sup}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-sup-t1 + <-> ssub * Montserrat-Sup/medium/it }{} -\DeclareFontShape{T1}{Montserrat-Sup}{m}{sl}{ - <-> ssub * Montserrat-Sup/m/it + +% sb --> semibold + +\DeclareFontShape{T1}{Montserrat-Sup}{sb}{it}{ + <-> ssub * Montserrat-Sup/semibold/it }{} -\DeclareFontShape{T1}{Montserrat-Sup}{l}{n}{ - <-> \Montserrat@@scale Montserrat-Light-sup-t1 +\DeclareFontShape{T1}{Montserrat-Sup}{sb}{n}{ + <-> ssub * Montserrat-Sup/semibold/n }{} -\DeclareFontShape{T1}{Montserrat-Sup}{l}{it}{ - <-> \Montserrat@@scale Montserrat-LightItalic-sup-t1 +\DeclareFontShape{T1}{Montserrat-Sup}{sb}{sl}{ + <-> ssub * Montserrat-Sup/semibold/sl }{} -\DeclareFontShape{T1}{Montserrat-Sup}{l}{sl}{ - <-> ssub * Montserrat-Sup/l/it + +% b --> bold + +\DeclareFontShape{T1}{Montserrat-Sup}{b}{it}{ + <-> ssub * Montserrat-Sup/bold/it }{} -\DeclareFontShape{T1}{Montserrat-Sup}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-sup-t1 +\DeclareFontShape{T1}{Montserrat-Sup}{b}{n}{ + <-> ssub * Montserrat-Sup/bold/n }{} -\DeclareFontShape{T1}{Montserrat-Sup}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-sup-t1 +\DeclareFontShape{T1}{Montserrat-Sup}{b}{sl}{ + <-> ssub * Montserrat-Sup/bold/sl }{} -\DeclareFontShape{T1}{Montserrat-Sup}{mb}{sl}{ - <-> ssub * Montserrat-Sup/mb/it + +% eb --> extrabold + +\DeclareFontShape{T1}{Montserrat-Sup}{eb}{n}{ + <-> ssub * Montserrat-Sup/extrabold/n }{} -\DeclareFontShape{T1}{Montserrat-Sup}{bx}{it}{ - <-> ssub * Montserrat-Sup/b/it +\DeclareFontShape{T1}{Montserrat-Sup}{eb}{sl}{ + <-> ssub * Montserrat-Sup/extrabold/sl }{} -\DeclareFontShape{T1}{Montserrat-Sup}{bx}{sl}{ - <-> ssub * Montserrat-Sup/b/sl +\DeclareFontShape{T1}{Montserrat-Sup}{eb}{it}{ + <-> ssub * Montserrat-Sup/extrabold/it +}{} + + +% ub --> black + +\DeclareFontShape{T1}{Montserrat-Sup}{ub}{it}{ + <-> ssub * Montserrat-Sup/black/it +}{} + +\DeclareFontShape{T1}{Montserrat-Sup}{ub}{sl}{ + <-> ssub * Montserrat-Sup/black/sl +}{} + +\DeclareFontShape{T1}{Montserrat-Sup}{ub}{n}{ + <-> ssub * Montserrat-Sup/black/n }{} \DeclareFontShape{T1}{Montserrat-Sup}{bx}{n}{ <-> ssub * Montserrat-Sup/b/n }{} +\DeclareFontShape{T1}{Montserrat-Sup}{bx}{sl}{ + <-> ssub * Montserrat-Sup/b/sl +}{} + +\DeclareFontShape{T1}{Montserrat-Sup}{bx}{it}{ + <-> ssub * Montserrat-Sup/b/it +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-TLF.fd b/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-TLF.fd index 50a16c08c8b..25fcaa7a73b 100644 --- a/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-TLF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{T1Montserrat-TLF.fd} - [2017/01/25 (autoinst) Font definitions for T1/Montserrat-TLF.] + [2019/10/18 (autoinst) Font definitions for T1/Montserrat-TLF.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,232 +11,493 @@ \DeclareFontFamily{T1}{Montserrat-TLF}{} -\DeclareFontShape{T1}{Montserrat-TLF}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-t1 + +% ---- thin ---- + +\DeclareFontShape{T1}{Montserrat-TLF}{thin}{sc}{ + <-> \Montserrat@@scale Montserrat-Thin-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{mb}{scit}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-tlf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-tlf-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{thin}{scit}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{mb}{sc}{ - <-> \Montserrat@@scale Montserrat-Medium-tlf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{mb}{scsl}{ - <-> ssub * Montserrat-TLF/mb/scit +\DeclareFontShape{T1}{Montserrat-TLF}{thin}{sl}{ + <-> ssub * Montserrat-TLF/thin/it }{} -\DeclareFontShape{T1}{Montserrat-TLF}{mb}{sl}{ - <-> ssub * Montserrat-TLF/mb/it +\DeclareFontShape{T1}{Montserrat-TLF}{thin}{scsl}{ + <-> ssub * Montserrat-TLF/thin/scit }{} -\DeclareFontShape{T1}{Montserrat-TLF}{l}{it}{ + +% ---- extrabold ---- + +\DeclareFontShape{T1}{Montserrat-TLF}{extrabold}{scit}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{extrabold}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{extrabold}{sl}{ + <-> ssub * Montserrat-TLF/extrabold/it +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{extrabold}{scsl}{ + <-> ssub * Montserrat-TLF/extrabold/scit +}{} + + +% ---- light ---- + +\DeclareFontShape{T1}{Montserrat-TLF}{light}{it}{ <-> \Montserrat@@scale Montserrat-LightItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{l}{scit}{ +\DeclareFontShape{T1}{Montserrat-TLF}{light}{scit}{ <-> \Montserrat@@scale Montserrat-LightItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{l}{sc}{ +\DeclareFontShape{T1}{Montserrat-TLF}{light}{n}{ + <-> \Montserrat@@scale Montserrat-Light-tlf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{light}{sc}{ <-> \Montserrat@@scale Montserrat-Light-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{l}{n}{ - <-> \Montserrat@@scale Montserrat-Light-tlf-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{light}{sl}{ + <-> ssub * Montserrat-TLF/light/it }{} -\DeclareFontShape{T1}{Montserrat-TLF}{l}{scsl}{ - <-> ssub * Montserrat-TLF/l/scit +\DeclareFontShape{T1}{Montserrat-TLF}{light}{scsl}{ + <-> ssub * Montserrat-TLF/light/scit }{} -\DeclareFontShape{T1}{Montserrat-TLF}{l}{sl}{ - <-> ssub * Montserrat-TLF/l/it + +% ---- medium ---- + +\DeclareFontShape{T1}{Montserrat-TLF}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{m}{sc}{ - <-> \Montserrat@@scale Montserrat-Regular-tlf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{medium}{scit}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-tlf-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{medium}{sc}{ + <-> \Montserrat@@scale Montserrat-Medium-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{m}{scit}{ - <-> \Montserrat@@scale Montserrat-Italic-tlf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-tlf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-tlf-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{medium}{sl}{ + <-> ssub * Montserrat-TLF/medium/it }{} -\DeclareFontShape{T1}{Montserrat-TLF}{m}{scsl}{ - <-> ssub * Montserrat-TLF/m/scit +\DeclareFontShape{T1}{Montserrat-TLF}{medium}{scsl}{ + <-> ssub * Montserrat-TLF/medium/scit }{} -\DeclareFontShape{T1}{Montserrat-TLF}{m}{sl}{ - <-> ssub * Montserrat-TLF/m/it + +% ---- extralight ---- + +\DeclareFontShape{T1}{Montserrat-TLF}{extralight}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{t}{scit}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{extralight}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{t}{sc}{ - <-> \Montserrat@@scale Montserrat-Thin-tlf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-tlf-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{extralight}{scit}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{extralight}{sl}{ + <-> ssub * Montserrat-TLF/extralight/it }{} -\DeclareFontShape{T1}{Montserrat-TLF}{t}{scsl}{ - <-> ssub * Montserrat-TLF/t/scit +\DeclareFontShape{T1}{Montserrat-TLF}{extralight}{scsl}{ + <-> ssub * Montserrat-TLF/extralight/scit }{} -\DeclareFontShape{T1}{Montserrat-TLF}{t}{sl}{ - <-> ssub * Montserrat-TLF/t/it + +% ---- black ---- + +\DeclareFontShape{T1}{Montserrat-TLF}{black}{sc}{ + <-> \Montserrat@@scale Montserrat-Black-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{sb}{it}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-tlf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{sb}{scit}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{sb}{sc}{ - <-> \Montserrat@@scale Montserrat-SemiBold-tlf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{black}{scit}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-tlf-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{black}{sl}{ + <-> ssub * Montserrat-TLF/black/it }{} -\DeclareFontShape{T1}{Montserrat-TLF}{sb}{scsl}{ - <-> ssub * Montserrat-TLF/sb/scit +\DeclareFontShape{T1}{Montserrat-TLF}{black}{scsl}{ + <-> ssub * Montserrat-TLF/black/scit }{} -\DeclareFontShape{T1}{Montserrat-TLF}{sb}{sl}{ - <-> ssub * Montserrat-TLF/sb/it + +% ---- regular ---- + +\DeclareFontShape{T1}{Montserrat-TLF}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-tlf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{b}{scit}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{regular}{scit}{ + <-> \Montserrat@@scale Montserrat-Italic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{b}{sc}{ - <-> \Montserrat@@scale Montserrat-Bold-tlf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{regular}{sc}{ + <-> \Montserrat@@scale Montserrat-Regular-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-tlf-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-tlf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{b}{it}{ +\DeclareFontShape{T1}{Montserrat-TLF}{regular}{sl}{ + <-> ssub * Montserrat-TLF/regular/it +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{regular}{scsl}{ + <-> ssub * Montserrat-TLF/regular/scit +}{} + + +% ---- bold ---- + +\DeclareFontShape{T1}{Montserrat-TLF}{bold}{it}{ <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{b}{scsl}{ - <-> ssub * Montserrat-TLF/b/scit +\DeclareFontShape{T1}{Montserrat-TLF}{bold}{scit}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{b}{sl}{ - <-> ssub * Montserrat-TLF/b/it +\DeclareFontShape{T1}{Montserrat-TLF}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-tlf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{bold}{sc}{ + <-> \Montserrat@@scale Montserrat-Bold-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{eb}{scit}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{bold}{sl}{ + <-> ssub * Montserrat-TLF/bold/it }{} -\DeclareFontShape{T1}{Montserrat-TLF}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{bold}{scsl}{ + <-> ssub * Montserrat-TLF/bold/scit }{} -\DeclareFontShape{T1}{Montserrat-TLF}{eb}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-sc-t1 + +% ---- semibold ---- + +\DeclareFontShape{T1}{Montserrat-TLF}{semibold}{sc}{ + <-> \Montserrat@@scale Montserrat-SemiBold-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{eb}{scsl}{ - <-> ssub * Montserrat-TLF/eb/scit +\DeclareFontShape{T1}{Montserrat-TLF}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-tlf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{eb}{sl}{ - <-> ssub * Montserrat-TLF/eb/it +\DeclareFontShape{T1}{Montserrat-TLF}{semibold}{it}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{semibold}{scit}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TLF}{k}{scit}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{semibold}{sl}{ + <-> ssub * Montserrat-TLF/semibold/it }{} -\DeclareFontShape{T1}{Montserrat-TLF}{k}{sc}{ - <-> \Montserrat@@scale Montserrat-Black-tlf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{semibold}{scsl}{ + <-> ssub * Montserrat-TLF/semibold/scit }{} -\DeclareFontShape{T1}{Montserrat-TLF}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-tlf-t1 +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{T1}{Montserrat-TLF}{ul}{sc}{ + <-> ssub * Montserrat-TLF/thin/sc }{} -\DeclareFontShape{T1}{Montserrat-TLF}{k}{scsl}{ - <-> ssub * Montserrat-TLF/k/scit +\DeclareFontShape{T1}{Montserrat-TLF}{ul}{n}{ + <-> ssub * Montserrat-TLF/thin/n }{} -\DeclareFontShape{T1}{Montserrat-TLF}{k}{sl}{ - <-> ssub * Montserrat-TLF/k/it +\DeclareFontShape{T1}{Montserrat-TLF}{ul}{scsl}{ + <-> ssub * Montserrat-TLF/thin/scsl }{} -\DeclareFontShape{T1}{Montserrat-TLF}{el}{scit}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TLF}{ul}{sl}{ + <-> ssub * Montserrat-TLF/thin/sl +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{ul}{it}{ + <-> ssub * Montserrat-TLF/thin/it +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{ul}{scit}{ + <-> ssub * Montserrat-TLF/thin/scit +}{} + + +% el --> extralight + +\DeclareFontShape{T1}{Montserrat-TLF}{el}{sl}{ + <-> ssub * Montserrat-TLF/extralight/sl }{} \DeclareFontShape{T1}{Montserrat-TLF}{el}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-sc-t1 + <-> ssub * Montserrat-TLF/extralight/sc }{} \DeclareFontShape{T1}{Montserrat-TLF}{el}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-t1 + <-> ssub * Montserrat-TLF/extralight/n +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{el}{scsl}{ + <-> ssub * Montserrat-TLF/extralight/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{el}{scit}{ + <-> ssub * Montserrat-TLF/extralight/scit }{} \DeclareFontShape{T1}{Montserrat-TLF}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-t1 + <-> ssub * Montserrat-TLF/extralight/it }{} -\DeclareFontShape{T1}{Montserrat-TLF}{el}{scsl}{ - <-> ssub * Montserrat-TLF/el/scit + +% l --> light + +\DeclareFontShape{T1}{Montserrat-TLF}{l}{sl}{ + <-> ssub * Montserrat-TLF/light/sl }{} -\DeclareFontShape{T1}{Montserrat-TLF}{el}{sl}{ - <-> ssub * Montserrat-TLF/el/it +\DeclareFontShape{T1}{Montserrat-TLF}{l}{scsl}{ + <-> ssub * Montserrat-TLF/light/scsl }{} -\DeclareFontShape{T1}{Montserrat-TLF}{bx}{sl}{ - <-> ssub * Montserrat-TLF/b/sl +\DeclareFontShape{T1}{Montserrat-TLF}{l}{n}{ + <-> ssub * Montserrat-TLF/light/n }{} -\DeclareFontShape{T1}{Montserrat-TLF}{bx}{it}{ - <-> ssub * Montserrat-TLF/b/it +\DeclareFontShape{T1}{Montserrat-TLF}{l}{sc}{ + <-> ssub * Montserrat-TLF/light/sc }{} -\DeclareFontShape{T1}{Montserrat-TLF}{bx}{scit}{ - <-> ssub * Montserrat-TLF/b/scit +\DeclareFontShape{T1}{Montserrat-TLF}{l}{scit}{ + <-> ssub * Montserrat-TLF/light/scit +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{l}{it}{ + <-> ssub * Montserrat-TLF/light/it +}{} + + +% sl --> regular + +\DeclareFontShape{T1}{Montserrat-TLF}{sl}{scit}{ + <-> ssub * Montserrat-TLF/regular/scit +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{sl}{it}{ + <-> ssub * Montserrat-TLF/regular/it +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{sl}{sl}{ + <-> ssub * Montserrat-TLF/regular/sl +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{sl}{scsl}{ + <-> ssub * Montserrat-TLF/regular/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{sl}{sc}{ + <-> ssub * Montserrat-TLF/regular/sc +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{sl}{n}{ + <-> ssub * Montserrat-TLF/regular/n +}{} + + +% m --> medium + +\DeclareFontShape{T1}{Montserrat-TLF}{m}{sl}{ + <-> ssub * Montserrat-TLF/medium/sl +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{m}{scsl}{ + <-> ssub * Montserrat-TLF/medium/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{m}{sc}{ + <-> ssub * Montserrat-TLF/medium/sc +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{m}{n}{ + <-> ssub * Montserrat-TLF/medium/n +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{m}{scit}{ + <-> ssub * Montserrat-TLF/medium/scit +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{m}{it}{ + <-> ssub * Montserrat-TLF/medium/it +}{} + + +% sb --> semibold + +\DeclareFontShape{T1}{Montserrat-TLF}{sb}{sl}{ + <-> ssub * Montserrat-TLF/semibold/sl +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{sb}{sc}{ + <-> ssub * Montserrat-TLF/semibold/sc +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{sb}{n}{ + <-> ssub * Montserrat-TLF/semibold/n +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{sb}{scsl}{ + <-> ssub * Montserrat-TLF/semibold/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{sb}{scit}{ + <-> ssub * Montserrat-TLF/semibold/scit +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{sb}{it}{ + <-> ssub * Montserrat-TLF/semibold/it +}{} + + +% b --> bold + +\DeclareFontShape{T1}{Montserrat-TLF}{b}{it}{ + <-> ssub * Montserrat-TLF/bold/it +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{b}{scit}{ + <-> ssub * Montserrat-TLF/bold/scit +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{b}{scsl}{ + <-> ssub * Montserrat-TLF/bold/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{b}{n}{ + <-> ssub * Montserrat-TLF/bold/n +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{b}{sc}{ + <-> ssub * Montserrat-TLF/bold/sc +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{b}{sl}{ + <-> ssub * Montserrat-TLF/bold/sl +}{} + + +% eb --> extrabold + +\DeclareFontShape{T1}{Montserrat-TLF}{eb}{scsl}{ + <-> ssub * Montserrat-TLF/extrabold/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{eb}{sc}{ + <-> ssub * Montserrat-TLF/extrabold/sc +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{eb}{n}{ + <-> ssub * Montserrat-TLF/extrabold/n +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{eb}{sl}{ + <-> ssub * Montserrat-TLF/extrabold/sl +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{eb}{it}{ + <-> ssub * Montserrat-TLF/extrabold/it +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{eb}{scit}{ + <-> ssub * Montserrat-TLF/extrabold/scit +}{} + + +% ub --> black + +\DeclareFontShape{T1}{Montserrat-TLF}{ub}{scit}{ + <-> ssub * Montserrat-TLF/black/scit +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{ub}{it}{ + <-> ssub * Montserrat-TLF/black/it +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{ub}{sl}{ + <-> ssub * Montserrat-TLF/black/sl +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{ub}{sc}{ + <-> ssub * Montserrat-TLF/black/sc +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{ub}{n}{ + <-> ssub * Montserrat-TLF/black/n +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{ub}{scsl}{ + <-> ssub * Montserrat-TLF/black/scsl }{} \DeclareFontShape{T1}{Montserrat-TLF}{bx}{scsl}{ @@ -251,4 +512,16 @@ <-> ssub * Montserrat-TLF/b/n }{} +\DeclareFontShape{T1}{Montserrat-TLF}{bx}{sl}{ + <-> ssub * Montserrat-TLF/b/sl +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{bx}{it}{ + <-> ssub * Montserrat-TLF/b/it +}{} + +\DeclareFontShape{T1}{Montserrat-TLF}{bx}{scit}{ + <-> ssub * Montserrat-TLF/b/scit +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-TOsF.fd b/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-TOsF.fd index 120038ae0ef..da2f4087e29 100644 --- a/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-TOsF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{T1Montserrat-TOsF.fd} - [2017/01/25 (autoinst) Font definitions for T1/Montserrat-TOsF.] + [2019/10/18 (autoinst) Font definitions for T1/Montserrat-TOsF.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,236 +11,493 @@ \DeclareFontFamily{T1}{Montserrat-TOsF}{} -\DeclareFontShape{T1}{Montserrat-TOsF}{el}{it}{ + +% ---- extralight ---- + +\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-sc-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{it}{ <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{el}{scit}{ +\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{scit}{ <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{el}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{sl}{ + <-> ssub * Montserrat-TOsF/extralight/it }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{el}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{scsl}{ + <-> ssub * Montserrat-TOsF/extralight/scit }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{el}{scsl}{ - <-> ssub * Montserrat-TOsF/el/scit + +% ---- black ---- + +\DeclareFontShape{T1}{Montserrat-TOsF}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-tosf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{el}{sl}{ - <-> ssub * Montserrat-TOsF/el/it +\DeclareFontShape{T1}{Montserrat-TOsF}{black}{sc}{ + <-> \Montserrat@@scale Montserrat-Black-tosf-sc-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{black}{scit}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{k}{it}{ +\DeclareFontShape{T1}{Montserrat-TOsF}{black}{it}{ <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{k}{scit}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{black}{sl}{ + <-> ssub * Montserrat-TOsF/black/it }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-tosf-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{black}{scsl}{ + <-> ssub * Montserrat-TOsF/black/scit }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{k}{sc}{ - <-> \Montserrat@@scale Montserrat-Black-tosf-sc-t1 + +% ---- regular ---- + +\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-tosf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{scit}{ + <-> \Montserrat@@scale Montserrat-Italic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{k}{scsl}{ - <-> ssub * Montserrat-TOsF/k/scit +\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-tosf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{k}{sl}{ - <-> ssub * Montserrat-TOsF/k/it +\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{sc}{ + <-> \Montserrat@@scale Montserrat-Regular-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{b}{scit}{ +\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{sl}{ + <-> ssub * Montserrat-TOsF/regular/it +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{scsl}{ + <-> ssub * Montserrat-TOsF/regular/scit +}{} + + +% ---- bold ---- + +\DeclareFontShape{T1}{Montserrat-TOsF}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{bold}{scit}{ <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{b}{n}{ +\DeclareFontShape{T1}{Montserrat-TOsF}{bold}{sc}{ + <-> \Montserrat@@scale Montserrat-Bold-tosf-sc-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{bold}{n}{ <-> \Montserrat@@scale Montserrat-Bold-tosf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{b}{sc}{ - <-> \Montserrat@@scale Montserrat-Bold-tosf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{bold}{sl}{ + <-> ssub * Montserrat-TOsF/bold/it }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{bold}{scsl}{ + <-> ssub * Montserrat-TOsF/bold/scit }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{b}{scsl}{ - <-> ssub * Montserrat-TOsF/b/scit + +% ---- semibold ---- + +\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{sc}{ + <-> \Montserrat@@scale Montserrat-SemiBold-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{b}{sl}{ - <-> ssub * Montserrat-TOsF/b/it +\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-tosf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{sc}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{scit}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{scit}{ +\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{it}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{sl}{ + <-> ssub * Montserrat-TOsF/semibold/it +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{scsl}{ + <-> ssub * Montserrat-TOsF/semibold/scit +}{} + + +% ---- thin ---- + +\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{scit}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-sc-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{sc}{ + <-> \Montserrat@@scale Montserrat-Thin-tosf-sc-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-tosf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{sl}{ + <-> ssub * Montserrat-TOsF/thin/it +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{scsl}{ + <-> ssub * Montserrat-TOsF/thin/scit +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{scit}{ <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{n}{ +\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{n}{ <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{sc}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{scsl}{ - <-> ssub * Montserrat-TOsF/eb/scit +\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{sl}{ + <-> ssub * Montserrat-TOsF/extrabold/it }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{sl}{ - <-> ssub * Montserrat-TOsF/eb/it +\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{scsl}{ + <-> ssub * Montserrat-TOsF/extrabold/scit }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-tosf-t1 + +% ---- light ---- + +\DeclareFontShape{T1}{Montserrat-TOsF}{light}{scit}{ + <-> \Montserrat@@scale Montserrat-LightItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-tosf-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{light}{it}{ + <-> \Montserrat@@scale Montserrat-LightItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{m}{sc}{ - <-> \Montserrat@@scale Montserrat-Regular-tosf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{light}{sc}{ + <-> \Montserrat@@scale Montserrat-Light-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{m}{scit}{ - <-> \Montserrat@@scale Montserrat-Italic-tosf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{light}{n}{ + <-> \Montserrat@@scale Montserrat-Light-tosf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{m}{scsl}{ - <-> ssub * Montserrat-TOsF/m/scit +\DeclareFontShape{T1}{Montserrat-TOsF}{light}{sl}{ + <-> ssub * Montserrat-TOsF/light/it }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{m}{sl}{ - <-> ssub * Montserrat-TOsF/m/it +\DeclareFontShape{T1}{Montserrat-TOsF}{light}{scsl}{ + <-> ssub * Montserrat-TOsF/light/scit }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-t1 + +% ---- medium ---- + +\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-tosf-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{mb}{sc}{ +\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{sc}{ <-> \Montserrat@@scale Montserrat-Medium-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{mb}{scit}{ +\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-t1 +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{scit}{ <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-tosf-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{sl}{ + <-> ssub * Montserrat-TOsF/medium/it }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{mb}{scsl}{ - <-> ssub * Montserrat-TOsF/mb/scit +\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{scsl}{ + <-> ssub * Montserrat-TOsF/medium/scit }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{mb}{sl}{ - <-> ssub * Montserrat-TOsF/mb/it +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{sc}{ + <-> ssub * Montserrat-TOsF/thin/sc }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{l}{it}{ - <-> \Montserrat@@scale Montserrat-LightItalic-tosf-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{n}{ + <-> ssub * Montserrat-TOsF/thin/n }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{l}{scit}{ - <-> \Montserrat@@scale Montserrat-LightItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{scsl}{ + <-> ssub * Montserrat-TOsF/thin/scsl }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{l}{n}{ - <-> \Montserrat@@scale Montserrat-Light-tosf-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{sl}{ + <-> ssub * Montserrat-TOsF/thin/sl }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{l}{sc}{ - <-> \Montserrat@@scale Montserrat-Light-tosf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{it}{ + <-> ssub * Montserrat-TOsF/thin/it +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{scit}{ + <-> ssub * Montserrat-TOsF/thin/scit +}{} + + +% el --> extralight + +\DeclareFontShape{T1}{Montserrat-TOsF}{el}{it}{ + <-> ssub * Montserrat-TOsF/extralight/it +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{el}{scit}{ + <-> ssub * Montserrat-TOsF/extralight/scit +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{el}{scsl}{ + <-> ssub * Montserrat-TOsF/extralight/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{el}{n}{ + <-> ssub * Montserrat-TOsF/extralight/n +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{el}{sc}{ + <-> ssub * Montserrat-TOsF/extralight/sc +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{el}{sl}{ + <-> ssub * Montserrat-TOsF/extralight/sl }{} + +% l --> light + \DeclareFontShape{T1}{Montserrat-TOsF}{l}{scsl}{ - <-> ssub * Montserrat-TOsF/l/scit + <-> ssub * Montserrat-TOsF/light/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{l}{sc}{ + <-> ssub * Montserrat-TOsF/light/sc +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{l}{n}{ + <-> ssub * Montserrat-TOsF/light/n }{} \DeclareFontShape{T1}{Montserrat-TOsF}{l}{sl}{ - <-> ssub * Montserrat-TOsF/l/it + <-> ssub * Montserrat-TOsF/light/sl }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{sb}{it}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{l}{it}{ + <-> ssub * Montserrat-TOsF/light/it +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{l}{scit}{ + <-> ssub * Montserrat-TOsF/light/scit }{} + +% sl --> regular + +\DeclareFontShape{T1}{Montserrat-TOsF}{sl}{sl}{ + <-> ssub * Montserrat-TOsF/regular/sl +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{sl}{scsl}{ + <-> ssub * Montserrat-TOsF/regular/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{sl}{n}{ + <-> ssub * Montserrat-TOsF/regular/n +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{sl}{sc}{ + <-> ssub * Montserrat-TOsF/regular/sc +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{sl}{scit}{ + <-> ssub * Montserrat-TOsF/regular/scit +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{sl}{it}{ + <-> ssub * Montserrat-TOsF/regular/it +}{} + + +% m --> medium + +\DeclareFontShape{T1}{Montserrat-TOsF}{m}{sl}{ + <-> ssub * Montserrat-TOsF/medium/sl +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{m}{scsl}{ + <-> ssub * Montserrat-TOsF/medium/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{m}{n}{ + <-> ssub * Montserrat-TOsF/medium/n +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{m}{sc}{ + <-> ssub * Montserrat-TOsF/medium/sc +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{m}{scit}{ + <-> ssub * Montserrat-TOsF/medium/scit +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{m}{it}{ + <-> ssub * Montserrat-TOsF/medium/it +}{} + + +% sb --> semibold + \DeclareFontShape{T1}{Montserrat-TOsF}{sb}{scit}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-sc-t1 + <-> ssub * Montserrat-TOsF/semibold/scit +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{sb}{it}{ + <-> ssub * Montserrat-TOsF/semibold/it +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{sb}{sl}{ + <-> ssub * Montserrat-TOsF/semibold/sl }{} \DeclareFontShape{T1}{Montserrat-TOsF}{sb}{sc}{ - <-> \Montserrat@@scale Montserrat-SemiBold-tosf-sc-t1 + <-> ssub * Montserrat-TOsF/semibold/sc }{} \DeclareFontShape{T1}{Montserrat-TOsF}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-tosf-t1 + <-> ssub * Montserrat-TOsF/semibold/n }{} \DeclareFontShape{T1}{Montserrat-TOsF}{sb}{scsl}{ - <-> ssub * Montserrat-TOsF/sb/scit + <-> ssub * Montserrat-TOsF/semibold/scsl }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{sb}{sl}{ - <-> ssub * Montserrat-TOsF/sb/it + +% b --> bold + +\DeclareFontShape{T1}{Montserrat-TOsF}{b}{it}{ + <-> ssub * Montserrat-TOsF/bold/it }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{b}{scit}{ + <-> ssub * Montserrat-TOsF/bold/scit }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-tosf-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{b}{sc}{ + <-> ssub * Montserrat-TOsF/bold/sc }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{t}{scit}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{b}{n}{ + <-> ssub * Montserrat-TOsF/bold/n }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{t}{sc}{ - <-> \Montserrat@@scale Montserrat-Thin-tosf-sc-t1 +\DeclareFontShape{T1}{Montserrat-TOsF}{b}{scsl}{ + <-> ssub * Montserrat-TOsF/bold/scsl }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{t}{scsl}{ - <-> ssub * Montserrat-TOsF/t/scit +\DeclareFontShape{T1}{Montserrat-TOsF}{b}{sl}{ + <-> ssub * Montserrat-TOsF/bold/sl }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{t}{sl}{ - <-> ssub * Montserrat-TOsF/t/it + +% eb --> extrabold + +\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{scit}{ + <-> ssub * Montserrat-TOsF/extrabold/scit }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{sl}{ - <-> ssub * Montserrat-TOsF/b/sl +\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{it}{ + <-> ssub * Montserrat-TOsF/extrabold/it }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{it}{ - <-> ssub * Montserrat-TOsF/b/it +\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{sl}{ + <-> ssub * Montserrat-TOsF/extrabold/sl }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{scsl}{ - <-> ssub * Montserrat-TOsF/b/scsl +\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{n}{ + <-> ssub * Montserrat-TOsF/extrabold/n }{} -\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{scit}{ - <-> ssub * Montserrat-TOsF/b/scit +\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{sc}{ + <-> ssub * Montserrat-TOsF/extrabold/sc +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{scsl}{ + <-> ssub * Montserrat-TOsF/extrabold/scsl +}{} + + +% ub --> black + +\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{sl}{ + <-> ssub * Montserrat-TOsF/black/sl +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{scsl}{ + <-> ssub * Montserrat-TOsF/black/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{n}{ + <-> ssub * Montserrat-TOsF/black/n +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{sc}{ + <-> ssub * Montserrat-TOsF/black/sc +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{scit}{ + <-> ssub * Montserrat-TOsF/black/scit +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{it}{ + <-> ssub * Montserrat-TOsF/black/it }{} \DeclareFontShape{T1}{Montserrat-TOsF}{bx}{n}{ @@ -251,4 +508,20 @@ <-> ssub * Montserrat-TOsF/b/sc }{} +\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{scsl}{ + <-> ssub * Montserrat-TOsF/b/scsl +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{sl}{ + <-> ssub * Montserrat-TOsF/b/sl +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{it}{ + <-> ssub * Montserrat-TOsF/b/it +}{} + +\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{scit}{ + <-> ssub * Montserrat-TOsF/b/scit +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-Dnom.fd b/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-Dnom.fd index f2718b47cf0..85c54bd6896 100644 --- a/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-Dnom.fd +++ b/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-Dnom.fd @@ -1,122 +1,291 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{T1MontserratAlternates-Dnom.fd} - [2017/01/25 (autoinst) Font definitions for T1/MontserratAlternates-Dnom.] + [2019/10/18 (autoinst) Font definitions for T1/MontserratAlternates-Dnom.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{T1}{MontserratAlternates-Dnom}{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-dnom-t1 + +% ---- light ---- + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-dnom-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-dnom-t1 +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-dnom-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{t}{sl}{ - <-> ssub * MontserratAlternates-Dnom/t/it +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{light}{sl}{ + <-> ssub * MontserratAlternates-Dnom/light/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-dnom-t1 + +% ---- medium ---- + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-dnom-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-dnom-t1 +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-dnom-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sb}{sl}{ - <-> ssub * MontserratAlternates-Dnom/sb/it +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{medium}{sl}{ + <-> ssub * MontserratAlternates-Dnom/medium/it +}{} + + +% ---- semibold ---- + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-dnom-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-dnom-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{semibold}{sl}{ + <-> ssub * MontserratAlternates-Dnom/semibold/it +}{} + + +% ---- black ---- + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-dnom-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-dnom-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{black}{sl}{ + <-> ssub * MontserratAlternates-Dnom/black/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-dnom-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-dnom-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{regular}{sl}{ + <-> ssub * MontserratAlternates-Dnom/regular/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-dnom-t1 + +% ---- thin ---- + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-dnom-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-dnom-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{thin}{sl}{ + <-> ssub * MontserratAlternates-Dnom/thin/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-dnom-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-dnom-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-dnom-t1 +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{bold}{sl}{ + <-> ssub * MontserratAlternates-Dnom/bold/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-dnom-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{mb}{sl}{ - <-> ssub * MontserratAlternates-Dnom/mb/it +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-dnom-t1 }{} +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extralight}{sl}{ + <-> ssub * MontserratAlternates-Dnom/extralight/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-dnom-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-dnom-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-Dnom/extrabold/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ul}{sl}{ + <-> ssub * MontserratAlternates-Dnom/thin/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ul}{it}{ + <-> ssub * MontserratAlternates-Dnom/thin/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ul}{n}{ + <-> ssub * MontserratAlternates-Dnom/thin/n +}{} + + +% el --> extralight + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{el}{n}{ + <-> ssub * MontserratAlternates-Dnom/extralight/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{el}{it}{ + <-> ssub * MontserratAlternates-Dnom/extralight/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{el}{sl}{ + <-> ssub * MontserratAlternates-Dnom/extralight/sl +}{} + + +% l --> light + \DeclareFontShape{T1}{MontserratAlternates-Dnom}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-dnom-t1 + <-> ssub * MontserratAlternates-Dnom/light/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{l}{sl}{ + <-> ssub * MontserratAlternates-Dnom/light/sl }{} \DeclareFontShape{T1}{MontserratAlternates-Dnom}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-dnom-t1 + <-> ssub * MontserratAlternates-Dnom/light/n }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{l}{sl}{ - <-> ssub * MontserratAlternates-Dnom/l/it + +% sl --> regular + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sl}{n}{ + <-> ssub * MontserratAlternates-Dnom/regular/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sl}{it}{ + <-> ssub * MontserratAlternates-Dnom/regular/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sl}{sl}{ + <-> ssub * MontserratAlternates-Dnom/regular/sl +}{} + + +% m --> medium + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{m}{sl}{ + <-> ssub * MontserratAlternates-Dnom/medium/sl }{} \DeclareFontShape{T1}{MontserratAlternates-Dnom}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-dnom-t1 + <-> ssub * MontserratAlternates-Dnom/medium/it }{} \DeclareFontShape{T1}{MontserratAlternates-Dnom}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-dnom-t1 + <-> ssub * MontserratAlternates-Dnom/medium/n }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{m}{sl}{ - <-> ssub * MontserratAlternates-Dnom/m/it + +% sb --> semibold + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sb}{it}{ + <-> ssub * MontserratAlternates-Dnom/semibold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-dnom-t1 +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sb}{sl}{ + <-> ssub * MontserratAlternates-Dnom/semibold/sl }{} +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sb}{n}{ + <-> ssub * MontserratAlternates-Dnom/semibold/n +}{} + + +% b --> bold + \DeclareFontShape{T1}{MontserratAlternates-Dnom}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-dnom-t1 + <-> ssub * MontserratAlternates-Dnom/bold/it }{} \DeclareFontShape{T1}{MontserratAlternates-Dnom}{b}{sl}{ - <-> ssub * MontserratAlternates-Dnom/b/it + <-> ssub * MontserratAlternates-Dnom/bold/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-dnom-t1 +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{b}{n}{ + <-> ssub * MontserratAlternates-Dnom/bold/n }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-dnom-t1 -}{} + +% eb --> extrabold \DeclareFontShape{T1}{MontserratAlternates-Dnom}{eb}{sl}{ - <-> ssub * MontserratAlternates-Dnom/eb/it + <-> ssub * MontserratAlternates-Dnom/extrabold/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-dnom-t1 +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{eb}{it}{ + <-> ssub * MontserratAlternates-Dnom/extrabold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-dnom-t1 +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{eb}{n}{ + <-> ssub * MontserratAlternates-Dnom/extrabold/n }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{k}{sl}{ - <-> ssub * MontserratAlternates-Dnom/k/it + +% ub --> black + +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ub}{n}{ + <-> ssub * MontserratAlternates-Dnom/black/n }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-dnom-t1 +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ub}{it}{ + <-> ssub * MontserratAlternates-Dnom/black/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-dnom-t1 +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ub}{sl}{ + <-> ssub * MontserratAlternates-Dnom/black/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{el}{sl}{ - <-> ssub * MontserratAlternates-Dnom/el/it +\DeclareFontShape{T1}{MontserratAlternates-Dnom}{bx}{n}{ + <-> ssub * MontserratAlternates-Dnom/b/n }{} \DeclareFontShape{T1}{MontserratAlternates-Dnom}{bx}{it}{ @@ -127,8 +296,4 @@ <-> ssub * MontserratAlternates-Dnom/b/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-Dnom}{bx}{n}{ - <-> ssub * MontserratAlternates-Dnom/b/n -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-Inf.fd b/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-Inf.fd index 398538eda59..51f9ea54ab5 100644 --- a/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-Inf.fd +++ b/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-Inf.fd @@ -1,122 +1,287 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{T1MontserratAlternates-Inf.fd} - [2017/01/25 (autoinst) Font definitions for T1/MontserratAlternates-Inf.] + [2019/10/18 (autoinst) Font definitions for T1/MontserratAlternates-Inf.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{T1}{MontserratAlternates-Inf}{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-inf-t1 + +% ---- bold ---- + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-inf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-inf-t1 +\DeclareFontShape{T1}{MontserratAlternates-Inf}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-inf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{el}{sl}{ - <-> ssub * MontserratAlternates-Inf/el/it +\DeclareFontShape{T1}{MontserratAlternates-Inf}{bold}{sl}{ + <-> ssub * MontserratAlternates-Inf/bold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-inf-t1 + +% ---- thin ---- + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-inf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-inf-t1 +\DeclareFontShape{T1}{MontserratAlternates-Inf}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-inf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{k}{sl}{ - <-> ssub * MontserratAlternates-Inf/k/it +\DeclareFontShape{T1}{MontserratAlternates-Inf}{thin}{sl}{ + <-> ssub * MontserratAlternates-Inf/thin/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-inf-t1 + +% ---- regular ---- + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-inf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-inf-t1 +\DeclareFontShape{T1}{MontserratAlternates-Inf}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-inf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{b}{sl}{ - <-> ssub * MontserratAlternates-Inf/b/it +\DeclareFontShape{T1}{MontserratAlternates-Inf}{regular}{sl}{ + <-> ssub * MontserratAlternates-Inf/regular/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-inf-t1 + +% ---- black ---- + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-inf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-inf-t1 +\DeclareFontShape{T1}{MontserratAlternates-Inf}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-inf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{eb}{sl}{ - <-> ssub * MontserratAlternates-Inf/eb/it +\DeclareFontShape{T1}{MontserratAlternates-Inf}{black}{sl}{ + <-> ssub * MontserratAlternates-Inf/black/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-inf-t1 + +% ---- semibold ---- + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-inf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-inf-t1 +\DeclareFontShape{T1}{MontserratAlternates-Inf}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-inf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{m}{sl}{ - <-> ssub * MontserratAlternates-Inf/m/it +\DeclareFontShape{T1}{MontserratAlternates-Inf}{semibold}{sl}{ + <-> ssub * MontserratAlternates-Inf/semibold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-inf-t1 + +% ---- light ---- + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-inf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-inf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{light}{sl}{ + <-> ssub * MontserratAlternates-Inf/light/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-inf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-inf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{medium}{sl}{ + <-> ssub * MontserratAlternates-Inf/medium/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-inf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-inf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-Inf/extrabold/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-inf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-inf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{extralight}{sl}{ + <-> ssub * MontserratAlternates-Inf/extralight/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{ul}{n}{ + <-> ssub * MontserratAlternates-Inf/thin/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{ul}{it}{ + <-> ssub * MontserratAlternates-Inf/thin/it }{} +\DeclareFontShape{T1}{MontserratAlternates-Inf}{ul}{sl}{ + <-> ssub * MontserratAlternates-Inf/thin/sl +}{} + + +% el --> extralight + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{el}{n}{ + <-> ssub * MontserratAlternates-Inf/extralight/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{el}{sl}{ + <-> ssub * MontserratAlternates-Inf/extralight/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{el}{it}{ + <-> ssub * MontserratAlternates-Inf/extralight/it +}{} + + +% l --> light + \DeclareFontShape{T1}{MontserratAlternates-Inf}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-inf-t1 + <-> ssub * MontserratAlternates-Inf/light/n }{} \DeclareFontShape{T1}{MontserratAlternates-Inf}{l}{sl}{ - <-> ssub * MontserratAlternates-Inf/l/it + <-> ssub * MontserratAlternates-Inf/light/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-inf-t1 +\DeclareFontShape{T1}{MontserratAlternates-Inf}{l}{it}{ + <-> ssub * MontserratAlternates-Inf/light/it +}{} + + +% sl --> regular + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{sl}{sl}{ + <-> ssub * MontserratAlternates-Inf/regular/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-inf-t1 +\DeclareFontShape{T1}{MontserratAlternates-Inf}{sl}{it}{ + <-> ssub * MontserratAlternates-Inf/regular/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{mb}{sl}{ - <-> ssub * MontserratAlternates-Inf/mb/it +\DeclareFontShape{T1}{MontserratAlternates-Inf}{sl}{n}{ + <-> ssub * MontserratAlternates-Inf/regular/n }{} + +% m --> medium + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{m}{it}{ + <-> ssub * MontserratAlternates-Inf/medium/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{m}{sl}{ + <-> ssub * MontserratAlternates-Inf/medium/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{m}{n}{ + <-> ssub * MontserratAlternates-Inf/medium/n +}{} + + +% sb --> semibold + \DeclareFontShape{T1}{MontserratAlternates-Inf}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-inf-t1 + <-> ssub * MontserratAlternates-Inf/semibold/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{sb}{sl}{ + <-> ssub * MontserratAlternates-Inf/semibold/sl }{} \DeclareFontShape{T1}{MontserratAlternates-Inf}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-inf-t1 + <-> ssub * MontserratAlternates-Inf/semibold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{sb}{sl}{ - <-> ssub * MontserratAlternates-Inf/sb/it + +% b --> bold + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{b}{n}{ + <-> ssub * MontserratAlternates-Inf/bold/n }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-inf-t1 +\DeclareFontShape{T1}{MontserratAlternates-Inf}{b}{it}{ + <-> ssub * MontserratAlternates-Inf/bold/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{b}{sl}{ + <-> ssub * MontserratAlternates-Inf/bold/sl +}{} + + +% eb --> extrabold + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{eb}{sl}{ + <-> ssub * MontserratAlternates-Inf/extrabold/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{eb}{it}{ + <-> ssub * MontserratAlternates-Inf/extrabold/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{eb}{n}{ + <-> ssub * MontserratAlternates-Inf/extrabold/n +}{} + + +% ub --> black + +\DeclareFontShape{T1}{MontserratAlternates-Inf}{ub}{n}{ + <-> ssub * MontserratAlternates-Inf/black/n }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-inf-t1 +\DeclareFontShape{T1}{MontserratAlternates-Inf}{ub}{sl}{ + <-> ssub * MontserratAlternates-Inf/black/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-Inf}{t}{sl}{ - <-> ssub * MontserratAlternates-Inf/t/it +\DeclareFontShape{T1}{MontserratAlternates-Inf}{ub}{it}{ + <-> ssub * MontserratAlternates-Inf/black/it }{} \DeclareFontShape{T1}{MontserratAlternates-Inf}{bx}{sl}{ diff --git a/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-LF.fd b/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-LF.fd index 4e92489efb8..be7a5cf1aae 100644 --- a/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-LF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-LF.fd @@ -1,234 +1,503 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{T1MontserratAlternates-LF.fd} - [2017/01/25 (autoinst) Font definitions for T1/MontserratAlternates-LF.] + [2019/10/18 (autoinst) Font definitions for T1/MontserratAlternates-LF.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{T1}{MontserratAlternates-LF}{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-lf-t1 + +% ---- extralight ---- + +\DeclareFontShape{T1}{MontserratAlternates-LF}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-lf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-lf-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{extralight}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-lf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{mb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-lf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{extralight}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{mb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-lf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-lf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{mb}{scsl}{ - <-> ssub * MontserratAlternates-LF/mb/scit +\DeclareFontShape{T1}{MontserratAlternates-LF}{extralight}{scsl}{ + <-> ssub * MontserratAlternates-LF/extralight/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{mb}{sl}{ - <-> ssub * MontserratAlternates-LF/mb/it +\DeclareFontShape{T1}{MontserratAlternates-LF}{extralight}{sl}{ + <-> ssub * MontserratAlternates-LF/extralight/it }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{l}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-lf-sc-t1 + +% ---- extrabold ---- + +\DeclareFontShape{T1}{MontserratAlternates-LF}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-lf-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{extrabold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{l}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Light-lf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-lf-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{extrabold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{l}{scsl}{ - <-> ssub * MontserratAlternates-LF/l/scit +\DeclareFontShape{T1}{MontserratAlternates-LF}{extrabold}{scsl}{ + <-> ssub * MontserratAlternates-LF/extrabold/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{l}{sl}{ - <-> ssub * MontserratAlternates-LF/l/it +\DeclareFontShape{T1}{MontserratAlternates-LF}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-LF/extrabold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{m}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-lf-sc-t1 + +% ---- bold ---- + +\DeclareFontShape{T1}{MontserratAlternates-LF}{bold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-lf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-lf-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-lf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{m}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-lf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-lf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-lf-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{bold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{m}{scsl}{ - <-> ssub * MontserratAlternates-LF/m/scit +\DeclareFontShape{T1}{MontserratAlternates-LF}{bold}{scsl}{ + <-> ssub * MontserratAlternates-LF/bold/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{m}{sl}{ - <-> ssub * MontserratAlternates-LF/m/it +\DeclareFontShape{T1}{MontserratAlternates-LF}{bold}{sl}{ + <-> ssub * MontserratAlternates-LF/bold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-lf-t1 + +% ---- thin ---- + +\DeclareFontShape{T1}{MontserratAlternates-LF}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{t}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-lf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{thin}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{t}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-lf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-lf-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{thin}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{t}{scsl}{ - <-> ssub * MontserratAlternates-LF/t/scit +\DeclareFontShape{T1}{MontserratAlternates-LF}{thin}{scsl}{ + <-> ssub * MontserratAlternates-LF/thin/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{t}{sl}{ - <-> ssub * MontserratAlternates-LF/t/it +\DeclareFontShape{T1}{MontserratAlternates-LF}{thin}{sl}{ + <-> ssub * MontserratAlternates-LF/thin/it }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-lf-t1 + +% ---- semibold ---- + +\DeclareFontShape{T1}{MontserratAlternates-LF}{semibold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-lf-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-lf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{semibold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-lf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{scsl}{ - <-> ssub * MontserratAlternates-LF/sb/scit +\DeclareFontShape{T1}{MontserratAlternates-LF}{semibold}{scsl}{ + <-> ssub * MontserratAlternates-LF/semibold/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{sl}{ - <-> ssub * MontserratAlternates-LF/sb/it +\DeclareFontShape{T1}{MontserratAlternates-LF}{semibold}{sl}{ + <-> ssub * MontserratAlternates-LF/semibold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-lf-t1 + +% ---- medium ---- + +\DeclareFontShape{T1}{MontserratAlternates-LF}{medium}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-lf-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-lf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-lf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-lf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{medium}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-lf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{scsl}{ - <-> ssub * MontserratAlternates-LF/eb/scit +\DeclareFontShape{T1}{MontserratAlternates-LF}{medium}{scsl}{ + <-> ssub * MontserratAlternates-LF/medium/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{sl}{ - <-> ssub * MontserratAlternates-LF/eb/it +\DeclareFontShape{T1}{MontserratAlternates-LF}{medium}{sl}{ + <-> ssub * MontserratAlternates-LF/medium/it }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-lf-t1 + +% ---- light ---- + +\DeclareFontShape{T1}{MontserratAlternates-LF}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-lf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-lf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{light}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-lf-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{light}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-lf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-lf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-lf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{scsl}{ - <-> ssub * MontserratAlternates-LF/b/scit +\DeclareFontShape{T1}{MontserratAlternates-LF}{light}{scsl}{ + <-> ssub * MontserratAlternates-LF/light/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{sl}{ - <-> ssub * MontserratAlternates-LF/b/it +\DeclareFontShape{T1}{MontserratAlternates-LF}{light}{sl}{ + <-> ssub * MontserratAlternates-LF/light/it }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{k}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-lf-sc-t1 + +% ---- black ---- + +\DeclareFontShape{T1}{MontserratAlternates-LF}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-lf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{k}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Black-lf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{black}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-lf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-lf-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{black}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-lf-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-lf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{k}{scsl}{ - <-> ssub * MontserratAlternates-LF/k/scit +\DeclareFontShape{T1}{MontserratAlternates-LF}{black}{scsl}{ + <-> ssub * MontserratAlternates-LF/black/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{k}{sl}{ - <-> ssub * MontserratAlternates-LF/k/it +\DeclareFontShape{T1}{MontserratAlternates-LF}{black}{sl}{ + <-> ssub * MontserratAlternates-LF/black/it }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-lf-t1 + +% ---- regular ---- + +\DeclareFontShape{T1}{MontserratAlternates-LF}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-lf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{regular}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-lf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{regular}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-lf-t1 +\DeclareFontShape{T1}{MontserratAlternates-LF}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{regular}{scsl}{ + <-> ssub * MontserratAlternates-LF/regular/scit }{} +\DeclareFontShape{T1}{MontserratAlternates-LF}{regular}{sl}{ + <-> ssub * MontserratAlternates-LF/regular/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{T1}{MontserratAlternates-LF}{ul}{scsl}{ + <-> ssub * MontserratAlternates-LF/thin/scsl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{ul}{n}{ + <-> ssub * MontserratAlternates-LF/thin/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{ul}{scit}{ + <-> ssub * MontserratAlternates-LF/thin/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{ul}{it}{ + <-> ssub * MontserratAlternates-LF/thin/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{ul}{sc}{ + <-> ssub * MontserratAlternates-LF/thin/sc +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{ul}{sl}{ + <-> ssub * MontserratAlternates-LF/thin/sl +}{} + + +% el --> extralight + \DeclareFontShape{T1}{MontserratAlternates-LF}{el}{scsl}{ - <-> ssub * MontserratAlternates-LF/el/scit + <-> ssub * MontserratAlternates-LF/extralight/scsl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{n}{ + <-> ssub * MontserratAlternates-LF/extralight/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{scit}{ + <-> ssub * MontserratAlternates-LF/extralight/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{it}{ + <-> ssub * MontserratAlternates-LF/extralight/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{sc}{ + <-> ssub * MontserratAlternates-LF/extralight/sc }{} \DeclareFontShape{T1}{MontserratAlternates-LF}{el}{sl}{ - <-> ssub * MontserratAlternates-LF/el/it + <-> ssub * MontserratAlternates-LF/extralight/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{bx}{scit}{ - <-> ssub * MontserratAlternates-LF/b/scit + +% l --> light + +\DeclareFontShape{T1}{MontserratAlternates-LF}{l}{scit}{ + <-> ssub * MontserratAlternates-LF/light/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{l}{n}{ + <-> ssub * MontserratAlternates-LF/light/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{l}{scsl}{ + <-> ssub * MontserratAlternates-LF/light/scsl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{l}{sl}{ + <-> ssub * MontserratAlternates-LF/light/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{l}{sc}{ + <-> ssub * MontserratAlternates-LF/light/sc +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{l}{it}{ + <-> ssub * MontserratAlternates-LF/light/it +}{} + + +% sl --> regular + +\DeclareFontShape{T1}{MontserratAlternates-LF}{sl}{it}{ + <-> ssub * MontserratAlternates-LF/regular/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{sl}{sc}{ + <-> ssub * MontserratAlternates-LF/regular/sc +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{sl}{sl}{ + <-> ssub * MontserratAlternates-LF/regular/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{sl}{scsl}{ + <-> ssub * MontserratAlternates-LF/regular/scsl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{sl}{n}{ + <-> ssub * MontserratAlternates-LF/regular/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{sl}{scit}{ + <-> ssub * MontserratAlternates-LF/regular/scit +}{} + + +% m --> medium + +\DeclareFontShape{T1}{MontserratAlternates-LF}{m}{sl}{ + <-> ssub * MontserratAlternates-LF/medium/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{m}{sc}{ + <-> ssub * MontserratAlternates-LF/medium/sc +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{m}{it}{ + <-> ssub * MontserratAlternates-LF/medium/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{m}{n}{ + <-> ssub * MontserratAlternates-LF/medium/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{m}{scit}{ + <-> ssub * MontserratAlternates-LF/medium/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{m}{scsl}{ + <-> ssub * MontserratAlternates-LF/medium/scsl +}{} + + +% sb --> semibold + +\DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{scsl}{ + <-> ssub * MontserratAlternates-LF/semibold/scsl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{n}{ + <-> ssub * MontserratAlternates-LF/semibold/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{scit}{ + <-> ssub * MontserratAlternates-LF/semibold/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{it}{ + <-> ssub * MontserratAlternates-LF/semibold/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{sc}{ + <-> ssub * MontserratAlternates-LF/semibold/sc +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{sl}{ + <-> ssub * MontserratAlternates-LF/semibold/sl +}{} + + +% b --> bold + +\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{scsl}{ + <-> ssub * MontserratAlternates-LF/bold/scsl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{scit}{ + <-> ssub * MontserratAlternates-LF/bold/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{n}{ + <-> ssub * MontserratAlternates-LF/bold/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{it}{ + <-> ssub * MontserratAlternates-LF/bold/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{sc}{ + <-> ssub * MontserratAlternates-LF/bold/sc +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{sl}{ + <-> ssub * MontserratAlternates-LF/bold/sl +}{} + + +% eb --> extrabold + +\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{sl}{ + <-> ssub * MontserratAlternates-LF/extrabold/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{sc}{ + <-> ssub * MontserratAlternates-LF/extrabold/sc +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{it}{ + <-> ssub * MontserratAlternates-LF/extrabold/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{n}{ + <-> ssub * MontserratAlternates-LF/extrabold/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{scit}{ + <-> ssub * MontserratAlternates-LF/extrabold/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{scsl}{ + <-> ssub * MontserratAlternates-LF/extrabold/scsl +}{} + + +% ub --> black + +\DeclareFontShape{T1}{MontserratAlternates-LF}{ub}{scsl}{ + <-> ssub * MontserratAlternates-LF/black/scsl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{ub}{n}{ + <-> ssub * MontserratAlternates-LF/black/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{ub}{scit}{ + <-> ssub * MontserratAlternates-LF/black/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{ub}{it}{ + <-> ssub * MontserratAlternates-LF/black/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{ub}{sc}{ + <-> ssub * MontserratAlternates-LF/black/sc +}{} + +\DeclareFontShape{T1}{MontserratAlternates-LF}{ub}{sl}{ + <-> ssub * MontserratAlternates-LF/black/sl }{} \DeclareFontShape{T1}{MontserratAlternates-LF}{bx}{scsl}{ @@ -239,8 +508,8 @@ <-> ssub * MontserratAlternates-LF/b/n }{} -\DeclareFontShape{T1}{MontserratAlternates-LF}{bx}{sc}{ - <-> ssub * MontserratAlternates-LF/b/sc +\DeclareFontShape{T1}{MontserratAlternates-LF}{bx}{scit}{ + <-> ssub * MontserratAlternates-LF/b/scit }{} \DeclareFontShape{T1}{MontserratAlternates-LF}{bx}{it}{ @@ -251,4 +520,8 @@ <-> ssub * MontserratAlternates-LF/b/sl }{} +\DeclareFontShape{T1}{MontserratAlternates-LF}{bx}{sc}{ + <-> ssub * MontserratAlternates-LF/b/sc +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-Numr.fd b/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-Numr.fd index 5c4bd6fdb3d..f391ddec865 100644 --- a/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-Numr.fd +++ b/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-Numr.fd @@ -1,122 +1,287 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{T1MontserratAlternates-Numr.fd} - [2017/01/25 (autoinst) Font definitions for T1/MontserratAlternates-Numr.] + [2019/10/18 (autoinst) Font definitions for T1/MontserratAlternates-Numr.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{T1}{MontserratAlternates-Numr}{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-numr-t1 + +% ---- bold ---- + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-numr-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-numr-t1 +\DeclareFontShape{T1}{MontserratAlternates-Numr}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-numr-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{m}{sl}{ - <-> ssub * MontserratAlternates-Numr/m/it +\DeclareFontShape{T1}{MontserratAlternates-Numr}{bold}{sl}{ + <-> ssub * MontserratAlternates-Numr/bold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-numr-t1 + +% ---- thin ---- + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-numr-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-numr-t1 +\DeclareFontShape{T1}{MontserratAlternates-Numr}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-numr-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{l}{sl}{ - <-> ssub * MontserratAlternates-Numr/l/it +\DeclareFontShape{T1}{MontserratAlternates-Numr}{thin}{sl}{ + <-> ssub * MontserratAlternates-Numr/thin/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-numr-t1 + +% ---- semibold ---- + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-numr-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-numr-t1 +\DeclareFontShape{T1}{MontserratAlternates-Numr}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-numr-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{mb}{sl}{ - <-> ssub * MontserratAlternates-Numr/mb/it +\DeclareFontShape{T1}{MontserratAlternates-Numr}{semibold}{sl}{ + <-> ssub * MontserratAlternates-Numr/semibold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-numr-t1 + +% ---- light ---- + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-numr-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-numr-t1 +\DeclareFontShape{T1}{MontserratAlternates-Numr}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-numr-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{sb}{sl}{ - <-> ssub * MontserratAlternates-Numr/sb/it +\DeclareFontShape{T1}{MontserratAlternates-Numr}{light}{sl}{ + <-> ssub * MontserratAlternates-Numr/light/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-numr-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-numr-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-numr-t1 +\DeclareFontShape{T1}{MontserratAlternates-Numr}{medium}{sl}{ + <-> ssub * MontserratAlternates-Numr/medium/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-numr-t1 + +% ---- regular ---- + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-numr-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{t}{sl}{ - <-> ssub * MontserratAlternates-Numr/t/it +\DeclareFontShape{T1}{MontserratAlternates-Numr}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-numr-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-numr-t1 +\DeclareFontShape{T1}{MontserratAlternates-Numr}{regular}{sl}{ + <-> ssub * MontserratAlternates-Numr/regular/it +}{} + + +% ---- black ---- + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-numr-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-numr-t1 +\DeclareFontShape{T1}{MontserratAlternates-Numr}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-numr-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{k}{sl}{ - <-> ssub * MontserratAlternates-Numr/k/it +\DeclareFontShape{T1}{MontserratAlternates-Numr}{black}{sl}{ + <-> ssub * MontserratAlternates-Numr/black/it }{} + +% ---- extrabold ---- + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-numr-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-numr-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-Numr/extrabold/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-numr-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-numr-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{extralight}{sl}{ + <-> ssub * MontserratAlternates-Numr/extralight/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{ul}{sl}{ + <-> ssub * MontserratAlternates-Numr/thin/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{ul}{it}{ + <-> ssub * MontserratAlternates-Numr/thin/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{ul}{n}{ + <-> ssub * MontserratAlternates-Numr/thin/n +}{} + + +% el --> extralight + \DeclareFontShape{T1}{MontserratAlternates-Numr}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-numr-t1 + <-> ssub * MontserratAlternates-Numr/extralight/n }{} \DeclareFontShape{T1}{MontserratAlternates-Numr}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-numr-t1 + <-> ssub * MontserratAlternates-Numr/extralight/it }{} \DeclareFontShape{T1}{MontserratAlternates-Numr}{el}{sl}{ - <-> ssub * MontserratAlternates-Numr/el/it + <-> ssub * MontserratAlternates-Numr/extralight/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-numr-t1 + +% l --> light + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{l}{it}{ + <-> ssub * MontserratAlternates-Numr/light/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{l}{sl}{ + <-> ssub * MontserratAlternates-Numr/light/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{l}{n}{ + <-> ssub * MontserratAlternates-Numr/light/n +}{} + + +% sl --> regular + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{sl}{it}{ + <-> ssub * MontserratAlternates-Numr/regular/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{sl}{sl}{ + <-> ssub * MontserratAlternates-Numr/regular/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{sl}{n}{ + <-> ssub * MontserratAlternates-Numr/regular/n +}{} + + +% m --> medium + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{m}{sl}{ + <-> ssub * MontserratAlternates-Numr/medium/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{m}{it}{ + <-> ssub * MontserratAlternates-Numr/medium/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{m}{n}{ + <-> ssub * MontserratAlternates-Numr/medium/n +}{} + + +% sb --> semibold + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{sb}{n}{ + <-> ssub * MontserratAlternates-Numr/semibold/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{sb}{sl}{ + <-> ssub * MontserratAlternates-Numr/semibold/sl }{} +\DeclareFontShape{T1}{MontserratAlternates-Numr}{sb}{it}{ + <-> ssub * MontserratAlternates-Numr/semibold/it +}{} + + +% b --> bold + \DeclareFontShape{T1}{MontserratAlternates-Numr}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-numr-t1 + <-> ssub * MontserratAlternates-Numr/bold/it }{} \DeclareFontShape{T1}{MontserratAlternates-Numr}{b}{sl}{ - <-> ssub * MontserratAlternates-Numr/b/it + <-> ssub * MontserratAlternates-Numr/bold/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-Numr}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-numr-t1 +\DeclareFontShape{T1}{MontserratAlternates-Numr}{b}{n}{ + <-> ssub * MontserratAlternates-Numr/bold/n }{} + +% eb --> extrabold + \DeclareFontShape{T1}{MontserratAlternates-Numr}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-numr-t1 + <-> ssub * MontserratAlternates-Numr/extrabold/it }{} \DeclareFontShape{T1}{MontserratAlternates-Numr}{eb}{sl}{ - <-> ssub * MontserratAlternates-Numr/eb/it + <-> ssub * MontserratAlternates-Numr/extrabold/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{eb}{n}{ + <-> ssub * MontserratAlternates-Numr/extrabold/n +}{} + + +% ub --> black + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{ub}{sl}{ + <-> ssub * MontserratAlternates-Numr/black/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{ub}{it}{ + <-> ssub * MontserratAlternates-Numr/black/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Numr}{ub}{n}{ + <-> ssub * MontserratAlternates-Numr/black/n }{} \DeclareFontShape{T1}{MontserratAlternates-Numr}{bx}{it}{ diff --git a/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-OsF.fd b/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-OsF.fd index f9ade7215dc..7635e8cee02 100644 --- a/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-OsF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-OsF.fd @@ -1,242 +1,515 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{T1MontserratAlternates-OsF.fd} - [2017/01/25 (autoinst) Font definitions for T1/MontserratAlternates-OsF.] + [2019/10/18 (autoinst) Font definitions for T1/MontserratAlternates-OsF.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{T1}{MontserratAlternates-OsF}{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-osf-t1 + +% ---- bold ---- + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{bold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-osf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-osf-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-osf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{bold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{scsl}{ - <-> ssub * MontserratAlternates-OsF/b/scit +\DeclareFontShape{T1}{MontserratAlternates-OsF}{bold}{scsl}{ + <-> ssub * MontserratAlternates-OsF/bold/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{sl}{ - <-> ssub * MontserratAlternates-OsF/b/it +\DeclareFontShape{T1}{MontserratAlternates-OsF}{bold}{sl}{ + <-> ssub * MontserratAlternates-OsF/bold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-osf-t1 + +% ---- thin ---- + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-osf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{thin}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-osf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{thin}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-osf-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{scsl}{ - <-> ssub * MontserratAlternates-OsF/eb/scit +\DeclareFontShape{T1}{MontserratAlternates-OsF}{thin}{scsl}{ + <-> ssub * MontserratAlternates-OsF/thin/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{sl}{ - <-> ssub * MontserratAlternates-OsF/eb/it +\DeclareFontShape{T1}{MontserratAlternates-OsF}{thin}{sl}{ + <-> ssub * MontserratAlternates-OsF/thin/it }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-osf-sc-t1 + +% ---- semibold ---- + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-osf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{semibold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-osf-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-osf-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{semibold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{scsl}{ - <-> ssub * MontserratAlternates-OsF/el/scit +\DeclareFontShape{T1}{MontserratAlternates-OsF}{semibold}{scsl}{ + <-> ssub * MontserratAlternates-OsF/semibold/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{sl}{ - <-> ssub * MontserratAlternates-OsF/el/it +\DeclareFontShape{T1}{MontserratAlternates-OsF}{semibold}{sl}{ + <-> ssub * MontserratAlternates-OsF/semibold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-osf-t1 + +% ---- light ---- + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{light}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{k}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-osf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{k}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Black-osf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{light}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-osf-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{k}{scsl}{ - <-> ssub * MontserratAlternates-OsF/k/scit +\DeclareFontShape{T1}{MontserratAlternates-OsF}{light}{scsl}{ + <-> ssub * MontserratAlternates-OsF/light/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{k}{sl}{ - <-> ssub * MontserratAlternates-OsF/k/it +\DeclareFontShape{T1}{MontserratAlternates-OsF}{light}{sl}{ + <-> ssub * MontserratAlternates-OsF/light/it }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-osf-t1 + +% ---- medium ---- + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{medium}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{l}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-osf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-osf-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{l}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Light-osf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{medium}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{medium}{scsl}{ + <-> ssub * MontserratAlternates-OsF/medium/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{medium}{sl}{ + <-> ssub * MontserratAlternates-OsF/medium/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{regular}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{regular}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{regular}{scsl}{ + <-> ssub * MontserratAlternates-OsF/regular/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{regular}{sl}{ + <-> ssub * MontserratAlternates-OsF/regular/it +}{} + + +% ---- black ---- + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{black}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{black}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{black}{scsl}{ + <-> ssub * MontserratAlternates-OsF/black/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{black}{sl}{ + <-> ssub * MontserratAlternates-OsF/black/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{extralight}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{extralight}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{extralight}{scsl}{ + <-> ssub * MontserratAlternates-OsF/extralight/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{extralight}{sl}{ + <-> ssub * MontserratAlternates-OsF/extralight/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{extrabold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{extrabold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{extrabold}{scsl}{ + <-> ssub * MontserratAlternates-OsF/extrabold/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-OsF/extrabold/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{ul}{it}{ + <-> ssub * MontserratAlternates-OsF/thin/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{ul}{sc}{ + <-> ssub * MontserratAlternates-OsF/thin/sc +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{ul}{sl}{ + <-> ssub * MontserratAlternates-OsF/thin/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{ul}{scsl}{ + <-> ssub * MontserratAlternates-OsF/thin/scsl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{ul}{n}{ + <-> ssub * MontserratAlternates-OsF/thin/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{ul}{scit}{ + <-> ssub * MontserratAlternates-OsF/thin/scit +}{} + + +% el --> extralight + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{it}{ + <-> ssub * MontserratAlternates-OsF/extralight/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{sc}{ + <-> ssub * MontserratAlternates-OsF/extralight/sc +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{sl}{ + <-> ssub * MontserratAlternates-OsF/extralight/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{scsl}{ + <-> ssub * MontserratAlternates-OsF/extralight/scsl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{scit}{ + <-> ssub * MontserratAlternates-OsF/extralight/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{n}{ + <-> ssub * MontserratAlternates-OsF/extralight/n +}{} + + +% l --> light + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{l}{scit}{ + <-> ssub * MontserratAlternates-OsF/light/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{l}{n}{ + <-> ssub * MontserratAlternates-OsF/light/n }{} \DeclareFontShape{T1}{MontserratAlternates-OsF}{l}{scsl}{ - <-> ssub * MontserratAlternates-OsF/l/scit + <-> ssub * MontserratAlternates-OsF/light/scsl }{} \DeclareFontShape{T1}{MontserratAlternates-OsF}{l}{sl}{ - <-> ssub * MontserratAlternates-OsF/l/it + <-> ssub * MontserratAlternates-OsF/light/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-osf-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{l}{sc}{ + <-> ssub * MontserratAlternates-OsF/light/sc }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{mb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-osf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{l}{it}{ + <-> ssub * MontserratAlternates-OsF/light/it }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{mb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-osf-sc-t1 + +% sl --> regular + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{sl}{scit}{ + <-> ssub * MontserratAlternates-OsF/regular/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-osf-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{sl}{n}{ + <-> ssub * MontserratAlternates-OsF/regular/n }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{mb}{scsl}{ - <-> ssub * MontserratAlternates-OsF/mb/scit +\DeclareFontShape{T1}{MontserratAlternates-OsF}{sl}{scsl}{ + <-> ssub * MontserratAlternates-OsF/regular/scsl }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{mb}{sl}{ - <-> ssub * MontserratAlternates-OsF/mb/it +\DeclareFontShape{T1}{MontserratAlternates-OsF}{sl}{sl}{ + <-> ssub * MontserratAlternates-OsF/regular/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{m}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-osf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{sl}{sc}{ + <-> ssub * MontserratAlternates-OsF/regular/sc }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{m}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-osf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{sl}{it}{ + <-> ssub * MontserratAlternates-OsF/regular/it }{} + +% m --> medium + \DeclareFontShape{T1}{MontserratAlternates-OsF}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-osf-t1 + <-> ssub * MontserratAlternates-OsF/medium/n }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-osf-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{m}{scit}{ + <-> ssub * MontserratAlternates-OsF/medium/scit }{} \DeclareFontShape{T1}{MontserratAlternates-OsF}{m}{scsl}{ - <-> ssub * MontserratAlternates-OsF/m/scit + <-> ssub * MontserratAlternates-OsF/medium/scsl }{} \DeclareFontShape{T1}{MontserratAlternates-OsF}{m}{sl}{ - <-> ssub * MontserratAlternates-OsF/m/it + <-> ssub * MontserratAlternates-OsF/medium/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-osf-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{m}{sc}{ + <-> ssub * MontserratAlternates-OsF/medium/sc }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{t}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-osf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{m}{it}{ + <-> ssub * MontserratAlternates-OsF/medium/it }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{t}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-osf-sc-t1 + +% sb --> semibold + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{it}{ + <-> ssub * MontserratAlternates-OsF/semibold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-osf-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{sc}{ + <-> ssub * MontserratAlternates-OsF/semibold/sc }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{t}{scsl}{ - <-> ssub * MontserratAlternates-OsF/t/scit +\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{sl}{ + <-> ssub * MontserratAlternates-OsF/semibold/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{t}{sl}{ - <-> ssub * MontserratAlternates-OsF/t/it +\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{scsl}{ + <-> ssub * MontserratAlternates-OsF/semibold/scsl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{n}{ + <-> ssub * MontserratAlternates-OsF/semibold/n }{} \DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-osf-sc-t1 + <-> ssub * MontserratAlternates-OsF/semibold/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-osf-t1 + +% b --> bold + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{it}{ + <-> ssub * MontserratAlternates-OsF/bold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-osf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{sc}{ + <-> ssub * MontserratAlternates-OsF/bold/sc }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-osf-t1 +\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{sl}{ + <-> ssub * MontserratAlternates-OsF/bold/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{scsl}{ - <-> ssub * MontserratAlternates-OsF/sb/scit +\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{scsl}{ + <-> ssub * MontserratAlternates-OsF/bold/scsl }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{sl}{ - <-> ssub * MontserratAlternates-OsF/sb/it +\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{scit}{ + <-> ssub * MontserratAlternates-OsF/bold/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{bx}{it}{ - <-> ssub * MontserratAlternates-OsF/b/it +\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{n}{ + <-> ssub * MontserratAlternates-OsF/bold/n +}{} + + +% eb --> extrabold + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{scsl}{ + <-> ssub * MontserratAlternates-OsF/extrabold/scsl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{scit}{ + <-> ssub * MontserratAlternates-OsF/extrabold/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{n}{ + <-> ssub * MontserratAlternates-OsF/extrabold/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{it}{ + <-> ssub * MontserratAlternates-OsF/extrabold/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{sc}{ + <-> ssub * MontserratAlternates-OsF/extrabold/sc +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{sl}{ + <-> ssub * MontserratAlternates-OsF/extrabold/sl +}{} + + +% ub --> black + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{ub}{sl}{ + <-> ssub * MontserratAlternates-OsF/black/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{ub}{sc}{ + <-> ssub * MontserratAlternates-OsF/black/sc +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{ub}{it}{ + <-> ssub * MontserratAlternates-OsF/black/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{ub}{n}{ + <-> ssub * MontserratAlternates-OsF/black/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{ub}{scit}{ + <-> ssub * MontserratAlternates-OsF/black/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{ub}{scsl}{ + <-> ssub * MontserratAlternates-OsF/black/scsl }{} \DeclareFontShape{T1}{MontserratAlternates-OsF}{bx}{sl}{ <-> ssub * MontserratAlternates-OsF/b/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{bx}{scsl}{ - <-> ssub * MontserratAlternates-OsF/b/scsl +\DeclareFontShape{T1}{MontserratAlternates-OsF}{bx}{sc}{ + <-> ssub * MontserratAlternates-OsF/b/sc +}{} + +\DeclareFontShape{T1}{MontserratAlternates-OsF}{bx}{it}{ + <-> ssub * MontserratAlternates-OsF/b/it }{} \DeclareFontShape{T1}{MontserratAlternates-OsF}{bx}{scit}{ @@ -247,8 +520,8 @@ <-> ssub * MontserratAlternates-OsF/b/n }{} -\DeclareFontShape{T1}{MontserratAlternates-OsF}{bx}{sc}{ - <-> ssub * MontserratAlternates-OsF/b/sc +\DeclareFontShape{T1}{MontserratAlternates-OsF}{bx}{scsl}{ + <-> ssub * MontserratAlternates-OsF/b/scsl }{} \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-Sup.fd b/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-Sup.fd index b8cbd6561be..d267bbd2837 100644 --- a/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-Sup.fd +++ b/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-Sup.fd @@ -1,134 +1,299 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{T1MontserratAlternates-Sup.fd} - [2017/01/25 (autoinst) Font definitions for T1/MontserratAlternates-Sup.] + [2019/10/18 (autoinst) Font definitions for T1/MontserratAlternates-Sup.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{T1}{MontserratAlternates-Sup}{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-sup-t1 + +% ---- bold ---- + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-sup-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-sup-t1 +\DeclareFontShape{T1}{MontserratAlternates-Sup}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-sup-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{el}{sl}{ - <-> ssub * MontserratAlternates-Sup/el/it +\DeclareFontShape{T1}{MontserratAlternates-Sup}{bold}{sl}{ + <-> ssub * MontserratAlternates-Sup/bold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-sup-t1 + +% ---- thin ---- + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-sup-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-sup-t1 +\DeclareFontShape{T1}{MontserratAlternates-Sup}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-sup-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{k}{sl}{ - <-> ssub * MontserratAlternates-Sup/k/it +\DeclareFontShape{T1}{MontserratAlternates-Sup}{thin}{sl}{ + <-> ssub * MontserratAlternates-Sup/thin/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-sup-t1 + +% ---- black ---- + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-sup-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-sup-t1 +\DeclareFontShape{T1}{MontserratAlternates-Sup}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-sup-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{b}{sl}{ - <-> ssub * MontserratAlternates-Sup/b/it +\DeclareFontShape{T1}{MontserratAlternates-Sup}{black}{sl}{ + <-> ssub * MontserratAlternates-Sup/black/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-sup-t1 + +% ---- regular ---- + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-sup-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-sup-t1 +\DeclareFontShape{T1}{MontserratAlternates-Sup}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-sup-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{eb}{sl}{ - <-> ssub * MontserratAlternates-Sup/eb/it +\DeclareFontShape{T1}{MontserratAlternates-Sup}{regular}{sl}{ + <-> ssub * MontserratAlternates-Sup/regular/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-sup-t1 + +% ---- semibold ---- + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-sup-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-sup-t1 +\DeclareFontShape{T1}{MontserratAlternates-Sup}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-sup-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{sb}{sl}{ - <-> ssub * MontserratAlternates-Sup/sb/it +\DeclareFontShape{T1}{MontserratAlternates-Sup}{semibold}{sl}{ + <-> ssub * MontserratAlternates-Sup/semibold/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-sup-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-sup-t1 +\DeclareFontShape{T1}{MontserratAlternates-Sup}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-sup-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-sup-t1 +\DeclareFontShape{T1}{MontserratAlternates-Sup}{medium}{sl}{ + <-> ssub * MontserratAlternates-Sup/medium/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{t}{sl}{ - <-> ssub * MontserratAlternates-Sup/t/it + +% ---- light ---- + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-sup-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-sup-t1 +\DeclareFontShape{T1}{MontserratAlternates-Sup}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-sup-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-sup-t1 +\DeclareFontShape{T1}{MontserratAlternates-Sup}{light}{sl}{ + <-> ssub * MontserratAlternates-Sup/light/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{m}{sl}{ - <-> ssub * MontserratAlternates-Sup/m/it + +% ---- extrabold ---- + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-sup-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-Sup/extrabold/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-sup-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{extralight}{sl}{ + <-> ssub * MontserratAlternates-Sup/extralight/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{ul}{it}{ + <-> ssub * MontserratAlternates-Sup/thin/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{ul}{sl}{ + <-> ssub * MontserratAlternates-Sup/thin/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{ul}{n}{ + <-> ssub * MontserratAlternates-Sup/thin/n +}{} + + +% el --> extralight + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{el}{n}{ + <-> ssub * MontserratAlternates-Sup/extralight/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{el}{it}{ + <-> ssub * MontserratAlternates-Sup/extralight/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{el}{sl}{ + <-> ssub * MontserratAlternates-Sup/extralight/sl }{} + +% l --> light + \DeclareFontShape{T1}{MontserratAlternates-Sup}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-sup-t1 + <-> ssub * MontserratAlternates-Sup/light/n }{} \DeclareFontShape{T1}{MontserratAlternates-Sup}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-sup-t1 + <-> ssub * MontserratAlternates-Sup/light/it }{} \DeclareFontShape{T1}{MontserratAlternates-Sup}{l}{sl}{ - <-> ssub * MontserratAlternates-Sup/l/it + <-> ssub * MontserratAlternates-Sup/light/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-sup-t1 + +% sl --> regular + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{sl}{n}{ + <-> ssub * MontserratAlternates-Sup/regular/n }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-sup-t1 +\DeclareFontShape{T1}{MontserratAlternates-Sup}{sl}{sl}{ + <-> ssub * MontserratAlternates-Sup/regular/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{mb}{sl}{ - <-> ssub * MontserratAlternates-Sup/mb/it +\DeclareFontShape{T1}{MontserratAlternates-Sup}{sl}{it}{ + <-> ssub * MontserratAlternates-Sup/regular/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{bx}{it}{ - <-> ssub * MontserratAlternates-Sup/b/it + +% m --> medium + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{m}{it}{ + <-> ssub * MontserratAlternates-Sup/medium/it }{} -\DeclareFontShape{T1}{MontserratAlternates-Sup}{bx}{sl}{ - <-> ssub * MontserratAlternates-Sup/b/sl +\DeclareFontShape{T1}{MontserratAlternates-Sup}{m}{sl}{ + <-> ssub * MontserratAlternates-Sup/medium/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{m}{n}{ + <-> ssub * MontserratAlternates-Sup/medium/n +}{} + + +% sb --> semibold + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{sb}{n}{ + <-> ssub * MontserratAlternates-Sup/semibold/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{sb}{sl}{ + <-> ssub * MontserratAlternates-Sup/semibold/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{sb}{it}{ + <-> ssub * MontserratAlternates-Sup/semibold/it +}{} + + +% b --> bold + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{b}{n}{ + <-> ssub * MontserratAlternates-Sup/bold/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{b}{sl}{ + <-> ssub * MontserratAlternates-Sup/bold/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{b}{it}{ + <-> ssub * MontserratAlternates-Sup/bold/it +}{} + + +% eb --> extrabold + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{eb}{n}{ + <-> ssub * MontserratAlternates-Sup/extrabold/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{eb}{it}{ + <-> ssub * MontserratAlternates-Sup/extrabold/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{eb}{sl}{ + <-> ssub * MontserratAlternates-Sup/extrabold/sl +}{} + + +% ub --> black + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{ub}{sl}{ + <-> ssub * MontserratAlternates-Sup/black/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{ub}{it}{ + <-> ssub * MontserratAlternates-Sup/black/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{ub}{n}{ + <-> ssub * MontserratAlternates-Sup/black/n }{} \DeclareFontShape{T1}{MontserratAlternates-Sup}{bx}{n}{ <-> ssub * MontserratAlternates-Sup/b/n }{} +\DeclareFontShape{T1}{MontserratAlternates-Sup}{bx}{sl}{ + <-> ssub * MontserratAlternates-Sup/b/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-Sup}{bx}{it}{ + <-> ssub * MontserratAlternates-Sup/b/it +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-TLF.fd b/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-TLF.fd index 98124b1cccd..1862e1f2318 100644 --- a/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-TLF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-TLF.fd @@ -1,254 +1,527 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{T1MontserratAlternates-TLF.fd} - [2017/01/25 (autoinst) Font definitions for T1/MontserratAlternates-TLF.] + [2019/10/18 (autoinst) Font definitions for T1/MontserratAlternates-TLF.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{T1}{MontserratAlternates-TLF}{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-tlf-t1 + +% ---- extralight ---- + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{mb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-tlf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{extralight}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-tlf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{mb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-tlf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{extralight}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{mb}{scsl}{ - <-> ssub * MontserratAlternates-TLF/mb/scit +\DeclareFontShape{T1}{MontserratAlternates-TLF}{extralight}{scsl}{ + <-> ssub * MontserratAlternates-TLF/extralight/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{mb}{sl}{ - <-> ssub * MontserratAlternates-TLF/mb/it +\DeclareFontShape{T1}{MontserratAlternates-TLF}{extralight}{sl}{ + <-> ssub * MontserratAlternates-TLF/extralight/it }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-tlf-t1 + +% ---- extrabold ---- + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{extrabold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-tlf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{extrabold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{extrabold}{scsl}{ + <-> ssub * MontserratAlternates-TLF/extrabold/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-TLF/extrabold/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{regular}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{regular}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{regular}{scsl}{ + <-> ssub * MontserratAlternates-TLF/regular/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{regular}{sl}{ + <-> ssub * MontserratAlternates-TLF/regular/it +}{} + + +% ---- black ---- + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{black}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{black}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{black}{scsl}{ + <-> ssub * MontserratAlternates-TLF/black/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{black}{sl}{ + <-> ssub * MontserratAlternates-TLF/black/it +}{} + + +% ---- semibold ---- + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{semibold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{semibold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{semibold}{scsl}{ + <-> ssub * MontserratAlternates-TLF/semibold/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{semibold}{sl}{ + <-> ssub * MontserratAlternates-TLF/semibold/it +}{} + + +% ---- light ---- + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{light}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{light}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{light}{scsl}{ + <-> ssub * MontserratAlternates-TLF/light/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{light}{sl}{ + <-> ssub * MontserratAlternates-TLF/light/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{medium}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{medium}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{medium}{scsl}{ + <-> ssub * MontserratAlternates-TLF/medium/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{medium}{sl}{ + <-> ssub * MontserratAlternates-TLF/medium/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{bold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{bold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{bold}{scsl}{ + <-> ssub * MontserratAlternates-TLF/bold/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{bold}{sl}{ + <-> ssub * MontserratAlternates-TLF/bold/it +}{} + + +% ---- thin ---- + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{thin}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{thin}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{thin}{scsl}{ + <-> ssub * MontserratAlternates-TLF/thin/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{thin}{sl}{ + <-> ssub * MontserratAlternates-TLF/thin/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{ul}{scsl}{ + <-> ssub * MontserratAlternates-TLF/thin/scsl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{ul}{n}{ + <-> ssub * MontserratAlternates-TLF/thin/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{ul}{scit}{ + <-> ssub * MontserratAlternates-TLF/thin/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{ul}{it}{ + <-> ssub * MontserratAlternates-TLF/thin/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{ul}{sc}{ + <-> ssub * MontserratAlternates-TLF/thin/sc +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{ul}{sl}{ + <-> ssub * MontserratAlternates-TLF/thin/sl +}{} + + +% el --> extralight + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{sl}{ + <-> ssub * MontserratAlternates-TLF/extralight/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{sc}{ + <-> ssub * MontserratAlternates-TLF/extralight/sc +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{it}{ + <-> ssub * MontserratAlternates-TLF/extralight/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{scit}{ + <-> ssub * MontserratAlternates-TLF/extralight/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{n}{ + <-> ssub * MontserratAlternates-TLF/extralight/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{scsl}{ + <-> ssub * MontserratAlternates-TLF/extralight/scsl +}{} + + +% l --> light + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{it}{ + <-> ssub * MontserratAlternates-TLF/light/it }{} \DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Light-tlf-sc-t1 + <-> ssub * MontserratAlternates-TLF/light/sc }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-tlf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{sl}{ + <-> ssub * MontserratAlternates-TLF/light/sl }{} \DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{scsl}{ - <-> ssub * MontserratAlternates-TLF/l/scit + <-> ssub * MontserratAlternates-TLF/light/scsl }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{sl}{ - <-> ssub * MontserratAlternates-TLF/l/it +\DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{scit}{ + <-> ssub * MontserratAlternates-TLF/light/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-tlf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{n}{ + <-> ssub * MontserratAlternates-TLF/light/n }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-tlf-t1 + +% sl --> regular + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{sl}{it}{ + <-> ssub * MontserratAlternates-TLF/regular/it }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-tlf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{sl}{sc}{ + <-> ssub * MontserratAlternates-TLF/regular/sc }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-tlf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{sl}{sl}{ + <-> ssub * MontserratAlternates-TLF/regular/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{scsl}{ - <-> ssub * MontserratAlternates-TLF/m/scit +\DeclareFontShape{T1}{MontserratAlternates-TLF}{sl}{scsl}{ + <-> ssub * MontserratAlternates-TLF/regular/scsl }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{sl}{ - <-> ssub * MontserratAlternates-TLF/m/it +\DeclareFontShape{T1}{MontserratAlternates-TLF}{sl}{n}{ + <-> ssub * MontserratAlternates-TLF/regular/n }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{t}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-tlf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{sl}{scit}{ + <-> ssub * MontserratAlternates-TLF/regular/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{t}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-tlf-sc-t1 + +% m --> medium + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{it}{ + <-> ssub * MontserratAlternates-TLF/medium/it }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-tlf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{sc}{ + <-> ssub * MontserratAlternates-TLF/medium/sc }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-tlf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{sl}{ + <-> ssub * MontserratAlternates-TLF/medium/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{t}{scsl}{ - <-> ssub * MontserratAlternates-TLF/t/scit +\DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{scsl}{ + <-> ssub * MontserratAlternates-TLF/medium/scsl }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{t}{sl}{ - <-> ssub * MontserratAlternates-TLF/t/it +\DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{n}{ + <-> ssub * MontserratAlternates-TLF/medium/n }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-tlf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{scit}{ + <-> ssub * MontserratAlternates-TLF/medium/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-tlf-sc-t1 + +% sb --> semibold + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{it}{ + <-> ssub * MontserratAlternates-TLF/semibold/it }{} \DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-tlf-sc-t1 + <-> ssub * MontserratAlternates-TLF/semibold/sc }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-tlf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{sl}{ + <-> ssub * MontserratAlternates-TLF/semibold/sl }{} \DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{scsl}{ - <-> ssub * MontserratAlternates-TLF/sb/scit + <-> ssub * MontserratAlternates-TLF/semibold/scsl }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{sl}{ - <-> ssub * MontserratAlternates-TLF/sb/it +\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{scit}{ + <-> ssub * MontserratAlternates-TLF/semibold/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-tlf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{n}{ + <-> ssub * MontserratAlternates-TLF/semibold/n }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-tlf-sc-t1 + +% b --> bold + +\DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{it}{ + <-> ssub * MontserratAlternates-TLF/bold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-tlf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{sc}{ + <-> ssub * MontserratAlternates-TLF/bold/sc }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-tlf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{sl}{ + <-> ssub * MontserratAlternates-TLF/bold/sl }{} \DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{scsl}{ - <-> ssub * MontserratAlternates-TLF/b/scit + <-> ssub * MontserratAlternates-TLF/bold/scsl }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{sl}{ - <-> ssub * MontserratAlternates-TLF/b/it +\DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{scit}{ + <-> ssub * MontserratAlternates-TLF/bold/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-tlf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{n}{ + <-> ssub * MontserratAlternates-TLF/bold/n }{} + +% eb --> extrabold + \DeclareFontShape{T1}{MontserratAlternates-TLF}{eb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-tlf-sc-t1 + <-> ssub * MontserratAlternates-TLF/extrabold/scit }{} \DeclareFontShape{T1}{MontserratAlternates-TLF}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-tlf-t1 -}{} - -\DeclareFontShape{T1}{MontserratAlternates-TLF}{eb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-tlf-sc-t1 + <-> ssub * MontserratAlternates-TLF/extrabold/n }{} \DeclareFontShape{T1}{MontserratAlternates-TLF}{eb}{scsl}{ - <-> ssub * MontserratAlternates-TLF/eb/scit + <-> ssub * MontserratAlternates-TLF/extrabold/scsl }{} \DeclareFontShape{T1}{MontserratAlternates-TLF}{eb}{sl}{ - <-> ssub * MontserratAlternates-TLF/eb/it + <-> ssub * MontserratAlternates-TLF/extrabold/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-tlf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{eb}{sc}{ + <-> ssub * MontserratAlternates-TLF/extrabold/sc }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{k}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-tlf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{eb}{it}{ + <-> ssub * MontserratAlternates-TLF/extrabold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{k}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Black-tlf-sc-t1 -}{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-tlf-t1 -}{} +% ub --> black -\DeclareFontShape{T1}{MontserratAlternates-TLF}{k}{scsl}{ - <-> ssub * MontserratAlternates-TLF/k/scit +\DeclareFontShape{T1}{MontserratAlternates-TLF}{ub}{it}{ + <-> ssub * MontserratAlternates-TLF/black/it }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{k}{sl}{ - <-> ssub * MontserratAlternates-TLF/k/it +\DeclareFontShape{T1}{MontserratAlternates-TLF}{ub}{sc}{ + <-> ssub * MontserratAlternates-TLF/black/sc }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-tlf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{ub}{sl}{ + <-> ssub * MontserratAlternates-TLF/black/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-tlf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{ub}{scsl}{ + <-> ssub * MontserratAlternates-TLF/black/scsl }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-tlf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{ub}{n}{ + <-> ssub * MontserratAlternates-TLF/black/n }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-tlf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TLF}{ub}{scit}{ + <-> ssub * MontserratAlternates-TLF/black/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{scsl}{ - <-> ssub * MontserratAlternates-TLF/el/scit +\DeclareFontShape{T1}{MontserratAlternates-TLF}{bx}{scsl}{ + <-> ssub * MontserratAlternates-TLF/b/scsl }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{sl}{ - <-> ssub * MontserratAlternates-TLF/el/it +\DeclareFontShape{T1}{MontserratAlternates-TLF}{bx}{n}{ + <-> ssub * MontserratAlternates-TLF/b/n }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{bx}{sl}{ - <-> ssub * MontserratAlternates-TLF/b/sl +\DeclareFontShape{T1}{MontserratAlternates-TLF}{bx}{scit}{ + <-> ssub * MontserratAlternates-TLF/b/scit }{} \DeclareFontShape{T1}{MontserratAlternates-TLF}{bx}{it}{ <-> ssub * MontserratAlternates-TLF/b/it }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{bx}{scit}{ - <-> ssub * MontserratAlternates-TLF/b/scit -}{} - -\DeclareFontShape{T1}{MontserratAlternates-TLF}{bx}{scsl}{ - <-> ssub * MontserratAlternates-TLF/b/scsl +\DeclareFontShape{T1}{MontserratAlternates-TLF}{bx}{sl}{ + <-> ssub * MontserratAlternates-TLF/b/sl }{} \DeclareFontShape{T1}{MontserratAlternates-TLF}{bx}{sc}{ <-> ssub * MontserratAlternates-TLF/b/sc }{} -\DeclareFontShape{T1}{MontserratAlternates-TLF}{bx}{n}{ - <-> ssub * MontserratAlternates-TLF/b/n -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-TOsF.fd b/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-TOsF.fd index 2ca8a608b9a..985c35d4ef4 100644 --- a/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-TOsF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/T1MontserratAlternates-TOsF.fd @@ -1,240 +1,517 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{T1MontserratAlternates-TOsF.fd} - [2017/01/25 (autoinst) Font definitions for T1/MontserratAlternates-TOsF.] + [2019/10/18 (autoinst) Font definitions for T1/MontserratAlternates-TOsF.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{T1}{MontserratAlternates-TOsF}{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-tosf-t1 + +% ---- extralight ---- + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extralight}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tosf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-tosf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-tosf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extralight}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-tosf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tosf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/el/scit +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extralight}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/extralight/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{sl}{ - <-> ssub * MontserratAlternates-TOsF/el/it +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extralight}{sl}{ + <-> ssub * MontserratAlternates-TOsF/extralight/it }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-tosf-t1 + +% ---- extrabold ---- + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extrabold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{k}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-tosf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-tosf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{k}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Black-tosf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extrabold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{k}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/k/scit +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extrabold}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{k}{sl}{ - <-> ssub * MontserratAlternates-TOsF/k/it +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-tosf-sc-t1 + +% ---- bold ---- + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-tosf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-tosf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-tosf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/b/scit +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bold}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/bold/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{sl}{ - <-> ssub * MontserratAlternates-TOsF/b/it +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bold}{sl}{ + <-> ssub * MontserratAlternates-TOsF/bold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-tosf-sc-t1 + +% ---- thin ---- + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{thin}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tosf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-tosf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tosf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-tosf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tosf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-tosf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{thin}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/eb/scit +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{thin}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/thin/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{sl}{ - <-> ssub * MontserratAlternates-TOsF/eb/it +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{thin}{sl}{ + <-> ssub * MontserratAlternates-TOsF/thin/it }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-tosf-t1 + +% ---- semibold ---- + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{semibold}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-tosf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tosf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-tosf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{semibold}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-tosf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-t1 }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/m/scit +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{semibold}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/semibold/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{sl}{ - <-> ssub * MontserratAlternates-TOsF/m/it +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{semibold}{sl}{ + <-> ssub * MontserratAlternates-TOsF/semibold/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tosf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{medium}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tosf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tosf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{medium}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tosf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{medium}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/medium/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{medium}{sl}{ + <-> ssub * MontserratAlternates-TOsF/medium/it +}{} + + +% ---- light ---- + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{light}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-tosf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-tosf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{light}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{light}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/light/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{light}{sl}{ + <-> ssub * MontserratAlternates-TOsF/light/it +}{} + + +% ---- black ---- + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{black}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-tosf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tosf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-tosf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{black}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tosf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{black}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/black/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{black}{sl}{ + <-> ssub * MontserratAlternates-TOsF/black/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{regular}{scit}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{regular}{sc}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-sc-t1 +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{regular}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/regular/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{regular}{sl}{ + <-> ssub * MontserratAlternates-TOsF/regular/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ul}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/thin/scsl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ul}{n}{ + <-> ssub * MontserratAlternates-TOsF/thin/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ul}{scit}{ + <-> ssub * MontserratAlternates-TOsF/thin/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ul}{it}{ + <-> ssub * MontserratAlternates-TOsF/thin/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ul}{sc}{ + <-> ssub * MontserratAlternates-TOsF/thin/sc +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ul}{sl}{ + <-> ssub * MontserratAlternates-TOsF/thin/sl +}{} + + +% el --> extralight + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{scit}{ + <-> ssub * MontserratAlternates-TOsF/extralight/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-tosf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{n}{ + <-> ssub * MontserratAlternates-TOsF/extralight/n }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{mb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-tosf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/extralight/scsl }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{mb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-tosf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{sl}{ + <-> ssub * MontserratAlternates-TOsF/extralight/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{sc}{ + <-> ssub * MontserratAlternates-TOsF/extralight/sc }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-tosf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{it}{ + <-> ssub * MontserratAlternates-TOsF/extralight/it }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{mb}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/mb/scit + +% l --> light + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{l}{sl}{ + <-> ssub * MontserratAlternates-TOsF/light/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{mb}{sl}{ - <-> ssub * MontserratAlternates-TOsF/mb/it +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{l}{sc}{ + <-> ssub * MontserratAlternates-TOsF/light/sc }{} \DeclareFontShape{T1}{MontserratAlternates-TOsF}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-tosf-t1 + <-> ssub * MontserratAlternates-TOsF/light/it }{} \DeclareFontShape{T1}{MontserratAlternates-TOsF}{l}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-tosf-sc-t1 + <-> ssub * MontserratAlternates-TOsF/light/scit }{} \DeclareFontShape{T1}{MontserratAlternates-TOsF}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-tosf-t1 + <-> ssub * MontserratAlternates-TOsF/light/n }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{l}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Light-tosf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{l}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/light/scsl }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{l}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/l/scit + +% sl --> regular + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sl}{it}{ + <-> ssub * MontserratAlternates-TOsF/regular/it }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{l}{sl}{ - <-> ssub * MontserratAlternates-TOsF/l/it +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sl}{sc}{ + <-> ssub * MontserratAlternates-TOsF/regular/sc }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-tosf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sl}{sl}{ + <-> ssub * MontserratAlternates-TOsF/regular/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-tosf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sl}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/regular/scsl }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-tosf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sl}{scit}{ + <-> ssub * MontserratAlternates-TOsF/regular/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-tosf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sl}{n}{ + <-> ssub * MontserratAlternates-TOsF/regular/n }{} + +% m --> medium + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{it}{ + <-> ssub * MontserratAlternates-TOsF/medium/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{sc}{ + <-> ssub * MontserratAlternates-TOsF/medium/sc +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{sl}{ + <-> ssub * MontserratAlternates-TOsF/medium/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/medium/scsl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{scit}{ + <-> ssub * MontserratAlternates-TOsF/medium/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{n}{ + <-> ssub * MontserratAlternates-TOsF/medium/n +}{} + + +% sb --> semibold + \DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/sb/scit + <-> ssub * MontserratAlternates-TOsF/semibold/scsl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{n}{ + <-> ssub * MontserratAlternates-TOsF/semibold/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{scit}{ + <-> ssub * MontserratAlternates-TOsF/semibold/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{it}{ + <-> ssub * MontserratAlternates-TOsF/semibold/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{sc}{ + <-> ssub * MontserratAlternates-TOsF/semibold/sc }{} \DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{sl}{ - <-> ssub * MontserratAlternates-TOsF/sb/it + <-> ssub * MontserratAlternates-TOsF/semibold/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-tosf-t1 + +% b --> bold + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{sl}{ + <-> ssub * MontserratAlternates-TOsF/bold/sl }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-tosf-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{sc}{ + <-> ssub * MontserratAlternates-TOsF/bold/sc }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{t}{scit}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-tosf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{it}{ + <-> ssub * MontserratAlternates-TOsF/bold/it }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{t}{sc}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-tosf-sc-t1 +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{scit}{ + <-> ssub * MontserratAlternates-TOsF/bold/scit }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{t}{scsl}{ - <-> ssub * MontserratAlternates-TOsF/t/scit +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{n}{ + <-> ssub * MontserratAlternates-TOsF/bold/n }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{t}{sl}{ - <-> ssub * MontserratAlternates-TOsF/t/it +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/bold/scsl }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bx}{sl}{ - <-> ssub * MontserratAlternates-TOsF/b/sl + +% eb --> extrabold + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{sl}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{sc}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/sc +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{it}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{scit}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{n}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/scsl +}{} + + +% ub --> black + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ub}{sl}{ + <-> ssub * MontserratAlternates-TOsF/black/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ub}{sc}{ + <-> ssub * MontserratAlternates-TOsF/black/sc +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ub}{it}{ + <-> ssub * MontserratAlternates-TOsF/black/it +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ub}{n}{ + <-> ssub * MontserratAlternates-TOsF/black/n +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ub}{scit}{ + <-> ssub * MontserratAlternates-TOsF/black/scit +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ub}{scsl}{ + <-> ssub * MontserratAlternates-TOsF/black/scsl }{} \DeclareFontShape{T1}{MontserratAlternates-TOsF}{bx}{it}{ <-> ssub * MontserratAlternates-TOsF/b/it }{} +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bx}{sl}{ + <-> ssub * MontserratAlternates-TOsF/b/sl +}{} + +\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bx}{sc}{ + <-> ssub * MontserratAlternates-TOsF/b/sc +}{} + \DeclareFontShape{T1}{MontserratAlternates-TOsF}{bx}{scsl}{ <-> ssub * MontserratAlternates-TOsF/b/scsl }{} @@ -247,8 +524,4 @@ <-> ssub * MontserratAlternates-TOsF/b/n }{} -\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bx}{sc}{ - <-> ssub * MontserratAlternates-TOsF/b/sc -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/TS1Montserrat-LF.fd b/Master/texmf-dist/tex/latex/montserrat/TS1Montserrat-LF.fd index 6f2ab688918..afc88fed57e 100644 --- a/Master/texmf-dist/tex/latex/montserrat/TS1Montserrat-LF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/TS1Montserrat-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{TS1Montserrat-LF.fd} - [2017/01/25 (autoinst) Font definitions for TS1/Montserrat-LF.] + [2019/10/18 (autoinst) Font definitions for TS1/Montserrat-LF.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,112 +11,277 @@ \DeclareFontFamily{TS1}{Montserrat-LF}{} -\DeclareFontShape{TS1}{Montserrat-LF}{sb}{it}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-ts1 + +% ---- extralight ---- + +\DeclareFontShape{TS1}{Montserrat-LF}{extralight}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-lf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-LF}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-lf-ts1 +\DeclareFontShape{TS1}{Montserrat-LF}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-LF}{sb}{sl}{ - <-> ssub * Montserrat-LF/sb/it +\DeclareFontShape{TS1}{Montserrat-LF}{extralight}{sl}{ + <-> ssub * Montserrat-LF/extralight/it }{} -\DeclareFontShape{TS1}{Montserrat-LF}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-lf-ts1 + +% ---- black ---- + +\DeclareFontShape{TS1}{Montserrat-LF}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-LF}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-lf-ts1 +\DeclareFontShape{TS1}{Montserrat-LF}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-lf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-LF}{t}{sl}{ - <-> ssub * Montserrat-LF/t/it +\DeclareFontShape{TS1}{Montserrat-LF}{black}{sl}{ + <-> ssub * Montserrat-LF/black/it }{} -\DeclareFontShape{TS1}{Montserrat-LF}{m}{it}{ + +% ---- regular ---- + +\DeclareFontShape{TS1}{Montserrat-LF}{regular}{it}{ <-> \Montserrat@@scale Montserrat-Italic-lf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-LF}{m}{n}{ +\DeclareFontShape{TS1}{Montserrat-LF}{regular}{n}{ <-> \Montserrat@@scale Montserrat-Regular-lf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-LF}{m}{sl}{ - <-> ssub * Montserrat-LF/m/it +\DeclareFontShape{TS1}{Montserrat-LF}{regular}{sl}{ + <-> ssub * Montserrat-LF/regular/it }{} -\DeclareFontShape{TS1}{Montserrat-LF}{l}{it}{ + +% ---- bold ---- + +\DeclareFontShape{TS1}{Montserrat-LF}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-lf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-LF}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-lf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-LF}{bold}{sl}{ + <-> ssub * Montserrat-LF/bold/it +}{} + + +% ---- semibold ---- + +\DeclareFontShape{TS1}{Montserrat-LF}{semibold}{it}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-LF}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-lf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-LF}{semibold}{sl}{ + <-> ssub * Montserrat-LF/semibold/it +}{} + + +% ---- thin ---- + +\DeclareFontShape{TS1}{Montserrat-LF}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-lf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-LF}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-lf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-LF}{thin}{sl}{ + <-> ssub * Montserrat-LF/thin/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{TS1}{Montserrat-LF}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-LF}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-lf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-LF}{extrabold}{sl}{ + <-> ssub * Montserrat-LF/extrabold/it +}{} + + +% ---- light ---- + +\DeclareFontShape{TS1}{Montserrat-LF}{light}{it}{ <-> \Montserrat@@scale Montserrat-LightItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-LF}{l}{n}{ +\DeclareFontShape{TS1}{Montserrat-LF}{light}{n}{ <-> \Montserrat@@scale Montserrat-Light-lf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-LF}{l}{sl}{ - <-> ssub * Montserrat-LF/l/it +\DeclareFontShape{TS1}{Montserrat-LF}{light}{sl}{ + <-> ssub * Montserrat-LF/light/it }{} -\DeclareFontShape{TS1}{Montserrat-LF}{mb}{it}{ + +% ---- medium ---- + +\DeclareFontShape{TS1}{Montserrat-LF}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-lf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-LF}{medium}{it}{ <-> \Montserrat@@scale Montserrat-MediumItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-LF}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-lf-ts1 +\DeclareFontShape{TS1}{Montserrat-LF}{medium}{sl}{ + <-> ssub * Montserrat-LF/medium/it }{} -\DeclareFontShape{TS1}{Montserrat-LF}{mb}{sl}{ - <-> ssub * Montserrat-LF/mb/it +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{TS1}{Montserrat-LF}{ul}{n}{ + <-> ssub * Montserrat-LF/thin/n }{} -\DeclareFontShape{TS1}{Montserrat-LF}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-ts1 +\DeclareFontShape{TS1}{Montserrat-LF}{ul}{sl}{ + <-> ssub * Montserrat-LF/thin/sl }{} -\DeclareFontShape{TS1}{Montserrat-LF}{el}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-lf-ts1 +\DeclareFontShape{TS1}{Montserrat-LF}{ul}{it}{ + <-> ssub * Montserrat-LF/thin/it }{} + +% el --> extralight + \DeclareFontShape{TS1}{Montserrat-LF}{el}{sl}{ - <-> ssub * Montserrat-LF/el/it + <-> ssub * Montserrat-LF/extralight/sl }{} -\DeclareFontShape{TS1}{Montserrat-LF}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-lf-ts1 +\DeclareFontShape{TS1}{Montserrat-LF}{el}{n}{ + <-> ssub * Montserrat-LF/extralight/n }{} -\DeclareFontShape{TS1}{Montserrat-LF}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-lf-ts1 +\DeclareFontShape{TS1}{Montserrat-LF}{el}{it}{ + <-> ssub * Montserrat-LF/extralight/it }{} -\DeclareFontShape{TS1}{Montserrat-LF}{k}{sl}{ - <-> ssub * Montserrat-LF/k/it + +% l --> light + +\DeclareFontShape{TS1}{Montserrat-LF}{l}{n}{ + <-> ssub * Montserrat-LF/light/n }{} -\DeclareFontShape{TS1}{Montserrat-LF}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-ts1 +\DeclareFontShape{TS1}{Montserrat-LF}{l}{sl}{ + <-> ssub * Montserrat-LF/light/sl }{} -\DeclareFontShape{TS1}{Montserrat-LF}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-lf-ts1 +\DeclareFontShape{TS1}{Montserrat-LF}{l}{it}{ + <-> ssub * Montserrat-LF/light/it }{} -\DeclareFontShape{TS1}{Montserrat-LF}{eb}{sl}{ - <-> ssub * Montserrat-LF/eb/it + +% sl --> regular + +\DeclareFontShape{TS1}{Montserrat-LF}{sl}{sl}{ + <-> ssub * Montserrat-LF/regular/sl +}{} + +\DeclareFontShape{TS1}{Montserrat-LF}{sl}{n}{ + <-> ssub * Montserrat-LF/regular/n +}{} + +\DeclareFontShape{TS1}{Montserrat-LF}{sl}{it}{ + <-> ssub * Montserrat-LF/regular/it +}{} + + +% m --> medium + +\DeclareFontShape{TS1}{Montserrat-LF}{m}{it}{ + <-> ssub * Montserrat-LF/medium/it +}{} + +\DeclareFontShape{TS1}{Montserrat-LF}{m}{n}{ + <-> ssub * Montserrat-LF/medium/n }{} +\DeclareFontShape{TS1}{Montserrat-LF}{m}{sl}{ + <-> ssub * Montserrat-LF/medium/sl +}{} + + +% sb --> semibold + +\DeclareFontShape{TS1}{Montserrat-LF}{sb}{sl}{ + <-> ssub * Montserrat-LF/semibold/sl +}{} + +\DeclareFontShape{TS1}{Montserrat-LF}{sb}{n}{ + <-> ssub * Montserrat-LF/semibold/n +}{} + +\DeclareFontShape{TS1}{Montserrat-LF}{sb}{it}{ + <-> ssub * Montserrat-LF/semibold/it +}{} + + +% b --> bold + \DeclareFontShape{TS1}{Montserrat-LF}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-lf-ts1 + <-> ssub * Montserrat-LF/bold/n +}{} + +\DeclareFontShape{TS1}{Montserrat-LF}{b}{sl}{ + <-> ssub * Montserrat-LF/bold/sl }{} \DeclareFontShape{TS1}{Montserrat-LF}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-lf-ts1 + <-> ssub * Montserrat-LF/bold/it }{} -\DeclareFontShape{TS1}{Montserrat-LF}{b}{sl}{ - <-> ssub * Montserrat-LF/b/it + +% eb --> extrabold + +\DeclareFontShape{TS1}{Montserrat-LF}{eb}{sl}{ + <-> ssub * Montserrat-LF/extrabold/sl +}{} + +\DeclareFontShape{TS1}{Montserrat-LF}{eb}{n}{ + <-> ssub * Montserrat-LF/extrabold/n +}{} + +\DeclareFontShape{TS1}{Montserrat-LF}{eb}{it}{ + <-> ssub * Montserrat-LF/extrabold/it +}{} + + +% ub --> black + +\DeclareFontShape{TS1}{Montserrat-LF}{ub}{n}{ + <-> ssub * Montserrat-LF/black/n +}{} + +\DeclareFontShape{TS1}{Montserrat-LF}{ub}{sl}{ + <-> ssub * Montserrat-LF/black/sl +}{} + +\DeclareFontShape{TS1}{Montserrat-LF}{ub}{it}{ + <-> ssub * Montserrat-LF/black/it }{} \DeclareFontShape{TS1}{Montserrat-LF}{bx}{n}{ diff --git a/Master/texmf-dist/tex/latex/montserrat/TS1Montserrat-OsF.fd b/Master/texmf-dist/tex/latex/montserrat/TS1Montserrat-OsF.fd index 909538cf1bd..7a6b1963bc7 100644 --- a/Master/texmf-dist/tex/latex/montserrat/TS1Montserrat-OsF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/TS1Montserrat-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{TS1Montserrat-OsF.fd} - [2017/01/25 (autoinst) Font definitions for TS1/Montserrat-OsF.] + [2019/10/18 (autoinst) Font definitions for TS1/Montserrat-OsF.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,112 +11,281 @@ \DeclareFontFamily{TS1}{Montserrat-OsF}{} -\DeclareFontShape{TS1}{Montserrat-OsF}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-osf-ts1 + +% ---- bold ---- + +\DeclareFontShape{TS1}{Montserrat-OsF}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-osf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-osf-ts1 +\DeclareFontShape{TS1}{Montserrat-OsF}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-osf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{t}{sl}{ - <-> ssub * Montserrat-OsF/t/it +\DeclareFontShape{TS1}{Montserrat-OsF}{bold}{sl}{ + <-> ssub * Montserrat-OsF/bold/it }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{sb}{it}{ + +% ---- semibold ---- + +\DeclareFontShape{TS1}{Montserrat-OsF}{semibold}{it}{ <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{sb}{n}{ +\DeclareFontShape{TS1}{Montserrat-OsF}{semibold}{n}{ <-> \Montserrat@@scale Montserrat-SemiBold-osf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{sb}{sl}{ - <-> ssub * Montserrat-OsF/sb/it +\DeclareFontShape{TS1}{Montserrat-OsF}{semibold}{sl}{ + <-> ssub * Montserrat-OsF/semibold/it }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{l}{n}{ - <-> \Montserrat@@scale Montserrat-Light-osf-ts1 + +% ---- black ---- + +\DeclareFontShape{TS1}{Montserrat-OsF}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-osf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{l}{it}{ +\DeclareFontShape{TS1}{Montserrat-OsF}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-OsF}{black}{sl}{ + <-> ssub * Montserrat-OsF/black/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{TS1}{Montserrat-OsF}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-OsF}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-OsF}{regular}{sl}{ + <-> ssub * Montserrat-OsF/regular/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{TS1}{Montserrat-OsF}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-OsF}{extralight}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-OsF}{extralight}{sl}{ + <-> ssub * Montserrat-OsF/extralight/it +}{} + + +% ---- light ---- + +\DeclareFontShape{TS1}{Montserrat-OsF}{light}{it}{ <-> \Montserrat@@scale Montserrat-LightItalic-osf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{l}{sl}{ - <-> ssub * Montserrat-OsF/l/it +\DeclareFontShape{TS1}{Montserrat-OsF}{light}{n}{ + <-> \Montserrat@@scale Montserrat-Light-osf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-osf-ts1 +\DeclareFontShape{TS1}{Montserrat-OsF}{light}{sl}{ + <-> ssub * Montserrat-OsF/light/it }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{mb}{n}{ + +% ---- medium ---- + +\DeclareFontShape{TS1}{Montserrat-OsF}{medium}{n}{ <-> \Montserrat@@scale Montserrat-Medium-osf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{mb}{sl}{ - <-> ssub * Montserrat-OsF/mb/it +\DeclareFontShape{TS1}{Montserrat-OsF}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-OsF}{medium}{sl}{ + <-> ssub * Montserrat-OsF/medium/it }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-osf-ts1 + +% ---- extrabold ---- + +\DeclareFontShape{TS1}{Montserrat-OsF}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-osf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-osf-ts1 +\DeclareFontShape{TS1}{Montserrat-OsF}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-ts1 }{} +\DeclareFontShape{TS1}{Montserrat-OsF}{extrabold}{sl}{ + <-> ssub * Montserrat-OsF/extrabold/it +}{} + + +% ---- thin ---- + +\DeclareFontShape{TS1}{Montserrat-OsF}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-OsF}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-OsF}{thin}{sl}{ + <-> ssub * Montserrat-OsF/thin/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{TS1}{Montserrat-OsF}{ul}{n}{ + <-> ssub * Montserrat-OsF/thin/n +}{} + +\DeclareFontShape{TS1}{Montserrat-OsF}{ul}{sl}{ + <-> ssub * Montserrat-OsF/thin/sl +}{} + +\DeclareFontShape{TS1}{Montserrat-OsF}{ul}{it}{ + <-> ssub * Montserrat-OsF/thin/it +}{} + + +% el --> extralight + +\DeclareFontShape{TS1}{Montserrat-OsF}{el}{it}{ + <-> ssub * Montserrat-OsF/extralight/it +}{} + +\DeclareFontShape{TS1}{Montserrat-OsF}{el}{sl}{ + <-> ssub * Montserrat-OsF/extralight/sl +}{} + +\DeclareFontShape{TS1}{Montserrat-OsF}{el}{n}{ + <-> ssub * Montserrat-OsF/extralight/n +}{} + + +% l --> light + +\DeclareFontShape{TS1}{Montserrat-OsF}{l}{n}{ + <-> ssub * Montserrat-OsF/light/n +}{} + +\DeclareFontShape{TS1}{Montserrat-OsF}{l}{sl}{ + <-> ssub * Montserrat-OsF/light/sl +}{} + +\DeclareFontShape{TS1}{Montserrat-OsF}{l}{it}{ + <-> ssub * Montserrat-OsF/light/it +}{} + + +% sl --> regular + +\DeclareFontShape{TS1}{Montserrat-OsF}{sl}{it}{ + <-> ssub * Montserrat-OsF/regular/it +}{} + +\DeclareFontShape{TS1}{Montserrat-OsF}{sl}{sl}{ + <-> ssub * Montserrat-OsF/regular/sl +}{} + +\DeclareFontShape{TS1}{Montserrat-OsF}{sl}{n}{ + <-> ssub * Montserrat-OsF/regular/n +}{} + + +% m --> medium + \DeclareFontShape{TS1}{Montserrat-OsF}{m}{sl}{ - <-> ssub * Montserrat-OsF/m/it + <-> ssub * Montserrat-OsF/medium/sl }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-osf-ts1 +\DeclareFontShape{TS1}{Montserrat-OsF}{m}{n}{ + <-> ssub * Montserrat-OsF/medium/n }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-ts1 +\DeclareFontShape{TS1}{Montserrat-OsF}{m}{it}{ + <-> ssub * Montserrat-OsF/medium/it }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{eb}{sl}{ - <-> ssub * Montserrat-OsF/eb/it + +% sb --> semibold + +\DeclareFontShape{TS1}{Montserrat-OsF}{sb}{it}{ + <-> ssub * Montserrat-OsF/semibold/it +}{} + +\DeclareFontShape{TS1}{Montserrat-OsF}{sb}{sl}{ + <-> ssub * Montserrat-OsF/semibold/sl +}{} + +\DeclareFontShape{TS1}{Montserrat-OsF}{sb}{n}{ + <-> ssub * Montserrat-OsF/semibold/n }{} + +% b --> bold + \DeclareFontShape{TS1}{Montserrat-OsF}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-osf-ts1 + <-> ssub * Montserrat-OsF/bold/it +}{} + +\DeclareFontShape{TS1}{Montserrat-OsF}{b}{sl}{ + <-> ssub * Montserrat-OsF/bold/sl }{} \DeclareFontShape{TS1}{Montserrat-OsF}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-osf-ts1 + <-> ssub * Montserrat-OsF/bold/n }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{b}{sl}{ - <-> ssub * Montserrat-OsF/b/it + +% eb --> extrabold + +\DeclareFontShape{TS1}{Montserrat-OsF}{eb}{it}{ + <-> ssub * Montserrat-OsF/extrabold/it }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{el}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-osf-ts1 +\DeclareFontShape{TS1}{Montserrat-OsF}{eb}{sl}{ + <-> ssub * Montserrat-OsF/extrabold/sl }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-ts1 +\DeclareFontShape{TS1}{Montserrat-OsF}{eb}{n}{ + <-> ssub * Montserrat-OsF/extrabold/n }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{el}{sl}{ - <-> ssub * Montserrat-OsF/el/it + +% ub --> black + +\DeclareFontShape{TS1}{Montserrat-OsF}{ub}{it}{ + <-> ssub * Montserrat-OsF/black/it }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-osf-ts1 +\DeclareFontShape{TS1}{Montserrat-OsF}{ub}{sl}{ + <-> ssub * Montserrat-OsF/black/sl }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-osf-ts1 +\DeclareFontShape{TS1}{Montserrat-OsF}{ub}{n}{ + <-> ssub * Montserrat-OsF/black/n }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{k}{sl}{ - <-> ssub * Montserrat-OsF/k/it +\DeclareFontShape{TS1}{Montserrat-OsF}{bx}{n}{ + <-> ssub * Montserrat-OsF/b/n }{} \DeclareFontShape{TS1}{Montserrat-OsF}{bx}{sl}{ @@ -127,8 +296,4 @@ <-> ssub * Montserrat-OsF/b/it }{} -\DeclareFontShape{TS1}{Montserrat-OsF}{bx}{n}{ - <-> ssub * Montserrat-OsF/b/n -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/TS1Montserrat-TLF.fd b/Master/texmf-dist/tex/latex/montserrat/TS1Montserrat-TLF.fd index 8df54e85bdc..f76b192b435 100644 --- a/Master/texmf-dist/tex/latex/montserrat/TS1Montserrat-TLF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/TS1Montserrat-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{TS1Montserrat-TLF.fd} - [2017/01/25 (autoinst) Font definitions for TS1/Montserrat-TLF.] + [2019/10/18 (autoinst) Font definitions for TS1/Montserrat-TLF.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,124 +11,289 @@ \DeclareFontFamily{TS1}{Montserrat-TLF}{} -\DeclareFontShape{TS1}{Montserrat-TLF}{l}{n}{ - <-> \Montserrat@@scale Montserrat-Light-tlf-ts1 + +% ---- extrabold ---- + +\DeclareFontShape{TS1}{Montserrat-TLF}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{l}{it}{ - <-> \Montserrat@@scale Montserrat-LightItalic-tlf-ts1 +\DeclareFontShape{TS1}{Montserrat-TLF}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{l}{sl}{ - <-> ssub * Montserrat-TLF/l/it +\DeclareFontShape{TS1}{Montserrat-TLF}{extrabold}{sl}{ + <-> ssub * Montserrat-TLF/extrabold/it +}{} + + +% ---- thin ---- + +\DeclareFontShape{TS1}{Montserrat-TLF}{thin}{n}{ + <-> \Montserrat@@scale Montserrat-Thin-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-TLF}{thin}{it}{ + <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{mb}{it}{ +\DeclareFontShape{TS1}{Montserrat-TLF}{thin}{sl}{ + <-> ssub * Montserrat-TLF/thin/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{TS1}{Montserrat-TLF}{medium}{it}{ <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{mb}{n}{ +\DeclareFontShape{TS1}{Montserrat-TLF}{medium}{n}{ <-> \Montserrat@@scale Montserrat-Medium-tlf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{mb}{sl}{ - <-> ssub * Montserrat-TLF/mb/it +\DeclareFontShape{TS1}{Montserrat-TLF}{medium}{sl}{ + <-> ssub * Montserrat-TLF/medium/it }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-tlf-ts1 + +% ---- light ---- + +\DeclareFontShape{TS1}{Montserrat-TLF}{light}{n}{ + <-> \Montserrat@@scale Montserrat-Light-tlf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{m}{it}{ +\DeclareFontShape{TS1}{Montserrat-TLF}{light}{it}{ + <-> \Montserrat@@scale Montserrat-LightItalic-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-TLF}{light}{sl}{ + <-> ssub * Montserrat-TLF/light/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{TS1}{Montserrat-TLF}{regular}{it}{ <-> \Montserrat@@scale Montserrat-Italic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{m}{sl}{ - <-> ssub * Montserrat-TLF/m/it +\DeclareFontShape{TS1}{Montserrat-TLF}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-tlf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{t}{n}{ - <-> \Montserrat@@scale Montserrat-Thin-tlf-ts1 +\DeclareFontShape{TS1}{Montserrat-TLF}{regular}{sl}{ + <-> ssub * Montserrat-TLF/regular/it }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{t}{it}{ - <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-ts1 + +% ---- black ---- + +\DeclareFontShape{TS1}{Montserrat-TLF}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{t}{sl}{ - <-> ssub * Montserrat-TLF/t/it +\DeclareFontShape{TS1}{Montserrat-TLF}{black}{n}{ + <-> \Montserrat@@scale Montserrat-Black-tlf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{sb}{n}{ +\DeclareFontShape{TS1}{Montserrat-TLF}{black}{sl}{ + <-> ssub * Montserrat-TLF/black/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{TS1}{Montserrat-TLF}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-TLF}{extralight}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-TLF}{extralight}{sl}{ + <-> ssub * Montserrat-TLF/extralight/it +}{} + + +% ---- semibold ---- + +\DeclareFontShape{TS1}{Montserrat-TLF}{semibold}{n}{ <-> \Montserrat@@scale Montserrat-SemiBold-tlf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{sb}{it}{ +\DeclareFontShape{TS1}{Montserrat-TLF}{semibold}{it}{ <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-ts1 }{} +\DeclareFontShape{TS1}{Montserrat-TLF}{semibold}{sl}{ + <-> ssub * Montserrat-TLF/semibold/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{TS1}{Montserrat-TLF}{bold}{n}{ + <-> \Montserrat@@scale Montserrat-Bold-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-TLF}{bold}{it}{ + <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-TLF}{bold}{sl}{ + <-> ssub * Montserrat-TLF/bold/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{TS1}{Montserrat-TLF}{ul}{n}{ + <-> ssub * Montserrat-TLF/thin/n +}{} + +\DeclareFontShape{TS1}{Montserrat-TLF}{ul}{sl}{ + <-> ssub * Montserrat-TLF/thin/sl +}{} + +\DeclareFontShape{TS1}{Montserrat-TLF}{ul}{it}{ + <-> ssub * Montserrat-TLF/thin/it +}{} + + +% el --> extralight + +\DeclareFontShape{TS1}{Montserrat-TLF}{el}{it}{ + <-> ssub * Montserrat-TLF/extralight/it +}{} + +\DeclareFontShape{TS1}{Montserrat-TLF}{el}{n}{ + <-> ssub * Montserrat-TLF/extralight/n +}{} + +\DeclareFontShape{TS1}{Montserrat-TLF}{el}{sl}{ + <-> ssub * Montserrat-TLF/extralight/sl +}{} + + +% l --> light + +\DeclareFontShape{TS1}{Montserrat-TLF}{l}{n}{ + <-> ssub * Montserrat-TLF/light/n +}{} + +\DeclareFontShape{TS1}{Montserrat-TLF}{l}{sl}{ + <-> ssub * Montserrat-TLF/light/sl +}{} + +\DeclareFontShape{TS1}{Montserrat-TLF}{l}{it}{ + <-> ssub * Montserrat-TLF/light/it +}{} + + +% sl --> regular + +\DeclareFontShape{TS1}{Montserrat-TLF}{sl}{it}{ + <-> ssub * Montserrat-TLF/regular/it +}{} + +\DeclareFontShape{TS1}{Montserrat-TLF}{sl}{n}{ + <-> ssub * Montserrat-TLF/regular/n +}{} + +\DeclareFontShape{TS1}{Montserrat-TLF}{sl}{sl}{ + <-> ssub * Montserrat-TLF/regular/sl +}{} + + +% m --> medium + +\DeclareFontShape{TS1}{Montserrat-TLF}{m}{sl}{ + <-> ssub * Montserrat-TLF/medium/sl +}{} + +\DeclareFontShape{TS1}{Montserrat-TLF}{m}{n}{ + <-> ssub * Montserrat-TLF/medium/n +}{} + +\DeclareFontShape{TS1}{Montserrat-TLF}{m}{it}{ + <-> ssub * Montserrat-TLF/medium/it +}{} + + +% sb --> semibold + +\DeclareFontShape{TS1}{Montserrat-TLF}{sb}{it}{ + <-> ssub * Montserrat-TLF/semibold/it +}{} + +\DeclareFontShape{TS1}{Montserrat-TLF}{sb}{n}{ + <-> ssub * Montserrat-TLF/semibold/n +}{} + \DeclareFontShape{TS1}{Montserrat-TLF}{sb}{sl}{ - <-> ssub * Montserrat-TLF/sb/it + <-> ssub * Montserrat-TLF/semibold/sl }{} + +% b --> bold + \DeclareFontShape{TS1}{Montserrat-TLF}{b}{it}{ - <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-ts1 + <-> ssub * Montserrat-TLF/bold/it }{} \DeclareFontShape{TS1}{Montserrat-TLF}{b}{n}{ - <-> \Montserrat@@scale Montserrat-Bold-tlf-ts1 + <-> ssub * Montserrat-TLF/bold/n }{} \DeclareFontShape{TS1}{Montserrat-TLF}{b}{sl}{ - <-> ssub * Montserrat-TLF/b/it + <-> ssub * Montserrat-TLF/bold/sl }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-ts1 -}{} -\DeclareFontShape{TS1}{Montserrat-TLF}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-ts1 -}{} +% eb --> extrabold \DeclareFontShape{TS1}{Montserrat-TLF}{eb}{sl}{ - <-> ssub * Montserrat-TLF/eb/it + <-> ssub * Montserrat-TLF/extrabold/sl }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-ts1 +\DeclareFontShape{TS1}{Montserrat-TLF}{eb}{n}{ + <-> ssub * Montserrat-TLF/extrabold/n }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{k}{n}{ - <-> \Montserrat@@scale Montserrat-Black-tlf-ts1 +\DeclareFontShape{TS1}{Montserrat-TLF}{eb}{it}{ + <-> ssub * Montserrat-TLF/extrabold/it }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{k}{sl}{ - <-> ssub * Montserrat-TLF/k/it -}{} -\DeclareFontShape{TS1}{Montserrat-TLF}{el}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-ts1 +% ub --> black + +\DeclareFontShape{TS1}{Montserrat-TLF}{ub}{it}{ + <-> ssub * Montserrat-TLF/black/it }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-ts1 +\DeclareFontShape{TS1}{Montserrat-TLF}{ub}{n}{ + <-> ssub * Montserrat-TLF/black/n }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{el}{sl}{ - <-> ssub * Montserrat-TLF/el/it +\DeclareFontShape{TS1}{Montserrat-TLF}{ub}{sl}{ + <-> ssub * Montserrat-TLF/black/sl }{} \DeclareFontShape{TS1}{Montserrat-TLF}{bx}{sl}{ <-> ssub * Montserrat-TLF/b/sl }{} -\DeclareFontShape{TS1}{Montserrat-TLF}{bx}{it}{ - <-> ssub * Montserrat-TLF/b/it -}{} - \DeclareFontShape{TS1}{Montserrat-TLF}{bx}{n}{ <-> ssub * Montserrat-TLF/b/n }{} +\DeclareFontShape{TS1}{Montserrat-TLF}{bx}{it}{ + <-> ssub * Montserrat-TLF/b/it +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/TS1Montserrat-TOsF.fd b/Master/texmf-dist/tex/latex/montserrat/TS1Montserrat-TOsF.fd index 41e92a77756..5ca7b9d2c8c 100644 --- a/Master/texmf-dist/tex/latex/montserrat/TS1Montserrat-TOsF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/TS1Montserrat-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{TS1Montserrat-TOsF.fd} - [2017/01/25 (autoinst) Font definitions for TS1/Montserrat-TOsF.] + [2019/10/18 (autoinst) Font definitions for TS1/Montserrat-TOsF.] \expandafter\ifx\csname Montserrat@scale\endcsname\relax \let\Montserrat@@scale\@empty @@ -11,122 +11,287 @@ \DeclareFontFamily{TS1}{Montserrat-TOsF}{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{b}{n}{ + +% ---- semibold ---- + +\DeclareFontShape{TS1}{Montserrat-TOsF}{semibold}{n}{ + <-> \Montserrat@@scale Montserrat-SemiBold-tosf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-TOsF}{semibold}{it}{ + <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-TOsF}{semibold}{sl}{ + <-> ssub * Montserrat-TOsF/semibold/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{TS1}{Montserrat-TOsF}{bold}{n}{ <-> \Montserrat@@scale Montserrat-Bold-tosf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{b}{it}{ +\DeclareFontShape{TS1}{Montserrat-TOsF}{bold}{it}{ <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{b}{sl}{ - <-> ssub * Montserrat-TOsF/b/it +\DeclareFontShape{TS1}{Montserrat-TOsF}{bold}{sl}{ + <-> ssub * Montserrat-TOsF/bold/it }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{eb}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-ts1 + +% ---- extralight ---- + +\DeclareFontShape{TS1}{Montserrat-TOsF}{extralight}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{eb}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-ts1 +\DeclareFontShape{TS1}{Montserrat-TOsF}{extralight}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{eb}{sl}{ - <-> ssub * Montserrat-TOsF/eb/it +\DeclareFontShape{TS1}{Montserrat-TOsF}{extralight}{sl}{ + <-> ssub * Montserrat-TOsF/extralight/it }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{k}{it}{ - <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-ts1 + +% ---- regular ---- + +\DeclareFontShape{TS1}{Montserrat-TOsF}{regular}{it}{ + <-> \Montserrat@@scale Montserrat-Italic-tosf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{k}{n}{ +\DeclareFontShape{TS1}{Montserrat-TOsF}{regular}{n}{ + <-> \Montserrat@@scale Montserrat-Regular-tosf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-TOsF}{regular}{sl}{ + <-> ssub * Montserrat-TOsF/regular/it +}{} + + +% ---- black ---- + +\DeclareFontShape{TS1}{Montserrat-TOsF}{black}{n}{ <-> \Montserrat@@scale Montserrat-Black-tosf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{k}{sl}{ - <-> ssub * Montserrat-TOsF/k/it +\DeclareFontShape{TS1}{Montserrat-TOsF}{black}{it}{ + <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-TOsF}{black}{sl}{ + <-> ssub * Montserrat-TOsF/black/it }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{el}{it}{ - <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-ts1 + +% ---- medium ---- + +\DeclareFontShape{TS1}{Montserrat-TOsF}{medium}{n}{ + <-> \Montserrat@@scale Montserrat-Medium-tosf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{el}{n}{ - <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-ts1 +\DeclareFontShape{TS1}{Montserrat-TOsF}{medium}{it}{ + <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{el}{sl}{ - <-> ssub * Montserrat-TOsF/el/it +\DeclareFontShape{TS1}{Montserrat-TOsF}{medium}{sl}{ + <-> ssub * Montserrat-TOsF/medium/it +}{} + + +% ---- light ---- + +\DeclareFontShape{TS1}{Montserrat-TOsF}{light}{it}{ + <-> \Montserrat@@scale Montserrat-LightItalic-tosf-ts1 +}{} + +\DeclareFontShape{TS1}{Montserrat-TOsF}{light}{n}{ + <-> \Montserrat@@scale Montserrat-Light-tosf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{t}{it}{ +\DeclareFontShape{TS1}{Montserrat-TOsF}{light}{sl}{ + <-> ssub * Montserrat-TOsF/light/it +}{} + + +% ---- thin ---- + +\DeclareFontShape{TS1}{Montserrat-TOsF}{thin}{it}{ <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{t}{n}{ +\DeclareFontShape{TS1}{Montserrat-TOsF}{thin}{n}{ <-> \Montserrat@@scale Montserrat-Thin-tosf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{t}{sl}{ - <-> ssub * Montserrat-TOsF/t/it +\DeclareFontShape{TS1}{Montserrat-TOsF}{thin}{sl}{ + <-> ssub * Montserrat-TOsF/thin/it }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{sb}{n}{ - <-> \Montserrat@@scale Montserrat-SemiBold-tosf-ts1 + +% ---- extrabold ---- + +\DeclareFontShape{TS1}{Montserrat-TOsF}{extrabold}{n}{ + <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{sb}{it}{ - <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-ts1 +\DeclareFontShape{TS1}{Montserrat-TOsF}{extrabold}{it}{ + <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{sb}{sl}{ - <-> ssub * Montserrat-TOsF/sb/it +\DeclareFontShape{TS1}{Montserrat-TOsF}{extrabold}{sl}{ + <-> ssub * Montserrat-TOsF/extrabold/it }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{mb}{n}{ - <-> \Montserrat@@scale Montserrat-Medium-tosf-ts1 +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{TS1}{Montserrat-TOsF}{ul}{it}{ + <-> ssub * Montserrat-TOsF/thin/it }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{mb}{it}{ - <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-ts1 +\DeclareFontShape{TS1}{Montserrat-TOsF}{ul}{n}{ + <-> ssub * Montserrat-TOsF/thin/n }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{mb}{sl}{ - <-> ssub * Montserrat-TOsF/mb/it +\DeclareFontShape{TS1}{Montserrat-TOsF}{ul}{sl}{ + <-> ssub * Montserrat-TOsF/thin/sl }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{l}{n}{ - <-> \Montserrat@@scale Montserrat-Light-tosf-ts1 + +% el --> extralight + +\DeclareFontShape{TS1}{Montserrat-TOsF}{el}{it}{ + <-> ssub * Montserrat-TOsF/extralight/it +}{} + +\DeclareFontShape{TS1}{Montserrat-TOsF}{el}{sl}{ + <-> ssub * Montserrat-TOsF/extralight/sl +}{} + +\DeclareFontShape{TS1}{Montserrat-TOsF}{el}{n}{ + <-> ssub * Montserrat-TOsF/extralight/n }{} + +% l --> light + \DeclareFontShape{TS1}{Montserrat-TOsF}{l}{it}{ - <-> \Montserrat@@scale Montserrat-LightItalic-tosf-ts1 + <-> ssub * Montserrat-TOsF/light/it +}{} + +\DeclareFontShape{TS1}{Montserrat-TOsF}{l}{n}{ + <-> ssub * Montserrat-TOsF/light/n }{} \DeclareFontShape{TS1}{Montserrat-TOsF}{l}{sl}{ - <-> ssub * Montserrat-TOsF/l/it + <-> ssub * Montserrat-TOsF/light/sl }{} + +% sl --> regular + +\DeclareFontShape{TS1}{Montserrat-TOsF}{sl}{n}{ + <-> ssub * Montserrat-TOsF/regular/n +}{} + +\DeclareFontShape{TS1}{Montserrat-TOsF}{sl}{sl}{ + <-> ssub * Montserrat-TOsF/regular/sl +}{} + +\DeclareFontShape{TS1}{Montserrat-TOsF}{sl}{it}{ + <-> ssub * Montserrat-TOsF/regular/it +}{} + + +% m --> medium + \DeclareFontShape{TS1}{Montserrat-TOsF}{m}{it}{ - <-> \Montserrat@@scale Montserrat-Italic-tosf-ts1 + <-> ssub * Montserrat-TOsF/medium/it }{} \DeclareFontShape{TS1}{Montserrat-TOsF}{m}{n}{ - <-> \Montserrat@@scale Montserrat-Regular-tosf-ts1 + <-> ssub * Montserrat-TOsF/medium/n }{} \DeclareFontShape{TS1}{Montserrat-TOsF}{m}{sl}{ - <-> ssub * Montserrat-TOsF/m/it + <-> ssub * Montserrat-TOsF/medium/sl }{} -\DeclareFontShape{TS1}{Montserrat-TOsF}{bx}{sl}{ - <-> ssub * Montserrat-TOsF/b/sl + +% sb --> semibold + +\DeclareFontShape{TS1}{Montserrat-TOsF}{sb}{sl}{ + <-> ssub * Montserrat-TOsF/semibold/sl +}{} + +\DeclareFontShape{TS1}{Montserrat-TOsF}{sb}{n}{ + <-> ssub * Montserrat-TOsF/semibold/n +}{} + +\DeclareFontShape{TS1}{Montserrat-TOsF}{sb}{it}{ + <-> ssub * Montserrat-TOsF/semibold/it +}{} + + +% b --> bold + +\DeclareFontShape{TS1}{Montserrat-TOsF}{b}{it}{ + <-> ssub * Montserrat-TOsF/bold/it +}{} + +\DeclareFontShape{TS1}{Montserrat-TOsF}{b}{sl}{ + <-> ssub * Montserrat-TOsF/bold/sl +}{} + +\DeclareFontShape{TS1}{Montserrat-TOsF}{b}{n}{ + <-> ssub * Montserrat-TOsF/bold/n +}{} + + +% eb --> extrabold + +\DeclareFontShape{TS1}{Montserrat-TOsF}{eb}{sl}{ + <-> ssub * Montserrat-TOsF/extrabold/sl +}{} + +\DeclareFontShape{TS1}{Montserrat-TOsF}{eb}{n}{ + <-> ssub * Montserrat-TOsF/extrabold/n +}{} + +\DeclareFontShape{TS1}{Montserrat-TOsF}{eb}{it}{ + <-> ssub * Montserrat-TOsF/extrabold/it +}{} + + +% ub --> black + +\DeclareFontShape{TS1}{Montserrat-TOsF}{ub}{it}{ + <-> ssub * Montserrat-TOsF/black/it +}{} + +\DeclareFontShape{TS1}{Montserrat-TOsF}{ub}{n}{ + <-> ssub * Montserrat-TOsF/black/n +}{} + +\DeclareFontShape{TS1}{Montserrat-TOsF}{ub}{sl}{ + <-> ssub * Montserrat-TOsF/black/sl }{} \DeclareFontShape{TS1}{Montserrat-TOsF}{bx}{it}{ <-> ssub * Montserrat-TOsF/b/it }{} +\DeclareFontShape{TS1}{Montserrat-TOsF}{bx}{sl}{ + <-> ssub * Montserrat-TOsF/b/sl +}{} + \DeclareFontShape{TS1}{Montserrat-TOsF}{bx}{n}{ <-> ssub * Montserrat-TOsF/b/n }{} diff --git a/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-LF.fd b/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-LF.fd index d4cdcba7f14..7915499380b 100644 --- a/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-LF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-LF.fd @@ -1,126 +1,287 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{TS1MontserratAlternates-LF.fd} - [2017/01/25 (autoinst) Font definitions for TS1/MontserratAlternates-LF.] + [2019/10/18 (autoinst) Font definitions for TS1/MontserratAlternates-LF.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{TS1}{MontserratAlternates-LF}{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-lf-ts1 + +% ---- bold ---- + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-lf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-lf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-LF}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{sb}{sl}{ - <-> ssub * MontserratAlternates-LF/sb/it +\DeclareFontShape{TS1}{MontserratAlternates-LF}{bold}{sl}{ + <-> ssub * MontserratAlternates-LF/bold/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-lf-ts1 + +% ---- thin ---- + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-lf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-LF}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{t}{sl}{ - <-> ssub * MontserratAlternates-LF/t/it +\DeclareFontShape{TS1}{MontserratAlternates-LF}{thin}{sl}{ + <-> ssub * MontserratAlternates-LF/thin/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-lf-ts1 + +% ---- regular ---- + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-lf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-LF}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{m}{sl}{ - <-> ssub * MontserratAlternates-LF/m/it +\DeclareFontShape{TS1}{MontserratAlternates-LF}{regular}{sl}{ + <-> ssub * MontserratAlternates-LF/regular/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-lf-ts1 + +% ---- black ---- + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-lf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-LF}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-lf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{l}{sl}{ - <-> ssub * MontserratAlternates-LF/l/it +\DeclareFontShape{TS1}{MontserratAlternates-LF}{black}{sl}{ + <-> ssub * MontserratAlternates-LF/black/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-lf-ts1 + +% ---- semibold ---- + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-lf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-LF}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{mb}{sl}{ - <-> ssub * MontserratAlternates-LF/mb/it +\DeclareFontShape{TS1}{MontserratAlternates-LF}{semibold}{sl}{ + <-> ssub * MontserratAlternates-LF/semibold/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-lf-ts1 + +% ---- medium ---- + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-lf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{medium}{sl}{ + <-> ssub * MontserratAlternates-LF/medium/it +}{} + + +% ---- light ---- + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-lf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-lf-ts1 }{} +\DeclareFontShape{TS1}{MontserratAlternates-LF}{light}{sl}{ + <-> ssub * MontserratAlternates-LF/light/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-LF/extrabold/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-lf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-lf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{extralight}{sl}{ + <-> ssub * MontserratAlternates-LF/extralight/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{ul}{it}{ + <-> ssub * MontserratAlternates-LF/thin/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{ul}{sl}{ + <-> ssub * MontserratAlternates-LF/thin/sl +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{ul}{n}{ + <-> ssub * MontserratAlternates-LF/thin/n +}{} + + +% el --> extralight + \DeclareFontShape{TS1}{MontserratAlternates-LF}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-lf-ts1 + <-> ssub * MontserratAlternates-LF/extralight/n +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{el}{it}{ + <-> ssub * MontserratAlternates-LF/extralight/it }{} \DeclareFontShape{TS1}{MontserratAlternates-LF}{el}{sl}{ - <-> ssub * MontserratAlternates-LF/el/it + <-> ssub * MontserratAlternates-LF/extralight/sl }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-lf-ts1 + +% l --> light + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{l}{sl}{ + <-> ssub * MontserratAlternates-LF/light/sl }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-lf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-LF}{l}{it}{ + <-> ssub * MontserratAlternates-LF/light/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{k}{sl}{ - <-> ssub * MontserratAlternates-LF/k/it +\DeclareFontShape{TS1}{MontserratAlternates-LF}{l}{n}{ + <-> ssub * MontserratAlternates-LF/light/n }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-lf-ts1 + +% sl --> regular + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{sl}{sl}{ + <-> ssub * MontserratAlternates-LF/regular/sl }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-lf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-LF}{sl}{it}{ + <-> ssub * MontserratAlternates-LF/regular/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{eb}{sl}{ - <-> ssub * MontserratAlternates-LF/eb/it +\DeclareFontShape{TS1}{MontserratAlternates-LF}{sl}{n}{ + <-> ssub * MontserratAlternates-LF/regular/n }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-lf-ts1 + +% m --> medium + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{m}{n}{ + <-> ssub * MontserratAlternates-LF/medium/n }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-lf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-LF}{m}{it}{ + <-> ssub * MontserratAlternates-LF/medium/it }{} +\DeclareFontShape{TS1}{MontserratAlternates-LF}{m}{sl}{ + <-> ssub * MontserratAlternates-LF/medium/sl +}{} + + +% sb --> semibold + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{sb}{n}{ + <-> ssub * MontserratAlternates-LF/semibold/n +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{sb}{it}{ + <-> ssub * MontserratAlternates-LF/semibold/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{sb}{sl}{ + <-> ssub * MontserratAlternates-LF/semibold/sl +}{} + + +% b --> bold + \DeclareFontShape{TS1}{MontserratAlternates-LF}{b}{sl}{ - <-> ssub * MontserratAlternates-LF/b/it + <-> ssub * MontserratAlternates-LF/bold/sl }{} -\DeclareFontShape{TS1}{MontserratAlternates-LF}{bx}{n}{ - <-> ssub * MontserratAlternates-LF/b/n +\DeclareFontShape{TS1}{MontserratAlternates-LF}{b}{it}{ + <-> ssub * MontserratAlternates-LF/bold/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{b}{n}{ + <-> ssub * MontserratAlternates-LF/bold/n +}{} + + +% eb --> extrabold + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{eb}{it}{ + <-> ssub * MontserratAlternates-LF/extrabold/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{eb}{sl}{ + <-> ssub * MontserratAlternates-LF/extrabold/sl +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{eb}{n}{ + <-> ssub * MontserratAlternates-LF/extrabold/n +}{} + + +% ub --> black + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{ub}{it}{ + <-> ssub * MontserratAlternates-LF/black/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{ub}{sl}{ + <-> ssub * MontserratAlternates-LF/black/sl +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-LF}{ub}{n}{ + <-> ssub * MontserratAlternates-LF/black/n }{} \DeclareFontShape{TS1}{MontserratAlternates-LF}{bx}{sl}{ @@ -131,4 +292,8 @@ <-> ssub * MontserratAlternates-LF/b/it }{} +\DeclareFontShape{TS1}{MontserratAlternates-LF}{bx}{n}{ + <-> ssub * MontserratAlternates-LF/b/n +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-OsF.fd b/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-OsF.fd index 0fce04aee7c..6a4d9a38672 100644 --- a/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-OsF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-OsF.fd @@ -1,122 +1,291 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{TS1MontserratAlternates-OsF.fd} - [2017/01/25 (autoinst) Font definitions for TS1/MontserratAlternates-OsF.] + [2019/10/18 (autoinst) Font definitions for TS1/MontserratAlternates-OsF.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{TS1}{MontserratAlternates-OsF}{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-osf-ts1 + +% ---- extralight ---- + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-osf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{t}{sl}{ - <-> ssub * MontserratAlternates-OsF/t/it +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{extralight}{sl}{ + <-> ssub * MontserratAlternates-OsF/extralight/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-osf-ts1 + +% ---- extrabold ---- + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-osf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{sb}{sl}{ - <-> ssub * MontserratAlternates-OsF/sb/it +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-OsF/extrabold/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-osf-ts1 + +% ---- semibold ---- + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-osf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{semibold}{sl}{ + <-> ssub * MontserratAlternates-OsF/semibold/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{medium}{sl}{ + <-> ssub * MontserratAlternates-OsF/medium/it +}{} + + +% ---- light ---- + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{light}{sl}{ + <-> ssub * MontserratAlternates-OsF/light/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{regular}{sl}{ + <-> ssub * MontserratAlternates-OsF/regular/it +}{} + + +% ---- black ---- + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{black}{sl}{ + <-> ssub * MontserratAlternates-OsF/black/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{bold}{sl}{ + <-> ssub * MontserratAlternates-OsF/bold/it +}{} + + +% ---- thin ---- + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{thin}{sl}{ + <-> ssub * MontserratAlternates-OsF/thin/it }{} +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{ul}{sl}{ + <-> ssub * MontserratAlternates-OsF/thin/sl +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{ul}{it}{ + <-> ssub * MontserratAlternates-OsF/thin/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{ul}{n}{ + <-> ssub * MontserratAlternates-OsF/thin/n +}{} + + +% el --> extralight + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{el}{n}{ + <-> ssub * MontserratAlternates-OsF/extralight/n +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{el}{it}{ + <-> ssub * MontserratAlternates-OsF/extralight/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{el}{sl}{ + <-> ssub * MontserratAlternates-OsF/extralight/sl +}{} + + +% l --> light + \DeclareFontShape{TS1}{MontserratAlternates-OsF}{l}{sl}{ - <-> ssub * MontserratAlternates-OsF/l/it + <-> ssub * MontserratAlternates-OsF/light/sl }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-osf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{l}{it}{ + <-> ssub * MontserratAlternates-OsF/light/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-osf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{l}{n}{ + <-> ssub * MontserratAlternates-OsF/light/n }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{mb}{sl}{ - <-> ssub * MontserratAlternates-OsF/mb/it + +% sl --> regular + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{sl}{n}{ + <-> ssub * MontserratAlternates-OsF/regular/n }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-osf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{sl}{sl}{ + <-> ssub * MontserratAlternates-OsF/regular/sl }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-osf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{sl}{it}{ + <-> ssub * MontserratAlternates-OsF/regular/it +}{} + + +% m --> medium + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{m}{it}{ + <-> ssub * MontserratAlternates-OsF/medium/it }{} \DeclareFontShape{TS1}{MontserratAlternates-OsF}{m}{sl}{ - <-> ssub * MontserratAlternates-OsF/m/it + <-> ssub * MontserratAlternates-OsF/medium/sl }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-osf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{m}{n}{ + <-> ssub * MontserratAlternates-OsF/medium/n }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-osf-ts1 + +% sb --> semibold + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{sb}{sl}{ + <-> ssub * MontserratAlternates-OsF/semibold/sl }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{eb}{sl}{ - <-> ssub * MontserratAlternates-OsF/eb/it +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{sb}{it}{ + <-> ssub * MontserratAlternates-OsF/semibold/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{sb}{n}{ + <-> ssub * MontserratAlternates-OsF/semibold/n }{} + +% b --> bold + \DeclareFontShape{TS1}{MontserratAlternates-OsF}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-osf-ts1 + <-> ssub * MontserratAlternates-OsF/bold/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{b}{sl}{ + <-> ssub * MontserratAlternates-OsF/bold/sl }{} \DeclareFontShape{TS1}{MontserratAlternates-OsF}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-osf-ts1 + <-> ssub * MontserratAlternates-OsF/bold/n }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{b}{sl}{ - <-> ssub * MontserratAlternates-OsF/b/it + +% eb --> extrabold + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{eb}{n}{ + <-> ssub * MontserratAlternates-OsF/extrabold/n }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-osf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{eb}{it}{ + <-> ssub * MontserratAlternates-OsF/extrabold/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-osf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{eb}{sl}{ + <-> ssub * MontserratAlternates-OsF/extrabold/sl }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{el}{sl}{ - <-> ssub * MontserratAlternates-OsF/el/it + +% ub --> black + +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{ub}{n}{ + <-> ssub * MontserratAlternates-OsF/black/n }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-osf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{ub}{sl}{ + <-> ssub * MontserratAlternates-OsF/black/sl }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-osf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{ub}{it}{ + <-> ssub * MontserratAlternates-OsF/black/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{k}{sl}{ - <-> ssub * MontserratAlternates-OsF/k/it +\DeclareFontShape{TS1}{MontserratAlternates-OsF}{bx}{n}{ + <-> ssub * MontserratAlternates-OsF/b/n }{} \DeclareFontShape{TS1}{MontserratAlternates-OsF}{bx}{sl}{ @@ -127,8 +296,4 @@ <-> ssub * MontserratAlternates-OsF/b/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-OsF}{bx}{n}{ - <-> ssub * MontserratAlternates-OsF/b/n -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-TLF.fd b/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-TLF.fd index 185773b2580..2c5f789b647 100644 --- a/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-TLF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-TLF.fd @@ -1,122 +1,287 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{TS1MontserratAlternates-TLF.fd} - [2017/01/25 (autoinst) Font definitions for TS1/MontserratAlternates-TLF.] + [2019/10/18 (autoinst) Font definitions for TS1/MontserratAlternates-TLF.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{TS1}{MontserratAlternates-TLF}{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-tlf-ts1 + +% ---- medium ---- + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-tlf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{sl}{ - <-> ssub * MontserratAlternates-TLF/l/it +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{medium}{sl}{ + <-> ssub * MontserratAlternates-TLF/medium/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-tlf-ts1 + +% ---- light ---- + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-tlf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{mb}{sl}{ - <-> ssub * MontserratAlternates-TLF/mb/it +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{light}{sl}{ + <-> ssub * MontserratAlternates-TLF/light/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-tlf-ts1 + +% ---- semibold ---- + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-tlf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{m}{sl}{ - <-> ssub * MontserratAlternates-TLF/m/it +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{semibold}{sl}{ + <-> ssub * MontserratAlternates-TLF/semibold/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-tlf-ts1 + +% ---- black ---- + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-tlf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{t}{sl}{ - <-> ssub * MontserratAlternates-TLF/t/it +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{black}{sl}{ + <-> ssub * MontserratAlternates-TLF/black/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-tlf-ts1 + +% ---- regular ---- + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-tlf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sb}{sl}{ - <-> ssub * MontserratAlternates-TLF/sb/it +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{regular}{sl}{ + <-> ssub * MontserratAlternates-TLF/regular/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-tlf-ts1 + +% ---- thin ---- + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-tlf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{b}{sl}{ - <-> ssub * MontserratAlternates-TLF/b/it +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{thin}{sl}{ + <-> ssub * MontserratAlternates-TLF/thin/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-tlf-ts1 + +% ---- bold ---- + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-tlf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{eb}{sl}{ - <-> ssub * MontserratAlternates-TLF/eb/it +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bold}{sl}{ + <-> ssub * MontserratAlternates-TLF/bold/it +}{} + + +% ---- extrabold ---- + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-TLF/extrabold/it +}{} + + +% ---- extralight ---- + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-tlf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extralight}{sl}{ + <-> ssub * MontserratAlternates-TLF/extralight/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-tlf-ts1 +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{ul}{sl}{ + <-> ssub * MontserratAlternates-TLF/thin/sl }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{k}{sl}{ - <-> ssub * MontserratAlternates-TLF/k/it +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{ul}{it}{ + <-> ssub * MontserratAlternates-TLF/thin/it }{} +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{ul}{n}{ + <-> ssub * MontserratAlternates-TLF/thin/n +}{} + + +% el --> extralight + \DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-tlf-ts1 + <-> ssub * MontserratAlternates-TLF/extralight/n +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{sl}{ + <-> ssub * MontserratAlternates-TLF/extralight/sl }{} \DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-tlf-ts1 + <-> ssub * MontserratAlternates-TLF/extralight/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{sl}{ - <-> ssub * MontserratAlternates-TLF/el/it + +% l --> light + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{sl}{ + <-> ssub * MontserratAlternates-TLF/light/sl +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{it}{ + <-> ssub * MontserratAlternates-TLF/light/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{n}{ + <-> ssub * MontserratAlternates-TLF/light/n +}{} + + +% sl --> regular + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sl}{n}{ + <-> ssub * MontserratAlternates-TLF/regular/n +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sl}{it}{ + <-> ssub * MontserratAlternates-TLF/regular/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sl}{sl}{ + <-> ssub * MontserratAlternates-TLF/regular/sl +}{} + + +% m --> medium + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{m}{it}{ + <-> ssub * MontserratAlternates-TLF/medium/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{m}{sl}{ + <-> ssub * MontserratAlternates-TLF/medium/sl +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{m}{n}{ + <-> ssub * MontserratAlternates-TLF/medium/n +}{} + + +% sb --> semibold + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sb}{n}{ + <-> ssub * MontserratAlternates-TLF/semibold/n +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sb}{sl}{ + <-> ssub * MontserratAlternates-TLF/semibold/sl +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sb}{it}{ + <-> ssub * MontserratAlternates-TLF/semibold/it +}{} + + +% b --> bold + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{b}{it}{ + <-> ssub * MontserratAlternates-TLF/bold/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{b}{sl}{ + <-> ssub * MontserratAlternates-TLF/bold/sl +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{b}{n}{ + <-> ssub * MontserratAlternates-TLF/bold/n +}{} + + +% eb --> extrabold + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{eb}{sl}{ + <-> ssub * MontserratAlternates-TLF/extrabold/sl +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{eb}{it}{ + <-> ssub * MontserratAlternates-TLF/extrabold/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{eb}{n}{ + <-> ssub * MontserratAlternates-TLF/extrabold/n +}{} + + +% ub --> black + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{ub}{it}{ + <-> ssub * MontserratAlternates-TLF/black/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{ub}{sl}{ + <-> ssub * MontserratAlternates-TLF/black/sl +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TLF}{ub}{n}{ + <-> ssub * MontserratAlternates-TLF/black/n }{} \DeclareFontShape{TS1}{MontserratAlternates-TLF}{bx}{sl}{ diff --git a/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-TOsF.fd b/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-TOsF.fd index 87f0c2d0d23..6ac7aa64889 100644 --- a/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-TOsF.fd +++ b/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-TOsF.fd @@ -1,132 +1,297 @@ -%% Generated by autoinst on 2017/01/25 +%% Generated by autoinst on 2019/10/18 %% \ProvidesFile{TS1MontserratAlternates-TOsF.fd} - [2017/01/25 (autoinst) Font definitions for TS1/MontserratAlternates-TOsF.] + [2019/10/18 (autoinst) Font definitions for TS1/MontserratAlternates-TOsF.] -\expandafter\ifx\csname Montserrat@scale\endcsname\relax - \let\Montserrat@@scale\@empty +\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax + \let\MontserratAlternates@@scale\@empty \else - \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}% + \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}% \fi \DeclareFontFamily{TS1}{MontserratAlternates-TOsF}{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{b}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Bold-tosf-ts1 + +% ---- extralight ---- + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{extralight}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tosf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{b}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BoldItalic-tosf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{extralight}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{b}{sl}{ - <-> ssub * MontserratAlternates-TOsF/b/it +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{extralight}{sl}{ + <-> ssub * MontserratAlternates-TOsF/extralight/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{eb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-tosf-ts1 + +% ---- extrabold ---- + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{extrabold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{eb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraBold-tosf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{extrabold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{eb}{sl}{ - <-> ssub * MontserratAlternates-TOsF/eb/it +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{extrabold}{sl}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{k}{it}{ - <-> \Montserrat@@scale MontserratAlternates-BlackItalic-tosf-ts1 + +% ---- regular ---- + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{regular}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{k}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Black-tosf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{regular}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{k}{sl}{ - <-> ssub * MontserratAlternates-TOsF/k/it +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{regular}{sl}{ + <-> ssub * MontserratAlternates-TOsF/regular/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{el}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-tosf-ts1 + +% ---- black ---- + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{black}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{el}{n}{ - <-> \Montserrat@@scale MontserratAlternates-ExtraLight-tosf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{black}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Black-tosf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{el}{sl}{ - <-> ssub * MontserratAlternates-TOsF/el/it +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{black}{sl}{ + <-> ssub * MontserratAlternates-TOsF/black/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{t}{it}{ - <-> \Montserrat@@scale MontserratAlternates-ThinItalic-tosf-ts1 + +% ---- medium ---- + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{medium}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tosf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{t}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Thin-tosf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{medium}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{t}{sl}{ - <-> ssub * MontserratAlternates-TOsF/t/it +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{medium}{sl}{ + <-> ssub * MontserratAlternates-TOsF/medium/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{sb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBold-tosf-ts1 + +% ---- light ---- + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{light}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{sb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-tosf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{light}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Light-tosf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{sb}{sl}{ - <-> ssub * MontserratAlternates-TOsF/sb/it +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{light}{sl}{ + <-> ssub * MontserratAlternates-TOsF/light/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{mb}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Medium-tosf-ts1 + +% ---- semibold ---- + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{semibold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{mb}{it}{ - <-> \Montserrat@@scale MontserratAlternates-MediumItalic-tosf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{semibold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{mb}{sl}{ - <-> ssub * MontserratAlternates-TOsF/mb/it +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{semibold}{sl}{ + <-> ssub * MontserratAlternates-TOsF/semibold/it }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{l}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Light-tosf-ts1 + +% ---- thin ---- + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{thin}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{l}{it}{ - <-> \Montserrat@@scale MontserratAlternates-LightItalic-tosf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{thin}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tosf-ts1 }{} +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{thin}{sl}{ + <-> ssub * MontserratAlternates-TOsF/thin/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{bold}{it}{ + <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{bold}{n}{ + <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-ts1 +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{bold}{sl}{ + <-> ssub * MontserratAlternates-TOsF/bold/it +}{} + +% +% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% + +% ul --> thin + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{ul}{n}{ + <-> ssub * MontserratAlternates-TOsF/thin/n +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{ul}{sl}{ + <-> ssub * MontserratAlternates-TOsF/thin/sl +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{ul}{it}{ + <-> ssub * MontserratAlternates-TOsF/thin/it +}{} + + +% el --> extralight + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{el}{it}{ + <-> ssub * MontserratAlternates-TOsF/extralight/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{el}{sl}{ + <-> ssub * MontserratAlternates-TOsF/extralight/sl +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{el}{n}{ + <-> ssub * MontserratAlternates-TOsF/extralight/n +}{} + + +% l --> light + \DeclareFontShape{TS1}{MontserratAlternates-TOsF}{l}{sl}{ - <-> ssub * MontserratAlternates-TOsF/l/it + <-> ssub * MontserratAlternates-TOsF/light/sl }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{m}{it}{ - <-> \Montserrat@@scale MontserratAlternates-Italic-tosf-ts1 +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{l}{it}{ + <-> ssub * MontserratAlternates-TOsF/light/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{l}{n}{ + <-> ssub * MontserratAlternates-TOsF/light/n +}{} + + +% sl --> regular + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{sl}{n}{ + <-> ssub * MontserratAlternates-TOsF/regular/n }{} +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{sl}{it}{ + <-> ssub * MontserratAlternates-TOsF/regular/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{sl}{sl}{ + <-> ssub * MontserratAlternates-TOsF/regular/sl +}{} + + +% m --> medium + \DeclareFontShape{TS1}{MontserratAlternates-TOsF}{m}{n}{ - <-> \Montserrat@@scale MontserratAlternates-Regular-tosf-ts1 + <-> ssub * MontserratAlternates-TOsF/medium/n +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{m}{it}{ + <-> ssub * MontserratAlternates-TOsF/medium/it }{} \DeclareFontShape{TS1}{MontserratAlternates-TOsF}{m}{sl}{ - <-> ssub * MontserratAlternates-TOsF/m/it + <-> ssub * MontserratAlternates-TOsF/medium/sl }{} -\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{bx}{sl}{ - <-> ssub * MontserratAlternates-TOsF/b/sl + +% sb --> semibold + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{sb}{n}{ + <-> ssub * MontserratAlternates-TOsF/semibold/n +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{sb}{sl}{ + <-> ssub * MontserratAlternates-TOsF/semibold/sl +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{sb}{it}{ + <-> ssub * MontserratAlternates-TOsF/semibold/it +}{} + + +% b --> bold + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{b}{it}{ + <-> ssub * MontserratAlternates-TOsF/bold/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{b}{sl}{ + <-> ssub * MontserratAlternates-TOsF/bold/sl +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{b}{n}{ + <-> ssub * MontserratAlternates-TOsF/bold/n +}{} + + +% eb --> extrabold + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{eb}{n}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/n +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{eb}{it}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{eb}{sl}{ + <-> ssub * MontserratAlternates-TOsF/extrabold/sl +}{} + + +% ub --> black + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{ub}{n}{ + <-> ssub * MontserratAlternates-TOsF/black/n +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{ub}{it}{ + <-> ssub * MontserratAlternates-TOsF/black/it +}{} + +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{ub}{sl}{ + <-> ssub * MontserratAlternates-TOsF/black/sl }{} \DeclareFontShape{TS1}{MontserratAlternates-TOsF}{bx}{it}{ <-> ssub * MontserratAlternates-TOsF/b/it }{} +\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{bx}{sl}{ + <-> ssub * MontserratAlternates-TOsF/b/sl +}{} + \DeclareFontShape{TS1}{MontserratAlternates-TOsF}{bx}{n}{ <-> ssub * MontserratAlternates-TOsF/b/n }{} diff --git a/Master/texmf-dist/tex/latex/montserrat/montserrat.sty b/Master/texmf-dist/tex/latex/montserrat/montserrat.sty index c95ba88812f..8e043cb0465 100644 --- a/Master/texmf-dist/tex/latex/montserrat/montserrat.sty +++ b/Master/texmf-dist/tex/latex/montserrat/montserrat.sty @@ -1,7 +1,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{1.01} -\def\filedate{2017/02/26} +\def\fileversion{1.02} +\def\filedate{2019/10/17} \ProvidesPackage{montserrat}[\filedate\space v\fileversion] \message{`montserrat' v\fileversion, \filedate\space Style file for Montserrat and Alternates (msharpe)} @@ -48,18 +48,33 @@ \newif\ifMontserrat@famdef \def\Montserrat@alt{}\newif\ifMontserrat@alt \DeclareOptionX{lining}{\edef\Montserrat@figurestyle{LF}} +\DeclareOptionX{osf}{\edef\Montserrat@figurestyle{OsF}} \DeclareOptionX{oldstyle}{\edef\Montserrat@figurestyle{OsF}} \DeclareOptionX{tabular}{\edef\Montserrat@figurealign{T}} +\DeclareOptionX{t}{\edef\Montserrat@figurealign{T}} \DeclareOptionX{proportional}{\edef\Montserrat@figurealign{}} -\DeclareOptionX{thin}{\edef\mdseries@sf{t}} -\DeclareOptionX{black}{\edef\bfseries@sf{k}} -\DeclareOptionX{extrabold}{\edef\bfseries@sf{eb}} -\DeclareOptionX{semibold}{\edef\bfseries@sf{sb}} -\DeclareOptionX{bold}{\edef\bfseries@sf{b}} -\DeclareOptionX{extralight}{\edef\mdseries@sf{el}} -\DeclareOptionX{light}{\edef\mdseries@sf{l}} -\DeclareOptionX{medium}{\edef\mdseries@sf{mb}} -\DeclareOptionX{regular}{\edef\mdseries@sf{m}} +\DeclareOptionX{p}{\edef\Montserrat@figurealign{}} +%\DeclareOptionX{mainfont}{ +% \renewcommand{\familydefault}{\sfdefault} +%} +\DeclareOptionX{black}{\edef\bfseries@sf{black}} +\DeclareOptionX{extrabold}{\edef\bfseries@sf{extrabold}} +\DeclareOptionX{semibold}{\edef\bfseries@sf{semibold}} +\DeclareOptionX{bold}{\edef\bfseries@sf{bold}} +\DeclareOptionX{medium}{\edef\mdseries@sf{medium}} +\DeclareOptionX{regular}{\edef\mdseries@sf{regular}} +\DeclareOptionX{thin}{\edef\mdseries@sf{thin}} +\DeclareOptionX{extralight}{\edef\mdseries@sf{extralight}} +\DeclareOptionX{light}{\edef\mdseries@sf{light}} +%\DeclareOptionX{thin}{\edef\mdseries@sf{t}} +%\DeclareOptionX{black}{\edef\bfseries@sf{k}} +%\DeclareOptionX{extrabold}{\edef\bfseries@sf{eb}} +%\DeclareOptionX{semibold}{\edef\bfseries@sf{sb}} +%\DeclareOptionX{bold}{\edef\bfseries@sf{b}} +%\DeclareOptionX{extralight}{\edef\mdseries@sf{el}} +%\DeclareOptionX{light}{\edef\mdseries@sf{l}} +%\DeclareOptionX{medium}{\edef\mdseries@sf{mb}} +%\DeclareOptionX{regular}{\edef\mdseries@sf{m}} \DeclareOptionX{alternates}{\edef\Montserrat@alt{Alternates}\Montserrat@alttrue} \DeclareOptionX{defaultfam}{\Montserrat@famdeftrue} \ExecuteOptionsX{lining,proportional,bold,regular} -- cgit v1.2.3