From c34d7811fa0e8cbe77c0625c5720c1821b242d52 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 16 Jun 2014 23:14:13 +0000 Subject: merriweather git-svn-id: svn://tug.org/texlive/trunk@34263 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/merriweather/OT1Merriweather-OsF.fd | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd') diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd index 2342ada7497..31ea2fc671b 100644 --- a/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd +++ b/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/11/10 +%% Generated by autoinst on 2014/01/22 %% \ProvidesFile{OT1Merriweather-OsF.fd} - [2013/11/10 (autoinst) Font definitions for OT1/Merriweather-OsF.] + [2014/01/22 (autoinst) Font definitions for OT1/Merriweather-OsF.] \expandafter\ifx\csname Merriweather@scale\endcsname\relax \let\Merriweather@@scale\@empty @@ -16,25 +16,13 @@ }{} \DeclareFontShape{OT1}{Merriweather-OsF}{l}{it}{ - <-> \Merriweather@@scale Merriweather-LightItalic-osf-ot1 + <-> \Merriweather@@scale Merriweather-LightIt-osf-ot1 }{} \DeclareFontShape{OT1}{Merriweather-OsF}{l}{sl}{ <-> ssub * Merriweather-OsF/l/it }{} -\DeclareFontShape{OT1}{Merriweather-OsF}{h}{n}{ - <-> \Merriweather@@scale Merriweather-Heavy-osf-ot1 -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{h}{it}{ - <-> \Merriweather@@scale Merriweather-HeavyItalic-osf-ot1 -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{h}{sl}{ - <-> ssub * Merriweather-OsF/h/it -}{} - \DeclareFontShape{OT1}{Merriweather-OsF}{b}{n}{ <-> \Merriweather@@scale Merriweather-Bold-osf-ot1 }{} @@ -48,7 +36,7 @@ }{} \DeclareFontShape{OT1}{Merriweather-OsF}{m}{n}{ - <-> \Merriweather@@scale Merriweather-osf-ot1 + <-> \Merriweather@@scale Merriweather-Regular-osf-ot1 }{} \DeclareFontShape{OT1}{Merriweather-OsF}{m}{it}{ @@ -59,6 +47,18 @@ <-> ssub * Merriweather-OsF/m/it }{} +\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{n}{ + <-> \Merriweather@@scale Merriweather-UltraBold-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{it}{ + <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{sl}{ + <-> ssub * Merriweather-OsF/ub/it +}{} + \DeclareFontShape{OT1}{Merriweather-OsF}{bx}{sl}{ <-> ssub * Merriweather-OsF/b/sl }{} -- cgit v1.2.3