summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-09-17 21:19:03 +0000
committerKarl Berry <karl@freefriends.org>2020-09-17 21:19:03 +0000
commit79b2c512f897d78673e06c5bf28b3eb5295ad529 (patch)
tree751e86729e66ad9e9d700b497ccb4ba905bc7dc8
parent465180b4917e94cc3cb501f4586280c333ba85ce (diff)
merriweather (17sep20)
git-svn-id: svn://tug.org/texlive/trunk@56365 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/merriweather/README2
-rw-r--r--Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdfbin109700 -> 73845 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex7
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/merriweather.sty4
4 files changed, 9 insertions, 4 deletions
diff --git a/Master/texmf-dist/doc/fonts/merriweather/README b/Master/texmf-dist/doc/fonts/merriweather/README
index 76b4706d7d6..2dc13c553f9 100644
--- a/Master/texmf-dist/doc/fonts/merriweather/README
+++ b/Master/texmf-dist/doc/fonts/merriweather/README
@@ -1,4 +1,4 @@
-This is the README for the merriweather package, version 2020-08-30.
+This is the README for the merriweather package, version 2020-09-12.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
the Merriweather and MerriweatherSans families of fonts, designed by
diff --git a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf
index deae8b5c9b3..e8ef7ef590c 100644
--- a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex
index f5190792554..7757dfe31e4 100644
--- a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex
+++ b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex
@@ -1,6 +1,7 @@
\documentclass{article}
\usepackage[T1]{fontenc}
-\usepackage{merriweather}
+\usepackage[light]{merriweather}
+\usepackage{microtype}
\usepackage{lipsum}
\begin{document}
@@ -61,6 +62,10 @@
\textbf{\textit{\lipsum[4]}}
+\subsection*{Small Capitals}
+
+\textsc{\lipsum[9]}
+
\subsection*{Light}
{\merriweathersanslight\lipsum[5]}
diff --git a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty
index 71fd75b8202..d0645b1f86e 100644
--- a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty
+++ b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{merriweather}[%
- 2020/08/30 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ]
+ 2020/09/12 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ]
\RequirePackage{ifxetex,ifluatex,textcomp}
@@ -194,7 +194,7 @@
[ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
UprightFont = *-Light ,
ItalicFont = *-LightItalic ,
- BoldFont = *-Bold ,
+ BoldFont = *-Bold , ]
{Merriweather}
\fi
\else