summaryrefslogtreecommitdiff
path: root/fonts/merriweather
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-10-15 03:01:23 +0000
committerNorbert Preining <norbert@preining.info>2019-10-15 03:01:23 +0000
commit14402f2e3de4ea4c565660dffad35276662c05ac (patch)
tree8e3c9ddb7a6210571c0d84fb42d2a99e95884c4c /fonts/merriweather
parent370853b6ba0be6e880b2f320268d4fefbd6aeef6 (diff)
CTAN sync 201910150301
Diffstat (limited to 'fonts/merriweather')
-rw-r--r--fonts/merriweather/README2
-rw-r--r--fonts/merriweather/latex/merriweather.sty18
2 files changed, 10 insertions, 10 deletions
diff --git a/fonts/merriweather/README b/fonts/merriweather/README
index acd1f26638..687ba68712 100644
--- a/fonts/merriweather/README
+++ b/fonts/merriweather/README
@@ -1,4 +1,4 @@
-This is the README for the merriweather package, version 2019-06-02.
+This is the README for the merriweather package, version 2019-10-13.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
the Merriweather and MerriweatherSans families of fonts, designed by
diff --git a/fonts/merriweather/latex/merriweather.sty b/fonts/merriweather/latex/merriweather.sty
index 231fc152c1..6f2f5e07e6 100644
--- a/fonts/merriweather/latex/merriweather.sty
+++ b/fonts/merriweather/latex/merriweather.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{merriweather}[%
- 2019/06/02 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ]
+ 2019/10/13 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ]
\RequirePackage{ifxetex,ifluatex,textcomp}
@@ -219,14 +219,14 @@
\else % type1
\ifmerriweather@rm
- \ifmerriweather@rmlight\def\mdseries@rm{light}\else\def\mdseries@rm{regular}\fi
- \ifmerriweather@rmblack\def\bfseries@rm{ultrabold}\else\def\bfseries@rm{bold}\fi
+ \ifmerriweather@rmlight\def\mdseries@rm{l}\else\def\mdseries@rm{m}\fi
+ \ifmerriweather@rmblack\def\bfseries@rm{ub}\else\def\bfseries@rm{b}\fi
\else
\def\mdseries@rm{m}\def\bfseries@rm{b}
\fi
\ifmerriweather@sf
- \ifmerriweather@sflight\def\mdseries@sf{light}\else\def\mdseries@sf{regular}\fi
- \ifmerriweather@sfblack\def\bfseries@sf{extrabold}\else\def\bfseries@sf{bold}\fi
+ \ifmerriweather@sflight\def\mdseries@sf{l}\else\def\mdseries@sf{m}\fi
+ \ifmerriweather@sfblack\def\bfseries@sf{eb}\else\def\bfseries@sf{b}\fi
\else
\def\mdseries@sf{m}\def\bfseries@sf{b}
\fi
@@ -252,10 +252,10 @@
\newcommand*\merriweather{\fontfamily{\merriweatherfamily}\selectfont}
\newcommand*\merriweathersans{\fontfamily{\merriweathersffamily}\selectfont}
- \newcommand*\merriweatherlight{\fontfamily{\merriweatherfamily}\fontseries{light}\selectfont}
- \newcommand*\merriweathersanslight{\fontfamily{\merriweathersffamily}\fontseries{light}\selectfont}
- \newcommand*\merriweatherblack{\fontfamily{\merriweatherfamily}\fontseries{ultrabold}\selectfont}
- \newcommand*\merriweathersansblack{\fontfamily{\merriweathersffamily}\fontseries{extrabold}\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