summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/fonts
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-08-31 21:17:18 +0000
committerKarl Berry <karl@freefriends.org>2020-08-31 21:17:18 +0000
commit2654b31b81dc0bda222b73f705f6504608d073ae (patch)
tree487628dba5ada654ca0e6e71fe7c31473a8f801f /Master/texmf-dist/doc/fonts
parent93929eb6e4cf9eed48e89c372890b79f5b4fb608 (diff)
merriweather (31aug20)
git-svn-id: svn://tug.org/texlive/trunk@56220 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/fonts')
-rw-r--r--Master/texmf-dist/doc/fonts/merriweather/README14
-rw-r--r--Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdfbin111128 -> 109700 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex7
3 files changed, 14 insertions, 7 deletions
diff --git a/Master/texmf-dist/doc/fonts/merriweather/README b/Master/texmf-dist/doc/fonts/merriweather/README
index d432aa7bab1..76b4706d7d6 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-07-31.
+This is the README for the merriweather package, version 2020-08-30.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
the Merriweather and MerriweatherSans families of fonts, designed by
@@ -53,14 +53,18 @@ and MerriweatherSans families, respectively. Commands \merriweatherlight,
\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.
+Options rmlining, sflining, rmoldstyle, sfoldstyle,
+rmtabular, sftabular, rmproportional, sfproportional select
+the number styles for the serif or sans-serif families. The
+defaults are proportional, oldstyle.
+
+Font encodings supported are OT1, T1, LY1 and TS1.
The original fonts are available at
-http://www.google.com/webfonts and are licensed under the
+https://github.com/SorkinType 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 and re-named in compliance with the Reserved
+cfftot1 and re-named in compliance with the Reserved
Font Name provision. 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
diff --git a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf
index e8ef6f1af5c..deae8b5c9b3 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 454003f1165..f5190792554 100644
--- a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex
+++ b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex
@@ -19,6 +19,10 @@
\textbf{\textit{\lipsum[4]}}
+\subsection*{Small Capitals}
+
+\textsc{\lipsum[9]}
+
\subsection*{Light}
{\merriweatherlight\lipsum[5]}
@@ -37,11 +41,11 @@
\textit{\merriweatherblack\lipsum[8]}
+
\subsection*{Numbers}
1234567890
-
\section{Merriweather Sans}\sf
\subsection*{Regular}
@@ -73,7 +77,6 @@
\textit{\merriweathersansblack\lipsum[8]}
-
\subsection*{Numbers}
1234567890