autoupdate

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

2 files changed, 469 insertions, 26 deletions

diff --git a/Master/texmf-dist/ls-R b/Master/texmf-dist/ls-R
index 684256620f1..a6891b4aeac 100644
--- a/Master/texmf-dist/ls-R
+++ b/Master/texmf-dist/ls-R
@@ -56197,6 +56197,7 @@ lobster2
 ly1
 mathdesign
 mdsymbol
+merriweather
 metapost
 miama
 mintspirit
@@ -59884,6 +59885,21 @@ mdsymbol-d.enc
 mdsymbol-e.enc
 mdsymbol-f.enc
 
+./fonts/enc/dvips/merriweather:
+mwthr_3g4t7f.enc
+mwthr_44qg5v.enc
+mwthr_6upxhe.enc
+mwthr_7ytifx.enc
+mwthr_clyrx2.enc
+mwthr_czxicq.enc
+mwthr_hzrl5s.enc
+mwthr_iuohxq.enc
+mwthr_n7ujmb.enc
+mwthr_tvbl63.enc
+mwthr_u54ue6.enc
+mwthr_vi456v.enc
+mwthr_zwbe7j.enc
+
 ./fonts/enc/dvips/metapost:
 groff.enc
 
@@ -61747,6 +61763,7 @@ marvosym
 mathabx-type1
 mathdesign
 mdsymbol
+merriweather
 metapost
 mflogo-font
 miama
@@ -62518,6 +62535,9 @@ mdugm.map
 ./fonts/map/dvips/mdsymbol:
 mdsymbol.map
 
+./fonts/map/dvips/merriweather:
+merriweather.map
+
 ./fonts/map/dvips/metapost:
 troff-updmap.map
 troff.map
@@ -72835,6 +72855,7 @@ paratype
 ptex-fonts
 public
 rozynski
+sorkin
 typoland
 uhc
 uptex-fonts
@@ -132264,6 +132285,139 @@ ComicNeueAngular-Regular-tlf-t1.tfm
 ComicNeueAngular-Regular-tlf-ts1--base.tfm
 ComicNeueAngular-Regular-tlf-ts1.tfm
 
+./fonts/tfm/sorkin:
+merriweather
+
+./fonts/tfm/sorkin/merriweather:
+Merriwthr-Bold-osf-ly1.tfm
+Merriwthr-Bold-osf-ot1.tfm
+Merriwthr-Bold-osf-t1--base.tfm
+Merriwthr-Bold-osf-t1.tfm
+Merriwthr-Bold-osf-ts1--base.tfm
+Merriwthr-Bold-osf-ts1.tfm
+Merriwthr-BoldItalic-osf-ly1.tfm
+Merriwthr-BoldItalic-osf-ot1.tfm
+Merriwthr-BoldItalic-osf-t1--base.tfm
+Merriwthr-BoldItalic-osf-t1.tfm
+Merriwthr-BoldItalic-osf-ts1--base.tfm
+Merriwthr-BoldItalic-osf-ts1.tfm
+Merriwthr-Italic-osf-ly1.tfm
+Merriwthr-Italic-osf-ot1.tfm
+Merriwthr-Italic-osf-t1--base.tfm
+Merriwthr-Italic-osf-t1.tfm
+Merriwthr-Italic-osf-ts1--base.tfm
+Merriwthr-Italic-osf-ts1.tfm
+Merriwthr-Light-osf-ly1.tfm
+Merriwthr-Light-osf-ot1.tfm
+Merriwthr-Light-osf-t1--base.tfm
+Merriwthr-Light-osf-t1.tfm
+Merriwthr-Light-osf-ts1--base.tfm
+Merriwthr-Light-osf-ts1.tfm
+Merriwthr-LightIt-osf-ly1.tfm
+Merriwthr-LightIt-osf-ot1.tfm
+Merriwthr-LightIt-osf-t1--base.tfm
+Merriwthr-LightIt-osf-t1.tfm
+Merriwthr-LightIt-osf-ts1--base.tfm
+Merriwthr-LightIt-osf-ts1.tfm
+Merriwthr-Regular-osf-ly1.tfm
+Merriwthr-Regular-osf-ot1.tfm
+Merriwthr-Regular-osf-t1--base.tfm
+Merriwthr-Regular-osf-t1.tfm
+Merriwthr-Regular-osf-ts1--base.tfm
+Merriwthr-Regular-osf-ts1.tfm
+Merriwthr-UltraBdIt-osf-ly1.tfm
+Merriwthr-UltraBdIt-osf-ot1.tfm
+Merriwthr-UltraBdIt-osf-t1--base.tfm
+Merriwthr-UltraBdIt-osf-t1.tfm
+Merriwthr-UltraBdIt-osf-ts1--base.tfm
+Merriwthr-UltraBdIt-osf-ts1.tfm
+Merriwthr-UltraBold-osf-ly1.tfm
+Merriwthr-UltraBold-osf-ot1.tfm
+Merriwthr-UltraBold-osf-t1--base.tfm
+Merriwthr-UltraBold-osf-t1.tfm
+Merriwthr-UltraBold-osf-ts1--base.tfm
+Merriwthr-UltraBold-osf-ts1.tfm
+MerriwthrSans-Bold-osf-ly1.tfm
+MerriwthrSans-Bold-osf-ot1.tfm
+MerriwthrSans-Bold-osf-t1--base.tfm
+MerriwthrSans-Bold-osf-t1.tfm
+MerriwthrSans-Bold-osf-ts1--base.tfm
+MerriwthrSans-Bold-osf-ts1.tfm
+MerriwthrSans-Bold-sup-ly1.tfm
+MerriwthrSans-Bold-sup-ot1.tfm
+MerriwthrSans-Bold-sup-t1--base.tfm
+MerriwthrSans-Bold-sup-t1.tfm
+MerriwthrSans-BoldItalic-osf-ly1.tfm
+MerriwthrSans-BoldItalic-osf-ot1.tfm
+MerriwthrSans-BoldItalic-osf-t1--base.tfm
+MerriwthrSans-BoldItalic-osf-t1.tfm
+MerriwthrSans-BoldItalic-osf-ts1--base.tfm
+MerriwthrSans-BoldItalic-osf-ts1.tfm
+MerriwthrSans-BoldItalic-sup-ly1.tfm
+MerriwthrSans-BoldItalic-sup-ot1.tfm
+MerriwthrSans-BoldItalic-sup-t1--base.tfm
+MerriwthrSans-BoldItalic-sup-t1.tfm
+MerriwthrSans-ExtraBold-osf-ly1.tfm
+MerriwthrSans-ExtraBold-osf-ot1.tfm
+MerriwthrSans-ExtraBold-osf-t1--base.tfm
+MerriwthrSans-ExtraBold-osf-t1.tfm
+MerriwthrSans-ExtraBold-osf-ts1--base.tfm
+MerriwthrSans-ExtraBold-osf-ts1.tfm
+MerriwthrSans-ExtraBold-sup-ly1.tfm
+MerriwthrSans-ExtraBold-sup-ot1.tfm
+MerriwthrSans-ExtraBold-sup-t1--base.tfm
+MerriwthrSans-ExtraBold-sup-t1.tfm
+MerriwthrSans-ExtraBoldItalic-osf-ly1.tfm
+MerriwthrSans-ExtraBoldItalic-osf-ot1.tfm
+MerriwthrSans-ExtraBoldItalic-osf-t1--base.tfm
+MerriwthrSans-ExtraBoldItalic-osf-t1.tfm
+MerriwthrSans-ExtraBoldItalic-osf-ts1--base.tfm
+MerriwthrSans-ExtraBoldItalic-osf-ts1.tfm
+MerriwthrSans-ExtraBoldItalic-sup-ly1.tfm
+MerriwthrSans-ExtraBoldItalic-sup-ot1.tfm
+MerriwthrSans-ExtraBoldItalic-sup-t1--base.tfm
+MerriwthrSans-ExtraBoldItalic-sup-t1.tfm
+MerriwthrSans-Italic-osf-ly1.tfm
+MerriwthrSans-Italic-osf-ot1.tfm
+MerriwthrSans-Italic-osf-t1--base.tfm
+MerriwthrSans-Italic-osf-t1.tfm
+MerriwthrSans-Italic-osf-ts1--base.tfm
+MerriwthrSans-Italic-osf-ts1.tfm
+MerriwthrSans-Italic-sup-ly1.tfm
+MerriwthrSans-Italic-sup-ot1.tfm
+MerriwthrSans-Italic-sup-t1--base.tfm
+MerriwthrSans-Italic-sup-t1.tfm
+MerriwthrSans-Light-osf-ly1.tfm
+MerriwthrSans-Light-osf-ot1.tfm
+MerriwthrSans-Light-osf-t1--base.tfm
+MerriwthrSans-Light-osf-t1.tfm
+MerriwthrSans-Light-osf-ts1--base.tfm
+MerriwthrSans-Light-osf-ts1.tfm
+MerriwthrSans-Light-sup-ly1.tfm
+MerriwthrSans-Light-sup-ot1.tfm
+MerriwthrSans-Light-sup-t1--base.tfm
+MerriwthrSans-Light-sup-t1.tfm
+MerriwthrSans-LightItalic-osf-ly1.tfm
+MerriwthrSans-LightItalic-osf-ot1.tfm
+MerriwthrSans-LightItalic-osf-t1--base.tfm
+MerriwthrSans-LightItalic-osf-t1.tfm
+MerriwthrSans-LightItalic-osf-ts1--base.tfm
+MerriwthrSans-LightItalic-osf-ts1.tfm
+MerriwthrSans-LightItalic-sup-ly1.tfm
+MerriwthrSans-LightItalic-sup-ot1.tfm
+MerriwthrSans-LightItalic-sup-t1--base.tfm
+MerriwthrSans-LightItalic-sup-t1.tfm
+MerriwthrSans-Regular-osf-ly1.tfm
+MerriwthrSans-Regular-osf-ot1.tfm
+MerriwthrSans-Regular-osf-t1--base.tfm
+MerriwthrSans-Regular-osf-t1.tfm
+MerriwthrSans-Regular-osf-ts1--base.tfm
+MerriwthrSans-Regular-osf-ts1.tfm
+MerriwthrSans-Regular-sup-ly1.tfm
+MerriwthrSans-Regular-sup-ot1.tfm
+MerriwthrSans-Regular-sup-t1--base.tfm
+MerriwthrSans-Regular-sup-t1.tfm
+
 ./fonts/tfm/typoland:
 carlito
 lato
@@ -142111,6 +142265,7 @@ nowacki
 paratype
 public
 rozynski
+sorkin
 typoland
 uhc
 urw
@@ -150463,6 +150618,27 @@ ComicNeueAngular-LightLCDFJ.pfb
 ComicNeueAngular-Regular.pfb
 ComicNeueAngular-RegularLCDFJ.pfb
 
+./fonts/type1/sorkin:
+merriweather
+
+./fonts/type1/sorkin/merriweather:
+Merriwthr-Bold.pfb
+Merriwthr-BoldIt.pfb
+Merriwthr-Italic.pfb
+Merriwthr-Light.pfb
+Merriwthr-LightIt.pfb
+Merriwthr-Regular.pfb
+Merriwthr-UltraBdIt.pfb
+Merriwthr-UltraBold.pfb
+MerriwthrSans-Bold.pfb
+MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-ExBoldIt.pfb
+MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-Italic.pfb
+MerriwthrSans-Light.pfb
+MerriwthrSans-LightItalic.pfb
+MerriwthrSans-Regular.pfb
+
 ./fonts/type1/typoland:
 carlito
 lato
@@ -151298,6 +151474,7 @@ paratype
 ptex-fonts
 public
 rozynski
+sorkin
 typoland
 uhc
 uptex-fonts
@@ -172480,6 +172657,51 @@ ComicNeueAngular-Regular-tlf-ot1.vf
 ComicNeueAngular-Regular-tlf-t1.vf
 ComicNeueAngular-Regular-tlf-ts1.vf
 
+./fonts/vf/sorkin:
+merriweather
+
+./fonts/vf/sorkin/merriweather:
+Merriwthr-Bold-osf-t1.vf
+Merriwthr-Bold-osf-ts1.vf
+Merriwthr-BoldItalic-osf-t1.vf
+Merriwthr-BoldItalic-osf-ts1.vf
+Merriwthr-Italic-osf-t1.vf
+Merriwthr-Italic-osf-ts1.vf
+Merriwthr-Light-osf-t1.vf
+Merriwthr-Light-osf-ts1.vf
+Merriwthr-LightIt-osf-t1.vf
+Merriwthr-LightIt-osf-ts1.vf
+Merriwthr-Regular-osf-t1.vf
+Merriwthr-Regular-osf-ts1.vf
+Merriwthr-UltraBdIt-osf-t1.vf
+Merriwthr-UltraBdIt-osf-ts1.vf
+Merriwthr-UltraBold-osf-t1.vf
+Merriwthr-UltraBold-osf-ts1.vf
+MerriwthrSans-Bold-osf-t1.vf
+MerriwthrSans-Bold-osf-ts1.vf
+MerriwthrSans-Bold-sup-t1.vf
+MerriwthrSans-BoldItalic-osf-t1.vf
+MerriwthrSans-BoldItalic-osf-ts1.vf
+MerriwthrSans-BoldItalic-sup-t1.vf
+MerriwthrSans-ExtraBold-osf-t1.vf
+MerriwthrSans-ExtraBold-osf-ts1.vf
+MerriwthrSans-ExtraBold-sup-t1.vf
+MerriwthrSans-ExtraBoldItalic-osf-t1.vf
+MerriwthrSans-ExtraBoldItalic-osf-ts1.vf
+MerriwthrSans-ExtraBoldItalic-sup-t1.vf
+MerriwthrSans-Italic-osf-t1.vf
+MerriwthrSans-Italic-osf-ts1.vf
+MerriwthrSans-Italic-sup-t1.vf
+MerriwthrSans-Light-osf-t1.vf
+MerriwthrSans-Light-osf-ts1.vf
+MerriwthrSans-Light-sup-t1.vf
+MerriwthrSans-LightItalic-osf-t1.vf
+MerriwthrSans-LightItalic-osf-ts1.vf
+MerriwthrSans-LightItalic-sup-t1.vf
+MerriwthrSans-Regular-osf-t1.vf
+MerriwthrSans-Regular-osf-ts1.vf
+MerriwthrSans-Regular-sup-t1.vf
+
 ./fonts/vf/typoland:
 carlito
 lato
@@ -213221,6 +213443,17 @@ mercatorpy.def
 mercatorsupplier.def
 
 ./tex/latex/merriweather:
+LY1Merriwthr-OsF.fd
+LY1MerriwthrSans-OsF.fd
+LY1MerriwthrSans-Sup.fd
+OT1Merriwthr-OsF.fd
+OT1MerriwthrSans-OsF.fd
+OT1MerriwthrSans-Sup.fd
+T1Merriwthr-OsF.fd
+T1MerriwthrSans-OsF.fd
+T1MerriwthrSans-Sup.fd
+TS1Merriwthr-OsF.fd
+TS1MerriwthrSans-OsF.fd
 merriweather.sty
 
 ./tex/latex/metalogo:
diff --git a/Master/tlpkg/texlive.tlpdb b/Master/tlpkg/texlive.tlpdb
index 52f24594727..38ff5239123 100644
--- a/Master/tlpkg/texlive.tlpdb
+++ b/Master/tlpkg/texlive.tlpdb
@@ -26,11 +26,11 @@ depend container_split_src_files/1
 depend frozen/0
 depend minrelease/2016
 depend release/2020
-depend revision/55989
+depend revision/55999
 
 name 00texlive.image
 category TLCore
-revision 55984
+revision 55996
 shortdesc TeX Live files only in the source repository
 longdesc The files here are not copied by the installer and containers
 longdesc are not built for them; they exist only in the source
@@ -40,7 +40,7 @@ longdesc IgnorePatterns in the check_files routine in tlmgr.pl augment
 longdesc this list. Those are not included in the source/ tarball. For
 longdesc information on the 00texlive prefix see
 longdesc 00texlive.installation(.tlpsrc)
-runfiles size=5019
+runfiles size=5020
  .mkisofsrc
  autorun.inf
  texmf-dist/README
@@ -91469,7 +91469,7 @@ longdesc sNgrh. ek-ttaaip sNsthaa ke kii utkRsstt devnaagrii ttNkoN kaa
 longdesc sNgrh / . This package provides a collection of some excellent
 longdesc Devanagari fonts by EkType: Mukta, Baloo, Modak, and Jaini.
 docfiles size=18
- texmf-dist/doc/fonts/ektype-tanka/EkType-tanka.pdf details="Package documentation in Marathi and Hindi" language="mr"
+ texmf-dist/doc/fonts/ektype-tanka/EkType-tanka.pdf details="Package documentation in Marathi and Hindi" language="mr,hi"
  texmf-dist/doc/fonts/ektype-tanka/EkType-tanka.tex
  texmf-dist/doc/fonts/ektype-tanka/README.txt details="Readme"
 runfiles size=2052
@@ -107564,7 +107564,7 @@ catalogue-topics font-doc
 
 name fontools
 category Package
-revision 55596
+revision 55997
 shortdesc Tools to simplify using fonts (especially TT/OTF ones)
 longdesc This package provides tools to simplify using OpenType fonts
 longdesc with LaTeX. By far the most important program in this bundle is
@@ -107578,7 +107578,7 @@ longdesc - re-encode .afm files, ot2kpx - extract kerning pairs from
 longdesc OpenType fonts, splitttc - split an OpenType Collection file
 longdesc (ttc or otc) into individual fonts.
 depend fontools.ARCH
-docfiles size=57
+docfiles size=54
  texmf-dist/doc/man/man1/afm2afm.1
  texmf-dist/doc/man/man1/afm2afm.man1.pdf
  texmf-dist/doc/man/man1/autoinst.1
@@ -107588,7 +107588,7 @@ docfiles size=57
  texmf-dist/doc/support/fontools/GPLv2.txt
  texmf-dist/doc/support/fontools/README details="Bundle readme"
  texmf-dist/doc/support/fontools/splitttc
-runfiles size=62
+runfiles size=63
  texmf-dist/fonts/enc/dvips/fontools/fontools_lgr.enc
  texmf-dist/fonts/enc/dvips/fontools/fontools_ly1.enc
  texmf-dist/fonts/enc/dvips/fontools/fontools_oml.enc
@@ -165381,7 +165381,7 @@ catalogue-topics index-multi
 
 name marathi
 category Package
-revision 55977
+revision 55998
 shortdesc Typeset Marathi language using XeLaTeX or LuaLaTeX
 longdesc luaa-laattek v jhii-laattek hyaaNcyaash mraatthiicaa sulbh
 longdesc vaapr krnnyaasaatthii. ithuun puddhe laattek-vriil
@@ -165396,7 +165396,7 @@ docfiles size=22
  texmf-dist/doc/latex/marathi/README.txt details="Readme"
  texmf-dist/doc/latex/marathi/marathi.pdf details="Package documentation" language="mr"
  texmf-dist/doc/latex/marathi/table.tex
-srcfiles size=11
+srcfiles size=10
  texmf-dist/source/latex/marathi/marathi.dtx
  texmf-dist/source/latex/marathi/marathi.ins
 runfiles size=15
@@ -165412,7 +165412,7 @@ catalogue-contact-repository https://gitlab.com/niranjanvikastambe/marathi/
 catalogue-ctan /language/marathi
 catalogue-license lppl1.3c
 catalogue-topics indic marathi
-catalogue-version 1.3
+catalogue-version 1.3.1
 
 name marcellus
 category Package
@@ -168975,21 +168975,164 @@ catalogue-version 1.01
 
 name merriweather
 category Package
-revision 55952
-shortdesc Merriweather and MerriweatherSans fonts, with LuaLaTeX and XeLaTeX support
+revision 55996
+shortdesc Merriweather and MerriweatherSans fonts, with LaTeX support
 longdesc This package provides the Merriweather and MerriweatherSans
-longdesc families of fonts, designed by Eben Sorkin, for use with
-longdesc LuaLaTeX and XeLaTeX. Merriweather features a very large x
-longdesc height, slightly condensed letterforms, a mild diagonal stress,
-longdesc sturdy serifs and open forms. The Sans family closely
-longdesc harmonizes with the weights and styles of the serif family.
-longdesc There are four weights and italics for each.
-docfiles size=41
+longdesc families of fonts, designed by Eben Sorkin, with support for
+longdesc LaTeX, pdfLaTeX, XeLaTeX, and LuaLaTeX. Merriweather features a
+longdesc very large x height, slightly condensed letterforms, a mild
+longdesc diagonal stress, sturdy serifs and open forms. The Sans family
+longdesc closely harmonizes with the weights and styles of the serif
+longdesc family. There are four weights and italics for each.
+execute addMap merriweather.map
+docfiles size=32
  texmf-dist/doc/fonts/merriweather/OFL.txt
  texmf-dist/doc/fonts/merriweather/README details="Readme"
  texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf details="Font samples"
  texmf-dist/doc/fonts/merriweather/merriweather-samples.tex
-runfiles size=519
+runfiles size=1141
+ texmf-dist/fonts/enc/dvips/merriweather/mwthr_3g4t7f.enc
+ texmf-dist/fonts/enc/dvips/merriweather/mwthr_44qg5v.enc
+ texmf-dist/fonts/enc/dvips/merriweather/mwthr_6upxhe.enc
+ texmf-dist/fonts/enc/dvips/merriweather/mwthr_7ytifx.enc
+ texmf-dist/fonts/enc/dvips/merriweather/mwthr_clyrx2.enc
+ texmf-dist/fonts/enc/dvips/merriweather/mwthr_czxicq.enc
+ texmf-dist/fonts/enc/dvips/merriweather/mwthr_hzrl5s.enc
+ texmf-dist/fonts/enc/dvips/merriweather/mwthr_iuohxq.enc
+ texmf-dist/fonts/enc/dvips/merriweather/mwthr_n7ujmb.enc
+ texmf-dist/fonts/enc/dvips/merriweather/mwthr_tvbl63.enc
+ texmf-dist/fonts/enc/dvips/merriweather/mwthr_u54ue6.enc
+ texmf-dist/fonts/enc/dvips/merriweather/mwthr_vi456v.enc
+ texmf-dist/fonts/enc/dvips/merriweather/mwthr_zwbe7j.enc
+ texmf-dist/fonts/map/dvips/merriweather/merriweather.map
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Bold-osf-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Bold-osf-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Bold-osf-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Bold-osf-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Bold-osf-ts1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Bold-osf-ts1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-BoldItalic-osf-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-BoldItalic-osf-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-BoldItalic-osf-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-BoldItalic-osf-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-BoldItalic-osf-ts1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-BoldItalic-osf-ts1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Italic-osf-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Italic-osf-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Italic-osf-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Italic-osf-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Italic-osf-ts1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Italic-osf-ts1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Light-osf-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Light-osf-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Light-osf-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Light-osf-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Light-osf-ts1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Light-osf-ts1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-LightIt-osf-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-LightIt-osf-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-LightIt-osf-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-LightIt-osf-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-LightIt-osf-ts1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-LightIt-osf-ts1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Regular-osf-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Regular-osf-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Regular-osf-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Regular-osf-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Regular-osf-ts1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-Regular-osf-ts1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBdIt-osf-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBdIt-osf-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBdIt-osf-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBdIt-osf-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBdIt-osf-ts1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBdIt-osf-ts1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBold-osf-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBold-osf-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBold-osf-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBold-osf-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBold-osf-ts1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/Merriwthr-UltraBold-osf-ts1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-osf-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-osf-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-osf-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-osf-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-osf-ts1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-osf-ts1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-sup-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-sup-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-sup-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Bold-sup-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-osf-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-osf-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-osf-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-osf-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-osf-ts1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-osf-ts1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-sup-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-sup-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-sup-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-BoldItalic-sup-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-osf-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-osf-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-osf-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-osf-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-osf-ts1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-osf-ts1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-sup-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-sup-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-sup-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBold-sup-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-osf-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-osf-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-osf-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-osf-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-osf-ts1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-osf-ts1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-sup-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-sup-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-sup-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-sup-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-osf-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-osf-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-osf-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-osf-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-osf-ts1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-osf-ts1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-sup-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-sup-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-sup-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Italic-sup-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-osf-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-osf-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-osf-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-osf-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-osf-ts1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-osf-ts1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-sup-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-sup-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-sup-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Light-sup-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-osf-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-osf-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-osf-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-osf-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-osf-ts1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-osf-ts1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-sup-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-sup-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-sup-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-LightItalic-sup-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-osf-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-osf-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-osf-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-osf-t1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-osf-ts1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-osf-ts1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-sup-ly1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-sup-ot1.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-sup-t1--base.tfm
+ texmf-dist/fonts/tfm/sorkin/merriweather/MerriwthrSans-Regular-sup-t1.tfm
  texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Bold.ttf
  texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-BoldIt.ttf
  texmf-dist/fonts/truetype/sorkin/merriweather/Merriweather-Italic.ttf
@@ -169006,11 +169149,78 @@ runfiles size=519
  texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-Light.ttf
  texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-LightItalic.ttf
  texmf-dist/fonts/truetype/sorkin/merriweather/MerriweatherSans-Regular.ttf
+ texmf-dist/fonts/type1/sorkin/merriweather/Merriwthr-Bold.pfb
+ texmf-dist/fonts/type1/sorkin/merriweather/Merriwthr-BoldIt.pfb
+ texmf-dist/fonts/type1/sorkin/merriweather/Merriwthr-Italic.pfb
+ texmf-dist/fonts/type1/sorkin/merriweather/Merriwthr-Light.pfb
+ texmf-dist/fonts/type1/sorkin/merriweather/Merriwthr-LightIt.pfb
+ texmf-dist/fonts/type1/sorkin/merriweather/Merriwthr-Regular.pfb
+ texmf-dist/fonts/type1/sorkin/merriweather/Merriwthr-UltraBdIt.pfb
+ texmf-dist/fonts/type1/sorkin/merriweather/Merriwthr-UltraBold.pfb
+ texmf-dist/fonts/type1/sorkin/merriweather/MerriwthrSans-Bold.pfb
+ texmf-dist/fonts/type1/sorkin/merriweather/MerriwthrSans-BoldItalic.pfb
+ texmf-dist/fonts/type1/sorkin/merriweather/MerriwthrSans-ExBoldIt.pfb
+ texmf-dist/fonts/type1/sorkin/merriweather/MerriwthrSans-ExtraBold.pfb
+ texmf-dist/fonts/type1/sorkin/merriweather/MerriwthrSans-Italic.pfb
+ texmf-dist/fonts/type1/sorkin/merriweather/MerriwthrSans-Light.pfb
+ texmf-dist/fonts/type1/sorkin/merriweather/MerriwthrSans-LightItalic.pfb
+ texmf-dist/fonts/type1/sorkin/merriweather/MerriwthrSans-Regular.pfb
+ texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-Bold-osf-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-Bold-osf-ts1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-BoldItalic-osf-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-BoldItalic-osf-ts1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-Italic-osf-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-Italic-osf-ts1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-Light-osf-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-Light-osf-ts1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-LightIt-osf-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-LightIt-osf-ts1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-Regular-osf-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-Regular-osf-ts1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-UltraBdIt-osf-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-UltraBdIt-osf-ts1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-UltraBold-osf-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/Merriwthr-UltraBold-osf-ts1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Bold-osf-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Bold-osf-ts1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Bold-sup-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-BoldItalic-osf-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-BoldItalic-osf-ts1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-BoldItalic-sup-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-ExtraBold-osf-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-ExtraBold-osf-ts1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-ExtraBold-sup-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-osf-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-osf-ts1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-ExtraBoldItalic-sup-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Italic-osf-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Italic-osf-ts1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Italic-sup-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Light-osf-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Light-osf-ts1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Light-sup-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-LightItalic-osf-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-LightItalic-osf-ts1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-LightItalic-sup-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Regular-osf-t1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Regular-osf-ts1.vf
+ texmf-dist/fonts/vf/sorkin/merriweather/MerriwthrSans-Regular-sup-t1.vf
+ texmf-dist/tex/latex/merriweather/LY1Merriwthr-OsF.fd
+ texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-OsF.fd
+ texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-Sup.fd
+ texmf-dist/tex/latex/merriweather/OT1Merriwthr-OsF.fd
+ texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-OsF.fd
+ texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-Sup.fd
+ texmf-dist/tex/latex/merriweather/T1Merriwthr-OsF.fd
+ texmf-dist/tex/latex/merriweather/T1MerriwthrSans-OsF.fd
+ texmf-dist/tex/latex/merriweather/T1MerriwthrSans-Sup.fd
+ texmf-dist/tex/latex/merriweather/TS1Merriwthr-OsF.fd
+ texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-OsF.fd
  texmf-dist/tex/latex/merriweather/merriweather.sty
 catalogue-contact-home http://www.google.com/webfonts
 catalogue-ctan /fonts/merriweather
 catalogue-license ofl lppl
-catalogue-topics font font-body font-proportional font-serif font-sans font-ttf font-supp
+catalogue-topics font font-body font-proportional font-serif font-sans font-ttf font-type1 font-supp font-t1enc
 
 name metafont
 category Package
@@ -253466,7 +253676,7 @@ binfiles arch=x86_64-solaris size=1
 
 name tex4ht
 category Package
-revision 55979
+revision 55995
 shortdesc Convert (La)TeX to HTML/XML
 longdesc A converter from TeX and LaTeX to SGML-based formats such as
 longdesc (X)HTML, MathML, OpenDocument, and DocBook, providing a
@@ -261466,7 +261676,7 @@ docfiles size=592
 
 name texlive-docindex
 category TLCore
-revision 55982
+revision 55991
 shortdesc top-level TeX Live doc.html, etc.
 longdesc These files are regenerated as needed, which is often, so we
 longdesc make them a separate package. See the tl-update-auto script for
@@ -261655,7 +261865,7 @@ docfiles size=368
 
 name texlive-scripts
 category TLCore
-revision 55983
+revision 55992
 shortdesc TeX Live infrastructure programs
 longdesc Includes install-tl, tl-portable, rungs, etc.; not needed for
 longdesc tlmgr to run but still ours. Not included in tlcritical.
@@ -281842,12 +282052,12 @@ catalogue-topics barcode
 
 name updmap-map
 category Package
-revision 55983
+revision 55992
 shortdesc auto-generated font map files
 longdesc These map files are regenerated every time a new font is added.
 longdesc There is no need to rebuild formats or update binaries because
 longdesc of such updates, hence this separate package.
-runfiles size=8215
+runfiles size=8222
  texmf-dist/fonts/map/dvipdfmx/updmap/kanjix.map
  texmf-dist/fonts/map/dvips/updmap/builtin35.map
  texmf-dist/fonts/map/dvips/updmap/download35.map