From 568fe838cef40f671837d9348dd73c93d9ea962b Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 31 Aug 2020 03:02:58 +0000 Subject: CTAN sync 202008310302 --- fonts/merriweather/latex/T1Merriwthr-OsF.fd | 212 ++++++++++++++++++++-------- 1 file changed, 154 insertions(+), 58 deletions(-) (limited to 'fonts/merriweather/latex/T1Merriwthr-OsF.fd') diff --git a/fonts/merriweather/latex/T1Merriwthr-OsF.fd b/fonts/merriweather/latex/T1Merriwthr-OsF.fd index 14a66d32e1..373f396e34 100644 --- a/fonts/merriweather/latex/T1Merriwthr-OsF.fd +++ b/fonts/merriweather/latex/T1Merriwthr-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/07/30 +%% Generated by autoinst on 2020/08/30 %% \ProvidesFile{T1Merriwthr-OsF.fd} - [2020/07/30 (autoinst) Font definitions for T1/Merriwthr-OsF.] + [2020/08/30 (autoinst) Font definitions for T1/Merriwthr-OsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,132 +20,224 @@ \DeclareFontFamily{T1}{Merriwthr-OsF}{} -% ---- regular ---- +% ---- m = regular ---- -\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{n}{ +\DeclareFontShape{T1}{Merriwthr-OsF}{m}{sc}{ + <-> \Merriwthr@@scale Merriwthr-Regular-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{sc}{ + <-> alias * Merriwthr-OsF/m/sc +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{m}{n}{ <-> \Merriwthr@@scale Merriwthr-Regular-osf-t1 }{} -\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{it}{ +\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{n}{ + <-> alias * Merriwthr-OsF/m/n +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{m}{it}{ <-> \Merriwthr@@scale Merriwthr-Italic-osf-t1 }{} -\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{sl}{ - <-> ssub * Merriwthr-OsF/regular/it +\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{it}{ + <-> alias * Merriwthr-OsF/m/it }{} +\DeclareFontShape{T1}{Merriwthr-OsF}{m}{scit}{ + <-> \Merriwthr@@scale Merriwthr-Italic-osf-sc-t1 +}{} -% ---- bold ---- +\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{scit}{ + <-> alias * Merriwthr-OsF/m/scit +}{} -\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{n}{ - <-> \Merriwthr@@scale Merriwthr-Bold-osf-t1 +\DeclareFontShape{T1}{Merriwthr-OsF}{m}{scsl}{ + <-> ssub * Merriwthr-OsF/m/scit }{} -\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{it}{ - <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-t1 +\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{scsl}{ + <-> ssub * Merriwthr-OsF/regular/scit }{} -\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{sl}{ - <-> ssub * Merriwthr-OsF/bold/it +\DeclareFontShape{T1}{Merriwthr-OsF}{m}{sl}{ + <-> ssub * Merriwthr-OsF/m/it +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{sl}{ + <-> ssub * Merriwthr-OsF/regular/it }{} -% ---- light ---- +% ---- eb = black ---- -\DeclareFontShape{T1}{Merriwthr-OsF}{light}{n}{ - <-> \Merriwthr@@scale Merriwthr-Light-osf-t1 +\DeclareFontShape{T1}{Merriwthr-OsF}{eb}{sc}{ + <-> \Merriwthr@@scale Merriwthr-Black-osf-sc-t1 }{} -\DeclareFontShape{T1}{Merriwthr-OsF}{light}{it}{ - <-> \Merriwthr@@scale Merriwthr-LightIt-osf-t1 +\DeclareFontShape{T1}{Merriwthr-OsF}{black}{sc}{ + <-> alias * Merriwthr-OsF/eb/sc }{} -\DeclareFontShape{T1}{Merriwthr-OsF}{light}{sl}{ - <-> ssub * Merriwthr-OsF/light/it +\DeclareFontShape{T1}{Merriwthr-OsF}{eb}{n}{ + <-> \Merriwthr@@scale Merriwthr-Black-osf-t1 }{} +\DeclareFontShape{T1}{Merriwthr-OsF}{black}{n}{ + <-> alias * Merriwthr-OsF/eb/n +}{} -% ---- ultrabold ---- +\DeclareFontShape{T1}{Merriwthr-OsF}{eb}{it}{ + <-> \Merriwthr@@scale Merriwthr-BlackItalic-osf-t1 +}{} -\DeclareFontShape{T1}{Merriwthr-OsF}{ultrabold}{n}{ - <-> \Merriwthr@@scale Merriwthr-UltraBold-osf-t1 +\DeclareFontShape{T1}{Merriwthr-OsF}{black}{it}{ + <-> alias * Merriwthr-OsF/eb/it }{} -\DeclareFontShape{T1}{Merriwthr-OsF}{ultrabold}{it}{ - <-> \Merriwthr@@scale Merriwthr-UltraBdIt-osf-t1 +\DeclareFontShape{T1}{Merriwthr-OsF}{eb}{scit}{ + <-> \Merriwthr@@scale Merriwthr-BlackItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{Merriwthr-OsF}{ultrabold}{sl}{ - <-> ssub * Merriwthr-OsF/ultrabold/it +\DeclareFontShape{T1}{Merriwthr-OsF}{black}{scit}{ + <-> alias * Merriwthr-OsF/eb/scit }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% +\DeclareFontShape{T1}{Merriwthr-OsF}{eb}{scsl}{ + <-> ssub * Merriwthr-OsF/eb/scit +}{} -% l --> light +\DeclareFontShape{T1}{Merriwthr-OsF}{black}{scsl}{ + <-> ssub * Merriwthr-OsF/black/scit +}{} -\DeclareFontShape{T1}{Merriwthr-OsF}{l}{sl}{ - <-> alias * Merriwthr-OsF/light/sl +\DeclareFontShape{T1}{Merriwthr-OsF}{eb}{sl}{ + <-> ssub * Merriwthr-OsF/eb/it }{} -\DeclareFontShape{T1}{Merriwthr-OsF}{l}{n}{ - <-> alias * Merriwthr-OsF/light/n +\DeclareFontShape{T1}{Merriwthr-OsF}{black}{sl}{ + <-> ssub * Merriwthr-OsF/black/it }{} -\DeclareFontShape{T1}{Merriwthr-OsF}{l}{it}{ - <-> alias * Merriwthr-OsF/light/it + +% ---- b = bold ---- + +\DeclareFontShape{T1}{Merriwthr-OsF}{b}{sc}{ + <-> \Merriwthr@@scale Merriwthr-Bold-osf-sc-t1 }{} +\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{sc}{ + <-> alias * Merriwthr-OsF/b/sc +}{} -% m --> regular +\DeclareFontShape{T1}{Merriwthr-OsF}{b}{n}{ + <-> \Merriwthr@@scale Merriwthr-Bold-osf-t1 +}{} -\DeclareFontShape{T1}{Merriwthr-OsF}{m}{sl}{ - <-> alias * Merriwthr-OsF/regular/sl +\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{n}{ + <-> alias * Merriwthr-OsF/b/n }{} -\DeclareFontShape{T1}{Merriwthr-OsF}{m}{n}{ - <-> alias * Merriwthr-OsF/regular/n +\DeclareFontShape{T1}{Merriwthr-OsF}{b}{it}{ + <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-t1 }{} -\DeclareFontShape{T1}{Merriwthr-OsF}{m}{it}{ - <-> alias * Merriwthr-OsF/regular/it +\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{it}{ + <-> alias * Merriwthr-OsF/b/it }{} +\DeclareFontShape{T1}{Merriwthr-OsF}{b}{scit}{ + <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-sc-t1 +}{} -% b --> bold +\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{scit}{ + <-> alias * Merriwthr-OsF/b/scit +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{b}{scsl}{ + <-> ssub * Merriwthr-OsF/b/scit +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{scsl}{ + <-> ssub * Merriwthr-OsF/bold/scit +}{} \DeclareFontShape{T1}{Merriwthr-OsF}{b}{sl}{ - <-> alias * Merriwthr-OsF/bold/sl + <-> ssub * Merriwthr-OsF/b/it }{} -\DeclareFontShape{T1}{Merriwthr-OsF}{b}{n}{ - <-> alias * Merriwthr-OsF/bold/n +\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{sl}{ + <-> ssub * Merriwthr-OsF/bold/it }{} -\DeclareFontShape{T1}{Merriwthr-OsF}{b}{it}{ - <-> alias * Merriwthr-OsF/bold/it + +% ---- l = light ---- + +\DeclareFontShape{T1}{Merriwthr-OsF}{l}{sc}{ + <-> \Merriwthr@@scale Merriwthr-Light-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{light}{sc}{ + <-> alias * Merriwthr-OsF/l/sc +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{l}{n}{ + <-> \Merriwthr@@scale Merriwthr-Light-osf-t1 +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{light}{n}{ + <-> alias * Merriwthr-OsF/l/n +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{l}{it}{ + <-> \Merriwthr@@scale Merriwthr-LightItalic-osf-t1 }{} +\DeclareFontShape{T1}{Merriwthr-OsF}{light}{it}{ + <-> alias * Merriwthr-OsF/l/it +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{l}{scit}{ + <-> \Merriwthr@@scale Merriwthr-LightItalic-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{light}{scit}{ + <-> alias * Merriwthr-OsF/l/scit +}{} -% ub --> ultrabold +\DeclareFontShape{T1}{Merriwthr-OsF}{l}{scsl}{ + <-> ssub * Merriwthr-OsF/l/scit +}{} -\DeclareFontShape{T1}{Merriwthr-OsF}{ub}{sl}{ - <-> alias * Merriwthr-OsF/ultrabold/sl +\DeclareFontShape{T1}{Merriwthr-OsF}{light}{scsl}{ + <-> ssub * Merriwthr-OsF/light/scit }{} -\DeclareFontShape{T1}{Merriwthr-OsF}{ub}{n}{ - <-> alias * Merriwthr-OsF/ultrabold/n +\DeclareFontShape{T1}{Merriwthr-OsF}{l}{sl}{ + <-> ssub * Merriwthr-OsF/l/it }{} -\DeclareFontShape{T1}{Merriwthr-OsF}{ub}{it}{ - <-> alias * Merriwthr-OsF/ultrabold/it +\DeclareFontShape{T1}{Merriwthr-OsF}{light}{sl}{ + <-> ssub * Merriwthr-OsF/light/it }{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + \DeclareFontShape{T1}{Merriwthr-OsF}{bx}{n}{ <-> ssub * Merriwthr-OsF/b/n }{} +\DeclareFontShape{T1}{Merriwthr-OsF}{bx}{sc}{ + <-> ssub * Merriwthr-OsF/b/sc +}{} + +\DeclareFontShape{T1}{Merriwthr-OsF}{bx}{scsl}{ + <-> ssub * Merriwthr-OsF/b/scsl +}{} + \DeclareFontShape{T1}{Merriwthr-OsF}{bx}{sl}{ <-> ssub * Merriwthr-OsF/b/sl }{} @@ -154,4 +246,8 @@ <-> ssub * Merriwthr-OsF/b/it }{} +\DeclareFontShape{T1}{Merriwthr-OsF}{bx}{scit}{ + <-> ssub * Merriwthr-OsF/b/scit +}{} + \endinput -- cgit v1.2.3