texlive[55942] Master/texmf-dist: merriweather (25jul20)
commits+karl at tug.org
commits+karl at tug.org
Sat Jul 25 23:46:36 CEST 2020
Revision: 55942
http://tug.org/svn/texlive?view=revision&revision=55942
Author: karl
Date: 2020-07-25 23:46:36 +0200 (Sat, 25 Jul 2020)
Log Message:
-----------
merriweather (25jul20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/fonts/merriweather/README
trunk/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf
trunk/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex
trunk/Master/texmf-dist/tex/latex/merriweather/merriweather.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/fonts/enc/dvips/merriweather/
trunk/Master/texmf-dist/fonts/map/dvips/merriweather/
trunk/Master/texmf-dist/fonts/tfm/sorkin/merriweather/
trunk/Master/texmf-dist/fonts/type1/sorkin/merriweather/
trunk/Master/texmf-dist/fonts/vf/sorkin/merriweather/
trunk/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd
trunk/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd
trunk/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-Sup.fd
trunk/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd
trunk/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd
trunk/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-Sup.fd
trunk/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd
trunk/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd
trunk/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-Sup.fd
trunk/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd
trunk/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd
Modified: trunk/Master/texmf-dist/doc/fonts/merriweather/README
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/merriweather/README 2020-07-25 21:46:13 UTC (rev 55941)
+++ trunk/Master/texmf-dist/doc/fonts/merriweather/README 2020-07-25 21:46:36 UTC (rev 55942)
@@ -1,8 +1,8 @@
-This is the README for the merriweather package, version 2019-10-13.
+This is the README for the merriweather package, version 2020-07-24.
-This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
-the Merriweather and MerriweatherSans families of fonts, designed by
-Eben Sorkin.
+This package provides the Merriweather and MerriweatherSans
+families of fonts, designed by Eben Sorkin, for use with
+luaLaTeX and xeLaTeX.
Merriweather features a very large x height, slightly condensed
letterforms, a mild diagonal stress, sturdy serifs and open forms.
@@ -14,8 +14,7 @@
preferred URL for "tex-archive" is http://mirror.ctan.org. Unzip
the archive at the root of an appropriate texmf tree, likely a
personal or local tree. If necessary, update the file-name database
-(e.g., texhash). Update the font-map files by enabling the Map file
-merriweather.map.
+(e.g., texhash).
To use, add
@@ -42,9 +41,6 @@
the light or heavy weights instead of the regular and bold weights,
respectively, for both or single families.
-LuaLaTeX and xeLaTeX users who might prefer type1 fonts or who wish
-to avoid fontspec may use the type1 option.
-
Options scaled=<number> or scale=<number> may be used to scale the
MerriweatherSans fonts; the serifed variants are not affected.
@@ -53,13 +49,11 @@
\merriweatherblack, \merriweathersanslight, and \merriweathersansblack
allow for localized use of light or black variants.
-The only figure style supported is proportional semi-oldstyle. Font
-encodings supported are OT1, T1, LY1 and TS1.
+The only figure style supported is proportional semi-oldstyle.
-The original fonts are available at http://www.google.com/webfonts
-and are licensed under the SIL Open Font License, (version 1.1);
-the text may be found in the doc directory. The type1 versions
-were created using fontforge. The support files were created using
-autoinst and are licensed under the terms of the LaTeX Project
-Public License. The maintainer of this package is Bob Tennent (rdt
-at cs.queensu.ca)
+The fonts are available at http://www.google.com/webfonts
+and are licensed under the SIL Open Font License, (version
+1.1); the text may be found in the doc directory. The rest
+of the package is licensed under the terms of the LaTeX
+Project Public License. The maintainer of this package is
+Bob Tennent (rdt at cs.queensu.ca)
Modified: trunk/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex 2020-07-25 21:46:13 UTC (rev 55941)
+++ trunk/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex 2020-07-25 21:46:36 UTC (rev 55942)
@@ -1,5 +1,4 @@
\documentclass{article}
-\usepackage[T1]{fontenc}
\usepackage{merriweather}
\usepackage{lipsum}
\begin{document}
Deleted: trunk/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd 2020-07-25 21:46:13 UTC (rev 55941)
+++ trunk/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd 2020-07-25 21:46:36 UTC (rev 55942)
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{LY1Merriweather-OsF.fd}
- [2019/06/02 (autoinst) Font definitions for LY1/Merriweather-OsF.]
-
-\expandafter\ifx\csname Merriweather at scale\endcsname\relax
- \let\Merriweather@@scale\@empty
-\else
- \edef\Merriweather@@scale{s*[\csname Merriweather at scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{Merriweather-OsF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{regular}{n}{
- <-> \Merriweather@@scale Merriweather-Regular-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{regular}{it}{
- <-> \Merriweather@@scale Merriweather-Italic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{regular}{sl}{
- <-> ssub * Merriweather-OsF/regular/it
-}{}
-
-
-% ---- bold ----
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{bold}{n}{
- <-> \Merriweather@@scale Merriweather-Bold-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{bold}{it}{
- <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{bold}{sl}{
- <-> ssub * Merriweather-OsF/bold/it
-}{}
-
-
-% ---- light ----
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{light}{n}{
- <-> \Merriweather@@scale Merriweather-Light-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{light}{it}{
- <-> \Merriweather@@scale Merriweather-LightIt-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{light}{sl}{
- <-> ssub * Merriweather-OsF/light/it
-}{}
-
-
-% ---- ultrabold ----
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{ultrabold}{n}{
- <-> \Merriweather@@scale Merriweather-UltraBold-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{ultrabold}{it}{
- <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{ultrabold}{sl}{
- <-> ssub * Merriweather-OsF/ultrabold/it
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% l --> light
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{l}{sl}{
- <-> ssub * Merriweather-OsF/light/sl
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{l}{n}{
- <-> ssub * Merriweather-OsF/light/n
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{l}{it}{
- <-> ssub * Merriweather-OsF/light/it
-}{}
-
-
-% m --> regular
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{m}{sl}{
- <-> ssub * Merriweather-OsF/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{m}{n}{
- <-> ssub * Merriweather-OsF/regular/n
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{m}{it}{
- <-> ssub * Merriweather-OsF/regular/it
-}{}
-
-
-% b --> bold
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{b}{sl}{
- <-> ssub * Merriweather-OsF/bold/sl
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{b}{n}{
- <-> ssub * Merriweather-OsF/bold/n
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{b}{it}{
- <-> ssub * Merriweather-OsF/bold/it
-}{}
-
-
-% ub --> ultrabold
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{sl}{
- <-> ssub * Merriweather-OsF/ultrabold/sl
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{n}{
- <-> ssub * Merriweather-OsF/ultrabold/n
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{it}{
- <-> ssub * Merriweather-OsF/ultrabold/it
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{bx}{n}{
- <-> ssub * Merriweather-OsF/b/n
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{bx}{sl}{
- <-> ssub * Merriweather-OsF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{bx}{it}{
- <-> ssub * Merriweather-OsF/b/it
-}{}
-
-\endinput
Deleted: trunk/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd 2020-07-25 21:46:13 UTC (rev 55941)
+++ trunk/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd 2020-07-25 21:46:36 UTC (rev 55942)
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{LY1MerriweatherSans-OsF.fd}
- [2019/06/02 (autoinst) Font definitions for LY1/MerriweatherSans-OsF.]
-
-\expandafter\ifx\csname MerriweatherSans at scale\endcsname\relax
- \let\MerriweatherSans@@scale\@empty
-\else
- \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans at scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{MerriweatherSans-OsF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{regular}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{regular}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{regular}{sl}{
- <-> ssub * MerriweatherSans-OsF/regular/it
-}{}
-
-
-% ---- bold ----
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bold}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bold}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bold}{sl}{
- <-> ssub * MerriweatherSans-OsF/bold/it
-}{}
-
-
-% ---- light ----
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{light}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{light}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{light}{sl}{
- <-> ssub * MerriweatherSans-OsF/light/it
-}{}
-
-
-% ---- extrabold ----
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{extrabold}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{extrabold}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{extrabold}{sl}{
- <-> ssub * MerriweatherSans-OsF/extrabold/it
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% l --> light
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{l}{sl}{
- <-> ssub * MerriweatherSans-OsF/light/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{l}{n}{
- <-> ssub * MerriweatherSans-OsF/light/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{l}{it}{
- <-> ssub * MerriweatherSans-OsF/light/it
-}{}
-
-
-% m --> regular
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{m}{sl}{
- <-> ssub * MerriweatherSans-OsF/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{m}{n}{
- <-> ssub * MerriweatherSans-OsF/regular/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{m}{it}{
- <-> ssub * MerriweatherSans-OsF/regular/it
-}{}
-
-
-% b --> bold
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{b}{sl}{
- <-> ssub * MerriweatherSans-OsF/bold/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{b}{n}{
- <-> ssub * MerriweatherSans-OsF/bold/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{b}{it}{
- <-> ssub * MerriweatherSans-OsF/bold/it
-}{}
-
-
-% eb --> extrabold
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{eb}{sl}{
- <-> ssub * MerriweatherSans-OsF/extrabold/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{eb}{n}{
- <-> ssub * MerriweatherSans-OsF/extrabold/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{eb}{it}{
- <-> ssub * MerriweatherSans-OsF/extrabold/it
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bx}{n}{
- <-> ssub * MerriweatherSans-OsF/b/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bx}{sl}{
- <-> ssub * MerriweatherSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bx}{it}{
- <-> ssub * MerriweatherSans-OsF/b/it
-}{}
-
-\endinput
Deleted: trunk/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-Sup.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-Sup.fd 2020-07-25 21:46:13 UTC (rev 55941)
+++ trunk/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-Sup.fd 2020-07-25 21:46:36 UTC (rev 55942)
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{LY1MerriweatherSans-Sup.fd}
- [2019/06/02 (autoinst) Font definitions for LY1/MerriweatherSans-Sup.]
-
-\expandafter\ifx\csname MerriweatherSans at scale\endcsname\relax
- \let\MerriweatherSans@@scale\@empty
-\else
- \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans at scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{MerriweatherSans-Sup}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{regular}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Regular-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{regular}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Italic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{regular}{sl}{
- <-> ssub * MerriweatherSans-Sup/regular/it
-}{}
-
-
-% ---- bold ----
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bold}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Bold-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bold}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bold}{sl}{
- <-> ssub * MerriweatherSans-Sup/bold/it
-}{}
-
-
-% ---- light ----
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{light}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Light-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{light}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{light}{sl}{
- <-> ssub * MerriweatherSans-Sup/light/it
-}{}
-
-
-% ---- extrabold ----
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{extrabold}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{extrabold}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{extrabold}{sl}{
- <-> ssub * MerriweatherSans-Sup/extrabold/it
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% l --> light
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{l}{sl}{
- <-> ssub * MerriweatherSans-Sup/light/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{l}{n}{
- <-> ssub * MerriweatherSans-Sup/light/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{l}{it}{
- <-> ssub * MerriweatherSans-Sup/light/it
-}{}
-
-
-% m --> regular
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{m}{sl}{
- <-> ssub * MerriweatherSans-Sup/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{m}{n}{
- <-> ssub * MerriweatherSans-Sup/regular/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{m}{it}{
- <-> ssub * MerriweatherSans-Sup/regular/it
-}{}
-
-
-% b --> bold
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{b}{sl}{
- <-> ssub * MerriweatherSans-Sup/bold/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{b}{n}{
- <-> ssub * MerriweatherSans-Sup/bold/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{b}{it}{
- <-> ssub * MerriweatherSans-Sup/bold/it
-}{}
-
-
-% eb --> extrabold
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{eb}{sl}{
- <-> ssub * MerriweatherSans-Sup/extrabold/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{eb}{n}{
- <-> ssub * MerriweatherSans-Sup/extrabold/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{eb}{it}{
- <-> ssub * MerriweatherSans-Sup/extrabold/it
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bx}{n}{
- <-> ssub * MerriweatherSans-Sup/b/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bx}{sl}{
- <-> ssub * MerriweatherSans-Sup/b/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bx}{it}{
- <-> ssub * MerriweatherSans-Sup/b/it
-}{}
-
-\endinput
Deleted: trunk/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd 2020-07-25 21:46:13 UTC (rev 55941)
+++ trunk/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd 2020-07-25 21:46:36 UTC (rev 55942)
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{OT1Merriweather-OsF.fd}
- [2019/06/02 (autoinst) Font definitions for OT1/Merriweather-OsF.]
-
-\expandafter\ifx\csname Merriweather at scale\endcsname\relax
- \let\Merriweather@@scale\@empty
-\else
- \edef\Merriweather@@scale{s*[\csname Merriweather at scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{Merriweather-OsF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{regular}{n}{
- <-> \Merriweather@@scale Merriweather-Regular-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{regular}{it}{
- <-> \Merriweather@@scale Merriweather-Italic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{regular}{sl}{
- <-> ssub * Merriweather-OsF/regular/it
-}{}
-
-
-% ---- bold ----
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{bold}{n}{
- <-> \Merriweather@@scale Merriweather-Bold-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{bold}{it}{
- <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{bold}{sl}{
- <-> ssub * Merriweather-OsF/bold/it
-}{}
-
-
-% ---- light ----
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{light}{n}{
- <-> \Merriweather@@scale Merriweather-Light-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{light}{it}{
- <-> \Merriweather@@scale Merriweather-LightIt-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{light}{sl}{
- <-> ssub * Merriweather-OsF/light/it
-}{}
-
-
-% ---- ultrabold ----
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{ultrabold}{n}{
- <-> \Merriweather@@scale Merriweather-UltraBold-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{ultrabold}{it}{
- <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{ultrabold}{sl}{
- <-> ssub * Merriweather-OsF/ultrabold/it
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% l --> light
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{l}{sl}{
- <-> ssub * Merriweather-OsF/light/sl
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{l}{n}{
- <-> ssub * Merriweather-OsF/light/n
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{l}{it}{
- <-> ssub * Merriweather-OsF/light/it
-}{}
-
-
-% m --> regular
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{m}{sl}{
- <-> ssub * Merriweather-OsF/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{m}{n}{
- <-> ssub * Merriweather-OsF/regular/n
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{m}{it}{
- <-> ssub * Merriweather-OsF/regular/it
-}{}
-
-
-% b --> bold
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{b}{sl}{
- <-> ssub * Merriweather-OsF/bold/sl
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{b}{n}{
- <-> ssub * Merriweather-OsF/bold/n
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{b}{it}{
- <-> ssub * Merriweather-OsF/bold/it
-}{}
-
-
-% ub --> ultrabold
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{sl}{
- <-> ssub * Merriweather-OsF/ultrabold/sl
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{n}{
- <-> ssub * Merriweather-OsF/ultrabold/n
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{it}{
- <-> ssub * Merriweather-OsF/ultrabold/it
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{bx}{n}{
- <-> ssub * Merriweather-OsF/b/n
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{bx}{sl}{
- <-> ssub * Merriweather-OsF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{bx}{it}{
- <-> ssub * Merriweather-OsF/b/it
-}{}
-
-\endinput
Deleted: trunk/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd 2020-07-25 21:46:13 UTC (rev 55941)
+++ trunk/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd 2020-07-25 21:46:36 UTC (rev 55942)
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{OT1MerriweatherSans-OsF.fd}
- [2019/06/02 (autoinst) Font definitions for OT1/MerriweatherSans-OsF.]
-
-\expandafter\ifx\csname MerriweatherSans at scale\endcsname\relax
- \let\MerriweatherSans@@scale\@empty
-\else
- \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans at scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{MerriweatherSans-OsF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{regular}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{regular}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{regular}{sl}{
- <-> ssub * MerriweatherSans-OsF/regular/it
-}{}
-
-
-% ---- bold ----
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bold}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bold}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bold}{sl}{
- <-> ssub * MerriweatherSans-OsF/bold/it
-}{}
-
-
-% ---- light ----
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{light}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{light}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{light}{sl}{
- <-> ssub * MerriweatherSans-OsF/light/it
-}{}
-
-
-% ---- extrabold ----
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{extrabold}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{extrabold}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{extrabold}{sl}{
- <-> ssub * MerriweatherSans-OsF/extrabold/it
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% l --> light
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{l}{sl}{
- <-> ssub * MerriweatherSans-OsF/light/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{l}{n}{
- <-> ssub * MerriweatherSans-OsF/light/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{l}{it}{
- <-> ssub * MerriweatherSans-OsF/light/it
-}{}
-
-
-% m --> regular
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{m}{sl}{
- <-> ssub * MerriweatherSans-OsF/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{m}{n}{
- <-> ssub * MerriweatherSans-OsF/regular/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{m}{it}{
- <-> ssub * MerriweatherSans-OsF/regular/it
-}{}
-
-
-% b --> bold
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{b}{sl}{
- <-> ssub * MerriweatherSans-OsF/bold/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{b}{n}{
- <-> ssub * MerriweatherSans-OsF/bold/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{b}{it}{
- <-> ssub * MerriweatherSans-OsF/bold/it
-}{}
-
-
-% eb --> extrabold
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{eb}{sl}{
- <-> ssub * MerriweatherSans-OsF/extrabold/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{eb}{n}{
- <-> ssub * MerriweatherSans-OsF/extrabold/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{eb}{it}{
- <-> ssub * MerriweatherSans-OsF/extrabold/it
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bx}{n}{
- <-> ssub * MerriweatherSans-OsF/b/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bx}{sl}{
- <-> ssub * MerriweatherSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bx}{it}{
- <-> ssub * MerriweatherSans-OsF/b/it
-}{}
-
-\endinput
Deleted: trunk/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-Sup.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-Sup.fd 2020-07-25 21:46:13 UTC (rev 55941)
+++ trunk/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-Sup.fd 2020-07-25 21:46:36 UTC (rev 55942)
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{OT1MerriweatherSans-Sup.fd}
- [2019/06/02 (autoinst) Font definitions for OT1/MerriweatherSans-Sup.]
-
-\expandafter\ifx\csname MerriweatherSans at scale\endcsname\relax
- \let\MerriweatherSans@@scale\@empty
-\else
- \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans at scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{MerriweatherSans-Sup}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{regular}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Regular-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{regular}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Italic-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{regular}{sl}{
- <-> ssub * MerriweatherSans-Sup/regular/it
-}{}
-
-
-% ---- bold ----
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bold}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Bold-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bold}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bold}{sl}{
- <-> ssub * MerriweatherSans-Sup/bold/it
-}{}
-
-
-% ---- light ----
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{light}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Light-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{light}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{light}{sl}{
- <-> ssub * MerriweatherSans-Sup/light/it
-}{}
-
-
-% ---- extrabold ----
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{extrabold}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{extrabold}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{extrabold}{sl}{
- <-> ssub * MerriweatherSans-Sup/extrabold/it
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% l --> light
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{l}{sl}{
- <-> ssub * MerriweatherSans-Sup/light/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{l}{n}{
- <-> ssub * MerriweatherSans-Sup/light/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{l}{it}{
- <-> ssub * MerriweatherSans-Sup/light/it
-}{}
-
-
-% m --> regular
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{m}{sl}{
- <-> ssub * MerriweatherSans-Sup/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{m}{n}{
- <-> ssub * MerriweatherSans-Sup/regular/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{m}{it}{
- <-> ssub * MerriweatherSans-Sup/regular/it
-}{}
-
-
-% b --> bold
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{b}{sl}{
- <-> ssub * MerriweatherSans-Sup/bold/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{b}{n}{
- <-> ssub * MerriweatherSans-Sup/bold/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{b}{it}{
- <-> ssub * MerriweatherSans-Sup/bold/it
-}{}
-
-
-% eb --> extrabold
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{eb}{sl}{
- <-> ssub * MerriweatherSans-Sup/extrabold/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{eb}{n}{
- <-> ssub * MerriweatherSans-Sup/extrabold/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{eb}{it}{
- <-> ssub * MerriweatherSans-Sup/extrabold/it
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bx}{n}{
- <-> ssub * MerriweatherSans-Sup/b/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bx}{sl}{
- <-> ssub * MerriweatherSans-Sup/b/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bx}{it}{
- <-> ssub * MerriweatherSans-Sup/b/it
-}{}
-
-\endinput
Deleted: trunk/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd 2020-07-25 21:46:13 UTC (rev 55941)
+++ trunk/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd 2020-07-25 21:46:36 UTC (rev 55942)
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{T1Merriweather-OsF.fd}
- [2019/06/02 (autoinst) Font definitions for T1/Merriweather-OsF.]
-
-\expandafter\ifx\csname Merriweather at scale\endcsname\relax
- \let\Merriweather@@scale\@empty
-\else
- \edef\Merriweather@@scale{s*[\csname Merriweather at scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{Merriweather-OsF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{T1}{Merriweather-OsF}{regular}{n}{
- <-> \Merriweather@@scale Merriweather-Regular-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{regular}{it}{
- <-> \Merriweather@@scale Merriweather-Italic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{regular}{sl}{
- <-> ssub * Merriweather-OsF/regular/it
-}{}
-
-
-% ---- bold ----
-
-\DeclareFontShape{T1}{Merriweather-OsF}{bold}{n}{
- <-> \Merriweather@@scale Merriweather-Bold-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{bold}{it}{
- <-> \Merriweather@@scale Merriweather-BoldItalic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{bold}{sl}{
- <-> ssub * Merriweather-OsF/bold/it
-}{}
-
-
-% ---- light ----
-
-\DeclareFontShape{T1}{Merriweather-OsF}{light}{n}{
- <-> \Merriweather@@scale Merriweather-Light-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{light}{it}{
- <-> \Merriweather@@scale Merriweather-LightIt-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{light}{sl}{
- <-> ssub * Merriweather-OsF/light/it
-}{}
-
-
-% ---- ultrabold ----
-
-\DeclareFontShape{T1}{Merriweather-OsF}{ultrabold}{n}{
- <-> \Merriweather@@scale Merriweather-UltraBold-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{ultrabold}{it}{
- <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{ultrabold}{sl}{
- <-> ssub * Merriweather-OsF/ultrabold/it
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% l --> light
-
-\DeclareFontShape{T1}{Merriweather-OsF}{l}{sl}{
- <-> ssub * Merriweather-OsF/light/sl
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{l}{n}{
- <-> ssub * Merriweather-OsF/light/n
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{l}{it}{
- <-> ssub * Merriweather-OsF/light/it
-}{}
-
-
-% m --> regular
-
-\DeclareFontShape{T1}{Merriweather-OsF}{m}{sl}{
- <-> ssub * Merriweather-OsF/regular/sl
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{m}{n}{
- <-> ssub * Merriweather-OsF/regular/n
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{m}{it}{
- <-> ssub * Merriweather-OsF/regular/it
-}{}
-
-
-% b --> bold
-
-\DeclareFontShape{T1}{Merriweather-OsF}{b}{sl}{
- <-> ssub * Merriweather-OsF/bold/sl
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{b}{n}{
- <-> ssub * Merriweather-OsF/bold/n
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{b}{it}{
- <-> ssub * Merriweather-OsF/bold/it
-}{}
-
-
-% ub --> ultrabold
-
-\DeclareFontShape{T1}{Merriweather-OsF}{ub}{sl}{
- <-> ssub * Merriweather-OsF/ultrabold/sl
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{ub}{n}{
- <-> ssub * Merriweather-OsF/ultrabold/n
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{ub}{it}{
- <-> ssub * Merriweather-OsF/ultrabold/it
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{bx}{n}{
- <-> ssub * Merriweather-OsF/b/n
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{bx}{sl}{
- <-> ssub * Merriweather-OsF/b/sl
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{bx}{it}{
- <-> ssub * Merriweather-OsF/b/it
-}{}
-
-\endinput
Deleted: trunk/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd 2020-07-25 21:46:13 UTC (rev 55941)
+++ trunk/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd 2020-07-25 21:46:36 UTC (rev 55942)
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{T1MerriweatherSans-OsF.fd}
- [2019/06/02 (autoinst) Font definitions for T1/MerriweatherSans-OsF.]
-
-\expandafter\ifx\csname MerriweatherSans at scale\endcsname\relax
- \let\MerriweatherSans@@scale\@empty
-\else
- \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans at scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{MerriweatherSans-OsF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{regular}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{regular}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{regular}{sl}{
- <-> ssub * MerriweatherSans-OsF/regular/it
-}{}
-
-
-% ---- bold ----
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{bold}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{bold}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{bold}{sl}{
- <-> ssub * MerriweatherSans-OsF/bold/it
-}{}
-
-
-% ---- light ----
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{light}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{light}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{light}{sl}{
- <-> ssub * MerriweatherSans-OsF/light/it
-}{}
-
-
-% ---- extrabold ----
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{extrabold}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{extrabold}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{extrabold}{sl}{
- <-> ssub * MerriweatherSans-OsF/extrabold/it
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% l --> light
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{l}{sl}{
- <-> ssub * MerriweatherSans-OsF/light/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{l}{n}{
- <-> ssub * MerriweatherSans-OsF/light/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{l}{it}{
- <-> ssub * MerriweatherSans-OsF/light/it
-}{}
-
-
-% m --> regular
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{m}{sl}{
- <-> ssub * MerriweatherSans-OsF/regular/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{m}{n}{
- <-> ssub * MerriweatherSans-OsF/regular/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{m}{it}{
- <-> ssub * MerriweatherSans-OsF/regular/it
-}{}
-
-
-% b --> bold
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{b}{sl}{
- <-> ssub * MerriweatherSans-OsF/bold/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{b}{n}{
- <-> ssub * MerriweatherSans-OsF/bold/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{b}{it}{
- <-> ssub * MerriweatherSans-OsF/bold/it
-}{}
-
-
-% eb --> extrabold
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{eb}{sl}{
- <-> ssub * MerriweatherSans-OsF/extrabold/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{eb}{n}{
- <-> ssub * MerriweatherSans-OsF/extrabold/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{eb}{it}{
- <-> ssub * MerriweatherSans-OsF/extrabold/it
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{bx}{n}{
- <-> ssub * MerriweatherSans-OsF/b/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{bx}{sl}{
- <-> ssub * MerriweatherSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{bx}{it}{
- <-> ssub * MerriweatherSans-OsF/b/it
-}{}
-
-\endinput
Deleted: trunk/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-Sup.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-Sup.fd 2020-07-25 21:46:13 UTC (rev 55941)
+++ trunk/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-Sup.fd 2020-07-25 21:46:36 UTC (rev 55942)
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{T1MerriweatherSans-Sup.fd}
- [2019/06/02 (autoinst) Font definitions for T1/MerriweatherSans-Sup.]
-
-\expandafter\ifx\csname MerriweatherSans at scale\endcsname\relax
- \let\MerriweatherSans@@scale\@empty
-\else
- \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans at scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{MerriweatherSans-Sup}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{regular}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Regular-sup-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{regular}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Italic-sup-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{regular}{sl}{
- <-> ssub * MerriweatherSans-Sup/regular/it
-}{}
-
-
-% ---- bold ----
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{bold}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Bold-sup-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{bold}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-sup-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{bold}{sl}{
- <-> ssub * MerriweatherSans-Sup/bold/it
-}{}
-
-
-% ---- light ----
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{light}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Light-sup-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{light}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-sup-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{light}{sl}{
- <-> ssub * MerriweatherSans-Sup/light/it
-}{}
-
-
-% ---- extrabold ----
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{extrabold}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-sup-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{extrabold}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-sup-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{extrabold}{sl}{
- <-> ssub * MerriweatherSans-Sup/extrabold/it
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% l --> light
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{l}{sl}{
- <-> ssub * MerriweatherSans-Sup/light/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{l}{n}{
- <-> ssub * MerriweatherSans-Sup/light/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{l}{it}{
- <-> ssub * MerriweatherSans-Sup/light/it
-}{}
-
-
-% m --> regular
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{m}{sl}{
- <-> ssub * MerriweatherSans-Sup/regular/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{m}{n}{
- <-> ssub * MerriweatherSans-Sup/regular/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{m}{it}{
- <-> ssub * MerriweatherSans-Sup/regular/it
-}{}
-
-
-% b --> bold
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{b}{sl}{
- <-> ssub * MerriweatherSans-Sup/bold/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{b}{n}{
- <-> ssub * MerriweatherSans-Sup/bold/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{b}{it}{
- <-> ssub * MerriweatherSans-Sup/bold/it
-}{}
-
-
-% eb --> extrabold
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{eb}{sl}{
- <-> ssub * MerriweatherSans-Sup/extrabold/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{eb}{n}{
- <-> ssub * MerriweatherSans-Sup/extrabold/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{eb}{it}{
- <-> ssub * MerriweatherSans-Sup/extrabold/it
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{bx}{n}{
- <-> ssub * MerriweatherSans-Sup/b/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{bx}{sl}{
- <-> ssub * MerriweatherSans-Sup/b/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{bx}{it}{
- <-> ssub * MerriweatherSans-Sup/b/it
-}{}
-
-\endinput
Deleted: trunk/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd 2020-07-25 21:46:13 UTC (rev 55941)
+++ trunk/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd 2020-07-25 21:46:36 UTC (rev 55942)
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{TS1Merriweather-OsF.fd}
- [2019/06/02 (autoinst) Font definitions for TS1/Merriweather-OsF.]
-
-\expandafter\ifx\csname Merriweather at scale\endcsname\relax
- \let\Merriweather@@scale\@empty
-\else
- \edef\Merriweather@@scale{s*[\csname Merriweather at scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{Merriweather-OsF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{regular}{n}{
- <-> \Merriweather@@scale Merriweather-Regular-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{regular}{it}{
- <-> \Merriweather@@scale Merriweather-Italic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{regular}{sl}{
- <-> ssub * Merriweather-OsF/regular/it
-}{}
-
-
-% ---- bold ----
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{bold}{n}{
- <-> \Merriweather@@scale Merriweather-Bold-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{bold}{it}{
- <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{bold}{sl}{
- <-> ssub * Merriweather-OsF/bold/it
-}{}
-
-
-% ---- light ----
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{light}{n}{
- <-> \Merriweather@@scale Merriweather-Light-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{light}{it}{
- <-> \Merriweather@@scale Merriweather-LightIt-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{light}{sl}{
- <-> ssub * Merriweather-OsF/light/it
-}{}
-
-
-% ---- ultrabold ----
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{ultrabold}{n}{
- <-> \Merriweather@@scale Merriweather-UltraBold-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{ultrabold}{it}{
- <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{ultrabold}{sl}{
- <-> ssub * Merriweather-OsF/ultrabold/it
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% l --> light
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{l}{sl}{
- <-> ssub * Merriweather-OsF/light/sl
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{l}{n}{
- <-> ssub * Merriweather-OsF/light/n
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{l}{it}{
- <-> ssub * Merriweather-OsF/light/it
-}{}
-
-
-% m --> regular
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{m}{sl}{
- <-> ssub * Merriweather-OsF/regular/sl
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{m}{n}{
- <-> ssub * Merriweather-OsF/regular/n
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{m}{it}{
- <-> ssub * Merriweather-OsF/regular/it
-}{}
-
-
-% b --> bold
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{b}{sl}{
- <-> ssub * Merriweather-OsF/bold/sl
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{b}{n}{
- <-> ssub * Merriweather-OsF/bold/n
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{b}{it}{
- <-> ssub * Merriweather-OsF/bold/it
-}{}
-
-
-% ub --> ultrabold
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{sl}{
- <-> ssub * Merriweather-OsF/ultrabold/sl
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{n}{
- <-> ssub * Merriweather-OsF/ultrabold/n
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{it}{
- <-> ssub * Merriweather-OsF/ultrabold/it
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{n}{
- <-> ssub * Merriweather-OsF/b/n
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{sl}{
- <-> ssub * Merriweather-OsF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{it}{
- <-> ssub * Merriweather-OsF/b/it
-}{}
-
-\endinput
Deleted: trunk/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd 2020-07-25 21:46:13 UTC (rev 55941)
+++ trunk/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd 2020-07-25 21:46:36 UTC (rev 55942)
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{TS1MerriweatherSans-OsF.fd}
- [2019/06/02 (autoinst) Font definitions for TS1/MerriweatherSans-OsF.]
-
-\expandafter\ifx\csname MerriweatherSans at scale\endcsname\relax
- \let\MerriweatherSans@@scale\@empty
-\else
- \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans at scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{MerriweatherSans-OsF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{regular}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{regular}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{regular}{sl}{
- <-> ssub * MerriweatherSans-OsF/regular/it
-}{}
-
-
-% ---- bold ----
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bold}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bold}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bold}{sl}{
- <-> ssub * MerriweatherSans-OsF/bold/it
-}{}
-
-
-% ---- light ----
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{light}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{light}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{light}{sl}{
- <-> ssub * MerriweatherSans-OsF/light/it
-}{}
-
-
-% ---- extrabold ----
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{extrabold}{n}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{extrabold}{it}{
- <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{extrabold}{sl}{
- <-> ssub * MerriweatherSans-OsF/extrabold/it
-}{}
-
-%
-% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-% l --> light
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{l}{sl}{
- <-> ssub * MerriweatherSans-OsF/light/sl
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{l}{n}{
- <-> ssub * MerriweatherSans-OsF/light/n
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{l}{it}{
- <-> ssub * MerriweatherSans-OsF/light/it
-}{}
-
-
-% m --> regular
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{m}{sl}{
- <-> ssub * MerriweatherSans-OsF/regular/sl
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{m}{n}{
- <-> ssub * MerriweatherSans-OsF/regular/n
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{m}{it}{
- <-> ssub * MerriweatherSans-OsF/regular/it
-}{}
-
-
-% b --> bold
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{b}{sl}{
- <-> ssub * MerriweatherSans-OsF/bold/sl
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{b}{n}{
- <-> ssub * MerriweatherSans-OsF/bold/n
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{b}{it}{
- <-> ssub * MerriweatherSans-OsF/bold/it
-}{}
-
-
-% eb --> extrabold
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{eb}{sl}{
- <-> ssub * MerriweatherSans-OsF/extrabold/sl
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{eb}{n}{
- <-> ssub * MerriweatherSans-OsF/extrabold/n
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{eb}{it}{
- <-> ssub * MerriweatherSans-OsF/extrabold/it
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bx}{n}{
- <-> ssub * MerriweatherSans-OsF/b/n
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bx}{sl}{
- <-> ssub * MerriweatherSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bx}{it}{
- <-> ssub * MerriweatherSans-OsF/b/it
-}{}
-
-\endinput
Modified: trunk/Master/texmf-dist/tex/latex/merriweather/merriweather.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/merriweather/merriweather.sty 2020-07-25 21:46:13 UTC (rev 55941)
+++ trunk/Master/texmf-dist/tex/latex/merriweather/merriweather.sty 2020-07-25 21:46:36 UTC (rev 55942)
@@ -1,16 +1,14 @@
\ProvidesPackage{merriweather}[%
- 2019/10/13 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ]
+ 2020/07/24 (Bob Tennent) Supports Merriweather(Sans) fonts for use with xeLaTeX and luaLaTeX. ]
-\RequirePackage{ifxetex,ifluatex,textcomp}
+\RequirePackage{iftex}
-\newif\ifmerriweather at ttf
-\ifxetex
- \merriweather at ttftrue
-\else\ifluatex
- \merriweather at ttftrue
-\else % [pdf]LaTeX
- \merriweather at ttffalse
-\fi\fi
+\ifpdftex
+\PackageError{merriweather}{%
+ *****************************************\MessageBreak
+ Please process using XeLaTeX or luaLaTeX\MessageBreak
+ *****************************************}
+\fi
\newcommand*{\Merriweather at scale}{1} % not adjustable
\newcommand*{\MerriweatherSans at scale}{1}
@@ -29,7 +27,6 @@
\DeclareOptionX{sf}{\merriweather at sftrue}
\DeclareOptionX{rm}{\merriweather at rmtrue}
\DeclareOptionX{sfdefault}{\merriweather at sftrue\merriweather at sfdefaulttrue}
-\DeclareOptionX{type1}{\merriweather at ttffalse}
\DeclareOptionX{light}{\merriweather at rmlighttrue\merriweather at sflighttrue}
\DeclareOptionX{rmlight}{\merriweather at rmlighttrue}
\DeclareOptionX{sflight}{\merriweather at sflighttrue}
@@ -39,11 +36,7 @@
\ProcessOptionsX\relax
-\ifmerriweather at ttf
- \RequirePackage{fontspec}
-\else
- \RequirePackage{fontenc,fontaxes,mweights}
-\fi
+\RequirePackage{fontspec}
\ifmerriweather at rm\else\ifmerriweather at sf\else
\merriweather at rmtrue\merriweather at sftrue % both false -> both true
@@ -51,7 +44,6 @@
% Set main and/or sans fonts:
-\ifmerriweather at ttf
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
@@ -216,53 +208,9 @@
BoldItalicFont = *-ExBoldIt ]
{MerriweatherSans}
-\else % type1
- \ifmerriweather at rm
- \ifmerriweather at rmlight\def\mdseries at rm{l}\else\def\mdseries at rm{m}\fi
- \ifmerriweather at rmblack\def\bfseries at rm{ub}\else\def\bfseries at rm{b}\fi
- \else
- \def\mdseries at rm{m}\def\bfseries at rm{b}
- \fi
- \ifmerriweather at sf
- \ifmerriweather at sflight\def\mdseries at sf{l}\else\def\mdseries at sf{m}\fi
- \ifmerriweather at sfblack\def\bfseries at sf{eb}\else\def\bfseries at sf{b}\fi
- \else
- \def\mdseries at sf{m}\def\bfseries at sf{b}
- \fi
-
-
-
- \def\merriweatherfamily{Merriweather-OsF}
- \def\merriweathersffamily{MerriweatherSans-OsF}
-
- \ifmerriweather at rm
- \renewcommand*\rmdefault{\merriweatherfamily}
- \fi
-
- \ifmerriweather at sf
- \renewcommand*\sfdefault{\merriweathersffamily}
- \fi
-
- \ifmerriweather at sfdefault
- \renewcommand*\familydefault{\merriweathersffamily}
- \fi
-
- \renewcommand*\seriesdefault{\mdseries at rm}
-
- \newcommand*\merriweather{\fontfamily{\merriweatherfamily}\selectfont}
- \newcommand*\merriweathersans{\fontfamily{\merriweathersffamily}\selectfont}
- \newcommand*\merriweatherlight{\fontfamily{\merriweatherfamily}\fontseries{l}\selectfont}
- \newcommand*\merriweathersanslight{\fontfamily{\merriweathersffamily}\fontseries{l}\selectfont}
- \newcommand*\merriweatherblack{\fontfamily{\merriweatherfamily}\fontseries{ub}\selectfont}
- \newcommand*\merriweathersansblack{\fontfamily{\merriweathersffamily}\fontseries{eb}\selectfont}
-
-\fi
-
% turn off defaults in case other fonts are selected:
-\ifmerriweather at ttf
\defaultfontfeatures{}
-\fi
\endinput
More information about the tex-live-commits
mailing list.