From 2654b31b81dc0bda222b73f705f6504608d073ae Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 31 Aug 2020 21:17:18 +0000 Subject: merriweather (31aug20) git-svn-id: svn://tug.org/texlive/trunk@56220 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/merriweather/T1MerriwthrSans-Sup.fd | 120 ++++++++++----------- 1 file changed, 54 insertions(+), 66 deletions(-) (limited to 'Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-Sup.fd') diff --git a/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-Sup.fd b/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-Sup.fd index 10c24943910..49c729e09b9 100644 --- a/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-Sup.fd +++ b/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/07/30 +%% Generated by autoinst on 2020/08/30 %% \ProvidesFile{T1MerriwthrSans-Sup.fd} - [2020/07/30 (autoinst) Font definitions for T1/MerriwthrSans-Sup.] + [2020/08/30 (autoinst) Font definitions for T1/MerriwthrSans-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,127 +20,115 @@ \DeclareFontFamily{T1}{MerriwthrSans-Sup}{} -% ---- regular ---- +% ---- m = regular ---- -\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{n}{ +\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{n}{ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-sup-t1 }{} -\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{it}{ - <-> \MerriwthrSans@@scale MerriwthrSans-Italic-sup-t1 +\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{n}{ + <-> alias * MerriwthrSans-Sup/m/n }{} -\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{sl}{ - <-> ssub * MerriwthrSans-Sup/regular/it +\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Italic-sup-t1 }{} - -% ---- bold ---- - -\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{n}{ - <-> \MerriwthrSans@@scale MerriwthrSans-Bold-sup-t1 +\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{it}{ + <-> alias * MerriwthrSans-Sup/m/it }{} -\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{it}{ - <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-sup-t1 +\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{sl}{ + <-> ssub * MerriwthrSans-Sup/m/it }{} -\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{sl}{ - <-> ssub * MerriwthrSans-Sup/bold/it +\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{sl}{ + <-> ssub * MerriwthrSans-Sup/regular/it }{} -% ---- light ---- +% ---- b = bold ---- -\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{n}{ - <-> \MerriwthrSans@@scale MerriwthrSans-Light-sup-t1 +\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Bold-sup-t1 }{} -\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{it}{ - <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-sup-t1 +\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{n}{ + <-> alias * MerriwthrSans-Sup/b/n }{} -\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{sl}{ - <-> ssub * MerriwthrSans-Sup/light/it +\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-sup-t1 }{} - -% ---- extrabold ---- - -\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{n}{ - <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-sup-t1 +\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{it}{ + <-> alias * MerriwthrSans-Sup/b/it }{} -\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{it}{ - <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-sup-t1 +\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{sl}{ + <-> ssub * MerriwthrSans-Sup/b/it }{} -\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{sl}{ - <-> ssub * MerriwthrSans-Sup/extrabold/it +\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{sl}{ + <-> ssub * MerriwthrSans-Sup/bold/it }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% l --> light +% ---- l = light ---- -\DeclareFontShape{T1}{MerriwthrSans-Sup}{l}{sl}{ - <-> alias * MerriwthrSans-Sup/light/sl +\DeclareFontShape{T1}{MerriwthrSans-Sup}{l}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-Light-sup-t1 }{} -\DeclareFontShape{T1}{MerriwthrSans-Sup}{l}{n}{ - <-> alias * MerriwthrSans-Sup/light/n +\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{n}{ + <-> alias * MerriwthrSans-Sup/l/n }{} \DeclareFontShape{T1}{MerriwthrSans-Sup}{l}{it}{ - <-> alias * MerriwthrSans-Sup/light/it + <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-sup-t1 }{} - -% m --> regular - -\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{sl}{ - <-> alias * MerriwthrSans-Sup/regular/sl +\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{it}{ + <-> alias * MerriwthrSans-Sup/l/it }{} -\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{n}{ - <-> alias * MerriwthrSans-Sup/regular/n +\DeclareFontShape{T1}{MerriwthrSans-Sup}{l}{sl}{ + <-> ssub * MerriwthrSans-Sup/l/it }{} -\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{it}{ - <-> alias * MerriwthrSans-Sup/regular/it +\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{sl}{ + <-> ssub * MerriwthrSans-Sup/light/it }{} -% b --> bold +% ---- eb = extrabold ---- -\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{sl}{ - <-> alias * MerriwthrSans-Sup/bold/sl +\DeclareFontShape{T1}{MerriwthrSans-Sup}{eb}{n}{ + <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-sup-t1 }{} -\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{n}{ - <-> alias * MerriwthrSans-Sup/bold/n +\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{n}{ + <-> alias * MerriwthrSans-Sup/eb/n }{} -\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{it}{ - <-> alias * MerriwthrSans-Sup/bold/it +\DeclareFontShape{T1}{MerriwthrSans-Sup}{eb}{it}{ + <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-sup-t1 }{} - -% eb --> extrabold +\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{it}{ + <-> alias * MerriwthrSans-Sup/eb/it +}{} \DeclareFontShape{T1}{MerriwthrSans-Sup}{eb}{sl}{ - <-> alias * MerriwthrSans-Sup/extrabold/sl + <-> ssub * MerriwthrSans-Sup/eb/it }{} -\DeclareFontShape{T1}{MerriwthrSans-Sup}{eb}{n}{ - <-> alias * MerriwthrSans-Sup/extrabold/n +\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{sl}{ + <-> ssub * MerriwthrSans-Sup/extrabold/it }{} -\DeclareFontShape{T1}{MerriwthrSans-Sup}{eb}{it}{ - <-> alias * MerriwthrSans-Sup/extrabold/it -}{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- \DeclareFontShape{T1}{MerriwthrSans-Sup}{bx}{n}{ <-> ssub * MerriwthrSans-Sup/b/n -- cgit v1.2.3