merriweather (25jul20)

git-svn-id: svn://tug.org/texlive/trunk@55942 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 12 insertions, 19 deletions

diff --git a/Master/texmf-dist/doc/fonts/merriweather/README b/Master/texmf-dist/doc/fonts/merriweather/README
index 687ba68712f..bb7905531d9 100644
--- a/Master/texmf-dist/doc/fonts/merriweather/README
+++ b/Master/texmf-dist/doc/fonts/merriweather/README
@@ -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 @@ file "tex-archive"/install/fonts/merriweather.tds.zip, where the
 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 @@ Options light, rmlight, sflight, black, rmblack, and sfblack choose
 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 @@ 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.
+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)
diff --git a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf
index e45ab3c446e..45065c109bc 100644
--- a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf
diff --git a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex
index 454003f1165..73ed7c3a360 100644
--- a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex
+++ b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.tex
@@ -1,5 +1,4 @@
 \documentclass{article}
-\usepackage[T1]{fontenc}
 \usepackage{merriweather}
 \usepackage{lipsum}
 \begin{document}