summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-08-31 03:02:58 +0000
committerNorbert Preining <norbert@preining.info>2020-08-31 03:02:58 +0000
commit568fe838cef40f671837d9348dd73c93d9ea962b (patch)
treeba2b2c6ab585927a89adae8c1cc2a594010ab933
parentc6a1b1f6422e10f363a9de80c4f103f0c155d8bb (diff)
CTAN sync 202008310302
-rw-r--r--FILES.byname2291
-rw-r--r--FILES.byname.gzbin2239639 -> 2247803 bytes
-rw-r--r--FILES.last07days2236
-rw-r--r--fonts/merriweather/README14
-rw-r--r--fonts/merriweather/doc/merriweather-samples.pdfbin111128 -> 109700 bytes
-rw-r--r--fonts/merriweather/doc/merriweather-samples.tex7
-rw-r--r--fonts/merriweather/enc/merriwthr_27vehb.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_2hyv6t.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_2j7grf.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_2r7lb2.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_4ylisx.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_5lck5z.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_5xld5w.enc (renamed from fonts/merriweather/enc/mwthr_czxicq.enc)22
-rw-r--r--fonts/merriweather/enc/merriwthr_6qeh6o.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_7bivwm.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_7jdyhk.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_7npxgm.enc65
-rw-r--r--fonts/merriweather/enc/merriwthr_7t3tp2.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_7tayun.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_abao47.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_adz5lu.enc (renamed from fonts/merriweather/enc/mwthr_tvbl63.enc)24
-rw-r--r--fonts/merriweather/enc/merriwthr_afua2j.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_ags7qn.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_ah5y5a.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_b6rchs.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_btdrxl.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_c4h6ot.enc65
-rw-r--r--fonts/merriweather/enc/merriwthr_cc6s4l.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_ckyw6q.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_cqy4t2.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_cvdnuw.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_cy3ufi.enc (renamed from fonts/merriweather/enc/mwthr_3g4t7f.enc)26
-rw-r--r--fonts/merriweather/enc/merriwthr_diijaa.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_dl4a4c.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_dx3n55.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_e2idhw.enc65
-rw-r--r--fonts/merriweather/enc/merriwthr_e5zf5y.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_f5n6m3.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_fs3efe.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_gbcczm.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_gdbfjs.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_gldhmf.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_gmchnq.enc (renamed from fonts/merriweather/enc/mwthr_clyrx2.enc)18
-rw-r--r--fonts/merriweather/enc/merriwthr_h6z4fc.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_h7gtfv.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_hwcxwn.enc (renamed from fonts/merriweather/enc/mwthr_iuohxq.enc)21
-rw-r--r--fonts/merriweather/enc/merriwthr_hz3jhh.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_ibepov.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_igdvgb.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_jjwbah.enc65
-rw-r--r--fonts/merriweather/enc/merriwthr_k4bbiq.enc (renamed from fonts/merriweather/enc/mwthr_zwbe7j.enc)34
-rw-r--r--fonts/merriweather/enc/merriwthr_lkhefy.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_lm56sz.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_mb4bqm.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_me3dx7.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_mgprdv.enc (renamed from fonts/merriweather/enc/mwthr_vi456v.enc)29
-rw-r--r--fonts/merriweather/enc/merriwthr_mr3nck.enc65
-rw-r--r--fonts/merriweather/enc/merriwthr_mx2b4h.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_nszfm3.enc65
-rw-r--r--fonts/merriweather/enc/merriwthr_o43b2q.enc (renamed from fonts/merriweather/enc/mwthr_44qg5v.enc)34
-rw-r--r--fonts/merriweather/enc/merriwthr_ob5vn4.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_okb76x.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_owzwzj.enc (renamed from fonts/merriweather/enc/mwthr_u54ue6.enc)27
-rw-r--r--fonts/merriweather/enc/merriwthr_p242jx.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_posqbl.enc65
-rw-r--r--fonts/merriweather/enc/merriwthr_qfmkcs.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_qndjqi.enc (renamed from fonts/merriweather/enc/mwthr_7ytifx.enc)20
-rw-r--r--fonts/merriweather/enc/merriwthr_rzflsg.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_s56ilq.enc65
-rw-r--r--fonts/merriweather/enc/merriwthr_stxeas.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_ttjzpe.enc65
-rw-r--r--fonts/merriweather/enc/merriwthr_u2frii.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_uduhhn.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_urus45.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_vvhkhe.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_w4rwtq.enc (renamed from fonts/merriweather/enc/mwthr_6upxhe.enc)20
-rw-r--r--fonts/merriweather/enc/merriwthr_wlsyn3.enc65
-rw-r--r--fonts/merriweather/enc/merriwthr_wppmfi.enc65
-rw-r--r--fonts/merriweather/enc/merriwthr_x754fd.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_xfdjpz.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_xys2i2.enc66
-rw-r--r--fonts/merriweather/enc/merriwthr_ynquvw.enc (renamed from fonts/merriweather/enc/mwthr_hzrl5s.enc)24
-rw-r--r--fonts/merriweather/enc/mwthr_n7ujmb.enc63
-rw-r--r--fonts/merriweather/latex/LY1Merriwthr-LF.fd253
-rw-r--r--fonts/merriweather/latex/LY1Merriwthr-OsF.fd212
-rw-r--r--fonts/merriweather/latex/LY1Merriwthr-Sup.fd145
-rw-r--r--fonts/merriweather/latex/LY1Merriwthr-TLF.fd253
-rw-r--r--fonts/merriweather/latex/LY1Merriwthr-TOsF.fd253
-rw-r--r--fonts/merriweather/latex/LY1MerriwthrSans-LF.fd253
-rw-r--r--fonts/merriweather/latex/LY1MerriwthrSans-OsF.fd208
-rw-r--r--fonts/merriweather/latex/LY1MerriwthrSans-Sup.fd120
-rw-r--r--fonts/merriweather/latex/LY1MerriwthrSans-TLF.fd253
-rw-r--r--fonts/merriweather/latex/LY1MerriwthrSans-TOsF.fd253
-rw-r--r--fonts/merriweather/latex/OT1Merriwthr-LF.fd253
-rw-r--r--fonts/merriweather/latex/OT1Merriwthr-OsF.fd212
-rw-r--r--fonts/merriweather/latex/OT1Merriwthr-Sup.fd145
-rw-r--r--fonts/merriweather/latex/OT1Merriwthr-TLF.fd253
-rw-r--r--fonts/merriweather/latex/OT1Merriwthr-TOsF.fd253
-rw-r--r--fonts/merriweather/latex/OT1MerriwthrSans-LF.fd253
-rw-r--r--fonts/merriweather/latex/OT1MerriwthrSans-OsF.fd208
-rw-r--r--fonts/merriweather/latex/OT1MerriwthrSans-Sup.fd120
-rw-r--r--fonts/merriweather/latex/OT1MerriwthrSans-TLF.fd253
-rw-r--r--fonts/merriweather/latex/OT1MerriwthrSans-TOsF.fd253
-rw-r--r--fonts/merriweather/latex/T1Merriwthr-LF.fd253
-rw-r--r--fonts/merriweather/latex/T1Merriwthr-OsF.fd212
-rw-r--r--fonts/merriweather/latex/T1Merriwthr-Sup.fd145
-rw-r--r--fonts/merriweather/latex/T1Merriwthr-TLF.fd253
-rw-r--r--fonts/merriweather/latex/T1Merriwthr-TOsF.fd253
-rw-r--r--fonts/merriweather/latex/T1MerriwthrSans-LF.fd253
-rw-r--r--fonts/merriweather/latex/T1MerriwthrSans-OsF.fd208
-rw-r--r--fonts/merriweather/latex/T1MerriwthrSans-Sup.fd120
-rw-r--r--fonts/merriweather/latex/T1MerriwthrSans-TLF.fd253
-rw-r--r--fonts/merriweather/latex/T1MerriwthrSans-TOsF.fd253
-rw-r--r--fonts/merriweather/latex/TS1Merriwthr-LF.fd145
-rw-r--r--fonts/merriweather/latex/TS1Merriwthr-OsF.fd124
-rw-r--r--fonts/merriweather/latex/TS1Merriwthr-TLF.fd145
-rw-r--r--fonts/merriweather/latex/TS1Merriwthr-TOsF.fd145
-rw-r--r--fonts/merriweather/latex/TS1MerriwthrSans-LF.fd145
-rw-r--r--fonts/merriweather/latex/TS1MerriwthrSans-OsF.fd120
-rw-r--r--fonts/merriweather/latex/TS1MerriwthrSans-TLF.fd145
-rw-r--r--fonts/merriweather/latex/TS1MerriwthrSans-TOsF.fd145
-rw-r--r--fonts/merriweather/latex/merriweather.sty251
-rw-r--r--fonts/merriweather/map/merriweather.map645
-rw-r--r--fonts/merriweather/opentype/Merriweather-Black.otfbin0 -> 260708 bytes
-rw-r--r--fonts/merriweather/opentype/Merriweather-BlackItalic.otfbin0 -> 233764 bytes
-rw-r--r--fonts/merriweather/opentype/Merriweather-Bold.otfbin0 -> 269484 bytes
-rw-r--r--fonts/merriweather/opentype/Merriweather-BoldItalic.otfbin0 -> 249400 bytes
-rw-r--r--fonts/merriweather/opentype/Merriweather-Italic.otfbin0 -> 247644 bytes
-rw-r--r--fonts/merriweather/opentype/Merriweather-Light.otfbin0 -> 251464 bytes
-rw-r--r--fonts/merriweather/opentype/Merriweather-LightItalic.otfbin0 -> 235128 bytes
-rw-r--r--fonts/merriweather/opentype/Merriweather-Regular.otfbin0 -> 265232 bytes
-rw-r--r--fonts/merriweather/opentype/MerriweatherSans-Bold.otfbin0 -> 132764 bytes
-rw-r--r--fonts/merriweather/opentype/MerriweatherSans-BoldItalic.otfbin0 -> 121036 bytes
-rw-r--r--fonts/merriweather/opentype/MerriweatherSans-ExtraBold.otfbin0 -> 120684 bytes
-rw-r--r--fonts/merriweather/opentype/MerriweatherSans-ExtraBoldItalic.otfbin0 -> 107192 bytes
-rw-r--r--fonts/merriweather/opentype/MerriweatherSans-Italic.otfbin0 -> 104464 bytes
-rw-r--r--fonts/merriweather/opentype/MerriweatherSans-Light.otfbin0 -> 119420 bytes
-rw-r--r--fonts/merriweather/opentype/MerriweatherSans-LightItalic.otfbin0 -> 101264 bytes
-rw-r--r--fonts/merriweather/opentype/MerriweatherSans-Regular.otfbin0 -> 119412 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-lf-ly1.tfmbin0 -> 40176 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-lf-ot1.tfmbin0 -> 11392 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ly1--base.tfmbin0 -> 1880 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ly1.tfmbin0 -> 33500 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ot1--base.tfmbin0 -> 1384 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ot1.tfmbin0 -> 9108 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-lf-sc-t1--base.tfmbin0 -> 1780 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-lf-sc-t1.tfmbin0 -> 42668 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-lf-t1--base.tfmbin0 -> 1828 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-lf-t1.tfmbin0 -> 54284 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-lf-ts1--base.tfmbin0 -> 1448 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-lf-ts1.tfmbin0 -> 1468 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-osf-ly1.tfmbin0 -> 40036 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-osf-ot1.tfmbin0 -> 11232 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ly1--base.tfmbin0 -> 1876 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ly1.tfmbin0 -> 33528 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ot1--base.tfmbin0 -> 1384 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ot1.tfmbin0 -> 9036 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-osf-sc-t1--base.tfmbin0 -> 1776 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-osf-sc-t1.tfmbin0 -> 42732 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-osf-t1--base.tfmbin0 -> 1820 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-osf-t1.tfmbin0 -> 54140 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-osf-ts1--base.tfmbin0 -> 1448 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-osf-ts1.tfmbin0 -> 1468 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-sup-ly1.tfmbin0 -> 1896 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-sup-ot1.tfmbin0 -> 1396 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-sup-t1--base.tfmbin0 -> 1820 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-sup-t1.tfmbin0 -> 1824 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tlf-ly1.tfmbin0 -> 39328 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tlf-ot1.tfmbin0 -> 10920 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ly1--base.tfmbin0 -> 1856 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ly1.tfmbin0 -> 32464 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ot1--base.tfmbin0 -> 1360 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ot1.tfmbin0 -> 8608 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-t1--base.tfmbin0 -> 1756 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-t1.tfmbin0 -> 41760 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tlf-t1--base.tfmbin0 -> 1800 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tlf-t1.tfmbin0 -> 53592 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tlf-ts1--base.tfmbin0 -> 1448 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tlf-ts1.tfmbin0 -> 1468 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tosf-ly1.tfmbin0 -> 39324 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tosf-ot1.tfmbin0 -> 10916 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ly1--base.tfmbin0 -> 1852 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ly1.tfmbin0 -> 32460 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ot1--base.tfmbin0 -> 1356 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ot1.tfmbin0 -> 8604 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-t1--base.tfmbin0 -> 1752 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-t1.tfmbin0 -> 41756 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tosf-t1--base.tfmbin0 -> 1796 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tosf-t1.tfmbin0 -> 53588 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tosf-ts1--base.tfmbin0 -> 1448 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Black-tosf-ts1.tfmbin0 -> 1468 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ly1.tfmbin0 -> 47936 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ot1.tfmbin0 -> 13124 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ly1--base.tfmbin0 -> 2064 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ly1.tfmbin0 -> 42552 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ot1--base.tfmbin0 -> 1500 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ot1.tfmbin0 -> 11280 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-t1--base.tfmbin0 -> 1952 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-t1.tfmbin0 -> 48956 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-t1--base.tfmbin0 -> 1976 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-t1.tfmbin0 -> 60420 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ts1--base.tfmbin0 -> 1488 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ts1.tfmbin0 -> 1504 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ly1.tfmbin0 -> 47056 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ot1.tfmbin0 -> 12700 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ly1--base.tfmbin0 -> 2072 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ly1.tfmbin0 -> 42188 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ot1--base.tfmbin0 -> 1500 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ot1.tfmbin0 -> 11200 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-t1--base.tfmbin0 -> 1952 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-t1.tfmbin0 -> 48872 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-t1--base.tfmbin0 -> 1976 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-t1.tfmbin0 -> 59872 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ts1--base.tfmbin0 -> 1488 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ts1.tfmbin0 -> 1504 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-ly1.tfmbin0 -> 2048 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-ot1.tfmbin0 -> 1504 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-t1--base.tfmbin0 -> 1996 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-t1.tfmbin0 -> 2000 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ly1.tfmbin0 -> 46716 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ot1.tfmbin0 -> 12384 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ly1--base.tfmbin0 -> 2040 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ly1.tfmbin0 -> 41744 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ot1--base.tfmbin0 -> 1468 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ot1.tfmbin0 -> 10784 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-t1--base.tfmbin0 -> 1920 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-t1.tfmbin0 -> 48348 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-t1--base.tfmbin0 -> 1944 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-t1.tfmbin0 -> 59504 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ts1--base.tfmbin0 -> 1488 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ts1.tfmbin0 -> 1504 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ly1.tfmbin0 -> 46716 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ot1.tfmbin0 -> 12384 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ly1--base.tfmbin0 -> 2040 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ly1.tfmbin0 -> 41744 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ot1--base.tfmbin0 -> 1468 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ot1.tfmbin0 -> 10784 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-t1--base.tfmbin0 -> 1920 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-t1.tfmbin0 -> 48348 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-t1--base.tfmbin0 -> 1944 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-t1.tfmbin0 -> 59504 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ts1--base.tfmbin0 -> 1488 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ts1.tfmbin0 -> 1504 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-lf-ly1.tfmbin0 -> 48820 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-lf-ot1.tfmbin0 -> 13692 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ly1--base.tfmbin0 -> 1892 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ly1.tfmbin0 -> 41292 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ot1--base.tfmbin0 -> 1372 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ot1.tfmbin0 -> 11360 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-t1--base.tfmbin0 -> 1776 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-t1.tfmbin0 -> 53244 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-lf-t1--base.tfmbin0 -> 1816 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-lf-t1.tfmbin0 -> 65892 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-lf-ts1--base.tfmbin0 -> 1448 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-lf-ts1.tfmbin0 -> 1460 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-osf-ly1.tfmbin1936 -> 48608 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-osf-ot1.tfmbin1396 -> 13536 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ly1--base.tfmbin0 -> 1888 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ly1.tfmbin0 -> 41264 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ot1--base.tfmbin0 -> 1368 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ot1.tfmbin0 -> 11288 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-t1--base.tfmbin0 -> 1772 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-t1.tfmbin0 -> 53280 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-osf-t1--base.tfmbin1836 -> 1812 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-osf-t1.tfmbin1884 -> 65708 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-osf-ts1--base.tfmbin1412 -> 1448 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-osf-ts1.tfmbin1424 -> 1460 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-sup-ly1.tfmbin0 -> 1896 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-sup-ot1.tfmbin0 -> 1392 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-sup-t1--base.tfmbin0 -> 1816 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-sup-t1.tfmbin0 -> 1820 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tlf-ly1.tfmbin0 -> 47644 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tlf-ot1.tfmbin0 -> 13108 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ly1--base.tfmbin0 -> 1868 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ly1.tfmbin0 -> 39952 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ot1--base.tfmbin0 -> 1348 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ot1.tfmbin0 -> 10728 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-t1--base.tfmbin0 -> 1752 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-t1.tfmbin0 -> 52116 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tlf-t1--base.tfmbin0 -> 1792 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tlf-t1.tfmbin0 -> 64960 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tlf-ts1--base.tfmbin0 -> 1448 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tlf-ts1.tfmbin0 -> 1460 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tosf-ly1.tfmbin0 -> 47640 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tosf-ot1.tfmbin0 -> 13104 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ly1--base.tfmbin0 -> 1864 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ly1.tfmbin0 -> 39948 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ot1--base.tfmbin0 -> 1344 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ot1.tfmbin0 -> 10724 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-t1--base.tfmbin0 -> 1748 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-t1.tfmbin0 -> 52112 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tosf-t1--base.tfmbin0 -> 1788 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tosf-t1.tfmbin0 -> 64956 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tosf-ts1--base.tfmbin0 -> 1448 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Bold-tosf-ts1.tfmbin0 -> 1460 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ly1.tfmbin0 -> 62572 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ot1.tfmbin0 -> 16372 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ly1--base.tfmbin0 -> 2068 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ly1.tfmbin0 -> 53280 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ot1--base.tfmbin0 -> 1488 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ot1.tfmbin0 -> 14108 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-t1--base.tfmbin0 -> 1952 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-t1.tfmbin0 -> 62112 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-t1--base.tfmbin0 -> 1976 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-t1.tfmbin0 -> 81580 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ts1--base.tfmbin0 -> 1488 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ts1.tfmbin0 -> 1500 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ly1.tfmbin2036 -> 61616 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ot1.tfmbin1504 -> 16000 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ly1--base.tfmbin0 -> 2064 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ly1.tfmbin0 -> 52780 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ot1--base.tfmbin0 -> 1484 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ot1.tfmbin0 -> 14072 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-t1--base.tfmbin0 -> 1952 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-t1.tfmbin0 -> 61920 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-t1--base.tfmbin1980 -> 1980 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-t1.tfmbin2028 -> 81156 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ts1--base.tfmbin1412 -> 1488 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ts1.tfmbin1432 -> 1500 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-ly1.tfmbin0 -> 2048 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-ot1.tfmbin0 -> 1472 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-t1--base.tfmbin0 -> 1984 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-t1.tfmbin0 -> 1988 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ly1.tfmbin0 -> 60788 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ot1.tfmbin0 -> 15396 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ly1--base.tfmbin0 -> 2036 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ly1.tfmbin0 -> 51880 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ot1--base.tfmbin0 -> 1452 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ot1.tfmbin0 -> 13356 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-t1--base.tfmbin0 -> 1920 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-t1.tfmbin0 -> 60896 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-t1--base.tfmbin0 -> 1940 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-t1.tfmbin0 -> 80248 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ts1--base.tfmbin0 -> 1488 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ts1.tfmbin0 -> 1500 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ly1.tfmbin0 -> 60788 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ot1.tfmbin0 -> 15396 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ly1--base.tfmbin0 -> 2036 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ly1.tfmbin0 -> 51880 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ot1--base.tfmbin0 -> 1452 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ot1.tfmbin0 -> 13356 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-t1--base.tfmbin0 -> 1920 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-t1.tfmbin0 -> 60896 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-t1--base.tfmbin0 -> 1940 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-t1.tfmbin0 -> 80248 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ts1--base.tfmbin0 -> 1488 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ts1.tfmbin0 -> 1500 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-lf-ly1.tfmbin0 -> 62432 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-lf-ot1.tfmbin0 -> 16312 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ly1--base.tfmbin0 -> 2028 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ly1.tfmbin0 -> 53204 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ot1--base.tfmbin0 -> 1448 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ot1.tfmbin0 -> 14056 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-t1--base.tfmbin0 -> 1904 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-t1.tfmbin0 -> 62020 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-lf-t1--base.tfmbin0 -> 1944 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-lf-t1.tfmbin0 -> 81392 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-lf-ts1--base.tfmbin0 -> 1484 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-lf-ts1.tfmbin0 -> 1488 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-osf-ly1.tfmbin1968 -> 61488 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-osf-ot1.tfmbin1452 -> 15952 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ly1--base.tfmbin0 -> 2028 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ly1.tfmbin0 -> 52688 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ot1--base.tfmbin0 -> 1448 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ot1.tfmbin0 -> 14000 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-t1--base.tfmbin0 -> 1900 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-t1.tfmbin0 -> 61804 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-osf-t1--base.tfmbin1924 -> 1940 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-osf-t1.tfmbin1972 -> 80972 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-osf-ts1--base.tfmbin1400 -> 1484 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-osf-ts1.tfmbin1416 -> 1488 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-sup-ly1.tfmbin0 -> 2028 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-sup-ot1.tfmbin0 -> 1464 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-sup-t1--base.tfmbin0 -> 1964 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-sup-t1.tfmbin0 -> 1968 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tlf-ly1.tfmbin0 -> 60664 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tlf-ot1.tfmbin0 -> 15352 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ly1--base.tfmbin0 -> 1996 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ly1.tfmbin0 -> 51792 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ot1--base.tfmbin0 -> 1416 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ot1.tfmbin0 -> 13300 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-t1--base.tfmbin0 -> 1868 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-t1.tfmbin0 -> 60788 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tlf-t1--base.tfmbin0 -> 1904 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tlf-t1.tfmbin0 -> 80072 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tlf-ts1--base.tfmbin0 -> 1484 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tlf-ts1.tfmbin0 -> 1488 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tosf-ly1.tfmbin0 -> 60660 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tosf-ot1.tfmbin0 -> 15348 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ly1--base.tfmbin0 -> 1992 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ly1.tfmbin0 -> 51788 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ot1--base.tfmbin0 -> 1412 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ot1.tfmbin0 -> 13296 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-t1--base.tfmbin0 -> 1864 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-t1.tfmbin0 -> 60784 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tosf-t1--base.tfmbin0 -> 1900 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tosf-t1.tfmbin0 -> 80068 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tosf-ts1--base.tfmbin0 -> 1484 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Italic-tosf-ts1.tfmbin0 -> 1488 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-lf-ly1.tfmbin0 -> 38992 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-lf-ot1.tfmbin0 -> 10668 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ly1--base.tfmbin0 -> 1844 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ly1.tfmbin0 -> 35188 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ot1--base.tfmbin0 -> 1352 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ot1.tfmbin0 -> 9404 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-lf-sc-t1--base.tfmbin0 -> 1756 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-lf-sc-t1.tfmbin0 -> 43728 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-lf-t1--base.tfmbin0 -> 1776 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-lf-t1.tfmbin0 -> 51268 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-lf-ts1--base.tfmbin0 -> 1428 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-lf-ts1.tfmbin0 -> 1444 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-osf-ly1.tfmbin1900 -> 38820 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-osf-ot1.tfmbin1392 -> 10588 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ly1--base.tfmbin0 -> 1840 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ly1.tfmbin0 -> 35128 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ot1--base.tfmbin0 -> 1352 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ot1.tfmbin0 -> 9324 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-osf-sc-t1--base.tfmbin0 -> 1756 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-osf-sc-t1.tfmbin0 -> 43688 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-osf-t1--base.tfmbin1812 -> 1788 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-osf-t1.tfmbin1860 -> 51100 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-osf-ts1--base.tfmbin1404 -> 1428 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-osf-ts1.tfmbin1416 -> 1444 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-sup-ly1.tfmbin0 -> 1840 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-sup-ot1.tfmbin0 -> 1360 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-sup-t1--base.tfmbin0 -> 1776 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-sup-t1.tfmbin0 -> 1780 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tlf-ly1.tfmbin0 -> 38032 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tlf-ot1.tfmbin0 -> 10236 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ly1--base.tfmbin0 -> 1816 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ly1.tfmbin0 -> 34100 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ot1--base.tfmbin0 -> 1324 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ot1.tfmbin0 -> 8896 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-t1--base.tfmbin0 -> 1728 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-t1.tfmbin0 -> 42804 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tlf-t1--base.tfmbin0 -> 1760 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tlf-t1.tfmbin0 -> 50508 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tlf-ts1--base.tfmbin0 -> 1428 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tlf-ts1.tfmbin0 -> 1444 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tosf-ly1.tfmbin0 -> 38032 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tosf-ot1.tfmbin0 -> 10236 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ly1--base.tfmbin0 -> 1816 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ly1.tfmbin0 -> 34100 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ot1--base.tfmbin0 -> 1324 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ot1.tfmbin0 -> 8896 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-t1--base.tfmbin0 -> 1728 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-t1.tfmbin0 -> 42804 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tosf-t1--base.tfmbin0 -> 1760 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tosf-t1.tfmbin0 -> 50508 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tosf-ts1--base.tfmbin0 -> 1428 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Light-tosf-ts1.tfmbin0 -> 1444 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightIt-osf-ly1.tfmbin1928 -> 0 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightIt-osf-ot1.tfmbin1428 -> 0 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightIt-osf-t1--base.tfmbin1892 -> 0 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightIt-osf-t1.tfmbin1940 -> 0 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightIt-osf-ts1--base.tfmbin1384 -> 0 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightIt-osf-ts1.tfmbin1400 -> 0 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ly1.tfmbin0 -> 42640 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ot1.tfmbin0 -> 11252 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ly1--base.tfmbin0 -> 2000 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ly1.tfmbin0 -> 35276 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ot1--base.tfmbin0 -> 1424 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ot1.tfmbin0 -> 9628 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-t1--base.tfmbin0 -> 1872 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-t1.tfmbin0 -> 40636 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-lf-t1--base.tfmbin0 -> 1956 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-lf-t1.tfmbin0 -> 58612 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ts1--base.tfmbin0 -> 1480 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ts1.tfmbin0 -> 1484 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ly1.tfmbin0 -> 42072 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ot1.tfmbin0 -> 11108 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ly1--base.tfmbin0 -> 2024 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ly1.tfmbin0 -> 34960 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ot1--base.tfmbin0 -> 1448 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ot1.tfmbin0 -> 9624 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-t1--base.tfmbin0 -> 1896 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-t1.tfmbin0 -> 40508 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-osf-t1--base.tfmbin0 -> 1956 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-osf-t1.tfmbin0 -> 58488 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ts1--base.tfmbin0 -> 1480 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ts1.tfmbin0 -> 1484 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-sup-ly1.tfmbin0 -> 2020 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-sup-ot1.tfmbin0 -> 1476 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-sup-t1--base.tfmbin0 -> 1968 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-sup-t1.tfmbin0 -> 1972 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ly1.tfmbin0 -> 41400 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ot1.tfmbin0 -> 10660 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ly1--base.tfmbin0 -> 1988 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ly1.tfmbin0 -> 34276 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ot1--base.tfmbin0 -> 1412 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ot1.tfmbin0 -> 9124 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-t1--base.tfmbin0 -> 1856 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-t1.tfmbin0 -> 39708 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-t1--base.tfmbin0 -> 1916 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-t1.tfmbin0 -> 57744 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ts1--base.tfmbin0 -> 1480 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ts1.tfmbin0 -> 1484 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ly1.tfmbin0 -> 41396 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ot1.tfmbin0 -> 10656 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ly1--base.tfmbin0 -> 1984 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ly1.tfmbin0 -> 34272 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ot1--base.tfmbin0 -> 1408 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ot1.tfmbin0 -> 9120 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-t1--base.tfmbin0 -> 1856 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-t1.tfmbin0 -> 39708 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-t1--base.tfmbin0 -> 1916 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-t1.tfmbin0 -> 57744 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ts1--base.tfmbin0 -> 1480 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ts1.tfmbin0 -> 1484 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-lf-ly1.tfmbin0 -> 49112 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-lf-ot1.tfmbin0 -> 13832 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ly1--base.tfmbin0 -> 1872 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ly1.tfmbin0 -> 41268 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ot1--base.tfmbin0 -> 1372 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ot1.tfmbin0 -> 11400 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-t1--base.tfmbin0 -> 1772 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-t1.tfmbin0 -> 53244 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-lf-t1--base.tfmbin0 -> 1800 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-lf-t1.tfmbin0 -> 66376 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-lf-ts1--base.tfmbin0 -> 1452 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-lf-ts1.tfmbin0 -> 1464 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-osf-ly1.tfmbin1924 -> 48932 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-osf-ot1.tfmbin1396 -> 13704 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ly1--base.tfmbin0 -> 1880 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ly1.tfmbin0 -> 41248 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ot1--base.tfmbin0 -> 1376 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ot1.tfmbin0 -> 11328 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-t1--base.tfmbin0 -> 1776 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-t1.tfmbin0 -> 53272 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-osf-t1--base.tfmbin1836 -> 1808 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-osf-t1.tfmbin1884 -> 66208 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-osf-ts1--base.tfmbin1412 -> 1452 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-osf-ts1.tfmbin1420 -> 1464 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-sup-ly1.tfmbin0 -> 1880 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-sup-ot1.tfmbin0 -> 1380 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-sup-t1--base.tfmbin0 -> 1804 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-sup-t1.tfmbin0 -> 1808 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tlf-ly1.tfmbin0 -> 47944 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tlf-ot1.tfmbin0 -> 13260 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ly1--base.tfmbin0 -> 1848 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ly1.tfmbin0 -> 39924 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ot1--base.tfmbin0 -> 1344 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ot1.tfmbin0 -> 10756 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-t1--base.tfmbin0 -> 1744 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-t1.tfmbin0 -> 52100 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tlf-t1--base.tfmbin0 -> 1776 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tlf-t1.tfmbin0 -> 65444 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tlf-ts1--base.tfmbin0 -> 1452 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tlf-ts1.tfmbin0 -> 1464 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tosf-ly1.tfmbin0 -> 47944 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tosf-ot1.tfmbin0 -> 13260 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ly1--base.tfmbin0 -> 1848 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ly1.tfmbin0 -> 39924 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ot1--base.tfmbin0 -> 1344 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ot1.tfmbin0 -> 10756 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-t1--base.tfmbin0 -> 1744 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-t1.tfmbin0 -> 52100 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tosf-t1--base.tfmbin0 -> 1776 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tosf-t1.tfmbin0 -> 65444 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tosf-ts1--base.tfmbin0 -> 1452 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-Regular-tosf-ts1.tfmbin0 -> 1464 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ly1.tfmbin2060 -> 0 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ot1.tfmbin1524 -> 0 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-t1--base.tfmbin2004 -> 0 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-t1.tfmbin2052 -> 0 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ts1--base.tfmbin1420 -> 0 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ts1.tfmbin1440 -> 0 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ly1.tfmbin1948 -> 0 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ot1.tfmbin1416 -> 0 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-UltraBold-osf-t1--base.tfmbin1860 -> 0 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-UltraBold-osf-t1.tfmbin1908 -> 0 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ts1--base.tfmbin1412 -> 0 bytes
-rw-r--r--fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ts1.tfmbin1424 -> 0 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ly1.tfmbin0 -> 23148 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ot1.tfmbin0 -> 6200 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ly1--base.tfmbin0 -> 1908 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ly1.tfmbin0 -> 18464 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ot1--base.tfmbin0 -> 1372 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ot1.tfmbin0 -> 5028 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-t1--base.tfmbin0 -> 1812 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-t1.tfmbin0 -> 21864 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-lf-t1--base.tfmbin0 -> 1852 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-lf-t1.tfmbin0 -> 29004 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ts1--base.tfmbin0 -> 1452 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ts1.tfmbin0 -> 1472 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ly1.tfmbin1936 -> 22756 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ot1.tfmbin1428 -> 6064 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ly1--base.tfmbin0 -> 1908 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ly1.tfmbin0 -> 18472 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ot1--base.tfmbin0 -> 1368 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ot1.tfmbin0 -> 4940 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-t1--base.tfmbin0 -> 1812 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-t1.tfmbin0 -> 21840 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-osf-t1--base.tfmbin1840 -> 1856 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-osf-t1.tfmbin1908 -> 28608 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ts1--base.tfmbin1364 -> 1452 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ts1.tfmbin1384 -> 1472 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-sup-ly1.tfmbin1840 -> 1888 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-sup-ot1.tfmbin1352 -> 1364 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-sup-t1--base.tfmbin1816 -> 1840 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-sup-t1.tfmbin1820 -> 1844 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ly1.tfmbin0 -> 22180 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ot1.tfmbin0 -> 5780 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ly1--base.tfmbin0 -> 1880 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ly1.tfmbin0 -> 17728 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ot1--base.tfmbin0 -> 1340 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ot1.tfmbin0 -> 4576 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-t1--base.tfmbin0 -> 1784 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-t1.tfmbin0 -> 20992 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-t1--base.tfmbin0 -> 1824 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-t1.tfmbin0 -> 27948 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ts1--base.tfmbin0 -> 1452 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ts1.tfmbin0 -> 1472 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ly1.tfmbin0 -> 22184 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ot1.tfmbin0 -> 5784 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ly1--base.tfmbin0 -> 1884 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ly1.tfmbin0 -> 17732 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ot1--base.tfmbin0 -> 1344 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ot1.tfmbin0 -> 4580 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-t1--base.tfmbin0 -> 1788 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-t1.tfmbin0 -> 20996 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-t1--base.tfmbin0 -> 1828 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-t1.tfmbin0 -> 27952 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ts1--base.tfmbin0 -> 1452 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ts1.tfmbin0 -> 1472 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ly1.tfmbin0 -> 13348 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ot1.tfmbin0 -> 4720 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ly1--base.tfmbin0 -> 2032 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ly1.tfmbin0 -> 13216 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ot1--base.tfmbin0 -> 1480 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ot1.tfmbin0 -> 3940 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-t1--base.tfmbin0 -> 1952 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-t1.tfmbin0 -> 17532 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-t1--base.tfmbin0 -> 2024 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-t1.tfmbin0 -> 17624 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ts1--base.tfmbin0 -> 1476 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ts1.tfmbin0 -> 1480 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ly1.tfmbin2048 -> 13260 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ot1.tfmbin1480 -> 4652 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ly1--base.tfmbin0 -> 2028 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ly1.tfmbin0 -> 13316 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ot1--base.tfmbin0 -> 1476 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ot1.tfmbin0 -> 3976 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-t1--base.tfmbin0 -> 1948 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-t1.tfmbin0 -> 17572 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-t1--base.tfmbin1992 -> 2008 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-t1.tfmbin2060 -> 17476 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ts1--base.tfmbin1412 -> 1476 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ts1.tfmbin1428 -> 1480 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-ly1.tfmbin1952 -> 2008 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-ot1.tfmbin1408 -> 1460 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-t1--base.tfmbin1972 -> 1992 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-t1.tfmbin1976 -> 1996 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ly1.tfmbin0 -> 12648 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ot1.tfmbin0 -> 4316 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ly1--base.tfmbin0 -> 2000 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ly1.tfmbin0 -> 12728 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ot1--base.tfmbin0 -> 1452 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ot1.tfmbin0 -> 3672 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-t1--base.tfmbin0 -> 1924 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-t1.tfmbin0 -> 16824 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-t1--base.tfmbin0 -> 1988 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-t1.tfmbin0 -> 16704 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ts1--base.tfmbin0 -> 1476 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ts1.tfmbin0 -> 1480 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ly1.tfmbin0 -> 12648 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ot1.tfmbin0 -> 4312 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ly1--base.tfmbin0 -> 2000 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ly1.tfmbin0 -> 12728 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ot1--base.tfmbin0 -> 1448 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ot1.tfmbin0 -> 3668 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-t1--base.tfmbin0 -> 1920 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-t1.tfmbin0 -> 16820 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-t1--base.tfmbin0 -> 1984 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-t1.tfmbin0 -> 16700 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ts1--base.tfmbin0 -> 1476 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ts1.tfmbin0 -> 1480 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ly1.tfmbin0 -> 22284 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ot1.tfmbin0 -> 5804 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ly1--base.tfmbin0 -> 1860 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ly1.tfmbin0 -> 18024 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ot1--base.tfmbin0 -> 1344 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ot1.tfmbin0 -> 4772 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-t1--base.tfmbin0 -> 1772 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-t1.tfmbin0 -> 21380 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-t1--base.tfmbin0 -> 1816 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-t1.tfmbin0 -> 28024 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ts1--base.tfmbin0 -> 1420 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ts1.tfmbin0 -> 1436 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ly1.tfmbin1964 -> 21912 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ot1.tfmbin1444 -> 5668 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ly1--base.tfmbin0 -> 1864 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ly1.tfmbin0 -> 17912 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ot1--base.tfmbin0 -> 1356 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ot1.tfmbin0 -> 4660 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-t1--base.tfmbin0 -> 1784 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-t1.tfmbin0 -> 21248 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-t1--base.tfmbin1856 -> 1824 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-t1.tfmbin1924 -> 27648 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ts1--base.tfmbin1380 -> 1420 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ts1.tfmbin1400 -> 1436 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-ly1.tfmbin1868 -> 1864 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-ot1.tfmbin1372 -> 1360 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-t1--base.tfmbin1836 -> 1816 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-t1.tfmbin1840 -> 1820 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ly1.tfmbin0 -> 21408 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ot1.tfmbin0 -> 5412 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ly1--base.tfmbin0 -> 1836 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ly1.tfmbin0 -> 17320 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ot1--base.tfmbin0 -> 1320 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ot1.tfmbin0 -> 4360 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-t1--base.tfmbin0 -> 1748 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-t1.tfmbin0 -> 20548 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-t1--base.tfmbin0 -> 1796 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-t1.tfmbin0 -> 27068 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ts1--base.tfmbin0 -> 1420 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ts1.tfmbin0 -> 1436 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ly1.tfmbin0 -> 21408 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ot1.tfmbin0 -> 5412 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ly1--base.tfmbin0 -> 1836 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ly1.tfmbin0 -> 17320 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ot1--base.tfmbin0 -> 1320 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ot1.tfmbin0 -> 4360 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-t1--base.tfmbin0 -> 1748 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-t1.tfmbin0 -> 20548 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-t1--base.tfmbin0 -> 1796 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-t1.tfmbin0 -> 27068 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ts1--base.tfmbin0 -> 1420 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ts1.tfmbin0 -> 1436 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ly1.tfmbin0 -> 12876 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ot1.tfmbin0 -> 4436 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ly1--base.tfmbin0 -> 1956 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ly1.tfmbin0 -> 12420 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ot1--base.tfmbin0 -> 1452 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ot1.tfmbin0 -> 3648 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-t1--base.tfmbin0 -> 1892 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-t1.tfmbin0 -> 16536 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-t1--base.tfmbin0 -> 1948 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-t1.tfmbin0 -> 17096 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ts1--base.tfmbin0 -> 1468 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ts1.tfmbin0 -> 1472 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ly1.tfmbin2084 -> 12820 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ot1.tfmbin1512 -> 4392 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ly1--base.tfmbin0 -> 1964 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ly1.tfmbin0 -> 12596 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ot1--base.tfmbin0 -> 1464 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ot1.tfmbin0 -> 3736 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-t1--base.tfmbin0 -> 1900 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-t1.tfmbin0 -> 16692 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-t1--base.tfmbin2016 -> 1952 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-t1.tfmbin2084 -> 16996 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ts1--base.tfmbin1420 -> 1468 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ts1.tfmbin1432 -> 1472 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-ly1.tfmbin1984 -> 1940 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-ot1.tfmbin1436 -> 1436 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-t1--base.tfmbin1992 -> 1936 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-t1.tfmbin1996 -> 1940 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ly1.tfmbin0 -> 12220 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ot1.tfmbin0 -> 4072 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1--base.tfmbin0 -> 1932 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1.tfmbin0 -> 12020 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1--base.tfmbin0 -> 1432 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1.tfmbin0 -> 3436 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-t1--base.tfmbin0 -> 1872 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-t1.tfmbin0 -> 15956 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-t1--base.tfmbin0 -> 1924 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-t1.tfmbin0 -> 16236 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ts1--base.tfmbin0 -> 1468 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ts1.tfmbin0 -> 1472 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ly1.tfmbin0 -> 12220 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ot1.tfmbin0 -> 4068 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1--base.tfmbin0 -> 1932 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1.tfmbin0 -> 12020 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1--base.tfmbin0 -> 1428 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1.tfmbin0 -> 3432 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-t1--base.tfmbin0 -> 1868 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-t1.tfmbin0 -> 15952 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-t1--base.tfmbin0 -> 1920 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-t1.tfmbin0 -> 16232 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ts1--base.tfmbin0 -> 1468 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ts1.tfmbin0 -> 1472 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ly1.tfmbin0 -> 12180 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ot1.tfmbin0 -> 4316 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ly1--base.tfmbin0 -> 2012 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ly1.tfmbin0 -> 11428 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ot1--base.tfmbin0 -> 1444 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ot1.tfmbin0 -> 3536 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-t1--base.tfmbin0 -> 1916 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-t1.tfmbin0 -> 14904 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-lf-t1--base.tfmbin0 -> 1956 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-lf-t1.tfmbin0 -> 16144 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ts1--base.tfmbin0 -> 1460 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ts1.tfmbin0 -> 1472 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ly1.tfmbin1936 -> 12236 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ot1.tfmbin1428 -> 4288 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ly1--base.tfmbin0 -> 2016 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ly1.tfmbin0 -> 11676 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ot1--base.tfmbin0 -> 1448 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ot1.tfmbin0 -> 3616 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-t1--base.tfmbin0 -> 1920 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-t1.tfmbin0 -> 15112 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-osf-t1--base.tfmbin1876 -> 1960 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-osf-t1.tfmbin1944 -> 16124 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ts1--base.tfmbin1380 -> 1460 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ts1.tfmbin1396 -> 1472 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-sup-ly1.tfmbin1848 -> 1972 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-sup-ot1.tfmbin1356 -> 1416 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-sup-t1--base.tfmbin1856 -> 1940 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-sup-t1.tfmbin1860 -> 1944 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ly1.tfmbin0 -> 11672 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ot1.tfmbin0 -> 4004 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ly1--base.tfmbin0 -> 1976 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ly1.tfmbin0 -> 11128 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ot1--base.tfmbin0 -> 1412 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ot1.tfmbin0 -> 3344 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-t1--base.tfmbin0 -> 1884 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-t1.tfmbin0 -> 14436 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-t1--base.tfmbin0 -> 1924 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-t1.tfmbin0 -> 15440 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ts1--base.tfmbin0 -> 1460 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ts1.tfmbin0 -> 1472 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ly1.tfmbin0 -> 11676 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ot1.tfmbin0 -> 4004 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ly1--base.tfmbin0 -> 1980 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ly1.tfmbin0 -> 11132 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ot1--base.tfmbin0 -> 1412 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ot1.tfmbin0 -> 3344 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-t1--base.tfmbin0 -> 1884 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-t1.tfmbin0 -> 14436 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-t1--base.tfmbin0 -> 1924 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-t1.tfmbin0 -> 15440 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ts1--base.tfmbin0 -> 1460 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ts1.tfmbin0 -> 1472 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-lf-ly1.tfmbin0 -> 21552 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-lf-ot1.tfmbin0 -> 5656 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ly1--base.tfmbin0 -> 1852 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ly1.tfmbin0 -> 17396 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ot1--base.tfmbin0 -> 1344 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ot1.tfmbin0 -> 4644 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-t1--base.tfmbin0 -> 1776 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-t1.tfmbin0 -> 20572 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-lf-t1--base.tfmbin0 -> 1788 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-lf-t1.tfmbin0 -> 27004 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-lf-ts1--base.tfmbin0 -> 1400 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-lf-ts1.tfmbin0 -> 1420 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-osf-ly1.tfmbin1908 -> 21148 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-osf-ot1.tfmbin1400 -> 5496 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ly1--base.tfmbin0 -> 1848 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ly1.tfmbin0 -> 17368 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ot1--base.tfmbin0 -> 1340 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ot1.tfmbin0 -> 4532 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-t1--base.tfmbin0 -> 1772 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-t1.tfmbin0 -> 20532 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-osf-t1--base.tfmbin1816 -> 1788 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-osf-t1.tfmbin1884 -> 26608 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-osf-ts1--base.tfmbin1364 -> 1400 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-osf-ts1.tfmbin1384 -> 1420 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-sup-ly1.tfmbin1812 -> 1832 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-sup-ot1.tfmbin1324 -> 1328 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-sup-t1--base.tfmbin1792 -> 1788 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-sup-t1.tfmbin1796 -> 1792 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ly1.tfmbin0 -> 20628 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ot1.tfmbin0 -> 5276 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ly1--base.tfmbin0 -> 1820 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ly1.tfmbin0 -> 16636 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ot1--base.tfmbin0 -> 1312 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ot1.tfmbin0 -> 4216 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-t1--base.tfmbin0 -> 1744 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-t1.tfmbin0 -> 19704 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tlf-t1--base.tfmbin0 -> 1772 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tlf-t1.tfmbin0 -> 26024 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ts1--base.tfmbin0 -> 1400 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ts1.tfmbin0 -> 1420 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ly1.tfmbin0 -> 20628 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ot1.tfmbin0 -> 5276 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ly1--base.tfmbin0 -> 1820 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ly1.tfmbin0 -> 16636 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ot1--base.tfmbin0 -> 1312 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ot1.tfmbin0 -> 4216 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-t1--base.tfmbin0 -> 1744 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-t1.tfmbin0 -> 19704 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tosf-t1--base.tfmbin0 -> 1772 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tosf-t1.tfmbin0 -> 26024 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ts1--base.tfmbin0 -> 1400 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ts1.tfmbin0 -> 1420 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ly1.tfmbin0 -> 10652 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ot1.tfmbin0 -> 3928 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ly1--base.tfmbin0 -> 1964 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ly1.tfmbin0 -> 9868 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ot1--base.tfmbin0 -> 1432 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ot1.tfmbin0 -> 3240 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-t1--base.tfmbin0 -> 1884 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-t1.tfmbin0 -> 12528 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-t1--base.tfmbin0 -> 1896 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-t1.tfmbin0 -> 13952 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ts1--base.tfmbin0 -> 1448 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ts1.tfmbin0 -> 1452 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ly1.tfmbin1980 -> 10648 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ot1.tfmbin1452 -> 3880 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ly1--base.tfmbin0 -> 1964 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ly1.tfmbin0 -> 10088 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ot1--base.tfmbin0 -> 1428 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ot1.tfmbin0 -> 3300 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-t1--base.tfmbin0 -> 1884 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-t1.tfmbin0 -> 12680 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-t1--base.tfmbin1888 -> 1884 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-t1.tfmbin1956 -> 13884 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ts1--base.tfmbin1396 -> 1448 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ts1.tfmbin1408 -> 1452 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-ly1.tfmbin1896 -> 1912 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-ot1.tfmbin1392 -> 1392 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-t1--base.tfmbin1880 -> 1872 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-t1.tfmbin1884 -> 1872 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ly1.tfmbin0 -> 10048 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ot1.tfmbin0 -> 3576 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ly1--base.tfmbin0 -> 1940 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ly1.tfmbin0 -> 9600 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ot1--base.tfmbin0 -> 1404 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ot1.tfmbin0 -> 3048 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-t1--base.tfmbin0 -> 1860 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-t1.tfmbin0 -> 12068 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-t1--base.tfmbin0 -> 1860 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-t1.tfmbin0 -> 13132 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ts1--base.tfmbin0 -> 1448 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ts1.tfmbin0 -> 1452 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ly1.tfmbin0 -> 10052 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ot1.tfmbin0 -> 3580 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ly1--base.tfmbin0 -> 1944 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ly1.tfmbin0 -> 9604 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ot1--base.tfmbin0 -> 1408 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ot1.tfmbin0 -> 3052 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-t1--base.tfmbin0 -> 1864 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-t1.tfmbin0 -> 12072 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-t1--base.tfmbin0 -> 1864 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-t1.tfmbin0 -> 13136 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ts1--base.tfmbin0 -> 1448 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ts1.tfmbin0 -> 1452 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ly1.tfmbin0 -> 21572 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ot1.tfmbin0 -> 5704 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ly1--base.tfmbin0 -> 1868 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ly1.tfmbin0 -> 17592 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ot1--base.tfmbin0 -> 1336 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ot1.tfmbin0 -> 4648 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-t1--base.tfmbin0 -> 1780 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-t1.tfmbin0 -> 20928 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-lf-t1--base.tfmbin0 -> 1828 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-lf-t1.tfmbin0 -> 27088 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ts1--base.tfmbin0 -> 1412 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ts1.tfmbin0 -> 1428 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ly1.tfmbin1888 -> 21252 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ot1.tfmbin1396 -> 5580 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ly1--base.tfmbin0 -> 1868 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ly1.tfmbin0 -> 17580 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ot1--base.tfmbin0 -> 1340 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ot1.tfmbin0 -> 4548 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-t1--base.tfmbin0 -> 1784 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-t1.tfmbin0 -> 20864 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-osf-t1--base.tfmbin1792 -> 1824 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-osf-t1.tfmbin1860 -> 26796 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ts1--base.tfmbin1352 -> 1412 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ts1.tfmbin1372 -> 1428 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-sup-ly1.tfmbin1792 -> 1864 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-sup-ot1.tfmbin1320 -> 1340 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-sup-t1--base.tfmbin1768 -> 1812 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-sup-t1.tfmbin1772 -> 1816 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ly1.tfmbin0 -> 20708 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ot1.tfmbin0 -> 5324 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ly1--base.tfmbin0 -> 1840 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ly1.tfmbin0 -> 16908 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ot1--base.tfmbin0 -> 1308 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ot1.tfmbin0 -> 4232 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-t1--base.tfmbin0 -> 1752 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-t1.tfmbin0 -> 20108 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-t1--base.tfmbin0 -> 1792 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-t1.tfmbin0 -> 26192 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ts1--base.tfmbin0 -> 1412 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ts1.tfmbin0 -> 1428 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ly1.tfmbin0 -> 20712 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ot1.tfmbin0 -> 5328 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ly1--base.tfmbin0 -> 1844 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ly1.tfmbin0 -> 16912 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ot1--base.tfmbin0 -> 1312 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ot1.tfmbin0 -> 4236 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-t1--base.tfmbin0 -> 1756 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-t1.tfmbin0 -> 20112 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-t1--base.tfmbin0 -> 1796 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-t1.tfmbin0 -> 26196 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ts1--base.tfmbin0 -> 1412 bytes
-rw-r--r--fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ts1.tfmbin0 -> 1428 bytes
-rw-r--r--fonts/merriweather/truetype/Merriweather-Bold.ttfbin167640 -> 0 bytes
-rw-r--r--fonts/merriweather/truetype/Merriweather-BoldIt.ttfbin175076 -> 0 bytes
-rw-r--r--fonts/merriweather/truetype/Merriweather-Italic.ttfbin174316 -> 0 bytes
-rw-r--r--fonts/merriweather/truetype/Merriweather-Light.ttfbin168640 -> 0 bytes
-rw-r--r--fonts/merriweather/truetype/Merriweather-LightIt.ttfbin175092 -> 0 bytes
-rw-r--r--fonts/merriweather/truetype/Merriweather-Regular.ttfbin170016 -> 0 bytes
-rw-r--r--fonts/merriweather/truetype/Merriweather-UltraBdIt.ttfbin174436 -> 0 bytes
-rw-r--r--fonts/merriweather/truetype/Merriweather-UltraBold.ttfbin170180 -> 0 bytes
-rw-r--r--fonts/merriweather/truetype/MerriweatherSans-Bold.ttfbin88132 -> 0 bytes
-rw-r--r--fonts/merriweather/truetype/MerriweatherSans-BoldItalic.ttfbin90400 -> 0 bytes
-rw-r--r--fonts/merriweather/truetype/MerriweatherSans-ExBoldIt.ttfbin90264 -> 0 bytes
-rw-r--r--fonts/merriweather/truetype/MerriweatherSans-ExtraBold.ttfbin88188 -> 0 bytes
-rw-r--r--fonts/merriweather/truetype/MerriweatherSans-Italic.ttfbin89820 -> 0 bytes
-rw-r--r--fonts/merriweather/truetype/MerriweatherSans-Light.ttfbin87752 -> 0 bytes
-rw-r--r--fonts/merriweather/truetype/MerriweatherSans-LightItalic.ttfbin89356 -> 0 bytes
-rw-r--r--fonts/merriweather/truetype/MerriweatherSans-Regular.ttfbin88316 -> 0 bytes
-rw-r--r--fonts/merriweather/type1/Merriwthr-Black.pfbbin0 -> 378012 bytes
-rw-r--r--fonts/merriweather/type1/Merriwthr-BlackItalic.pfbbin0 -> 325592 bytes
-rw-r--r--fonts/merriweather/type1/Merriwthr-Bold.pfbbin130032 -> 368053 bytes
-rw-r--r--fonts/merriweather/type1/Merriwthr-BoldIt.pfbbin140757 -> 0 bytes
-rw-r--r--fonts/merriweather/type1/Merriwthr-BoldItalic.pfbbin0 -> 331198 bytes
-rw-r--r--fonts/merriweather/type1/Merriwthr-Italic.pfbbin140571 -> 324293 bytes
-rw-r--r--fonts/merriweather/type1/Merriwthr-Light.pfbbin127524 -> 342047 bytes
-rw-r--r--fonts/merriweather/type1/Merriwthr-LightIt.pfbbin141029 -> 0 bytes
-rw-r--r--fonts/merriweather/type1/Merriwthr-LightItalic.pfbbin0 -> 299981 bytes
-rw-r--r--fonts/merriweather/type1/Merriwthr-Regular.pfbbin134279 -> 355472 bytes
-rw-r--r--fonts/merriweather/type1/Merriwthr-UltraBdIt.pfbbin140313 -> 0 bytes
-rw-r--r--fonts/merriweather/type1/Merriwthr-UltraBold.pfbbin129903 -> 0 bytes
-rw-r--r--fonts/merriweather/type1/MerriwthrSans-Bold.pfbbin76203 -> 118266 bytes
-rw-r--r--fonts/merriweather/type1/MerriwthrSans-BoldItalic.pfbbin77839 -> 118981 bytes
-rw-r--r--fonts/merriweather/type1/MerriwthrSans-ExBoldIt.pfbbin76529 -> 0 bytes
-rw-r--r--fonts/merriweather/type1/MerriwthrSans-ExtraBold.pfbbin77136 -> 110715 bytes
-rw-r--r--fonts/merriweather/type1/MerriwthrSans-ExtraBoldItalic.pfbbin0 -> 110380 bytes
-rw-r--r--fonts/merriweather/type1/MerriwthrSans-Italic.pfbbin75833 -> 111241 bytes
-rw-r--r--fonts/merriweather/type1/MerriwthrSans-Light.pfbbin76279 -> 109916 bytes
-rw-r--r--fonts/merriweather/type1/MerriwthrSans-LightItalic.pfbbin78328 -> 110227 bytes
-rw-r--r--fonts/merriweather/type1/MerriwthrSans-Regular.pfbbin76519 -> 110121 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-lf-sc-ly1.vfbin0 -> 1676 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-lf-sc-ot1.vfbin0 -> 772 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-lf-sc-t1.vfbin0 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-lf-t1.vfbin0 -> 1696 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-lf-ts1.vfbin0 -> 580 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-osf-sc-ly1.vfbin0 -> 1680 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-osf-sc-ot1.vfbin0 -> 772 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-osf-sc-t1.vfbin0 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-osf-t1.vfbin0 -> 1696 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-osf-ts1.vfbin0 -> 580 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-sup-t1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-tlf-sc-ly1.vfbin0 -> 1680 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-tlf-sc-ot1.vfbin0 -> 772 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-tlf-sc-t1.vfbin0 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-tlf-t1.vfbin0 -> 1696 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-tlf-ts1.vfbin0 -> 580 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-tosf-sc-ly1.vfbin0 -> 1680 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-tosf-sc-ot1.vfbin0 -> 772 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-tosf-sc-t1.vfbin0 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-tosf-t1.vfbin0 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Black-tosf-ts1.vfbin0 -> 580 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-lf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-lf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-lf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-lf-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-lf-ts1.vfbin0 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-osf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-osf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-osf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-osf-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-osf-ts1.vfbin0 -> 588 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-sup-t1.vfbin0 -> 1692 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-ts1.vfbin0 -> 588 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-ts1.vfbin0 -> 588 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-lf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-lf-sc-ot1.vfbin0 -> 772 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-lf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-lf-t1.vfbin0 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-lf-ts1.vfbin0 -> 580 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-osf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-osf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-osf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-osf-t1.vfbin1684 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-osf-ts1.vfbin568 -> 580 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-sup-t1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-tlf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-tlf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-tlf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-tlf-t1.vfbin0 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-tlf-ts1.vfbin0 -> 580 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-tosf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-tosf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-tosf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-tosf-t1.vfbin0 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Bold-tosf-ts1.vfbin0 -> 580 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-lf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-lf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-lf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-lf-t1.vfbin0 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-lf-ts1.vfbin0 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-osf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-osf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-osf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-osf-t1.vfbin1692 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-osf-ts1.vfbin572 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-sup-t1.vfbin0 -> 1692 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-ts1.vfbin0 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-ts1.vfbin0 -> 588 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-lf-sc-ly1.vfbin0 -> 1680 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-lf-sc-ot1.vfbin0 -> 772 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-lf-sc-t1.vfbin0 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-lf-t1.vfbin0 -> 1696 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-lf-ts1.vfbin0 -> 580 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-osf-sc-ly1.vfbin0 -> 1680 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-osf-sc-ot1.vfbin0 -> 772 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-osf-sc-t1.vfbin0 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-osf-t1.vfbin1688 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-osf-ts1.vfbin568 -> 580 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-sup-t1.vfbin0 -> 1688 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-tlf-sc-ly1.vfbin0 -> 1680 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-tlf-sc-ot1.vfbin0 -> 772 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-tlf-sc-t1.vfbin0 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-tlf-t1.vfbin0 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-tlf-ts1.vfbin0 -> 580 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-tosf-sc-ly1.vfbin0 -> 1680 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-tosf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-tosf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-tosf-t1.vfbin0 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Italic-tosf-ts1.vfbin0 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-lf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-lf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-lf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-lf-t1.vfbin0 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-lf-ts1.vfbin0 -> 580 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-osf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-osf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-osf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-osf-t1.vfbin1684 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-osf-ts1.vfbin568 -> 580 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-sup-t1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-tlf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-tlf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-tlf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-tlf-t1.vfbin0 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-tlf-ts1.vfbin0 -> 580 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-tosf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-tosf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-tosf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-tosf-t1.vfbin0 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Light-tosf-ts1.vfbin0 -> 580 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightIt-osf-t1.vfbin1688 -> 0 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightIt-osf-ts1.vfbin572 -> 0 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-lf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-lf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-lf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-lf-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-lf-ts1.vfbin0 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-osf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-osf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-osf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-osf-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-osf-ts1.vfbin0 -> 588 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-sup-t1.vfbin0 -> 1692 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-tlf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-tlf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-tlf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-tlf-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-tlf-ts1.vfbin0 -> 588 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-tosf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-tosf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-tosf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-tosf-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-LightItalic-tosf-ts1.vfbin0 -> 588 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-lf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-lf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-lf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-lf-t1.vfbin0 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-lf-ts1.vfbin0 -> 580 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-osf-sc-ly1.vfbin0 -> 1688 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-osf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-osf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-osf-t1.vfbin1688 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-osf-ts1.vfbin572 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-sup-t1.vfbin0 -> 1688 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-tlf-sc-ly1.vfbin0 -> 1688 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-tlf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-tlf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-tlf-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-tlf-ts1.vfbin0 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-tosf-sc-ly1.vfbin0 -> 1688 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-tosf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-tosf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-tosf-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-Regular-tosf-ts1.vfbin0 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-UltraBdIt-osf-t1.vfbin1688 -> 0 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-UltraBdIt-osf-ts1.vfbin572 -> 0 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-UltraBold-osf-t1.vfbin1688 -> 0 bytes
-rw-r--r--fonts/merriweather/vf/Merriwthr-UltraBold-osf-ts1.vfbin572 -> 0 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-lf-sc-ly1.vfbin0 -> 1680 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-lf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-lf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-lf-t1.vfbin0 -> 1716 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-lf-ts1.vfbin0 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-osf-sc-ly1.vfbin0 -> 1680 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-osf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-osf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-osf-t1.vfbin1720 -> 1720 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-osf-ts1.vfbin520 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-sup-t1.vfbin1688 -> 1688 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-tlf-sc-ly1.vfbin0 -> 1680 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-tlf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-tlf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-tlf-t1.vfbin0 -> 1720 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-tlf-ts1.vfbin0 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-tosf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-tosf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-tosf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-tosf-t1.vfbin0 -> 1720 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Bold-tosf-ts1.vfbin0 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-sc-ly1.vfbin0 -> 1688 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-t1.vfbin0 -> 1724 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-ts1.vfbin0 -> 588 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-sc-ly1.vfbin0 -> 1688 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-t1.vfbin1724 -> 1724 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-ts1.vfbin524 -> 588 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-sup-t1.vfbin1696 -> 1696 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-sc-ly1.vfbin0 -> 1688 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-t1.vfbin0 -> 1724 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-ts1.vfbin0 -> 588 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-sc-ly1.vfbin0 -> 1688 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-sc-ot1.vfbin0 -> 784 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-sc-t1.vfbin0 -> 1712 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-t1.vfbin0 -> 1724 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-ts1.vfbin0 -> 592 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-t1.vfbin0 -> 1724 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-ts1.vfbin0 -> 588 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-sc-ly1.vfbin0 -> 1688 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-t1.vfbin1724 -> 1724 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-ts1.vfbin524 -> 588 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-sup-t1.vfbin1692 -> 1692 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-sc-ly1.vfbin0 -> 1688 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-t1.vfbin0 -> 1724 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-ts1.vfbin0 -> 588 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-sc-ly1.vfbin0 -> 1688 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-t1.vfbin0 -> 1724 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-ts1.vfbin0 -> 588 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-sc-ly1.vfbin0 -> 1692 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-sc-ot1.vfbin0 -> 784 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-sc-t1.vfbin0 -> 1712 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-t1.vfbin0 -> 1728 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-ts1.vfbin0 -> 592 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-sc-ly1.vfbin0 -> 1692 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-sc-ot1.vfbin0 -> 788 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-sc-t1.vfbin0 -> 1716 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-ts1.vfbin532 -> 596 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-sup-t1.vfbin1700 -> 1700 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1.vfbin0 -> 1692 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1.vfbin0 -> 788 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-sc-t1.vfbin0 -> 1716 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-t1.vfbin0 -> 1728 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-ts1.vfbin0 -> 596 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1.vfbin0 -> 1692 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1.vfbin0 -> 788 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-sc-t1.vfbin0 -> 1716 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-t1.vfbin0 -> 1732 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-ts1.vfbin0 -> 596 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-lf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-lf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-lf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-lf-t1.vfbin0 -> 1720 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-lf-ts1.vfbin0 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-osf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-osf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-osf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-osf-t1.vfbin1720 -> 1720 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-osf-ts1.vfbin520 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-sup-t1.vfbin1692 -> 1692 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-tlf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-tlf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-tlf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-tlf-t1.vfbin0 -> 1720 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-tlf-ts1.vfbin0 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-tosf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-tosf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-tosf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-tosf-t1.vfbin0 -> 1720 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Italic-tosf-ts1.vfbin0 -> 588 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-lf-sc-ly1.vfbin0 -> 1680 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-lf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-lf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-lf-t1.vfbin0 -> 1720 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-lf-ts1.vfbin0 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-osf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-osf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-osf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-osf-t1.vfbin1720 -> 1720 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-osf-ts1.vfbin520 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-sup-t1.vfbin1688 -> 1688 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-tlf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-tlf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-tlf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-tlf-t1.vfbin0 -> 1720 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-tlf-ts1.vfbin0 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-tosf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-tosf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-tosf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-tosf-t1.vfbin0 -> 1720 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Light-tosf-ts1.vfbin0 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-sc-ly1.vfbin0 -> 1688 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-t1.vfbin0 -> 1724 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-ts1.vfbin0 -> 588 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-sc-ly1.vfbin0 -> 1688 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-sc-ot1.vfbin0 -> 784 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-sc-t1.vfbin0 -> 1712 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-t1.vfbin1724 -> 1724 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-ts1.vfbin528 -> 592 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-sup-t1.vfbin1696 -> 1696 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-sc-ly1.vfbin0 -> 1688 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-sc-ot1.vfbin0 -> 784 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-sc-t1.vfbin0 -> 1712 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-t1.vfbin0 -> 1724 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-ts1.vfbin0 -> 592 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-sc-ly1.vfbin0 -> 1688 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-sc-ot1.vfbin0 -> 784 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-sc-t1.vfbin0 -> 1712 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-t1.vfbin0 -> 1728 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-ts1.vfbin0 -> 592 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-lf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-lf-sc-ot1.vfbin0 -> 776 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-lf-sc-t1.vfbin0 -> 1704 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-lf-t1.vfbin0 -> 1720 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-lf-ts1.vfbin0 -> 584 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-osf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-osf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-osf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-osf-t1.vfbin1720 -> 1720 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-osf-ts1.vfbin524 -> 588 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-sup-t1.vfbin1692 -> 1692 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-tlf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-tlf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-tlf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-tlf-t1.vfbin0 -> 1720 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-tlf-ts1.vfbin0 -> 588 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-tosf-sc-ly1.vfbin0 -> 1684 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-tosf-sc-ot1.vfbin0 -> 780 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-tosf-sc-t1.vfbin0 -> 1708 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-tosf-t1.vfbin0 -> 1724 bytes
-rw-r--r--fonts/merriweather/vf/MerriwthrSans-Regular-tosf-ts1.vfbin0 -> 588 bytes
-rw-r--r--graphics/mcf2graph/CHANGELOG6
-rw-r--r--graphics/mcf2graph/README2
-rw-r--r--graphics/mcf2graph/mcf2graph.mf105
-rw-r--r--graphics/mcf2graph/mcf_exa_soc.mf6
-rw-r--r--graphics/mcf2graph/mcf_example.pdfbin306240 -> 306332 bytes
-rw-r--r--graphics/mcf2graph/mcf_example.tex38
-rw-r--r--graphics/mcf2graph/mcf_man_soc.mf31
-rw-r--r--graphics/mcf2graph/mcf_manual.pdfbin576529 -> 575278 bytes
-rw-r--r--graphics/mcf2graph/mcf_manual.tex48
-rw-r--r--graphics/mcf2graph/mcf_mplib_exa.pdfbin201822 -> 201949 bytes
-rw-r--r--graphics/mcf2graph/mcf_mplib_exa.tex4
-rw-r--r--graphics/mcf2graph/mcf_setup.sty12
-rw-r--r--macros/latex/contrib/caption/CHANGELOG22
-rw-r--r--macros/latex/contrib/caption/README9
-rw-r--r--macros/latex/contrib/caption/bicaption.dtx53
-rw-r--r--macros/latex/contrib/caption/caption-ams-smf.dtx254
-rw-r--r--macros/latex/contrib/caption/caption-beamer.dtx382
-rw-r--r--macros/latex/contrib/caption/caption-deu.pdfbin318839 -> 409837 bytes
-rw-r--r--macros/latex/contrib/caption/caption-deu.tex66
-rw-r--r--macros/latex/contrib/caption/caption-elsarticle.dtx208
-rw-r--r--macros/latex/contrib/caption/caption-eng.pdfbin307635 -> 402305 bytes
-rw-r--r--macros/latex/contrib/caption/caption-eng.tex304
-rw-r--r--macros/latex/contrib/caption/caption-koma.dtx518
-rw-r--r--macros/latex/contrib/caption/caption-light.dtx394
-rw-r--r--macros/latex/contrib/caption/caption-light.pdfbin0 -> 67305 bytes
-rw-r--r--macros/latex/contrib/caption/caption-memoir.dtx226
-rw-r--r--macros/latex/contrib/caption/caption-ntg.dtx213
-rw-r--r--macros/latex/contrib/caption/caption-thesis.dtx219
-rw-r--r--macros/latex/contrib/caption/caption.dtx882
-rw-r--r--macros/latex/contrib/caption/caption.ins27
-rw-r--r--macros/latex/contrib/caption/caption2.dtx12
-rw-r--r--macros/latex/contrib/caption/caption3.dtx3117
-rw-r--r--macros/latex/contrib/caption/ltcaption.dtx16
-rw-r--r--macros/latex/contrib/caption/subcaption.dtx127
-rw-r--r--macros/latex/contrib/caption/subcaption.pdfbin154507 -> 154563 bytes
-rw-r--r--macros/latex/contrib/fduthesis/README.md4
-rw-r--r--macros/latex/contrib/fduthesis/fduthesis-code.pdfbin916050 -> 920850 bytes
-rw-r--r--macros/latex/contrib/fduthesis/fduthesis-doc.dtx16
-rw-r--r--macros/latex/contrib/fduthesis/fduthesis-en.pdfbin162728 -> 155894 bytes
-rw-r--r--macros/latex/contrib/fduthesis/fduthesis-logo.dtx2
-rw-r--r--macros/latex/contrib/fduthesis/fduthesis.dtx334
-rw-r--r--macros/latex/contrib/fduthesis/fduthesis.pdfbin410643 -> 402649 bytes
-rw-r--r--macros/latex/contrib/texnegar/INSTALL.txt2
-rw-r--r--macros/latex/contrib/texnegar/doc-ligature-texnegar.pdfbin13140 -> 13133 bytes
-rw-r--r--macros/latex/contrib/texnegar/doc-ligature-xep.pdfbin10112 -> 10116 bytes
-rw-r--r--macros/latex/contrib/texnegar/doc-samples-glyph.pdfbin63437 -> 63437 bytes
-rw-r--r--macros/latex/contrib/texnegar/doc-samples-hrule.pdfbin62969 -> 62967 bytes
-rw-r--r--macros/latex/contrib/texnegar/doc-samples-xep.pdfbin65544 -> 65544 bytes
-rw-r--r--macros/latex/contrib/texnegar/texnegar-doc.ltx4
-rw-r--r--macros/latex/contrib/texnegar/texnegar-doc.pdfbin3145159 -> 3145482 bytes
-rw-r--r--macros/latex/contrib/texnegar/texnegar-luatex-glyph.pdfbin1105890 -> 1105890 bytes
-rw-r--r--macros/latex/contrib/texnegar/texnegar-luatex-leaders-glyph.pdfbin325838 -> 325838 bytes
-rw-r--r--macros/latex/contrib/texnegar/texnegar-luatex-leaders-hrule.pdfbin174805 -> 174805 bytes
-rw-r--r--macros/latex/contrib/texnegar/texnegar-xetex-bidi-glyph.pdfbin157984 -> 157987 bytes
-rw-r--r--macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-glyph.pdfbin212554 -> 212554 bytes
-rw-r--r--macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-hrule.pdfbin156632 -> 156628 bytes
-rw-r--r--macros/latex/contrib/texnegar/texnegar-xetex-xepersian-glyph.pdfbin156629 -> 156633 bytes
-rw-r--r--macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-glyph.pdfbin194658 -> 194659 bytes
-rw-r--r--macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-hrule.pdfbin155930 -> 155933 bytes
-rw-r--r--macros/latex/contrib/texnegar/texnegar.dtx101
-rw-r--r--macros/latex/contrib/texnegar/texnegar.ins4
-rw-r--r--macros/latex/contrib/texnegar/texnegar.pdfbin535371 -> 534937 bytes
-rw-r--r--macros/latex/contrib/texnegar/xepersian-XB.pdfbin106731 -> 106734 bytes
-rw-r--r--macros/latex/contrib/totalcount/CHANGELOG10
-rw-r--r--macros/latex/contrib/totalcount/README36
-rw-r--r--macros/latex/contrib/totalcount/SUMMARY1
-rw-r--r--macros/latex/contrib/totalcount/totalcount.dtx (renamed from macros/latex/contrib/caption/totalcount.dtx)4
-rw-r--r--macros/latex/contrib/totalcount/totalcount.ins42
-rw-r--r--macros/latex/contrib/totalcount/totalcount.pdf (renamed from macros/latex/contrib/caption/totalcount.pdf)bin82006 -> 82731 bytes
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb209
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.md52
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha5122
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc14
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.xzbin2223840 -> 2222596 bytes
-rw-r--r--systems/win32/miktex/tm/packages/files.csv.lzmabin542244 -> 545043 bytes
-rw-r--r--systems/win32/miktex/tm/packages/next/files.csv.lzmabin541919 -> 545814 bytes
-rw-r--r--systems/win32/miktex/tm/packages/next/pr.ini10
-rw-r--r--systems/win32/miktex/tm/packages/pr.ini12
-rw-r--r--systems/win32/w32tex/ChangeLog14
-rw-r--r--timestamp2
1448 files changed, 21168 insertions, 4700 deletions
diff --git a/FILES.byname b/FILES.byname
index cfd415afed..76205d4441 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -5003,7 +5003,7 @@
1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp
1990/10/02 | 812 | dviware/vutex/vaxvms.ins
1990/10/02 | 127576 | dviware/vutex/vutex.web
-2020/08/29 | 229317 | FILES.last07days
+2020/08/30 | 74016 | FILES.last07days
2020/08/14 | 104065 | fonts/academicons/academicons.pdf
2020/08/14 | 17247 | fonts/academicons/academicons.sty
2020/08/14 | 6546 | fonts/academicons/academicons.tex
@@ -68968,237 +68968,1327 @@
2012/11/29 | 25789 | fonts/mdsymbol/type1/MdSymbolF-Regular.pfb
2012/11/29 | 26343 | fonts/mdsymbol/type1/MdSymbolF-Semibold.pfb
2012/11/29 | 1477786 | fonts/mdsymbol.zip
-2020/07/31 | 111128 | fonts/merriweather/doc/merriweather-samples.pdf
-2020/07/31 | 1100 | fonts/merriweather/doc/merriweather-samples.tex
-2020/07/30 | 4450 | fonts/merriweather/doc/OFL.txt
-2020/07/30 | 2992 | fonts/merriweather/enc/mwthr_3g4t7f.enc
-2020/07/30 | 3027 | fonts/merriweather/enc/mwthr_44qg5v.enc
-2020/07/30 | 2770 | fonts/merriweather/enc/mwthr_6upxhe.enc
-2020/07/30 | 2933 | fonts/merriweather/enc/mwthr_7ytifx.enc
-2020/07/30 | 2857 | fonts/merriweather/enc/mwthr_clyrx2.enc
-2020/07/30 | 2844 | fonts/merriweather/enc/mwthr_czxicq.enc
-2020/07/30 | 2919 | fonts/merriweather/enc/mwthr_hzrl5s.enc
-2020/07/30 | 2980 | fonts/merriweather/enc/mwthr_iuohxq.enc
-2020/07/30 | 3211 | fonts/merriweather/enc/mwthr_n7ujmb.enc
-2020/07/30 | 2893 | fonts/merriweather/enc/mwthr_tvbl63.enc
-2020/07/30 | 3201 | fonts/merriweather/enc/mwthr_u54ue6.enc
-2020/07/30 | 3039 | fonts/merriweather/enc/mwthr_vi456v.enc
-2020/07/30 | 2980 | fonts/merriweather/enc/mwthr_zwbe7j.enc
-2020/07/30 | 3524 | fonts/merriweather/latex/LY1Merriwthr-OsF.fd
-2020/07/30 | 3810 | fonts/merriweather/latex/LY1MerriwthrSans-OsF.fd
-2020/07/30 | 3810 | fonts/merriweather/latex/LY1MerriwthrSans-Sup.fd
-2020/07/31 | 9037 | fonts/merriweather/latex/merriweather.sty
-2020/07/30 | 3524 | fonts/merriweather/latex/OT1Merriwthr-OsF.fd
-2020/07/30 | 3810 | fonts/merriweather/latex/OT1MerriwthrSans-OsF.fd
-2020/07/30 | 3810 | fonts/merriweather/latex/OT1MerriwthrSans-Sup.fd
-2020/07/30 | 3486 | fonts/merriweather/latex/T1Merriwthr-OsF.fd
-2020/07/30 | 3772 | fonts/merriweather/latex/T1MerriwthrSans-OsF.fd
-2020/07/30 | 3772 | fonts/merriweather/latex/T1MerriwthrSans-Sup.fd
-2020/07/30 | 3524 | fonts/merriweather/latex/TS1Merriwthr-OsF.fd
-2020/07/30 | 3810 | fonts/merriweather/latex/TS1MerriwthrSans-OsF.fd
-2020/07/30 | 21851 | fonts/merriweather/map/merriweather.map
-2020/07/31 | 2686 | fonts/merriweather/README
-2020/07/30 | 2036 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ly1.tfm
-2020/07/30 | 1504 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ot1.tfm
-2020/07/30 | 1980 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-t1--base.tfm
-2020/07/30 | 2028 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-t1.tfm
-2020/07/30 | 1412 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ts1--base.tfm
-2020/07/30 | 1432 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ts1.tfm
-2020/07/30 | 1936 | fonts/merriweather/tfm/Merriwthr-Bold-osf-ly1.tfm
-2020/07/30 | 1396 | fonts/merriweather/tfm/Merriwthr-Bold-osf-ot1.tfm
-2020/07/30 | 1836 | fonts/merriweather/tfm/Merriwthr-Bold-osf-t1--base.tfm
-2020/07/30 | 1884 | fonts/merriweather/tfm/Merriwthr-Bold-osf-t1.tfm
-2020/07/30 | 1412 | fonts/merriweather/tfm/Merriwthr-Bold-osf-ts1--base.tfm
-2020/07/30 | 1424 | fonts/merriweather/tfm/Merriwthr-Bold-osf-ts1.tfm
-2020/07/30 | 1968 | fonts/merriweather/tfm/Merriwthr-Italic-osf-ly1.tfm
-2020/07/30 | 1452 | fonts/merriweather/tfm/Merriwthr-Italic-osf-ot1.tfm
-2020/07/30 | 1924 | fonts/merriweather/tfm/Merriwthr-Italic-osf-t1--base.tfm
-2020/07/30 | 1972 | fonts/merriweather/tfm/Merriwthr-Italic-osf-t1.tfm
-2020/07/30 | 1400 | fonts/merriweather/tfm/Merriwthr-Italic-osf-ts1--base.tfm
-2020/07/30 | 1416 | fonts/merriweather/tfm/Merriwthr-Italic-osf-ts1.tfm
-2020/07/30 | 1928 | fonts/merriweather/tfm/Merriwthr-LightIt-osf-ly1.tfm
-2020/07/30 | 1428 | fonts/merriweather/tfm/Merriwthr-LightIt-osf-ot1.tfm
-2020/07/30 | 1892 | fonts/merriweather/tfm/Merriwthr-LightIt-osf-t1--base.tfm
-2020/07/30 | 1940 | fonts/merriweather/tfm/Merriwthr-LightIt-osf-t1.tfm
-2020/07/30 | 1384 | fonts/merriweather/tfm/Merriwthr-LightIt-osf-ts1--base.tfm
-2020/07/30 | 1400 | fonts/merriweather/tfm/Merriwthr-LightIt-osf-ts1.tfm
-2020/07/30 | 1900 | fonts/merriweather/tfm/Merriwthr-Light-osf-ly1.tfm
-2020/07/30 | 1392 | fonts/merriweather/tfm/Merriwthr-Light-osf-ot1.tfm
-2020/07/30 | 1812 | fonts/merriweather/tfm/Merriwthr-Light-osf-t1--base.tfm
-2020/07/30 | 1860 | fonts/merriweather/tfm/Merriwthr-Light-osf-t1.tfm
-2020/07/30 | 1404 | fonts/merriweather/tfm/Merriwthr-Light-osf-ts1--base.tfm
-2020/07/30 | 1416 | fonts/merriweather/tfm/Merriwthr-Light-osf-ts1.tfm
-2020/07/30 | 1924 | fonts/merriweather/tfm/Merriwthr-Regular-osf-ly1.tfm
-2020/07/30 | 1396 | fonts/merriweather/tfm/Merriwthr-Regular-osf-ot1.tfm
-2020/07/30 | 1836 | fonts/merriweather/tfm/Merriwthr-Regular-osf-t1--base.tfm
-2020/07/30 | 1884 | fonts/merriweather/tfm/Merriwthr-Regular-osf-t1.tfm
-2020/07/30 | 1412 | fonts/merriweather/tfm/Merriwthr-Regular-osf-ts1--base.tfm
-2020/07/30 | 1420 | fonts/merriweather/tfm/Merriwthr-Regular-osf-ts1.tfm
-2020/07/30 | 2048 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ly1.tfm
-2020/07/30 | 1480 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ot1.tfm
-2020/07/30 | 1992 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-t1--base.tfm
-2020/07/30 | 2060 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-t1.tfm
-2020/07/30 | 1412 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ts1--base.tfm
-2020/07/30 | 1428 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ts1.tfm
-2020/07/30 | 1952 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-ly1.tfm
-2020/07/30 | 1408 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-ot1.tfm
-2020/07/30 | 1972 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-t1--base.tfm
-2020/07/30 | 1976 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-t1.tfm
-2020/07/30 | 1936 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ly1.tfm
-2020/07/30 | 1428 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ot1.tfm
-2020/07/30 | 1840 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-t1--base.tfm
-2020/07/30 | 1908 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-t1.tfm
-2020/07/30 | 1364 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ts1--base.tfm
-2020/07/30 | 1384 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ts1.tfm
-2020/07/30 | 1840 | fonts/merriweather/tfm/MerriwthrSans-Bold-sup-ly1.tfm
-2020/07/30 | 1352 | fonts/merriweather/tfm/MerriwthrSans-Bold-sup-ot1.tfm
-2020/07/30 | 1816 | fonts/merriweather/tfm/MerriwthrSans-Bold-sup-t1--base.tfm
-2020/07/30 | 1820 | fonts/merriweather/tfm/MerriwthrSans-Bold-sup-t1.tfm
-2020/07/30 | 2084 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ly1.tfm
-2020/07/30 | 1512 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ot1.tfm
-2020/07/30 | 2016 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-t1--base.tfm
-2020/07/30 | 2084 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-t1.tfm
-2020/07/30 | 1420 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ts1--base.tfm
-2020/07/30 | 1432 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ts1.tfm
-2020/07/30 | 1984 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-ly1.tfm
-2020/07/30 | 1436 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-ot1.tfm
-2020/07/30 | 1992 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-t1--base.tfm
-2020/07/30 | 1996 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-t1.tfm
-2020/07/30 | 1964 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ly1.tfm
-2020/07/30 | 1444 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ot1.tfm
-2020/07/30 | 1856 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-t1--base.tfm
-2020/07/30 | 1924 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-t1.tfm
-2020/07/30 | 1380 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ts1--base.tfm
-2020/07/30 | 1400 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ts1.tfm
-2020/07/30 | 1868 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-ly1.tfm
-2020/07/30 | 1372 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-ot1.tfm
-2020/07/30 | 1836 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-t1--base.tfm
-2020/07/30 | 1840 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-t1.tfm
-2020/07/30 | 1936 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ly1.tfm
-2020/07/30 | 1428 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ot1.tfm
-2020/07/30 | 1876 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-t1--base.tfm
-2020/07/30 | 1944 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-t1.tfm
-2020/07/30 | 1380 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ts1--base.tfm
-2020/07/30 | 1396 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ts1.tfm
-2020/07/30 | 1848 | fonts/merriweather/tfm/MerriwthrSans-Italic-sup-ly1.tfm
-2020/07/30 | 1356 | fonts/merriweather/tfm/MerriwthrSans-Italic-sup-ot1.tfm
-2020/07/30 | 1856 | fonts/merriweather/tfm/MerriwthrSans-Italic-sup-t1--base.tfm
-2020/07/30 | 1860 | fonts/merriweather/tfm/MerriwthrSans-Italic-sup-t1.tfm
-2020/07/30 | 1980 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ly1.tfm
-2020/07/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ot1.tfm
-2020/07/30 | 1888 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-t1--base.tfm
-2020/07/30 | 1956 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-t1.tfm
-2020/07/30 | 1396 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ts1--base.tfm
-2020/07/30 | 1408 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ts1.tfm
-2020/07/30 | 1896 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-ly1.tfm
-2020/07/30 | 1392 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-ot1.tfm
-2020/07/30 | 1880 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-t1--base.tfm
-2020/07/30 | 1884 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-t1.tfm
-2020/07/30 | 1908 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-ly1.tfm
-2020/07/30 | 1400 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-ot1.tfm
-2020/07/30 | 1816 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-t1--base.tfm
-2020/07/30 | 1884 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-t1.tfm
-2020/07/30 | 1364 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-ts1--base.tfm
-2020/07/30 | 1384 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-ts1.tfm
-2020/07/30 | 1812 | fonts/merriweather/tfm/MerriwthrSans-Light-sup-ly1.tfm
-2020/07/30 | 1324 | fonts/merriweather/tfm/MerriwthrSans-Light-sup-ot1.tfm
-2020/07/30 | 1792 | fonts/merriweather/tfm/MerriwthrSans-Light-sup-t1--base.tfm
-2020/07/30 | 1796 | fonts/merriweather/tfm/MerriwthrSans-Light-sup-t1.tfm
-2020/07/30 | 1888 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ly1.tfm
-2020/07/30 | 1396 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ot1.tfm
-2020/07/30 | 1792 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-t1--base.tfm
-2020/07/30 | 1860 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-t1.tfm
-2020/07/30 | 1352 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ts1--base.tfm
-2020/07/30 | 1372 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ts1.tfm
-2020/07/30 | 1792 | fonts/merriweather/tfm/MerriwthrSans-Regular-sup-ly1.tfm
-2020/07/30 | 1320 | fonts/merriweather/tfm/MerriwthrSans-Regular-sup-ot1.tfm
-2020/07/30 | 1768 | fonts/merriweather/tfm/MerriwthrSans-Regular-sup-t1--base.tfm
-2020/07/30 | 1772 | fonts/merriweather/tfm/MerriwthrSans-Regular-sup-t1.tfm
-2020/07/30 | 2060 | fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ly1.tfm
-2020/07/30 | 1524 | fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ot1.tfm
-2020/07/30 | 2004 | fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-t1--base.tfm
-2020/07/30 | 2052 | fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-t1.tfm
-2020/07/30 | 1420 | fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ts1--base.tfm
-2020/07/30 | 1440 | fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ts1.tfm
-2020/07/30 | 1948 | fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ly1.tfm
-2020/07/30 | 1416 | fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ot1.tfm
-2020/07/30 | 1860 | fonts/merriweather/tfm/Merriwthr-UltraBold-osf-t1--base.tfm
-2020/07/30 | 1908 | fonts/merriweather/tfm/Merriwthr-UltraBold-osf-t1.tfm
-2020/07/30 | 1412 | fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ts1--base.tfm
-2020/07/30 | 1424 | fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ts1.tfm
-2020/07/30 | 175076 | fonts/merriweather/truetype/Merriweather-BoldIt.ttf
-2020/07/30 | 167640 | fonts/merriweather/truetype/Merriweather-Bold.ttf
-2020/07/30 | 174316 | fonts/merriweather/truetype/Merriweather-Italic.ttf
-2020/07/30 | 175092 | fonts/merriweather/truetype/Merriweather-LightIt.ttf
-2020/07/30 | 168640 | fonts/merriweather/truetype/Merriweather-Light.ttf
-2020/07/30 | 170016 | fonts/merriweather/truetype/Merriweather-Regular.ttf
-2020/07/30 | 90400 | fonts/merriweather/truetype/MerriweatherSans-BoldItalic.ttf
-2020/07/30 | 88132 | fonts/merriweather/truetype/MerriweatherSans-Bold.ttf
-2020/07/30 | 90264 | fonts/merriweather/truetype/MerriweatherSans-ExBoldIt.ttf
-2020/07/30 | 88188 | fonts/merriweather/truetype/MerriweatherSans-ExtraBold.ttf
-2020/07/30 | 89820 | fonts/merriweather/truetype/MerriweatherSans-Italic.ttf
-2020/07/30 | 89356 | fonts/merriweather/truetype/MerriweatherSans-LightItalic.ttf
-2020/07/30 | 87752 | fonts/merriweather/truetype/MerriweatherSans-Light.ttf
-2020/07/30 | 88316 | fonts/merriweather/truetype/MerriweatherSans-Regular.ttf
-2020/07/30 | 174436 | fonts/merriweather/truetype/Merriweather-UltraBdIt.ttf
-2020/07/30 | 170180 | fonts/merriweather/truetype/Merriweather-UltraBold.ttf
-2020/07/30 | 140757 | fonts/merriweather/type1/Merriwthr-BoldIt.pfb
-2020/07/30 | 130032 | fonts/merriweather/type1/Merriwthr-Bold.pfb
-2020/07/30 | 140571 | fonts/merriweather/type1/Merriwthr-Italic.pfb
-2020/07/30 | 141029 | fonts/merriweather/type1/Merriwthr-LightIt.pfb
-2020/07/30 | 127524 | fonts/merriweather/type1/Merriwthr-Light.pfb
-2020/07/30 | 134279 | fonts/merriweather/type1/Merriwthr-Regular.pfb
-2020/07/30 | 77839 | fonts/merriweather/type1/MerriwthrSans-BoldItalic.pfb
-2020/07/30 | 76203 | fonts/merriweather/type1/MerriwthrSans-Bold.pfb
-2020/07/30 | 76529 | fonts/merriweather/type1/MerriwthrSans-ExBoldIt.pfb
-2020/07/30 | 77136 | fonts/merriweather/type1/MerriwthrSans-ExtraBold.pfb
-2020/07/30 | 75833 | fonts/merriweather/type1/MerriwthrSans-Italic.pfb
-2020/07/30 | 78328 | fonts/merriweather/type1/MerriwthrSans-LightItalic.pfb
-2020/07/30 | 76279 | fonts/merriweather/type1/MerriwthrSans-Light.pfb
-2020/07/30 | 76519 | fonts/merriweather/type1/MerriwthrSans-Regular.pfb
-2020/07/30 | 140313 | fonts/merriweather/type1/Merriwthr-UltraBdIt.pfb
-2020/07/30 | 129903 | fonts/merriweather/type1/Merriwthr-UltraBold.pfb
-2020/07/30 | 1692 | fonts/merriweather/vf/Merriwthr-BoldItalic-osf-t1.vf
-2020/07/30 | 572 | fonts/merriweather/vf/Merriwthr-BoldItalic-osf-ts1.vf
-2020/07/30 | 1684 | fonts/merriweather/vf/Merriwthr-Bold-osf-t1.vf
-2020/07/30 | 568 | fonts/merriweather/vf/Merriwthr-Bold-osf-ts1.vf
-2020/07/30 | 1688 | fonts/merriweather/vf/Merriwthr-Italic-osf-t1.vf
-2020/07/30 | 568 | fonts/merriweather/vf/Merriwthr-Italic-osf-ts1.vf
-2020/07/30 | 1688 | fonts/merriweather/vf/Merriwthr-LightIt-osf-t1.vf
-2020/07/30 | 572 | fonts/merriweather/vf/Merriwthr-LightIt-osf-ts1.vf
-2020/07/30 | 1684 | fonts/merriweather/vf/Merriwthr-Light-osf-t1.vf
-2020/07/30 | 568 | fonts/merriweather/vf/Merriwthr-Light-osf-ts1.vf
-2020/07/30 | 1688 | fonts/merriweather/vf/Merriwthr-Regular-osf-t1.vf
-2020/07/30 | 572 | fonts/merriweather/vf/Merriwthr-Regular-osf-ts1.vf
-2020/07/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-t1.vf
-2020/07/30 | 524 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-ts1.vf
-2020/07/30 | 1696 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-sup-t1.vf
-2020/07/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Bold-osf-t1.vf
-2020/07/30 | 520 | fonts/merriweather/vf/MerriwthrSans-Bold-osf-ts1.vf
-2020/07/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-Bold-sup-t1.vf
-2020/07/30 | 1728 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-t1.vf
-2020/07/30 | 532 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-ts1.vf
-2020/07/30 | 1700 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-sup-t1.vf
-2020/07/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-t1.vf
-2020/07/30 | 524 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-ts1.vf
-2020/07/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-sup-t1.vf
-2020/07/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Italic-osf-t1.vf
-2020/07/30 | 520 | fonts/merriweather/vf/MerriwthrSans-Italic-osf-ts1.vf
-2020/07/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-Italic-sup-t1.vf
-2020/07/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-t1.vf
-2020/07/30 | 528 | fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-ts1.vf
-2020/07/30 | 1696 | fonts/merriweather/vf/MerriwthrSans-LightItalic-sup-t1.vf
-2020/07/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Light-osf-t1.vf
-2020/07/30 | 520 | fonts/merriweather/vf/MerriwthrSans-Light-osf-ts1.vf
-2020/07/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-Light-sup-t1.vf
-2020/07/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Regular-osf-t1.vf
-2020/07/30 | 524 | fonts/merriweather/vf/MerriwthrSans-Regular-osf-ts1.vf
-2020/07/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-Regular-sup-t1.vf
-2020/07/30 | 1688 | fonts/merriweather/vf/Merriwthr-UltraBdIt-osf-t1.vf
-2020/07/30 | 572 | fonts/merriweather/vf/Merriwthr-UltraBdIt-osf-ts1.vf
-2020/07/30 | 1688 | fonts/merriweather/vf/Merriwthr-UltraBold-osf-t1.vf
-2020/07/30 | 572 | fonts/merriweather/vf/Merriwthr-UltraBold-osf-ts1.vf
-2020/07/31 | 3005143 | fonts/merriweather.zip
+2020/08/30 | 109700 | fonts/merriweather/doc/merriweather-samples.pdf
+2020/08/30 | 1150 | fonts/merriweather/doc/merriweather-samples.tex
+2020/08/30 | 4450 | fonts/merriweather/doc/OFL.txt
+2020/08/30 | 3126 | fonts/merriweather/enc/merriwthr_27vehb.enc
+2020/08/30 | 3356 | fonts/merriweather/enc/merriwthr_2hyv6t.enc
+2020/08/30 | 3335 | fonts/merriweather/enc/merriwthr_2j7grf.enc
+2020/08/30 | 3113 | fonts/merriweather/enc/merriwthr_2r7lb2.enc
+2020/08/30 | 3125 | fonts/merriweather/enc/merriwthr_4ylisx.enc
+2020/08/30 | 3117 | fonts/merriweather/enc/merriwthr_5lck5z.enc
+2020/08/30 | 2844 | fonts/merriweather/enc/merriwthr_5xld5w.enc
+2020/08/30 | 3085 | fonts/merriweather/enc/merriwthr_6qeh6o.enc
+2020/08/30 | 3336 | fonts/merriweather/enc/merriwthr_7bivwm.enc
+2020/08/30 | 3116 | fonts/merriweather/enc/merriwthr_7jdyhk.enc
+2020/08/30 | 2960 | fonts/merriweather/enc/merriwthr_7npxgm.enc
+2020/08/30 | 3367 | fonts/merriweather/enc/merriwthr_7t3tp2.enc
+2020/08/30 | 3325 | fonts/merriweather/enc/merriwthr_7tayun.enc
+2020/08/30 | 3136 | fonts/merriweather/enc/merriwthr_abao47.enc
+2020/08/30 | 2929 | fonts/merriweather/enc/merriwthr_adz5lu.enc
+2020/08/30 | 3334 | fonts/merriweather/enc/merriwthr_afua2j.enc
+2020/08/30 | 3044 | fonts/merriweather/enc/merriwthr_ags7qn.enc
+2020/08/30 | 3354 | fonts/merriweather/enc/merriwthr_ah5y5a.enc
+2020/08/30 | 3366 | fonts/merriweather/enc/merriwthr_b6rchs.enc
+2020/08/30 | 3354 | fonts/merriweather/enc/merriwthr_btdrxl.enc
+2020/08/30 | 2958 | fonts/merriweather/enc/merriwthr_c4h6ot.enc
+2020/08/30 | 3102 | fonts/merriweather/enc/merriwthr_cc6s4l.enc
+2020/08/30 | 3320 | fonts/merriweather/enc/merriwthr_ckyw6q.enc
+2020/08/30 | 3314 | fonts/merriweather/enc/merriwthr_cqy4t2.enc
+2020/08/30 | 3376 | fonts/merriweather/enc/merriwthr_cvdnuw.enc
+2020/08/30 | 2959 | fonts/merriweather/enc/merriwthr_cy3ufi.enc
+2020/08/30 | 3365 | fonts/merriweather/enc/merriwthr_diijaa.enc
+2020/08/30 | 3385 | fonts/merriweather/enc/merriwthr_dl4a4c.enc
+2020/08/30 | 3355 | fonts/merriweather/enc/merriwthr_dx3n55.enc
+2020/08/30 | 3030 | fonts/merriweather/enc/merriwthr_e2idhw.enc
+2020/08/30 | 3346 | fonts/merriweather/enc/merriwthr_e5zf5y.enc
+2020/08/30 | 3344 | fonts/merriweather/enc/merriwthr_f5n6m3.enc
+2020/08/30 | 3365 | fonts/merriweather/enc/merriwthr_fs3efe.enc
+2020/08/30 | 3331 | fonts/merriweather/enc/merriwthr_gbcczm.enc
+2020/08/30 | 3103 | fonts/merriweather/enc/merriwthr_gdbfjs.enc
+2020/08/30 | 3034 | fonts/merriweather/enc/merriwthr_gldhmf.enc
+2020/08/30 | 2999 | fonts/merriweather/enc/merriwthr_gmchnq.enc
+2020/08/30 | 3374 | fonts/merriweather/enc/merriwthr_h6z4fc.enc
+2020/08/30 | 3112 | fonts/merriweather/enc/merriwthr_h7gtfv.enc
+2020/08/30 | 3003 | fonts/merriweather/enc/merriwthr_hwcxwn.enc
+2020/08/30 | 3111 | fonts/merriweather/enc/merriwthr_hz3jhh.enc
+2020/08/30 | 3343 | fonts/merriweather/enc/merriwthr_ibepov.enc
+2020/08/30 | 3345 | fonts/merriweather/enc/merriwthr_igdvgb.enc
+2020/08/30 | 2968 | fonts/merriweather/enc/merriwthr_jjwbah.enc
+2020/08/30 | 3075 | fonts/merriweather/enc/merriwthr_k4bbiq.enc
+2020/08/30 | 3138 | fonts/merriweather/enc/merriwthr_lkhefy.enc
+2020/08/30 | 3122 | fonts/merriweather/enc/merriwthr_lm56sz.enc
+2020/08/30 | 3124 | fonts/merriweather/enc/merriwthr_mb4bqm.enc
+2020/08/30 | 3365 | fonts/merriweather/enc/merriwthr_me3dx7.enc
+2020/08/30 | 3044 | fonts/merriweather/enc/merriwthr_mgprdv.enc
+2020/08/30 | 3051 | fonts/merriweather/enc/merriwthr_mr3nck.enc
+2020/08/30 | 3096 | fonts/merriweather/enc/merriwthr_mx2b4h.enc
+2020/08/30 | 2979 | fonts/merriweather/enc/merriwthr_nszfm3.enc
+2020/08/30 | 3071 | fonts/merriweather/enc/merriwthr_o43b2q.enc
+2020/08/30 | 3315 | fonts/merriweather/enc/merriwthr_ob5vn4.enc
+2020/08/30 | 3127 | fonts/merriweather/enc/merriwthr_okb76x.enc
+2020/08/30 | 3232 | fonts/merriweather/enc/merriwthr_owzwzj.enc
+2020/08/30 | 3345 | fonts/merriweather/enc/merriwthr_p242jx.enc
+2020/08/30 | 3040 | fonts/merriweather/enc/merriwthr_posqbl.enc
+2020/08/30 | 3342 | fonts/merriweather/enc/merriwthr_qfmkcs.enc
+2020/08/30 | 2918 | fonts/merriweather/enc/merriwthr_qndjqi.enc
+2020/08/30 | 3321 | fonts/merriweather/enc/merriwthr_rzflsg.enc
+2020/08/30 | 3092 | fonts/merriweather/enc/merriwthr_s56ilq.enc
+2020/08/30 | 3133 | fonts/merriweather/enc/merriwthr_stxeas.enc
+2020/08/30 | 2970 | fonts/merriweather/enc/merriwthr_ttjzpe.enc
+2020/08/30 | 3055 | fonts/merriweather/enc/merriwthr_u2frii.enc
+2020/08/30 | 3356 | fonts/merriweather/enc/merriwthr_uduhhn.enc
+2020/08/30 | 3147 | fonts/merriweather/enc/merriwthr_urus45.enc
+2020/08/30 | 3375 | fonts/merriweather/enc/merriwthr_vvhkhe.enc
+2020/08/30 | 2927 | fonts/merriweather/enc/merriwthr_w4rwtq.enc
+2020/08/30 | 2981 | fonts/merriweather/enc/merriwthr_wlsyn3.enc
+2020/08/30 | 3081 | fonts/merriweather/enc/merriwthr_wppmfi.enc
+2020/08/30 | 3387 | fonts/merriweather/enc/merriwthr_x754fd.enc
+2020/08/30 | 3396 | fonts/merriweather/enc/merriwthr_xfdjpz.enc
+2020/08/30 | 3376 | fonts/merriweather/enc/merriwthr_xys2i2.enc
+2020/08/30 | 3040 | fonts/merriweather/enc/merriwthr_ynquvw.enc
+2020/08/30 | 5886 | fonts/merriweather/latex/LY1Merriwthr-LF.fd
+2020/08/30 | 5997 | fonts/merriweather/latex/LY1Merriwthr-OsF.fd
+2020/08/30 | 6462 | fonts/merriweather/latex/LY1MerriwthrSans-LF.fd
+2020/08/30 | 6573 | fonts/merriweather/latex/LY1MerriwthrSans-OsF.fd
+2020/08/30 | 3648 | fonts/merriweather/latex/LY1MerriwthrSans-Sup.fd
+2020/08/30 | 6573 | fonts/merriweather/latex/LY1MerriwthrSans-TLF.fd
+2020/08/30 | 6684 | fonts/merriweather/latex/LY1MerriwthrSans-TOsF.fd
+2020/08/30 | 3344 | fonts/merriweather/latex/LY1Merriwthr-Sup.fd
+2020/08/30 | 5997 | fonts/merriweather/latex/LY1Merriwthr-TLF.fd
+2020/08/30 | 6108 | fonts/merriweather/latex/LY1Merriwthr-TOsF.fd
+2020/08/30 | 13515 | fonts/merriweather/latex/merriweather.sty
+2020/08/30 | 5886 | fonts/merriweather/latex/OT1Merriwthr-LF.fd
+2020/08/30 | 5997 | fonts/merriweather/latex/OT1Merriwthr-OsF.fd
+2020/08/30 | 6462 | fonts/merriweather/latex/OT1MerriwthrSans-LF.fd
+2020/08/30 | 6573 | fonts/merriweather/latex/OT1MerriwthrSans-OsF.fd
+2020/08/30 | 3648 | fonts/merriweather/latex/OT1MerriwthrSans-Sup.fd
+2020/08/30 | 6573 | fonts/merriweather/latex/OT1MerriwthrSans-TLF.fd
+2020/08/30 | 6684 | fonts/merriweather/latex/OT1MerriwthrSans-TOsF.fd
+2020/08/30 | 3344 | fonts/merriweather/latex/OT1Merriwthr-Sup.fd
+2020/08/30 | 5997 | fonts/merriweather/latex/OT1Merriwthr-TLF.fd
+2020/08/30 | 6108 | fonts/merriweather/latex/OT1Merriwthr-TOsF.fd
+2020/08/30 | 5813 | fonts/merriweather/latex/T1Merriwthr-LF.fd
+2020/08/30 | 5924 | fonts/merriweather/latex/T1Merriwthr-OsF.fd
+2020/08/30 | 6389 | fonts/merriweather/latex/T1MerriwthrSans-LF.fd
+2020/08/30 | 6500 | fonts/merriweather/latex/T1MerriwthrSans-OsF.fd
+2020/08/30 | 3610 | fonts/merriweather/latex/T1MerriwthrSans-Sup.fd
+2020/08/30 | 6500 | fonts/merriweather/latex/T1MerriwthrSans-TLF.fd
+2020/08/30 | 6611 | fonts/merriweather/latex/T1MerriwthrSans-TOsF.fd
+2020/08/30 | 3306 | fonts/merriweather/latex/T1Merriwthr-Sup.fd
+2020/08/30 | 5924 | fonts/merriweather/latex/T1Merriwthr-TLF.fd
+2020/08/30 | 6035 | fonts/merriweather/latex/T1Merriwthr-TOsF.fd
+2020/08/30 | 3287 | fonts/merriweather/latex/TS1Merriwthr-LF.fd
+2020/08/30 | 3344 | fonts/merriweather/latex/TS1Merriwthr-OsF.fd
+2020/08/30 | 3591 | fonts/merriweather/latex/TS1MerriwthrSans-LF.fd
+2020/08/30 | 3648 | fonts/merriweather/latex/TS1MerriwthrSans-OsF.fd
+2020/08/30 | 3648 | fonts/merriweather/latex/TS1MerriwthrSans-TLF.fd
+2020/08/30 | 3705 | fonts/merriweather/latex/TS1MerriwthrSans-TOsF.fd
+2020/08/30 | 3344 | fonts/merriweather/latex/TS1Merriwthr-TLF.fd
+2020/08/30 | 3401 | fonts/merriweather/latex/TS1Merriwthr-TOsF.fd
+2020/08/30 | 76310 | fonts/merriweather/map/merriweather.map
+2020/08/30 | 233764 | fonts/merriweather/opentype/Merriweather-BlackItalic.otf
+2020/08/30 | 260708 | fonts/merriweather/opentype/Merriweather-Black.otf
+2020/08/30 | 249400 | fonts/merriweather/opentype/Merriweather-BoldItalic.otf
+2020/08/30 | 269484 | fonts/merriweather/opentype/Merriweather-Bold.otf
+2020/08/30 | 247644 | fonts/merriweather/opentype/Merriweather-Italic.otf
+2020/08/30 | 235128 | fonts/merriweather/opentype/Merriweather-LightItalic.otf
+2020/08/30 | 251464 | fonts/merriweather/opentype/Merriweather-Light.otf
+2020/08/30 | 265232 | fonts/merriweather/opentype/Merriweather-Regular.otf
+2020/08/30 | 121036 | fonts/merriweather/opentype/MerriweatherSans-BoldItalic.otf
+2020/08/30 | 132764 | fonts/merriweather/opentype/MerriweatherSans-Bold.otf
+2020/08/30 | 107192 | fonts/merriweather/opentype/MerriweatherSans-ExtraBoldItalic.otf
+2020/08/30 | 120684 | fonts/merriweather/opentype/MerriweatherSans-ExtraBold.otf
+2020/08/30 | 104464 | fonts/merriweather/opentype/MerriweatherSans-Italic.otf
+2020/08/30 | 101264 | fonts/merriweather/opentype/MerriweatherSans-LightItalic.otf
+2020/08/30 | 119420 | fonts/merriweather/opentype/MerriweatherSans-Light.otf
+2020/08/30 | 119412 | fonts/merriweather/opentype/MerriweatherSans-Regular.otf
+2020/08/30 | 2830 | fonts/merriweather/README
+2020/08/30 | 47936 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ly1.tfm
+2020/08/30 | 13124 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ot1.tfm
+2020/08/30 | 2064 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ly1--base.tfm
+2020/08/30 | 42552 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ly1.tfm
+2020/08/30 | 1500 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ot1--base.tfm
+2020/08/30 | 11280 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ot1.tfm
+2020/08/30 | 1952 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-t1--base.tfm
+2020/08/30 | 48956 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-t1.tfm
+2020/08/30 | 1976 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-t1--base.tfm
+2020/08/30 | 60420 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-t1.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ts1--base.tfm
+2020/08/30 | 1504 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ts1.tfm
+2020/08/30 | 47056 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ly1.tfm
+2020/08/30 | 12700 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ot1.tfm
+2020/08/30 | 2072 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ly1--base.tfm
+2020/08/30 | 42188 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ly1.tfm
+2020/08/30 | 1500 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ot1--base.tfm
+2020/08/30 | 11200 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ot1.tfm
+2020/08/30 | 1952 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-t1--base.tfm
+2020/08/30 | 48872 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-t1.tfm
+2020/08/30 | 1976 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-t1--base.tfm
+2020/08/30 | 59872 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-t1.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ts1--base.tfm
+2020/08/30 | 1504 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ts1.tfm
+2020/08/30 | 2048 | fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-ly1.tfm
+2020/08/30 | 1504 | fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-ot1.tfm
+2020/08/30 | 1996 | fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-t1--base.tfm
+2020/08/30 | 2000 | fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-t1.tfm
+2020/08/30 | 46716 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ly1.tfm
+2020/08/30 | 12384 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ot1.tfm
+2020/08/30 | 2040 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ly1--base.tfm
+2020/08/30 | 41744 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ly1.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ot1--base.tfm
+2020/08/30 | 10784 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ot1.tfm
+2020/08/30 | 1920 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-t1--base.tfm
+2020/08/30 | 48348 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-t1.tfm
+2020/08/30 | 1944 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-t1--base.tfm
+2020/08/30 | 59504 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-t1.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ts1--base.tfm
+2020/08/30 | 1504 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ts1.tfm
+2020/08/30 | 46716 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ly1.tfm
+2020/08/30 | 12384 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ot1.tfm
+2020/08/30 | 2040 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ly1--base.tfm
+2020/08/30 | 41744 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ly1.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ot1--base.tfm
+2020/08/30 | 10784 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ot1.tfm
+2020/08/30 | 1920 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-t1--base.tfm
+2020/08/30 | 48348 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-t1.tfm
+2020/08/30 | 1944 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-t1--base.tfm
+2020/08/30 | 59504 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-t1.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ts1--base.tfm
+2020/08/30 | 1504 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ts1.tfm
+2020/08/30 | 40176 | fonts/merriweather/tfm/Merriwthr-Black-lf-ly1.tfm
+2020/08/30 | 11392 | fonts/merriweather/tfm/Merriwthr-Black-lf-ot1.tfm
+2020/08/30 | 1880 | fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ly1--base.tfm
+2020/08/30 | 33500 | fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ly1.tfm
+2020/08/30 | 1384 | fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ot1--base.tfm
+2020/08/30 | 9108 | fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ot1.tfm
+2020/08/30 | 1780 | fonts/merriweather/tfm/Merriwthr-Black-lf-sc-t1--base.tfm
+2020/08/30 | 42668 | fonts/merriweather/tfm/Merriwthr-Black-lf-sc-t1.tfm
+2020/08/30 | 1828 | fonts/merriweather/tfm/Merriwthr-Black-lf-t1--base.tfm
+2020/08/30 | 54284 | fonts/merriweather/tfm/Merriwthr-Black-lf-t1.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Black-lf-ts1--base.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/Merriwthr-Black-lf-ts1.tfm
+2020/08/30 | 40036 | fonts/merriweather/tfm/Merriwthr-Black-osf-ly1.tfm
+2020/08/30 | 11232 | fonts/merriweather/tfm/Merriwthr-Black-osf-ot1.tfm
+2020/08/30 | 1876 | fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ly1--base.tfm
+2020/08/30 | 33528 | fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ly1.tfm
+2020/08/30 | 1384 | fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ot1--base.tfm
+2020/08/30 | 9036 | fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ot1.tfm
+2020/08/30 | 1776 | fonts/merriweather/tfm/Merriwthr-Black-osf-sc-t1--base.tfm
+2020/08/30 | 42732 | fonts/merriweather/tfm/Merriwthr-Black-osf-sc-t1.tfm
+2020/08/30 | 1820 | fonts/merriweather/tfm/Merriwthr-Black-osf-t1--base.tfm
+2020/08/30 | 54140 | fonts/merriweather/tfm/Merriwthr-Black-osf-t1.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Black-osf-ts1--base.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/Merriwthr-Black-osf-ts1.tfm
+2020/08/30 | 1896 | fonts/merriweather/tfm/Merriwthr-Black-sup-ly1.tfm
+2020/08/30 | 1396 | fonts/merriweather/tfm/Merriwthr-Black-sup-ot1.tfm
+2020/08/30 | 1820 | fonts/merriweather/tfm/Merriwthr-Black-sup-t1--base.tfm
+2020/08/30 | 1824 | fonts/merriweather/tfm/Merriwthr-Black-sup-t1.tfm
+2020/08/30 | 39328 | fonts/merriweather/tfm/Merriwthr-Black-tlf-ly1.tfm
+2020/08/30 | 10920 | fonts/merriweather/tfm/Merriwthr-Black-tlf-ot1.tfm
+2020/08/30 | 1856 | fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ly1--base.tfm
+2020/08/30 | 32464 | fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ly1.tfm
+2020/08/30 | 1360 | fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ot1--base.tfm
+2020/08/30 | 8608 | fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ot1.tfm
+2020/08/30 | 1756 | fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-t1--base.tfm
+2020/08/30 | 41760 | fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-t1.tfm
+2020/08/30 | 1800 | fonts/merriweather/tfm/Merriwthr-Black-tlf-t1--base.tfm
+2020/08/30 | 53592 | fonts/merriweather/tfm/Merriwthr-Black-tlf-t1.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Black-tlf-ts1--base.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/Merriwthr-Black-tlf-ts1.tfm
+2020/08/30 | 39324 | fonts/merriweather/tfm/Merriwthr-Black-tosf-ly1.tfm
+2020/08/30 | 10916 | fonts/merriweather/tfm/Merriwthr-Black-tosf-ot1.tfm
+2020/08/30 | 1852 | fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ly1--base.tfm
+2020/08/30 | 32460 | fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ly1.tfm
+2020/08/30 | 1356 | fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ot1--base.tfm
+2020/08/30 | 8604 | fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ot1.tfm
+2020/08/30 | 1752 | fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-t1--base.tfm
+2020/08/30 | 41756 | fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-t1.tfm
+2020/08/30 | 1796 | fonts/merriweather/tfm/Merriwthr-Black-tosf-t1--base.tfm
+2020/08/30 | 53588 | fonts/merriweather/tfm/Merriwthr-Black-tosf-t1.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Black-tosf-ts1--base.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/Merriwthr-Black-tosf-ts1.tfm
+2020/08/30 | 62572 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ly1.tfm
+2020/08/30 | 16372 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ot1.tfm
+2020/08/30 | 2068 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ly1--base.tfm
+2020/08/30 | 53280 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ly1.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ot1--base.tfm
+2020/08/30 | 14108 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ot1.tfm
+2020/08/30 | 1952 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-t1--base.tfm
+2020/08/30 | 62112 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-t1.tfm
+2020/08/30 | 1976 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-t1--base.tfm
+2020/08/30 | 81580 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-t1.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ts1--base.tfm
+2020/08/30 | 1500 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ts1.tfm
+2020/08/30 | 61616 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ly1.tfm
+2020/08/30 | 16000 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ot1.tfm
+2020/08/30 | 2064 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ly1--base.tfm
+2020/08/30 | 52780 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ly1.tfm
+2020/08/30 | 1484 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ot1--base.tfm
+2020/08/30 | 14072 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ot1.tfm
+2020/08/30 | 1952 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-t1--base.tfm
+2020/08/30 | 61920 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-t1.tfm
+2020/08/30 | 1980 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-t1--base.tfm
+2020/08/30 | 81156 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-t1.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ts1--base.tfm
+2020/08/30 | 1500 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ts1.tfm
+2020/08/30 | 2048 | fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-ly1.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-ot1.tfm
+2020/08/30 | 1984 | fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-t1--base.tfm
+2020/08/30 | 1988 | fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-t1.tfm
+2020/08/30 | 60788 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ly1.tfm
+2020/08/30 | 15396 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ot1.tfm
+2020/08/30 | 2036 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ly1--base.tfm
+2020/08/30 | 51880 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ly1.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ot1--base.tfm
+2020/08/30 | 13356 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ot1.tfm
+2020/08/30 | 1920 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-t1--base.tfm
+2020/08/30 | 60896 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-t1.tfm
+2020/08/30 | 1940 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-t1--base.tfm
+2020/08/30 | 80248 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-t1.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ts1--base.tfm
+2020/08/30 | 1500 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ts1.tfm
+2020/08/30 | 60788 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ly1.tfm
+2020/08/30 | 15396 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ot1.tfm
+2020/08/30 | 2036 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ly1--base.tfm
+2020/08/30 | 51880 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ly1.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ot1--base.tfm
+2020/08/30 | 13356 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ot1.tfm
+2020/08/30 | 1920 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-t1--base.tfm
+2020/08/30 | 60896 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-t1.tfm
+2020/08/30 | 1940 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-t1--base.tfm
+2020/08/30 | 80248 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-t1.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ts1--base.tfm
+2020/08/30 | 1500 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ts1.tfm
+2020/08/30 | 48820 | fonts/merriweather/tfm/Merriwthr-Bold-lf-ly1.tfm
+2020/08/30 | 13692 | fonts/merriweather/tfm/Merriwthr-Bold-lf-ot1.tfm
+2020/08/30 | 1892 | fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ly1--base.tfm
+2020/08/30 | 41292 | fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ly1.tfm
+2020/08/30 | 1372 | fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ot1--base.tfm
+2020/08/30 | 11360 | fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ot1.tfm
+2020/08/30 | 1776 | fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-t1--base.tfm
+2020/08/30 | 53244 | fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-t1.tfm
+2020/08/30 | 1816 | fonts/merriweather/tfm/Merriwthr-Bold-lf-t1--base.tfm
+2020/08/30 | 65892 | fonts/merriweather/tfm/Merriwthr-Bold-lf-t1.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Bold-lf-ts1--base.tfm
+2020/08/30 | 1460 | fonts/merriweather/tfm/Merriwthr-Bold-lf-ts1.tfm
+2020/08/30 | 48608 | fonts/merriweather/tfm/Merriwthr-Bold-osf-ly1.tfm
+2020/08/30 | 13536 | fonts/merriweather/tfm/Merriwthr-Bold-osf-ot1.tfm
+2020/08/30 | 1888 | fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ly1--base.tfm
+2020/08/30 | 41264 | fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ly1.tfm
+2020/08/30 | 1368 | fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ot1--base.tfm
+2020/08/30 | 11288 | fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ot1.tfm
+2020/08/30 | 1772 | fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-t1--base.tfm
+2020/08/30 | 53280 | fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-t1.tfm
+2020/08/30 | 1812 | fonts/merriweather/tfm/Merriwthr-Bold-osf-t1--base.tfm
+2020/08/30 | 65708 | fonts/merriweather/tfm/Merriwthr-Bold-osf-t1.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Bold-osf-ts1--base.tfm
+2020/08/30 | 1460 | fonts/merriweather/tfm/Merriwthr-Bold-osf-ts1.tfm
+2020/08/30 | 1896 | fonts/merriweather/tfm/Merriwthr-Bold-sup-ly1.tfm
+2020/08/30 | 1392 | fonts/merriweather/tfm/Merriwthr-Bold-sup-ot1.tfm
+2020/08/30 | 1816 | fonts/merriweather/tfm/Merriwthr-Bold-sup-t1--base.tfm
+2020/08/30 | 1820 | fonts/merriweather/tfm/Merriwthr-Bold-sup-t1.tfm
+2020/08/30 | 47644 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-ly1.tfm
+2020/08/30 | 13108 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-ot1.tfm
+2020/08/30 | 1868 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ly1--base.tfm
+2020/08/30 | 39952 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ly1.tfm
+2020/08/30 | 1348 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ot1--base.tfm
+2020/08/30 | 10728 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ot1.tfm
+2020/08/30 | 1752 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-t1--base.tfm
+2020/08/30 | 52116 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-t1.tfm
+2020/08/30 | 1792 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-t1--base.tfm
+2020/08/30 | 64960 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-t1.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-ts1--base.tfm
+2020/08/30 | 1460 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-ts1.tfm
+2020/08/30 | 47640 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-ly1.tfm
+2020/08/30 | 13104 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-ot1.tfm
+2020/08/30 | 1864 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ly1--base.tfm
+2020/08/30 | 39948 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ly1.tfm
+2020/08/30 | 1344 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ot1--base.tfm
+2020/08/30 | 10724 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ot1.tfm
+2020/08/30 | 1748 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-t1--base.tfm
+2020/08/30 | 52112 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-t1.tfm
+2020/08/30 | 1788 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-t1--base.tfm
+2020/08/30 | 64956 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-t1.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-ts1--base.tfm
+2020/08/30 | 1460 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-ts1.tfm
+2020/08/30 | 62432 | fonts/merriweather/tfm/Merriwthr-Italic-lf-ly1.tfm
+2020/08/30 | 16312 | fonts/merriweather/tfm/Merriwthr-Italic-lf-ot1.tfm
+2020/08/30 | 2028 | fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ly1--base.tfm
+2020/08/30 | 53204 | fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ly1.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ot1--base.tfm
+2020/08/30 | 14056 | fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ot1.tfm
+2020/08/30 | 1904 | fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-t1--base.tfm
+2020/08/30 | 62020 | fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-t1.tfm
+2020/08/30 | 1944 | fonts/merriweather/tfm/Merriwthr-Italic-lf-t1--base.tfm
+2020/08/30 | 81392 | fonts/merriweather/tfm/Merriwthr-Italic-lf-t1.tfm
+2020/08/30 | 1484 | fonts/merriweather/tfm/Merriwthr-Italic-lf-ts1--base.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-Italic-lf-ts1.tfm
+2020/08/30 | 61488 | fonts/merriweather/tfm/Merriwthr-Italic-osf-ly1.tfm
+2020/08/30 | 15952 | fonts/merriweather/tfm/Merriwthr-Italic-osf-ot1.tfm
+2020/08/30 | 2028 | fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ly1--base.tfm
+2020/08/30 | 52688 | fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ly1.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ot1--base.tfm
+2020/08/30 | 14000 | fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ot1.tfm
+2020/08/30 | 1900 | fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-t1--base.tfm
+2020/08/30 | 61804 | fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-t1.tfm
+2020/08/30 | 1940 | fonts/merriweather/tfm/Merriwthr-Italic-osf-t1--base.tfm
+2020/08/30 | 80972 | fonts/merriweather/tfm/Merriwthr-Italic-osf-t1.tfm
+2020/08/30 | 1484 | fonts/merriweather/tfm/Merriwthr-Italic-osf-ts1--base.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-Italic-osf-ts1.tfm
+2020/08/30 | 2028 | fonts/merriweather/tfm/Merriwthr-Italic-sup-ly1.tfm
+2020/08/30 | 1464 | fonts/merriweather/tfm/Merriwthr-Italic-sup-ot1.tfm
+2020/08/30 | 1964 | fonts/merriweather/tfm/Merriwthr-Italic-sup-t1--base.tfm
+2020/08/30 | 1968 | fonts/merriweather/tfm/Merriwthr-Italic-sup-t1.tfm
+2020/08/30 | 60664 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-ly1.tfm
+2020/08/30 | 15352 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-ot1.tfm
+2020/08/30 | 1996 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ly1--base.tfm
+2020/08/30 | 51792 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ly1.tfm
+2020/08/30 | 1416 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ot1--base.tfm
+2020/08/30 | 13300 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ot1.tfm
+2020/08/30 | 1868 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-t1--base.tfm
+2020/08/30 | 60788 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-t1.tfm
+2020/08/30 | 1904 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-t1--base.tfm
+2020/08/30 | 80072 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-t1.tfm
+2020/08/30 | 1484 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-ts1--base.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-ts1.tfm
+2020/08/30 | 60660 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-ly1.tfm
+2020/08/30 | 15348 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-ot1.tfm
+2020/08/30 | 1992 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ly1--base.tfm
+2020/08/30 | 51788 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ly1.tfm
+2020/08/30 | 1412 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ot1--base.tfm
+2020/08/30 | 13296 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ot1.tfm
+2020/08/30 | 1864 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-t1--base.tfm
+2020/08/30 | 60784 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-t1.tfm
+2020/08/30 | 1900 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-t1--base.tfm
+2020/08/30 | 80068 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-t1.tfm
+2020/08/30 | 1484 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-ts1--base.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-ts1.tfm
+2020/08/30 | 42640 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ly1.tfm
+2020/08/30 | 11252 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ot1.tfm
+2020/08/30 | 2000 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ly1--base.tfm
+2020/08/30 | 35276 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ly1.tfm
+2020/08/30 | 1424 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ot1--base.tfm
+2020/08/30 | 9628 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ot1.tfm
+2020/08/30 | 1872 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-t1--base.tfm
+2020/08/30 | 40636 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-t1.tfm
+2020/08/30 | 1956 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-t1--base.tfm
+2020/08/30 | 58612 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-t1.tfm
+2020/08/30 | 1480 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ts1--base.tfm
+2020/08/30 | 1484 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ts1.tfm
+2020/08/30 | 42072 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ly1.tfm
+2020/08/30 | 11108 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ot1.tfm
+2020/08/30 | 2024 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ly1--base.tfm
+2020/08/30 | 34960 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ly1.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ot1--base.tfm
+2020/08/30 | 9624 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ot1.tfm
+2020/08/30 | 1896 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-t1--base.tfm
+2020/08/30 | 40508 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-t1.tfm
+2020/08/30 | 1956 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-t1--base.tfm
+2020/08/30 | 58488 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-t1.tfm
+2020/08/30 | 1480 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ts1--base.tfm
+2020/08/30 | 1484 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ts1.tfm
+2020/08/30 | 2020 | fonts/merriweather/tfm/Merriwthr-LightItalic-sup-ly1.tfm
+2020/08/30 | 1476 | fonts/merriweather/tfm/Merriwthr-LightItalic-sup-ot1.tfm
+2020/08/30 | 1968 | fonts/merriweather/tfm/Merriwthr-LightItalic-sup-t1--base.tfm
+2020/08/30 | 1972 | fonts/merriweather/tfm/Merriwthr-LightItalic-sup-t1.tfm
+2020/08/30 | 41400 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ly1.tfm
+2020/08/30 | 10660 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ot1.tfm
+2020/08/30 | 1988 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ly1--base.tfm
+2020/08/30 | 34276 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ly1.tfm
+2020/08/30 | 1412 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ot1--base.tfm
+2020/08/30 | 9124 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ot1.tfm
+2020/08/30 | 1856 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-t1--base.tfm
+2020/08/30 | 39708 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-t1.tfm
+2020/08/30 | 1916 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-t1--base.tfm
+2020/08/30 | 57744 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-t1.tfm
+2020/08/30 | 1480 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ts1--base.tfm
+2020/08/30 | 1484 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ts1.tfm
+2020/08/30 | 41396 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ly1.tfm
+2020/08/30 | 10656 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ot1.tfm
+2020/08/30 | 1984 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ly1--base.tfm
+2020/08/30 | 34272 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ly1.tfm
+2020/08/30 | 1408 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ot1--base.tfm
+2020/08/30 | 9120 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ot1.tfm
+2020/08/30 | 1856 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-t1--base.tfm
+2020/08/30 | 39708 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-t1.tfm
+2020/08/30 | 1916 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-t1--base.tfm
+2020/08/30 | 57744 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-t1.tfm
+2020/08/30 | 1480 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ts1--base.tfm
+2020/08/30 | 1484 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ts1.tfm
+2020/08/30 | 38992 | fonts/merriweather/tfm/Merriwthr-Light-lf-ly1.tfm
+2020/08/30 | 10668 | fonts/merriweather/tfm/Merriwthr-Light-lf-ot1.tfm
+2020/08/30 | 1844 | fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ly1--base.tfm
+2020/08/30 | 35188 | fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ly1.tfm
+2020/08/30 | 1352 | fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ot1--base.tfm
+2020/08/30 | 9404 | fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ot1.tfm
+2020/08/30 | 1756 | fonts/merriweather/tfm/Merriwthr-Light-lf-sc-t1--base.tfm
+2020/08/30 | 43728 | fonts/merriweather/tfm/Merriwthr-Light-lf-sc-t1.tfm
+2020/08/30 | 1776 | fonts/merriweather/tfm/Merriwthr-Light-lf-t1--base.tfm
+2020/08/30 | 51268 | fonts/merriweather/tfm/Merriwthr-Light-lf-t1.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/Merriwthr-Light-lf-ts1--base.tfm
+2020/08/30 | 1444 | fonts/merriweather/tfm/Merriwthr-Light-lf-ts1.tfm
+2020/08/30 | 38820 | fonts/merriweather/tfm/Merriwthr-Light-osf-ly1.tfm
+2020/08/30 | 10588 | fonts/merriweather/tfm/Merriwthr-Light-osf-ot1.tfm
+2020/08/30 | 1840 | fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ly1--base.tfm
+2020/08/30 | 35128 | fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ly1.tfm
+2020/08/30 | 1352 | fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ot1--base.tfm
+2020/08/30 | 9324 | fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ot1.tfm
+2020/08/30 | 1756 | fonts/merriweather/tfm/Merriwthr-Light-osf-sc-t1--base.tfm
+2020/08/30 | 43688 | fonts/merriweather/tfm/Merriwthr-Light-osf-sc-t1.tfm
+2020/08/30 | 1788 | fonts/merriweather/tfm/Merriwthr-Light-osf-t1--base.tfm
+2020/08/30 | 51100 | fonts/merriweather/tfm/Merriwthr-Light-osf-t1.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/Merriwthr-Light-osf-ts1--base.tfm
+2020/08/30 | 1444 | fonts/merriweather/tfm/Merriwthr-Light-osf-ts1.tfm
+2020/08/30 | 1840 | fonts/merriweather/tfm/Merriwthr-Light-sup-ly1.tfm
+2020/08/30 | 1360 | fonts/merriweather/tfm/Merriwthr-Light-sup-ot1.tfm
+2020/08/30 | 1776 | fonts/merriweather/tfm/Merriwthr-Light-sup-t1--base.tfm
+2020/08/30 | 1780 | fonts/merriweather/tfm/Merriwthr-Light-sup-t1.tfm
+2020/08/30 | 38032 | fonts/merriweather/tfm/Merriwthr-Light-tlf-ly1.tfm
+2020/08/30 | 10236 | fonts/merriweather/tfm/Merriwthr-Light-tlf-ot1.tfm
+2020/08/30 | 1816 | fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ly1--base.tfm
+2020/08/30 | 34100 | fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ly1.tfm
+2020/08/30 | 1324 | fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ot1--base.tfm
+2020/08/30 | 8896 | fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ot1.tfm
+2020/08/30 | 1728 | fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-t1--base.tfm
+2020/08/30 | 42804 | fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-t1.tfm
+2020/08/30 | 1760 | fonts/merriweather/tfm/Merriwthr-Light-tlf-t1--base.tfm
+2020/08/30 | 50508 | fonts/merriweather/tfm/Merriwthr-Light-tlf-t1.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/Merriwthr-Light-tlf-ts1--base.tfm
+2020/08/30 | 1444 | fonts/merriweather/tfm/Merriwthr-Light-tlf-ts1.tfm
+2020/08/30 | 38032 | fonts/merriweather/tfm/Merriwthr-Light-tosf-ly1.tfm
+2020/08/30 | 10236 | fonts/merriweather/tfm/Merriwthr-Light-tosf-ot1.tfm
+2020/08/30 | 1816 | fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ly1--base.tfm
+2020/08/30 | 34100 | fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ly1.tfm
+2020/08/30 | 1324 | fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ot1--base.tfm
+2020/08/30 | 8896 | fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ot1.tfm
+2020/08/30 | 1728 | fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-t1--base.tfm
+2020/08/30 | 42804 | fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-t1.tfm
+2020/08/30 | 1760 | fonts/merriweather/tfm/Merriwthr-Light-tosf-t1--base.tfm
+2020/08/30 | 50508 | fonts/merriweather/tfm/Merriwthr-Light-tosf-t1.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/Merriwthr-Light-tosf-ts1--base.tfm
+2020/08/30 | 1444 | fonts/merriweather/tfm/Merriwthr-Light-tosf-ts1.tfm
+2020/08/30 | 49112 | fonts/merriweather/tfm/Merriwthr-Regular-lf-ly1.tfm
+2020/08/30 | 13832 | fonts/merriweather/tfm/Merriwthr-Regular-lf-ot1.tfm
+2020/08/30 | 1872 | fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ly1--base.tfm
+2020/08/30 | 41268 | fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ly1.tfm
+2020/08/30 | 1372 | fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ot1--base.tfm
+2020/08/30 | 11400 | fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ot1.tfm
+2020/08/30 | 1772 | fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-t1--base.tfm
+2020/08/30 | 53244 | fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-t1.tfm
+2020/08/30 | 1800 | fonts/merriweather/tfm/Merriwthr-Regular-lf-t1--base.tfm
+2020/08/30 | 66376 | fonts/merriweather/tfm/Merriwthr-Regular-lf-t1.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/Merriwthr-Regular-lf-ts1--base.tfm
+2020/08/30 | 1464 | fonts/merriweather/tfm/Merriwthr-Regular-lf-ts1.tfm
+2020/08/30 | 48932 | fonts/merriweather/tfm/Merriwthr-Regular-osf-ly1.tfm
+2020/08/30 | 13704 | fonts/merriweather/tfm/Merriwthr-Regular-osf-ot1.tfm
+2020/08/30 | 1880 | fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ly1--base.tfm
+2020/08/30 | 41248 | fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ly1.tfm
+2020/08/30 | 1376 | fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ot1--base.tfm
+2020/08/30 | 11328 | fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ot1.tfm
+2020/08/30 | 1776 | fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-t1--base.tfm
+2020/08/30 | 53272 | fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-t1.tfm
+2020/08/30 | 1808 | fonts/merriweather/tfm/Merriwthr-Regular-osf-t1--base.tfm
+2020/08/30 | 66208 | fonts/merriweather/tfm/Merriwthr-Regular-osf-t1.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/Merriwthr-Regular-osf-ts1--base.tfm
+2020/08/30 | 1464 | fonts/merriweather/tfm/Merriwthr-Regular-osf-ts1.tfm
+2020/08/30 | 1880 | fonts/merriweather/tfm/Merriwthr-Regular-sup-ly1.tfm
+2020/08/30 | 1380 | fonts/merriweather/tfm/Merriwthr-Regular-sup-ot1.tfm
+2020/08/30 | 1804 | fonts/merriweather/tfm/Merriwthr-Regular-sup-t1--base.tfm
+2020/08/30 | 1808 | fonts/merriweather/tfm/Merriwthr-Regular-sup-t1.tfm
+2020/08/30 | 47944 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-ly1.tfm
+2020/08/30 | 13260 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-ot1.tfm
+2020/08/30 | 1848 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ly1--base.tfm
+2020/08/30 | 39924 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ly1.tfm
+2020/08/30 | 1344 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ot1--base.tfm
+2020/08/30 | 10756 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ot1.tfm
+2020/08/30 | 1744 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-t1--base.tfm
+2020/08/30 | 52100 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-t1.tfm
+2020/08/30 | 1776 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-t1--base.tfm
+2020/08/30 | 65444 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-t1.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-ts1--base.tfm
+2020/08/30 | 1464 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-ts1.tfm
+2020/08/30 | 47944 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-ly1.tfm
+2020/08/30 | 13260 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-ot1.tfm
+2020/08/30 | 1848 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ly1--base.tfm
+2020/08/30 | 39924 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ly1.tfm
+2020/08/30 | 1344 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ot1--base.tfm
+2020/08/30 | 10756 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ot1.tfm
+2020/08/30 | 1744 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-t1--base.tfm
+2020/08/30 | 52100 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-t1.tfm
+2020/08/30 | 1776 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-t1--base.tfm
+2020/08/30 | 65444 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-t1.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-ts1--base.tfm
+2020/08/30 | 1464 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-ts1.tfm
+2020/08/30 | 13348 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ly1.tfm
+2020/08/30 | 4720 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ot1.tfm
+2020/08/30 | 2032 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ly1--base.tfm
+2020/08/30 | 13216 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ly1.tfm
+2020/08/30 | 1480 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ot1--base.tfm
+2020/08/30 | 3940 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ot1.tfm
+2020/08/30 | 1952 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-t1--base.tfm
+2020/08/30 | 17532 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-t1.tfm
+2020/08/30 | 2024 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-t1--base.tfm
+2020/08/30 | 17624 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-t1.tfm
+2020/08/30 | 1476 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ts1--base.tfm
+2020/08/30 | 1480 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ts1.tfm
+2020/08/30 | 13260 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ly1.tfm
+2020/08/30 | 4652 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ot1.tfm
+2020/08/30 | 2028 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ly1--base.tfm
+2020/08/30 | 13316 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ly1.tfm
+2020/08/30 | 1476 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ot1--base.tfm
+2020/08/30 | 3976 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ot1.tfm
+2020/08/30 | 1948 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-t1--base.tfm
+2020/08/30 | 17572 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-t1.tfm
+2020/08/30 | 2008 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-t1--base.tfm
+2020/08/30 | 17476 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-t1.tfm
+2020/08/30 | 1476 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ts1--base.tfm
+2020/08/30 | 1480 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ts1.tfm
+2020/08/30 | 2008 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-ly1.tfm
+2020/08/30 | 1460 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-ot1.tfm
+2020/08/30 | 1992 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-t1--base.tfm
+2020/08/30 | 1996 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-t1.tfm
+2020/08/30 | 12648 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ly1.tfm
+2020/08/30 | 4316 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ot1.tfm
+2020/08/30 | 2000 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ly1--base.tfm
+2020/08/30 | 12728 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ly1.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ot1--base.tfm
+2020/08/30 | 3672 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ot1.tfm
+2020/08/30 | 1924 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-t1--base.tfm
+2020/08/30 | 16824 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-t1.tfm
+2020/08/30 | 1988 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-t1--base.tfm
+2020/08/30 | 16704 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-t1.tfm
+2020/08/30 | 1476 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ts1--base.tfm
+2020/08/30 | 1480 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ts1.tfm
+2020/08/30 | 12648 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ly1.tfm
+2020/08/30 | 4312 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ot1.tfm
+2020/08/30 | 2000 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ly1--base.tfm
+2020/08/30 | 12728 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ly1.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ot1--base.tfm
+2020/08/30 | 3668 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ot1.tfm
+2020/08/30 | 1920 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-t1--base.tfm
+2020/08/30 | 16820 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-t1.tfm
+2020/08/30 | 1984 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-t1--base.tfm
+2020/08/30 | 16700 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-t1.tfm
+2020/08/30 | 1476 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ts1--base.tfm
+2020/08/30 | 1480 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ts1.tfm
+2020/08/30 | 23148 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ly1.tfm
+2020/08/30 | 6200 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ot1.tfm
+2020/08/30 | 1908 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ly1--base.tfm
+2020/08/30 | 18464 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ly1.tfm
+2020/08/30 | 1372 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ot1--base.tfm
+2020/08/30 | 5028 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ot1.tfm
+2020/08/30 | 1812 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-t1--base.tfm
+2020/08/30 | 21864 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-t1.tfm
+2020/08/30 | 1852 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-t1--base.tfm
+2020/08/30 | 29004 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-t1.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ts1--base.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ts1.tfm
+2020/08/30 | 22756 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ly1.tfm
+2020/08/30 | 6064 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ot1.tfm
+2020/08/30 | 1908 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ly1--base.tfm
+2020/08/30 | 18472 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ly1.tfm
+2020/08/30 | 1368 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ot1--base.tfm
+2020/08/30 | 4940 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ot1.tfm
+2020/08/30 | 1812 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-t1--base.tfm
+2020/08/30 | 21840 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-t1.tfm
+2020/08/30 | 1856 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-t1--base.tfm
+2020/08/30 | 28608 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-t1.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ts1--base.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ts1.tfm
+2020/08/30 | 1888 | fonts/merriweather/tfm/MerriwthrSans-Bold-sup-ly1.tfm
+2020/08/30 | 1364 | fonts/merriweather/tfm/MerriwthrSans-Bold-sup-ot1.tfm
+2020/08/30 | 1840 | fonts/merriweather/tfm/MerriwthrSans-Bold-sup-t1--base.tfm
+2020/08/30 | 1844 | fonts/merriweather/tfm/MerriwthrSans-Bold-sup-t1.tfm
+2020/08/30 | 22180 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ly1.tfm
+2020/08/30 | 5780 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ot1.tfm
+2020/08/30 | 1880 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ly1--base.tfm
+2020/08/30 | 17728 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ly1.tfm
+2020/08/30 | 1340 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ot1--base.tfm
+2020/08/30 | 4576 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ot1.tfm
+2020/08/30 | 1784 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-t1--base.tfm
+2020/08/30 | 20992 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-t1.tfm
+2020/08/30 | 1824 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-t1--base.tfm
+2020/08/30 | 27948 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-t1.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ts1--base.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ts1.tfm
+2020/08/30 | 22184 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ly1.tfm
+2020/08/30 | 5784 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ot1.tfm
+2020/08/30 | 1884 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ly1--base.tfm
+2020/08/30 | 17732 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ly1.tfm
+2020/08/30 | 1344 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ot1--base.tfm
+2020/08/30 | 4580 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ot1.tfm
+2020/08/30 | 1788 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-t1--base.tfm
+2020/08/30 | 20996 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-t1.tfm
+2020/08/30 | 1828 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-t1--base.tfm
+2020/08/30 | 27952 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-t1.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ts1--base.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ts1.tfm
+2020/08/30 | 12876 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ly1.tfm
+2020/08/30 | 4436 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ot1.tfm
+2020/08/30 | 1956 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ly1--base.tfm
+2020/08/30 | 12420 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ly1.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ot1--base.tfm
+2020/08/30 | 3648 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ot1.tfm
+2020/08/30 | 1892 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-t1--base.tfm
+2020/08/30 | 16536 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-t1.tfm
+2020/08/30 | 1948 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-t1--base.tfm
+2020/08/30 | 17096 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-t1.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ts1--base.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ts1.tfm
+2020/08/30 | 12820 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ly1.tfm
+2020/08/30 | 4392 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ot1.tfm
+2020/08/30 | 1964 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ly1--base.tfm
+2020/08/30 | 12596 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ly1.tfm
+2020/08/30 | 1464 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ot1--base.tfm
+2020/08/30 | 3736 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ot1.tfm
+2020/08/30 | 1900 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-t1--base.tfm
+2020/08/30 | 16692 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-t1.tfm
+2020/08/30 | 1952 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-t1--base.tfm
+2020/08/30 | 16996 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-t1.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ts1--base.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ts1.tfm
+2020/08/30 | 1940 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-ly1.tfm
+2020/08/30 | 1436 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-ot1.tfm
+2020/08/30 | 1936 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-t1--base.tfm
+2020/08/30 | 1940 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-t1.tfm
+2020/08/30 | 12220 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ly1.tfm
+2020/08/30 | 4072 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ot1.tfm
+2020/08/30 | 1932 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1--base.tfm
+2020/08/30 | 12020 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1.tfm
+2020/08/30 | 1432 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1--base.tfm
+2020/08/30 | 3436 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1.tfm
+2020/08/30 | 1872 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-t1--base.tfm
+2020/08/30 | 15956 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-t1.tfm
+2020/08/30 | 1924 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-t1--base.tfm
+2020/08/30 | 16236 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-t1.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ts1--base.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ts1.tfm
+2020/08/30 | 12220 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ly1.tfm
+2020/08/30 | 4068 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ot1.tfm
+2020/08/30 | 1932 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1--base.tfm
+2020/08/30 | 12020 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1--base.tfm
+2020/08/30 | 3432 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1.tfm
+2020/08/30 | 1868 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-t1--base.tfm
+2020/08/30 | 15952 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-t1.tfm
+2020/08/30 | 1920 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-t1--base.tfm
+2020/08/30 | 16232 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-t1.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ts1--base.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ts1.tfm
+2020/08/30 | 22284 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ly1.tfm
+2020/08/30 | 5804 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ot1.tfm
+2020/08/30 | 1860 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ly1--base.tfm
+2020/08/30 | 18024 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ly1.tfm
+2020/08/30 | 1344 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ot1--base.tfm
+2020/08/30 | 4772 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ot1.tfm
+2020/08/30 | 1772 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-t1--base.tfm
+2020/08/30 | 21380 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-t1.tfm
+2020/08/30 | 1816 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-t1--base.tfm
+2020/08/30 | 28024 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-t1.tfm
+2020/08/30 | 1420 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ts1--base.tfm
+2020/08/30 | 1436 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ts1.tfm
+2020/08/30 | 21912 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ly1.tfm
+2020/08/30 | 5668 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ot1.tfm
+2020/08/30 | 1864 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ly1--base.tfm
+2020/08/30 | 17912 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ly1.tfm
+2020/08/30 | 1356 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ot1--base.tfm
+2020/08/30 | 4660 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ot1.tfm
+2020/08/30 | 1784 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-t1--base.tfm
+2020/08/30 | 21248 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-t1.tfm
+2020/08/30 | 1824 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-t1--base.tfm
+2020/08/30 | 27648 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-t1.tfm
+2020/08/30 | 1420 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ts1--base.tfm
+2020/08/30 | 1436 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ts1.tfm
+2020/08/30 | 1864 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-ly1.tfm
+2020/08/30 | 1360 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-ot1.tfm
+2020/08/30 | 1816 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-t1--base.tfm
+2020/08/30 | 1820 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-t1.tfm
+2020/08/30 | 21408 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ly1.tfm
+2020/08/30 | 5412 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ot1.tfm
+2020/08/30 | 1836 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ly1--base.tfm
+2020/08/30 | 17320 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ly1.tfm
+2020/08/30 | 1320 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ot1--base.tfm
+2020/08/30 | 4360 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ot1.tfm
+2020/08/30 | 1748 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-t1--base.tfm
+2020/08/30 | 20548 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-t1.tfm
+2020/08/30 | 1796 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-t1--base.tfm
+2020/08/30 | 27068 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-t1.tfm
+2020/08/30 | 1420 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ts1--base.tfm
+2020/08/30 | 1436 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ts1.tfm
+2020/08/30 | 21408 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ly1.tfm
+2020/08/30 | 5412 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ot1.tfm
+2020/08/30 | 1836 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ly1--base.tfm
+2020/08/30 | 17320 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ly1.tfm
+2020/08/30 | 1320 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ot1--base.tfm
+2020/08/30 | 4360 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ot1.tfm
+2020/08/30 | 1748 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-t1--base.tfm
+2020/08/30 | 20548 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-t1.tfm
+2020/08/30 | 1796 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-t1--base.tfm
+2020/08/30 | 27068 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-t1.tfm
+2020/08/30 | 1420 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ts1--base.tfm
+2020/08/30 | 1436 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ts1.tfm
+2020/08/30 | 12180 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ly1.tfm
+2020/08/30 | 4316 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ot1.tfm
+2020/08/30 | 2012 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ly1--base.tfm
+2020/08/30 | 11428 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ly1.tfm
+2020/08/30 | 1444 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ot1--base.tfm
+2020/08/30 | 3536 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ot1.tfm
+2020/08/30 | 1916 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-t1--base.tfm
+2020/08/30 | 14904 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-t1.tfm
+2020/08/30 | 1956 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-t1--base.tfm
+2020/08/30 | 16144 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-t1.tfm
+2020/08/30 | 1460 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ts1--base.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ts1.tfm
+2020/08/30 | 12236 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ly1.tfm
+2020/08/30 | 4288 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ot1.tfm
+2020/08/30 | 2016 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ly1--base.tfm
+2020/08/30 | 11676 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ly1.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ot1--base.tfm
+2020/08/30 | 3616 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ot1.tfm
+2020/08/30 | 1920 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-t1--base.tfm
+2020/08/30 | 15112 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-t1.tfm
+2020/08/30 | 1960 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-t1--base.tfm
+2020/08/30 | 16124 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-t1.tfm
+2020/08/30 | 1460 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ts1--base.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ts1.tfm
+2020/08/30 | 1972 | fonts/merriweather/tfm/MerriwthrSans-Italic-sup-ly1.tfm
+2020/08/30 | 1416 | fonts/merriweather/tfm/MerriwthrSans-Italic-sup-ot1.tfm
+2020/08/30 | 1940 | fonts/merriweather/tfm/MerriwthrSans-Italic-sup-t1--base.tfm
+2020/08/30 | 1944 | fonts/merriweather/tfm/MerriwthrSans-Italic-sup-t1.tfm
+2020/08/30 | 11672 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ly1.tfm
+2020/08/30 | 4004 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ot1.tfm
+2020/08/30 | 1976 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ly1--base.tfm
+2020/08/30 | 11128 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ly1.tfm
+2020/08/30 | 1412 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ot1--base.tfm
+2020/08/30 | 3344 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ot1.tfm
+2020/08/30 | 1884 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-t1--base.tfm
+2020/08/30 | 14436 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-t1.tfm
+2020/08/30 | 1924 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-t1--base.tfm
+2020/08/30 | 15440 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-t1.tfm
+2020/08/30 | 1460 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ts1--base.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ts1.tfm
+2020/08/30 | 11676 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ly1.tfm
+2020/08/30 | 4004 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ot1.tfm
+2020/08/30 | 1980 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ly1--base.tfm
+2020/08/30 | 11132 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ly1.tfm
+2020/08/30 | 1412 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ot1--base.tfm
+2020/08/30 | 3344 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ot1.tfm
+2020/08/30 | 1884 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-t1--base.tfm
+2020/08/30 | 14436 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-t1.tfm
+2020/08/30 | 1924 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-t1--base.tfm
+2020/08/30 | 15440 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-t1.tfm
+2020/08/30 | 1460 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ts1--base.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ts1.tfm
+2020/08/30 | 10652 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ly1.tfm
+2020/08/30 | 3928 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ot1.tfm
+2020/08/30 | 1964 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ly1--base.tfm
+2020/08/30 | 9868 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ly1.tfm
+2020/08/30 | 1432 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ot1--base.tfm
+2020/08/30 | 3240 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ot1.tfm
+2020/08/30 | 1884 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-t1--base.tfm
+2020/08/30 | 12528 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-t1.tfm
+2020/08/30 | 1896 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-t1--base.tfm
+2020/08/30 | 13952 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-t1.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ts1--base.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ts1.tfm
+2020/08/30 | 10648 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ly1.tfm
+2020/08/30 | 3880 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ot1.tfm
+2020/08/30 | 1964 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ly1--base.tfm
+2020/08/30 | 10088 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ly1.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ot1--base.tfm
+2020/08/30 | 3300 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ot1.tfm
+2020/08/30 | 1884 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-t1--base.tfm
+2020/08/30 | 12680 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-t1.tfm
+2020/08/30 | 1884 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-t1--base.tfm
+2020/08/30 | 13884 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-t1.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ts1--base.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ts1.tfm
+2020/08/30 | 1912 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-ly1.tfm
+2020/08/30 | 1392 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-ot1.tfm
+2020/08/30 | 1872 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-t1--base.tfm
+2020/08/30 | 1872 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-t1.tfm
+2020/08/30 | 10048 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ly1.tfm
+2020/08/30 | 3576 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ot1.tfm
+2020/08/30 | 1940 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ly1--base.tfm
+2020/08/30 | 9600 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ly1.tfm
+2020/08/30 | 1404 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ot1--base.tfm
+2020/08/30 | 3048 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ot1.tfm
+2020/08/30 | 1860 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-t1--base.tfm
+2020/08/30 | 12068 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-t1.tfm
+2020/08/30 | 1860 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-t1--base.tfm
+2020/08/30 | 13132 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-t1.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ts1--base.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ts1.tfm
+2020/08/30 | 10052 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ly1.tfm
+2020/08/30 | 3580 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ot1.tfm
+2020/08/30 | 1944 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ly1--base.tfm
+2020/08/30 | 9604 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ly1.tfm
+2020/08/30 | 1408 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ot1--base.tfm
+2020/08/30 | 3052 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ot1.tfm
+2020/08/30 | 1864 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-t1--base.tfm
+2020/08/30 | 12072 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-t1.tfm
+2020/08/30 | 1864 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-t1--base.tfm
+2020/08/30 | 13136 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-t1.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ts1--base.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ts1.tfm
+2020/08/30 | 21552 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-ly1.tfm
+2020/08/30 | 5656 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-ot1.tfm
+2020/08/30 | 1852 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ly1--base.tfm
+2020/08/30 | 17396 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ly1.tfm
+2020/08/30 | 1344 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ot1--base.tfm
+2020/08/30 | 4644 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ot1.tfm
+2020/08/30 | 1776 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-t1--base.tfm
+2020/08/30 | 20572 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-t1.tfm
+2020/08/30 | 1788 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-t1--base.tfm
+2020/08/30 | 27004 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-t1.tfm
+2020/08/30 | 1400 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-ts1--base.tfm
+2020/08/30 | 1420 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-ts1.tfm
+2020/08/30 | 21148 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-ly1.tfm
+2020/08/30 | 5496 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-ot1.tfm
+2020/08/30 | 1848 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ly1--base.tfm
+2020/08/30 | 17368 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ly1.tfm
+2020/08/30 | 1340 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ot1--base.tfm
+2020/08/30 | 4532 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ot1.tfm
+2020/08/30 | 1772 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-t1--base.tfm
+2020/08/30 | 20532 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-t1.tfm
+2020/08/30 | 1788 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-t1--base.tfm
+2020/08/30 | 26608 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-t1.tfm
+2020/08/30 | 1400 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-ts1--base.tfm
+2020/08/30 | 1420 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-ts1.tfm
+2020/08/30 | 1832 | fonts/merriweather/tfm/MerriwthrSans-Light-sup-ly1.tfm
+2020/08/30 | 1328 | fonts/merriweather/tfm/MerriwthrSans-Light-sup-ot1.tfm
+2020/08/30 | 1788 | fonts/merriweather/tfm/MerriwthrSans-Light-sup-t1--base.tfm
+2020/08/30 | 1792 | fonts/merriweather/tfm/MerriwthrSans-Light-sup-t1.tfm
+2020/08/30 | 20628 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ly1.tfm
+2020/08/30 | 5276 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ot1.tfm
+2020/08/30 | 1820 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ly1--base.tfm
+2020/08/30 | 16636 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ly1.tfm
+2020/08/30 | 1312 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ot1--base.tfm
+2020/08/30 | 4216 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ot1.tfm
+2020/08/30 | 1744 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-t1--base.tfm
+2020/08/30 | 19704 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-t1.tfm
+2020/08/30 | 1772 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-t1--base.tfm
+2020/08/30 | 26024 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-t1.tfm
+2020/08/30 | 1400 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ts1--base.tfm
+2020/08/30 | 1420 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ts1.tfm
+2020/08/30 | 20628 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ly1.tfm
+2020/08/30 | 5276 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ot1.tfm
+2020/08/30 | 1820 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ly1--base.tfm
+2020/08/30 | 16636 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ly1.tfm
+2020/08/30 | 1312 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ot1--base.tfm
+2020/08/30 | 4216 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ot1.tfm
+2020/08/30 | 1744 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-t1--base.tfm
+2020/08/30 | 19704 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-t1.tfm
+2020/08/30 | 1772 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-t1--base.tfm
+2020/08/30 | 26024 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-t1.tfm
+2020/08/30 | 1400 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ts1--base.tfm
+2020/08/30 | 1420 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ts1.tfm
+2020/08/30 | 21572 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ly1.tfm
+2020/08/30 | 5704 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ot1.tfm
+2020/08/30 | 1868 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ly1--base.tfm
+2020/08/30 | 17592 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ly1.tfm
+2020/08/30 | 1336 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ot1--base.tfm
+2020/08/30 | 4648 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ot1.tfm
+2020/08/30 | 1780 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-t1--base.tfm
+2020/08/30 | 20928 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-t1.tfm
+2020/08/30 | 1828 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-t1--base.tfm
+2020/08/30 | 27088 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-t1.tfm
+2020/08/30 | 1412 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ts1--base.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ts1.tfm
+2020/08/30 | 21252 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ly1.tfm
+2020/08/30 | 5580 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ot1.tfm
+2020/08/30 | 1868 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ly1--base.tfm
+2020/08/30 | 17580 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ly1.tfm
+2020/08/30 | 1340 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ot1--base.tfm
+2020/08/30 | 4548 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ot1.tfm
+2020/08/30 | 1784 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-t1--base.tfm
+2020/08/30 | 20864 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-t1.tfm
+2020/08/30 | 1824 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-t1--base.tfm
+2020/08/30 | 26796 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-t1.tfm
+2020/08/30 | 1412 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ts1--base.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ts1.tfm
+2020/08/30 | 1864 | fonts/merriweather/tfm/MerriwthrSans-Regular-sup-ly1.tfm
+2020/08/30 | 1340 | fonts/merriweather/tfm/MerriwthrSans-Regular-sup-ot1.tfm
+2020/08/30 | 1812 | fonts/merriweather/tfm/MerriwthrSans-Regular-sup-t1--base.tfm
+2020/08/30 | 1816 | fonts/merriweather/tfm/MerriwthrSans-Regular-sup-t1.tfm
+2020/08/30 | 20708 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ly1.tfm
+2020/08/30 | 5324 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ot1.tfm
+2020/08/30 | 1840 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ly1--base.tfm
+2020/08/30 | 16908 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ly1.tfm
+2020/08/30 | 1308 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ot1--base.tfm
+2020/08/30 | 4232 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ot1.tfm
+2020/08/30 | 1752 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-t1--base.tfm
+2020/08/30 | 20108 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-t1.tfm
+2020/08/30 | 1792 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-t1--base.tfm
+2020/08/30 | 26192 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-t1.tfm
+2020/08/30 | 1412 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ts1--base.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ts1.tfm
+2020/08/30 | 20712 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ly1.tfm
+2020/08/30 | 5328 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ot1.tfm
+2020/08/30 | 1844 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ly1--base.tfm
+2020/08/30 | 16912 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ly1.tfm
+2020/08/30 | 1312 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ot1--base.tfm
+2020/08/30 | 4236 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ot1.tfm
+2020/08/30 | 1756 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-t1--base.tfm
+2020/08/30 | 20112 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-t1.tfm
+2020/08/30 | 1796 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-t1--base.tfm
+2020/08/30 | 26196 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-t1.tfm
+2020/08/30 | 1412 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ts1--base.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ts1.tfm
+2020/08/30 | 325592 | fonts/merriweather/type1/Merriwthr-BlackItalic.pfb
+2020/08/30 | 378012 | fonts/merriweather/type1/Merriwthr-Black.pfb
+2020/08/30 | 331198 | fonts/merriweather/type1/Merriwthr-BoldItalic.pfb
+2020/08/30 | 368053 | fonts/merriweather/type1/Merriwthr-Bold.pfb
+2020/08/30 | 324293 | fonts/merriweather/type1/Merriwthr-Italic.pfb
+2020/08/30 | 299981 | fonts/merriweather/type1/Merriwthr-LightItalic.pfb
+2020/08/30 | 342047 | fonts/merriweather/type1/Merriwthr-Light.pfb
+2020/08/30 | 355472 | fonts/merriweather/type1/Merriwthr-Regular.pfb
+2020/08/30 | 118981 | fonts/merriweather/type1/MerriwthrSans-BoldItalic.pfb
+2020/08/30 | 118266 | fonts/merriweather/type1/MerriwthrSans-Bold.pfb
+2020/08/30 | 110380 | fonts/merriweather/type1/MerriwthrSans-ExtraBoldItalic.pfb
+2020/08/30 | 110715 | fonts/merriweather/type1/MerriwthrSans-ExtraBold.pfb
+2020/08/30 | 111241 | fonts/merriweather/type1/MerriwthrSans-Italic.pfb
+2020/08/30 | 110227 | fonts/merriweather/type1/MerriwthrSans-LightItalic.pfb
+2020/08/30 | 109916 | fonts/merriweather/type1/MerriwthrSans-Light.pfb
+2020/08/30 | 110121 | fonts/merriweather/type1/MerriwthrSans-Regular.pfb
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-BlackItalic-lf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-BlackItalic-lf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BlackItalic-lf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BlackItalic-lf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/Merriwthr-BlackItalic-lf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-BlackItalic-osf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/Merriwthr-BlackItalic-osf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-BlackItalic-osf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BlackItalic-osf-t1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/Merriwthr-BlackItalic-osf-ts1.vf
+2020/08/30 | 1692 | fonts/merriweather/vf/Merriwthr-BlackItalic-sup-t1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-t1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-t1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-ts1.vf
+2020/08/30 | 1676 | fonts/merriweather/vf/Merriwthr-Black-lf-sc-ly1.vf
+2020/08/30 | 772 | fonts/merriweather/vf/Merriwthr-Black-lf-sc-ot1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Black-lf-sc-t1.vf
+2020/08/30 | 1696 | fonts/merriweather/vf/Merriwthr-Black-lf-t1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Black-lf-ts1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/Merriwthr-Black-osf-sc-ly1.vf
+2020/08/30 | 772 | fonts/merriweather/vf/Merriwthr-Black-osf-sc-ot1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Black-osf-sc-t1.vf
+2020/08/30 | 1696 | fonts/merriweather/vf/Merriwthr-Black-osf-t1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Black-osf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Black-sup-t1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/Merriwthr-Black-tlf-sc-ly1.vf
+2020/08/30 | 772 | fonts/merriweather/vf/Merriwthr-Black-tlf-sc-ot1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Black-tlf-sc-t1.vf
+2020/08/30 | 1696 | fonts/merriweather/vf/Merriwthr-Black-tlf-t1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Black-tlf-ts1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/Merriwthr-Black-tosf-sc-ly1.vf
+2020/08/30 | 772 | fonts/merriweather/vf/Merriwthr-Black-tosf-sc-ot1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Black-tosf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Black-tosf-t1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Black-tosf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-BoldItalic-lf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-BoldItalic-lf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BoldItalic-lf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-BoldItalic-lf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/Merriwthr-BoldItalic-lf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-BoldItalic-osf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-BoldItalic-osf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BoldItalic-osf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BoldItalic-osf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/Merriwthr-BoldItalic-osf-ts1.vf
+2020/08/30 | 1692 | fonts/merriweather/vf/Merriwthr-BoldItalic-sup-t1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-t1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Bold-lf-sc-ly1.vf
+2020/08/30 | 772 | fonts/merriweather/vf/Merriwthr-Bold-lf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-Bold-lf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Bold-lf-t1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Bold-lf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Bold-osf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Bold-osf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-Bold-osf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Bold-osf-t1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Bold-osf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Bold-sup-t1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Bold-tlf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Bold-tlf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-Bold-tlf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Bold-tlf-t1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Bold-tlf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Bold-tosf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Bold-tosf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-Bold-tosf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Bold-tosf-t1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Bold-tosf-ts1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/Merriwthr-Italic-lf-sc-ly1.vf
+2020/08/30 | 772 | fonts/merriweather/vf/Merriwthr-Italic-lf-sc-ot1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Italic-lf-sc-t1.vf
+2020/08/30 | 1696 | fonts/merriweather/vf/Merriwthr-Italic-lf-t1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Italic-lf-ts1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/Merriwthr-Italic-osf-sc-ly1.vf
+2020/08/30 | 772 | fonts/merriweather/vf/Merriwthr-Italic-osf-sc-ot1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Italic-osf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Italic-osf-t1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Italic-osf-ts1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/Merriwthr-Italic-sup-t1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/Merriwthr-Italic-tlf-sc-ly1.vf
+2020/08/30 | 772 | fonts/merriweather/vf/Merriwthr-Italic-tlf-sc-ot1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Italic-tlf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Italic-tlf-t1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Italic-tlf-ts1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/Merriwthr-Italic-tosf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Italic-tosf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-Italic-tosf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Italic-tosf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/Merriwthr-Italic-tosf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-LightItalic-lf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-LightItalic-lf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-LightItalic-lf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-LightItalic-lf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/Merriwthr-LightItalic-lf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-LightItalic-osf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/Merriwthr-LightItalic-osf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-LightItalic-osf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-LightItalic-osf-t1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/Merriwthr-LightItalic-osf-ts1.vf
+2020/08/30 | 1692 | fonts/merriweather/vf/Merriwthr-LightItalic-sup-t1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-LightItalic-tlf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/Merriwthr-LightItalic-tlf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-LightItalic-tlf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-LightItalic-tlf-t1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/Merriwthr-LightItalic-tlf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-LightItalic-tosf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/Merriwthr-LightItalic-tosf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-LightItalic-tosf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-LightItalic-tosf-t1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/Merriwthr-LightItalic-tosf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Light-lf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Light-lf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-Light-lf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Light-lf-t1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Light-lf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Light-osf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Light-osf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-Light-osf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Light-osf-t1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Light-osf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Light-sup-t1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Light-tlf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Light-tlf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-Light-tlf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Light-tlf-t1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Light-tlf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Light-tosf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Light-tosf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-Light-tosf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Light-tosf-t1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Light-tosf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Regular-lf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Regular-lf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-Regular-lf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Regular-lf-t1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Regular-lf-ts1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/Merriwthr-Regular-osf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Regular-osf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-Regular-osf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-Regular-osf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/Merriwthr-Regular-osf-ts1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/Merriwthr-Regular-sup-t1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/Merriwthr-Regular-tlf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Regular-tlf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-Regular-tlf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-Regular-tlf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/Merriwthr-Regular-tlf-ts1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/Merriwthr-Regular-tosf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/Merriwthr-Regular-tosf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-Regular-tosf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-Regular-tosf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/Merriwthr-Regular-tosf-ts1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-sc-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-t1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-ts1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-sc-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-t1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-ts1.vf
+2020/08/30 | 1696 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-sup-t1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-sc-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-t1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-ts1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-sc-ly1.vf
+2020/08/30 | 784 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-sc-ot1.vf
+2020/08/30 | 1712 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-sc-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-t1.vf
+2020/08/30 | 592 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-ts1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/MerriwthrSans-Bold-lf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Bold-lf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Bold-lf-sc-t1.vf
+2020/08/30 | 1716 | fonts/merriweather/vf/MerriwthrSans-Bold-lf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Bold-lf-ts1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/MerriwthrSans-Bold-osf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Bold-osf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Bold-osf-sc-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Bold-osf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Bold-osf-ts1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-Bold-sup-t1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/MerriwthrSans-Bold-tlf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Bold-tlf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Bold-tlf-sc-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Bold-tlf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Bold-tlf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Bold-tosf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Bold-tosf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Bold-tosf-sc-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Bold-tosf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Bold-tosf-ts1.vf
+2020/08/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-sc-ly1.vf
+2020/08/30 | 784 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-sc-ot1.vf
+2020/08/30 | 1712 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-sc-t1.vf
+2020/08/30 | 1728 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-t1.vf
+2020/08/30 | 592 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-ts1.vf
+2020/08/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-sc-ly1.vf
+2020/08/30 | 788 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-sc-ot1.vf
+2020/08/30 | 1716 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-sc-t1.vf
+2020/08/30 | 1728 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-t1.vf
+2020/08/30 | 596 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-ts1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-sup-t1.vf
+2020/08/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1.vf
+2020/08/30 | 788 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1.vf
+2020/08/30 | 1716 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-sc-t1.vf
+2020/08/30 | 1728 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-t1.vf
+2020/08/30 | 596 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-ts1.vf
+2020/08/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1.vf
+2020/08/30 | 788 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1.vf
+2020/08/30 | 1716 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-sc-t1.vf
+2020/08/30 | 1732 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-t1.vf
+2020/08/30 | 596 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-sc-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-t1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-ts1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-sc-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-t1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-ts1.vf
+2020/08/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-sup-t1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-sc-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-t1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-ts1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-sc-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-t1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Italic-lf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Italic-lf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Italic-lf-sc-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Italic-lf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Italic-lf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Italic-osf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Italic-osf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Italic-osf-sc-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Italic-osf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Italic-osf-ts1.vf
+2020/08/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-Italic-sup-t1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Italic-tlf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Italic-tlf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Italic-tlf-sc-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Italic-tlf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Italic-tlf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Italic-tosf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-Italic-tosf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-Italic-tosf-sc-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Italic-tosf-t1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-Italic-tosf-ts1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-sc-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-t1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-ts1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-sc-ly1.vf
+2020/08/30 | 784 | fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-sc-ot1.vf
+2020/08/30 | 1712 | fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-sc-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-t1.vf
+2020/08/30 | 592 | fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-ts1.vf
+2020/08/30 | 1696 | fonts/merriweather/vf/MerriwthrSans-LightItalic-sup-t1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-sc-ly1.vf
+2020/08/30 | 784 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-sc-ot1.vf
+2020/08/30 | 1712 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-sc-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-t1.vf
+2020/08/30 | 592 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-ts1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-sc-ly1.vf
+2020/08/30 | 784 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-sc-ot1.vf
+2020/08/30 | 1712 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-sc-t1.vf
+2020/08/30 | 1728 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-t1.vf
+2020/08/30 | 592 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-ts1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/MerriwthrSans-Light-lf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Light-lf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Light-lf-sc-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Light-lf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Light-lf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Light-osf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Light-osf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Light-osf-sc-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Light-osf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Light-osf-ts1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-Light-sup-t1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Light-tlf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Light-tlf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Light-tlf-sc-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Light-tlf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Light-tlf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Light-tosf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Light-tosf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Light-tosf-sc-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Light-tosf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Light-tosf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Regular-lf-sc-ly1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Regular-lf-sc-ot1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Regular-lf-sc-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Regular-lf-t1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Regular-lf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Regular-osf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-Regular-osf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-Regular-osf-sc-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Regular-osf-t1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-Regular-osf-ts1.vf
+2020/08/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-Regular-sup-t1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Regular-tlf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-Regular-tlf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-Regular-tlf-sc-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Regular-tlf-t1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-Regular-tlf-ts1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Regular-tosf-sc-ly1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-Regular-tosf-sc-ot1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-Regular-tosf-sc-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-Regular-tosf-t1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-Regular-tosf-ts1.vf
+2020/08/30 | 8949627 | fonts/merriweather.zip
1999/03/18 | 2126 | fonts/mflogo/Makefile
1999/03/18 | 402 | fonts/mflogo/mf/logosl8.mf
1999/08/25 | 992 | fonts/mflogo/ps-type1/hoekwater/afm/logo10.afm
@@ -133692,19 +134782,19 @@
2011/05/31 | 231925 | graphics/mathspic/perl/sourcecode113.html
2011/05/31 | 183530 | graphics/mathspic/perl/sourcecode113.nw
2011/05/31 | 2864043 | graphics/mathspic/perl/sourcecode113.pdf
-2020/08/10 | 10292 | graphics/mcf2graph/CHANGELOG
-2020/08/09 | 88065 | graphics/mcf2graph/mcf2graph.mf
-2020/08/10 | 306240 | graphics/mcf2graph/mcf_example.pdf
-2020/08/07 | 2276 | graphics/mcf2graph/mcf_example.tex
-2020/08/10 | 20819 | graphics/mcf2graph/mcf_exa_soc.mf
-2020/08/05 | 36466 | graphics/mcf2graph/mcf_man_soc.mf
-2020/08/10 | 576529 | graphics/mcf2graph/mcf_manual.pdf
-2020/08/10 | 47928 | graphics/mcf2graph/mcf_manual.tex
-2020/08/10 | 201822 | graphics/mcf2graph/mcf_mplib_exa.pdf
-2020/08/01 | 16700 | graphics/mcf2graph/mcf_mplib_exa.tex
-2020/08/10 | 3320 | graphics/mcf2graph/mcf_setup.sty
-2020/08/09 | 3701 | graphics/mcf2graph/README
-2020/08/10 | 1089407 | graphics/mcf2graph.zip
+2020/08/30 | 10381 | graphics/mcf2graph/CHANGELOG
+2020/08/30 | 88754 | graphics/mcf2graph/mcf2graph.mf
+2020/08/30 | 306332 | graphics/mcf2graph/mcf_example.pdf
+2020/08/29 | 2914 | graphics/mcf2graph/mcf_example.tex
+2020/08/30 | 20843 | graphics/mcf2graph/mcf_exa_soc.mf
+2020/08/30 | 36652 | graphics/mcf2graph/mcf_man_soc.mf
+2020/08/30 | 575278 | graphics/mcf2graph/mcf_manual.pdf
+2020/08/30 | 47664 | graphics/mcf2graph/mcf_manual.tex
+2020/08/30 | 201949 | graphics/mcf2graph/mcf_mplib_exa.pdf
+2020/08/16 | 16700 | graphics/mcf2graph/mcf_mplib_exa.tex
+2020/08/30 | 3638 | graphics/mcf2graph/mcf_setup.sty
+2020/08/10 | 3701 | graphics/mcf2graph/README
+2020/08/30 | 1088751 | graphics/mcf2graph.zip
2004/07/13 | 8567 | graphics/metaplot/axes.mp
2004/06/28 | 1122 | graphics/metaplot/examples/cap1.cc
2004/06/28 | 2178 | graphics/metaplot/examples/cap1.mp
@@ -164644,7 +165734,7 @@
2009/07/22 | 1183893 | install/fonts/mathgifg.tds.zip
2010/11/03 | 232427 | install/fonts/mdputu.tds.zip
2012/11/29 | 1501134 | install/fonts/mdsymbol.tds.zip
-2020/07/31 | 3025865 | install/fonts/merriweather.tds.zip
+2020/08/30 | 9054757 | install/fonts/merriweather.tds.zip
2020/05/03 | 428983 | install/fonts/minion2newtx.tds.zip
2013/11/02 | 2698039 | install/fonts/mintspirit.tds.zip
2019/11/08 | 25067633 | install/fonts/montserrat.tds.zip
@@ -164830,7 +165920,7 @@
2017/09/19 | 592240 | install/macros/latex/contrib/bytefield.tds.zip
2009/10/01 | 166291 | install/macros/latex/contrib/cachepic.tds.zip
2014/02/24 | 625238 | install/macros/latex/contrib/calculator.tds.zip
-2020/07/20 | 2059069 | install/macros/latex/contrib/caption.tds.zip
+2020/08/30 | 2075614 | install/macros/latex/contrib/caption.tds.zip
2019/12/10 | 304516 | install/macros/latex/contrib/catchfile.tds.zip
2011/08/07 | 511024 | install/macros/latex/contrib/ccaption.tds.zip
2009/10/20 | 291969 | install/macros/latex/contrib/changepage.tds.zip
@@ -164875,7 +165965,7 @@
2014/11/26 | 125896 | install/macros/latex/contrib/everyhook.tds.zip
2018/10/23 | 686749 | install/macros/latex/contrib/exsol.tds.zip
2016/06/27 | 190038 | install/macros/latex/contrib/fancytabs.tds.zip
-2019/04/03 | 1776624 | install/macros/latex/contrib/fduthesis.tds.zip
+2020/08/30 | 1769613 | install/macros/latex/contrib/fduthesis.tds.zip
2013/05/03 | 382005 | install/macros/latex/contrib/feynmp-auto.tds.zip
2019/09/21 | 131617 | install/macros/latex/contrib/filecontents.tds.zip
2013/03/27 | 577400 | install/macros/latex/contrib/filedate.tds.zip
@@ -165070,7 +166160,7 @@
2020/07/31 | 6111945 | install/macros/latex/contrib/tcolorbox.tds.zip
2009/06/22 | 771373 | install/macros/latex/contrib/tdsfrmath.tds.zip
2019/09/29 | 5325410 | install/macros/latex/contrib/testidx.tds.zip
-2020/08/29 | 4958366 | install/macros/latex/contrib/texnegar.tds.zip
+2020/08/30 | 4957201 | install/macros/latex/contrib/texnegar.tds.zip
2019/07/31 | 453685 | install/macros/latex/contrib/thalie.tds.zip
2013/01/06 | 389729 | install/macros/latex/contrib/threadcol.tds.zip
2014/03/09 | 752162 | install/macros/latex/contrib/thumbs.tds.zip
@@ -185613,30 +186703,37 @@
2010/03/06 | 3264 | macros/latex/contrib/captdef/captdef.tex
2010/03/06 | 3423 | macros/latex/contrib/captdef/miscdoc.sty
2010/03/06 | 216809 | macros/latex/contrib/captdef.zip
-2020/07/20 | 48975 | macros/latex/contrib/caption/bicaption.dtx
-2020/07/20 | 115778 | macros/latex/contrib/caption/bicaption.pdf
-2020/07/20 | 49377 | macros/latex/contrib/caption/caption2.dtx
-2020/07/20 | 155388 | macros/latex/contrib/caption/caption3.dtx
-2020/07/20 | 318839 | macros/latex/contrib/caption/caption-deu.pdf
-2020/07/20 | 166680 | macros/latex/contrib/caption/caption-deu.tex
-2020/07/20 | 169730 | macros/latex/contrib/caption/caption.dtx
-2020/07/20 | 307635 | macros/latex/contrib/caption/caption-eng.pdf
-2020/07/20 | 151528 | macros/latex/contrib/caption/caption-eng.tex
-2020/07/20 | 2148 | macros/latex/contrib/caption/caption.ins
-2020/07/20 | 718117 | macros/latex/contrib/caption/caption-rus.pdf
-2020/07/20 | 264773 | macros/latex/contrib/caption/caption-rus.tex
-2020/07/20 | 15737 | macros/latex/contrib/caption/cat.eps
-2020/07/20 | 6430 | macros/latex/contrib/caption/CHANGELOG
-2020/07/20 | 21191 | macros/latex/contrib/caption/elephant.eps
-2020/07/20 | 29088 | macros/latex/contrib/caption/ltcaption.dtx
-2020/07/20 | 89996 | macros/latex/contrib/caption/ltcaption.pdf
-2020/07/20 | 2926 | macros/latex/contrib/caption/README
-2020/07/20 | 46619 | macros/latex/contrib/caption/subcaption.dtx
-2020/07/20 | 154507 | macros/latex/contrib/caption/subcaption.pdf
-2020/07/20 | 112 | macros/latex/contrib/caption/SUMMARY
-2020/07/20 | 12628 | macros/latex/contrib/caption/totalcount.dtx
-2020/07/20 | 82006 | macros/latex/contrib/caption/totalcount.pdf
-2020/07/20 | 2018350 | macros/latex/contrib/caption.zip
+2020/08/30 | 49732 | macros/latex/contrib/caption/bicaption.dtx
+2020/08/30 | 115778 | macros/latex/contrib/caption/bicaption.pdf
+2020/08/30 | 49679 | macros/latex/contrib/caption/caption2.dtx
+2020/08/30 | 174386 | macros/latex/contrib/caption/caption3.dtx
+2020/08/30 | 9351 | macros/latex/contrib/caption/caption-ams-smf.dtx
+2020/08/30 | 14394 | macros/latex/contrib/caption/caption-beamer.dtx
+2020/08/30 | 409837 | macros/latex/contrib/caption/caption-deu.pdf
+2020/08/30 | 168795 | macros/latex/contrib/caption/caption-deu.tex
+2020/08/30 | 160152 | macros/latex/contrib/caption/caption.dtx
+2020/08/30 | 7663 | macros/latex/contrib/caption/caption-elsarticle.dtx
+2020/08/30 | 402305 | macros/latex/contrib/caption/caption-eng.pdf
+2020/08/30 | 159556 | macros/latex/contrib/caption/caption-eng.tex
+2020/08/30 | 2845 | macros/latex/contrib/caption/caption.ins
+2020/08/30 | 19389 | macros/latex/contrib/caption/caption-koma.dtx
+2020/08/30 | 13165 | macros/latex/contrib/caption/caption-light.dtx
+2020/08/30 | 67305 | macros/latex/contrib/caption/caption-light.pdf
+2020/08/30 | 8599 | macros/latex/contrib/caption/caption-memoir.dtx
+2020/08/30 | 7773 | macros/latex/contrib/caption/caption-ntg.dtx
+2020/08/30 | 718117 | macros/latex/contrib/caption/caption-rus.pdf
+2020/08/30 | 264773 | macros/latex/contrib/caption/caption-rus.tex
+2020/08/30 | 7939 | macros/latex/contrib/caption/caption-thesis.dtx
+2020/08/30 | 15737 | macros/latex/contrib/caption/cat.eps
+2020/08/30 | 7382 | macros/latex/contrib/caption/CHANGELOG
+2020/08/30 | 21191 | macros/latex/contrib/caption/elephant.eps
+2020/08/30 | 29367 | macros/latex/contrib/caption/ltcaption.dtx
+2020/08/30 | 89996 | macros/latex/contrib/caption/ltcaption.pdf
+2020/08/30 | 3032 | macros/latex/contrib/caption/README
+2020/08/30 | 47608 | macros/latex/contrib/caption/subcaption.dtx
+2020/08/30 | 154563 | macros/latex/contrib/caption/subcaption.pdf
+2020/08/30 | 112 | macros/latex/contrib/caption/SUMMARY
+2020/08/30 | 2027635 | macros/latex/contrib/caption.zip
2010/01/22 | 5956 | macros/latex/contrib/capt-of/capt-of.dtx
2010/01/22 | 1434 | macros/latex/contrib/capt-of/capt-of.ins
2010/01/22 | 85950 | macros/latex/contrib/capt-of/capt-of.pdf
@@ -190280,17 +191377,17 @@
2019/04/24 | 908 | macros/latex/contrib/fcolumn/makefile
2019/04/24 | 2758 | macros/latex/contrib/fcolumn/README
2019/04/24 | 303600 | macros/latex/contrib/fcolumn.zip
-2019/04/03 | 916050 | macros/latex/contrib/fduthesis/fduthesis-code.pdf
-2019/04/03 | 63791 | macros/latex/contrib/fduthesis/fduthesis-doc.dtx
-2019/04/03 | 213297 | macros/latex/contrib/fduthesis/fduthesis.dtx
-2019/04/03 | 162728 | macros/latex/contrib/fduthesis/fduthesis-en.pdf
-2019/04/03 | 259421 | macros/latex/contrib/fduthesis/fduthesis-logo.dtx
-2019/04/03 | 410643 | macros/latex/contrib/fduthesis/fduthesis.pdf
-2019/04/03 | 10688 | macros/latex/contrib/fduthesis/fudan-emblem-new.pdf
-2019/04/03 | 15957 | macros/latex/contrib/fduthesis/fudan-emblem.pdf
-2019/04/03 | 9952 | macros/latex/contrib/fduthesis/fudan-name.pdf
-2019/04/03 | 2463 | macros/latex/contrib/fduthesis/README.md
-2019/04/03 | 1648223 | macros/latex/contrib/fduthesis.zip
+2020/08/30 | 920850 | macros/latex/contrib/fduthesis/fduthesis-code.pdf
+2020/08/30 | 63790 | macros/latex/contrib/fduthesis/fduthesis-doc.dtx
+2020/08/30 | 219590 | macros/latex/contrib/fduthesis/fduthesis.dtx
+2020/08/30 | 155894 | macros/latex/contrib/fduthesis/fduthesis-en.pdf
+2020/08/30 | 259421 | macros/latex/contrib/fduthesis/fduthesis-logo.dtx
+2020/08/30 | 402649 | macros/latex/contrib/fduthesis/fduthesis.pdf
+2020/08/30 | 10688 | macros/latex/contrib/fduthesis/fudan-emblem-new.pdf
+2020/08/30 | 15957 | macros/latex/contrib/fduthesis/fudan-emblem.pdf
+2020/08/30 | 9952 | macros/latex/contrib/fduthesis/fudan-name.pdf
+2020/08/30 | 2463 | macros/latex/contrib/fduthesis/README.md
+2020/08/30 | 1637554 | macros/latex/contrib/fduthesis.zip
2020/07/26 | 111348 | macros/latex/contrib/fei/fei.dtx
2020/07/26 | 438675 | macros/latex/contrib/fei/fei.pdf
2020/07/26 | 22562 | macros/latex/contrib/fei/fei-template-sublist.tex
@@ -206397,39 +207494,39 @@
2008/12/27 | 2644 | macros/latex/contrib/texments/texments.ins
2008/12/27 | 101140 | macros/latex/contrib/texments/texments.pdf
2008/12/27 | 93663 | macros/latex/contrib/texments.zip
-2020/08/29 | 13140 | macros/latex/contrib/texnegar/doc-ligature-texnegar.pdf
-2020/08/29 | 10112 | macros/latex/contrib/texnegar/doc-ligature-xep.pdf
-2020/08/29 | 63437 | macros/latex/contrib/texnegar/doc-samples-glyph.pdf
-2020/08/29 | 62969 | macros/latex/contrib/texnegar/doc-samples-hrule.pdf
-2020/08/29 | 65544 | macros/latex/contrib/texnegar/doc-samples-xep.pdf
-2020/08/29 | 1556 | macros/latex/contrib/texnegar/INSTALL.txt
-2020/08/29 | 1142 | macros/latex/contrib/texnegar/README.txt
-2020/08/29 | 26077 | macros/latex/contrib/texnegar/texnegar-doc.ltx
-2020/08/29 | 3145159 | macros/latex/contrib/texnegar/texnegar-doc.pdf
-2020/08/29 | 81558 | macros/latex/contrib/texnegar/texnegar.dtx
-2020/08/29 | 2685 | macros/latex/contrib/texnegar/texnegar.ins
-2020/08/29 | 1105890 | macros/latex/contrib/texnegar/texnegar-luatex-glyph.pdf
-2020/08/29 | 3508 | macros/latex/contrib/texnegar/texnegar-luatex-glyph.tex
-2020/08/29 | 325838 | macros/latex/contrib/texnegar/texnegar-luatex-leaders-glyph.pdf
-2020/08/29 | 3604 | macros/latex/contrib/texnegar/texnegar-luatex-leaders-glyph.tex
-2020/08/29 | 174805 | macros/latex/contrib/texnegar/texnegar-luatex-leaders-hrule.pdf
-2020/08/29 | 3604 | macros/latex/contrib/texnegar/texnegar-luatex-leaders-hrule.tex
-2020/08/29 | 535371 | macros/latex/contrib/texnegar/texnegar.pdf
-2020/08/29 | 157984 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-glyph.pdf
-2020/08/29 | 3793 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-glyph.tex
-2020/08/29 | 212554 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-glyph.pdf
-2020/08/29 | 3889 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-glyph.tex
-2020/08/29 | 156632 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-hrule.pdf
-2020/08/29 | 3889 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-hrule.tex
-2020/08/29 | 156629 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-glyph.pdf
-2020/08/29 | 3617 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-glyph.tex
-2020/08/29 | 194658 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-glyph.pdf
-2020/08/29 | 3702 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-glyph.tex
-2020/08/29 | 155930 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-hrule.pdf
-2020/08/29 | 3703 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-hrule.tex
-2020/08/29 | 106731 | macros/latex/contrib/texnegar/xepersian-XB.pdf
-2020/08/29 | 3114 | macros/latex/contrib/texnegar/xepersian-XB.tex
-2020/08/29 | 4935518 | macros/latex/contrib/texnegar.zip
+2020/08/30 | 13133 | macros/latex/contrib/texnegar/doc-ligature-texnegar.pdf
+2020/08/30 | 10116 | macros/latex/contrib/texnegar/doc-ligature-xep.pdf
+2020/08/30 | 63437 | macros/latex/contrib/texnegar/doc-samples-glyph.pdf
+2020/08/30 | 62967 | macros/latex/contrib/texnegar/doc-samples-hrule.pdf
+2020/08/30 | 65544 | macros/latex/contrib/texnegar/doc-samples-xep.pdf
+2020/08/30 | 1556 | macros/latex/contrib/texnegar/INSTALL.txt
+2020/08/30 | 1142 | macros/latex/contrib/texnegar/README.txt
+2020/08/30 | 26137 | macros/latex/contrib/texnegar/texnegar-doc.ltx
+2020/08/30 | 3145482 | macros/latex/contrib/texnegar/texnegar-doc.pdf
+2020/08/30 | 80327 | macros/latex/contrib/texnegar/texnegar.dtx
+2020/08/30 | 2618 | macros/latex/contrib/texnegar/texnegar.ins
+2020/08/30 | 1105890 | macros/latex/contrib/texnegar/texnegar-luatex-glyph.pdf
+2020/08/30 | 3508 | macros/latex/contrib/texnegar/texnegar-luatex-glyph.tex
+2020/08/30 | 325838 | macros/latex/contrib/texnegar/texnegar-luatex-leaders-glyph.pdf
+2020/08/30 | 3604 | macros/latex/contrib/texnegar/texnegar-luatex-leaders-glyph.tex
+2020/08/30 | 174805 | macros/latex/contrib/texnegar/texnegar-luatex-leaders-hrule.pdf
+2020/08/30 | 3604 | macros/latex/contrib/texnegar/texnegar-luatex-leaders-hrule.tex
+2020/08/30 | 534937 | macros/latex/contrib/texnegar/texnegar.pdf
+2020/08/30 | 157987 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-glyph.pdf
+2020/08/30 | 3793 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-glyph.tex
+2020/08/30 | 212554 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-glyph.pdf
+2020/08/30 | 3889 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-glyph.tex
+2020/08/30 | 156628 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-hrule.pdf
+2020/08/30 | 3889 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-hrule.tex
+2020/08/30 | 156633 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-glyph.pdf
+2020/08/30 | 3617 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-glyph.tex
+2020/08/30 | 194659 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-glyph.pdf
+2020/08/30 | 3702 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-glyph.tex
+2020/08/30 | 155933 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-hrule.pdf
+2020/08/30 | 3703 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-hrule.tex
+2020/08/30 | 106734 | macros/latex/contrib/texnegar/xepersian-XB.pdf
+2020/08/30 | 3114 | macros/latex/contrib/texnegar/xepersian-XB.tex
+2020/08/30 | 4934897 | macros/latex/contrib/texnegar.zip
2005/04/09 | 6332 | macros/latex/contrib/texpower/00readme.txt
2005/04/06 | 1668 | macros/latex/contrib/texpower/01install.txt
2005/04/09 | 1850 | macros/latex/contrib/texpower/02changes.txt
@@ -207833,6 +208930,13 @@
2019/05/01 | 127008 | macros/latex/contrib/toptesi/veraPDFnoconformance.jpg
2018/05/13 | 89699 | macros/latex/contrib/toptesi/veraPDFnoconformance.pdf
2020/05/31 | 8401962 | macros/latex/contrib/toptesi.zip
+2020/08/30 | 389 | macros/latex/contrib/totalcount/CHANGELOG
+2020/08/30 | 1210 | macros/latex/contrib/totalcount/README
+2020/08/30 | 77 | macros/latex/contrib/totalcount/SUMMARY
+2020/08/30 | 12648 | macros/latex/contrib/totalcount/totalcount.dtx
+2020/08/30 | 1300 | macros/latex/contrib/totalcount/totalcount.ins
+2020/08/30 | 82731 | macros/latex/contrib/totalcount/totalcount.pdf
+2020/08/30 | 80261 | macros/latex/contrib/totalcount.zip
2011/01/25 | 1613 | macros/latex/contrib/totcount/README
2011/01/25 | 20761 | macros/latex/contrib/totcount/totcount.dtx
2011/01/25 | 1456 | macros/latex/contrib/totcount/totcount.ins
@@ -256348,9 +257452,9 @@
2019/02/28 | 324 | systems/texlive/tlnet/archive/amstex.x86_64-solaris.r18442.tar.xz
2019/02/28 | 100012 | systems/texlive/tlnet/archive/amsthdoc-it.doc.r45662.tar.xz
2019/02/28 | 288 | systems/texlive/tlnet/archive/amsthdoc-it.r45662.tar.xz
-2020/08/05 | 3144460 | systems/texlive/tlnet/archive/animate.doc.r56044.tar.xz
-2020/08/05 | 23356 | systems/texlive/tlnet/archive/animate.r56044.tar.xz
-2020/08/05 | 30184 | systems/texlive/tlnet/archive/animate.source.r56044.tar.xz
+2020/08/30 | 3145696 | systems/texlive/tlnet/archive/animate.doc.r56207.tar.xz
+2020/08/30 | 23368 | systems/texlive/tlnet/archive/animate.r56207.tar.xz
+2020/08/30 | 30292 | systems/texlive/tlnet/archive/animate.source.r56207.tar.xz
2020/07/30 | 1134124 | systems/texlive/tlnet/archive/annee-scolaire.doc.r55988.tar.xz
2020/07/30 | 1404 | systems/texlive/tlnet/archive/annee-scolaire.r55988.tar.xz
2020/07/30 | 5896 | systems/texlive/tlnet/archive/annee-scolaire.source.r55988.tar.xz
@@ -257122,10 +258226,10 @@
2020/03/20 | 1440 | systems/texlive/tlnet/archive/biblatex-ajc2020unofficial.r54401.tar.xz
2019/02/28 | 62380 | systems/texlive/tlnet/archive/biblatex-anonymous.doc.r48548.tar.xz
2019/02/28 | 1608 | systems/texlive/tlnet/archive/biblatex-anonymous.r48548.tar.xz
-2020/05/05 | 226788 | systems/texlive/tlnet/archive/biblatex-apa6.doc.r55017.tar.xz
-2020/05/05 | 21184 | systems/texlive/tlnet/archive/biblatex-apa6.r55017.tar.xz
-2020/05/31 | 321784 | systems/texlive/tlnet/archive/biblatex-apa.doc.r55344.tar.xz
-2020/05/31 | 24808 | systems/texlive/tlnet/archive/biblatex-apa.r55344.tar.xz
+2020/08/30 | 226684 | systems/texlive/tlnet/archive/biblatex-apa6.doc.r56209.tar.xz
+2020/08/30 | 21184 | systems/texlive/tlnet/archive/biblatex-apa6.r56209.tar.xz
+2020/08/30 | 322056 | systems/texlive/tlnet/archive/biblatex-apa.doc.r56208.tar.xz
+2020/08/30 | 24868 | systems/texlive/tlnet/archive/biblatex-apa.r56208.tar.xz
2020/01/02 | 4828952 | systems/texlive/tlnet/archive/biblatex-archaeology.doc.r53281.tar.xz
2020/01/02 | 39412 | systems/texlive/tlnet/archive/biblatex-archaeology.r53281.tar.xz
2020/01/02 | 193792 | systems/texlive/tlnet/archive/biblatex-archaeology.source.r53281.tar.xz
@@ -258169,7 +259273,7 @@
2020/08/26 | 6148 | systems/texlive/tlnet/archive/collection-latexextra.r56182.tar.xz
2020/08/14 | 688 | systems/texlive/tlnet/archive/collection-latex.r56105.tar.xz
2020/03/04 | 748 | systems/texlive/tlnet/archive/collection-latexrecommended.r54074.tar.xz
-2020/08/15 | 680 | systems/texlive/tlnet/archive/collection-luatex.r56113.tar.xz
+2020/08/30 | 684 | systems/texlive/tlnet/archive/collection-luatex.r56210.tar.xz
2020/08/24 | 1464 | systems/texlive/tlnet/archive/collection-mathscience.r56164.tar.xz
2019/03/09 | 540 | systems/texlive/tlnet/archive/collection-metapost.r50293.tar.xz
2020/04/12 | 472 | systems/texlive/tlnet/archive/collection-music.r54666.tar.xz
@@ -266257,6 +267361,8 @@
2019/02/28 | 6216 | systems/texlive/tlnet/archive/storebox.source.r24895.tar.xz
2019/02/28 | 242396 | systems/texlive/tlnet/archive/storecmd.doc.r24431.tar.xz
2019/02/28 | 3304 | systems/texlive/tlnet/archive/storecmd.r24431.tar.xz
+2020/08/30 | 57616 | systems/texlive/tlnet/archive/stricttex.doc.r56210.tar.xz
+2020/08/30 | 1884 | systems/texlive/tlnet/archive/stricttex.r56210.tar.xz
2019/12/01 | 664768 | systems/texlive/tlnet/archive/stringenc.doc.r52982.tar.xz
2019/12/01 | 23376 | systems/texlive/tlnet/archive/stringenc.r52982.tar.xz
2019/12/01 | 30628 | systems/texlive/tlnet/archive/stringenc.source.r52982.tar.xz
@@ -266786,8 +267892,8 @@
2020/03/24 | 280 | systems/texlive/tlnet/archive/texlive-cz.r54496.tar.xz
2020/03/29 | 1338300 | systems/texlive/tlnet/archive/texlive-de.doc.r54604.tar.xz
2020/03/29 | 272 | systems/texlive/tlnet/archive/texlive-de.r54604.tar.xz
-2020/08/29 | 168460 | systems/texlive/tlnet/archive/texlive-docindex.doc.r56199.tar.xz
-2020/08/29 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r56199.tar.xz
+2020/08/30 | 168540 | systems/texlive/tlnet/archive/texlive-docindex.doc.r56204.tar.xz
+2020/08/30 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r56204.tar.xz
2020/04/16 | 1891392 | systems/texlive/tlnet/archive/texlive-en.doc.r54755.tar.xz
2020/04/16 | 272 | systems/texlive/tlnet/archive/texlive-en.r54755.tar.xz
2020/03/22 | 3090144 | systems/texlive/tlnet/archive/texlive-es.doc.r54465.tar.xz
@@ -266843,7 +267949,7 @@
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r55172.tar.xz
-2020/08/28 | 218656 | systems/texlive/tlnet/archive/texlive-scripts.doc.r56192.tar.xz
+2020/08/30 | 218656 | systems/texlive/tlnet/archive/texlive-scripts.doc.r56204.tar.xz
2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.aarch64-linux.r53577.tar.xz
2020/01/27 | 924 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-freebsd.r53577.tar.xz
2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-netbsd.r53577.tar.xz
@@ -266867,7 +267973,7 @@
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r55172.tar.xz
-2020/08/28 | 132032 | systems/texlive/tlnet/archive/texlive-scripts.r56192.tar.xz
+2020/08/30 | 131936 | systems/texlive/tlnet/archive/texlive-scripts.r56204.tar.xz
2020/08/24 | 36336 | systems/texlive/tlnet/archive/texlive-scripts.win32.r56157.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
2020/05/12 | 592 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-darwinlegacy.r55117.tar.xz
@@ -268511,16 +269617,16 @@
2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
2020/06/13 | 105829 | systems/texlive/tlnet/install-tl
-2020/08/29 | 5500851 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2020/08/29 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2020/08/29 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2020/08/30 | 5500709 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2020/08/30 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2020/08/30 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2020/08/23 | 4889 | systems/texlive/tlnet/install-tl-windows.bat
-2020/08/29 | 19382714 | systems/texlive/tlnet/install-tl-windows.exe
-2020/08/29 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2020/08/29 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2020/08/29 | 24269405 | systems/texlive/tlnet/install-tl.zip
-2020/08/29 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2020/08/29 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2020/08/30 | 19379923 | systems/texlive/tlnet/install-tl-windows.exe
+2020/08/30 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2020/08/30 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2020/08/30 | 24269318 | systems/texlive/tlnet/install-tl.zip
+2020/08/30 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2020/08/30 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2020/03/05 | 1215 | systems/texlive/tlnet/README.md
2020/04/06 | 5961 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
2016/04/12 | 600 | systems/texlive/tlnet/tlpkg/gpg/random_seed
@@ -268529,7 +269635,7 @@
2020/04/06 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2020/08/19 | 48946 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2020/08/27 | 6509 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2020/08/29 | 6130 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2020/04/15 | 223687 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt
2020/04/15 | 2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe
2018/04/29 | 13647 | systems/texlive/tlnet/tlpkg/installer/DirSelect.pm
@@ -268576,12 +269682,12 @@
2020/05/17 | 20322 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2020/05/03 | 4786 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2020/08/06 | 27567 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2020/08/29 | 16478090 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2020/08/29 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2020/08/30 | 16479508 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2020/08/30 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2020/05/13 | 86417 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2020/08/29 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2020/08/29 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2020/08/29 | 2221732 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2020/08/30 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2020/08/30 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2020/08/30 | 2223840 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2020/04/15 | 58761 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2020/03/20 | 41736 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2020/05/11 | 15010 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -271849,7 +272955,7 @@
2019/10/15 | 415013 | systems/win32/miktex/tm/packages/adfsymbols.tar.lzma
2019/01/30 | 489199 | systems/win32/miktex/tm/packages/adigraph.tar.lzma
2020/03/09 | 310162 | systems/win32/miktex/tm/packages/adjmulticol.tar.lzma
-2019/01/06 | 790035 | systems/win32/miktex/tm/packages/adjustbox.tar.lzma
+2020/08/30 | 782441 | systems/win32/miktex/tm/packages/adjustbox.tar.lzma
2017/01/25 | 491531 | systems/win32/miktex/tm/packages/adobecaslon.tar.lzma
2018/06/04 | 40018 | systems/win32/miktex/tm/packages/adobe-euro.tar.lzma
2019/08/02 | 2164518 | systems/win32/miktex/tm/packages/adobemapping.tar.lzma
@@ -271908,7 +273014,7 @@
2013/03/11 | 2065077 | systems/win32/miktex/tm/packages/amsrefs.tar.lzma
2011/06/23 | 385532 | systems/win32/miktex/tm/packages/amstex.tar.lzma
2008/12/23 | 68780 | systems/win32/miktex/tm/packages/analogclock.tar.lzma
-2020/08/09 | 3199605 | systems/win32/miktex/tm/packages/animate.tar.lzma
+2020/08/30 | 3200336 | systems/win32/miktex/tm/packages/animate.tar.lzma
2020/08/09 | 1139079 | systems/win32/miktex/tm/packages/annee-scolaire.tar.lzma
2018/08/27 | 1599994 | systems/win32/miktex/tm/packages/annot-pro.tar.lzma
2010/02/22 | 189080 | systems/win32/miktex/tm/packages/anonchap.tar.lzma
@@ -272106,7 +273212,7 @@
2020/05/12 | 1892413 | systems/win32/miktex/tm/packages/beamerdarkthemes.tar.lzma
2015/08/22 | 370971 | systems/win32/miktex/tm/packages/beamer-fuberlin.tar.lzma
2018/04/24 | 84638 | systems/win32/miktex/tm/packages/beamerposter.tar.lzma
-2020/08/09 | 187972 | systems/win32/miktex/tm/packages/beamer-rl.tar.lzma
+2020/08/30 | 189322 | systems/win32/miktex/tm/packages/beamer-rl.tar.lzma
2011/08/12 | 444235 | systems/win32/miktex/tm/packages/beamersubframe.tar.lzma
2020/06/09 | 276097 | systems/win32/miktex/tm/packages/beamerswitch.tar.lzma
2020/07/27 | 2456925 | systems/win32/miktex/tm/packages/beamer.tar.lzma
@@ -272118,7 +273224,7 @@
2019/01/30 | 100626 | systems/win32/miktex/tm/packages/beamertheme-light.tar.lzma
2017/01/25 | 203560 | systems/win32/miktex/tm/packages/beamertheme-metropolis.tar.lzma
2010/12/23 | 2967 | systems/win32/miktex/tm/packages/beamerthemenirma.tar.lzma
-2020/07/09 | 67013 | systems/win32/miktex/tm/packages/beamerthemenord.tar.lzma
+2020/08/30 | 2241882 | systems/win32/miktex/tm/packages/beamerthemenord.tar.lzma
2018/08/20 | 1880627 | systems/win32/miktex/tm/packages/beamertheme-npbt.tar.lzma
2013/08/19 | 58538 | systems/win32/miktex/tm/packages/beamertheme-phnompenh.tar.lzma
2020/06/02 | 366202 | systems/win32/miktex/tm/packages/beamertheme-pure-minimalistic.tar.lzma
@@ -272129,7 +273235,7 @@
2020/04/22 | 794111 | systems/win32/miktex/tm/packages/bearwear.tar.lzma
2016/11/05 | 310673 | systems/win32/miktex/tm/packages/beebe.tar.lzma
2005/06/02 | 43896 | systems/win32/miktex/tm/packages/begriff.cab
-2020/02/26 | 759086 | systems/win32/miktex/tm/packages/beilstein.tar.lzma
+2020/08/30 | 759144 | systems/win32/miktex/tm/packages/beilstein.tar.lzma
2013/08/19 | 83990 | systems/win32/miktex/tm/packages/belleek.tar.lzma
2004/11/11 | 363550 | systems/win32/miktex/tm/packages/bera.cab
2013/11/22 | 1905913 | systems/win32/miktex/tm/packages/berenisadf.tar.lzma
@@ -272147,11 +273253,11 @@
2020/07/19 | 7548954 | systems/win32/miktex/tm/packages/bib2gls.tar.lzma
2004/11/11 | 84386 | systems/win32/miktex/tm/packages/bib2xhtml.cab
2019/03/07 | 1191804 | systems/win32/miktex/tm/packages/bibarts.tar.lzma
-2019/12/09 | 28362304 | systems/win32/miktex/tm/packages/biber-darwin-x86_64.tar.lzma
-2019/12/09 | 275089 | systems/win32/miktex/tm/packages/biber-doc.tar.lzma
-2019/12/09 | 18258176 | systems/win32/miktex/tm/packages/biber-linux-x86_64.tar.lzma
-2019/12/09 | 22416215 | systems/win32/miktex/tm/packages/biber-windows-x64.tar.lzma
-2019/12/09 | 22448493 | systems/win32/miktex/tm/packages/biber-windows-x86.tar.lzma
+2020/08/30 | 28364655 | systems/win32/miktex/tm/packages/biber-darwin-x86_64.tar.lzma
+2020/08/30 | 276579 | systems/win32/miktex/tm/packages/biber-doc.tar.lzma
+2020/08/30 | 18262596 | systems/win32/miktex/tm/packages/biber-linux-x86_64.tar.lzma
+2020/08/30 | 22448144 | systems/win32/miktex/tm/packages/biber-windows-x64.tar.lzma
+2020/08/30 | 22485857 | systems/win32/miktex/tm/packages/biber-windows-x86.tar.lzma
2019/04/01 | 274474 | systems/win32/miktex/tm/packages/bibexport.tar.lzma
2006/01/01 | 17664 | systems/win32/miktex/tm/packages/bib-fr.cab
2013/09/09 | 34440 | systems/win32/miktex/tm/packages/bibhtml.tar.lzma
@@ -272159,8 +273265,8 @@
2018/11/22 | 884678 | systems/win32/miktex/tm/packages/biblatex-abnt.tar.lzma
2020/03/19 | 2480 | systems/win32/miktex/tm/packages/biblatex-ajc2020unofficial.tar.lzma
2018/09/04 | 64282 | systems/win32/miktex/tm/packages/biblatex-anonymous.tar.lzma
-2020/05/06 | 248223 | systems/win32/miktex/tm/packages/biblatex-apa6.tar.lzma
-2020/06/02 | 346993 | systems/win32/miktex/tm/packages/biblatex-apa.tar.lzma
+2020/08/30 | 248153 | systems/win32/miktex/tm/packages/biblatex-apa6.tar.lzma
+2020/08/30 | 347321 | systems/win32/miktex/tm/packages/biblatex-apa.tar.lzma
2020/01/02 | 5062923 | systems/win32/miktex/tm/packages/biblatex-archaeology.tar.lzma
2018/02/14 | 192153 | systems/win32/miktex/tm/packages/biblatex-arthistory-bonn.tar.lzma
2010/07/12 | 2404 | systems/win32/miktex/tm/packages/biblatex-authoryear-icomp-tt.tar.lzma
@@ -272175,7 +273281,7 @@
2017/04/11 | 92574 | systems/win32/miktex/tm/packages/biblatex-claves.tar.lzma
2016/12/09 | 1140816 | systems/win32/miktex/tm/packages/biblatex-dw.tar.lzma
2017/06/18 | 10024 | systems/win32/miktex/tm/packages/biblatex-enc.tar.lzma
-2020/08/17 | 633869 | systems/win32/miktex/tm/packages/biblatex-ext.tar.lzma
+2020/08/30 | 634145 | systems/win32/miktex/tm/packages/biblatex-ext.tar.lzma
2017/11/22 | 616165 | systems/win32/miktex/tm/packages/biblatex-fiwi.tar.lzma
2020/07/27 | 1653163 | systems/win32/miktex/tm/packages/biblatex-gb7714-2015.tar.lzma
2020/03/18 | 172223 | systems/win32/miktex/tm/packages/biblatex-german-legal.tar.lzma
@@ -272184,7 +273290,7 @@
2020/02/27 | 562460 | systems/win32/miktex/tm/packages/biblatex-ieee.tar.lzma
2016/07/06 | 50792 | systems/win32/miktex/tm/packages/biblatex-ijsra.tar.lzma
2020/03/26 | 283162 | systems/win32/miktex/tm/packages/biblatex-iso690.tar.lzma
-2019/12/31 | 377564 | systems/win32/miktex/tm/packages/biblatex-jura2.tar.lzma
+2020/08/30 | 377121 | systems/win32/miktex/tm/packages/biblatex-jura2.tar.lzma
2020/03/25 | 127417 | systems/win32/miktex/tm/packages/biblatex-juradiss.tar.lzma
2010/07/12 | 11922 | systems/win32/miktex/tm/packages/biblatex-jura.tar.lzma
2019/02/04 | 12871 | systems/win32/miktex/tm/packages/biblatex-lni.tar.lzma
@@ -272201,7 +273307,7 @@
2020/01/29 | 2000846 | systems/win32/miktex/tm/packages/biblatex-oxref.tar.lzma
2020/05/25 | 558668 | systems/win32/miktex/tm/packages/biblatex-philosophy.tar.lzma
2019/12/04 | 461163 | systems/win32/miktex/tm/packages/biblatex-phys.tar.lzma
-2020/08/09 | 381529 | systems/win32/miktex/tm/packages/biblatex-publist.tar.lzma
+2020/08/30 | 381934 | systems/win32/miktex/tm/packages/biblatex-publist.tar.lzma
2017/11/21 | 96599 | systems/win32/miktex/tm/packages/biblatex-realauthor.tar.lzma
2018/12/18 | 670534 | systems/win32/miktex/tm/packages/biblatex-sbl.tar.lzma
2018/10/23 | 360669 | systems/win32/miktex/tm/packages/biblatex-science.tar.lzma
@@ -272211,7 +273317,7 @@
2017/09/22 | 67698 | systems/win32/miktex/tm/packages/biblatex-source-division.tar.lzma
2017/03/07 | 71964 | systems/win32/miktex/tm/packages/biblatex-subseries.tar.lzma
2014/01/24 | 535684 | systems/win32/miktex/tm/packages/biblatex-swiss-legal.tar.lzma
-2019/12/09 | 7369497 | systems/win32/miktex/tm/packages/biblatex.tar.lzma
+2020/08/30 | 7411271 | systems/win32/miktex/tm/packages/biblatex.tar.lzma
2018/02/18 | 339624 | systems/win32/miktex/tm/packages/biblatex-trad.tar.lzma
2017/06/21 | 72547 | systems/win32/miktex/tm/packages/biblatex-true-citepages-omit.tar.lzma
2020/05/30 | 444980 | systems/win32/miktex/tm/packages/biblatex-unified.tar.lzma
@@ -272391,7 +273497,7 @@
2005/09/24 | 328888 | systems/win32/miktex/tm/packages/changebar.cab
2018/03/12 | 670370 | systems/win32/miktex/tm/packages/changebar.tar.lzma
2009/10/16 | 61449 | systems/win32/miktex/tm/packages/changelayout.tar.lzma
-2020/04/25 | 168107 | systems/win32/miktex/tm/packages/changelog.tar.lzma
+2020/08/30 | 167380 | systems/win32/miktex/tm/packages/changelog.tar.lzma
2009/10/21 | 283425 | systems/win32/miktex/tm/packages/changepage.tar.lzma
2020/06/22 | 923934 | systems/win32/miktex/tm/packages/changes.tar.lzma
2006/05/19 | 197978 | systems/win32/miktex/tm/packages/chappg.cab
@@ -272619,7 +273725,7 @@
2017/04/25 | 46327 | systems/win32/miktex/tm/packages/ctanify.tar.lzma
2017/11/26 | 39933 | systems/win32/miktex/tm/packages/ctan-o-mat.tar.lzma
2012/05/11 | 179205 | systems/win32/miktex/tm/packages/ctanupload.tar.lzma
-2020/06/09 | 1296570 | systems/win32/miktex/tm/packages/ctex.tar.lzma
+2020/08/30 | 1297828 | systems/win32/miktex/tm/packages/ctex.tar.lzma
2004/01/11 | 171807 | systems/win32/miktex/tm/packages/ctib.cab
2014/06/30 | 272094 | systems/win32/miktex/tm/packages/cuisine.tar.lzma
2019/02/04 | 130281 | systems/win32/miktex/tm/packages/cuprum.tar.lzma
@@ -272700,6 +273806,7 @@
2013/05/06 | 949470 | systems/win32/miktex/tm/packages/dcpic.tar.lzma
2019/09/08 | 288031 | systems/win32/miktex/tm/packages/ddphonism.tar.lzma
2011/06/23 | 163978 | systems/win32/miktex/tm/packages/decimal.tar.lzma
+2020/08/30 | 273549 | systems/win32/miktex/tm/packages/decision-table.tar.lzma
2020/05/23 | 417354 | systems/win32/miktex/tm/packages/decorule.tar.lzma
2019/04/05 | 234548 | systems/win32/miktex/tm/packages/dehyph-exptl.tar.lzma
2018/09/04 | 46884 | systems/win32/miktex/tm/packages/dehyph.tar.lzma
@@ -272819,7 +273926,7 @@
2019/09/26 | 379955 | systems/win32/miktex/tm/packages/ebgaramond-maths.tar.lzma
2020/04/15 | 12434583 | systems/win32/miktex/tm/packages/ebgaramond.tar.lzma
2013/03/22 | 2133 | systems/win32/miktex/tm/packages/ebook.tar.lzma
-2017/05/19 | 239948 | systems/win32/miktex/tm/packages/ebproof.tar.lzma
+2020/08/30 | 514886 | systems/win32/miktex/tm/packages/ebproof.tar.lzma
2007/01/19 | 269326 | systems/win32/miktex/tm/packages/ebsthesis.tar.bz2
2016/09/27 | 2941994 | systems/win32/miktex/tm/packages/ecards.tar.lzma
2015/08/22 | 382953 | systems/win32/miktex/tm/packages/ecclesiastic.tar.lzma
@@ -272850,7 +273957,7 @@
2020/04/07 | 32910 | systems/win32/miktex/tm/packages/ehhline.tar.lzma
2009/01/10 | 276496 | systems/win32/miktex/tm/packages/eiad.tar.lzma
2006/09/22 | 7331 | systems/win32/miktex/tm/packages/eijkhout.cab
-2020/08/09 | 319935 | systems/win32/miktex/tm/packages/ejpecp.tar.lzma
+2020/08/30 | 362993 | systems/win32/miktex/tm/packages/ejpecp.tar.lzma
2019/01/06 | 228202 | systems/win32/miktex/tm/packages/ekaia.tar.lzma
2020/08/17 | 597270 | systems/win32/miktex/tm/packages/ekdosis.tar.lzma
2020/07/27 | 1965876 | systems/win32/miktex/tm/packages/ektype-tanka.tar.lzma
@@ -272868,7 +273975,7 @@
2004/11/28 | 8818 | systems/win32/miktex/tm/packages/elmath.tar.lzma
2016/12/18 | 157386 | systems/win32/miktex/tm/packages/elocalloc.tar.lzma
2005/09/15 | 471815 | systems/win32/miktex/tm/packages/elpres.cab
-2020/07/19 | 318762 | systems/win32/miktex/tm/packages/elpres.tar.lzma
+2020/08/30 | 453893 | systems/win32/miktex/tm/packages/elpres.tar.lzma
2019/04/06 | 831673 | systems/win32/miktex/tm/packages/elsarticle.tar.lzma
2020/03/18 | 663917 | systems/win32/miktex/tm/packages/els-cas-templates.tar.lzma
2006/12/10 | 10930 | systems/win32/miktex/tm/packages/elsevier-bib.tar.bz2
@@ -272958,7 +274065,7 @@
2016/11/03 | 183734 | systems/win32/miktex/tm/packages/etex.tar.lzma
2011/03/03 | 993681 | systems/win32/miktex/tm/packages/etextools.tar.lzma
2020/05/16 | 1242211 | systems/win32/miktex/tm/packages/etoc.tar.lzma
-2020/07/19 | 245684 | systems/win32/miktex/tm/packages/etoolbox.tar.lzma
+2020/08/30 | 246418 | systems/win32/miktex/tm/packages/etoolbox.tar.lzma
2018/07/12 | 1869 | systems/win32/miktex/tm/packages/etsvthor.tar.lzma
2020/05/06 | 1046544 | systems/win32/miktex/tm/packages/euclideangeometry.tar.lzma
2010/09/21 | 156297 | systems/win32/miktex/tm/packages/euenc.tar.lzma
@@ -273069,7 +274176,7 @@
2020/02/04 | 281488 | systems/win32/miktex/tm/packages/filehook.tar.lzma
2012/12/04 | 924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
2011/09/21 | 281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2020/08/29 | 542244 | systems/win32/miktex/tm/packages/files.csv.lzma
+2020/08/30 | 545043 | systems/win32/miktex/tm/packages/files.csv.lzma
2001/05/14 | 5617 | systems/win32/miktex/tm/packages/finbib.tar.lzma
2015/10/20 | 44379 | systems/win32/miktex/tm/packages/findhyph.tar.lzma
2011/10/21 | 89323 | systems/win32/miktex/tm/packages/fink.tar.lzma
@@ -273137,7 +274244,7 @@
2005/06/25 | 33931 | systems/win32/miktex/tm/packages/fontsampler.cab
2020/02/13 | 2425284 | systems/win32/miktex/tm/packages/fonts-arundina.tar.lzma
2017/02/03 | 2021910 | systems/win32/miktex/tm/packages/fonts-churchslavonic.tar.lzma
-2020/08/17 | 750353 | systems/win32/miktex/tm/packages/fontsetup.tar.lzma
+2020/08/30 | 755180 | systems/win32/miktex/tm/packages/fontsetup.tar.lzma
2020/05/25 | 297346 | systems/win32/miktex/tm/packages/fontsize.tar.lzma
2020/02/22 | 1299441 | systems/win32/miktex/tm/packages/fontspec.tar.lzma
2020/05/06 | 12767240 | systems/win32/miktex/tm/packages/fonts-tlwg.tar.lzma
@@ -273382,7 +274489,7 @@
2015/02/28 | 232056 | systems/win32/miktex/tm/packages/havannah.tar.lzma
2016/07/15 | 69232 | systems/win32/miktex/tm/packages/hc.tar.lzma
2004/07/29 | 37800 | systems/win32/miktex/tm/packages/hebclass.cab
-2019/03/28 | 920225 | systems/win32/miktex/tm/packages/hecthese.tar.lzma
+2020/08/30 | 905245 | systems/win32/miktex/tm/packages/hecthese.tar.lzma
2014/12/22 | 749378 | systems/win32/miktex/tm/packages/he-le-na.tar.lzma
2020/05/20 | 99111 | systems/win32/miktex/tm/packages/helmholtz-ellis-ji-notation.tar.lzma
2006/09/28 | 745459 | systems/win32/miktex/tm/packages/helvetic.cab
@@ -273414,7 +274521,7 @@
2016/03/20 | 375061 | systems/win32/miktex/tm/packages/hobete.tar.lzma
2019/11/16 | 62408 | systems/win32/miktex/tm/packages/hobsub.tar.lzma
2019/12/09 | 583217 | systems/win32/miktex/tm/packages/hologo.tar.lzma
-2020/08/17 | 310483 | systems/win32/miktex/tm/packages/hopatch.tar.lzma
+2020/08/30 | 312066 | systems/win32/miktex/tm/packages/hopatch.tar.lzma
2020/08/09 | 774976 | systems/win32/miktex/tm/packages/horoscop.tar.lzma
2016/07/15 | 127199 | systems/win32/miktex/tm/packages/hpsdiss.tar.lzma
2011/05/06 | 449162 | systems/win32/miktex/tm/packages/hrefhide.tar.lzma
@@ -273694,6 +274801,7 @@
2020/02/03 | 7953 | systems/win32/miktex/tm/packages/lectures.tar.lzma
2016/08/09 | 2514816 | systems/win32/miktex/tm/packages/ledmac.tar.lzma
2007/01/19 | 56963 | systems/win32/miktex/tm/packages/leftidx.tar.bz2
+2020/08/30 | 76567 | systems/win32/miktex/tm/packages/leftindex.tar.lzma
2020/02/10 | 452162 | systems/win32/miktex/tm/packages/leiletter.tar.lzma
2019/10/20 | 628747 | systems/win32/miktex/tm/packages/leipzig.tar.lzma
2013/07/01 | 451593 | systems/win32/miktex/tm/packages/lengthconvert.tar.lzma
@@ -273714,11 +274822,11 @@
2009/08/11 | 253127 | systems/win32/miktex/tm/packages/lh.tar.lzma
2017/06/18 | 343703 | systems/win32/miktex/tm/packages/libertinegc.tar.lzma
2020/03/30 | 15094509 | systems/win32/miktex/tm/packages/libertine.tar.lzma
-2020/06/29 | 2139818 | systems/win32/miktex/tm/packages/libertinus-fonts.tar.lzma
+2020/08/30 | 2138493 | systems/win32/miktex/tm/packages/libertinus-fonts.tar.lzma
2020/08/09 | 605275 | systems/win32/miktex/tm/packages/libertinus-otf.tar.lzma
2020/06/13 | 2359490 | systems/win32/miktex/tm/packages/libertinust1math.tar.lzma
2020/05/07 | 17336 | systems/win32/miktex/tm/packages/libertinus.tar.lzma
-2019/12/20 | 9819512 | systems/win32/miktex/tm/packages/libertinus-type1.tar.lzma
+2020/08/30 | 10141374 | systems/win32/miktex/tm/packages/libertinus-type1.tar.lzma
2012/09/26 | 53049 | systems/win32/miktex/tm/packages/libgreek.tar.lzma
2010/06/18 | 167997 | systems/win32/miktex/tm/packages/librarian.tar.lzma
2020/08/09 | 609825 | systems/win32/miktex/tm/packages/librebaskerville.tar.lzma
@@ -273817,7 +274925,7 @@
2019/12/20 | 406142 | systems/win32/miktex/tm/packages/ltxcmds.tar.lzma
2011/03/30 | 6745 | systems/win32/miktex/tm/packages/ltxdockit.tar.lzma
2019/04/16 | 78752 | systems/win32/miktex/tm/packages/ltxguidex.tar.lzma
-2019/08/25 | 168389 | systems/win32/miktex/tm/packages/ltximg.tar.lzma
+2020/08/30 | 250077 | systems/win32/miktex/tm/packages/ltximg.tar.lzma
2007/01/19 | 93122 | systems/win32/miktex/tm/packages/ltxindex.tar.bz2
2012/11/23 | 786051 | systems/win32/miktex/tm/packages/ltxkeys.tar.lzma
2018/04/16 | 23515 | systems/win32/miktex/tm/packages/ltxmisc.tar.lzma
@@ -273829,7 +274937,7 @@
2018/04/22 | 120964 | systems/win32/miktex/tm/packages/lua-check-hyphen.tar.lzma
2012/01/25 | 425322 | systems/win32/miktex/tm/packages/luacode.tar.lzma
2020/02/27 | 334119 | systems/win32/miktex/tm/packages/luacolor.tar.lzma
-2016/12/15 | 41723 | systems/win32/miktex/tm/packages/luahyphenrules.tar.lzma
+2020/08/30 | 43908 | systems/win32/miktex/tm/packages/luahyphenrules.tar.lzma
2019/04/06 | 2685 | systems/win32/miktex/tm/packages/luaimageembed.tar.lzma
2011/02/19 | 180907 | systems/win32/miktex/tm/packages/luaindex.tar.lzma
2010/11/24 | 424357 | systems/win32/miktex/tm/packages/luainputenc.tar.lzma
@@ -273987,7 +275095,7 @@
2018/09/19 | 231546 | systems/win32/miktex/tm/packages/metapost-colorbrewer.tar.lzma
2001/10/03 | 21486 | systems/win32/miktex/tm/packages/metapost-examples.tar.lzma
2019/05/27 | 2419171 | systems/win32/miktex/tm/packages/metapost.tar.lzma
-2020/06/30 | 349970 | systems/win32/miktex/tm/packages/metastr.tar.lzma
+2020/08/30 | 357736 | systems/win32/miktex/tm/packages/metastr.tar.lzma
2004/08/15 | 141274 | systems/win32/miktex/tm/packages/metatex.cab
2006/03/25 | 374169 | systems/win32/miktex/tm/packages/metauml.cab
2019/02/04 | 463870 | systems/win32/miktex/tm/packages/metauml.tar.lzma
@@ -274132,7 +275240,7 @@
2016/11/04 | 687 | systems/win32/miktex/tm/packages/miktex-metapost.tar.lzma
2020/08/01 | 96434 | systems/win32/miktex/tm/packages/miktex-mfware-bin-2.9.tar.lzma
2020/08/01 | 101650 | systems/win32/miktex/tm/packages/miktex-mfware-bin-x64-2.9.tar.lzma
-2020/08/09 | 22561 | systems/win32/miktex/tm/packages/miktex-misc.tar.lzma
+2020/08/30 | 22657 | systems/win32/miktex/tm/packages/miktex-misc.tar.lzma
2020/08/01 | 79662 | systems/win32/miktex/tm/packages/miktex-mkfntmap-bin-2.9.tar.lzma
2020/08/01 | 88731 | systems/win32/miktex/tm/packages/miktex-mkfntmap-bin-x64-2.9.tar.lzma
2020/08/01 | 170527 | systems/win32/miktex/tm/packages/miktex-mktex-bin-2.9.tar.lzma
@@ -274234,9 +275342,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2020/08/01 | 38929 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2020/08/01 | 43039 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2020/08/29 | 202486 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2020/08/29 | 1211902 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2020/08/29 | 1129597 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2020/08/30 | 202882 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2020/08/30 | 1216850 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2020/08/30 | 1136171 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2020/08/01 | 13102 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2020/08/01 | 14104 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma
2016/07/15 | 35914 | systems/win32/miktex/tm/packages/mil3.tar.lzma
@@ -274260,7 +275368,7 @@
2007/05/12 | 61030 | systems/win32/miktex/tm/packages/mkpattern.tar.bz2
2016/12/15 | 606197 | systems/win32/miktex/tm/packages/mkstmp_pro.tar.lzma
2018/04/11 | 86814 | systems/win32/miktex/tm/packages/mk.tar.lzma
-2019/08/05 | 2989894 | systems/win32/miktex/tm/packages/mlacls.tar.lzma
+2020/08/30 | 3022408 | systems/win32/miktex/tm/packages/mlacls.tar.lzma
2011/01/07 | 3376 | systems/win32/miktex/tm/packages/mla-paper.tar.lzma
2019/12/05 | 317993 | systems/win32/miktex/tm/packages/mleftright.tar.lzma
2009/07/13 | 205462 | systems/win32/miktex/tm/packages/mlist.tar.lzma
@@ -274376,7 +275484,7 @@
2013/08/27 | 646870 | systems/win32/miktex/tm/packages/neuralnetwork.tar.lzma
2015/12/08 | 217634 | systems/win32/miktex/tm/packages/nevelok.tar.lzma
2016/07/16 | 223351 | systems/win32/miktex/tm/packages/newalg.tar.lzma
-2020/08/17 | 6137953 | systems/win32/miktex/tm/packages/newcomputermodern.tar.lzma
+2020/08/30 | 6138187 | systems/win32/miktex/tm/packages/newcomputermodern.tar.lzma
2013/03/11 | 4261 | systems/win32/miktex/tm/packages/newenviron.tar.lzma
2009/09/11 | 159025 | systems/win32/miktex/tm/packages/newfile.tar.lzma
2019/11/26 | 120397 | systems/win32/miktex/tm/packages/newfloat.tar.lzma
@@ -274390,193 +275498,193 @@
2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
2019/09/11 | 231430 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2020/08/29 | 541919 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2020/08/29 | 59344 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2020/08/29 | 67259 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2020/08/29 | 956335 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2020/08/29 | 1061415 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2020/08/29 | 28605 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2020/08/29 | 30908 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2020/08/29 | 29399 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2020/08/29 | 34775 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2020/08/29 | 49593 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2020/08/29 | 57160 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2020/08/29 | 84663 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2020/08/29 | 93642 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2020/08/29 | 65820 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2020/08/29 | 73449 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2020/08/29 | 27010 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2020/08/29 | 30891 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2020/08/29 | 329617 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2020/08/29 | 392368 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2020/08/29 | 32353 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2020/08/29 | 36361 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2020/08/29 | 72256 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2020/08/29 | 79420 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2020/08/29 | 203966 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2020/08/29 | 224089 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2020/08/29 | 169657 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2020/08/29 | 184490 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2020/08/29 | 51936 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2020/08/29 | 58660 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2020/08/29 | 20818 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2020/08/29 | 22982 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2020/08/29 | 460434 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2020/08/29 | 45321 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2020/08/29 | 51137 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2020/08/29 | 273698 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2020/08/29 | 310936 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2020/08/29 | 40823 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2020/08/29 | 45033 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2020/08/29 | 115881 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2020/08/29 | 130358 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2020/08/29 | 1265434 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2020/08/29 | 1404302 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2020/08/29 | 95402 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2020/08/29 | 109732 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2020/08/29 | 43315 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2020/08/29 | 48087 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2020/08/29 | 46358 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2020/08/29 | 51236 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2020/08/29 | 57149 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2020/08/29 | 62978 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2020/08/29 | 133656 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2020/08/29 | 151865 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2020/08/29 | 72864 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2020/08/29 | 77368 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2020/08/29 | 68969 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2020/08/29 | 77314 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2020/08/29 | 246826 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2020/08/29 | 281779 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2020/08/29 | 25504 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2020/08/29 | 29059 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2020/08/29 | 100918 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2020/08/29 | 116789 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2020/08/29 | 63516 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2020/08/29 | 72614 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2020/08/29 | 94383 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2020/08/29 | 113582 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2020/08/29 | 59041 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2020/08/29 | 65546 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2020/08/29 | 462707 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2020/08/29 | 549966 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2020/08/29 | 141854 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2020/08/29 | 154419 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2020/08/29 | 94514 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2020/08/29 | 108991 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2020/08/29 | 15948 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2020/08/29 | 17627 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2020/08/29 | 27804 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2020/08/29 | 29638 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2020/08/29 | 623929 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2020/08/29 | 677581 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2020/08/29 | 500568 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2020/08/29 | 561891 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2020/08/29 | 544358 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2020/08/29 | 583965 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2020/08/29 | 93625 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2020/08/29 | 102589 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2020/08/29 | 1746185 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2020/08/29 | 2031794 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2020/08/29 | 67278 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2020/08/29 | 73692 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2020/08/29 | 26997 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2020/08/29 | 31253 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2020/08/29 | 7550 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2020/08/29 | 8568 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2020/08/29 | 192838 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2020/08/29 | 211539 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2020/08/29 | 269406 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2020/08/29 | 305081 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2020/08/29 | 96479 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2020/08/29 | 101784 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2020/08/29 | 79693 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2020/08/29 | 88874 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2020/08/29 | 170421 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2020/08/29 | 189153 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2020/08/29 | 159880 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2020/08/29 | 180901 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2020/08/29 | 196320 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2020/08/29 | 177377 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2020/08/29 | 85159 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2020/08/29 | 96848 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2020/08/29 | 31225 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2020/08/29 | 35034 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2020/08/29 | 57314 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2020/08/29 | 64237 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2020/08/29 | 63360 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2020/08/29 | 69913 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2020/08/29 | 45776 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2020/08/29 | 52203 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2020/08/29 | 192588 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2020/08/29 | 210277 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2020/08/29 | 35215 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2020/08/29 | 39333 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2020/08/29 | 327553 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2020/08/29 | 360765 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2020/08/29 | 187721 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2020/08/29 | 193837 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2020/08/29 | 207671 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2020/08/29 | 243054 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2020/08/29 | 78102 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2020/08/29 | 87298 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2020/08/29 | 922275 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2020/08/29 | 1021968 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2020/08/29 | 20007 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2020/08/29 | 23600 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2020/08/29 | 31209 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2020/08/29 | 36865 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2020/08/29 | 63556 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2020/08/29 | 71554 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2020/08/29 | 42625 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2020/08/29 | 50915 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2020/08/29 | 1192976 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2020/08/29 | 1325259 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2020/08/29 | 42063 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2020/08/29 | 51421 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2020/08/29 | 76797 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2020/08/29 | 82787 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2020/08/29 | 26853 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2020/08/29 | 29028 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2020/08/29 | 16022 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2020/08/29 | 17728 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2020/08/29 | 63430 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2020/08/29 | 69184 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2020/08/29 | 151837 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2020/08/29 | 165593 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2020/08/29 | 77489 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2020/08/29 | 87982 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2020/08/29 | 97375 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2020/08/29 | 104548 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2020/08/29 | 2534481 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2020/08/29 | 2657476 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2020/08/29 | 55564 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2020/08/29 | 62027 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2020/08/29 | 33089 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2020/08/29 | 36922 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2020/08/29 | 26614 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2020/08/29 | 32394 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2020/08/29 | 66014 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2020/08/29 | 70141 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2020/08/29 | 250289 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2020/08/29 | 279882 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2020/08/29 | 597783 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2020/08/29 | 638663 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2020/08/29 | 39268 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2020/08/29 | 43074 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2020/08/29 | 202516 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2020/08/29 | 1211710 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2020/08/29 | 1129669 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2020/08/29 | 13128 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2020/08/29 | 14130 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2020/08/30 | 545814 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2020/08/30 | 59343 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2020/08/30 | 67259 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2020/08/30 | 956334 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2020/08/30 | 1061413 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2020/08/30 | 28605 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2020/08/30 | 30910 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2020/08/30 | 29399 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2020/08/30 | 34775 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2020/08/30 | 49589 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2020/08/30 | 57159 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2020/08/30 | 84662 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2020/08/30 | 93643 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2020/08/30 | 65819 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2020/08/30 | 73450 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2020/08/30 | 27009 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2020/08/30 | 30891 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2020/08/30 | 329618 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2020/08/30 | 392369 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2020/08/30 | 32351 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2020/08/30 | 36362 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2020/08/30 | 72257 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2020/08/30 | 79418 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2020/08/30 | 203963 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2020/08/30 | 224087 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2020/08/30 | 169656 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2020/08/30 | 184490 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2020/08/30 | 51937 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2020/08/30 | 58661 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2020/08/30 | 20817 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2020/08/30 | 22982 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2020/08/30 | 460433 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2020/08/30 | 45320 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2020/08/30 | 51134 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2020/08/30 | 273699 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2020/08/30 | 310935 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2020/08/30 | 40823 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2020/08/30 | 45032 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2020/08/30 | 115883 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2020/08/30 | 130357 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2020/08/30 | 1265432 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2020/08/30 | 1404302 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2020/08/30 | 95401 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2020/08/30 | 109731 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2020/08/30 | 43315 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2020/08/30 | 48086 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2020/08/30 | 46358 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2020/08/30 | 51235 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2020/08/30 | 57149 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2020/08/30 | 62979 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2020/08/30 | 133655 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2020/08/30 | 151865 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2020/08/30 | 72864 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2020/08/30 | 77367 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2020/08/30 | 68968 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2020/08/30 | 77316 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2020/08/30 | 246826 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2020/08/30 | 281780 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2020/08/30 | 25504 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2020/08/30 | 29058 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2020/08/30 | 100918 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2020/08/30 | 116787 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2020/08/30 | 63516 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2020/08/30 | 72612 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2020/08/30 | 94383 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2020/08/30 | 113580 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2020/08/30 | 59042 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2020/08/30 | 65546 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2020/08/30 | 462710 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2020/08/30 | 549966 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2020/08/30 | 141852 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2020/08/30 | 154418 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2020/08/30 | 94514 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2020/08/30 | 108990 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2020/08/30 | 15949 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2020/08/30 | 17626 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2020/08/30 | 27803 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2020/08/30 | 29638 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2020/08/30 | 623931 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2020/08/30 | 677581 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2020/08/30 | 500569 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2020/08/30 | 561892 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2020/08/30 | 544358 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2020/08/30 | 583966 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2020/08/30 | 93620 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2020/08/30 | 102588 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2020/08/30 | 1746185 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2020/08/30 | 2031794 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2020/08/30 | 67277 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2020/08/30 | 73691 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2020/08/30 | 26998 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2020/08/30 | 31253 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2020/08/30 | 7550 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2020/08/30 | 8567 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2020/08/30 | 192836 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2020/08/30 | 211539 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2020/08/30 | 269406 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2020/08/30 | 305084 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2020/08/30 | 96480 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2020/08/30 | 101783 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2020/08/30 | 79692 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2020/08/30 | 88873 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2020/08/30 | 170421 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2020/08/30 | 189153 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2020/08/30 | 159880 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2020/08/30 | 180902 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2020/08/30 | 196319 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2020/08/30 | 177375 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2020/08/30 | 85160 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2020/08/30 | 96846 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2020/08/30 | 31223 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2020/08/30 | 35033 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2020/08/30 | 57313 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2020/08/30 | 64237 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2020/08/30 | 63360 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2020/08/30 | 69913 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2020/08/30 | 45776 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2020/08/30 | 52202 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2020/08/30 | 192589 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2020/08/30 | 210277 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2020/08/30 | 35215 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2020/08/30 | 39331 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2020/08/30 | 327552 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2020/08/30 | 360764 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2020/08/30 | 187720 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2020/08/30 | 193833 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2020/08/30 | 207673 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2020/08/30 | 243053 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2020/08/30 | 78102 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2020/08/30 | 87299 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2020/08/30 | 922273 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2020/08/30 | 1021969 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2020/08/30 | 20006 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2020/08/30 | 23600 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2020/08/30 | 31208 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2020/08/30 | 36866 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2020/08/30 | 63554 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2020/08/30 | 71552 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2020/08/30 | 42623 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2020/08/30 | 50914 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2020/08/30 | 1192975 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2020/08/30 | 1325259 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2020/08/30 | 42062 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2020/08/30 | 51420 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2020/08/30 | 76796 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2020/08/30 | 82787 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2020/08/30 | 26853 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2020/08/30 | 29028 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2020/08/30 | 16024 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2020/08/30 | 17728 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2020/08/30 | 63429 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2020/08/30 | 69184 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2020/08/30 | 151838 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2020/08/30 | 165592 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2020/08/30 | 77487 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2020/08/30 | 87981 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2020/08/30 | 97375 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2020/08/30 | 104548 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2020/08/30 | 2534480 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2020/08/30 | 2657477 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2020/08/30 | 55563 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2020/08/30 | 62026 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2020/08/30 | 33091 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2020/08/30 | 36922 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2020/08/30 | 26613 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2020/08/30 | 32393 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2020/08/30 | 66015 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2020/08/30 | 70141 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2020/08/30 | 250291 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2020/08/30 | 279882 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2020/08/30 | 597779 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2020/08/30 | 638666 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2020/08/30 | 39269 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2020/08/30 | 43075 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2020/08/30 | 202901 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2020/08/30 | 1217180 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2020/08/30 | 1135583 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2020/08/30 | 13128 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2020/08/30 | 14131 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2019/03/12 | 1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma
-2020/08/29 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2020/08/30 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
2018/07/06 | 145915 | systems/win32/miktex/tm/packages/nexus-otf.tar.lzma
2017/03/30 | 191149 | systems/win32/miktex/tm/packages/nfssext-cfr.tar.lzma
2012/12/20 | 612251 | systems/win32/miktex/tm/packages/nicefilelist.tar.lzma
2017/06/22 | 263407 | systems/win32/miktex/tm/packages/niceframe.tar.lzma
2017/06/22 | 276883 | systems/win32/miktex/tm/packages/niceframe-type1.tar.lzma
-2020/08/09 | 1473772 | systems/win32/miktex/tm/packages/nicematrix.tar.lzma
+2020/08/30 | 1517269 | systems/win32/miktex/tm/packages/nicematrix.tar.lzma
2015/11/25 | 2555178 | systems/win32/miktex/tm/packages/nicetext.tar.lzma
2018/07/30 | 243633 | systems/win32/miktex/tm/packages/nidanfloat.tar.lzma
2016/01/26 | 74424 | systems/win32/miktex/tm/packages/nihbiosketch.tar.lzma
@@ -274674,6 +275782,7 @@
2016/07/16 | 17435 | systems/win32/miktex/tm/packages/othello.tar.lzma
2017/07/26 | 83450 | systems/win32/miktex/tm/packages/ot-tableau.tar.lzma
2011/03/28 | 62464 | systems/win32/miktex/tm/packages/oubraces.tar.lzma
+2020/08/30 | 527104 | systems/win32/miktex/tm/packages/oup-authoring-template.tar.lzma
2016/07/20 | 4520 | systems/win32/miktex/tm/packages/outliner.tar.lzma
2012/01/25 | 132912 | systems/win32/miktex/tm/packages/outlines.tar.lzma
2010/06/04 | 236717 | systems/win32/miktex/tm/packages/outline.tar.lzma
@@ -274889,7 +275998,7 @@
2008/11/07 | 35981 | systems/win32/miktex/tm/packages/prettyref.tar.lzma
2017/07/26 | 201385 | systems/win32/miktex/tm/packages/preview.tar.lzma
2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
-2020/08/29 | 866 | systems/win32/miktex/tm/packages/pr.ini
+2020/08/30 | 919 | systems/win32/miktex/tm/packages/pr.ini
2010/09/27 | 248469 | systems/win32/miktex/tm/packages/printlen.tar.lzma
2008/06/17 | 77313 | systems/win32/miktex/tm/packages/proba.tar.lzma
2017/07/12 | 988486 | systems/win32/miktex/tm/packages/probsoln.tar.lzma
@@ -274924,7 +276033,7 @@
2007/08/13 | 739448 | systems/win32/miktex/tm/packages/psnfssx.tar.lzma
2016/11/03 | 50539 | systems/win32/miktex/tm/packages/pspicture.tar.lzma
2009/01/02 | 72043 | systems/win32/miktex/tm/packages/pst-2dplot.tar.lzma
-2017/10/05 | 292876 | systems/win32/miktex/tm/packages/pst2pdf.tar.lzma
+2020/08/30 | 416377 | systems/win32/miktex/tm/packages/pst2pdf.tar.lzma
2020/08/09 | 2151484 | systems/win32/miktex/tm/packages/pst-3dplot.tar.lzma
2010/02/22 | 106136 | systems/win32/miktex/tm/packages/pst-3d.tar.lzma
2009/09/28 | 60609 | systems/win32/miktex/tm/packages/pst-abspos.tar.lzma
@@ -275055,7 +276164,7 @@
2005/04/09 | 31740 | systems/win32/miktex/tm/packages/qcm.cab
2008/12/01 | 5897 | systems/win32/miktex/tm/packages/qobitree.tar.lzma
2017/04/17 | 19689 | systems/win32/miktex/tm/packages/qpxqtx.tar.lzma
-2020/06/30 | 88848 | systems/win32/miktex/tm/packages/qrbill.tar.lzma
+2020/08/30 | 92452 | systems/win32/miktex/tm/packages/qrbill.tar.lzma
2015/01/24 | 292183 | systems/win32/miktex/tm/packages/qrcode.tar.lzma
2018/06/04 | 283244 | systems/win32/miktex/tm/packages/qrcstamps.tar.lzma
2019/01/19 | 10820 | systems/win32/miktex/tm/packages/qsharp.tar.lzma
@@ -275074,6 +276183,7 @@
2020/03/09 | 747672 | systems/win32/miktex/tm/packages/quran-de.tar.lzma
2020/06/13 | 1944192 | systems/win32/miktex/tm/packages/quran.tar.lzma
2020/03/09 | 1994041 | systems/win32/miktex/tm/packages/quran-ur.tar.lzma
+2020/08/30 | 592215 | systems/win32/miktex/tm/packages/qyxf-book.tar.lzma
2019/08/02 | 659794 | systems/win32/miktex/tm/packages/ragged2e.tar.lzma
2016/12/05 | 2516856 | systems/win32/miktex/tm/packages/raleway.tar.lzma
2007/05/19 | 17628 | systems/win32/miktex/tm/packages/randbild.tar.bz2
@@ -275109,7 +276219,7 @@
2018/05/04 | 547083 | systems/win32/miktex/tm/packages/regexpatch.tar.lzma
2020/03/23 | 335314 | systems/win32/miktex/tm/packages/register.tar.lzma
2012/01/10 | 416161 | systems/win32/miktex/tm/packages/regstats.tar.lzma
-2020/07/09 | 8947739 | systems/win32/miktex/tm/packages/reledmac.tar.lzma
+2020/08/30 | 8952191 | systems/win32/miktex/tm/packages/reledmac.tar.lzma
2016/07/18 | 62816 | systems/win32/miktex/tm/packages/relenc.tar.lzma
2013/05/29 | 315594 | systems/win32/miktex/tm/packages/relsize.tar.lzma
2010/02/12 | 58689 | systems/win32/miktex/tm/packages/renditions.tar.lzma
@@ -275307,7 +276417,7 @@
2009/02/21 | 477338 | systems/win32/miktex/tm/packages/skaknew.tar.lzma
2018/02/08 | 221377 | systems/win32/miktex/tm/packages/skak.tar.lzma
2011/06/23 | 1471957 | systems/win32/miktex/tm/packages/skb.tar.lzma
-2019/10/04 | 330340 | systems/win32/miktex/tm/packages/skdoc.tar.lzma
+2020/08/30 | 393248 | systems/win32/miktex/tm/packages/skdoc.tar.lzma
2011/11/22 | 333812 | systems/win32/miktex/tm/packages/skeycommand.tar.lzma
2013/05/21 | 424870 | systems/win32/miktex/tm/packages/skeyval.tar.lzma
2019/10/17 | 317510 | systems/win32/miktex/tm/packages/skmath.tar.lzma
@@ -275343,6 +276453,7 @@
2019/04/14 | 106425 | systems/win32/miktex/tm/packages/spark-otf.tar.lzma
2019/02/16 | 1039328 | systems/win32/miktex/tm/packages/spath3.tar.lzma
2019/02/20 | 2704444 | systems/win32/miktex/tm/packages/spectralsequences.tar.lzma
+2020/08/30 | 3555555 | systems/win32/miktex/tm/packages/spectral.tar.lzma
2013/06/25 | 157432 | systems/win32/miktex/tm/packages/spelling.tar.lzma
2011/01/07 | 246641 | systems/win32/miktex/tm/packages/sphack.tar.lzma
2014/06/23 | 575560 | systems/win32/miktex/tm/packages/sphdthesis.tar.lzma
@@ -275397,6 +276508,7 @@
2018/07/13 | 100408 | systems/win32/miktex/tm/packages/stoneipa.tar.lzma
2011/12/21 | 204614 | systems/win32/miktex/tm/packages/storebox.tar.lzma
2011/11/01 | 246506 | systems/win32/miktex/tm/packages/storecmd.tar.lzma
+2020/08/30 | 59839 | systems/win32/miktex/tm/packages/stricttex.tar.lzma
2019/12/01 | 719569 | systems/win32/miktex/tm/packages/stringenc.tar.lzma
2015/02/28 | 437374 | systems/win32/miktex/tm/packages/stringstrings.tar.lzma
2018/05/29 | 151304 | systems/win32/miktex/tm/packages/structmech.tar.lzma
@@ -275480,7 +276592,7 @@
2006/08/17 | 125942 | systems/win32/miktex/tm/packages/t-angles.cab
2004/09/09 | 107770 | systems/win32/miktex/tm/packages/tapir.cab
2016/07/20 | 37664 | systems/win32/miktex/tm/packages/tap.tar.lzma
-2020/05/12 | 481107 | systems/win32/miktex/tm/packages/tasks.tar.lzma
+2020/08/30 | 492379 | systems/win32/miktex/tm/packages/tasks.tar.lzma
2016/07/18 | 511088 | systems/win32/miktex/tm/packages/tclldoc.tar.lzma
2020/08/09 | 4733854 | systems/win32/miktex/tm/packages/tcolorbox.tar.lzma
2014/02/28 | 248700 | systems/win32/miktex/tm/packages/tdclock.tar.lzma
@@ -275523,6 +276635,7 @@
2006/01/13 | 2094 | systems/win32/miktex/tm/packages/texlogos.cab
2006/09/22 | 256338 | systems/win32/miktex/tm/packages/texmate.cab
2009/01/02 | 93067 | systems/win32/miktex/tm/packages/texments.tar.lzma
+2020/08/30 | 2119877 | systems/win32/miktex/tm/packages/texnegar.tar.lzma
2020/05/18 | 263734 | systems/win32/miktex/tm/packages/tex-nutshell.tar.lzma
2020/02/05 | 746586 | systems/win32/miktex/tm/packages/texosquery.tar.lzma
2016/05/31 | 260827 | systems/win32/miktex/tm/packages/tex-overview.tar.lzma
@@ -275650,7 +276763,7 @@
2019/07/20 | 932365 | systems/win32/miktex/tm/packages/tocdata.tar.lzma
2020/01/13 | 532318 | systems/win32/miktex/tm/packages/tocloft.tar.lzma
2014/03/14 | 312556 | systems/win32/miktex/tm/packages/tocvsec2.tar.lzma
-2019/01/26 | 452981 | systems/win32/miktex/tm/packages/todonotes.tar.lzma
+2020/08/30 | 454534 | systems/win32/miktex/tm/packages/todonotes.tar.lzma
2010/04/13 | 187962 | systems/win32/miktex/tm/packages/todo.tar.lzma
2020/02/13 | 283000 | systems/win32/miktex/tm/packages/tokcycle.tar.lzma
2004/05/07 | 6156 | systems/win32/miktex/tm/packages/tokenizer.cab
@@ -275877,7 +276990,7 @@
2008/04/02 | 202156 | systems/win32/miktex/tm/packages/xargs.tar.lzma
2020/07/27 | 1159577 | systems/win32/miktex/tm/packages/xassoccnt.tar.lzma
2020/01/19 | 376430 | systems/win32/miktex/tm/packages/xbmks.tar.lzma
-2020/08/09 | 2516402 | systems/win32/miktex/tm/packages/xcharter.tar.lzma
+2020/08/30 | 2518359 | systems/win32/miktex/tm/packages/xcharter.tar.lzma
2020/01/22 | 161707 | systems/win32/miktex/tm/packages/xcite.tar.lzma
2020/05/06 | 328896 | systems/win32/miktex/tm/packages/xcjk2uni.tar.lzma
2018/01/07 | 348703 | systems/win32/miktex/tm/packages/xcntperchap.tar.lzma
@@ -275891,7 +277004,7 @@
2016/02/12 | 838878 | systems/win32/miktex/tm/packages/xduthesis.tar.lzma
2016/09/13 | 393323 | systems/win32/miktex/tm/packages/xebaposter.tar.lzma
2017/08/05 | 9511 | systems/win32/miktex/tm/packages/xechangebar.tar.lzma
-2020/06/09 | 1854624 | systems/win32/miktex/tm/packages/xecjk.tar.lzma
+2020/08/30 | 1858185 | systems/win32/miktex/tm/packages/xecjk.tar.lzma
2013/04/08 | 3203 | systems/win32/miktex/tm/packages/xecolor.tar.lzma
2019/12/20 | 68329 | systems/win32/miktex/tm/packages/xecyrmongolian.tar.lzma
2019/10/08 | 695808 | systems/win32/miktex/tm/packages/xecyr.tar.lzma
@@ -275974,7 +277087,7 @@
2011/06/23 | 128192 | systems/win32/miktex/tm/packages/york-thesis.tar.lzma
2016/07/18 | 157092 | systems/win32/miktex/tm/packages/youngtab.tar.lzma
2016/07/18 | 10494 | systems/win32/miktex/tm/packages/yplan.tar.lzma
-2020/07/19 | 515166 | systems/win32/miktex/tm/packages/yquant.tar.lzma
+2020/08/30 | 514740 | systems/win32/miktex/tm/packages/yquant.tar.lzma
2016/07/28 | 23987 | systems/win32/miktex/tm/packages/yswab.tar.lzma
2016/10/18 | 1347285 | systems/win32/miktex/tm/packages/yt4pdf.tar.lzma
2014/02/19 | 396912 | systems/win32/miktex/tm/packages/ytableau.tar.lzma
@@ -276039,7 +277152,7 @@
2020/08/08 | 4912168 | systems/win32/w32tex/aleph-w32.tar.xz
2020/08/24 | 66088620 | systems/win32/w32tex/biblatex-biber.tar.xz
2016/12/13 | 65971452 | systems/win32/w32tex/cbfonts.tar.xz
-2020/08/28 | 701312 | systems/win32/w32tex/ChangeLog
+2020/08/29 | 702522 | systems/win32/w32tex/ChangeLog
2009/08/03 | 141221 | systems/win32/w32tex/ChangeLog.0
2009/08/03 | 221890 | systems/win32/w32tex/ChangeLog.1
2009/08/03 | 116462 | systems/win32/w32tex/ChangeLog.2
@@ -276047,7 +277160,7 @@
2017/06/24 | 644754 | systems/win32/w32tex/ChangeLog.4
2020/08/28 | 23425684 | systems/win32/w32tex/cjkzr.tar.xz
2013/04/27 | 15858676 | systems/win32/w32tex/context-doc.tar.xz
-2020/08/28 | 140505272 | systems/win32/w32tex/context.tar.xz
+2020/08/29 | 140518088 | systems/win32/w32tex/context.tar.xz
2020/06/13 | 910472 | systems/win32/w32tex/cweb-w32.tar.xz
2020/03/02 | 6281164 | systems/win32/w32tex/datetime2.tar.xz
2020/06/13 | 845760 | systems/win32/w32tex/dvi2ps-w32.tar.xz
@@ -276064,14 +277177,14 @@
2020/06/13 | 996116 | systems/win32/w32tex/lcdf-typetools-w32.tar.xz
2020/08/11 | 398710232 | systems/win32/w32tex/ltxpkgdocs.tar.xz
2020/08/27 | 33843432 | systems/win32/w32tex/ltxpkgs.tar.xz
-2020/08/21 | 3834632 | systems/win32/w32tex/luajittex-dev-w32.tar.xz
-2020/08/22 | 3807036 | systems/win32/w32tex/luajittex-exp-w32.tar.xz
-2020/08/21 | 3839504 | systems/win32/w32tex/luajittex-w32.tar.xz
+2020/08/29 | 3835788 | systems/win32/w32tex/luajittex-dev-w32.tar.xz
+2020/08/29 | 3817884 | systems/win32/w32tex/luajittex-exp-w32.tar.xz
+2020/08/29 | 3840916 | systems/win32/w32tex/luajittex-w32.tar.xz
2020/08/27 | 836536 | systems/win32/w32tex/luasec-w32.tar.xz
-2020/08/21 | 17941872 | systems/win32/w32tex/luatex-dev-w32.tar.xz
-2020/08/22 | 17911588 | systems/win32/w32tex/luatex-exp-w32.tar.xz
+2020/08/29 | 17941096 | systems/win32/w32tex/luatex-dev-w32.tar.xz
+2020/08/29 | 17914244 | systems/win32/w32tex/luatex-exp-w32.tar.xz
2020/08/08 | 69257336 | systems/win32/w32tex/luatexja.tar.xz
-2020/08/21 | 17944736 | systems/win32/w32tex/luatex-w32.tar.xz
+2020/08/29 | 17945908 | systems/win32/w32tex/luatex-w32.tar.xz
2020/06/13 | 1663176 | systems/win32/w32tex/makeindex-w32.tar.xz
2015/05/26 | 1542676 | systems/win32/w32tex/manual.tar.xz
2020/06/13 | 439032 | systems/win32/w32tex/mftools.tar.xz
@@ -276132,13 +277245,13 @@
2020/07/07 | 587744 | systems/win32/w32tex/win64/jtex-w64.tar.xz
2019/11/11 | 2568 | systems/win32/w32tex/win64/latex-dev-w64.tar.xz
2020/06/13 | 799528 | systems/win32/w32tex/win64/lcdf-typetools-w64.tar.xz
-2020/08/21 | 3430084 | systems/win32/w32tex/win64/luajittex-dev-w64.tar.xz
-2020/08/22 | 3437288 | systems/win32/w32tex/win64/luajittex-exp-w64.tar.xz
-2020/08/21 | 3440372 | systems/win32/w32tex/win64/luajittex-w64.tar.xz
+2020/08/29 | 3435060 | systems/win32/w32tex/win64/luajittex-dev-w64.tar.xz
+2020/08/29 | 3430488 | systems/win32/w32tex/win64/luajittex-exp-w64.tar.xz
+2020/08/29 | 3441756 | systems/win32/w32tex/win64/luajittex-w64.tar.xz
2020/08/27 | 933816 | systems/win32/w32tex/win64/luasec-w64.tar.xz
-2020/08/21 | 3116824 | systems/win32/w32tex/win64/luatex-dev-w64.tar.xz
-2020/08/22 | 3094292 | systems/win32/w32tex/win64/luatex-exp-w64.tar.xz
-2020/08/21 | 3104780 | systems/win32/w32tex/win64/luatex-w64.tar.xz
+2020/08/29 | 3107640 | systems/win32/w32tex/win64/luatex-dev-w64.tar.xz
+2020/08/29 | 3101168 | systems/win32/w32tex/win64/luatex-exp-w64.tar.xz
+2020/08/29 | 3109936 | systems/win32/w32tex/win64/luatex-w64.tar.xz
2020/06/13 | 1140856 | systems/win32/w32tex/win64/makeindex-w64.tar.xz
2020/06/13 | 431036 | systems/win32/w32tex/win64/mftools-w64.tar.xz
2020/06/13 | 376316 | systems/win32/w32tex/win64/mftrace-w64.tar.xz
@@ -276159,8 +277272,8 @@
2020/01/18 | 42768 | systems/win32/w32tex/win64/txtutil-w64.tar.xz
2020/08/21 | 1809216 | systems/win32/w32tex/win64/uptex-w64.tar.xz
2020/08/21 | 3391912 | systems/win32/w32tex/win64/web2c-w64.tar.xz
-2020/08/26 | 10982312 | systems/win32/w32tex/win64/xetex-w64.tar.xz
-2020/08/26 | 48811184 | systems/win32/w32tex/xetex-w32.tar.xz
+2020/08/29 | 10982476 | systems/win32/w32tex/win64/xetex-w64.tar.xz
+2020/08/29 | 48808096 | systems/win32/w32tex/xetex-w32.tar.xz
2020/05/29 | 2936068 | systems/win32/w32tex/xindy-w32.tar.xz
2013/11/19 | 11356248 | systems/win32/w32tex/xymtex.tar.xz
2016/09/09 | 4334636 | systems/win32/w32tex/xypic.tar.xz
@@ -276257,7 +277370,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2020/08/30 | 186 | timestamp
+2020/08/31 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2017/06/30 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 4227d290b7..bd49e143a3 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index f344bab9da..63e87e7343 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,252 +1,1715 @@
-2020/08/29 | 97375 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2020/08/29 | 96848 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2020/08/29 | 96479 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2020/08/29 | 956335 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2020/08/29 | 95402 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2020/08/29 | 94514 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2020/08/29 | 94383 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2020/08/29 | 93642 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2020/08/29 | 93625 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2020/08/29 | 922275 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2020/08/29 | 88874 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2020/08/29 | 87982 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2020/08/29 | 87298 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2020/08/29 | 866 | systems/win32/miktex/tm/packages/pr.ini
-2020/08/29 | 8568 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2020/08/29 | 85159 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2020/08/29 | 84663 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2020/08/30 | 9952 | macros/latex/contrib/fduthesis/fudan-name.pdf
+2020/08/30 | 9868 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ly1.tfm
+2020/08/30 | 97375 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2020/08/30 | 96846 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2020/08/30 | 96480 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2020/08/30 | 9628 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ot1.tfm
+2020/08/30 | 9624 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ot1.tfm
+2020/08/30 | 9604 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ly1.tfm
+2020/08/30 | 9600 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ly1.tfm
+2020/08/30 | 956334 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2020/08/30 | 95401 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2020/08/30 | 94514 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2020/08/30 | 94383 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2020/08/30 | 9404 | fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ot1.tfm
+2020/08/30 | 93643 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2020/08/30 | 93620 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2020/08/30 | 9351 | macros/latex/contrib/caption/caption-ams-smf.dtx
+2020/08/30 | 9324 | fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ot1.tfm
+2020/08/30 | 92452 | systems/win32/miktex/tm/packages/qrbill.tar.lzma
+2020/08/30 | 922273 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2020/08/30 | 920850 | macros/latex/contrib/fduthesis/fduthesis-code.pdf
+2020/08/30 | 919 | systems/win32/miktex/tm/packages/pr.ini
+2020/08/30 | 9124 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ot1.tfm
+2020/08/30 | 9120 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ot1.tfm
+2020/08/30 | 9108 | fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ot1.tfm
+2020/08/30 | 9054757 | install/fonts/merriweather.tds.zip
+2020/08/30 | 905245 | systems/win32/miktex/tm/packages/hecthese.tar.lzma
+2020/08/30 | 9036 | fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ot1.tfm
+2020/08/30 | 89996 | macros/latex/contrib/caption/ltcaption.pdf
+2020/08/30 | 8952191 | systems/win32/miktex/tm/packages/reledmac.tar.lzma
+2020/08/30 | 8949627 | fonts/merriweather.zip
+2020/08/30 | 8896 | fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ot1.tfm
+2020/08/30 | 8896 | fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ot1.tfm
+2020/08/30 | 88873 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2020/08/30 | 88754 | graphics/mcf2graph/mcf2graph.mf
+2020/08/30 | 87981 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2020/08/30 | 87299 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2020/08/30 | 8608 | fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ot1.tfm
+2020/08/30 | 8604 | fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ot1.tfm
+2020/08/30 | 8599 | macros/latex/contrib/caption/caption-memoir.dtx
+2020/08/30 | 8567 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2020/08/30 | 85160 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2020/08/30 | 84662 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2020/08/30 | 82787 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2020/08/30 | 82731 | macros/latex/contrib/totalcount/totalcount.pdf
+2020/08/30 | 81580 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-t1.tfm
+2020/08/30 | 81392 | fonts/merriweather/tfm/Merriwthr-Italic-lf-t1.tfm
+2020/08/30 | 81156 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-t1.tfm
+2020/08/30 | 80972 | fonts/merriweather/tfm/Merriwthr-Italic-osf-t1.tfm
+2020/08/30 | 80327 | macros/latex/contrib/texnegar/texnegar.dtx
+2020/08/30 | 80261 | macros/latex/contrib/totalcount.zip
+2020/08/30 | 80248 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-t1.tfm
+2020/08/30 | 80248 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-t1.tfm
+2020/08/30 | 80072 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-t1.tfm
+2020/08/30 | 80068 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-t1.tfm
+2020/08/30 | 79692 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2020/08/30 | 79418 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2020/08/30 | 7939 | macros/latex/contrib/caption/caption-thesis.dtx
+2020/08/30 | 788 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1.vf
+2020/08/30 | 788 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1.vf
+2020/08/30 | 788 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-sc-ot1.vf
+2020/08/30 | 784 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-sc-ot1.vf
+2020/08/30 | 784 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-sc-ot1.vf
+2020/08/30 | 784 | fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-sc-ot1.vf
+2020/08/30 | 784 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-sc-ot1.vf
+2020/08/30 | 784 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-sc-ot1.vf
+2020/08/30 | 782441 | systems/win32/miktex/tm/packages/adjustbox.tar.lzma
+2020/08/30 | 78102 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-Regular-tosf-sc-ot1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-Regular-tlf-sc-ot1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-Regular-osf-sc-ot1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-sc-ot1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-Italic-tosf-sc-ot1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-sc-ot1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-sc-ot1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-sc-ot1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-sc-ot1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-sc-ot1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-sc-ot1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-sc-ot1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/Merriwthr-Regular-tosf-sc-ot1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/Merriwthr-LightItalic-tosf-sc-ot1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/Merriwthr-LightItalic-tlf-sc-ot1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/Merriwthr-LightItalic-osf-sc-ot1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-sc-ot1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-sc-ot1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-sc-ot1.vf
+2020/08/30 | 780 | fonts/merriweather/vf/Merriwthr-BlackItalic-osf-sc-ot1.vf
+2020/08/30 | 77 | macros/latex/contrib/totalcount/SUMMARY
+2020/08/30 | 7773 | macros/latex/contrib/caption/caption-ntg.dtx
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Regular-lf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Light-tosf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Light-tlf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Light-osf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Light-lf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Italic-tlf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Italic-osf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Italic-lf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Bold-tosf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Bold-tlf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Bold-osf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/MerriwthrSans-Bold-lf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Regular-tlf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Regular-osf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Regular-lf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Light-tosf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Light-tlf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Light-osf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Light-lf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-LightItalic-lf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Italic-tosf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Bold-tosf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Bold-tlf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-Bold-osf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-BoldItalic-osf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-BoldItalic-lf-sc-ot1.vf
+2020/08/30 | 776 | fonts/merriweather/vf/Merriwthr-BlackItalic-lf-sc-ot1.vf
+2020/08/30 | 77487 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2020/08/30 | 77367 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2020/08/30 | 77316 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2020/08/30 | 772 | fonts/merriweather/vf/Merriwthr-Italic-tlf-sc-ot1.vf
+2020/08/30 | 772 | fonts/merriweather/vf/Merriwthr-Italic-osf-sc-ot1.vf
+2020/08/30 | 772 | fonts/merriweather/vf/Merriwthr-Italic-lf-sc-ot1.vf
+2020/08/30 | 772 | fonts/merriweather/vf/Merriwthr-Bold-lf-sc-ot1.vf
+2020/08/30 | 772 | fonts/merriweather/vf/Merriwthr-Black-tosf-sc-ot1.vf
+2020/08/30 | 772 | fonts/merriweather/vf/Merriwthr-Black-tlf-sc-ot1.vf
+2020/08/30 | 772 | fonts/merriweather/vf/Merriwthr-Black-osf-sc-ot1.vf
+2020/08/30 | 772 | fonts/merriweather/vf/Merriwthr-Black-lf-sc-ot1.vf
+2020/08/30 | 76796 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2020/08/30 | 7663 | macros/latex/contrib/caption/caption-elsarticle.dtx
+2020/08/30 | 76567 | systems/win32/miktex/tm/packages/leftindex.tar.lzma
+2020/08/30 | 76310 | fonts/merriweather/map/merriweather.map
+2020/08/30 | 759144 | systems/win32/miktex/tm/packages/beilstein.tar.lzma
+2020/08/30 | 755180 | systems/win32/miktex/tm/packages/fontsetup.tar.lzma
+2020/08/30 | 7550 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2020/08/30 | 7411271 | systems/win32/miktex/tm/packages/biblatex.tar.lzma
+2020/08/30 | 7382 | macros/latex/contrib/caption/CHANGELOG
+2020/08/30 | 73691 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2020/08/30 | 73450 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2020/08/30 | 72864 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2020/08/30 | 72612 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2020/08/30 | 72257 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2020/08/30 | 718117 | macros/latex/contrib/caption/caption-rus.pdf
+2020/08/30 | 71552 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2020/08/30 | 70141 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2020/08/30 | 69913 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2020/08/30 | 69184 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2020/08/30 | 68968 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2020/08/30 | 684 | systems/texlive/tlnet/archive/collection-luatex.r56210.tar.xz
+2020/08/30 | 677581 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2020/08/30 | 67305 | macros/latex/contrib/caption/caption-light.pdf
+2020/08/30 | 67277 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2020/08/30 | 67259 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2020/08/30 | 6684 | fonts/merriweather/latex/OT1MerriwthrSans-TOsF.fd
+2020/08/30 | 6684 | fonts/merriweather/latex/LY1MerriwthrSans-TOsF.fd
+2020/08/30 | 66376 | fonts/merriweather/tfm/Merriwthr-Regular-lf-t1.tfm
+2020/08/30 | 66208 | fonts/merriweather/tfm/Merriwthr-Regular-osf-t1.tfm
+2020/08/30 | 6611 | fonts/merriweather/latex/T1MerriwthrSans-TOsF.fd
+2020/08/30 | 66015 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2020/08/30 | 65892 | fonts/merriweather/tfm/Merriwthr-Bold-lf-t1.tfm
+2020/08/30 | 65819 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2020/08/30 | 6573 | fonts/merriweather/latex/OT1MerriwthrSans-TLF.fd
+2020/08/30 | 6573 | fonts/merriweather/latex/OT1MerriwthrSans-OsF.fd
+2020/08/30 | 6573 | fonts/merriweather/latex/LY1MerriwthrSans-TLF.fd
+2020/08/30 | 6573 | fonts/merriweather/latex/LY1MerriwthrSans-OsF.fd
+2020/08/30 | 65708 | fonts/merriweather/tfm/Merriwthr-Bold-osf-t1.tfm
+2020/08/30 | 65546 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2020/08/30 | 65544 | macros/latex/contrib/texnegar/doc-samples-xep.pdf
+2020/08/30 | 65444 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-t1.tfm
+2020/08/30 | 65444 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-t1.tfm
+2020/08/30 | 6500 | fonts/merriweather/latex/T1MerriwthrSans-TLF.fd
+2020/08/30 | 6500 | fonts/merriweather/latex/T1MerriwthrSans-OsF.fd
+2020/08/30 | 64960 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-t1.tfm
+2020/08/30 | 64956 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-t1.tfm
+2020/08/30 | 6462 | fonts/merriweather/latex/OT1MerriwthrSans-LF.fd
+2020/08/30 | 6462 | fonts/merriweather/latex/LY1MerriwthrSans-LF.fd
+2020/08/30 | 64237 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2020/08/30 | 6389 | fonts/merriweather/latex/T1MerriwthrSans-LF.fd
+2020/08/30 | 638666 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2020/08/30 | 63790 | macros/latex/contrib/fduthesis/fduthesis-doc.dtx
+2020/08/30 | 63554 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2020/08/30 | 63516 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2020/08/30 | 63437 | macros/latex/contrib/texnegar/doc-samples-glyph.pdf
+2020/08/30 | 63429 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2020/08/30 | 634145 | systems/win32/miktex/tm/packages/biblatex-ext.tar.lzma
+2020/08/30 | 63360 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2020/08/30 | 62979 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2020/08/30 | 62967 | macros/latex/contrib/texnegar/doc-samples-hrule.pdf
+2020/08/30 | 62572 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ly1.tfm
+2020/08/30 | 62432 | fonts/merriweather/tfm/Merriwthr-Italic-lf-ly1.tfm
+2020/08/30 | 623931 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2020/08/30 | 62112 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-t1.tfm
+2020/08/30 | 62026 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2020/08/30 | 62020 | fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-t1.tfm
+2020/08/30 | 6200 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ot1.tfm
+2020/08/30 | 61920 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-t1.tfm
+2020/08/30 | 61804 | fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-t1.tfm
+2020/08/30 | 61616 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ly1.tfm
+2020/08/30 | 61488 | fonts/merriweather/tfm/Merriwthr-Italic-osf-ly1.tfm
+2020/08/30 | 6138187 | systems/win32/miktex/tm/packages/newcomputermodern.tar.lzma
+2020/08/30 | 6108 | fonts/merriweather/latex/OT1Merriwthr-TOsF.fd
+2020/08/30 | 6108 | fonts/merriweather/latex/LY1Merriwthr-TOsF.fd
+2020/08/30 | 60896 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-t1.tfm
+2020/08/30 | 60896 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-t1.tfm
+2020/08/30 | 60788 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-t1.tfm
+2020/08/30 | 60788 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ly1.tfm
+2020/08/30 | 60788 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ly1.tfm
+2020/08/30 | 60784 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-t1.tfm
+2020/08/30 | 60664 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-ly1.tfm
+2020/08/30 | 60660 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-ly1.tfm
+2020/08/30 | 6064 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ot1.tfm
+2020/08/30 | 60420 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-t1.tfm
+2020/08/30 | 6035 | fonts/merriweather/latex/T1Merriwthr-TOsF.fd
+2020/08/30 | 5997 | fonts/merriweather/latex/OT1Merriwthr-TLF.fd
+2020/08/30 | 5997 | fonts/merriweather/latex/OT1Merriwthr-OsF.fd
+2020/08/30 | 5997 | fonts/merriweather/latex/LY1Merriwthr-TLF.fd
+2020/08/30 | 5997 | fonts/merriweather/latex/LY1Merriwthr-OsF.fd
+2020/08/30 | 59872 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-t1.tfm
+2020/08/30 | 59839 | systems/win32/miktex/tm/packages/stricttex.tar.lzma
+2020/08/30 | 597779 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2020/08/30 | 596 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-ts1.vf
+2020/08/30 | 596 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-ts1.vf
+2020/08/30 | 596 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-ts1.vf
+2020/08/30 | 59504 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-t1.tfm
+2020/08/30 | 59504 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-t1.tfm
+2020/08/30 | 59343 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2020/08/30 | 592 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-ts1.vf
+2020/08/30 | 592 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-ts1.vf
+2020/08/30 | 592 | fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-ts1.vf
+2020/08/30 | 592 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-ts1.vf
+2020/08/30 | 592 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-ts1.vf
+2020/08/30 | 5924 | fonts/merriweather/latex/T1Merriwthr-TLF.fd
+2020/08/30 | 5924 | fonts/merriweather/latex/T1Merriwthr-OsF.fd
+2020/08/30 | 592215 | systems/win32/miktex/tm/packages/qyxf-book.tar.lzma
+2020/08/30 | 59042 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-Regular-tosf-ts1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-Regular-tlf-ts1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-Regular-osf-ts1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-ts1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-Italic-tosf-ts1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-ts1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-ts1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-ts1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-ts1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-ts1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-ts1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-ts1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/Merriwthr-LightItalic-tosf-ts1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/Merriwthr-LightItalic-tlf-ts1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/Merriwthr-LightItalic-osf-ts1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-ts1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-ts1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-ts1.vf
+2020/08/30 | 588 | fonts/merriweather/vf/Merriwthr-BlackItalic-osf-ts1.vf
+2020/08/30 | 5886 | fonts/merriweather/latex/OT1Merriwthr-LF.fd
+2020/08/30 | 5886 | fonts/merriweather/latex/LY1Merriwthr-LF.fd
+2020/08/30 | 58661 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2020/08/30 | 58612 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-t1.tfm
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Regular-lf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Light-tosf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Light-tlf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Light-osf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Light-lf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Italic-tlf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Italic-osf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Italic-lf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Bold-tosf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Bold-tlf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Bold-osf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/MerriwthrSans-Bold-lf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/Merriwthr-Regular-tosf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/Merriwthr-Regular-tlf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/Merriwthr-Regular-osf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/Merriwthr-LightItalic-lf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/Merriwthr-Italic-tosf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/Merriwthr-BoldItalic-osf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/Merriwthr-BoldItalic-lf-ts1.vf
+2020/08/30 | 584 | fonts/merriweather/vf/Merriwthr-BlackItalic-lf-ts1.vf
+2020/08/30 | 58488 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-t1.tfm
+2020/08/30 | 583966 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2020/08/30 | 5813 | fonts/merriweather/latex/T1Merriwthr-LF.fd
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Regular-lf-ts1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Light-tosf-ts1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Light-tlf-ts1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Light-osf-ts1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Light-lf-ts1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Italic-tlf-ts1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Italic-osf-ts1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Italic-lf-ts1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Bold-tosf-ts1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Bold-tlf-ts1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Bold-osf-ts1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Bold-lf-ts1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Black-tosf-ts1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Black-tlf-ts1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Black-osf-ts1.vf
+2020/08/30 | 580 | fonts/merriweather/vf/Merriwthr-Black-lf-ts1.vf
+2020/08/30 | 5804 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ot1.tfm
+2020/08/30 | 5784 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ot1.tfm
+2020/08/30 | 5780 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ot1.tfm
+2020/08/30 | 57744 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-t1.tfm
+2020/08/30 | 57744 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-t1.tfm
+2020/08/30 | 57616 | systems/texlive/tlnet/archive/stricttex.doc.r56210.tar.xz
+2020/08/30 | 575278 | graphics/mcf2graph/mcf_manual.pdf
+2020/08/30 | 57313 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2020/08/30 | 57159 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2020/08/30 | 57149 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2020/08/30 | 5704 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ot1.tfm
+2020/08/30 | 5668 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ot1.tfm
+2020/08/30 | 5656 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-ot1.tfm
+2020/08/30 | 561892 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2020/08/30 | 5580 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ot1.tfm
+2020/08/30 | 55563 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2020/08/30 | 5500709 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2020/08/30 | 549966 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2020/08/30 | 5496 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-ot1.tfm
+2020/08/30 | 545814 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2020/08/30 | 545043 | systems/win32/miktex/tm/packages/files.csv.lzma
+2020/08/30 | 544358 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2020/08/30 | 54284 | fonts/merriweather/tfm/Merriwthr-Black-lf-t1.tfm
+2020/08/30 | 54140 | fonts/merriweather/tfm/Merriwthr-Black-osf-t1.tfm
+2020/08/30 | 5412 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ot1.tfm
+2020/08/30 | 5412 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ot1.tfm
+2020/08/30 | 53592 | fonts/merriweather/tfm/Merriwthr-Black-tlf-t1.tfm
+2020/08/30 | 53588 | fonts/merriweather/tfm/Merriwthr-Black-tosf-t1.tfm
+2020/08/30 | 534937 | macros/latex/contrib/texnegar/texnegar.pdf
+2020/08/30 | 5328 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ot1.tfm
+2020/08/30 | 53280 | fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-t1.tfm
+2020/08/30 | 53280 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ly1.tfm
+2020/08/30 | 53272 | fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-t1.tfm
+2020/08/30 | 5324 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ot1.tfm
+2020/08/30 | 53244 | fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-t1.tfm
+2020/08/30 | 53244 | fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-t1.tfm
+2020/08/30 | 53204 | fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ly1.tfm
+2020/08/30 | 52780 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ly1.tfm
+2020/08/30 | 5276 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ot1.tfm
+2020/08/30 | 5276 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ot1.tfm
+2020/08/30 | 527104 | systems/win32/miktex/tm/packages/oup-authoring-template.tar.lzma
+2020/08/30 | 52688 | fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ly1.tfm
+2020/08/30 | 52202 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2020/08/30 | 52116 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-t1.tfm
+2020/08/30 | 52112 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-t1.tfm
+2020/08/30 | 52100 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-t1.tfm
+2020/08/30 | 52100 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-t1.tfm
+2020/08/30 | 51937 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2020/08/30 | 51880 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ly1.tfm
+2020/08/30 | 51880 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ly1.tfm
+2020/08/30 | 51792 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ly1.tfm
+2020/08/30 | 51788 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ly1.tfm
+2020/08/30 | 514886 | systems/win32/miktex/tm/packages/ebproof.tar.lzma
+2020/08/30 | 514740 | systems/win32/miktex/tm/packages/yquant.tar.lzma
+2020/08/30 | 51420 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2020/08/30 | 51268 | fonts/merriweather/tfm/Merriwthr-Light-lf-t1.tfm
+2020/08/30 | 51235 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2020/08/30 | 51134 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2020/08/30 | 51100 | fonts/merriweather/tfm/Merriwthr-Light-osf-t1.tfm
+2020/08/30 | 50914 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2020/08/30 | 50508 | fonts/merriweather/tfm/Merriwthr-Light-tosf-t1.tfm
+2020/08/30 | 50508 | fonts/merriweather/tfm/Merriwthr-Light-tlf-t1.tfm
+2020/08/30 | 5028 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ot1.tfm
+2020/08/30 | 500569 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2020/08/30 | 49732 | macros/latex/contrib/caption/bicaption.dtx
+2020/08/30 | 49679 | macros/latex/contrib/caption/caption2.dtx
+2020/08/30 | 49589 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2020/08/30 | 4957201 | install/macros/latex/contrib/texnegar.tds.zip
+2020/08/30 | 4940 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ot1.tfm
+2020/08/30 | 4934897 | macros/latex/contrib/texnegar.zip
+2020/08/30 | 492379 | systems/win32/miktex/tm/packages/tasks.tar.lzma
+2020/08/30 | 49112 | fonts/merriweather/tfm/Merriwthr-Regular-lf-ly1.tfm
+2020/08/30 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2020/08/30 | 48956 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-t1.tfm
+2020/08/30 | 48932 | fonts/merriweather/tfm/Merriwthr-Regular-osf-ly1.tfm
+2020/08/30 | 48872 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-t1.tfm
+2020/08/30 | 48820 | fonts/merriweather/tfm/Merriwthr-Bold-lf-ly1.tfm
+2020/08/30 | 48608 | fonts/merriweather/tfm/Merriwthr-Bold-osf-ly1.tfm
+2020/08/30 | 48348 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-t1.tfm
+2020/08/30 | 48348 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-t1.tfm
+2020/08/30 | 48086 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2020/08/30 | 47944 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-ly1.tfm
+2020/08/30 | 47944 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-ly1.tfm
+2020/08/30 | 47936 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ly1.tfm
+2020/08/30 | 4772 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ot1.tfm
+2020/08/30 | 47664 | graphics/mcf2graph/mcf_manual.tex
+2020/08/30 | 47644 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-ly1.tfm
+2020/08/30 | 47640 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-ly1.tfm
+2020/08/30 | 47608 | macros/latex/contrib/caption/subcaption.dtx
+2020/08/30 | 4720 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ot1.tfm
+2020/08/30 | 47056 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ly1.tfm
+2020/08/30 | 46716 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ly1.tfm
+2020/08/30 | 46716 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ly1.tfm
+2020/08/30 | 4660 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ot1.tfm
+2020/08/30 | 4652 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ot1.tfm
+2020/08/30 | 4648 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ot1.tfm
+2020/08/30 | 4644 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ot1.tfm
+2020/08/30 | 46358 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2020/08/30 | 462710 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2020/08/30 | 460433 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2020/08/30 | 4580 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ot1.tfm
+2020/08/30 | 45776 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2020/08/30 | 4576 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ot1.tfm
+2020/08/30 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2020/08/30 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2020/08/30 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2020/08/30 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2020/08/30 | 4548 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ot1.tfm
+2020/08/30 | 454534 | systems/win32/miktex/tm/packages/todonotes.tar.lzma
+2020/08/30 | 453893 | systems/win32/miktex/tm/packages/elpres.tar.lzma
+2020/08/30 | 4532 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ot1.tfm
+2020/08/30 | 45320 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2020/08/30 | 45032 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2020/08/30 | 4450 | fonts/merriweather/doc/OFL.txt
+2020/08/30 | 4436 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ot1.tfm
+2020/08/30 | 4392 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ot1.tfm
+2020/08/30 | 43908 | systems/win32/miktex/tm/packages/luahyphenrules.tar.lzma
+2020/08/30 | 43728 | fonts/merriweather/tfm/Merriwthr-Light-lf-sc-t1.tfm
+2020/08/30 | 43688 | fonts/merriweather/tfm/Merriwthr-Light-osf-sc-t1.tfm
+2020/08/30 | 4360 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ot1.tfm
+2020/08/30 | 4360 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ot1.tfm
+2020/08/30 | 43315 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2020/08/30 | 4316 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ot1.tfm
+2020/08/30 | 4316 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ot1.tfm
+2020/08/30 | 4312 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ot1.tfm
+2020/08/30 | 43075 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2020/08/30 | 4288 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ot1.tfm
+2020/08/30 | 42804 | fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-t1.tfm
+2020/08/30 | 42804 | fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-t1.tfm
+2020/08/30 | 42732 | fonts/merriweather/tfm/Merriwthr-Black-osf-sc-t1.tfm
+2020/08/30 | 42668 | fonts/merriweather/tfm/Merriwthr-Black-lf-sc-t1.tfm
+2020/08/30 | 42640 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ly1.tfm
+2020/08/30 | 42623 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2020/08/30 | 42552 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ly1.tfm
+2020/08/30 | 4236 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ot1.tfm
+2020/08/30 | 4232 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ot1.tfm
+2020/08/30 | 42188 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ly1.tfm
+2020/08/30 | 4216 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ot1.tfm
+2020/08/30 | 4216 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ot1.tfm
+2020/08/30 | 42072 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ly1.tfm
+2020/08/30 | 42062 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2020/08/30 | 41760 | fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-t1.tfm
+2020/08/30 | 41756 | fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-t1.tfm
+2020/08/30 | 41744 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ly1.tfm
+2020/08/30 | 41744 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ly1.tfm
+2020/08/30 | 416377 | systems/win32/miktex/tm/packages/pst2pdf.tar.lzma
+2020/08/30 | 41400 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ly1.tfm
+2020/08/30 | 41396 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ly1.tfm
+2020/08/30 | 41292 | fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ly1.tfm
+2020/08/30 | 41268 | fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ly1.tfm
+2020/08/30 | 41264 | fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ly1.tfm
+2020/08/30 | 41248 | fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ly1.tfm
+2020/08/30 | 409837 | macros/latex/contrib/caption/caption-deu.pdf
+2020/08/30 | 40823 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2020/08/30 | 4072 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ot1.tfm
+2020/08/30 | 4068 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ot1.tfm
+2020/08/30 | 40636 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-t1.tfm
+2020/08/30 | 40508 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-t1.tfm
+2020/08/30 | 402649 | macros/latex/contrib/fduthesis/fduthesis.pdf
+2020/08/30 | 402305 | macros/latex/contrib/caption/caption-eng.pdf
+2020/08/30 | 40176 | fonts/merriweather/tfm/Merriwthr-Black-lf-ly1.tfm
+2020/08/30 | 4004 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ot1.tfm
+2020/08/30 | 4004 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ot1.tfm
+2020/08/30 | 40036 | fonts/merriweather/tfm/Merriwthr-Black-osf-ly1.tfm
+2020/08/30 | 39952 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ly1.tfm
+2020/08/30 | 39948 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ly1.tfm
+2020/08/30 | 39924 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ly1.tfm
+2020/08/30 | 39924 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ly1.tfm
+2020/08/30 | 3976 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ot1.tfm
+2020/08/30 | 39708 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-t1.tfm
+2020/08/30 | 39708 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-t1.tfm
+2020/08/30 | 3940 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ot1.tfm
+2020/08/30 | 39331 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2020/08/30 | 39328 | fonts/merriweather/tfm/Merriwthr-Black-tlf-ly1.tfm
+2020/08/30 | 39324 | fonts/merriweather/tfm/Merriwthr-Black-tosf-ly1.tfm
+2020/08/30 | 393248 | systems/win32/miktex/tm/packages/skdoc.tar.lzma
+2020/08/30 | 3928 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ot1.tfm
+2020/08/30 | 39269 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2020/08/30 | 392369 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2020/08/30 | 389 | macros/latex/contrib/totalcount/CHANGELOG
+2020/08/30 | 38992 | fonts/merriweather/tfm/Merriwthr-Light-lf-ly1.tfm
+2020/08/30 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r56204.tar.xz
+2020/08/30 | 3889 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-hrule.tex
+2020/08/30 | 3889 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-glyph.tex
+2020/08/30 | 38820 | fonts/merriweather/tfm/Merriwthr-Light-osf-ly1.tfm
+2020/08/30 | 3880 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ot1.tfm
+2020/08/30 | 381934 | systems/win32/miktex/tm/packages/biblatex-publist.tar.lzma
+2020/08/30 | 38032 | fonts/merriweather/tfm/Merriwthr-Light-tosf-ly1.tfm
+2020/08/30 | 38032 | fonts/merriweather/tfm/Merriwthr-Light-tlf-ly1.tfm
+2020/08/30 | 3793 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-glyph.tex
+2020/08/30 | 378012 | fonts/merriweather/type1/Merriwthr-Black.pfb
+2020/08/30 | 377121 | systems/win32/miktex/tm/packages/biblatex-jura2.tar.lzma
+2020/08/30 | 3736 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ot1.tfm
+2020/08/30 | 3705 | fonts/merriweather/latex/TS1MerriwthrSans-TOsF.fd
+2020/08/30 | 3703 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-hrule.tex
+2020/08/30 | 3702 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-glyph.tex
+2020/08/30 | 36922 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2020/08/30 | 36866 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2020/08/30 | 368053 | fonts/merriweather/type1/Merriwthr-Bold.pfb
+2020/08/30 | 3672 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ot1.tfm
+2020/08/30 | 3668 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ot1.tfm
+2020/08/30 | 36652 | graphics/mcf2graph/mcf_man_soc.mf
+2020/08/30 | 3648 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ot1.tfm
+2020/08/30 | 3648 | fonts/merriweather/latex/TS1MerriwthrSans-TLF.fd
+2020/08/30 | 3648 | fonts/merriweather/latex/TS1MerriwthrSans-OsF.fd
+2020/08/30 | 3648 | fonts/merriweather/latex/OT1MerriwthrSans-Sup.fd
+2020/08/30 | 3648 | fonts/merriweather/latex/LY1MerriwthrSans-Sup.fd
+2020/08/30 | 3638 | graphics/mcf2graph/mcf_setup.sty
+2020/08/30 | 36362 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2020/08/30 | 362993 | systems/win32/miktex/tm/packages/ejpecp.tar.lzma
+2020/08/30 | 3617 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-glyph.tex
+2020/08/30 | 3616 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ot1.tfm
+2020/08/30 | 3610 | fonts/merriweather/latex/T1MerriwthrSans-Sup.fd
+2020/08/30 | 360764 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2020/08/30 | 3604 | macros/latex/contrib/texnegar/texnegar-luatex-leaders-hrule.tex
+2020/08/30 | 3604 | macros/latex/contrib/texnegar/texnegar-luatex-leaders-glyph.tex
+2020/08/30 | 3591 | fonts/merriweather/latex/TS1MerriwthrSans-LF.fd
+2020/08/30 | 3580 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ot1.tfm
+2020/08/30 | 357736 | systems/win32/miktex/tm/packages/metastr.tar.lzma
+2020/08/30 | 3576 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ot1.tfm
+2020/08/30 | 3555555 | systems/win32/miktex/tm/packages/spectral.tar.lzma
+2020/08/30 | 355472 | fonts/merriweather/type1/Merriwthr-Regular.pfb
+2020/08/30 | 3536 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ot1.tfm
+2020/08/30 | 35276 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ly1.tfm
+2020/08/30 | 35215 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2020/08/30 | 35188 | fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ly1.tfm
+2020/08/30 | 35128 | fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ly1.tfm
+2020/08/30 | 3508 | macros/latex/contrib/texnegar/texnegar-luatex-glyph.tex
+2020/08/30 | 35033 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2020/08/30 | 34960 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ly1.tfm
+2020/08/30 | 34775 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2020/08/30 | 347321 | systems/win32/miktex/tm/packages/biblatex-apa.tar.lzma
+2020/08/30 | 3436 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1.tfm
+2020/08/30 | 3432 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1.tfm
+2020/08/30 | 34276 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ly1.tfm
+2020/08/30 | 34272 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ly1.tfm
+2020/08/30 | 342047 | fonts/merriweather/type1/Merriwthr-Light.pfb
+2020/08/30 | 34100 | fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ly1.tfm
+2020/08/30 | 34100 | fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ly1.tfm
+2020/08/30 | 3401 | fonts/merriweather/latex/TS1Merriwthr-TOsF.fd
+2020/08/30 | 3396 | fonts/merriweather/enc/merriwthr_xfdjpz.enc
+2020/08/30 | 3387 | fonts/merriweather/enc/merriwthr_x754fd.enc
+2020/08/30 | 3385 | fonts/merriweather/enc/merriwthr_dl4a4c.enc
+2020/08/30 | 3376 | fonts/merriweather/enc/merriwthr_xys2i2.enc
+2020/08/30 | 3376 | fonts/merriweather/enc/merriwthr_cvdnuw.enc
+2020/08/30 | 3375 | fonts/merriweather/enc/merriwthr_vvhkhe.enc
+2020/08/30 | 3374 | fonts/merriweather/enc/merriwthr_h6z4fc.enc
+2020/08/30 | 3367 | fonts/merriweather/enc/merriwthr_7t3tp2.enc
+2020/08/30 | 3366 | fonts/merriweather/enc/merriwthr_b6rchs.enc
+2020/08/30 | 3365 | fonts/merriweather/enc/merriwthr_me3dx7.enc
+2020/08/30 | 3365 | fonts/merriweather/enc/merriwthr_fs3efe.enc
+2020/08/30 | 3365 | fonts/merriweather/enc/merriwthr_diijaa.enc
+2020/08/30 | 3356 | fonts/merriweather/enc/merriwthr_uduhhn.enc
+2020/08/30 | 3356 | fonts/merriweather/enc/merriwthr_2hyv6t.enc
+2020/08/30 | 3355 | fonts/merriweather/enc/merriwthr_dx3n55.enc
+2020/08/30 | 3354 | fonts/merriweather/enc/merriwthr_btdrxl.enc
+2020/08/30 | 3354 | fonts/merriweather/enc/merriwthr_ah5y5a.enc
+2020/08/30 | 33528 | fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ly1.tfm
+2020/08/30 | 33500 | fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ly1.tfm
+2020/08/30 | 3346 | fonts/merriweather/enc/merriwthr_e5zf5y.enc
+2020/08/30 | 3345 | fonts/merriweather/enc/merriwthr_p242jx.enc
+2020/08/30 | 3345 | fonts/merriweather/enc/merriwthr_igdvgb.enc
+2020/08/30 | 3344 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ot1.tfm
+2020/08/30 | 3344 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ot1.tfm
+2020/08/30 | 3344 | fonts/merriweather/latex/TS1Merriwthr-TLF.fd
+2020/08/30 | 3344 | fonts/merriweather/latex/TS1Merriwthr-OsF.fd
+2020/08/30 | 3344 | fonts/merriweather/latex/OT1Merriwthr-Sup.fd
+2020/08/30 | 3344 | fonts/merriweather/latex/LY1Merriwthr-Sup.fd
+2020/08/30 | 3344 | fonts/merriweather/enc/merriwthr_f5n6m3.enc
+2020/08/30 | 3343 | fonts/merriweather/enc/merriwthr_ibepov.enc
+2020/08/30 | 3342 | fonts/merriweather/enc/merriwthr_qfmkcs.enc
+2020/08/30 | 3336 | fonts/merriweather/enc/merriwthr_7bivwm.enc
+2020/08/30 | 3335 | fonts/merriweather/enc/merriwthr_2j7grf.enc
+2020/08/30 | 3334 | fonts/merriweather/enc/merriwthr_afua2j.enc
+2020/08/30 | 3331 | fonts/merriweather/enc/merriwthr_gbcczm.enc
+2020/08/30 | 3325 | fonts/merriweather/enc/merriwthr_7tayun.enc
+2020/08/30 | 3321 | fonts/merriweather/enc/merriwthr_rzflsg.enc
+2020/08/30 | 3320 | fonts/merriweather/enc/merriwthr_ckyw6q.enc
+2020/08/30 | 3315 | fonts/merriweather/enc/merriwthr_ob5vn4.enc
+2020/08/30 | 3314 | fonts/merriweather/enc/merriwthr_cqy4t2.enc
+2020/08/30 | 331198 | fonts/merriweather/type1/Merriwthr-BoldItalic.pfb
+2020/08/30 | 33091 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2020/08/30 | 3306 | fonts/merriweather/latex/T1Merriwthr-Sup.fd
+2020/08/30 | 3300 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ot1.tfm
+2020/08/30 | 329618 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2020/08/30 | 3287 | fonts/merriweather/latex/TS1Merriwthr-LF.fd
+2020/08/30 | 327552 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2020/08/30 | 325838 | macros/latex/contrib/texnegar/texnegar-luatex-leaders-glyph.pdf
+2020/08/30 | 325592 | fonts/merriweather/type1/Merriwthr-BlackItalic.pfb
+2020/08/30 | 32464 | fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ly1.tfm
+2020/08/30 | 32460 | fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ly1.tfm
+2020/08/30 | 324293 | fonts/merriweather/type1/Merriwthr-Italic.pfb
+2020/08/30 | 3240 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ot1.tfm
+2020/08/30 | 32393 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2020/08/30 | 32351 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2020/08/30 | 3232 | fonts/merriweather/enc/merriwthr_owzwzj.enc
+2020/08/30 | 322056 | systems/texlive/tlnet/archive/biblatex-apa.doc.r56208.tar.xz
+2020/08/30 | 3200336 | systems/win32/miktex/tm/packages/animate.tar.lzma
+2020/08/30 | 3147 | fonts/merriweather/enc/merriwthr_urus45.enc
+2020/08/30 | 3145696 | systems/texlive/tlnet/archive/animate.doc.r56207.tar.xz
+2020/08/30 | 3145482 | macros/latex/contrib/texnegar/texnegar-doc.pdf
+2020/08/30 | 3138 | fonts/merriweather/enc/merriwthr_lkhefy.enc
+2020/08/30 | 3136 | fonts/merriweather/enc/merriwthr_abao47.enc
+2020/08/30 | 3133 | fonts/merriweather/enc/merriwthr_stxeas.enc
+2020/08/30 | 3127 | fonts/merriweather/enc/merriwthr_okb76x.enc
+2020/08/30 | 3126 | fonts/merriweather/enc/merriwthr_27vehb.enc
+2020/08/30 | 3125 | fonts/merriweather/enc/merriwthr_4ylisx.enc
+2020/08/30 | 31253 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2020/08/30 | 3124 | fonts/merriweather/enc/merriwthr_mb4bqm.enc
+2020/08/30 | 3122 | fonts/merriweather/enc/merriwthr_lm56sz.enc
+2020/08/30 | 31223 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2020/08/30 | 31208 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2020/08/30 | 312066 | systems/win32/miktex/tm/packages/hopatch.tar.lzma
+2020/08/30 | 3117 | fonts/merriweather/enc/merriwthr_5lck5z.enc
+2020/08/30 | 3116 | fonts/merriweather/enc/merriwthr_7jdyhk.enc
+2020/08/30 | 3114 | macros/latex/contrib/texnegar/xepersian-XB.tex
+2020/08/30 | 3113 | fonts/merriweather/enc/merriwthr_2r7lb2.enc
+2020/08/30 | 3112 | fonts/merriweather/enc/merriwthr_h7gtfv.enc
+2020/08/30 | 3111 | fonts/merriweather/enc/merriwthr_hz3jhh.enc
+2020/08/30 | 310935 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2020/08/30 | 3103 | fonts/merriweather/enc/merriwthr_gdbfjs.enc
+2020/08/30 | 3102 | fonts/merriweather/enc/merriwthr_cc6s4l.enc
+2020/08/30 | 3096 | fonts/merriweather/enc/merriwthr_mx2b4h.enc
+2020/08/30 | 3092 | fonts/merriweather/enc/merriwthr_s56ilq.enc
+2020/08/30 | 30910 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2020/08/30 | 30891 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2020/08/30 | 3085 | fonts/merriweather/enc/merriwthr_6qeh6o.enc
+2020/08/30 | 3081 | fonts/merriweather/enc/merriwthr_wppmfi.enc
+2020/08/30 | 3075 | fonts/merriweather/enc/merriwthr_k4bbiq.enc
+2020/08/30 | 3071 | fonts/merriweather/enc/merriwthr_o43b2q.enc
+2020/08/30 | 306332 | graphics/mcf2graph/mcf_example.pdf
+2020/08/30 | 3055 | fonts/merriweather/enc/merriwthr_u2frii.enc
+2020/08/30 | 3052 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ot1.tfm
+2020/08/30 | 3051 | fonts/merriweather/enc/merriwthr_mr3nck.enc
+2020/08/30 | 305084 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2020/08/30 | 3048 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ot1.tfm
+2020/08/30 | 3044 | fonts/merriweather/enc/merriwthr_mgprdv.enc
+2020/08/30 | 3044 | fonts/merriweather/enc/merriwthr_ags7qn.enc
+2020/08/30 | 3040 | fonts/merriweather/enc/merriwthr_ynquvw.enc
+2020/08/30 | 3040 | fonts/merriweather/enc/merriwthr_posqbl.enc
+2020/08/30 | 3034 | fonts/merriweather/enc/merriwthr_gldhmf.enc
+2020/08/30 | 3032 | macros/latex/contrib/caption/README
+2020/08/30 | 3030 | fonts/merriweather/enc/merriwthr_e2idhw.enc
+2020/08/30 | 30292 | systems/texlive/tlnet/archive/animate.source.r56207.tar.xz
+2020/08/30 | 3022408 | systems/win32/miktex/tm/packages/mlacls.tar.lzma
+2020/08/30 | 3003 | fonts/merriweather/enc/merriwthr_hwcxwn.enc
+2020/08/30 | 2999 | fonts/merriweather/enc/merriwthr_gmchnq.enc
+2020/08/30 | 299981 | fonts/merriweather/type1/Merriwthr-LightItalic.pfb
+2020/08/30 | 2981 | fonts/merriweather/enc/merriwthr_wlsyn3.enc
+2020/08/30 | 2979 | fonts/merriweather/enc/merriwthr_nszfm3.enc
+2020/08/30 | 2970 | fonts/merriweather/enc/merriwthr_ttjzpe.enc
+2020/08/30 | 2968 | fonts/merriweather/enc/merriwthr_jjwbah.enc
+2020/08/30 | 29638 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2020/08/30 | 2960 | fonts/merriweather/enc/merriwthr_7npxgm.enc
+2020/08/30 | 2959 | fonts/merriweather/enc/merriwthr_cy3ufi.enc
+2020/08/30 | 2958 | fonts/merriweather/enc/merriwthr_c4h6ot.enc
+2020/08/30 | 29399 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2020/08/30 | 29367 | macros/latex/contrib/caption/ltcaption.dtx
+2020/08/30 | 2929 | fonts/merriweather/enc/merriwthr_adz5lu.enc
+2020/08/30 | 2927 | fonts/merriweather/enc/merriwthr_w4rwtq.enc
+2020/08/30 | 2918 | fonts/merriweather/enc/merriwthr_qndjqi.enc
+2020/08/30 | 29058 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2020/08/30 | 29028 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2020/08/30 | 29004 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-t1.tfm
+2020/08/30 | 28608 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-t1.tfm
+2020/08/30 | 28605 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2020/08/30 | 2845 | macros/latex/contrib/caption/caption.ins
+2020/08/30 | 2844 | fonts/merriweather/enc/merriwthr_5xld5w.enc
+2020/08/30 | 28364655 | systems/win32/miktex/tm/packages/biber-darwin-x86_64.tar.lzma
+2020/08/30 | 2830 | fonts/merriweather/README
+2020/08/30 | 281780 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2020/08/30 | 28024 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-t1.tfm
+2020/08/30 | 279882 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2020/08/30 | 27952 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-t1.tfm
+2020/08/30 | 27948 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-t1.tfm
+2020/08/30 | 27803 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2020/08/30 | 276579 | systems/win32/miktex/tm/packages/biber-doc.tar.lzma
+2020/08/30 | 27648 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-t1.tfm
+2020/08/30 | 273699 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2020/08/30 | 273549 | systems/win32/miktex/tm/packages/decision-table.tar.lzma
+2020/08/30 | 27088 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-t1.tfm
+2020/08/30 | 27068 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-t1.tfm
+2020/08/30 | 27068 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-t1.tfm
+2020/08/30 | 27009 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2020/08/30 | 27004 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-t1.tfm
+2020/08/30 | 26998 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2020/08/30 | 269484 | fonts/merriweather/opentype/Merriweather-Bold.otf
+2020/08/30 | 269406 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2020/08/30 | 26853 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2020/08/30 | 26796 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-t1.tfm
+2020/08/30 | 26613 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2020/08/30 | 26608 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-t1.tfm
+2020/08/30 | 2657477 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2020/08/30 | 265232 | fonts/merriweather/opentype/Merriweather-Regular.otf
+2020/08/30 | 264773 | macros/latex/contrib/caption/caption-rus.tex
+2020/08/30 | 26196 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-t1.tfm
+2020/08/30 | 26192 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-t1.tfm
+2020/08/30 | 2618 | macros/latex/contrib/texnegar/texnegar.ins
+2020/08/30 | 26137 | macros/latex/contrib/texnegar/texnegar-doc.ltx
+2020/08/30 | 260708 | fonts/merriweather/opentype/Merriweather-Black.otf
+2020/08/30 | 26024 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-t1.tfm
+2020/08/30 | 26024 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-t1.tfm
+2020/08/30 | 259421 | macros/latex/contrib/fduthesis/fduthesis-logo.dtx
+2020/08/30 | 25504 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2020/08/30 | 2534480 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2020/08/30 | 2518359 | systems/win32/miktex/tm/packages/xcharter.tar.lzma
+2020/08/30 | 251464 | fonts/merriweather/opentype/Merriweather-Light.otf
+2020/08/30 | 250291 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2020/08/30 | 250077 | systems/win32/miktex/tm/packages/ltximg.tar.lzma
+2020/08/30 | 249400 | fonts/merriweather/opentype/Merriweather-BoldItalic.otf
+2020/08/30 | 24868 | systems/texlive/tlnet/archive/biblatex-apa.r56208.tar.xz
+2020/08/30 | 248153 | systems/win32/miktex/tm/packages/biblatex-apa6.tar.lzma
+2020/08/30 | 247644 | fonts/merriweather/opentype/Merriweather-Italic.otf
+2020/08/30 | 246826 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2020/08/30 | 246418 | systems/win32/miktex/tm/packages/etoolbox.tar.lzma
+2020/08/30 | 2463 | macros/latex/contrib/fduthesis/README.md
+2020/08/30 | 243053 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2020/08/30 | 24269318 | systems/texlive/tlnet/install-tl.zip
+2020/08/30 | 23600 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2020/08/30 | 235128 | fonts/merriweather/opentype/Merriweather-LightItalic.otf
+2020/08/30 | 233764 | fonts/merriweather/opentype/Merriweather-BlackItalic.otf
+2020/08/30 | 23368 | systems/texlive/tlnet/archive/animate.r56207.tar.xz
+2020/08/30 | 23148 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ly1.tfm
+2020/08/30 | 22982 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2020/08/30 | 22756 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ly1.tfm
+2020/08/30 | 226684 | systems/texlive/tlnet/archive/biblatex-apa6.doc.r56209.tar.xz
+2020/08/30 | 22657 | systems/win32/miktex/tm/packages/miktex-misc.tar.lzma
+2020/08/30 | 22485857 | systems/win32/miktex/tm/packages/biber-windows-x86.tar.lzma
+2020/08/30 | 22448144 | systems/win32/miktex/tm/packages/biber-windows-x64.tar.lzma
+2020/08/30 | 2241882 | systems/win32/miktex/tm/packages/beamerthemenord.tar.lzma
+2020/08/30 | 224087 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2020/08/30 | 22284 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ly1.tfm
+2020/08/30 | 2223840 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2020/08/30 | 22184 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ly1.tfm
+2020/08/30 | 22180 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ly1.tfm
+2020/08/30 | 219590 | macros/latex/contrib/fduthesis/fduthesis.dtx
+2020/08/30 | 21912 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ly1.tfm
+2020/08/30 | 218656 | systems/texlive/tlnet/archive/texlive-scripts.doc.r56204.tar.xz
+2020/08/30 | 21864 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-t1.tfm
+2020/08/30 | 21840 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-t1.tfm
+2020/08/30 | 21572 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ly1.tfm
+2020/08/30 | 21552 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-ly1.tfm
+2020/08/30 | 21408 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ly1.tfm
+2020/08/30 | 21408 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ly1.tfm
+2020/08/30 | 2138493 | systems/win32/miktex/tm/packages/libertinus-fonts.tar.lzma
+2020/08/30 | 21380 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-t1.tfm
+2020/08/30 | 212554 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-glyph.pdf
+2020/08/30 | 21252 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ly1.tfm
+2020/08/30 | 21248 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-t1.tfm
+2020/08/30 | 2119877 | systems/win32/miktex/tm/packages/texnegar.tar.lzma
+2020/08/30 | 21191 | macros/latex/contrib/caption/elephant.eps
+2020/08/30 | 21184 | systems/texlive/tlnet/archive/biblatex-apa6.r56209.tar.xz
+2020/08/30 | 211539 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2020/08/30 | 21148 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-ly1.tfm
+2020/08/30 | 210277 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2020/08/30 | 20996 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-t1.tfm
+2020/08/30 | 20992 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-t1.tfm
+2020/08/30 | 20928 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-t1.tfm
+2020/08/30 | 20864 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-t1.tfm
+2020/08/30 | 20843 | graphics/mcf2graph/mcf_exa_soc.mf
+2020/08/30 | 20817 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2020/08/30 | 207673 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2020/08/30 | 2075614 | install/macros/latex/contrib/caption.tds.zip
+2020/08/30 | 2072 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ly1--base.tfm
+2020/08/30 | 20712 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ly1.tfm
+2020/08/30 | 20708 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ly1.tfm
+2020/08/30 | 2068 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ly1--base.tfm
+2020/08/30 | 2064 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ly1--base.tfm
+2020/08/30 | 2064 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ly1--base.tfm
+2020/08/30 | 20628 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ly1.tfm
+2020/08/30 | 20628 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ly1.tfm
+2020/08/30 | 20572 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-t1.tfm
+2020/08/30 | 20548 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-t1.tfm
+2020/08/30 | 20548 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-t1.tfm
+2020/08/30 | 20532 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-t1.tfm
+2020/08/30 | 2048 | fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-ly1.tfm
+2020/08/30 | 2048 | fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-ly1.tfm
+2020/08/30 | 2040 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ly1--base.tfm
+2020/08/30 | 2040 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ly1--base.tfm
+2020/08/30 | 203963 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2020/08/30 | 2036 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ly1--base.tfm
+2020/08/30 | 2036 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ly1--base.tfm
+2020/08/30 | 2032 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ly1--base.tfm
+2020/08/30 | 2031794 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2020/08/30 | 202901 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2020/08/30 | 2028 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ly1--base.tfm
+2020/08/30 | 2028 | fonts/merriweather/tfm/Merriwthr-Italic-sup-ly1.tfm
+2020/08/30 | 2028 | fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ly1--base.tfm
+2020/08/30 | 2028 | fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ly1--base.tfm
+2020/08/30 | 202882 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2020/08/30 | 2027635 | macros/latex/contrib/caption.zip
+2020/08/30 | 2024 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-t1--base.tfm
+2020/08/30 | 2024 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ly1--base.tfm
+2020/08/30 | 2020 | fonts/merriweather/tfm/Merriwthr-LightItalic-sup-ly1.tfm
+2020/08/30 | 201949 | graphics/mcf2graph/mcf_mplib_exa.pdf
+2020/08/30 | 2016 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ly1--base.tfm
+2020/08/30 | 2012 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ly1--base.tfm
+2020/08/30 | 20112 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-t1.tfm
+2020/08/30 | 20108 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-t1.tfm
+2020/08/30 | 2008 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-ly1.tfm
+2020/08/30 | 2008 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-t1--base.tfm
+2020/08/30 | 2000 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ly1--base.tfm
+2020/08/30 | 2000 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ly1--base.tfm
+2020/08/30 | 2000 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ly1--base.tfm
+2020/08/30 | 2000 | fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-t1.tfm
+2020/08/30 | 20006 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2020/08/30 | 1996 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-t1.tfm
+2020/08/30 | 1996 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ly1--base.tfm
+2020/08/30 | 1996 | fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-t1--base.tfm
+2020/08/30 | 1992 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-t1--base.tfm
+2020/08/30 | 1992 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ly1--base.tfm
+2020/08/30 | 1988 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-t1--base.tfm
+2020/08/30 | 1988 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ly1--base.tfm
+2020/08/30 | 1988 | fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-t1.tfm
+2020/08/30 | 1984 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-t1--base.tfm
+2020/08/30 | 1984 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ly1--base.tfm
+2020/08/30 | 1984 | fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-t1--base.tfm
+2020/08/30 | 1980 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ly1--base.tfm
+2020/08/30 | 1980 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-t1--base.tfm
+2020/08/30 | 1976 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ly1--base.tfm
+2020/08/30 | 1976 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-t1--base.tfm
+2020/08/30 | 1976 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-t1--base.tfm
+2020/08/30 | 1976 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-t1--base.tfm
+2020/08/30 | 1972 | fonts/merriweather/tfm/MerriwthrSans-Italic-sup-ly1.tfm
+2020/08/30 | 1972 | fonts/merriweather/tfm/Merriwthr-LightItalic-sup-t1.tfm
+2020/08/30 | 19704 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-t1.tfm
+2020/08/30 | 19704 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-t1.tfm
+2020/08/30 | 1968 | fonts/merriweather/tfm/Merriwthr-LightItalic-sup-t1--base.tfm
+2020/08/30 | 1968 | fonts/merriweather/tfm/Merriwthr-Italic-sup-t1.tfm
+2020/08/30 | 1964 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ly1--base.tfm
+2020/08/30 | 1964 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ly1--base.tfm
+2020/08/30 | 1964 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ly1--base.tfm
+2020/08/30 | 1964 | fonts/merriweather/tfm/Merriwthr-Italic-sup-t1--base.tfm
+2020/08/30 | 196319 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2020/08/30 | 1960 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-t1--base.tfm
+2020/08/30 | 1956 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-t1--base.tfm
+2020/08/30 | 1956 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ly1--base.tfm
+2020/08/30 | 1956 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-t1--base.tfm
+2020/08/30 | 1956 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-t1--base.tfm
+2020/08/30 | 1952 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-t1--base.tfm
+2020/08/30 | 1952 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-t1--base.tfm
+2020/08/30 | 1952 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-t1--base.tfm
+2020/08/30 | 1952 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-t1--base.tfm
+2020/08/30 | 1952 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-t1--base.tfm
+2020/08/30 | 1952 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-t1--base.tfm
+2020/08/30 | 1948 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-t1--base.tfm
+2020/08/30 | 1948 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-t1--base.tfm
+2020/08/30 | 194659 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-glyph.pdf
+2020/08/30 | 1944 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ly1--base.tfm
+2020/08/30 | 1944 | fonts/merriweather/tfm/MerriwthrSans-Italic-sup-t1.tfm
+2020/08/30 | 1944 | fonts/merriweather/tfm/Merriwthr-Italic-lf-t1--base.tfm
+2020/08/30 | 1944 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-t1--base.tfm
+2020/08/30 | 1944 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-t1--base.tfm
+2020/08/30 | 1940 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ly1--base.tfm
+2020/08/30 | 1940 | fonts/merriweather/tfm/MerriwthrSans-Italic-sup-t1--base.tfm
+2020/08/30 | 1940 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-t1.tfm
+2020/08/30 | 1940 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-ly1.tfm
+2020/08/30 | 1940 | fonts/merriweather/tfm/Merriwthr-Italic-osf-t1--base.tfm
+2020/08/30 | 1940 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-t1--base.tfm
+2020/08/30 | 1940 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-t1--base.tfm
+2020/08/30 | 19389 | macros/latex/contrib/caption/caption-koma.dtx
+2020/08/30 | 193833 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2020/08/30 | 19379923 | systems/texlive/tlnet/install-tl-windows.exe
+2020/08/30 | 1936 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-t1--base.tfm
+2020/08/30 | 1932 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1--base.tfm
+2020/08/30 | 1932 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1--base.tfm
+2020/08/30 | 192836 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2020/08/30 | 192589 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2020/08/30 | 1924 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-t1--base.tfm
+2020/08/30 | 1924 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-t1--base.tfm
+2020/08/30 | 1924 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-t1--base.tfm
+2020/08/30 | 1924 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-t1--base.tfm
+2020/08/30 | 1920 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-t1--base.tfm
+2020/08/30 | 1920 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-t1--base.tfm
+2020/08/30 | 1920 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-t1--base.tfm
+2020/08/30 | 1920 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-t1--base.tfm
+2020/08/30 | 1920 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-t1--base.tfm
+2020/08/30 | 1920 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-t1--base.tfm
+2020/08/30 | 1920 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-t1--base.tfm
+2020/08/30 | 1916 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-t1--base.tfm
+2020/08/30 | 1916 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-t1--base.tfm
+2020/08/30 | 1916 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-t1--base.tfm
+2020/08/30 | 1912 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-ly1.tfm
+2020/08/30 | 1908 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ly1--base.tfm
+2020/08/30 | 1908 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ly1--base.tfm
+2020/08/30 | 1904 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-t1--base.tfm
+2020/08/30 | 1904 | fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-t1--base.tfm
+2020/08/30 | 1900 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-t1--base.tfm
+2020/08/30 | 1900 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-t1--base.tfm
+2020/08/30 | 1900 | fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-t1--base.tfm
+2020/08/30 | 1896 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-t1--base.tfm
+2020/08/30 | 1896 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-t1--base.tfm
+2020/08/30 | 1896 | fonts/merriweather/tfm/Merriwthr-Bold-sup-ly1.tfm
+2020/08/30 | 1896 | fonts/merriweather/tfm/Merriwthr-Black-sup-ly1.tfm
+2020/08/30 | 189322 | systems/win32/miktex/tm/packages/beamer-rl.tar.lzma
+2020/08/30 | 1892 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-t1--base.tfm
+2020/08/30 | 1892 | fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ly1--base.tfm
+2020/08/30 | 189153 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2020/08/30 | 1888 | fonts/merriweather/tfm/MerriwthrSans-Bold-sup-ly1.tfm
+2020/08/30 | 1888 | fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ly1--base.tfm
+2020/08/30 | 1884 | systems/texlive/tlnet/archive/stricttex.r56210.tar.xz
+2020/08/30 | 1884 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-t1--base.tfm
+2020/08/30 | 1884 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-t1--base.tfm
+2020/08/30 | 1884 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-t1--base.tfm
+2020/08/30 | 1884 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-t1--base.tfm
+2020/08/30 | 1884 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-t1--base.tfm
+2020/08/30 | 1884 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ly1--base.tfm
+2020/08/30 | 1880 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ly1--base.tfm
+2020/08/30 | 1880 | fonts/merriweather/tfm/Merriwthr-Regular-sup-ly1.tfm
+2020/08/30 | 1880 | fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ly1--base.tfm
+2020/08/30 | 1880 | fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ly1--base.tfm
+2020/08/30 | 187720 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2020/08/30 | 1876 | fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ly1--base.tfm
+2020/08/30 | 1872 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-t1.tfm
+2020/08/30 | 1872 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-t1--base.tfm
+2020/08/30 | 1872 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-t1--base.tfm
+2020/08/30 | 1872 | fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ly1--base.tfm
+2020/08/30 | 1872 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-t1--base.tfm
+2020/08/30 | 1868 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ly1--base.tfm
+2020/08/30 | 1868 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ly1--base.tfm
+2020/08/30 | 1868 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-t1--base.tfm
+2020/08/30 | 1868 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-t1--base.tfm
+2020/08/30 | 1868 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ly1--base.tfm
+2020/08/30 | 1864 | fonts/merriweather/tfm/MerriwthrSans-Regular-sup-ly1.tfm
+2020/08/30 | 1864 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-t1--base.tfm
+2020/08/30 | 1864 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-t1--base.tfm
+2020/08/30 | 1864 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-ly1.tfm
+2020/08/30 | 1864 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ly1--base.tfm
+2020/08/30 | 1864 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-t1--base.tfm
+2020/08/30 | 1864 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ly1--base.tfm
+2020/08/30 | 1860 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-t1--base.tfm
+2020/08/30 | 1860 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-t1--base.tfm
+2020/08/30 | 1860 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ly1--base.tfm
+2020/08/30 | 1858185 | systems/win32/miktex/tm/packages/xecjk.tar.lzma
+2020/08/30 | 1856 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-t1--base.tfm
+2020/08/30 | 1856 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-t1--base.tfm
+2020/08/30 | 1856 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-t1--base.tfm
+2020/08/30 | 1856 | fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ly1--base.tfm
+2020/08/30 | 1852 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ly1--base.tfm
+2020/08/30 | 1852 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-t1--base.tfm
+2020/08/30 | 1852 | fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ly1--base.tfm
+2020/08/30 | 1848 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ly1--base.tfm
+2020/08/30 | 1848 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ly1--base.tfm
+2020/08/30 | 1848 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ly1--base.tfm
+2020/08/30 | 18472 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ly1.tfm
+2020/08/30 | 18464 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ly1.tfm
+2020/08/30 | 1844 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ly1--base.tfm
+2020/08/30 | 1844 | fonts/merriweather/tfm/MerriwthrSans-Bold-sup-t1.tfm
+2020/08/30 | 1844 | fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ly1--base.tfm
+2020/08/30 | 184490 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2020/08/30 | 1840 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ly1--base.tfm
+2020/08/30 | 1840 | fonts/merriweather/tfm/MerriwthrSans-Bold-sup-t1--base.tfm
+2020/08/30 | 1840 | fonts/merriweather/tfm/Merriwthr-Light-sup-ly1.tfm
+2020/08/30 | 1840 | fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ly1--base.tfm
+2020/08/30 | 1836 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ly1--base.tfm
+2020/08/30 | 1836 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ly1--base.tfm
+2020/08/30 | 1832 | fonts/merriweather/tfm/MerriwthrSans-Light-sup-ly1.tfm
+2020/08/30 | 1828 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-t1--base.tfm
+2020/08/30 | 1828 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-t1--base.tfm
+2020/08/30 | 1828 | fonts/merriweather/tfm/Merriwthr-Black-lf-t1--base.tfm
+2020/08/30 | 18262596 | systems/win32/miktex/tm/packages/biber-linux-x86_64.tar.lzma
+2020/08/30 | 1824 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-t1--base.tfm
+2020/08/30 | 1824 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-t1--base.tfm
+2020/08/30 | 1824 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-t1--base.tfm
+2020/08/30 | 1824 | fonts/merriweather/tfm/Merriwthr-Black-sup-t1.tfm
+2020/08/30 | 1820 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ly1--base.tfm
+2020/08/30 | 1820 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ly1--base.tfm
+2020/08/30 | 1820 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-t1.tfm
+2020/08/30 | 1820 | fonts/merriweather/tfm/Merriwthr-Bold-sup-t1.tfm
+2020/08/30 | 1820 | fonts/merriweather/tfm/Merriwthr-Black-sup-t1--base.tfm
+2020/08/30 | 1820 | fonts/merriweather/tfm/Merriwthr-Black-osf-t1--base.tfm
+2020/08/30 | 1816 | fonts/merriweather/tfm/MerriwthrSans-Regular-sup-t1.tfm
+2020/08/30 | 1816 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-t1--base.tfm
+2020/08/30 | 1816 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-t1--base.tfm
+2020/08/30 | 1816 | fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ly1--base.tfm
+2020/08/30 | 1816 | fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ly1--base.tfm
+2020/08/30 | 1816 | fonts/merriweather/tfm/Merriwthr-Bold-sup-t1--base.tfm
+2020/08/30 | 1816 | fonts/merriweather/tfm/Merriwthr-Bold-lf-t1--base.tfm
+2020/08/30 | 1812 | fonts/merriweather/tfm/MerriwthrSans-Regular-sup-t1--base.tfm
+2020/08/30 | 1812 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-t1--base.tfm
+2020/08/30 | 1812 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-t1--base.tfm
+2020/08/30 | 1812 | fonts/merriweather/tfm/Merriwthr-Bold-osf-t1--base.tfm
+2020/08/30 | 180902 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2020/08/30 | 1808 | fonts/merriweather/tfm/Merriwthr-Regular-sup-t1.tfm
+2020/08/30 | 1808 | fonts/merriweather/tfm/Merriwthr-Regular-osf-t1--base.tfm
+2020/08/30 | 1804 | fonts/merriweather/tfm/Merriwthr-Regular-sup-t1--base.tfm
+2020/08/30 | 18024 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ly1.tfm
+2020/08/30 | 1800 | fonts/merriweather/tfm/Merriwthr-Regular-lf-t1--base.tfm
+2020/08/30 | 1800 | fonts/merriweather/tfm/Merriwthr-Black-tlf-t1--base.tfm
+2020/08/30 | 1796 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-t1--base.tfm
+2020/08/30 | 1796 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-t1--base.tfm
+2020/08/30 | 1796 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-t1--base.tfm
+2020/08/30 | 1796 | fonts/merriweather/tfm/Merriwthr-Black-tosf-t1--base.tfm
+2020/08/30 | 1792 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-t1--base.tfm
+2020/08/30 | 1792 | fonts/merriweather/tfm/MerriwthrSans-Light-sup-t1.tfm
+2020/08/30 | 1792 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-t1--base.tfm
+2020/08/30 | 17912 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ly1.tfm
+2020/08/30 | 1788 | fonts/merriweather/tfm/MerriwthrSans-Light-sup-t1--base.tfm
+2020/08/30 | 1788 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-t1--base.tfm
+2020/08/30 | 1788 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-t1--base.tfm
+2020/08/30 | 1788 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-t1--base.tfm
+2020/08/30 | 1788 | fonts/merriweather/tfm/Merriwthr-Light-osf-t1--base.tfm
+2020/08/30 | 1788 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-t1--base.tfm
+2020/08/30 | 1784 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-t1--base.tfm
+2020/08/30 | 1784 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-t1--base.tfm
+2020/08/30 | 1784 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-t1--base.tfm
+2020/08/30 | 1780 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-t1--base.tfm
+2020/08/30 | 1780 | fonts/merriweather/tfm/Merriwthr-Light-sup-t1.tfm
+2020/08/30 | 1780 | fonts/merriweather/tfm/Merriwthr-Black-lf-sc-t1--base.tfm
+2020/08/30 | 1776 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-t1--base.tfm
+2020/08/30 | 1776 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-t1--base.tfm
+2020/08/30 | 1776 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-t1--base.tfm
+2020/08/30 | 1776 | fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-t1--base.tfm
+2020/08/30 | 1776 | fonts/merriweather/tfm/Merriwthr-Light-sup-t1--base.tfm
+2020/08/30 | 1776 | fonts/merriweather/tfm/Merriwthr-Light-lf-t1--base.tfm
+2020/08/30 | 1776 | fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-t1--base.tfm
+2020/08/30 | 1776 | fonts/merriweather/tfm/Merriwthr-Black-osf-sc-t1--base.tfm
+2020/08/30 | 177375 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2020/08/30 | 17732 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ly1.tfm
+2020/08/30 | 1772 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-t1--base.tfm
+2020/08/30 | 1772 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-t1--base.tfm
+2020/08/30 | 1772 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-t1--base.tfm
+2020/08/30 | 1772 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-t1--base.tfm
+2020/08/30 | 1772 | fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-t1--base.tfm
+2020/08/30 | 1772 | fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-t1--base.tfm
+2020/08/30 | 17728 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2020/08/30 | 17728 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ly1.tfm
+2020/08/30 | 1769613 | install/macros/latex/contrib/fduthesis.tds.zip
+2020/08/30 | 17626 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2020/08/30 | 17624 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-t1.tfm
+2020/08/30 | 1760 | fonts/merriweather/tfm/Merriwthr-Light-tosf-t1--base.tfm
+2020/08/30 | 1760 | fonts/merriweather/tfm/Merriwthr-Light-tlf-t1--base.tfm
+2020/08/30 | 17592 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ly1.tfm
+2020/08/30 | 17580 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ly1.tfm
+2020/08/30 | 17572 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-t1.tfm
+2020/08/30 | 1756 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-t1--base.tfm
+2020/08/30 | 1756 | fonts/merriweather/tfm/Merriwthr-Light-osf-sc-t1--base.tfm
+2020/08/30 | 1756 | fonts/merriweather/tfm/Merriwthr-Light-lf-sc-t1--base.tfm
+2020/08/30 | 1756 | fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-t1--base.tfm
+2020/08/30 | 17532 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-t1.tfm
+2020/08/30 | 1752 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-t1--base.tfm
+2020/08/30 | 1752 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-t1--base.tfm
+2020/08/30 | 1752 | fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-t1--base.tfm
+2020/08/30 | 1748 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-t1--base.tfm
+2020/08/30 | 1748 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-t1--base.tfm
+2020/08/30 | 1748 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-t1--base.tfm
+2020/08/30 | 174805 | macros/latex/contrib/texnegar/texnegar-luatex-leaders-hrule.pdf
+2020/08/30 | 17476 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-t1.tfm
+2020/08/30 | 1746185 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2020/08/30 | 1744 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-t1--base.tfm
+2020/08/30 | 1744 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-t1--base.tfm
+2020/08/30 | 1744 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-t1--base.tfm
+2020/08/30 | 1744 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-t1--base.tfm
+2020/08/30 | 174386 | macros/latex/contrib/caption/caption3.dtx
+2020/08/30 | 17396 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ly1.tfm
+2020/08/30 | 17368 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ly1.tfm
+2020/08/30 | 1732 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-t1.vf
+2020/08/30 | 17320 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ly1.tfm
+2020/08/30 | 17320 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ly1.tfm
+2020/08/30 | 1728 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-t1.vf
+2020/08/30 | 1728 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-t1.vf
+2020/08/30 | 1728 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-t1.vf
+2020/08/30 | 1728 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-t1.vf
+2020/08/30 | 1728 | fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-t1--base.tfm
+2020/08/30 | 1728 | fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-t1--base.tfm
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-Regular-tosf-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-t1.vf
+2020/08/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Regular-tlf-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Regular-osf-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Regular-lf-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Light-tosf-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Light-tlf-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Light-osf-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Light-lf-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Italic-tosf-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Italic-tlf-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Italic-osf-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Italic-lf-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Bold-tosf-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Bold-tlf-t1.vf
+2020/08/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Bold-osf-t1.vf
+2020/08/30 | 1716 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-sc-t1.vf
+2020/08/30 | 1716 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-sc-t1.vf
+2020/08/30 | 1716 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-sc-t1.vf
+2020/08/30 | 1716 | fonts/merriweather/vf/MerriwthrSans-Bold-lf-t1.vf
+2020/08/30 | 1712 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-sc-t1.vf
+2020/08/30 | 1712 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-sc-t1.vf
+2020/08/30 | 1712 | fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-sc-t1.vf
+2020/08/30 | 1712 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-sc-t1.vf
+2020/08/30 | 1712 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-sc-t1.vf
+2020/08/30 | 17096 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-t1.tfm
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-Regular-tosf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-Regular-tlf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-Regular-osf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-Italic-tosf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-Regular-tosf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-Regular-tlf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-Regular-osf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-Regular-lf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-Light-tosf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-Light-tlf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-Light-osf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-LightItalic-tosf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-LightItalic-tlf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-LightItalic-osf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-Bold-tosf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-sc-t1.vf
+2020/08/30 | 1708 | fonts/merriweather/vf/Merriwthr-BlackItalic-osf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Regular-lf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Light-tosf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Light-tlf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Light-osf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Light-lf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Italic-tlf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Italic-osf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Italic-lf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Bold-tosf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Bold-tlf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Bold-osf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/MerriwthrSans-Bold-lf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-Regular-tosf-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-Regular-tlf-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-Regular-osf-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-Light-lf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-LightItalic-tosf-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-LightItalic-tlf-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-LightItalic-osf-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-LightItalic-lf-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-LightItalic-lf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-Italic-tosf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-Bold-tlf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-Bold-osf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-Bold-lf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BoldItalic-osf-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BoldItalic-osf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BoldItalic-lf-sc-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BlackItalic-osf-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BlackItalic-lf-t1.vf
+2020/08/30 | 1704 | fonts/merriweather/vf/Merriwthr-BlackItalic-lf-sc-t1.vf
+2020/08/30 | 170421 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2020/08/30 | 1700 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-sup-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Regular-lf-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Light-tosf-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Light-tlf-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Light-osf-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Light-lf-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Italic-tosf-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Italic-tlf-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Italic-tlf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Italic-osf-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Italic-osf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Italic-lf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Bold-tosf-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Bold-tlf-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Bold-osf-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Bold-lf-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-BoldItalic-lf-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Black-tosf-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Black-tosf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Black-tlf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Black-osf-sc-t1.vf
+2020/08/30 | 1700 | fonts/merriweather/vf/Merriwthr-Black-lf-sc-t1.vf
+2020/08/30 | 16996 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-t1.tfm
+2020/08/30 | 1696 | fonts/merriweather/vf/MerriwthrSans-LightItalic-sup-t1.vf
+2020/08/30 | 1696 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-sup-t1.vf
+2020/08/30 | 1696 | fonts/merriweather/vf/Merriwthr-Italic-lf-t1.vf
+2020/08/30 | 1696 | fonts/merriweather/vf/Merriwthr-Black-tlf-t1.vf
+2020/08/30 | 1696 | fonts/merriweather/vf/Merriwthr-Black-osf-t1.vf
+2020/08/30 | 1696 | fonts/merriweather/vf/Merriwthr-Black-lf-t1.vf
+2020/08/30 | 169656 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2020/08/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-Regular-sup-t1.vf
+2020/08/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-Italic-sup-t1.vf
+2020/08/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-sup-t1.vf
+2020/08/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1.vf
+2020/08/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1.vf
+2020/08/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-sc-ly1.vf
+2020/08/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-sc-ly1.vf
+2020/08/30 | 1692 | fonts/merriweather/vf/Merriwthr-LightItalic-sup-t1.vf
+2020/08/30 | 1692 | fonts/merriweather/vf/Merriwthr-BoldItalic-sup-t1.vf
+2020/08/30 | 1692 | fonts/merriweather/vf/Merriwthr-BlackItalic-sup-t1.vf
+2020/08/30 | 16912 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ly1.tfm
+2020/08/30 | 16908 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ly1.tfm
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-Light-sup-t1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-sc-ly1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-sc-ly1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-sc-ly1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-sc-ly1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-sc-ly1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-sc-ly1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-sc-ly1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-Bold-sup-t1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-sc-ly1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-sc-ly1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-sc-ly1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-sc-ly1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/Merriwthr-Regular-tosf-sc-ly1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/Merriwthr-Regular-tlf-sc-ly1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/Merriwthr-Regular-sup-t1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/Merriwthr-Regular-osf-sc-ly1.vf
+2020/08/30 | 1688 | fonts/merriweather/vf/Merriwthr-Italic-sup-t1.vf
+2020/08/30 | 168795 | macros/latex/contrib/caption/caption-deu.tex
+2020/08/30 | 168540 | systems/texlive/tlnet/archive/texlive-docindex.doc.r56204.tar.xz
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Regular-tosf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Regular-tlf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Regular-osf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Regular-lf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Light-tosf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Light-tlf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Light-osf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Italic-tosf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Italic-tlf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Italic-osf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Italic-lf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/MerriwthrSans-Bold-tosf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Regular-lf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Light-tosf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Light-tlf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Light-sup-t1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Light-osf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Light-lf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-LightItalic-tosf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-LightItalic-tlf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-LightItalic-osf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-LightItalic-lf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Bold-tosf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Bold-tlf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Bold-sup-t1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Bold-osf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Bold-lf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-BoldItalic-osf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-BoldItalic-lf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-Black-sup-t1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-BlackItalic-osf-sc-ly1.vf
+2020/08/30 | 1684 | fonts/merriweather/vf/Merriwthr-BlackItalic-lf-sc-ly1.vf
+2020/08/30 | 16824 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-t1.tfm
+2020/08/30 | 16820 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-t1.tfm
+2020/08/30 | 1680 | fonts/merriweather/vf/MerriwthrSans-Light-lf-sc-ly1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/MerriwthrSans-Bold-tlf-sc-ly1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/MerriwthrSans-Bold-osf-sc-ly1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/MerriwthrSans-Bold-lf-sc-ly1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/Merriwthr-Italic-tosf-sc-ly1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/Merriwthr-Italic-tlf-sc-ly1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/Merriwthr-Italic-osf-sc-ly1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/Merriwthr-Italic-lf-sc-ly1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/Merriwthr-Black-tosf-sc-ly1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/Merriwthr-Black-tlf-sc-ly1.vf
+2020/08/30 | 1680 | fonts/merriweather/vf/Merriwthr-Black-osf-sc-ly1.vf
+2020/08/30 | 1676 | fonts/merriweather/vf/Merriwthr-Black-lf-sc-ly1.vf
+2020/08/30 | 167380 | systems/win32/miktex/tm/packages/changelog.tar.lzma
+2020/08/30 | 16704 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-t1.tfm
+2020/08/30 | 16700 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-t1.tfm
+2020/08/30 | 16692 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-t1.tfm
+2020/08/30 | 16636 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ly1.tfm
+2020/08/30 | 16636 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ly1.tfm
+2020/08/30 | 165592 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2020/08/30 | 16536 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-t1.tfm
+2020/08/30 | 16479508 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2020/08/30 | 1637554 | macros/latex/contrib/fduthesis.zip
+2020/08/30 | 16372 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ot1.tfm
+2020/08/30 | 16312 | fonts/merriweather/tfm/Merriwthr-Italic-lf-ot1.tfm
+2020/08/30 | 16236 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-t1.tfm
+2020/08/30 | 16232 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-t1.tfm
+2020/08/30 | 16144 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-t1.tfm
+2020/08/30 | 16124 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-t1.tfm
+2020/08/30 | 16024 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2020/08/30 | 160152 | macros/latex/contrib/caption/caption.dtx
+2020/08/30 | 16000 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ot1.tfm
+2020/08/30 | 159880 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2020/08/30 | 15957 | macros/latex/contrib/fduthesis/fudan-emblem.pdf
+2020/08/30 | 15956 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-t1.tfm
+2020/08/30 | 159556 | macros/latex/contrib/caption/caption-eng.tex
+2020/08/30 | 15952 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-t1.tfm
+2020/08/30 | 15952 | fonts/merriweather/tfm/Merriwthr-Italic-osf-ot1.tfm
+2020/08/30 | 15949 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2020/08/30 | 157987 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-glyph.pdf
+2020/08/30 | 15737 | macros/latex/contrib/caption/cat.eps
+2020/08/30 | 156633 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-glyph.pdf
+2020/08/30 | 156628 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-hrule.pdf
+2020/08/30 | 155933 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-hrule.pdf
+2020/08/30 | 155894 | macros/latex/contrib/fduthesis/fduthesis-en.pdf
+2020/08/30 | 1556 | macros/latex/contrib/texnegar/INSTALL.txt
+2020/08/30 | 154563 | macros/latex/contrib/caption/subcaption.pdf
+2020/08/30 | 154418 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2020/08/30 | 15440 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-t1.tfm
+2020/08/30 | 15440 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-t1.tfm
+2020/08/30 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2020/08/30 | 15396 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ot1.tfm
+2020/08/30 | 15396 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ot1.tfm
+2020/08/30 | 15352 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-ot1.tfm
+2020/08/30 | 15348 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-ot1.tfm
+2020/08/30 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2020/08/30 | 151865 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2020/08/30 | 151838 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2020/08/30 | 1517269 | systems/win32/miktex/tm/packages/nicematrix.tar.lzma
+2020/08/30 | 15112 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-t1.tfm
+2020/08/30 | 1504 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ts1.tfm
+2020/08/30 | 1504 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ts1.tfm
+2020/08/30 | 1504 | fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-ot1.tfm
+2020/08/30 | 1504 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ts1.tfm
+2020/08/30 | 1504 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ts1.tfm
+2020/08/30 | 1500 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ts1.tfm
+2020/08/30 | 1500 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ts1.tfm
+2020/08/30 | 1500 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ts1.tfm
+2020/08/30 | 1500 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ts1.tfm
+2020/08/30 | 1500 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ot1--base.tfm
+2020/08/30 | 1500 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ot1--base.tfm
+2020/08/30 | 14904 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-t1.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-ts1.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-ts1.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-Italic-osf-ts1.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-Italic-lf-ts1.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ts1--base.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ts1--base.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ts1--base.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ts1--base.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ot1--base.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ts1--base.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ts1--base.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ts1--base.tfm
+2020/08/30 | 1488 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ts1--base.tfm
+2020/08/30 | 1484 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ts1.tfm
+2020/08/30 | 1484 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ts1.tfm
+2020/08/30 | 1484 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ts1.tfm
+2020/08/30 | 1484 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ts1.tfm
+2020/08/30 | 1484 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-ts1--base.tfm
+2020/08/30 | 1484 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-ts1--base.tfm
+2020/08/30 | 1484 | fonts/merriweather/tfm/Merriwthr-Italic-osf-ts1--base.tfm
+2020/08/30 | 1484 | fonts/merriweather/tfm/Merriwthr-Italic-lf-ts1--base.tfm
+2020/08/30 | 1484 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ot1--base.tfm
+2020/08/30 | 1480 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ts1.tfm
+2020/08/30 | 1480 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ts1.tfm
+2020/08/30 | 1480 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ts1.tfm
+2020/08/30 | 1480 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ts1.tfm
+2020/08/30 | 1480 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ot1--base.tfm
+2020/08/30 | 1480 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ts1--base.tfm
+2020/08/30 | 1480 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ts1--base.tfm
+2020/08/30 | 1480 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ts1--base.tfm
+2020/08/30 | 1480 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ts1--base.tfm
+2020/08/30 | 1476 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ts1--base.tfm
+2020/08/30 | 1476 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ts1--base.tfm
+2020/08/30 | 1476 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ts1--base.tfm
+2020/08/30 | 1476 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ot1--base.tfm
+2020/08/30 | 1476 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ts1--base.tfm
+2020/08/30 | 1476 | fonts/merriweather/tfm/Merriwthr-LightItalic-sup-ot1.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ts1.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ts1.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ts1.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ts1.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ts1.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ts1.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ts1.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ts1.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ts1.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ts1.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ts1.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ts1.tfm
+2020/08/30 | 1472 | fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-ot1.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ts1--base.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ts1--base.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ts1--base.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ts1--base.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/Merriwthr-Black-tosf-ts1.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/Merriwthr-Black-tlf-ts1.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/Merriwthr-Black-osf-ts1.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/Merriwthr-Black-lf-ts1.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ot1--base.tfm
+2020/08/30 | 1468 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ot1--base.tfm
+2020/08/30 | 1464 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ot1--base.tfm
+2020/08/30 | 1464 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-ts1.tfm
+2020/08/30 | 1464 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-ts1.tfm
+2020/08/30 | 1464 | fonts/merriweather/tfm/Merriwthr-Regular-osf-ts1.tfm
+2020/08/30 | 1464 | fonts/merriweather/tfm/Merriwthr-Regular-lf-ts1.tfm
+2020/08/30 | 1464 | fonts/merriweather/tfm/Merriwthr-Italic-sup-ot1.tfm
+2020/08/30 | 1460 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ts1--base.tfm
+2020/08/30 | 1460 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ts1--base.tfm
+2020/08/30 | 1460 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ts1--base.tfm
+2020/08/30 | 1460 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ts1--base.tfm
+2020/08/30 | 1460 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-ot1.tfm
+2020/08/30 | 1460 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-ts1.tfm
+2020/08/30 | 1460 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-ts1.tfm
+2020/08/30 | 1460 | fonts/merriweather/tfm/Merriwthr-Bold-osf-ts1.tfm
+2020/08/30 | 1460 | fonts/merriweather/tfm/Merriwthr-Bold-lf-ts1.tfm
+2020/08/30 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ts1.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ts1.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ts1.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ts1.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ot1--base.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ts1--base.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ts1--base.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ts1--base.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ts1--base.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ot1--base.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-ts1--base.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-ts1--base.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/Merriwthr-Regular-osf-ts1--base.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/Merriwthr-Regular-lf-ts1--base.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ot1--base.tfm
+2020/08/30 | 1452 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ot1--base.tfm
+2020/08/30 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2020/08/30 | 1448 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ts1--base.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ts1--base.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ts1--base.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ts1--base.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ot1--base.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ot1--base.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ot1--base.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ot1--base.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ot1--base.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-ts1--base.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-ts1--base.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Bold-osf-ts1--base.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Bold-lf-ts1--base.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Black-tosf-ts1--base.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Black-tlf-ts1--base.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Black-osf-ts1--base.tfm
+2020/08/30 | 1448 | fonts/merriweather/tfm/Merriwthr-Black-lf-ts1--base.tfm
+2020/08/30 | 1444 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ot1--base.tfm
+2020/08/30 | 1444 | fonts/merriweather/tfm/Merriwthr-Light-tosf-ts1.tfm
+2020/08/30 | 1444 | fonts/merriweather/tfm/Merriwthr-Light-tlf-ts1.tfm
+2020/08/30 | 1444 | fonts/merriweather/tfm/Merriwthr-Light-osf-ts1.tfm
+2020/08/30 | 1444 | fonts/merriweather/tfm/Merriwthr-Light-lf-ts1.tfm
+2020/08/30 | 14436 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-t1.tfm
+2020/08/30 | 14436 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-t1.tfm
+2020/08/30 | 14394 | macros/latex/contrib/caption/caption-beamer.dtx
+2020/08/30 | 1436 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ts1.tfm
+2020/08/30 | 1436 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ts1.tfm
+2020/08/30 | 1436 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ts1.tfm
+2020/08/30 | 1436 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ts1.tfm
+2020/08/30 | 1436 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-ot1.tfm
+2020/08/30 | 1432 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ot1--base.tfm
+2020/08/30 | 1432 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1--base.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ts1.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ts1.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ts1.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ts1.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ot1--base.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1--base.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/Merriwthr-Light-tosf-ts1--base.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/Merriwthr-Light-tlf-ts1--base.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/Merriwthr-Light-osf-ts1--base.tfm
+2020/08/30 | 1428 | fonts/merriweather/tfm/Merriwthr-Light-lf-ts1--base.tfm
+2020/08/30 | 1424 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ot1--base.tfm
+2020/08/30 | 1420 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ts1.tfm
+2020/08/30 | 1420 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ts1.tfm
+2020/08/30 | 1420 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-ts1.tfm
+2020/08/30 | 1420 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-ts1.tfm
+2020/08/30 | 1420 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ts1--base.tfm
+2020/08/30 | 1420 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ts1--base.tfm
+2020/08/30 | 1420 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ts1--base.tfm
+2020/08/30 | 1420 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ts1--base.tfm
+2020/08/30 | 141852 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2020/08/30 | 1416 | fonts/merriweather/tfm/MerriwthrSans-Italic-sup-ot1.tfm
+2020/08/30 | 1416 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ot1--base.tfm
+2020/08/30 | 14131 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2020/08/30 | 1412 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ts1--base.tfm
+2020/08/30 | 1412 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ts1--base.tfm
+2020/08/30 | 1412 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ts1--base.tfm
+2020/08/30 | 1412 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ts1--base.tfm
+2020/08/30 | 1412 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ot1--base.tfm
+2020/08/30 | 1412 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ot1--base.tfm
+2020/08/30 | 1412 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ot1--base.tfm
+2020/08/30 | 1412 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ot1--base.tfm
+2020/08/30 | 14108 | fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ot1.tfm
+2020/08/30 | 1408 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ot1--base.tfm
+2020/08/30 | 1408 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ot1--base.tfm
+2020/08/30 | 14072 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ot1.tfm
+2020/08/30 | 14056 | fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ot1.tfm
+2020/08/30 | 1404 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ot1--base.tfm
+2020/08/30 | 1404302 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2020/08/30 | 1400 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ts1--base.tfm
+2020/08/30 | 1400 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ts1--base.tfm
+2020/08/30 | 1400 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-ts1--base.tfm
+2020/08/30 | 1400 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-ts1--base.tfm
+2020/08/30 | 14000 | fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ot1.tfm
+2020/08/30 | 1396 | fonts/merriweather/tfm/Merriwthr-Black-sup-ot1.tfm
+2020/08/30 | 13952 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-t1.tfm
+2020/08/30 | 1392 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-ot1.tfm
+2020/08/30 | 1392 | fonts/merriweather/tfm/Merriwthr-Bold-sup-ot1.tfm
+2020/08/30 | 13884 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-t1.tfm
+2020/08/30 | 1384 | fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ot1--base.tfm
+2020/08/30 | 1384 | fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ot1--base.tfm
+2020/08/30 | 13832 | fonts/merriweather/tfm/Merriwthr-Regular-lf-ot1.tfm
+2020/08/30 | 1380 | fonts/merriweather/tfm/Merriwthr-Regular-sup-ot1.tfm
+2020/08/30 | 1376 | fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ot1--base.tfm
+2020/08/30 | 1372 | fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ot1--base.tfm
+2020/08/30 | 1372 | fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ot1--base.tfm
+2020/08/30 | 1372 | fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ot1--base.tfm
+2020/08/30 | 13704 | fonts/merriweather/tfm/Merriwthr-Regular-osf-ot1.tfm
+2020/08/30 | 13692 | fonts/merriweather/tfm/Merriwthr-Bold-lf-ot1.tfm
+2020/08/30 | 1368 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ot1--base.tfm
+2020/08/30 | 1368 | fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ot1--base.tfm
+2020/08/30 | 1364 | fonts/merriweather/tfm/MerriwthrSans-Bold-sup-ot1.tfm
+2020/08/30 | 1360 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-ot1.tfm
+2020/08/30 | 1360 | fonts/merriweather/tfm/Merriwthr-Light-sup-ot1.tfm
+2020/08/30 | 1360 | fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ot1--base.tfm
+2020/08/30 | 1356 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ot1--base.tfm
+2020/08/30 | 1356 | fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ot1--base.tfm
+2020/08/30 | 13536 | fonts/merriweather/tfm/Merriwthr-Bold-osf-ot1.tfm
+2020/08/30 | 1352 | fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ot1--base.tfm
+2020/08/30 | 1352 | fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ot1--base.tfm
+2020/08/30 | 13515 | fonts/merriweather/latex/merriweather.sty
+2020/08/30 | 1348 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ot1--base.tfm
+2020/08/30 | 1344 | fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ot1--base.tfm
+2020/08/30 | 1344 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ot1--base.tfm
+2020/08/30 | 1344 | fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ot1--base.tfm
+2020/08/30 | 1344 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ot1--base.tfm
+2020/08/30 | 1344 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ot1--base.tfm
+2020/08/30 | 1344 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ot1--base.tfm
+2020/08/30 | 1340 | fonts/merriweather/tfm/MerriwthrSans-Regular-sup-ot1.tfm
+2020/08/30 | 1340 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ot1--base.tfm
+2020/08/30 | 1340 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ot1--base.tfm
+2020/08/30 | 1340 | fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ot1--base.tfm
+2020/08/30 | 1336 | fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ot1--base.tfm
+2020/08/30 | 133655 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2020/08/30 | 13356 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ot1.tfm
+2020/08/30 | 13356 | fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ot1.tfm
+2020/08/30 | 13348 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ly1.tfm
+2020/08/30 | 13316 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ly1.tfm
+2020/08/30 | 13300 | fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ot1.tfm
+2020/08/30 | 13296 | fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ot1.tfm
+2020/08/30 | 1328 | fonts/merriweather/tfm/MerriwthrSans-Light-sup-ot1.tfm
+2020/08/30 | 132764 | fonts/merriweather/opentype/MerriweatherSans-Bold.otf
+2020/08/30 | 13260 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ly1.tfm
+2020/08/30 | 13260 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-ot1.tfm
+2020/08/30 | 13260 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-ot1.tfm
+2020/08/30 | 1325259 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2020/08/30 | 1324 | fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ot1--base.tfm
+2020/08/30 | 1324 | fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ot1--base.tfm
+2020/08/30 | 13216 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ly1.tfm
+2020/08/30 | 1320 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ot1--base.tfm
+2020/08/30 | 1320 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ot1--base.tfm
+2020/08/30 | 131936 | systems/texlive/tlnet/archive/texlive-scripts.r56204.tar.xz
+2020/08/30 | 13165 | macros/latex/contrib/caption/caption-light.dtx
+2020/08/30 | 13136 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-t1.tfm
+2020/08/30 | 13133 | macros/latex/contrib/texnegar/doc-ligature-texnegar.pdf
+2020/08/30 | 13132 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-t1.tfm
+2020/08/30 | 1312 | fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ot1--base.tfm
+2020/08/30 | 1312 | fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ot1--base.tfm
+2020/08/30 | 1312 | fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ot1--base.tfm
+2020/08/30 | 13128 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2020/08/30 | 13124 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ot1.tfm
+2020/08/30 | 13108 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-ot1.tfm
+2020/08/30 | 13104 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-ot1.tfm
+2020/08/30 | 1308 | fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ot1--base.tfm
+2020/08/30 | 130357 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2020/08/30 | 1300 | macros/latex/contrib/totalcount/totalcount.ins
+2020/08/30 | 1297828 | systems/win32/miktex/tm/packages/ctex.tar.lzma
+2020/08/30 | 12876 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ly1.tfm
+2020/08/30 | 12820 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ly1.tfm
+2020/08/30 | 12728 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ly1.tfm
+2020/08/30 | 12728 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ly1.tfm
+2020/08/30 | 12700 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ot1.tfm
+2020/08/30 | 12680 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-t1.tfm
+2020/08/30 | 1265432 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2020/08/30 | 12648 | macros/latex/contrib/totalcount/totalcount.dtx
+2020/08/30 | 12648 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ly1.tfm
+2020/08/30 | 12648 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ly1.tfm
+2020/08/30 | 12596 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ly1.tfm
+2020/08/30 | 12528 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-t1.tfm
+2020/08/30 | 12420 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ly1.tfm
+2020/08/30 | 12384 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ot1.tfm
+2020/08/30 | 12384 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ot1.tfm
+2020/08/30 | 12236 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ly1.tfm
+2020/08/30 | 12220 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ly1.tfm
+2020/08/30 | 12220 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ly1.tfm
+2020/08/30 | 12180 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ly1.tfm
+2020/08/30 | 1217180 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2020/08/30 | 1216850 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2020/08/30 | 1210 | macros/latex/contrib/totalcount/README
+2020/08/30 | 121036 | fonts/merriweather/opentype/MerriweatherSans-BoldItalic.otf
+2020/08/30 | 12072 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-t1.tfm
+2020/08/30 | 12068 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-t1.tfm
+2020/08/30 | 120684 | fonts/merriweather/opentype/MerriweatherSans-ExtraBold.otf
+2020/08/30 | 12020 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1.tfm
+2020/08/30 | 12020 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1.tfm
+2020/08/30 | 119420 | fonts/merriweather/opentype/MerriweatherSans-Light.otf
+2020/08/30 | 119412 | fonts/merriweather/opentype/MerriweatherSans-Regular.otf
+2020/08/30 | 1192975 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2020/08/30 | 118981 | fonts/merriweather/type1/MerriwthrSans-BoldItalic.pfb
+2020/08/30 | 118266 | fonts/merriweather/type1/MerriwthrSans-Bold.pfb
+2020/08/30 | 116787 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2020/08/30 | 11676 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ly1.tfm
+2020/08/30 | 11676 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ly1.tfm
+2020/08/30 | 11672 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ly1.tfm
+2020/08/30 | 115883 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2020/08/30 | 115778 | macros/latex/contrib/caption/bicaption.pdf
+2020/08/30 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2020/08/30 | 1150 | fonts/merriweather/doc/merriweather-samples.tex
+2020/08/30 | 1142 | macros/latex/contrib/texnegar/README.txt
+2020/08/30 | 11428 | fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ly1.tfm
+2020/08/30 | 11400 | fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ot1.tfm
+2020/08/30 | 11392 | fonts/merriweather/tfm/Merriwthr-Black-lf-ot1.tfm
+2020/08/30 | 1136171 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2020/08/30 | 11360 | fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ot1.tfm
+2020/08/30 | 113580 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2020/08/30 | 1135583 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2020/08/30 | 11328 | fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ot1.tfm
+2020/08/30 | 112 | macros/latex/contrib/caption/SUMMARY
+2020/08/30 | 11288 | fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ot1.tfm
+2020/08/30 | 11280 | fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ot1.tfm
+2020/08/30 | 11252 | fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ot1.tfm
+2020/08/30 | 11232 | fonts/merriweather/tfm/Merriwthr-Black-osf-ot1.tfm
+2020/08/30 | 11200 | fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ot1.tfm
+2020/08/30 | 11132 | fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ly1.tfm
+2020/08/30 | 11128 | fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ly1.tfm
+2020/08/30 | 111241 | fonts/merriweather/type1/MerriwthrSans-Italic.pfb
+2020/08/30 | 11108 | fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ot1.tfm
+2020/08/30 | 110715 | fonts/merriweather/type1/MerriwthrSans-ExtraBold.pfb
+2020/08/30 | 1105890 | macros/latex/contrib/texnegar/texnegar-luatex-glyph.pdf
+2020/08/30 | 110380 | fonts/merriweather/type1/MerriwthrSans-ExtraBoldItalic.pfb
+2020/08/30 | 110227 | fonts/merriweather/type1/MerriwthrSans-LightItalic.pfb
+2020/08/30 | 110121 | fonts/merriweather/type1/MerriwthrSans-Regular.pfb
+2020/08/30 | 109916 | fonts/merriweather/type1/MerriwthrSans-Light.pfb
+2020/08/30 | 109731 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2020/08/30 | 109700 | fonts/merriweather/doc/merriweather-samples.pdf
+2020/08/30 | 10920 | fonts/merriweather/tfm/Merriwthr-Black-tlf-ot1.tfm
+2020/08/30 | 10916 | fonts/merriweather/tfm/Merriwthr-Black-tosf-ot1.tfm
+2020/08/30 | 108990 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2020/08/30 | 1088751 | graphics/mcf2graph.zip
+2020/08/30 | 10784 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ot1.tfm
+2020/08/30 | 10784 | fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ot1.tfm
+2020/08/30 | 10756 | fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ot1.tfm
+2020/08/30 | 10756 | fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ot1.tfm
+2020/08/30 | 10728 | fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ot1.tfm
+2020/08/30 | 10724 | fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ot1.tfm
+2020/08/30 | 107192 | fonts/merriweather/opentype/MerriweatherSans-ExtraBoldItalic.otf
+2020/08/30 | 10688 | macros/latex/contrib/fduthesis/fudan-emblem-new.pdf
+2020/08/30 | 106734 | macros/latex/contrib/texnegar/xepersian-XB.pdf
+2020/08/30 | 10668 | fonts/merriweather/tfm/Merriwthr-Light-lf-ot1.tfm
+2020/08/30 | 10660 | fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ot1.tfm
+2020/08/30 | 10656 | fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ot1.tfm
+2020/08/30 | 10652 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ly1.tfm
+2020/08/30 | 10648 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ly1.tfm
+2020/08/30 | 1061413 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2020/08/30 | 10588 | fonts/merriweather/tfm/Merriwthr-Light-osf-ot1.tfm
+2020/08/30 | 104548 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2020/08/30 | 104464 | fonts/merriweather/opentype/MerriweatherSans-Italic.otf
+2020/08/30 | 10381 | graphics/mcf2graph/CHANGELOG
+2020/08/30 | 102588 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2020/08/30 | 10236 | fonts/merriweather/tfm/Merriwthr-Light-tosf-ot1.tfm
+2020/08/30 | 10236 | fonts/merriweather/tfm/Merriwthr-Light-tlf-ot1.tfm
+2020/08/30 | 1021969 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2020/08/30 | 101783 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2020/08/30 | 10141374 | systems/win32/miktex/tm/packages/libertinus-type1.tar.lzma
+2020/08/30 | 101264 | fonts/merriweather/opentype/MerriweatherSans-LightItalic.otf
+2020/08/30 | 10116 | macros/latex/contrib/texnegar/doc-ligature-xep.pdf
+2020/08/30 | 100918 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2020/08/30 | 10088 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ly1.tfm
+2020/08/30 | 10052 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ly1.tfm
+2020/08/30 | 10048 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ly1.tfm
2020/08/29 | 84185 | macros/latex/contrib/animate/animate.tex
-2020/08/29 | 82787 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2020/08/29 | 81558 | macros/latex/contrib/texnegar/texnegar.dtx
-2020/08/29 | 79693 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2020/08/29 | 79420 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2020/08/29 | 78102 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2020/08/29 | 77489 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2020/08/29 | 77368 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2020/08/29 | 77314 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2020/08/29 | 76797 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2020/08/29 | 7550 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2020/08/29 | 73692 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2020/08/29 | 73449 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2020/08/29 | 72864 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2020/08/29 | 72614 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2020/08/29 | 72256 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2020/08/29 | 71554 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2020/08/29 | 70141 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2020/08/29 | 69913 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2020/08/29 | 69184 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2020/08/29 | 68969 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2020/08/29 | 677581 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2020/08/29 | 67278 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2020/08/29 | 67259 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2020/08/29 | 66014 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2020/08/29 | 65820 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2020/08/29 | 65546 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2020/08/29 | 65544 | macros/latex/contrib/texnegar/doc-samples-xep.pdf
-2020/08/29 | 64237 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2020/08/29 | 638663 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2020/08/29 | 63556 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2020/08/29 | 63516 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2020/08/29 | 63437 | macros/latex/contrib/texnegar/doc-samples-glyph.pdf
-2020/08/29 | 63430 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2020/08/29 | 63360 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2020/08/29 | 62978 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2020/08/29 | 62969 | macros/latex/contrib/texnegar/doc-samples-hrule.pdf
-2020/08/29 | 623929 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2020/08/29 | 62027 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2020/08/29 | 597783 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2020/08/29 | 59344 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2020/08/29 | 59041 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2020/08/29 | 58660 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2020/08/29 | 583965 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2020/08/29 | 57314 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2020/08/29 | 57160 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2020/08/29 | 57149 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2020/08/29 | 561891 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2020/08/29 | 55564 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2020/08/29 | 5500851 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2020/08/29 | 549966 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2020/08/29 | 544358 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2020/08/29 | 542244 | systems/win32/miktex/tm/packages/files.csv.lzma
-2020/08/29 | 541919 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2020/08/29 | 535371 | macros/latex/contrib/texnegar/texnegar.pdf
-2020/08/29 | 52203 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2020/08/29 | 51936 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2020/08/29 | 51421 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2020/08/29 | 51236 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2020/08/29 | 51137 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2020/08/29 | 702522 | systems/win32/w32tex/ChangeLog
+2020/08/29 | 6130 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2020/08/29 | 511084 | systems/texlive/tlnet/archive/oup-authoring-template.doc.r56201.tar.xz
-2020/08/29 | 50915 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2020/08/29 | 500568 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2020/08/29 | 49593 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2020/08/29 | 4958366 | install/macros/latex/contrib/texnegar.tds.zip
-2020/08/29 | 4935518 | macros/latex/contrib/texnegar.zip
-2020/08/29 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2020/08/29 | 48087 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2020/08/29 | 46358 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2020/08/29 | 462707 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2020/08/29 | 460434 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2020/08/29 | 45776 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2020/08/29 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2020/08/29 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2020/08/29 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2020/08/29 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
-2020/08/29 | 45321 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2020/08/29 | 45033 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2020/08/29 | 43315 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2020/08/29 | 43074 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2020/08/29 | 42625 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2020/08/29 | 42063 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2020/08/29 | 48808096 | systems/win32/w32tex/xetex-w32.tar.xz
2020/08/29 | 4175 | macros/latex/contrib/animate/README.md
2020/08/29 | 41252 | systems/texlive/tlnet/archive/luahyphenrules.doc.r56200.tar.xz
-2020/08/29 | 40823 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
2020/08/29 | 400842 | macros/latex/contrib/biblatex-contrib/biblatex-apa.zip
-2020/08/29 | 39333 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2020/08/29 | 39268 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2020/08/29 | 392368 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2020/08/29 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r56199.tar.xz
-2020/08/29 | 3889 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-hrule.tex
-2020/08/29 | 3889 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-glyph.tex
2020/08/29 | 3883925 | macros/latex/contrib/animate/animate.pdf
-2020/08/29 | 3793 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-glyph.tex
-2020/08/29 | 3703 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-hrule.tex
-2020/08/29 | 3702 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-glyph.tex
-2020/08/29 | 36922 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2020/08/29 | 36865 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2020/08/29 | 36361 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2020/08/29 | 3617 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-glyph.tex
-2020/08/29 | 360765 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2020/08/29 | 3604 | macros/latex/contrib/texnegar/texnegar-luatex-leaders-hrule.tex
-2020/08/29 | 3604 | macros/latex/contrib/texnegar/texnegar-luatex-leaders-glyph.tex
-2020/08/29 | 35215 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2020/08/29 | 3508 | macros/latex/contrib/texnegar/texnegar-luatex-glyph.tex
-2020/08/29 | 35034 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2020/08/29 | 34775 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2020/08/29 | 33089 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2020/08/29 | 329617 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2020/08/29 | 327553 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2020/08/29 | 325838 | macros/latex/contrib/texnegar/texnegar-luatex-leaders-glyph.pdf
-2020/08/29 | 32394 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2020/08/29 | 32353 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2020/08/29 | 3840916 | systems/win32/w32tex/luajittex-w32.tar.xz
+2020/08/29 | 3835788 | systems/win32/w32tex/luajittex-dev-w32.tar.xz
+2020/08/29 | 3817884 | systems/win32/w32tex/luajittex-exp-w32.tar.xz
+2020/08/29 | 3441756 | systems/win32/w32tex/win64/luajittex-w64.tar.xz
+2020/08/29 | 3435060 | systems/win32/w32tex/win64/luajittex-dev-w64.tar.xz
+2020/08/29 | 3430488 | systems/win32/w32tex/win64/luajittex-exp-w64.tar.xz
2020/08/29 | 3232984 | install/macros/latex/contrib/animate.tds.zip
2020/08/29 | 3230711 | macros/latex/contrib/animate.zip
-2020/08/29 | 3145159 | macros/latex/contrib/texnegar/texnegar-doc.pdf
-2020/08/29 | 31253 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2020/08/29 | 31225 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2020/08/29 | 31209 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2020/08/29 | 3114 | macros/latex/contrib/texnegar/xepersian-XB.tex
-2020/08/29 | 310936 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2020/08/29 | 30908 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2020/08/29 | 30891 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2020/08/29 | 305081 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2020/08/29 | 29638 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2020/08/29 | 29399 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2020/08/29 | 29059 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2020/08/29 | 29028 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2020/08/29 | 28605 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2020/08/29 | 3109936 | systems/win32/w32tex/win64/luatex-w64.tar.xz
+2020/08/29 | 3107640 | systems/win32/w32tex/win64/luatex-dev-w64.tar.xz
+2020/08/29 | 3101168 | systems/win32/w32tex/win64/luatex-exp-w64.tar.xz
+2020/08/29 | 2914 | graphics/mcf2graph/mcf_example.tex
2020/08/29 | 283146 | macros/latex/contrib/biblatex-contrib/biblatex-apa6.zip
-2020/08/29 | 281779 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2020/08/29 | 279882 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2020/08/29 | 27804 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2020/08/29 | 273698 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2020/08/29 | 27010 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2020/08/29 | 26997 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2020/08/29 | 269406 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2020/08/29 | 2685 | macros/latex/contrib/texnegar/texnegar.ins
-2020/08/29 | 26853 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2020/08/29 | 26614 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2020/08/29 | 2657476 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2020/08/29 | 26077 | macros/latex/contrib/texnegar/texnegar-doc.ltx
-2020/08/29 | 25504 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2020/08/29 | 2534481 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2020/08/29 | 250289 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2020/08/29 | 246826 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2020/08/29 | 243054 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2020/08/29 | 24269405 | systems/texlive/tlnet/install-tl.zip
2020/08/29 | 2368 | systems/texlive/tlnet/archive/luahyphenrules.r56200.tar.xz
-2020/08/29 | 23600 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2020/08/29 | 22982 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2020/08/29 | 224089 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2020/08/29 | 2221732 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
-2020/08/29 | 212554 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-glyph.pdf
-2020/08/29 | 211539 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2020/08/29 | 210277 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2020/08/29 | 20818 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2020/08/29 | 207671 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2020/08/29 | 203966 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2020/08/29 | 2031794 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2020/08/29 | 202516 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2020/08/29 | 202486 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2020/08/29 | 20007 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2020/08/29 | 196320 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2020/08/29 | 194658 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-glyph.pdf
-2020/08/29 | 193837 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2020/08/29 | 19382714 | systems/texlive/tlnet/install-tl-windows.exe
-2020/08/29 | 192838 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2020/08/29 | 192588 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2020/08/29 | 189153 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2020/08/29 | 187721 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2020/08/29 | 184490 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2020/08/29 | 180901 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2020/08/29 | 177377 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2020/08/29 | 17728 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2020/08/29 | 17627 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2020/08/29 | 174805 | macros/latex/contrib/texnegar/texnegar-luatex-leaders-hrule.pdf
-2020/08/29 | 1746185 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2020/08/29 | 170421 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2020/08/29 | 169657 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2020/08/29 | 168460 | systems/texlive/tlnet/archive/texlive-docindex.doc.r56199.tar.xz
-2020/08/29 | 165593 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2020/08/29 | 16478090 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2020/08/29 | 16022 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2020/08/29 | 159880 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2020/08/29 | 15948 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2020/08/29 | 157984 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-glyph.pdf
-2020/08/29 | 156632 | macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-hrule.pdf
-2020/08/29 | 156629 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-glyph.pdf
-2020/08/29 | 155930 | macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-hrule.pdf
-2020/08/29 | 1556 | macros/latex/contrib/texnegar/INSTALL.txt
-2020/08/29 | 154419 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2020/08/29 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2020/08/29 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2020/08/29 | 151865 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2020/08/29 | 151837 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2020/08/29 | 17945908 | systems/win32/w32tex/luatex-w32.tar.xz
+2020/08/29 | 17941096 | systems/win32/w32tex/luatex-dev-w32.tar.xz
+2020/08/29 | 17914244 | systems/win32/w32tex/luatex-exp-w32.tar.xz
2020/08/29 | 1516 | systems/texlive/tlnet/archive/collection-publishers.r56201.tar.xz
2020/08/29 | 15128 | systems/texlive/tlnet/archive/oup-authoring-template.r56201.tar.xz
-2020/08/29 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2020/08/29 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2020/08/29 | 141854 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2020/08/29 | 14130 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
-2020/08/29 | 1404302 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2020/08/29 | 140518088 | systems/win32/w32tex/context.tar.xz
2020/08/29 | 136937 | macros/latex/contrib/animate/animate.sty
-2020/08/29 | 133656 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2020/08/29 | 1325259 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2020/08/29 | 13140 | macros/latex/contrib/texnegar/doc-ligature-texnegar.pdf
-2020/08/29 | 13128 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2020/08/29 | 130358 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2020/08/29 | 1265434 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2020/08/29 | 1211902 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2020/08/29 | 1211710 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
2020/08/29 | 12061 | macros/latex/contrib/animate/ChangeLog
-2020/08/29 | 1192976 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2020/08/29 | 116789 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2020/08/29 | 115881 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2020/08/29 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
-2020/08/29 | 1142 | macros/latex/contrib/texnegar/README.txt
-2020/08/29 | 113582 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2020/08/29 | 1129669 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2020/08/29 | 1129597 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2020/08/29 | 1105890 | macros/latex/contrib/texnegar/texnegar-luatex-glyph.pdf
-2020/08/29 | 109732 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2020/08/29 | 108991 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2020/08/29 | 106731 | macros/latex/contrib/texnegar/xepersian-XB.pdf
-2020/08/29 | 1061415 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2020/08/29 | 104548 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2020/08/29 | 102589 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2020/08/29 | 1021968 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2020/08/29 | 101784 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2020/08/29 | 10112 | macros/latex/contrib/texnegar/doc-ligature-xep.pdf
-2020/08/29 | 100918 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2020/08/29 | 10982476 | systems/win32/w32tex/win64/xetex-w64.tar.xz
2020/08/28 | 9965 | macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx
2020/08/28 | 9961 | macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx
2020/08/28 | 9627 | macros/latex/contrib/biblatex-contrib/biblatex-apa/danish-apa.lbx
@@ -272,7 +1735,6 @@
2020/08/28 | 8192 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/german-apa6.lbx
2020/08/28 | 76016 | systems/texlive/tlnet/archive/beilstein.source.r56193.tar.xz
2020/08/28 | 7484 | systems/texlive/tlnet/archive/metastr.r56195.tar.xz
-2020/08/28 | 701312 | systems/win32/w32tex/ChangeLog
2020/08/28 | 6698 | macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx
2020/08/28 | 66878 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdf
2020/08/28 | 666912 | systems/texlive/tlnet/archive/beilstein.doc.r56193.tar.xz
@@ -319,7 +1781,6 @@
2020/08/28 | 23425684 | systems/win32/w32tex/cjkzr.tar.xz
2020/08/28 | 23180 | systems/texlive/tlnet/archive/metastr.source.r56195.tar.xz
2020/08/28 | 224605 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.pdf
-2020/08/28 | 218656 | systems/texlive/tlnet/archive/texlive-scripts.doc.r56192.tar.xz
2020/08/28 | 2086 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.dbx
2020/08/28 | 2060 | systems/win32/w32tex/TLW64/00README.TLW64
2020/08/28 | 20545 | macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx
@@ -332,12 +1793,10 @@
2020/08/28 | 14864 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test-citations.bib
2020/08/28 | 14662 | macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx
2020/08/28 | 1406 | macros/luatex/latex/stricttex/README.md
-2020/08/28 | 140505272 | systems/win32/w32tex/context.tar.xz
2020/08/28 | 1389 | macros/luatex/latex/stricttex/stricttex.sty
2020/08/28 | 136160 | systems/texlive/tlnet/archive/tex4ht.doc.r56197.tar.xz
2020/08/28 | 13304 | systems/texlive/tlnet/archive/beilstein.r56193.tar.xz
2020/08/28 | 13250 | macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx
-2020/08/28 | 132032 | systems/texlive/tlnet/archive/texlive-scripts.r56192.tar.xz
2020/08/28 | 12785 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-citations.bib
2020/08/28 | 12580 | macros/latex/contrib/biblatex-contrib/biblatex-apa/ngerman-apa.lbx
2020/08/28 | 12573 | macros/latex/contrib/biblatex-contrib/biblatex-apa/swissgerman-apa.lbx
@@ -358,7 +1817,6 @@
2020/08/27 | 74584 | systems/texlive/tlnet/archive/qrbill.doc.r56190.tar.xz
2020/08/27 | 6888 | systems/texlive/tlnet/archive/qrbill.r56190.tar.xz
2020/08/27 | 6724 | systems/texlive/tlnet/archive/ejpecp.source.r56188.tar.xz
-2020/08/27 | 6509 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2020/08/27 | 603926 | macros/latex/contrib/qyxf-book.zip
2020/08/27 | 5056 | systems/texlive/tlnet/archive/ejpecp.r56188.tar.xz
2020/08/27 | 475572 | systems/texlive/tlnet/archive/yquant.doc.r56189.tar.xz
@@ -398,7 +1856,6 @@
2020/08/26 | 6148 | systems/texlive/tlnet/archive/collection-latexextra.r56182.tar.xz
2020/08/26 | 551819 | graphics/pgf/contrib/yquant.zip
2020/08/26 | 49850 | macros/latex/contrib/beilstein/bjnano_logo.pdf
-2020/08/26 | 48811184 | systems/win32/w32tex/xetex-w32.tar.xz
2020/08/26 | 4661196 | systems/win32/w32tex/dvipdfm-w32.tar.xz
2020/08/26 | 445732 | systems/texlive/tlnet/archive/xcharter.doc.r56179.tar.xz
2020/08/26 | 3984 | systems/texlive/tlnet/archive/hecthese.r56181.tar.xz
@@ -423,7 +1880,6 @@
2020/08/26 | 144710 | macros/latex/contrib/beilstein/beilstein.dtx
2020/08/26 | 1403 | macros/latex/contrib/beilstein/README.md
2020/08/26 | 1396642 | macros/latex/contrib/beilstein.zip
-2020/08/26 | 10982312 | systems/win32/w32tex/win64/xetex-w64.tar.xz
2020/08/26 | 1066608 | systems/texlive/tlnet/archive/kpathsea.doc.r56185.tar.xz
2020/08/26 | 10266 | macros/latex/contrib/beilstein/scheme2.pdf
2020/08/26 | 10249 | macros/latex/contrib/beilstein/scheme1.pdf
@@ -555,299 +2011,3 @@
2020/08/24 | 1079868 | systems/texlive/tlnet/archive/ctex.doc.r56166.tar.xz
2020/08/24 | 1062 | macros/latex/contrib/beamer-contrib/themes/beamerthemenord/beamerfontthemeNord.sty
2020/08/24 | 102720 | systems/texlive/tlnet/archive/dvisvgm.doc.r56166.tar.xz
-2020/08/23 | 99 | macros/latex/contrib/biblatex/latex/bbx/authoryear-icomp.bbx
-2020/08/23 | 98 | macros/latex/contrib/biblatex/latex/bbx/authoryear-ibid.bbx
-2020/08/23 | 98 | macros/latex/contrib/biblatex/latex/bbx/authoryear-comp.bbx
-2020/08/23 | 98 | macros/latex/contrib/biblatex/latex/bbx/alphabetic-verb.bbx
-2020/08/23 | 9853 | macros/latex/contrib/biblatex/latex/cbx/authoryear-icomp.cbx
-2020/08/23 | 98442 | macros/latex/contrib/biblatex/doc/examples/12-references-by-segment-biber.pdf
-2020/08/23 | 98437 | macros/latex/contrib/biblatex/doc/examples/12-references-by-segment-bibtex.pdf
-2020/08/23 | 98395 | macros/latex/contrib/biblatex/doc/examples/11-references-by-section-biber.pdf
-2020/08/23 | 98390 | macros/latex/contrib/biblatex/doc/examples/11-references-by-section-bibtex.pdf
-2020/08/23 | 97 | macros/latex/contrib/biblatex/latex/bbx/verbose-trad3.bbx
-2020/08/23 | 97 | macros/latex/contrib/biblatex/latex/bbx/verbose-trad2.bbx
-2020/08/23 | 97 | macros/latex/contrib/biblatex/latex/bbx/verbose-trad1.bbx
-2020/08/23 | 97 | macros/latex/contrib/biblatex/latex/bbx/verbose-inote.bbx
-2020/08/23 | 9725 | macros/latex/contrib/biblatex/doc/examples/75-style-verbose-trad2.tex
-2020/08/23 | 96 | macros/latex/contrib/biblatex/latex/bbx/verbose-note.bbx
-2020/08/23 | 96 | macros/latex/contrib/biblatex/latex/bbx/verbose-ibid.bbx
-2020/08/23 | 9620 | macros/latex/contrib/biblatex/latex/cbx/verbose-inote.cbx
-2020/08/23 | 92 | macros/latex/contrib/biblatex/latex/bbx/numeric-verb.bbx
-2020/08/23 | 92 | macros/latex/contrib/biblatex/latex/bbx/numeric-comp.bbx
-2020/08/23 | 91 | macros/latex/contrib/biblatex/latex/bbx/verbose.bbx
-2020/08/23 | 9091 | macros/latex/contrib/biblatex/latex/cbx/verbose-trad1.cbx
-2020/08/23 | 90799 | macros/latex/contrib/biblatex/latex/biblatex.def
-2020/08/23 | 88905 | macros/latex/contrib/biblatex/doc/examples/22-indexing-subentry-bibtex.pdf
-2020/08/23 | 88905 | macros/latex/contrib/biblatex/doc/examples/22-indexing-subentry-biber.pdf
-2020/08/23 | 87 | macros/latex/contrib/biblatex/latex/cbx/reading.cbx
-2020/08/23 | 8784 | macros/latex/contrib/biblatex/latex/cbx/verbose-trad2.cbx
-2020/08/23 | 8737 | macros/latex/contrib/biblatex/latex/cbx/authoryear-comp.cbx
-2020/08/23 | 8688 | macros/latex/contrib/biblatex/latex/cbx/verbose-note.cbx
-2020/08/23 | 856 | macros/latex/contrib/biblatex/latex/lbx/newzealand.lbx
-2020/08/23 | 840 | macros/latex/contrib/biblatex/doc/examples/82-style-debug.tex
-2020/08/23 | 81705 | macros/latex/contrib/biblatex/doc/examples/10-references-per-section-bibtex.pdf
-2020/08/23 | 81705 | macros/latex/contrib/biblatex/doc/examples/10-references-per-section-biber.pdf
-2020/08/23 | 8115 | macros/latex/contrib/biblatex/doc/examples/76-style-verbose-trad3.tex
-2020/08/23 | 810 | macros/latex/contrib/biblatex/doc/examples/91-sorting-schemes.tex
-2020/08/23 | 8029 | macros/latex/contrib/biblatex/doc/examples/73-style-verbose-inote.tex
-2020/08/23 | 8024 | macros/latex/contrib/biblatex/latex/bbx/authoryear.bbx
-2020/08/23 | 80156 | macros/latex/contrib/biblatex/doc/examples/04-delimiters-biber.pdf
-2020/08/23 | 80152 | macros/latex/contrib/biblatex/doc/examples/04-delimiters-bibtex.pdf
-2020/08/23 | 7936 | macros/latex/contrib/biblatex/latex/cbx/verbose-trad3.cbx
-2020/08/23 | 791 | macros/latex/contrib/biblatex/doc/examples/81-style-draft.tex
-2020/08/23 | 7875 | macros/latex/contrib/biblatex/latex/blx-case-expl3.def
-2020/08/23 | 783 | macros/latex/contrib/biblatex/doc/examples/15-references-by-type.tex
-2020/08/23 | 782 | macros/latex/contrib/biblatex/latex/lbx/australian.lbx
-2020/08/23 | 7801 | macros/latex/contrib/biblatex/latex/cbx/verbose-ibid.cbx
-2020/08/23 | 7769 | macros/latex/contrib/biblatex/doc/examples/96-dates.tex
-2020/08/23 | 7710 | macros/latex/contrib/biblatex/doc/examples/50-style-authoryear.tex
-2020/08/23 | 769 | macros/latex/contrib/biblatex/latex/lbx/nswissgerman.lbx
-2020/08/23 | 757 | macros/latex/contrib/biblatex/doc/examples/42-style-alphabetic-template.tex
-2020/08/23 | 7478 | macros/latex/contrib/biblatex/doc/examples/51-style-authoryear-ibid.tex
-2020/08/23 | 744 | macros/latex/contrib/biblatex/doc/examples/41-style-alphabetic-verb.tex
-2020/08/23 | 7288 | macros/latex/contrib/biblatex/doc/examples/53-style-authoryear-icomp.tex
-2020/08/23 | 7221 | macros/latex/contrib/biblatex/latex/blx-case-latex2e.def
-2020/08/23 | 7002 | macros/latex/contrib/biblatex/doc/examples/71-style-verbose-ibid.tex
-2020/08/23 | 7000 | macros/latex/contrib/biblatex/latex/cbx/verbose.cbx
-2020/08/23 | 69 | macros/latex/contrib/biblatex/latex/biblatex.cfg
-2020/08/23 | 68013 | macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib
-2020/08/23 | 68013 | macros/latex/contrib/biblatex/bibtex/bib/biblatex/biblatex-examples.bib
-2020/08/23 | 6648 | macros/latex/contrib/biblatex/latex/cbx/authortitle-icomp.cbx
-2020/08/23 | 65407 | macros/latex/contrib/biblatex/bibtex/bst/biblatex.bst
-2020/08/23 | 63376 | macros/latex/contrib/biblatex/doc/examples/92-bibliographylists-biber.pdf
-2020/08/23 | 6039 | language/chinese/ctex/README.md
-2020/08/23 | 5888 | macros/latex/contrib/biblatex/doc/examples/72-style-verbose-note.tex
-2020/08/23 | 5780 | macros/latex/contrib/biblatex/doc/examples/52-style-authoryear-comp.tex
-2020/08/23 | 571 | macros/latex/contrib/biblatex/latex/lbx/naustrian.lbx
-2020/08/23 | 5661 | macros/latex/contrib/biblatex/latex/cbx/authortitle-comp.cbx
-2020/08/23 | 545 | macros/latex/contrib/biblatex/doc/examples/02-annotations.tex
-2020/08/23 | 520 | macros/latex/contrib/biblatex/latex/lbx/ngerman.lbx
-2020/08/23 | 5197 | macros/latex/contrib/biblatex/README
-2020/08/23 | 5175 | macros/latex/contrib/biblatex/doc/examples/01-introduction.tex
-2020/08/23 | 5131 | macros/latex/contrib/biblatex/latex/cbx/authoryear-ibid.cbx
-2020/08/23 | 513107 | macros/xetex/latex/xecjk/xeCJK.dtx
-2020/08/23 | 5091 | macros/latex/contrib/biblatex/doc/examples/21-indexing-multiple.tex
-2020/08/23 | 505 | macros/latex/contrib/biblatex/doc/examples/95-customlists.bib
-2020/08/23 | 5047 | macros/latex/contrib/biblatex/doc/examples/70-style-verbose.tex
-2020/08/23 | 498507 | macros/latex/contrib/biblatex/latex/biblatex.sty
-2020/08/23 | 4889 | systems/texlive/tlnet/install-tl-windows.bat
-2020/08/23 | 474 | macros/latex/contrib/biblatex/latex/lbx/swissgerman.lbx
-2020/08/23 | 47020 | macros/latex/contrib/biblatex/latex/lbx/spanish.lbx
-2020/08/23 | 4578 | macros/latex/contrib/biblatex/latex/cbx/numeric.cbx
-2020/08/23 | 45070 | macros/latex/contrib/biblatex/latex/lbx/russian.lbx
-2020/08/23 | 4480 | macros/latex/contrib/biblatex/latex/bbx/reading.bbx
-2020/08/23 | 44740 | macros/latex/contrib/biblatex/latex/lbx/lithuanian.lbx
-2020/08/23 | 44468 | macros/latex/contrib/biblatex/latex/lbx/bulgarian.lbx
-2020/08/23 | 44443 | macros/latex/contrib/biblatex/CHANGES.md
-2020/08/23 | 44157 | macros/latex/contrib/biblatex/latex/lbx/ukrainian.lbx
-2020/08/23 | 440755 | language/chinese/ctex/ctex.dtx
-2020/08/23 | 43608 | macros/latex/contrib/biblatex/latex/lbx/latvian.lbx
-2020/08/23 | 426 | macros/latex/contrib/biblatex/doc/examples/97-annotations.bib
-2020/08/23 | 4261 | macros/latex/contrib/biblatex/latex/cbx/alphabetic.cbx
-2020/08/23 | 4032 | macros/latex/contrib/biblatex/latex/bbx/debug.bbx
-2020/08/23 | 3976 | macros/latex/contrib/biblatex/latex/cbx/authoryear.cbx
-2020/08/23 | 391 | macros/latex/contrib/biblatex/doc/examples/90-related-entries.tex
-2020/08/23 | 39038 | macros/latex/contrib/biblatex/latex/lbx/magyar.lbx
-2020/08/23 | 38925 | macros/latex/contrib/biblatex/doc/examples/03-localization-keys.tex
-2020/08/23 | 3850 | macros/latex/contrib/biblatex/latex/cbx/authortitle-ibid.cbx
-2020/08/23 | 38458 | macros/latex/contrib/biblatex/latex/lbx/english.lbx
-2020/08/23 | 37768 | macros/latex/contrib/biblatex/doc/examples/93-nameparts-biber.pdf
-2020/08/23 | 3713 | macros/latex/contrib/biblatex/doc/examples/60-style-authortitle.tex
-2020/08/23 | 36836 | systems/texlive/tlnet/archive/spectral.doc.r56153.tar.xz
-2020/08/23 | 36663 | macros/latex/contrib/biblatex/latex/lbx/finnish.lbx
-2020/08/23 | 3588 | macros/latex/contrib/biblatex/doc/examples/22-indexing-subentry.tex
-2020/08/23 | 35569 | macros/latex/contrib/biblatex/latex/lbx/catalan.lbx
-2020/08/23 | 3545044 | systems/texlive/tlnet/archive/spectral.r56153.tar.xz
-2020/08/23 | 35299 | macros/latex/contrib/biblatex/latex/lbx/greek.lbx
-2020/08/23 | 3520 | macros/latex/contrib/biblatex/doc/examples/94-labelprefix.tex
-2020/08/23 | 3454 | macros/latex/contrib/biblatex/latex/cbx/authortitle-ticomp.cbx
-2020/08/23 | 34500 | macros/latex/contrib/biblatex/latex/lbx/french.lbx
-2020/08/23 | 3437 | macros/latex/contrib/biblatex/latex/bbx/authortitle.bbx
-2020/08/23 | 3395 | macros/xetex/latex/xecjk/README.md
-2020/08/23 | 33082 | macros/latex/contrib/biblatex/latex/lbx/serbianc.lbx
-2020/08/23 | 33062 | macros/latex/contrib/biblatex/latex/lbx/czech.lbx
-2020/08/23 | 33007 | macros/latex/contrib/biblatex/latex/lbx/estonian.lbx
-2020/08/23 | 32887 | macros/latex/contrib/biblatex/latex/lbx/german.lbx
-2020/08/23 | 328754 | macros/latex/contrib/biblatex/doc/examples/74-style-verbose-trad1-biber.pdf
-2020/08/23 | 3280 | macros/latex/contrib/biblatex/latex/blx-unicode.def
-2020/08/23 | 3273 | macros/latex/contrib/biblatex/doc/examples/95-customlists.tex
-2020/08/23 | 327370 | macros/latex/contrib/biblatex/doc/examples/74-style-verbose-trad1-bibtex.pdf
-2020/08/23 | 32524 | macros/latex/contrib/biblatex/latex/blx-dm.def
-2020/08/23 | 32154 | macros/latex/contrib/biblatex/latex/lbx/slovak.lbx
-2020/08/23 | 3206 | macros/latex/contrib/biblatex/doc/examples/61-style-authortitle-ibid.tex
-2020/08/23 | 31993 | macros/latex/contrib/biblatex/latex/lbx/polish.lbx
-2020/08/23 | 31281 | macros/latex/contrib/biblatex/doc/examples/90-related-entries-biber.pdf
-2020/08/23 | 31273 | macros/latex/contrib/biblatex/latex/lbx/slovene.lbx
-2020/08/23 | 31124 | macros/latex/contrib/biblatex/latex/lbx/turkish.lbx
-2020/08/23 | 30596 | macros/latex/contrib/biblatex/latex/lbx/dutch.lbx
-2020/08/23 | 3036 | macros/latex/contrib/biblatex/doc/examples/31-style-numeric-comp.tex
-2020/08/23 | 30087 | macros/latex/contrib/biblatex/latex/lbx/danish.lbx
-2020/08/23 | 29475 | language/chinese/ctex/ctxdoc.cls
-2020/08/23 | 2934 | macros/latex/contrib/biblatex/latex/cbx/authortitle-tcomp.cbx
-2020/08/23 | 29318 | macros/latex/contrib/biblatex/latex/lbx/portuguese.lbx
-2020/08/23 | 292888 | macros/xetex/latex/xecjk/xunicode-symbols.pdf
-2020/08/23 | 29247 | macros/latex/contrib/biblatex/latex/lbx/norsk.lbx
-2020/08/23 | 29100 | macros/latex/contrib/biblatex/latex/lbx/brazilian.lbx
-2020/08/23 | 29072 | macros/latex/contrib/biblatex/latex/lbx/croatian.lbx
-2020/08/23 | 2899 | macros/latex/contrib/biblatex/doc/examples/18-numeric-hybrid.tex
-2020/08/23 | 2893 | macros/latex/contrib/biblatex/latex/lbx/british.lbx
-2020/08/23 | 2893 | macros/latex/contrib/biblatex/latex/cbx/authortitle.cbx
-2020/08/23 | 28621 | macros/latex/contrib/biblatex/latex/lbx/galician.lbx
-2020/08/23 | 2833 | macros/latex/contrib/biblatex/doc/examples/63-style-authortitle-icomp.tex
-2020/08/23 | 280078 | macros/latex/contrib/biblatex/doc/examples/50-style-authoryear-biber.pdf
-2020/08/23 | 277799 | macros/latex/contrib/biblatex/doc/examples/50-style-authoryear-bibtex.pdf
-2020/08/23 | 277795 | macros/latex/contrib/biblatex/doc/examples/60-style-authortitle-biber.pdf
-2020/08/23 | 276 | macros/latex/contrib/biblatex/latex/lbx/austrian.lbx
-2020/08/23 | 275259 | macros/latex/contrib/biblatex/doc/examples/60-style-authortitle-bibtex.pdf
-2020/08/23 | 274164 | macros/latex/contrib/biblatex/doc/examples/73-style-verbose-inote-biber.pdf
-2020/08/23 | 273584 | macros/latex/contrib/biblatex/doc/examples/75-style-verbose-trad2-biber.pdf
-2020/08/23 | 272786 | macros/latex/contrib/biblatex/doc/examples/73-style-verbose-inote-bibtex.pdf
-2020/08/23 | 272203 | macros/latex/contrib/biblatex/doc/examples/75-style-verbose-trad2-bibtex.pdf
-2020/08/23 | 272064 | macros/latex/contrib/biblatex/doc/examples/71-style-verbose-ibid-biber.pdf
-2020/08/23 | 270799 | macros/latex/contrib/biblatex/doc/examples/76-style-verbose-trad3-biber.pdf
-2020/08/23 | 270652 | macros/latex/contrib/biblatex/doc/examples/71-style-verbose-ibid-bibtex.pdf
-2020/08/23 | 270391 | macros/latex/contrib/biblatex/doc/examples/72-style-verbose-note-biber.pdf
-2020/08/23 | 269420 | macros/latex/contrib/biblatex/doc/examples/76-style-verbose-trad3-bibtex.pdf
-2020/08/23 | 268908 | macros/latex/contrib/biblatex/doc/examples/72-style-verbose-note-bibtex.pdf
-2020/08/23 | 2688 | macros/latex/contrib/biblatex/doc/examples/30-style-numeric.tex
-2020/08/23 | 268065 | macros/latex/contrib/biblatex/doc/examples/70-style-verbose-biber.pdf
-2020/08/23 | 266542 | macros/latex/contrib/biblatex/doc/examples/70-style-verbose-bibtex.pdf
-2020/08/23 | 2635 | macros/latex/contrib/biblatex/doc/examples/64-style-authortitle-terse.tex
-2020/08/23 | 26169 | macros/latex/contrib/biblatex/latex/lbx/swedish.lbx
-2020/08/23 | 2585 | macros/latex/contrib/biblatex/doc/examples/66-style-authortitle-ticomp.tex
-2020/08/23 | 258208 | support/ltximg.zip
-2020/08/23 | 2580 | macros/latex/contrib/biblatex/doc/examples/80-style-reading.tex
-2020/08/23 | 2572 | macros/latex/contrib/biblatex/latex/cbx/numeric-verb.cbx
-2020/08/23 | 25668 | macros/latex/contrib/biblatex/latex/bbx/standard.bbx
-2020/08/23 | 25609 | macros/latex/contrib/biblatex/latex/lbx/icelandic.lbx
-2020/08/23 | 25296 | macros/latex/contrib/biblatex/doc/examples/96-dates-biber.pdf
-2020/08/23 | 246343 | macros/latex/contrib/biblatex/doc/examples/03-localization-keys-biber.pdf
-2020/08/23 | 245414 | macros/latex/contrib/biblatex/doc/examples/03-localization-keys-bibtex.pdf
-2020/08/23 | 244291 | macros/latex/contrib/biblatex/doc/examples/80-style-reading-bibtex.pdf
-2020/08/23 | 244291 | macros/latex/contrib/biblatex/doc/examples/80-style-reading-biber.pdf
-2020/08/23 | 2434 | macros/latex/contrib/biblatex/doc/examples/20-indexing-single.tex
-2020/08/23 | 24155 | macros/latex/contrib/biblatex/latex/blx-bibtex.def
-2020/08/23 | 24027 | macros/latex/contrib/biblatex/doc/examples/94-labelprefix-biber.pdf
-2020/08/23 | 2395 | macros/latex/contrib/biblatex/doc/examples/04-delimiters.tex
-2020/08/23 | 2388 | macros/latex/contrib/biblatex/latex/cbx/debug.cbx
-2020/08/23 | 23858 | macros/latex/contrib/biblatex/latex/lbx/serbian.lbx
-2020/08/23 | 23181 | macros/latex/contrib/biblatex/latex/lbx/italian.lbx
-2020/08/23 | 225925 | macros/latex/contrib/biblatex/doc/examples/53-style-authoryear-icomp-bibtex.pdf
-2020/08/23 | 225925 | macros/latex/contrib/biblatex/doc/examples/53-style-authoryear-icomp-biber.pdf
-2020/08/23 | 2257 | macros/latex/contrib/biblatex/latex/cbx/alphabetic-verb.cbx
-2020/08/23 | 222705 | macros/latex/contrib/biblatex/doc/examples/63-style-authortitle-icomp-bibtex.pdf
-2020/08/23 | 222705 | macros/latex/contrib/biblatex/doc/examples/63-style-authortitle-icomp-biber.pdf
-2020/08/23 | 2190 | macros/latex/contrib/biblatex/latex/blx-natbib.def
-2020/08/23 | 21707 | macros/latex/contrib/biblatex/doc/examples/91-sorting-schemes-biber.pdf
-2020/08/23 | 213637 | macros/latex/contrib/biblatex/doc/examples/51-style-authoryear-ibid-bibtex.pdf
-2020/08/23 | 213637 | macros/latex/contrib/biblatex/doc/examples/51-style-authoryear-ibid-biber.pdf
-2020/08/23 | 2126 | macros/latex/contrib/biblatex/latex/blx-mcite.def
-2020/08/23 | 207853 | macros/latex/contrib/biblatex/doc/examples/02-annotations-biber.pdf
-2020/08/23 | 207478 | macros/latex/contrib/biblatex/doc/examples/02-annotations-bibtex.pdf
-2020/08/23 | 203055 | macros/latex/contrib/biblatex/doc/examples/61-style-authortitle-ibid-bibtex.pdf
-2020/08/23 | 203055 | macros/latex/contrib/biblatex/doc/examples/61-style-authortitle-ibid-biber.pdf
-2020/08/23 | 200075 | macros/latex/contrib/biblatex/doc/examples/40-style-alphabetic-biber.pdf
-2020/08/23 | 1994 | macros/latex/contrib/biblatex/doc/examples/10-references-per-section.tex
-2020/08/23 | 199318 | macros/latex/contrib/biblatex/doc/examples/40-style-alphabetic-bibtex.pdf
-2020/08/23 | 1988 | macros/latex/contrib/biblatex/doc/examples/40-style-alphabetic.tex
-2020/08/23 | 19781 | macros/latex/contrib/biblatex/latex/lbx/nynorsk.lbx
-2020/08/23 | 195323 | macros/latex/contrib/biblatex/doc/examples/64-style-authortitle-terse-bibtex.pdf
-2020/08/23 | 195323 | macros/latex/contrib/biblatex/doc/examples/64-style-authortitle-terse-biber.pdf
-2020/08/23 | 1942 | macros/latex/contrib/biblatex/doc/examples/16-numeric-prefixed-1.tex
-2020/08/23 | 1940544 | install/macros/xetex/latex/xecjk.tds.zip
-2020/08/23 | 1876 | macros/latex/contrib/biblatex/doc/examples/11-references-by-section.tex
-2020/08/23 | 187105 | macros/latex/contrib/biblatex/doc/examples/31-style-numeric-comp-bibtex.pdf
-2020/08/23 | 186808 | macros/latex/contrib/biblatex/doc/examples/31-style-numeric-comp-biber.pdf
-2020/08/23 | 18660244 | macros/latex/contrib/biblatex.zip
-2020/08/23 | 1863 | macros/latex/contrib/biblatex/doc/examples/16-numeric-prefixed-1-bibtex.tex
-2020/08/23 | 1828 | systems/texlive/tlnet/archive/collection-fontsextra.r56153.tar.xz
-2020/08/23 | 181606 | macros/latex/contrib/biblatex/doc/examples/32-style-numeric-verb-bibtex.pdf
-2020/08/23 | 181606 | macros/latex/contrib/biblatex/doc/examples/32-style-numeric-verb-biber.pdf
-2020/08/23 | 1808 | macros/latex/contrib/biblatex/latex/cbx/draft.cbx
-2020/08/23 | 1800 | macros/latex/contrib/biblatex/doc/examples/97-annotations.tex
-2020/08/23 | 17851212 | biblio/biber/binaries/FreeBSD/biber-amd64-freebsd.tar.xz
-2020/08/23 | 177233 | macros/latex/contrib/biblatex/doc/examples/30-style-numeric-bibtex.pdf
-2020/08/23 | 177233 | macros/latex/contrib/biblatex/doc/examples/30-style-numeric-biber.pdf
-2020/08/23 | 175130 | macros/latex/contrib/biblatex/doc/examples/13-references-by-keyword-bibtex.pdf
-2020/08/23 | 175130 | macros/latex/contrib/biblatex/doc/examples/13-references-by-keyword-biber.pdf
-2020/08/23 | 174634 | macros/latex/contrib/biblatex/doc/examples/14-references-by-category-bibtex.pdf
-2020/08/23 | 174634 | macros/latex/contrib/biblatex/doc/examples/14-references-by-category-biber.pdf
-2020/08/23 | 1731 | macros/latex/contrib/biblatex/latex/bbx/alphabetic.bbx
-2020/08/23 | 171712 | macros/latex/contrib/biblatex/doc/examples/21-indexing-multiple-biber.pdf
-2020/08/23 | 171031 | macros/latex/contrib/biblatex/doc/examples/21-indexing-multiple-bibtex.pdf
-2020/08/23 | 170519 | macros/latex/contrib/biblatex/doc/examples/20-indexing-single-biber.pdf
-2020/08/23 | 169 | macros/latex/contrib/biblatex/latex/lbx/american.lbx
-2020/08/23 | 169812 | macros/latex/contrib/biblatex/doc/examples/20-indexing-single-bibtex.pdf
-2020/08/23 | 1687 | macros/latex/contrib/biblatex/latex/bbx/numeric.bbx
-2020/08/23 | 1682 | macros/latex/contrib/biblatex/doc/examples/14-references-by-category.tex
-2020/08/23 | 167962 | macros/latex/contrib/biblatex/doc/examples/01-introduction-bibtex.pdf
-2020/08/23 | 167962 | macros/latex/contrib/biblatex/doc/examples/01-introduction-biber.pdf
-2020/08/23 | 16647 | macros/latex/contrib/biblatex/doc/examples/97-annotations-biber.pdf
-2020/08/23 | 163 | macros/latex/contrib/biblatex/latex/lbx/canadian.lbx
-2020/08/23 | 1623106 | macros/xetex/latex/xecjk.zip
-2020/08/23 | 159 | macros/latex/contrib/biblatex/doc/examples/95-customlists.dbx
-2020/08/23 | 15939228 | biblio/biber/binaries/FreeBSD/biber-i386-freebsd.tar.xz
-2020/08/23 | 1588759 | macros/latex/contrib/biblatex/doc/biblatex.pdf
-2020/08/23 | 158307 | macros/latex/contrib/biblatex/doc/examples/19-alphabetic-prefixed-biber.pdf
-2020/08/23 | 1580704 | install/language/chinese/ctex.tds.zip
-2020/08/23 | 157684 | macros/latex/contrib/biblatex/doc/examples/16-numeric-prefixed-1-biber.pdf
-2020/08/23 | 157659 | macros/latex/contrib/biblatex/doc/examples/17-numeric-prefixed-2-biber.pdf
-2020/08/23 | 157502 | macros/latex/contrib/biblatex/doc/examples/19-alphabetic-prefixed-bibtex.pdf
-2020/08/23 | 156536 | macros/latex/contrib/biblatex/doc/examples/16-numeric-prefixed-1-bibtex.pdf
-2020/08/23 | 156527 | macros/latex/contrib/biblatex/doc/examples/17-numeric-prefixed-2-bibtex.pdf
-2020/08/23 | 1549 | macros/latex/contrib/biblatex/doc/examples/92-bibliographylists.tex
-2020/08/23 | 1546 | macros/latex/contrib/biblatex/doc/examples/32-style-numeric-verb.tex
-2020/08/23 | 150179 | macros/latex/contrib/biblatex/doc/examples/82-style-debug-biber.pdf
-2020/08/23 | 149733 | macros/latex/contrib/biblatex/doc/examples/81-style-draft-bibtex.pdf
-2020/08/23 | 149733 | macros/latex/contrib/biblatex/doc/examples/81-style-draft-biber.pdf
-2020/08/23 | 148860 | macros/latex/contrib/biblatex/doc/examples/82-style-debug-bibtex.pdf
-2020/08/23 | 147776 | macros/latex/contrib/biblatex/doc/examples/66-style-authortitle-ticomp-bibtex.pdf
-2020/08/23 | 147776 | macros/latex/contrib/biblatex/doc/examples/66-style-authortitle-ticomp-biber.pdf
-2020/08/23 | 147304 | macros/latex/contrib/biblatex/doc/examples/52-style-authoryear-comp-bibtex.pdf
-2020/08/23 | 147304 | macros/latex/contrib/biblatex/doc/examples/52-style-authoryear-comp-biber.pdf
-2020/08/23 | 1455 | macros/latex/contrib/biblatex/doc/examples/19-alphabetic-prefixed-bibtex.tex
-2020/08/23 | 143176 | macros/latex/contrib/biblatex/doc/examples/65-style-authortitle-tcomp-bibtex.pdf
-2020/08/23 | 143176 | macros/latex/contrib/biblatex/doc/examples/65-style-authortitle-tcomp-biber.pdf
-2020/08/23 | 14153 | macros/latex/contrib/biblatex/doc/examples/74-style-verbose-trad1.tex
-2020/08/23 | 1409 | macros/latex/contrib/biblatex/doc/examples/19-alphabetic-prefixed.tex
-2020/08/23 | 1346 | macros/latex/contrib/biblatex/doc/examples/65-style-authortitle-tcomp.tex
-2020/08/23 | 1340 | macros/latex/contrib/biblatex/doc/examples/12-references-by-segment.tex
-2020/08/23 | 1334 | macros/latex/contrib/biblatex/doc/examples/62-style-authortitle-comp.tex
-2020/08/23 | 132 | macros/latex/contrib/biblatex/latex/lbx/portuges.lbx
-2020/08/23 | 132465 | macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bltxml
-2020/08/23 | 132465 | macros/latex/contrib/biblatex/biber/bltxml/biblatex-examples.bltxml
-2020/08/23 | 13243 | macros/latex/contrib/biblatex/latex/blx-compat.def
-2020/08/23 | 1311 | macros/latex/contrib/biblatex/doc/examples/13-references-by-keyword.tex
-2020/08/23 | 129 | macros/latex/contrib/biblatex/latex/lbx/USenglish.lbx
-2020/08/23 | 1291521 | macros/xetex/latex/xecjk/xeCJK.pdf
-2020/08/23 | 128 | macros/latex/contrib/biblatex/latex/lbx/brazil.lbx
-2020/08/23 | 1287 | macros/latex/contrib/biblatex/doc/examples/17-numeric-prefixed-2.tex
-2020/08/23 | 1284 | macros/latex/contrib/biblatex/latex/cbx/authortitle-terse.cbx
-2020/08/23 | 127 | macros/latex/contrib/biblatex/latex/lbx/UKenglish.lbx
-2020/08/23 | 127 | macros/latex/contrib/biblatex/latex/lbx/slovenian.lbx
-2020/08/23 | 12770 | macros/latex/contrib/biblatex/doc/examples/93-nameparts.tex
-2020/08/23 | 126042 | macros/latex/contrib/biblatex/doc/examples/62-style-authortitle-comp-bibtex.pdf
-2020/08/23 | 126042 | macros/latex/contrib/biblatex/doc/examples/62-style-authortitle-comp-biber.pdf
-2020/08/23 | 125 | macros/latex/contrib/biblatex/latex/lbx/hungarian.lbx
-2020/08/23 | 12296 | macros/latex/contrib/biblatex/doc/examples/95-customlists-biber.pdf
-2020/08/23 | 1206 | macros/latex/contrib/biblatex/doc/examples/17-numeric-prefixed-2-bibtex.tex
-2020/08/23 | 1194538 | language/chinese/ctex.zip
-2020/08/23 | 119269 | macros/latex/contrib/biblatex/doc/examples/15-references-by-type-bibtex.pdf
-2020/08/23 | 119269 | macros/latex/contrib/biblatex/doc/examples/15-references-by-type-biber.pdf
-2020/08/23 | 112916 | macros/latex/contrib/biblatex/doc/examples/18-numeric-hybrid-bibtex.pdf
-2020/08/23 | 112916 | macros/latex/contrib/biblatex/doc/examples/18-numeric-hybrid-biber.pdf
-2020/08/23 | 111947 | macros/latex/contrib/biblatex/doc/examples/41-style-alphabetic-verb-bibtex.pdf
-2020/08/23 | 111947 | macros/latex/contrib/biblatex/doc/examples/41-style-alphabetic-verb-biber.pdf
-2020/08/23 | 1115663 | language/chinese/ctex/ctex.pdf
-2020/08/23 | 10374 | macros/latex/contrib/biblatex/latex/cbx/numeric-comp.cbx
-2020/08/23 | 102 | macros/latex/contrib/biblatex/latex/bbx/authortitle-ticomp.bbx
-2020/08/23 | 102 | macros/latex/contrib/biblatex/doc/examples/93-nameparts.dbx
-2020/08/23 | 1029 | macros/latex/contrib/biblatex/latex/bbx/draft.bbx
-2020/08/23 | 1029383 | macros/latex/contrib/biblatex/doc/biblatex.tex
-2020/08/23 | 101 | macros/latex/contrib/biblatex/latex/bbx/authortitle-terse.bbx
-2020/08/23 | 101 | macros/latex/contrib/biblatex/latex/bbx/authortitle-tcomp.bbx
-2020/08/23 | 101 | macros/latex/contrib/biblatex/latex/bbx/authortitle-icomp.bbx
-2020/08/23 | 101002 | macros/latex/contrib/biblatex/doc/examples/42-style-alphabetic-template-bibtex.pdf
-2020/08/23 | 101002 | macros/latex/contrib/biblatex/doc/examples/42-style-alphabetic-template-biber.pdf
-2020/08/23 | 100 | macros/latex/contrib/biblatex/latex/bbx/authortitle-ibid.bbx
-2020/08/23 | 100 | macros/latex/contrib/biblatex/latex/bbx/authortitle-comp.bbx
diff --git a/fonts/merriweather/README b/fonts/merriweather/README
index d432aa7bab..76b4706d7d 100644
--- a/fonts/merriweather/README
+++ b/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/fonts/merriweather/doc/merriweather-samples.pdf b/fonts/merriweather/doc/merriweather-samples.pdf
index e8ef6f1af5..deae8b5c9b 100644
--- a/fonts/merriweather/doc/merriweather-samples.pdf
+++ b/fonts/merriweather/doc/merriweather-samples.pdf
Binary files differ
diff --git a/fonts/merriweather/doc/merriweather-samples.tex b/fonts/merriweather/doc/merriweather-samples.tex
index 454003f116..f519079255 100644
--- a/fonts/merriweather/doc/merriweather-samples.tex
+++ b/fonts/merriweather/doc/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
diff --git a/fonts/merriweather/enc/merriwthr_27vehb.enc b/fonts/merriweather/enc/merriwthr_27vehb.enc
new file mode 100644
index 0000000000..e71d655e0a
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_27vehb.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_27vehb5m3cihxu3ac3lncxkf3b
+% Encoding created by otftotfm on Sun Aug 30 08:19:45 2020
+% Command line follows encoding
+/AutoEnc_27vehb5m3cihxu3ac3lncxkf3b [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /exclamdown.sc /equal /questiondown.sc /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /quotedblleft /bracketright.sc /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=smcp --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall Merriwthr-BlackItalic.otf
+% Merriwthr-BlackItalic-tlf-sc-ot1'
diff --git a/fonts/merriweather/enc/merriwthr_2hyv6t.enc b/fonts/merriweather/enc/merriwthr_2hyv6t.enc
new file mode 100644
index 0000000000..cc87164397
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_2hyv6t.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_2hyv6tfov4dx2meqej4mzahcwf
+% Encoding created by otftotfm on Sun Aug 30 08:19:07 2020
+% Command line follows encoding
+/AutoEnc_2hyv6tfov4dx2meqej4mzahcwf [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi.sc /uni0237.sc /.notdef /fi /fl /.notdef /.notdef
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% MerriwthrSans-Bold.otf MerriwthrSans-Bold-osf-sc-t1'
diff --git a/fonts/merriweather/enc/merriwthr_2j7grf.enc b/fonts/merriweather/enc/merriwthr_2j7grf.enc
new file mode 100644
index 0000000000..1470d5f2dd
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_2j7grf.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_2j7grfe4celkaswwxdgd6kmn7h
+% Encoding created by otftotfm on Sun Aug 30 08:19:54 2020
+% Command line follows encoding
+/AutoEnc_2j7grfe4celkaswwxdgd6kmn7h [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /backslash /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft.sc /bar /braceright.sc /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown.sc /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Merriwthr-Black.otf Merriwthr-Black-tlf-sc-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_2r7lb2.enc b/fonts/merriweather/enc/merriwthr_2r7lb2.enc
new file mode 100644
index 0000000000..54b1863483
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_2r7lb2.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_2r7lb2mrks3igmx77ochduaeld
+% Encoding created by otftotfm on Sun Aug 30 08:19:07 2020
+% Command line follows encoding
+/AutoEnc_2r7lb2mrks3igmx77ochduaeld [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi.sc /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=pnum --feature=smcp --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall MerriwthrSans-Bold.otf
+% MerriwthrSans-Bold-osf-sc-ot1'
diff --git a/fonts/merriweather/enc/merriwthr_4ylisx.enc b/fonts/merriweather/enc/merriwthr_4ylisx.enc
new file mode 100644
index 0000000000..8fc74d4f8b
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_4ylisx.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_4ylisx4bjukj4ykfse7sl6as3b
+% Encoding created by otftotfm on Sun Aug 30 08:19:47 2020
+% Command line follows encoding
+/AutoEnc_4ylisx4bjukj4ykfse7sl6as3b [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.sc /one.sc /two.sc /three.sc /four.sc /five.sc /six.sc /seven.sc
+ /eight.sc /nine.sc /colon /semicolon /exclamdown.sc /equal /questiondown.sc /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /quotedblleft /bracketright.sc /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --feature=smcp --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall Merriwthr-BlackItalic.otf
+% Merriwthr-BlackItalic-lf-sc-ot1'
diff --git a/fonts/merriweather/enc/merriwthr_5lck5z.enc b/fonts/merriweather/enc/merriwthr_5lck5z.enc
new file mode 100644
index 0000000000..0de5ee5808
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_5lck5z.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_5lck5zupnxcvrb5zmzavlitmja
+% Encoding created by otftotfm on Sun Aug 30 08:19:53 2020
+% Command line follows encoding
+/AutoEnc_5lck5zupnxcvrb5zmzavlitmja [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /exclamdown.sc /equal /questiondown.sc /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /quotedblleft /bracketright.sc /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=smcp --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall Merriwthr-Black.otf
+% Merriwthr-Black-tlf-sc-ot1'
diff --git a/fonts/merriweather/enc/mwthr_czxicq.enc b/fonts/merriweather/enc/merriwthr_5xld5w.enc
index 69656bea24..10d4b7f666 100644
--- a/fonts/merriweather/enc/mwthr_czxicq.enc
+++ b/fonts/merriweather/enc/merriwthr_5xld5w.enc
@@ -1,21 +1,21 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_czxicqvoi7gergm2nqp7s2dfph
-% Encoding created by otftotfm on Thu Jul 30 08:43:50 2020
+%%AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c
+% Encoding created by otftotfm on Sun Aug 30 08:18:59 2020
% Command line follows encoding
-/AutoEnc_czxicqvoi7gergm2nqp7s2dfph [
+/AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c [
%00
- /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
%20
/space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
- /zero /onesuperior /twosuperior /threesuperior /four /five /six /seven
- /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+ /uni2070 /uni00B9 /uni00B2 /uni00B3 /uni2074 /uni2075 /uni2076 /uni2077
+ /uni2078 /uni2079 /colon /semicolon /exclamdown /equal /questiondown /question
%40
/at /A /B /C /D /E /F /G
/H /I /J /K /L /M /N /O
@@ -56,8 +56,8 @@
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
% --vf-directory=texmf/fonts/vf/sorkin/merriweather
-% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
% --encoding-directory=texmf/fonts/enc/dvips/merriweather
% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
-% --no-updmap --no-type1 --coding-scheme=TEX TEXT --feature=sups --ligkern=*
-% {KL} * MerriwthrSans-BoldItalic.ttf MerriwthrSans-BoldItalic-sup-ot1'
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=sups --ligkern=*
+% {KL} * MerriwthrSans-BoldItalic.otf MerriwthrSans-BoldItalic-sup-ot1'
diff --git a/fonts/merriweather/enc/merriwthr_6qeh6o.enc b/fonts/merriweather/enc/merriwthr_6qeh6o.enc
new file mode 100644
index 0000000000..3356fc4d39
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_6qeh6o.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_6qeh6o3hklpdqb33emvpqseuyh
+% Encoding created by otftotfm on Sun Aug 30 08:19:02 2020
+% Command line follows encoding
+/AutoEnc_6qeh6o3hklpdqb33emvpqseuyh [
+%00
+ /f_f /Euro /f_f_i /f_f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl MerriwthrSans-BoldItalic.otf
+% MerriwthrSans-BoldItalic-osf-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_7bivwm.enc b/fonts/merriweather/enc/merriwthr_7bivwm.enc
new file mode 100644
index 0000000000..5b71bd6ef1
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_7bivwm.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_7bivwmjuams2tgf2xlzum3iuzc
+% Encoding created by otftotfm on Sun Aug 30 08:19:06 2020
+% Command line follows encoding
+/AutoEnc_7bivwmjuams2tgf2xlzum3iuzc [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi.sc /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% MerriwthrSans-Bold.otf MerriwthrSans-Bold-tosf-sc-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_7jdyhk.enc b/fonts/merriweather/enc/merriwthr_7jdyhk.enc
new file mode 100644
index 0000000000..cef89277d2
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_7jdyhk.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_7jdyhkndsyrev6wof6cyijpmpe
+% Encoding created by otftotfm on Sun Aug 30 08:19:56 2020
+% Command line follows encoding
+/AutoEnc_7jdyhkndsyrev6wof6cyijpmpe [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.sc /one.sc /two.sc /three.sc /four.sc /five.sc /six.sc /seven.sc
+ /eight.sc /nine.sc /colon /semicolon /exclamdown.sc /equal /questiondown.sc /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /quotedblleft /bracketright.sc /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --feature=smcp --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall Merriwthr-Black.otf
+% Merriwthr-Black-lf-sc-ot1'
diff --git a/fonts/merriweather/enc/merriwthr_7npxgm.enc b/fonts/merriweather/enc/merriwthr_7npxgm.enc
new file mode 100644
index 0000000000..3b9b880451
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_7npxgm.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_7npxgm2htdezd6aegz2nrfnmta
+% Encoding created by otftotfm on Sun Aug 30 08:18:58 2020
+% Command line follows encoding
+/AutoEnc_7npxgm2htdezd6aegz2nrfnmta [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_f /f_f_i /f_f_l /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% MerriwthrSans-BoldItalic.otf MerriwthrSans-BoldItalic-tlf-ot1'
diff --git a/fonts/merriweather/enc/merriwthr_7t3tp2.enc b/fonts/merriweather/enc/merriwthr_7t3tp2.enc
new file mode 100644
index 0000000000..0d3f119615
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_7t3tp2.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_7t3tp2q6bx5fixcoyjapcimq3f
+% Encoding created by otftotfm on Sun Aug 30 08:19:06 2020
+% Command line follows encoding
+/AutoEnc_7t3tp2q6bx5fixcoyjapcimq3f [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi.sc /uni0237.sc /.notdef /fi /fl /.notdef /.notdef
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% MerriwthrSans-Bold.otf MerriwthrSans-Bold-tosf-sc-t1'
diff --git a/fonts/merriweather/enc/merriwthr_7tayun.enc b/fonts/merriweather/enc/merriwthr_7tayun.enc
new file mode 100644
index 0000000000..629d84accf
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_7tayun.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_7tayunkz3krd6mqtntm4yqbzhc
+% Encoding created by otftotfm on Sun Aug 30 08:19:07 2020
+% Command line follows encoding
+/AutoEnc_7tayunkz3krd6mqtntm4yqbzhc [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi.sc /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% MerriwthrSans-Bold.otf MerriwthrSans-Bold-osf-sc-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_abao47.enc b/fonts/merriweather/enc/merriwthr_abao47.enc
new file mode 100644
index 0000000000..a70f7ba4cb
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_abao47.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_abao47xoatoxdwsybjc3c2ar6d
+% Encoding created by otftotfm on Sun Aug 30 08:19:51 2020
+% Command line follows encoding
+/AutoEnc_abao47xoatoxdwsybjc3c2ar6d [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /exclamdown.sc /equal /questiondown.sc /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /quotedblleft /bracketright.sc /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=pnum --feature=smcp --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall Merriwthr-BlackItalic.otf
+% Merriwthr-BlackItalic-osf-sc-ot1'
diff --git a/fonts/merriweather/enc/mwthr_tvbl63.enc b/fonts/merriweather/enc/merriwthr_adz5lu.enc
index c16d6c1324..5582e0df7f 100644
--- a/fonts/merriweather/enc/mwthr_tvbl63.enc
+++ b/fonts/merriweather/enc/merriwthr_adz5lu.enc
@@ -1,14 +1,14 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb
-% Encoding created by otftotfm on Thu Jul 30 08:43:50 2020
+%%AutoEnc_adz5lu2pubiora2jv2qajnuogc
+% Encoding created by otftotfm on Sun Aug 30 08:18:59 2020
% Command line follows encoding
-/AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb [
+/AutoEnc_adz5lu2pubiora2jv2qajnuogc [
%00
- /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
%20
/space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
@@ -29,7 +29,7 @@
/p /q /r /s /t /u /v /w
/x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
%80
- /f_f /f_i /f_l /f_f_i /f_f_l /.notdef /.notdef /.notdef
+ /f_f /f_f_i /f_f_l /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -56,10 +56,10 @@
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
% --vf-directory=texmf/fonts/vf/sorkin/merriweather
-% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
% --encoding-directory=texmf/fonts/enc/dvips/merriweather
% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
-% --no-updmap --no-type1 --coding-scheme=TEX TEXT --feature=liga --ligkern=f
-% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl MerriwthrSans-BoldItalic.ttf
-% MerriwthrSans-BoldItalic-osf-ot1'
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% MerriwthrSans-BoldItalic.otf MerriwthrSans-BoldItalic-lf-ot1'
diff --git a/fonts/merriweather/enc/merriwthr_afua2j.enc b/fonts/merriweather/enc/merriwthr_afua2j.enc
new file mode 100644
index 0000000000..5e23d3bbe9
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_afua2j.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_afua2jwl273trfqxqlndomfbjh
+% Encoding created by otftotfm on Sun Aug 30 08:19:57 2020
+% Command line follows encoding
+/AutoEnc_afua2jwl273trfqxqlndomfbjh [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.sc /one.sc /two.sc /three.sc /four.sc /five.sc /six.sc /seven.sc
+ /eight.sc /nine.sc /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /backslash /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft.sc /bar /braceright.sc /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown.sc /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Merriwthr-Black.otf Merriwthr-Black-lf-sc-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_ags7qn.enc b/fonts/merriweather/enc/merriwthr_ags7qn.enc
new file mode 100644
index 0000000000..83b5ad87a6
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_ags7qn.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ags7qn2hkkgrahlkz4jfjwrd7e
+% Encoding created by otftotfm on Sun Aug 30 08:19:01 2020
+% Command line follows encoding
+/AutoEnc_ags7qn2hkkgrahlkz4jfjwrd7e [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /f_f /dotlessi /uni0237 /f_f_i /fi /fl /f_f_l /.notdef
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=onum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl MerriwthrSans-BoldItalic.otf
+% MerriwthrSans-BoldItalic-osf-t1'
diff --git a/fonts/merriweather/enc/merriwthr_ah5y5a.enc b/fonts/merriweather/enc/merriwthr_ah5y5a.enc
new file mode 100644
index 0000000000..14aec51fe4
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_ah5y5a.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ah5y5aw36djf33hoctce7xgaqg
+% Encoding created by otftotfm on Sun Aug 30 08:19:52 2020
+% Command line follows encoding
+/AutoEnc_ah5y5aw36djf33hoctce7xgaqg [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /backslash /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft.sc /bar /braceright.sc /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown.sc /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-osf-sc-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_b6rchs.enc b/fonts/merriweather/enc/merriwthr_b6rchs.enc
new file mode 100644
index 0000000000..f01f383f87
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_b6rchs.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_b6rchsdcccdbohxqpazo7dpjpe
+% Encoding created by otftotfm on Sun Aug 30 08:19:54 2020
+% Command line follows encoding
+/AutoEnc_b6rchsdcccdbohxqpazo7dpjpe [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi /uni0237.sc /.notdef /fi /fl /.notdef /.notdef
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /backslash /bracketright.sc /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft.sc /bar /braceright.sc /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Merriwthr-Black.otf Merriwthr-Black-tlf-sc-t1'
diff --git a/fonts/merriweather/enc/merriwthr_btdrxl.enc b/fonts/merriweather/enc/merriwthr_btdrxl.enc
new file mode 100644
index 0000000000..0157744b71
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_btdrxl.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_btdrxlukgdjwcqxq6mrycdd2td
+% Encoding created by otftotfm on Sun Aug 30 08:19:00 2020
+% Command line follows encoding
+/AutoEnc_btdrxlukgdjwcqxq6mrycdd2td [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi.sc /uni0237.sc /.notdef /fi /fl /.notdef /.notdef
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.sc /one.sc /two.sc /three.sc /four.sc /five.sc /six.sc /seven.sc
+ /eight.sc /nine.sc /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% MerriwthrSans-BoldItalic.otf MerriwthrSans-BoldItalic-lf-sc-t1'
diff --git a/fonts/merriweather/enc/merriwthr_c4h6ot.enc b/fonts/merriweather/enc/merriwthr_c4h6ot.enc
new file mode 100644
index 0000000000..09588d8883
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_c4h6ot.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_c4h6otdvt6kvqx2jiclefoedfe
+% Encoding created by otftotfm on Sun Aug 30 08:19:44 2020
+% Command line follows encoding
+/AutoEnc_c4h6otdvt6kvqx2jiclefoedfe [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-tlf-ot1'
diff --git a/fonts/merriweather/enc/merriwthr_cc6s4l.enc b/fonts/merriweather/enc/merriwthr_cc6s4l.enc
new file mode 100644
index 0000000000..91c549833d
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_cc6s4l.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_cc6s4lvadopwb3xu3rnm75smbf
+% Encoding created by otftotfm on Sun Aug 30 08:19:04 2020
+% Command line follows encoding
+/AutoEnc_cc6s4lvadopwb3xu3rnm75smbf [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi.sc /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.sc /one.sc /two.sc /three.sc /four.sc /five.sc /six.sc /seven.sc
+ /eight.sc /nine.sc /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --feature=smcp --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall MerriwthrSans-Bold.otf
+% MerriwthrSans-Bold-lf-sc-ot1'
diff --git a/fonts/merriweather/enc/merriwthr_ckyw6q.enc b/fonts/merriweather/enc/merriwthr_ckyw6q.enc
new file mode 100644
index 0000000000..6991390ddb
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_ckyw6q.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ckyw6qgt6catbf5a63k2jhbete
+% Encoding created by otftotfm on Sun Aug 30 08:19:00 2020
+% Command line follows encoding
+/AutoEnc_ckyw6qgt6catbf5a63k2jhbete [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi.sc /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.sc /one.sc /two.sc /three.sc /four.sc /five.sc /six.sc /seven.sc
+ /eight.sc /nine.sc /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% MerriwthrSans-BoldItalic.otf MerriwthrSans-BoldItalic-lf-sc-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_cqy4t2.enc b/fonts/merriweather/enc/merriwthr_cqy4t2.enc
new file mode 100644
index 0000000000..4b1c866af0
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_cqy4t2.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_cqy4t2lohtwiuyuqloqvrnwroh
+% Encoding created by otftotfm on Sun Aug 30 08:19:05 2020
+% Command line follows encoding
+/AutoEnc_cqy4t2lohtwiuyuqloqvrnwroh [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi.sc /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.sc /one.sc /two.sc /three.sc /four.sc /five.sc /six.sc /seven.sc
+ /eight.sc /nine.sc /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% MerriwthrSans-Bold.otf MerriwthrSans-Bold-lf-sc-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_cvdnuw.enc b/fonts/merriweather/enc/merriwthr_cvdnuw.enc
new file mode 100644
index 0000000000..b3efa2ef17
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_cvdnuw.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_cvdnuwpmerv3rzww7xrfph4beh
+% Encoding created by otftotfm on Sun Aug 30 08:19:01 2020
+% Command line follows encoding
+/AutoEnc_cvdnuwpmerv3rzww7xrfph4beh [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi.sc /uni0237.sc /.notdef /fi /fl /.notdef /.notdef
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% MerriwthrSans-BoldItalic.otf MerriwthrSans-BoldItalic-tosf-sc-t1'
diff --git a/fonts/merriweather/enc/mwthr_3g4t7f.enc b/fonts/merriweather/enc/merriwthr_cy3ufi.enc
index 23e296c33c..3d89cf3cbf 100644
--- a/fonts/merriweather/enc/mwthr_3g4t7f.enc
+++ b/fonts/merriweather/enc/merriwthr_cy3ufi.enc
@@ -1,21 +1,21 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_3g4t7fcjh3tc6ptea3fgbusogg
-% Encoding created by otftotfm on Thu Jul 30 08:43:50 2020
+%%AutoEnc_cy3ufib4i3gsgczcb7bl5ni5hb
+% Encoding created by otftotfm on Sun Aug 30 08:18:59 2020
% Command line follows encoding
-/AutoEnc_3g4t7fcjh3tc6ptea3fgbusogg [
+/AutoEnc_cy3ufib4i3gsgczcb7bl5ni5hb [
%00
/.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /.notdef /.notdef /zerowidthnonjoiner /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /.notdef /.notdef
%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
%20
/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
- /zero /onesuperior /twosuperior /threesuperior /four /five /six /seven
- /eight /nine /colon /semicolon /less /equal /greater /question
+ /uni2070 /uni00B9 /uni00B2 /uni00B3 /uni2074 /uni2075 /uni2076 /uni2077
+ /uni2078 /uni2079 /colon /semicolon /less /equal /greater /question
%40
/at /A /B /C /D /E /F /G
/H /I /J /K /L /M /N /O
@@ -35,11 +35,11 @@
/lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
%A0
- /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
- /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
- /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
%C0
/Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
/Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
@@ -56,9 +56,9 @@
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
% --vf-directory=texmf/fonts/vf/sorkin/merriweather
-% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
% --encoding-directory=texmf/fonts/enc/dvips/merriweather
% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
-% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=sups --ligkern=* {KL} * MerriwthrSans-BoldItalic.ttf
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=sups --ligkern=* {KL} * MerriwthrSans-BoldItalic.otf
% MerriwthrSans-BoldItalic-sup-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_diijaa.enc b/fonts/merriweather/enc/merriwthr_diijaa.enc
new file mode 100644
index 0000000000..d7991da0cf
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_diijaa.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_diijaagendozmspoxxqdz27yxg
+% Encoding created by otftotfm on Sun Aug 30 08:19:56 2020
+% Command line follows encoding
+/AutoEnc_diijaagendozmspoxxqdz27yxg [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi /uni0237.sc /.notdef /fi /fl /.notdef /.notdef
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.sc /one.sc /two.sc /three.sc /four.sc /five.sc /six.sc /seven.sc
+ /eight.sc /nine.sc /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /backslash /bracketright.sc /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft.sc /bar /braceright.sc /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Merriwthr-Black.otf Merriwthr-Black-lf-sc-t1'
diff --git a/fonts/merriweather/enc/merriwthr_dl4a4c.enc b/fonts/merriweather/enc/merriwthr_dl4a4c.enc
new file mode 100644
index 0000000000..e334907032
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_dl4a4c.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_dl4a4cd6a23xd5xgvepmqyb43h
+% Encoding created by otftotfm on Sun Aug 30 08:19:52 2020
+% Command line follows encoding
+/AutoEnc_dl4a4cd6a23xd5xgvepmqyb43h [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi /uni0237.sc /.notdef /fi /fl /.notdef /.notdef
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /backslash /bracketright.sc /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft.sc /bar /braceright.sc /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-osf-sc-t1'
diff --git a/fonts/merriweather/enc/merriwthr_dx3n55.enc b/fonts/merriweather/enc/merriwthr_dx3n55.enc
new file mode 100644
index 0000000000..5f22389a01
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_dx3n55.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_dx3n55r2uvpk75edgtlquzem7g
+% Encoding created by otftotfm on Sun Aug 30 08:18:59 2020
+% Command line follows encoding
+/AutoEnc_dx3n55r2uvpk75edgtlquzem7g [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi.sc /uni0237.sc /.notdef /fi /fl /.notdef /.notdef
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% MerriwthrSans-BoldItalic.otf MerriwthrSans-BoldItalic-tlf-sc-t1'
diff --git a/fonts/merriweather/enc/merriwthr_e2idhw.enc b/fonts/merriweather/enc/merriwthr_e2idhw.enc
new file mode 100644
index 0000000000..f78384d056
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_e2idhw.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_e2idhw5l3f6krq5sjxsu7h333h
+% Encoding created by otftotfm on Sun Aug 30 08:19:44 2020
+% Command line follows encoding
+/AutoEnc_e2idhw5l3f6krq5sjxsu7h333h [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi /uni0237 /.notdef /fi /fl /.notdef /.notdef
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-tlf-t1'
diff --git a/fonts/merriweather/enc/merriwthr_e5zf5y.enc b/fonts/merriweather/enc/merriwthr_e5zf5y.enc
new file mode 100644
index 0000000000..a8c4c10184
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_e5zf5y.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_e5zf5ydrjxeuko6a4z6jh2orca
+% Encoding created by otftotfm on Sun Aug 30 08:19:03 2020
+% Command line follows encoding
+/AutoEnc_e5zf5ydrjxeuko6a4z6jh2orca [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi.sc /uni0237.sc /.notdef /fi /fl /.notdef /.notdef
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% MerriwthrSans-Bold.otf MerriwthrSans-Bold-tlf-sc-t1'
diff --git a/fonts/merriweather/enc/merriwthr_f5n6m3.enc b/fonts/merriweather/enc/merriwthr_f5n6m3.enc
new file mode 100644
index 0000000000..715743b3e7
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_f5n6m3.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_f5n6m3o7woi5yzxjhungu6czrc
+% Encoding created by otftotfm on Sun Aug 30 08:19:45 2020
+% Command line follows encoding
+/AutoEnc_f5n6m3o7woi5yzxjhungu6czrc [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /backslash /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft.sc /bar /braceright.sc /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown.sc /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-tlf-sc-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_fs3efe.enc b/fonts/merriweather/enc/merriwthr_fs3efe.enc
new file mode 100644
index 0000000000..9513175b4b
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_fs3efe.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_fs3efepejn3awlhjrbqbmbyure
+% Encoding created by otftotfm on Sun Aug 30 08:19:50 2020
+% Command line follows encoding
+/AutoEnc_fs3efepejn3awlhjrbqbmbyure [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /backslash /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft.sc /bar /braceright.sc /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown.sc /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-tosf-sc-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_gbcczm.enc b/fonts/merriweather/enc/merriwthr_gbcczm.enc
new file mode 100644
index 0000000000..9a5df54150
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_gbcczm.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_gbcczmajeintwgetcl4kujtw4a
+% Encoding created by otftotfm on Sun Aug 30 08:19:02 2020
+% Command line follows encoding
+/AutoEnc_gbcczmajeintwgetcl4kujtw4a [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi.sc /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% MerriwthrSans-BoldItalic.otf MerriwthrSans-BoldItalic-osf-sc-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_gdbfjs.enc b/fonts/merriweather/enc/merriwthr_gdbfjs.enc
new file mode 100644
index 0000000000..21db389b6d
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_gdbfjs.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_gdbfjstdbnpx2a3bbc3ldeyfza
+% Encoding created by otftotfm on Sun Aug 30 08:19:03 2020
+% Command line follows encoding
+/AutoEnc_gdbfjstdbnpx2a3bbc3ldeyfza [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi.sc /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=smcp --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall MerriwthrSans-Bold.otf
+% MerriwthrSans-Bold-tlf-sc-ot1'
diff --git a/fonts/merriweather/enc/merriwthr_gldhmf.enc b/fonts/merriweather/enc/merriwthr_gldhmf.enc
new file mode 100644
index 0000000000..e8f666eab8
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_gldhmf.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_gldhmf3wvb2ea2ood5x6iaa77d
+% Encoding created by otftotfm on Sun Aug 30 08:18:58 2020
+% Command line follows encoding
+/AutoEnc_gldhmf3wvb2ea2ood5x6iaa77d [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /f_f /dotlessi /uni0237 /f_f_i /fi /fl /f_f_l /.notdef
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=lnum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl MerriwthrSans-BoldItalic.otf
+% MerriwthrSans-BoldItalic-tlf-t1'
diff --git a/fonts/merriweather/enc/mwthr_clyrx2.enc b/fonts/merriweather/enc/merriwthr_gmchnq.enc
index 59e7895bd9..f5db83a02c 100644
--- a/fonts/merriweather/enc/mwthr_clyrx2.enc
+++ b/fonts/merriweather/enc/merriwthr_gmchnq.enc
@@ -1,15 +1,15 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe
-% Encoding created by otftotfm on Thu Jul 30 08:43:35 2020
+%%AutoEnc_gmchnqiogedxb6eqrw52occsyg
+% Encoding created by otftotfm on Sun Aug 30 08:19:47 2020
% Command line follows encoding
-/AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe [
+/AutoEnc_gmchnqiogedxb6eqrw52occsyg [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
%10
- /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /zerowidthnonjoiner
- /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi /uni0237 /.notdef /fi /fl /.notdef /.notdef
%20
/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -56,8 +56,10 @@
% Command line: 'otftotfm --automatic --encoding=fontools_t1
% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
% --vf-directory=texmf/fonts/vf/sorkin/merriweather
-% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
% --encoding-directory=texmf/fonts/enc/dvips/merriweather
% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
-% --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% Merriwthr-BoldIt.ttf Merriwthr-BoldItalic-osf-t1'
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-lf-t1'
diff --git a/fonts/merriweather/enc/merriwthr_h6z4fc.enc b/fonts/merriweather/enc/merriwthr_h6z4fc.enc
new file mode 100644
index 0000000000..04f88550f8
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_h6z4fc.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_h6z4fchqakiptcatrec23y7rcc
+% Encoding created by otftotfm on Sun Aug 30 08:19:48 2020
+% Command line follows encoding
+/AutoEnc_h6z4fchqakiptcatrec23y7rcc [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi /uni0237.sc /.notdef /fi /fl /.notdef /.notdef
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.sc /one.sc /two.sc /three.sc /four.sc /five.sc /six.sc /seven.sc
+ /eight.sc /nine.sc /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /backslash /bracketright.sc /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft.sc /bar /braceright.sc /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-lf-sc-t1'
diff --git a/fonts/merriweather/enc/merriwthr_h7gtfv.enc b/fonts/merriweather/enc/merriwthr_h7gtfv.enc
new file mode 100644
index 0000000000..fd3077fb28
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_h7gtfv.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_h7gtfvyqvtclf7jusn2dcrzzrf
+% Encoding created by otftotfm on Sun Aug 30 08:18:59 2020
+% Command line follows encoding
+/AutoEnc_h7gtfvyqvtclf7jusn2dcrzzrf [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi.sc /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=smcp --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall MerriwthrSans-BoldItalic.otf
+% MerriwthrSans-BoldItalic-tlf-sc-ot1'
diff --git a/fonts/merriweather/enc/mwthr_iuohxq.enc b/fonts/merriweather/enc/merriwthr_hwcxwn.enc
index 1d79aeb94c..65cc37a427 100644
--- a/fonts/merriweather/enc/mwthr_iuohxq.enc
+++ b/fonts/merriweather/enc/merriwthr_hwcxwn.enc
@@ -1,15 +1,15 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_iuohxqr2qb6k5t77legm5nsxle
-% Encoding created by otftotfm on Thu Jul 30 08:43:50 2020
+%%AutoEnc_hwcxwnwusbuaheqcgocu67s3qd
+% Encoding created by otftotfm on Sun Aug 30 08:19:00 2020
% Command line follows encoding
-/AutoEnc_iuohxqr2qb6k5t77legm5nsxle [
+/AutoEnc_hwcxwnwusbuaheqcgocu67s3qd [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
%10
- /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /zerowidthnonjoiner
- /f_f /dotlessi /dotlessj /f_i /f_l /f_f_i /f_f_l /.notdef
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /f_f /dotlessi /uni0237 /f_f_i /fi /fl /f_f_l /.notdef
%20
/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -56,10 +56,11 @@
% Command line: 'otftotfm --automatic --encoding=fontools_t1
% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
% --vf-directory=texmf/fonts/vf/sorkin/merriweather
-% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
% --encoding-directory=texmf/fonts/enc/dvips/merriweather
% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
-% --no-updmap --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl MerriwthrSans-BoldItalic.ttf
-% MerriwthrSans-BoldItalic-osf-t1'
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl MerriwthrSans-BoldItalic.otf
+% MerriwthrSans-BoldItalic-lf-t1'
diff --git a/fonts/merriweather/enc/merriwthr_hz3jhh.enc b/fonts/merriweather/enc/merriwthr_hz3jhh.enc
new file mode 100644
index 0000000000..9d233d5e5d
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_hz3jhh.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_hz3jhhwfqeh3tu3dbvcfoqqvqe
+% Encoding created by otftotfm on Sun Aug 30 08:19:00 2020
+% Command line follows encoding
+/AutoEnc_hz3jhhwfqeh3tu3dbvcfoqqvqe [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi.sc /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.sc /one.sc /two.sc /three.sc /four.sc /five.sc /six.sc /seven.sc
+ /eight.sc /nine.sc /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --feature=smcp --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall MerriwthrSans-BoldItalic.otf
+% MerriwthrSans-BoldItalic-lf-sc-ot1'
diff --git a/fonts/merriweather/enc/merriwthr_ibepov.enc b/fonts/merriweather/enc/merriwthr_ibepov.enc
new file mode 100644
index 0000000000..cc6aa48936
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_ibepov.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ibepovaibzx3d7em6a74gi3zsf
+% Encoding created by otftotfm on Sun Aug 30 08:19:48 2020
+% Command line follows encoding
+/AutoEnc_ibepovaibzx3d7em6a74gi3zsf [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.sc /one.sc /two.sc /three.sc /four.sc /five.sc /six.sc /seven.sc
+ /eight.sc /nine.sc /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /backslash /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft.sc /bar /braceright.sc /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown.sc /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-lf-sc-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_igdvgb.enc b/fonts/merriweather/enc/merriwthr_igdvgb.enc
new file mode 100644
index 0000000000..020e233f51
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_igdvgb.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_igdvgbzyycmjszvsnaafuzxjca
+% Encoding created by otftotfm on Sun Aug 30 08:20:01 2020
+% Command line follows encoding
+/AutoEnc_igdvgbzyycmjszvsnaafuzxjca [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /backslash /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft.sc /bar /braceright.sc /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown.sc /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Merriwthr-Black.otf Merriwthr-Black-osf-sc-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_jjwbah.enc b/fonts/merriweather/enc/merriwthr_jjwbah.enc
new file mode 100644
index 0000000000..24f0099ee0
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_jjwbah.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_jjwbah5qahy6yiiis5yetxupnf
+% Encoding created by otftotfm on Sun Aug 30 08:19:50 2020
+% Command line follows encoding
+/AutoEnc_jjwbah5qahy6yiiis5yetxupnf [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-osf-ot1'
diff --git a/fonts/merriweather/enc/mwthr_zwbe7j.enc b/fonts/merriweather/enc/merriwthr_k4bbiq.enc
index 5a8e41edea..233ef01a8f 100644
--- a/fonts/merriweather/enc/mwthr_zwbe7j.enc
+++ b/fonts/merriweather/enc/merriwthr_k4bbiq.enc
@@ -1,21 +1,21 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_zwbe7jlcvl2wsktttm4zndfryf
-% Encoding created by otftotfm on Thu Jul 30 08:43:51 2020
+%%AutoEnc_k4bbiq7munb7i3qj5kjp4gm37f
+% Encoding created by otftotfm on Sun Aug 30 08:18:58 2020
% Command line follows encoding
-/AutoEnc_zwbe7jlcvl2wsktttm4zndfryf [
+/AutoEnc_k4bbiq7munb7i3qj5kjp4gm37f [
%00
- /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /.notdef /.notdef /zerowidthnonjoiner /.notdef /.notdef /.notdef /.notdef /.notdef
+ /f_f /Euro /f_f_i /f_f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
%20
/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
- /zero /onesuperior /twosuperior /threesuperior /four /five /six /seven
- /eight /nine /colon /semicolon /less /equal /greater /question
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /less /equal /greater /question
%40
/at /A /B /C /D /E /F /G
/H /I /J /K /L /M /N /O
@@ -35,11 +35,11 @@
/lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
%A0
- /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
- /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
- /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
- /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
%C0
/Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
/Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
@@ -56,9 +56,11 @@
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
% --vf-directory=texmf/fonts/vf/sorkin/merriweather
-% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
% --encoding-directory=texmf/fonts/enc/dvips/merriweather
% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
-% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=sups --ligkern=* {KL} * MerriwthrSans-Bold.ttf
-% MerriwthrSans-Bold-sup-ly1'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl MerriwthrSans-BoldItalic.otf
+% MerriwthrSans-BoldItalic-tlf-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_lkhefy.enc b/fonts/merriweather/enc/merriwthr_lkhefy.enc
new file mode 100644
index 0000000000..96cc010e51
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_lkhefy.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_lkhefyggyierwy5lpz6f5mrllg
+% Encoding created by otftotfm on Sun Aug 30 08:19:58 2020
+% Command line follows encoding
+/AutoEnc_lkhefyggyierwy5lpz6f5mrllg [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /semicolon /exclamdown.sc /equal /questiondown.sc /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /quotedblleft /bracketright.sc /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=smcp --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall Merriwthr-Black.otf
+% Merriwthr-Black-tosf-sc-ot1'
diff --git a/fonts/merriweather/enc/merriwthr_lm56sz.enc b/fonts/merriweather/enc/merriwthr_lm56sz.enc
new file mode 100644
index 0000000000..6d4ec9c8fc
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_lm56sz.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_lm56szn3gmmnb7zmo6qpm4fbgc
+% Encoding created by otftotfm on Sun Aug 30 08:19:02 2020
+% Command line follows encoding
+/AutoEnc_lm56szn3gmmnb7zmo6qpm4fbgc [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi.sc /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=pnum --feature=smcp --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall MerriwthrSans-BoldItalic.otf
+% MerriwthrSans-BoldItalic-osf-sc-ot1'
diff --git a/fonts/merriweather/enc/merriwthr_mb4bqm.enc b/fonts/merriweather/enc/merriwthr_mb4bqm.enc
new file mode 100644
index 0000000000..fcf2f30c70
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_mb4bqm.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_mb4bqmbrzw45injvjiuyiplp6c
+% Encoding created by otftotfm on Sun Aug 30 08:19:05 2020
+% Command line follows encoding
+/AutoEnc_mb4bqmbrzw45injvjiuyiplp6c [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi.sc /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=smcp --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall MerriwthrSans-Bold.otf
+% MerriwthrSans-Bold-tosf-sc-ot1'
diff --git a/fonts/merriweather/enc/merriwthr_me3dx7.enc b/fonts/merriweather/enc/merriwthr_me3dx7.enc
new file mode 100644
index 0000000000..9642016f2c
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_me3dx7.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_me3dx7s5yei22rvgi4gmtp7vwf
+% Encoding created by otftotfm on Sun Aug 30 08:19:02 2020
+% Command line follows encoding
+/AutoEnc_me3dx7s5yei22rvgi4gmtp7vwf [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi.sc /uni0237.sc /.notdef /fi /fl /.notdef /.notdef
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% MerriwthrSans-BoldItalic.otf MerriwthrSans-BoldItalic-osf-sc-t1'
diff --git a/fonts/merriweather/enc/mwthr_vi456v.enc b/fonts/merriweather/enc/merriwthr_mgprdv.enc
index 0984ed35e7..e9274cfe06 100644
--- a/fonts/merriweather/enc/mwthr_vi456v.enc
+++ b/fonts/merriweather/enc/merriwthr_mgprdv.enc
@@ -1,14 +1,14 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_vi456vknjkllfjnxu4s533uuwe
-% Encoding created by otftotfm on Thu Jul 30 08:43:50 2020
+%%AutoEnc_mgprdvdw5vhpsriq4w73u5qrtd
+% Encoding created by otftotfm on Sun Aug 30 08:19:00 2020
% Command line follows encoding
-/AutoEnc_vi456vknjkllfjnxu4s533uuwe [
+/AutoEnc_mgprdvdw5vhpsriq4w73u5qrtd [
%00
- /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /.notdef /.notdef /zerowidthnonjoiner /f_f_l /f_f_i /f_f /f_l /f_i
+ /f_f /Euro /f_f_i /f_f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
%20
/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
@@ -35,11 +35,11 @@
/lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
%A0
- /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
- /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
- /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
%C0
/Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
/Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
@@ -56,10 +56,11 @@
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
% --vf-directory=texmf/fonts/vf/sorkin/merriweather
-% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
% --encoding-directory=texmf/fonts/enc/dvips/merriweather
% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
-% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl MerriwthrSans-BoldItalic.ttf
-% MerriwthrSans-BoldItalic-osf-ly1'
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl MerriwthrSans-BoldItalic.otf
+% MerriwthrSans-BoldItalic-lf-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_mr3nck.enc b/fonts/merriweather/enc/merriwthr_mr3nck.enc
new file mode 100644
index 0000000000..26ccd16961
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_mr3nck.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_mr3nckycyxcdyrjgjhye5cztpb
+% Encoding created by otftotfm on Sun Aug 30 08:19:49 2020
+% Command line follows encoding
+/AutoEnc_mr3nckycyxcdyrjgjhye5cztpb [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi /uni0237 /.notdef /fi /fl /.notdef /.notdef
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-tosf-t1'
diff --git a/fonts/merriweather/enc/merriwthr_mx2b4h.enc b/fonts/merriweather/enc/merriwthr_mx2b4h.enc
new file mode 100644
index 0000000000..49ddaa9678
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_mx2b4h.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_mx2b4h6pq5c3bsd2jdaiymy3ld
+% Encoding created by otftotfm on Sun Aug 30 08:19:01 2020
+% Command line follows encoding
+/AutoEnc_mx2b4h6pq5c3bsd2jdaiymy3ld [
+%00
+ /f_f /Euro /f_f_i /f_f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl MerriwthrSans-BoldItalic.otf
+% MerriwthrSans-BoldItalic-tosf-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_nszfm3.enc b/fonts/merriweather/enc/merriwthr_nszfm3.enc
new file mode 100644
index 0000000000..757f9ba224
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_nszfm3.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_nszfm3rifj2lt5clmoofzy4dcd
+% Encoding created by otftotfm on Sun Aug 30 08:19:48 2020
+% Command line follows encoding
+/AutoEnc_nszfm3rifj2lt5clmoofzy4dcd [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-tosf-ot1'
diff --git a/fonts/merriweather/enc/mwthr_44qg5v.enc b/fonts/merriweather/enc/merriwthr_o43b2q.enc
index c2107a40cb..ad3ce5c6c2 100644
--- a/fonts/merriweather/enc/mwthr_44qg5v.enc
+++ b/fonts/merriweather/enc/merriwthr_o43b2q.enc
@@ -1,21 +1,21 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_44qg5voi43tymivsufwnvthinh
-% Encoding created by otftotfm on Thu Jul 30 08:43:51 2020
+%%AutoEnc_o43b2qy2xwpvi2pcx6qou2eunc
+% Encoding created by otftotfm on Sun Aug 30 08:19:44 2020
% Command line follows encoding
-/AutoEnc_44qg5voi43tymivsufwnvthinh [
+/AutoEnc_o43b2qy2xwpvi2pcx6qou2eunc [
%00
/.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /.notdef /.notdef /zerowidthnonjoiner /f_f_l /f_f_i /f_f /f_l /f_i
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
%20
/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /less /equal /greater /question
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /less /equal /greater /question
%40
/at /A /B /C /D /E /F /G
/H /I /J /K /L /M /N /O
@@ -35,11 +35,11 @@
/lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
%A0
- /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
- /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
- /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
- /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
%C0
/Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
/Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
@@ -56,10 +56,10 @@
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
% --vf-directory=texmf/fonts/vf/sorkin/merriweather
-% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
% --encoding-directory=texmf/fonts/enc/dvips/merriweather
-% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
-% --no-updmap --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl MerriwthrSans-Bold.ttf
-% MerriwthrSans-Bold-osf-ly1'
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-tlf-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_ob5vn4.enc b/fonts/merriweather/enc/merriwthr_ob5vn4.enc
new file mode 100644
index 0000000000..cbbce791bc
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_ob5vn4.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ob5vn4xb4fk2bw4i35otvjphka
+% Encoding created by otftotfm on Sun Aug 30 08:19:03 2020
+% Command line follows encoding
+/AutoEnc_ob5vn4xb4fk2bw4i35otvjphka [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi.sc /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% MerriwthrSans-Bold.otf MerriwthrSans-Bold-tlf-sc-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_okb76x.enc b/fonts/merriweather/enc/merriwthr_okb76x.enc
new file mode 100644
index 0000000000..13f9d54e81
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_okb76x.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_okb76xb34camvyvrgktdrvpbda
+% Encoding created by otftotfm on Sun Aug 30 08:20:01 2020
+% Command line follows encoding
+/AutoEnc_okb76xb34camvyvrgktdrvpbda [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /exclamdown.sc /equal /questiondown.sc /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /quotedblleft /bracketright.sc /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=pnum --feature=smcp --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall Merriwthr-Black.otf
+% Merriwthr-Black-osf-sc-ot1'
diff --git a/fonts/merriweather/enc/mwthr_u54ue6.enc b/fonts/merriweather/enc/merriwthr_owzwzj.enc
index 86d40997fd..1f728affe6 100644
--- a/fonts/merriweather/enc/mwthr_u54ue6.enc
+++ b/fonts/merriweather/enc/merriwthr_owzwzj.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_u54ue6qvmldocqxmqypta3d4nc
-% Encoding created by otftotfm on Thu Jul 30 08:43:35 2020
+%%AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e
+% Encoding created by otftotfm on Sun Aug 30 08:18:59 2020
% Command line follows encoding
-/AutoEnc_u54ue6qvmldocqxmqypta3d4nc [
+/AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e [
%00
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -15,12 +15,12 @@
/.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
%30
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /uni27E8 /minus /uni27E9 /.notdef
%40
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%50
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni2126
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown
%60
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -30,16 +30,16 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%80
/.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
- /bullet /.notdef /.notdef /.notdef /florin /colonmonetary /won /.notdef
+ /bullet /.notdef /.notdef /.notdef /florin /colonmonetary /uni20A9 /.notdef
%90
/.notdef /.notdef /lira /.notdef /.notdef /.notdef /dong /trademark
- /.notdef /.notdef /.notdef /afii61352 /.notdef /estimated /.notdef /.notdef
+ /.notdef /.notdef /.notdef /uni2116 /.notdef /estimated /.notdef /.notdef
%A0
/.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
/.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
%B0
- /degree /plusminus /two.superior /three.superior /.notdef /mu /paragraph /periodcentered
- /.notdef /one.superior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro
+ /degree /plusminus /uni00B2 /uni00B3 /.notdef /uni00B5 /paragraph /periodcentered
+ /.notdef /uni00B9 /ordmasculine /radical /onequarter /onehalf /threequarters /Euro
%C0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -56,8 +56,9 @@
% Command line: 'otftotfm --automatic --encoding=fontools_ts1
% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
% --vf-directory=texmf/fonts/vf/sorkin/merriweather
-% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
% --encoding-directory=texmf/fonts/enc/dvips/merriweather
-% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
-% --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
-% Merriwthr-BoldIt.ttf Merriwthr-BoldItalic-osf-ts1'
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
+% --feature=onum --feature=tnum MerriwthrSans-BoldItalic.otf
+% MerriwthrSans-BoldItalic-tlf-ts1'
diff --git a/fonts/merriweather/enc/merriwthr_p242jx.enc b/fonts/merriweather/enc/merriwthr_p242jx.enc
new file mode 100644
index 0000000000..960abb4891
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_p242jx.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_p242jx5yqzirobjdghtfhsivef
+% Encoding created by otftotfm on Sun Aug 30 08:19:04 2020
+% Command line follows encoding
+/AutoEnc_p242jx5yqzirobjdghtfhsivef [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi.sc /uni0237.sc /.notdef /fi /fl /.notdef /.notdef
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.sc /one.sc /two.sc /three.sc /four.sc /five.sc /six.sc /seven.sc
+ /eight.sc /nine.sc /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% MerriwthrSans-Bold.otf MerriwthrSans-Bold-lf-sc-t1'
diff --git a/fonts/merriweather/enc/merriwthr_posqbl.enc b/fonts/merriweather/enc/merriwthr_posqbl.enc
new file mode 100644
index 0000000000..f6445002ee
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_posqbl.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_posqbludufzthv4e4oqyltuypc
+% Encoding created by otftotfm on Sun Aug 30 08:19:51 2020
+% Command line follows encoding
+/AutoEnc_posqbludufzthv4e4oqyltuypc [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi /uni0237 /.notdef /fi /fl /.notdef /.notdef
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-osf-t1'
diff --git a/fonts/merriweather/enc/merriwthr_qfmkcs.enc b/fonts/merriweather/enc/merriwthr_qfmkcs.enc
new file mode 100644
index 0000000000..618dce5d14
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_qfmkcs.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_qfmkcsvhzqzdsv22ohwgwo2xhd
+% Encoding created by otftotfm on Sun Aug 30 08:19:01 2020
+% Command line follows encoding
+/AutoEnc_qfmkcsvhzqzdsv22ohwgwo2xhd [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi.sc /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% MerriwthrSans-BoldItalic.otf MerriwthrSans-BoldItalic-tosf-sc-ly1'
diff --git a/fonts/merriweather/enc/mwthr_7ytifx.enc b/fonts/merriweather/enc/merriwthr_qndjqi.enc
index bed0d440dc..7e40a26d08 100644
--- a/fonts/merriweather/enc/mwthr_7ytifx.enc
+++ b/fonts/merriweather/enc/merriwthr_qndjqi.enc
@@ -1,21 +1,21 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb
-% Encoding created by otftotfm on Thu Jul 30 08:43:50 2020
+%%AutoEnc_qndjqiu4qjku62xxe6uv5xlfjb
+% Encoding created by otftotfm on Sun Aug 30 08:18:59 2020
% Command line follows encoding
-/AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb [
+/AutoEnc_qndjqiu4qjku62xxe6uv5xlfjb [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
%10
- /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /zerowidthnonjoiner
- /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
%20
/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
- /zero /onesuperior /twosuperior /threesuperior /four /five /six /seven
- /eight /nine /colon /semicolon /less /equal /greater /question
+ /uni2070 /uni00B9 /uni00B2 /uni00B3 /uni2074 /uni2075 /uni2076 /uni2077
+ /uni2078 /uni2079 /colon /semicolon /less /equal /greater /question
%40
/at /A /B /C /D /E /F /G
/H /I /J /K /L /M /N /O
@@ -56,9 +56,9 @@
% Command line: 'otftotfm --automatic --encoding=fontools_t1
% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
% --vf-directory=texmf/fonts/vf/sorkin/merriweather
-% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
% --encoding-directory=texmf/fonts/enc/dvips/merriweather
% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
-% --no-updmap --no-type1 --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=sups --ligkern=* {KL} * MerriwthrSans-BoldItalic.ttf
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=sups --ligkern=* {KL} * MerriwthrSans-BoldItalic.otf
% MerriwthrSans-BoldItalic-sup-t1'
diff --git a/fonts/merriweather/enc/merriwthr_rzflsg.enc b/fonts/merriweather/enc/merriwthr_rzflsg.enc
new file mode 100644
index 0000000000..febaeabdef
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_rzflsg.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_rzflsg23wvwgzskzfq5vgf7j5g
+% Encoding created by otftotfm on Sun Aug 30 08:18:59 2020
+% Command line follows encoding
+/AutoEnc_rzflsg23wvwgzskzfq5vgf7j5g [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi.sc /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% MerriwthrSans-BoldItalic.otf MerriwthrSans-BoldItalic-tlf-sc-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_s56ilq.enc b/fonts/merriweather/enc/merriwthr_s56ilq.enc
new file mode 100644
index 0000000000..7a51aef51e
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_s56ilq.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_s56ilq3a5gkjgfrefs4uoyfp4h
+% Encoding created by otftotfm on Sun Aug 30 08:19:49 2020
+% Command line follows encoding
+/AutoEnc_s56ilq3a5gkjgfrefs4uoyfp4h [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-tosf-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_stxeas.enc b/fonts/merriweather/enc/merriwthr_stxeas.enc
new file mode 100644
index 0000000000..a9ee05787d
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_stxeas.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_stxeasictntzuilrpixo7a54ye
+% Encoding created by otftotfm on Sun Aug 30 08:19:01 2020
+% Command line follows encoding
+/AutoEnc_stxeasictntzuilrpixo7a54ye [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi.sc /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=smcp --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall MerriwthrSans-BoldItalic.otf
+% MerriwthrSans-BoldItalic-tosf-sc-ot1'
diff --git a/fonts/merriweather/enc/merriwthr_ttjzpe.enc b/fonts/merriweather/enc/merriwthr_ttjzpe.enc
new file mode 100644
index 0000000000..79ae7fbeb1
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_ttjzpe.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ttjzpeaor6y6pteopjtxgp5poa
+% Encoding created by otftotfm on Sun Aug 30 08:19:01 2020
+% Command line follows encoding
+/AutoEnc_ttjzpeaor6y6pteopjtxgp5poa [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_f /f_f_i /f_f_l /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% MerriwthrSans-BoldItalic.otf MerriwthrSans-BoldItalic-osf-ot1'
diff --git a/fonts/merriweather/enc/merriwthr_u2frii.enc b/fonts/merriweather/enc/merriwthr_u2frii.enc
new file mode 100644
index 0000000000..fb8dc1f33b
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_u2frii.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_u2friiggclcp6b5msd4ts52k2g
+% Encoding created by otftotfm on Sun Aug 30 08:19:00 2020
+% Command line follows encoding
+/AutoEnc_u2friiggclcp6b5msd4ts52k2g [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /f_f /dotlessi /uni0237 /f_f_i /fi /fl /f_f_l /.notdef
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl MerriwthrSans-BoldItalic.otf
+% MerriwthrSans-BoldItalic-tosf-t1'
diff --git a/fonts/merriweather/enc/merriwthr_uduhhn.enc b/fonts/merriweather/enc/merriwthr_uduhhn.enc
new file mode 100644
index 0000000000..2fdd424440
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_uduhhn.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_uduhhnl6o26amfuwg72h3q32ac
+% Encoding created by otftotfm on Sun Aug 30 08:19:59 2020
+% Command line follows encoding
+/AutoEnc_uduhhnl6o26amfuwg72h3q32ac [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /backslash /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft.sc /bar /braceright.sc /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown.sc /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Merriwthr-Black.otf Merriwthr-Black-tosf-sc-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_urus45.enc b/fonts/merriweather/enc/merriwthr_urus45.enc
new file mode 100644
index 0000000000..5e12375c56
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_urus45.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_urus45g42tw26byrfmdw37peyf
+% Encoding created by otftotfm on Sun Aug 30 08:19:49 2020
+% Command line follows encoding
+/AutoEnc_urus45g42tw26byrfmdw37peyf [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /semicolon /exclamdown.sc /equal /questiondown.sc /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /quotedblleft /bracketright.sc /circumflex /dotaccent
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=smcp --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall Merriwthr-BlackItalic.otf
+% Merriwthr-BlackItalic-tosf-sc-ot1'
diff --git a/fonts/merriweather/enc/merriwthr_vvhkhe.enc b/fonts/merriweather/enc/merriwthr_vvhkhe.enc
new file mode 100644
index 0000000000..6ff405e91e
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_vvhkhe.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_vvhkhe5iryghotomeftgcjayke
+% Encoding created by otftotfm on Sun Aug 30 08:19:45 2020
+% Command line follows encoding
+/AutoEnc_vvhkhe5iryghotomeftgcjayke [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi /uni0237.sc /.notdef /fi /fl /.notdef /.notdef
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /backslash /bracketright.sc /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft.sc /bar /braceright.sc /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-tlf-sc-t1'
diff --git a/fonts/merriweather/enc/mwthr_6upxhe.enc b/fonts/merriweather/enc/merriwthr_w4rwtq.enc
index d606c690ad..865b87d232 100644
--- a/fonts/merriweather/enc/mwthr_6upxhe.enc
+++ b/fonts/merriweather/enc/merriwthr_w4rwtq.enc
@@ -1,14 +1,14 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_6upxhe2m74q2iptst22s37sn3e
-% Encoding created by otftotfm on Thu Jul 30 08:43:35 2020
+%%AutoEnc_w4rwtqnqgnoept64akgqql332d
+% Encoding created by otftotfm on Sun Aug 30 08:19:46 2020
% Command line follows encoding
-/AutoEnc_6upxhe2m74q2iptst22s37sn3e [
+/AutoEnc_w4rwtqnqgnoept64akgqql332d [
%00
- /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
%20
/space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
@@ -56,8 +56,10 @@
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
% --vf-directory=texmf/fonts/vf/sorkin/merriweather
-% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
% --encoding-directory=texmf/fonts/enc/dvips/merriweather
% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
-% --no-type1 --coding-scheme=TEX TEXT Merriwthr-BoldIt.ttf
-% Merriwthr-BoldItalic-osf-ot1'
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-lf-ot1'
diff --git a/fonts/merriweather/enc/merriwthr_wlsyn3.enc b/fonts/merriweather/enc/merriwthr_wlsyn3.enc
new file mode 100644
index 0000000000..698d2f920f
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_wlsyn3.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_wlsyn3fqr6sfenouszwkfdbt4a
+% Encoding created by otftotfm on Sun Aug 30 08:19:00 2020
+% Command line follows encoding
+/AutoEnc_wlsyn3fqr6sfenouszwkfdbt4a [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_f /f_f_i /f_f_l /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% MerriwthrSans-BoldItalic.otf MerriwthrSans-BoldItalic-tosf-ot1'
diff --git a/fonts/merriweather/enc/merriwthr_wppmfi.enc b/fonts/merriweather/enc/merriwthr_wppmfi.enc
new file mode 100644
index 0000000000..9ce27a2c87
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_wppmfi.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_wppmfidyainl67d5kddjpxn6nd
+% Encoding created by otftotfm on Sun Aug 30 08:19:51 2020
+% Command line follows encoding
+/AutoEnc_wppmfidyainl67d5kddjpxn6nd [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-osf-ly1'
diff --git a/fonts/merriweather/enc/merriwthr_x754fd.enc b/fonts/merriweather/enc/merriwthr_x754fd.enc
new file mode 100644
index 0000000000..e7083d9dc4
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_x754fd.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_x754fdhjy7kbfaggcczlltapqc
+% Encoding created by otftotfm on Sun Aug 30 08:19:59 2020
+% Command line follows encoding
+/AutoEnc_x754fdhjy7kbfaggcczlltapqc [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi /uni0237.sc /.notdef /fi /fl /.notdef /.notdef
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /backslash /bracketright.sc /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft.sc /bar /braceright.sc /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Merriwthr-Black.otf Merriwthr-Black-tosf-sc-t1'
diff --git a/fonts/merriweather/enc/merriwthr_xfdjpz.enc b/fonts/merriweather/enc/merriwthr_xfdjpz.enc
new file mode 100644
index 0000000000..aafc5e38bc
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_xfdjpz.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_xfdjpzrew23yucr3gqhoiqfjpg
+% Encoding created by otftotfm on Sun Aug 30 08:19:50 2020
+% Command line follows encoding
+/AutoEnc_xfdjpzrew23yucr3gqhoiqfjpg [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi /uni0237.sc /.notdef /fi /fl /.notdef /.notdef
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tosf /one.tosf /two.tosf /three.tosf /four.tosf /five.tosf /six.tosf /seven.tosf
+ /eight.tosf /nine.tosf /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /backslash /bracketright.sc /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft.sc /bar /braceright.sc /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-tosf-sc-t1'
diff --git a/fonts/merriweather/enc/merriwthr_xys2i2.enc b/fonts/merriweather/enc/merriwthr_xys2i2.enc
new file mode 100644
index 0000000000..5977cc133f
--- /dev/null
+++ b/fonts/merriweather/enc/merriwthr_xys2i2.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_xys2i2l6u4vmavrixvir4bozhf
+% Encoding created by otftotfm on Sun Aug 30 08:20:01 2020
+% Command line follows encoding
+/AutoEnc_xys2i2l6u4vmavrixvir4bozhf [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /uni200C
+ /.notdef /dotlessi /uni0237.sc /.notdef /fi /fl /.notdef /.notdef
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft.sc /backslash /bracketright.sc /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft.sc /bar /braceright.sc /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
+% --vf-directory=texmf/fonts/vf/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
+% --encoding-directory=texmf/fonts/enc/dvips/merriweather
+% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Merriwthr-Black.otf Merriwthr-Black-osf-sc-t1'
diff --git a/fonts/merriweather/enc/mwthr_hzrl5s.enc b/fonts/merriweather/enc/merriwthr_ynquvw.enc
index b6ad3b8a22..285a4ef447 100644
--- a/fonts/merriweather/enc/mwthr_hzrl5s.enc
+++ b/fonts/merriweather/enc/merriwthr_ynquvw.enc
@@ -1,14 +1,14 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_hzrl5scqns2jtblgadawedqwjb
-% Encoding created by otftotfm on Thu Jul 30 08:43:35 2020
+%%AutoEnc_ynquvwz7uzs76ql3vkgsnmi6oh
+% Encoding created by otftotfm on Sun Aug 30 08:19:47 2020
% Command line follows encoding
-/AutoEnc_hzrl5scqns2jtblgadawedqwjb [
+/AutoEnc_ynquvwz7uzs76ql3vkgsnmi6oh [
%00
/.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /.notdef /.notdef /zerowidthnonjoiner /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /fl /fi
%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
%20
/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
@@ -35,11 +35,11 @@
/lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
%A0
- /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
- /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
- /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
%C0
/Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
/Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
@@ -56,8 +56,10 @@
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
% --vf-directory=texmf/fonts/vf/sorkin/merriweather
-% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather
+% --type1-directory=texmf/fonts/type1/sorkin/merriweather
% --encoding-directory=texmf/fonts/enc/dvips/merriweather
% --map-file=texmf/fonts/map/dvips/merriweather/Merriwthr.map --no-updmap
-% --no-type1 --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
-% Merriwthr-BoldIt.ttf Merriwthr-BoldItalic-osf-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Merriwthr-BlackItalic.otf Merriwthr-BlackItalic-lf-ly1'
diff --git a/fonts/merriweather/enc/mwthr_n7ujmb.enc b/fonts/merriweather/enc/mwthr_n7ujmb.enc
deleted file mode 100644
index b57e6479e0..0000000000
--- a/fonts/merriweather/enc/mwthr_n7ujmb.enc
+++ /dev/null
@@ -1,63 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_n7ujmbrloaigamcc6xrat5ctxd
-% Encoding created by otftotfm on Thu Jul 30 08:43:51 2020
-% Command line follows encoding
-/AutoEnc_n7ujmbrloaigamcc6xrat5ctxd [
-%00
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
-%10
- /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
-%20
- /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
- /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
-%30
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
-%40
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%50
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%60
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%70
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%80
- /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
- /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef
-%90
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
- /.notdef /.notdef /.notdef /afii61352 /.notdef /estimated /.notdef /.notdef
-%A0
- /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
- /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
-%B0
- /degree /plusminus /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered
- /.notdef /onesuperior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=texmf/fonts/tfm/sorkin/merriweather
-% --vf-directory=texmf/fonts/vf/sorkin/merriweather
-% --truetype-directory=texmf/fonts/truetype/sorkin/merriweather
-% --encoding-directory=texmf/fonts/enc/dvips/merriweather
-% --map-file=texmf/fonts/map/dvips/merriweather/MerriwthrSans.map
-% --no-updmap --no-type1 --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
-% MerriwthrSans-BoldItalic.ttf MerriwthrSans-BoldItalic-osf-ts1'
diff --git a/fonts/merriweather/latex/LY1Merriwthr-LF.fd b/fonts/merriweather/latex/LY1Merriwthr-LF.fd
new file mode 100644
index 0000000000..00eafb89be
--- /dev/null
+++ b/fonts/merriweather/latex/LY1Merriwthr-LF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{LY1Merriwthr-LF.fd}
+ [2020/08/30 (autoinst) Font definitions for LY1/Merriwthr-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{Merriwthr-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{regular}{sc}{
+ <-> alias * Merriwthr-LF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{regular}{n}{
+ <-> alias * Merriwthr-LF/m/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{regular}{it}{
+ <-> alias * Merriwthr-LF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{regular}{scit}{
+ <-> alias * Merriwthr-LF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{m}{scsl}{
+ <-> ssub * Merriwthr-LF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{regular}{scsl}{
+ <-> ssub * Merriwthr-LF/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{m}{sl}{
+ <-> ssub * Merriwthr-LF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{regular}{sl}{
+ <-> ssub * Merriwthr-LF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{black}{sc}{
+ <-> alias * Merriwthr-LF/eb/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{black}{n}{
+ <-> alias * Merriwthr-LF/eb/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{black}{it}{
+ <-> alias * Merriwthr-LF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{black}{scit}{
+ <-> alias * Merriwthr-LF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{eb}{scsl}{
+ <-> ssub * Merriwthr-LF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{black}{scsl}{
+ <-> ssub * Merriwthr-LF/black/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{eb}{sl}{
+ <-> ssub * Merriwthr-LF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{black}{sl}{
+ <-> ssub * Merriwthr-LF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bold}{sc}{
+ <-> alias * Merriwthr-LF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bold}{n}{
+ <-> alias * Merriwthr-LF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bold}{it}{
+ <-> alias * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bold}{scit}{
+ <-> alias * Merriwthr-LF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{b}{scsl}{
+ <-> ssub * Merriwthr-LF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bold}{scsl}{
+ <-> ssub * Merriwthr-LF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{b}{sl}{
+ <-> ssub * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bold}{sl}{
+ <-> ssub * Merriwthr-LF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{light}{sc}{
+ <-> alias * Merriwthr-LF/l/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{light}{n}{
+ <-> alias * Merriwthr-LF/l/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{light}{it}{
+ <-> alias * Merriwthr-LF/l/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{light}{scit}{
+ <-> alias * Merriwthr-LF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{l}{scsl}{
+ <-> ssub * Merriwthr-LF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{light}{scsl}{
+ <-> ssub * Merriwthr-LF/light/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{l}{sl}{
+ <-> ssub * Merriwthr-LF/l/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{light}{sl}{
+ <-> ssub * Merriwthr-LF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bx}{n}{
+ <-> ssub * Merriwthr-LF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bx}{sc}{
+ <-> ssub * Merriwthr-LF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bx}{scsl}{
+ <-> ssub * Merriwthr-LF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bx}{sl}{
+ <-> ssub * Merriwthr-LF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bx}{it}{
+ <-> ssub * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bx}{scit}{
+ <-> ssub * Merriwthr-LF/b/scit
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/LY1Merriwthr-OsF.fd b/fonts/merriweather/latex/LY1Merriwthr-OsF.fd
index 05e55d7c69..23426700c4 100644
--- a/fonts/merriweather/latex/LY1Merriwthr-OsF.fd
+++ b/fonts/merriweather/latex/LY1Merriwthr-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{LY1Merriwthr-OsF.fd}
- [2020/07/30 (autoinst) Font definitions for LY1/Merriwthr-OsF.]
+ [2020/08/30 (autoinst) Font definitions for LY1/Merriwthr-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,132 +20,224 @@
\DeclareFontFamily{LY1}{Merriwthr-OsF}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{n}{
+\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{sc}{
+ <-> alias * Merriwthr-OsF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{n}{
<-> \Merriwthr@@scale Merriwthr-Regular-osf-ly1
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{it}{
+\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{n}{
+ <-> alias * Merriwthr-OsF/m/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{it}{
<-> \Merriwthr@@scale Merriwthr-Italic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{sl}{
- <-> ssub * Merriwthr-OsF/regular/it
+\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{it}{
+ <-> alias * Merriwthr-OsF/m/it
}{}
+\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-osf-sc-ly1
+}{}
-% ---- bold ----
+\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{scit}{
+ <-> alias * Merriwthr-OsF/m/scit
+}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{n}{
- <-> \Merriwthr@@scale Merriwthr-Bold-osf-ly1
+\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{scsl}{
+ <-> ssub * Merriwthr-OsF/m/scit
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{it}{
- <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-ly1
+\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{scsl}{
+ <-> ssub * Merriwthr-OsF/regular/scit
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{sl}{
- <-> ssub * Merriwthr-OsF/bold/it
+\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{sl}{
+ <-> ssub * Merriwthr-OsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{sl}{
+ <-> ssub * Merriwthr-OsF/regular/it
}{}
-% ---- light ----
+% ---- eb = black ----
-\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{n}{
- <-> \Merriwthr@@scale Merriwthr-Light-osf-ly1
+\DeclareFontShape{LY1}{Merriwthr-OsF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{it}{
- <-> \Merriwthr@@scale Merriwthr-LightIt-osf-ly1
+\DeclareFontShape{LY1}{Merriwthr-OsF}{black}{sc}{
+ <-> alias * Merriwthr-OsF/eb/sc
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{sl}{
- <-> ssub * Merriwthr-OsF/light/it
+\DeclareFontShape{LY1}{Merriwthr-OsF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-osf-ly1
}{}
+\DeclareFontShape{LY1}{Merriwthr-OsF}{black}{n}{
+ <-> alias * Merriwthr-OsF/eb/n
+}{}
-% ---- ultrabold ----
+\DeclareFontShape{LY1}{Merriwthr-OsF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-osf-ly1
+}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{ultrabold}{n}{
- <-> \Merriwthr@@scale Merriwthr-UltraBold-osf-ly1
+\DeclareFontShape{LY1}{Merriwthr-OsF}{black}{it}{
+ <-> alias * Merriwthr-OsF/eb/it
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{ultrabold}{it}{
- <-> \Merriwthr@@scale Merriwthr-UltraBdIt-osf-ly1
+\DeclareFontShape{LY1}{Merriwthr-OsF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{ultrabold}{sl}{
- <-> ssub * Merriwthr-OsF/ultrabold/it
+\DeclareFontShape{LY1}{Merriwthr-OsF}{black}{scit}{
+ <-> alias * Merriwthr-OsF/eb/scit
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
+\DeclareFontShape{LY1}{Merriwthr-OsF}{eb}{scsl}{
+ <-> ssub * Merriwthr-OsF/eb/scit
+}{}
-% l --> light
+\DeclareFontShape{LY1}{Merriwthr-OsF}{black}{scsl}{
+ <-> ssub * Merriwthr-OsF/black/scit
+}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{sl}{
- <-> alias * Merriwthr-OsF/light/sl
+\DeclareFontShape{LY1}{Merriwthr-OsF}{eb}{sl}{
+ <-> ssub * Merriwthr-OsF/eb/it
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{n}{
- <-> alias * Merriwthr-OsF/light/n
+\DeclareFontShape{LY1}{Merriwthr-OsF}{black}{sl}{
+ <-> ssub * Merriwthr-OsF/black/it
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{it}{
- <-> alias * Merriwthr-OsF/light/it
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-osf-sc-ly1
}{}
+\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{sc}{
+ <-> alias * Merriwthr-OsF/b/sc
+}{}
-% m --> regular
+\DeclareFontShape{LY1}{Merriwthr-OsF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-osf-ly1
+}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{sl}{
- <-> alias * Merriwthr-OsF/regular/sl
+\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{n}{
+ <-> alias * Merriwthr-OsF/b/n
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{n}{
- <-> alias * Merriwthr-OsF/regular/n
+\DeclareFontShape{LY1}{Merriwthr-OsF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{it}{
- <-> alias * Merriwthr-OsF/regular/it
+\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{it}{
+ <-> alias * Merriwthr-OsF/b/it
}{}
+\DeclareFontShape{LY1}{Merriwthr-OsF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-sc-ly1
+}{}
-% b --> bold
+\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{scit}{
+ <-> alias * Merriwthr-OsF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{b}{scsl}{
+ <-> ssub * Merriwthr-OsF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{scsl}{
+ <-> ssub * Merriwthr-OsF/bold/scit
+}{}
\DeclareFontShape{LY1}{Merriwthr-OsF}{b}{sl}{
- <-> alias * Merriwthr-OsF/bold/sl
+ <-> ssub * Merriwthr-OsF/b/it
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{b}{n}{
- <-> alias * Merriwthr-OsF/bold/n
+\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{sl}{
+ <-> ssub * Merriwthr-OsF/bold/it
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{b}{it}{
- <-> alias * Merriwthr-OsF/bold/it
+
+% ---- l = light ----
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{sc}{
+ <-> alias * Merriwthr-OsF/l/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{n}{
+ <-> alias * Merriwthr-OsF/l/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-osf-ly1
}{}
+\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{it}{
+ <-> alias * Merriwthr-OsF/l/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{scit}{
+ <-> alias * Merriwthr-OsF/l/scit
+}{}
-% ub --> ultrabold
+\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{scsl}{
+ <-> ssub * Merriwthr-OsF/l/scit
+}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{ub}{sl}{
- <-> alias * Merriwthr-OsF/ultrabold/sl
+\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{scsl}{
+ <-> ssub * Merriwthr-OsF/light/scit
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{ub}{n}{
- <-> alias * Merriwthr-OsF/ultrabold/n
+\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{sl}{
+ <-> ssub * Merriwthr-OsF/l/it
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{ub}{it}{
- <-> alias * Merriwthr-OsF/ultrabold/it
+\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{sl}{
+ <-> ssub * Merriwthr-OsF/light/it
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{LY1}{Merriwthr-OsF}{bx}{n}{
<-> ssub * Merriwthr-OsF/b/n
}{}
+\DeclareFontShape{LY1}{Merriwthr-OsF}{bx}{sc}{
+ <-> ssub * Merriwthr-OsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{bx}{scsl}{
+ <-> ssub * Merriwthr-OsF/b/scsl
+}{}
+
\DeclareFontShape{LY1}{Merriwthr-OsF}{bx}{sl}{
<-> ssub * Merriwthr-OsF/b/sl
}{}
@@ -154,4 +246,8 @@
<-> ssub * Merriwthr-OsF/b/it
}{}
+\DeclareFontShape{LY1}{Merriwthr-OsF}{bx}{scit}{
+ <-> ssub * Merriwthr-OsF/b/scit
+}{}
+
\endinput
diff --git a/fonts/merriweather/latex/LY1Merriwthr-Sup.fd b/fonts/merriweather/latex/LY1Merriwthr-Sup.fd
new file mode 100644
index 0000000000..4dca64a087
--- /dev/null
+++ b/fonts/merriweather/latex/LY1Merriwthr-Sup.fd
@@ -0,0 +1,145 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{LY1Merriwthr-Sup.fd}
+ [2020/08/30 (autoinst) Font definitions for LY1/Merriwthr-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{Merriwthr-Sup}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{regular}{n}{
+ <-> alias * Merriwthr-Sup/m/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{regular}{it}{
+ <-> alias * Merriwthr-Sup/m/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{m}{sl}{
+ <-> ssub * Merriwthr-Sup/m/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{regular}{sl}{
+ <-> ssub * Merriwthr-Sup/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{black}{n}{
+ <-> alias * Merriwthr-Sup/eb/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{black}{it}{
+ <-> alias * Merriwthr-Sup/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{eb}{sl}{
+ <-> ssub * Merriwthr-Sup/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{black}{sl}{
+ <-> ssub * Merriwthr-Sup/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{bold}{n}{
+ <-> alias * Merriwthr-Sup/b/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{bold}{it}{
+ <-> alias * Merriwthr-Sup/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{b}{sl}{
+ <-> ssub * Merriwthr-Sup/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{bold}{sl}{
+ <-> ssub * Merriwthr-Sup/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{light}{n}{
+ <-> alias * Merriwthr-Sup/l/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{light}{it}{
+ <-> alias * Merriwthr-Sup/l/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{l}{sl}{
+ <-> ssub * Merriwthr-Sup/l/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{light}{sl}{
+ <-> ssub * Merriwthr-Sup/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{bx}{n}{
+ <-> ssub * Merriwthr-Sup/b/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{bx}{sl}{
+ <-> ssub * Merriwthr-Sup/b/sl
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{bx}{it}{
+ <-> ssub * Merriwthr-Sup/b/it
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/LY1Merriwthr-TLF.fd b/fonts/merriweather/latex/LY1Merriwthr-TLF.fd
new file mode 100644
index 0000000000..d82f8ff2fa
--- /dev/null
+++ b/fonts/merriweather/latex/LY1Merriwthr-TLF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{LY1Merriwthr-TLF.fd}
+ [2020/08/30 (autoinst) Font definitions for LY1/Merriwthr-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{Merriwthr-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{regular}{sc}{
+ <-> alias * Merriwthr-TLF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{regular}{n}{
+ <-> alias * Merriwthr-TLF/m/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{regular}{it}{
+ <-> alias * Merriwthr-TLF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{regular}{scit}{
+ <-> alias * Merriwthr-TLF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{m}{scsl}{
+ <-> ssub * Merriwthr-TLF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{regular}{scsl}{
+ <-> ssub * Merriwthr-TLF/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{m}{sl}{
+ <-> ssub * Merriwthr-TLF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{regular}{sl}{
+ <-> ssub * Merriwthr-TLF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{black}{sc}{
+ <-> alias * Merriwthr-TLF/eb/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{black}{n}{
+ <-> alias * Merriwthr-TLF/eb/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{black}{it}{
+ <-> alias * Merriwthr-TLF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{black}{scit}{
+ <-> alias * Merriwthr-TLF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{eb}{scsl}{
+ <-> ssub * Merriwthr-TLF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{black}{scsl}{
+ <-> ssub * Merriwthr-TLF/black/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{eb}{sl}{
+ <-> ssub * Merriwthr-TLF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{black}{sl}{
+ <-> ssub * Merriwthr-TLF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bold}{sc}{
+ <-> alias * Merriwthr-TLF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bold}{n}{
+ <-> alias * Merriwthr-TLF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bold}{it}{
+ <-> alias * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bold}{scit}{
+ <-> alias * Merriwthr-TLF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{b}{scsl}{
+ <-> ssub * Merriwthr-TLF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bold}{scsl}{
+ <-> ssub * Merriwthr-TLF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{b}{sl}{
+ <-> ssub * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bold}{sl}{
+ <-> ssub * Merriwthr-TLF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{light}{sc}{
+ <-> alias * Merriwthr-TLF/l/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{light}{n}{
+ <-> alias * Merriwthr-TLF/l/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{light}{it}{
+ <-> alias * Merriwthr-TLF/l/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{light}{scit}{
+ <-> alias * Merriwthr-TLF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{l}{scsl}{
+ <-> ssub * Merriwthr-TLF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{light}{scsl}{
+ <-> ssub * Merriwthr-TLF/light/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{l}{sl}{
+ <-> ssub * Merriwthr-TLF/l/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{light}{sl}{
+ <-> ssub * Merriwthr-TLF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bx}{n}{
+ <-> ssub * Merriwthr-TLF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bx}{sc}{
+ <-> ssub * Merriwthr-TLF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bx}{scsl}{
+ <-> ssub * Merriwthr-TLF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bx}{sl}{
+ <-> ssub * Merriwthr-TLF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bx}{it}{
+ <-> ssub * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bx}{scit}{
+ <-> ssub * Merriwthr-TLF/b/scit
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/LY1Merriwthr-TOsF.fd b/fonts/merriweather/latex/LY1Merriwthr-TOsF.fd
new file mode 100644
index 0000000000..827a95951f
--- /dev/null
+++ b/fonts/merriweather/latex/LY1Merriwthr-TOsF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{LY1Merriwthr-TOsF.fd}
+ [2020/08/30 (autoinst) Font definitions for LY1/Merriwthr-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{Merriwthr-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{regular}{sc}{
+ <-> alias * Merriwthr-TOsF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{regular}{n}{
+ <-> alias * Merriwthr-TOsF/m/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{regular}{it}{
+ <-> alias * Merriwthr-TOsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{regular}{scit}{
+ <-> alias * Merriwthr-TOsF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{m}{scsl}{
+ <-> ssub * Merriwthr-TOsF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{regular}{scsl}{
+ <-> ssub * Merriwthr-TOsF/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{m}{sl}{
+ <-> ssub * Merriwthr-TOsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{regular}{sl}{
+ <-> ssub * Merriwthr-TOsF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{black}{sc}{
+ <-> alias * Merriwthr-TOsF/eb/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{black}{n}{
+ <-> alias * Merriwthr-TOsF/eb/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{black}{it}{
+ <-> alias * Merriwthr-TOsF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{black}{scit}{
+ <-> alias * Merriwthr-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{eb}{scsl}{
+ <-> ssub * Merriwthr-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{black}{scsl}{
+ <-> ssub * Merriwthr-TOsF/black/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{eb}{sl}{
+ <-> ssub * Merriwthr-TOsF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{black}{sl}{
+ <-> ssub * Merriwthr-TOsF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bold}{sc}{
+ <-> alias * Merriwthr-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bold}{n}{
+ <-> alias * Merriwthr-TOsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bold}{it}{
+ <-> alias * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bold}{scit}{
+ <-> alias * Merriwthr-TOsF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{b}{scsl}{
+ <-> ssub * Merriwthr-TOsF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bold}{scsl}{
+ <-> ssub * Merriwthr-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{b}{sl}{
+ <-> ssub * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bold}{sl}{
+ <-> ssub * Merriwthr-TOsF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{light}{sc}{
+ <-> alias * Merriwthr-TOsF/l/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{light}{n}{
+ <-> alias * Merriwthr-TOsF/l/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{light}{it}{
+ <-> alias * Merriwthr-TOsF/l/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{light}{scit}{
+ <-> alias * Merriwthr-TOsF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{l}{scsl}{
+ <-> ssub * Merriwthr-TOsF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{light}{scsl}{
+ <-> ssub * Merriwthr-TOsF/light/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{l}{sl}{
+ <-> ssub * Merriwthr-TOsF/l/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{light}{sl}{
+ <-> ssub * Merriwthr-TOsF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bx}{n}{
+ <-> ssub * Merriwthr-TOsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bx}{sc}{
+ <-> ssub * Merriwthr-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bx}{scsl}{
+ <-> ssub * Merriwthr-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bx}{sl}{
+ <-> ssub * Merriwthr-TOsF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bx}{it}{
+ <-> ssub * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bx}{scit}{
+ <-> ssub * Merriwthr-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/LY1MerriwthrSans-LF.fd b/fonts/merriweather/latex/LY1MerriwthrSans-LF.fd
new file mode 100644
index 0000000000..dfda0be531
--- /dev/null
+++ b/fonts/merriweather/latex/LY1MerriwthrSans-LF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{LY1MerriwthrSans-LF.fd}
+ [2020/08/30 (autoinst) Font definitions for LY1/MerriwthrSans-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{MerriwthrSans-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{regular}{sc}{
+ <-> alias * MerriwthrSans-LF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{regular}{n}{
+ <-> alias * MerriwthrSans-LF/m/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{regular}{it}{
+ <-> alias * MerriwthrSans-LF/m/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{regular}{scit}{
+ <-> alias * MerriwthrSans-LF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-LF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-LF/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{m}{sl}{
+ <-> ssub * MerriwthrSans-LF/m/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-LF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bold}{sc}{
+ <-> alias * MerriwthrSans-LF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bold}{n}{
+ <-> alias * MerriwthrSans-LF/b/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bold}{it}{
+ <-> alias * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bold}{scit}{
+ <-> alias * MerriwthrSans-LF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-LF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-LF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{b}{sl}{
+ <-> ssub * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-LF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{light}{sc}{
+ <-> alias * MerriwthrSans-LF/l/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{light}{n}{
+ <-> alias * MerriwthrSans-LF/l/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{light}{it}{
+ <-> alias * MerriwthrSans-LF/l/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{light}{scit}{
+ <-> alias * MerriwthrSans-LF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-LF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-LF/light/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{l}{sl}{
+ <-> ssub * MerriwthrSans-LF/l/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{light}{sl}{
+ <-> ssub * MerriwthrSans-LF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-LF/eb/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-LF/eb/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-LF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-LF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-LF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-LF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-LF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bx}{n}{
+ <-> ssub * MerriwthrSans-LF/b/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-LF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-LF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-LF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bx}{it}{
+ <-> ssub * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-LF/b/scit
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/LY1MerriwthrSans-OsF.fd b/fonts/merriweather/latex/LY1MerriwthrSans-OsF.fd
index d29d07c99e..bec4c551bc 100644
--- a/fonts/merriweather/latex/LY1MerriwthrSans-OsF.fd
+++ b/fonts/merriweather/latex/LY1MerriwthrSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{LY1MerriwthrSans-OsF.fd}
- [2020/07/30 (autoinst) Font definitions for LY1/MerriwthrSans-OsF.]
+ [2020/08/30 (autoinst) Font definitions for LY1/MerriwthrSans-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,132 +20,224 @@
\DeclareFontFamily{LY1}{MerriwthrSans-OsF}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{regular}{n}{
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{regular}{sc}{
+ <-> alias * MerriwthrSans-OsF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Regular-osf-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{regular}{it}{
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{regular}{n}{
+ <-> alias * MerriwthrSans-OsF/m/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{it}{
<-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-ly1
}{}
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{regular}{it}{
+ <-> alias * MerriwthrSans-OsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{regular}{scit}{
+ <-> alias * MerriwthrSans-OsF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{sl}{
+ <-> ssub * MerriwthrSans-OsF/m/it
+}{}
+
\DeclareFontShape{LY1}{MerriwthrSans-OsF}{regular}{sl}{
- <-> ssub * MerriwthrSans-OsF/regular/it
+ <-> ssub * MerriwthrSans-OsF/regular/it
}{}
-% ---- bold ----
+% ---- b = bold ----
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{n}{
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{sc}{
+ <-> alias * MerriwthrSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{it}{
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{n}{
+ <-> alias * MerriwthrSans-OsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{it}{
<-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{sl}{
- <-> ssub * MerriwthrSans-OsF/bold/it
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{it}{
+ <-> alias * MerriwthrSans-OsF/b/it
}{}
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-sc-ly1
+}{}
-% ---- light ----
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{scit}{
+ <-> alias * MerriwthrSans-OsF/b/scit
+}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/b/scit
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/bold/scit
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{sl}{
- <-> ssub * MerriwthrSans-OsF/light/it
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{sl}{
+ <-> ssub * MerriwthrSans-OsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-OsF/bold/it
}{}
-% ---- extrabold ----
+% ---- l = light ----
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{sc}{
+ <-> alias * MerriwthrSans-OsF/l/sc
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{sl}{
- <-> ssub * MerriwthrSans-OsF/extrabold/it
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-ly1
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{n}{
+ <-> alias * MerriwthrSans-OsF/l/n
+}{}
-% l --> light
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-ly1
+}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{sl}{
- <-> alias * MerriwthrSans-OsF/light/sl
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{it}{
+ <-> alias * MerriwthrSans-OsF/l/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{n}{
- <-> alias * MerriwthrSans-OsF/light/n
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{it}{
- <-> alias * MerriwthrSans-OsF/light/it
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{scit}{
+ <-> alias * MerriwthrSans-OsF/l/scit
}{}
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/l/scit
+}{}
-% m --> regular
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/light/scit
+}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{sl}{
- <-> alias * MerriwthrSans-OsF/regular/sl
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{sl}{
+ <-> ssub * MerriwthrSans-OsF/l/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{n}{
- <-> alias * MerriwthrSans-OsF/regular/n
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{sl}{
+ <-> ssub * MerriwthrSans-OsF/light/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{it}{
- <-> alias * MerriwthrSans-OsF/regular/it
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-sc-ly1
}{}
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-OsF/eb/sc
+}{}
-% b --> bold
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-ly1
+}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{sl}{
- <-> alias * MerriwthrSans-OsF/bold/sl
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-OsF/eb/n
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{n}{
- <-> alias * MerriwthrSans-OsF/bold/n
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{it}{
- <-> alias * MerriwthrSans-OsF/bold/it
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-OsF/eb/it
}{}
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-sc-ly1
+}{}
-% eb --> extrabold
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-OsF/eb/scit
+}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{sl}{
- <-> alias * MerriwthrSans-OsF/extrabold/sl
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/eb/scit
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{n}{
- <-> alias * MerriwthrSans-OsF/extrabold/n
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/extrabold/scit
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{it}{
- <-> alias * MerriwthrSans-OsF/extrabold/it
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-OsF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-OsF/extrabold/it
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bx}{n}{
<-> ssub * MerriwthrSans-OsF/b/n
}{}
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/b/scsl
+}{}
+
\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bx}{sl}{
<-> ssub * MerriwthrSans-OsF/b/sl
}{}
@@ -154,4 +246,8 @@
<-> ssub * MerriwthrSans-OsF/b/it
}{}
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-OsF/b/scit
+}{}
+
\endinput
diff --git a/fonts/merriweather/latex/LY1MerriwthrSans-Sup.fd b/fonts/merriweather/latex/LY1MerriwthrSans-Sup.fd
index f17c9b867d..f58c5560d6 100644
--- a/fonts/merriweather/latex/LY1MerriwthrSans-Sup.fd
+++ b/fonts/merriweather/latex/LY1MerriwthrSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{LY1MerriwthrSans-Sup.fd}
- [2020/07/30 (autoinst) Font definitions for LY1/MerriwthrSans-Sup.]
+ [2020/08/30 (autoinst) Font definitions for LY1/MerriwthrSans-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,127 +20,115 @@
\DeclareFontFamily{LY1}{MerriwthrSans-Sup}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{regular}{n}{
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{m}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Regular-sup-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{regular}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Italic-sup-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{regular}{n}{
+ <-> alias * MerriwthrSans-Sup/m/n
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{regular}{sl}{
- <-> ssub * MerriwthrSans-Sup/regular/it
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-sup-ly1
}{}
-
-% ---- bold ----
-
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Bold-sup-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{regular}{it}{
+ <-> alias * MerriwthrSans-Sup/m/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-sup-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{m}{sl}{
+ <-> ssub * MerriwthrSans-Sup/m/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bold}{sl}{
- <-> ssub * MerriwthrSans-Sup/bold/it
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{regular}{sl}{
+ <-> ssub * MerriwthrSans-Sup/regular/it
}{}
-% ---- light ----
+% ---- b = bold ----
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{light}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Light-sup-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-sup-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{light}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-sup-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bold}{n}{
+ <-> alias * MerriwthrSans-Sup/b/n
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{light}{sl}{
- <-> ssub * MerriwthrSans-Sup/light/it
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-sup-ly1
}{}
-
-% ---- extrabold ----
-
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{extrabold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-sup-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bold}{it}{
+ <-> alias * MerriwthrSans-Sup/b/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{extrabold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-sup-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{b}{sl}{
+ <-> ssub * MerriwthrSans-Sup/b/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{extrabold}{sl}{
- <-> ssub * MerriwthrSans-Sup/extrabold/it
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bold}{sl}{
+ <-> ssub * MerriwthrSans-Sup/bold/it
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-% l --> light
+% ---- l = light ----
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{l}{sl}{
- <-> alias * MerriwthrSans-Sup/light/sl
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-sup-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{l}{n}{
- <-> alias * MerriwthrSans-Sup/light/n
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{light}{n}{
+ <-> alias * MerriwthrSans-Sup/l/n
}{}
\DeclareFontShape{LY1}{MerriwthrSans-Sup}{l}{it}{
- <-> alias * MerriwthrSans-Sup/light/it
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-sup-ly1
}{}
-
-% m --> regular
-
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{m}{sl}{
- <-> alias * MerriwthrSans-Sup/regular/sl
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{light}{it}{
+ <-> alias * MerriwthrSans-Sup/l/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{m}{n}{
- <-> alias * MerriwthrSans-Sup/regular/n
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{l}{sl}{
+ <-> ssub * MerriwthrSans-Sup/l/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{m}{it}{
- <-> alias * MerriwthrSans-Sup/regular/it
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{light}{sl}{
+ <-> ssub * MerriwthrSans-Sup/light/it
}{}
-% b --> bold
+% ---- eb = extrabold ----
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{b}{sl}{
- <-> alias * MerriwthrSans-Sup/bold/sl
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-sup-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{b}{n}{
- <-> alias * MerriwthrSans-Sup/bold/n
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{extrabold}{n}{
+ <-> alias * MerriwthrSans-Sup/eb/n
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{b}{it}{
- <-> alias * MerriwthrSans-Sup/bold/it
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-sup-ly1
}{}
-
-% eb --> extrabold
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{extrabold}{it}{
+ <-> alias * MerriwthrSans-Sup/eb/it
+}{}
\DeclareFontShape{LY1}{MerriwthrSans-Sup}{eb}{sl}{
- <-> alias * MerriwthrSans-Sup/extrabold/sl
+ <-> ssub * MerriwthrSans-Sup/eb/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{eb}{n}{
- <-> alias * MerriwthrSans-Sup/extrabold/n
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-Sup/extrabold/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{eb}{it}{
- <-> alias * MerriwthrSans-Sup/extrabold/it
-}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bx}{n}{
<-> ssub * MerriwthrSans-Sup/b/n
diff --git a/fonts/merriweather/latex/LY1MerriwthrSans-TLF.fd b/fonts/merriweather/latex/LY1MerriwthrSans-TLF.fd
new file mode 100644
index 0000000000..c2c26aff66
--- /dev/null
+++ b/fonts/merriweather/latex/LY1MerriwthrSans-TLF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{LY1MerriwthrSans-TLF.fd}
+ [2020/08/30 (autoinst) Font definitions for LY1/MerriwthrSans-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{MerriwthrSans-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{regular}{sc}{
+ <-> alias * MerriwthrSans-TLF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{regular}{n}{
+ <-> alias * MerriwthrSans-TLF/m/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{regular}{it}{
+ <-> alias * MerriwthrSans-TLF/m/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{regular}{scit}{
+ <-> alias * MerriwthrSans-TLF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{m}{sl}{
+ <-> ssub * MerriwthrSans-TLF/m/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-TLF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bold}{sc}{
+ <-> alias * MerriwthrSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bold}{n}{
+ <-> alias * MerriwthrSans-TLF/b/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bold}{it}{
+ <-> alias * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bold}{scit}{
+ <-> alias * MerriwthrSans-TLF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{b}{sl}{
+ <-> ssub * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-TLF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{light}{sc}{
+ <-> alias * MerriwthrSans-TLF/l/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{light}{n}{
+ <-> alias * MerriwthrSans-TLF/l/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{light}{it}{
+ <-> alias * MerriwthrSans-TLF/l/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{light}{scit}{
+ <-> alias * MerriwthrSans-TLF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/light/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{l}{sl}{
+ <-> ssub * MerriwthrSans-TLF/l/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{light}{sl}{
+ <-> ssub * MerriwthrSans-TLF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-TLF/eb/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-TLF/eb/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-TLF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-TLF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bx}{n}{
+ <-> ssub * MerriwthrSans-TLF/b/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-TLF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bx}{it}{
+ <-> ssub * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-TLF/b/scit
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/LY1MerriwthrSans-TOsF.fd b/fonts/merriweather/latex/LY1MerriwthrSans-TOsF.fd
new file mode 100644
index 0000000000..2a53213309
--- /dev/null
+++ b/fonts/merriweather/latex/LY1MerriwthrSans-TOsF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{LY1MerriwthrSans-TOsF.fd}
+ [2020/08/30 (autoinst) Font definitions for LY1/MerriwthrSans-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{MerriwthrSans-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{regular}{sc}{
+ <-> alias * MerriwthrSans-TOsF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{regular}{n}{
+ <-> alias * MerriwthrSans-TOsF/m/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{regular}{it}{
+ <-> alias * MerriwthrSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{regular}{scit}{
+ <-> alias * MerriwthrSans-TOsF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{m}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bold}{sc}{
+ <-> alias * MerriwthrSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bold}{n}{
+ <-> alias * MerriwthrSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bold}{it}{
+ <-> alias * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bold}{scit}{
+ <-> alias * MerriwthrSans-TOsF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{b}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{light}{sc}{
+ <-> alias * MerriwthrSans-TOsF/l/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{light}{n}{
+ <-> alias * MerriwthrSans-TOsF/l/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{light}{it}{
+ <-> alias * MerriwthrSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{light}{scit}{
+ <-> alias * MerriwthrSans-TOsF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/light/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{l}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{light}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-TOsF/eb/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-TOsF/eb/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bx}{n}{
+ <-> ssub * MerriwthrSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bx}{it}{
+ <-> ssub * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/OT1Merriwthr-LF.fd b/fonts/merriweather/latex/OT1Merriwthr-LF.fd
new file mode 100644
index 0000000000..cdc8228b69
--- /dev/null
+++ b/fonts/merriweather/latex/OT1Merriwthr-LF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{OT1Merriwthr-LF.fd}
+ [2020/08/30 (autoinst) Font definitions for OT1/Merriwthr-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{Merriwthr-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{regular}{sc}{
+ <-> alias * Merriwthr-LF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{regular}{n}{
+ <-> alias * Merriwthr-LF/m/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{regular}{it}{
+ <-> alias * Merriwthr-LF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{regular}{scit}{
+ <-> alias * Merriwthr-LF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{m}{scsl}{
+ <-> ssub * Merriwthr-LF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{regular}{scsl}{
+ <-> ssub * Merriwthr-LF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{m}{sl}{
+ <-> ssub * Merriwthr-LF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{regular}{sl}{
+ <-> ssub * Merriwthr-LF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{black}{sc}{
+ <-> alias * Merriwthr-LF/eb/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{black}{n}{
+ <-> alias * Merriwthr-LF/eb/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{black}{it}{
+ <-> alias * Merriwthr-LF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{black}{scit}{
+ <-> alias * Merriwthr-LF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{eb}{scsl}{
+ <-> ssub * Merriwthr-LF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{black}{scsl}{
+ <-> ssub * Merriwthr-LF/black/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{eb}{sl}{
+ <-> ssub * Merriwthr-LF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{black}{sl}{
+ <-> ssub * Merriwthr-LF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bold}{sc}{
+ <-> alias * Merriwthr-LF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bold}{n}{
+ <-> alias * Merriwthr-LF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bold}{it}{
+ <-> alias * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bold}{scit}{
+ <-> alias * Merriwthr-LF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{b}{scsl}{
+ <-> ssub * Merriwthr-LF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bold}{scsl}{
+ <-> ssub * Merriwthr-LF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{b}{sl}{
+ <-> ssub * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bold}{sl}{
+ <-> ssub * Merriwthr-LF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{light}{sc}{
+ <-> alias * Merriwthr-LF/l/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{light}{n}{
+ <-> alias * Merriwthr-LF/l/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{light}{it}{
+ <-> alias * Merriwthr-LF/l/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{light}{scit}{
+ <-> alias * Merriwthr-LF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{l}{scsl}{
+ <-> ssub * Merriwthr-LF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{light}{scsl}{
+ <-> ssub * Merriwthr-LF/light/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{l}{sl}{
+ <-> ssub * Merriwthr-LF/l/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{light}{sl}{
+ <-> ssub * Merriwthr-LF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bx}{n}{
+ <-> ssub * Merriwthr-LF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bx}{sc}{
+ <-> ssub * Merriwthr-LF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bx}{scsl}{
+ <-> ssub * Merriwthr-LF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bx}{sl}{
+ <-> ssub * Merriwthr-LF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bx}{it}{
+ <-> ssub * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bx}{scit}{
+ <-> ssub * Merriwthr-LF/b/scit
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/OT1Merriwthr-OsF.fd b/fonts/merriweather/latex/OT1Merriwthr-OsF.fd
index e6c211f1e7..3d121952b1 100644
--- a/fonts/merriweather/latex/OT1Merriwthr-OsF.fd
+++ b/fonts/merriweather/latex/OT1Merriwthr-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{OT1Merriwthr-OsF.fd}
- [2020/07/30 (autoinst) Font definitions for OT1/Merriwthr-OsF.]
+ [2020/08/30 (autoinst) Font definitions for OT1/Merriwthr-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,132 +20,224 @@
\DeclareFontFamily{OT1}{Merriwthr-OsF}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{n}{
+\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{sc}{
+ <-> alias * Merriwthr-OsF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{n}{
<-> \Merriwthr@@scale Merriwthr-Regular-osf-ot1
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{it}{
+\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{n}{
+ <-> alias * Merriwthr-OsF/m/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{it}{
<-> \Merriwthr@@scale Merriwthr-Italic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{sl}{
- <-> ssub * Merriwthr-OsF/regular/it
+\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{it}{
+ <-> alias * Merriwthr-OsF/m/it
}{}
+\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-osf-sc-ot1
+}{}
-% ---- bold ----
+\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{scit}{
+ <-> alias * Merriwthr-OsF/m/scit
+}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{n}{
- <-> \Merriwthr@@scale Merriwthr-Bold-osf-ot1
+\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{scsl}{
+ <-> ssub * Merriwthr-OsF/m/scit
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{it}{
- <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-ot1
+\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{scsl}{
+ <-> ssub * Merriwthr-OsF/regular/scit
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{sl}{
- <-> ssub * Merriwthr-OsF/bold/it
+\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{sl}{
+ <-> ssub * Merriwthr-OsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{sl}{
+ <-> ssub * Merriwthr-OsF/regular/it
}{}
-% ---- light ----
+% ---- eb = black ----
-\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{n}{
- <-> \Merriwthr@@scale Merriwthr-Light-osf-ot1
+\DeclareFontShape{OT1}{Merriwthr-OsF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{it}{
- <-> \Merriwthr@@scale Merriwthr-LightIt-osf-ot1
+\DeclareFontShape{OT1}{Merriwthr-OsF}{black}{sc}{
+ <-> alias * Merriwthr-OsF/eb/sc
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{sl}{
- <-> ssub * Merriwthr-OsF/light/it
+\DeclareFontShape{OT1}{Merriwthr-OsF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-osf-ot1
}{}
+\DeclareFontShape{OT1}{Merriwthr-OsF}{black}{n}{
+ <-> alias * Merriwthr-OsF/eb/n
+}{}
-% ---- ultrabold ----
+\DeclareFontShape{OT1}{Merriwthr-OsF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-osf-ot1
+}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{ultrabold}{n}{
- <-> \Merriwthr@@scale Merriwthr-UltraBold-osf-ot1
+\DeclareFontShape{OT1}{Merriwthr-OsF}{black}{it}{
+ <-> alias * Merriwthr-OsF/eb/it
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{ultrabold}{it}{
- <-> \Merriwthr@@scale Merriwthr-UltraBdIt-osf-ot1
+\DeclareFontShape{OT1}{Merriwthr-OsF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{ultrabold}{sl}{
- <-> ssub * Merriwthr-OsF/ultrabold/it
+\DeclareFontShape{OT1}{Merriwthr-OsF}{black}{scit}{
+ <-> alias * Merriwthr-OsF/eb/scit
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
+\DeclareFontShape{OT1}{Merriwthr-OsF}{eb}{scsl}{
+ <-> ssub * Merriwthr-OsF/eb/scit
+}{}
-% l --> light
+\DeclareFontShape{OT1}{Merriwthr-OsF}{black}{scsl}{
+ <-> ssub * Merriwthr-OsF/black/scit
+}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{sl}{
- <-> alias * Merriwthr-OsF/light/sl
+\DeclareFontShape{OT1}{Merriwthr-OsF}{eb}{sl}{
+ <-> ssub * Merriwthr-OsF/eb/it
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{n}{
- <-> alias * Merriwthr-OsF/light/n
+\DeclareFontShape{OT1}{Merriwthr-OsF}{black}{sl}{
+ <-> ssub * Merriwthr-OsF/black/it
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{it}{
- <-> alias * Merriwthr-OsF/light/it
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-osf-sc-ot1
}{}
+\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{sc}{
+ <-> alias * Merriwthr-OsF/b/sc
+}{}
-% m --> regular
+\DeclareFontShape{OT1}{Merriwthr-OsF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-osf-ot1
+}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{sl}{
- <-> alias * Merriwthr-OsF/regular/sl
+\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{n}{
+ <-> alias * Merriwthr-OsF/b/n
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{n}{
- <-> alias * Merriwthr-OsF/regular/n
+\DeclareFontShape{OT1}{Merriwthr-OsF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{it}{
- <-> alias * Merriwthr-OsF/regular/it
+\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{it}{
+ <-> alias * Merriwthr-OsF/b/it
}{}
+\DeclareFontShape{OT1}{Merriwthr-OsF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-sc-ot1
+}{}
-% b --> bold
+\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{scit}{
+ <-> alias * Merriwthr-OsF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{b}{scsl}{
+ <-> ssub * Merriwthr-OsF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{scsl}{
+ <-> ssub * Merriwthr-OsF/bold/scit
+}{}
\DeclareFontShape{OT1}{Merriwthr-OsF}{b}{sl}{
- <-> alias * Merriwthr-OsF/bold/sl
+ <-> ssub * Merriwthr-OsF/b/it
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{b}{n}{
- <-> alias * Merriwthr-OsF/bold/n
+\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{sl}{
+ <-> ssub * Merriwthr-OsF/bold/it
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{b}{it}{
- <-> alias * Merriwthr-OsF/bold/it
+
+% ---- l = light ----
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{sc}{
+ <-> alias * Merriwthr-OsF/l/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{n}{
+ <-> alias * Merriwthr-OsF/l/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-osf-ot1
}{}
+\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{it}{
+ <-> alias * Merriwthr-OsF/l/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{scit}{
+ <-> alias * Merriwthr-OsF/l/scit
+}{}
-% ub --> ultrabold
+\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{scsl}{
+ <-> ssub * Merriwthr-OsF/l/scit
+}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{ub}{sl}{
- <-> alias * Merriwthr-OsF/ultrabold/sl
+\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{scsl}{
+ <-> ssub * Merriwthr-OsF/light/scit
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{ub}{n}{
- <-> alias * Merriwthr-OsF/ultrabold/n
+\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{sl}{
+ <-> ssub * Merriwthr-OsF/l/it
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{ub}{it}{
- <-> alias * Merriwthr-OsF/ultrabold/it
+\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{sl}{
+ <-> ssub * Merriwthr-OsF/light/it
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{OT1}{Merriwthr-OsF}{bx}{n}{
<-> ssub * Merriwthr-OsF/b/n
}{}
+\DeclareFontShape{OT1}{Merriwthr-OsF}{bx}{sc}{
+ <-> ssub * Merriwthr-OsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{bx}{scsl}{
+ <-> ssub * Merriwthr-OsF/b/scsl
+}{}
+
\DeclareFontShape{OT1}{Merriwthr-OsF}{bx}{sl}{
<-> ssub * Merriwthr-OsF/b/sl
}{}
@@ -154,4 +246,8 @@
<-> ssub * Merriwthr-OsF/b/it
}{}
+\DeclareFontShape{OT1}{Merriwthr-OsF}{bx}{scit}{
+ <-> ssub * Merriwthr-OsF/b/scit
+}{}
+
\endinput
diff --git a/fonts/merriweather/latex/OT1Merriwthr-Sup.fd b/fonts/merriweather/latex/OT1Merriwthr-Sup.fd
new file mode 100644
index 0000000000..972a98a2e3
--- /dev/null
+++ b/fonts/merriweather/latex/OT1Merriwthr-Sup.fd
@@ -0,0 +1,145 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{OT1Merriwthr-Sup.fd}
+ [2020/08/30 (autoinst) Font definitions for OT1/Merriwthr-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{Merriwthr-Sup}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{regular}{n}{
+ <-> alias * Merriwthr-Sup/m/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{regular}{it}{
+ <-> alias * Merriwthr-Sup/m/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{m}{sl}{
+ <-> ssub * Merriwthr-Sup/m/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{regular}{sl}{
+ <-> ssub * Merriwthr-Sup/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{black}{n}{
+ <-> alias * Merriwthr-Sup/eb/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{black}{it}{
+ <-> alias * Merriwthr-Sup/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{eb}{sl}{
+ <-> ssub * Merriwthr-Sup/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{black}{sl}{
+ <-> ssub * Merriwthr-Sup/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{bold}{n}{
+ <-> alias * Merriwthr-Sup/b/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{bold}{it}{
+ <-> alias * Merriwthr-Sup/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{b}{sl}{
+ <-> ssub * Merriwthr-Sup/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{bold}{sl}{
+ <-> ssub * Merriwthr-Sup/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{light}{n}{
+ <-> alias * Merriwthr-Sup/l/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{light}{it}{
+ <-> alias * Merriwthr-Sup/l/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{l}{sl}{
+ <-> ssub * Merriwthr-Sup/l/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{light}{sl}{
+ <-> ssub * Merriwthr-Sup/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{bx}{n}{
+ <-> ssub * Merriwthr-Sup/b/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{bx}{sl}{
+ <-> ssub * Merriwthr-Sup/b/sl
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{bx}{it}{
+ <-> ssub * Merriwthr-Sup/b/it
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/OT1Merriwthr-TLF.fd b/fonts/merriweather/latex/OT1Merriwthr-TLF.fd
new file mode 100644
index 0000000000..3cfead0171
--- /dev/null
+++ b/fonts/merriweather/latex/OT1Merriwthr-TLF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{OT1Merriwthr-TLF.fd}
+ [2020/08/30 (autoinst) Font definitions for OT1/Merriwthr-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{Merriwthr-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{regular}{sc}{
+ <-> alias * Merriwthr-TLF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{regular}{n}{
+ <-> alias * Merriwthr-TLF/m/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{regular}{it}{
+ <-> alias * Merriwthr-TLF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{regular}{scit}{
+ <-> alias * Merriwthr-TLF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{m}{scsl}{
+ <-> ssub * Merriwthr-TLF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{regular}{scsl}{
+ <-> ssub * Merriwthr-TLF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{m}{sl}{
+ <-> ssub * Merriwthr-TLF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{regular}{sl}{
+ <-> ssub * Merriwthr-TLF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{black}{sc}{
+ <-> alias * Merriwthr-TLF/eb/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{black}{n}{
+ <-> alias * Merriwthr-TLF/eb/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{black}{it}{
+ <-> alias * Merriwthr-TLF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{black}{scit}{
+ <-> alias * Merriwthr-TLF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{eb}{scsl}{
+ <-> ssub * Merriwthr-TLF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{black}{scsl}{
+ <-> ssub * Merriwthr-TLF/black/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{eb}{sl}{
+ <-> ssub * Merriwthr-TLF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{black}{sl}{
+ <-> ssub * Merriwthr-TLF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bold}{sc}{
+ <-> alias * Merriwthr-TLF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bold}{n}{
+ <-> alias * Merriwthr-TLF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bold}{it}{
+ <-> alias * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bold}{scit}{
+ <-> alias * Merriwthr-TLF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{b}{scsl}{
+ <-> ssub * Merriwthr-TLF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bold}{scsl}{
+ <-> ssub * Merriwthr-TLF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{b}{sl}{
+ <-> ssub * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bold}{sl}{
+ <-> ssub * Merriwthr-TLF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{light}{sc}{
+ <-> alias * Merriwthr-TLF/l/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{light}{n}{
+ <-> alias * Merriwthr-TLF/l/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{light}{it}{
+ <-> alias * Merriwthr-TLF/l/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{light}{scit}{
+ <-> alias * Merriwthr-TLF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{l}{scsl}{
+ <-> ssub * Merriwthr-TLF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{light}{scsl}{
+ <-> ssub * Merriwthr-TLF/light/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{l}{sl}{
+ <-> ssub * Merriwthr-TLF/l/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{light}{sl}{
+ <-> ssub * Merriwthr-TLF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bx}{n}{
+ <-> ssub * Merriwthr-TLF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bx}{sc}{
+ <-> ssub * Merriwthr-TLF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bx}{scsl}{
+ <-> ssub * Merriwthr-TLF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bx}{sl}{
+ <-> ssub * Merriwthr-TLF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bx}{it}{
+ <-> ssub * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bx}{scit}{
+ <-> ssub * Merriwthr-TLF/b/scit
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/OT1Merriwthr-TOsF.fd b/fonts/merriweather/latex/OT1Merriwthr-TOsF.fd
new file mode 100644
index 0000000000..72b89789b1
--- /dev/null
+++ b/fonts/merriweather/latex/OT1Merriwthr-TOsF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{OT1Merriwthr-TOsF.fd}
+ [2020/08/30 (autoinst) Font definitions for OT1/Merriwthr-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{Merriwthr-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{regular}{sc}{
+ <-> alias * Merriwthr-TOsF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{regular}{n}{
+ <-> alias * Merriwthr-TOsF/m/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{regular}{it}{
+ <-> alias * Merriwthr-TOsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{regular}{scit}{
+ <-> alias * Merriwthr-TOsF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{m}{scsl}{
+ <-> ssub * Merriwthr-TOsF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{regular}{scsl}{
+ <-> ssub * Merriwthr-TOsF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{m}{sl}{
+ <-> ssub * Merriwthr-TOsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{regular}{sl}{
+ <-> ssub * Merriwthr-TOsF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{black}{sc}{
+ <-> alias * Merriwthr-TOsF/eb/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{black}{n}{
+ <-> alias * Merriwthr-TOsF/eb/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{black}{it}{
+ <-> alias * Merriwthr-TOsF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{black}{scit}{
+ <-> alias * Merriwthr-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{eb}{scsl}{
+ <-> ssub * Merriwthr-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{black}{scsl}{
+ <-> ssub * Merriwthr-TOsF/black/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{eb}{sl}{
+ <-> ssub * Merriwthr-TOsF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{black}{sl}{
+ <-> ssub * Merriwthr-TOsF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bold}{sc}{
+ <-> alias * Merriwthr-TOsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bold}{n}{
+ <-> alias * Merriwthr-TOsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bold}{it}{
+ <-> alias * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bold}{scit}{
+ <-> alias * Merriwthr-TOsF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{b}{scsl}{
+ <-> ssub * Merriwthr-TOsF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bold}{scsl}{
+ <-> ssub * Merriwthr-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{b}{sl}{
+ <-> ssub * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bold}{sl}{
+ <-> ssub * Merriwthr-TOsF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{light}{sc}{
+ <-> alias * Merriwthr-TOsF/l/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{light}{n}{
+ <-> alias * Merriwthr-TOsF/l/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{light}{it}{
+ <-> alias * Merriwthr-TOsF/l/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{light}{scit}{
+ <-> alias * Merriwthr-TOsF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{l}{scsl}{
+ <-> ssub * Merriwthr-TOsF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{light}{scsl}{
+ <-> ssub * Merriwthr-TOsF/light/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{l}{sl}{
+ <-> ssub * Merriwthr-TOsF/l/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{light}{sl}{
+ <-> ssub * Merriwthr-TOsF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bx}{n}{
+ <-> ssub * Merriwthr-TOsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bx}{sc}{
+ <-> ssub * Merriwthr-TOsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bx}{scsl}{
+ <-> ssub * Merriwthr-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bx}{sl}{
+ <-> ssub * Merriwthr-TOsF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bx}{it}{
+ <-> ssub * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bx}{scit}{
+ <-> ssub * Merriwthr-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/OT1MerriwthrSans-LF.fd b/fonts/merriweather/latex/OT1MerriwthrSans-LF.fd
new file mode 100644
index 0000000000..4e2c35eea6
--- /dev/null
+++ b/fonts/merriweather/latex/OT1MerriwthrSans-LF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{OT1MerriwthrSans-LF.fd}
+ [2020/08/30 (autoinst) Font definitions for OT1/MerriwthrSans-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{MerriwthrSans-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{regular}{sc}{
+ <-> alias * MerriwthrSans-LF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{regular}{n}{
+ <-> alias * MerriwthrSans-LF/m/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{regular}{it}{
+ <-> alias * MerriwthrSans-LF/m/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{regular}{scit}{
+ <-> alias * MerriwthrSans-LF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-LF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-LF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{m}{sl}{
+ <-> ssub * MerriwthrSans-LF/m/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-LF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bold}{sc}{
+ <-> alias * MerriwthrSans-LF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bold}{n}{
+ <-> alias * MerriwthrSans-LF/b/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bold}{it}{
+ <-> alias * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bold}{scit}{
+ <-> alias * MerriwthrSans-LF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-LF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-LF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{b}{sl}{
+ <-> ssub * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-LF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{light}{sc}{
+ <-> alias * MerriwthrSans-LF/l/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{light}{n}{
+ <-> alias * MerriwthrSans-LF/l/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{light}{it}{
+ <-> alias * MerriwthrSans-LF/l/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{light}{scit}{
+ <-> alias * MerriwthrSans-LF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-LF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-LF/light/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{l}{sl}{
+ <-> ssub * MerriwthrSans-LF/l/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{light}{sl}{
+ <-> ssub * MerriwthrSans-LF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-LF/eb/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-LF/eb/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-LF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-LF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-LF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-LF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-LF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bx}{n}{
+ <-> ssub * MerriwthrSans-LF/b/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-LF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-LF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-LF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bx}{it}{
+ <-> ssub * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-LF/b/scit
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/OT1MerriwthrSans-OsF.fd b/fonts/merriweather/latex/OT1MerriwthrSans-OsF.fd
index 1464a5e0c7..3fa832c932 100644
--- a/fonts/merriweather/latex/OT1MerriwthrSans-OsF.fd
+++ b/fonts/merriweather/latex/OT1MerriwthrSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{OT1MerriwthrSans-OsF.fd}
- [2020/07/30 (autoinst) Font definitions for OT1/MerriwthrSans-OsF.]
+ [2020/08/30 (autoinst) Font definitions for OT1/MerriwthrSans-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,132 +20,224 @@
\DeclareFontFamily{OT1}{MerriwthrSans-OsF}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{regular}{n}{
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{regular}{sc}{
+ <-> alias * MerriwthrSans-OsF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Regular-osf-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{regular}{it}{
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{regular}{n}{
+ <-> alias * MerriwthrSans-OsF/m/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{it}{
<-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-ot1
}{}
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{regular}{it}{
+ <-> alias * MerriwthrSans-OsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{regular}{scit}{
+ <-> alias * MerriwthrSans-OsF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{sl}{
+ <-> ssub * MerriwthrSans-OsF/m/it
+}{}
+
\DeclareFontShape{OT1}{MerriwthrSans-OsF}{regular}{sl}{
- <-> ssub * MerriwthrSans-OsF/regular/it
+ <-> ssub * MerriwthrSans-OsF/regular/it
}{}
-% ---- bold ----
+% ---- b = bold ----
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{n}{
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{sc}{
+ <-> alias * MerriwthrSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{it}{
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{n}{
+ <-> alias * MerriwthrSans-OsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{it}{
<-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{sl}{
- <-> ssub * MerriwthrSans-OsF/bold/it
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{it}{
+ <-> alias * MerriwthrSans-OsF/b/it
}{}
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-sc-ot1
+}{}
-% ---- light ----
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{scit}{
+ <-> alias * MerriwthrSans-OsF/b/scit
+}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/b/scit
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/bold/scit
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{sl}{
- <-> ssub * MerriwthrSans-OsF/light/it
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{sl}{
+ <-> ssub * MerriwthrSans-OsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-OsF/bold/it
}{}
-% ---- extrabold ----
+% ---- l = light ----
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{sc}{
+ <-> alias * MerriwthrSans-OsF/l/sc
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{sl}{
- <-> ssub * MerriwthrSans-OsF/extrabold/it
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-ot1
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{n}{
+ <-> alias * MerriwthrSans-OsF/l/n
+}{}
-% l --> light
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-ot1
+}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{sl}{
- <-> alias * MerriwthrSans-OsF/light/sl
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{it}{
+ <-> alias * MerriwthrSans-OsF/l/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{n}{
- <-> alias * MerriwthrSans-OsF/light/n
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{it}{
- <-> alias * MerriwthrSans-OsF/light/it
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{scit}{
+ <-> alias * MerriwthrSans-OsF/l/scit
}{}
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/l/scit
+}{}
-% m --> regular
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/light/scit
+}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{sl}{
- <-> alias * MerriwthrSans-OsF/regular/sl
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{sl}{
+ <-> ssub * MerriwthrSans-OsF/l/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{n}{
- <-> alias * MerriwthrSans-OsF/regular/n
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{sl}{
+ <-> ssub * MerriwthrSans-OsF/light/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{it}{
- <-> alias * MerriwthrSans-OsF/regular/it
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-sc-ot1
}{}
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-OsF/eb/sc
+}{}
-% b --> bold
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-ot1
+}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{sl}{
- <-> alias * MerriwthrSans-OsF/bold/sl
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-OsF/eb/n
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{n}{
- <-> alias * MerriwthrSans-OsF/bold/n
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{it}{
- <-> alias * MerriwthrSans-OsF/bold/it
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-OsF/eb/it
}{}
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-sc-ot1
+}{}
-% eb --> extrabold
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-OsF/eb/scit
+}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{sl}{
- <-> alias * MerriwthrSans-OsF/extrabold/sl
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/eb/scit
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{n}{
- <-> alias * MerriwthrSans-OsF/extrabold/n
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/extrabold/scit
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{it}{
- <-> alias * MerriwthrSans-OsF/extrabold/it
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-OsF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-OsF/extrabold/it
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bx}{n}{
<-> ssub * MerriwthrSans-OsF/b/n
}{}
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/b/scsl
+}{}
+
\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bx}{sl}{
<-> ssub * MerriwthrSans-OsF/b/sl
}{}
@@ -154,4 +246,8 @@
<-> ssub * MerriwthrSans-OsF/b/it
}{}
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-OsF/b/scit
+}{}
+
\endinput
diff --git a/fonts/merriweather/latex/OT1MerriwthrSans-Sup.fd b/fonts/merriweather/latex/OT1MerriwthrSans-Sup.fd
index 5542aa6451..874aa993ac 100644
--- a/fonts/merriweather/latex/OT1MerriwthrSans-Sup.fd
+++ b/fonts/merriweather/latex/OT1MerriwthrSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{OT1MerriwthrSans-Sup.fd}
- [2020/07/30 (autoinst) Font definitions for OT1/MerriwthrSans-Sup.]
+ [2020/08/30 (autoinst) Font definitions for OT1/MerriwthrSans-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,127 +20,115 @@
\DeclareFontFamily{OT1}{MerriwthrSans-Sup}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{regular}{n}{
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{m}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Regular-sup-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{regular}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Italic-sup-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{regular}{n}{
+ <-> alias * MerriwthrSans-Sup/m/n
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{regular}{sl}{
- <-> ssub * MerriwthrSans-Sup/regular/it
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-sup-ot1
}{}
-
-% ---- bold ----
-
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Bold-sup-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{regular}{it}{
+ <-> alias * MerriwthrSans-Sup/m/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-sup-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{m}{sl}{
+ <-> ssub * MerriwthrSans-Sup/m/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bold}{sl}{
- <-> ssub * MerriwthrSans-Sup/bold/it
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{regular}{sl}{
+ <-> ssub * MerriwthrSans-Sup/regular/it
}{}
-% ---- light ----
+% ---- b = bold ----
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{light}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Light-sup-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-sup-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{light}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-sup-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bold}{n}{
+ <-> alias * MerriwthrSans-Sup/b/n
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{light}{sl}{
- <-> ssub * MerriwthrSans-Sup/light/it
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-sup-ot1
}{}
-
-% ---- extrabold ----
-
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{extrabold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-sup-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bold}{it}{
+ <-> alias * MerriwthrSans-Sup/b/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{extrabold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-sup-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{b}{sl}{
+ <-> ssub * MerriwthrSans-Sup/b/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{extrabold}{sl}{
- <-> ssub * MerriwthrSans-Sup/extrabold/it
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bold}{sl}{
+ <-> ssub * MerriwthrSans-Sup/bold/it
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-% l --> light
+% ---- l = light ----
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{l}{sl}{
- <-> alias * MerriwthrSans-Sup/light/sl
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-sup-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{l}{n}{
- <-> alias * MerriwthrSans-Sup/light/n
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{light}{n}{
+ <-> alias * MerriwthrSans-Sup/l/n
}{}
\DeclareFontShape{OT1}{MerriwthrSans-Sup}{l}{it}{
- <-> alias * MerriwthrSans-Sup/light/it
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-sup-ot1
}{}
-
-% m --> regular
-
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{m}{sl}{
- <-> alias * MerriwthrSans-Sup/regular/sl
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{light}{it}{
+ <-> alias * MerriwthrSans-Sup/l/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{m}{n}{
- <-> alias * MerriwthrSans-Sup/regular/n
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{l}{sl}{
+ <-> ssub * MerriwthrSans-Sup/l/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{m}{it}{
- <-> alias * MerriwthrSans-Sup/regular/it
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{light}{sl}{
+ <-> ssub * MerriwthrSans-Sup/light/it
}{}
-% b --> bold
+% ---- eb = extrabold ----
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{b}{sl}{
- <-> alias * MerriwthrSans-Sup/bold/sl
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-sup-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{b}{n}{
- <-> alias * MerriwthrSans-Sup/bold/n
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{extrabold}{n}{
+ <-> alias * MerriwthrSans-Sup/eb/n
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{b}{it}{
- <-> alias * MerriwthrSans-Sup/bold/it
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-sup-ot1
}{}
-
-% eb --> extrabold
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{extrabold}{it}{
+ <-> alias * MerriwthrSans-Sup/eb/it
+}{}
\DeclareFontShape{OT1}{MerriwthrSans-Sup}{eb}{sl}{
- <-> alias * MerriwthrSans-Sup/extrabold/sl
+ <-> ssub * MerriwthrSans-Sup/eb/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{eb}{n}{
- <-> alias * MerriwthrSans-Sup/extrabold/n
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-Sup/extrabold/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{eb}{it}{
- <-> alias * MerriwthrSans-Sup/extrabold/it
-}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bx}{n}{
<-> ssub * MerriwthrSans-Sup/b/n
diff --git a/fonts/merriweather/latex/OT1MerriwthrSans-TLF.fd b/fonts/merriweather/latex/OT1MerriwthrSans-TLF.fd
new file mode 100644
index 0000000000..e0a876352b
--- /dev/null
+++ b/fonts/merriweather/latex/OT1MerriwthrSans-TLF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{OT1MerriwthrSans-TLF.fd}
+ [2020/08/30 (autoinst) Font definitions for OT1/MerriwthrSans-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{MerriwthrSans-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{regular}{sc}{
+ <-> alias * MerriwthrSans-TLF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{regular}{n}{
+ <-> alias * MerriwthrSans-TLF/m/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{regular}{it}{
+ <-> alias * MerriwthrSans-TLF/m/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{regular}{scit}{
+ <-> alias * MerriwthrSans-TLF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{m}{sl}{
+ <-> ssub * MerriwthrSans-TLF/m/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-TLF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bold}{sc}{
+ <-> alias * MerriwthrSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bold}{n}{
+ <-> alias * MerriwthrSans-TLF/b/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bold}{it}{
+ <-> alias * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bold}{scit}{
+ <-> alias * MerriwthrSans-TLF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{b}{sl}{
+ <-> ssub * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-TLF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{light}{sc}{
+ <-> alias * MerriwthrSans-TLF/l/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{light}{n}{
+ <-> alias * MerriwthrSans-TLF/l/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{light}{it}{
+ <-> alias * MerriwthrSans-TLF/l/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{light}{scit}{
+ <-> alias * MerriwthrSans-TLF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/light/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{l}{sl}{
+ <-> ssub * MerriwthrSans-TLF/l/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{light}{sl}{
+ <-> ssub * MerriwthrSans-TLF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-TLF/eb/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-TLF/eb/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-TLF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-TLF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bx}{n}{
+ <-> ssub * MerriwthrSans-TLF/b/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-TLF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bx}{it}{
+ <-> ssub * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-TLF/b/scit
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/OT1MerriwthrSans-TOsF.fd b/fonts/merriweather/latex/OT1MerriwthrSans-TOsF.fd
new file mode 100644
index 0000000000..b7bb8bf52a
--- /dev/null
+++ b/fonts/merriweather/latex/OT1MerriwthrSans-TOsF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{OT1MerriwthrSans-TOsF.fd}
+ [2020/08/30 (autoinst) Font definitions for OT1/MerriwthrSans-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{MerriwthrSans-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{regular}{sc}{
+ <-> alias * MerriwthrSans-TOsF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{regular}{n}{
+ <-> alias * MerriwthrSans-TOsF/m/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{regular}{it}{
+ <-> alias * MerriwthrSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{regular}{scit}{
+ <-> alias * MerriwthrSans-TOsF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{m}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bold}{sc}{
+ <-> alias * MerriwthrSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bold}{n}{
+ <-> alias * MerriwthrSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bold}{it}{
+ <-> alias * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bold}{scit}{
+ <-> alias * MerriwthrSans-TOsF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{b}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{light}{sc}{
+ <-> alias * MerriwthrSans-TOsF/l/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{light}{n}{
+ <-> alias * MerriwthrSans-TOsF/l/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{light}{it}{
+ <-> alias * MerriwthrSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{light}{scit}{
+ <-> alias * MerriwthrSans-TOsF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/light/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{l}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{light}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-TOsF/eb/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-TOsF/eb/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bx}{n}{
+ <-> ssub * MerriwthrSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bx}{it}{
+ <-> ssub * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/T1Merriwthr-LF.fd b/fonts/merriweather/latex/T1Merriwthr-LF.fd
new file mode 100644
index 0000000000..f738ee820a
--- /dev/null
+++ b/fonts/merriweather/latex/T1Merriwthr-LF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{T1Merriwthr-LF.fd}
+ [2020/08/30 (autoinst) Font definitions for T1/Merriwthr-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{Merriwthr-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{Merriwthr-LF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{regular}{sc}{
+ <-> alias * Merriwthr-LF/m/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{regular}{n}{
+ <-> alias * Merriwthr-LF/m/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{regular}{it}{
+ <-> alias * Merriwthr-LF/m/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{regular}{scit}{
+ <-> alias * Merriwthr-LF/m/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{m}{scsl}{
+ <-> ssub * Merriwthr-LF/m/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{regular}{scsl}{
+ <-> ssub * Merriwthr-LF/regular/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{m}{sl}{
+ <-> ssub * Merriwthr-LF/m/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{regular}{sl}{
+ <-> ssub * Merriwthr-LF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{T1}{Merriwthr-LF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{black}{sc}{
+ <-> alias * Merriwthr-LF/eb/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{black}{n}{
+ <-> alias * Merriwthr-LF/eb/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{black}{it}{
+ <-> alias * Merriwthr-LF/eb/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{black}{scit}{
+ <-> alias * Merriwthr-LF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{eb}{scsl}{
+ <-> ssub * Merriwthr-LF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{black}{scsl}{
+ <-> ssub * Merriwthr-LF/black/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{eb}{sl}{
+ <-> ssub * Merriwthr-LF/eb/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{black}{sl}{
+ <-> ssub * Merriwthr-LF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{Merriwthr-LF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bold}{sc}{
+ <-> alias * Merriwthr-LF/b/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bold}{n}{
+ <-> alias * Merriwthr-LF/b/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bold}{it}{
+ <-> alias * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bold}{scit}{
+ <-> alias * Merriwthr-LF/b/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{b}{scsl}{
+ <-> ssub * Merriwthr-LF/b/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bold}{scsl}{
+ <-> ssub * Merriwthr-LF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{b}{sl}{
+ <-> ssub * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bold}{sl}{
+ <-> ssub * Merriwthr-LF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{T1}{Merriwthr-LF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{light}{sc}{
+ <-> alias * Merriwthr-LF/l/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{light}{n}{
+ <-> alias * Merriwthr-LF/l/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{light}{it}{
+ <-> alias * Merriwthr-LF/l/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{light}{scit}{
+ <-> alias * Merriwthr-LF/l/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{l}{scsl}{
+ <-> ssub * Merriwthr-LF/l/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{light}{scsl}{
+ <-> ssub * Merriwthr-LF/light/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{l}{sl}{
+ <-> ssub * Merriwthr-LF/l/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{light}{sl}{
+ <-> ssub * Merriwthr-LF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bx}{n}{
+ <-> ssub * Merriwthr-LF/b/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bx}{sc}{
+ <-> ssub * Merriwthr-LF/b/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bx}{scsl}{
+ <-> ssub * Merriwthr-LF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bx}{sl}{
+ <-> ssub * Merriwthr-LF/b/sl
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bx}{it}{
+ <-> ssub * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bx}{scit}{
+ <-> ssub * Merriwthr-LF/b/scit
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/T1Merriwthr-OsF.fd b/fonts/merriweather/latex/T1Merriwthr-OsF.fd
index 14a66d32e1..373f396e34 100644
--- a/fonts/merriweather/latex/T1Merriwthr-OsF.fd
+++ b/fonts/merriweather/latex/T1Merriwthr-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{T1Merriwthr-OsF.fd}
- [2020/07/30 (autoinst) Font definitions for T1/Merriwthr-OsF.]
+ [2020/08/30 (autoinst) Font definitions for T1/Merriwthr-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,132 +20,224 @@
\DeclareFontFamily{T1}{Merriwthr-OsF}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{n}{
+\DeclareFontShape{T1}{Merriwthr-OsF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{sc}{
+ <-> alias * Merriwthr-OsF/m/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{m}{n}{
<-> \Merriwthr@@scale Merriwthr-Regular-osf-t1
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{it}{
+\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{n}{
+ <-> alias * Merriwthr-OsF/m/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{m}{it}{
<-> \Merriwthr@@scale Merriwthr-Italic-osf-t1
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{sl}{
- <-> ssub * Merriwthr-OsF/regular/it
+\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{it}{
+ <-> alias * Merriwthr-OsF/m/it
}{}
+\DeclareFontShape{T1}{Merriwthr-OsF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-osf-sc-t1
+}{}
-% ---- bold ----
+\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{scit}{
+ <-> alias * Merriwthr-OsF/m/scit
+}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{n}{
- <-> \Merriwthr@@scale Merriwthr-Bold-osf-t1
+\DeclareFontShape{T1}{Merriwthr-OsF}{m}{scsl}{
+ <-> ssub * Merriwthr-OsF/m/scit
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{it}{
- <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-t1
+\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{scsl}{
+ <-> ssub * Merriwthr-OsF/regular/scit
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{sl}{
- <-> ssub * Merriwthr-OsF/bold/it
+\DeclareFontShape{T1}{Merriwthr-OsF}{m}{sl}{
+ <-> ssub * Merriwthr-OsF/m/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{sl}{
+ <-> ssub * Merriwthr-OsF/regular/it
}{}
-% ---- light ----
+% ---- eb = black ----
-\DeclareFontShape{T1}{Merriwthr-OsF}{light}{n}{
- <-> \Merriwthr@@scale Merriwthr-Light-osf-t1
+\DeclareFontShape{T1}{Merriwthr-OsF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{light}{it}{
- <-> \Merriwthr@@scale Merriwthr-LightIt-osf-t1
+\DeclareFontShape{T1}{Merriwthr-OsF}{black}{sc}{
+ <-> alias * Merriwthr-OsF/eb/sc
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{light}{sl}{
- <-> ssub * Merriwthr-OsF/light/it
+\DeclareFontShape{T1}{Merriwthr-OsF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-osf-t1
}{}
+\DeclareFontShape{T1}{Merriwthr-OsF}{black}{n}{
+ <-> alias * Merriwthr-OsF/eb/n
+}{}
-% ---- ultrabold ----
+\DeclareFontShape{T1}{Merriwthr-OsF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-osf-t1
+}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{ultrabold}{n}{
- <-> \Merriwthr@@scale Merriwthr-UltraBold-osf-t1
+\DeclareFontShape{T1}{Merriwthr-OsF}{black}{it}{
+ <-> alias * Merriwthr-OsF/eb/it
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{ultrabold}{it}{
- <-> \Merriwthr@@scale Merriwthr-UltraBdIt-osf-t1
+\DeclareFontShape{T1}{Merriwthr-OsF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{ultrabold}{sl}{
- <-> ssub * Merriwthr-OsF/ultrabold/it
+\DeclareFontShape{T1}{Merriwthr-OsF}{black}{scit}{
+ <-> alias * Merriwthr-OsF/eb/scit
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
+\DeclareFontShape{T1}{Merriwthr-OsF}{eb}{scsl}{
+ <-> ssub * Merriwthr-OsF/eb/scit
+}{}
-% l --> light
+\DeclareFontShape{T1}{Merriwthr-OsF}{black}{scsl}{
+ <-> ssub * Merriwthr-OsF/black/scit
+}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{l}{sl}{
- <-> alias * Merriwthr-OsF/light/sl
+\DeclareFontShape{T1}{Merriwthr-OsF}{eb}{sl}{
+ <-> ssub * Merriwthr-OsF/eb/it
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{l}{n}{
- <-> alias * Merriwthr-OsF/light/n
+\DeclareFontShape{T1}{Merriwthr-OsF}{black}{sl}{
+ <-> ssub * Merriwthr-OsF/black/it
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{l}{it}{
- <-> alias * Merriwthr-OsF/light/it
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-osf-sc-t1
}{}
+\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{sc}{
+ <-> alias * Merriwthr-OsF/b/sc
+}{}
-% m --> regular
+\DeclareFontShape{T1}{Merriwthr-OsF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-osf-t1
+}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{m}{sl}{
- <-> alias * Merriwthr-OsF/regular/sl
+\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{n}{
+ <-> alias * Merriwthr-OsF/b/n
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{m}{n}{
- <-> alias * Merriwthr-OsF/regular/n
+\DeclareFontShape{T1}{Merriwthr-OsF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-t1
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{m}{it}{
- <-> alias * Merriwthr-OsF/regular/it
+\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{it}{
+ <-> alias * Merriwthr-OsF/b/it
}{}
+\DeclareFontShape{T1}{Merriwthr-OsF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-sc-t1
+}{}
-% b --> bold
+\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{scit}{
+ <-> alias * Merriwthr-OsF/b/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{b}{scsl}{
+ <-> ssub * Merriwthr-OsF/b/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{scsl}{
+ <-> ssub * Merriwthr-OsF/bold/scit
+}{}
\DeclareFontShape{T1}{Merriwthr-OsF}{b}{sl}{
- <-> alias * Merriwthr-OsF/bold/sl
+ <-> ssub * Merriwthr-OsF/b/it
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{b}{n}{
- <-> alias * Merriwthr-OsF/bold/n
+\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{sl}{
+ <-> ssub * Merriwthr-OsF/bold/it
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{b}{it}{
- <-> alias * Merriwthr-OsF/bold/it
+
+% ---- l = light ----
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{light}{sc}{
+ <-> alias * Merriwthr-OsF/l/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{light}{n}{
+ <-> alias * Merriwthr-OsF/l/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-osf-t1
}{}
+\DeclareFontShape{T1}{Merriwthr-OsF}{light}{it}{
+ <-> alias * Merriwthr-OsF/l/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{light}{scit}{
+ <-> alias * Merriwthr-OsF/l/scit
+}{}
-% ub --> ultrabold
+\DeclareFontShape{T1}{Merriwthr-OsF}{l}{scsl}{
+ <-> ssub * Merriwthr-OsF/l/scit
+}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{ub}{sl}{
- <-> alias * Merriwthr-OsF/ultrabold/sl
+\DeclareFontShape{T1}{Merriwthr-OsF}{light}{scsl}{
+ <-> ssub * Merriwthr-OsF/light/scit
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{ub}{n}{
- <-> alias * Merriwthr-OsF/ultrabold/n
+\DeclareFontShape{T1}{Merriwthr-OsF}{l}{sl}{
+ <-> ssub * Merriwthr-OsF/l/it
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{ub}{it}{
- <-> alias * Merriwthr-OsF/ultrabold/it
+\DeclareFontShape{T1}{Merriwthr-OsF}{light}{sl}{
+ <-> ssub * Merriwthr-OsF/light/it
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{T1}{Merriwthr-OsF}{bx}{n}{
<-> ssub * Merriwthr-OsF/b/n
}{}
+\DeclareFontShape{T1}{Merriwthr-OsF}{bx}{sc}{
+ <-> ssub * Merriwthr-OsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{bx}{scsl}{
+ <-> ssub * Merriwthr-OsF/b/scsl
+}{}
+
\DeclareFontShape{T1}{Merriwthr-OsF}{bx}{sl}{
<-> ssub * Merriwthr-OsF/b/sl
}{}
@@ -154,4 +246,8 @@
<-> ssub * Merriwthr-OsF/b/it
}{}
+\DeclareFontShape{T1}{Merriwthr-OsF}{bx}{scit}{
+ <-> ssub * Merriwthr-OsF/b/scit
+}{}
+
\endinput
diff --git a/fonts/merriweather/latex/T1Merriwthr-Sup.fd b/fonts/merriweather/latex/T1Merriwthr-Sup.fd
new file mode 100644
index 0000000000..10455c335b
--- /dev/null
+++ b/fonts/merriweather/latex/T1Merriwthr-Sup.fd
@@ -0,0 +1,145 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{T1Merriwthr-Sup.fd}
+ [2020/08/30 (autoinst) Font definitions for T1/Merriwthr-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{Merriwthr-Sup}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{regular}{n}{
+ <-> alias * Merriwthr-Sup/m/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{regular}{it}{
+ <-> alias * Merriwthr-Sup/m/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{m}{sl}{
+ <-> ssub * Merriwthr-Sup/m/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{regular}{sl}{
+ <-> ssub * Merriwthr-Sup/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{black}{n}{
+ <-> alias * Merriwthr-Sup/eb/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{black}{it}{
+ <-> alias * Merriwthr-Sup/eb/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{eb}{sl}{
+ <-> ssub * Merriwthr-Sup/eb/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{black}{sl}{
+ <-> ssub * Merriwthr-Sup/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{bold}{n}{
+ <-> alias * Merriwthr-Sup/b/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{bold}{it}{
+ <-> alias * Merriwthr-Sup/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{b}{sl}{
+ <-> ssub * Merriwthr-Sup/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{bold}{sl}{
+ <-> ssub * Merriwthr-Sup/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{light}{n}{
+ <-> alias * Merriwthr-Sup/l/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{light}{it}{
+ <-> alias * Merriwthr-Sup/l/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{l}{sl}{
+ <-> ssub * Merriwthr-Sup/l/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{light}{sl}{
+ <-> ssub * Merriwthr-Sup/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{bx}{n}{
+ <-> ssub * Merriwthr-Sup/b/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{bx}{sl}{
+ <-> ssub * Merriwthr-Sup/b/sl
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{bx}{it}{
+ <-> ssub * Merriwthr-Sup/b/it
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/T1Merriwthr-TLF.fd b/fonts/merriweather/latex/T1Merriwthr-TLF.fd
new file mode 100644
index 0000000000..74f3eafdc4
--- /dev/null
+++ b/fonts/merriweather/latex/T1Merriwthr-TLF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{T1Merriwthr-TLF.fd}
+ [2020/08/30 (autoinst) Font definitions for T1/Merriwthr-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{Merriwthr-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{regular}{sc}{
+ <-> alias * Merriwthr-TLF/m/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{regular}{n}{
+ <-> alias * Merriwthr-TLF/m/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{regular}{it}{
+ <-> alias * Merriwthr-TLF/m/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{regular}{scit}{
+ <-> alias * Merriwthr-TLF/m/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{m}{scsl}{
+ <-> ssub * Merriwthr-TLF/m/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{regular}{scsl}{
+ <-> ssub * Merriwthr-TLF/regular/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{m}{sl}{
+ <-> ssub * Merriwthr-TLF/m/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{regular}{sl}{
+ <-> ssub * Merriwthr-TLF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{black}{sc}{
+ <-> alias * Merriwthr-TLF/eb/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{black}{n}{
+ <-> alias * Merriwthr-TLF/eb/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{black}{it}{
+ <-> alias * Merriwthr-TLF/eb/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{black}{scit}{
+ <-> alias * Merriwthr-TLF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{eb}{scsl}{
+ <-> ssub * Merriwthr-TLF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{black}{scsl}{
+ <-> ssub * Merriwthr-TLF/black/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{eb}{sl}{
+ <-> ssub * Merriwthr-TLF/eb/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{black}{sl}{
+ <-> ssub * Merriwthr-TLF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bold}{sc}{
+ <-> alias * Merriwthr-TLF/b/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bold}{n}{
+ <-> alias * Merriwthr-TLF/b/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bold}{it}{
+ <-> alias * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bold}{scit}{
+ <-> alias * Merriwthr-TLF/b/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{b}{scsl}{
+ <-> ssub * Merriwthr-TLF/b/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bold}{scsl}{
+ <-> ssub * Merriwthr-TLF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{b}{sl}{
+ <-> ssub * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bold}{sl}{
+ <-> ssub * Merriwthr-TLF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{light}{sc}{
+ <-> alias * Merriwthr-TLF/l/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{light}{n}{
+ <-> alias * Merriwthr-TLF/l/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{light}{it}{
+ <-> alias * Merriwthr-TLF/l/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{light}{scit}{
+ <-> alias * Merriwthr-TLF/l/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{l}{scsl}{
+ <-> ssub * Merriwthr-TLF/l/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{light}{scsl}{
+ <-> ssub * Merriwthr-TLF/light/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{l}{sl}{
+ <-> ssub * Merriwthr-TLF/l/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{light}{sl}{
+ <-> ssub * Merriwthr-TLF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bx}{n}{
+ <-> ssub * Merriwthr-TLF/b/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bx}{sc}{
+ <-> ssub * Merriwthr-TLF/b/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bx}{scsl}{
+ <-> ssub * Merriwthr-TLF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bx}{sl}{
+ <-> ssub * Merriwthr-TLF/b/sl
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bx}{it}{
+ <-> ssub * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bx}{scit}{
+ <-> ssub * Merriwthr-TLF/b/scit
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/T1Merriwthr-TOsF.fd b/fonts/merriweather/latex/T1Merriwthr-TOsF.fd
new file mode 100644
index 0000000000..f897ffbd33
--- /dev/null
+++ b/fonts/merriweather/latex/T1Merriwthr-TOsF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{T1Merriwthr-TOsF.fd}
+ [2020/08/30 (autoinst) Font definitions for T1/Merriwthr-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{Merriwthr-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{regular}{sc}{
+ <-> alias * Merriwthr-TOsF/m/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{regular}{n}{
+ <-> alias * Merriwthr-TOsF/m/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{regular}{it}{
+ <-> alias * Merriwthr-TOsF/m/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{regular}{scit}{
+ <-> alias * Merriwthr-TOsF/m/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{m}{scsl}{
+ <-> ssub * Merriwthr-TOsF/m/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{regular}{scsl}{
+ <-> ssub * Merriwthr-TOsF/regular/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{m}{sl}{
+ <-> ssub * Merriwthr-TOsF/m/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{regular}{sl}{
+ <-> ssub * Merriwthr-TOsF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{black}{sc}{
+ <-> alias * Merriwthr-TOsF/eb/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{black}{n}{
+ <-> alias * Merriwthr-TOsF/eb/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{black}{it}{
+ <-> alias * Merriwthr-TOsF/eb/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{black}{scit}{
+ <-> alias * Merriwthr-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{eb}{scsl}{
+ <-> ssub * Merriwthr-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{black}{scsl}{
+ <-> ssub * Merriwthr-TOsF/black/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{eb}{sl}{
+ <-> ssub * Merriwthr-TOsF/eb/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{black}{sl}{
+ <-> ssub * Merriwthr-TOsF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bold}{sc}{
+ <-> alias * Merriwthr-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bold}{n}{
+ <-> alias * Merriwthr-TOsF/b/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bold}{it}{
+ <-> alias * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bold}{scit}{
+ <-> alias * Merriwthr-TOsF/b/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{b}{scsl}{
+ <-> ssub * Merriwthr-TOsF/b/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bold}{scsl}{
+ <-> ssub * Merriwthr-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{b}{sl}{
+ <-> ssub * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bold}{sl}{
+ <-> ssub * Merriwthr-TOsF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{light}{sc}{
+ <-> alias * Merriwthr-TOsF/l/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{light}{n}{
+ <-> alias * Merriwthr-TOsF/l/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{light}{it}{
+ <-> alias * Merriwthr-TOsF/l/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{light}{scit}{
+ <-> alias * Merriwthr-TOsF/l/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{l}{scsl}{
+ <-> ssub * Merriwthr-TOsF/l/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{light}{scsl}{
+ <-> ssub * Merriwthr-TOsF/light/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{l}{sl}{
+ <-> ssub * Merriwthr-TOsF/l/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{light}{sl}{
+ <-> ssub * Merriwthr-TOsF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bx}{n}{
+ <-> ssub * Merriwthr-TOsF/b/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bx}{sc}{
+ <-> ssub * Merriwthr-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bx}{scsl}{
+ <-> ssub * Merriwthr-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bx}{sl}{
+ <-> ssub * Merriwthr-TOsF/b/sl
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bx}{it}{
+ <-> ssub * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bx}{scit}{
+ <-> ssub * Merriwthr-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/T1MerriwthrSans-LF.fd b/fonts/merriweather/latex/T1MerriwthrSans-LF.fd
new file mode 100644
index 0000000000..5f00d3e90c
--- /dev/null
+++ b/fonts/merriweather/latex/T1MerriwthrSans-LF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{T1MerriwthrSans-LF.fd}
+ [2020/08/30 (autoinst) Font definitions for T1/MerriwthrSans-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{MerriwthrSans-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{regular}{sc}{
+ <-> alias * MerriwthrSans-LF/m/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-lf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{regular}{n}{
+ <-> alias * MerriwthrSans-LF/m/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{regular}{it}{
+ <-> alias * MerriwthrSans-LF/m/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{regular}{scit}{
+ <-> alias * MerriwthrSans-LF/m/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-LF/m/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-LF/regular/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{m}{sl}{
+ <-> ssub * MerriwthrSans-LF/m/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-LF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bold}{sc}{
+ <-> alias * MerriwthrSans-LF/b/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bold}{n}{
+ <-> alias * MerriwthrSans-LF/b/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bold}{it}{
+ <-> alias * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bold}{scit}{
+ <-> alias * MerriwthrSans-LF/b/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-LF/b/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-LF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{b}{sl}{
+ <-> ssub * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-LF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{light}{sc}{
+ <-> alias * MerriwthrSans-LF/l/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-lf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{light}{n}{
+ <-> alias * MerriwthrSans-LF/l/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{light}{it}{
+ <-> alias * MerriwthrSans-LF/l/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{light}{scit}{
+ <-> alias * MerriwthrSans-LF/l/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-LF/l/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-LF/light/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{l}{sl}{
+ <-> ssub * MerriwthrSans-LF/l/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{light}{sl}{
+ <-> ssub * MerriwthrSans-LF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-LF/eb/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-LF/eb/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-LF/eb/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-LF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-LF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-LF/eb/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-LF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bx}{n}{
+ <-> ssub * MerriwthrSans-LF/b/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-LF/b/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-LF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-LF/b/sl
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bx}{it}{
+ <-> ssub * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-LF/b/scit
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/T1MerriwthrSans-OsF.fd b/fonts/merriweather/latex/T1MerriwthrSans-OsF.fd
index d8bc181b24..9684ec170d 100644
--- a/fonts/merriweather/latex/T1MerriwthrSans-OsF.fd
+++ b/fonts/merriweather/latex/T1MerriwthrSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{T1MerriwthrSans-OsF.fd}
- [2020/07/30 (autoinst) Font definitions for T1/MerriwthrSans-OsF.]
+ [2020/08/30 (autoinst) Font definitions for T1/MerriwthrSans-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,132 +20,224 @@
\DeclareFontFamily{T1}{MerriwthrSans-OsF}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{regular}{n}{
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{regular}{sc}{
+ <-> alias * MerriwthrSans-OsF/m/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Regular-osf-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{regular}{it}{
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{regular}{n}{
+ <-> alias * MerriwthrSans-OsF/m/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{it}{
<-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-t1
}{}
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{regular}{it}{
+ <-> alias * MerriwthrSans-OsF/m/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{regular}{scit}{
+ <-> alias * MerriwthrSans-OsF/m/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/m/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/regular/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{sl}{
+ <-> ssub * MerriwthrSans-OsF/m/it
+}{}
+
\DeclareFontShape{T1}{MerriwthrSans-OsF}{regular}{sl}{
- <-> ssub * MerriwthrSans-OsF/regular/it
+ <-> ssub * MerriwthrSans-OsF/regular/it
}{}
-% ---- bold ----
+% ---- b = bold ----
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{n}{
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{sc}{
+ <-> alias * MerriwthrSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{it}{
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{n}{
+ <-> alias * MerriwthrSans-OsF/b/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{it}{
<-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{sl}{
- <-> ssub * MerriwthrSans-OsF/bold/it
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{it}{
+ <-> alias * MerriwthrSans-OsF/b/it
}{}
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-sc-t1
+}{}
-% ---- light ----
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{scit}{
+ <-> alias * MerriwthrSans-OsF/b/scit
+}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-t1
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/b/scit
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-t1
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/bold/scit
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{sl}{
- <-> ssub * MerriwthrSans-OsF/light/it
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{sl}{
+ <-> ssub * MerriwthrSans-OsF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-OsF/bold/it
}{}
-% ---- extrabold ----
+% ---- l = light ----
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-t1
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-sc-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-t1
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{sc}{
+ <-> alias * MerriwthrSans-OsF/l/sc
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{sl}{
- <-> ssub * MerriwthrSans-OsF/extrabold/it
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-t1
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{n}{
+ <-> alias * MerriwthrSans-OsF/l/n
+}{}
-% l --> light
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-t1
+}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{sl}{
- <-> alias * MerriwthrSans-OsF/light/sl
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{it}{
+ <-> alias * MerriwthrSans-OsF/l/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{n}{
- <-> alias * MerriwthrSans-OsF/light/n
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{it}{
- <-> alias * MerriwthrSans-OsF/light/it
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{scit}{
+ <-> alias * MerriwthrSans-OsF/l/scit
}{}
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/l/scit
+}{}
-% m --> regular
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/light/scit
+}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{sl}{
- <-> alias * MerriwthrSans-OsF/regular/sl
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{sl}{
+ <-> ssub * MerriwthrSans-OsF/l/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{n}{
- <-> alias * MerriwthrSans-OsF/regular/n
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{sl}{
+ <-> ssub * MerriwthrSans-OsF/light/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{it}{
- <-> alias * MerriwthrSans-OsF/regular/it
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-sc-t1
}{}
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-OsF/eb/sc
+}{}
-% b --> bold
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-t1
+}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{sl}{
- <-> alias * MerriwthrSans-OsF/bold/sl
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-OsF/eb/n
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{n}{
- <-> alias * MerriwthrSans-OsF/bold/n
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{it}{
- <-> alias * MerriwthrSans-OsF/bold/it
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-OsF/eb/it
}{}
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-sc-t1
+}{}
-% eb --> extrabold
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-OsF/eb/scit
+}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{sl}{
- <-> alias * MerriwthrSans-OsF/extrabold/sl
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/eb/scit
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{n}{
- <-> alias * MerriwthrSans-OsF/extrabold/n
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/extrabold/scit
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{it}{
- <-> alias * MerriwthrSans-OsF/extrabold/it
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-OsF/eb/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-OsF/extrabold/it
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{T1}{MerriwthrSans-OsF}{bx}{n}{
<-> ssub * MerriwthrSans-OsF/b/n
}{}
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/b/scsl
+}{}
+
\DeclareFontShape{T1}{MerriwthrSans-OsF}{bx}{sl}{
<-> ssub * MerriwthrSans-OsF/b/sl
}{}
@@ -154,4 +246,8 @@
<-> ssub * MerriwthrSans-OsF/b/it
}{}
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-OsF/b/scit
+}{}
+
\endinput
diff --git a/fonts/merriweather/latex/T1MerriwthrSans-Sup.fd b/fonts/merriweather/latex/T1MerriwthrSans-Sup.fd
index 10c2494391..49c729e09b 100644
--- a/fonts/merriweather/latex/T1MerriwthrSans-Sup.fd
+++ b/fonts/merriweather/latex/T1MerriwthrSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{T1MerriwthrSans-Sup.fd}
- [2020/07/30 (autoinst) Font definitions for T1/MerriwthrSans-Sup.]
+ [2020/08/30 (autoinst) Font definitions for T1/MerriwthrSans-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,127 +20,115 @@
\DeclareFontFamily{T1}{MerriwthrSans-Sup}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{n}{
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Regular-sup-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Italic-sup-t1
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{n}{
+ <-> alias * MerriwthrSans-Sup/m/n
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{sl}{
- <-> ssub * MerriwthrSans-Sup/regular/it
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-sup-t1
}{}
-
-% ---- bold ----
-
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Bold-sup-t1
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{it}{
+ <-> alias * MerriwthrSans-Sup/m/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-sup-t1
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{sl}{
+ <-> ssub * MerriwthrSans-Sup/m/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{sl}{
- <-> ssub * MerriwthrSans-Sup/bold/it
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{sl}{
+ <-> ssub * MerriwthrSans-Sup/regular/it
}{}
-% ---- light ----
+% ---- b = bold ----
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Light-sup-t1
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-sup-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-sup-t1
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{n}{
+ <-> alias * MerriwthrSans-Sup/b/n
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{sl}{
- <-> ssub * MerriwthrSans-Sup/light/it
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-sup-t1
}{}
-
-% ---- extrabold ----
-
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-sup-t1
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{it}{
+ <-> alias * MerriwthrSans-Sup/b/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-sup-t1
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{sl}{
+ <-> ssub * MerriwthrSans-Sup/b/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{sl}{
- <-> ssub * MerriwthrSans-Sup/extrabold/it
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{sl}{
+ <-> ssub * MerriwthrSans-Sup/bold/it
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-% l --> light
+% ---- l = light ----
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{l}{sl}{
- <-> alias * MerriwthrSans-Sup/light/sl
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-sup-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{l}{n}{
- <-> alias * MerriwthrSans-Sup/light/n
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{n}{
+ <-> alias * MerriwthrSans-Sup/l/n
}{}
\DeclareFontShape{T1}{MerriwthrSans-Sup}{l}{it}{
- <-> alias * MerriwthrSans-Sup/light/it
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-sup-t1
}{}
-
-% m --> regular
-
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{sl}{
- <-> alias * MerriwthrSans-Sup/regular/sl
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{it}{
+ <-> alias * MerriwthrSans-Sup/l/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{n}{
- <-> alias * MerriwthrSans-Sup/regular/n
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{l}{sl}{
+ <-> ssub * MerriwthrSans-Sup/l/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{it}{
- <-> alias * MerriwthrSans-Sup/regular/it
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{sl}{
+ <-> ssub * MerriwthrSans-Sup/light/it
}{}
-% b --> bold
+% ---- eb = extrabold ----
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{sl}{
- <-> alias * MerriwthrSans-Sup/bold/sl
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-sup-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{n}{
- <-> alias * MerriwthrSans-Sup/bold/n
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{n}{
+ <-> alias * MerriwthrSans-Sup/eb/n
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{it}{
- <-> alias * MerriwthrSans-Sup/bold/it
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-sup-t1
}{}
-
-% eb --> extrabold
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{it}{
+ <-> alias * MerriwthrSans-Sup/eb/it
+}{}
\DeclareFontShape{T1}{MerriwthrSans-Sup}{eb}{sl}{
- <-> alias * MerriwthrSans-Sup/extrabold/sl
+ <-> ssub * MerriwthrSans-Sup/eb/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{eb}{n}{
- <-> alias * MerriwthrSans-Sup/extrabold/n
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-Sup/extrabold/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{eb}{it}{
- <-> alias * MerriwthrSans-Sup/extrabold/it
-}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
\DeclareFontShape{T1}{MerriwthrSans-Sup}{bx}{n}{
<-> ssub * MerriwthrSans-Sup/b/n
diff --git a/fonts/merriweather/latex/T1MerriwthrSans-TLF.fd b/fonts/merriweather/latex/T1MerriwthrSans-TLF.fd
new file mode 100644
index 0000000000..62c9f2776c
--- /dev/null
+++ b/fonts/merriweather/latex/T1MerriwthrSans-TLF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{T1MerriwthrSans-TLF.fd}
+ [2020/08/30 (autoinst) Font definitions for T1/MerriwthrSans-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{MerriwthrSans-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{regular}{sc}{
+ <-> alias * MerriwthrSans-TLF/m/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{regular}{n}{
+ <-> alias * MerriwthrSans-TLF/m/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{regular}{it}{
+ <-> alias * MerriwthrSans-TLF/m/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{regular}{scit}{
+ <-> alias * MerriwthrSans-TLF/m/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/m/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/regular/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{m}{sl}{
+ <-> ssub * MerriwthrSans-TLF/m/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-TLF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bold}{sc}{
+ <-> alias * MerriwthrSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bold}{n}{
+ <-> alias * MerriwthrSans-TLF/b/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bold}{it}{
+ <-> alias * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bold}{scit}{
+ <-> alias * MerriwthrSans-TLF/b/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/b/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{b}{sl}{
+ <-> ssub * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-TLF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{light}{sc}{
+ <-> alias * MerriwthrSans-TLF/l/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{light}{n}{
+ <-> alias * MerriwthrSans-TLF/l/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{light}{it}{
+ <-> alias * MerriwthrSans-TLF/l/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{light}{scit}{
+ <-> alias * MerriwthrSans-TLF/l/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/l/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/light/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{l}{sl}{
+ <-> ssub * MerriwthrSans-TLF/l/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{light}{sl}{
+ <-> ssub * MerriwthrSans-TLF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-TLF/eb/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-TLF/eb/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-TLF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-TLF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bx}{n}{
+ <-> ssub * MerriwthrSans-TLF/b/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-TLF/b/sl
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bx}{it}{
+ <-> ssub * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-TLF/b/scit
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/T1MerriwthrSans-TOsF.fd b/fonts/merriweather/latex/T1MerriwthrSans-TOsF.fd
new file mode 100644
index 0000000000..36d3c23356
--- /dev/null
+++ b/fonts/merriweather/latex/T1MerriwthrSans-TOsF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{T1MerriwthrSans-TOsF.fd}
+ [2020/08/30 (autoinst) Font definitions for T1/MerriwthrSans-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{MerriwthrSans-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{regular}{sc}{
+ <-> alias * MerriwthrSans-TOsF/m/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{regular}{n}{
+ <-> alias * MerriwthrSans-TOsF/m/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{regular}{it}{
+ <-> alias * MerriwthrSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{regular}{scit}{
+ <-> alias * MerriwthrSans-TOsF/m/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/m/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/regular/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{m}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bold}{sc}{
+ <-> alias * MerriwthrSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bold}{n}{
+ <-> alias * MerriwthrSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bold}{it}{
+ <-> alias * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bold}{scit}{
+ <-> alias * MerriwthrSans-TOsF/b/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/b/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{b}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{light}{sc}{
+ <-> alias * MerriwthrSans-TOsF/l/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{light}{n}{
+ <-> alias * MerriwthrSans-TOsF/l/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{light}{it}{
+ <-> alias * MerriwthrSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{light}{scit}{
+ <-> alias * MerriwthrSans-TOsF/l/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/l/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/light/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{l}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{light}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-TOsF/eb/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-TOsF/eb/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bx}{n}{
+ <-> ssub * MerriwthrSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/b/sl
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bx}{it}{
+ <-> ssub * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/TS1Merriwthr-LF.fd b/fonts/merriweather/latex/TS1Merriwthr-LF.fd
new file mode 100644
index 0000000000..1c0a10949a
--- /dev/null
+++ b/fonts/merriweather/latex/TS1Merriwthr-LF.fd
@@ -0,0 +1,145 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{TS1Merriwthr-LF.fd}
+ [2020/08/30 (autoinst) Font definitions for TS1/Merriwthr-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{Merriwthr-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{regular}{n}{
+ <-> alias * Merriwthr-LF/m/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{regular}{it}{
+ <-> alias * Merriwthr-LF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{m}{sl}{
+ <-> ssub * Merriwthr-LF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{regular}{sl}{
+ <-> ssub * Merriwthr-LF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{black}{n}{
+ <-> alias * Merriwthr-LF/eb/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{black}{it}{
+ <-> alias * Merriwthr-LF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{eb}{sl}{
+ <-> ssub * Merriwthr-LF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{black}{sl}{
+ <-> ssub * Merriwthr-LF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{bold}{n}{
+ <-> alias * Merriwthr-LF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{bold}{it}{
+ <-> alias * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{b}{sl}{
+ <-> ssub * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{bold}{sl}{
+ <-> ssub * Merriwthr-LF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{light}{n}{
+ <-> alias * Merriwthr-LF/l/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{light}{it}{
+ <-> alias * Merriwthr-LF/l/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{l}{sl}{
+ <-> ssub * Merriwthr-LF/l/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{light}{sl}{
+ <-> ssub * Merriwthr-LF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{bx}{n}{
+ <-> ssub * Merriwthr-LF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{bx}{sl}{
+ <-> ssub * Merriwthr-LF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{bx}{it}{
+ <-> ssub * Merriwthr-LF/b/it
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/TS1Merriwthr-OsF.fd b/fonts/merriweather/latex/TS1Merriwthr-OsF.fd
index cdb6daa679..37f570c74b 100644
--- a/fonts/merriweather/latex/TS1Merriwthr-OsF.fd
+++ b/fonts/merriweather/latex/TS1Merriwthr-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{TS1Merriwthr-OsF.fd}
- [2020/07/30 (autoinst) Font definitions for TS1/Merriwthr-OsF.]
+ [2020/08/30 (autoinst) Font definitions for TS1/Merriwthr-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,128 +20,116 @@
\DeclareFontFamily{TS1}{Merriwthr-OsF}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{TS1}{Merriwthr-OsF}{regular}{n}{
+\DeclareFontShape{TS1}{Merriwthr-OsF}{m}{n}{
<-> \Merriwthr@@scale Merriwthr-Regular-osf-ts1
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{regular}{it}{
- <-> \Merriwthr@@scale Merriwthr-Italic-osf-ts1
+\DeclareFontShape{TS1}{Merriwthr-OsF}{regular}{n}{
+ <-> alias * Merriwthr-OsF/m/n
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{regular}{sl}{
- <-> ssub * Merriwthr-OsF/regular/it
+\DeclareFontShape{TS1}{Merriwthr-OsF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-osf-ts1
}{}
-
-% ---- bold ----
-
-\DeclareFontShape{TS1}{Merriwthr-OsF}{bold}{n}{
- <-> \Merriwthr@@scale Merriwthr-Bold-osf-ts1
+\DeclareFontShape{TS1}{Merriwthr-OsF}{regular}{it}{
+ <-> alias * Merriwthr-OsF/m/it
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{bold}{it}{
- <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-ts1
+\DeclareFontShape{TS1}{Merriwthr-OsF}{m}{sl}{
+ <-> ssub * Merriwthr-OsF/m/it
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{bold}{sl}{
- <-> ssub * Merriwthr-OsF/bold/it
+\DeclareFontShape{TS1}{Merriwthr-OsF}{regular}{sl}{
+ <-> ssub * Merriwthr-OsF/regular/it
}{}
-% ---- light ----
+% ---- eb = black ----
-\DeclareFontShape{TS1}{Merriwthr-OsF}{light}{n}{
- <-> \Merriwthr@@scale Merriwthr-Light-osf-ts1
+\DeclareFontShape{TS1}{Merriwthr-OsF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-osf-ts1
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{light}{it}{
- <-> \Merriwthr@@scale Merriwthr-LightIt-osf-ts1
+\DeclareFontShape{TS1}{Merriwthr-OsF}{black}{n}{
+ <-> alias * Merriwthr-OsF/eb/n
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{light}{sl}{
- <-> ssub * Merriwthr-OsF/light/it
+\DeclareFontShape{TS1}{Merriwthr-OsF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-osf-ts1
}{}
-
-% ---- ultrabold ----
-
-\DeclareFontShape{TS1}{Merriwthr-OsF}{ultrabold}{n}{
- <-> \Merriwthr@@scale Merriwthr-UltraBold-osf-ts1
+\DeclareFontShape{TS1}{Merriwthr-OsF}{black}{it}{
+ <-> alias * Merriwthr-OsF/eb/it
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{ultrabold}{it}{
- <-> \Merriwthr@@scale Merriwthr-UltraBdIt-osf-ts1
+\DeclareFontShape{TS1}{Merriwthr-OsF}{eb}{sl}{
+ <-> ssub * Merriwthr-OsF/eb/it
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{ultrabold}{sl}{
- <-> ssub * Merriwthr-OsF/ultrabold/it
+\DeclareFontShape{TS1}{Merriwthr-OsF}{black}{sl}{
+ <-> ssub * Merriwthr-OsF/black/it
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-% l --> light
+% ---- b = bold ----
-\DeclareFontShape{TS1}{Merriwthr-OsF}{l}{sl}{
- <-> alias * Merriwthr-OsF/light/sl
+\DeclareFontShape{TS1}{Merriwthr-OsF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-osf-ts1
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{l}{n}{
- <-> alias * Merriwthr-OsF/light/n
+\DeclareFontShape{TS1}{Merriwthr-OsF}{bold}{n}{
+ <-> alias * Merriwthr-OsF/b/n
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{l}{it}{
- <-> alias * Merriwthr-OsF/light/it
+\DeclareFontShape{TS1}{Merriwthr-OsF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-ts1
}{}
-
-% m --> regular
-
-\DeclareFontShape{TS1}{Merriwthr-OsF}{m}{sl}{
- <-> alias * Merriwthr-OsF/regular/sl
+\DeclareFontShape{TS1}{Merriwthr-OsF}{bold}{it}{
+ <-> alias * Merriwthr-OsF/b/it
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{m}{n}{
- <-> alias * Merriwthr-OsF/regular/n
+\DeclareFontShape{TS1}{Merriwthr-OsF}{b}{sl}{
+ <-> ssub * Merriwthr-OsF/b/it
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{m}{it}{
- <-> alias * Merriwthr-OsF/regular/it
+\DeclareFontShape{TS1}{Merriwthr-OsF}{bold}{sl}{
+ <-> ssub * Merriwthr-OsF/bold/it
}{}
-% b --> bold
+% ---- l = light ----
-\DeclareFontShape{TS1}{Merriwthr-OsF}{b}{sl}{
- <-> alias * Merriwthr-OsF/bold/sl
+\DeclareFontShape{TS1}{Merriwthr-OsF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-osf-ts1
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{b}{n}{
- <-> alias * Merriwthr-OsF/bold/n
+\DeclareFontShape{TS1}{Merriwthr-OsF}{light}{n}{
+ <-> alias * Merriwthr-OsF/l/n
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{b}{it}{
- <-> alias * Merriwthr-OsF/bold/it
+\DeclareFontShape{TS1}{Merriwthr-OsF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-osf-ts1
}{}
-
-% ub --> ultrabold
-
-\DeclareFontShape{TS1}{Merriwthr-OsF}{ub}{sl}{
- <-> alias * Merriwthr-OsF/ultrabold/sl
+\DeclareFontShape{TS1}{Merriwthr-OsF}{light}{it}{
+ <-> alias * Merriwthr-OsF/l/it
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{ub}{n}{
- <-> alias * Merriwthr-OsF/ultrabold/n
+\DeclareFontShape{TS1}{Merriwthr-OsF}{l}{sl}{
+ <-> ssub * Merriwthr-OsF/l/it
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{ub}{it}{
- <-> alias * Merriwthr-OsF/ultrabold/it
+\DeclareFontShape{TS1}{Merriwthr-OsF}{light}{sl}{
+ <-> ssub * Merriwthr-OsF/light/it
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{TS1}{Merriwthr-OsF}{bx}{n}{
<-> ssub * Merriwthr-OsF/b/n
}{}
diff --git a/fonts/merriweather/latex/TS1Merriwthr-TLF.fd b/fonts/merriweather/latex/TS1Merriwthr-TLF.fd
new file mode 100644
index 0000000000..7503c53448
--- /dev/null
+++ b/fonts/merriweather/latex/TS1Merriwthr-TLF.fd
@@ -0,0 +1,145 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{TS1Merriwthr-TLF.fd}
+ [2020/08/30 (autoinst) Font definitions for TS1/Merriwthr-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{Merriwthr-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{regular}{n}{
+ <-> alias * Merriwthr-TLF/m/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{regular}{it}{
+ <-> alias * Merriwthr-TLF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{m}{sl}{
+ <-> ssub * Merriwthr-TLF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{regular}{sl}{
+ <-> ssub * Merriwthr-TLF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{black}{n}{
+ <-> alias * Merriwthr-TLF/eb/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{black}{it}{
+ <-> alias * Merriwthr-TLF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{eb}{sl}{
+ <-> ssub * Merriwthr-TLF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{black}{sl}{
+ <-> ssub * Merriwthr-TLF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{bold}{n}{
+ <-> alias * Merriwthr-TLF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{bold}{it}{
+ <-> alias * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{b}{sl}{
+ <-> ssub * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{bold}{sl}{
+ <-> ssub * Merriwthr-TLF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{light}{n}{
+ <-> alias * Merriwthr-TLF/l/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{light}{it}{
+ <-> alias * Merriwthr-TLF/l/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{l}{sl}{
+ <-> ssub * Merriwthr-TLF/l/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{light}{sl}{
+ <-> ssub * Merriwthr-TLF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{bx}{n}{
+ <-> ssub * Merriwthr-TLF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{bx}{sl}{
+ <-> ssub * Merriwthr-TLF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{bx}{it}{
+ <-> ssub * Merriwthr-TLF/b/it
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/TS1Merriwthr-TOsF.fd b/fonts/merriweather/latex/TS1Merriwthr-TOsF.fd
new file mode 100644
index 0000000000..0bfd1d2b2d
--- /dev/null
+++ b/fonts/merriweather/latex/TS1Merriwthr-TOsF.fd
@@ -0,0 +1,145 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{TS1Merriwthr-TOsF.fd}
+ [2020/08/30 (autoinst) Font definitions for TS1/Merriwthr-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{Merriwthr-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{regular}{n}{
+ <-> alias * Merriwthr-TOsF/m/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{regular}{it}{
+ <-> alias * Merriwthr-TOsF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{m}{sl}{
+ <-> ssub * Merriwthr-TOsF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{regular}{sl}{
+ <-> ssub * Merriwthr-TOsF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{black}{n}{
+ <-> alias * Merriwthr-TOsF/eb/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{black}{it}{
+ <-> alias * Merriwthr-TOsF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{eb}{sl}{
+ <-> ssub * Merriwthr-TOsF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{black}{sl}{
+ <-> ssub * Merriwthr-TOsF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{bold}{n}{
+ <-> alias * Merriwthr-TOsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{bold}{it}{
+ <-> alias * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{b}{sl}{
+ <-> ssub * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{bold}{sl}{
+ <-> ssub * Merriwthr-TOsF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{light}{n}{
+ <-> alias * Merriwthr-TOsF/l/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{light}{it}{
+ <-> alias * Merriwthr-TOsF/l/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{l}{sl}{
+ <-> ssub * Merriwthr-TOsF/l/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{light}{sl}{
+ <-> ssub * Merriwthr-TOsF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{bx}{n}{
+ <-> ssub * Merriwthr-TOsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{bx}{sl}{
+ <-> ssub * Merriwthr-TOsF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{bx}{it}{
+ <-> ssub * Merriwthr-TOsF/b/it
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/TS1MerriwthrSans-LF.fd b/fonts/merriweather/latex/TS1MerriwthrSans-LF.fd
new file mode 100644
index 0000000000..db8f23f6b5
--- /dev/null
+++ b/fonts/merriweather/latex/TS1MerriwthrSans-LF.fd
@@ -0,0 +1,145 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{TS1MerriwthrSans-LF.fd}
+ [2020/08/30 (autoinst) Font definitions for TS1/MerriwthrSans-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{MerriwthrSans-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{regular}{n}{
+ <-> alias * MerriwthrSans-LF/m/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{regular}{it}{
+ <-> alias * MerriwthrSans-LF/m/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{m}{sl}{
+ <-> ssub * MerriwthrSans-LF/m/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-LF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{bold}{n}{
+ <-> alias * MerriwthrSans-LF/b/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{bold}{it}{
+ <-> alias * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{b}{sl}{
+ <-> ssub * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-LF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{light}{n}{
+ <-> alias * MerriwthrSans-LF/l/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{light}{it}{
+ <-> alias * MerriwthrSans-LF/l/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{l}{sl}{
+ <-> ssub * MerriwthrSans-LF/l/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{light}{sl}{
+ <-> ssub * MerriwthrSans-LF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-LF/eb/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-LF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-LF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-LF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{bx}{n}{
+ <-> ssub * MerriwthrSans-LF/b/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-LF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{bx}{it}{
+ <-> ssub * MerriwthrSans-LF/b/it
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/TS1MerriwthrSans-OsF.fd b/fonts/merriweather/latex/TS1MerriwthrSans-OsF.fd
index e347fa5662..33ec62fe33 100644
--- a/fonts/merriweather/latex/TS1MerriwthrSans-OsF.fd
+++ b/fonts/merriweather/latex/TS1MerriwthrSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{TS1MerriwthrSans-OsF.fd}
- [2020/07/30 (autoinst) Font definitions for TS1/MerriwthrSans-OsF.]
+ [2020/08/30 (autoinst) Font definitions for TS1/MerriwthrSans-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,127 +20,115 @@
\DeclareFontFamily{TS1}{MerriwthrSans-OsF}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{regular}{n}{
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{m}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Regular-osf-ts1
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{regular}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-ts1
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{regular}{n}{
+ <-> alias * MerriwthrSans-OsF/m/n
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{regular}{sl}{
- <-> ssub * MerriwthrSans-OsF/regular/it
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-ts1
}{}
-
-% ---- bold ----
-
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-ts1
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{regular}{it}{
+ <-> alias * MerriwthrSans-OsF/m/it
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-ts1
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{m}{sl}{
+ <-> ssub * MerriwthrSans-OsF/m/it
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bold}{sl}{
- <-> ssub * MerriwthrSans-OsF/bold/it
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-OsF/regular/it
}{}
-% ---- light ----
+% ---- b = bold ----
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{light}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-ts1
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-ts1
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{light}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-ts1
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bold}{n}{
+ <-> alias * MerriwthrSans-OsF/b/n
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{light}{sl}{
- <-> ssub * MerriwthrSans-OsF/light/it
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-ts1
}{}
-
-% ---- extrabold ----
-
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{extrabold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-ts1
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bold}{it}{
+ <-> alias * MerriwthrSans-OsF/b/it
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{extrabold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-ts1
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{b}{sl}{
+ <-> ssub * MerriwthrSans-OsF/b/it
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{extrabold}{sl}{
- <-> ssub * MerriwthrSans-OsF/extrabold/it
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-OsF/bold/it
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-% l --> light
+% ---- l = light ----
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{l}{sl}{
- <-> alias * MerriwthrSans-OsF/light/sl
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-ts1
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{l}{n}{
- <-> alias * MerriwthrSans-OsF/light/n
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{light}{n}{
+ <-> alias * MerriwthrSans-OsF/l/n
}{}
\DeclareFontShape{TS1}{MerriwthrSans-OsF}{l}{it}{
- <-> alias * MerriwthrSans-OsF/light/it
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-ts1
}{}
-
-% m --> regular
-
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{m}{sl}{
- <-> alias * MerriwthrSans-OsF/regular/sl
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{light}{it}{
+ <-> alias * MerriwthrSans-OsF/l/it
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{m}{n}{
- <-> alias * MerriwthrSans-OsF/regular/n
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{l}{sl}{
+ <-> ssub * MerriwthrSans-OsF/l/it
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{m}{it}{
- <-> alias * MerriwthrSans-OsF/regular/it
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{light}{sl}{
+ <-> ssub * MerriwthrSans-OsF/light/it
}{}
-% b --> bold
+% ---- eb = extrabold ----
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{b}{sl}{
- <-> alias * MerriwthrSans-OsF/bold/sl
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-ts1
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{b}{n}{
- <-> alias * MerriwthrSans-OsF/bold/n
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-OsF/eb/n
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{b}{it}{
- <-> alias * MerriwthrSans-OsF/bold/it
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-ts1
}{}
-
-% eb --> extrabold
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-OsF/eb/it
+}{}
\DeclareFontShape{TS1}{MerriwthrSans-OsF}{eb}{sl}{
- <-> alias * MerriwthrSans-OsF/extrabold/sl
+ <-> ssub * MerriwthrSans-OsF/eb/it
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{eb}{n}{
- <-> alias * MerriwthrSans-OsF/extrabold/n
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-OsF/extrabold/it
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{eb}{it}{
- <-> alias * MerriwthrSans-OsF/extrabold/it
-}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bx}{n}{
<-> ssub * MerriwthrSans-OsF/b/n
diff --git a/fonts/merriweather/latex/TS1MerriwthrSans-TLF.fd b/fonts/merriweather/latex/TS1MerriwthrSans-TLF.fd
new file mode 100644
index 0000000000..08dcb35871
--- /dev/null
+++ b/fonts/merriweather/latex/TS1MerriwthrSans-TLF.fd
@@ -0,0 +1,145 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{TS1MerriwthrSans-TLF.fd}
+ [2020/08/30 (autoinst) Font definitions for TS1/MerriwthrSans-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{MerriwthrSans-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{regular}{n}{
+ <-> alias * MerriwthrSans-TLF/m/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{regular}{it}{
+ <-> alias * MerriwthrSans-TLF/m/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{m}{sl}{
+ <-> ssub * MerriwthrSans-TLF/m/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-TLF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{bold}{n}{
+ <-> alias * MerriwthrSans-TLF/b/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{bold}{it}{
+ <-> alias * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{b}{sl}{
+ <-> ssub * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-TLF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{light}{n}{
+ <-> alias * MerriwthrSans-TLF/l/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{light}{it}{
+ <-> alias * MerriwthrSans-TLF/l/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{l}{sl}{
+ <-> ssub * MerriwthrSans-TLF/l/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{light}{sl}{
+ <-> ssub * MerriwthrSans-TLF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-TLF/eb/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-TLF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{bx}{n}{
+ <-> ssub * MerriwthrSans-TLF/b/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-TLF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{bx}{it}{
+ <-> ssub * MerriwthrSans-TLF/b/it
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/TS1MerriwthrSans-TOsF.fd b/fonts/merriweather/latex/TS1MerriwthrSans-TOsF.fd
new file mode 100644
index 0000000000..f52dcac8b9
--- /dev/null
+++ b/fonts/merriweather/latex/TS1MerriwthrSans-TOsF.fd
@@ -0,0 +1,145 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{TS1MerriwthrSans-TOsF.fd}
+ [2020/08/30 (autoinst) Font definitions for TS1/MerriwthrSans-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{MerriwthrSans-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{regular}{n}{
+ <-> alias * MerriwthrSans-TOsF/m/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{regular}{it}{
+ <-> alias * MerriwthrSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{m}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{bold}{n}{
+ <-> alias * MerriwthrSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{bold}{it}{
+ <-> alias * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{b}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{light}{n}{
+ <-> alias * MerriwthrSans-TOsF/l/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{light}{it}{
+ <-> alias * MerriwthrSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{l}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{light}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-TOsF/eb/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{bx}{n}{
+ <-> ssub * MerriwthrSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{bx}{it}{
+ <-> ssub * MerriwthrSans-TOsF/b/it
+}{}
+
+\endinput
diff --git a/fonts/merriweather/latex/merriweather.sty b/fonts/merriweather/latex/merriweather.sty
index 35fba36110..71fd75b820 100644
--- a/fonts/merriweather/latex/merriweather.sty
+++ b/fonts/merriweather/latex/merriweather.sty
@@ -1,15 +1,15 @@
\ProvidesPackage{merriweather}[%
- 2020/07/31 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ]
+ 2020/08/30 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ]
\RequirePackage{ifxetex,ifluatex,textcomp}
-\newif\ifmerriweather@ttf
+\newif\ifmerriweather@otf
\ifxetex
- \merriweather@ttftrue
+ \merriweather@otftrue
\else\ifluatex
- \merriweather@ttftrue
+ \merriweather@otftrue
\else % [pdf]LaTeX
- \merriweather@ttffalse
+ \merriweather@otffalse
\fi\fi
\newcommand*{\Merriwthr@scale}{1} % not adjustable
@@ -25,94 +25,208 @@
\newif\ifmerriweather@sflight \merriweather@sflightfalse
\newif\ifmerriweather@rmblack \merriweather@rmblackfalse
\newif\ifmerriweather@sfblack \merriweather@sfblackfalse
+\newif\ifmerriweather@rmlining \merriweather@rmliningfalse
+\newif\ifmerriweather@rmtabular \merriweather@rmtabularfalse
+\newif\ifmerriweather@sflining \merriweather@sfliningfalse
+\newif\ifmerriweather@sftabular \merriweather@sftabularfalse
+
\DeclareOptionX{sf}{\merriweather@sftrue}
\DeclareOptionX{rm}{\merriweather@rmtrue}
\DeclareOptionX{sfdefault}{\merriweather@sftrue\merriweather@sfdefaulttrue}
-\DeclareOptionX{type1}{\merriweather@ttffalse}
+\DeclareOptionX{type1}{\merriweather@otffalse}
\DeclareOptionX{light}{\merriweather@rmlighttrue\merriweather@sflighttrue}
\DeclareOptionX{rmlight}{\merriweather@rmlighttrue}
\DeclareOptionX{sflight}{\merriweather@sflighttrue}
\DeclareOptionX{black}{\merriweather@rmblacktrue\merriweather@sfblacktrue}
\DeclareOptionX{rmblack}{\merriweather@rmblacktrue}
\DeclareOptionX{sfblack}{\merriweather@sfblacktrue}
+\DeclareOptionX{rmlining}{\merriweather@rmliningtrue}
+\DeclareOptionX{rmoldstyle}{\merriweather@rmliningfalse}
+\DeclareOptionX{sflining}{\merriweather@sfliningtrue}
+\DeclareOptionX{sfoldstyle}{\merriweather@sfliningfalse}
+\DeclareOptionX{rmtabular}{\merriweather@rmtabulartrue}
+\DeclareOptionX{rmproportional}{\merriweather@rmtabularfalse}
+\DeclareOptionX{sftabular}{\merriweather@sftabulartrue}
+\DeclareOptionX{sfproportional}{\merriweather@sftabularfalse}
+
\ProcessOptionsX\relax
-\ifmerriweather@ttf
+\ifmerriweather@otf
\RequirePackage{fontspec}
\else
- \RequirePackage{fontenc,fontaxes,mweights}
+ \RequirePackage{fontenc,fontaxes}
\fi
\ifmerriweather@rm\else\ifmerriweather@sf\else
\merriweather@rmtrue\merriweather@sftrue % both false -> both true
\fi\fi
+\ifmerriweather@otf
+ \ifmerriweather@rmlining
+ \def\merriweather@figurestyle{Lining}
+ \else
+ \def\merriweather@figurestyle{OldStyle}
+ \fi
+ \ifmerriweather@rmtabular
+ \def\merriweather@figurealign{Monospaced}
+ \else
+ \def\merriweather@figurealign{Proportional}
+ \fi
+
+ \ifmerriweather@sflining
+ \def\merriweathersans@figurestyle{Lining}
+ \else
+ \def\merriweathersans@figurestyle{OldStyle}
+ \fi
+ \ifmerriweather@sftabular
+ \def\merriweathersans@figurealign{Monospaced}
+ \else
+ \def\merriweathersans@figurealign{Proportional}
+ \fi
+
+ \ifmerriweather@rmlight
+ \def\merriweather@regularstyle{Light}
+ \else
+ \def\merriweather@regularstyle{Regular}
+ \fi
+ \ifmerriweather@rmblack
+ \def\merriweather@boldstyle{Black}
+ \else
+ \def\merriweather@boldstyle{Bold}
+ \fi
+
+ \ifmerriweather@sflight
+ \def\merriweathersans@regularstyle{Light}
+ \else
+ \def\merriweathersans@regularstyle{Regular}
+ \fi
+ \ifmerriweather@sfblack
+ \def\merriweathersans@boldstyle{ExtraBold}
+ \else
+ \def\merriweathersans@boldstyle{Bold}
+ \fi
+
+\else % type1
+ \ifmerriweather@rmlining
+ \def\merriweather@figurestyle{LF}
+ \else
+ \def\merriweather@figurestyle{OsF}
+ \fi
+ \ifmerriweather@rmtabular
+ \def\merriweather@figurealign{T}
+ \else
+ \def\merriweather@figurealign{}
+ \fi
+ \ifmerriweather@sflining
+ \def\merriweathersans@figurestyle{LF}
+ \else
+ \def\merriweathersans@figurestyle{OsF}
+ \fi
+ \ifmerriweather@sftabular
+ \def\merriweathersans@figurealign{T}
+ \else
+ \def\merriweathersans@figurealign{}
+ \fi
+
+ \ifmerriweather@rmlight
+ \def\mdseries@rm{light}
+ \else
+ \def\mdseries@rm{m}
+ \fi
+ \def\seriesdefault{\mdseries@rm}
+ \ifmerriweather@rmblack
+ \def\bfseries@rm{black}
+ \else
+ \def\bfseries@rm{b}
+ \fi
+
+ \ifmerriweather@sflight
+ \def\mdseries@sf{light}
+ \else
+ \def\mdseries@sf{m}
+ \fi
+ \def\seriesdefault{\mdseries@sf}
+ \ifmerriweather@sfblack
+ \def\bfseries@sf{black}
+ \else
+ \def\bfseries@sf{b}
+ \fi
+
+\fi
+
% Set main and/or sans fonts:
-\ifmerriweather@ttf
+\ifmerriweather@otf
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
Ligatures = TeX ,
- Extension = .ttf ,
+ Extension = .otf ,
}
\ifmerriweather@rm
\ifmerriweather@rmlight
\ifmerriweather@rmblack
\setmainfont
- [ UprightFont = *-Light ,
- ItalicFont = *-LightIt ,
- BoldFont = *-UltraBold ,
- BoldItalicFont = *-UltraBdIt ]
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Light ,
+ ItalicFont = *-LightItalic ,
+ BoldFont = *-Black ,
+ BoldItalicFont = *-BlackItalic ]
{Merriweather}
\newfontfamily\merriweather
- [ UprightFont = *-Light ,
- ItalicFont = *-LightIt ,
- BoldFont = *-UltraBold ,
- BoldItalicFont = *-UltraBdIt ]
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Light ,
+ ItalicFont = *-LightItalic ,
+ BoldFont = *-Black ,
+ BoldItalicFont = *-BlackItalic ]
{Merriweather}
\else
\setmainfont
- [ UprightFont = *-Light ,
- ItalicFont = *-LightIt ,
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Light ,
+ ItalicFont = *-LightItalic ,
BoldFont = *-Bold ,
- BoldItalicFont = *-BoldIt ]
+ BoldItalicFont = *-BoldItalic ]
{Merriweather}
\newfontfamily\merriweather
- [ UprightFont = *-Light ,
- ItalicFont = *-LightIt ,
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Light ,
+ ItalicFont = *-LightItalic ,
BoldFont = *-Bold ,
- BoldItalicFont = *-BoldIt ]
{Merriweather}
\fi
\else
\ifmerriweather@rmblack
\setmainfont
- [ UprightFont = *-Regular ,
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Regular ,
ItalicFont = *-Italic ,
- BoldFont = *-UltraBold ,
- BoldItalicFont = *-UltraBdIt ]
+ BoldFont = *-Black ,
+ BoldItalicFont = *-BlackItalic ]
{Merriweather}
\newfontfamily\merriweather
- [ UprightFont = *-Regular ,
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Regular ,
ItalicFont = *-Italic ,
- BoldFont = *-UltraBold ,
- BoldItalicFont = *-UltraBdIt ]
+ BoldFont = *-Black ,
+ BoldItalicFont = *-BlackItalic ]
{Merriweather}
\else
\setmainfont
- [ UprightFont = *-Regular ,
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Regular ,
ItalicFont = *-Italic ,
BoldFont = *-Bold ,
- BoldItalicFont = *-BoldIt ]
+ BoldItalicFont = *-BoldItalic ]
{Merriweather}
\newfontfamily\merriweather
- [ UprightFont = *-Regular ,
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Regular ,
ItalicFont = *-Italic ,
BoldFont = *-Bold ,
- BoldItalicFont = *-BoldIt ]
+ BoldItalicFont = *-BoldItalic ]
{Merriweather}
\fi
\fi
@@ -121,29 +235,33 @@
\ifmerriweather@sflight
\ifmerriweather@sfblack
\setsansfont
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-Light ,
ItalicFont = *-LightItalic ,
BoldFont = *-ExtraBold ,
- BoldItalicFont = *-ExBoldIt ]
+ BoldItalicFont = *-ExtraBoldItalic ]
{MerriweatherSans}
\newfontfamily\merriweathersans
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-Light ,
ItalicFont = *-LightItalic ,
BoldFont = *-ExtraBold ,
- BoldItalicFont = *-ExBoldIt ]
+ BoldItalicFont = *-ExtraBoldItalic ]
{MerriweatherSans}
\else
\setsansfont
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-Light ,
ItalicFont = *-LightItalic ,
BoldFont = *-Bold ,
BoldItalicFont = *-BoldItalic ]
{MerriweatherSans}
\newfontfamily\merriweathersans
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-Light ,
ItalicFont = *-LightItalic ,
BoldFont = *-Bold ,
@@ -153,29 +271,33 @@
\else
\ifmerriweather@sfblack
\setsansfont
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-Regular ,
ItalicFont = *-Italic ,
BoldFont = *-ExtraBold ,
- BoldItalicFont = *-ExBoldIt ]
+ BoldItalicFont = *-ExtraBoldItalic ]
{MerriweatherSans}
\newfontfamily\merriweathersans
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-Regular ,
ItalicFont = *-Italic ,
BoldFont = *-ExtraBold ,
- BoldItalicFont = *-ExBoldIt ]
+ BoldItalicFont = *-ExtraBoldItalic ]
{MerriweatherSans}
\else
\setsansfont
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-Regular ,
ItalicFont = *-Italic ,
BoldFont = *-Bold ,
BoldItalicFont = *-BoldItalic ]
{MerriweatherSans}
\newfontfamily\merriweathersans
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-Regular ,
ItalicFont = *-Italic ,
BoldFont = *-Bold ,
@@ -190,37 +312,41 @@
\renewcommand*\familydefault{\merriweathersffamily}
\fi
\newfontfamily\merriweatherlight
- [ UprightFont = *-Light ,
- ItalicFont = *-LightIt ,
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Light ,
+ ItalicFont = *-LightItalic ,
BoldFont = *-Light ,
- BoldItalicFont = *-LightIt ]
+ BoldItalicFont = *-LightItalic ]
{Merriweather}
\newfontfamily\merriweathersanslight
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-Light ,
ItalicFont = *-LightItalic ,
BoldFont = *-Light ,
BoldItalicFont = *-LightItalic ]
{MerriweatherSans}
\newfontfamily\merriweatherblack
- [ UprightFont = *-UltraBold ,
- ItalicFont = *-UltraBdIt ,
- BoldFont = *-UltraBold ,
- BoldItalicFont = *-UltraBdIt ]
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Black ,
+ ItalicFont = *-BlackItalic ,
+ BoldFont = *-Black ,
+ BoldItalicFont = *-BlackItalic ]
{Merriweather}
\newfontfamily\merriweathersansblack
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-ExtraBold ,
- ItalicFont = *-ExBoldIt ,
+ ItalicFont = *-ExtraBoldItalic ,
BoldFont = *-ExtraBold ,
- BoldItalicFont = *-ExBoldIt ]
+ BoldItalicFont = *-ExtraBoldItalic ]
{MerriweatherSans}
\else % type1
\ifmerriweather@rm
\ifmerriweather@rmlight\def\mdseries@rm{l}\else\def\mdseries@rm{m}\fi
- \ifmerriweather@rmblack\def\bfseries@rm{ub}\else\def\bfseries@rm{b}\fi
+ \ifmerriweather@rmblack\def\bfseries@rm{eb}\else\def\bfseries@rm{b}\fi
\else
\def\mdseries@rm{m}\def\bfseries@rm{b}
\fi
@@ -233,8 +359,8 @@
- \def\merriweatherfamily{Merriwthr-OsF}
- \def\merriweathersffamily{MerriwthrSans-OsF}
+ \def\merriweatherfamily{Merriwthr-\merriweather@figurealign\merriweather@figurestyle}
+ \def\merriweathersffamily{MerriwthrSans-\merriweathersans@figurealign\merriweathersans@figurestyle}
\ifmerriweather@rm
\renewcommand*\rmdefault{\merriweatherfamily}
@@ -254,13 +380,14 @@
\newcommand*\merriweathersans{\fontfamily{\merriweathersffamily}\selectfont}
\newcommand*\merriweatherlight{\fontfamily{\merriweatherfamily}\fontseries{l}\selectfont}
\newcommand*\merriweathersanslight{\fontfamily{\merriweathersffamily}\fontseries{l}\selectfont}
- \newcommand*\merriweatherblack{\fontfamily{\merriweatherfamily}\fontseries{ub}\selectfont}
+ \newcommand*\merriweatherblack{\fontfamily{\merriweatherfamily}\fontseries{eb}\selectfont}
\newcommand*\merriweathersansblack{\fontfamily{\merriweathersffamily}\fontseries{eb}\selectfont}
+
\fi
% turn off defaults in case other fonts are selected:
-\ifmerriweather@ttf
+\ifmerriweather@otf
\defaultfontfeatures{}
\fi
diff --git a/fonts/merriweather/map/merriweather.map b/fonts/merriweather/map/merriweather.map
index b4176d3e06..352fd76e6b 100644
--- a/fonts/merriweather/map/merriweather.map
+++ b/fonts/merriweather/map/merriweather.map
@@ -1,153 +1,500 @@
-
% Automatically maintained by otftotfm or other programs. Do not edit.
-Merriwthr-BoldItalic-osf-ot1 Merriwthr-BoldItalic "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwthr_6upxhe.enc <Merriwthr-BoldIt.pfb
-Merriwthr-BoldItalic-osf-t1--base Merriwthr-BoldItalic "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwthr_clyrx2.enc <Merriwthr-BoldIt.pfb
-Merriwthr-BoldItalic-osf-ly1 Merriwthr-BoldItalic "AutoEnc_hzrl5scqns2jtblgadawedqwjb ReEncodeFont" <[mwthr_hzrl5s.enc <Merriwthr-BoldIt.pfb
-Merriwthr-BoldItalic-osf-ts1--base Merriwthr-BoldItalic "AutoEnc_u54ue6qvmldocqxmqypta3d4nc ReEncodeFont" <[mwthr_u54ue6.enc <Merriwthr-BoldIt.pfb
-Merriwthr-Bold-osf-ot1 Merriwthr-Bold "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwthr_6upxhe.enc <Merriwthr-Bold.pfb
-Merriwthr-Bold-osf-t1--base Merriwthr-Bold "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwthr_clyrx2.enc <Merriwthr-Bold.pfb
-Merriwthr-Bold-osf-ly1 Merriwthr-Bold "AutoEnc_hzrl5scqns2jtblgadawedqwjb ReEncodeFont" <[mwthr_hzrl5s.enc <Merriwthr-Bold.pfb
-Merriwthr-Bold-osf-ts1--base Merriwthr-Bold "AutoEnc_u54ue6qvmldocqxmqypta3d4nc ReEncodeFont" <[mwthr_u54ue6.enc <Merriwthr-Bold.pfb
-Merriwthr-Italic-osf-ot1 Merriwthr-Italic "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwthr_6upxhe.enc <Merriwthr-Italic.pfb
-Merriwthr-Italic-osf-t1--base Merriwthr-Italic "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwthr_clyrx2.enc <Merriwthr-Italic.pfb
-Merriwthr-Italic-osf-ly1 Merriwthr-Italic "AutoEnc_hzrl5scqns2jtblgadawedqwjb ReEncodeFont" <[mwthr_hzrl5s.enc <Merriwthr-Italic.pfb
-Merriwthr-Italic-osf-ts1--base Merriwthr-Italic "AutoEnc_u54ue6qvmldocqxmqypta3d4nc ReEncodeFont" <[mwthr_u54ue6.enc <Merriwthr-Italic.pfb
-Merriwthr-LightIt-osf-ot1 Merriwthr-LightIt "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwthr_6upxhe.enc <Merriwthr-LightIt.pfb
-Merriwthr-LightIt-osf-t1--base Merriwthr-LightIt "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwthr_clyrx2.enc <Merriwthr-LightIt.pfb
-Merriwthr-LightIt-osf-ly1 Merriwthr-LightIt "AutoEnc_hzrl5scqns2jtblgadawedqwjb ReEncodeFont" <[mwthr_hzrl5s.enc <Merriwthr-LightIt.pfb
-Merriwthr-LightIt-osf-ts1--base Merriwthr-LightIt "AutoEnc_u54ue6qvmldocqxmqypta3d4nc ReEncodeFont" <[mwthr_u54ue6.enc <Merriwthr-LightIt.pfb
-Merriwthr-Light-osf-ot1 Merriwthr-Light "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwthr_6upxhe.enc <Merriwthr-Light.pfb
-Merriwthr-Light-osf-t1--base Merriwthr-Light "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwthr_clyrx2.enc <Merriwthr-Light.pfb
-Merriwthr-Light-osf-ly1 Merriwthr-Light "AutoEnc_hzrl5scqns2jtblgadawedqwjb ReEncodeFont" <[mwthr_hzrl5s.enc <Merriwthr-Light.pfb
-Merriwthr-Light-osf-ts1--base Merriwthr-Light "AutoEnc_u54ue6qvmldocqxmqypta3d4nc ReEncodeFont" <[mwthr_u54ue6.enc <Merriwthr-Light.pfb
-Merriwthr-Regular-osf-ot1 Merriwthr-Regular "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwthr_6upxhe.enc <Merriwthr-Regular.pfb
-Merriwthr-Regular-osf-t1--base Merriwthr-Regular "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwthr_clyrx2.enc <Merriwthr-Regular.pfb
-Merriwthr-Regular-osf-ly1 Merriwthr-Regular "AutoEnc_hzrl5scqns2jtblgadawedqwjb ReEncodeFont" <[mwthr_hzrl5s.enc <Merriwthr-Regular.pfb
-Merriwthr-Regular-osf-ts1--base Merriwthr-Regular "AutoEnc_u54ue6qvmldocqxmqypta3d4nc ReEncodeFont" <[mwthr_u54ue6.enc <Merriwthr-Regular.pfb
-Merriwthr-UltraBdIt-osf-ot1 Merriwthr-UltraBdIt "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwthr_6upxhe.enc <Merriwthr-UltraBdIt.pfb
-Merriwthr-UltraBdIt-osf-t1--base Merriwthr-UltraBdIt "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwthr_clyrx2.enc <Merriwthr-UltraBdIt.pfb
-Merriwthr-UltraBdIt-osf-ly1 Merriwthr-UltraBdIt "AutoEnc_hzrl5scqns2jtblgadawedqwjb ReEncodeFont" <[mwthr_hzrl5s.enc <Merriwthr-UltraBdIt.pfb
-Merriwthr-UltraBdIt-osf-ts1--base Merriwthr-UltraBdIt "AutoEnc_u54ue6qvmldocqxmqypta3d4nc ReEncodeFont" <[mwthr_u54ue6.enc <Merriwthr-UltraBdIt.pfb
-Merriwthr-UltraBold-osf-ot1 Merriwthr-UltraBold "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[mwthr_6upxhe.enc <Merriwthr-UltraBold.pfb
-Merriwthr-UltraBold-osf-t1--base Merriwthr-UltraBold "AutoEnc_clyrx2g6vyt4l47obgfn3hyxqe ReEncodeFont" <[mwthr_clyrx2.enc <Merriwthr-UltraBold.pfb
-Merriwthr-UltraBold-osf-ly1 Merriwthr-UltraBold "AutoEnc_hzrl5scqns2jtblgadawedqwjb ReEncodeFont" <[mwthr_hzrl5s.enc <Merriwthr-UltraBold.pfb
-Merriwthr-UltraBold-osf-ts1--base Merriwthr-UltraBold "AutoEnc_u54ue6qvmldocqxmqypta3d4nc ReEncodeFont" <[mwthr_u54ue6.enc <Merriwthr-UltraBold.pfb
-
-% Automatically maintained by otftotfm or other programs. Do not edit.
-
-MerriwthrSans-BoldItalic-sup-ot1 MerriwthrSans-BoldItalic "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwthr_czxicq.enc <MerriwthrSans-BoldItalic.pfb
-MerriwthrSans-BoldItalic-sup-t1--base MerriwthrSans-BoldItalic "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwthr_7ytifx.enc <MerriwthrSans-BoldItalic.pfb
-MerriwthrSans-BoldItalic-sup-ly1 MerriwthrSans-BoldItalic "AutoEnc_3g4t7fcjh3tc6ptea3fgbusogg ReEncodeFont" <[mwthr_3g4t7f.enc <MerriwthrSans-BoldItalic.pfb
-MerriwthrSans-BoldItalic-osf-ot1 MerriwthrSans-BoldItalic "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwthr_tvbl63.enc <MerriwthrSans-BoldItalic.pfb
-MerriwthrSans-BoldItalic-osf-t1--base MerriwthrSans-BoldItalic "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwthr_iuohxq.enc <MerriwthrSans-BoldItalic.pfb
-MerriwthrSans-BoldItalic-osf-ly1 MerriwthrSans-BoldItalic "AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont" <[mwthr_vi456v.enc <MerriwthrSans-BoldItalic.pfb
-MerriwthrSans-BoldItalic-osf-ts1--base MerriwthrSans-BoldItalic "AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont" <[mwthr_n7ujmb.enc <MerriwthrSans-BoldItalic.pfb
-MerriwthrSans-Bold-sup-ot1 MerriwthrSans-Bold "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwthr_czxicq.enc <MerriwthrSans-Bold.pfb
-MerriwthrSans-Bold-sup-t1--base MerriwthrSans-Bold "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwthr_7ytifx.enc <MerriwthrSans-Bold.pfb
-MerriwthrSans-Bold-sup-ly1 MerriwthrSans-Bold "AutoEnc_zwbe7jlcvl2wsktttm4zndfryf ReEncodeFont" <[mwthr_zwbe7j.enc <MerriwthrSans-Bold.pfb
-MerriwthrSans-Bold-osf-ot1 MerriwthrSans-Bold "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwthr_tvbl63.enc <MerriwthrSans-Bold.pfb
-MerriwthrSans-Bold-osf-t1--base MerriwthrSans-Bold "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwthr_iuohxq.enc <MerriwthrSans-Bold.pfb
-MerriwthrSans-Bold-osf-ly1 MerriwthrSans-Bold "AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont" <[mwthr_44qg5v.enc <MerriwthrSans-Bold.pfb
-MerriwthrSans-Bold-osf-ts1--base MerriwthrSans-Bold "AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont" <[mwthr_n7ujmb.enc <MerriwthrSans-Bold.pfb
-MerriwthrSans-ExtraBoldItalic-sup-ot1 MerriwthrSans-ExtraBoldItalic "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwthr_czxicq.enc <MerriwthrSans-ExBoldIt.pfb
-MerriwthrSans-ExtraBoldItalic-sup-t1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwthr_7ytifx.enc <MerriwthrSans-ExBoldIt.pfb
-MerriwthrSans-ExtraBoldItalic-sup-ly1 MerriwthrSans-ExtraBoldItalic "AutoEnc_3g4t7fcjh3tc6ptea3fgbusogg ReEncodeFont" <[mwthr_3g4t7f.enc <MerriwthrSans-ExBoldIt.pfb
-MerriwthrSans-ExtraBoldItalic-osf-ot1 MerriwthrSans-ExtraBoldItalic "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwthr_tvbl63.enc <MerriwthrSans-ExBoldIt.pfb
-MerriwthrSans-ExtraBoldItalic-osf-t1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwthr_iuohxq.enc <MerriwthrSans-ExBoldIt.pfb
-MerriwthrSans-ExtraBoldItalic-osf-ly1 MerriwthrSans-ExtraBoldItalic "AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont" <[mwthr_vi456v.enc <MerriwthrSans-ExBoldIt.pfb
-MerriwthrSans-ExtraBoldItalic-osf-ts1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont" <[mwthr_n7ujmb.enc <MerriwthrSans-ExBoldIt.pfb
-MerriwthrSans-ExtraBold-sup-ot1 MerriwthrSans-ExtraBold "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwthr_czxicq.enc <MerriwthrSans-ExtraBold.pfb
-MerriwthrSans-ExtraBold-sup-t1--base MerriwthrSans-ExtraBold "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwthr_7ytifx.enc <MerriwthrSans-ExtraBold.pfb
-MerriwthrSans-ExtraBold-sup-ly1 MerriwthrSans-ExtraBold "AutoEnc_zwbe7jlcvl2wsktttm4zndfryf ReEncodeFont" <[mwthr_zwbe7j.enc <MerriwthrSans-ExtraBold.pfb
-MerriwthrSans-ExtraBold-osf-ot1 MerriwthrSans-ExtraBold "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwthr_tvbl63.enc <MerriwthrSans-ExtraBold.pfb
-MerriwthrSans-ExtraBold-osf-t1--base MerriwthrSans-ExtraBold "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwthr_iuohxq.enc <MerriwthrSans-ExtraBold.pfb
-MerriwthrSans-ExtraBold-osf-ly1 MerriwthrSans-ExtraBold "AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont" <[mwthr_44qg5v.enc <MerriwthrSans-ExtraBold.pfb
-MerriwthrSans-ExtraBold-osf-ts1--base MerriwthrSans-ExtraBold "AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont" <[mwthr_n7ujmb.enc <MerriwthrSans-ExtraBold.pfb
-MerriwthrSans-Italic-sup-ot1 MerriwthrSans-Italic "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwthr_czxicq.enc <MerriwthrSans-Italic.pfb
-MerriwthrSans-Italic-sup-t1--base MerriwthrSans-Italic "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwthr_7ytifx.enc <MerriwthrSans-Italic.pfb
-MerriwthrSans-Italic-sup-ly1 MerriwthrSans-Italic "AutoEnc_3g4t7fcjh3tc6ptea3fgbusogg ReEncodeFont" <[mwthr_3g4t7f.enc <MerriwthrSans-Italic.pfb
-MerriwthrSans-Italic-osf-ot1 MerriwthrSans-Italic "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwthr_tvbl63.enc <MerriwthrSans-Italic.pfb
-MerriwthrSans-Italic-osf-t1--base MerriwthrSans-Italic "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwthr_iuohxq.enc <MerriwthrSans-Italic.pfb
-MerriwthrSans-Italic-osf-ly1 MerriwthrSans-Italic "AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont" <[mwthr_vi456v.enc <MerriwthrSans-Italic.pfb
-MerriwthrSans-Italic-osf-ts1--base MerriwthrSans-Italic "AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont" <[mwthr_n7ujmb.enc <MerriwthrSans-Italic.pfb
-MerriwthrSans-LightItalic-sup-ot1 MerriwthrSans-LightItalic "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwthr_czxicq.enc <MerriwthrSans-LightItalic.pfb
-MerriwthrSans-LightItalic-sup-t1--base MerriwthrSans-LightItalic "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwthr_7ytifx.enc <MerriwthrSans-LightItalic.pfb
-MerriwthrSans-LightItalic-sup-ly1 MerriwthrSans-LightItalic "AutoEnc_3g4t7fcjh3tc6ptea3fgbusogg ReEncodeFont" <[mwthr_3g4t7f.enc <MerriwthrSans-LightItalic.pfb
-MerriwthrSans-LightItalic-osf-ot1 MerriwthrSans-LightItalic "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwthr_tvbl63.enc <MerriwthrSans-LightItalic.pfb
-MerriwthrSans-LightItalic-osf-t1--base MerriwthrSans-LightItalic "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwthr_iuohxq.enc <MerriwthrSans-LightItalic.pfb
-MerriwthrSans-LightItalic-osf-ly1 MerriwthrSans-LightItalic "AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont" <[mwthr_vi456v.enc <MerriwthrSans-LightItalic.pfb
-MerriwthrSans-LightItalic-osf-ts1--base MerriwthrSans-LightItalic "AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont" <[mwthr_n7ujmb.enc <MerriwthrSans-LightItalic.pfb
-MerriwthrSans-Light-sup-ot1 MerriwthrSans-Light "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwthr_czxicq.enc <MerriwthrSans-Light.pfb
-MerriwthrSans-Light-sup-t1--base MerriwthrSans-Light "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwthr_7ytifx.enc <MerriwthrSans-Light.pfb
-MerriwthrSans-Light-sup-ly1 MerriwthrSans-Light "AutoEnc_zwbe7jlcvl2wsktttm4zndfryf ReEncodeFont" <[mwthr_zwbe7j.enc <MerriwthrSans-Light.pfb
-MerriwthrSans-Light-osf-ot1 MerriwthrSans-Light "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwthr_tvbl63.enc <MerriwthrSans-Light.pfb
-MerriwthrSans-Light-osf-t1--base MerriwthrSans-Light "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwthr_iuohxq.enc <MerriwthrSans-Light.pfb
-MerriwthrSans-Light-osf-ly1 MerriwthrSans-Light "AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont" <[mwthr_44qg5v.enc <MerriwthrSans-Light.pfb
-MerriwthrSans-Light-osf-ts1--base MerriwthrSans-Light "AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont" <[mwthr_n7ujmb.enc <MerriwthrSans-Light.pfb
-MerriwthrSans-Regular-sup-ot1 MerriwthrSans-Regular "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwthr_czxicq.enc <MerriwthrSans-Regular.pfb
-MerriwthrSans-Regular-sup-t1--base MerriwthrSans-Regular "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwthr_7ytifx.enc <MerriwthrSans-Regular.pfb
-MerriwthrSans-Regular-sup-ly1 MerriwthrSans-Regular "AutoEnc_zwbe7jlcvl2wsktttm4zndfryf ReEncodeFont" <[mwthr_zwbe7j.enc <MerriwthrSans-Regular.pfb
-MerriwthrSans-Regular-osf-ot1 MerriwthrSans-Regular "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwthr_tvbl63.enc <MerriwthrSans-Regular.pfb
-MerriwthrSans-Regular-osf-t1--base MerriwthrSans-Regular "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwthr_iuohxq.enc <MerriwthrSans-Regular.pfb
-MerriwthrSans-Regular-osf-ly1 MerriwthrSans-Regular "AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont" <[mwthr_44qg5v.enc <MerriwthrSans-Regular.pfb
-MerriwthrSans-Regular-osf-ts1--base MerriwthrSans-Regular "AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont" <[mwthr_n7ujmb.enc <MerriwthrSans-Regular.pfb
-
+Merriwthr-BlackItalic-tlf-ot1 Merriwthr-BlackItalic "AutoEnc_c4h6otdvt6kvqx2jiclefoedfe ReEncodeFont" <[merriwthr_c4h6ot.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-tlf-t1--base Merriwthr-BlackItalic "AutoEnc_e2idhw5l3f6krq5sjxsu7h333h ReEncodeFont" <[merriwthr_e2idhw.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-tlf-ly1 Merriwthr-BlackItalic "AutoEnc_o43b2qy2xwpvi2pcx6qou2eunc ReEncodeFont" <[merriwthr_o43b2q.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-tlf-sc-ot1--base Merriwthr-BlackItalic "AutoEnc_27vehb5m3cihxu3ac3lncxkf3b ReEncodeFont" <[merriwthr_27vehb.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-tlf-sc-t1--base Merriwthr-BlackItalic "AutoEnc_vvhkhe5iryghotomeftgcjayke ReEncodeFont" <[merriwthr_vvhkhe.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-tlf-sc-ly1--base Merriwthr-BlackItalic "AutoEnc_f5n6m3o7woi5yzxjhungu6czrc ReEncodeFont" <[merriwthr_f5n6m3.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-tlf-ts1--base Merriwthr-BlackItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-sup-ot1 Merriwthr-BlackItalic "AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c ReEncodeFont" <[merriwthr_5xld5w.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-sup-t1--base Merriwthr-BlackItalic "AutoEnc_qndjqiu4qjku62xxe6uv5xlfjb ReEncodeFont" <[merriwthr_qndjqi.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-sup-ly1 Merriwthr-BlackItalic "AutoEnc_cy3ufib4i3gsgczcb7bl5ni5hb ReEncodeFont" <[merriwthr_cy3ufi.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-lf-ot1 Merriwthr-BlackItalic "AutoEnc_w4rwtqnqgnoept64akgqql332d ReEncodeFont" <[merriwthr_w4rwtq.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-lf-t1--base Merriwthr-BlackItalic "AutoEnc_gmchnqiogedxb6eqrw52occsyg ReEncodeFont" <[merriwthr_gmchnq.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-lf-ly1 Merriwthr-BlackItalic "AutoEnc_ynquvwz7uzs76ql3vkgsnmi6oh ReEncodeFont" <[merriwthr_ynquvw.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-lf-sc-ot1--base Merriwthr-BlackItalic "AutoEnc_4ylisx4bjukj4ykfse7sl6as3b ReEncodeFont" <[merriwthr_4ylisx.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-lf-sc-t1--base Merriwthr-BlackItalic "AutoEnc_h6z4fchqakiptcatrec23y7rcc ReEncodeFont" <[merriwthr_h6z4fc.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-lf-sc-ly1--base Merriwthr-BlackItalic "AutoEnc_ibepovaibzx3d7em6a74gi3zsf ReEncodeFont" <[merriwthr_ibepov.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-lf-ts1--base Merriwthr-BlackItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-tosf-ot1 Merriwthr-BlackItalic "AutoEnc_nszfm3rifj2lt5clmoofzy4dcd ReEncodeFont" <[merriwthr_nszfm3.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-tosf-t1--base Merriwthr-BlackItalic "AutoEnc_mr3nckycyxcdyrjgjhye5cztpb ReEncodeFont" <[merriwthr_mr3nck.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-tosf-ly1 Merriwthr-BlackItalic "AutoEnc_s56ilq3a5gkjgfrefs4uoyfp4h ReEncodeFont" <[merriwthr_s56ilq.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-tosf-sc-ot1--base Merriwthr-BlackItalic "AutoEnc_urus45g42tw26byrfmdw37peyf ReEncodeFont" <[merriwthr_urus45.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-tosf-sc-t1--base Merriwthr-BlackItalic "AutoEnc_xfdjpzrew23yucr3gqhoiqfjpg ReEncodeFont" <[merriwthr_xfdjpz.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-tosf-sc-ly1--base Merriwthr-BlackItalic "AutoEnc_fs3efepejn3awlhjrbqbmbyure ReEncodeFont" <[merriwthr_fs3efe.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-tosf-ts1--base Merriwthr-BlackItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-osf-ot1 Merriwthr-BlackItalic "AutoEnc_jjwbah5qahy6yiiis5yetxupnf ReEncodeFont" <[merriwthr_jjwbah.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-osf-t1--base Merriwthr-BlackItalic "AutoEnc_posqbludufzthv4e4oqyltuypc ReEncodeFont" <[merriwthr_posqbl.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-osf-ly1 Merriwthr-BlackItalic "AutoEnc_wppmfidyainl67d5kddjpxn6nd ReEncodeFont" <[merriwthr_wppmfi.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-osf-sc-ot1--base Merriwthr-BlackItalic "AutoEnc_abao47xoatoxdwsybjc3c2ar6d ReEncodeFont" <[merriwthr_abao47.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-osf-sc-t1--base Merriwthr-BlackItalic "AutoEnc_dl4a4cd6a23xd5xgvepmqyb43h ReEncodeFont" <[merriwthr_dl4a4c.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-osf-sc-ly1--base Merriwthr-BlackItalic "AutoEnc_ah5y5aw36djf33hoctce7xgaqg ReEncodeFont" <[merriwthr_ah5y5a.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-BlackItalic-osf-ts1--base Merriwthr-BlackItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-BlackItalic.pfb
+Merriwthr-Black-tlf-ot1 Merriwthr-Black "AutoEnc_c4h6otdvt6kvqx2jiclefoedfe ReEncodeFont" <[merriwthr_c4h6ot.enc <Merriwthr-Black.pfb
+Merriwthr-Black-tlf-t1--base Merriwthr-Black "AutoEnc_e2idhw5l3f6krq5sjxsu7h333h ReEncodeFont" <[merriwthr_e2idhw.enc <Merriwthr-Black.pfb
+Merriwthr-Black-tlf-ly1 Merriwthr-Black "AutoEnc_o43b2qy2xwpvi2pcx6qou2eunc ReEncodeFont" <[merriwthr_o43b2q.enc <Merriwthr-Black.pfb
+Merriwthr-Black-tlf-sc-ot1--base Merriwthr-Black "AutoEnc_5lck5zupnxcvrb5zmzavlitmja ReEncodeFont" <[merriwthr_5lck5z.enc <Merriwthr-Black.pfb
+Merriwthr-Black-tlf-sc-t1--base Merriwthr-Black "AutoEnc_b6rchsdcccdbohxqpazo7dpjpe ReEncodeFont" <[merriwthr_b6rchs.enc <Merriwthr-Black.pfb
+Merriwthr-Black-tlf-sc-ly1--base Merriwthr-Black "AutoEnc_2j7grfe4celkaswwxdgd6kmn7h ReEncodeFont" <[merriwthr_2j7grf.enc <Merriwthr-Black.pfb
+Merriwthr-Black-tlf-ts1--base Merriwthr-Black "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Black.pfb
+Merriwthr-Black-sup-ot1 Merriwthr-Black "AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c ReEncodeFont" <[merriwthr_5xld5w.enc <Merriwthr-Black.pfb
+Merriwthr-Black-sup-t1--base Merriwthr-Black "AutoEnc_qndjqiu4qjku62xxe6uv5xlfjb ReEncodeFont" <[merriwthr_qndjqi.enc <Merriwthr-Black.pfb
+Merriwthr-Black-sup-ly1 Merriwthr-Black "AutoEnc_cy3ufib4i3gsgczcb7bl5ni5hb ReEncodeFont" <[merriwthr_cy3ufi.enc <Merriwthr-Black.pfb
+Merriwthr-Black-lf-ot1 Merriwthr-Black "AutoEnc_w4rwtqnqgnoept64akgqql332d ReEncodeFont" <[merriwthr_w4rwtq.enc <Merriwthr-Black.pfb
+Merriwthr-Black-lf-t1--base Merriwthr-Black "AutoEnc_gmchnqiogedxb6eqrw52occsyg ReEncodeFont" <[merriwthr_gmchnq.enc <Merriwthr-Black.pfb
+Merriwthr-Black-lf-ly1 Merriwthr-Black "AutoEnc_ynquvwz7uzs76ql3vkgsnmi6oh ReEncodeFont" <[merriwthr_ynquvw.enc <Merriwthr-Black.pfb
+Merriwthr-Black-lf-sc-ot1--base Merriwthr-Black "AutoEnc_7jdyhkndsyrev6wof6cyijpmpe ReEncodeFont" <[merriwthr_7jdyhk.enc <Merriwthr-Black.pfb
+Merriwthr-Black-lf-sc-t1--base Merriwthr-Black "AutoEnc_diijaagendozmspoxxqdz27yxg ReEncodeFont" <[merriwthr_diijaa.enc <Merriwthr-Black.pfb
+Merriwthr-Black-lf-sc-ly1--base Merriwthr-Black "AutoEnc_afua2jwl273trfqxqlndomfbjh ReEncodeFont" <[merriwthr_afua2j.enc <Merriwthr-Black.pfb
+Merriwthr-Black-lf-ts1--base Merriwthr-Black "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Black.pfb
+Merriwthr-Black-tosf-ot1 Merriwthr-Black "AutoEnc_nszfm3rifj2lt5clmoofzy4dcd ReEncodeFont" <[merriwthr_nszfm3.enc <Merriwthr-Black.pfb
+Merriwthr-Black-tosf-t1--base Merriwthr-Black "AutoEnc_mr3nckycyxcdyrjgjhye5cztpb ReEncodeFont" <[merriwthr_mr3nck.enc <Merriwthr-Black.pfb
+Merriwthr-Black-tosf-ly1 Merriwthr-Black "AutoEnc_s56ilq3a5gkjgfrefs4uoyfp4h ReEncodeFont" <[merriwthr_s56ilq.enc <Merriwthr-Black.pfb
+Merriwthr-Black-tosf-sc-ot1--base Merriwthr-Black "AutoEnc_lkhefyggyierwy5lpz6f5mrllg ReEncodeFont" <[merriwthr_lkhefy.enc <Merriwthr-Black.pfb
+Merriwthr-Black-tosf-sc-t1--base Merriwthr-Black "AutoEnc_x754fdhjy7kbfaggcczlltapqc ReEncodeFont" <[merriwthr_x754fd.enc <Merriwthr-Black.pfb
+Merriwthr-Black-tosf-sc-ly1--base Merriwthr-Black "AutoEnc_uduhhnl6o26amfuwg72h3q32ac ReEncodeFont" <[merriwthr_uduhhn.enc <Merriwthr-Black.pfb
+Merriwthr-Black-tosf-ts1--base Merriwthr-Black "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Black.pfb
+Merriwthr-Black-osf-ot1 Merriwthr-Black "AutoEnc_jjwbah5qahy6yiiis5yetxupnf ReEncodeFont" <[merriwthr_jjwbah.enc <Merriwthr-Black.pfb
+Merriwthr-Black-osf-t1--base Merriwthr-Black "AutoEnc_posqbludufzthv4e4oqyltuypc ReEncodeFont" <[merriwthr_posqbl.enc <Merriwthr-Black.pfb
+Merriwthr-Black-osf-ly1 Merriwthr-Black "AutoEnc_wppmfidyainl67d5kddjpxn6nd ReEncodeFont" <[merriwthr_wppmfi.enc <Merriwthr-Black.pfb
+Merriwthr-Black-osf-sc-ot1--base Merriwthr-Black "AutoEnc_okb76xb34camvyvrgktdrvpbda ReEncodeFont" <[merriwthr_okb76x.enc <Merriwthr-Black.pfb
+Merriwthr-Black-osf-sc-t1--base Merriwthr-Black "AutoEnc_xys2i2l6u4vmavrixvir4bozhf ReEncodeFont" <[merriwthr_xys2i2.enc <Merriwthr-Black.pfb
+Merriwthr-Black-osf-sc-ly1--base Merriwthr-Black "AutoEnc_igdvgbzyycmjszvsnaafuzxjca ReEncodeFont" <[merriwthr_igdvgb.enc <Merriwthr-Black.pfb
+Merriwthr-Black-osf-ts1--base Merriwthr-Black "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Black.pfb
+Merriwthr-BoldItalic-tlf-ot1 Merriwthr-BoldItalic "AutoEnc_c4h6otdvt6kvqx2jiclefoedfe ReEncodeFont" <[merriwthr_c4h6ot.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-tlf-t1--base Merriwthr-BoldItalic "AutoEnc_e2idhw5l3f6krq5sjxsu7h333h ReEncodeFont" <[merriwthr_e2idhw.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-tlf-ly1 Merriwthr-BoldItalic "AutoEnc_o43b2qy2xwpvi2pcx6qou2eunc ReEncodeFont" <[merriwthr_o43b2q.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-tlf-sc-ot1--base Merriwthr-BoldItalic "AutoEnc_27vehb5m3cihxu3ac3lncxkf3b ReEncodeFont" <[merriwthr_27vehb.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-tlf-sc-t1--base Merriwthr-BoldItalic "AutoEnc_vvhkhe5iryghotomeftgcjayke ReEncodeFont" <[merriwthr_vvhkhe.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-tlf-sc-ly1--base Merriwthr-BoldItalic "AutoEnc_f5n6m3o7woi5yzxjhungu6czrc ReEncodeFont" <[merriwthr_f5n6m3.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-tlf-ts1--base Merriwthr-BoldItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-sup-ot1 Merriwthr-BoldItalic "AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c ReEncodeFont" <[merriwthr_5xld5w.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-sup-t1--base Merriwthr-BoldItalic "AutoEnc_qndjqiu4qjku62xxe6uv5xlfjb ReEncodeFont" <[merriwthr_qndjqi.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-sup-ly1 Merriwthr-BoldItalic "AutoEnc_cy3ufib4i3gsgczcb7bl5ni5hb ReEncodeFont" <[merriwthr_cy3ufi.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-lf-ot1 Merriwthr-BoldItalic "AutoEnc_w4rwtqnqgnoept64akgqql332d ReEncodeFont" <[merriwthr_w4rwtq.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-lf-t1--base Merriwthr-BoldItalic "AutoEnc_gmchnqiogedxb6eqrw52occsyg ReEncodeFont" <[merriwthr_gmchnq.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-lf-ly1 Merriwthr-BoldItalic "AutoEnc_ynquvwz7uzs76ql3vkgsnmi6oh ReEncodeFont" <[merriwthr_ynquvw.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-lf-sc-ot1--base Merriwthr-BoldItalic "AutoEnc_4ylisx4bjukj4ykfse7sl6as3b ReEncodeFont" <[merriwthr_4ylisx.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-lf-sc-t1--base Merriwthr-BoldItalic "AutoEnc_h6z4fchqakiptcatrec23y7rcc ReEncodeFont" <[merriwthr_h6z4fc.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-lf-sc-ly1--base Merriwthr-BoldItalic "AutoEnc_ibepovaibzx3d7em6a74gi3zsf ReEncodeFont" <[merriwthr_ibepov.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-lf-ts1--base Merriwthr-BoldItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-tosf-ot1 Merriwthr-BoldItalic "AutoEnc_nszfm3rifj2lt5clmoofzy4dcd ReEncodeFont" <[merriwthr_nszfm3.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-tosf-t1--base Merriwthr-BoldItalic "AutoEnc_mr3nckycyxcdyrjgjhye5cztpb ReEncodeFont" <[merriwthr_mr3nck.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-tosf-ly1 Merriwthr-BoldItalic "AutoEnc_s56ilq3a5gkjgfrefs4uoyfp4h ReEncodeFont" <[merriwthr_s56ilq.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-tosf-sc-ot1--base Merriwthr-BoldItalic "AutoEnc_urus45g42tw26byrfmdw37peyf ReEncodeFont" <[merriwthr_urus45.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-tosf-sc-t1--base Merriwthr-BoldItalic "AutoEnc_xfdjpzrew23yucr3gqhoiqfjpg ReEncodeFont" <[merriwthr_xfdjpz.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-tosf-sc-ly1--base Merriwthr-BoldItalic "AutoEnc_fs3efepejn3awlhjrbqbmbyure ReEncodeFont" <[merriwthr_fs3efe.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-tosf-ts1--base Merriwthr-BoldItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-osf-ot1 Merriwthr-BoldItalic "AutoEnc_jjwbah5qahy6yiiis5yetxupnf ReEncodeFont" <[merriwthr_jjwbah.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-osf-t1--base Merriwthr-BoldItalic "AutoEnc_posqbludufzthv4e4oqyltuypc ReEncodeFont" <[merriwthr_posqbl.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-osf-ly1 Merriwthr-BoldItalic "AutoEnc_wppmfidyainl67d5kddjpxn6nd ReEncodeFont" <[merriwthr_wppmfi.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-osf-sc-ot1--base Merriwthr-BoldItalic "AutoEnc_abao47xoatoxdwsybjc3c2ar6d ReEncodeFont" <[merriwthr_abao47.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-osf-sc-t1--base Merriwthr-BoldItalic "AutoEnc_dl4a4cd6a23xd5xgvepmqyb43h ReEncodeFont" <[merriwthr_dl4a4c.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-osf-sc-ly1--base Merriwthr-BoldItalic "AutoEnc_ah5y5aw36djf33hoctce7xgaqg ReEncodeFont" <[merriwthr_ah5y5a.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-BoldItalic-osf-ts1--base Merriwthr-BoldItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-BoldItalic.pfb
+Merriwthr-Bold-tlf-ot1 Merriwthr-Bold "AutoEnc_c4h6otdvt6kvqx2jiclefoedfe ReEncodeFont" <[merriwthr_c4h6ot.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-tlf-t1--base Merriwthr-Bold "AutoEnc_e2idhw5l3f6krq5sjxsu7h333h ReEncodeFont" <[merriwthr_e2idhw.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-tlf-ly1 Merriwthr-Bold "AutoEnc_o43b2qy2xwpvi2pcx6qou2eunc ReEncodeFont" <[merriwthr_o43b2q.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-tlf-sc-ot1--base Merriwthr-Bold "AutoEnc_5lck5zupnxcvrb5zmzavlitmja ReEncodeFont" <[merriwthr_5lck5z.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-tlf-sc-t1--base Merriwthr-Bold "AutoEnc_b6rchsdcccdbohxqpazo7dpjpe ReEncodeFont" <[merriwthr_b6rchs.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-tlf-sc-ly1--base Merriwthr-Bold "AutoEnc_2j7grfe4celkaswwxdgd6kmn7h ReEncodeFont" <[merriwthr_2j7grf.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-tlf-ts1--base Merriwthr-Bold "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-sup-ot1 Merriwthr-Bold "AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c ReEncodeFont" <[merriwthr_5xld5w.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-sup-t1--base Merriwthr-Bold "AutoEnc_qndjqiu4qjku62xxe6uv5xlfjb ReEncodeFont" <[merriwthr_qndjqi.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-sup-ly1 Merriwthr-Bold "AutoEnc_cy3ufib4i3gsgczcb7bl5ni5hb ReEncodeFont" <[merriwthr_cy3ufi.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-lf-ot1 Merriwthr-Bold "AutoEnc_w4rwtqnqgnoept64akgqql332d ReEncodeFont" <[merriwthr_w4rwtq.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-lf-t1--base Merriwthr-Bold "AutoEnc_gmchnqiogedxb6eqrw52occsyg ReEncodeFont" <[merriwthr_gmchnq.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-lf-ly1 Merriwthr-Bold "AutoEnc_ynquvwz7uzs76ql3vkgsnmi6oh ReEncodeFont" <[merriwthr_ynquvw.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-lf-sc-ot1--base Merriwthr-Bold "AutoEnc_7jdyhkndsyrev6wof6cyijpmpe ReEncodeFont" <[merriwthr_7jdyhk.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-lf-sc-t1--base Merriwthr-Bold "AutoEnc_diijaagendozmspoxxqdz27yxg ReEncodeFont" <[merriwthr_diijaa.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-lf-sc-ly1--base Merriwthr-Bold "AutoEnc_afua2jwl273trfqxqlndomfbjh ReEncodeFont" <[merriwthr_afua2j.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-lf-ts1--base Merriwthr-Bold "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-tosf-ot1 Merriwthr-Bold "AutoEnc_nszfm3rifj2lt5clmoofzy4dcd ReEncodeFont" <[merriwthr_nszfm3.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-tosf-t1--base Merriwthr-Bold "AutoEnc_mr3nckycyxcdyrjgjhye5cztpb ReEncodeFont" <[merriwthr_mr3nck.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-tosf-ly1 Merriwthr-Bold "AutoEnc_s56ilq3a5gkjgfrefs4uoyfp4h ReEncodeFont" <[merriwthr_s56ilq.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-tosf-sc-ot1--base Merriwthr-Bold "AutoEnc_lkhefyggyierwy5lpz6f5mrllg ReEncodeFont" <[merriwthr_lkhefy.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-tosf-sc-t1--base Merriwthr-Bold "AutoEnc_x754fdhjy7kbfaggcczlltapqc ReEncodeFont" <[merriwthr_x754fd.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-tosf-sc-ly1--base Merriwthr-Bold "AutoEnc_uduhhnl6o26amfuwg72h3q32ac ReEncodeFont" <[merriwthr_uduhhn.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-tosf-ts1--base Merriwthr-Bold "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-osf-ot1 Merriwthr-Bold "AutoEnc_jjwbah5qahy6yiiis5yetxupnf ReEncodeFont" <[merriwthr_jjwbah.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-osf-t1--base Merriwthr-Bold "AutoEnc_posqbludufzthv4e4oqyltuypc ReEncodeFont" <[merriwthr_posqbl.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-osf-ly1 Merriwthr-Bold "AutoEnc_wppmfidyainl67d5kddjpxn6nd ReEncodeFont" <[merriwthr_wppmfi.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-osf-sc-ot1--base Merriwthr-Bold "AutoEnc_okb76xb34camvyvrgktdrvpbda ReEncodeFont" <[merriwthr_okb76x.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-osf-sc-t1--base Merriwthr-Bold "AutoEnc_xys2i2l6u4vmavrixvir4bozhf ReEncodeFont" <[merriwthr_xys2i2.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-osf-sc-ly1--base Merriwthr-Bold "AutoEnc_igdvgbzyycmjszvsnaafuzxjca ReEncodeFont" <[merriwthr_igdvgb.enc <Merriwthr-Bold.pfb
+Merriwthr-Bold-osf-ts1--base Merriwthr-Bold "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Bold.pfb
+Merriwthr-Italic-tlf-ot1 Merriwthr-Italic "AutoEnc_c4h6otdvt6kvqx2jiclefoedfe ReEncodeFont" <[merriwthr_c4h6ot.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-tlf-t1--base Merriwthr-Italic "AutoEnc_e2idhw5l3f6krq5sjxsu7h333h ReEncodeFont" <[merriwthr_e2idhw.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-tlf-ly1 Merriwthr-Italic "AutoEnc_o43b2qy2xwpvi2pcx6qou2eunc ReEncodeFont" <[merriwthr_o43b2q.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-tlf-sc-ot1--base Merriwthr-Italic "AutoEnc_27vehb5m3cihxu3ac3lncxkf3b ReEncodeFont" <[merriwthr_27vehb.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-tlf-sc-t1--base Merriwthr-Italic "AutoEnc_vvhkhe5iryghotomeftgcjayke ReEncodeFont" <[merriwthr_vvhkhe.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-tlf-sc-ly1--base Merriwthr-Italic "AutoEnc_f5n6m3o7woi5yzxjhungu6czrc ReEncodeFont" <[merriwthr_f5n6m3.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-tlf-ts1--base Merriwthr-Italic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-sup-ot1 Merriwthr-Italic "AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c ReEncodeFont" <[merriwthr_5xld5w.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-sup-t1--base Merriwthr-Italic "AutoEnc_qndjqiu4qjku62xxe6uv5xlfjb ReEncodeFont" <[merriwthr_qndjqi.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-sup-ly1 Merriwthr-Italic "AutoEnc_cy3ufib4i3gsgczcb7bl5ni5hb ReEncodeFont" <[merriwthr_cy3ufi.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-lf-ot1 Merriwthr-Italic "AutoEnc_w4rwtqnqgnoept64akgqql332d ReEncodeFont" <[merriwthr_w4rwtq.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-lf-t1--base Merriwthr-Italic "AutoEnc_gmchnqiogedxb6eqrw52occsyg ReEncodeFont" <[merriwthr_gmchnq.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-lf-ly1 Merriwthr-Italic "AutoEnc_ynquvwz7uzs76ql3vkgsnmi6oh ReEncodeFont" <[merriwthr_ynquvw.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-lf-sc-ot1--base Merriwthr-Italic "AutoEnc_4ylisx4bjukj4ykfse7sl6as3b ReEncodeFont" <[merriwthr_4ylisx.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-lf-sc-t1--base Merriwthr-Italic "AutoEnc_h6z4fchqakiptcatrec23y7rcc ReEncodeFont" <[merriwthr_h6z4fc.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-lf-sc-ly1--base Merriwthr-Italic "AutoEnc_ibepovaibzx3d7em6a74gi3zsf ReEncodeFont" <[merriwthr_ibepov.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-lf-ts1--base Merriwthr-Italic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-tosf-ot1 Merriwthr-Italic "AutoEnc_nszfm3rifj2lt5clmoofzy4dcd ReEncodeFont" <[merriwthr_nszfm3.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-tosf-t1--base Merriwthr-Italic "AutoEnc_mr3nckycyxcdyrjgjhye5cztpb ReEncodeFont" <[merriwthr_mr3nck.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-tosf-ly1 Merriwthr-Italic "AutoEnc_s56ilq3a5gkjgfrefs4uoyfp4h ReEncodeFont" <[merriwthr_s56ilq.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-tosf-sc-ot1--base Merriwthr-Italic "AutoEnc_urus45g42tw26byrfmdw37peyf ReEncodeFont" <[merriwthr_urus45.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-tosf-sc-t1--base Merriwthr-Italic "AutoEnc_xfdjpzrew23yucr3gqhoiqfjpg ReEncodeFont" <[merriwthr_xfdjpz.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-tosf-sc-ly1--base Merriwthr-Italic "AutoEnc_fs3efepejn3awlhjrbqbmbyure ReEncodeFont" <[merriwthr_fs3efe.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-tosf-ts1--base Merriwthr-Italic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-osf-ot1 Merriwthr-Italic "AutoEnc_jjwbah5qahy6yiiis5yetxupnf ReEncodeFont" <[merriwthr_jjwbah.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-osf-t1--base Merriwthr-Italic "AutoEnc_posqbludufzthv4e4oqyltuypc ReEncodeFont" <[merriwthr_posqbl.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-osf-ly1 Merriwthr-Italic "AutoEnc_wppmfidyainl67d5kddjpxn6nd ReEncodeFont" <[merriwthr_wppmfi.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-osf-sc-ot1--base Merriwthr-Italic "AutoEnc_abao47xoatoxdwsybjc3c2ar6d ReEncodeFont" <[merriwthr_abao47.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-osf-sc-t1--base Merriwthr-Italic "AutoEnc_dl4a4cd6a23xd5xgvepmqyb43h ReEncodeFont" <[merriwthr_dl4a4c.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-osf-sc-ly1--base Merriwthr-Italic "AutoEnc_ah5y5aw36djf33hoctce7xgaqg ReEncodeFont" <[merriwthr_ah5y5a.enc <Merriwthr-Italic.pfb
+Merriwthr-Italic-osf-ts1--base Merriwthr-Italic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Italic.pfb
+Merriwthr-LightItalic-tlf-ot1 Merriwthr-LightItalic "AutoEnc_c4h6otdvt6kvqx2jiclefoedfe ReEncodeFont" <[merriwthr_c4h6ot.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-tlf-t1--base Merriwthr-LightItalic "AutoEnc_e2idhw5l3f6krq5sjxsu7h333h ReEncodeFont" <[merriwthr_e2idhw.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-tlf-ly1 Merriwthr-LightItalic "AutoEnc_o43b2qy2xwpvi2pcx6qou2eunc ReEncodeFont" <[merriwthr_o43b2q.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-tlf-sc-ot1--base Merriwthr-LightItalic "AutoEnc_27vehb5m3cihxu3ac3lncxkf3b ReEncodeFont" <[merriwthr_27vehb.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-tlf-sc-t1--base Merriwthr-LightItalic "AutoEnc_vvhkhe5iryghotomeftgcjayke ReEncodeFont" <[merriwthr_vvhkhe.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-tlf-sc-ly1--base Merriwthr-LightItalic "AutoEnc_f5n6m3o7woi5yzxjhungu6czrc ReEncodeFont" <[merriwthr_f5n6m3.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-tlf-ts1--base Merriwthr-LightItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-sup-ot1 Merriwthr-LightItalic "AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c ReEncodeFont" <[merriwthr_5xld5w.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-sup-t1--base Merriwthr-LightItalic "AutoEnc_qndjqiu4qjku62xxe6uv5xlfjb ReEncodeFont" <[merriwthr_qndjqi.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-sup-ly1 Merriwthr-LightItalic "AutoEnc_cy3ufib4i3gsgczcb7bl5ni5hb ReEncodeFont" <[merriwthr_cy3ufi.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-lf-ot1 Merriwthr-LightItalic "AutoEnc_w4rwtqnqgnoept64akgqql332d ReEncodeFont" <[merriwthr_w4rwtq.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-lf-t1--base Merriwthr-LightItalic "AutoEnc_gmchnqiogedxb6eqrw52occsyg ReEncodeFont" <[merriwthr_gmchnq.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-lf-ly1 Merriwthr-LightItalic "AutoEnc_ynquvwz7uzs76ql3vkgsnmi6oh ReEncodeFont" <[merriwthr_ynquvw.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-lf-sc-ot1--base Merriwthr-LightItalic "AutoEnc_4ylisx4bjukj4ykfse7sl6as3b ReEncodeFont" <[merriwthr_4ylisx.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-lf-sc-t1--base Merriwthr-LightItalic "AutoEnc_h6z4fchqakiptcatrec23y7rcc ReEncodeFont" <[merriwthr_h6z4fc.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-lf-sc-ly1--base Merriwthr-LightItalic "AutoEnc_ibepovaibzx3d7em6a74gi3zsf ReEncodeFont" <[merriwthr_ibepov.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-lf-ts1--base Merriwthr-LightItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-tosf-ot1 Merriwthr-LightItalic "AutoEnc_nszfm3rifj2lt5clmoofzy4dcd ReEncodeFont" <[merriwthr_nszfm3.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-tosf-t1--base Merriwthr-LightItalic "AutoEnc_mr3nckycyxcdyrjgjhye5cztpb ReEncodeFont" <[merriwthr_mr3nck.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-tosf-ly1 Merriwthr-LightItalic "AutoEnc_s56ilq3a5gkjgfrefs4uoyfp4h ReEncodeFont" <[merriwthr_s56ilq.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-tosf-sc-ot1--base Merriwthr-LightItalic "AutoEnc_urus45g42tw26byrfmdw37peyf ReEncodeFont" <[merriwthr_urus45.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-tosf-sc-t1--base Merriwthr-LightItalic "AutoEnc_xfdjpzrew23yucr3gqhoiqfjpg ReEncodeFont" <[merriwthr_xfdjpz.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-tosf-sc-ly1--base Merriwthr-LightItalic "AutoEnc_fs3efepejn3awlhjrbqbmbyure ReEncodeFont" <[merriwthr_fs3efe.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-tosf-ts1--base Merriwthr-LightItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-osf-ot1 Merriwthr-LightItalic "AutoEnc_jjwbah5qahy6yiiis5yetxupnf ReEncodeFont" <[merriwthr_jjwbah.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-osf-t1--base Merriwthr-LightItalic "AutoEnc_posqbludufzthv4e4oqyltuypc ReEncodeFont" <[merriwthr_posqbl.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-osf-ly1 Merriwthr-LightItalic "AutoEnc_wppmfidyainl67d5kddjpxn6nd ReEncodeFont" <[merriwthr_wppmfi.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-osf-sc-ot1--base Merriwthr-LightItalic "AutoEnc_abao47xoatoxdwsybjc3c2ar6d ReEncodeFont" <[merriwthr_abao47.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-osf-sc-t1--base Merriwthr-LightItalic "AutoEnc_dl4a4cd6a23xd5xgvepmqyb43h ReEncodeFont" <[merriwthr_dl4a4c.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-osf-sc-ly1--base Merriwthr-LightItalic "AutoEnc_ah5y5aw36djf33hoctce7xgaqg ReEncodeFont" <[merriwthr_ah5y5a.enc <Merriwthr-LightItalic.pfb
+Merriwthr-LightItalic-osf-ts1--base Merriwthr-LightItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-LightItalic.pfb
+Merriwthr-Light-tlf-ot1 Merriwthr-Light "AutoEnc_c4h6otdvt6kvqx2jiclefoedfe ReEncodeFont" <[merriwthr_c4h6ot.enc <Merriwthr-Light.pfb
+Merriwthr-Light-tlf-t1--base Merriwthr-Light "AutoEnc_e2idhw5l3f6krq5sjxsu7h333h ReEncodeFont" <[merriwthr_e2idhw.enc <Merriwthr-Light.pfb
+Merriwthr-Light-tlf-ly1 Merriwthr-Light "AutoEnc_o43b2qy2xwpvi2pcx6qou2eunc ReEncodeFont" <[merriwthr_o43b2q.enc <Merriwthr-Light.pfb
+Merriwthr-Light-tlf-sc-ot1--base Merriwthr-Light "AutoEnc_5lck5zupnxcvrb5zmzavlitmja ReEncodeFont" <[merriwthr_5lck5z.enc <Merriwthr-Light.pfb
+Merriwthr-Light-tlf-sc-t1--base Merriwthr-Light "AutoEnc_b6rchsdcccdbohxqpazo7dpjpe ReEncodeFont" <[merriwthr_b6rchs.enc <Merriwthr-Light.pfb
+Merriwthr-Light-tlf-sc-ly1--base Merriwthr-Light "AutoEnc_2j7grfe4celkaswwxdgd6kmn7h ReEncodeFont" <[merriwthr_2j7grf.enc <Merriwthr-Light.pfb
+Merriwthr-Light-tlf-ts1--base Merriwthr-Light "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Light.pfb
+Merriwthr-Light-sup-ot1 Merriwthr-Light "AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c ReEncodeFont" <[merriwthr_5xld5w.enc <Merriwthr-Light.pfb
+Merriwthr-Light-sup-t1--base Merriwthr-Light "AutoEnc_qndjqiu4qjku62xxe6uv5xlfjb ReEncodeFont" <[merriwthr_qndjqi.enc <Merriwthr-Light.pfb
+Merriwthr-Light-sup-ly1 Merriwthr-Light "AutoEnc_cy3ufib4i3gsgczcb7bl5ni5hb ReEncodeFont" <[merriwthr_cy3ufi.enc <Merriwthr-Light.pfb
+Merriwthr-Light-lf-ot1 Merriwthr-Light "AutoEnc_w4rwtqnqgnoept64akgqql332d ReEncodeFont" <[merriwthr_w4rwtq.enc <Merriwthr-Light.pfb
+Merriwthr-Light-lf-t1--base Merriwthr-Light "AutoEnc_gmchnqiogedxb6eqrw52occsyg ReEncodeFont" <[merriwthr_gmchnq.enc <Merriwthr-Light.pfb
+Merriwthr-Light-lf-ly1 Merriwthr-Light "AutoEnc_ynquvwz7uzs76ql3vkgsnmi6oh ReEncodeFont" <[merriwthr_ynquvw.enc <Merriwthr-Light.pfb
+Merriwthr-Light-lf-sc-ot1--base Merriwthr-Light "AutoEnc_7jdyhkndsyrev6wof6cyijpmpe ReEncodeFont" <[merriwthr_7jdyhk.enc <Merriwthr-Light.pfb
+Merriwthr-Light-lf-sc-t1--base Merriwthr-Light "AutoEnc_diijaagendozmspoxxqdz27yxg ReEncodeFont" <[merriwthr_diijaa.enc <Merriwthr-Light.pfb
+Merriwthr-Light-lf-sc-ly1--base Merriwthr-Light "AutoEnc_afua2jwl273trfqxqlndomfbjh ReEncodeFont" <[merriwthr_afua2j.enc <Merriwthr-Light.pfb
+Merriwthr-Light-lf-ts1--base Merriwthr-Light "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Light.pfb
+Merriwthr-Light-tosf-ot1 Merriwthr-Light "AutoEnc_nszfm3rifj2lt5clmoofzy4dcd ReEncodeFont" <[merriwthr_nszfm3.enc <Merriwthr-Light.pfb
+Merriwthr-Light-tosf-t1--base Merriwthr-Light "AutoEnc_mr3nckycyxcdyrjgjhye5cztpb ReEncodeFont" <[merriwthr_mr3nck.enc <Merriwthr-Light.pfb
+Merriwthr-Light-tosf-ly1 Merriwthr-Light "AutoEnc_s56ilq3a5gkjgfrefs4uoyfp4h ReEncodeFont" <[merriwthr_s56ilq.enc <Merriwthr-Light.pfb
+Merriwthr-Light-tosf-sc-ot1--base Merriwthr-Light "AutoEnc_lkhefyggyierwy5lpz6f5mrllg ReEncodeFont" <[merriwthr_lkhefy.enc <Merriwthr-Light.pfb
+Merriwthr-Light-tosf-sc-t1--base Merriwthr-Light "AutoEnc_x754fdhjy7kbfaggcczlltapqc ReEncodeFont" <[merriwthr_x754fd.enc <Merriwthr-Light.pfb
+Merriwthr-Light-tosf-sc-ly1--base Merriwthr-Light "AutoEnc_uduhhnl6o26amfuwg72h3q32ac ReEncodeFont" <[merriwthr_uduhhn.enc <Merriwthr-Light.pfb
+Merriwthr-Light-tosf-ts1--base Merriwthr-Light "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Light.pfb
+Merriwthr-Light-osf-ot1 Merriwthr-Light "AutoEnc_jjwbah5qahy6yiiis5yetxupnf ReEncodeFont" <[merriwthr_jjwbah.enc <Merriwthr-Light.pfb
+Merriwthr-Light-osf-t1--base Merriwthr-Light "AutoEnc_posqbludufzthv4e4oqyltuypc ReEncodeFont" <[merriwthr_posqbl.enc <Merriwthr-Light.pfb
+Merriwthr-Light-osf-ly1 Merriwthr-Light "AutoEnc_wppmfidyainl67d5kddjpxn6nd ReEncodeFont" <[merriwthr_wppmfi.enc <Merriwthr-Light.pfb
+Merriwthr-Light-osf-sc-ot1--base Merriwthr-Light "AutoEnc_okb76xb34camvyvrgktdrvpbda ReEncodeFont" <[merriwthr_okb76x.enc <Merriwthr-Light.pfb
+Merriwthr-Light-osf-sc-t1--base Merriwthr-Light "AutoEnc_xys2i2l6u4vmavrixvir4bozhf ReEncodeFont" <[merriwthr_xys2i2.enc <Merriwthr-Light.pfb
+Merriwthr-Light-osf-sc-ly1--base Merriwthr-Light "AutoEnc_igdvgbzyycmjszvsnaafuzxjca ReEncodeFont" <[merriwthr_igdvgb.enc <Merriwthr-Light.pfb
+Merriwthr-Light-osf-ts1--base Merriwthr-Light "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Light.pfb
+Merriwthr-Regular-tlf-ot1 Merriwthr-Regular "AutoEnc_c4h6otdvt6kvqx2jiclefoedfe ReEncodeFont" <[merriwthr_c4h6ot.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-tlf-t1--base Merriwthr-Regular "AutoEnc_e2idhw5l3f6krq5sjxsu7h333h ReEncodeFont" <[merriwthr_e2idhw.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-tlf-ly1 Merriwthr-Regular "AutoEnc_o43b2qy2xwpvi2pcx6qou2eunc ReEncodeFont" <[merriwthr_o43b2q.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-tlf-sc-ot1--base Merriwthr-Regular "AutoEnc_5lck5zupnxcvrb5zmzavlitmja ReEncodeFont" <[merriwthr_5lck5z.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-tlf-sc-t1--base Merriwthr-Regular "AutoEnc_b6rchsdcccdbohxqpazo7dpjpe ReEncodeFont" <[merriwthr_b6rchs.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-tlf-sc-ly1--base Merriwthr-Regular "AutoEnc_2j7grfe4celkaswwxdgd6kmn7h ReEncodeFont" <[merriwthr_2j7grf.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-tlf-ts1--base Merriwthr-Regular "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-sup-ot1 Merriwthr-Regular "AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c ReEncodeFont" <[merriwthr_5xld5w.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-sup-t1--base Merriwthr-Regular "AutoEnc_qndjqiu4qjku62xxe6uv5xlfjb ReEncodeFont" <[merriwthr_qndjqi.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-sup-ly1 Merriwthr-Regular "AutoEnc_cy3ufib4i3gsgczcb7bl5ni5hb ReEncodeFont" <[merriwthr_cy3ufi.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-lf-ot1 Merriwthr-Regular "AutoEnc_w4rwtqnqgnoept64akgqql332d ReEncodeFont" <[merriwthr_w4rwtq.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-lf-t1--base Merriwthr-Regular "AutoEnc_gmchnqiogedxb6eqrw52occsyg ReEncodeFont" <[merriwthr_gmchnq.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-lf-ly1 Merriwthr-Regular "AutoEnc_ynquvwz7uzs76ql3vkgsnmi6oh ReEncodeFont" <[merriwthr_ynquvw.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-lf-sc-ot1--base Merriwthr-Regular "AutoEnc_7jdyhkndsyrev6wof6cyijpmpe ReEncodeFont" <[merriwthr_7jdyhk.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-lf-sc-t1--base Merriwthr-Regular "AutoEnc_diijaagendozmspoxxqdz27yxg ReEncodeFont" <[merriwthr_diijaa.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-lf-sc-ly1--base Merriwthr-Regular "AutoEnc_afua2jwl273trfqxqlndomfbjh ReEncodeFont" <[merriwthr_afua2j.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-lf-ts1--base Merriwthr-Regular "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-tosf-ot1 Merriwthr-Regular "AutoEnc_nszfm3rifj2lt5clmoofzy4dcd ReEncodeFont" <[merriwthr_nszfm3.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-tosf-t1--base Merriwthr-Regular "AutoEnc_mr3nckycyxcdyrjgjhye5cztpb ReEncodeFont" <[merriwthr_mr3nck.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-tosf-ly1 Merriwthr-Regular "AutoEnc_s56ilq3a5gkjgfrefs4uoyfp4h ReEncodeFont" <[merriwthr_s56ilq.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-tosf-sc-ot1--base Merriwthr-Regular "AutoEnc_lkhefyggyierwy5lpz6f5mrllg ReEncodeFont" <[merriwthr_lkhefy.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-tosf-sc-t1--base Merriwthr-Regular "AutoEnc_x754fdhjy7kbfaggcczlltapqc ReEncodeFont" <[merriwthr_x754fd.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-tosf-sc-ly1--base Merriwthr-Regular "AutoEnc_uduhhnl6o26amfuwg72h3q32ac ReEncodeFont" <[merriwthr_uduhhn.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-tosf-ts1--base Merriwthr-Regular "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-osf-ot1 Merriwthr-Regular "AutoEnc_jjwbah5qahy6yiiis5yetxupnf ReEncodeFont" <[merriwthr_jjwbah.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-osf-t1--base Merriwthr-Regular "AutoEnc_posqbludufzthv4e4oqyltuypc ReEncodeFont" <[merriwthr_posqbl.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-osf-ly1 Merriwthr-Regular "AutoEnc_wppmfidyainl67d5kddjpxn6nd ReEncodeFont" <[merriwthr_wppmfi.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-osf-sc-ot1--base Merriwthr-Regular "AutoEnc_okb76xb34camvyvrgktdrvpbda ReEncodeFont" <[merriwthr_okb76x.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-osf-sc-t1--base Merriwthr-Regular "AutoEnc_xys2i2l6u4vmavrixvir4bozhf ReEncodeFont" <[merriwthr_xys2i2.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-osf-sc-ly1--base Merriwthr-Regular "AutoEnc_igdvgbzyycmjszvsnaafuzxjca ReEncodeFont" <[merriwthr_igdvgb.enc <Merriwthr-Regular.pfb
+Merriwthr-Regular-osf-ts1--base Merriwthr-Regular "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <Merriwthr-Regular.pfb
% Automatically maintained by otftotfm or other programs. Do not edit.
-MerriwthrSans-BoldItalic-sup-ot1 MerriwthrSans-BoldItalic "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwthr_czxicq.enc <MerriwthrSans-BoldItalic.pfb
-MerriwthrSans-BoldItalic-sup-t1--base MerriwthrSans-BoldItalic "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwthr_7ytifx.enc <MerriwthrSans-BoldItalic.pfb
-MerriwthrSans-BoldItalic-sup-ly1 MerriwthrSans-BoldItalic "AutoEnc_3g4t7fcjh3tc6ptea3fgbusogg ReEncodeFont" <[mwthr_3g4t7f.enc <MerriwthrSans-BoldItalic.pfb
-MerriwthrSans-BoldItalic-osf-ot1 MerriwthrSans-BoldItalic "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwthr_tvbl63.enc <MerriwthrSans-BoldItalic.pfb
-MerriwthrSans-BoldItalic-osf-t1--base MerriwthrSans-BoldItalic "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwthr_iuohxq.enc <MerriwthrSans-BoldItalic.pfb
-MerriwthrSans-BoldItalic-osf-ly1 MerriwthrSans-BoldItalic "AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont" <[mwthr_vi456v.enc <MerriwthrSans-BoldItalic.pfb
-MerriwthrSans-BoldItalic-osf-ts1--base MerriwthrSans-BoldItalic "AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont" <[mwthr_n7ujmb.enc <MerriwthrSans-BoldItalic.pfb
-MerriwthrSans-Bold-sup-ot1 MerriwthrSans-Bold "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwthr_czxicq.enc <MerriwthrSans-Bold.pfb
-MerriwthrSans-Bold-sup-t1--base MerriwthrSans-Bold "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwthr_7ytifx.enc <MerriwthrSans-Bold.pfb
-MerriwthrSans-Bold-sup-ly1 MerriwthrSans-Bold "AutoEnc_zwbe7jlcvl2wsktttm4zndfryf ReEncodeFont" <[mwthr_zwbe7j.enc <MerriwthrSans-Bold.pfb
-MerriwthrSans-Bold-osf-ot1 MerriwthrSans-Bold "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwthr_tvbl63.enc <MerriwthrSans-Bold.pfb
-MerriwthrSans-Bold-osf-t1--base MerriwthrSans-Bold "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwthr_iuohxq.enc <MerriwthrSans-Bold.pfb
-MerriwthrSans-Bold-osf-ly1 MerriwthrSans-Bold "AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont" <[mwthr_44qg5v.enc <MerriwthrSans-Bold.pfb
-MerriwthrSans-Bold-osf-ts1--base MerriwthrSans-Bold "AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont" <[mwthr_n7ujmb.enc <MerriwthrSans-Bold.pfb
-MerriwthrSans-ExtraBoldItalic-sup-ot1 MerriwthrSans-ExtraBoldItalic "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwthr_czxicq.enc <MerriwthrSans-ExBoldIt.pfb
-MerriwthrSans-ExtraBoldItalic-sup-t1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwthr_7ytifx.enc <MerriwthrSans-ExBoldIt.pfb
-MerriwthrSans-ExtraBoldItalic-sup-ly1 MerriwthrSans-ExtraBoldItalic "AutoEnc_3g4t7fcjh3tc6ptea3fgbusogg ReEncodeFont" <[mwthr_3g4t7f.enc <MerriwthrSans-ExBoldIt.pfb
-MerriwthrSans-ExtraBoldItalic-osf-ot1 MerriwthrSans-ExtraBoldItalic "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwthr_tvbl63.enc <MerriwthrSans-ExBoldIt.pfb
-MerriwthrSans-ExtraBoldItalic-osf-t1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwthr_iuohxq.enc <MerriwthrSans-ExBoldIt.pfb
-MerriwthrSans-ExtraBoldItalic-osf-ly1 MerriwthrSans-ExtraBoldItalic "AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont" <[mwthr_vi456v.enc <MerriwthrSans-ExBoldIt.pfb
-MerriwthrSans-ExtraBoldItalic-osf-ts1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont" <[mwthr_n7ujmb.enc <MerriwthrSans-ExBoldIt.pfb
-MerriwthrSans-ExtraBold-sup-ot1 MerriwthrSans-ExtraBold "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwthr_czxicq.enc <MerriwthrSans-ExtraBold.pfb
-MerriwthrSans-ExtraBold-sup-t1--base MerriwthrSans-ExtraBold "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwthr_7ytifx.enc <MerriwthrSans-ExtraBold.pfb
-MerriwthrSans-ExtraBold-sup-ly1 MerriwthrSans-ExtraBold "AutoEnc_zwbe7jlcvl2wsktttm4zndfryf ReEncodeFont" <[mwthr_zwbe7j.enc <MerriwthrSans-ExtraBold.pfb
-MerriwthrSans-ExtraBold-osf-ot1 MerriwthrSans-ExtraBold "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwthr_tvbl63.enc <MerriwthrSans-ExtraBold.pfb
-MerriwthrSans-ExtraBold-osf-t1--base MerriwthrSans-ExtraBold "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwthr_iuohxq.enc <MerriwthrSans-ExtraBold.pfb
-MerriwthrSans-ExtraBold-osf-ly1 MerriwthrSans-ExtraBold "AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont" <[mwthr_44qg5v.enc <MerriwthrSans-ExtraBold.pfb
-MerriwthrSans-ExtraBold-osf-ts1--base MerriwthrSans-ExtraBold "AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont" <[mwthr_n7ujmb.enc <MerriwthrSans-ExtraBold.pfb
-MerriwthrSans-Italic-sup-ot1 MerriwthrSans-Italic "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwthr_czxicq.enc <MerriwthrSans-Italic.pfb
-MerriwthrSans-Italic-sup-t1--base MerriwthrSans-Italic "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwthr_7ytifx.enc <MerriwthrSans-Italic.pfb
-MerriwthrSans-Italic-sup-ly1 MerriwthrSans-Italic "AutoEnc_3g4t7fcjh3tc6ptea3fgbusogg ReEncodeFont" <[mwthr_3g4t7f.enc <MerriwthrSans-Italic.pfb
-MerriwthrSans-Italic-osf-ot1 MerriwthrSans-Italic "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwthr_tvbl63.enc <MerriwthrSans-Italic.pfb
-MerriwthrSans-Italic-osf-t1--base MerriwthrSans-Italic "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwthr_iuohxq.enc <MerriwthrSans-Italic.pfb
-MerriwthrSans-Italic-osf-ly1 MerriwthrSans-Italic "AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont" <[mwthr_vi456v.enc <MerriwthrSans-Italic.pfb
-MerriwthrSans-Italic-osf-ts1--base MerriwthrSans-Italic "AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont" <[mwthr_n7ujmb.enc <MerriwthrSans-Italic.pfb
-MerriwthrSans-LightItalic-sup-ot1 MerriwthrSans-LightItalic "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwthr_czxicq.enc <MerriwthrSans-LightItalic.pfb
-MerriwthrSans-LightItalic-sup-t1--base MerriwthrSans-LightItalic "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwthr_7ytifx.enc <MerriwthrSans-LightItalic.pfb
-MerriwthrSans-LightItalic-sup-ly1 MerriwthrSans-LightItalic "AutoEnc_3g4t7fcjh3tc6ptea3fgbusogg ReEncodeFont" <[mwthr_3g4t7f.enc <MerriwthrSans-LightItalic.pfb
-MerriwthrSans-LightItalic-osf-ot1 MerriwthrSans-LightItalic "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwthr_tvbl63.enc <MerriwthrSans-LightItalic.pfb
-MerriwthrSans-LightItalic-osf-t1--base MerriwthrSans-LightItalic "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwthr_iuohxq.enc <MerriwthrSans-LightItalic.pfb
-MerriwthrSans-LightItalic-osf-ly1 MerriwthrSans-LightItalic "AutoEnc_vi456vknjkllfjnxu4s533uuwe ReEncodeFont" <[mwthr_vi456v.enc <MerriwthrSans-LightItalic.pfb
-MerriwthrSans-LightItalic-osf-ts1--base MerriwthrSans-LightItalic "AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont" <[mwthr_n7ujmb.enc <MerriwthrSans-LightItalic.pfb
-MerriwthrSans-Light-sup-ot1 MerriwthrSans-Light "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwthr_czxicq.enc <MerriwthrSans-Light.pfb
-MerriwthrSans-Light-sup-t1--base MerriwthrSans-Light "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwthr_7ytifx.enc <MerriwthrSans-Light.pfb
-MerriwthrSans-Light-sup-ly1 MerriwthrSans-Light "AutoEnc_zwbe7jlcvl2wsktttm4zndfryf ReEncodeFont" <[mwthr_zwbe7j.enc <MerriwthrSans-Light.pfb
-MerriwthrSans-Light-osf-ot1 MerriwthrSans-Light "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwthr_tvbl63.enc <MerriwthrSans-Light.pfb
-MerriwthrSans-Light-osf-t1--base MerriwthrSans-Light "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwthr_iuohxq.enc <MerriwthrSans-Light.pfb
-MerriwthrSans-Light-osf-ly1 MerriwthrSans-Light "AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont" <[mwthr_44qg5v.enc <MerriwthrSans-Light.pfb
-MerriwthrSans-Light-osf-ts1--base MerriwthrSans-Light "AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont" <[mwthr_n7ujmb.enc <MerriwthrSans-Light.pfb
-MerriwthrSans-Regular-sup-ot1 MerriwthrSans-Regular "AutoEnc_czxicqvoi7gergm2nqp7s2dfph ReEncodeFont" <[mwthr_czxicq.enc <MerriwthrSans-Regular.pfb
-MerriwthrSans-Regular-sup-t1--base MerriwthrSans-Regular "AutoEnc_7ytifxzsr3dgywxov7dwh4mhjb ReEncodeFont" <[mwthr_7ytifx.enc <MerriwthrSans-Regular.pfb
-MerriwthrSans-Regular-sup-ly1 MerriwthrSans-Regular "AutoEnc_zwbe7jlcvl2wsktttm4zndfryf ReEncodeFont" <[mwthr_zwbe7j.enc <MerriwthrSans-Regular.pfb
-MerriwthrSans-Regular-osf-ot1 MerriwthrSans-Regular "AutoEnc_tvbl63y4jirfk6w4wwh6ysewkb ReEncodeFont" <[mwthr_tvbl63.enc <MerriwthrSans-Regular.pfb
-MerriwthrSans-Regular-osf-t1--base MerriwthrSans-Regular "AutoEnc_iuohxqr2qb6k5t77legm5nsxle ReEncodeFont" <[mwthr_iuohxq.enc <MerriwthrSans-Regular.pfb
-MerriwthrSans-Regular-osf-ly1 MerriwthrSans-Regular "AutoEnc_44qg5voi43tymivsufwnvthinh ReEncodeFont" <[mwthr_44qg5v.enc <MerriwthrSans-Regular.pfb
-MerriwthrSans-Regular-osf-ts1--base MerriwthrSans-Regular "AutoEnc_n7ujmbrloaigamcc6xrat5ctxd ReEncodeFont" <[mwthr_n7ujmb.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-BoldItalic-tlf-ot1 MerriwthrSans-BoldItalic "AutoEnc_7npxgm2htdezd6aegz2nrfnmta ReEncodeFont" <[merriwthr_7npxgm.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-tlf-t1--base MerriwthrSans-BoldItalic "AutoEnc_gldhmf3wvb2ea2ood5x6iaa77d ReEncodeFont" <[merriwthr_gldhmf.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-tlf-ly1 MerriwthrSans-BoldItalic "AutoEnc_k4bbiq7munb7i3qj5kjp4gm37f ReEncodeFont" <[merriwthr_k4bbiq.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-tlf-sc-ot1--base MerriwthrSans-BoldItalic "AutoEnc_h7gtfvyqvtclf7jusn2dcrzzrf ReEncodeFont" <[merriwthr_h7gtfv.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-tlf-sc-t1--base MerriwthrSans-BoldItalic "AutoEnc_dx3n55r2uvpk75edgtlquzem7g ReEncodeFont" <[merriwthr_dx3n55.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-tlf-sc-ly1--base MerriwthrSans-BoldItalic "AutoEnc_rzflsg23wvwgzskzfq5vgf7j5g ReEncodeFont" <[merriwthr_rzflsg.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-tlf-ts1--base MerriwthrSans-BoldItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-sup-ot1 MerriwthrSans-BoldItalic "AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c ReEncodeFont" <[merriwthr_5xld5w.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-sup-t1--base MerriwthrSans-BoldItalic "AutoEnc_qndjqiu4qjku62xxe6uv5xlfjb ReEncodeFont" <[merriwthr_qndjqi.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-sup-ly1 MerriwthrSans-BoldItalic "AutoEnc_cy3ufib4i3gsgczcb7bl5ni5hb ReEncodeFont" <[merriwthr_cy3ufi.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-lf-ot1 MerriwthrSans-BoldItalic "AutoEnc_adz5lu2pubiora2jv2qajnuogc ReEncodeFont" <[merriwthr_adz5lu.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-lf-t1--base MerriwthrSans-BoldItalic "AutoEnc_hwcxwnwusbuaheqcgocu67s3qd ReEncodeFont" <[merriwthr_hwcxwn.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-lf-ly1 MerriwthrSans-BoldItalic "AutoEnc_mgprdvdw5vhpsriq4w73u5qrtd ReEncodeFont" <[merriwthr_mgprdv.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-lf-sc-ot1--base MerriwthrSans-BoldItalic "AutoEnc_hz3jhhwfqeh3tu3dbvcfoqqvqe ReEncodeFont" <[merriwthr_hz3jhh.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-lf-sc-t1--base MerriwthrSans-BoldItalic "AutoEnc_btdrxlukgdjwcqxq6mrycdd2td ReEncodeFont" <[merriwthr_btdrxl.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-lf-sc-ly1--base MerriwthrSans-BoldItalic "AutoEnc_ckyw6qgt6catbf5a63k2jhbete ReEncodeFont" <[merriwthr_ckyw6q.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-lf-ts1--base MerriwthrSans-BoldItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-tosf-ot1 MerriwthrSans-BoldItalic "AutoEnc_wlsyn3fqr6sfenouszwkfdbt4a ReEncodeFont" <[merriwthr_wlsyn3.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-tosf-t1--base MerriwthrSans-BoldItalic "AutoEnc_u2friiggclcp6b5msd4ts52k2g ReEncodeFont" <[merriwthr_u2frii.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-tosf-ly1 MerriwthrSans-BoldItalic "AutoEnc_mx2b4h6pq5c3bsd2jdaiymy3ld ReEncodeFont" <[merriwthr_mx2b4h.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-tosf-sc-ot1--base MerriwthrSans-BoldItalic "AutoEnc_stxeasictntzuilrpixo7a54ye ReEncodeFont" <[merriwthr_stxeas.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-tosf-sc-t1--base MerriwthrSans-BoldItalic "AutoEnc_cvdnuwpmerv3rzww7xrfph4beh ReEncodeFont" <[merriwthr_cvdnuw.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-tosf-sc-ly1--base MerriwthrSans-BoldItalic "AutoEnc_qfmkcsvhzqzdsv22ohwgwo2xhd ReEncodeFont" <[merriwthr_qfmkcs.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-tosf-ts1--base MerriwthrSans-BoldItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-osf-ot1 MerriwthrSans-BoldItalic "AutoEnc_ttjzpeaor6y6pteopjtxgp5poa ReEncodeFont" <[merriwthr_ttjzpe.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-osf-t1--base MerriwthrSans-BoldItalic "AutoEnc_ags7qn2hkkgrahlkz4jfjwrd7e ReEncodeFont" <[merriwthr_ags7qn.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-osf-ly1 MerriwthrSans-BoldItalic "AutoEnc_6qeh6o3hklpdqb33emvpqseuyh ReEncodeFont" <[merriwthr_6qeh6o.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-osf-sc-ot1--base MerriwthrSans-BoldItalic "AutoEnc_lm56szn3gmmnb7zmo6qpm4fbgc ReEncodeFont" <[merriwthr_lm56sz.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-osf-sc-t1--base MerriwthrSans-BoldItalic "AutoEnc_me3dx7s5yei22rvgi4gmtp7vwf ReEncodeFont" <[merriwthr_me3dx7.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-osf-sc-ly1--base MerriwthrSans-BoldItalic "AutoEnc_gbcczmajeintwgetcl4kujtw4a ReEncodeFont" <[merriwthr_gbcczm.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-BoldItalic-osf-ts1--base MerriwthrSans-BoldItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-BoldItalic.pfb
+MerriwthrSans-Bold-tlf-ot1 MerriwthrSans-Bold "AutoEnc_7npxgm2htdezd6aegz2nrfnmta ReEncodeFont" <[merriwthr_7npxgm.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-tlf-t1--base MerriwthrSans-Bold "AutoEnc_gldhmf3wvb2ea2ood5x6iaa77d ReEncodeFont" <[merriwthr_gldhmf.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-tlf-ly1 MerriwthrSans-Bold "AutoEnc_k4bbiq7munb7i3qj5kjp4gm37f ReEncodeFont" <[merriwthr_k4bbiq.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-tlf-sc-ot1--base MerriwthrSans-Bold "AutoEnc_gdbfjstdbnpx2a3bbc3ldeyfza ReEncodeFont" <[merriwthr_gdbfjs.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-tlf-sc-t1--base MerriwthrSans-Bold "AutoEnc_e5zf5ydrjxeuko6a4z6jh2orca ReEncodeFont" <[merriwthr_e5zf5y.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-tlf-sc-ly1--base MerriwthrSans-Bold "AutoEnc_ob5vn4xb4fk2bw4i35otvjphka ReEncodeFont" <[merriwthr_ob5vn4.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-tlf-ts1--base MerriwthrSans-Bold "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-sup-ot1 MerriwthrSans-Bold "AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c ReEncodeFont" <[merriwthr_5xld5w.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-sup-t1--base MerriwthrSans-Bold "AutoEnc_qndjqiu4qjku62xxe6uv5xlfjb ReEncodeFont" <[merriwthr_qndjqi.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-sup-ly1 MerriwthrSans-Bold "AutoEnc_cy3ufib4i3gsgczcb7bl5ni5hb ReEncodeFont" <[merriwthr_cy3ufi.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-lf-ot1 MerriwthrSans-Bold "AutoEnc_adz5lu2pubiora2jv2qajnuogc ReEncodeFont" <[merriwthr_adz5lu.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-lf-t1--base MerriwthrSans-Bold "AutoEnc_hwcxwnwusbuaheqcgocu67s3qd ReEncodeFont" <[merriwthr_hwcxwn.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-lf-ly1 MerriwthrSans-Bold "AutoEnc_mgprdvdw5vhpsriq4w73u5qrtd ReEncodeFont" <[merriwthr_mgprdv.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-lf-sc-ot1--base MerriwthrSans-Bold "AutoEnc_cc6s4lvadopwb3xu3rnm75smbf ReEncodeFont" <[merriwthr_cc6s4l.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-lf-sc-t1--base MerriwthrSans-Bold "AutoEnc_p242jx5yqzirobjdghtfhsivef ReEncodeFont" <[merriwthr_p242jx.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-lf-sc-ly1--base MerriwthrSans-Bold "AutoEnc_cqy4t2lohtwiuyuqloqvrnwroh ReEncodeFont" <[merriwthr_cqy4t2.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-lf-ts1--base MerriwthrSans-Bold "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-tosf-ot1 MerriwthrSans-Bold "AutoEnc_wlsyn3fqr6sfenouszwkfdbt4a ReEncodeFont" <[merriwthr_wlsyn3.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-tosf-t1--base MerriwthrSans-Bold "AutoEnc_u2friiggclcp6b5msd4ts52k2g ReEncodeFont" <[merriwthr_u2frii.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-tosf-ly1 MerriwthrSans-Bold "AutoEnc_mx2b4h6pq5c3bsd2jdaiymy3ld ReEncodeFont" <[merriwthr_mx2b4h.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-tosf-sc-ot1--base MerriwthrSans-Bold "AutoEnc_mb4bqmbrzw45injvjiuyiplp6c ReEncodeFont" <[merriwthr_mb4bqm.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-tosf-sc-t1--base MerriwthrSans-Bold "AutoEnc_7t3tp2q6bx5fixcoyjapcimq3f ReEncodeFont" <[merriwthr_7t3tp2.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-tosf-sc-ly1--base MerriwthrSans-Bold "AutoEnc_7bivwmjuams2tgf2xlzum3iuzc ReEncodeFont" <[merriwthr_7bivwm.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-tosf-ts1--base MerriwthrSans-Bold "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-osf-ot1 MerriwthrSans-Bold "AutoEnc_ttjzpeaor6y6pteopjtxgp5poa ReEncodeFont" <[merriwthr_ttjzpe.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-osf-t1--base MerriwthrSans-Bold "AutoEnc_ags7qn2hkkgrahlkz4jfjwrd7e ReEncodeFont" <[merriwthr_ags7qn.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-osf-ly1 MerriwthrSans-Bold "AutoEnc_6qeh6o3hklpdqb33emvpqseuyh ReEncodeFont" <[merriwthr_6qeh6o.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-osf-sc-ot1--base MerriwthrSans-Bold "AutoEnc_2r7lb2mrks3igmx77ochduaeld ReEncodeFont" <[merriwthr_2r7lb2.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-osf-sc-t1--base MerriwthrSans-Bold "AutoEnc_2hyv6tfov4dx2meqej4mzahcwf ReEncodeFont" <[merriwthr_2hyv6t.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-osf-sc-ly1--base MerriwthrSans-Bold "AutoEnc_7tayunkz3krd6mqtntm4yqbzhc ReEncodeFont" <[merriwthr_7tayun.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-Bold-osf-ts1--base MerriwthrSans-Bold "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-Bold.pfb
+MerriwthrSans-ExtraBoldItalic-tlf-ot1 MerriwthrSans-ExtraBoldItalic "AutoEnc_7npxgm2htdezd6aegz2nrfnmta ReEncodeFont" <[merriwthr_7npxgm.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-tlf-t1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_gldhmf3wvb2ea2ood5x6iaa77d ReEncodeFont" <[merriwthr_gldhmf.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-tlf-ly1 MerriwthrSans-ExtraBoldItalic "AutoEnc_k4bbiq7munb7i3qj5kjp4gm37f ReEncodeFont" <[merriwthr_k4bbiq.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_h7gtfvyqvtclf7jusn2dcrzzrf ReEncodeFont" <[merriwthr_h7gtfv.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-tlf-sc-t1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_dx3n55r2uvpk75edgtlquzem7g ReEncodeFont" <[merriwthr_dx3n55.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_rzflsg23wvwgzskzfq5vgf7j5g ReEncodeFont" <[merriwthr_rzflsg.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-tlf-ts1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-sup-ot1 MerriwthrSans-ExtraBoldItalic "AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c ReEncodeFont" <[merriwthr_5xld5w.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-sup-t1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_qndjqiu4qjku62xxe6uv5xlfjb ReEncodeFont" <[merriwthr_qndjqi.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-sup-ly1 MerriwthrSans-ExtraBoldItalic "AutoEnc_cy3ufib4i3gsgczcb7bl5ni5hb ReEncodeFont" <[merriwthr_cy3ufi.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-lf-ot1 MerriwthrSans-ExtraBoldItalic "AutoEnc_adz5lu2pubiora2jv2qajnuogc ReEncodeFont" <[merriwthr_adz5lu.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-lf-t1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_hwcxwnwusbuaheqcgocu67s3qd ReEncodeFont" <[merriwthr_hwcxwn.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-lf-ly1 MerriwthrSans-ExtraBoldItalic "AutoEnc_mgprdvdw5vhpsriq4w73u5qrtd ReEncodeFont" <[merriwthr_mgprdv.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-lf-sc-ot1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_hz3jhhwfqeh3tu3dbvcfoqqvqe ReEncodeFont" <[merriwthr_hz3jhh.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-lf-sc-t1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_btdrxlukgdjwcqxq6mrycdd2td ReEncodeFont" <[merriwthr_btdrxl.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-lf-sc-ly1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_ckyw6qgt6catbf5a63k2jhbete ReEncodeFont" <[merriwthr_ckyw6q.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-lf-ts1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-tosf-ot1 MerriwthrSans-ExtraBoldItalic "AutoEnc_wlsyn3fqr6sfenouszwkfdbt4a ReEncodeFont" <[merriwthr_wlsyn3.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-tosf-t1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_u2friiggclcp6b5msd4ts52k2g ReEncodeFont" <[merriwthr_u2frii.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-tosf-ly1 MerriwthrSans-ExtraBoldItalic "AutoEnc_mx2b4h6pq5c3bsd2jdaiymy3ld ReEncodeFont" <[merriwthr_mx2b4h.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_stxeasictntzuilrpixo7a54ye ReEncodeFont" <[merriwthr_stxeas.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-tosf-sc-t1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_cvdnuwpmerv3rzww7xrfph4beh ReEncodeFont" <[merriwthr_cvdnuw.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_qfmkcsvhzqzdsv22ohwgwo2xhd ReEncodeFont" <[merriwthr_qfmkcs.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-tosf-ts1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-osf-ot1 MerriwthrSans-ExtraBoldItalic "AutoEnc_ttjzpeaor6y6pteopjtxgp5poa ReEncodeFont" <[merriwthr_ttjzpe.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-osf-t1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_ags7qn2hkkgrahlkz4jfjwrd7e ReEncodeFont" <[merriwthr_ags7qn.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-osf-ly1 MerriwthrSans-ExtraBoldItalic "AutoEnc_6qeh6o3hklpdqb33emvpqseuyh ReEncodeFont" <[merriwthr_6qeh6o.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-osf-sc-ot1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_lm56szn3gmmnb7zmo6qpm4fbgc ReEncodeFont" <[merriwthr_lm56sz.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-osf-sc-t1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_me3dx7s5yei22rvgi4gmtp7vwf ReEncodeFont" <[merriwthr_me3dx7.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-osf-sc-ly1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_gbcczmajeintwgetcl4kujtw4a ReEncodeFont" <[merriwthr_gbcczm.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBoldItalic-osf-ts1--base MerriwthrSans-ExtraBoldItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-ExtraBoldItalic.pfb
+MerriwthrSans-ExtraBold-tlf-ot1 MerriwthrSans-ExtraBold "AutoEnc_7npxgm2htdezd6aegz2nrfnmta ReEncodeFont" <[merriwthr_7npxgm.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-tlf-t1--base MerriwthrSans-ExtraBold "AutoEnc_gldhmf3wvb2ea2ood5x6iaa77d ReEncodeFont" <[merriwthr_gldhmf.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-tlf-ly1 MerriwthrSans-ExtraBold "AutoEnc_k4bbiq7munb7i3qj5kjp4gm37f ReEncodeFont" <[merriwthr_k4bbiq.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-tlf-sc-ot1--base MerriwthrSans-ExtraBold "AutoEnc_gdbfjstdbnpx2a3bbc3ldeyfza ReEncodeFont" <[merriwthr_gdbfjs.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-tlf-sc-t1--base MerriwthrSans-ExtraBold "AutoEnc_e5zf5ydrjxeuko6a4z6jh2orca ReEncodeFont" <[merriwthr_e5zf5y.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-tlf-sc-ly1--base MerriwthrSans-ExtraBold "AutoEnc_ob5vn4xb4fk2bw4i35otvjphka ReEncodeFont" <[merriwthr_ob5vn4.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-tlf-ts1--base MerriwthrSans-ExtraBold "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-sup-ot1 MerriwthrSans-ExtraBold "AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c ReEncodeFont" <[merriwthr_5xld5w.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-sup-t1--base MerriwthrSans-ExtraBold "AutoEnc_qndjqiu4qjku62xxe6uv5xlfjb ReEncodeFont" <[merriwthr_qndjqi.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-sup-ly1 MerriwthrSans-ExtraBold "AutoEnc_cy3ufib4i3gsgczcb7bl5ni5hb ReEncodeFont" <[merriwthr_cy3ufi.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-lf-ot1 MerriwthrSans-ExtraBold "AutoEnc_adz5lu2pubiora2jv2qajnuogc ReEncodeFont" <[merriwthr_adz5lu.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-lf-t1--base MerriwthrSans-ExtraBold "AutoEnc_hwcxwnwusbuaheqcgocu67s3qd ReEncodeFont" <[merriwthr_hwcxwn.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-lf-ly1 MerriwthrSans-ExtraBold "AutoEnc_mgprdvdw5vhpsriq4w73u5qrtd ReEncodeFont" <[merriwthr_mgprdv.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-lf-sc-ot1--base MerriwthrSans-ExtraBold "AutoEnc_cc6s4lvadopwb3xu3rnm75smbf ReEncodeFont" <[merriwthr_cc6s4l.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-lf-sc-t1--base MerriwthrSans-ExtraBold "AutoEnc_p242jx5yqzirobjdghtfhsivef ReEncodeFont" <[merriwthr_p242jx.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-lf-sc-ly1--base MerriwthrSans-ExtraBold "AutoEnc_cqy4t2lohtwiuyuqloqvrnwroh ReEncodeFont" <[merriwthr_cqy4t2.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-lf-ts1--base MerriwthrSans-ExtraBold "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-tosf-ot1 MerriwthrSans-ExtraBold "AutoEnc_wlsyn3fqr6sfenouszwkfdbt4a ReEncodeFont" <[merriwthr_wlsyn3.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-tosf-t1--base MerriwthrSans-ExtraBold "AutoEnc_u2friiggclcp6b5msd4ts52k2g ReEncodeFont" <[merriwthr_u2frii.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-tosf-ly1 MerriwthrSans-ExtraBold "AutoEnc_mx2b4h6pq5c3bsd2jdaiymy3ld ReEncodeFont" <[merriwthr_mx2b4h.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-tosf-sc-ot1--base MerriwthrSans-ExtraBold "AutoEnc_mb4bqmbrzw45injvjiuyiplp6c ReEncodeFont" <[merriwthr_mb4bqm.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-tosf-sc-t1--base MerriwthrSans-ExtraBold "AutoEnc_7t3tp2q6bx5fixcoyjapcimq3f ReEncodeFont" <[merriwthr_7t3tp2.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-tosf-sc-ly1--base MerriwthrSans-ExtraBold "AutoEnc_7bivwmjuams2tgf2xlzum3iuzc ReEncodeFont" <[merriwthr_7bivwm.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-tosf-ts1--base MerriwthrSans-ExtraBold "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-osf-ot1 MerriwthrSans-ExtraBold "AutoEnc_ttjzpeaor6y6pteopjtxgp5poa ReEncodeFont" <[merriwthr_ttjzpe.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-osf-t1--base MerriwthrSans-ExtraBold "AutoEnc_ags7qn2hkkgrahlkz4jfjwrd7e ReEncodeFont" <[merriwthr_ags7qn.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-osf-ly1 MerriwthrSans-ExtraBold "AutoEnc_6qeh6o3hklpdqb33emvpqseuyh ReEncodeFont" <[merriwthr_6qeh6o.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-osf-sc-ot1--base MerriwthrSans-ExtraBold "AutoEnc_2r7lb2mrks3igmx77ochduaeld ReEncodeFont" <[merriwthr_2r7lb2.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-osf-sc-t1--base MerriwthrSans-ExtraBold "AutoEnc_2hyv6tfov4dx2meqej4mzahcwf ReEncodeFont" <[merriwthr_2hyv6t.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-osf-sc-ly1--base MerriwthrSans-ExtraBold "AutoEnc_7tayunkz3krd6mqtntm4yqbzhc ReEncodeFont" <[merriwthr_7tayun.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-ExtraBold-osf-ts1--base MerriwthrSans-ExtraBold "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-ExtraBold.pfb
+MerriwthrSans-Italic-tlf-ot1 MerriwthrSans-Italic "AutoEnc_7npxgm2htdezd6aegz2nrfnmta ReEncodeFont" <[merriwthr_7npxgm.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-tlf-t1--base MerriwthrSans-Italic "AutoEnc_gldhmf3wvb2ea2ood5x6iaa77d ReEncodeFont" <[merriwthr_gldhmf.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-tlf-ly1 MerriwthrSans-Italic "AutoEnc_k4bbiq7munb7i3qj5kjp4gm37f ReEncodeFont" <[merriwthr_k4bbiq.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-tlf-sc-ot1--base MerriwthrSans-Italic "AutoEnc_h7gtfvyqvtclf7jusn2dcrzzrf ReEncodeFont" <[merriwthr_h7gtfv.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-tlf-sc-t1--base MerriwthrSans-Italic "AutoEnc_dx3n55r2uvpk75edgtlquzem7g ReEncodeFont" <[merriwthr_dx3n55.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-tlf-sc-ly1--base MerriwthrSans-Italic "AutoEnc_rzflsg23wvwgzskzfq5vgf7j5g ReEncodeFont" <[merriwthr_rzflsg.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-tlf-ts1--base MerriwthrSans-Italic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-sup-ot1 MerriwthrSans-Italic "AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c ReEncodeFont" <[merriwthr_5xld5w.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-sup-t1--base MerriwthrSans-Italic "AutoEnc_qndjqiu4qjku62xxe6uv5xlfjb ReEncodeFont" <[merriwthr_qndjqi.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-sup-ly1 MerriwthrSans-Italic "AutoEnc_cy3ufib4i3gsgczcb7bl5ni5hb ReEncodeFont" <[merriwthr_cy3ufi.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-lf-ot1 MerriwthrSans-Italic "AutoEnc_adz5lu2pubiora2jv2qajnuogc ReEncodeFont" <[merriwthr_adz5lu.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-lf-t1--base MerriwthrSans-Italic "AutoEnc_hwcxwnwusbuaheqcgocu67s3qd ReEncodeFont" <[merriwthr_hwcxwn.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-lf-ly1 MerriwthrSans-Italic "AutoEnc_mgprdvdw5vhpsriq4w73u5qrtd ReEncodeFont" <[merriwthr_mgprdv.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-lf-sc-ot1--base MerriwthrSans-Italic "AutoEnc_hz3jhhwfqeh3tu3dbvcfoqqvqe ReEncodeFont" <[merriwthr_hz3jhh.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-lf-sc-t1--base MerriwthrSans-Italic "AutoEnc_btdrxlukgdjwcqxq6mrycdd2td ReEncodeFont" <[merriwthr_btdrxl.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-lf-sc-ly1--base MerriwthrSans-Italic "AutoEnc_ckyw6qgt6catbf5a63k2jhbete ReEncodeFont" <[merriwthr_ckyw6q.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-lf-ts1--base MerriwthrSans-Italic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-tosf-ot1 MerriwthrSans-Italic "AutoEnc_wlsyn3fqr6sfenouszwkfdbt4a ReEncodeFont" <[merriwthr_wlsyn3.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-tosf-t1--base MerriwthrSans-Italic "AutoEnc_u2friiggclcp6b5msd4ts52k2g ReEncodeFont" <[merriwthr_u2frii.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-tosf-ly1 MerriwthrSans-Italic "AutoEnc_mx2b4h6pq5c3bsd2jdaiymy3ld ReEncodeFont" <[merriwthr_mx2b4h.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-tosf-sc-ot1--base MerriwthrSans-Italic "AutoEnc_stxeasictntzuilrpixo7a54ye ReEncodeFont" <[merriwthr_stxeas.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-tosf-sc-t1--base MerriwthrSans-Italic "AutoEnc_cvdnuwpmerv3rzww7xrfph4beh ReEncodeFont" <[merriwthr_cvdnuw.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-tosf-sc-ly1--base MerriwthrSans-Italic "AutoEnc_qfmkcsvhzqzdsv22ohwgwo2xhd ReEncodeFont" <[merriwthr_qfmkcs.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-tosf-ts1--base MerriwthrSans-Italic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-osf-ot1 MerriwthrSans-Italic "AutoEnc_ttjzpeaor6y6pteopjtxgp5poa ReEncodeFont" <[merriwthr_ttjzpe.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-osf-t1--base MerriwthrSans-Italic "AutoEnc_ags7qn2hkkgrahlkz4jfjwrd7e ReEncodeFont" <[merriwthr_ags7qn.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-osf-ly1 MerriwthrSans-Italic "AutoEnc_6qeh6o3hklpdqb33emvpqseuyh ReEncodeFont" <[merriwthr_6qeh6o.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-osf-sc-ot1--base MerriwthrSans-Italic "AutoEnc_lm56szn3gmmnb7zmo6qpm4fbgc ReEncodeFont" <[merriwthr_lm56sz.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-osf-sc-t1--base MerriwthrSans-Italic "AutoEnc_me3dx7s5yei22rvgi4gmtp7vwf ReEncodeFont" <[merriwthr_me3dx7.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-osf-sc-ly1--base MerriwthrSans-Italic "AutoEnc_gbcczmajeintwgetcl4kujtw4a ReEncodeFont" <[merriwthr_gbcczm.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-Italic-osf-ts1--base MerriwthrSans-Italic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-Italic.pfb
+MerriwthrSans-LightItalic-tlf-ot1 MerriwthrSans-LightItalic "AutoEnc_7npxgm2htdezd6aegz2nrfnmta ReEncodeFont" <[merriwthr_7npxgm.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-tlf-t1--base MerriwthrSans-LightItalic "AutoEnc_gldhmf3wvb2ea2ood5x6iaa77d ReEncodeFont" <[merriwthr_gldhmf.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-tlf-ly1 MerriwthrSans-LightItalic "AutoEnc_k4bbiq7munb7i3qj5kjp4gm37f ReEncodeFont" <[merriwthr_k4bbiq.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-tlf-sc-ot1--base MerriwthrSans-LightItalic "AutoEnc_h7gtfvyqvtclf7jusn2dcrzzrf ReEncodeFont" <[merriwthr_h7gtfv.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-tlf-sc-t1--base MerriwthrSans-LightItalic "AutoEnc_dx3n55r2uvpk75edgtlquzem7g ReEncodeFont" <[merriwthr_dx3n55.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-tlf-sc-ly1--base MerriwthrSans-LightItalic "AutoEnc_rzflsg23wvwgzskzfq5vgf7j5g ReEncodeFont" <[merriwthr_rzflsg.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-tlf-ts1--base MerriwthrSans-LightItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-sup-ot1 MerriwthrSans-LightItalic "AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c ReEncodeFont" <[merriwthr_5xld5w.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-sup-t1--base MerriwthrSans-LightItalic "AutoEnc_qndjqiu4qjku62xxe6uv5xlfjb ReEncodeFont" <[merriwthr_qndjqi.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-sup-ly1 MerriwthrSans-LightItalic "AutoEnc_cy3ufib4i3gsgczcb7bl5ni5hb ReEncodeFont" <[merriwthr_cy3ufi.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-lf-ot1 MerriwthrSans-LightItalic "AutoEnc_adz5lu2pubiora2jv2qajnuogc ReEncodeFont" <[merriwthr_adz5lu.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-lf-t1--base MerriwthrSans-LightItalic "AutoEnc_hwcxwnwusbuaheqcgocu67s3qd ReEncodeFont" <[merriwthr_hwcxwn.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-lf-ly1 MerriwthrSans-LightItalic "AutoEnc_mgprdvdw5vhpsriq4w73u5qrtd ReEncodeFont" <[merriwthr_mgprdv.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-lf-sc-ot1--base MerriwthrSans-LightItalic "AutoEnc_hz3jhhwfqeh3tu3dbvcfoqqvqe ReEncodeFont" <[merriwthr_hz3jhh.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-lf-sc-t1--base MerriwthrSans-LightItalic "AutoEnc_btdrxlukgdjwcqxq6mrycdd2td ReEncodeFont" <[merriwthr_btdrxl.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-lf-sc-ly1--base MerriwthrSans-LightItalic "AutoEnc_ckyw6qgt6catbf5a63k2jhbete ReEncodeFont" <[merriwthr_ckyw6q.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-lf-ts1--base MerriwthrSans-LightItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-tosf-ot1 MerriwthrSans-LightItalic "AutoEnc_wlsyn3fqr6sfenouszwkfdbt4a ReEncodeFont" <[merriwthr_wlsyn3.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-tosf-t1--base MerriwthrSans-LightItalic "AutoEnc_u2friiggclcp6b5msd4ts52k2g ReEncodeFont" <[merriwthr_u2frii.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-tosf-ly1 MerriwthrSans-LightItalic "AutoEnc_mx2b4h6pq5c3bsd2jdaiymy3ld ReEncodeFont" <[merriwthr_mx2b4h.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-tosf-sc-ot1--base MerriwthrSans-LightItalic "AutoEnc_stxeasictntzuilrpixo7a54ye ReEncodeFont" <[merriwthr_stxeas.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-tosf-sc-t1--base MerriwthrSans-LightItalic "AutoEnc_cvdnuwpmerv3rzww7xrfph4beh ReEncodeFont" <[merriwthr_cvdnuw.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-tosf-sc-ly1--base MerriwthrSans-LightItalic "AutoEnc_qfmkcsvhzqzdsv22ohwgwo2xhd ReEncodeFont" <[merriwthr_qfmkcs.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-tosf-ts1--base MerriwthrSans-LightItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-osf-ot1 MerriwthrSans-LightItalic "AutoEnc_ttjzpeaor6y6pteopjtxgp5poa ReEncodeFont" <[merriwthr_ttjzpe.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-osf-t1--base MerriwthrSans-LightItalic "AutoEnc_ags7qn2hkkgrahlkz4jfjwrd7e ReEncodeFont" <[merriwthr_ags7qn.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-osf-ly1 MerriwthrSans-LightItalic "AutoEnc_6qeh6o3hklpdqb33emvpqseuyh ReEncodeFont" <[merriwthr_6qeh6o.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-osf-sc-ot1--base MerriwthrSans-LightItalic "AutoEnc_lm56szn3gmmnb7zmo6qpm4fbgc ReEncodeFont" <[merriwthr_lm56sz.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-osf-sc-t1--base MerriwthrSans-LightItalic "AutoEnc_me3dx7s5yei22rvgi4gmtp7vwf ReEncodeFont" <[merriwthr_me3dx7.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-osf-sc-ly1--base MerriwthrSans-LightItalic "AutoEnc_gbcczmajeintwgetcl4kujtw4a ReEncodeFont" <[merriwthr_gbcczm.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-LightItalic-osf-ts1--base MerriwthrSans-LightItalic "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-LightItalic.pfb
+MerriwthrSans-Light-tlf-ot1 MerriwthrSans-Light "AutoEnc_7npxgm2htdezd6aegz2nrfnmta ReEncodeFont" <[merriwthr_7npxgm.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-tlf-t1--base MerriwthrSans-Light "AutoEnc_gldhmf3wvb2ea2ood5x6iaa77d ReEncodeFont" <[merriwthr_gldhmf.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-tlf-ly1 MerriwthrSans-Light "AutoEnc_k4bbiq7munb7i3qj5kjp4gm37f ReEncodeFont" <[merriwthr_k4bbiq.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-tlf-sc-ot1--base MerriwthrSans-Light "AutoEnc_gdbfjstdbnpx2a3bbc3ldeyfza ReEncodeFont" <[merriwthr_gdbfjs.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-tlf-sc-t1--base MerriwthrSans-Light "AutoEnc_e5zf5ydrjxeuko6a4z6jh2orca ReEncodeFont" <[merriwthr_e5zf5y.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-tlf-sc-ly1--base MerriwthrSans-Light "AutoEnc_ob5vn4xb4fk2bw4i35otvjphka ReEncodeFont" <[merriwthr_ob5vn4.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-tlf-ts1--base MerriwthrSans-Light "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-sup-ot1 MerriwthrSans-Light "AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c ReEncodeFont" <[merriwthr_5xld5w.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-sup-t1--base MerriwthrSans-Light "AutoEnc_qndjqiu4qjku62xxe6uv5xlfjb ReEncodeFont" <[merriwthr_qndjqi.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-sup-ly1 MerriwthrSans-Light "AutoEnc_cy3ufib4i3gsgczcb7bl5ni5hb ReEncodeFont" <[merriwthr_cy3ufi.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-lf-ot1 MerriwthrSans-Light "AutoEnc_adz5lu2pubiora2jv2qajnuogc ReEncodeFont" <[merriwthr_adz5lu.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-lf-t1--base MerriwthrSans-Light "AutoEnc_hwcxwnwusbuaheqcgocu67s3qd ReEncodeFont" <[merriwthr_hwcxwn.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-lf-ly1 MerriwthrSans-Light "AutoEnc_mgprdvdw5vhpsriq4w73u5qrtd ReEncodeFont" <[merriwthr_mgprdv.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-lf-sc-ot1--base MerriwthrSans-Light "AutoEnc_cc6s4lvadopwb3xu3rnm75smbf ReEncodeFont" <[merriwthr_cc6s4l.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-lf-sc-t1--base MerriwthrSans-Light "AutoEnc_p242jx5yqzirobjdghtfhsivef ReEncodeFont" <[merriwthr_p242jx.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-lf-sc-ly1--base MerriwthrSans-Light "AutoEnc_cqy4t2lohtwiuyuqloqvrnwroh ReEncodeFont" <[merriwthr_cqy4t2.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-lf-ts1--base MerriwthrSans-Light "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-tosf-ot1 MerriwthrSans-Light "AutoEnc_wlsyn3fqr6sfenouszwkfdbt4a ReEncodeFont" <[merriwthr_wlsyn3.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-tosf-t1--base MerriwthrSans-Light "AutoEnc_u2friiggclcp6b5msd4ts52k2g ReEncodeFont" <[merriwthr_u2frii.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-tosf-ly1 MerriwthrSans-Light "AutoEnc_mx2b4h6pq5c3bsd2jdaiymy3ld ReEncodeFont" <[merriwthr_mx2b4h.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-tosf-sc-ot1--base MerriwthrSans-Light "AutoEnc_mb4bqmbrzw45injvjiuyiplp6c ReEncodeFont" <[merriwthr_mb4bqm.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-tosf-sc-t1--base MerriwthrSans-Light "AutoEnc_7t3tp2q6bx5fixcoyjapcimq3f ReEncodeFont" <[merriwthr_7t3tp2.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-tosf-sc-ly1--base MerriwthrSans-Light "AutoEnc_7bivwmjuams2tgf2xlzum3iuzc ReEncodeFont" <[merriwthr_7bivwm.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-tosf-ts1--base MerriwthrSans-Light "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-osf-ot1 MerriwthrSans-Light "AutoEnc_ttjzpeaor6y6pteopjtxgp5poa ReEncodeFont" <[merriwthr_ttjzpe.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-osf-t1--base MerriwthrSans-Light "AutoEnc_ags7qn2hkkgrahlkz4jfjwrd7e ReEncodeFont" <[merriwthr_ags7qn.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-osf-ly1 MerriwthrSans-Light "AutoEnc_6qeh6o3hklpdqb33emvpqseuyh ReEncodeFont" <[merriwthr_6qeh6o.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-osf-sc-ot1--base MerriwthrSans-Light "AutoEnc_2r7lb2mrks3igmx77ochduaeld ReEncodeFont" <[merriwthr_2r7lb2.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-osf-sc-t1--base MerriwthrSans-Light "AutoEnc_2hyv6tfov4dx2meqej4mzahcwf ReEncodeFont" <[merriwthr_2hyv6t.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-osf-sc-ly1--base MerriwthrSans-Light "AutoEnc_7tayunkz3krd6mqtntm4yqbzhc ReEncodeFont" <[merriwthr_7tayun.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Light-osf-ts1--base MerriwthrSans-Light "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-Light.pfb
+MerriwthrSans-Regular-tlf-ot1 MerriwthrSans-Regular "AutoEnc_7npxgm2htdezd6aegz2nrfnmta ReEncodeFont" <[merriwthr_7npxgm.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-tlf-t1--base MerriwthrSans-Regular "AutoEnc_gldhmf3wvb2ea2ood5x6iaa77d ReEncodeFont" <[merriwthr_gldhmf.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-tlf-ly1 MerriwthrSans-Regular "AutoEnc_k4bbiq7munb7i3qj5kjp4gm37f ReEncodeFont" <[merriwthr_k4bbiq.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-tlf-sc-ot1--base MerriwthrSans-Regular "AutoEnc_gdbfjstdbnpx2a3bbc3ldeyfza ReEncodeFont" <[merriwthr_gdbfjs.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-tlf-sc-t1--base MerriwthrSans-Regular "AutoEnc_e5zf5ydrjxeuko6a4z6jh2orca ReEncodeFont" <[merriwthr_e5zf5y.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-tlf-sc-ly1--base MerriwthrSans-Regular "AutoEnc_ob5vn4xb4fk2bw4i35otvjphka ReEncodeFont" <[merriwthr_ob5vn4.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-tlf-ts1--base MerriwthrSans-Regular "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-sup-ot1 MerriwthrSans-Regular "AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c ReEncodeFont" <[merriwthr_5xld5w.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-sup-t1--base MerriwthrSans-Regular "AutoEnc_qndjqiu4qjku62xxe6uv5xlfjb ReEncodeFont" <[merriwthr_qndjqi.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-sup-ly1 MerriwthrSans-Regular "AutoEnc_cy3ufib4i3gsgczcb7bl5ni5hb ReEncodeFont" <[merriwthr_cy3ufi.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-lf-ot1 MerriwthrSans-Regular "AutoEnc_adz5lu2pubiora2jv2qajnuogc ReEncodeFont" <[merriwthr_adz5lu.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-lf-t1--base MerriwthrSans-Regular "AutoEnc_hwcxwnwusbuaheqcgocu67s3qd ReEncodeFont" <[merriwthr_hwcxwn.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-lf-ly1 MerriwthrSans-Regular "AutoEnc_mgprdvdw5vhpsriq4w73u5qrtd ReEncodeFont" <[merriwthr_mgprdv.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-lf-sc-ot1--base MerriwthrSans-Regular "AutoEnc_cc6s4lvadopwb3xu3rnm75smbf ReEncodeFont" <[merriwthr_cc6s4l.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-lf-sc-t1--base MerriwthrSans-Regular "AutoEnc_p242jx5yqzirobjdghtfhsivef ReEncodeFont" <[merriwthr_p242jx.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-lf-sc-ly1--base MerriwthrSans-Regular "AutoEnc_cqy4t2lohtwiuyuqloqvrnwroh ReEncodeFont" <[merriwthr_cqy4t2.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-lf-ts1--base MerriwthrSans-Regular "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-tosf-ot1 MerriwthrSans-Regular "AutoEnc_wlsyn3fqr6sfenouszwkfdbt4a ReEncodeFont" <[merriwthr_wlsyn3.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-tosf-t1--base MerriwthrSans-Regular "AutoEnc_u2friiggclcp6b5msd4ts52k2g ReEncodeFont" <[merriwthr_u2frii.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-tosf-ly1 MerriwthrSans-Regular "AutoEnc_mx2b4h6pq5c3bsd2jdaiymy3ld ReEncodeFont" <[merriwthr_mx2b4h.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-tosf-sc-ot1--base MerriwthrSans-Regular "AutoEnc_mb4bqmbrzw45injvjiuyiplp6c ReEncodeFont" <[merriwthr_mb4bqm.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-tosf-sc-t1--base MerriwthrSans-Regular "AutoEnc_7t3tp2q6bx5fixcoyjapcimq3f ReEncodeFont" <[merriwthr_7t3tp2.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-tosf-sc-ly1--base MerriwthrSans-Regular "AutoEnc_7bivwmjuams2tgf2xlzum3iuzc ReEncodeFont" <[merriwthr_7bivwm.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-tosf-ts1--base MerriwthrSans-Regular "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-osf-ot1 MerriwthrSans-Regular "AutoEnc_ttjzpeaor6y6pteopjtxgp5poa ReEncodeFont" <[merriwthr_ttjzpe.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-osf-t1--base MerriwthrSans-Regular "AutoEnc_ags7qn2hkkgrahlkz4jfjwrd7e ReEncodeFont" <[merriwthr_ags7qn.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-osf-ly1 MerriwthrSans-Regular "AutoEnc_6qeh6o3hklpdqb33emvpqseuyh ReEncodeFont" <[merriwthr_6qeh6o.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-osf-sc-ot1--base MerriwthrSans-Regular "AutoEnc_2r7lb2mrks3igmx77ochduaeld ReEncodeFont" <[merriwthr_2r7lb2.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-osf-sc-t1--base MerriwthrSans-Regular "AutoEnc_2hyv6tfov4dx2meqej4mzahcwf ReEncodeFont" <[merriwthr_2hyv6t.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-osf-sc-ly1--base MerriwthrSans-Regular "AutoEnc_7tayunkz3krd6mqtntm4yqbzhc ReEncodeFont" <[merriwthr_7tayun.enc <MerriwthrSans-Regular.pfb
+MerriwthrSans-Regular-osf-ts1--base MerriwthrSans-Regular "AutoEnc_owzwzjsjl6m7k62hdeaotsfk6e ReEncodeFont" <[merriwthr_owzwzj.enc <MerriwthrSans-Regular.pfb
diff --git a/fonts/merriweather/opentype/Merriweather-Black.otf b/fonts/merriweather/opentype/Merriweather-Black.otf
new file mode 100644
index 0000000000..5ec9b38589
--- /dev/null
+++ b/fonts/merriweather/opentype/Merriweather-Black.otf
Binary files differ
diff --git a/fonts/merriweather/opentype/Merriweather-BlackItalic.otf b/fonts/merriweather/opentype/Merriweather-BlackItalic.otf
new file mode 100644
index 0000000000..28586359d9
--- /dev/null
+++ b/fonts/merriweather/opentype/Merriweather-BlackItalic.otf
Binary files differ
diff --git a/fonts/merriweather/opentype/Merriweather-Bold.otf b/fonts/merriweather/opentype/Merriweather-Bold.otf
new file mode 100644
index 0000000000..a0f5e2409f
--- /dev/null
+++ b/fonts/merriweather/opentype/Merriweather-Bold.otf
Binary files differ
diff --git a/fonts/merriweather/opentype/Merriweather-BoldItalic.otf b/fonts/merriweather/opentype/Merriweather-BoldItalic.otf
new file mode 100644
index 0000000000..3cd46a402a
--- /dev/null
+++ b/fonts/merriweather/opentype/Merriweather-BoldItalic.otf
Binary files differ
diff --git a/fonts/merriweather/opentype/Merriweather-Italic.otf b/fonts/merriweather/opentype/Merriweather-Italic.otf
new file mode 100644
index 0000000000..86a2c85e53
--- /dev/null
+++ b/fonts/merriweather/opentype/Merriweather-Italic.otf
Binary files differ
diff --git a/fonts/merriweather/opentype/Merriweather-Light.otf b/fonts/merriweather/opentype/Merriweather-Light.otf
new file mode 100644
index 0000000000..cb32de1368
--- /dev/null
+++ b/fonts/merriweather/opentype/Merriweather-Light.otf
Binary files differ
diff --git a/fonts/merriweather/opentype/Merriweather-LightItalic.otf b/fonts/merriweather/opentype/Merriweather-LightItalic.otf
new file mode 100644
index 0000000000..deee560036
--- /dev/null
+++ b/fonts/merriweather/opentype/Merriweather-LightItalic.otf
Binary files differ
diff --git a/fonts/merriweather/opentype/Merriweather-Regular.otf b/fonts/merriweather/opentype/Merriweather-Regular.otf
new file mode 100644
index 0000000000..f896c9d55e
--- /dev/null
+++ b/fonts/merriweather/opentype/Merriweather-Regular.otf
Binary files differ
diff --git a/fonts/merriweather/opentype/MerriweatherSans-Bold.otf b/fonts/merriweather/opentype/MerriweatherSans-Bold.otf
new file mode 100644
index 0000000000..770ee24ef9
--- /dev/null
+++ b/fonts/merriweather/opentype/MerriweatherSans-Bold.otf
Binary files differ
diff --git a/fonts/merriweather/opentype/MerriweatherSans-BoldItalic.otf b/fonts/merriweather/opentype/MerriweatherSans-BoldItalic.otf
new file mode 100644
index 0000000000..857615445f
--- /dev/null
+++ b/fonts/merriweather/opentype/MerriweatherSans-BoldItalic.otf
Binary files differ
diff --git a/fonts/merriweather/opentype/MerriweatherSans-ExtraBold.otf b/fonts/merriweather/opentype/MerriweatherSans-ExtraBold.otf
new file mode 100644
index 0000000000..22ae68b0d9
--- /dev/null
+++ b/fonts/merriweather/opentype/MerriweatherSans-ExtraBold.otf
Binary files differ
diff --git a/fonts/merriweather/opentype/MerriweatherSans-ExtraBoldItalic.otf b/fonts/merriweather/opentype/MerriweatherSans-ExtraBoldItalic.otf
new file mode 100644
index 0000000000..ab3f621a6c
--- /dev/null
+++ b/fonts/merriweather/opentype/MerriweatherSans-ExtraBoldItalic.otf
Binary files differ
diff --git a/fonts/merriweather/opentype/MerriweatherSans-Italic.otf b/fonts/merriweather/opentype/MerriweatherSans-Italic.otf
new file mode 100644
index 0000000000..4f7d2010f7
--- /dev/null
+++ b/fonts/merriweather/opentype/MerriweatherSans-Italic.otf
Binary files differ
diff --git a/fonts/merriweather/opentype/MerriweatherSans-Light.otf b/fonts/merriweather/opentype/MerriweatherSans-Light.otf
new file mode 100644
index 0000000000..157e87e9df
--- /dev/null
+++ b/fonts/merriweather/opentype/MerriweatherSans-Light.otf
Binary files differ
diff --git a/fonts/merriweather/opentype/MerriweatherSans-LightItalic.otf b/fonts/merriweather/opentype/MerriweatherSans-LightItalic.otf
new file mode 100644
index 0000000000..96c805a109
--- /dev/null
+++ b/fonts/merriweather/opentype/MerriweatherSans-LightItalic.otf
Binary files differ
diff --git a/fonts/merriweather/opentype/MerriweatherSans-Regular.otf b/fonts/merriweather/opentype/MerriweatherSans-Regular.otf
new file mode 100644
index 0000000000..ba6d8c30dd
--- /dev/null
+++ b/fonts/merriweather/opentype/MerriweatherSans-Regular.otf
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-lf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-lf-ly1.tfm
new file mode 100644
index 0000000000..e8abc1e963
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-lf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-lf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-lf-ot1.tfm
new file mode 100644
index 0000000000..d4c7b5dfdd
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-lf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..0c7eff3f85
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ly1.tfm
new file mode 100644
index 0000000000..088a23e242
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..54eb761c00
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ot1.tfm
new file mode 100644
index 0000000000..f3ffe215f3
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-lf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-lf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-lf-sc-t1--base.tfm
new file mode 100644
index 0000000000..b2f006d124
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-lf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-lf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-lf-sc-t1.tfm
new file mode 100644
index 0000000000..a26e934cae
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-lf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-lf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-lf-t1--base.tfm
new file mode 100644
index 0000000000..72bba71fee
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-lf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-lf-t1.tfm
new file mode 100644
index 0000000000..631bdd830c
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-lf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-lf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-lf-ts1--base.tfm
new file mode 100644
index 0000000000..670ab68979
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-lf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-lf-ts1.tfm
new file mode 100644
index 0000000000..8cd3f5cbf6
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-lf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-osf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-osf-ly1.tfm
new file mode 100644
index 0000000000..02d844be5e
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-osf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-osf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-osf-ot1.tfm
new file mode 100644
index 0000000000..912bd2de12
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-osf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..214d0312ec
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ly1.tfm
new file mode 100644
index 0000000000..1db2436fe8
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..fef03e815b
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ot1.tfm
new file mode 100644
index 0000000000..edc5132aeb
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-osf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-osf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-osf-sc-t1--base.tfm
new file mode 100644
index 0000000000..8947281414
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-osf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-osf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-osf-sc-t1.tfm
new file mode 100644
index 0000000000..cdf1ec12da
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-osf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-osf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-osf-t1--base.tfm
new file mode 100644
index 0000000000..eb72791d54
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-osf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-osf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-osf-t1.tfm
new file mode 100644
index 0000000000..6dbddf66c4
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-osf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-osf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-osf-ts1--base.tfm
new file mode 100644
index 0000000000..670ab68979
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-osf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-osf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-osf-ts1.tfm
new file mode 100644
index 0000000000..8cd3f5cbf6
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-osf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-sup-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-sup-ly1.tfm
new file mode 100644
index 0000000000..653be0798a
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-sup-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-sup-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-sup-ot1.tfm
new file mode 100644
index 0000000000..107223eed6
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-sup-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-sup-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-sup-t1--base.tfm
new file mode 100644
index 0000000000..863f9bcf22
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-sup-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-sup-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-sup-t1.tfm
new file mode 100644
index 0000000000..37575542eb
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-sup-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tlf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tlf-ly1.tfm
new file mode 100644
index 0000000000..f8de486c7b
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tlf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tlf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tlf-ot1.tfm
new file mode 100644
index 0000000000..ffa6bc20fb
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tlf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..3ad3e6d638
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ly1.tfm
new file mode 100644
index 0000000000..d88c2e4f32
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..621d949f95
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ot1.tfm
new file mode 100644
index 0000000000..7291d550c3
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-t1--base.tfm
new file mode 100644
index 0000000000..755dee4ad8
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-t1.tfm
new file mode 100644
index 0000000000..caa6b3d771
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tlf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tlf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tlf-t1--base.tfm
new file mode 100644
index 0000000000..43c6b3d462
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tlf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tlf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tlf-t1.tfm
new file mode 100644
index 0000000000..a2a08280a3
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tlf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tlf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tlf-ts1--base.tfm
new file mode 100644
index 0000000000..670ab68979
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tlf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tlf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tlf-ts1.tfm
new file mode 100644
index 0000000000..8cd3f5cbf6
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tlf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tosf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tosf-ly1.tfm
new file mode 100644
index 0000000000..1b853e90ee
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tosf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tosf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tosf-ot1.tfm
new file mode 100644
index 0000000000..4de937ec7f
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tosf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..6544db5bca
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ly1.tfm
new file mode 100644
index 0000000000..e352e29632
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..f636858ad6
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ot1.tfm
new file mode 100644
index 0000000000..e8430249c1
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-t1--base.tfm
new file mode 100644
index 0000000000..e276b12a63
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-t1.tfm
new file mode 100644
index 0000000000..53ef3290f5
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tosf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tosf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tosf-t1--base.tfm
new file mode 100644
index 0000000000..fdddc8f86e
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tosf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tosf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tosf-t1.tfm
new file mode 100644
index 0000000000..73fc1e914e
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tosf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tosf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tosf-ts1--base.tfm
new file mode 100644
index 0000000000..670ab68979
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tosf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Black-tosf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Black-tosf-ts1.tfm
new file mode 100644
index 0000000000..8cd3f5cbf6
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Black-tosf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ly1.tfm
new file mode 100644
index 0000000000..91a796ac0d
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ot1.tfm
new file mode 100644
index 0000000000..1831a71b50
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..4059544a11
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ly1.tfm
new file mode 100644
index 0000000000..7d949bf54b
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..f23fdbb3ef
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ot1.tfm
new file mode 100644
index 0000000000..f6176cab97
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-t1--base.tfm
new file mode 100644
index 0000000000..a3dc79cf9c
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-t1.tfm
new file mode 100644
index 0000000000..63afb9f562
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-t1--base.tfm
new file mode 100644
index 0000000000..92a788e18f
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-t1.tfm
new file mode 100644
index 0000000000..abd760dd73
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ts1--base.tfm
new file mode 100644
index 0000000000..5e867449d5
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ts1.tfm
new file mode 100644
index 0000000000..e7f0e0f066
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-lf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ly1.tfm
new file mode 100644
index 0000000000..7ffd4e0a46
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ot1.tfm
new file mode 100644
index 0000000000..4ec7ff9814
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..561784ce25
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ly1.tfm
new file mode 100644
index 0000000000..ab8439da28
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..0405111e5e
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ot1.tfm
new file mode 100644
index 0000000000..baf0833500
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-t1--base.tfm
new file mode 100644
index 0000000000..2b0c55f548
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-t1.tfm
new file mode 100644
index 0000000000..c319eea17c
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-t1--base.tfm
new file mode 100644
index 0000000000..6d436a8c3c
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-t1.tfm
new file mode 100644
index 0000000000..ff81086678
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ts1--base.tfm
new file mode 100644
index 0000000000..5e867449d5
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ts1.tfm
new file mode 100644
index 0000000000..e7f0e0f066
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-osf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-ly1.tfm
new file mode 100644
index 0000000000..0b0b4791d1
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-ot1.tfm
new file mode 100644
index 0000000000..60b7097fe3
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-t1--base.tfm
new file mode 100644
index 0000000000..5e08d8d0eb
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-t1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-t1.tfm
new file mode 100644
index 0000000000..eef995f4b7
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-sup-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ly1.tfm
new file mode 100644
index 0000000000..ad2a0db206
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ot1.tfm
new file mode 100644
index 0000000000..93e8f367fb
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..e0d4b714f0
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ly1.tfm
new file mode 100644
index 0000000000..a4626c12e9
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..d327c3d28e
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ot1.tfm
new file mode 100644
index 0000000000..622271b1c7
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-t1--base.tfm
new file mode 100644
index 0000000000..02aa68ecd5
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-t1.tfm
new file mode 100644
index 0000000000..93bc142a6f
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-t1--base.tfm
new file mode 100644
index 0000000000..e77121a988
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-t1.tfm
new file mode 100644
index 0000000000..634386f565
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ts1--base.tfm
new file mode 100644
index 0000000000..5e867449d5
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ts1.tfm
new file mode 100644
index 0000000000..e7f0e0f066
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tlf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ly1.tfm
new file mode 100644
index 0000000000..27b00d97e9
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ot1.tfm
new file mode 100644
index 0000000000..94aa8ee85a
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..7e3ad156de
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ly1.tfm
new file mode 100644
index 0000000000..ff2eaf9d98
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..2c1b5b95c9
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ot1.tfm
new file mode 100644
index 0000000000..434f3b2f7b
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-t1--base.tfm
new file mode 100644
index 0000000000..5938893d0b
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-t1.tfm
new file mode 100644
index 0000000000..e37a9cae4d
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-t1--base.tfm
new file mode 100644
index 0000000000..3c25e0f342
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-t1.tfm
new file mode 100644
index 0000000000..9b82089365
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ts1--base.tfm
new file mode 100644
index 0000000000..5e867449d5
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ts1.tfm
new file mode 100644
index 0000000000..e7f0e0f066
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BlackItalic-tosf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-lf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-lf-ly1.tfm
new file mode 100644
index 0000000000..4f7b40da17
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-lf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-lf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-lf-ot1.tfm
new file mode 100644
index 0000000000..19435f7240
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-lf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..d6907dee65
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ly1.tfm
new file mode 100644
index 0000000000..a1de93f86c
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..1e57f6a0c4
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ot1.tfm
new file mode 100644
index 0000000000..ac374bd15a
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-t1--base.tfm
new file mode 100644
index 0000000000..47980a996a
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-t1.tfm
new file mode 100644
index 0000000000..fff37f0bf5
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-lf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-lf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-lf-t1--base.tfm
new file mode 100644
index 0000000000..1b74c5af8e
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-lf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-lf-t1.tfm
new file mode 100644
index 0000000000..2055da23f6
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-lf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-lf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-lf-ts1--base.tfm
new file mode 100644
index 0000000000..c958b1f105
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-lf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-lf-ts1.tfm
new file mode 100644
index 0000000000..e33099e758
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-lf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-osf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-osf-ly1.tfm
index 6312d6065c..a3f87d4809 100644
--- a/fonts/merriweather/tfm/Merriwthr-Bold-osf-ly1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-osf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-osf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-osf-ot1.tfm
index 8ae5c946e5..a44a4286c1 100644
--- a/fonts/merriweather/tfm/Merriwthr-Bold-osf-ot1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-osf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..7b9f1232bd
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ly1.tfm
new file mode 100644
index 0000000000..df048ee80a
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..1f1a88654f
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ot1.tfm
new file mode 100644
index 0000000000..6110722ea9
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-t1--base.tfm
new file mode 100644
index 0000000000..999de44132
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-t1.tfm
new file mode 100644
index 0000000000..f4a128fb00
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-osf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-osf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-osf-t1--base.tfm
index 1b4453ac9b..7bf25688be 100644
--- a/fonts/merriweather/tfm/Merriwthr-Bold-osf-t1--base.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-osf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-osf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-osf-t1.tfm
index e93e3de19c..e789765aa9 100644
--- a/fonts/merriweather/tfm/Merriwthr-Bold-osf-t1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-osf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-osf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-osf-ts1--base.tfm
index 81eab803d3..c958b1f105 100644
--- a/fonts/merriweather/tfm/Merriwthr-Bold-osf-ts1--base.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-osf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-osf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-osf-ts1.tfm
index 34698ae9ad..e33099e758 100644
--- a/fonts/merriweather/tfm/Merriwthr-Bold-osf-ts1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-osf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-sup-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-sup-ly1.tfm
new file mode 100644
index 0000000000..e405f31b65
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-sup-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-sup-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-sup-ot1.tfm
new file mode 100644
index 0000000000..87ddc8a058
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-sup-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-sup-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-sup-t1--base.tfm
new file mode 100644
index 0000000000..5b294387a6
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-sup-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-sup-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-sup-t1.tfm
new file mode 100644
index 0000000000..37f3ff4b60
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-sup-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tlf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-ly1.tfm
new file mode 100644
index 0000000000..9ba8301e9a
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tlf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-ot1.tfm
new file mode 100644
index 0000000000..93a7d062af
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..2186e8d99c
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ly1.tfm
new file mode 100644
index 0000000000..9f726e309d
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..6e9e945694
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ot1.tfm
new file mode 100644
index 0000000000..c49985fcab
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-t1--base.tfm
new file mode 100644
index 0000000000..d609f627e0
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-t1.tfm
new file mode 100644
index 0000000000..347dd1a275
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tlf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-t1--base.tfm
new file mode 100644
index 0000000000..e0486835ad
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tlf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-t1.tfm
new file mode 100644
index 0000000000..85ec264a26
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tlf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-ts1--base.tfm
new file mode 100644
index 0000000000..c958b1f105
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tlf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-ts1.tfm
new file mode 100644
index 0000000000..e33099e758
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tlf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tosf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-ly1.tfm
new file mode 100644
index 0000000000..035ceedbef
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tosf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-ot1.tfm
new file mode 100644
index 0000000000..7a279cebe3
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..eeb393ed45
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ly1.tfm
new file mode 100644
index 0000000000..161b011c12
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..e589c2fa2e
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ot1.tfm
new file mode 100644
index 0000000000..c14a100ef7
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-t1--base.tfm
new file mode 100644
index 0000000000..c1fc1bd33d
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-t1.tfm
new file mode 100644
index 0000000000..995bf545fd
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tosf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-t1--base.tfm
new file mode 100644
index 0000000000..64a35ddf2b
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tosf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-t1.tfm
new file mode 100644
index 0000000000..6982abdbd1
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tosf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-ts1--base.tfm
new file mode 100644
index 0000000000..c958b1f105
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Bold-tosf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-ts1.tfm
new file mode 100644
index 0000000000..e33099e758
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Bold-tosf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ly1.tfm
new file mode 100644
index 0000000000..2266a93673
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ot1.tfm
new file mode 100644
index 0000000000..325f0bc28f
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..699dc6d95a
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ly1.tfm
new file mode 100644
index 0000000000..dad0b29a24
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..b0ddff49a7
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ot1.tfm
new file mode 100644
index 0000000000..07b5906ccc
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-t1--base.tfm
new file mode 100644
index 0000000000..61a12365da
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-t1.tfm
new file mode 100644
index 0000000000..08a0a7eb71
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-t1--base.tfm
new file mode 100644
index 0000000000..a0f7bf92be
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-t1.tfm
new file mode 100644
index 0000000000..189240438c
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ts1--base.tfm
new file mode 100644
index 0000000000..4b6d80d459
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ts1.tfm
new file mode 100644
index 0000000000..85349001bc
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-lf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ly1.tfm
index 2bccac44b1..6cffc7aee5 100644
--- a/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ly1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ot1.tfm
index b3b36894eb..0e47f3e83a 100644
--- a/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ot1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..7779b3ef47
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ly1.tfm
new file mode 100644
index 0000000000..a07a103ce5
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..7d0079dd67
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ot1.tfm
new file mode 100644
index 0000000000..d2f5c0b596
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-t1--base.tfm
new file mode 100644
index 0000000000..e716427e0d
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-t1.tfm
new file mode 100644
index 0000000000..9013cbbc4e
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-t1--base.tfm
index 55855b27df..13d27aba18 100644
--- a/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-t1--base.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-t1.tfm
index 03202f1731..ca24342837 100644
--- a/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-t1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ts1--base.tfm
index c567f3b213..4b6d80d459 100644
--- a/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ts1--base.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ts1.tfm
index 31233a7e60..85349001bc 100644
--- a/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ts1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-ly1.tfm
new file mode 100644
index 0000000000..6e2d2a985a
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-ot1.tfm
new file mode 100644
index 0000000000..3eef49a9b1
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-t1--base.tfm
new file mode 100644
index 0000000000..5d6dcaac5e
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-t1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-t1.tfm
new file mode 100644
index 0000000000..bb195e7fed
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-sup-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ly1.tfm
new file mode 100644
index 0000000000..688c22a979
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ot1.tfm
new file mode 100644
index 0000000000..c4139fa459
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..b97f876b5d
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ly1.tfm
new file mode 100644
index 0000000000..4d07282a02
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..607a907dd2
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ot1.tfm
new file mode 100644
index 0000000000..404665f284
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-t1--base.tfm
new file mode 100644
index 0000000000..b9e9a6e630
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-t1.tfm
new file mode 100644
index 0000000000..d9e5d19737
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-t1--base.tfm
new file mode 100644
index 0000000000..a91d6fe81b
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-t1.tfm
new file mode 100644
index 0000000000..6316fb9d8b
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ts1--base.tfm
new file mode 100644
index 0000000000..4b6d80d459
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ts1.tfm
new file mode 100644
index 0000000000..85349001bc
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tlf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ly1.tfm
new file mode 100644
index 0000000000..32814611d9
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ot1.tfm
new file mode 100644
index 0000000000..f573d02beb
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..0954676989
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ly1.tfm
new file mode 100644
index 0000000000..61383712c0
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..77cb541226
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ot1.tfm
new file mode 100644
index 0000000000..44e1c20e58
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-t1--base.tfm
new file mode 100644
index 0000000000..f89886b112
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-t1.tfm
new file mode 100644
index 0000000000..7429e95aca
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-t1--base.tfm
new file mode 100644
index 0000000000..d7cb713635
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-t1.tfm
new file mode 100644
index 0000000000..2b586e2358
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ts1--base.tfm
new file mode 100644
index 0000000000..4b6d80d459
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ts1.tfm
new file mode 100644
index 0000000000..85349001bc
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-BoldItalic-tosf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-lf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-lf-ly1.tfm
new file mode 100644
index 0000000000..d0fc470148
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-lf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-lf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-lf-ot1.tfm
new file mode 100644
index 0000000000..52aa4aaa7c
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-lf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..49404a3b22
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ly1.tfm
new file mode 100644
index 0000000000..9984803144
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..fc05a8aabc
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ot1.tfm
new file mode 100644
index 0000000000..05177d2dbe
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-t1--base.tfm
new file mode 100644
index 0000000000..d74cf81210
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-t1.tfm
new file mode 100644
index 0000000000..049f2db418
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-lf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-lf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-lf-t1--base.tfm
new file mode 100644
index 0000000000..2b71cf34d6
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-lf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-lf-t1.tfm
new file mode 100644
index 0000000000..65923f906d
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-lf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-lf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-lf-ts1--base.tfm
new file mode 100644
index 0000000000..dec4344808
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-lf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-lf-ts1.tfm
new file mode 100644
index 0000000000..31c472c7ac
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-lf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-osf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-osf-ly1.tfm
index b98120be65..941ca0e38d 100644
--- a/fonts/merriweather/tfm/Merriwthr-Italic-osf-ly1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-osf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-osf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-osf-ot1.tfm
index 904905275a..297b02e35b 100644
--- a/fonts/merriweather/tfm/Merriwthr-Italic-osf-ot1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-osf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..33dec85d3f
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ly1.tfm
new file mode 100644
index 0000000000..599f9b1ac9
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..c9f481f5ba
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ot1.tfm
new file mode 100644
index 0000000000..2e29496e12
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-t1--base.tfm
new file mode 100644
index 0000000000..d3228bf60b
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-t1.tfm
new file mode 100644
index 0000000000..7e7f9ca88f
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-osf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-osf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-osf-t1--base.tfm
index 09020b3d42..e08e6098b2 100644
--- a/fonts/merriweather/tfm/Merriwthr-Italic-osf-t1--base.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-osf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-osf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-osf-t1.tfm
index e84d043cda..40585d787a 100644
--- a/fonts/merriweather/tfm/Merriwthr-Italic-osf-t1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-osf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-osf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-osf-ts1--base.tfm
index 1d4950cf55..dec4344808 100644
--- a/fonts/merriweather/tfm/Merriwthr-Italic-osf-ts1--base.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-osf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-osf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-osf-ts1.tfm
index 07209d1e3b..31c472c7ac 100644
--- a/fonts/merriweather/tfm/Merriwthr-Italic-osf-ts1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-osf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-sup-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-sup-ly1.tfm
new file mode 100644
index 0000000000..a430d0865d
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-sup-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-sup-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-sup-ot1.tfm
new file mode 100644
index 0000000000..0615aff16c
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-sup-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-sup-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-sup-t1--base.tfm
new file mode 100644
index 0000000000..9acf5bae80
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-sup-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-sup-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-sup-t1.tfm
new file mode 100644
index 0000000000..44b37919f4
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-sup-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tlf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-ly1.tfm
new file mode 100644
index 0000000000..edb3c21955
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tlf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-ot1.tfm
new file mode 100644
index 0000000000..7eb919e09e
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..f7b283af00
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ly1.tfm
new file mode 100644
index 0000000000..2e9142e83c
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..12d211ce48
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ot1.tfm
new file mode 100644
index 0000000000..c8468fde12
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-t1--base.tfm
new file mode 100644
index 0000000000..250d24a06f
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-t1.tfm
new file mode 100644
index 0000000000..176b1aec94
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tlf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-t1--base.tfm
new file mode 100644
index 0000000000..5da5cad9a3
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tlf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-t1.tfm
new file mode 100644
index 0000000000..4bc127accd
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tlf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-ts1--base.tfm
new file mode 100644
index 0000000000..dec4344808
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tlf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-ts1.tfm
new file mode 100644
index 0000000000..31c472c7ac
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tlf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tosf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-ly1.tfm
new file mode 100644
index 0000000000..60118a478c
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tosf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-ot1.tfm
new file mode 100644
index 0000000000..969f1e9073
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..99897fe1e1
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ly1.tfm
new file mode 100644
index 0000000000..04e501b48a
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..4f42d27d6a
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ot1.tfm
new file mode 100644
index 0000000000..6443941ee8
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-t1--base.tfm
new file mode 100644
index 0000000000..d5c5fb7a34
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-t1.tfm
new file mode 100644
index 0000000000..d673205781
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tosf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-t1--base.tfm
new file mode 100644
index 0000000000..7039a59b94
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tosf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-t1.tfm
new file mode 100644
index 0000000000..fe4658ec52
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tosf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-ts1--base.tfm
new file mode 100644
index 0000000000..dec4344808
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Italic-tosf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-ts1.tfm
new file mode 100644
index 0000000000..31c472c7ac
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Italic-tosf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-lf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-lf-ly1.tfm
new file mode 100644
index 0000000000..038c80039b
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-lf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-lf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-lf-ot1.tfm
new file mode 100644
index 0000000000..44a8b10a1b
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-lf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..be826ec6bf
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ly1.tfm
new file mode 100644
index 0000000000..d66afc1e7c
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..ec24210134
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ot1.tfm
new file mode 100644
index 0000000000..a90fb9db45
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-lf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-lf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-lf-sc-t1--base.tfm
new file mode 100644
index 0000000000..cb4ee251de
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-lf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-lf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-lf-sc-t1.tfm
new file mode 100644
index 0000000000..70ffb396ea
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-lf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-lf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-lf-t1--base.tfm
new file mode 100644
index 0000000000..4f8b31a0ef
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-lf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-lf-t1.tfm
new file mode 100644
index 0000000000..88833a9975
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-lf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-lf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-lf-ts1--base.tfm
new file mode 100644
index 0000000000..6345d1c7fb
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-lf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-lf-ts1.tfm
new file mode 100644
index 0000000000..c8ec516d95
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-lf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-osf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-osf-ly1.tfm
index 3b9da4892c..d28aabfafe 100644
--- a/fonts/merriweather/tfm/Merriwthr-Light-osf-ly1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Light-osf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-osf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-osf-ot1.tfm
index 05c0d0ac1e..a9933fb8b7 100644
--- a/fonts/merriweather/tfm/Merriwthr-Light-osf-ot1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Light-osf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..fb0431e985
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ly1.tfm
new file mode 100644
index 0000000000..630fe5575d
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..a7aae525b0
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ot1.tfm
new file mode 100644
index 0000000000..5c003f91d0
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-osf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-osf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-osf-sc-t1--base.tfm
new file mode 100644
index 0000000000..518c99ff02
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-osf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-osf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-osf-sc-t1.tfm
new file mode 100644
index 0000000000..d481f734d8
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-osf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-osf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-osf-t1--base.tfm
index b3a9b9b63f..43f97a65bc 100644
--- a/fonts/merriweather/tfm/Merriwthr-Light-osf-t1--base.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Light-osf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-osf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-osf-t1.tfm
index f3eab41760..59722b0c75 100644
--- a/fonts/merriweather/tfm/Merriwthr-Light-osf-t1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Light-osf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-osf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-osf-ts1--base.tfm
index 4a7e131d69..6345d1c7fb 100644
--- a/fonts/merriweather/tfm/Merriwthr-Light-osf-ts1--base.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Light-osf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-osf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-osf-ts1.tfm
index d59f0979da..c8ec516d95 100644
--- a/fonts/merriweather/tfm/Merriwthr-Light-osf-ts1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Light-osf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-sup-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-sup-ly1.tfm
new file mode 100644
index 0000000000..a555272cd1
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-sup-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-sup-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-sup-ot1.tfm
new file mode 100644
index 0000000000..693e09e01d
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-sup-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-sup-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-sup-t1--base.tfm
new file mode 100644
index 0000000000..fcf62fedf9
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-sup-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-sup-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-sup-t1.tfm
new file mode 100644
index 0000000000..b06d8b5b42
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-sup-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tlf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tlf-ly1.tfm
new file mode 100644
index 0000000000..1c0b068630
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tlf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tlf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tlf-ot1.tfm
new file mode 100644
index 0000000000..fc6f614273
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tlf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..bc94f82bd6
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ly1.tfm
new file mode 100644
index 0000000000..753391aa76
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..9f57ad07fd
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ot1.tfm
new file mode 100644
index 0000000000..0110a8cb85
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-t1--base.tfm
new file mode 100644
index 0000000000..13a3c149d3
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-t1.tfm
new file mode 100644
index 0000000000..acd6ec07fd
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tlf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tlf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tlf-t1--base.tfm
new file mode 100644
index 0000000000..bc40ad7ab0
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tlf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tlf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tlf-t1.tfm
new file mode 100644
index 0000000000..5ebc8423d8
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tlf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tlf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tlf-ts1--base.tfm
new file mode 100644
index 0000000000..6345d1c7fb
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tlf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tlf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tlf-ts1.tfm
new file mode 100644
index 0000000000..c8ec516d95
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tlf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tosf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tosf-ly1.tfm
new file mode 100644
index 0000000000..67f35107b1
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tosf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tosf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tosf-ot1.tfm
new file mode 100644
index 0000000000..230cba94c6
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tosf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..1e2b1a7a04
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ly1.tfm
new file mode 100644
index 0000000000..3b4ec35bde
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..4858d4e4ba
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ot1.tfm
new file mode 100644
index 0000000000..9d57a6f564
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-t1--base.tfm
new file mode 100644
index 0000000000..0707edbea7
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-t1.tfm
new file mode 100644
index 0000000000..1d1278f2a0
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tosf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tosf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tosf-t1--base.tfm
new file mode 100644
index 0000000000..62efcad86c
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tosf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tosf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tosf-t1.tfm
new file mode 100644
index 0000000000..2018861dc7
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tosf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tosf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tosf-ts1--base.tfm
new file mode 100644
index 0000000000..6345d1c7fb
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tosf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Light-tosf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Light-tosf-ts1.tfm
new file mode 100644
index 0000000000..c8ec516d95
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Light-tosf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightIt-osf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-LightIt-osf-ly1.tfm
deleted file mode 100644
index b0004ff03c..0000000000
--- a/fonts/merriweather/tfm/Merriwthr-LightIt-osf-ly1.tfm
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightIt-osf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-LightIt-osf-ot1.tfm
deleted file mode 100644
index 3b1c3cbd5d..0000000000
--- a/fonts/merriweather/tfm/Merriwthr-LightIt-osf-ot1.tfm
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightIt-osf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightIt-osf-t1--base.tfm
deleted file mode 100644
index 524458287f..0000000000
--- a/fonts/merriweather/tfm/Merriwthr-LightIt-osf-t1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightIt-osf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-LightIt-osf-t1.tfm
deleted file mode 100644
index 89dad4eb8c..0000000000
--- a/fonts/merriweather/tfm/Merriwthr-LightIt-osf-t1.tfm
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightIt-osf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightIt-osf-ts1--base.tfm
deleted file mode 100644
index 0a15ae1799..0000000000
--- a/fonts/merriweather/tfm/Merriwthr-LightIt-osf-ts1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightIt-osf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-LightIt-osf-ts1.tfm
deleted file mode 100644
index ab3dc2ad4b..0000000000
--- a/fonts/merriweather/tfm/Merriwthr-LightIt-osf-ts1.tfm
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ly1.tfm
new file mode 100644
index 0000000000..e01ac8977b
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ot1.tfm
new file mode 100644
index 0000000000..1f060b0cd1
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..a839f3d9cb
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ly1.tfm
new file mode 100644
index 0000000000..439d4d8ff5
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..a4fb9ca40b
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ot1.tfm
new file mode 100644
index 0000000000..cde88eed72
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-t1--base.tfm
new file mode 100644
index 0000000000..2ed0a7060a
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-t1.tfm
new file mode 100644
index 0000000000..8e8c0c960d
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-t1--base.tfm
new file mode 100644
index 0000000000..c48d1208bc
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-t1.tfm
new file mode 100644
index 0000000000..7db21982d5
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ts1--base.tfm
new file mode 100644
index 0000000000..5c21d93e62
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ts1.tfm
new file mode 100644
index 0000000000..77347d94e0
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-lf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ly1.tfm
new file mode 100644
index 0000000000..f9990e68c2
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ot1.tfm
new file mode 100644
index 0000000000..f28004c0dd
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..e901b85746
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ly1.tfm
new file mode 100644
index 0000000000..886f675081
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..7177442747
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ot1.tfm
new file mode 100644
index 0000000000..25779bca5c
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-t1--base.tfm
new file mode 100644
index 0000000000..27f7ee09f0
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-t1.tfm
new file mode 100644
index 0000000000..b4039c1127
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-t1--base.tfm
new file mode 100644
index 0000000000..e31e5d3e4f
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-t1.tfm
new file mode 100644
index 0000000000..5656bab7e2
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ts1--base.tfm
new file mode 100644
index 0000000000..5c21d93e62
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ts1.tfm
new file mode 100644
index 0000000000..77347d94e0
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-osf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-sup-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-sup-ly1.tfm
new file mode 100644
index 0000000000..164ad4e343
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-sup-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-sup-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-sup-ot1.tfm
new file mode 100644
index 0000000000..8f0ff3fbf2
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-sup-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-sup-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-sup-t1--base.tfm
new file mode 100644
index 0000000000..25de756690
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-sup-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-sup-t1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-sup-t1.tfm
new file mode 100644
index 0000000000..4230ed2f81
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-sup-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ly1.tfm
new file mode 100644
index 0000000000..4ff35b296b
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ot1.tfm
new file mode 100644
index 0000000000..2d48e1ce0e
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..2ec1eaafe6
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ly1.tfm
new file mode 100644
index 0000000000..28ae12dd47
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..c49becbccd
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ot1.tfm
new file mode 100644
index 0000000000..3f4d860a3e
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-t1--base.tfm
new file mode 100644
index 0000000000..32a573a69b
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-t1.tfm
new file mode 100644
index 0000000000..e7d9084993
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-t1--base.tfm
new file mode 100644
index 0000000000..748ac5068b
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-t1.tfm
new file mode 100644
index 0000000000..4d7a34d42c
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ts1--base.tfm
new file mode 100644
index 0000000000..5c21d93e62
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ts1.tfm
new file mode 100644
index 0000000000..77347d94e0
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tlf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ly1.tfm
new file mode 100644
index 0000000000..6bc55585ca
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ot1.tfm
new file mode 100644
index 0000000000..4e8ddf4ed0
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..f66361df1c
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ly1.tfm
new file mode 100644
index 0000000000..1244ef01e8
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..676721899c
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ot1.tfm
new file mode 100644
index 0000000000..b551ff0156
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-t1--base.tfm
new file mode 100644
index 0000000000..b519fac17b
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-t1.tfm
new file mode 100644
index 0000000000..da9b4c4e42
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-t1--base.tfm
new file mode 100644
index 0000000000..432a9aa43d
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-t1.tfm
new file mode 100644
index 0000000000..d43bc5a2d3
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ts1--base.tfm
new file mode 100644
index 0000000000..5c21d93e62
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ts1.tfm
new file mode 100644
index 0000000000..77347d94e0
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-LightItalic-tosf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-lf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-lf-ly1.tfm
new file mode 100644
index 0000000000..6da974e323
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-lf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-lf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-lf-ot1.tfm
new file mode 100644
index 0000000000..fdb4282c19
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-lf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..bcb91a5687
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ly1.tfm
new file mode 100644
index 0000000000..0a98092dc9
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..3ce7b2879f
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ot1.tfm
new file mode 100644
index 0000000000..d5b2ddbec8
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-t1--base.tfm
new file mode 100644
index 0000000000..226df97f56
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-t1.tfm
new file mode 100644
index 0000000000..f2d5dedb69
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-lf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-lf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-lf-t1--base.tfm
new file mode 100644
index 0000000000..5e45922f7a
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-lf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-lf-t1.tfm
new file mode 100644
index 0000000000..272e86d955
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-lf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-lf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-lf-ts1--base.tfm
new file mode 100644
index 0000000000..3762f09799
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-lf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-lf-ts1.tfm
new file mode 100644
index 0000000000..5bcb2d56a1
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-lf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-osf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-osf-ly1.tfm
index 8b0868ff13..e639dd9c62 100644
--- a/fonts/merriweather/tfm/Merriwthr-Regular-osf-ly1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-osf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-osf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-osf-ot1.tfm
index caeba9ffe5..806b3b9410 100644
--- a/fonts/merriweather/tfm/Merriwthr-Regular-osf-ot1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-osf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..49b706c2cd
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ly1.tfm
new file mode 100644
index 0000000000..931c9e2a24
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..5006795fa4
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ot1.tfm
new file mode 100644
index 0000000000..8859f69ae3
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-t1--base.tfm
new file mode 100644
index 0000000000..2b026fcdc0
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-t1.tfm
new file mode 100644
index 0000000000..045d693efe
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-osf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-osf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-osf-t1--base.tfm
index 9f00b8050b..ec510739fc 100644
--- a/fonts/merriweather/tfm/Merriwthr-Regular-osf-t1--base.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-osf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-osf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-osf-t1.tfm
index 4b82c5c1cc..ca88aa448a 100644
--- a/fonts/merriweather/tfm/Merriwthr-Regular-osf-t1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-osf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-osf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-osf-ts1--base.tfm
index 9c03fa7a2d..3762f09799 100644
--- a/fonts/merriweather/tfm/Merriwthr-Regular-osf-ts1--base.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-osf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-osf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-osf-ts1.tfm
index 7f3469572f..5bcb2d56a1 100644
--- a/fonts/merriweather/tfm/Merriwthr-Regular-osf-ts1.tfm
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-osf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-sup-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-sup-ly1.tfm
new file mode 100644
index 0000000000..e85c050823
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-sup-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-sup-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-sup-ot1.tfm
new file mode 100644
index 0000000000..a5e4f06267
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-sup-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-sup-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-sup-t1--base.tfm
new file mode 100644
index 0000000000..0171c725ad
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-sup-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-sup-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-sup-t1.tfm
new file mode 100644
index 0000000000..c073dd989d
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-sup-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tlf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-ly1.tfm
new file mode 100644
index 0000000000..d6edc6dfcd
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tlf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-ot1.tfm
new file mode 100644
index 0000000000..16ebb2b496
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..dca4b4b059
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ly1.tfm
new file mode 100644
index 0000000000..17a0cc65b0
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..12bf78b4d8
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ot1.tfm
new file mode 100644
index 0000000000..a1539f75ae
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-t1--base.tfm
new file mode 100644
index 0000000000..8dc665ac47
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-t1.tfm
new file mode 100644
index 0000000000..ed1e88f42c
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tlf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-t1--base.tfm
new file mode 100644
index 0000000000..18e2e2ab00
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tlf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-t1.tfm
new file mode 100644
index 0000000000..af42e910ca
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tlf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-ts1--base.tfm
new file mode 100644
index 0000000000..3762f09799
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tlf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-ts1.tfm
new file mode 100644
index 0000000000..5bcb2d56a1
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tlf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tosf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-ly1.tfm
new file mode 100644
index 0000000000..81044a9297
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tosf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-ot1.tfm
new file mode 100644
index 0000000000..0a8e4b0a8d
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ly1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..766c0cd39e
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ly1.tfm
new file mode 100644
index 0000000000..0660556e0d
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ot1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..143b7e6a2c
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ot1.tfm
new file mode 100644
index 0000000000..47018a0636
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-t1--base.tfm
new file mode 100644
index 0000000000..1542627dd1
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-t1.tfm
new file mode 100644
index 0000000000..aedd89dc39
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tosf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-t1--base.tfm
new file mode 100644
index 0000000000..fcb07edddc
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tosf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-t1.tfm
new file mode 100644
index 0000000000..429b08bfdd
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tosf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-ts1--base.tfm
new file mode 100644
index 0000000000..3762f09799
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-Regular-tosf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-ts1.tfm
new file mode 100644
index 0000000000..5bcb2d56a1
--- /dev/null
+++ b/fonts/merriweather/tfm/Merriwthr-Regular-tosf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ly1.tfm
deleted file mode 100644
index efa62388ed..0000000000
--- a/fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ly1.tfm
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ot1.tfm
deleted file mode 100644
index dd8f065e1c..0000000000
--- a/fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ot1.tfm
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-t1--base.tfm
deleted file mode 100644
index d575850d70..0000000000
--- a/fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-t1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-t1.tfm
deleted file mode 100644
index a40473d49c..0000000000
--- a/fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-t1.tfm
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ts1--base.tfm
deleted file mode 100644
index eec67e2f07..0000000000
--- a/fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ts1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ts1.tfm
deleted file mode 100644
index 97e1328268..0000000000
--- a/fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ts1.tfm
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ly1.tfm b/fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ly1.tfm
deleted file mode 100644
index 11c467b760..0000000000
--- a/fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ly1.tfm
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ot1.tfm b/fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ot1.tfm
deleted file mode 100644
index fcd514d81b..0000000000
--- a/fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ot1.tfm
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-UltraBold-osf-t1--base.tfm b/fonts/merriweather/tfm/Merriwthr-UltraBold-osf-t1--base.tfm
deleted file mode 100644
index 60a7bf0ef6..0000000000
--- a/fonts/merriweather/tfm/Merriwthr-UltraBold-osf-t1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-UltraBold-osf-t1.tfm b/fonts/merriweather/tfm/Merriwthr-UltraBold-osf-t1.tfm
deleted file mode 100644
index 3068eded1d..0000000000
--- a/fonts/merriweather/tfm/Merriwthr-UltraBold-osf-t1.tfm
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ts1--base.tfm b/fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ts1--base.tfm
deleted file mode 100644
index b89104e0d3..0000000000
--- a/fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ts1--base.tfm
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ts1.tfm b/fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ts1.tfm
deleted file mode 100644
index 2ad5cfd095..0000000000
--- a/fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ts1.tfm
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ly1.tfm
new file mode 100644
index 0000000000..77ae366ea7
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ot1.tfm
new file mode 100644
index 0000000000..c0331b77c1
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..3db31a3e71
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ly1.tfm
new file mode 100644
index 0000000000..3faa32af68
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..b7eeadf9fd
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ot1.tfm
new file mode 100644
index 0000000000..e412c13c06
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-t1--base.tfm
new file mode 100644
index 0000000000..cd4ba3db2c
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-t1.tfm
new file mode 100644
index 0000000000..536cbf7695
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-t1--base.tfm
new file mode 100644
index 0000000000..166c61a757
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-t1.tfm
new file mode 100644
index 0000000000..87f5e5c98d
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ts1--base.tfm
new file mode 100644
index 0000000000..ee11531df2
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ts1.tfm
new file mode 100644
index 0000000000..bf78f195ef
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-lf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ly1.tfm
index c0d40ac696..4d407fed5c 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ly1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ot1.tfm
index ed9f170598..df22ab4535 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ot1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..4427ee06b1
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ly1.tfm
new file mode 100644
index 0000000000..51549a52e7
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..f79ab47178
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ot1.tfm
new file mode 100644
index 0000000000..45a17aa4a3
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-t1--base.tfm
new file mode 100644
index 0000000000..d1e5d62918
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-t1.tfm
new file mode 100644
index 0000000000..b1a5054726
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-t1--base.tfm
index ca8ce541e6..e128811311 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-t1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-t1.tfm
index 3dd7b34194..ec297d0825 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-t1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ts1--base.tfm
index 6d42085edf..ee11531df2 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ts1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ts1.tfm
index 2c5d4e0f2f..bf78f195ef 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ts1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-sup-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-sup-ly1.tfm
index 73d306a673..2796d8ceb8 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Bold-sup-ly1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-sup-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-sup-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-sup-ot1.tfm
index 203becd957..231da82c75 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Bold-sup-ot1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-sup-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-sup-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-sup-t1--base.tfm
index b77b3d0166..b42216da01 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Bold-sup-t1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-sup-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-sup-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-sup-t1.tfm
index 9d7ec03537..50924b4027 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Bold-sup-t1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-sup-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ly1.tfm
new file mode 100644
index 0000000000..9e33675325
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ot1.tfm
new file mode 100644
index 0000000000..f31e09377c
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..33ef18d338
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ly1.tfm
new file mode 100644
index 0000000000..eaeca2cb67
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..015cdea72b
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ot1.tfm
new file mode 100644
index 0000000000..0eb6d6d5c1
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-t1--base.tfm
new file mode 100644
index 0000000000..9bb01cf0f6
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-t1.tfm
new file mode 100644
index 0000000000..4e2dab77de
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-t1--base.tfm
new file mode 100644
index 0000000000..06783db3f1
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-t1.tfm
new file mode 100644
index 0000000000..9019fd4462
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ts1--base.tfm
new file mode 100644
index 0000000000..ee11531df2
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ts1.tfm
new file mode 100644
index 0000000000..bf78f195ef
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tlf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ly1.tfm
new file mode 100644
index 0000000000..4da8355746
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ot1.tfm
new file mode 100644
index 0000000000..3d1a9e0027
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..4ee25f0558
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ly1.tfm
new file mode 100644
index 0000000000..cfb049968a
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..9018cd8320
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ot1.tfm
new file mode 100644
index 0000000000..fb7bbd2ca9
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-t1--base.tfm
new file mode 100644
index 0000000000..2f9d1ac6a4
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-t1.tfm
new file mode 100644
index 0000000000..21fe325e90
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-t1--base.tfm
new file mode 100644
index 0000000000..31b1be1ec1
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-t1.tfm
new file mode 100644
index 0000000000..003131cd83
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ts1--base.tfm
new file mode 100644
index 0000000000..ee11531df2
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ts1.tfm
new file mode 100644
index 0000000000..bf78f195ef
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Bold-tosf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ly1.tfm
new file mode 100644
index 0000000000..b9c7d1d9a0
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ot1.tfm
new file mode 100644
index 0000000000..987c3b4e47
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..b4edc646db
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ly1.tfm
new file mode 100644
index 0000000000..99d3d35d7e
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..1fef46d927
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ot1.tfm
new file mode 100644
index 0000000000..6fb61b1806
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-t1--base.tfm
new file mode 100644
index 0000000000..159b81dec9
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-t1.tfm
new file mode 100644
index 0000000000..9a2257939b
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-t1--base.tfm
new file mode 100644
index 0000000000..6a52dcb5e0
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-t1.tfm
new file mode 100644
index 0000000000..0fa81c8bf4
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ts1--base.tfm
new file mode 100644
index 0000000000..664497e212
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ts1.tfm
new file mode 100644
index 0000000000..f7b8660221
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-lf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ly1.tfm
index b092dcd4fe..57462d5dc8 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ly1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ot1.tfm
index 641c0a8269..a938c427b8 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ot1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..f9067cab4d
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ly1.tfm
new file mode 100644
index 0000000000..563c81e50c
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..01d82c87d5
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ot1.tfm
new file mode 100644
index 0000000000..99a60096ed
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-t1--base.tfm
new file mode 100644
index 0000000000..9ea383ef85
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-t1.tfm
new file mode 100644
index 0000000000..2fe2c1a0ad
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-t1--base.tfm
index 2156d369fd..b83f0c5be1 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-t1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-t1.tfm
index 257edf1ecd..7bdd2eca80 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-t1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ts1--base.tfm
index 01322b8f96..664497e212 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ts1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ts1.tfm
index 3228b00b26..f7b8660221 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ts1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-ly1.tfm
index 7c6629c130..a58ec2dee8 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-ly1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-ot1.tfm
index 227c207020..e44bfc3861 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-ot1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-t1--base.tfm
index cd702d7c7d..7ccdd17d57 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-t1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-t1.tfm
index 21e9bfe3c7..ab529c2fea 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-t1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ly1.tfm
new file mode 100644
index 0000000000..b172444766
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ot1.tfm
new file mode 100644
index 0000000000..64b4e00793
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..4e13785aea
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ly1.tfm
new file mode 100644
index 0000000000..1f7eabb3f2
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..39ab7f3a8c
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ot1.tfm
new file mode 100644
index 0000000000..4d29b1b8e3
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-t1--base.tfm
new file mode 100644
index 0000000000..ab25283e4f
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-t1.tfm
new file mode 100644
index 0000000000..c47710376f
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-t1--base.tfm
new file mode 100644
index 0000000000..f2b14883a3
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-t1.tfm
new file mode 100644
index 0000000000..feeca05522
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ts1--base.tfm
new file mode 100644
index 0000000000..664497e212
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ts1.tfm
new file mode 100644
index 0000000000..f7b8660221
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tlf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ly1.tfm
new file mode 100644
index 0000000000..8f81dfd673
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ot1.tfm
new file mode 100644
index 0000000000..8ed92c4990
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..2366b58742
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ly1.tfm
new file mode 100644
index 0000000000..a65374f481
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..2d004157cd
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ot1.tfm
new file mode 100644
index 0000000000..de9c130037
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-t1--base.tfm
new file mode 100644
index 0000000000..94eac1ae07
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-t1.tfm
new file mode 100644
index 0000000000..1aba88c687
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-t1--base.tfm
new file mode 100644
index 0000000000..202cba3894
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-t1.tfm
new file mode 100644
index 0000000000..64cc32fe3a
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ts1--base.tfm
new file mode 100644
index 0000000000..664497e212
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ts1.tfm
new file mode 100644
index 0000000000..f7b8660221
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-BoldItalic-tosf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ly1.tfm
new file mode 100644
index 0000000000..87786f82d7
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ot1.tfm
new file mode 100644
index 0000000000..f8cc50c3be
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..b3da550643
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ly1.tfm
new file mode 100644
index 0000000000..87695242eb
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..771a34fc86
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ot1.tfm
new file mode 100644
index 0000000000..8b157a38ae
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-t1--base.tfm
new file mode 100644
index 0000000000..d5e9523a8d
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-t1.tfm
new file mode 100644
index 0000000000..465d6e2ebe
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-t1--base.tfm
new file mode 100644
index 0000000000..dd46d996bf
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-t1.tfm
new file mode 100644
index 0000000000..21fb5a4091
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ts1--base.tfm
new file mode 100644
index 0000000000..3fb22d1f4a
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ts1.tfm
new file mode 100644
index 0000000000..56e0ccb1a5
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-lf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ly1.tfm
index c1c3f748fa..b2c73d01d8 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ly1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ot1.tfm
index 9a16e9a120..38ffe3be5a 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ot1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..d20a4539f5
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ly1.tfm
new file mode 100644
index 0000000000..924386b4a2
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..425adc258b
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ot1.tfm
new file mode 100644
index 0000000000..c94718db70
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-t1--base.tfm
new file mode 100644
index 0000000000..291e130e54
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-t1.tfm
new file mode 100644
index 0000000000..51e467ad8e
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-t1--base.tfm
index cb1c1b7f24..8a230b9155 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-t1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-t1.tfm
index ebe4a1de40..92165e9484 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-t1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ts1--base.tfm
index c75fa1adc1..3fb22d1f4a 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ts1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ts1.tfm
index 90004fdea2..56e0ccb1a5 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ts1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-ly1.tfm
index 28c83ac363..450967f977 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-ly1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-ot1.tfm
index a2f26a01a3..54fb28fd91 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-ot1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-t1--base.tfm
index 2b16d4b55a..440ecad284 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-t1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-t1.tfm
index 9ee7c622db..fc99157e07 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-t1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ly1.tfm
new file mode 100644
index 0000000000..6639631da3
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ot1.tfm
new file mode 100644
index 0000000000..6acb09bcf6
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..8e687a0d2d
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ly1.tfm
new file mode 100644
index 0000000000..cc476a390b
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..d895e1b873
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ot1.tfm
new file mode 100644
index 0000000000..5ed7423ee9
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-t1--base.tfm
new file mode 100644
index 0000000000..f0ed18d547
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-t1.tfm
new file mode 100644
index 0000000000..e923ecdcea
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-t1--base.tfm
new file mode 100644
index 0000000000..120078ddeb
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-t1.tfm
new file mode 100644
index 0000000000..e403349f2b
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ts1--base.tfm
new file mode 100644
index 0000000000..3fb22d1f4a
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ts1.tfm
new file mode 100644
index 0000000000..56e0ccb1a5
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tlf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ly1.tfm
new file mode 100644
index 0000000000..b0f001223c
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ot1.tfm
new file mode 100644
index 0000000000..81b2945752
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..8772ffa6c2
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ly1.tfm
new file mode 100644
index 0000000000..e39c396a7a
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..424cb25d44
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ot1.tfm
new file mode 100644
index 0000000000..dfd415b184
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-t1--base.tfm
new file mode 100644
index 0000000000..b401113ecf
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-t1.tfm
new file mode 100644
index 0000000000..6aec5c59fa
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-t1--base.tfm
new file mode 100644
index 0000000000..5901590f20
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-t1.tfm
new file mode 100644
index 0000000000..f4aab49355
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ts1--base.tfm
new file mode 100644
index 0000000000..3fb22d1f4a
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ts1.tfm
new file mode 100644
index 0000000000..56e0ccb1a5
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBold-tosf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ly1.tfm
new file mode 100644
index 0000000000..c7de710a0e
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ot1.tfm
new file mode 100644
index 0000000000..0a07ef69ed
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..cc8839ed7a
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ly1.tfm
new file mode 100644
index 0000000000..59dd8e48ad
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..e1455074b1
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ot1.tfm
new file mode 100644
index 0000000000..75ed6be692
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-t1--base.tfm
new file mode 100644
index 0000000000..93283f64bd
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-t1.tfm
new file mode 100644
index 0000000000..888b5eb91a
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-t1--base.tfm
new file mode 100644
index 0000000000..53584cae28
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-t1.tfm
new file mode 100644
index 0000000000..aa2388b45c
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ts1--base.tfm
new file mode 100644
index 0000000000..cb3510ad9d
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ts1.tfm
new file mode 100644
index 0000000000..b3b6b7f03f
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-lf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ly1.tfm
index c834c367ee..523183e32c 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ly1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ot1.tfm
index 85a0aeacf5..f18c746d57 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ot1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..d1ccb48279
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ly1.tfm
new file mode 100644
index 0000000000..1eeb4aa4e9
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..3a44c72493
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ot1.tfm
new file mode 100644
index 0000000000..b94fd77dac
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-t1--base.tfm
new file mode 100644
index 0000000000..e7111266a4
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-t1.tfm
new file mode 100644
index 0000000000..6a3cfc28a7
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-t1--base.tfm
index 651341a0ce..f6ec40ed42 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-t1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-t1.tfm
index 147016e027..7be17bf2c7 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-t1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ts1--base.tfm
index 94dcbae12d..cb3510ad9d 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ts1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ts1.tfm
index f3f2f8647c..b3b6b7f03f 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ts1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-ly1.tfm
index 8d244f09bd..dbadd52363 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-ly1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-ot1.tfm
index 8a58372387..9f615541c1 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-ot1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-t1--base.tfm
index 30a9eee7c7..1cf228ee36 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-t1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-t1.tfm
index 1202e64007..5bd9698b45 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-t1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ly1.tfm
new file mode 100644
index 0000000000..eb02cdda38
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ot1.tfm
new file mode 100644
index 0000000000..5163d3e5f4
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..53bc1b6cac
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1.tfm
new file mode 100644
index 0000000000..7ff90ba7a5
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..28cb119702
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1.tfm
new file mode 100644
index 0000000000..ab557bff5e
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-t1--base.tfm
new file mode 100644
index 0000000000..1b5b2761df
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-t1.tfm
new file mode 100644
index 0000000000..1b88c0cbfc
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-t1--base.tfm
new file mode 100644
index 0000000000..0846378b0a
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-t1.tfm
new file mode 100644
index 0000000000..8c76e541f3
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ts1--base.tfm
new file mode 100644
index 0000000000..cb3510ad9d
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ts1.tfm
new file mode 100644
index 0000000000..b3b6b7f03f
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tlf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ly1.tfm
new file mode 100644
index 0000000000..3c65e4cd77
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ot1.tfm
new file mode 100644
index 0000000000..cc55dee41c
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..7eaac045ba
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1.tfm
new file mode 100644
index 0000000000..c9127e5fcd
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..dabf6f22b9
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1.tfm
new file mode 100644
index 0000000000..c4930d88d7
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-t1--base.tfm
new file mode 100644
index 0000000000..e97051aca5
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-t1.tfm
new file mode 100644
index 0000000000..68fe13153c
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-t1--base.tfm
new file mode 100644
index 0000000000..49163b227b
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-t1.tfm
new file mode 100644
index 0000000000..cc75e253b0
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ts1--base.tfm
new file mode 100644
index 0000000000..cb3510ad9d
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ts1.tfm
new file mode 100644
index 0000000000..b3b6b7f03f
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-tosf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ly1.tfm
new file mode 100644
index 0000000000..8557924a1f
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ot1.tfm
new file mode 100644
index 0000000000..c8ebbdbf6f
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..2772ede53c
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ly1.tfm
new file mode 100644
index 0000000000..f2f1534c55
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..1e059b6cc5
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ot1.tfm
new file mode 100644
index 0000000000..9fc35113de
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-t1--base.tfm
new file mode 100644
index 0000000000..91cf9839c3
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-t1.tfm
new file mode 100644
index 0000000000..294b0a4c18
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-t1--base.tfm
new file mode 100644
index 0000000000..b5d38336b1
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-t1.tfm
new file mode 100644
index 0000000000..5da3c8da11
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ts1--base.tfm
new file mode 100644
index 0000000000..eb6440c9ea
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ts1.tfm
new file mode 100644
index 0000000000..1fa8522fac
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-lf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ly1.tfm
index 65cc2cbf3d..0934671583 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ly1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ot1.tfm
index 75b411aaca..1730358acf 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ot1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..5b7974d307
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ly1.tfm
new file mode 100644
index 0000000000..6e11fc64ec
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..93669d369b
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ot1.tfm
new file mode 100644
index 0000000000..cb0497535d
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-t1--base.tfm
new file mode 100644
index 0000000000..8b2d9876cb
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-t1.tfm
new file mode 100644
index 0000000000..0a655e646e
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-t1--base.tfm
index 040dc3ed2e..9208ea8c2d 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-t1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-t1.tfm
index 08f25ea536..32bd512e9c 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-t1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ts1--base.tfm
index 5f353a3dc1..eb6440c9ea 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ts1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ts1.tfm
index bffa1983c0..1fa8522fac 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ts1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-sup-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-sup-ly1.tfm
index b3be3b818a..c6f5304a09 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Italic-sup-ly1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-sup-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-sup-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-sup-ot1.tfm
index 56a0db2a25..15935f0fd9 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Italic-sup-ot1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-sup-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-sup-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-sup-t1--base.tfm
index b7b5e7307a..c8d4a701ab 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Italic-sup-t1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-sup-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-sup-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-sup-t1.tfm
index e8919c17c4..88d540a66c 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Italic-sup-t1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-sup-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ly1.tfm
new file mode 100644
index 0000000000..db0af668a9
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ot1.tfm
new file mode 100644
index 0000000000..1639568b42
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..991fbcdd6b
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ly1.tfm
new file mode 100644
index 0000000000..c3fe1ed918
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..bb781e853c
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ot1.tfm
new file mode 100644
index 0000000000..543e55aba3
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-t1--base.tfm
new file mode 100644
index 0000000000..f17b8b129c
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-t1.tfm
new file mode 100644
index 0000000000..2522e31ae7
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-t1--base.tfm
new file mode 100644
index 0000000000..2e32e6398d
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-t1.tfm
new file mode 100644
index 0000000000..7eebd0fd47
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ts1--base.tfm
new file mode 100644
index 0000000000..eb6440c9ea
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ts1.tfm
new file mode 100644
index 0000000000..1fa8522fac
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tlf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ly1.tfm
new file mode 100644
index 0000000000..43bc113ff4
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ot1.tfm
new file mode 100644
index 0000000000..f01c7d505f
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..5abf7f1df9
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ly1.tfm
new file mode 100644
index 0000000000..4755730685
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..5c1b7e5749
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ot1.tfm
new file mode 100644
index 0000000000..1bda4eddd9
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-t1--base.tfm
new file mode 100644
index 0000000000..ace0d2df32
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-t1.tfm
new file mode 100644
index 0000000000..055222c257
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-t1--base.tfm
new file mode 100644
index 0000000000..c3be004952
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-t1.tfm
new file mode 100644
index 0000000000..3a01439efa
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ts1--base.tfm
new file mode 100644
index 0000000000..eb6440c9ea
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ts1.tfm
new file mode 100644
index 0000000000..1fa8522fac
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Italic-tosf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-lf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-ly1.tfm
new file mode 100644
index 0000000000..43ea163a52
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-lf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-ot1.tfm
new file mode 100644
index 0000000000..4a5131d535
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..4637abed9f
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ly1.tfm
new file mode 100644
index 0000000000..bd8b023215
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..658c645ba2
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ot1.tfm
new file mode 100644
index 0000000000..14be626ff7
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-t1--base.tfm
new file mode 100644
index 0000000000..182244da00
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-t1.tfm
new file mode 100644
index 0000000000..9606685f3c
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-lf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-t1--base.tfm
new file mode 100644
index 0000000000..c45f8c3d37
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-lf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-t1.tfm
new file mode 100644
index 0000000000..cd86be9608
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-lf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-ts1--base.tfm
new file mode 100644
index 0000000000..eb4fd3c4ad
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-lf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-ts1.tfm
new file mode 100644
index 0000000000..4413beef5e
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-lf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-osf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-ly1.tfm
index 3b07f9b30d..0d6d708f2f 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Light-osf-ly1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-osf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-ot1.tfm
index ca976e7089..30241b1753 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Light-osf-ot1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..220bc06274
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ly1.tfm
new file mode 100644
index 0000000000..874fe9afb1
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..3d0f232289
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ot1.tfm
new file mode 100644
index 0000000000..94b3f9b5d6
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-t1--base.tfm
new file mode 100644
index 0000000000..db406dc307
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-t1.tfm
new file mode 100644
index 0000000000..dfd44f20bd
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-osf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-t1--base.tfm
index a8b5574abb..1c91b5b328 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Light-osf-t1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-osf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-t1.tfm
index a8b5c76c57..d8d9999f7d 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Light-osf-t1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-osf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-ts1--base.tfm
index 4abd426239..eb4fd3c4ad 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Light-osf-ts1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-osf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-ts1.tfm
index 6caca655e5..4413beef5e 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Light-osf-ts1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-osf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-sup-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-sup-ly1.tfm
index 788e6d0142..0bfb7ff548 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Light-sup-ly1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-sup-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-sup-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-sup-ot1.tfm
index 63233a6587..6d71477d92 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Light-sup-ot1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-sup-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-sup-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-sup-t1--base.tfm
index 3cda61e2dd..d7811a95f7 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Light-sup-t1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-sup-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-sup-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-sup-t1.tfm
index 8173b3752b..8538d4da57 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Light-sup-t1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-sup-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ly1.tfm
new file mode 100644
index 0000000000..c34e2b2979
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ot1.tfm
new file mode 100644
index 0000000000..2820feb854
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..52ed0cd0f0
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ly1.tfm
new file mode 100644
index 0000000000..e39f1fd0db
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..cf24350d29
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ot1.tfm
new file mode 100644
index 0000000000..f63276a8ab
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-t1--base.tfm
new file mode 100644
index 0000000000..2adbe61277
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-t1.tfm
new file mode 100644
index 0000000000..b32d955241
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-t1--base.tfm
new file mode 100644
index 0000000000..ce1fcc5677
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-t1.tfm
new file mode 100644
index 0000000000..1cba6275c6
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ts1--base.tfm
new file mode 100644
index 0000000000..eb4fd3c4ad
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ts1.tfm
new file mode 100644
index 0000000000..4413beef5e
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tlf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ly1.tfm
new file mode 100644
index 0000000000..a57b513639
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ot1.tfm
new file mode 100644
index 0000000000..188a73105b
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..87522d31e8
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ly1.tfm
new file mode 100644
index 0000000000..b50bc9a06c
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..54691bba63
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ot1.tfm
new file mode 100644
index 0000000000..0cdce768d5
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-t1--base.tfm
new file mode 100644
index 0000000000..ce2670ae83
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-t1.tfm
new file mode 100644
index 0000000000..dae50fd0aa
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-t1--base.tfm
new file mode 100644
index 0000000000..1eb480b614
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-t1.tfm
new file mode 100644
index 0000000000..1faf1c9ffa
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ts1--base.tfm
new file mode 100644
index 0000000000..eb4fd3c4ad
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ts1.tfm
new file mode 100644
index 0000000000..4413beef5e
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Light-tosf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ly1.tfm
new file mode 100644
index 0000000000..40f5b891d4
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ot1.tfm
new file mode 100644
index 0000000000..902527d79e
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..0182bf27ca
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ly1.tfm
new file mode 100644
index 0000000000..6691136c21
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..f257582535
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ot1.tfm
new file mode 100644
index 0000000000..e355d165c4
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-t1--base.tfm
new file mode 100644
index 0000000000..ada87f399c
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-t1.tfm
new file mode 100644
index 0000000000..f9bc34ccd9
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-t1--base.tfm
new file mode 100644
index 0000000000..8f7ea93e33
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-t1.tfm
new file mode 100644
index 0000000000..cbc3b51a23
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ts1--base.tfm
new file mode 100644
index 0000000000..e70751fbd2
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ts1.tfm
new file mode 100644
index 0000000000..0f74b75b11
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-lf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ly1.tfm
index ad58fe26a1..0f8cb9270e 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ly1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ot1.tfm
index 60af6e8ed2..29b1f03ba1 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ot1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..6147a3b372
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ly1.tfm
new file mode 100644
index 0000000000..5c2b1e45b0
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..670bc36d5f
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ot1.tfm
new file mode 100644
index 0000000000..70cf36e50f
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-t1--base.tfm
new file mode 100644
index 0000000000..e442d9225b
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-t1.tfm
new file mode 100644
index 0000000000..d99ca0768d
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-t1--base.tfm
index f70afc9b9e..6df6b8ddde 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-t1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-t1.tfm
index 138144ff04..e2cd48a681 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-t1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ts1--base.tfm
index 0725a25268..e70751fbd2 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ts1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ts1.tfm
index 6436eccbbd..0f74b75b11 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ts1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-ly1.tfm
index fb53004ed0..46046e2016 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-ly1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-ot1.tfm
index 79fb78a103..b4c781cd3e 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-ot1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-t1--base.tfm
index 6c472cb844..4bce94f5db 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-t1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-t1.tfm
index 1c91d760b3..03466534bd 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-t1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ly1.tfm
new file mode 100644
index 0000000000..39a28a9804
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ot1.tfm
new file mode 100644
index 0000000000..edac801bc8
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..4c1ca0a7d6
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ly1.tfm
new file mode 100644
index 0000000000..807bdc9a17
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..c0266df1ad
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ot1.tfm
new file mode 100644
index 0000000000..d92e6a9913
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-t1--base.tfm
new file mode 100644
index 0000000000..84e77687d4
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-t1.tfm
new file mode 100644
index 0000000000..d1764db52a
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-t1--base.tfm
new file mode 100644
index 0000000000..2fa45533a9
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-t1.tfm
new file mode 100644
index 0000000000..29cbd7a29f
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ts1--base.tfm
new file mode 100644
index 0000000000..e70751fbd2
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ts1.tfm
new file mode 100644
index 0000000000..0f74b75b11
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tlf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ly1.tfm
new file mode 100644
index 0000000000..713c7e36d6
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ot1.tfm
new file mode 100644
index 0000000000..ea9eaaaeb6
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..85efaf0b67
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ly1.tfm
new file mode 100644
index 0000000000..8cb3093960
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..833531bc9d
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ot1.tfm
new file mode 100644
index 0000000000..7aea0a96b3
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-t1--base.tfm
new file mode 100644
index 0000000000..e63897d8cf
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-t1.tfm
new file mode 100644
index 0000000000..732b3e8209
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-t1--base.tfm
new file mode 100644
index 0000000000..01f094f3f0
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-t1.tfm
new file mode 100644
index 0000000000..326a77f9c8
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ts1--base.tfm
new file mode 100644
index 0000000000..e70751fbd2
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ts1.tfm
new file mode 100644
index 0000000000..0f74b75b11
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-LightItalic-tosf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ly1.tfm
new file mode 100644
index 0000000000..e6f9502f63
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ot1.tfm
new file mode 100644
index 0000000000..1a73c6f9f8
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..6a0e535e21
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ly1.tfm
new file mode 100644
index 0000000000..84badc7b57
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..d4cfb11851
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ot1.tfm
new file mode 100644
index 0000000000..2047d958be
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-t1--base.tfm
new file mode 100644
index 0000000000..6ee89945dd
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-t1.tfm
new file mode 100644
index 0000000000..01b27d9d7e
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-t1--base.tfm
new file mode 100644
index 0000000000..385065dd8b
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-t1.tfm
new file mode 100644
index 0000000000..73e5668833
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ts1--base.tfm
new file mode 100644
index 0000000000..7073502838
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ts1.tfm
new file mode 100644
index 0000000000..bdfbdef8a8
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-lf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ly1.tfm
index 91d9522091..41efc07c7b 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ly1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ot1.tfm
index 715341a53c..4e78f6d9ad 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ot1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..2e5c2bbce1
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ly1.tfm
new file mode 100644
index 0000000000..3c6ccd18fb
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..6f7faa69e4
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ot1.tfm
new file mode 100644
index 0000000000..e68eca7276
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-t1--base.tfm
new file mode 100644
index 0000000000..1c74c4eb87
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-t1.tfm
new file mode 100644
index 0000000000..cea85c7299
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-t1--base.tfm
index 857f6c40b3..5ed3aad207 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-t1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-t1.tfm
index fdcf58ea98..d2786f018e 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-t1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ts1--base.tfm
index 6dc8d9c6d1..7073502838 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ts1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ts1.tfm
index 3fc32c17ab..bdfbdef8a8 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ts1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-sup-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-sup-ly1.tfm
index 0be97443a3..e767201230 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Regular-sup-ly1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-sup-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-sup-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-sup-ot1.tfm
index 0d3472831d..8f69bc72e9 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Regular-sup-ot1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-sup-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-sup-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-sup-t1--base.tfm
index 60e14ae7fe..8d58d72985 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Regular-sup-t1--base.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-sup-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-sup-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-sup-t1.tfm
index 64855be334..bda032e10c 100644
--- a/fonts/merriweather/tfm/MerriwthrSans-Regular-sup-t1.tfm
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-sup-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ly1.tfm
new file mode 100644
index 0000000000..f162854447
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ot1.tfm
new file mode 100644
index 0000000000..0ed7b0e06f
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..340b85e7a3
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ly1.tfm
new file mode 100644
index 0000000000..8de1b7a097
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..4fc0a928d8
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ot1.tfm
new file mode 100644
index 0000000000..8c1976884e
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-t1--base.tfm
new file mode 100644
index 0000000000..b5ea38a10f
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-t1.tfm
new file mode 100644
index 0000000000..bfd352137c
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-t1--base.tfm
new file mode 100644
index 0000000000..666e109111
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-t1.tfm
new file mode 100644
index 0000000000..562bdad4c4
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ts1--base.tfm
new file mode 100644
index 0000000000..7073502838
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ts1.tfm
new file mode 100644
index 0000000000..bdfbdef8a8
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tlf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ly1.tfm
new file mode 100644
index 0000000000..cf0b6c5e35
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ot1.tfm
new file mode 100644
index 0000000000..a72eedf122
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ly1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ly1--base.tfm
new file mode 100644
index 0000000000..a8930ec981
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ly1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ly1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ly1.tfm
new file mode 100644
index 0000000000..6ec9c8004b
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ly1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ot1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ot1--base.tfm
new file mode 100644
index 0000000000..de82c68761
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ot1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ot1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ot1.tfm
new file mode 100644
index 0000000000..8688209a92
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-ot1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-t1--base.tfm
new file mode 100644
index 0000000000..cc99edff9d
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-t1.tfm
new file mode 100644
index 0000000000..e683ddb065
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-sc-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-t1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-t1--base.tfm
new file mode 100644
index 0000000000..4d15143428
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-t1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-t1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-t1.tfm
new file mode 100644
index 0000000000..2ac563b48f
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-t1.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ts1--base.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ts1--base.tfm
new file mode 100644
index 0000000000..7073502838
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ts1--base.tfm
Binary files differ
diff --git a/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ts1.tfm b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ts1.tfm
new file mode 100644
index 0000000000..bdfbdef8a8
--- /dev/null
+++ b/fonts/merriweather/tfm/MerriwthrSans-Regular-tosf-ts1.tfm
Binary files differ
diff --git a/fonts/merriweather/truetype/Merriweather-Bold.ttf b/fonts/merriweather/truetype/Merriweather-Bold.ttf
deleted file mode 100644
index 4431bddc46..0000000000
--- a/fonts/merriweather/truetype/Merriweather-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/truetype/Merriweather-BoldIt.ttf b/fonts/merriweather/truetype/Merriweather-BoldIt.ttf
deleted file mode 100644
index d6f11c8c7a..0000000000
--- a/fonts/merriweather/truetype/Merriweather-BoldIt.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/truetype/Merriweather-Italic.ttf b/fonts/merriweather/truetype/Merriweather-Italic.ttf
deleted file mode 100644
index c5ab14a434..0000000000
--- a/fonts/merriweather/truetype/Merriweather-Italic.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/truetype/Merriweather-Light.ttf b/fonts/merriweather/truetype/Merriweather-Light.ttf
deleted file mode 100644
index 9364fd8cbb..0000000000
--- a/fonts/merriweather/truetype/Merriweather-Light.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/truetype/Merriweather-LightIt.ttf b/fonts/merriweather/truetype/Merriweather-LightIt.ttf
deleted file mode 100644
index c9713d1e4d..0000000000
--- a/fonts/merriweather/truetype/Merriweather-LightIt.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/truetype/Merriweather-Regular.ttf b/fonts/merriweather/truetype/Merriweather-Regular.ttf
deleted file mode 100644
index f027065313..0000000000
--- a/fonts/merriweather/truetype/Merriweather-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/truetype/Merriweather-UltraBdIt.ttf b/fonts/merriweather/truetype/Merriweather-UltraBdIt.ttf
deleted file mode 100644
index 6127f3072c..0000000000
--- a/fonts/merriweather/truetype/Merriweather-UltraBdIt.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/truetype/Merriweather-UltraBold.ttf b/fonts/merriweather/truetype/Merriweather-UltraBold.ttf
deleted file mode 100644
index 74114bb300..0000000000
--- a/fonts/merriweather/truetype/Merriweather-UltraBold.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/truetype/MerriweatherSans-Bold.ttf b/fonts/merriweather/truetype/MerriweatherSans-Bold.ttf
deleted file mode 100644
index b9aa9608c1..0000000000
--- a/fonts/merriweather/truetype/MerriweatherSans-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/truetype/MerriweatherSans-BoldItalic.ttf b/fonts/merriweather/truetype/MerriweatherSans-BoldItalic.ttf
deleted file mode 100644
index 1a132754e7..0000000000
--- a/fonts/merriweather/truetype/MerriweatherSans-BoldItalic.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/truetype/MerriweatherSans-ExBoldIt.ttf b/fonts/merriweather/truetype/MerriweatherSans-ExBoldIt.ttf
deleted file mode 100644
index d8fa71fa8f..0000000000
--- a/fonts/merriweather/truetype/MerriweatherSans-ExBoldIt.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/truetype/MerriweatherSans-ExtraBold.ttf b/fonts/merriweather/truetype/MerriweatherSans-ExtraBold.ttf
deleted file mode 100644
index c019127781..0000000000
--- a/fonts/merriweather/truetype/MerriweatherSans-ExtraBold.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/truetype/MerriweatherSans-Italic.ttf b/fonts/merriweather/truetype/MerriweatherSans-Italic.ttf
deleted file mode 100644
index c7ee07a877..0000000000
--- a/fonts/merriweather/truetype/MerriweatherSans-Italic.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/truetype/MerriweatherSans-Light.ttf b/fonts/merriweather/truetype/MerriweatherSans-Light.ttf
deleted file mode 100644
index a1ef4037ad..0000000000
--- a/fonts/merriweather/truetype/MerriweatherSans-Light.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/truetype/MerriweatherSans-LightItalic.ttf b/fonts/merriweather/truetype/MerriweatherSans-LightItalic.ttf
deleted file mode 100644
index 794ce73bf2..0000000000
--- a/fonts/merriweather/truetype/MerriweatherSans-LightItalic.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/truetype/MerriweatherSans-Regular.ttf b/fonts/merriweather/truetype/MerriweatherSans-Regular.ttf
deleted file mode 100644
index 1c544cf085..0000000000
--- a/fonts/merriweather/truetype/MerriweatherSans-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/type1/Merriwthr-Black.pfb b/fonts/merriweather/type1/Merriwthr-Black.pfb
new file mode 100644
index 0000000000..517f9f1917
--- /dev/null
+++ b/fonts/merriweather/type1/Merriwthr-Black.pfb
Binary files differ
diff --git a/fonts/merriweather/type1/Merriwthr-BlackItalic.pfb b/fonts/merriweather/type1/Merriwthr-BlackItalic.pfb
new file mode 100644
index 0000000000..d45fad850d
--- /dev/null
+++ b/fonts/merriweather/type1/Merriwthr-BlackItalic.pfb
Binary files differ
diff --git a/fonts/merriweather/type1/Merriwthr-Bold.pfb b/fonts/merriweather/type1/Merriwthr-Bold.pfb
index e236bb0ee3..898761e7a5 100644
--- a/fonts/merriweather/type1/Merriwthr-Bold.pfb
+++ b/fonts/merriweather/type1/Merriwthr-Bold.pfb
Binary files differ
diff --git a/fonts/merriweather/type1/Merriwthr-BoldIt.pfb b/fonts/merriweather/type1/Merriwthr-BoldIt.pfb
deleted file mode 100644
index 586c630029..0000000000
--- a/fonts/merriweather/type1/Merriwthr-BoldIt.pfb
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/type1/Merriwthr-BoldItalic.pfb b/fonts/merriweather/type1/Merriwthr-BoldItalic.pfb
new file mode 100644
index 0000000000..4481f24a7d
--- /dev/null
+++ b/fonts/merriweather/type1/Merriwthr-BoldItalic.pfb
Binary files differ
diff --git a/fonts/merriweather/type1/Merriwthr-Italic.pfb b/fonts/merriweather/type1/Merriwthr-Italic.pfb
index 967d8938b6..3d7b6edfc8 100644
--- a/fonts/merriweather/type1/Merriwthr-Italic.pfb
+++ b/fonts/merriweather/type1/Merriwthr-Italic.pfb
Binary files differ
diff --git a/fonts/merriweather/type1/Merriwthr-Light.pfb b/fonts/merriweather/type1/Merriwthr-Light.pfb
index 3d7b862fc0..3fde5ab7a6 100644
--- a/fonts/merriweather/type1/Merriwthr-Light.pfb
+++ b/fonts/merriweather/type1/Merriwthr-Light.pfb
Binary files differ
diff --git a/fonts/merriweather/type1/Merriwthr-LightIt.pfb b/fonts/merriweather/type1/Merriwthr-LightIt.pfb
deleted file mode 100644
index 041098aa34..0000000000
--- a/fonts/merriweather/type1/Merriwthr-LightIt.pfb
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/type1/Merriwthr-LightItalic.pfb b/fonts/merriweather/type1/Merriwthr-LightItalic.pfb
new file mode 100644
index 0000000000..11c01906f2
--- /dev/null
+++ b/fonts/merriweather/type1/Merriwthr-LightItalic.pfb
Binary files differ
diff --git a/fonts/merriweather/type1/Merriwthr-Regular.pfb b/fonts/merriweather/type1/Merriwthr-Regular.pfb
index c6a3b0d184..cb18dc72a9 100644
--- a/fonts/merriweather/type1/Merriwthr-Regular.pfb
+++ b/fonts/merriweather/type1/Merriwthr-Regular.pfb
Binary files differ
diff --git a/fonts/merriweather/type1/Merriwthr-UltraBdIt.pfb b/fonts/merriweather/type1/Merriwthr-UltraBdIt.pfb
deleted file mode 100644
index 01e8199d09..0000000000
--- a/fonts/merriweather/type1/Merriwthr-UltraBdIt.pfb
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/type1/Merriwthr-UltraBold.pfb b/fonts/merriweather/type1/Merriwthr-UltraBold.pfb
deleted file mode 100644
index 5e36bdf4cc..0000000000
--- a/fonts/merriweather/type1/Merriwthr-UltraBold.pfb
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/type1/MerriwthrSans-Bold.pfb b/fonts/merriweather/type1/MerriwthrSans-Bold.pfb
index daad4fb791..a51117822e 100644
--- a/fonts/merriweather/type1/MerriwthrSans-Bold.pfb
+++ b/fonts/merriweather/type1/MerriwthrSans-Bold.pfb
Binary files differ
diff --git a/fonts/merriweather/type1/MerriwthrSans-BoldItalic.pfb b/fonts/merriweather/type1/MerriwthrSans-BoldItalic.pfb
index 5507d584bb..f26130e8f5 100644
--- a/fonts/merriweather/type1/MerriwthrSans-BoldItalic.pfb
+++ b/fonts/merriweather/type1/MerriwthrSans-BoldItalic.pfb
Binary files differ
diff --git a/fonts/merriweather/type1/MerriwthrSans-ExBoldIt.pfb b/fonts/merriweather/type1/MerriwthrSans-ExBoldIt.pfb
deleted file mode 100644
index 8218b11950..0000000000
--- a/fonts/merriweather/type1/MerriwthrSans-ExBoldIt.pfb
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/type1/MerriwthrSans-ExtraBold.pfb b/fonts/merriweather/type1/MerriwthrSans-ExtraBold.pfb
index 2aa9215546..0fd68294b1 100644
--- a/fonts/merriweather/type1/MerriwthrSans-ExtraBold.pfb
+++ b/fonts/merriweather/type1/MerriwthrSans-ExtraBold.pfb
Binary files differ
diff --git a/fonts/merriweather/type1/MerriwthrSans-ExtraBoldItalic.pfb b/fonts/merriweather/type1/MerriwthrSans-ExtraBoldItalic.pfb
new file mode 100644
index 0000000000..da21e0e8b0
--- /dev/null
+++ b/fonts/merriweather/type1/MerriwthrSans-ExtraBoldItalic.pfb
Binary files differ
diff --git a/fonts/merriweather/type1/MerriwthrSans-Italic.pfb b/fonts/merriweather/type1/MerriwthrSans-Italic.pfb
index 0fb59d61b2..3ac636dc6c 100644
--- a/fonts/merriweather/type1/MerriwthrSans-Italic.pfb
+++ b/fonts/merriweather/type1/MerriwthrSans-Italic.pfb
Binary files differ
diff --git a/fonts/merriweather/type1/MerriwthrSans-Light.pfb b/fonts/merriweather/type1/MerriwthrSans-Light.pfb
index 2c488f6e14..b9cc7102d0 100644
--- a/fonts/merriweather/type1/MerriwthrSans-Light.pfb
+++ b/fonts/merriweather/type1/MerriwthrSans-Light.pfb
Binary files differ
diff --git a/fonts/merriweather/type1/MerriwthrSans-LightItalic.pfb b/fonts/merriweather/type1/MerriwthrSans-LightItalic.pfb
index 829191c6c1..cf78f015bd 100644
--- a/fonts/merriweather/type1/MerriwthrSans-LightItalic.pfb
+++ b/fonts/merriweather/type1/MerriwthrSans-LightItalic.pfb
Binary files differ
diff --git a/fonts/merriweather/type1/MerriwthrSans-Regular.pfb b/fonts/merriweather/type1/MerriwthrSans-Regular.pfb
index 99542a1b42..b09a3828ba 100644
--- a/fonts/merriweather/type1/MerriwthrSans-Regular.pfb
+++ b/fonts/merriweather/type1/MerriwthrSans-Regular.pfb
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-lf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Black-lf-sc-ly1.vf
new file mode 100644
index 0000000000..7885ef7fac
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-lf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-lf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Black-lf-sc-ot1.vf
new file mode 100644
index 0000000000..251f60da51
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-lf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-lf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Black-lf-sc-t1.vf
new file mode 100644
index 0000000000..62263bfbe9
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-lf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-lf-t1.vf b/fonts/merriweather/vf/Merriwthr-Black-lf-t1.vf
new file mode 100644
index 0000000000..a9890d549d
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-lf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-lf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Black-lf-ts1.vf
new file mode 100644
index 0000000000..fec6cdfbd1
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-lf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-osf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Black-osf-sc-ly1.vf
new file mode 100644
index 0000000000..44cde8be96
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-osf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-osf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Black-osf-sc-ot1.vf
new file mode 100644
index 0000000000..bf4631579c
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-osf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-osf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Black-osf-sc-t1.vf
new file mode 100644
index 0000000000..4146693760
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-osf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-osf-t1.vf b/fonts/merriweather/vf/Merriwthr-Black-osf-t1.vf
new file mode 100644
index 0000000000..a72edfd512
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-osf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-osf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Black-osf-ts1.vf
new file mode 100644
index 0000000000..6839838552
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-osf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-sup-t1.vf b/fonts/merriweather/vf/Merriwthr-Black-sup-t1.vf
new file mode 100644
index 0000000000..11286bac2f
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-sup-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-tlf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Black-tlf-sc-ly1.vf
new file mode 100644
index 0000000000..dfa67e5192
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-tlf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-tlf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Black-tlf-sc-ot1.vf
new file mode 100644
index 0000000000..9dec8ac756
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-tlf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-tlf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Black-tlf-sc-t1.vf
new file mode 100644
index 0000000000..3538587cf4
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-tlf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-tlf-t1.vf b/fonts/merriweather/vf/Merriwthr-Black-tlf-t1.vf
new file mode 100644
index 0000000000..a807d06c17
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-tlf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-tlf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Black-tlf-ts1.vf
new file mode 100644
index 0000000000..ce68cda8d9
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-tlf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-tosf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Black-tosf-sc-ly1.vf
new file mode 100644
index 0000000000..5bf5c41ed6
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-tosf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-tosf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Black-tosf-sc-ot1.vf
new file mode 100644
index 0000000000..cce15ec778
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-tosf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-tosf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Black-tosf-sc-t1.vf
new file mode 100644
index 0000000000..2755410e24
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-tosf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-tosf-t1.vf b/fonts/merriweather/vf/Merriwthr-Black-tosf-t1.vf
new file mode 100644
index 0000000000..c466e7af6a
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-tosf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Black-tosf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Black-tosf-ts1.vf
new file mode 100644
index 0000000000..3de8270c06
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Black-tosf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-lf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-lf-sc-ly1.vf
new file mode 100644
index 0000000000..a8bae4dc6c
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-lf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-lf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-lf-sc-ot1.vf
new file mode 100644
index 0000000000..17600f38f0
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-lf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-lf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-lf-sc-t1.vf
new file mode 100644
index 0000000000..19e335e93f
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-lf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-lf-t1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-lf-t1.vf
new file mode 100644
index 0000000000..e9f3100cd3
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-lf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-lf-ts1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-lf-ts1.vf
new file mode 100644
index 0000000000..62c70d9a35
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-lf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-osf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-osf-sc-ly1.vf
new file mode 100644
index 0000000000..0f729fbdb6
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-osf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-osf-sc-ot1.vf
new file mode 100644
index 0000000000..1ac5e35638
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-osf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-osf-sc-t1.vf
new file mode 100644
index 0000000000..dc2a6825d6
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-osf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-osf-t1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-osf-t1.vf
new file mode 100644
index 0000000000..d4c88ee992
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-osf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-osf-ts1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-osf-ts1.vf
new file mode 100644
index 0000000000..c4139349c3
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-osf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-sup-t1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-sup-t1.vf
new file mode 100644
index 0000000000..9c45870aeb
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-sup-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-sc-ly1.vf
new file mode 100644
index 0000000000..f5c434ceb0
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-sc-ot1.vf
new file mode 100644
index 0000000000..33d0884eda
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-sc-t1.vf
new file mode 100644
index 0000000000..a86feb0b5e
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-t1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-t1.vf
new file mode 100644
index 0000000000..4bf1f7d4c1
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-ts1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-ts1.vf
new file mode 100644
index 0000000000..f9e341794e
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-tlf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-sc-ly1.vf
new file mode 100644
index 0000000000..afa47cd1a3
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-sc-ot1.vf
new file mode 100644
index 0000000000..0f2093bfe3
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-sc-t1.vf
new file mode 100644
index 0000000000..172399819f
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-t1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-t1.vf
new file mode 100644
index 0000000000..031d37530f
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-ts1.vf b/fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-ts1.vf
new file mode 100644
index 0000000000..519d7fda79
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BlackItalic-tosf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-lf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Bold-lf-sc-ly1.vf
new file mode 100644
index 0000000000..9c85f3491a
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Bold-lf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-lf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Bold-lf-sc-ot1.vf
new file mode 100644
index 0000000000..370e8b7fbe
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Bold-lf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-lf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Bold-lf-sc-t1.vf
new file mode 100644
index 0000000000..f0c9082324
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Bold-lf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-lf-t1.vf b/fonts/merriweather/vf/Merriwthr-Bold-lf-t1.vf
new file mode 100644
index 0000000000..713d4bc3c2
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Bold-lf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-lf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Bold-lf-ts1.vf
new file mode 100644
index 0000000000..65be4488aa
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Bold-lf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-osf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Bold-osf-sc-ly1.vf
new file mode 100644
index 0000000000..fca1154122
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Bold-osf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-osf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Bold-osf-sc-ot1.vf
new file mode 100644
index 0000000000..d7e8cce8cc
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Bold-osf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-osf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Bold-osf-sc-t1.vf
new file mode 100644
index 0000000000..df99e07624
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Bold-osf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-osf-t1.vf b/fonts/merriweather/vf/Merriwthr-Bold-osf-t1.vf
index 7a54869a67..310ba6891d 100644
--- a/fonts/merriweather/vf/Merriwthr-Bold-osf-t1.vf
+++ b/fonts/merriweather/vf/Merriwthr-Bold-osf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-osf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Bold-osf-ts1.vf
index ab225c151c..0d3c81d16b 100644
--- a/fonts/merriweather/vf/Merriwthr-Bold-osf-ts1.vf
+++ b/fonts/merriweather/vf/Merriwthr-Bold-osf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-sup-t1.vf b/fonts/merriweather/vf/Merriwthr-Bold-sup-t1.vf
new file mode 100644
index 0000000000..138b808311
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Bold-sup-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-tlf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Bold-tlf-sc-ly1.vf
new file mode 100644
index 0000000000..611ae1fa8f
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Bold-tlf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-tlf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Bold-tlf-sc-ot1.vf
new file mode 100644
index 0000000000..baf2fe28de
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Bold-tlf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-tlf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Bold-tlf-sc-t1.vf
new file mode 100644
index 0000000000..ab918df5b1
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Bold-tlf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-tlf-t1.vf b/fonts/merriweather/vf/Merriwthr-Bold-tlf-t1.vf
new file mode 100644
index 0000000000..9c2b7cdbd8
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Bold-tlf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-tlf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Bold-tlf-ts1.vf
new file mode 100644
index 0000000000..5491024381
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Bold-tlf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-tosf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Bold-tosf-sc-ly1.vf
new file mode 100644
index 0000000000..97ce93aad0
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Bold-tosf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-tosf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Bold-tosf-sc-ot1.vf
new file mode 100644
index 0000000000..a64c9c6ace
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Bold-tosf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-tosf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Bold-tosf-sc-t1.vf
new file mode 100644
index 0000000000..6834afdff4
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Bold-tosf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-tosf-t1.vf b/fonts/merriweather/vf/Merriwthr-Bold-tosf-t1.vf
new file mode 100644
index 0000000000..2eca0472d7
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Bold-tosf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Bold-tosf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Bold-tosf-ts1.vf
new file mode 100644
index 0000000000..c1a0b6e4b7
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Bold-tosf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-lf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-lf-sc-ly1.vf
new file mode 100644
index 0000000000..29c770afe2
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-lf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-lf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-lf-sc-ot1.vf
new file mode 100644
index 0000000000..5c40ee717e
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-lf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-lf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-lf-sc-t1.vf
new file mode 100644
index 0000000000..f50acfd707
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-lf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-lf-t1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-lf-t1.vf
new file mode 100644
index 0000000000..48e09c681e
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-lf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-lf-ts1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-lf-ts1.vf
new file mode 100644
index 0000000000..6f3997c9aa
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-lf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-osf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-osf-sc-ly1.vf
new file mode 100644
index 0000000000..d1fedc1a30
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-osf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-osf-sc-ot1.vf
new file mode 100644
index 0000000000..640adaab75
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-osf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-osf-sc-t1.vf
new file mode 100644
index 0000000000..1bbe2ea706
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-osf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-osf-t1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-osf-t1.vf
index d596b59899..abc02fd468 100644
--- a/fonts/merriweather/vf/Merriwthr-BoldItalic-osf-t1.vf
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-osf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-osf-ts1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-osf-ts1.vf
index e20620ea9f..82ba023e64 100644
--- a/fonts/merriweather/vf/Merriwthr-BoldItalic-osf-ts1.vf
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-osf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-sup-t1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-sup-t1.vf
new file mode 100644
index 0000000000..e0dd38e88b
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-sup-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-sc-ly1.vf
new file mode 100644
index 0000000000..4abebf8a6c
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-sc-ot1.vf
new file mode 100644
index 0000000000..c272190946
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-sc-t1.vf
new file mode 100644
index 0000000000..f6262884a9
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-t1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-t1.vf
new file mode 100644
index 0000000000..5670c1e3f3
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-ts1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-ts1.vf
new file mode 100644
index 0000000000..f7a060ddca
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-tlf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-sc-ly1.vf
new file mode 100644
index 0000000000..7e861cb6fa
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-sc-ot1.vf
new file mode 100644
index 0000000000..2892968e95
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-sc-t1.vf
new file mode 100644
index 0000000000..f5a1a43da2
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-t1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-t1.vf
new file mode 100644
index 0000000000..a0a96c1f9a
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-ts1.vf b/fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-ts1.vf
new file mode 100644
index 0000000000..97c24237ec
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-BoldItalic-tosf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-lf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Italic-lf-sc-ly1.vf
new file mode 100644
index 0000000000..a3ff090ea1
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Italic-lf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-lf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Italic-lf-sc-ot1.vf
new file mode 100644
index 0000000000..0d36565dd1
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Italic-lf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-lf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Italic-lf-sc-t1.vf
new file mode 100644
index 0000000000..c024928bf6
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Italic-lf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-lf-t1.vf b/fonts/merriweather/vf/Merriwthr-Italic-lf-t1.vf
new file mode 100644
index 0000000000..45ba0072cf
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Italic-lf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-lf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Italic-lf-ts1.vf
new file mode 100644
index 0000000000..bc98aeca29
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Italic-lf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-osf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Italic-osf-sc-ly1.vf
new file mode 100644
index 0000000000..1c5e4a4bea
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Italic-osf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-osf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Italic-osf-sc-ot1.vf
new file mode 100644
index 0000000000..ca5c71e49c
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Italic-osf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-osf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Italic-osf-sc-t1.vf
new file mode 100644
index 0000000000..e340e1f07d
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Italic-osf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-osf-t1.vf b/fonts/merriweather/vf/Merriwthr-Italic-osf-t1.vf
index da8ea51560..1bbf923914 100644
--- a/fonts/merriweather/vf/Merriwthr-Italic-osf-t1.vf
+++ b/fonts/merriweather/vf/Merriwthr-Italic-osf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-osf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Italic-osf-ts1.vf
index 12d4794b0b..297717e154 100644
--- a/fonts/merriweather/vf/Merriwthr-Italic-osf-ts1.vf
+++ b/fonts/merriweather/vf/Merriwthr-Italic-osf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-sup-t1.vf b/fonts/merriweather/vf/Merriwthr-Italic-sup-t1.vf
new file mode 100644
index 0000000000..d01c0e6f9a
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Italic-sup-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-tlf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Italic-tlf-sc-ly1.vf
new file mode 100644
index 0000000000..cbba7bc0b3
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Italic-tlf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-tlf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Italic-tlf-sc-ot1.vf
new file mode 100644
index 0000000000..faaea0ee31
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Italic-tlf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-tlf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Italic-tlf-sc-t1.vf
new file mode 100644
index 0000000000..b65f0242ab
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Italic-tlf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-tlf-t1.vf b/fonts/merriweather/vf/Merriwthr-Italic-tlf-t1.vf
new file mode 100644
index 0000000000..cfd96e4fb1
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Italic-tlf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-tlf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Italic-tlf-ts1.vf
new file mode 100644
index 0000000000..b0bf52cd7a
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Italic-tlf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-tosf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Italic-tosf-sc-ly1.vf
new file mode 100644
index 0000000000..0245877bc8
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Italic-tosf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-tosf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Italic-tosf-sc-ot1.vf
new file mode 100644
index 0000000000..d2ad88d453
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Italic-tosf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-tosf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Italic-tosf-sc-t1.vf
new file mode 100644
index 0000000000..b03c9a250c
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Italic-tosf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-tosf-t1.vf b/fonts/merriweather/vf/Merriwthr-Italic-tosf-t1.vf
new file mode 100644
index 0000000000..5a1ed91755
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Italic-tosf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Italic-tosf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Italic-tosf-ts1.vf
new file mode 100644
index 0000000000..f597c9b89c
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Italic-tosf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-lf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Light-lf-sc-ly1.vf
new file mode 100644
index 0000000000..540b53e03d
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Light-lf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-lf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Light-lf-sc-ot1.vf
new file mode 100644
index 0000000000..9ddcdfb542
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Light-lf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-lf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Light-lf-sc-t1.vf
new file mode 100644
index 0000000000..6f3773f7e0
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Light-lf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-lf-t1.vf b/fonts/merriweather/vf/Merriwthr-Light-lf-t1.vf
new file mode 100644
index 0000000000..17656883d3
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Light-lf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-lf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Light-lf-ts1.vf
new file mode 100644
index 0000000000..00f1564684
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Light-lf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-osf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Light-osf-sc-ly1.vf
new file mode 100644
index 0000000000..69b8f18d86
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Light-osf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-osf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Light-osf-sc-ot1.vf
new file mode 100644
index 0000000000..997f8a5ba8
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Light-osf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-osf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Light-osf-sc-t1.vf
new file mode 100644
index 0000000000..f49759926c
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Light-osf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-osf-t1.vf b/fonts/merriweather/vf/Merriwthr-Light-osf-t1.vf
index 1462cff825..bb4e1ff33c 100644
--- a/fonts/merriweather/vf/Merriwthr-Light-osf-t1.vf
+++ b/fonts/merriweather/vf/Merriwthr-Light-osf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-osf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Light-osf-ts1.vf
index f54d2cd760..70769e155a 100644
--- a/fonts/merriweather/vf/Merriwthr-Light-osf-ts1.vf
+++ b/fonts/merriweather/vf/Merriwthr-Light-osf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-sup-t1.vf b/fonts/merriweather/vf/Merriwthr-Light-sup-t1.vf
new file mode 100644
index 0000000000..0ca2b16b8c
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Light-sup-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-tlf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Light-tlf-sc-ly1.vf
new file mode 100644
index 0000000000..eb873c8ece
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Light-tlf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-tlf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Light-tlf-sc-ot1.vf
new file mode 100644
index 0000000000..e99869fcdc
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Light-tlf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-tlf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Light-tlf-sc-t1.vf
new file mode 100644
index 0000000000..92e52f465e
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Light-tlf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-tlf-t1.vf b/fonts/merriweather/vf/Merriwthr-Light-tlf-t1.vf
new file mode 100644
index 0000000000..da13d545f0
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Light-tlf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-tlf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Light-tlf-ts1.vf
new file mode 100644
index 0000000000..3303e469af
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Light-tlf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-tosf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Light-tosf-sc-ly1.vf
new file mode 100644
index 0000000000..a8345ea5a1
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Light-tosf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-tosf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Light-tosf-sc-ot1.vf
new file mode 100644
index 0000000000..31fdd3a880
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Light-tosf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-tosf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Light-tosf-sc-t1.vf
new file mode 100644
index 0000000000..476eb62433
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Light-tosf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-tosf-t1.vf b/fonts/merriweather/vf/Merriwthr-Light-tosf-t1.vf
new file mode 100644
index 0000000000..5ee11b53d7
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Light-tosf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Light-tosf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Light-tosf-ts1.vf
new file mode 100644
index 0000000000..eaef7756a3
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Light-tosf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightIt-osf-t1.vf b/fonts/merriweather/vf/Merriwthr-LightIt-osf-t1.vf
deleted file mode 100644
index 1b58056b4d..0000000000
--- a/fonts/merriweather/vf/Merriwthr-LightIt-osf-t1.vf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightIt-osf-ts1.vf b/fonts/merriweather/vf/Merriwthr-LightIt-osf-ts1.vf
deleted file mode 100644
index c76d86b99e..0000000000
--- a/fonts/merriweather/vf/Merriwthr-LightIt-osf-ts1.vf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-lf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-lf-sc-ly1.vf
new file mode 100644
index 0000000000..f66d9b6570
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-lf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-lf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-lf-sc-ot1.vf
new file mode 100644
index 0000000000..c0074babbf
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-lf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-lf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-lf-sc-t1.vf
new file mode 100644
index 0000000000..15db7d4657
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-lf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-lf-t1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-lf-t1.vf
new file mode 100644
index 0000000000..de7bf29d53
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-lf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-lf-ts1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-lf-ts1.vf
new file mode 100644
index 0000000000..c173779d92
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-lf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-osf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-osf-sc-ly1.vf
new file mode 100644
index 0000000000..cef66af8ec
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-osf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-osf-sc-ot1.vf
new file mode 100644
index 0000000000..0e2155e504
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-osf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-osf-sc-t1.vf
new file mode 100644
index 0000000000..8e893c5fab
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-osf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-osf-t1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-osf-t1.vf
new file mode 100644
index 0000000000..e620ea753c
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-osf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-osf-ts1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-osf-ts1.vf
new file mode 100644
index 0000000000..f166eee8a1
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-osf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-sup-t1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-sup-t1.vf
new file mode 100644
index 0000000000..f85184d088
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-sup-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-tlf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-tlf-sc-ly1.vf
new file mode 100644
index 0000000000..8701d7555f
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-tlf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-tlf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-tlf-sc-ot1.vf
new file mode 100644
index 0000000000..2f9d94f467
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-tlf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-tlf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-tlf-sc-t1.vf
new file mode 100644
index 0000000000..83ffe08acd
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-tlf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-tlf-t1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-tlf-t1.vf
new file mode 100644
index 0000000000..14faa6c90c
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-tlf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-tlf-ts1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-tlf-ts1.vf
new file mode 100644
index 0000000000..ac436117af
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-tlf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-tosf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-tosf-sc-ly1.vf
new file mode 100644
index 0000000000..c10f19d8b7
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-tosf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-tosf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-tosf-sc-ot1.vf
new file mode 100644
index 0000000000..261640da7e
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-tosf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-tosf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-tosf-sc-t1.vf
new file mode 100644
index 0000000000..7f24b5acb9
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-tosf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-tosf-t1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-tosf-t1.vf
new file mode 100644
index 0000000000..be2a436517
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-tosf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-LightItalic-tosf-ts1.vf b/fonts/merriweather/vf/Merriwthr-LightItalic-tosf-ts1.vf
new file mode 100644
index 0000000000..053aa42bd0
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-LightItalic-tosf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-lf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Regular-lf-sc-ly1.vf
new file mode 100644
index 0000000000..660c2ba4f7
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Regular-lf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-lf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Regular-lf-sc-ot1.vf
new file mode 100644
index 0000000000..0fdfe13981
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Regular-lf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-lf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Regular-lf-sc-t1.vf
new file mode 100644
index 0000000000..1f61b7988a
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Regular-lf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-lf-t1.vf b/fonts/merriweather/vf/Merriwthr-Regular-lf-t1.vf
new file mode 100644
index 0000000000..4f11013daf
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Regular-lf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-lf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Regular-lf-ts1.vf
new file mode 100644
index 0000000000..e3b4dc5f55
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Regular-lf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-osf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Regular-osf-sc-ly1.vf
new file mode 100644
index 0000000000..036688d405
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Regular-osf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-osf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Regular-osf-sc-ot1.vf
new file mode 100644
index 0000000000..7a3af6e202
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Regular-osf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-osf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Regular-osf-sc-t1.vf
new file mode 100644
index 0000000000..c987ca5d5d
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Regular-osf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-osf-t1.vf b/fonts/merriweather/vf/Merriwthr-Regular-osf-t1.vf
index 0ec42e1e68..e92230fd8c 100644
--- a/fonts/merriweather/vf/Merriwthr-Regular-osf-t1.vf
+++ b/fonts/merriweather/vf/Merriwthr-Regular-osf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-osf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Regular-osf-ts1.vf
index ded7026124..c63ebcbe43 100644
--- a/fonts/merriweather/vf/Merriwthr-Regular-osf-ts1.vf
+++ b/fonts/merriweather/vf/Merriwthr-Regular-osf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-sup-t1.vf b/fonts/merriweather/vf/Merriwthr-Regular-sup-t1.vf
new file mode 100644
index 0000000000..22e7d089c7
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Regular-sup-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-tlf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Regular-tlf-sc-ly1.vf
new file mode 100644
index 0000000000..11af238b02
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Regular-tlf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-tlf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Regular-tlf-sc-ot1.vf
new file mode 100644
index 0000000000..d02cc227fe
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Regular-tlf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-tlf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Regular-tlf-sc-t1.vf
new file mode 100644
index 0000000000..e2500f1b64
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Regular-tlf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-tlf-t1.vf b/fonts/merriweather/vf/Merriwthr-Regular-tlf-t1.vf
new file mode 100644
index 0000000000..e4bbfcbdaa
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Regular-tlf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-tlf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Regular-tlf-ts1.vf
new file mode 100644
index 0000000000..731f163057
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Regular-tlf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-tosf-sc-ly1.vf b/fonts/merriweather/vf/Merriwthr-Regular-tosf-sc-ly1.vf
new file mode 100644
index 0000000000..08d74141e6
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Regular-tosf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-tosf-sc-ot1.vf b/fonts/merriweather/vf/Merriwthr-Regular-tosf-sc-ot1.vf
new file mode 100644
index 0000000000..fb1e05bb22
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Regular-tosf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-tosf-sc-t1.vf b/fonts/merriweather/vf/Merriwthr-Regular-tosf-sc-t1.vf
new file mode 100644
index 0000000000..10c49d2fd6
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Regular-tosf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-tosf-t1.vf b/fonts/merriweather/vf/Merriwthr-Regular-tosf-t1.vf
new file mode 100644
index 0000000000..0d9392fc8e
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Regular-tosf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-Regular-tosf-ts1.vf b/fonts/merriweather/vf/Merriwthr-Regular-tosf-ts1.vf
new file mode 100644
index 0000000000..df7eb79cf9
--- /dev/null
+++ b/fonts/merriweather/vf/Merriwthr-Regular-tosf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-UltraBdIt-osf-t1.vf b/fonts/merriweather/vf/Merriwthr-UltraBdIt-osf-t1.vf
deleted file mode 100644
index 3f5c5f0050..0000000000
--- a/fonts/merriweather/vf/Merriwthr-UltraBdIt-osf-t1.vf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-UltraBdIt-osf-ts1.vf b/fonts/merriweather/vf/Merriwthr-UltraBdIt-osf-ts1.vf
deleted file mode 100644
index 4058fb6028..0000000000
--- a/fonts/merriweather/vf/Merriwthr-UltraBdIt-osf-ts1.vf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-UltraBold-osf-t1.vf b/fonts/merriweather/vf/Merriwthr-UltraBold-osf-t1.vf
deleted file mode 100644
index 65c5b1d90f..0000000000
--- a/fonts/merriweather/vf/Merriwthr-UltraBold-osf-t1.vf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/vf/Merriwthr-UltraBold-osf-ts1.vf b/fonts/merriweather/vf/Merriwthr-UltraBold-osf-ts1.vf
deleted file mode 100644
index bca16d03d6..0000000000
--- a/fonts/merriweather/vf/Merriwthr-UltraBold-osf-ts1.vf
+++ /dev/null
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-lf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-lf-sc-ly1.vf
new file mode 100644
index 0000000000..65c0cd0781
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-lf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-lf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-lf-sc-ot1.vf
new file mode 100644
index 0000000000..bb85a40789
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-lf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-lf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-lf-sc-t1.vf
new file mode 100644
index 0000000000..e69c5ec28d
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-lf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-lf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-lf-t1.vf
new file mode 100644
index 0000000000..de20437867
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-lf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-lf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-lf-ts1.vf
new file mode 100644
index 0000000000..d68ccff93b
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-lf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-osf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-osf-sc-ly1.vf
new file mode 100644
index 0000000000..3819547731
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-osf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-osf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-osf-sc-ot1.vf
new file mode 100644
index 0000000000..d9f2f4750c
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-osf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-osf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-osf-sc-t1.vf
new file mode 100644
index 0000000000..a46a351149
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-osf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-osf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-osf-t1.vf
index af79b60247..09aa11edb7 100644
--- a/fonts/merriweather/vf/MerriwthrSans-Bold-osf-t1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-osf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-osf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-osf-ts1.vf
index e071521571..8e0a195fb5 100644
--- a/fonts/merriweather/vf/MerriwthrSans-Bold-osf-ts1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-osf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-sup-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-sup-t1.vf
index 1f4d1160bf..16d773805b 100644
--- a/fonts/merriweather/vf/MerriwthrSans-Bold-sup-t1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-sup-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-tlf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-tlf-sc-ly1.vf
new file mode 100644
index 0000000000..eb0c22198b
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-tlf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-tlf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-tlf-sc-ot1.vf
new file mode 100644
index 0000000000..0cce4d081b
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-tlf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-tlf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-tlf-sc-t1.vf
new file mode 100644
index 0000000000..4479061b69
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-tlf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-tlf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-tlf-t1.vf
new file mode 100644
index 0000000000..5708918943
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-tlf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-tlf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-tlf-ts1.vf
new file mode 100644
index 0000000000..38d1ff5fe1
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-tlf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-tosf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-tosf-sc-ly1.vf
new file mode 100644
index 0000000000..5c5a95b8ab
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-tosf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-tosf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-tosf-sc-ot1.vf
new file mode 100644
index 0000000000..762fbee587
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-tosf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-tosf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-tosf-sc-t1.vf
new file mode 100644
index 0000000000..fbca0ac50c
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-tosf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-tosf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-tosf-t1.vf
new file mode 100644
index 0000000000..bf5e1ad587
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-tosf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Bold-tosf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-Bold-tosf-ts1.vf
new file mode 100644
index 0000000000..f7ccd8ef73
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Bold-tosf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-sc-ly1.vf
new file mode 100644
index 0000000000..4d66cddf34
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-sc-ot1.vf
new file mode 100644
index 0000000000..4cafa650a8
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-sc-t1.vf
new file mode 100644
index 0000000000..b54aa05a5e
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-t1.vf
new file mode 100644
index 0000000000..c362ff8a07
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-ts1.vf
new file mode 100644
index 0000000000..7dcf86f5eb
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-lf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-sc-ly1.vf
new file mode 100644
index 0000000000..a7b8d2fbdf
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-sc-ot1.vf
new file mode 100644
index 0000000000..1159ffcdaf
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-sc-t1.vf
new file mode 100644
index 0000000000..949ecf3398
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-t1.vf
index f690550627..77e0ec1513 100644
--- a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-t1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-ts1.vf
index cb4821592a..c5535f8e66 100644
--- a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-ts1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-sup-t1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-sup-t1.vf
index bf41191732..45d0c29630 100644
--- a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-sup-t1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-sup-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-sc-ly1.vf
new file mode 100644
index 0000000000..2e865223e4
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-sc-ot1.vf
new file mode 100644
index 0000000000..33c364c455
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-sc-t1.vf
new file mode 100644
index 0000000000..c0148a26ca
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-t1.vf
new file mode 100644
index 0000000000..62a317bf6b
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-ts1.vf
new file mode 100644
index 0000000000..8996d0249c
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tlf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-sc-ly1.vf
new file mode 100644
index 0000000000..5bc47cfde0
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-sc-ot1.vf
new file mode 100644
index 0000000000..9ff78e7f55
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-sc-t1.vf
new file mode 100644
index 0000000000..4772e0ec18
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-t1.vf
new file mode 100644
index 0000000000..60cc6e9dba
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-ts1.vf
new file mode 100644
index 0000000000..0a899c2062
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-BoldItalic-tosf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-sc-ly1.vf
new file mode 100644
index 0000000000..cffc9e9d3c
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-sc-ot1.vf
new file mode 100644
index 0000000000..6935f0dccd
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-sc-t1.vf
new file mode 100644
index 0000000000..31694b4b10
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-t1.vf
new file mode 100644
index 0000000000..d4fd72f1a0
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-ts1.vf
new file mode 100644
index 0000000000..1ae1cdb53f
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-lf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-sc-ly1.vf
new file mode 100644
index 0000000000..b1fa966827
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-sc-ot1.vf
new file mode 100644
index 0000000000..1610907d32
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-sc-t1.vf
new file mode 100644
index 0000000000..6773437f89
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-t1.vf
index c479068c9d..5db2bcf82d 100644
--- a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-t1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-ts1.vf
index b8f1b58ced..bbce05092e 100644
--- a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-ts1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-sup-t1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-sup-t1.vf
index 446b2de8ea..d395f95e56 100644
--- a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-sup-t1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-sup-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-sc-ly1.vf
new file mode 100644
index 0000000000..fe94e5c117
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-sc-ot1.vf
new file mode 100644
index 0000000000..bbc3972221
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-sc-t1.vf
new file mode 100644
index 0000000000..706b9e73bb
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-t1.vf
new file mode 100644
index 0000000000..8c6fe81ea9
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-ts1.vf
new file mode 100644
index 0000000000..43e5258daa
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tlf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-sc-ly1.vf
new file mode 100644
index 0000000000..14370fbae0
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-sc-ot1.vf
new file mode 100644
index 0000000000..6b25fbb722
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-sc-t1.vf
new file mode 100644
index 0000000000..a903c6b385
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-t1.vf
new file mode 100644
index 0000000000..c4634485a4
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-ts1.vf
new file mode 100644
index 0000000000..3740e4d134
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBold-tosf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-sc-ly1.vf
new file mode 100644
index 0000000000..73fbe9b4dc
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-sc-ot1.vf
new file mode 100644
index 0000000000..9afeff0219
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-sc-t1.vf
new file mode 100644
index 0000000000..00bc83cf63
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-t1.vf
new file mode 100644
index 0000000000..c403689850
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-ts1.vf
new file mode 100644
index 0000000000..4833da7762
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-lf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-sc-ly1.vf
new file mode 100644
index 0000000000..ddb9f2d71c
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-sc-ot1.vf
new file mode 100644
index 0000000000..32424b6003
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-sc-t1.vf
new file mode 100644
index 0000000000..4896f11e20
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-t1.vf
index 42522f9034..5a1d167339 100644
--- a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-t1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-ts1.vf
index a9969f20ae..1d72af2270 100644
--- a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-ts1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-sup-t1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-sup-t1.vf
index 4eb25e81e5..03ec46882c 100644
--- a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-sup-t1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-sup-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1.vf
new file mode 100644
index 0000000000..012df7e9ce
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1.vf
new file mode 100644
index 0000000000..be1db559fc
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-sc-t1.vf
new file mode 100644
index 0000000000..7873954b3d
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-t1.vf
new file mode 100644
index 0000000000..b3c4c5d5dd
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-ts1.vf
new file mode 100644
index 0000000000..41bdd4ac9b
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tlf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1.vf
new file mode 100644
index 0000000000..01776a5256
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1.vf
new file mode 100644
index 0000000000..72238ce7b5
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-sc-t1.vf
new file mode 100644
index 0000000000..42ab0eab38
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-t1.vf
new file mode 100644
index 0000000000..0f266cdbe0
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-ts1.vf
new file mode 100644
index 0000000000..ebb759facf
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-tosf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-lf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-lf-sc-ly1.vf
new file mode 100644
index 0000000000..0d094fcef9
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-lf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-lf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-lf-sc-ot1.vf
new file mode 100644
index 0000000000..64925651ab
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-lf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-lf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-lf-sc-t1.vf
new file mode 100644
index 0000000000..c52ec2c691
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-lf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-lf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-lf-t1.vf
new file mode 100644
index 0000000000..2943ceae2f
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-lf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-lf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-lf-ts1.vf
new file mode 100644
index 0000000000..1bc5bf6ec4
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-lf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-osf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-osf-sc-ly1.vf
new file mode 100644
index 0000000000..70a6c437ff
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-osf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-osf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-osf-sc-ot1.vf
new file mode 100644
index 0000000000..066989a5ab
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-osf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-osf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-osf-sc-t1.vf
new file mode 100644
index 0000000000..fa15a1587c
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-osf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-osf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-osf-t1.vf
index b61a661012..f1af6ff7de 100644
--- a/fonts/merriweather/vf/MerriwthrSans-Italic-osf-t1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-osf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-osf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-osf-ts1.vf
index eeeed4fdf0..d29993faa5 100644
--- a/fonts/merriweather/vf/MerriwthrSans-Italic-osf-ts1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-osf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-sup-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-sup-t1.vf
index 1acd8a46f9..dff9002c8b 100644
--- a/fonts/merriweather/vf/MerriwthrSans-Italic-sup-t1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-sup-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-tlf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-tlf-sc-ly1.vf
new file mode 100644
index 0000000000..4126d8df20
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-tlf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-tlf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-tlf-sc-ot1.vf
new file mode 100644
index 0000000000..dafa16f7c4
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-tlf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-tlf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-tlf-sc-t1.vf
new file mode 100644
index 0000000000..50cb70df63
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-tlf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-tlf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-tlf-t1.vf
new file mode 100644
index 0000000000..5fe7a23859
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-tlf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-tlf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-tlf-ts1.vf
new file mode 100644
index 0000000000..9f7ce807ff
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-tlf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-tosf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-tosf-sc-ly1.vf
new file mode 100644
index 0000000000..dcb32cbe38
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-tosf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-tosf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-tosf-sc-ot1.vf
new file mode 100644
index 0000000000..0e313b91b6
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-tosf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-tosf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-tosf-sc-t1.vf
new file mode 100644
index 0000000000..af02ae38c9
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-tosf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-tosf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-tosf-t1.vf
new file mode 100644
index 0000000000..e448ffcf8c
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-tosf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Italic-tosf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-Italic-tosf-ts1.vf
new file mode 100644
index 0000000000..43e684beac
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Italic-tosf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-lf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-lf-sc-ly1.vf
new file mode 100644
index 0000000000..5dd23f1f3e
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-lf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-lf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-lf-sc-ot1.vf
new file mode 100644
index 0000000000..60116b4f82
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-lf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-lf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-lf-sc-t1.vf
new file mode 100644
index 0000000000..b6236054bb
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-lf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-lf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-lf-t1.vf
new file mode 100644
index 0000000000..dfa16d9a88
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-lf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-lf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-lf-ts1.vf
new file mode 100644
index 0000000000..ec142fde22
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-lf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-osf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-osf-sc-ly1.vf
new file mode 100644
index 0000000000..b029a2ada5
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-osf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-osf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-osf-sc-ot1.vf
new file mode 100644
index 0000000000..3c835ddafb
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-osf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-osf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-osf-sc-t1.vf
new file mode 100644
index 0000000000..7663c4f692
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-osf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-osf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-osf-t1.vf
index 21b4aee7b8..66b4d9ee2c 100644
--- a/fonts/merriweather/vf/MerriwthrSans-Light-osf-t1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-osf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-osf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-osf-ts1.vf
index 644c34da56..10cdf9a29e 100644
--- a/fonts/merriweather/vf/MerriwthrSans-Light-osf-ts1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-osf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-sup-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-sup-t1.vf
index dacfd52942..ee6fd6ec49 100644
--- a/fonts/merriweather/vf/MerriwthrSans-Light-sup-t1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-sup-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-tlf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-tlf-sc-ly1.vf
new file mode 100644
index 0000000000..b8f5e7e3e2
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-tlf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-tlf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-tlf-sc-ot1.vf
new file mode 100644
index 0000000000..6076a38062
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-tlf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-tlf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-tlf-sc-t1.vf
new file mode 100644
index 0000000000..6913162d20
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-tlf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-tlf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-tlf-t1.vf
new file mode 100644
index 0000000000..f918477e8a
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-tlf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-tlf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-tlf-ts1.vf
new file mode 100644
index 0000000000..3ea0129509
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-tlf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-tosf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-tosf-sc-ly1.vf
new file mode 100644
index 0000000000..eb4ccc9eff
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-tosf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-tosf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-tosf-sc-ot1.vf
new file mode 100644
index 0000000000..02ec6a2948
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-tosf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-tosf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-tosf-sc-t1.vf
new file mode 100644
index 0000000000..20dd744bee
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-tosf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-tosf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-tosf-t1.vf
new file mode 100644
index 0000000000..a0f8b8415a
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-tosf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Light-tosf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-Light-tosf-ts1.vf
new file mode 100644
index 0000000000..b0962c6903
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Light-tosf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-sc-ly1.vf
new file mode 100644
index 0000000000..8a12e66879
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-sc-ot1.vf
new file mode 100644
index 0000000000..5092b4d0a8
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-sc-t1.vf
new file mode 100644
index 0000000000..9810422563
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-t1.vf
new file mode 100644
index 0000000000..9430689ba1
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-ts1.vf
new file mode 100644
index 0000000000..3692eb065f
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-lf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-sc-ly1.vf
new file mode 100644
index 0000000000..be5b88a98c
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-sc-ot1.vf
new file mode 100644
index 0000000000..cfc5baf35d
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-sc-t1.vf
new file mode 100644
index 0000000000..076e04c15a
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-t1.vf
index 53c9bf5fe6..ad4f20186a 100644
--- a/fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-t1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-ts1.vf
index a413f80af2..9096b944c9 100644
--- a/fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-ts1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-sup-t1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-sup-t1.vf
index fec749ad18..182a39b86f 100644
--- a/fonts/merriweather/vf/MerriwthrSans-LightItalic-sup-t1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-sup-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-sc-ly1.vf
new file mode 100644
index 0000000000..e44e6f8071
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-sc-ot1.vf
new file mode 100644
index 0000000000..6fabda76fc
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-sc-t1.vf
new file mode 100644
index 0000000000..df163116ee
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-t1.vf
new file mode 100644
index 0000000000..50e538f4fc
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-ts1.vf
new file mode 100644
index 0000000000..d4e082f95a
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tlf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-sc-ly1.vf
new file mode 100644
index 0000000000..f9ff48d82c
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-sc-ot1.vf
new file mode 100644
index 0000000000..5694bca6b4
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-sc-t1.vf
new file mode 100644
index 0000000000..4d9d1774fa
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-t1.vf
new file mode 100644
index 0000000000..2fd07b573c
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-ts1.vf
new file mode 100644
index 0000000000..d5034f6457
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-LightItalic-tosf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-lf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-lf-sc-ly1.vf
new file mode 100644
index 0000000000..4003cd27e0
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-lf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-lf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-lf-sc-ot1.vf
new file mode 100644
index 0000000000..99dd8a546a
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-lf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-lf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-lf-sc-t1.vf
new file mode 100644
index 0000000000..c0f55953c5
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-lf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-lf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-lf-t1.vf
new file mode 100644
index 0000000000..0325c3ada3
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-lf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-lf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-lf-ts1.vf
new file mode 100644
index 0000000000..43d237fd9c
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-lf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-osf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-osf-sc-ly1.vf
new file mode 100644
index 0000000000..64d1b09420
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-osf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-osf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-osf-sc-ot1.vf
new file mode 100644
index 0000000000..f520900539
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-osf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-osf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-osf-sc-t1.vf
new file mode 100644
index 0000000000..60028d0d45
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-osf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-osf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-osf-t1.vf
index 53d134f27f..8a7f0e49e9 100644
--- a/fonts/merriweather/vf/MerriwthrSans-Regular-osf-t1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-osf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-osf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-osf-ts1.vf
index d0f9eeb75e..d2f4c54995 100644
--- a/fonts/merriweather/vf/MerriwthrSans-Regular-osf-ts1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-osf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-sup-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-sup-t1.vf
index 137aacd2a1..e4cd90dc1d 100644
--- a/fonts/merriweather/vf/MerriwthrSans-Regular-sup-t1.vf
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-sup-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-tlf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-tlf-sc-ly1.vf
new file mode 100644
index 0000000000..fbd6f31f69
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-tlf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-tlf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-tlf-sc-ot1.vf
new file mode 100644
index 0000000000..eb15e9ee2e
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-tlf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-tlf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-tlf-sc-t1.vf
new file mode 100644
index 0000000000..ccf3f156c3
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-tlf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-tlf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-tlf-t1.vf
new file mode 100644
index 0000000000..710003e12f
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-tlf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-tlf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-tlf-ts1.vf
new file mode 100644
index 0000000000..71754850a1
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-tlf-ts1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-tosf-sc-ly1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-tosf-sc-ly1.vf
new file mode 100644
index 0000000000..1d3d741133
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-tosf-sc-ly1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-tosf-sc-ot1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-tosf-sc-ot1.vf
new file mode 100644
index 0000000000..23bdc0534e
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-tosf-sc-ot1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-tosf-sc-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-tosf-sc-t1.vf
new file mode 100644
index 0000000000..4e0712fe8a
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-tosf-sc-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-tosf-t1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-tosf-t1.vf
new file mode 100644
index 0000000000..dce77531f6
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-tosf-t1.vf
Binary files differ
diff --git a/fonts/merriweather/vf/MerriwthrSans-Regular-tosf-ts1.vf b/fonts/merriweather/vf/MerriwthrSans-Regular-tosf-ts1.vf
new file mode 100644
index 0000000000..c76c4aac95
--- /dev/null
+++ b/fonts/merriweather/vf/MerriwthrSans-Regular-tosf-ts1.vf
Binary files differ
diff --git a/graphics/mcf2graph/CHANGELOG b/graphics/mcf2graph/CHANGELOG
index e314506053..b3bcfd022e 100644
--- a/graphics/mcf2graph/CHANGELOG
+++ b/graphics/mcf2graph/CHANGELOG
@@ -1,6 +1,10 @@
*******************************************************************************
- Changelog of mcf2graph software package by Akira Yamaji 2020-08-10
+ Changelog of mcf2graph software package by Akira Yamaji 2020-08-30
*******************************************************************************
+[ver. 4.52 / 2020-08-30]
+ -improve aux file output,input
+ -update MCF manual,example
+
[ver. 4.51 / 2020-08-10]
-improve aux file output,input
-add style file mcf_setup.sty
diff --git a/graphics/mcf2graph/README b/graphics/mcf2graph/README
index 016dcd6c04..7f830cef14 100644
--- a/graphics/mcf2graph/README
+++ b/graphics/mcf2graph/README
@@ -1,7 +1,7 @@
********************************************************************************
mcf2graph : Convert Molecular Coding Format to graphics with METAFONT/METAPOST
Author : Akira Yamaji
- version : 4.51 2020-08-10
+ version : 4.52 2020-08-30
E-mail : mcf2graph@gmail.com
Located at : http://www.ctan.org/pkg/mcf2graph
********************************************************************************
diff --git a/graphics/mcf2graph/mcf2graph.mf b/graphics/mcf2graph/mcf2graph.mf
index 6011d247e6..e28af21d62 100644
--- a/graphics/mcf2graph/mcf2graph.mf
+++ b/graphics/mcf2graph/mcf2graph.mf
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 4.51 Copyright (c) 2013-2020 Akira Yamaji
+% mcf2graph ver 4.52 Copyright (c) 2013-2020 Akira Yamaji
%
% Permission is hereby granted, free of charge, to any person obtaining a copy of this software
% and associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -42,7 +42,7 @@ newinternal com,par,nA,nB,nC,nD,nE,nF,nP;
numeric save_num[],comD[][],parD[][],adrD[][],cntD[],tbl_atom[],tbl_group[][],f_char[],
tbl_atom_wt[],tbl_atom_mi[],tbl_char_wd[],tbl_char_ht[],andA[],and_rot[],chargeA[],
com_group[][],par_group[][],cnt_group[],colorA[],colorB[];
-string save_str[],tbl_atom_str[],strD[],var[],tag[],mpc_name[],out_file_name,out_file_aux,
+string save_str[],tbl_atom_str[],strD[],tag[],mpc_name[],out_file_name,out_file_aux,
out_file_rep,out_file_mpc,aux_delimiter,atomfont,save_atomfont,save_defaultfont;
pair save_pair[],msize,mposition,fsize,fmargin,save_mposition,posBs,posBe;
picture mol_stru[],save_picture,temp_picture;
@@ -55,7 +55,7 @@ numberA_start:=numberB_start:=1; numberA_end:=numberB_end:=4095;
%-------------------------------------------------------------------------------------------------
aux_max:=max_inf_num:=20;
aux_delimiter:=";";
-for i=1 upto aux_max: var[i]:=tag[i]:=""; endfor
+for i=1 upto aux_max: tag[i]:=""; endfor
%=================================================================================================
if (known green)and(known ahlength):
f_MP:=1;
@@ -126,7 +126,7 @@ fi
clearit;
%--------------------------------------------------------------------------------------------------
message "---------------------------------------------";
-message "This is mcf2graph ver 4.51 2020.08";
+message "This is mcf2graph ver 4.52 2020.08";
if f_MP=1:
if bboxmargin=0: message "output no image file";
elseif bboxmargin=1: message "output first font only";
@@ -254,7 +254,7 @@ def beginfont(text s)=
def ext=ext_to_font enddef;
def add=add_to_molecule enddef;
%------------------------------------------------------------------------------------------------
- inf_NO:=inf_EN:=inf_JN:=inf_MW:=inf_FM:=inf_CAS:=inf_USE:=inf_EXA:=inf_EXB:="";
+ inf_NO:=inf_EN:=inf_JN:=inf_MW:=inf_FM:=inf_CAS:=inf_USE:=inf_EXA:=inf_EXB:="-";
cal_MW:=cal_MW_str:=cal_MI:=cal_MI_str:=cal_FM:="";
%------------------------------------------------------------------------------------------------
char_num:=char_num+1;
@@ -299,7 +299,7 @@ def endfont=
fi
if (sw_fframe=1)or(sw_fframe=3): ext(draw_frame((0,0),w,h,thickness_fframe);) fi
if (sw_fframe=2)or(sw_fframe=3): ext(draw_frame(p0,w0,h0,thickness_fframe);) fi
- if sw_fframe=4: ext(drawdot(0,0); drawdot(w,0); drawdot(w,h); drawdot(0,h);) fi
+ if sw_fframe=4: ext(draw_corner((0,0),w,h,0.2bp);) fi
for i=1 upto cntM:
addto currentpicture also mol_stru[i] shifted posM[0][i]; mol_stru[i]:=nullpicture;
if sw_mframe=1: ext(draw_frame(p[i],w[i],h[i],thickness_mframe)) fi
@@ -909,6 +909,13 @@ def draw_frame(expr PS,LX,LY,PN)=
draw ((0,0)--(LX,0)--(LX,LY)--(0,LY)--cycle) shifted PS withpen pensquare scaled PN;
enddef;
%-------------------------------------------------------------------------------------------------
+def draw_corner(expr PS,LX,LY,PN)=
+ draw( 0, 0) shifted PS withpen pencircle scaled PN;
+ draw(LX, 0) shifted PS withpen pencircle scaled PN;
+ draw(LX,LY) shifted PS withpen pencircle scaled PN;
+ draw( 0,LY) shifted PS withpen pencircle scaled PN;
+enddef;
+%-------------------------------------------------------------------------------------------------
def proc_size_setup=
if (blen*ratio_atom_bond+offset_atom)<.8blen: atom_wd:=blen*ratio_atom_bond+offset_atom;
else: atom_wd:=.8blen; ratio_chain_ring:= .5;
@@ -1105,13 +1112,13 @@ def termA=
f_term:=1;
fi
enddef;
-%--------------------------------------------------------------------------------------------------
+%-------------------------------------------------------------------------------------------------
def termB=
if f_term=0: if f_bra=0: cntA:=cntA+1; angX[cntA]:=angT mod 360; else:f_bra:=0; fi f_term:=1; fi
enddef;
-%--------------------------------------------------------------------------------------------------
+%-------------------------------------------------------------------------------------------------
def proc_cyc(expr n)= add_bond(angle(posA[n]-posBs)-angT); enddef;
-%--------------------------------------------------------------------------------------------------
+%-------------------------------------------------------------------------------------------------
vardef glu_atom(expr NUM)=
if numS[NUM]<>0: nE:=angT mod 90; nF:=0.5atom_wd;(iif(nE<45,sind(nE),cosd(nE))*nF)++nF else: 0 fi
enddef;
@@ -1278,7 +1285,7 @@ COMe:=CO!:='(//O,!); COEt:=CO!2:='(//O,!,!); COPr:=CO!3:='(//O,!,!,!);
OCOMe:=OCO!:='(O,!,//O,!); NMeMe:=NMe!:='(N!,!); NMeEt:=NMe!2:='(N!,!,!); NMePr:=NMe!3:='(N!,!,!,!);
NHCOMe:=NHCO!:='(NH,!,//O,!); NHiPr:=NHMe!:='(NH,!,iPr); NHtBu:='(NH,!,tBu); NHMe:=NH!:='(NH,!);
NHEt:=NH!2:='(NH,!,!); NHPr:=NH!3:='(NH,!,!,!);
-%--------------------------------------------------------------------------------------------------
+%-------------------------------------------------------------------------------------------------
!OH:='(!,OH); !SH:='(!,SH); !NH2:='(!,NH2);
!COMe:=!CO!:='(!,//O,!); !COEt:=!CO!2:='(!,CO!2); !COPr:=!CO!3:='(!,CO!3);
!OMe:=!O!:='(!,O!); !OEt:=!O!2:='(!,O!2); !OPr:=!O!3:='(!,O!3); !OiPr:=!OMe!:='(!,OMe!);
@@ -1290,29 +1297,29 @@ NHEt:=NH!2:='(NH,!,!); NHPr:=NH!3:='(NH,!,!,!);
!CH3:='(!,CH3); !CN:='(!,CN); !iPr:=!Me!:='(!,iPr); !tBu:='(!,tBu);
!CHO:='(!,CHO); !NO2:='(!,NO2); !Cl:='(!,Cl); !Br:='(!,Br); !F:='(!,F);
!?3:='(!,?3); !?4:='(!,?4); !?5:='(!,?5); !?6:='(!,?6); !?7:='(!,?7); !?8:='(!,?8); !Ph:='(!,Ph);
-%--------------------------------------------------------------------------------------------------
+%-------------------------------------------------------------------------------------------------
!2OH:='(!,!,OH); !2COOH:='(!,!,COOH); !2NH2:='(!,!,NH2); !2CN:='(!,!,CN); !2NO2:='(!,!,NO2);
!2CH3:='(!,!,CH3); !2CHO:='(!,!,CHO); !2SH:='(!,!SH); !2tBu:='(!,!,tBu); !2Cl:='(!,!,Cl);
!2?5:='(!,!,?5); !2?6:='(!,!,?6); !2Ph:='(!,!,Ph);
-%--------------------------------------------------------------------------------------------------
+%-------------------------------------------------------------------------------------------------
CF2:='(/F,60,F); CCl2:='(/Cl,60,Cl); CBr2:='(/Br,60,Br);
CF3:='(/F,/F^60,60,F); CCl3:='(/Cl,/Cl^60,60,Cl); CBr3:='(/Br,/Br^60,60,Br);
-%--------------------------------------------------------------------------------------------------
+%-------------------------------------------------------------------------------------------------
xCH3:='(/H,/H^60,60,H); xNH:='(N,/H); xNH2:='(N,/H,60,H); xNO2:='(N,//O,60~dm,O); xOH:='(O,!,H);
xCHO:='(//O,!,H); xCOOH:='(//O,!,O,!,H); xCN:='(!~tm,N); xSH:='(S,!,H);
-%==================================================================================================
+%=================================================================================================
init_par(parameter_list);
-%--------------------------------------------------------------------------------------------------
+%-------------------------------------------------------------------------------------------------
parts_emb_end:=parts_usr;
%%%%% message "parts_emb =" & decimal(parts_emb_start) &" => " & decimal(parts_emb_end);
-%--------------------------------------------------------------------------------------------------
+%-------------------------------------------------------------------------------------------------
def expand_set=
CH3:=xCH3; NH:=xNH; NH2:=xNH2; NO2:=xNO2; OH:=xOH; CHO:=xCHO; COOH:=xCOOH; CN:=xCN; SH:=xSH;
!CH3:='(!,CH3); !OH:='(!,OH); !NH2:='(!,NH2); !CHO:='(!,CHO); !COOH:='(!,COOH); !CN:='(!,CN);
!SH:='(!,SH); !NO2:='(!,NO2); !2CH3:='(!,!CH3); !2OH:='(!,!OH); !2NH2:='(!,!NH2);
!2CHO:='(!,!CHO); !2COOH:='(!,!COOH); !2CN:='(!,!CN); !2SH:='(!,!SH); !2NO2:='(!,!NO2);
enddef;
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
def char_size_set(expr WD)(expr HT)(expr STR)=
for j=0 upto length(STR)-1:
nA:=ASCII(pic_c(j,STR)); tbl_char_wd[nA]:=WD; tbl_char_ht[nA]:=HT;
@@ -1334,7 +1341,7 @@ char_size_set(.35)( .9)("i");
char_size_set( .5)( .9)("j");
char_size_set(.35)( 1)("!|");
char_size_set( .4)( 1)(".,:;'`^");
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
def draw_char(expr CHR,POS,WD,PEN,NUM)=
begingroup
save Z,aW,aH,fW,fH,hW,hW,hH,fP,hP,zO,zOh,pos,dw,dwh,dwv,cdw,ppcs,sbp,sC;
@@ -1470,28 +1477,28 @@ else:
fi
endgroup
enddef;
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
def blank_str:= " " enddef;
vardef fixed_r(expr n)(expr s)= (substring(0,n-length(s)) of blank_str)&s enddef;
vardef fixed_l(expr n)(expr s)= s&(substring(0,n-length(s)) of blank_str) enddef;
vardef fdr(expr n)(expr s)=fixed_r(n)(decimal(s)) enddef;
vardef fdl(expr n)(expr s)=fixed_l(n)(decimal(s)) enddef;
def warning(expr s)= message "% "&decimal(char_num)&fdr(3)(incr warning_cnt)&")"&s; enddef;
-%--------------------------------------------------------------------------------------------------
+%-------------------------------------------------------------------------------------------------
def bond_check(expr a)(text s)=
nF:=0; for list=s: if list=bond_cnt: nF:=1; fi endfor
if nF=0:
warning("A"&decimal(a)&" ( "&fixed_l(8)(strD[numS[a]])&") has"&fdr(2)(bond_cnt)&" bonds");
fi
enddef;
-%--------------------------------------------------------------------------------------------------
+%-------------------------------------------------------------------------------------------------
vardef stripP(expr ATOM)=
if length(ATOM)=4: substring (1,3) of ATOM
elseif length(ATOM)=6: substring (1,2) of ATOM
else: ATOM
fi
enddef;
-%==================================================================================================
+%=================================================================================================
def STa(expr ATOM,WT,MI)=
tbl_cnt:=tbl_cnt+1;
tbl_atom_str[tbl_cnt]:=ATOM;
@@ -1511,7 +1518,7 @@ def STb(expr ATOM)(text TXT)=
endfor
endfor
enddef;
-%==================================================================================================
+%=================================================================================================
tbl_cnt:=0;
STa("C" ,12.0107, 12.0000000); STa("H" , 1.00794, 1.00782503223);
STa("{Al}",26.9815, 26.98153853); STa("{As}",74.9216, 74.92159457);
@@ -1533,12 +1540,12 @@ STa("{S^m^}",32.065, 31.9720711744);
STa("{Se}",78.971, 79.9165218); STa("{Si}",28.0855, 27.97692653465);
STa("{Sn}",118.71, 119.90220163); STa("{Ti}",47.867, 47.94794198);
STa("{Zn}",65.409, 63.92914201);
-%--------------------------------------------------------------------------------------------------
+%-------------------------------------------------------------------------------------------------
STb("{H_2_}")("H","H"); STb("OH")("O","H"); STb("O{Na}")("O","{Na}"); STb("CN")("C","N");
STb("SH")("S","H"); STb("CHO")("C","H","O"); STb("N{O_2_}")("N","O","O");
STb("N{H_2_}")("N","H","H"); STb("S{O_3_}")("S","O","O","O"); STb("COOH")("C","O","O","H");
STb("C{H_3_}")("C","H","H","H"); STb("C{F_3_}")("C","F","F","F");
-%==================================================================================================
+%=================================================================================================
def proc_calc=
begingroup
save warning_cnt,MWp,knownA,bondC,tmp_wtp,bond_cnt,cnt_hide_H;
@@ -1602,7 +1609,7 @@ def proc_calc=
if sw_mol_out>=1: proc_mol_out; fi
endgroup
enddef;
-%==================================================================================================
+%=================================================================================================
def proc_auxfile_out=
message "["&decimal(char_num)&"]:"&inf_EN;
out_file_name:=out_file_aux;
@@ -1613,29 +1620,39 @@ def proc_auxfile_out=
%--------------------------------------------------------------------------------------
for i=1 upto aux_max: exitif tag[i]="";
if i=1: printf "" else: &aux_delimiter fi
- if sw_aux_out=1: &tag[i]&":" fi
- if tag[i]="F": & jobname
- elseif tag[i]="C": & decimal(char_num)
- elseif tag[i]="mw": & cal_MW
- elseif tag[i]="fm": & cal_FM
- elseif tag[i]="mi": & cal_MI
- elseif tag[i]="w": & decimal(xpart(fsize))
- elseif tag[i]="h": & decimal(ypart(fsize))
- elseif tag[i]="w1": & decimal(mol_wd)
- elseif tag[i]="h1": & decimal(mol_ht)
- elseif tag[i]="An": & decimal(cntA)
- elseif tag[i]="Bn": & decimal(cntB)
- else:
+ if (sw_aux_out=1)or(sw_aux_out=3): &tag[i]&":" fi
+ if tag[i]="F": & jobname
+ elseif tag[i]="C": & decimal(char_num)
+ elseif tag[i]="mw": & cal_MW
+ elseif tag[i]="fm": & cal_FM
+ elseif tag[i]="mi": & cal_MI
+ elseif tag[i]="w": & decimal(xpart(fsize))
+ elseif tag[i]="h": & decimal(ypart(fsize))
+ elseif tag[i]="w1": & decimal(mol_wd)
+ elseif tag[i]="h1": & decimal(mol_ht)
+ elseif tag[i]="An": & decimal(cntA)
+ elseif tag[i]="Bn": & decimal(cntB)
+ %-------------------------------------------
+ elseif tag[i]="NO": & inf_NO
+ elseif tag[i]="EN": & inf_EN
+ elseif tag[i]="JN": & inf_JN
+ elseif tag[i]="MW": & inf_MW
+ elseif tag[i]="MI": & inf_MI
+ elseif tag[i]="FM": & inf_FM
+ elseif tag[i]="CAS": & inf_CAS
+ elseif tag[i]="USE": & inf_USE
+ elseif tag[i]="EXA": & inf_EXA
+ elseif tag[i]="EXB": & inf_EXB
fi
endfor
- if (sw_aux_out=1)or(sw_aux_out=3): for i=1 upto inf_num: &aux_delimiter&info[i] endfor; fi
+ if sw_aux_out=3: for i=1 upto inf_num: &aux_delimiter&info[i] endfor; fi
enddef;
-%==================================================================================================
+%=================================================================================================
vardef round_auto(expr n)=
if (n<4) and(n>-4): round(n*1000)/1000 elseif (n<40) and(n>-40): round(n*100)/100
elseif (n<400)and(n>-400): round(n*10)/10 else: round(n) fi
enddef;
-%--------------------------------------------------------------------------------------------------
+%-------------------------------------------------------------------------------------------------
def proc_report_out=
message "["&decimal(char_num)&"]:"&inf_EN;
out_file_name:=out_file_rep;
@@ -1693,7 +1710,7 @@ def proc_report_out=
if inf_FM<>"": &inf_FM&" / "& iif(inf_FM=cal_FM,"MACTCH","NOT MACTCH") fi;
printf "==================================================================";
enddef;
-%==================================================================================================
+%=================================================================================================
def proc_mol_out=
begingroup
save chg_cnt,chg_atm,chg_chg,nA,nB;
@@ -1765,4 +1782,4 @@ def proc_bond_class(expr n)=
else: nA:=1; nB:=0;
fi
enddef;
-%--------------------------------------------------------------------------------------------------
+%-------------------------------------------------------------------------------------------------
diff --git a/graphics/mcf2graph/mcf_exa_soc.mf b/graphics/mcf2graph/mcf_exa_soc.mf
index f2a973c7cf..8cbd78defe 100644
--- a/graphics/mcf2graph/mcf_exa_soc.mf
+++ b/graphics/mcf2graph/mcf_exa_soc.mf
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2020.08.10
+% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2020.08.30
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %%% it must be version 4.51 or later
+input mcf2graph.mf; %%% it must be version 4.52 or later
%-------------------------------------------------------------------------
fsize:=(33mm,24mm);
max_blength:=4.5mm;
@@ -11,7 +11,7 @@ max_blength:=4.5mm;
%%%%sw_aframe:=1;
%%%%sw_mframe:=1;
%%%%sw_expand:=1;
-tag1:="F"; tag2:="C"; tag3:="fm"; tag4:="mw";
+tag1:="F"; tag2:="C"; tag3:="fm"; tag4:="mw"; tag5:="EN"; tag6:="MW";
%%%%tag5:="mi";
%%%%tag6:="w1";
%%%%tag7:="h1";
diff --git a/graphics/mcf2graph/mcf_example.pdf b/graphics/mcf2graph/mcf_example.pdf
index 709aff0809..b412a69a43 100644
--- a/graphics/mcf2graph/mcf_example.pdf
+++ b/graphics/mcf2graph/mcf_example.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_example.tex b/graphics/mcf2graph/mcf_example.tex
index fcbacc1ec8..784d2d61a2 100644
--- a/graphics/mcf2graph/mcf_example.tex
+++ b/graphics/mcf2graph/mcf_example.tex
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2020.08.10
+% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2020.08.30
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage{graphicx}
@@ -13,19 +13,24 @@
\textheight=280mm
\parindent=0mm
\setlength\columnsep{8mm}
-%-------------------------------------------------------------------------------
+%-----------------------------------------------------------------------------
\makeatletter%
-\newbox \@stringbox%
-\newcount \fontnum%
+\newbox \f@box%
+\newcount \f@num%
\newcount \tnum%
\tnum=0%
\font\labelM=cmtt8 at 6pt\relax%
-%-------------------------------------------------------------------------------
+%-----------------------------------------------------------------------------
\newif\ifCONT@%
\newread\@auxf%
%------------------------------------------------------------------------
-\fontnum=1%
+\f@num=1%
\unitlength=0.01mm%
+%------------------------------------------------------------------------
+\edef\jobname{mcf_exa_soc}%
+\edef\f@ext{pk}%
+%%%%\edef\f@ext{mps}%
+%%%%\edef\f@ext{png}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{document}
\begin{center}
@@ -37,24 +42,30 @@
** MW:Molecular weight calculated by mcf2graph}\vspace{3mm}\\
%------------------------------------------------------------------------
\noindent%
-\openin\@auxf=mcf_exa_soc-info.aux%
+\openin\@auxf=\jobname-info.aux%
\CONT@true%
\loop%
\read\@auxf to \@info%
\ifeof\@auxf\CONT@false\else\@sfor\@info{\tag@var\@list}%
%------------------------------------------------------------
\begin{picture}(3750,3300)%
- \put(20,3000){\footnotesize\bf \the\fontnum:\EN}%
+ \put(20,3000){\footnotesize\bf \the\f@num:\EN}%
\put(20,2750){\labelM MW:\mw { / }FM:\fm}%
\put(20,2530){\labelM MW:\MW(data)}%
\put( 0,0){%
\makebox(3750,2530){%
- \font\@strufont=\File\relax\hbox{\@strufont\char\Char}%
+ \ifx\f@ext\@pk{\font\@font=\jobname\@font\char\f@num}%
+ \else%
+ \edef\f@file{\jobname-\z@num\f@num.\f@ext}%
+ \setbox\f@box=\hbox{\font\@font=\jobname\@font\char\f@num}%
+ \includegraphics[width=\wd\f@box,height=\ht\f@box]{\f@file}%
+%%%% \includegraphics{\f@file}%
+ \fi%
}%
}%
\end{picture}%
%------------------------------------------------------------
- \advance\fontnum1\relax%
+ \advance\f@num1\relax%
\advance\tnum1\relax%
\ifnum\tnum=5 \\ \tnum=0 \fi%
\fi%
@@ -63,3 +74,10 @@
%------------------------------------------------------------------------
\end{document}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+tnum=5 \\ \tnum=0 \fi%
+\fi%
+\ifCONT@ \repeat%
+\closein\@auxf%
+%------------------------------------------------------------------------
+\end{document}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/graphics/mcf2graph/mcf_man_soc.mf b/graphics/mcf2graph/mcf_man_soc.mf
index e2ff60943e..ea8912bda7 100644
--- a/graphics/mcf2graph/mcf_man_soc.mf
+++ b/graphics/mcf2graph/mcf_man_soc.mf
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2020.08.10
+% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2020.08.30
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %% it must be version 4.51 or later
+input mcf2graph.mf; %% it must be version 4.52 or later
%------------------------------------------------------------------------
sw_mframe:=0;
sw_expand:=0;
@@ -869,48 +869,55 @@ beginfont("EN:Switwch Expand")
endfont
%***********************************************************************
beginfont("EN:Switwch group off")
- fsize:=(60mm,15mm);
+ fsize:=(60mm,12mm);
MCat(.15, .5)(<30,Ph,4:/Cl,3:/F)
sw_group_off:=1;
MCat(.85, .5)(<30,Ph,4:/Cl,3:/F)
endfont
%***********************************************************************
beginfont("EN:Switwch bondtype off")
- fsize:=(60mm,15mm);
+ fsize:=(60mm,12mm);
MCat(.15, .5)(<30,Ph,4:/Cl,3:/F)
sw_single:=1;
MCat(.85, .5)(<30,Ph,4:/Cl,3:/F)
endfont
%***********************************************************************
beginfont("EN:Switwch font frame 1")
- fsize:=(40mm,12mm);
- fmargin:=(5mm,2mm);
+ fsize:=(40mm,10mm);
+ fmargin:=(5mm,1.5mm);
sw_fframe:=1;
MC(<30,Ph)
endfont
beginfont("EN:Switwch font frame 2")
- fsize:=(40mm,12mm);
- fmargin:=(5mm,2mm);
+ fsize:=(40mm,10mm);
+ fmargin:=(5mm,1.5mm);
sw_fframe:=2;
MC(<30,Ph)
endfont
beginfont("EN:Switwch font frame 3")
- fsize:=(40mm,12mm);
- fmargin:=(5mm,2mm);
+ fsize:=(40mm,10mm);
+ fmargin:=(5mm,1.5mm);
sw_fframe:=3;
MC(<30,Ph)
endfont
+beginfont("EN:Switwch font frame 4")
+ fsize:=(40mm,10mm);
+ fmargin:=(5mm,1.5mm);
+ sw_fframe:=4;
+ MC(<30,Ph)
+ ext(drawdot(0,0);drawdot(w,0);drawdot(w,h);drawdot(0,h);)
+endfont
%***********************************************************************
beginfont("EN:Switwch molecular frame")
sw_fframe:=1;
- fsize:=(40mm,15mm);
+ fsize:=(40mm,11mm);
msize:=(1,1);
sw_mframe:=1;
MC(<30,Ph)
endfont
%***********************************************************************
beginfont("EN:Switwch atom frame")
- fsize:=(60mm,15mm);
+ fsize:=(60mm,10mm);
sw_aframe:=1;
MC(<30,COOH,!,COOH)
endfont
diff --git a/graphics/mcf2graph/mcf_manual.pdf b/graphics/mcf2graph/mcf_manual.pdf
index 19f2435a1b..233e70eecd 100644
--- a/graphics/mcf2graph/mcf_manual.pdf
+++ b/graphics/mcf2graph/mcf_manual.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_manual.tex b/graphics/mcf2graph/mcf_manual.tex
index 9f33673c13..4664a2eea0 100644
--- a/graphics/mcf2graph/mcf_manual.tex
+++ b/graphics/mcf2graph/mcf_manual.tex
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format manual by Akira Yamaji 2020.08.10
+% Molecular Coding Format manual by Akira Yamaji 2020.08.30
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
%%%%\documentclass[a4paper,twoside]{article}
@@ -34,7 +34,6 @@
\fnum=29%
%----------------------------------------------------------------------------
\edef\MCFjobname{mcf_man_soc}%
-\edef\@pk{pk}%
%----------------------------------------------------------------------------
\edef\fext{pk}%
%%\edef\fext{mps}%
@@ -47,10 +46,7 @@
\def\MCFgraph{%
\ifx\fext\@pk{\hspace{5mm}\@strufont\char\fnum}%
\else%
-\ifnum\fnum<10\edef\pre@zero{00}%
-\else\ifnum\fnum<100\edef\pre@zero{0}%
-\else\edef\pre@zero{}\fi\fi%
-\edef\file@name{\MCFjobname-\pre@zero\the\fnum.\fext}%
+\edef\file@name{\MCFjobname-\z@num\fnum.\fext}%
\setbox\fbox=\hbox{\@strufont\char\fnum}%
\hspace{5mm}\includegraphics[width=\wd\fbox,height=\ht\fbox]{\file@name}%
\fi%
@@ -865,27 +861,18 @@ MCat(1, .5)(<30,Ph,4:/COOH,3:/NH2)
** default: sw_expand=0
\end{verbatim}
\MCFgraph\\
-\makebox[5mm]{}%
-\makebox[30mm]{\tt 0 :default}%
-\makebox[30mm]{\tt 1}%
%-----------------------------------------------------------------------------
\subsubsection{Group off mode}
\begin{verbatim}
** default: sw_group_off=0
\end{verbatim}
-\MCFgraph\\
-\makebox[5mm]{}%
-\makebox[30mm]{\tt 0 :default}%
-\makebox[30mm]{\tt 1}%
+\MCFgraph
%-----------------------------------------------------------------------------
\subsubsection{Single bond mode}
\begin{verbatim}
** default: sw_single=0
\end{verbatim}
-\MCFgraph\\
-\makebox[5mm]{}%
-\makebox[30mm]{\tt 0 :default}%
-\makebox[30mm]{\tt 1}%
+\MCFgraph
%-----------------------------------------------------------------------------
\subsection{Frame}
%-----------------------------------------------------------------------------
@@ -906,6 +893,11 @@ MCat(1, .5)(<30,Ph,4:/COOH,3:/NH2)
sw_fframe=3
\end{verbatim}
\MCFgraph
+\begin{verbatim}
+ (Draw small dot at corner)
+ sw_fframe=4
+\end{verbatim}
+\MCFgraph
%-----------------------------------------------------------------------------
\subsubsection{Molecular frame}
\begin{verbatim}
@@ -1391,7 +1383,7 @@ beginfont("EN:beta-Carotene") .... endfont
\end{verbatim}
\paragraph{(Setting)}
\begin{verbatim}
-tag1:="F"; tag2:="C"; tag3:="mw"; tag4:="fm";
+tag1:="F"; tag2:="C"; tag3:="mw"; tag4:="fm"; tag5:="EN";
\end{verbatim}
\paragraph{(Output)}
\begin{verbatim}
@@ -1401,12 +1393,12 @@ F:mcf_man_soc;C:2;mw:386.6532;fm:C27H46O;EN:Cholesterol
F:mcf_exa_soc;C:3;mw:470.5113;fm:C26H30O8;EN:Limonin
F:mcf_exa_soc;C:4;mw:536.8722;fm:C40H56;EN:beta-Carotene
-(sw_aux_out=2 (3))
-F;C;mw;fm(;EN)
-mcf_man_soc;1;349.40462;C16H19N3O4S(;Ampicillin)
-mcf_man_soc;2;386.6532;C27H46O(;Cholesterol)
-mcf_exa_soc;3;470.5113;C26H30O8(;Limonin)
-mcf_exa_soc;4;536.8722;C40H56(;beta-Carotene)
+(sw_aux_out=2)
+F;C;mw;fm
+mcf_man_soc;1;349.40462;C16H19N3O4S;Ampicillin
+mcf_man_soc;2;386.6532;C27H46O;Cholesterol
+mcf_exa_soc;3;470.5113;C26H30O8;Limonin
+mcf_exa_soc;4;536.8722;C40H56;beta-Carotene
(aux_delimiter="/")
F:mcf_man_soc/C:1/mw:349.40462/fm:C16H19N3O4S/EN:Ampicillin
@@ -1632,14 +1624,14 @@ endfont;
%--------------------------------------------------------------------
\begin{document}
\unitlength=1mm%
-\INFO{F:mcf_man_soc,C:138,NO:1,mw:349.40462,fm:C16H19N3O4S,EN:Ampicillin}%
-\INFO{F:mcf_man_soc,C:139,NO:2,mw:386.6532,fm:C27H46O,EN:Cholesterol}%
+\INFO{F:mcf_man_soc,C:139,NO:1,mw:349.40462,fm:C16H19N3O4S,EN:Ampicillin}%
+\INFO{F:mcf_man_soc,C:140,NO:2,mw:386.6532,fm:C27H46O,EN:Cholesterol}%
\end{document}
%--------------------------------------------------------------------
\end{verbatim}%
%############################################################################
%------------------------------------------------------------------------
-\INFO{F:mcf_man_soc,C:138,NO:1,mw:349.40462,fm:C16H19N3O4S,EN:Ampicillin}%
-\INFO{F:mcf_man_soc,C:139,NO:2,mw:386.6532,fm:C27H46O,EN:Cholesterol}%
+\INFO{F:mcf_man_soc,C:139,NO:1,mw:349.40462,fm:C16H19N3O4S,EN:Ampicillin}%
+\INFO{F:mcf_man_soc,C:140,NO:2,mw:386.6532,fm:C27H46O,EN:Cholesterol}%
%------------------------------------------------------------------------
\end{document}
diff --git a/graphics/mcf2graph/mcf_mplib_exa.pdf b/graphics/mcf2graph/mcf_mplib_exa.pdf
index 3275834c6b..314b6cbe23 100644
--- a/graphics/mcf2graph/mcf_mplib_exa.pdf
+++ b/graphics/mcf2graph/mcf_mplib_exa.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_mplib_exa.tex b/graphics/mcf2graph/mcf_mplib_exa.tex
index e6fc0eb02d..d35a55eed2 100644
--- a/graphics/mcf2graph/mcf_mplib_exa.tex
+++ b/graphics/mcf2graph/mcf_mplib_exa.tex
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2020.08.10
+% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2020.08.30
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% mcf2graph.mf it must be version 4.51 or later
+%%% mcf2graph.mf it must be version 4.52 or later
\documentclass{article}
%------------------------------------------------------------------------------
\usepackage{luamplib}%
diff --git a/graphics/mcf2graph/mcf_setup.sty b/graphics/mcf2graph/mcf_setup.sty
index 37945f1662..c308967b89 100644
--- a/graphics/mcf2graph/mcf_setup.sty
+++ b/graphics/mcf2graph/mcf_setup.sty
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf_setup.sty for input aux file by Akira Yamaji 2020.08.10
+% mcf_setup.sty for input aux file by Akira Yamaji 2020.08.30
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\edef\@F{F} \edef\File{}% 1
\edef\@C{C} \edef\Char{}% 2
@@ -27,6 +27,12 @@
\edef\@EXA{EXA} \edef\EXA{}% 19
\edef\@EXB{EXB} \edef\EXB{}% 20
%---------------------------------------------------------------------------
+\edef\@pk{pk}%
+\edef\@mps{mps}%
+\edef\@eps{eps}%
+\edef\@png{png}%
+\edef\@png{svg}%
+%---------------------------------------------------------------------------
\def\@tag@param#1:#2;{#1}%
\def\@var@param#1:#2;{#2}%
%----------------------------------------
@@ -63,10 +69,12 @@
%----------------------------------------
\fi%
}%
+%-----------------------------------------------------------------------------
+\def\z@num#1{\ifnum#1<10 00\the#1\else\ifnum#1<100 0\the#1\else \the#1\fi\fi}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% sfor : modified latex2e kernel program control
% @for => @sfor delimiter ',' => ';'
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%-----------------------------------------------------------------------------
\def\@sfor#1#2{\expandafter\def\expandafter\@tmp\expandafter{#1}%
\ifx\@tmp\@empty\else\expandafter\@rep#1;\@nil;\@@\@list{#2}\fi}%
%------------------------------------------------------------------
diff --git a/macros/latex/contrib/caption/CHANGELOG b/macros/latex/contrib/caption/CHANGELOG
index 1eab8c90a4..d228e25176 100644
--- a/macros/latex/contrib/caption/CHANGELOG
+++ b/macros/latex/contrib/caption/CHANGELOG
@@ -1,7 +1,7 @@
Changes made in the caption package bundle
==========================================
-Please note that this document does not reflect bugfix-releases, and that the dates given are the dates of the release w/o bugfixes.
+Please note that this document does not reflect bugfix-releases (which are marked with a letter after the version number, for example v3.4m), and that the dates given are the dates of the release w/o bugfixes.
If you are interested in a complete changelog -- including bugfixes -- process the dtx files with \RecordChanges and \PrintChanges.
@@ -118,6 +118,18 @@ v3.4 (2019/09/11)
- \ContinuedFloat renamed to \continuedfloat (since this is not a preamble command)
- \caption will always be re-defined now, unless `compatibility' is set to `v1' (or an incompatible package is loaded)
+v3.5 (2020/08/30)
+- If a document class defines \caption@documentclass, an adaption to the caption package will be loaded as caption-<documentclass>.sto
+- New commands \SetCaptionDefault and \AtCaptionPackage for usage in document classes or document class adaptions
+- Document class support re-written (using the new commands above)
+- New commands \caption@switchdefault and \caption@restoredefault for usage in babel language packages
+- Babel language support re-written (using the new commands above); furthermore it's independent on the load order now
+- Support for the babel language option `latvian' added
+- New command \DeclareCaptionSinglelinecheck
+- New commands \ForEachCaptionType and \ForEachCaptionSubType
+- Options "figure*" resp. "table*" will be applied additionally in "figure*" resp. "table*" environments (twocolumn mode only)
+- Option and font option "hypersetup" added which expands to \hypersetup (if defined) resp. nothing (otherwise)
+
bicaption package
-----------------
@@ -172,11 +184,3 @@ v1.2 (2018/05/13)
v1.3 (2019/08/31)
- New command \subfloat for easy transition from the `subfig' package
-
-
-totalcount package
-------------------
-
-v1.0 (2008/03/09)
-- 1st published version
-
diff --git a/macros/latex/contrib/caption/README b/macros/latex/contrib/caption/README
index 721eab665a..76c478b98f 100644
--- a/macros/latex/contrib/caption/README
+++ b/macros/latex/contrib/caption/README
@@ -1,7 +1,7 @@
==========================================================================
The `caption' package bundle
-Release 2020-07-20
+Release 2020-08-30
Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
License: LPPL = LaTeX Project Public Licence
@@ -23,13 +23,13 @@ If you need help using these packages please visit:
If you think you may have found a bug in these packages,
or want to report a suggestion for improvement, please either visit
- https://gitlab.com/axelsommerfeldt/caption/issues (preferred)
+ https://gitlab.com/axelsommerfeldt/caption/issues
or send an e-mail to
axel.sommerfeldt@f-m.fm
--------------------------------------------------------------------------
-The `caption' package v3.4 offers customization of captions of floating
+The `caption' package v3.5 offers customization of captions of floating
environments such `figure' and `table' and cooperates with the packages
float, floatflt, fltpage, hyperref, hypcap, listings, longtable,
@@ -76,6 +76,9 @@ User Manual: subcaption.pdf (English)
Note: The `newfloat' package was removed from this package bundle and was
uploaded to CTAN as stand-alone package.
+Note: The `totalcount' package was removed from this package bundle and
+was uploaded to CTAN as stand-alone package.
+
==========================================================================
(The pictures cat.eps & elephant.eps were taken with permission from the
LaTeX Companion examples.)
diff --git a/macros/latex/contrib/caption/bicaption.dtx b/macros/latex/contrib/caption/bicaption.dtx
index 9008263302..f2a52185c9 100644
--- a/macros/latex/contrib/caption/bicaption.dtx
+++ b/macros/latex/contrib/caption/bicaption.dtx
@@ -19,16 +19,20 @@
% This Current Maintainer of this work is Axel Sommerfeldt.
%
% This work consists of the files
-% caption.ins, caption.dtx, caption2.dtx, caption3.dtx,
-% bicaption.dtx, ltcaption.dtx, subcaption.dtx, totalcount.dtx,
+% caption.ins, caption.dtx, caption-light.dtx, caption2.dtx, caption3.dtx,
+% caption-ams-smf.dtx, caption-beamer.dtx, caption-elsarticle.dtx,
+% caption-koma.dtx, caption-memoir.dtx, caption-ntg.dtx,
+% caption-thesis.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx,
% the derived files
-% caption.sty, caption2.sty, caption3.sty,
-% bicaption.sty, ltcaption.sty, subcaption.sty, totalcount.sty,
+% caption.sty, caption-light.sty, caption2.sty, caption3.sty,
+% caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
+% caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
+% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty,
% and the user manuals
% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%
% \fi
-% \CheckSum{427}
+% \CheckSum{431}
%
% \iffalse
%<*driver>
@@ -827,17 +831,10 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{bicaption}[2016/03/27 v1.2 Bilingual Captions (AR)]
+\ProvidesPackage{bicaption}[2020/08/23 v1.2a Bilingual Captions (AR)]
% \end{macrocode}
% \begin{macrocode}
-\RequirePackage{caption}[2018/05/11] % needs v3.4 or newer
-% \end{macrocode}
-% \changes{v1.0}{2011/09/01}{Compatibility error added}
-% \begin{macrocode}
-\caption@AtBeginDocument{\caption@ifcompatibility{%
- \caption@Error{%
- The `bicaption' package does not work correctly\MessageBreak
- in compatibility mode}}{}}
+\RequirePackage{caption}[2020/08/23] % needs v3.5 or newer
% \end{macrocode}
%
% \bigskip
@@ -897,6 +894,30 @@
% \end{macro}
%
% \pagebreak[3]
+% \subsection{Compatibility check}
+%
+% \begin{macro}{\bicaption@CheckCompatibility}
+% \changes{v1.0}{2011/09/01}{Compatibility error added}
+% \changes{v1.2a}{2020/08/01}{Error text adapted to \package{caption} package~\version{4.0}}
+% \begin{macrocode}
+\newcommand*\bicaption@CheckCompatibility{%
+% \end{macrocode}
+% \begin{macrocode}
+ \caption@ifcompatibility{%
+ \bicaption@Error
+ {This package does not work with\MessageBreak
+ caption option `compatibility=v1'}%
+ \endinput}{}}
+% \end{macrocode}
+% \begin{macrocode}
+\bicaption@CheckCompatibility
+\caption@AtBeginDocument{%
+ \bicaption@CheckCompatibility
+ \let\bicaption@CheckCompatibility\@undefined}
+% \end{macrocode}
+% \end{macro}
+%
+% \pagebreak[3]
% \subsection{Declaration of options}
%
% The option |bi-lang| will setup which language(s) will actually be typeset,
@@ -1259,7 +1280,7 @@
% \end{macrocode}
% \begin{macrocode}
\long\def\@@@@bicaption#1#2[#3]#4{%
- \caption@getlabel#2\label{}\@nil
+ \caption@getlabel{#2}%
\bicaption@ifswap
{\bicaption@setup{#1}{#2}%
\bicaption@cmd[{#3}]{#4}}%
@@ -1293,7 +1314,7 @@
% \begin{macrocode}
\long\def\LT@@@@bicaption#1#2[#3]#4{%
\gdef\bicaption@LTsetup{%
- \caption@getlabel#2\label{}\@nil
+ \caption@getlabel{#2}%
\bicaption@LT@setup}%
\gdef\bicaption@LT@setup{%
\bicaption@ifswap
diff --git a/macros/latex/contrib/caption/caption-ams-smf.dtx b/macros/latex/contrib/caption/caption-ams-smf.dtx
new file mode 100644
index 0000000000..e36d586fb5
--- /dev/null
+++ b/macros/latex/contrib/caption/caption-ams-smf.dtx
@@ -0,0 +1,254 @@
+% \iffalse meta-comment
+%
+% This is file `caption-ams-smf.dtx'.
+%
+% Copyright (C) 2007-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%
+% --------------------------------------------------------------------------
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Axel Sommerfeldt.
+%
+% This work consists of the files
+% caption.ins, caption.dtx, caption-light.dtx, caption2.dtx, caption3.dtx,
+% caption-ams-smf.dtx, caption-beamer.dtx, caption-elsarticle.dtx,
+% caption-koma.dtx, caption-memoir.dtx, caption-ntg.dtx,
+% caption-thesis.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx,
+% the derived files
+% caption.sty, caption-light.sty, caption2.sty, caption3.sty,
+% caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
+% caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
+% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty,
+% and the user manuals
+% caption-deu.tex, caption-eng.tex, caption-rus.tex.
+%
+% \fi
+% \CheckSum{21}
+%
+% \iffalse
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}[1994/12/01]
+\ProvidesFile{caption-ams-smf.drv}[2020/07/31 v2.0 Implementation of the caption-ams-smf package]
+\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
+%\errorcontextlines=3
+%
+\documentclass{ltxdoc}
+\setlength\parindent{0pt}
+\setlength\parskip{\smallskipamount}
+%
+\makeatletter % make room for subsections like 2.16.14 in the TOC
+%\newcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.3em}}
+\renewcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.7em}}
+\makeatother
+%
+\usepackage{ifpdf}
+\ifpdf
+ \usepackage{mathptmx,courier}
+ \usepackage[scaled=0.90]{helvet}
+ \addtolength\marginparwidth{15pt}
+\fi
+%
+\usepackage{hypdoc}
+\ifpdf\usepackage{hypdestopt}\fi
+\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
+%
+\DeclareRobustCommand*\AmS{\texorpdfstring
+ {{\protect\usefont{OMS}{cmsy}{m}{n}A\kern-.1667em\lower.5ex\hbox{M}\kern-.125emS}}%
+ {AMS}}
+\DeclareRobustCommand*\SmF{SMF}
+%
+\begin{document}
+ \DocInput{caption-ams-smf.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \newcommand*\purerm[1]{\texorpdfstring{{\upshape\mdseries\rmfamily #1}}{#1}}
+% \newcommand*\puresf[1]{\texorpdfstring{{\upshape\mdseries\sffamily #1}}{#1}}
+% \newcommand*\purett[1]{\texorpdfstring{{\upshape\mdseries\ttfamily #1}}{#1}}
+% \let\class\puresf \let\package\puresf
+% \let\env\purett \let\opt\purett
+%
+% \newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
+% \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
+% \newcommand*\version[2][]{\textit{v#2}}
+%
+% \GetFileInfo{caption-ams-smf.drv}
+% \let\docdate\filedate
+% \let\docversion\fileversion
+% \GetFileInfo{caption-ams-smf.sto}
+%
+% \title{\texorpdfstring
+% {The adaption of the \package{caption} package to the \AmS\ and \SmF\ document classes\thanks{%^^A
+% This adaption has version number \docversion.}}%^^A
+% {The adaption of the caption package to the AMS and SMF document classes}}
+% \author{Axel Sommerfeldt\\
+% \url{https://gitlab.com/axelsommerfeldt/caption}}
+% \date{\docdate}
+% \maketitle
+%
+% \begin{abstract}
+% This package adapts the \package{caption} package to the \AmS\ and \SmF\ document classes.
+% \end{abstract}
+%
+% \section*{User manual}
+%
+% This document is describing the code implementation only.
+% The user documentation can be found in
+% \nopagebreak\begin{quote}
+% \begin{tabular}{ll}
+% \href{http://mirror.ctan.org/macros/latex/contrib/caption/caption-eng.pdf}%
+% {\texttt{caption-eng.pdf}} & The caption package bundle documentation \\
+% \end{tabular}
+% \end{quote}
+%
+% \StopEventually{}
+% \iffalse
+% \clearpage
+% \tableofcontents
+% \fi
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \DoNotIndex{\\,\_,\ ,\@@par}
+% \DoNotIndex{\@bsphack}
+% \DoNotIndex{\@car,\@cdr,\@classoptionslist,\@cons,\@currext,\@currname}
+% \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs}
+% \DoNotIndex{\@for,\@firstofone,\@firstoftwo}
+% \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom}
+% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded}
+% \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue}
+% \DoNotIndex{\@namedef,\@nameuse}
+% \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist}
+% \DoNotIndex{\@removeelement,\@restorepar,\@secondoftwo,\@setminipage,\@setpar}
+% \DoNotIndex{\@tempa,\@tempboxa,\@tempdima,\@tempdimb,\@tempdimc,\@tempb,\@tempc}
+% \DoNotIndex{\@testopt}
+% \DoNotIndex{\@undefined,\@unprocessedoptions,\@unusedoptionlist}
+% \DoNotIndex{\p@,\z@}
+% \DoNotIndex{\active,\addtocounter,\addtolength,\advance,\aftergroup}
+% \DoNotIndex{\baselineskip,\begin,\begingroup,\bfseries,\box}
+% \DoNotIndex{\catcode,\centering,\changes,\csname,\def,\divide,\do,\downarrow}
+% \DoNotIndex{\edef,\else,\empty,\end,\endcsname,\endgraf,\endgroup,\expandafter}
+% \DoNotIndex{\fi,\footnotesize,\global}
+% \DoNotIndex{\hangindent,\hbox,\hfil,\hsize,\hskip,\hspace,\hss}
+% \DoNotIndex{\ifcase,\ifdim,\ifnum,\ifodd,\ifvoid,\ifvmode}
+% \DoNotIndex{\ifx,\ignorespaces,\itshape}
+% \DoNotIndex{\Large,\large,\leavevmode,\leftmargini,\leftskip,\let,\linewidth}
+% \DoNotIndex{\llap,\long,\m@ne,\margin,\mdseries,\message}
+% \DoNotIndex{\newcommand,\newdimen,\newlength,\newline,\newif,\newsavebox}
+% \DoNotIndex{\next,\nobreak,\nobreakspace,\noexpand,\noindent,\numberline}
+% \DoNotIndex{\normalcolor,\normalfont,\normalsize,\or,\par,\parbox,\parfillskip}
+% \DoNotIndex{\parindent,\parskip,\prevdepth,\protect,\protected@edef,\protected@write}
+% \DoNotIndex{\providecommand,\quad}
+% \DoNotIndex{\raggedleft,\raggedright,\relax,\renewcommand,\RequirePackage}
+% \DoNotIndex{\rightskip,\rmfamily}
+% \DoNotIndex{\sbox,\scriptsize,\scshape,\setbox,\setlength,\sffamily,\slshape}
+% \DoNotIndex{\small,\string,\space,\strut}
+% \DoNotIndex{\textheight,\the,\toks@,\typeout,\ttfamily}
+% \DoNotIndex{\unvbox,\uparrow,\upshape,\usebox,\usepackage}
+% \DoNotIndex{\value,\vbox,\vsize,\vskip,\wd,\width,\z@skip}
+% \DoNotIndex{\AtBeginDocument,\AtEndOfPackage,\CurrentOption,\DeclareOption}
+% \DoNotIndex{\ExecuteOptions,\GenericWarning,\IfFileExists,\InputIfFileExists}
+% \DoNotIndex{\NeedsTeXFormat,\MessageBreak}
+% \DoNotIndex{\PackageError,\PackageInfo,\PackageWarning,\PackageWarningNoLine}
+% \DoNotIndex{\PassOptionsToPackage,\ProcessOptions,\ProvidesPackage}
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \setlength{\parskip}{0pt plus 1pt}
+% \newcommand*\Note[2][Note]{\par{\small\emph{#1:} #2}\par}
+%
+% \changes{v1.1}{2007/07/29}{\AmS\ \& \SmF\ classes support added}
+% \changes{v2.0}{2020/07/27}{\AmS\ \& \SmF\ class support adapted to \package{caption3}~\version{2.0}}
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \clearpage
+%
+% \iffalse
+%<*package>
+% \fi
+%
+% \section{Identification}
+%
+% \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}[1994/12/01]
+\ProvidesFile{caption-ams-smf.sto}[2020/08/22 v2.0 Adaption of the caption package to the AMS and SMF document classes (AR)]
+% \end{macrocode}
+%
+% \section{Margin resp. width}
+%
+% The \AmS\ document classes use |\caption|\-|indent| as fixed margin, usually set to |3pc|.
+% \begin{macrocode}
+\SetCaptionDefault*{margin}{\the\captionindent}
+% \end{macrocode}
+%
+% \section{Label separator}
+%
+% \begin{macrocode}
+\DeclareCaptionLabelSeparator{default}{.\enspace}
+% \end{macrocode}
+%
+% \section{Fonts}
+%
+% The `default' fonts map to |\@caption|\-|font| resp.~|\@caption|\-|head|\-|font|
+% which are usually set to |\sc|\-|shape| resp.~|\normalfont|.
+%
+% \begin{macrocode}
+\DeclareCaptionFont{ams@font}{\@captionfont}
+\DeclareCaptionFont{ams@labelfont}{\@captionheadfont}
+\DeclareCaptionFont{ams@textfont}{\@captionfont\upshape}
+\SetCaptionDefault{font}{ams@font}
+\SetCaptionDefault{labelfont}{ams@labelfont}
+\SetCaptionDefault{textfont}{ams@textfont}
+% \end{macrocode}
+%
+% \section{Vertical spaces before and after captions}
+%
+% The \AmS\ document classes uses |\above|\-|caption|\-|skip| and |\below|\-|caption|\-|skip|
+% different than the standard document classes and the \package{caption} package:
+% They typeset |\above|\-|caption|\-|skip| before the `figure' caption and
+% |\below|\-|caption|\-|skip| after all other captions. Both are preset to |12pt|.
+%
+% For this reason we have to set the |\below|\-|caption|\-|skip| to |0pt| if the \package{caption}
+% package is used, so no extra vertical space will be created.
+%
+% \begin{macrocode}
+\AtCaptionPackage{\setlength\belowcaptionskip{0pt}}
+% \end{macrocode}
+%
+% \section{Positioning}
+%
+% The default caption position in all floating environments except `figure' is `top'.
+% \begin{macrocode}
+\captionsetup{position=t,figureposition=b}
+% \end{macrocode}
+%
+% \iffalse
+%</package>
+% \fi
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \clearpage
+% \Finale
+%
+\endinput
+
diff --git a/macros/latex/contrib/caption/caption-beamer.dtx b/macros/latex/contrib/caption/caption-beamer.dtx
new file mode 100644
index 0000000000..57993b5c49
--- /dev/null
+++ b/macros/latex/contrib/caption/caption-beamer.dtx
@@ -0,0 +1,382 @@
+% \iffalse meta-comment
+%
+% This is file `caption-beamer.dtx'.
+%
+% Copyright (C) 2007-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%
+% --------------------------------------------------------------------------
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Axel Sommerfeldt.
+%
+% This work consists of the files
+% caption.ins, caption.dtx, caption-light.dtx, caption2.dtx, caption3.dtx,
+% caption-ams-smf.dtx, caption-beamer.dtx, caption-elsarticle.dtx,
+% caption-koma.dtx, caption-memoir.dtx, caption-ntg.dtx,
+% caption-thesis.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx,
+% the derived files
+% caption.sty, caption-light.sty, caption2.sty, caption3.sty,
+% caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
+% caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
+% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty,
+% and the user manuals
+% caption-deu.tex, caption-eng.tex, caption-rus.tex.
+%
+% \fi
+% \CheckSum{104}
+%
+% \iffalse
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}[1994/12/01]
+\ProvidesFile{caption-beamer.drv}[2018/05/13 v2.0 Implementation of the caption-beamer package]
+\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
+%\errorcontextlines=3
+%
+\documentclass{ltxdoc}
+\setlength\parindent{0pt}
+\setlength\parskip{\smallskipamount}
+%
+\makeatletter % make room for subsections like 2.16.14 in the TOC
+%\newcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.3em}}
+\renewcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.7em}}
+\makeatother
+%
+\usepackage{ifpdf}
+\ifpdf
+ \usepackage{mathptmx,courier}
+ \usepackage[scaled=0.90]{helvet}
+ \addtolength\marginparwidth{15pt}
+\fi
+%
+\usepackage{hypdoc}
+\ifpdf\usepackage{hypdestopt}\fi
+\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
+%
+\begin{document}
+ \DocInput{caption-beamer.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \newcommand*\purerm[1]{\texorpdfstring{{\upshape\mdseries\rmfamily #1}}{#1}}
+% \newcommand*\puresf[1]{\texorpdfstring{{\upshape\mdseries\sffamily #1}}{#1}}
+% \newcommand*\purett[1]{\texorpdfstring{{\upshape\mdseries\ttfamily #1}}{#1}}
+% \let\class\puresf \let\package\puresf
+% \let\env\purett \let\opt\purett
+%
+% \newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
+% \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
+% \newcommand*\version[2][]{\textit{v#2}}
+%
+% \GetFileInfo{caption-beamer.drv}
+% \let\docdate\filedate
+% \let\docversion\fileversion
+% \GetFileInfo{caption-beamer.sto}
+%
+% \title{\texorpdfstring
+% {The adaption of the \package{caption} package to the \class{beamer} document class\thanks{%^^A
+% This adaption has version number \docversion.}}%^^A
+% {The adaption of the caption package to the beamer document class}}
+% \author{Axel Sommerfeldt\\
+% \url{https://gitlab.com/axelsommerfeldt/caption}}
+% \date{\docdate}
+% \maketitle
+%
+% \begin{abstract}
+% This package adapts the \package{caption} package to the \class{beamer} document class.
+% \end{abstract}
+%
+% \section*{User manual}
+%
+% This document is describing the code implementation only. The user
+% documentation can be found in
+% \nopagebreak\begin{quote}
+% \begin{tabular}{ll}
+% \href{http://mirror.ctan.org/macros/latex/contrib/caption/caption-eng.pdf}%
+% {\texttt{caption-eng.pdf}} & The caption package bundle documentation \\
+% \end{tabular}
+% \end{quote}
+%
+% \StopEventually{}
+% \iffalse
+% \clearpage
+% \tableofcontents
+% \fi
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \DoNotIndex{\\,\_,\ ,\@@par}
+% \DoNotIndex{\@bsphack}
+% \DoNotIndex{\@car,\@cdr,\@classoptionslist,\@cons,\@currext,\@currname}
+% \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs}
+% \DoNotIndex{\@for,\@firstofone,\@firstoftwo}
+% \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom}
+% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded}
+% \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue}
+% \DoNotIndex{\@namedef,\@nameuse}
+% \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist}
+% \DoNotIndex{\@removeelement,\@restorepar,\@secondoftwo,\@setminipage,\@setpar}
+% \DoNotIndex{\@tempa,\@tempboxa,\@tempdima,\@tempdimb,\@tempdimc,\@tempb,\@tempc}
+% \DoNotIndex{\@testopt}
+% \DoNotIndex{\@undefined,\@unprocessedoptions,\@unusedoptionlist}
+% \DoNotIndex{\p@,\z@}
+% \DoNotIndex{\active,\addtocounter,\addtolength,\advance,\aftergroup}
+% \DoNotIndex{\baselineskip,\begin,\begingroup,\bfseries,\box}
+% \DoNotIndex{\catcode,\centering,\changes,\csname,\def,\divide,\do,\downarrow}
+% \DoNotIndex{\edef,\else,\empty,\end,\endcsname,\endgraf,\endgroup,\expandafter}
+% \DoNotIndex{\fi,\footnotesize,\global}
+% \DoNotIndex{\hangindent,\hbox,\hfil,\hsize,\hskip,\hspace,\hss}
+% \DoNotIndex{\ifcase,\ifdim,\ifnum,\ifodd,\ifvoid,\ifvmode}
+% \DoNotIndex{\ifx,\ignorespaces,\itshape}
+% \DoNotIndex{\Large,\large,\leavevmode,\leftmargini,\leftskip,\let,\linewidth}
+% \DoNotIndex{\llap,\long,\m@ne,\margin,\mdseries,\message}
+% \DoNotIndex{\newcommand,\newdimen,\newlength,\newline,\newif,\newsavebox}
+% \DoNotIndex{\next,\nobreak,\nobreakspace,\noexpand,\noindent,\numberline}
+% \DoNotIndex{\normalcolor,\normalfont,\normalsize,\or,\par,\parbox,\parfillskip}
+% \DoNotIndex{\parindent,\parskip,\prevdepth,\protect,\protected@edef,\protected@write}
+% \DoNotIndex{\providecommand,\quad}
+% \DoNotIndex{\raggedleft,\raggedright,\relax,\renewcommand,\RequirePackage}
+% \DoNotIndex{\rightskip,\rmfamily}
+% \DoNotIndex{\sbox,\scriptsize,\scshape,\setbox,\setlength,\sffamily,\slshape}
+% \DoNotIndex{\small,\string,\space,\strut}
+% \DoNotIndex{\textheight,\the,\toks@,\typeout,\ttfamily}
+% \DoNotIndex{\unvbox,\uparrow,\upshape,\usebox,\usepackage}
+% \DoNotIndex{\value,\vbox,\vsize,\vskip,\wd,\width,\z@skip}
+% \DoNotIndex{\AtBeginDocument,\AtEndOfPackage,\CurrentOption,\DeclareOption}
+% \DoNotIndex{\ExecuteOptions,\GenericWarning,\IfFileExists,\InputIfFileExists}
+% \DoNotIndex{\NeedsTeXFormat,\MessageBreak}
+% \DoNotIndex{\PackageError,\PackageInfo,\PackageWarning,\PackageWarningNoLine}
+% \DoNotIndex{\PassOptionsToPackage,\ProcessOptions,\ProvidesPackage}
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \setlength{\parskip}{0pt plus 1pt}
+% \newcommand*\Note[2][Note]{\par{\small\emph{#1:} #2}\par}
+%
+% \changes{v1.1}{2007/03/10}{\class{beamer} class support added}
+% \changes{v1.3}{2011/08/06}{\class{beamer} class support revised}
+% \changes{v1.5}{2013/04/27}{The \class{beamer} template \texttt{caption label separator} will be used now}
+% \changes{v1.7}{2016/05/22}{Re-definition of label format \texttt{simpleMagyar} added to \class{beamer} class support}
+% \changes{v1.7}{2018/04/15}{Re-definition of label format \texttt{simpleMagyar} revised}
+% \changes{v1.7}{2018/05/01}{Definition of \class{beamer} default label font revised}
+% \changes{v2.0}{2020/07/27}{\class{beamer} class support adapted to \package{caption3}~\version{2.0}}
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \clearpage
+%
+% \iffalse
+%<*package>
+% \fi
+%
+% \section{Identification}
+%
+% \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}[1994/12/01]
+\ProvidesFile{caption-beamer.sto}[2020/08/22 v2.0 Adaption of the caption package to the beamer document classes (AR)]
+% \end{macrocode}
+%
+% \section{Helper macros}
+%
+% \begin{macro}{\caption@ifbeamertemplate}
+% |\caption@ifbeamertemplate|\marg{caption template name}\marg{yes-code}\marg{no-code}\\
+% tests if the given beamer caption template was selected by the user (or not).
+% \begin{macrocode}
+\newcommand*\caption@ifbeamertemplate[1]{%
+ \begingroup
+ \let\beamer@@tmpl@caption@ORI\beamer@@tmpl@caption
+ \@nameuse{beamer@@tmpop@caption@#1}%
+ \ifx\beamer@@tmpl@caption@ORI\beamer@@tmpl@caption
+ \endgroup\expandafter\@firstoftwo
+ \else
+ \endgroup\expandafter\@secondoftwo
+ \fi}
+% \end{macrocode}
+% \end{macro}
+%
+% \section{Single-line-check}
+%
+% The `default' single-line-check maps to the beamer template setting `caption name own line'.
+% \begin{macrocode}
+\DeclareCaptionSinglelinecheck{default}{%
+ \caption@ifbeamertemplate{caption name own line}%
+ \@secondoftwo % \@secondoftwo -> singlelinecheck=off
+ \@firstoftwo} % \@firstoftwo -> singlelinecheck=on
+% \end{macrocode}
+%
+% \begin{macro}{\caption@prepareslc}
+% \changes{v1.12b}{2020/07/20}{Special adaption to \class{beamer} added}
+% The patch of \cs{footnote} provided by the \package{caption3} package assumes
+% that the optional arguments of \cs{footnote} and \cs{footnotemark} match.
+% Since this is not the case in \class{beamer} based documents,
+% and since \class{beamer} extents the syntax of \cs{footnote} in a special way,
+% we need a special patch here.\par
+% \emph{Note:} For this patch we assume that \cs{footnote} will always end with the usage of
+% \cs{beamer@footnotetext}. (Unfortunately \cs{footnote} is defined too monolithic
+% in \class{beamer} to offer a less dirty patch.)
+% \begin{macrocode}
+\g@addto@macro\caption@prepareslc{%
+ \def\footnote{%
+ \begingroup
+ \let\stepcounter\caption@l@stepcounter
+ \renewcommand<>\beamer@framefootnotetext[1]{%
+ \endgroup}%
+ \let\@footnotetext\beamer@framefootnotetext
+ \caption@footnote@ORI}}
+% \end{macrocode}
+% \end{macro}
+%
+% \section{Label formats}
+%
+% The `default' caption label format maps to either `simple' (if the `numbered' beamer template is set) or `unnumbered' (otherwise).
+% \begin{macrocode}
+\DeclareCaptionLabelFormat{default}{%
+ \caption@ifbeamertemplate{numbered}%
+ \caption@labelformat@simple
+ \caption@labelformat@unnumbered
+ {#1}{#2}}
+% \end{macrocode}
+%
+% The \package{magyar} babel package redefines the current label format to a one called |simple|\-|Magyar|,
+% defined within |\@@magyar@caption|\-|fix| which will be executed |\At|\-|Begin|\-|Document|:
+% \begin{quote}
+% |\DeclareCaptionLabelFormat{simpleMagyar}%|\\
+% | {#2.\bothIfSecond{\nobreakspace}{#1}}|
+% \end{quote}
+% When used with beamer, we need to patch it so no numbering will be used if the `numbered` template isn't selected.
+% \begin{macrocode}
+\DeclareCaptionLabelFormat{simpleMagyar}{%
+ \caption@ifbeamertemplate{numbered}%
+ {#2.\bothIfSecond{\nobreakspace}{#1}}%
+ {\caption@labelformat@unnumbered{#1}{#2}}}
+% \end{macrocode}
+% \begin{macro}{\@@magyar@captionfix}
+% Prevent \package{magyar} from defining this caption label format on its own.
+% \begin{macrocode}
+\let\@@magyar@captionfix\relax
+\AtBeginDocument{\let\@@magyar@captionfix\relax}
+% \end{macrocode}
+% \end{macro}
+%
+% \section{Label separator}
+%
+% The `default' caption label separator maps to the beamer templates
+% `caption name own line' and `caption label separator'.
+%
+% If the beamer template `caption name own line' is set, this code equals to
+% \begin{quote}
+% |\DeclareCaptionLabelSeparator*{default}{\\}|
+% \end{quote}
+% otherwise this code equals to
+% \begin{quote}
+% |\DeclareCaptionLabelSeparator{default}%|\\
+% | {\usebeamertemplate{caption label separator}}|
+% \end{quote}
+% \begin{macrocode}
+\DeclareCaptionLabelSeparator**{default}%
+ {\caption@ifbeamertemplate{caption name own line}}%
+ {\caption@ifbeamertemplate{caption name own line}%
+ {\\}%
+ {\usebeamertemplate{caption label separator}}}
+% \end{macrocode}
+%
+% \section{Fonts}
+%
+% The `default' caption font maps to the beamer settings for `caption' resp. `caption name'.
+% \begin{macrocode}
+\DeclareCaptionFont{beamer@font}{%
+ \usebeamerfont*{caption}%
+ \usebeamercolor[fg]{caption}}
+\SetCaptionDefault{font}{beamer@font}
+% \end{macrocode}
+% \begin{macrocode}
+\DeclareCaptionFont{beamer@labelfont}{%
+ \setbeamercolor*{caption}{}% avoid setting "caption" color additionally
+ \usebeamercolor[fg]{caption name}%
+ \setbeamerfont*{caption}{}% avoid setting "caption" font additionally
+ \usebeamerfont{caption name}}
+\SetCaptionDefault{labelfont}{beamer@labelfont}
+% \end{macrocode}
+% \begin{macrocode}
+\DeclareCaptionFont{beamer@textfont}{}
+\SetCaptionDefault{textfont}{beamer@textfont}
+% \end{macrocode}
+%
+% \section{Justification}
+%
+% The `default' caption justification is `raggedright'.
+% \begin{macrocode}
+\SetCaptionDefault{justification}{raggedright}
+% \end{macrocode}
+%
+% \section{Lists}
+%
+% Since the beamer class do not offer a `List of figures' we switch it off.
+% \begin{macrocode}
+\captionsetup{list=off}
+% \end{macrocode}
+%
+% \section{Adaption of figure and table environment}
+%
+% \begin{macrocode}
+\AtCaptionPackage{%
+% \end{macrocode}
+%
+% \begin{macro}{\figure}
+% \changes{v1.1f}{2007/12/17}{This re-definition for \class{beamer} document class added}
+% \changes{v1.8d}{2019/09/01}{This re-definition for \class{beamer} document class revised}
+% \begin{macrocode}
+ \expandafter\let\expandafter\caption@beamer@figure
+ \csname\string\figure\endcsname
+ \@namedef{\string\figure}[#1]{%
+ \caption@beamer@figure[#1]% use original beamer code first
+ \caption@settype{figure}} % set "type=figure" afterwards
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\table}
+% \changes{v1.1f}{2007/12/17}{This re-definition for \class{beamer} document class added}
+% \changes{v1.8d}{2019/09/01}{This re-definition for \class{beamer} document class revised}
+% \changes{v1.8e}{2019/10/18}{Bug fixed which was introduced in previous revision}
+% We redefine |figure| \& |table| so our type-specific options will be used etc.
+% \begin{macrocode}
+ \expandafter\let\expandafter\caption@beamer@table
+ \csname\string\table\endcsname
+ \@namedef{\string\table}[#1]{%
+ \caption@beamer@table[#1]% use original beamer code first
+ \caption@settype{table}} % set "type=table" afterwards
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+}
+% \end{macrocode}
+%
+% \iffalse
+%</package>
+% \fi
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \clearpage
+% \Finale
+%
+\endinput
+
diff --git a/macros/latex/contrib/caption/caption-deu.pdf b/macros/latex/contrib/caption/caption-deu.pdf
index 7697a2f35c..e20b64721a 100644
--- a/macros/latex/contrib/caption/caption-deu.pdf
+++ b/macros/latex/contrib/caption/caption-deu.pdf
Binary files differ
diff --git a/macros/latex/contrib/caption/caption-deu.tex b/macros/latex/contrib/caption/caption-deu.tex
index 6a58b3ca9a..7d84184285 100644
--- a/macros/latex/contrib/caption/caption-deu.tex
+++ b/macros/latex/contrib/caption/caption-deu.tex
@@ -1,7 +1,7 @@
%
% This is file `caption-deu.tex'.
%
-% Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+% Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -17,14 +17,21 @@
%
% This Current Maintainer of this work is Axel Sommerfeldt.
%
-% This work consists of the files caption.ins, caption.dtx, caption2.dtx,
-% caption3.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx, and newfloat.dtx,
-% the derived files caption.sty, caption2.sty, caption3.sty,
-% bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty,
-% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
+% This work consists of the files
+% caption.ins, caption.dtx, caption-light.dtx, caption2.dtx, caption3.dtx,
+% caption-ams-smf.dtx, caption-beamer.dtx, caption-elsarticle.dtx,
+% caption-koma.dtx, caption-memoir.dtx, caption-ntg.dtx,
+% caption-thesis.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx,
+% the derived files
+% caption.sty, caption-light.sty, caption2.sty, caption3.sty,
+% caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
+% caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
+% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty,
+% and the user manuals
+% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-deu.tex}[2011/11/02 v3.2 Das caption-Paket]
+\ProvidesFile{caption-deu.tex}[2020/08/22 v3.4 Das caption-Paket]
\hbadness=9999 \newcount\hbadness \hfuzz=20pt % Make TeX shut up.
%\errorcontextlines=3
@@ -194,9 +201,12 @@
\GetFileInfo{caption-deu.tex}
\let\docdate\filedate
+\let\docdate\filedate
+\let\docversion\fileversion
\GetFileInfo{caption.sty}
-\title{Anpassen der Abbildungs- und Tabellenbeschriftungen}
+\title{Anpassen der Abbildungs- und Tabellenbeschriftungen\texorpdfstring{%
+ \thanks{Dieses Paket hat Versionsnummer \docversion.}}{}}
\author{Axel Sommerfeldt\\
\url{https://gitlab.com/axelsommerfeldt/caption}}
\date{\docdate}
@@ -223,11 +233,49 @@ kleinen aber feinen \package{capt-of}"=Paketes hierzu völlig ausreichend.
\newcommand\exampletext{%
Die auf die Rotationsfrequenz des Innenzylinders normierten Eigenfrequenzen
- der gefundenen Grundmoden der Taylor"=Str"omung f"ur \mbox{$\eta = 0.5$}. %\\
+ der gefundenen Grundmoden der Taylor"=Strömung f"ur \mbox{$\eta = 0.5$}. %\\
(Die azimutale Wellenzahl ist mit $m$ bezeichnet.)}
% --------------------------------------------------------------------------- %
+\section*{Status dieses Dokumentes}
+
+Diese Dokumentation ist veraltet.
+
+Sie dokumentiert die in Version \version{3.1} des \package{caption}"=Paketes
+verfügbaren Optionen und Befehle, jedoch nicht, was in folgenden Versionen
+hinzugefügt wurde. Warum?
+\begin{itemize}
+\item
+ Ich war nicht glücklich mit der Struktur der Dokumentation und wollte sie daher
+ neu schreiben. Warum also eine aufgegebene Version der Dokumentation pflegen?
+ (Leider hatte ich aber nie die Zeit gefunden, die neue Version zu schreiben.)
+\item
+ Da meine Freizeit seit dem Release der Version \version{3.1} nur spärlich
+ vorhanden war, wollte ich die Veröffentlichung von Verbesserungen und
+ Erweiterungen nicht aufgrund fehlender Dokumentation um Monate verzögern.
+\item
+ Da ich früher Fehlerkorrekturen nur in der aktuellen Entwicklungsversion
+ vorgenommen hatte, wollte ich die Veröffentlichung von Korrekturen nicht
+ aufgrund fehlender Dokumentation um Monate verzögern.
+ (Seit 2015 werden Fehler in der Regel auch für die letzte Release"=Version
+ behoben und auf CTAN veröffentlicht.)
+\end{itemize}
+
+Wie geht es nun weiter?
+\begin{itemize}
+\item
+ Ich werde in den nächsten Wochen starten, die Dokumentation (endlich) zu aktualisieren.
+\item
+ Bis die überarbeitete Version fertig und auf CTAN zu finden ist,
+ kann jederzeit der aktuelle Zwischenstand über
+ \url{https://gitlab.com/axelsommerfeldt/caption/-/blob/master/doc/caption-eng.pdf}
+ bezogen werden. (Zunächst wird die englischsprachige Dokumentation überarbeitet,
+ und erst anschließend die deutschsprachige.)
+\end{itemize}
+
+% --------------------------------------------------------------------------- %
+
\section*{Einleitung}
Mit |\caption| gesetzte Bildunterschriften und Tabellenüberschriften werden
diff --git a/macros/latex/contrib/caption/caption-elsarticle.dtx b/macros/latex/contrib/caption/caption-elsarticle.dtx
new file mode 100644
index 0000000000..c7f0922c14
--- /dev/null
+++ b/macros/latex/contrib/caption/caption-elsarticle.dtx
@@ -0,0 +1,208 @@
+% \iffalse meta-comment
+%
+% This is file `caption-elsarticle.dtx'.
+%
+% Copyright (C) 2013-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%
+% --------------------------------------------------------------------------
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Axel Sommerfeldt.
+%
+% This work consists of the files
+% caption.ins, caption.dtx, caption-light.dtx, caption2.dtx, caption3.dtx,
+% caption-ams-smf.dtx, caption-beamer.dtx, caption-elsarticle.dtx,
+% caption-koma.dtx, caption-memoir.dtx, caption-ntg.dtx,
+% caption-thesis.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx,
+% the derived files
+% caption.sty, caption-light.sty, caption2.sty, caption3.sty,
+% caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
+% caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
+% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty,
+% and the user manuals
+% caption-deu.tex, caption-eng.tex, caption-rus.tex.
+%
+% \fi
+% \CheckSum{3}
+%
+% \iffalse
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}[1994/12/01]
+\ProvidesFile{caption-elsarticle.drv}[2018/05/24 v2.0 Implementation of the caption-elsarticle package]
+\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
+%\errorcontextlines=3
+%
+\documentclass{ltxdoc}
+\setlength\parindent{0pt}
+\setlength\parskip{\smallskipamount}
+%
+\makeatletter % make room for subsections like 2.16.14 in the TOC
+%\newcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.3em}}
+\renewcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.7em}}
+\makeatother
+%
+\usepackage{ifpdf}
+\ifpdf
+ \usepackage{mathptmx,courier}
+ \usepackage[scaled=0.90]{helvet}
+ \addtolength\marginparwidth{15pt}
+\fi
+%
+\usepackage{hypdoc}
+\ifpdf\usepackage{hypdestopt}\fi
+\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
+%
+\begin{document}
+ \DocInput{caption-elsarticle.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \newcommand*\purerm[1]{\texorpdfstring{{\upshape\mdseries\rmfamily #1}}{#1}}
+% \newcommand*\puresf[1]{\texorpdfstring{{\upshape\mdseries\sffamily #1}}{#1}}
+% \newcommand*\purett[1]{\texorpdfstring{{\upshape\mdseries\ttfamily #1}}{#1}}
+% \let\class\puresf \let\package\puresf
+% \let\env\purett \let\opt\purett
+%
+% \newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
+% \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
+% \newcommand*\version[2][]{\textit{v#2}}
+%
+% \GetFileInfo{caption-elsarticle.drv}
+% \let\docdate\filedate
+% \let\docversion\fileversion
+% \GetFileInfo{caption-elsarticle.sto}
+%
+% \title{\texorpdfstring
+% {The adaption of the \package{caption} package to the \class{elsarticle} document class\thanks{%^^A
+% This adaption has version number \docversion.}}%^^A
+% {The adaption of the caption package to the elsarticle document class}}
+% \author{Axel Sommerfeldt\\
+% \url{https://gitlab.com/axelsommerfeldt/caption}}
+% \date{\docdate}
+% \maketitle
+%
+% \begin{abstract}
+% This package adapts the \package{caption} package to the \package{elsarticle} document class.
+% \end{abstract}
+%
+% \section*{User manual}
+%
+% This document is describing the code implementation only. The user
+% documentation can be found in
+% \nopagebreak\begin{quote}
+% \begin{tabular}{ll}
+% \href{http://mirror.ctan.org/macros/latex/contrib/caption/caption-eng.pdf}%
+% {\texttt{caption-eng.pdf}} & The caption package bundle documentation \\
+% \end{tabular}
+% \end{quote}
+%
+% \StopEventually{}
+% \iffalse
+% \clearpage
+% \tableofcontents
+% \fi
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \DoNotIndex{\\,\_,\ ,\@@par}
+% \DoNotIndex{\@bsphack}
+% \DoNotIndex{\@car,\@cdr,\@classoptionslist,\@cons,\@currext,\@currname}
+% \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs}
+% \DoNotIndex{\@for,\@firstofone,\@firstoftwo}
+% \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom}
+% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded}
+% \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue}
+% \DoNotIndex{\@namedef,\@nameuse}
+% \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist}
+% \DoNotIndex{\@removeelement,\@restorepar,\@secondoftwo,\@setminipage,\@setpar}
+% \DoNotIndex{\@tempa,\@tempboxa,\@tempdima,\@tempdimb,\@tempdimc,\@tempb,\@tempc}
+% \DoNotIndex{\@testopt}
+% \DoNotIndex{\@undefined,\@unprocessedoptions,\@unusedoptionlist}
+% \DoNotIndex{\p@,\z@}
+% \DoNotIndex{\active,\addtocounter,\addtolength,\advance,\aftergroup}
+% \DoNotIndex{\baselineskip,\begin,\begingroup,\bfseries,\box}
+% \DoNotIndex{\catcode,\centering,\changes,\csname,\def,\divide,\do,\downarrow}
+% \DoNotIndex{\edef,\else,\empty,\end,\endcsname,\endgraf,\endgroup,\expandafter}
+% \DoNotIndex{\fi,\footnotesize,\global}
+% \DoNotIndex{\hangindent,\hbox,\hfil,\hsize,\hskip,\hspace,\hss}
+% \DoNotIndex{\ifcase,\ifdim,\ifnum,\ifodd,\ifvoid,\ifvmode}
+% \DoNotIndex{\ifx,\ignorespaces,\itshape}
+% \DoNotIndex{\Large,\large,\leavevmode,\leftmargini,\leftskip,\let,\linewidth}
+% \DoNotIndex{\llap,\long,\m@ne,\margin,\mdseries,\message}
+% \DoNotIndex{\newcommand,\newdimen,\newlength,\newline,\newif,\newsavebox}
+% \DoNotIndex{\next,\nobreak,\nobreakspace,\noexpand,\noindent,\numberline}
+% \DoNotIndex{\normalcolor,\normalfont,\normalsize,\or,\par,\parbox,\parfillskip}
+% \DoNotIndex{\parindent,\parskip,\prevdepth,\protect,\protected@edef,\protected@write}
+% \DoNotIndex{\providecommand,\quad}
+% \DoNotIndex{\raggedleft,\raggedright,\relax,\renewcommand,\RequirePackage}
+% \DoNotIndex{\rightskip,\rmfamily}
+% \DoNotIndex{\sbox,\scriptsize,\scshape,\setbox,\setlength,\sffamily,\slshape}
+% \DoNotIndex{\small,\string,\space,\strut}
+% \DoNotIndex{\textheight,\the,\toks@,\typeout,\ttfamily}
+% \DoNotIndex{\unvbox,\uparrow,\upshape,\usebox,\usepackage}
+% \DoNotIndex{\value,\vbox,\vsize,\vskip,\wd,\width,\z@skip}
+% \DoNotIndex{\AtBeginDocument,\AtEndOfPackage,\CurrentOption,\DeclareOption}
+% \DoNotIndex{\ExecuteOptions,\GenericWarning,\IfFileExists,\InputIfFileExists}
+% \DoNotIndex{\NeedsTeXFormat,\MessageBreak}
+% \DoNotIndex{\PackageError,\PackageInfo,\PackageWarning,\PackageWarningNoLine}
+% \DoNotIndex{\PassOptionsToPackage,\ProcessOptions,\ProvidesPackage}
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \setlength{\parskip}{0pt plus 1pt}
+% \newcommand*\Note[2][Note]{\par{\small\emph{#1:} #2}\par}
+%
+% \changes{v1.5}{2013/01/06}{\class{elsarticle} class support added}
+% \changes{v2.0}{2020/07/27}{\class{elsarticle} class support adapted to \package{caption3}~\version{2.0}}
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \clearpage
+%
+% \iffalse
+%<*package>
+% \fi
+%
+% \section{Identification}
+%
+% \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}[1994/12/01]
+\ProvidesFile{caption-elsarticle.sto}[2020/08/22 v2.0 Adaption of the caption package to the elsarticle document class (AR)]
+% \end{macrocode}
+%
+% \section{Fonts}
+%
+% The `default' caption size is |\footnotesize|.
+% \begin{macrocode}
+\SetCaptionDefault{font}{footnotesize}
+% \end{macrocode}
+%
+% \iffalse
+%</package>
+% \fi
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \clearpage
+% \Finale
+%
+\endinput
+
diff --git a/macros/latex/contrib/caption/caption-eng.pdf b/macros/latex/contrib/caption/caption-eng.pdf
index d0e771e0c4..d7744c25d0 100644
--- a/macros/latex/contrib/caption/caption-eng.pdf
+++ b/macros/latex/contrib/caption/caption-eng.pdf
Binary files differ
diff --git a/macros/latex/contrib/caption/caption-eng.tex b/macros/latex/contrib/caption/caption-eng.tex
index ef9fd38923..8a10baffd0 100644
--- a/macros/latex/contrib/caption/caption-eng.tex
+++ b/macros/latex/contrib/caption/caption-eng.tex
@@ -1,7 +1,7 @@
%
% This is file `caption-eng.tex'.
%
-% Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+% Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -17,14 +17,21 @@
%
% This Current Maintainer of this work is Axel Sommerfeldt.
%
-% This work consists of the files caption.ins, caption.dtx, caption2.dtx,
-% caption3.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx, and newfloat.dtx,
-% the derived files caption.sty, caption2.sty, caption3.sty,
-% bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty,
-% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
+% This work consists of the files
+% caption.ins, caption.dtx, caption-light.dtx, caption2.dtx, caption3.dtx,
+% caption-ams-smf.dtx, caption-beamer.dtx, caption-elsarticle.dtx,
+% caption-koma.dtx, caption-memoir.dtx, caption-ntg.dtx,
+% caption-thesis.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx,
+% the derived files
+% caption.sty, caption-light.sty, caption2.sty, caption3.sty,
+% caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
+% caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
+% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty,
+% and the user manuals
+% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-eng.tex}[2011/11/02 v3.2 The caption package]
+\ProvidesFile{caption-eng.tex}[2020/08/30 v3.5 The caption package]
\hbadness=9999 \newcount\hbadness \hfuzz=20pt % Make TeX shut up.
%\errorcontextlines=3
@@ -187,9 +194,11 @@
\GetFileInfo{caption-eng.tex}
\let\docdate\filedate
+\let\docversion\fileversion
\GetFileInfo{caption.sty}
-\title{Customizing captions of floating environments}
+\title{Customizing captions of floating environments\texorpdfstring{%
+ \thanks{This package has version number \docversion.}}{}}
\author{Axel Sommerfeldt\\
\url{https://gitlab.com/axelsommerfeldt/caption}}
\date{\docdate}
@@ -206,7 +215,7 @@ many other packages.
commands for customizing captions.
If these possibilities are sufficient for you, there is usually no need for
you to use the \package{caption} package at all.
-And if you are just interested in using the command \cs{captionof}, loading of
+And if you are only interested in using the command \cs{captionof}, loading of
the very small \package{capt-of} package is usually sufficient.
\end{abstract}
@@ -218,6 +227,41 @@ the very small \package{capt-of} package is usually sufficient.
% --------------------------------------------------------------------------- %
+\section*{State of this document}
+
+This documentation is outdated.
+
+It documents the options and commands available in version \version{3.1} of the
+\package{caption} package, but many things added later on is missing here. Why?
+\begin{itemize}
+\item
+ I wasn't happy with the structure of the documentation, so I decided to write a new one.
+ So why updating the abandoned documentation?
+ (Unfortunately I never found the time to actually write the new one.)
+\item
+ Since my spare time was extremly limited since version \version{3.1} I didn't
+ wanted to hold improvements and enhancements back for months because of missing
+ documentation.
+\item
+ Since I used to fix bugs in the most recent development version only,
+ I didn't wanted to hold bugfixes back for months because of missing
+ documentation of features.
+ (But since 2015 bugs will usually get fixed for the latest release version as well,
+ and released to CTAN as bug-fixed version afterwards.)
+\end{itemize}
+
+What now?
+\begin{itemize}
+\item
+ I will start revising this documentation in the next weeks, finally bringing it up-to-date.
+\item
+ Until the revised documentation is ready the most recent version could be found at
+ \url{https://gitlab.com/axelsommerfeldt/caption/-/blob/master/doc/caption-eng.pdf}
+ since I will not upload every improvement of the documentation to CTAN immediately.
+\end{itemize}
+
+% --------------------------------------------------------------------------- %
+
\section*{Introduction}
Within the standard \LaTeX\ document classes captions haven't received the
@@ -613,18 +657,18 @@ You can choose one of the following:
Three examples:
\begin{Example}
\begin{quote}
- |format=plain,justification=centerlast|
+ |format=hang,justification=raggedright|
\end{quote}
\captionsetup{skip=0pt}
- \example{format=plain,justification=centerlast}{\exampletext}
+ \example{format=hang,justification=raggedright}{\exampletext}
\end{Example}
\begin{Example}
\begin{quote}
- |format=hang,justification=raggedright|
+ |format=hang,justification=centerlast|
\end{quote}
\captionsetup{skip=0pt}
- \example{format=hang,justification=raggedright}{\exampletext}
+ \example{format=hang,justification=centerlast}{\exampletext}
\end{Example}
\begin{Example}
@@ -761,10 +805,10 @@ Three examples:
\begin{Example}
\begin{quote}
- |labelfont=bf,textfont=it|
+ |labelfont=sc,textfont=it|
\end{quote}
\captionsetup{skip=0pt}
- \example{labelfont=bf,textfont=it}{\exampletext}
+ \example{labelfont=sc,textfont=it}{\exampletext}
\end{Example}
\begin{Example}
@@ -2157,7 +2201,7 @@ This will be achieved by a combination of
% --------------------------------------------------------------------------- %
\clearpage
-\section{Document classes \& Babel support}
+\section{Supported document classes}
\label{classes}
%\NEWdescription{v3.1}
@@ -2369,51 +2413,31 @@ the caption text font with |\caption|\-|body|\-|font|.
Both is still supported unless you use one of the two options
|label|\-|font=| or |text|\-|font=| offered by \thispackage.
-\subsection{frenchb babel option}
-\label{frenchb}
+% --------------------------------------------------------------------------- %
-If you use the \package{frenchb} option of the \package{babel} package
+\clearpage
+\section{Supported babel package options}
+\label{babel}
+
+\NEWfeature{v3.5}
+Since version \version{3.5} of the \package{caption} package the support
+is independent on the load order of \package{caption} and \package{babel}.
+
+\subsection{french babel option}
+\label{french}
+
+If you use the \package{french} option of the \package{babel} package
with one of the three standard \LaTeX{} classes (or a one derived from them)
the default |label|\-|sep=| will be set to |\Caption|\-|Sep|\-|a|\-|ra|\-|tor|
-(offered by \package{frenchb}), overriding the default value set by the
+(offered by \package{french}), overriding the default value set by the
document class.
So redefining |\Caption|\-|Sep|\-|a|\-|ra|\-|tor| will still work, unless you
don't select a different |label|\-|sep=| than the default one.
-\INFO*
-Please load \thispackage\ \emph{after} the \package{babel} package.
-
-\subsection{frenchle and frenchpro packages}
-\label{frenchpro}
-
-If you use the \package{frenchle} or \package{frenchpro} package,
-the default |label|\-|sep=| will be set to |\caption|\-|sep|\-|a|\-|ra|\-|tor|
-(offered by \package{frenchle/pro}) plus \cs{space}, overriding the default
-value set by the document class.
-So redefining |\caption|\-|sep|\-|a|\-|ra|\-|tor| will still work, unless you
-don't select a different |label|\-|sep=| than the default one.
-
-Furthermore the default |text|\-|font=| will be set to |text|\-|font=|\x|it|,
-since this emulates the default setting of |\caption|\-|font| defined by the
-\package{frenchle} or \package{frenchpro} package.
-%If you redefine |\captionfont| after loading the \package{frenchle} or
-%\package{frenchpro} package, this redefinition gets lost.
-Please note that the command |\caption|\-|font| is used by the
-\package{caption} package internally for a different purpose,
-so you should not change it (anymore).
-
-The command |\un|\-|numbered|\-|captions|\marg{figure \emph{or} table} will
-still work, but only unless you don't select a different |label|\-|format=|
-than the default one.
-
-\INFO*
-Please load \thispackage\ \emph{after} the \package{frenchle}
-or \package{frenchpro} package.
-
% --------------------------------------------------------------------------- %
\clearpage
-\section{Package support}
+\section{Supported packages}
\label{packages}
\label{compatibility}
@@ -2680,6 +2704,35 @@ These options will be executed additionally to the regular ones for
|figure| or |table|.
\pagebreak[3]
+\subsection{frenchle and frenchpro packages}
+\label{frenchpro}
+
+If you use the \package{frenchle} or \package{frenchpro} package,
+the default |label|\-|sep=| will be set to |\caption|\-|sep|\-|a|\-|ra|\-|tor|
+(offered by \package{frenchle/pro}) plus \cs{space}, overriding the default
+value set by the document class.
+So redefining |\caption|\-|sep|\-|a|\-|ra|\-|tor| will still work, unless you
+don't select a different |label|\-|sep=| than the default one.
+
+Furthermore the default |text|\-|font=| will be set to |text|\-|font=|\x|it|,
+since this emulates the default setting of |\caption|\-|font| defined by the
+\package{frenchle} or \package{frenchpro} package.
+%If you redefine |\captionfont| after loading the \package{frenchle} or
+%\package{frenchpro} package, this redefinition gets lost.
+Please note that the command |\caption|\-|font| is used by the
+\package{caption} package internally for a different purpose,
+so you should not change it (anymore).
+
+The command |\un|\-|numbered|\-|captions|\marg{figure \emph{or} table} will
+still work, but only unless you don't select a different |label|\-|format=|
+than the default one.
+
+\NEWfeature{v3.5}
+Since version \version{3.5} of the \package{caption} package the support
+is independent on the load order of \package{caption} and \package{frenchle}
+resp~.\package{frenchpro}.
+
+\pagebreak[3]
\subsection{hyperref}
\label{hyperref}
\packagedescription{%
@@ -3811,7 +3864,7 @@ While all the previous versions were designed for usage with the standard
the current version $3.1$ released in 2007 also supports the \AmS,
\KOMAScript, \NTG, and \SmF\ document classes, and the \class{beamer} class
as well.
-Furthermore it was adapted to the \package{frenchb} Babel option,
+Furthermore it was adapted to the \package{french} Babel option,
the \package{frenchle} \& \package{frenchpro} packages,
and the \package{floatflt}, \package{fltpage}, \package{picinpar},
\package{picins}, \package{setspace}, \package{threeparttable},
@@ -4072,6 +4125,152 @@ to the \package{subfig} package instead and do not load \thispackage\ anymore.
% --------------------------------------------------------------------------- %
\clearpage
+\section{Commands for document class authors}
+
+A document class could simply load the \package{caption} package instead
+of defining an own variant of |\@make|\-|caption|. However if the author decides
+not to do this -- for whatever reason -- there is a second option:
+
+\NEWfeature{v3.5}
+If a document class defines |\caption@document|\-|class|, an adaption to the
+\package{caption} package will be loaded as |caption-|\meta{documentclass}|.sto|
+if the \package{caption} kernel is loaded.
+The goal of this adaption file is changing the default settings of the
+\package{caption} package so simply loading it (without any package options)
+will not make any harm to the look at feel of the captions.
+This gives end-users the opportunity to fine-tune certain aspects of the
+appearance of captions by adding package options, without unwanted
+side-effects on other aspects of the appearance.
+
+In both cases the command |\Set|\-|Caption|\-|Default|
+could be used to adapt the \package{caption} package default values:
+
+\DescribeMacro{\SetCaptionDefault}
+The command
+\begin{quote}|\SetCaptionDefault*|\marg{option}\marg{default value}\end{quote}
+changes the default value for the option \meta{option}, for example:
+\begin{quote}
+|\SetCaptionDefault{format}{hang}|\\
+|\SetCaptionDefault{justification}{raggedright}|\\
+|\DeclareCaptionLabelSeparator{silly}{ +++ }|\\
+|\SetCaptionDefault{labelseparator}{silly}|
+\end{quote}
+This command is available for the options
+|box|,
+|font|,
+|format|,
+|justification|,
+|label|\-|font|,
+|label|\-|format|,
+|label|\-|separator|,
+|list|\-|format|,
+|margin|,
+|parbox|,
+|position|,
+|single|\-|line|\-|check|,
+|text|\-|font|,
+|text|\-|format|, and
+|width|.
+
+The starred variant only makes a difference when setting the default length
+of either |margin| or |width|, in this case it will use |\def| internally
+instead of |\edef| to store the value so the actual margin will be calculated
+when used (and not when set).
+
+\DescribeMacro{\AtCaptionPackage}
+The adaption file will be loaded when the \package{caption} kernel |caption3.sty|
+will be loaded so the given adaptions will be done for the \package{floatrow}
+and \package{subfig} packages even if the \package{caption} package isn't loaded.
+
+But some adaptions have to be done for the \package{caption} package,
+and for this reason the hook
+\begin{quote}|\At|\-|Caption|\-|Package|\marg{code}\end{quote}
+is offered to authors of adaption files.
+The \meta{code} inside the hook will be executed right before the given package
+options will be evaluated.
+
+For example the adaption file for the \KOMAScript\ document classes
+uses |\At|\-|Begin|\-|Caption| to re-define the \package{caption} package
+options |figure|\-|position| and |table|\-|position| to issue a warning
+that using these options has little effect here.
+
+% --------------------------------------------------------------------------- %
+
+\clearpage
+\section{Commands for babel language package authors}
+
+\NEWfeature{v3.5}
+\DescribeMacro{\caption@switchdefault}
+If the \package{caption3} kernel package is loaded, the command
+\begin{quote}|\caption@switchdefault|\marg{option}\marg{code with \#1}\marg{new value}\end{quote}
+is available which saves the old default value of the given option using
+\meta{code} and sets the new default value afterwards.
+
+\DescribeMacro{\caption@restoredefault}
+The command
+\begin{quote}|\caption@restoredefault|\marg{option}\marg{old value}\end{quote}
+restores the old default value which was stored in \meta{old value} before.
+
+Example:
+\begin{quote}
+ |\DeclareCaptionLabelSeparator{french}{|\ldots|}|\\
+ |\addto\extrasfrench{%|\\
+ | \caption@switchdefault{labelseparator}{\babel@save #1}{french}}|\\
+ |% Note: \caption@restoredefault isn't needed here|
+\end{quote}
+
+Another example:
+\begin{quote}
+ |\caption@switchdefault{font}{\let\original@captionfont#1}{it}%|\\
+ \ldots\\
+ |\caption@restoredefault{font}{\original@captionfont}%|\\
+\end{quote}
+
+Since boths commands are defined with |\def| inside the \package{caption3}
+kernel, they could be pre-defined with
+\begin{quote}
+ |\providecommand\caption@switchdefault[3]{}|\\
+ |\providecommand\caption@restoredefault[2]{}|
+\end{quote}
+inside the babel language package so their existence doesn't need to be tested
+prior use.
+
+Additionally babel language packages should not re-define |\@make|\-|caption|
+if the \package{caption} package is loaded, i.e.~if |\caption@makecaption| is
+defined. (Unfortunately one cannot use the \LaTeX{} kernel command
+|\@if|\-|package|\-|loaded{caption}| here since it's only available in the
+document preamble.)
+
+Please note that code like
+\begin{quote}
+ |\addto\extraswhatever{%|\\
+ | \@ifundefined{caption@makecaption}{%|\\
+ | \babel@save\@makecaption|\\
+ | \let\@makecaption\my@makecaption|\\
+ | }{%|\\
+ | \caption@switchdefault{|\ldots|}{\babel@save #1}{|\ldots|}%|\\
+ | }}|
+\end{quote}
+would be wrong since it mixes up the presence of the \package{caption3} kernel
+and the \package{caption} package.
+If the \package{caption3} kernel is loaded this does not mean that the
+\package{caption} package is loaded, too, and the latter one re-defines
+|\caption|, |\@caption|, and |\@make|\-|caption| while the \package{caption3}
+kernel does not re-define any of them, instead it only provides (default) values
+for the \package{caption}, \package{floatrow}, and \package{subfig} package.
+
+Currently there is build-in support for the following babel language options:
+|arabic|, |farsi|, |french|, |hungarian|, |latvian|, and |magyar|.
+This support could be deactivated by defining
+\begin{quote}
+ |\def\caption@ifbabel@|\meta{package}|{false}|
+\end{quote}
+where \meta{package} is either |arabi|, |french|, |frenchle|, |hungarian|,
+or |latvian|.
+
+% --------------------------------------------------------------------------- %
+
+\clearpage
\begin{thebibliography}{99}
\bibitem{TLC2}
@@ -4230,3 +4429,4 @@ to the \package{subfig} package instead and do not load \thispackage\ anymore.
% --------------------------------------------------------------------------- %
\end{document}
+
diff --git a/macros/latex/contrib/caption/caption-koma.dtx b/macros/latex/contrib/caption/caption-koma.dtx
new file mode 100644
index 0000000000..1cd5f85671
--- /dev/null
+++ b/macros/latex/contrib/caption/caption-koma.dtx
@@ -0,0 +1,518 @@
+% \iffalse meta-comment
+%
+% This is file `caption-koma.dtx'.
+%
+% Copyright (C) 2004-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%
+% --------------------------------------------------------------------------
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Axel Sommerfeldt.
+%
+% This work consists of the files
+% caption.ins, caption.dtx, caption-light.dtx, caption2.dtx, caption3.dtx,
+% caption-ams-smf.dtx, caption-beamer.dtx, caption-elsarticle.dtx,
+% caption-koma.dtx, caption-memoir.dtx, caption-ntg.dtx,
+% caption-thesis.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx,
+% the derived files
+% caption.sty, caption-light.sty, caption2.sty, caption3.sty,
+% caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
+% caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
+% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty,
+% and the user manuals
+% caption-deu.tex, caption-eng.tex, caption-rus.tex.
+%
+% \fi
+% \CheckSum{273}
+%
+% \iffalse
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}[1994/12/01]
+\ProvidesFile{caption-koma.drv}[2018/05/24 v2.0 Implementation of the caption-koma package]
+\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
+%\errorcontextlines=3
+%
+\documentclass{ltxdoc}
+\setlength\parindent{0pt}
+\setlength\parskip{\smallskipamount}
+%
+\makeatletter % make room for subsections like 2.16.14 in the TOC
+%\newcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.3em}}
+\renewcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.7em}}
+\makeatother
+%
+\usepackage{ifpdf}
+\ifpdf
+ \usepackage{mathptmx,courier}
+ \usepackage[scaled=0.90]{helvet}
+ \addtolength\marginparwidth{15pt}
+\fi
+%
+\usepackage{hypdoc}
+\ifpdf\usepackage{hypdestopt}\fi
+\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
+%
+\DeclareRobustCommand*\KOMAScript{\texorpdfstring
+ {\textsf{K\kern.05em O\kern.05em M\kern.05em A\kern.1em-\kern.1em Script}}%
+ {KOMA-Script}}
+%
+\begin{document}
+ \DocInput{caption-koma.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \newcommand*\purerm[1]{\texorpdfstring{{\upshape\mdseries\rmfamily #1}}{#1}}
+% \newcommand*\puresf[1]{\texorpdfstring{{\upshape\mdseries\sffamily #1}}{#1}}
+% \newcommand*\purett[1]{\texorpdfstring{{\upshape\mdseries\ttfamily #1}}{#1}}
+% \let\class\puresf \let\package\puresf
+% \let\env\purett \let\opt\purett
+%
+% \newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
+% \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
+% \newcommand*\version[2][]{\textit{v#2}}
+%
+% \GetFileInfo{caption-koma.drv}
+% \let\docdate\filedate
+% \let\docversion\fileversion
+% \GetFileInfo{caption-koma.sto}
+%
+% \title{\texorpdfstring
+% {The adaption of the \package{caption} package to the \KOMAScript\ document classes\thanks{%^^A
+% This adaption has version number \docversion.}}%^^A
+% {The adaption of the caption package to the KOMA-Script document classes}}
+% \author{Axel Sommerfeldt\\
+% \url{https://gitlab.com/axelsommerfeldt/caption}}
+% \date{\docdate}
+% \maketitle
+%
+% \begin{abstract}
+% This package adapts the \package{caption} package to the \KOMAScript\ document classes.
+% \end{abstract}
+%
+% \section*{User manual}
+%
+% This document is describing the code implementation only.
+% The user documentation can be found in
+% \nopagebreak\begin{quote}
+% \begin{tabular}{ll}
+% \href{http://mirror.ctan.org/macros/latex/contrib/caption/caption-eng.pdf}%
+% {\texttt{caption-eng.pdf}} & The caption package bundle documentation \\
+% \end{tabular}
+% \end{quote}
+%
+% \StopEventually{}
+% \iffalse
+% \clearpage
+% \tableofcontents
+% \fi
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \DoNotIndex{\\,\_,\ ,\@@par}
+% \DoNotIndex{\@bsphack}
+% \DoNotIndex{\@car,\@cdr,\@classoptionslist,\@cons,\@currext,\@currname}
+% \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs}
+% \DoNotIndex{\@for,\@firstofone,\@firstoftwo}
+% \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom}
+% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded}
+% \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue}
+% \DoNotIndex{\@namedef,\@nameuse}
+% \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist}
+% \DoNotIndex{\@removeelement,\@restorepar,\@secondoftwo,\@setminipage,\@setpar}
+% \DoNotIndex{\@tempa,\@tempboxa,\@tempdima,\@tempdimb,\@tempdimc,\@tempb,\@tempc}
+% \DoNotIndex{\@testopt}
+% \DoNotIndex{\@undefined,\@unprocessedoptions,\@unusedoptionlist}
+% \DoNotIndex{\p@,\z@}
+% \DoNotIndex{\active,\addtocounter,\addtolength,\advance,\aftergroup}
+% \DoNotIndex{\baselineskip,\begin,\begingroup,\bfseries,\box}
+% \DoNotIndex{\catcode,\centering,\changes,\csname,\def,\divide,\do,\downarrow}
+% \DoNotIndex{\edef,\else,\empty,\end,\endcsname,\endgraf,\endgroup,\expandafter}
+% \DoNotIndex{\fi,\footnotesize,\global}
+% \DoNotIndex{\hangindent,\hbox,\hfil,\hsize,\hskip,\hspace,\hss}
+% \DoNotIndex{\ifcase,\ifdim,\ifnum,\ifodd,\ifvoid,\ifvmode}
+% \DoNotIndex{\ifx,\ignorespaces,\itshape}
+% \DoNotIndex{\Large,\large,\leavevmode,\leftmargini,\leftskip,\let,\linewidth}
+% \DoNotIndex{\llap,\long,\m@ne,\margin,\mdseries,\message}
+% \DoNotIndex{\newcommand,\newdimen,\newlength,\newline,\newif,\newsavebox}
+% \DoNotIndex{\next,\nobreak,\nobreakspace,\noexpand,\noindent,\numberline}
+% \DoNotIndex{\normalcolor,\normalfont,\normalsize,\or,\par,\parbox,\parfillskip}
+% \DoNotIndex{\parindent,\parskip,\prevdepth,\protect,\protected@edef,\protected@write}
+% \DoNotIndex{\providecommand,\quad}
+% \DoNotIndex{\raggedleft,\raggedright,\relax,\renewcommand,\RequirePackage}
+% \DoNotIndex{\rightskip,\rmfamily}
+% \DoNotIndex{\sbox,\scriptsize,\scshape,\setbox,\setlength,\sffamily,\slshape}
+% \DoNotIndex{\small,\string,\space,\strut}
+% \DoNotIndex{\textheight,\the,\toks@,\typeout,\ttfamily}
+% \DoNotIndex{\unvbox,\uparrow,\upshape,\usebox,\usepackage}
+% \DoNotIndex{\value,\vbox,\vsize,\vskip,\wd,\width,\z@skip}
+% \DoNotIndex{\AtBeginDocument,\AtEndOfPackage,\CurrentOption,\DeclareOption}
+% \DoNotIndex{\ExecuteOptions,\GenericWarning,\IfFileExists,\InputIfFileExists}
+% \DoNotIndex{\NeedsTeXFormat,\MessageBreak}
+% \DoNotIndex{\PackageError,\PackageInfo,\PackageWarning,\PackageWarningNoLine}
+% \DoNotIndex{\PassOptionsToPackage,\ProcessOptions,\ProvidesPackage}
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \setlength{\parskip}{0pt plus 1pt}
+% \newcommand*\Note[2][Note]{\par{\small\emph{#1:} #2}\par}
+%
+% \changes{v1.0a}{2004/01/18}{Minimum adaptation to \KOMAScript\ added}
+% \changes{v1.0h}{2005/08/22}{\KOMAScript\ compatibility options added}
+% \changes{v1.0i}{2005/11/17}{\KOMAScript\ compatibility commands added}
+% \changes{v1.0l}{2007/02/18}{\KOMAScript\ compatibility revised}
+% \changes{v1.1}{2007/03/17}{\KOMAScript\ compatibility options removed}
+% \changes{v1.1}{2007/03/31}{\KOMAScript\ classes support added}
+% \changes{v1.1}{2007/04/05}{\KOMAScript\ compatibility revised \& enhanced}
+% \changes{v2.0}{2020/07/27}{\KOMAScript\ class support adapted to \package{caption3}~\version{2.0}}
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \clearpage
+%
+% \iffalse
+%<*package>
+% \fi
+%
+% \section{Identification}
+%
+% \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}[1994/12/01]
+\ProvidesFile{caption-koma.sto}[2020/08/22 v2.0 Adaption of the caption package to the KOMA-Script document classes (AR)]
+% \end{macrocode}
+%
+% \section{Margin resp. width}
+%
+% \begin{macro}{\setcapwidth}
+% \changes{v1.9}{2018/12/26}{Bugfix: Missing curly braces added}
+% Patch |\setcapwidth| so it will set the \package{caption3} width setting, too.
+% \begin{macrocode}
+\expandafter\let\expandafter\caption@koma@setcapwidth
+ \csname\string\setcapwidth\endcsname
+\@namedef{\string\setcapwidth}[#1]#2{%
+ \caption@koma@setcapwidth[{#1}]{#2}%
+ \caption@setcapwidth@opt{#1}%
+ \caption@setcapwidth}
+% \end{macrocode}
+% The optional argument of \cs{setcapwidth} if not supported (yet),
+% so we issue a warning if used.
+% (Since this does not seem to have an negative effect when used
+% by the \texttt{captionbeside} environment, we suppress the warning here.)
+% \begin{macrocode}
+\newcommand*\caption@setcapwidth@opt[1]{}
+\AtCaptionPackage{\renewcommand*\caption@setcapwidth@opt[1]{%
+ \ifx\\#1\\\else
+ \caption@ifdefined\cap@margin{%
+ \def\@tempa{captionbeside}%
+ \ifx\@tempa\@currenvir\else\caption@Warning{%
+ Ignoring optional argument [#1] of \string\setcapwidth\MessageBreak}%
+ \fi}{}%
+ \fi}}
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\caption@setcapwidth{%
+ \captionsetup{width=\cap@width}}
+% \end{macrocode}
+% \begin{macrocode}
+\def\caption@tempa{\hsize}%
+\ifx\caption@tempa\cap@width \else
+ \caption@setcapwidth
+\fi
+% \end{macrocode}
+% \end{macro}
+%
+% \emph{TODO:} |\setcapdynwidth|
+%
+% \begin{macro}{\setcapmargin}
+% Patch |\setcapmargin| so it will set the \package{caption3} margin setting, too.
+% \begin{macrocode}
+\expandafter\let\expandafter\caption@koma@setcapmargin
+ \csname\string\@setcapmargin\endcsname
+\@namedef{\string\@setcapmargin}[#1]#2{%
+ \caption@koma@setcapmargin[{#1}]{#2}%
+ \caption@setcapmargin}
+% \end{macrocode}
+% \begin{macrocode}
+\expandafter\let\expandafter\caption@koma@@setcapmargin
+ \csname\string\@@setcapmargin\endcsname
+\@namedef{\string\@@setcapmargin}[#1]#2{%
+ \caption@koma@@setcapmargin[{#1}]{#2}%
+ \caption@setcapmargin}
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\caption@setcapmargin{%
+ \begingroup
+ \let\onelinecaptionsfalse\relax
+ \def\@twoside{0}%
+ \def\if@twoside{\def\@twoside{1}\iffalse}%
+ \cap@margin
+ \def\@tempa{\endgroup}%
+ \ifx\cap@left\hfill\else\ifx\cap@right\hfill\else
+ \def\hspace##1##{\@firstofone}%
+ \edef\@tempa{\endgroup
+ \noexpand\captionsetup{%
+ twoside=\@twoside,slc=0,%
+ margin={\cap@left,\cap@right}}}%
+ \fi\fi
+ \@tempa}
+% \end{macrocode}
+% \begin{macrocode}
+\ifx\cap@margin\relax \else
+ \caption@setcapmargin
+\fi
+% \end{macrocode}
+% \end{macro}
+%
+% \section{Indentions}
+%
+% \begin{macro}{\setcapindent}
+% Patch |\setcapindent| so it will set the \package{caption3} indention setting, too.
+% \begin{macrocode}
+\let\caption@koma@setcapindent\@setcapindent
+\renewcommand*\@setcapindent[1]{%
+ \caption@koma@setcapindent{#1}%
+ \caption@setcapindent}
+% \end{macrocode}
+% \begin{macrocode}
+\let\caption@koma@@setcapindent\@@setcapindent
+\renewcommand*\@@setcapindent[1]{%
+ \caption@koma@@setcapindent{#1}%
+ \caption@setcapindent}
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\caption@setcapindent{%
+ \captionsetup{indent=\ifdim\cap@indent<\z@\z@\else\cap@indent\fi}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\caption@ifdefined\cap@indent{\caption@setcapindent}{}
+% \end{macrocode}
+%
+% \changes{v1.0f}{2005/08/22}{Increased compatibility to KOMA-Script: A special version of options `parindent' and `parskip' added}
+% \changes{v1.0g}{2006/01/03}{Bugfix 06-01-03: KOMA-Script variants of `parskip' and `parindent' options revised and moved into caption kernel}
+% \changes{v1.0h}{2006/02/23}{KOMA-Script variants of `parskip' and `parindent' are obsolete now, removed}
+% \changes{v1.0m}{2007/03/30}{KOMA-Script variants of `parskip' and `parindent' re-added, since they still collide with the current version of the subfig package (Sigh!)}
+%
+% There is an option clash between the \KOMAScript\ document classes
+% and the \package{caption} kernel, both define the options |parindent| and
+% |parskip| but with different meaning.
+% Furthermore the ones defined by the \package{caption} kernel take a
+% value as parameter but the \KOMAScript\ ones do not.
+%
+% So we need special versions of the options |parindent| and |parskip| here
+% which determine if a value is given (and therefore should be treated as
+% our option) or not (and therefore should be ignored by us).\footnote{%^^A
+% This problem was completely solved due a change of \cs{caption@ProcessOptions}
+% in \package{caption3}~\version{1.0h}, but we still need this workaround since
+% these options would otherwise still collide with the current version $1.3$
+% of the \package{subfig} package (Sigh!)}
+%
+% \begin{macrocode}
+\let\caption@koma@parindent\KV@caption@parindent
+\DeclareCaptionOption{parindent}[]{%
+ \ifx,#1,%
+ \caption@Debug{Option `parindent' ignored}%
+ \else
+ \caption@koma@parindent{#1}%
+ \fi}%
+% \end{macrocode}
+% \begin{macrocode}
+\let\caption@koma@parskip\KV@caption@parskip
+\DeclareCaptionOption{parskip}[]{%
+ \ifx,#1,%
+ \caption@Debug{Option `parskip' ignored}%
+ \else
+ \caption@koma@parskip{#1}%
+ \fi}%
+% \end{macrocode}
+%
+% \section{Single-line-check}
+%
+% \begin{macro}{\ifonelinecaptions}
+% \changes{v1.1g}{2008/03/01}{\cs{def} changed to \cs{g@addto@macro}}
+% Patch |\onelinecaptionstrue| and |onelinecaptionsfalse| so they will set the corresponding \package{caption3} setting, too.
+% \begin{macrocode}
+\g@addto@macro\onelinecaptionstrue{\caption@setsinglelinecheck{true}}%
+\g@addto@macro\onelinecaptionsfalse{\caption@setsinglelinecheck{false}}%
+% \end{macrocode}
+% \begin{macrocode}
+\ifonelinecaptions
+ \onelinecaptionstrue
+\else
+ \onelinecaptionsfalse
+\fi
+% \end{macrocode}
+% \end{macro}
+%
+% \section{Format}
+%
+% The `default' caption format was taken from \KOMAScript\ \cs{@makecaption} and adapted.
+% \begin{macrocode}
+\DeclareCaptionFormat{default}[#1#2#3\par]{%
+ \ifdofullc@p
+ \caption@useformat{hang}{#1}{#2}{#3}%
+ \else
+ #1#2%
+ \ifdim\cap@indent<\z@
+ \par
+ \noindent\hspace*{-\cap@indent}%
+ \else\if@capbreak
+ \par
+ \fi\fi
+ #3\par
+ \fi}
+%
+% \section{Label format}
+%
+% The `default' caption label format maps to `autodot'.
+% \begin{macrocode}
+\SetCaptionDefault{labelformat}{autodot}
+% \end{macrocode}
+%
+% \section{Label separator}
+%
+% The `default' caption label separator maps to \cs{captionformat}.
+% \begin{macrocode}
+\DeclareCaptionLabelSeparator{default}{\captionformat}
+% \end{macrocode}
+%
+% \section{Fonts}
+%
+% The `default' fonts map to \cs{scr@fnt@caption} resp. \cs{scr@fnt@captonlabel}.
+% \begin{macrocode}
+\DeclareCaptionFont{scr@font}{\scr@fnt@caption}
+\DeclareCaptionFont{scr@labelfont}{\scr@fnt@captionlabel}
+\SetCaptionDefault{font}{scr@font}
+\SetCaptionDefault{labelfont}{scr@labelfont}
+% \end{macrocode}
+%
+% \section{Positioning}
+%
+% Here we patch the caption related \KOMAScript\ commands to set \package{caption} package settings as well.
+% Furthermore we take over the caption related settings from the \KOMAScript\ classes.
+%
+% \begin{macro}{\if@captionabove}
+% \changes{v1.0j}{2006/03/21}{Bugfix 06-03-21: \cs{let}\cs{caption@setposition}\cs{@gobble} added}
+% \changes{v1.0n}{2006/03/09}{Accidentally this got broken in \version{1.0m}, fixed}
+% \changes{v1.1}{2007/03/31}{We redefine \cs{captionabovetrue/false} now instead of \cs{captionabove/below}}
+% \changes{v1.1a}{2007/09/14}{Bugfix 07-09-14: Redefinition of \cs{@captionabovetrue} \& \cs{@captionabovefalse} for \env{longtable} added}
+% \changes{v1.1g}{2008/03/01}{\cs{def} changed to \cs{g@addto@macro}}
+% \changes{v1.1k}{2009/10/09}{\opt{figureposition} and \opt{tableposition} will issue a warning now}
+% \changes{v1.8e}{2019/09/11}{\opt{figureposition} and \opt{tableposition} will now set the position anyway since it could be used by other packages}
+% Patch |\@captionabovetrue| and |\@captionabovefalse| so they will set the \package{caption3} position setting, too.
+% Note that these are stronger than the \opt{position} setting, therefore we override the options
+% \opt{figureposition} and \opt{tableposition} to typeout a warning.
+% \begin{macrocode}
+\g@addto@macro\@captionabovetrue{\caption@setposition{t}}%
+\g@addto@macro\@captionabovefalse{\caption@setposition{b}}%
+% \end{macrocode}
+% \begin{macrocode}
+\if@captionabove
+ \@captionabovetrue
+\else
+ \@captionabovefalse
+\fi
+% \end{macrocode}
+% |\captionabove| \& |\captionbelow| for longtable:
+% \begin{macrocode}
+\AtBeginCaption{\caption@AtBeginLongtable{%
+ \def\@captionabovetrue{\LT@captionsetup{position=t}}%
+ \def\@captionabovefalse{\LT@captionsetup{position=b}}}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\if@tablecaptionabove}
+% \changes{v1.1g}{2008/03/01}{\cs{def} changed to \cs{g@addto@macro}}
+% Patch |\@tablecaptionabovetrue| and |\@tablecaptionabovefalse| so they will set the \package{caption3} position setting, too.
+% \begin{macrocode}
+\g@addto@macro\@tablecaptionabovetrue{\captionsetup*[table]{position=t}}%
+\g@addto@macro\@tablecaptionabovefalse{\captionsetup*[table]{position=b}}%
+% \end{macrocode}
+% \begin{macrocode}
+\if@tablecaptionabove
+ \@tablecaptionabovetrue
+\else
+ \@tablecaptionabovefalse
+\fi
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\if@figurecaptionabove}
+% \changes{v1.5}{2013/02/15}{Support of \cs{if@figurecaptionabove} added}
+% Patch |\@figurecaptionabovetrue| and |\@figurecaptionabovefalse| so they will set the \package{caption3} position setting, too.
+% \begin{macrocode}
+\caption@ifdefined\@figurecaptionabovetrue{%
+ \g@addto@macro\@figurecaptionabovetrue{\captionsetup*[figure]{position=t}}%
+ \g@addto@macro\@figurecaptionabovefalse{\captionsetup*[figure]{position=b}}%
+% \end{macrocode}
+% \begin{macrocode}
+ \if@figurecaptionabove
+ \@figurecaptionabovetrue
+ \else
+ \@figurecaptionabovefalse
+ \fi}{}
+% \end{macrocode}
+% \end{macro}
+%
+% Since the \KOMAScript\ position setting overwrites the one from the \package{caption} package,
+% we re-define the options |figure|\-|position| and |table|\-|position| to issue a warning.
+% \Note{But we set the value anyway since it will be used by sub-captions.}
+%
+% \begin{macrocode}
+\AtCaptionPackage{%
+ \let\caption@koma@figureposition\KV@caption@figureposition
+ \DeclareCaptionOption{figureposition}{%
+ \caption@WarningNoLine{%
+ Option `figureposition=#1' has no effect\MessageBreak
+ when used with a KOMA-Script document class}%
+ \caption@koma@figureposition{#1}}
+% \end{macrocode}
+% \begin{macrocode}
+ \let\caption@koma@tableposition\KV@caption@tableposition
+ \DeclareCaptionOption{tableposition}{%
+ \caption@WarningNoLine{%
+ Option `tableposition=#1' has no effect\MessageBreak
+ when used with a KOMA-Script document class}%
+ \caption@koma@tableposition{#1}}}
+% \end{macrocode}
+%
+% \section{Adaption of \cs{caption} command}
+%
+% \begin{macro}{\scr@caption}
+% \KOMAScript\ contains the code
+% |\AtBeginDocument{\let\scr@caption\caption}|
+% so we need to update |\scr@caption| after the \package{caption} package has re-defined |\caption|.
+% \begin{macrocode}
+\AtBeginDocument{\let\scr@caption\caption}
+% \end{macrocode}
+% \end{macro}
+%
+% \iffalse
+%</package>
+% \fi
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \clearpage
+% \Finale
+%
+\endinput
+
diff --git a/macros/latex/contrib/caption/caption-light.dtx b/macros/latex/contrib/caption/caption-light.dtx
new file mode 100644
index 0000000000..3b9b907112
--- /dev/null
+++ b/macros/latex/contrib/caption/caption-light.dtx
@@ -0,0 +1,394 @@
+% \iffalse meta-comment
+%
+% This is file `caption-light.dtx'.
+%
+% Copyright (C) 2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%
+% --------------------------------------------------------------------------
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Axel Sommerfeldt.
+%
+% This work consists of the files
+% caption.ins, caption.dtx, caption-light.dtx, caption2.dtx, caption3.dtx,
+% caption-ams-smf.dtx, caption-beamer.dtx, caption-elsarticle.dtx,
+% caption-koma.dtx, caption-memoir.dtx, caption-ntg.dtx,
+% caption-thesis.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx,
+% the derived files
+% caption.sty, caption-light.sty, caption2.sty, caption3.sty,
+% caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
+% caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
+% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty,
+% and the user manuals
+% caption-deu.tex, caption-eng.tex, caption-rus.tex.
+%
+% \fi
+% \CheckSum{84}
+%
+% \iffalse
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}[1994/12/01]
+\ProvidesFile{caption-light.drv}[2020/08/24 v1.0 Customizing captions (AR)]
+\hbadness=9999 \newcount\hbadness \hfuzz=74pt % Make TeX shut up.
+%\errorcontextlines=3
+%
+\documentclass{ltxdoc}
+\setlength\parindent{0pt}
+\setlength\parskip{\smallskipamount}
+%
+\newcommand\LineBreak{\linebreak[3]}
+\newcommand\PageBreak{\pagebreak[3]}
+\usepackage{ifpdf}
+\ifpdf
+ \usepackage{mathptmx,courier}
+ \usepackage[scaled=0.90]{helvet}
+ \addtolength\marginparwidth{15pt}
+ \ifdim\paperheight=297mm % a4paper
+ \renewcommand\LineBreak{\\}
+ \renewcommand\PageBreak{\clearpage}
+ \fi
+\fi
+%
+\usepackage[bottom]{footmisc}
+%
+\PassOptionsToPackage{breaklinks=true}{hyperref}
+\usepackage{hypdoc}
+\ifpdf\usepackage{hypdestopt}\fi
+\hypersetup{pdfkeywords={LaTeX, package, subcaption},pdfstartpage={},pdfstartview={}}
+%
+\usepackage{caption-light}[2020/08/23] % needs v1.0 or newer
+%
+\newcommand*\purerm[1]{{\upshape\mdseries\rmfamily #1}}
+\newcommand*\puresf[1]{{\upshape\mdseries\sffamily #1}}
+\newcommand*\purett[1]{{\upshape\mdseries\ttfamily #1}}
+\let\package\puresf
+\let\env\purett \let\opt\purett
+%
+\newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
+\newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
+\newcommand*\version[2][]{$v#2$}
+%
+\usepackage{marvosym}
+\makeatletter
+\newcommand*\INFO{\@ifstar{\@INFO{}}{\@INFO{\vbox to \ht\strutbox}}}
+\newcommand*\@INFO[1]{\MARGINSYM{#1{\LARGE\Info}}}
+\makeatother
+%
+\newcommand*\MARGINSYM[1]{\hskip 1sp \marginpar{\raggedleft\textcolor{blue}{{#1}}}}
+\newcommand*\NEW[2]{\MARGINSYM{\vskip2pt\footnotesize#1\\#2}}
+%
+\begin{document}
+ \DocInput{caption-light.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \let\subsectionautorefname\sectionautorefname
+% \let\subsubsectionautorefname\sectionautorefname
+%
+% \def\thispackage{the \package{caption-light} package}
+% \def\Thispackage{The \package{caption-light} package}
+%
+% \newcommand\NEWfeature{\NEW{New feature}}
+% \newcommand\NEWdescription{\NEW{New description}}
+%
+% \makeatletter
+% \def\Ref{\@ifstar{\@Ref\ref}{\@Ref\autoref}}
+% \def\@Ref#1#2{#1{#2}: \textit{\nameref{#2}}}
+% \makeatother
+% \def\See#1{\nopagebreak{\small (See #1)}}
+%
+% \GetFileInfo{caption-light.drv}
+% \let\docdate\filedate
+% \let\docversion\fileversion
+% \GetFileInfo{caption-light.sty}
+%
+% \title{\texorpdfstring{\Thispackage\thanks{%^^A
+% This package has version number \docversion.}}%^^A
+% {The caption-light package}}
+% \author{Axel Sommerfeldt\\
+% \url{https://gitlab.com/axelsommerfeldt/caption}}
+% \date{\docdate}
+% \maketitle
+%
+% \begin{abstract}
+% \Thispackage\ offers (limited) customization of captions
+% in floating environments such |figure| and |table|.
+% \par\smallskip
+% \textit{Please note:} Many document classes already have build-in options and
+% commands for customizing captions.
+% If these possibilities are sufficient for you, there is usually no need for
+% you to use the \package{caption} package at all.
+% And if you are just interested in using the command \cs{captionof}, loading
+% of the very small \package{capt-of} package is usually sufficient.
+% \end{abstract}
+%
+% \iffalse\clearpage\fi
+% \setcounter{tocdepth}{2}
+% \tableofcontents
+%
+% \clearpage
+% \section{Loading the package}
+%
+% Load this package using
+% \begin{quote}
+% |\usepackage|\oarg{options}|{caption-light}|
+% \end{quote}
+% or
+% \begin{quote}
+% |\usepackage{caption-light}|\\
+% \ldots\\
+% |\captionsetup|\marg{options}
+% \end{quote}
+% As opposite to the \package{caption} package only a limited set of options is
+% supported by \thispackage:
+% |aboveskip=|\ldots,
+% |belowskip=|\ldots,
+% |font=|\ldots,
+% |justification=|\ldots,
+% |labelfont=|\ldots,
+% |labelseparator=|\ldots,
+% |position=|\ldots,
+% |singlelinecheck=|\ldots,
+% |skip=|\ldots, and
+% |textfont=|\ldots
+%
+% See \package{caption} package documentation for the meaning and usage of
+% these options.
+%
+% \section{Commands}
+%
+% This package offers |\caption|\-|setup|, |\set|\-|caption|\-|type|, and
+% |\caption|\-|of| as well.
+%
+% \section{Why this package?}
+%
+% This package offers some advantages over the \package{caption} package:
+% \begin{itemize}
+% \item It does not depend on correct |\hsize| for "long" captions,
+% just like the original definition included in |article|, |report|, and |book|.
+% \item If the caption is typeset as "short" (centered), the content of
+% the caption is evaluated only once,
+% just like the original definition included in |article|, |report|, and |book|.
+% \item It does not re-define |\caption| and floating environments,
+% therefore avoiding incompatibilities.
+% \item It does not patch any other packages, therefore avoiding
+% incompatibilities.
+% \end{itemize}
+%
+% In short it's a more compatible and less troublesome variant of the
+% \package{caption} package, but (much) less powerful.
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \StopEventually{%^^A
+% }
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \DoNotIndex{\\,\_,\ ,\@@par}
+% \DoNotIndex{\@bsphack}
+% \DoNotIndex{\@car,\@cdr,\@classoptionslist,\@cons,\@currext,\@currname}
+% \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs}
+% \DoNotIndex{\@for,\@firstofone,\@firstoftwo}
+% \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom}
+% \DoNotIndex{\@ifnextchar,\@ifpackagelater,\@ifpackageloaded}
+% \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@namedef,\@nameuse}
+% \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist}
+% \DoNotIndex{\@removeelement,\@restorepar,\@secondoftwo,\@setpar}
+% \DoNotIndex{\@tempa,\@tempboxa,\@tempdima,\@tempdimb,\@tempdimc,\@tempb,\@tempc}
+% \DoNotIndex{\@testopt}
+% \DoNotIndex{\@undefined,\@unprocessedoptions,\@unusedoptionlist}
+% \DoNotIndex{\p@,\z@}
+% \DoNotIndex{\active,\addtocounter,\addtolength,\advance,\aftergroup}
+% \DoNotIndex{\baselineskip,\begin,\begingroup,\bfseries,\box}
+% \DoNotIndex{\catcode,\centering,\changes,\csname,\def,\divide,\do,\downarrow}
+% \DoNotIndex{\edef,\else,\empty,\end,\endcsname,\endgraf,\endgroup,\expandafter}
+% \DoNotIndex{\fi,\footnotesize,\global}
+% \DoNotIndex{\hangindent,\hbox,\hfil,\hsize,\hskip,\hspace,\hss}
+% \DoNotIndex{\ifcase,\ifdim,\ifnum,\ifodd,\ifvoid,\ifvmode}
+% \DoNotIndex{\ifx,\ignorespaces,\itshape}
+% \DoNotIndex{\Large,\large,\leavevmode,\leftmargini,\leftskip,\let,\linewidth}
+% \DoNotIndex{\llap,\long,\m@ne,\margin,\mdseries,\message}
+% \DoNotIndex{\newcommand,\newdimen,\newlength,\newline,\newif,\newsavebox}
+% \DoNotIndex{\next,\nobreak,\nobreakspace,\noexpand,\noindent,\numberline}
+% \DoNotIndex{\normalcolor,\normalfont,\normalsize,\or,\par,\parbox,\parfillskip}
+% \DoNotIndex{\parindent,\parskip,\prevdepth,\protect,\protected@edef,\protected@write}
+% \DoNotIndex{\providecommand,\quad}
+% \DoNotIndex{\raggedleft,\raggedright,\relax,\renewcommand,\RequirePackage}
+% \DoNotIndex{\rightskip,\rmfamily}
+% \DoNotIndex{\sbox,\scriptsize,\scshape,\setbox,\setlength,\sffamily,\slshape}
+% \DoNotIndex{\small,\string,\space,\strut}
+% \DoNotIndex{\textheight,\the,\toks@,\typeout,\ttfamily}
+% \DoNotIndex{\unvbox,\uparrow,\upshape,\usebox,\usepackage}
+% \DoNotIndex{\value,\vbox,\vsize,\vskip,\wd,\width,\z@skip}
+% \DoNotIndex{\AtBeginDocument,\AtEndOfPackage,\CurrentOption,\DeclareOption}
+% \DoNotIndex{\ExecuteOptions,\GenericWarning,\IfFileExists,\InputIfFileExists}
+% \DoNotIndex{\NeedsTeXFormat,\MessageBreak}
+% \DoNotIndex{\PackageError,\PackageInfo,\PackageWarning,\PackageWarningNoLine}
+% \DoNotIndex{\PassOptionsToPackage,\ProcessOptions,\ProvidesPackage}
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \setlength{\parskip}{0pt plus 1pt}
+% \changes{v1.0}{2020/08/24}{First version}
+%
+% \newcommand*\Note[2][Note]{\par{\small\emph{#1:} #2}}
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \clearpage
+% \section{The implementation}
+% \iffalse
+%<*package>
+% \fi
+%
+% \subsection{Identification}
+%
+% \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}[1994/12/01]
+\ProvidesPackage{caption-light}[2020/08/24 v1.0 Customizing captions (AR)]
+% \end{macrocode}
+%
+% \section{Loading the kernel}
+%
+% \begin{macrocode}
+\RequirePackage{caption3}[2020/08/23] % needs v2.0 or newer
+% \end{macrocode}
+%
+% \section{Check against unknown document classes}
+%
+% \begin{macrocode}
+\caption@ifbool{documentclass}{}{%
+ \caption@WarningNoLine{%
+ Unknown document class (or package),\MessageBreak
+ standard defaults will be used}}
+% \end{macrocode}
+%
+% \section{Check against incompatible packages}
+%
+% \begin{macrocode}
+\@ifpackageloaded{caption2}{%
+ \caption@Error{%
+ You can't use both, the (obsolete) caption2 *and*\MessageBreak
+ the caption-light package}%
+ \endinput
+}{}
+% \end{macrocode}
+%
+% \section{Processing of options}
+%
+% \begin{macrocode}
+\caption@SetupOptions{caption-light}{\caption@setkeys{caption}{#2}}
+\caption@ProcessOptions*{caption-light}
+% \end{macrocode}
+%
+% \section{\cs{@makecaption}}
+%
+% If the \package{caption} package is loaded, we abort processing this file.
+% \begin{macrocode}
+\caption@ifdefined\caption@makecaption
+ {\caption@Info{\noexpand\caption@makecaption is already defined}%
+ \endinput}{}
+% \end{macrocode}
+%
+% \begin{macro}{\caption@makecaption}
+% |\@makecaption|\marg{label}\marg{text}\\
+% We do basically the same as the original code (from the standard
+% \LaTeX\ document classes), but take care of selected settings
+% offered by the \package{caption3} kernel.
+% \begin{macrocode}
+\long\def\caption@makecaption#1#2{%
+ \caption@iftop\caption@belowskip\caption@aboveskip
+ \caption@labelseparator % defines \caption@iflabelfont and \caption@labelsep
+ \caption@singlelinecheck
+ {\sbox\@tempboxa{\caption@@makecaption{#1}{#2}}%
+ \ifdim \wd\@tempboxa >\hsize}%
+ {\iftrue}%
+ \caption@@makecaption{#1}{#2}\par
+ \else
+ \global \@minipagefalse
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
+ \fi
+ \caption@iftop\caption@aboveskip\caption@belowskip}
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand\caption@@makecaption[2]{%
+ \caption@applyfont
+ {\captionlabelfont #1}%
+ {\caption@iflabelfont\captionlabelfont
+ \relax\caption@labelsep}%
+ {\captiontextfont #2}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@makecaption}
+% Patch |\@makecaption|, so our definition will be used.
+% \begin{macrocode}
+\let\@makecaption\caption@makecaption
+% \end{macrocode}
+% \end{macro}
+%
+% \section{\cs{setcaptiontype}}
+%
+% We offer the options |type=| and |type*=|, too:
+% \begin{macrocode}
+\caption@AtBeginDocument{%
+% \end{macrocode}
+% \begin{macrocode}
+ \DeclareCaptionOption{type}{\setcaptiontype{#1}}%
+ \DeclareCaptionOption{type*}{\setcaptiontype*{#1}}%
+% \end{macrocode}
+% \begin{macrocode}
+}
+% \end{macrocode}
+% \begin{macro}{\setcaptiontype}
+% |\setcaptiontype*|\marg{type}\\
+% For compatibility reasons we offer a starred variant as well,
+% but it does not differ from the non-starred variant here.
+% \begin{macrocode}
+\newcommand*\setcaptiontype{%
+ \caption@teststar{\def\@captype}{}{}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\captionof}
+% |\captionof*|\marg{type}\oarg{list-entry}\marg{text}\\
+% For compatibility reasons we offer a starred variant as well.
+% \begin{macrocode}
+\caption@AtBeginDocument{%
+ \def\captionof{\caption@teststar\caption@of{\caption*}\caption}}
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\caption@of[2]{\setcaptiontype*{#2}#1}
+% \end{macrocode}
+% \end{macro}
+%
+% \iffalse
+%</package>
+% \fi
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \Finale
+%
+\endinput
diff --git a/macros/latex/contrib/caption/caption-light.pdf b/macros/latex/contrib/caption/caption-light.pdf
new file mode 100644
index 0000000000..132be27d7d
--- /dev/null
+++ b/macros/latex/contrib/caption/caption-light.pdf
Binary files differ
diff --git a/macros/latex/contrib/caption/caption-memoir.dtx b/macros/latex/contrib/caption/caption-memoir.dtx
new file mode 100644
index 0000000000..1233515b1c
--- /dev/null
+++ b/macros/latex/contrib/caption/caption-memoir.dtx
@@ -0,0 +1,226 @@
+% \iffalse meta-comment
+%
+% This is file `caption-memoir.dtx'.
+%
+% Copyright (C) 2011-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%
+% --------------------------------------------------------------------------
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Axel Sommerfeldt.
+%
+% This work consists of the files
+% caption.ins, caption.dtx, caption-light.dtx, caption2.dtx, caption3.dtx,
+% caption-ams-smf.dtx, caption-beamer.dtx, caption-elsarticle.dtx,
+% caption-koma.dtx, caption-memoir.dtx, caption-ntg.dtx,
+% caption-thesis.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx,
+% the derived files
+% caption.sty, caption-light.sty, caption2.sty, caption3.sty,
+% caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
+% caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
+% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty,
+% and the user manuals
+% caption-deu.tex, caption-eng.tex, caption-rus.tex.
+%
+% \fi
+% \CheckSum{7}
+%
+% \iffalse
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}[1994/12/01]
+\ProvidesFile{caption-memoir.drv}[2018/05/24 v2.0 Implementation of the caption-memoir package]
+\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
+%\errorcontextlines=3
+%
+\documentclass{ltxdoc}
+\setlength\parindent{0pt}
+\setlength\parskip{\smallskipamount}
+%
+\makeatletter % make room for subsections like 2.16.14 in the TOC
+%\newcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.3em}}
+\renewcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.7em}}
+\makeatother
+%
+\usepackage{ifpdf}
+\ifpdf
+ \usepackage{mathptmx,courier}
+ \usepackage[scaled=0.90]{helvet}
+ \addtolength\marginparwidth{15pt}
+\fi
+%
+\usepackage{hypdoc}
+\ifpdf\usepackage{hypdestopt}\fi
+\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
+%
+\begin{document}
+ \DocInput{caption-memoir.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \newcommand*\purerm[1]{\texorpdfstring{{\upshape\mdseries\rmfamily #1}}{#1}}
+% \newcommand*\puresf[1]{\texorpdfstring{{\upshape\mdseries\sffamily #1}}{#1}}
+% \newcommand*\purett[1]{\texorpdfstring{{\upshape\mdseries\ttfamily #1}}{#1}}
+% \let\class\puresf \let\package\puresf
+% \let\env\purett \let\opt\purett
+%
+% \newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
+% \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
+% \newcommand*\version[2][]{\textit{v#2}}
+%
+% \GetFileInfo{caption-memoir.drv}
+% \let\docdate\filedate
+% \let\docversion\fileversion
+% \GetFileInfo{caption-memoir.sto}
+%
+% \title{\texorpdfstring
+% {The adaption of the \package{caption} package to the \class{memoir} document class\thanks{%^^A
+% This adaption has version number \docversion.}}%^^A
+% {The adaption of the caption package to the memoir document class}}
+% \author{Axel Sommerfeldt\\
+% \url{https://gitlab.com/axelsommerfeldt/caption}}
+% \date{\docdate}
+% \maketitle
+%
+% \begin{abstract}
+% This package adapts the \package{caption} package to the \class{memoir} document class.
+% \end{abstract}
+%
+% \section*{User manual}
+%
+% This document is describing the code implementation only.
+% The user documentation can be found in
+% \nopagebreak\begin{quote}
+% \begin{tabular}{ll}
+% \href{http://mirror.ctan.org/macros/latex/contrib/caption/caption-eng.pdf}%
+% {\texttt{caption-eng.pdf}} & The caption package bundle documentation \\
+% \end{tabular}
+% \end{quote}
+%
+% \StopEventually{}
+% \iffalse
+% \clearpage
+% \tableofcontents
+% \fi
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \DoNotIndex{\\,\_,\ ,\@@par}
+% \DoNotIndex{\@bsphack}
+% \DoNotIndex{\@car,\@cdr,\@classoptionslist,\@cons,\@currext,\@currname}
+% \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs}
+% \DoNotIndex{\@for,\@firstofone,\@firstoftwo}
+% \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom}
+% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded}
+% \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue}
+% \DoNotIndex{\@namedef,\@nameuse}
+% \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist}
+% \DoNotIndex{\@removeelement,\@restorepar,\@secondoftwo,\@setminipage,\@setpar}
+% \DoNotIndex{\@tempa,\@tempboxa,\@tempdima,\@tempdimb,\@tempdimc,\@tempb,\@tempc}
+% \DoNotIndex{\@testopt}
+% \DoNotIndex{\@undefined,\@unprocessedoptions,\@unusedoptionlist}
+% \DoNotIndex{\p@,\z@}
+% \DoNotIndex{\active,\addtocounter,\addtolength,\advance,\aftergroup}
+% \DoNotIndex{\baselineskip,\begin,\begingroup,\bfseries,\box}
+% \DoNotIndex{\catcode,\centering,\changes,\csname,\def,\divide,\do,\downarrow}
+% \DoNotIndex{\edef,\else,\empty,\end,\endcsname,\endgraf,\endgroup,\expandafter}
+% \DoNotIndex{\fi,\footnotesize,\global}
+% \DoNotIndex{\hangindent,\hbox,\hfil,\hsize,\hskip,\hspace,\hss}
+% \DoNotIndex{\ifcase,\ifdim,\ifnum,\ifodd,\ifvoid,\ifvmode}
+% \DoNotIndex{\ifx,\ignorespaces,\itshape}
+% \DoNotIndex{\Large,\large,\leavevmode,\leftmargini,\leftskip,\let,\linewidth}
+% \DoNotIndex{\llap,\long,\m@ne,\margin,\mdseries,\message}
+% \DoNotIndex{\newcommand,\newdimen,\newlength,\newline,\newif,\newsavebox}
+% \DoNotIndex{\next,\nobreak,\nobreakspace,\noexpand,\noindent,\numberline}
+% \DoNotIndex{\normalcolor,\normalfont,\normalsize,\or,\par,\parbox,\parfillskip}
+% \DoNotIndex{\parindent,\parskip,\prevdepth,\protect,\protected@edef,\protected@write}
+% \DoNotIndex{\providecommand,\quad}
+% \DoNotIndex{\raggedleft,\raggedright,\relax,\renewcommand,\RequirePackage}
+% \DoNotIndex{\rightskip,\rmfamily}
+% \DoNotIndex{\sbox,\scriptsize,\scshape,\setbox,\setlength,\sffamily,\slshape}
+% \DoNotIndex{\small,\string,\space,\strut}
+% \DoNotIndex{\textheight,\the,\toks@,\typeout,\ttfamily}
+% \DoNotIndex{\unvbox,\uparrow,\upshape,\usebox,\usepackage}
+% \DoNotIndex{\value,\vbox,\vsize,\vskip,\wd,\width,\z@skip}
+% \DoNotIndex{\AtBeginDocument,\AtEndOfPackage,\CurrentOption,\DeclareOption}
+% \DoNotIndex{\ExecuteOptions,\GenericWarning,\IfFileExists,\InputIfFileExists}
+% \DoNotIndex{\NeedsTeXFormat,\MessageBreak}
+% \DoNotIndex{\PackageError,\PackageInfo,\PackageWarning,\PackageWarningNoLine}
+% \DoNotIndex{\PassOptionsToPackage,\ProcessOptions,\ProvidesPackage}
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \setlength{\parskip}{0pt plus 1pt}
+% \newcommand*\Note[2][Note]{\par{\small\emph{#1:} #2}\par}
+%
+% \changes{v1.4a}{2011/10/21}{\class{memoir} class support added}
+% \changes{v2.0}{2020/07/27}{\class{memoir} class support adapted to \package{caption3}~\version{2.0}}
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \clearpage
+%
+% \iffalse
+%<*package>
+% \fi
+%
+% \section{Identification}
+%
+% \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}[1994/12/01]
+\ProvidesFile{caption-memoir.sto}[2020/07/31 v2.0 Adaption of the caption package to the memoir document class (AR)]
+% \end{macrocode}
+%
+% \section{Adaptions already included in the caption package}
+%
+% The following adaptions to the \class{memoir} document class are already included in the \package{caption} package:
+% \begin{itemize}
+% \item \cs{@caption} expands \cs{memcaptioninfo}
+% \item \cs{caption@prepareanchor} expands \cs{M@gettitle}
+% \item \cs{caption@refstepcounter} expands \cs{donemaincaptiontrue}
+% \item Since the \class{memoir} document class resets the sub-caption
+% counter at |\@float|, right after |\done|\-|main|\-|caption|\-|false|,
+% all sub-caption counters will be saved at |\done|\-|main|\-|caption|\-|false|
+% so they can (and will) be restored using |\caption@|\-|restore|\-|counters|
+% at |\continued|\-|float|.
+% \end{itemize}
+%
+% \section{Single-line-check}
+%
+% \begin{macro}{\caption@prepareslc}
+% \changes{v1.4a}{2011/10/21}{Redefinition of \cs{pagenote} from \textsf{memoir} document class added}
+% We re-define \cs{pagenote} here so it won't disturb the single-line-check.
+% \begin{macrocode}
+\g@addto@macro\caption@prepareslc{%
+ \let\pagenote\caption@gobble}
+% \end{macrocode}
+% \end{macro}
+%
+% \iffalse
+%</package>
+% \fi
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \clearpage
+% \Finale
+%
+\endinput
+
diff --git a/macros/latex/contrib/caption/caption-ntg.dtx b/macros/latex/contrib/caption/caption-ntg.dtx
new file mode 100644
index 0000000000..61c6ed8116
--- /dev/null
+++ b/macros/latex/contrib/caption/caption-ntg.dtx
@@ -0,0 +1,213 @@
+% \iffalse meta-comment
+%
+% This is file `caption-ntg.dtx'.
+%
+% Copyright (C) 2007-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%
+% --------------------------------------------------------------------------
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Axel Sommerfeldt.
+%
+% This work consists of the files
+% caption.ins, caption.dtx, caption-light.dtx, caption2.dtx, caption3.dtx,
+% caption-ams-smf.dtx, caption-beamer.dtx, caption-elsarticle.dtx,
+% caption-koma.dtx, caption-memoir.dtx, caption-ntg.dtx,
+% caption-thesis.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx,
+% the derived files
+% caption.sty, caption-light.sty, caption2.sty, caption3.sty,
+% caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
+% caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
+% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty,
+% and the user manuals
+% caption-deu.tex, caption-eng.tex, caption-rus.tex.
+%
+% \fi
+% \CheckSum{8}
+%
+% \iffalse
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}[1994/12/01]
+\ProvidesFile{caption-ntg.drv}[2020/08/01 v2.0 Implementation of the caption-ntg package]
+\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
+%\errorcontextlines=3
+%
+\documentclass{ltxdoc}
+\setlength\parindent{0pt}
+\setlength\parskip{\smallskipamount}
+%
+\makeatletter % make room for subsections like 2.16.14 in the TOC
+%\newcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.3em}}
+\renewcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.7em}}
+\makeatother
+%
+\usepackage{ifpdf}
+\ifpdf
+ \usepackage{mathptmx,courier}
+ \usepackage[scaled=0.90]{helvet}
+ \addtolength\marginparwidth{15pt}
+\fi
+%
+\usepackage{hypdoc}
+\ifpdf\usepackage{hypdestopt}\fi
+\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
+%
+\DeclareRobustCommand*\NTG{NTG}
+%
+\begin{document}
+ \DocInput{caption-ntg.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \newcommand*\purerm[1]{\texorpdfstring{{\upshape\mdseries\rmfamily #1}}{#1}}
+% \newcommand*\puresf[1]{\texorpdfstring{{\upshape\mdseries\sffamily #1}}{#1}}
+% \newcommand*\purett[1]{\texorpdfstring{{\upshape\mdseries\ttfamily #1}}{#1}}
+% \let\class\puresf \let\package\puresf
+% \let\env\purett \let\opt\purett
+%
+% \newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
+% \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
+% \newcommand*\version[2][]{\textit{v#2}}
+%
+% \GetFileInfo{caption-ntg.drv}
+% \let\docdate\filedate
+% \let\docversion\fileversion
+% \GetFileInfo{caption-ntg.sto}
+%
+% \title{\texorpdfstring
+% {The adaption of the \package{caption} package to the \NTG\ document classes\thanks{%^^A
+% This adaption has version number \docversion.}}%^^A
+% {The adaption of the caption package to the NTG document classes}}
+% \author{Axel Sommerfeldt\\
+% \url{https://gitlab.com/axelsommerfeldt/caption}}
+% \date{\docdate}
+% \maketitle
+%
+% \begin{abstract}
+% This package adapts the \package{caption} package to the \NTG\ document classes.
+% \end{abstract}
+%
+% \section*{User manual}
+%
+% This document is describing the code implementation only.
+% The user documentation can be found in
+% \nopagebreak\begin{quote}
+% \begin{tabular}{ll}
+% \href{http://mirror.ctan.org/macros/latex/contrib/caption/caption-eng.pdf}%
+% {\texttt{caption-eng.pdf}} & The caption package bundle documentation \\
+% \end{tabular}
+% \end{quote}
+%
+% \StopEventually{}
+% \iffalse
+% \clearpage
+% \tableofcontents
+% \fi
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \DoNotIndex{\\,\_,\ ,\@@par}
+% \DoNotIndex{\@bsphack}
+% \DoNotIndex{\@car,\@cdr,\@classoptionslist,\@cons,\@currext,\@currname}
+% \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs}
+% \DoNotIndex{\@for,\@firstofone,\@firstoftwo}
+% \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom}
+% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded}
+% \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue}
+% \DoNotIndex{\@namedef,\@nameuse}
+% \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist}
+% \DoNotIndex{\@removeelement,\@restorepar,\@secondoftwo,\@setminipage,\@setpar}
+% \DoNotIndex{\@tempa,\@tempboxa,\@tempdima,\@tempdimb,\@tempdimc,\@tempb,\@tempc}
+% \DoNotIndex{\@testopt}
+% \DoNotIndex{\@undefined,\@unprocessedoptions,\@unusedoptionlist}
+% \DoNotIndex{\p@,\z@}
+% \DoNotIndex{\active,\addtocounter,\addtolength,\advance,\aftergroup}
+% \DoNotIndex{\baselineskip,\begin,\begingroup,\bfseries,\box}
+% \DoNotIndex{\catcode,\centering,\changes,\csname,\def,\divide,\do,\downarrow}
+% \DoNotIndex{\edef,\else,\empty,\end,\endcsname,\endgraf,\endgroup,\expandafter}
+% \DoNotIndex{\fi,\footnotesize,\global}
+% \DoNotIndex{\hangindent,\hbox,\hfil,\hsize,\hskip,\hspace,\hss}
+% \DoNotIndex{\ifcase,\ifdim,\ifnum,\ifodd,\ifvoid,\ifvmode}
+% \DoNotIndex{\ifx,\ignorespaces,\itshape}
+% \DoNotIndex{\Large,\large,\leavevmode,\leftmargini,\leftskip,\let,\linewidth}
+% \DoNotIndex{\llap,\long,\m@ne,\margin,\mdseries,\message}
+% \DoNotIndex{\newcommand,\newdimen,\newlength,\newline,\newif,\newsavebox}
+% \DoNotIndex{\next,\nobreak,\nobreakspace,\noexpand,\noindent,\numberline}
+% \DoNotIndex{\normalcolor,\normalfont,\normalsize,\or,\par,\parbox,\parfillskip}
+% \DoNotIndex{\parindent,\parskip,\prevdepth,\protect,\protected@edef,\protected@write}
+% \DoNotIndex{\providecommand,\quad}
+% \DoNotIndex{\raggedleft,\raggedright,\relax,\renewcommand,\RequirePackage}
+% \DoNotIndex{\rightskip,\rmfamily}
+% \DoNotIndex{\sbox,\scriptsize,\scshape,\setbox,\setlength,\sffamily,\slshape}
+% \DoNotIndex{\small,\string,\space,\strut}
+% \DoNotIndex{\textheight,\the,\toks@,\typeout,\ttfamily}
+% \DoNotIndex{\unvbox,\uparrow,\upshape,\usebox,\usepackage}
+% \DoNotIndex{\value,\vbox,\vsize,\vskip,\wd,\width,\z@skip}
+% \DoNotIndex{\AtBeginDocument,\AtEndOfPackage,\CurrentOption,\DeclareOption}
+% \DoNotIndex{\ExecuteOptions,\GenericWarning,\IfFileExists,\InputIfFileExists}
+% \DoNotIndex{\NeedsTeXFormat,\MessageBreak}
+% \DoNotIndex{\PackageError,\PackageInfo,\PackageWarning,\PackageWarningNoLine}
+% \DoNotIndex{\PassOptionsToPackage,\ProcessOptions,\ProvidesPackage}
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \setlength{\parskip}{0pt plus 1pt}
+% \newcommand*\Note[2][Note]{\par{\small\emph{#1:} #2}\par}
+%
+% \changes{v1.1}{2007/04/06}{\NTG\ class support added}
+% \changes{v2.0}{2020/08/01}{\NTG\ class support adapted to \package{caption3}~\version{2.0}}
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \clearpage
+%
+% \iffalse
+%<*package>
+% \fi
+%
+% \section{Identification}
+%
+% \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}[1994/12/01]
+\ProvidesFile{caption-ntg.sto}[2020/08/22 v2.0 Adaption of the caption package to the NTG document classes (AR)]
+% \end{macrocode}
+%
+% \section{Fonts}
+%
+% The `default' fonts map to \cs{CaptionLabelFont} resp. \cs{CaptionTextFont}.
+% \begin{macrocode}
+\DeclareCaptionFont{ntg@labelfont}{\CaptionLabelFont}
+\DeclareCaptionFont{ntg@textfont}{\CaptionTextFont}
+\SetCaptionDefault{labelfont}{ntg@labelfont}
+\SetCaptionDefault{textfont}{ntg@textfont}
+% \end{macrocode}
+%
+% \iffalse
+%</package>
+% \fi
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \clearpage
+% \Finale
+%
+\endinput
+
diff --git a/macros/latex/contrib/caption/caption-thesis.dtx b/macros/latex/contrib/caption/caption-thesis.dtx
new file mode 100644
index 0000000000..a26ea7b31a
--- /dev/null
+++ b/macros/latex/contrib/caption/caption-thesis.dtx
@@ -0,0 +1,219 @@
+% \iffalse meta-comment
+%
+% This is file `caption-thesis.dtx'.
+%
+% Copyright (C) 2008-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%
+% --------------------------------------------------------------------------
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Axel Sommerfeldt.
+%
+% This work consists of the files
+% caption.ins, caption.dtx, caption-light.dtx, caption2.dtx, caption3.dtx,
+% caption-ams-smf.dtx, caption-beamer.dtx, caption-elsarticle.dtx,
+% caption-koma.dtx, caption-memoir.dtx, caption-ntg.dtx,
+% caption-thesis.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx,
+% the derived files
+% caption.sty, caption-light.sty, caption2.sty, caption3.sty,
+% caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
+% caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
+% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty,
+% and the user manuals
+% caption-deu.tex, caption-eng.tex, caption-rus.tex.
+%
+% \fi
+% \CheckSum{9}
+%
+% \iffalse
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}[1994/12/01]
+\ProvidesFile{caption-thesis.drv}[2020/08/01 v2.0 Implementation of the caption-thesis package]
+\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
+%\errorcontextlines=3
+%
+\documentclass{ltxdoc}
+\setlength\parindent{0pt}
+\setlength\parskip{\smallskipamount}
+%
+\makeatletter % make room for subsections like 2.16.14 in the TOC
+%\newcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.3em}}
+\renewcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.7em}}
+\makeatother
+%
+\usepackage{ifpdf}
+\ifpdf
+ \usepackage{mathptmx,courier}
+ \usepackage[scaled=0.90]{helvet}
+ \addtolength\marginparwidth{15pt}
+\fi
+%
+\usepackage{hypdoc}
+\ifpdf\usepackage{hypdestopt}\fi
+\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
+%
+\begin{document}
+ \DocInput{caption-thesis.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \newcommand*\purerm[1]{\texorpdfstring{{\upshape\mdseries\rmfamily #1}}{#1}}
+% \newcommand*\puresf[1]{\texorpdfstring{{\upshape\mdseries\sffamily #1}}{#1}}
+% \newcommand*\purett[1]{\texorpdfstring{{\upshape\mdseries\ttfamily #1}}{#1}}
+% \let\class\puresf \let\package\puresf
+% \let\env\purett \let\opt\purett
+%
+% \newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
+% \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
+% \newcommand*\version[2][]{\textit{v#2}}
+%
+% \GetFileInfo{caption-thesis.drv}
+% \let\docdate\filedate
+% \let\docversion\fileversion
+% \GetFileInfo{caption-thesis.sto}
+%
+% \title{\texorpdfstring
+% {The adaption of the \package{caption} package to the \class{thesis} document class\thanks{%^^A
+% This adaption has version number \docversion.}}%^^A
+% {The adaption of the caption package to the thesis document class}}
+% \author{Axel Sommerfeldt\\
+% \url{https://gitlab.com/axelsommerfeldt/caption}}
+% \date{\docdate}
+% \maketitle
+%
+% \begin{abstract}
+% This package adapts the \package{caption} package to the thesis document class.
+% \end{abstract}
+%
+% \section*{User manual}
+%
+% This document is describing the code implementation only.
+% The user documentation can be found in
+% \nopagebreak\begin{quote}
+% \begin{tabular}{ll}
+% \href{http://mirror.ctan.org/macros/latex/contrib/caption/caption-eng.pdf}%
+% {\texttt{caption-eng.pdf}} & The caption package bundle documentation \\
+% \end{tabular}
+% \end{quote}
+%
+% \StopEventually{}
+% \iffalse
+% \clearpage
+% \tableofcontents
+% \fi
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \DoNotIndex{\\,\_,\ ,\@@par}
+% \DoNotIndex{\@bsphack}
+% \DoNotIndex{\@car,\@cdr,\@classoptionslist,\@cons,\@currext,\@currname}
+% \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs}
+% \DoNotIndex{\@for,\@firstofone,\@firstoftwo}
+% \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom}
+% \DoNotIndex{\if@minipage\@ifnextchar,\@ifpackagelater,\@ifpackageloaded}
+% \DoNotIndex{\@ifstar,\@ifundefined,\@latex@error,\@minipagefalse,\@minipagetrue}
+% \DoNotIndex{\@namedef,\@nameuse}
+% \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist}
+% \DoNotIndex{\@removeelement,\@restorepar,\@secondoftwo,\@setminipage,\@setpar}
+% \DoNotIndex{\@tempa,\@tempboxa,\@tempdima,\@tempdimb,\@tempdimc,\@tempb,\@tempc}
+% \DoNotIndex{\@testopt}
+% \DoNotIndex{\@undefined,\@unprocessedoptions,\@unusedoptionlist}
+% \DoNotIndex{\p@,\z@}
+% \DoNotIndex{\active,\addtocounter,\addtolength,\advance,\aftergroup}
+% \DoNotIndex{\baselineskip,\begin,\begingroup,\bfseries,\box}
+% \DoNotIndex{\catcode,\centering,\changes,\csname,\def,\divide,\do,\downarrow}
+% \DoNotIndex{\edef,\else,\empty,\end,\endcsname,\endgraf,\endgroup,\expandafter}
+% \DoNotIndex{\fi,\footnotesize,\global}
+% \DoNotIndex{\hangindent,\hbox,\hfil,\hsize,\hskip,\hspace,\hss}
+% \DoNotIndex{\ifcase,\ifdim,\ifnum,\ifodd,\ifvoid,\ifvmode}
+% \DoNotIndex{\ifx,\ignorespaces,\itshape}
+% \DoNotIndex{\Large,\large,\leavevmode,\leftmargini,\leftskip,\let,\linewidth}
+% \DoNotIndex{\llap,\long,\m@ne,\margin,\mdseries,\message}
+% \DoNotIndex{\newcommand,\newdimen,\newlength,\newline,\newif,\newsavebox}
+% \DoNotIndex{\next,\nobreak,\nobreakspace,\noexpand,\noindent,\numberline}
+% \DoNotIndex{\normalcolor,\normalfont,\normalsize,\or,\par,\parbox,\parfillskip}
+% \DoNotIndex{\parindent,\parskip,\prevdepth,\protect,\protected@edef,\protected@write}
+% \DoNotIndex{\providecommand,\quad}
+% \DoNotIndex{\raggedleft,\raggedright,\relax,\renewcommand,\RequirePackage}
+% \DoNotIndex{\rightskip,\rmfamily}
+% \DoNotIndex{\sbox,\scriptsize,\scshape,\setbox,\setlength,\sffamily,\slshape}
+% \DoNotIndex{\small,\string,\space,\strut}
+% \DoNotIndex{\textheight,\the,\toks@,\typeout,\ttfamily}
+% \DoNotIndex{\unvbox,\uparrow,\upshape,\usebox,\usepackage}
+% \DoNotIndex{\value,\vbox,\vsize,\vskip,\wd,\width,\z@skip}
+% \DoNotIndex{\AtBeginDocument,\AtEndOfPackage,\CurrentOption,\DeclareOption}
+% \DoNotIndex{\ExecuteOptions,\GenericWarning,\IfFileExists,\InputIfFileExists}
+% \DoNotIndex{\NeedsTeXFormat,\MessageBreak}
+% \DoNotIndex{\PackageError,\PackageInfo,\PackageWarning,\PackageWarningNoLine}
+% \DoNotIndex{\PassOptionsToPackage,\ProcessOptions,\ProvidesPackage}
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \setlength{\parskip}{0pt plus 1pt}
+% \newcommand*\Note[2][Note]{\par{\small\emph{#1:} #2}\par}
+%
+% \changes{v1.2a}{2008/01/31}{thesis class support added}
+% \changes{v1.2e}{2009/11/15}{Bugfix 09-11-14: thesis class support revised}
+% \changes{v2.0}{2020/08/01}{thesis class support adapted to \package{caption3}~\version{2.0}}
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \clearpage
+%
+% \iffalse
+%<*package>
+% \fi
+%
+% \section{Identification}
+%
+% \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}[1994/12/01]
+\ProvidesFile{caption-thesis.sto}[2020/08/22 v2.0 Adaption of the caption package to the thesis document class (AR)]
+% \end{macrocode}
+%
+% \section{Format}
+%
+% The `default' format maps to `hang'.
+% \begin{macrocode}
+\SetCaptionDefault{format}{hang}
+% \end{macrocode}
+%
+% \section{Fonts}
+%
+% The `default' fonts map to \cs{cph@font} resp. \cs{cpb@font}.
+% \begin{macrocode}
+\DeclareCaptionFont{cph@font}{\cph@font}
+\DeclareCaptionFont{cpb@font}{\cpb@font}
+\SetCaptionDefault{labelfont}{cph@font}
+\SetCaptionDefault{textfont}{cpb@font}
+% \end{macrocode}
+%
+% \iffalse
+%</package>
+% \fi
+%
+% \iffalse
+% --------------------------------------------------------------------------- %
+% \fi
+%
+% \clearpage
+% \Finale
+%
+\endinput
+
diff --git a/macros/latex/contrib/caption/caption.dtx b/macros/latex/contrib/caption/caption.dtx
index e75d4bd431..0a029f8d38 100644
--- a/macros/latex/contrib/caption/caption.dtx
+++ b/macros/latex/contrib/caption/caption.dtx
@@ -19,21 +19,25 @@
% This Current Maintainer of this work is Axel Sommerfeldt.
%
% This work consists of the files
-% caption.ins, caption.dtx, caption2.dtx, caption3.dtx,
-% bicaption.dtx, ltcaption.dtx, subcaption.dtx, totalcount.dtx,
+% caption.ins, caption.dtx, caption-light.dtx, caption2.dtx, caption3.dtx,
+% caption-ams-smf.dtx, caption-beamer.dtx, caption-elsarticle.dtx,
+% caption-koma.dtx, caption-memoir.dtx, caption-ntg.dtx,
+% caption-thesis.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx,
% the derived files
-% caption.sty, caption2.sty, caption3.sty,
-% bicaption.sty, ltcaption.sty, subcaption.sty, totalcount.sty,
+% caption.sty, caption-light.sty, caption2.sty, caption3.sty,
+% caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
+% caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
+% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty,
% and the user manuals
% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%
% \fi
-% \CheckSum{3022}
+% \CheckSum{2715}
%
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption.drv}[2015/09/16 v3.4 Implementation of the caption package]
+\ProvidesFile{caption.drv}[2015/09/16 v3.5 Implementation of the caption package]
\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
%\errorcontextlines=3
%
@@ -62,14 +66,6 @@
\DeclareRobustCommand*\eTeX{\texorpdfstring
{\leavevmode\hbox{$\varepsilon$}-\TeX}%
{e-TeX}}
-\DeclareRobustCommand*\AmS{\texorpdfstring
- {{\protect\usefont{OMS}{cmsy}{m}{n}A\kern-.1667em\lower.5ex\hbox{M}\kern-.125emS}}%
- {AMS}}
-\DeclareRobustCommand*\KOMAScript{\texorpdfstring
- {\textsf{K\kern.05em O\kern.05em M\kern.05em A\kern.1em-\kern.1em Script}}%
- {KOMA-Script}}
-\DeclareRobustCommand*\NTG{NTG}
-\DeclareRobustCommand*\SmF{SMF}
%
\begin{document}
\DocInput{caption.dtx}
@@ -92,15 +88,18 @@
%
% \newcommand*\issue[1]{GitLab~\##1}
%
+% \GetFileInfo{caption.drv}
+% \let\docdate\filedate
+% \let\docversion\fileversion
% \GetFileInfo{caption.sty}
%
% \title{The Implementation of
% \texorpdfstring{\thispackage\thanks{%^^A
-% This package has version number \fileversion, last revised \filedate.}}%^^A
+% This package has version number \docversion.}}%^^A
% {the caption package}}
% \author{Axel Sommerfeldt\\
% \url{https://gitlab.com/axelsommerfeldt/caption}}
-% \date{\filedate}
+% \date{\docdate}
% \maketitle
%
% \begin{abstract}
@@ -218,13 +217,13 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2020/05/30 v3.4k Customizing captions (AR)]
+\ProvidesPackage{caption}[2020/08/30 v3.5 Customizing captions (AR)]
% \end{macrocode}
%
% \section{Loading the kernel}
%
% \begin{macrocode}
-\RequirePackage{caption3}[2020/05/10] % needs v1.10 or newer
+\RequirePackage{caption3}[2020/08/23] % needs v2.0 or newer
% \end{macrocode}
%
% \section{Check against unknown document classes}
@@ -523,223 +522,23 @@
\captionsetup{hypcap=1,hypcapspace=.5\baselineskip}
% \end{macrocode}
%
-% \section{\AmS{} \& \SmF{} document classes support}
-% \changes{v3.1}{2007/07/29}{\AmS\ \& \SmF\ document classes support added}
+% \section{Document class support}
%
+% Execute the code declared with |\AtCaptionPackage|.
+% We do this right before processing the options so stuff done with
+% |\At|\-|Caption|\-|Package| could be overwritten by user options.
% \begin{macrocode}
-\caption@ifclassloaded{ams}{%
- \caption@InfoNoLine{AMS or SMF document class}%
-% \end{macrocode}
-% \begin{macrocode}
- \setlength\belowcaptionskip{0pt}% set to 12pt by AMS class
-% \end{macrocode}
-% \begin{macrocode}
-}{}
-% \end{macrocode}
-%
-% \section{\KOMAScript{} document classes support}
-% \changes{v3.0a}{2004/01/18}{Minimum adaptation to \KOMAScript\ added}
-% \changes{v3.0h}{2005/08/22}{\KOMAScript\ compatibility options added}
-% \changes{v3.0i}{2005/11/17}{\KOMAScript\ compatibility commands added}
-% \changes{v3.0l}{2007/02/18}{\KOMAScript\ compatibility revised}
-% \changes{v3.1}{2007/03/17}{\KOMAScript\ compatibility options removed}
-% \changes{v3.1}{2007/04/05}{\KOMAScript\ compatibility revised \& enhanced}
-%
-% \begin{macrocode}
-\caption@ifclassloaded{koma}{%
- \caption@InfoNoLine{KOMA-Script document class}%
-% \end{macrocode}
-%
-% Here we emulate the caption related commands and take over the caption
-% related settings from the \KOMAScript\ classes.
-%
-% \begin{macro}{\@tablecaptionabovetrue}
-% \begin{macro}{\@tablecaptionabovefalse}
-% \changes{v3.1g}{2008/03/01}{\cs{def} changed to \cs{g@addto@macro}}
-% \begin{macrocode}
- \g@addto@macro\@tablecaptionabovetrue{\captionsetup*[table]{position=t}}
- \g@addto@macro\@tablecaptionabovefalse{\captionsetup*[table]{position=b}}
-% \end{macrocode}
-% \begin{macrocode}
- \if@tablecaptionabove
- \@tablecaptionabovetrue
- \else
- \@tablecaptionabovefalse
- \fi
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\@figurecaptionabovetrue}
-% \begin{macro}{\@figurecaptionabovefalse}
-% \changes{v3.3}{2013/02/15}{Support of \cs{@figurecaptionabovetrue} added}
-% \begin{macrocode}
- \caption@ifdefined\@figurecaptionabovetrue{%
-% \end{macrocode}
-% \begin{macrocode}
- \g@addto@macro\@figurecaptionabovetrue{\captionsetup*[figure]{position=t}}
- \g@addto@macro\@figurecaptionabovefalse{\captionsetup*[figure]{position=b}}
-% \end{macrocode}
-% \begin{macrocode}
- \if@figurecaptionabove
- \@figurecaptionabovetrue
- \else
- \@figurecaptionabovefalse
- \fi
-% \end{macrocode}
-% \begin{macrocode}
- }{}%
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\onelinecaptionstrue}
-% \begin{macro}{\onelinecaptionsfalse}
-% \changes{v3.1g}{2008/03/01}{\cs{def} changed to \cs{g@addto@macro}}
-% \begin{macrocode}
- \g@addto@macro\onelinecaptionstrue{\let\caption@ifslc\@firstoftwo}
- \g@addto@macro\onelinecaptionsfalse{\let\caption@ifslc\@secondoftwo}
-% \end{macrocode}
-% \begin{macrocode}
- \ifonelinecaptions
- \onelinecaptionstrue
- \else
- \onelinecaptionsfalse
- \fi
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\@captionabovetrue}
-% \begin{macro}{\@captionabovefalse}
-% \changes{v3.0j}{2006/03/21}{Bugfix 06-03-21:
-% \cs{let}\cs{caption@setposition}\cs{@gobble} added}
-% \changes{v3.0n}{2006/03/09}{Accidentally this got broken in \version{3.0m}, fixed}
-% \changes{v3.1}{2007/03/31}{We redefine \cs{captionabovetrue/false} now
-% instead of \cs{captionabove/below}}
-% \changes{v3.1g}{2008/03/01}{\cs{def} changed to \cs{g@addto@macro}}
-% \changes{v3.1k}{2009/10/09}{\opt{figureposition} and \opt{tableposition} will issue a warning now}
-% \changes{v3.4}{2019/09/11}{\opt{figureposition} and \opt{tableposition} will now set the position anyway since it could be used by other packages}
-% Please note that these are stronger than the \opt{position} setting, therefore we
-% override the options \opt{figureposition} and \opt{tableposition} to typeout a warning.
-% \begin{macrocode}
- \g@addto@macro\@captionabovetrue{\let\caption@position\@firstoftwo}
- \g@addto@macro\@captionabovefalse{\let\caption@position\@secondoftwo}
-% \end{macrocode}
-% \begin{macrocode}
- \DeclareCaptionOption{figureposition}{%
- \caption@WarningNoLine{Option `figureposition=#1' has no effect\MessageBreak
- when used with a KOMA script document class}%
- \captionsetup*[figure]{position=#1}}
- \DeclareCaptionOption{tableposition}{%
- \caption@WarningNoLine{Option `tableposition=#1' has no effect\MessageBreak
- when used with a KOMA script document class}%
- \captionsetup*[table]{position=#1}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\setcapindent}
-% \begin{macrocode}
- \let\caption@KOMA@setcapindent\@setcapindent
- \renewcommand*\@setcapindent[1]{%
- \caption@KOMA@setcapindent{#1}\caption@setcapindent}
-% \end{macrocode}
-% \begin{macrocode}
- \let\caption@KOMA@@setcapindent\@@setcapindent
- \renewcommand*\@@setcapindent[1]{%
- \caption@KOMA@@setcapindent{#1}\caption@setcapindent}
-% \end{macrocode}
-% \begin{macrocode}
- \newcommand*\caption@setcapindent{%
- \captionsetup{indent=\ifdim\cap@indent<\z@\z@\else\cap@indent\fi}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macrocode}
- \caption@ifdefined\cap@indent{\caption@setcapindent}{}
-% \end{macrocode}
-%
-% \begin{macro}{\setcapwidth}
-% \changes{v3.3}{2018/12/26}{Bugfix: Missing curly braces added}
-% \Note{The optional argument of \cs{setcapwidth} if not supported (yet),
-% so we issue a warning if used.
-% (Since this does not seem to have an negative effect when used
-% by the \texttt{captionbeside} environment, we suppress the warning here.)}
-% \begin{macrocode}
- \expandafter\let\expandafter\caption@KOMA@setcapwidth
- \csname\string\setcapwidth\endcsname
- \@namedef{\string\setcapwidth}[#1]#2{%
- \caption@KOMA@setcapwidth[{#1}]{#2}\caption@setcapwidth{#1}}
-% \end{macrocode}
-% \begin{macrocode}
- \newcommand*\caption@setcapwidth[1]{%
- \ifx\\#1\\\else
- \caption@ifdefined\cap@margin{%
- \def\@tempa{captionbeside}%
- \ifx\@tempa\@currenvir\else\caption@Warning{%
- Ignoring optional argument [#1] of \string\setcapwidth\MessageBreak}%
- \fi}{}%
- \fi
- \captionsetup{width=\cap@width}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macrocode}
- \def\caption@tempa{\hsize}%
- \ifx\caption@tempa\cap@width \else
- \caption@setcapwidth{?}
- \fi
-% \end{macrocode}
-%
-% \begin{macro}{\setcapmargin}
-% \begin{macrocode}
- \expandafter\let\expandafter\caption@KOMA@setcapmargin
- \csname\string\@setcapmargin\endcsname
- \@namedef{\string\@setcapmargin}[#1]#2{%
- \caption@KOMA@setcapmargin[{#1}]{#2}\caption@setcapmargin}
-% \end{macrocode}
-% \begin{macrocode}
- \expandafter\let\expandafter\caption@KOMA@@setcapmargin
- \csname\string\@@setcapmargin\endcsname
- \@namedef{\string\@@setcapmargin}[#1]#2{%
- \caption@KOMA@@setcapmargin[{#1}]{#2}\caption@setcapmargin}
-% \end{macrocode}
-% \begin{macrocode}
- \newcommand*\caption@setcapmargin{%
- \begingroup
- \let\onelinecaptionsfalse\relax
- \def\@twoside{0}%
- \def\if@twoside{\def\@twoside{1}\iffalse}%
- \cap@margin
- \def\@tempa{\endgroup}%
- \ifx\cap@left\hfill\else\ifx\cap@right\hfill\else
- \def\hspace##1##{\@firstofone}%
- \edef\@tempa{\endgroup
- \noexpand\captionsetup{%
- twoside=\@twoside,slc=0,%
- margin={\cap@left,\cap@right}}}%
- \fi\fi
- \@tempa}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macrocode}
- \ifx\cap@margin\relax \else
- \caption@setcapmargin
- \fi
-% \end{macrocode}
-%
-% \begin{macrocode}
-}{}
+\caption@documentclass@code
+\let\caption@documentclass@code\@undefined
+\let\AtCaptionPackage\@firstofone
% \end{macrocode}
%
% \section{Processing of options}
%
% \changes{v3.0m}{2007/03/04}{Verbose option added}
% \changes{v3.1}{2007/07/02}{Verbose option removed from package}
-%
% \changes{v3.1}{2007/03/17}{We do not process global options anymore}
+%
% \begin{macrocode}
\caption@SetupOptions{caption}{\caption@setkeys{#1}{#2}}
\caption@ProcessOptions*{caption}
@@ -884,9 +683,8 @@
\caption@if@minipage\@minipagetrue\@minipagefalse}%
\caption@end}
% \end{macrocode}
-% \textsf{memoir} document class stuff:
+% \class{memoir} document class stuff:
% \begin{macrocode}
-\providecommand\M@gettitle[1]{}
\providecommand\memcaptioninfo[4]{}
% \end{macrocode}
% \end{macro}
@@ -900,6 +698,10 @@
\caption@ifhypcap\caption@@start\relax
\M@gettitle{#2}}
% \end{macrocode}
+% \class{memoir} document class stuff:
+% \begin{macrocode}
+\providecommand\M@gettitle[1]{}
+% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\caption@makecaption}
@@ -938,25 +740,13 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\caption@aboveskip}
-% \begin{macro}{\caption@belowskip}
-% \changes{v3.3a}{2019/04/02}{This macro added}
-% |\caption@aboveskip|\\
-% |\caption@belowskip|\par
-% Typesets the skip above resp.~below the caption.
-% \begin{macrocode}
-\newcommand*\caption@aboveskip{%
- \vskip\abovecaptionskip}
-% \end{macrocode}
+% \begin{macro}{\caption@redefine}
+% \changes{v3.1k}{2009/03/30}{This macro added, it contains the patching code now}
% \begin{macrocode}
-\newcommand*\caption@belowskip{%
- \vskip\belowcaptionskip}
+\newcommand*\caption@redefine{}
% \end{macrocode}
% \end{macro}
-% \end{macro}
%
-% \begin{macro}{\caption@redefine}
-% \changes{v3.1k}{2009/03/30}{This macro added, it contains the patching code now}
% Prior to \version{3.4} we only redefined |\caption| and |\@caption| if the current definitions
% were well known, so documents written in the old (\package{caption} package \version{1.x}) days
% (where |\caption| \& |\@caption| were not redefined by us) still compiled fine.
@@ -964,8 +754,8 @@
% but is simply overcautious and especially unwanted by the user nowadays.
% So starting with \version{3.4} we only do not redefine |\caption| and |\@caption| if the
% `compatibility' option is set to `v1'.
+%
% \begin{macrocode}
-\newcommand*\caption@redefine{}
\g@addto@macro\caption@redefine{%
% \end{macrocode}
% \begin{macrocode}
@@ -979,13 +769,13 @@
\renewcommand*\caption@redefine{}%
% \end{macrocode}
%
-% |\continuedfloat| is not supported in compatibility mode.
+% |\continuedfloat| is not supported in compatibility mode `v1'.
% \begin{macrocode}
\renewcommand*\caption@continuedfloat[1]{%
- \caption@Error{Not available in compatibility mode}}%
+ \caption@Error{Not available with option `compatibility=v1'}}%
% \end{macrocode}
%
-% |\caption@start| is not supported in compatibility mode.
+% |\caption@start| is not supported in compatibility mode `v1'.
% \begin{macrocode}
\caption@AtBeginDocument*{%
\let\caption@start\relax
@@ -1029,22 +819,50 @@
% \begin{macro}{\@xfloat}
% \changes{v3.1}{2007/05/09}{This re-definition added}
% \changes{v3.1b}{2007/09/22}{Will now be redefined in compatibility mode, too}
-% We redefine |\@xfloat| so inside floating environments our
-% type-specific options will be used, a \package{hyperref}
-% anchor will be set etc.
+% \changes{v3.5}{2020/08/30}{Hook added}
+% We redefine |\@x|\-|float| so inside floating environments our
+% type-specific options will be used, a \package{hyperref}
+% anchor will be set etc.
% \begin{macrocode}
\let\caption@ORI@xfloat\@xfloat
+% \end{macrocode}
+% \begin{macrocode}
\def\@xfloat#1[#2]{%
\caption@ORI@xfloat{#1}[#2]%
- \caption@settype{#1}}%
+ \caption@settype{#1}%
+ \caption@xfloat@hook}%
+% \end{macrocode}
+% Hook, could be extended with |\g@addto@macro\caption@x|\-|float@hook{|\ldots|}|.
+% (The caption type could be found in |\@cap|\-|type|.)
+% \begin{macrocode}
+ \newcommand*\caption@xfloat@hook{}%
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\@xdblfloat}
+% \changes{v3.5}{2020/08/30}{Re-definition of \cs{xdblfloat} added}
+% We redefine |\@xdbl|\-|float|, too, so special options for |figure*|
+% resp.~|table*| will be applied here.
% \begin{macrocode}
-}
+ \let\caption@ORI@xdblfloat\@xdblfloat
+% \end{macrocode}
+% \begin{macrocode}
+ \def\@xdblfloat#1[#2]{%
+ \caption@ORI@xdblfloat{#1}[#2]% expands to \@xfloat{#1}[#2] + extra stuff
+ \caption@setoptions{#1*}%
+ \caption@xdblfloat@hook}%
+% \end{macrocode}
+% Hook, could be extended with |\g@addto@macro\caption@xdbl|\-|float@hook{|\ldots|}|.
+% (The caption type could be found in |\@cap|\-|type|.)
+% \begin{macrocode}
+ \newcommand*\caption@xdblfloat@hook{}%
% \end{macrocode}
% \end{macro}
%
+% \begin{macrocode}
+}
+% \end{macrocode}
+%
% Some packages (like the \package{hyperref} package for example) redefines
% |\caption| and |\@caption|, too.
% So we have to use |\AtBeginDocument| here, so we can make sure
@@ -1071,7 +889,7 @@
% \end{macrocode}
% \end{macro}
%
-% \section{\cs{captionof}}
+% \section{\cs{setcaptiontype} and \cs{setcaptionsubtype}}
%
% \changes{v3.0d}{2004/08/03}{Option \opt{type=} added}
% \changes{v3.1}{2007/06/25}{Option \opt{type*=} added}
@@ -1101,9 +919,10 @@
% \begin{macro}{\setcaptiontype}
% \changes{v3.2}{2010/10/24}{This macro added}
% \changes{v3.4e}{2020/01/02}{Check added if the subtype is defined}
+% \changes{v3.5}{2020/08/24}{Definition method adapted to the \package{caption-light} package}
% Like |\captionsetup{type=xxx}|, but also works if \cs{captionsetup} was redefined.
% \begin{macrocode}
-\newcommand\setcaptiontype{%
+\def\setcaptiontype{%
\caption@boxrestore@mini
\caption@settype}
% \end{macrocode}
@@ -1213,21 +1032,43 @@
%
% \begin{macro}{\caption@checktype}
% \changes{v3.4g}{2020/01/02}{This macro and its usage added}
-% |\setcaptiontype| should not be used with a subtype,
-% and |\setcaptionsubtype| should not be used with an undefined subtype.
+% \changes{v3.4m}{2020/07/29}{Check of \cs{sf@counterlist} from \package{subfig} package added}
+% |\caption@checktype|\marg{type}\marg{code}\par
+% is used by |\caption@settype| and should either expand the code or issue an error
+% if the given type is not a proper type, i.e. it is a sub-type instead (either defined by
+% |\DeclareCaptionSubType| or |\newsubfloat|\cite{subfig}).
% \begin{macrocode}
\newcommand*\caption@checktype[1]{%
- \caption@ifsubtype{#1}%
- {\caption@Error{Should not be used with subtype `#1'}%
- \@gobble}%
- \@firstofone}
+ \caption@ifsubtype{#1}\@firstoftwo{\caption@ifin@list\sf@counterlist{#1}}%
+ {\caption@Error{Should not be used with subtype `#1'}%
+ \@gobble}%
+ \@firstofone}
% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@checksubtype}
+% \changes{v3.4g}{2020/01/02}{This macro and its usage added}
+% \changes{v3.4m}{2020/07/29}{Check of \cs{sf@counterlist} from \package{subfig} package added}
+% |\caption@checksubtype|\marg{type}\marg{code}\par
+% is used by |\caption@settype| and should either expand the code or issue an error
+% if the given type is not a proper sub-type, i.e. not defined by |\Declare|\-|Caption|\-|Sub|\-|Type|.
+% Since the |sub|\-|float|\-|row| environment offered by the \package{floatrow} package\cite{floatrow}
+% is using |\caption|\-|setup{sub|\-|type}| even if the sub-type was defined by |\new|\-|sub|\-|float|
+% offered by \package{subfig}\cite{subfig}, we take a more relaxed view of things here and allow
+% those sub-types as well (but not without warning since we do not support this).
% \begin{macrocode}
\newcommand*\caption@checksubtype[1]{%
\caption@ifsubtype{#1}%
- \@firstofone
- {\caption@Error{Undefined subtype `#1'}%
- \@gobble}}
+ \@firstofone
+ {\caption@ifin@list\sf@counterlist{#1}%
+ {\caption@Warning{%
+ \noexpand\setcaptionsubtype without \string\DeclareCaptionSubType.\MessageBreak
+ This is not designed to work; you could try replacing\MessageBreak
+ the `subfig' package with `subcaption' to resolve\MessageBreak
+ this problem which occurred}%
+ \@firstofone}%
+ {\caption@Error{Undefined subtype `#1'}%
+ \@gobble}}}
% \end{macrocode}
% \end{macro}
%
@@ -1235,24 +1076,21 @@
% \changes{v3.1}{2007/07/15}{This macro and its usage added}
% \changes{v3.1f}{2007/11/28}{Error changed to warning (compatibility)}
% \changes{v3.3}{2013/04/21}{Uses \cs{caption@ifeTeX} now}
+% \changes{v3.5}{2019/09/11}{Relies on \eTeX{} now}
% Checks if |\captionsetup{type=|\ldots|}| or |\caption| is done
% inside a group or not -- in the latter case a warning message will
-% be issued. (needs \eTeX)
-% \begin{macrocode}
-\caption@ifeTeX{%
- \newcommand*\caption@checkgrouplevel[2]{%
- \@ifundefined{#1caption@grouplevel}{%
- \caption@ifundefined\caption@grouplevel{\let\caption@grouplevel\z@}{}%
- \ifnum\currentgrouplevel>\caption@grouplevel\relax
- \expandafter\edef\csname #1caption@grouplevel\endcsname{%
- \the\currentgrouplevel}%
- \else
- \caption@Warning{\string#2\MessageBreak outside box or environment}%
- \fi
- }{}}%
-}{%
- \let\caption@checkgrouplevel\@gobbletwo
-}
+% be issued.
+% \begin{macrocode}
+\newcommand*\caption@checkgrouplevel[2]{%
+ \@ifundefined{#1caption@grouplevel}{%
+ \caption@ifundefined\caption@grouplevel{\let\caption@grouplevel\z@}{}%
+ \ifnum\currentgrouplevel>\caption@grouplevel\relax
+ \expandafter\edef\csname #1caption@grouplevel\endcsname{%
+ \the\currentgrouplevel}%
+ \else
+ \caption@Warning{\string#2\MessageBreak outside box or environment}%
+ \fi
+ }{}}%
% \end{macrocode}
% \end{macro}
%
@@ -1314,6 +1152,7 @@
% \changes{v3.1c}{2007/09/22}{Bugfix: Redefinition of \cs{caption@setfloatcapt} removed}
% \changes{v3.1e}{2007/10/30}{Better compatibility: Will be defined with \cs{AtBeginDocument} now}
% \changes{v3.2}{2010/10/24}{Bugfix 10-10-17: Uses \cs{setcaptiontype} instead of \cs{caption@settype} now}
+% \changes{v3.5}{2020/08/24}{Definition method adapted to the \package{caption-light} package}
% |\captionof|\marg{type}\oarg{lst\_entry}\marg{heading}\\
% |\captionof*|\oarg{lst\_entry}\marg{heading}\par
% \Note{This will be defined with \cs{AtBeginDocument} so
@@ -1324,7 +1163,7 @@
\def\captionof{\caption@teststar\caption@of{\caption*}\caption}}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*\caption@of[2]{\setcaptiontype*{#2}#1}
+\providecommand*\caption@of[2]{\setcaptiontype*{#2}#1}
% \end{macrocode}
% \end{macro}
%
@@ -1364,6 +1203,7 @@
% \changes{v3.3}{2012/04/09}{Adapted to revised version of \cs{caption@withoptargs}}
% \changes{v3.3}{2017/03/19}{When used with fixed witdh the content will not be hboxed anymore}
% \changes{v3.3c}{2019/09/01}{Adapted so it could be used by \cs{subfloat} offered by \package{subcaption}}
+% \changes{v3.5}{2020/07/28}{Adapted to \package{caption3} v2.0}
% A |\parbox| with contents and caption, separated by an invisible |\hrule|.
% \begin{macrocode}
\newcommand*\captionbox{%
@@ -1377,12 +1217,12 @@
% \end{macrocode}
% \begin{macrocode}
\long\def\caption@iibox#1#2#3[#4]{%
- \@testopt{\caption@iiibox{#1}{#2}{#3}[{#4}]}\captionbox@hj@default}
+ \@testopt{\caption@iiibox{#1}{#2}{#3}[{#4}]}\captionbox@innerpos@default}
% \end{macrocode}
% \begin{macrocode}
\long\def\caption@iibox@#1#2#3#4{%
\setbox\@tempboxa\hbox{#4}%
- \caption@iiibox{#1}{#2}{#3}[\wd\@tempboxa][\captionbox@hj@default]{\unhbox\@tempboxa}}
+ \caption@iiibox{#1}{#2}{#3}[\wd\@tempboxa][\captionbox@innerpos@default]{\unhbox\@tempboxa}}
% \end{macrocode}
% \begin{macrocode}
\long\def\caption@iiibox#1{%
@@ -1399,28 +1239,28 @@
\caption@setposition t%
#2{\caption#4{#5}}%
\captionbox@hrule
- \csname caption@hj@#7\endcsname
+ \csname caption@justification@#7\endcsname
#8}%
}{%
\endgroup
\parbox[b]{#6}{%
#1\relax
\caption@setposition b%
- \csname caption@hj@#7\endcsname
+ \csname caption@justification@#7\endcsname
#8%
\captionbox@hrule
#3{\caption#4{#5}}}%
}}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*\captionbox@hj@default{c}
+\newcommand*\captionbox@innerpos@default{c}
\newcommand*\captionbox@hrule{\hrule\@height\z@\relax}
% \end{macrocode}
% \begin{macrocode}
-\providecommand*\caption@hj@c{\centering}
-\providecommand*\caption@hj@l{\raggedright}
-\providecommand*\caption@hj@r{\raggedleft}
-\providecommand*\caption@hj@s{}
+\providecommand*\caption@justification@c{\centering}
+\providecommand*\caption@justification@l{\raggedright}
+\providecommand*\caption@justification@r{\raggedleft}
+\providecommand*\caption@justification@s{}
% \end{macrocode}
% \end{macro}
%
@@ -1576,7 +1416,7 @@
% (If |\caption@if|\-|top| is not set, |\caption| is at the bottom of this part,
% therefore ending this part, so we set the flag to |false| in this case.)
% \begin{macrocode}
- \caption@fixposition
+ \caption@fixposition % TODO: Make this independant on the "position" setting
\caption@iftop\caption@setflag\caption@clrflag2% caption
% \end{macrocode}
% This part does not contain content (like sub-figures) yet,
@@ -1718,22 +1558,21 @@
% \end{macrocode}
% \end{macro}
%
-% \changes{v3.0a}{2004/01/23}{%
-% Internal hooks \cs{caption@@begin} \& \cs{caption@@end} added}
-% \changes{v3.0h}{2005/10/06}{%
-% Internal hooks \cs{caption@@begin} \& \cs{caption@@end} removed}
+% \changes{v3.0a}{2004/01/23}{Internal hooks \cs{caption@@begin} \& \cs{caption@@end} added}
+% \changes{v3.0h}{2005/10/06}{Internal hooks \cs{caption@@begin} \& \cs{caption@@end} removed}
%
% \begin{macro}{\caption@setfnum}
% \changes{v3.1}{2007/03/10}{This macro added}
+% \changes{v3.5}{2020/08/03}{Adapted to \package{caption3} v2.0}
% |\caption@setfnum|\marg{type}\\
-% redefines |\fnum@|\meta{type} according the caption label format
-% set with |labelformat=|. But if |labelformat=default| is set,
-% |\fnum@|\meta{type} will not be overwritten by us.
+% stores the original definition of |\fnum@|\meta{type} in |\caption@fnum@|\meta{type}
+% and re-defines it according the caption label format set with |label|\-|format=|.
% \begin{macrocode}
\newcommand*\caption@setfnum[1]{%
- \@ifundefined{fnum@#1}{\iftrue}{\ifx\caption@lfmt\caption@lfmt@default\else}%
- \@namedef{fnum@#1}{\caption@fnum{#1}}%
- \fi}
+ \@ifundefined{caption@fnum@#1}%
+ {\expandafter\let\csname caption@fnum@#1\expandafter\endcsname\csname fnum@#1\endcsname
+ \@namedef{fnum@#1}{\caption@fnum{#1}}}%
+ {}}
% \end{macrocode}
% \end{macro}
%
@@ -1795,16 +1634,11 @@
%
% \begin{macro}{\caption@normalsize}
% \changes{v3.1}{2007/05/05}{This macro and its usage added}
-% This one will be used by |\@caption| instead of |\normalsize|.\par
-% Its code is equivalent to
-% \begin{quote}
-% |\caption@font{normal}%|
-% \end{quote}
-% but executes faster (since the starred form of |\caption@font|
-% does not use |\setkeys| internally).
+% \changes{v3.5}{2020/07/27}{Adapted to \package{caption3} v2.0}
+% This one will be used by |\@caption| instead of |\normalsize|.
% \begin{macrocode}
\newcommand*\caption@normalsize{%
- \caption@font*{\KV@caption@fnt@normal\@unused}}
+ \caption@font@normal\@unused}
% \end{macrocode}
% \end{macro}
%
@@ -1858,30 +1692,6 @@
% \section{Support for sub-captions}
% \changes{v3.1f}{2007/11/16}{Support for sub-captions added}
%
-% \begin{macro}{\caption@DeclareSubType}
-% |\caption@DeclareSub| initializes the usage of \cs{caption}
-% in sub-floats.
-% \begin{macrocode}
-\def\caption@DeclareSubType sub#1\@nil{%
- \caption@Debug{Initializing subtype for `#1'\@gobble}%
- \@namedef{caption@beginsub#1}{\caption@beginsubfloat{#1}}}
-\@onlypreamble\caption@DeclareSubType
-% \end{macrocode}
-% \end{macro}
-%
-% Initialize the sub-captions defined with \cs{DeclareCaptionSubType}\ldots
-% \begin{macrocode}
-\caption@For*{subtypelist}{\caption@DeclareSubType sub#1\@nil}
-% \end{macrocode}
-%
-% Initialize the sub-captions defined with \cs{newsubfloat}\cite{subfig}\ldots
-% \begin{macrocode}
-\caption@AtBeginDocument*{%
- \caption@ifdefined\sf@counterlist{%
- \@for\sf@temp:=\sf@counterlist\do{%
- \expandafter\caption@DeclareSubType\sf@temp\@nil}}{}}
-% \end{macrocode}
-%
% \begin{macro}{\caption@subtypehook}
% \changes{v3.1g}{2008/03/20}{Redefinition of \cs{caption@setlist} added}
% \changes{v3.1k}{2009/10/09}{Bugfix 09-08-12b: \cs{@makecaption} will now be restored here, too}
@@ -1895,6 +1705,7 @@
% \changes{v3.3}{2013/06/17}{Missing redefinition of \cs{captionlistentry} added}
% \changes{v3.3}{2018/09/06}{Adapted to the \package{chkfloat} package}
% \changes{v3.4f}{2020/01/03}{Redefinition of \cs{@caption} added since it was redefined by the \env{threeparttable} environment}
+% \changes{v3.5}{2020/07/27}{Adapted to \package{caption3} v2.0}
% Hook, will be used inside \cs{caption@setsubtype}.\par
% (Note: If we are inside an |sub|\-|float|\-|row| environment we have to keep
% the |\@make|\-|caption| code of the \package{floatrow} package intact.)
@@ -1925,7 +1736,7 @@
\let\caption@chkfloat\@gobbletwo
% \end{macrocode}
% \begin{macrocode}
- \caption@setbox{none}%
+ \caption@set{box}{none}%
\caption@clearmargin
\caption@iflist{}{\let\caption@setlist\@gobble}%
\caption@setoptions{sub}%
@@ -2094,181 +1905,117 @@
% \end{macrocode}
% \end{macro}
%
+% \section{Babel package support}
%
-% \section{Document class \& Babel package support}
-%
-% \subsection{The \AmS{} \& \SmF{} classes}
-% \changes{v3.1}{2007/07/29}{\AmS\ \& \SmF\ classes support added}
+% \subsection{The arabic \& farsi babel option}
+% \changes{v3.5}{2020/08/02}{\package{arabic} babel support addded}
%
% \begin{macrocode}
-\caption@ifdefined\smf@makecaption{\let\smf@makecaption\@makecaption}{}
+\caption@IfBabelArabi{%
% \end{macrocode}
%
-% \subsection{The beamer class}
-% \changes{v3.1}{2007/03/10}{beamer class support added}
+% The \package{arabicore} package re-defines |\@make|\-|caption|, |\fnum@figure|, and |\fnum@table|
+% incompatible to the \package{caption} package, therefore we have to restore our resp.~the original definitions here.
%
% \begin{macrocode}
-\@ifclassloaded{beamer}{%
- \caption@InfoNoLine{beamer document class}%
+ \let\@makecaption\caption@makecaption
+ \def\fnum@figure{\figurename\nobreakspace\thefigure}%
+ \def\fnum@table{\tablename\nobreakspace\thetable}%
% \end{macrocode}
%
-% \begin{macro}{\figure}
-% \changes{v3.1f}{2007/12/17}{This re-definition for \class{beamer} document class added}
-% \changes{v3.3d}{2019/09/01}{This re-definition for \class{beamer} document class revised}
-% We redefine |figure| so our type-specific options will be used etc.
-% \begin{macrocode}
- \let\caption@ORI@figure\figure
- \def\figure{\caption@settype{figure}\caption@ORI@figure}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\table}
-% \changes{v3.1f}{2007/12/17}{This re-definition for \class{beamer} document class added}
-% \changes{v3.3d}{2019/09/01}{This re-definition for \class{beamer} document class revised}
-% \changes{v3.4a}{2019/10/18}{Bug fixed which was introduced in previous revision}
-% We redefine |table| so our type-specific options will be used etc.
-% \begin{macrocode}
- \let\caption@ORI@table\table
- \def\table{\caption@settype{table}\caption@ORI@table}
-% \end{macrocode}
-% \end{macro}
-%
% \begin{macrocode}
}{}
% \end{macrocode}
%
-% \subsection{The \KOMAScript{} classes}
-%
-% \KOMAScript\ contains the code
-% |\AtBeginDocument{\let\scr@caption\caption}|
-% so we need to update |\scr@caption| here, too.
+% \subsection{The frenchle \& frenchpro package}
+% \changes{v3.0h}{2005/10/03}{\package{frenchle/pro} package support added}
+% \changes{v3.5}{2020/08/01}{\package{frenchle/pro} package support updated}
%
% \begin{macrocode}
-\caption@ifdefined\scr@caption{%
- \caption@AtBeginDocument{\let\scr@caption\caption}}{}
+\caption@IfFrenchLe{%
% \end{macrocode}
%
-% \subsection{The frenchb Babel option}
-% \changes{v3.1}{2006/05/14}{Adaptation to \package{frenchb} added}
-%
-% Suppress
-% ``Package |frenchb.ldf| Warning: The definition of |\@makecaption| has been
-% changed, frenchb will NOT customize it.''
-% (but only if we emulate this customization)
+% \begin{macro}{\f@ffrench}
+% \begin{macro}{\f@tfrench}
+% |\f@ffrench| and |\f@tfrench| reflect |\fnum@figure| and |\fnum@table|
+% when used in French mode. These contain additional code which typesets
+% the caption separator |\caption|\-|separator| instead of the usual colon.
+% Because this breaks with our |\@make|\-|caption| code we have to remove
+% this additional code here.
% \begin{macrocode}
-\@nameuse{caption@frenchb}\@nameundef{caption@frenchb}
+ \def\f@ffrench{\ifx\listoffigures\relax\else\figurename~\thefigure\fi}%
+ \def\f@tfrench{\ifx\listoftables\relax\else\tablename~\thetable\fi}%
+ \let\@eatDP\@undefined
% \end{macrocode}
+% \end{macro}
+% \end{macro}
%
-% \subsection{The frenchle/pro package}
-% \changes{v3.0h}{2005/10/03}{Adaptation to \package{frenchle/pro} added}
-%
+% Since the \package{frenchle} package overwrites |\@make|\-|caption| (within |\GO|\-|french|),
+% we need to save it beforehand and restore it afterwards.
% \begin{macrocode}
-\caption@AtBeginDocument{\caption@ifdefined\frenchTeXmods{%
- \caption@InfoNoLine{frenchle/pro package is loaded}%
+ \caption@AtBeginDocument{%
+ \let\caption@original@makecaption\@makecaption}%
+ \g@addto@macro\GOfrench{%
+ \let\@makecaption\caption@original@makecaption}%
% \end{macrocode}
%
% \begin{macrocode}
- \let\captionfont@ORI\captionfont
- \let\captionlabelfont@ORI\captionlabelfont
- \let\@makecaption@ORI\@makecaption
-% \end{macrocode}
-
-% If |\GOfrench| is defined as |\relax| all the re-definitions regarding
-% captions have already been done, so we can do our patches immediately.
-% Otherwise we must add our stuff to |\GOfrench|.
-% \begin{macrocode}
- \caption@ifdefined\GOfrench
- {\def\caption@tempa{\g@addto@macro\GOfrench}}%
- {\let\caption@tempa\@firstofone}%
- \caption@tempa{%
+}{}
% \end{macrocode}
%
-% \begin{macrocode}
- \let\captionfont\captionfont@ORI
- \let\captionfont@ORI\@undefined
- \let\captionlabelfont\captionlabelfont@ORI
- \let\captionlabelfont@ORI\@undefined
- \let\@makecaption\@makecaption@ORI
- \let\@makecaption@ORI\@undefined
-% \end{macrocode}
+% \subsection{The hungarian \& magyar babel option}
+% \changes{v3.2}{2009/03/29}{\package{magyar} babel support added}
+% \changes{v3.3}{2018/08/26}{\package{magyar} babel support revised}
+% \changes{v3.5}{2020/08/02}{\package{magyar} babel support updated}
%
-% \begin{macro}{\@cnORI}
-% We update the definition of |\@cnORI| so it actually reflects
-% our definition of |\caption|.
% \begin{macrocode}
- \let\@cnORI\caption
+\caption@IfBabelHungarian{%
% \end{macrocode}
-% \end{macro}
%
-% \begin{macro}{\@tablescaption}
-% The \package{frenchle/pro} package sets |\caption| to |\@tablescaption| at
-% |\begin{table}| for special treatment of footnotes.
-% Therefore we have to patch |\@tablescaption| so |\caption*| will work
-% inside the |table| environment.
+% Since the \package{magyar} package tends to overwrite |\@make|\-|caption|
+% we save it beforehand and restore it afterwards.
+% \Note{Currently it will not be overwritten, caused by a side-effect of a
+% work-around for the \package{floatrow} package within \package{caption3}.}
+%
% \begin{macrocode}
- \let\caption@tcORI\@tablescaption
- \def\@tablescaption{\caption@star\relax\caption@tcORI}%
+ \caption@AtBeginDocument{%
+ \let\caption@original@makecaption\@makecaption}%
+ \caption@ifdefined\extrashungarian{%
+ \addto\extrashungarian{%
+ \let\@makecaption\caption@original@makecaption}}{}%
+ \caption@ifdefined\extrasmagyar{%
+ \addto\extrasmagyar{%
+ \let\@makecaption\caption@original@makecaption}}{}%
% \end{macrocode}
-% \end{macro}
%
-% \begin{macro}{\f@ffrench}
-% \begin{macro}{\f@tfrench}
-% |\f@ffrench| and |\f@tfrench| reflect |\fnum@figure| and |\fnum@table|
-% when used in French mode. These contain additional code which typesets
-% the caption separator |\captionseparator| instead of the usual colon.
-% Because this breaks with our |\@makecaption| code we have to remove
-% this additional code here.
% \begin{macrocode}
- \let\@eatDP\@undefined
- \let\caption@tempa\@empty
- \ifx\f@ffrench\fnum@figure
- \l@addto@macro\caption@tempa{\let\fnum@figure\f@ffrench}%
- \fi
- \ifx\f@tfrench\fnum@table
- \l@addto@macro\caption@tempa{\let\fnum@table\f@tfrench}%
- \fi
- \def\f@ffrench{\ifx\listoffigures\relax\else\figurename~\thefigure\fi}%
- \def\f@tfrench{\ifx\listoftables\relax\else\tablename~\thetable\fi}%
- \caption@tempa
+}{}
% \end{macrocode}
-% \end{macro}
-% \end{macro}
+%
+% \subsection{The latvian babel option}
+% \changes{v3.5}{2020/08/02}{\package{latvian} babel support updated}
%
% \begin{macrocode}
- }%
-}{}}
+\caption@IfBabelLatvian{%
% \end{macrocode}
%
-% \subsection{The hungarian and magyar Babel option}
-% \changes{v3.2}{2009/03/29}{\package{magyar} package support added}
-% \changes{v3.3}{2018/08/26}{\package{magyar} package support revised}
+% The \package{latvian} package re-defines |\@make|\-|caption| incompatible to the \package{caption} package,
+% therefore we have to restore our definitions here.
%
% \begin{macrocode}
-\def\caption@tempa#1{%
- \@ifpackagewith{babel}{#1}{%
- \caption@InfoNoLine{#1 babel option is loaded}%
- \expandafter\addto\csname extras#1\endcsname{%
- % reverse changes made by magyar.ldf
- \let\@makecaption\caption@makecaption
- \babel@save\@makecaption
- \caption@redefine
- \babel@save\@caption}%
- }{}}
+ \let\@makecaption\caption@makecaption
% \end{macrocode}
+%
% \begin{macrocode}
-\caption@tempa{hungarian}%
-\caption@tempa{magyar}%
+}{}
% \end{macrocode}
%
% \section{Package support}
-% \changes{v3.1}{2007/04/11}{Package options `float', `longtable' etc.
-% are not supported anymore, removed}
+% \changes{v3.1}{2007/04/11}{Package options `float', `longtable' etc.~are not supported anymore, removed}
%
% \begin{macro}{\caption@IfPackageLoaded}
-% \changes{v3.0f}{2005/05/29}{3rd argument \meta{code} added,
-% so no extra check is needed}
-% \changes{v3.1}{2007/07/04}{Re-written \& renamed from \cs{caption@ifpackage}
-% to \cs{caption@IfPackageLoaded}}
+% \changes{v3.0f}{2005/05/29}{3rd argument \meta{code} added, so no extra check is needed}
+% \changes{v3.1}{2007/07/04}{Re-written \& renamed from \cs{caption@ifpackage} to \cs{caption@IfPackageLoaded}}
% \changes{v3.3}{2018/12/26}{Bugfix: Missing curly braces added}
% |\caption@IfPackageLoaded|\marg{package}\oarg{version}\marg{true}\marg{false}\par
% Some kind of combination of |\@ifpackageloaded| and |\@ifpackagelater|.
@@ -2507,7 +2254,7 @@
\fi}%
% \end{macrocode}
% \begin{macrocode}
-\AtBeginCaption{\caption@test@adjustwidth}
+ \AtBeginCaption{\caption@test@adjustwidth}%
% \end{macrocode}
% \end{macro}
%
@@ -2633,7 +2380,7 @@
% \begin{macro}{\float@makebox}
% \changes{v3.3}{2013/01/06}{Corrects wrong load order hyperref-float now}
% \changes{v3.3}{2013/02/03}{Correction of wrong load order hyperref-float revised}
-% Redefine |\float@makebox| (only if we are not operating in compatibility mode).
+% Redefine |\float@makebox| (only if we are not operating in compatibility mode `v1').
% \begin{macrocode}
\caption@AtBeginDocument{\caption@ifcompatibility{}{%
% \end{macrocode}
@@ -2673,8 +2420,7 @@
% \begin{macrocode}
\newcommand*\caption@float@setname[1]{%
\expandafter\ifx\csname #1name\endcsname\relax
- \expandafter\let\csname #1name\expandafter\endcsname
- \csname fname@#1\endcsname
+ \expandafter\let\csname #1name\expandafter\endcsname\csname fname@#1\endcsname
\fi}%
% \end{macrocode}
% \end{macro}
@@ -3307,18 +3053,9 @@
% \changes{v3.4c}{2020/01/01}{Ugly workaround for usage in lists added}
% \changes{v3.4d}{2020/01/01}{Ugly workaround for usage in lists revised}
% To support the \package{listings} package we need to redefine
-% |\lst@MakeCaption| so the original stuff is nested with
+% |\lst@Make|\-|Caption| so the original stuff is nested with
% |\caption@begin| and |\caption@end| etc.\par
-% Unfortunately |\lst@MakeCaption| is sometimes used with |\linewidth| intact but sometimes with |\linewidth| adapted.
-% So we either could write a bunch of very ugly code which is using internals of the \package{listings} package, or
-% we could simply ignore this fact since |\hsize| will be left untouched by the \package{listings} package.
-% (This is the reason why the caption is mis-aligned when using one of the options |linewidth=|, |xleftmargin=|, |yleftmargin=|, or |resetmargins=|,
-% even if the \package{caption} package isn't used. This needs to be fixed within the \package{listings} package, for example by using
-% |\lst@MakeCaption| inside a parbox of correct width.)
-%
-% The \package{listings} package calls |\lst@MakeCaption| sometimes with original |\linewidth|, sometimes with adapted |\linewidth|.
-% So we need to detect if |\linewidth| is already adapted or not.
-% We realize this by setting a flag inside the "Init" hook of the \package{listings} package (where the adaption takes place).
+% We set a flag inside the "Init" hook of the \package{listings} package (where adaption of |\line|\-|width| etc.~takes place).
% \begin{macrocode}
\caption@setbool{lst@Init}{0}%
\lst@AddToHook{Init}{\caption@setbool{lst@Init}{1}}%
@@ -3332,28 +3069,8 @@
% \begin{macrocode}
\begingroup
% \end{macrocode}
-% \begin{macrocode}
-%% \caption@Debug{%
-%% linewidth=\lst@linewidth,
-%% xleftmargin=\lst@xleftmargin,\MessageBreak
-%% xrightmargin=\lst@xrightmargin,
-%% resetmargins=\lst@ifresetmargins true\else false\fi}%
-% \end{macrocode}
-% If |\linewidth| isn't adapted by the \package{listings} package yet, do the adaption now.
-% \begin{macrocode}
-%% \caption@iflst@Init{}{%
-%% \linewidth\lst@linewidth\relax
-%% \lst@ifresetmargins
-%% \advance\linewidth\@totalleftmargin
-%% \advance\linewidth\rightmargin
-%% \@totalleftmargin\z@
-%% \fi
-%% \advance\linewidth-\lst@xleftmargin
-%% \advance\linewidth-\lst@xrightmargin
-%% \advance\@totalleftmargin\lst@xleftmargin\relax}%
-% \end{macrocode}
-% Inside lists the \package{listings} package ignores the left margin (|\@totalleftmargin|) for captions.
-% We emulate this behaviour by adding a negativ skip which will be typeset ahead of |\caption@box|.\par
+% Inside lists the \package{listings} package ignores the left margin (|\@total|\-|left|\-|margin|) for captions.
+% We emulate this behaviour by adding a negative skip which will be typeset ahead of |\caption@box|.\par
% Note: We only need to do this if the ``Init'' hook of the \package{listings} package wasn't called yet.
% \begin{macrocode}
\caption@iflst@Init{}{%
@@ -3432,6 +3149,15 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\caption@AtBeginLongtable}
+% \changes{v3.5}{2018/04/15}{This macro added}
+% \begin{macrocode}
+\providecommand*\caption@LT@array{}
+\newcommand\caption@AtBeginLongtable{%
+ \g@addto@macro\caption@LT@array}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macrocode}
\caption@IfPackageLoaded{longtable}[1995/05/24 v3.14]{%
% \end{macrocode}
@@ -3442,85 +3168,81 @@
%
% \begin{macro}{\LT@array}
% \changes{v3.1}{2007/07/22}{This redefinition added}
-% \changes{v3.1a}{2007/09/14}{Bugfix 07-09-14: Redefinition of \cs{@captionabovetrue} \& \cs{@captionabovefalse} added}
% \changes{v3.1a}{2007/09/16}{Bugfix: This redefinition will always be done \cs{AtBeginDocument}}
% \changes{v3.1g}{2008/01/20}{Bugfix in \cs{captionlistentry}: Table counter will not be incremented anymore, \cs{nameref} works}
% \changes{v3.3}{2016/01/31}{Support for \cs{bicaption} added}
% \changes{v3.3}{2018/10/05}{Definition of \cs{captionlistentry} fixed}
-% We redefine |\LT@array| here to get |\captionsetup|\marg{options}
-% working inside |longtable|s.
+% \changes{v3.5}{2018/04/15}{Usage of \cs{caption@AtBeginLongtable} added}
+% We redefine |\LT@array| here to get |\captionsetup|\marg{options} working inside |longtable|s.
% \Note{Since the \package{hyperref} package patches \cs{LT@array} as well
% and since this only works with the original definition of \cs{LT@array},
-% we have to do this after the \package{hyperref} package,
-% i.e.~\cs{AtBeginDocument}.}
+% we have to do this after the \package{hyperref} package, i.e.~\cs{AtBeginDocument}.}
% \begin{macrocode}
\caption@AtBeginDocument{%
\let\caption@ORI@LT@array\LT@array
\renewcommand*\LT@array{%
+ \caption@LT@array
+ \caption@ORI@LT@array}}%
% \end{macrocode}
-% |\captionsetup| for longtable:
% \begin{macrocode}
- \global\let\caption@opt@@longtable\@undefined
- \def\captionsetup{%
- \noalign\bgroup
- \@ifstar\@captionsetup\@captionsetup}% gobble *
- \def\@captionsetup##1{\LT@captionsetup{##1}\egroup}%
- \def\LT@captionsetup##1{%
- \captionsetup@startrue\caption@setup@options[@longtable]{##1}%
- \global\let\caption@opt@@longtable\caption@opt@@longtable}%
-% \end{macrocode}
-% |\captionabove| \& |\captionbelow| for longtable: (\KOMAScript\ document class)
+ \caption@AtBeginLongtable{%
+% |\captionsetup| for longtable:
% \begin{macrocode}
- \def\@captionabovetrue{\LT@captionsetup{position=t}}%
- \def\@captionabovefalse{\LT@captionsetup{position=b}}%
+ \global\let\caption@opt@@longtable\@undefined
+ \def\captionsetup{%
+ \noalign\bgroup
+ \@ifstar\@captionsetup\@captionsetup}% gobble *
+ \def\@captionsetup#1{\LT@captionsetup{#1}\egroup}%
+ \def\LT@captionsetup#1{%
+ \captionsetup@startrue\caption@setup@options[@longtable]{#1}%
+ \global\let\caption@opt@@longtable\caption@opt@@longtable}%
% \end{macrocode}
% |\captionlistentry| for longtable:
% \begin{macrocode}
- \def\captionlistentry{%
- \noalign\bgroup
- \@ifstar{\egroup\LT@listentry\LTcaptype}% gobble *
- {\egroup\LT@listentry\LTcaptype}}%
+ \def\captionlistentry{%
+ \noalign\bgroup
+ \@ifstar{\egroup\LT@listentry\LTcaptype}% gobble *
+ {\egroup\LT@listentry\LTcaptype}}%
% \end{macrocode}
% |\continuedfloat| for longtable:\\
% {\small(Commented out, since it's not deeply tested and quite useless anyway)}
% \Note{\package{hyperref} versions $<$ v6.76j uses $2\times$ \cs{hyper@makecurrent}}
% \begin{macrocode}
-% \caption@ifhypcap{%
-% \let\caption@ORI@hyper@makecurrent\hyper@makecurrent
-% \def\hyper@makecurrent##1{%
-% \let\hyper@makecurrent\caption@ORI@hyper@makecurrent
-% \caption@makestart{##1}%
-%% \let\Hy@LT@currentHlabel\@currentHlabel
-% \let\Hy@LT@currentHref\@currentHref
-% \def\hyper@makecurrent####1{%
-%% \let\@currentHlabel\Hy@LT@currentHlabel
-% \let\@currentHref\Hy@LT@currentHref}}%
-% \let\caption@ORI@continuedfloat\continuedfloat
-% \def\continuedfloat{\noalign{%
-% \gdef\caption@setContinuedFloat{%
-% \let\caption@reset@continuedfloat\@gobble}%
-% \def\caption@setoptions####1{%
-% \g@addto@macro\caption@setContinuedFloat{%
-% \caption@setoptions{####1}}}%
-% \let\@captype\LTcaptype
-% \caption@ORI@ContinuedFloat}}%
-% }{%
-% \def\continuedfloat{\noalign{%
-% \caption@Error{%
-% \noexpand\continuedfloat inside longtables\MessageBreak
-% is only available with `hypcap=true'}}}%
-% }%
-% \global\let\caption@setContinuedFloat\@empty
- \def\continuedfloat{\noalign{%
- \caption@Error{\noexpand\continuedfloat outside float}}}%
+% \caption@ifhypcap{%
+% \let\caption@ORI@hyper@makecurrent\hyper@makecurrent
+% \def\hyper@makecurrent##1{%
+% \let\hyper@makecurrent\caption@ORI@hyper@makecurrent
+% \caption@makestart{##1}%
+%% \let\Hy@LT@currentHlabel\@currentHlabel
+% \let\Hy@LT@currentHref\@currentHref
+% \def\hyper@makecurrent####1{%
+%% \let\@currentHlabel\Hy@LT@currentHlabel
+% \let\@currentHref\Hy@LT@currentHref}}%
+% \let\caption@ORI@continuedfloat\continuedfloat
+% \def\continuedfloat{\noalign{%
+% \gdef\caption@setContinuedFloat{%
+% \let\caption@reset@continuedfloat\@gobble}%
+% \def\caption@setoptions##1{%
+% \g@addto@macro\caption@setContinuedFloat{%
+% \caption@setoptions{##1}}}%
+% \let\@captype\LTcaptype
+% \caption@ORI@ContinuedFloat}}%
+% }{%
+% \def\continuedfloat{\noalign{%
+% \caption@Error{%
+% \noexpand\continuedfloat inside longtables\MessageBreak
+% is only available with `hypcap=true'}}}%
+% }%
+% \global\let\caption@setContinuedFloat\@empty
+ \def\continuedfloat{\noalign{%
+ \caption@Error{\noexpand\continuedfloat outside float}}}%
% \end{macrocode}
% |\bicaption| for longtable:
% \begin{macrocode}
- \let\bicaption\LT@bicaption
+ \let\bicaption\LT@bicaption
% \end{macrocode}
-%
% \begin{macrocode}
- \caption@ORI@LT@array}}%
+ }%
% \end{macrocode}
% \end{macro}
%
@@ -3543,10 +3265,8 @@
% \end{macro}
%
% \begin{macro}{\LT@makecaption}
-% \changes{v3.0d}{2004/08/10}{%
-% Bugfix 04-08-04: \cs{abovecaptionskip} \& \cs{belowcaptionskip} will be used now}
-% \changes{v3.0e}{2005/05/05}{%
-% Bugfix: \cs{captionsetup[longtable]} overrides \cs{LTcapwidth} now}
+% \changes{v3.0d}{2004/08/10}{Bugfix 04-08-04: \cs{abovecaptionskip} \& \cs{belowcaptionskip} will be used now}
+% \changes{v3.0e}{2005/05/05}{Bugfix: \cs{captionsetup[longtable]} overrides \cs{LTcapwidth} now}
% \changes{v3.0h}{2005/10/07}{\cs{caption@LT@make} introduced}
% \changes{v3.3}{2016/02/01}{Support for \cs{bicaption} via \cs{caption@LT@setup} added}
% \changes{v3.3a}{2019/04/02}{Work-around for problem with \package{floatrow} added}
@@ -3573,19 +3293,16 @@
\caption@LT@make{%
\caption@LT@settype\LTcaptype
% \end{macrocode}
-%
% |\caption@LT@setup| is re-defined inside the \package{bicaption} package
% and contains the preparation of typesetting of the bilingual caption.
% \begin{macrocode}
\caption@LT@setup
% \end{macrocode}
-%
% \iffalse
% The default |position=| setting for longtables is |top|.
% (This emulates the standard behavior of the \package{longtable} package
% which has no skip above the caption but a skip below it.)
% \fi
-%
% |position=auto| is a bad idea for longtables, but we do our very best.
% This works quite well for captions inside the longtable contents, but
% not for captions inside the longtable (end)foot.
@@ -3593,22 +3310,18 @@
% \begin{macrocode}
\caption@setautoposition{\ifcase\LT@rows t\else b\fi}%
% \end{macrocode}
-%
% We set |\ifcaption@star| according the 1st argument.
% \begin{macrocode}
\caption@startrue#1\caption@starfalse
% \end{macrocode}
-%
% \begin{macrocode}
\caption@prepare@stepcounter\LTcaptype{LT}%
% \end{macrocode}
-%
-% \changes{v3.1}{2007/05/05}{\cs{caption@normalsize} added}
+% \changes{v3.1}{2007/05/05}{\cs{caption@font@normal} added}
% \begin{macrocode}
\caption@begin\LTcaptype
\caption@normalsize
% \end{macrocode}
-%
% The following skip has the purpose to correct the height of the
% |\parbox[t]|. Usually it's the height of the very first line, but
% because of our extra skips (|\abovecaptionskip| and |\belowcaptionskip|)
@@ -3621,16 +3334,14 @@
% \begin{macrocode}
\vskip-\ht\strutbox
% \end{macrocode}
-%
-% Work-around for problem with \package{floatrow}:
-% The |\belowcaptionskip| disturbs the environment in which the caption is actually typeset (by creating extra, unwanted space),
-% so we supress this skip if the \package{floatrow} package is loaded.
-% (This fixes \issue{50})
+% Work-around for problem with \package{floatrow}:
+% The |\below|\-|caption|\-|skip| disturbs the environment in which the caption is actually typeset (by creating extra, unwanted space),
+% so we supress this skip if the \package{floatrow} package is loaded.
+% (This fixes \issue{50})
% \begin{macrocode}
\caption@ifdefined\FBifcaptop{%
\let\caption@belowskip\@empty}{}%
% \end{macrocode}
-%
% The following code should look familiar. We do our skips and use
% |\caption@@make| to typeset the caption itself.
% \begin{macrocode}
@@ -3701,7 +3412,10 @@
% \end{macro}
%
% \begin{macrocode}
-}{}
+}{%
+ \let\caption@AtBeginLongtable\@gobble
+ \let\caption@LT@array\@undefined
+}
% \end{macrocode}
%
% \begin{macro}{\caption@LT@setup}
@@ -4068,7 +3782,7 @@
\def\caption@setSC@justify{%
\caption@clearmargin
\ifx\SC@justify\@empty \else
- \let\caption@hj\SC@justify
+ \let\caption@justification\SC@justify
\let\SC@justify\@empty
\fi}%
% \end{macrocode}
@@ -4191,8 +3905,7 @@
% \package{supertabular} package: If |\topcaption| was used,
% the position will be |top| automatically, |bottom| otherwise.
% \begin{macrocode}
- \def\caption@fixposition{%
- \caption@setposition{\if@topcaption t\else b\fi}}%
+ \caption@setposition{\if@topcaption t\else b\fi}%
% \end{macrocode}
% \begin{macrocode}
\caption@beginex{#1}{#2}{#3}%
@@ -4258,8 +3971,7 @@
\caption@setoptions{xtabular}%
% \end{macrocode}
% \begin{macrocode}
- \def\caption@fixposition{%
- \caption@setposition{\if@topcaption t\else b\fi}}%
+ \caption@set{position}{\if@topcaption t\else b\fi}%
% \end{macrocode}
% \begin{macrocode}
\@initisotab
@@ -4292,7 +4004,7 @@
\let\caption@ORI@threeparttable\threeparttable
\renewcommand*\threeparttable{%
\caption@settype{\@ifundefined{@captype}{table}{\@captype}}%
-%%% \caption@setposition a% ?
+%%% \caption@setposition{auto}% ?
\caption@clearmargin
\caption@setoptions{threeparttable}%
\caption@ORI@threeparttable}%
@@ -4305,7 +4017,7 @@
\let\caption@ORI@measuredfigure\measuredfigure
\renewcommand*\measuredfigure{%
\caption@settype{\@ifundefined{@captype}{figure}{\@captype}}%
-%%% \caption@setposition a% ?
+%%% \caption@setposition{auto}% ?
\caption@clearmargin
\caption@setoptions{measuredfigure}%
\caption@ORI@measuredfigure}%
@@ -4430,24 +4142,6 @@
%
% \clearpage
% \begin{thebibliography}{99}
-% \bibitem{beamer}
-% Till Tantau:\\
-% \href{http://www.ctan.org/pkg/beamer}%
-% {\emph{The beamer class, User Guide for version 3.25}},\\
-% December 26, 2012
-%
-% \bibitem{KOMAScript}
-% Markus Kohm \& Jens-Uwe-Morawski:\\
-% \href{http://www.ctan.org/pkg/koma-script}%
-% {\emph{KOMA-Script -- a versatile \LaTeXe\ bundle}},\\
-% 2012-07-22
-%
-% \bibitem{NTG}
-% Victor Eijkhout:\\
-% \href{http://www.ctan.org/pkg/ntgclass}%
-% {\emph{An introduction to the Dutch \LaTeX\ document classes}},\\
-% 3 September 1989
-%
% \bibitem{float}
% Anselm Lingnau:\\
% \href{http://www.ctan.org/pkg/float}%
diff --git a/macros/latex/contrib/caption/caption.ins b/macros/latex/contrib/caption/caption.ins
index d6ea31962f..188347ba15 100644
--- a/macros/latex/contrib/caption/caption.ins
+++ b/macros/latex/contrib/caption/caption.ins
@@ -25,30 +25,41 @@ This work has the LPPL maintenance status "maintained".
This Current Maintainer of this work is Axel Sommerfeldt.
This work consists of the files
- caption.ins, caption.dtx, caption2.dtx, caption3.dtx,
- bicaption.dtx, ltcaption.dtx, subcaption.dtx, totalcount.dtx,
+ caption.ins, caption.dtx, caption-light.dtx, caption2.dtx, caption3.dtx,
+ caption-ams-smf.dtx, caption-beamer.dtx, caption-elsarticle.dtx,
+ caption-koma.dtx, caption-memoir.dtx, caption-ntg.dtx,
+ caption-thesis.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx,
the derived files
- caption.sty, caption2.sty, caption3.sty,
- bicaption.sty, ltcaption.sty, subcaption.sty, totalcount.sty,
+ caption.sty, caption-light.sty, caption2.sty, caption3.sty,
+ caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
+ caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
+ caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty,
and the user manuals
caption-deu.tex, caption-eng.tex, caption-rus.tex.
\endpreamble
\generate{\file{caption.sty}{\from{caption.dtx}{package}}}
+\generate{\file{caption-light.sty}{\from{caption-light.dtx}{package}}}
\generate{\file{caption2.sty}{\from{caption2.dtx}{package}}}
\generate{\file{caption3.sty}{\from{caption3.dtx}{package}}}
+
+\generate{\file{caption-ams-smf.sto}{\from{caption-ams-smf.dtx}{package}}}
+\generate{\file{caption-beamer.sto}{\from{caption-beamer.dtx}{package}}}
+\generate{\file{caption-elsarticle.sto}{\from{caption-elsarticle.dtx}{package}}}
+\generate{\file{caption-koma.sto}{\from{caption-koma.dtx}{package}}}
+\generate{\file{caption-memoir.sto}{\from{caption-memoir.dtx}{package}}}
+\generate{\file{caption-ntg.sto}{\from{caption-ntg.dtx}{package}}}
+\generate{\file{caption-thesis.sto}{\from{caption-thesis.dtx}{package}}}
+
\generate{\file{bicaption.sty}{\from{bicaption.dtx}{package}}}
\generate{\file{ltcaption.sty}{\from{ltcaption.dtx}{package}}}
\generate{\file{subcaption.sty}{\from{subcaption.dtx}{package}}}
-\generate{\file{totalcount.sty}{\from{totalcount.dtx}{package}}}
\Msg{***********************************************************}
\Msg{*}
\Msg{* To finish the installation you have to move the files}
-\Msg{* `caption.sty', `caption2.sty', 'caption3.sty',}
-\Msg{* `bicaption.sty', `ltcaption.sty', `subcaption.sty',}
-\Msg{* and `totalcount.sty' into a directory searched by TeX.}
+\Msg{* `*.sty' and `*.sto' into a directory searched by TeX.}
\Msg{*}
\Msg{* To produce the documentation run the file}
\Msg{* `caption-eng.tex' (English version) or `caption-rus.tex'}
diff --git a/macros/latex/contrib/caption/caption2.dtx b/macros/latex/contrib/caption/caption2.dtx
index 2b6f3c73c2..074dd7c630 100644
--- a/macros/latex/contrib/caption/caption2.dtx
+++ b/macros/latex/contrib/caption/caption2.dtx
@@ -19,11 +19,15 @@
% This Current Maintainer of this work is Axel Sommerfeldt.
%
% This work consists of the files
-% caption.ins, caption.dtx, caption2.dtx, caption3.dtx,
-% bicaption.dtx, ltcaption.dtx, subcaption.dtx, totalcount.dtx,
+% caption.ins, caption.dtx, caption-light.dtx, caption2.dtx, caption3.dtx,
+% caption-ams-smf.dtx, caption-beamer.dtx, caption-elsarticle.dtx,
+% caption-koma.dtx, caption-memoir.dtx, caption-ntg.dtx,
+% caption-thesis.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx,
% the derived files
-% caption.sty, caption2.sty, caption3.sty,
-% bicaption.sty, ltcaption.sty, subcaption.sty, totalcount.sty,
+% caption.sty, caption-light.sty, caption2.sty, caption3.sty,
+% caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
+% caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
+% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty,
% and the user manuals
% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%
diff --git a/macros/latex/contrib/caption/caption3.dtx b/macros/latex/contrib/caption/caption3.dtx
index 8edc856461..5f2823ac0b 100644
--- a/macros/latex/contrib/caption/caption3.dtx
+++ b/macros/latex/contrib/caption/caption3.dtx
@@ -19,21 +19,25 @@
% This Current Maintainer of this work is Axel Sommerfeldt.
%
% This work consists of the files
-% caption.ins, caption.dtx, caption2.dtx, caption3.dtx,
-% bicaption.dtx, ltcaption.dtx, subcaption.dtx, totalcount.dtx,
+% caption.ins, caption.dtx, caption-light.dtx, caption2.dtx, caption3.dtx,
+% caption-ams-smf.dtx, caption-beamer.dtx, caption-elsarticle.dtx,
+% caption-koma.dtx, caption-memoir.dtx, caption-ntg.dtx,
+% caption-thesis.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx,
% the derived files
-% caption.sty, caption2.sty, caption3.sty,
-% bicaption.sty, ltcaption.sty, subcaption.sty, totalcount.sty,
+% caption.sty, caption-light.sty, caption2.sty, caption3.sty,
+% caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
+% caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
+% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty,
% and the user manuals
% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%
% \fi
-% \CheckSum{3606}
+% \CheckSum{3636}
%
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption3.drv}[2020/05/30 v1.12 Implementation of the caption kernel]
+\ProvidesFile{caption3.drv}[2019/09/10 v2.0 Implementation of the caption kernel]
\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
%\errorcontextlines=3
%
@@ -57,16 +61,11 @@
\ifpdf\usepackage{hypdestopt}\fi
\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
%
-\usepackage{caption3}[2020/05/30]
+\usepackage{caption3}[2020/07/27]
%
-\DeclareRobustCommand*\AmS{\texorpdfstring
- {{\protect\usefont{OMS}{cmsy}{m}{n}A\kern-.1667em\lower.5ex\hbox{M}\kern-.125emS}}%
- {AMS}}
-\DeclareRobustCommand*\KOMAScript{\texorpdfstring
- {\textsf{K\kern.05em O\kern.05em M\kern.05em A\kern.1em-\kern.1em Script}}%
- {KOMA-Script}}
-\DeclareRobustCommand*\NTG{NTG}
-\DeclareRobustCommand*\SmF{SMF}
+\DeclareRobustCommand*\eTeX{\texorpdfstring
+ {\leavevmode\hbox{$\varepsilon$}-\TeX}%
+ {e-TeX}}
%
\begin{document}
\DocInput{caption3.dtx}
@@ -74,28 +73,31 @@
%</driver>
% \fi
%
+% \def\thispackage{the \package{caption} kernel}
+% \def\Thispackage{The \package{caption} kernel}
+%
% \newcommand*\purerm[1]{{\upshape\mdseries\rmfamily #1}}
% \newcommand*\puresf[1]{{\upshape\mdseries\sffamily #1}}
% \newcommand*\purett[1]{{\upshape\mdseries\ttfamily #1}}
% \let\class\puresf \let\package\puresf
% \let\env\purett \let\opt\purett
%
-% \def\thispackage{the \package{caption} kernel}
-% \def\Thispackage{The \package{caption} kernel}
-%
% \newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
% \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
% \newcommand*\version[2][]{\textit{v#2}}
%
+% \GetFileInfo{caption3.drv}
+% \let\docdate\filedate
+% \let\docversion\fileversion
% \GetFileInfo{caption3.sty}
%
% \title{The Implementation of
% \texorpdfstring{\thispackage\thanks{%^^A
-% This package has version number \fileversion, last revised \filedate.}}%^^A
+% This package has version number \docversion.}}%^^A
% {the caption kernel}}
% \author{Axel Sommerfeldt\\
% \url{https://gitlab.com/axelsommerfeldt/caption}}
-% \date{\filedate}
+% \date{\docdate}
% \maketitle
%
% \begin{abstract}
@@ -174,8 +176,7 @@
% \newcommand*\Note[2][Note]{\par{\small\emph{#1:} #2}\par}
%
% \changes{v1.0}{2003/12/20}{Rewritten; many new commands and features}
-% \changes{v1.0c}{2004/11/28}{Split into two packages:
-% \package{caption} \& \package{caption3}}
+% \changes{v1.0c}{2004/11/28}{Split into two packages: \package{caption} \& \package{caption3}}
%
% \iffalse
% --------------------------------------------------------------------------- %
@@ -191,38 +192,17 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2020/07/20 v1.12b caption3 kernel (AR)]
-% \end{macrocode}
-%
-% \section{Workaround for bug in package \package{arabtex}}
-% \package{arabtex} re-defines \cs{@gobble} as not-long so the packages of the
-% \package{caption} package bundle are doomed to fail.
-% Since this fatal bug won't be fixed in \package{arabtex} but we are dependent on a
-% proper definition of \cs{@gobble}, \cs{@firstofone}, \cs{@firstoftwo}, \cs{@secondoftwo},
-% and so on we fix this here. (Sigh!)
-% \begin{macrocode}
-\providecommand\caption@FixArabTeX{%
- \def\caption@tempa##1{}%
- \ifx\caption@tempa\@gobble
- \PackageInfo{caption3}{Fixing ArabTeX}%
- \long\def\@gobble##1{}%
- \fi}
-% \end{macrocode}
-% Do the fix now and at |\begin{document}|, in case \package{arabtex} will be loaded after \package{caption}.
-% \begin{macrocode}
-\caption@FixArabTeX
-\AtBeginDocument{%
- \caption@FixArabTeX
- \let\caption@FixArabTeX\@undefined}
+\ProvidesPackage{caption3}[2020/08/30 v2.0 caption3 kernel (AR)]
% \end{macrocode}
%
% \section{Generic helpers}
%
% \begin{macro}{\@nameundef}
-% This is the opposite to |\@namedef| which is offered by the \LaTeX\ kernel.
-% We use it to remove the definition of some commands and keyval options after
-% |\begin{document}| (to save \TeX\ memory) and to remove caption options defined
-% with |\captionsetup|\oarg{type}.
+% |\@nameundef|\marg{command name}\\
+% is the opposite to |\@namedef| which is offered by the \LaTeX\ kernel.
+% We use it to remove the definition of some commands and keyval options after
+% |\begin{document}| (to save \TeX\ memory) and to remove caption options defined
+% with |\captionsetup|\oarg{type}.
% \begin{macrocode}
\providecommand*\@nameundef[1]{%
\expandafter\let\csname #1\endcsname\@undefined}
@@ -231,34 +211,24 @@
%
% \begin{macro}{\l@addto@macro}
% \changes{v1.5}{2013/04/26}{Revised}
-% The \LaTeXe\ kernel offers the internal helper macro |\g@addto@macro| which
-% globally adds tokens to existing macros, like in |\AtBeginDocument|.
-% This is the same but it works local, not global.
-% \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname currentgrouplevel\endcsname\relax
- \PackageInfo{caption3}{TeX engine: TeX}
- \let\caption@ifeTeX\@secondoftwo
- \providecommand\l@addto@macro[2]{%
- \begingroup
- \toks@\expandafter{#1#2}%
- \xdef\caption@addto@temp{\the\toks@}%
- \endgroup
- \let#1\caption@addto@temp}
-\else
- \PackageInfo{caption3}{TeX engine: e-TeX}
- \let\caption@ifeTeX\@firstoftwo
- \providecommand\l@addto@macro[2]{%
- \edef#1{\unexpanded\expandafter{#1#2}}}
-\fi
+% \changes{v2.0}{2019/09/11}{Relies on \eTeX{} now}
+% |\l@addto@macro|\marg{command}\marg{code}\\
+% The \LaTeXe\ kernel offers the internal helper macro |\g@addto@macro| which
+% globally adds tokens to existing macros, like in |\AtBeginDocument|.
+% This one is the same but it works locally, not globally.
+% \begin{macrocode}
+\providecommand\l@addto@macro[2]{%
+ \edef#1{\unexpanded\expandafter{#1#2}}}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\bothIfFirst}
% \begin{macro}{\bothIfSecond}
-% |\bothIfFirst| tests if the first argument is not empty, |\bothIfSecond|
-% tests if the second argument is not empty. If yes both arguments get
-% typeset, otherwise none of them.
+% |\bothIfFirst|\marg{code no. 1}\marg{code no. 2}\\
+% |\bothIfSecond|\marg{code no. 1}\marg{code no. 2}\\
+% |\bothIfFirst| tests if the first argument is not empty, |\bothIfSecond|
+% tests if the second argument is not empty. If yes both arguments get
+% typeset, otherwise none of them.
% \begin{macrocode}
\def\bothIfFirst#1#2{%
\protected@edef\caption@tempa{#1}%
@@ -279,44 +249,53 @@
% \begin{macro}{\caption@ifundefined}
% \changes{v1.3a}{2011/08/12}{This macro added}
% \changes{v1.3b}{2011/08/18}{Made expandable}
-% Similar to \cs{@ifundefined} offered by the \LaTeX kernel,
-% but takes a macro as argument instead of a macro name.
+% |\caption@ifundefined|\marg{command}\marg{yes-code}\marg{no-code}\\
+% is similar to \cs{@ifundefined} offered by the \LaTeX kernel,
+% but takes a command as argument instead of a command name.
% \begin{macrocode}
\newcommand*\caption@ifundefined[1]{%
- \ifx#1\@undefined
- \expandafter\@firstoftwo
- \else\ifx#1\relax
- \expandafter\expandafter\expandafter\@firstoftwo
+ \ifdefined#1%
+ \ifx#1\relax
+ \expandafter\expandafter\expandafter\@firstoftwo
+ \else
+ \expandafter\expandafter\expandafter\@secondoftwo
+ \fi
\else
- \expandafter\expandafter\expandafter\@secondoftwo
- \fi\fi}
+ \expandafter\@firstoftwo
+ \fi}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\caption@ifdefined}
% \changes{v1.8e}{2018/05/11}{This macro added}
-% Similar to \cs{@ifundefined} offered by the \LaTeX kernel,
-% but takes a macro as argument instead of a macro name.
+% |\caption@ifdefined|\marg{command}\marg{yes-code}\marg{no-code}\\
+% is similar to \cs{@ifundefined} offered by the \LaTeX kernel,
+% but takes a command as argument instead of a command name.
% \begin{macrocode}
\newcommand*\caption@ifdefined[1]{%
- \ifx#1\@undefined
- \expandafter\@secondoftwo
- \else\ifx#1\relax
- \expandafter\expandafter\expandafter\@secondoftwo
+ \ifdefined#1%
+ \ifx#1\relax
+ \expandafter\expandafter\expandafter\@secondoftwo
+ \else
+ \expandafter\expandafter\expandafter\@firstoftwo
+ \fi
\else
- \expandafter\expandafter\expandafter\@firstoftwo
- \fi\fi}
+ \expandafter\@secondoftwo
+ \fi}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\caption@ifinlist}
% \changes{v1.1}{2007/07/29}{Rewritten}
-% This helper macro checks if the first argument is in the comma separated
-% list which is offered as second argument. So for example
-% \begin{quote}
-% |\caption@ifinlist{frank}{axel,frank,olga,steven}{yes}{no}|
-% \end{quote}
-% would expand to |yes|.
+% |\caption@ifinlist|\marg{element}\marg{list}\marg{yes-code}\marg{no-code}\\
+% This helper command checks if the \meta{element} is in the comma separated
+% \meta{list}. So for example
+% \begin{quote}
+% |\caption@ifinlist{frank}{axel,frank,olga,steven}{yes}{no}|
+% \end{quote}
+% would expand to |yes|.\par
+% (Note: Since this command is used by the \package{floatrow} package as well
+% its syntax should not change.)
% \begin{macrocode}
\newcommand*\caption@ifinlist{%
\@expandtwoargs\caption@@ifinlist}
@@ -337,7 +316,9 @@
%
% \begin{macro}{\caption@ifin@list}
% \changes{v1.1}{2007/08/12}{This macro added}
-% |\caption@ifin@list|\marg{cmd}\marg{list entry}\marg{yes}\marg{no}
+% |\caption@ifin@list|\marg{cmd}\marg{element}\marg{yes-code}\marg{no-code}\\
+% is the same as |\caption@ifinlist| but with a command (containing a list)
+% instead of the list itself.
% \begin{macrocode}
\newcommand*\caption@ifin@list[2]{%
\caption@ifempty@list#1%
@@ -348,7 +329,9 @@
%
% \begin{macro}{\caption@g@addto@list}
% \changes{v1.1}{2007/07/29}{This macro added}
-% |\caption@g@addto@list|\marg{cmd}\marg{list entry}
+% |\caption@g@addto@list|\marg{cmd}\marg{element}\\
+% adds an element to a command containing a list.
+% (The command will get defined if it isn't defined yet.)
% \begin{macrocode}
\newcommand*\caption@g@addto@list[2]{%
\caption@ifempty@list#1{\gdef#1{#2}}{\g@addto@macro#1{,#2}}}
@@ -356,7 +339,8 @@
% \end{macro}
% \begin{macro}{\caption@l@addto@list}
% \changes{v1.1}{2007/07/29}{This macro added}
-% |\caption@l@addto@list|\marg{cmd}\marg{list entry}
+% |\caption@l@addto@list|\marg{cmd}\marg{element}\\
+% is the same as |\caption@g@addto@list| but works locally.
% \begin{macrocode}
\newcommand*\caption@l@addto@list[2]{%
\caption@ifempty@list#1{\def#1{#2}}{\l@addto@macro#1{,#2}}}
@@ -365,7 +349,10 @@
%
% \begin{macro}{\caption@g@removefrom@list}
% \changes{v1.1}{2007/07/29}{This macro added}
-% |\caption@g@removefrom@list|\marg{cmd}\marg{list entry}
+% |\caption@g@removefrom@list|\marg{cmd}\marg{element}\\
+% removes an element from a command containing a list.
+% \Note[Caveat]{\meta{cmd} will be expanded during this process since
+% \cs{@removeelement} is using \cs{edef} to build the new list.}
% \begin{macrocode}
\newcommand*\caption@g@removefrom@list[2]{%
\caption@l@removefrom@list#1{#2}%
@@ -374,9 +361,10 @@
% \end{macro}
% \begin{macro}{\caption@l@removefrom@list}
% \changes{v1.1}{2007/07/29}{This macro added}
-% |\caption@l@removefrom@list|\marg{cmd}\marg{list entry}\par
-% \Note[Caveat]{\meta{cmd} will be expanded during this process since
-% \cs{@removeelement} is using \cs{edef} to build the new list!}
+% |\caption@l@removefrom@list|\marg{cmd}\marg{element}\\
+% is the same as |\caption@g@removefrom@list| but works locally.
+% \Note[Caveat]{\meta{cmd} will be expanded during this process since
+% \cs{@removeelement} is using \cs{edef} to build the new list.}
% \begin{macrocode}
\newcommand*\caption@l@removefrom@list[2]{%
\caption@ifempty@list#1{}{\@expandtwoargs\@removeelement{#2}#1#1}}
@@ -385,19 +373,22 @@
%
% \begin{macro}{\caption@for@list}
% \changes{v1.1}{2007/07/29}{This macro added}
-% |\caption@for@list|\marg{cmd}\marg{code with \#1}
+% |\caption@for@list|\marg{cmd}\marg{code with \#1}\\
+% iterates all elements of the list (within \meta{cmd}) using the given
+% \meta{code}.
% \begin{macrocode}
\newcommand*\caption@for@list[2]{%
- \caption@ifempty@list#1{}{%
- \def\caption@tempb##1{#2}%
- \@for\caption@tempa:=#1\do{%
- \expandafter\caption@tempb\expandafter{\caption@tempa}}}}
+ \caption@ifempty@list#1{}%
+ {\def\caption@tempb##1{#2}%
+ \@for\caption@tempa:=#1\do{%
+ \expandafter\caption@tempb\expandafter{\caption@tempa}}}}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\caption@ifempty@list}
% \changes{v1.1}{2007/07/29}{This macro added}
-% |\caption@ifempty@list|\marg{cmd}\marg{true}\marg{false}
+% |\caption@ifempty@list|\marg{cmd}\marg{yes-code}\marg{no-code}\\
+% This helper command checks if the list (within \meta{cmd}) is empty.
% \begin{macrocode}
\newcommand*\caption@ifempty@list[1]{%
\ifx#1\@undefined
@@ -416,30 +407,33 @@
%
% \pagebreak[3]
% \begin{macro}{\caption@setbool}
-% \begin{macro}{\caption@set@bool}
% \changes{v1.1}{2007/04/05}{\cs{caption@set@bool}\marg{cmd}\marg{value} added}
% \begin{macro}{\caption@ifbool}
+% \changes{v1.1}{2020/08/02}{\cs{caption@if@bool}\marg{value} added}
% \begin{macro}{\caption@undefbool}
-% For setting and testing boolean options we offer these three helper macros:
-% \begin{quote}
-% |\caption@setbool|\marg{name}\marg{value}\\
-% | |(with |value = false/true/no/yes/off/on/0/1|)\\
-% |\caption@ifbool|\marg{name}\marg{if-clause}\marg{else-clause}\\
-% |\caption@undefbool|\marg{name}
-% \end{quote}
+% For setting and testing boolean options we offer these three helper macros:
+% \begin{quote}
+% |\caption@setbool|\marg{name}\marg{value}\\
+% | |(with |value = false/true/no/yes/off/on/0/1|)\\
+% |\caption@ifbool|\marg{name}\marg{if-clause}\marg{else-clause}\\
+% |\caption@undefbool|\marg{name}
+% \end{quote}
% \begin{macrocode}
\newcommand*\caption@setbool[1]{%
\expandafter\caption@set@bool\csname caption@if#1\endcsname}
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption@set@bool[2]{%
- \caption@ifinlist{#2}{1,true,yes,on}{%
- \let#1\@firstoftwo
- }{\caption@ifinlist{#2}{0,false,no,off}{%
- \let#1\@secondoftwo
- }{%
- \caption@Error{Undefined boolean value `#2'}%
- }}}
+ \caption@if@bool{#2}{\let#1\@firstoftwo}{\let#1\@secondoftwo}}
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\caption@if@bool[1]{%
+ \caption@ifinlist{#1}{1,true,yes,on}%
+ {\@firstoftwo}%
+ {\caption@ifinlist{#1}{0,false,no,off}%
+ {}%
+ {\caption@Error{Undefined boolean value `#1'}}%
+ \@secondoftwo}}
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption@ifbool[1]{\@nameuse{caption@if#1}}
@@ -450,21 +444,31 @@
% \end{macro}
% \end{macro}
% \end{macro}
-% \end{macro}
%
% \begin{macro}{\caption@teststar}
% \changes{v1.1}{2007/05/08}{This macro and its usage added}
% \changes{v1.1e}{2007/10/28}{\cs{caption@teststar@} added}
-% |\caption@teststar|\marg{cmd}\marg{star arg}\marg{non-star arg}\\
-% |\caption@teststar@|\marg{cmd}\marg{star arg}\marg{non-star arg}
+% |\caption@teststar|\marg{cmd}\marg{star-arg}\marg{non-star-arg}\\
+% expands \meta{cmd} with either argument \marg{star-arg} or
+% \meta{non-star-arg}, depending on if the next char is a star (or not).\par
+% |\caption@teststar@|\marg{cmd}\marg{star-arg}\marg{non-star-arg}\\
+% will test the catcode of the character \@ additionally.
% \begin{macrocode}
-\newcommand*\caption@teststar[3]{\@ifstar{#1{#2}}{#1{#3}}}
+\newcommand*\caption@teststar[3]{%
+ \@ifstar{#1{#2}}{#1{#3}}}
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption@teststar@[3]{%
\@ifstar{#1{#2}}{\caption@ifatletter{#1{#2}}{#1{#3}}}}
\AtBeginDocument{\let\caption@teststar@\caption@teststar}
% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@ifatletter}
+% \changes{v1.1e}{2007/10/28}{This macro added}
+% |\caption@ifatletter|\marg{yes-code}\marg{no-code}\\
+% will either expand \meta{yes-code} or \meta{no-code},
+% depending on the catcode of the character \@.
% \begin{macrocode}
\newcommand*\caption@ifatletter{%
\ifnum\the\catcode`\@=11
@@ -472,6 +476,8 @@
\else
\expandafter\@secondoftwo
\fi}
+% \end{macrocode}
+% \begin{macrocode}
\AtBeginDocument{\let\caption@ifatletter\@secondoftwo}
% \end{macrocode}
% \end{macro}
@@ -479,7 +485,9 @@
% \begin{macro}{\caption@withoptargs}
% \changes{v1.1}{2007/08/12}{This macro added}
% \changes{v1.5}{2012/04/09}{This macro revised}
-% |\caption@withoptargs|\marg{cmd}
+% |\caption@withoptargs|\marg{cmd}\\
+% collects a star and all optional arguments, and expands \meta{cmd}
+% afterwards with the collected stuff as first argument.
% \begin{macrocode}
\newcommand*\caption@withoptargs[1]{%
\@ifstar
@@ -506,8 +514,8 @@
%
% \begin{macro}{\caption@gobble}
% \changes{v1.4}{2011/08/19}{This macro added}
-% |\caption@gobble*|\oarg{arg}\oarg{\ldots}\marg{arg}\par
-% Same as |\@gobble|, but gobbles optional arguments as well.
+% |\caption@gobble*|\oarg{arg}\oarg{\ldots}\marg{arg}\\
+% is similar to |\@gobble| but gobbles a star and optional arguments as well.
% \begin{macrocode}
\DeclareRobustCommand*\caption@gobble{%
\caption@withoptargs\@gobbletwo}
@@ -517,11 +525,11 @@
% \begin{macro}{\caption@AtBeginDocument}
% \changes{v1.1}{2007/04/13}{This macro and its usage added}
% \changes{v1.2e}{2010/01/09}{Adapted to the combine document class}
-% |\caption@AtBeginDocument*|\marg{code}\\
-% Same as |\AtBeginDocument| but the execution of code
-% will be surrounded by two |\PackageInfo|s.
-% The starred variant causes the code to be executed after all code
-% specified using the non-starred variant.
+% |\caption@AtBeginDocument*|\marg{code}\\
+% is similar to |\AtBeginDocument| but the execution of code will be
+% surrounded by two |\Package|\-|Info|s.
+% The starred variant causes the code to be executed after all code
+% specified using the non-starred variant.
% \begin{macrocode}
\let\caption@begindocumenthook\@empty
\let\caption@@begindocumenthook\@empty
@@ -557,7 +565,8 @@
%
% \begin{macro}{\caption@Info}
% \changes{v1.3}{2010/10/25}{Moved from package to kernel}
-% |\caption@Info|\marg{message}
+% |\caption@Info|\marg{message}\\
+% issues an info message (with code line indication).
% \begin{macrocode}
\newcommand*\caption@Info[1]{%
\PackageInfo{caption}{#1}}
@@ -565,10 +574,11 @@
% \end{macro}
% \begin{macro}{\caption@InfoNoLine}
% \changes{v1.3}{2010/10/25}{Moved from package to kernel}
-% |\caption@InfoNoLine|\marg{message}\\
-% \Note{The \cs{@gobble} at the end of the 2nd argument of
-% \cs{PackageInfo} suppresses the line number info.
-% See TLC2\cite{TLC2}, A.4.7, p885 for details.}
+% |\caption@InfoNoLine|\marg{message}\\
+% issues an info message without code line indication.
+% \Note{The \cs{@gobble} at the end of the 2nd argument of
+% \cs{PackageInfo} suppresses the line number info.
+% See TLC2\cite{TLC2}, A.4.7, p885 for details.}
% \begin{macrocode}
\newcommand*\caption@InfoNoLine[1]{%
\caption@Info{#1\@gobble}}
@@ -577,7 +587,8 @@
%
% \begin{macro}{\caption@Warning}
% \changes{v1.1c}{2007/10/14}{This macro added, will now be used for warnings}
-% |\caption@Warning|\marg{message}
+% |\caption@Warning|\marg{message}\\
+% issues a warning message (with code line indication).
% \begin{macrocode}
\newcommand*\caption@Warning[1]{%
\caption@WarningNoLine{#1\on@line}}
@@ -585,7 +596,8 @@
% \end{macro}
% \begin{macro}{\caption@WarningNoLine}
% \changes{v1.1c}{2007/10/14}{This macro added, will now be used for warnings}
-% |\caption@WarningNoLine|\marg{message}
+% |\caption@WarningNoLine|\marg{message}\\
+% issues a warning message without code line indication.
% \begin{macrocode}
\newcommand*\caption@WarningNoLine[1]{%
\PackageWarning{caption}{#1.^^J\caption@wh\@gobbletwo}}
@@ -600,7 +612,8 @@
% \changes{v1.0j}{2007/01/20}{This macro added, will now be used for errors}
% \changes{v1.0o}{2007/04/11}{Renamed from \cs{caption@error} to \cs{caption@Error}}
% \changes{v1.1b}{2007/09/18}{Usage of \cs{caption@Package} removed}
-% |\caption@Error|\marg{message}
+% |\caption@Error|\marg{message}\\
+% issues an error message (with code line indication).
% \begin{macrocode}
\newcommand*\caption@Error[1]{%
\PackageError{caption}{#1}\caption@eh}
@@ -615,6 +628,9 @@
%
% \begin{macro}{\caption@KV@err}
% \changes{v1.1b}{2007/09/18}{This macro added}
+% |\caption@KV@err|\marg{message}\\
+% will be used to issue an error while parsing the key-value (package)
+% options.
% \begin{macrocode}
\let\caption@KV@err\caption@Error
% \end{macrocode}
@@ -622,15 +638,15 @@
%
% \section{Using the keyval package}
%
-% We need the \package{keyval} package for option handling, so we load it here.
+% We need the \package{keyval} package for option handling, so we load it here.\par
+% \emph{TODO:} Use some recent stuff instead, for example kvdefinekey and kvsetkeys.
% \begin{macrocode}
\RequirePackage{keyval}[1997/11/10]
% \end{macrocode}
%
% \begin{macro}{\undefine@key}
-% |\undefine@key|\marg{family}\marg{key}\par
-% This helper macro is the opposite of |\define@key|, it removes a keyval
-% definition.
+% |\undefine@key|\marg{family}\marg{key}\\
+% is the opposite of |\define@key|, it removes a keyval definition.
% \begin{macrocode}
\providecommand*\undefine@key[2]{%
\@nameundef{KV@#1@#2}\@nameundef{KV@#1@#2@default}}
@@ -640,8 +656,9 @@
% \begin{macro}{\@onlypreamble@key}
% \changes{v1.1}{2007/07/22}{This macro added}
% \changes{v1.1e}{2007/11/01}{\cs{KV@err} will be used now instead of \cs{@notprerr}}
-% |\onlypreamble@key|\marg{family}\marg{key}\par
-% Analogous to |\@onlypreamble| from \LaTeXe.
+% |\onlypreamble@key|\marg{family}\marg{key}\\
+% marks a keyval definition only valid in the document preamble, analogous to
+% |\@only|\-|preamble| from \LaTeXe.
% \begin{macrocode}
\providecommand*\@preamble@keys{}
\providecommand*\@onlypreamble@key[2]{\@cons\@preamble@keys{{#1}{#2}}}
@@ -660,13 +677,12 @@
% \end{macro}
%
% \begin{macro}{\DeclareCaptionOption}
-% |\DeclareCaptionOption|\marg{option}\oarg{default value}\marg{code}\\
-% |\DeclareCaptionOption*|\marg{option}\oarg{default value}\marg{code}\par
-% We declare our options using these commands (instead of using
-% |\DeclareOption| offered by \LaTeXe), so the keyval package is used.
-% The starred form makes the option available during the lifetime of the
-% current package only, so they can be used with |\usepackage|, but
-% \emph{not} with |\captionsetup| later on.
+% |\DeclareCaptionOption*|\marg{option}\oarg{default value}\marg{code}\\
+% We declare our options using these commands (instead of using
+% |\Declare|\-|Option| offered by \LaTeXe), so the keyval package is used.
+% The starred form makes the option available during the lifetime of the
+% current package only, so they can be used with |\use|\-|package|, but
+% \emph{not} with |\caption|\-|setup| later on.
% \begin{macrocode}
\newcommand*\DeclareCaptionOption{%
\caption@teststar\caption@declareoption\AtEndOfPackage\@gobble}
@@ -680,15 +696,15 @@
% \begin{macrocode}
\newcommand*\caption@declare@option{%
\define@key{caption}}
-%% no \@onlypreamble\caption@declare@option, will be used by \captionsetup
+%% no \@onlypreamble\caption@declare@option since it will be used by \captionsetup
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\DeclareCaptionOptionNoValue}
% \changes{v1.1c}{2007/10/06}{This macro added}
-% |\DeclareCaptionOptionNoValue|\marg{option}\marg{code}\\
-% |\DeclareCaptionOptionNoValue*|\marg{option}\marg{code}\par
-% Same as \cs{DeclareCaptionOption} but issues an error if a value is given.
+% |\DeclareCaptionOptionNoValue*|\marg{option}\marg{code}\\
+% is the same as |\DeclareCaptionOption| but issues an error if a value is
+% given.
% \begin{macrocode}
\newcommand*\DeclareCaptionOptionNoValue{%
\caption@teststar\caption@declareoption@novalue\AtEndOfPackage\@gobble}
@@ -713,8 +729,8 @@
%
% \begin{macro}{\ifcaptionsetup@star}
% \changes{v1.2a}{2008/01/12}{This macro added}
-% If the starred form of |\captionsetup| is used, this will be set to |true|.
-% (It will be reset to |false| at the end of |\caption@setkeys|.)
+% If the starred form of |\captionsetup| is used, this will be set to |true|.
+% (It will be reset to |false| at the end of |\caption@set|\-|keys|.)
% \begin{macrocode}
\newif\ifcaptionsetup@star
% \end{macrocode}
@@ -728,13 +744,13 @@
% \changes{v1.2a}{2008/01/12}{\cs{ifcaptionsetup@star} will be set now}
% \changes{v1.5}{2012/04/09}{Support of multiple optional arguments added}
% \changes{v1.8h}{2020/01/03}{Syntax check of saved options added}
-% |\captionsetup|\oarg{type}\ldots\marg{keyval-list of options}\\
-% |\captionsetup*|\oarg{type}\ldots\marg{keyval-list of options}\par
-% If the optional argument `type' is specified, we simply save or append
-% the option list, otherwise we `execute' it with |\setkeys|.
-% (The non-starred variant issues a warning if \meta{keyval-list of options}
-% is not used later on.)
-% \Note{The starred variant will be used inside packages automatically.}
+% |\captionsetup*|\oarg{type}\ldots\marg{keyval-list of options}\\
+% applies the given list of options.
+% If the optional argument `type' is specified, we simply save or append
+% the option list, otherwise we `execute' it with |\set|\-|keys|.
+% (The non-starred variant issues a warning if \meta{keyval-list of options}
+% is not used later on.)
+% \Note{The starred variant will be used inside packages automatically.}
% \begin{macrocode}
\newcommand*\captionsetup{%
\caption@teststar@\@captionsetup\@gobble\@firstofone}
@@ -773,7 +789,8 @@
%
% \begin{macro}{\caption@checkoptions}
% \changes{v1.8h}{2020/01/03}{This macro added}
-% Check the syntax of the given options by executing them inside a group.
+% |\caption@checkoptions|\marg{keyval-list of options}\\
+% checks the syntax of the given options by executing them inside a group.
% \begin{macrocode}
\newcommand*\caption@checkoptions[1]{%
\begingroup
@@ -788,8 +805,9 @@
%
% \begin{macro}{\IfCaptionOptionCheck}
% \changes{v1.10}{2020/05/10}{This macro added}
-% |\IfCaptionOptionCheck|\marg{yes-code}\marg{no-code}
-% executes the \meta{yes-code} if options are just checked for syntax, and \meta{no-code} if not.
+% |\IfCaptionOptionCheck|\marg{yes-code}\marg{no-code}\\
+% executes the \meta{yes-code} if options are just checked for syntax,
+% and \meta{no-code} if not.
% \begin{macrocode}
\let\IfCaptionOptionCheck\@secondoftwo
% \end{macrocode}
@@ -804,12 +822,11 @@
% \changes{v1.1}{2007/08/17}{Starred variant added}
% \changes{v1.1e}{2007/07/27}{Inside packages the starred variant will be used automatically}
% \changes{v1.2}{2007/11/16}{Bugfix 07-11-09: `space hack' added}
-% |\clearcaptionsetup|\oarg{option}\marg{type}\\
-% |\clearcaptionsetup*|\oarg{option}\marg{type}\par
-% This removes the saved option list associated with \meta{type}.
-% If \meta{option} is given, only this option will be removed from the list.
-% (The starred variant does not issue warnings.)
-% \Note{The starred variant will be used inside packages automatically.}
+% |\clearcaptionsetup*|\oarg{option}\marg{type}\\
+% removes the saved option list associated with \meta{type}.
+% If \meta{option} is given, only this option will be removed from the list.
+% (The starred variant does not issue warnings.)
+% \Note{The starred variant will be used inside packages automatically.}
% \begin{macrocode}
\newcommand*\clearcaptionsetup{%
\caption@teststar@\@clearcaptionsetup\@gobble\@firstofone}
@@ -867,9 +884,9 @@
% \changes{v1.0d}{2005/05/03}{Optimized for memory usage}
% \changes{v1.1}{2007/07/29}{Bugfix: Does not expand option list anymore}
% \changes{v1.2}{2007/11/16}{Bugfix 07-11-09: `space hack' added}
-% |\showcaptionsetup|\oarg{package}\marg{type}\par
-% This comes for debugging issues: It shows the saved option list which
-% is associated with \meta{type}.
+% |\showcaptionsetup|\oarg{package}\marg{type}\\
+% shows the saved option list which is associated with \meta{type}
+% (as warning message).
% \begin{macrocode}
\newcommand*\showcaptionsetup[2][\@firstofone]{%
\@bsphack
@@ -901,14 +918,9 @@
% \changes{v1.2}{2007/12/03}{Definition of \cs{caption@iftypewarning} removed}
% \changes{v1.3}{2010/09/05}{Starred variant added}
% \changes{v1.4b}{2012/01/12}{Starred variant removed}
-% |\caption@setoptions|\marg{type or environment or\ldots}\par
-% Caption options which have been saved with |\captionsetup|\oarg{type} can
-% be executed by using this command.
-% It simply executes the saved option list (and clears it afterwards),
-% if there is any.
-% \iffalse
-% (The starred variant do not clear the option list.)
-% \fi
+% |\caption@setoptions|\marg{type or environment or\ldots}\\
+% applies caption options which have been saved with |\caption|\-|setup|\oarg{type}.
+% To prevent multiple application the list will be cleared (locally) afterwards.
% \begin{macrocode}
\newcommand*\caption@setoptions[1]{%
\caption@Debug{options=#1}%
@@ -928,19 +940,19 @@
% \begin{macro}{\caption@removefromoptlist}
% \changes{v1.1}{2007/07/22}{This macro added}
% \changes{v1.2c}{2008/08/24}{Fatal typo corrected}
-% |\caption@addtooptlist|\marg{type}\\
-% |\caption@removefromoptlist|\marg{type}\par
-% Adds or removes an \meta{type} to the list of unused caption options.
-% Note that the catcodes of \meta{type} are sanitized here so removing
-% \meta{type} from the list do not fail when the \package{float} package
-% is used (since |\float@getstyle| gives a result which tokens have catcode
-% 12 $=$ ``other'').
+% |\caption@addtooptlist|\marg{type}\\
+% |\caption@removefromoptlist|\marg{type}\\
+% adds or removes an \meta{type} to the list of unused caption options.
+% Note that the catcodes of \meta{type} are sanitized here so removing
+% \meta{type} from the list do not fail when the \package{float} package
+% is used (since |\float@getstyle| gives a result which tokens have catcode
+% 12 $=$ ``other'').
% \begin{macrocode}
\newcommand*\caption@addtooptlist[1]{%
- \@ifundefined{caption@opt@#1@lineno}{%
- \caption@dooptlist\caption@g@addto@list{#1}%
- \expandafter\xdef\csname caption@opt@#1@lineno\endcsname{\the\inputlineno}%
- }{}}
+ \@ifundefined{caption@opt@#1@lineno}%
+ {\caption@dooptlist\caption@g@addto@list{#1}%
+ \expandafter\xdef\csname caption@opt@#1@lineno\endcsname{\the\inputlineno}}%
+ {}}
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption@removefromoptlist[1]{%
@@ -956,10 +968,10 @@
% \end{macrocode}
% \begin{macrocode}
\AtEndDocument{%
- \caption@for@list\caption@optlist{%
- \caption@WarningNoLine{%
- Unused \string\captionsetup[#1]
- on input line \csname caption@opt@#1@lineno\endcsname}}}
+ \caption@for@list\caption@optlist
+ {\caption@WarningNoLine{%
+ Unused \string\captionsetup[#1]
+ on input line \csname caption@opt@#1@lineno\endcsname}}}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -974,10 +986,10 @@
% \changes{v1.2a}{2008/01/12}{\cs{captionsetup@starfalse} added}
% \changes{v1.2d}{2009/09/30}{Bugfix 09-09-29: Missing error handler will be defined automatically}
% \changes{v1.4}{2011/08/24}{Redefinition of \cs{XKV@err} added}
-% |\caption@setkeys|\oarg{package}\marg{family}\marg{key-values}\par
-% This one simply calls |\setkeys|\marg{family}\marg{key-values}
-% but lets the error messages not refer to the \package{keyval} package,
-% but to the \meta{package} package instead.
+% |\caption@setkeys|\oarg{package}\marg{family}\marg{key-values}\\
+% expands to |\setkeys|\marg{family}\marg{key-values},
+% but lets the error messages not refer to the \package{keyval} package
+% but to the \meta{package} package instead.
% \begin{macrocode}
\newcommand*\caption@setkeys{\@dblarg\caption@@setkeys}
% \end{macrocode}
@@ -1001,7 +1013,7 @@
\def\XKV@err{\let\@tempa\XKV@tkey\KV@err}%
% \end{macrocode}
% \begin{macrocode}
- \caption@Debug{\protect\setkeys{#2}{#3}}%
+ \caption@Debug{\noexpand\setkeys{#2}{#3}}%
\setkeys{#2}{#3}%
% \end{macrocode}
% \begin{macrocode}
@@ -1024,9 +1036,9 @@
% \begin{macro}{\caption@ExecuteOptions}
% \changes{v1.1}{2007/07/15}{This macro added}
% \changes{v1.3}{2010/09/04}{Depends on package now}
-% |\caption@ExecuteOptions|\marg{package}\marg{key-values}\par
-% We execute our options using the keyval interface, so we use this one
-% instead of |\ExecuteOptions| offered by \LaTeXe.
+% |\caption@ExecuteOptions|\marg{package}\marg{key-value options}\\
+% applies the given options using the keyval interface, so we use this one
+% instead of |\Execute|\-|Options| offered by \LaTeXe.
% \begin{macrocode}
\newcommand*\caption@ExecuteOptions[2]{%
\expandafter\@expandtwoargs\csname caption@setkeys@#1\endcsname{#1}{#2}}%
@@ -1035,21 +1047,17 @@
% \end{macro}
%
% \begin{macro}{\caption@ProcessOptions}
-% \changes{v1.0a}{2004/01/23}{Bugfix, see
-% \purett{news:400D360C.9678329F@gmx.net} for details}
-% \changes{v1.0g}{2006/01/03}{Improvement, uses \cs{caption@setkeys}
-% instead of \cs{setkeys}}
-% \changes{v1.0h}{2006/02/23}{Bugfix, now processes only those global
-% options which have a default value}
-% \changes{v1.0j}{2007/01/30}{\cs{ProcessOptionsWithKV} renamed to
-% \cs{caption@ProcessOptions} and moved from the package to the kernel}
-% \changes{v1.1}{2007/04/17}{Star variant added}
-% |\caption@ProcessOptions*|\marg{package}\par
-% We process our options using the keyval package, so we use this one
-% instead of |\ProcessOptions| offered by \LaTeXe.
-% The starred variant do not process the global options.
-% (This code was taken from the \package{hyperref} package\cite{hyperref}
-% \version{6.74} and improved.)
+% \changes{v1.0a}{2004/01/23}{Bugfix, see \purett{news:400D360C.9678329F@gmx.net} for details}
+% \changes{v1.0g}{2006/01/03}{Improvement, uses \cs{caption@setkeys} instead of \cs{setkeys}}
+% \changes{v1.0h}{2006/02/23}{Bugfix, now processes only those global options which have a default value}
+% \changes{v1.0j}{2007/01/30}{\cs{ProcessOptionsWithKV} renamed to \cs{caption@ProcessOptions} and moved from the package to the kernel}
+% \changes{v1.1}{2007/04/17}{Starred variant added}
+% |\caption@ProcessOptions*|\marg{package}\\
+% processes the given options using the keyval package, so we use this one
+% instead of |\Process|\-|Options| offered by \LaTeXe.
+% The starred variant does not process the global options.
+% (This code was taken from the \package{hyperref} package\cite{hyperref}
+% \version{6.74} and modified.)
% \begin{macrocode}
\newcommand*\caption@ProcessOptions{%
\caption@teststar\caption@@ProcessOptions\@gobble\@firstofone}
@@ -1082,11 +1090,11 @@
%
% \begin{macro}{\caption@SetupOptions}
% \changes{v1.3}{2010/09/04}{This macro added}
-% |\caption@SetupOptions|\marg{package}\marg{code}\par
-% After calling this macro |\caption@ExecuteOptions| and
-% |\usepackage|\oarg{options}\marg{package}
-% will both be mapped to \meta{code} with \meta{package} and \meta{options}
-% as arguments |#1| and |#2|. (This helps avoiding ``Option clash'' errors.)
+% |\caption@SetupOptions|\marg{package}\marg{code}\\
+% After application of this command |\caption@Execute|\-|Options| and
+% |\use|\-|package| will both be mapped to \meta{code} with \meta{package}
+% and \meta{options} as arguments |#1| and |#2|.
+% (This helps avoiding ``Option clash'' errors.)
% \begin{macrocode}
\newcommand\caption@SetupOptions[2]{%
\@namedef{caption@setkeys@#1}##1##2{#2}%
@@ -1120,6 +1128,263 @@
% \end{macrocode}
% \end{macro}
%
+% \section{Declaring and setting key values}
+%
+% \begin{macro}{\caption@decl}
+% \changes{v2.0}{2019/09/10}{This macro added}
+% |\caption@decl|\oarg{command}\marg{option}\marg{name}\\
+% is used for declaring boxes, fonts, formats etc.
+% (It defines |\caption@|\meta{option}|@|\meta{name}
+% using the given \meta{command}.)
+% \begin{macrocode}
+\newcommand*\caption@decl[3][\def]{%
+ \global\long\expandafter#1\csname caption@#2@#3\endcsname}
+\@onlypreamble\caption@decl
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@ifdecl}
+% \changes{v2.0}{2019/09/10}{This macro added}
+% |\caption@ifdecl|\marg{option}\marg{name}\marg{yes-code}\marg{no-code}\\
+% checks if the given \meta{option} and \meta{name} combination is
+% already declared.
+% \begin{macrocode}
+\newcommand*\caption@ifdecl[2]{%
+ \@ifundefined{caption@#1@#2}\@secondoftwo\@firstoftwo}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@checkdecl}
+% \changes{v2.0}{2019/09/10}{This macro added}
+% |\caption@checkdecl|\marg{option}\marg{name}\marg{yes-code}\\
+% behaves similar to |\caption@if|\-|decl| but issues an error message if the
+% given \meta{option} plus \meta{name} is not defined.
+% \begin{macrocode}
+\newcommand*\caption@checkdecl[2]{%
+ \caption@ifdecl{#1}{#2}%
+ \@firstofone
+ {\caption@Error{Undefined #1 `#2'}%
+ \@gobble}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@set}
+% \changes{v2.0}{2019/09/10}{This macro added}
+% \changes{v2.0}{2020/07/26}{Uses \cs{def} instead of \cs{let} internally}
+% |\caption@set|\marg{option}\marg{name}\\
+% sets the declared \meta{option} to \meta{name}, for example
+% |label|\-|format| to |simple|.
+% Note that since version \version{2.0} future changes to \meta{name}
+% (via |\caption@decl|) will effect the outcome,
+% for example |\caption@decl{labelformat}{simple}\ldots| will not only change
+% the definition of the label format |simple| but also effect the current
+% label format if set to |simple| (via |\caption@set|).
+% \begin{macrocode}
+\newcommand*\caption@set{%
+ \caption@maparg\caption@@set}%
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\caption@@set[3]{%
+ \caption@checkdecl{#1}{#3}{%
+% \expandafter\edef\csname caption@@#2\endcsname{#3}% could be used for debugging
+ \expandafter\def\csname caption@#2\expandafter\endcsname\expandafter{\csname caption@#1@#3\endcsname}}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\SetCaptionDefault}
+% \changes{v2.0}{2019/09/10}{This macro added}
+% \changes{v2.0}{2020/07/28}{Check for `default' added to prevent infinite loop}
+% |\SetCaptionDefault*|\marg{option}\marg{name}\\
+% sets the default value for the \meta{option}.
+% The starred variant is only relevant for setting default values for lengths
+% like |margin|. (See definition of |\caption@set|\-|default@length| for
+% details.)
+% \begin{macrocode}
+\newcommand*\SetCaptionDefault{%
+ \caption@teststar\caption@setdefault\def\edef}
+\@onlypreamble\SetCaptionDefault
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\caption@setdefault[2]{%
+ \@ifundefined{caption@setdefault@#2}%
+ {\caption@maparg\caption@@setdefault}%
+ {\@nameuse{caption@setdefault@#2}{#1}}%
+ {#2}}
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\caption@@setdefault[3]{%
+ \caption@ifdefault{#3}%
+ {\caption@Error{Invalid argument for \string\SetCaptionDefault: `#3'}}% would cause an infinite loop otherwise
+ {\caption@@set{#1}{#2@default}{#3}}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@ifdefault}
+% \changes{v2.0}{2020/08/23}{This macro added}
+% |\caption@ifdefault|\marg{value}\marg{yes-code}\marg{no-code}\\
+% expands to \meta{yes-code} if the \meta{value} expands to `default',
+% and to \meta{no-code} otherwise.
+% \begin{macrocode}
+\newcommand*\caption@ifdefault[1]{%
+ \edef\caption@tempa{#1}%
+ \def\caption@tempb{default}%
+ \ifx\caption@tempa\caption@tempb
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@setmapping}
+% \changes{v2.0}{2020/08/23}{This macro added}
+% |\caption@setmapping|\marg{source option}\marg{destination option}\\
+% sets a mapping from the \meta{source option} to the
+% \meta{destination option}, for example |label|\-|font| to |font|
+% since |label|\-|font| does not have any own definitions but shares
+% them with |font|.
+% \begin{macrocode}
+\newcommand*\caption@setmapping[2]{%
+ \@namedef{caption@map@#1}{#2}}
+\@onlypreamble\caption@setmapping
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@maparg}
+% \changes{v2.0}{2020/08/23}{This macro added}
+% |\caption@maparg|\marg{command}\marg{option}\\
+% similar to |\@dblarg| but either duplicates the given \meta{option} or
+% expands it to \meta{destination option} plus \meta{option} if a mapping
+% was defined for the given option (via |\caption@set|\-|mapping|).
+% \begin{macrocode}
+\newcommand*\caption@maparg[2]{%
+ \@ifundefined{caption@map@#2}%
+ {#1{#2}}%
+ {#1{\csname caption@map@#2\endcsname}}%
+ {#2}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@switchdefault}
+% \changes{v2.0}{2020/08/01}{This macro added}
+% |\caption@switchdefault\marg{option}|\marg{code with \#1}\marg{name}\\
+% like |\Set|\-|Caption|\-|Default| but first expands the given code with the
+% to-be-overwritten internal command as argument, so it can be stored (and
+% restored later on).
+% The main purpose of this command is switching default settings in
+% \package{babel} language packages, e.g.:
+% \begin{quote}|\caption@switchdefault{labelfont}{\babel@save #1}{sc}|\end{quote}
+% \begin{macrocode}
+\def\caption@switchdefault#1#2{%
+ \def\caption@tempa##1{#2}%
+ \expandafter\caption@tempa\csname caption@#1@default\endcsname
+ \caption@setdefault\def{#1}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@restoredefault}
+% \changes{v2.0}{2020/08/01}{This macro added}
+% |\caption@restoredefault\marg{option}|\marg{command}\\
+% restores a default setting which was stored to \meta{command} before
+% (via |\caption@switch|\-|default|).
+% \begin{macrocode}
+\def\caption@restoredefault#1#2{%
+ \caption@checkdecl{#1}{default}{%
+ \caption@ifdefined#2{%
+ \expandafter\let\csname caption@#1@default\endcsname#2%
+ \let#2\@undefined}{}}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@decl@package}
+% \changes{v2.0}{2020/07/26}{This macro added}
+% |\caption@decl@package|\marg{option}\marg{cmd}\oarg{package}\marg{name}\ldots\\
+% Helper command to declare a caption package option value which is dependent
+% on the existence of a specific package, for example the |font| value
+% |one|\-|half|\-|spacing| which is dependent on the \package{setspace}
+% package.
+% \begin{macrocode}
+\newcommand*\caption@decl@package[2]{%
+ \@ifnextchar[%]
+ {\caption@declare@package{#1}{#2}}%
+ {\caption@declarepackage{#1}{#2}}}
+\@onlypreamble\caption@decl@package
+% \end{macrocode}
+% \begin{macrocode}
+\def\caption@declare@package#1#2[#3]#4{%
+ \global\@namedef{caption@#1@#4@package}{#3}%
+ #2{#4}}
+\@onlypreamble\caption@declare@package
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\caption@declarepackage[3]{%
+ \global\@nameundef{caption@#1@#3@package}%
+ #2{#3}}
+\@onlypreamble\caption@declarepackage
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@load@package}
+% \changes{v2.0}{2020/07/26}{This macro added}
+% |\caption@load@package|\marg{option}\marg{value}\\
+% If the given option value needs a package, it will be loaded automatically.
+% \begin{macrocode}
+\newcommand*\caption@load@package[2]{%
+ \expandafter\let\expandafter\caption@tempa\csname caption@#1@#2@package\endcsname
+ \caption@ifdefined\caption@tempa
+ {\caption@requirepackage\caption@tempa{#1=#2}}%
+ {}}
+% \end{macrocode}
+% \end{macro}
+%
+% \section{Declaring and setting lengths}
+%
+% \begin{macro}{\DeclareCaptionLength}
+% \changes{v2.0}{2020/08/09}{This macro added}
+% |\DeclareCaptionLength|\marg{name}\marg{default value}\\
+% \begin{enumerate}
+% \item Defines a new length (dimension)
+% \item Installes a hook for |\caption@set|\-|default| so
+% |\caption@set|\-|default@length| will be used to set a default
+% value for this length
+% \item Sets a default value using |\Set|\-|Caption|\-|Default*|.
+% \end{enumerate}
+% \begin{macrocode}
+\newcommand*\DeclareCaptionLength[1]{%
+ \expandafter\newdimen\csname caption#1\endcsname
+ \@namedef{caption@setdefault@#1}##1{%
+ \caption@setdefault@length{##1}}%
+ \SetCaptionDefault*{#1}}
+\@onlypreamble\DeclareCaptionLength
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@setdefault@length}
+% \changes{v2.0}{2020/08/09}{This macro added}
+% |\caption@setdefault@length*|\marg{cmd}\marg{name}\marg{value}\\
+% sets a default value for the given \meta{length}, either using |\def|
+% (if the starred variant is used) or |\edef| (if the non-starred variant is
+% used).
+% \begin{macrocode}
+\newcommand*\caption@setdefault@length[3]{%
+ \expandafter#1\csname caption#2@default\endcsname{#3}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@setlength}
+% \changes{v2.0}{2020/08/09}{This macro added}
+% |\caption@setlength|\marg{name}\marg{value}\\
+% sets a length to either the given \meta{value} or to the default value if
+% \meta{value} is `default'.
+% \begin{macrocode}
+\newcommand*\caption@setlength[2]{%
+ \caption@ifdefault{#2}%
+ {\expandafter\let\expandafter\caption@tempa\csname caption#1@default\endcsname}%
+ {\def\caption@tempa{#2}}%
+ \expandafter\setlength\csname caption#1\endcsname\caption@tempa}
+% \end{macrocode}
+% \end{macro}
+%
% \section{Margin resp. width}
% \changes{v1.0n}{2007/04/01}{\cs{captionmarginx} renamed to \cs{captionmargin@}}
% \changes{v1.0n}{2007/04/03}{Option `twoside' added}
@@ -1128,17 +1393,17 @@
%
% \begin{macro}{\captionmargin}
% \begin{macro}{\captionwidth}
-% |\captionmargin| and |\captionwidth| contain the extra margin
-% resp. the total width used for captions. Please never set these values in
-% a direct way, they are just accessible in user documents to provide
-% compatibility to \version{1.x}.\par
-% Note that we can only set one value at a time, `margin' \emph{or} `width'.
-% If |\captionwidth| is not zero we will take this value afterwards,
-% otherwise |\captionmargin| and |\captionmargin@|.
-% \begin{macrocode}
-\newdimen\captionmargin
-\newdimen\captionmargin@
-\newdimen\captionwidth
+% |\captionmargin| and |\captionwidth| contain the extra margin
+% resp. the total width used for captions. Please never set these values in
+% a direct way, they are just accessible in user documents to provide
+% compatibility to \version{1.x} of the \package{caption} package.\par
+% Note that we can only set one value at a time, `margin' \emph{or} `width'.
+% If |\caption|\-|width| is not zero we will take this value afterwards,
+% otherwise |\caption|\-|margin| and |\caption|\-|margin@|.
+% \begin{macrocode}
+\DeclareCaptionLength{margin}{0pt}
+\DeclareCaptionLength{margin@}{\the\captionmargin}
+\DeclareCaptionLength{width}{0pt}
\newdimen\caption@tempdima
% \end{macrocode}
% \end{macro}
@@ -1159,6 +1424,7 @@
% \begin{macrocode}
\DeclareCaptionOption{twoside}[1]{\caption@set@bool\caption@iftwoside{#1}}
\DeclareCaptionOptionNoValue{oneside}{\caption@set@bool\caption@iftwoside0}
+\caption@set@bool\caption@iftwoside{\if@twoside 1\else 0\fi}
% \end{macrocode}
% \begin{macrocode}
\DeclareCaptionOption{minmargin}{\caption@setoptcmd\caption@minmargin{#1}}
@@ -1167,17 +1433,14 @@
%
% \begin{macro}{\setcaptionmargin}
% \changes{v1.0f}{2005/10/24}{Renamed from \cs{caption@setmargin} to \cs{setcaptionmargin}}
-% \changes{v1.0f}{2005/10/24}{\cs{setcaptionmargin} enhanced so it can take
-% left+right margin}
+% \changes{v1.0f}{2005/10/24}{\cs{setcaptionmargin} enhanced so it can take left+right margin}
% \changes{v1.1}{2007/08/11}{Starred variant added}
-% \changes{v1.1}{2007/08/12}{\cs{setlength}\cs{captionmargin} \&
-% \cs{setlength}\cs{captionmargin@} swapped so
-% `\texttt{margin*=}\cs{captionmargin}' works in singleline options}
+% \changes{v1.1}{2007/08/12}{\cs{setlength}\cs{captionmargin} \& \cs{setlength}\cs{captionmargin@} swapped so `\texttt{margin*=}\cs{captionmargin}' works in singleline options}
% \changes{v1.3}{2010/11/07}{Support for option \opt{calcmargin} added}
-% |\setcaptionmargin|\marg{amount}\\
-% |\setcaptionmargin*|\marg{amount}\par
-% Please never use this in user documents, it's just there to
-% provide compatibility to the \package{caption2} package.
+% |\setcaptionmargin*|\marg{amount}\\
+% sets the caption margin to the given \meta{amount}.
+% Please never use this in user documents, it's just there to
+% provide compatibility to the \package{caption2} package.
% \begin{macrocode}
\newcommand*\setcaptionmargin{%
\caption@resetcalcmargin
@@ -1194,8 +1457,8 @@
% \end{macrocode}
% \begin{macrocode}
\def\caption@@@setmargin#1,#2,#3\@nil{%
- \setlength\captionmargin@{#2}%
- \setlength\captionmargin{#1}%
+ \caption@setlength{margin}{#1}%
+ \caption@setlength{margin@}{#2}%
\addtolength\captionmargin@{-\captionmargin}}
% \end{macrocode}
% \end{macro}
@@ -1204,10 +1467,10 @@
% \changes{v1.0f}{2005/10/24}{Renamed from \cs{caption@setwidth} to \cs{setcaptionwidth}}
% \changes{v1.3}{2010/11/07}{Starred variant added}
% \changes{v1.3}{2010/11/07}{Support for option \opt{calcwidth} added}
-% |\setcaptionwidth|\marg{amount}\\
-% |\setcaptionwidth*|\marg{amount}\par
-% Please never use this in user documents, it's just there to
-% provide compatibility to the \package{caption2} package.
+% |\setcaptionwidth*|\marg{amount}\\
+% sets the caption width to the given \meta{amount}.
+% Please never use this in user documents, it's just there to
+% provide compatibility to the \package{caption2} package.
% \begin{macrocode}
\newcommand*\setcaptionwidth{%
\caption@resetcalcmargin
@@ -1220,20 +1483,16 @@
% \begin{macrocode}
\newcommand*\caption@@setwidth[2]{%
#1{\captionmargin\z@\captionmargin@\z@}%
- \setlength\captionwidth{#2}}%
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\caption@resetcalcmargin}
-% \changes{v1.3}{2010/11/07}{This macro added}
-% \begin{macrocode}
-\newcommand*\caption@resetcalcmargin{%
- \let\caption@calcmargin@hook\@empty}
+ \caption@setlength{width}{#2}}%
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\caption@setcalcmargin}
% \changes{v1.3}{2010/11/07}{This macro added}
+% |\caption@setcalcmargin*|\marg{amount}\\
+% sets the caption margin to the given \meta{amount}
+% right before the caption will be typeset, i.e.\meta{amount} will
+% not be evaluated immediately.
% \begin{macrocode}
\newcommand*\caption@setcalcmargin{%
\caption@teststar{\caption@@setcalcmargin\caption@setmargin}%
@@ -1247,8 +1506,22 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\caption@resetcalcmargin}
+% \changes{v1.3}{2010/11/07}{This macro added}
+% |\caption@resetcalcmargin|\\
+% clears the value which was stored in |\caption@set|\-|calc|\-|margin|.
+% \begin{macrocode}
+\newcommand*\caption@resetcalcmargin{%
+ \let\caption@calcmargin@hook\@empty}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\caption@setcalcwidth}
% \changes{v1.3}{2010/11/07}{This macro added}
+% |\caption@setcalcwidth*|\marg{amount}\\
+% sets the caption width to the given \meta{amount}
+% right before the caption will be typeset, i.e.\meta{amount} will
+% not be evaluated immediately.
% \begin{macrocode}
\newcommand*\caption@setcalcwidth{%
\caption@teststar{\caption@@setcalcmargin\caption@setwidth}%
@@ -1260,8 +1533,8 @@
% \changes{v1.0n}{2007/04/03}{This counter added}
% \changes{v1.1e}{2007/10/28}{Renamed to \cs{caption@thecounter}; \cs{caption@stepcounter} added}
% \changes{v1.5}{2012/04/09}{\cs{caption@stepcounter} renamed to \cs{caption@stepthecounter}}
-% Internal counter. At the moment it will be used inside
-% |\caption@ifoddpage| only.
+% Internal counter.
+% At the moment it will be used inside |\caption@if|\-|odd|\-|page| only.
% \begin{macrocode}
\newcommand*\caption@thecounter{0}
% \end{macrocode}
@@ -1275,10 +1548,11 @@
%
% \begin{macro}{\caption@newlabel}
% \changes{v1.0n}{2007/04/03}{This macro added}
-% This command is a modified version of |\newlabel| from \LaTeX2e.
-% It will be written to the \texttt{.aux} file to
-% pass label information from one run to another.
-% (We use it inside |\caption@ifoddpage| and |\caption@ragged|.)
+% |\caption@newlabel|\marg{name}\marg{value}\\
+% This command is a modified version of |\new|\-|label| from \LaTeX2e.
+% It will be written to the \texttt{.aux} file to
+% pass label information from one run to another.
+% (We use it inside |\caption@if|\-|odd|\-|page|.)
% \begin{macrocode}
\newcommand*\caption@newlabel{\@newl@bel{caption@r}}
% \end{macrocode}
@@ -1286,8 +1560,8 @@
%
% \begin{macro}{\caption@thepage}
% \changes{v1.0n}{2007/04/03}{This macro added}
-% This command is a modified version of |\thepage| from \LaTeX2e.
-% It will be used inside |\caption@ifoddpage| only.
+% This command is a modified version of |\the|\-|page| from \LaTeX2e.
+% It will be used inside |\caption@if|\-|odd|\-|page| only.
% \begin{macrocode}
\newcommand*\caption@thepage{\the\c@page}
% \end{macrocode}
@@ -1295,9 +1569,10 @@
%
% \begin{macro}{\caption@label}
% \changes{v1.1}{2007/09/01}{This macro added}
-% \changes{v1.2}{2007/12/03}{Definition of \cs{caption@newlabel} in AUX file added}
-% This command is a modified version of |\label| from \LaTeX2e.
-% It will be used inside |\caption@ifoddpage| and |\FP@helpNote|.
+% \changes{v1.2}{2007/12/03}{Definition of \cs{caption@newlabel} in aux file added}
+% |\caption@label|\marg{name}\\
+% This command is a modified version of |\label| from \LaTeX2e.
+% It will be used inside |\caption@if|\-|odd|\-|page| and |\FP@help|\-|Note|.
% \begin{macrocode}
\newcommand*\caption@label[1]{%
\caption@@label
@@ -1315,8 +1590,9 @@
% \begin{macro}{\caption@pageref}
% \changes{v1.1}{2007/09/01}{This macro added}
% \changes{v1.2d}{2009/10/09}{Uses \cs{@latex@warning} instead of \cs{caption@Warning} now}
-% This command is a modified version of |\pageref| from \LaTeX2e.
-% It will be used inside |\caption@ifoddpage| and |\FP@helpNote|.
+% |\caption@pageref|\marg{name}\\
+% This command is a modified version of |\page|\-|ref| from \LaTeX2e.
+% It will be used inside |\caption@if|\-|odd|\-|page| and |\FP@help|\-|Note|.
% \begin{macrocode}
\newcommand*\caption@pageref[1]{%
\expandafter\ifx\csname caption@r@#1\endcsname\relax
@@ -1331,11 +1607,13 @@
% \begin{macro}{\caption@ifoddpage}
% \changes{v1.0n}{2007/04/03}{This macro added}
% \changes{v1.1e}{2007/10/28}{Incrementation of counter moved to \cs{caption@@make}}
-% At the moment this macro uses an own label\ldots ref mechanism,
-% but an alternative implementation method would be using the
-% \package{refcount} package\cite{refcount} and |\ifodd\getpagerefnumber{|\ldots|}|.
-% \Note{This macro re-defines itself so the \texttt{.aux} file will
-% only be used once per group.}
+% Currently this macro uses an own label\ldots ref mechanism,
+% but an alternative implementation method would use the
+% \package{refcount} package\cite{refcount} and
+% |\ifodd\get|\-|page|\-|ref|\-|number{|\ldots|}|.
+% Maybe we will change that in a later release.
+% \Note{This macro re-defines itself so the \texttt{.aux} file will
+% only be used once per group.}
% \begin{macrocode}
\newcommand*\caption@ifoddpage{%
\caption@iftwoside{%
@@ -1355,7 +1633,9 @@
%
% \begin{macro}{\caption@setoptcmd}
% \changes{v1.1}{2007/08/11}{This macro added}
-% |\caption@setoptcmd|\marg{cmd}\marg{off -or- value}
+% |\caption@setoptcmd|\marg{command}\marg{off -or- value}\\
+% defines the given \meta{command} to \meta{value},
+% but if \meta{value} if `off' the given \meta{command} is undefined instead.
% \begin{macrocode}
\newcommand*\caption@setoptcmd[2]{%
\caption@ifinlist{#2}{0,false,no,off}{\let#1\@undefined}{\def#1{#2}}}
@@ -1368,41 +1648,39 @@
% \changes{v1.1}{2007/07/29}{Renamed from \cs{captionindent} to \cs{caption@indent}}
% \begin{macro}{\caption@parindent}
% \begin{macro}{\caption@hangindent}
-% These are the indentions we support.
+% These are the indentions we support.
% \begin{macrocode}
-\newdimen\caption@indent
-\newdimen\caption@parindent
-\newdimen\caption@hangindent
+\DeclareCaptionLength{@indent}{0pt}
+\DeclareCaptionLength{@parindent}{0pt}
+\DeclareCaptionLength{@hangindent}{0pt}
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
%
-% \changes{v1.0b}{2004/05/16}{Defaults added for options \opt{parindent=}
-% and \opt{hangindent=}}
-% \changes{v1.0f}{2005/08/22}{Option \opt{parskip=}: \cs{AtBeginCaption}
-% replaced by \cs{caption@@par}}
-% \changes{v1.0f}{2005/08/22}{Undocumented defaults for \opt{parindent=},
-% \opt{hangindent=}, and \opt{parskip=} removed}
+% \changes{v1.0b}{2004/05/16}{Defaults added for options \opt{parindent=} and \opt{hangindent=}}
+% \changes{v1.0f}{2005/08/22}{Option \opt{parskip=}: \cs{AtBeginCaption} replaced by \cs{caption@@par}}
+% \changes{v1.0f}{2005/08/22}{Undocumented defaults for \opt{parindent=}, \opt{hangindent=}, and \opt{parskip=} removed}
% \begin{macrocode}
-\DeclareCaptionOption{indent}[\leftmargini]{% obsolete!
- \setlength\caption@indent{#1}}
+\DeclareCaptionOption{indent}[\leftmargini]{% obsolete
+ \caption@setlength{@indent}{#1}}
\DeclareCaptionOption{indention}[\leftmargini]{%
- \setlength\caption@indent{#1}}
+ \caption@setlength{@indent}{#1}}
\DeclareCaptionOption{parindent}{%
- \setlength\caption@parindent{#1}}
+ \caption@setlength{@parindent}{#1}}
\DeclareCaptionOption{hangindent}{%
- \setlength\caption@hangindent{#1}}
+ \caption@setlength{@hangindent}{#1}}
\DeclareCaptionOption{parskip}{%
- \l@addto@macro\caption@@par{\setlength\parskip{#1}}}
+ \l@addto@macro\caption@@par{\setlength\parskip{#1}}}
% \end{macrocode}
%
% \section{Styles}
%
% \begin{macro}{\DeclareCaptionStyle}
-% \changes{v1.0a}{2004/01/17}{Pass through argument \#3 so extra spaces
-% between arguments do make any harm}
-% |\DeclareCaptionStyle|\marg{name}\oarg{single-line-list-of-KV}\marg{list-of-KV}
+% \changes{v1.0a}{2004/01/17}{Pass through argument \#3 so extra spaces between arguments do make any harm}
+% \changes{v2.0}{2019/09/10}{Uses \cs{caption@decl} now}
+% \changes{v2.0}{2020/07/27}{\cs{caption@sls} renamed to \cs{caption@slsty}}
+% |\DeclareCaptionStyle|\marg{name}\oarg{single-line-list-of-KV}\marg{list-of-KV}
% \begin{macrocode}
\newcommand*\DeclareCaptionStyle[1]{%
\@testopt{\caption@declarestyle{#1}}{}}
@@ -1410,8 +1688,16 @@
% \end{macrocode}
% \begin{macrocode}
\def\caption@declarestyle#1[#2]#3{%
- \global\@namedef{caption@sls@#1}{#2}%
- \global\@namedef{caption@sty@#1}{#3}}
+ \caption@decl{style}{#1}%
+ {\def\caption@slsty{#2}%
+ \def\caption@sty{#3}}%
+% \end{macrocode}
+% The \package{floatrow} package uses |\@if|\-|undefined{caption@sty@#1}| to
+% determine in |\flrow@set|\-|style| if a caption style is defined or not.
+% Since the \package{floatrow} package is unmaintained we fake the definition
+% so the test will still work.
+% \begin{macrocode}
+ \@namedef{caption@sty@#1}{\@unused}}
\@onlypreamble\caption@declarestyle
% \end{macrocode}
% \end{macro}
@@ -1427,58 +1713,55 @@
% \changes{v1.1}{2007/07/29}{Recursive style definitions should work now}
% \changes{v1.1d}{2007/10/23}{`SingleLine' renamed to `singleline' for consistency}
% \changes{v1.2}{2007/12/03}{Definition of \cs{caption@iftypewarning} removed}
-% |\caption@setstyle|\marg{name}\\
-% |\caption@setstyle*|\marg{name}\par
-% Selecting a caption style means saving the additional
-% \meta{single-line-list-of-KV} (this will be done by |\caption@sls|),
-% resetting the caption options to the base ones (this will be done using
-% |\caption@resetstyle|) and executing the \meta{list-of-KV} options
-% (this will be done using |\caption@setup|).\par
-% The starred version will give no error message if the given style is not
-% defined.
+% \changes{v2.0}{2019/09/10}{Uses \cs{caption@ifdecl} and \cs{caption@checkdecl} now}
+% |\caption@setstyle*|\marg{name}\\
+% Selecting a caption style means saving the additional
+% \meta{single-line-list-of-KV} (this will be done by |\caption@sl|\-|sty|),
+% resetting the caption options to the base ones (this will be done using
+% |\caption@reset|\-|style|) and executing the \meta{list-of-KV} options
+% (this will be done using |\caption@setup|).\par
+% The starred version will give no error message if the given style is not
+% defined.
% \begin{macrocode}
\newcommand*\caption@setstyle{%
- \caption@teststar\caption@@setstyle\@gobble\@firstofone}
+ \caption@teststar\caption@@setstyle\caption@ifdecl\caption@checkdecl}
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption@@setstyle[2]{%
- \@ifundefined{caption@sty@#2}%
- {#1{\caption@Error{Undefined style `#2'}}}%
- {\expandafter\let\expandafter\caption@sty\csname caption@sty@#2\endcsname
+ #1{style}{#2}%
+ {\caption@set{style}{#2}%
+ \caption@style % defines \caption@sty & \caption@slsty
\ifx\caption@setstyle@flag\@undefined
- \let\caption@setstyle@flag\relax
+ \let\caption@setstyle@flag\relax % prevent \caption@resetstyle if called recursively
\caption@resetstyle
\caption@xsetup\caption@sty
\let\caption@setstyle@flag\@undefined
\else
\caption@xsetup\caption@sty
- \fi
- \expandafter\let\expandafter\caption@sls\csname caption@sls@#2\endcsname
- \expandafter\caption@l@addto@list\expandafter\caption@opt@singleline
- \expandafter{\caption@sls}}}
+ \fi}%
+ {}}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\caption@resetstyle}
-% \changes{v1.1}{2007/02/04}{%
-% This macro renamed from \cs{caption@setdefault} to \cs{caption@resetstyle}}
+% \changes{v1.1}{2007/02/04}{This macro renamed from \cs{caption@setdefault} to \cs{caption@resetstyle}}
% \changes{v1.1d}{2007/10/23}{`SingleLine' renamed to `singleline' for consistency}
% \changes{v1.2}{2007/11/17}{Usage of \opt{size=} added}
% \changes{v1.2b}{2008/05/06}{Usage of \opt{rule} added}
% \changes{v1.5}{2012/03/15}{\opt{box=parbox} added}
% \changes{v1.6}{2013/05/01}{\opt{box=none} added, \opt{box=parbox} changed to \opt{parbox=parbox}}
-% This resets (nearly) all caption options to the base ones.
-% \emph{Note that this does not touch the skips and the positioning!}
+% |\caption@resetstyle|\\
+% This resets (nearly) all caption options to the base ones.
+% \emph{Note that this does not touch the skips and the positioning.}
% \begin{macrocode}
\newcommand*\caption@resetstyle{%
\caption@setup{%
box=none,boxcolor=white,parbox=parbox,%
format=plain,labelformat=default,labelsep=colon,textformat=simple,%
- justification=justified,font=,size=,labelfont=,textfont=,%
+ font=,labelfont=,textfont=,size=,%
+ justification=justified,slc,rule,strut,%
margin=0pt,minmargin=0,maxmargin=0,%
- indent=0pt,parindent=0pt,hangindent=0pt,%
- slc,rule,strut}%
- \caption@clearsetup{singleline}}
+ indent=0pt,parindent=0pt,hangindent=0pt}}
% \end{macrocode}
% \end{macro}
%
@@ -1488,31 +1771,69 @@
% \changes{v1.1c}{2007/10/14}{\opt{format=plain} removed from caption style \opt{default}}
% \changes{v1.5}{2012/03/15}{\opt{box=default} added to caption style \opt{default}}
% Currently there are two pre-defined styles, called `base' \& `default'.
-% The first one is a perfect match to the behavior of |\@makecaption| offered
-% by the standard \LaTeX\ document classes (and was called `default' in
-% \thispackage\ \version{1.0}), the second one matches the document
+% The first one is a perfect match to the behavior of |\@make|\-|caption|
+% offered by the standard \LaTeX\ document classes (and was called `default'
+% in \thispackage\ \version{1.0}), the second one matches the document
% class actually used.
% \begin{macrocode}
\DeclareCaptionStyle{base}[indent=0pt,justification=centering]{}
\DeclareCaptionStyle{default}[indent=0pt,justification=centering]{%
- box=default,format=default,labelsep=default,textformat=default,%
- justification=default,font=default,labelfont=default,textfont=default}
+ box=default,%
+ format=default,labelformat=default,labelsep=default,textformat=default,%
+ font=default,labelfont=default,textfont=default,size=default,%
+ justification=default,slc=default,margin=default,%
+ indent=default,parindent=default,hangindent=default}
% \end{macrocode}
%
+% \begin{macro}{\DeclareCaptionSinglelinecheck}
+% \changes{v2.0}{2019/09/10}{This macro added}
+% |\DeclareCaptionSinglelinecheck|\marg{name}\marg{code}
+% \begin{macrocode}
+\newcommand*\DeclareCaptionSinglelinecheck[2]{%
+ \caption@decl{singlelinecheck}{#1}{#2}}
+\@onlypreamble\DeclareCaptionSinglelinecheck
+% \end{macrocode}
+% \end{macro}
+%
% \changes{v1.2b}{2008/05/06}{Option \opt{slc=} added}
% \begin{macrocode}
-\DeclareCaptionOption{singlelinecheck}[1]{\caption@set@bool\caption@ifslc{#1}}
+\DeclareCaptionOption{singlelinecheck}[1]{\caption@setsinglelinecheck{#1}}
\DeclareCaptionOption{slc}[1]{\KV@caption@singlelinecheck{#1}}
% \end{macrocode}
%
+% These are the pre-defined single-line-check code snippets.
+% \begin{macrocode}
+\DeclareCaptionSinglelinecheck{on}{\@firstoftwo}
+\DeclareCaptionSinglelinecheck{off}{\@secondoftwo}
+% \end{macrocode}
+%
+% `default' usually maps to `on'.
+% \begin{macrocode}
+\SetCaptionDefault{singlelinecheck}{on}
+% \end{macrocode}
+%
+% \begin{macro}{\caption@setsinglelinecheck}
+% \changes{v2.0}{2018/03/13}{This macro added}
+% |\caption@setsinglelinecheck|\marg{value}\\
+% sets the single-line-check either on or off,
+% where \meta{value} could be either a \meta{name} or boolean value.
+% \begin{macrocode}
+\newcommand*\caption@setsinglelinecheck[1]{%
+ \caption@ifdecl{singlelinecheck}{#1}%
+ {\caption@set{singlelinecheck}{#1}}%
+ {\caption@set@bool\caption@singlelinecheck{#1}}}
+% \end{macrocode}
+% \end{macro}
+%
% \section{Boxes}
%
% \begin{macro}{\DeclareCaptionBox}
% \changes{v1.5}{2012/03/15}{This macro added}
-% |\DeclareCaptionBox|\marg{name}\marg{code with \#1 and \#2}
+% \changes{v2.0}{2019/09/10}{Uses \cs{caption@decl} now}
+% |\DeclareCaptionBox|\marg{name}\marg{code with \#1 and \#2}
% \begin{macrocode}
\newcommand*\DeclareCaptionBox[2]{%
- \global\long\@namedef{caption@box@#1}##1##2{#2}}
+ \caption@decl{box}{#1}##1##2{#2}}
\@onlypreamble\DeclareCaptionBox
% \end{macrocode}
% \end{macro}
@@ -1520,31 +1841,15 @@
% \changes{v1.5}{2012/03/15}{Option \opt{box=} added}
% \changes{v1.6}{2013/05/01}{Option \opt{parbox=} added}
% \begin{macrocode}
-\DeclareCaptionOption{box}{\caption@setbox{#1}}
-\DeclareCaptionOption{parbox}{\caption@set@box\caption@parbox{#1}}
+\DeclareCaptionOption{box}{\caption@set{box}{#1}}
+\DeclareCaptionOption{parbox}{\caption@set{parbox}{#1}}
+\caption@setmapping{parbox}{box}
% \end{macrocode}
%
-% \begin{macro}{\caption@setbox}
-% |\caption@setbox|\marg{name}\par
-% Selecting a caption box simply means saving the code (in |\caption@box|).
-% \begin{macrocode}
-\newcommand*\caption@setbox{%
- \caption@set@box\caption@box}
-% \end{macrocode}
-% \begin{macrocode}
-\newcommand*\caption@set@box[2]{%
- \@ifundefined{caption@box@#2}%
- {\caption@Error{Undefined box `#2'}}%
- {\expandafter\let\expandafter#1\csname caption@box@#2\endcsname}}
-% \end{macrocode}
-% \end{macro}
-%
% There are four pre-defined boxes, called `empty', `none',
% `parbox', and `colorbox'.
-% \changes{v1.0i}{2006/05/13}{We define \cs{captionbox} instead of
-% \cs{caption@start/endbox}}
-% \changes{v1.0l}{2006/03/09}{Bugfix 07-03-09: \cs{captionbox} changed from
-% \cs{parbox-t} to \cs{parbox-b}}
+% \changes{v1.0i}{2006/05/13}{We define \cs{captionbox} instead of \cs{caption@start/endbox}}
+% \changes{v1.0l}{2006/03/09}{Bugfix 07-03-09: \cs{captionbox} changed from \cs{parbox-t} to \cs{parbox-b}}
% \changes{v1.2}{2007/11/11}{\cs{captionbox} renamed to \cs{caption@parbox}}
% \changes{v1.5}{2012/03/15}{\cs{caption@parbox} adapted to \cs{DeclareCaptionBox}}
% \changes{v1.6}{2013/05/02}{Option \opt{boxsep=} added}
@@ -1552,34 +1857,34 @@
\DeclareCaptionBox{empty}{}
\DeclareCaptionBox{none}{#2}
\DeclareCaptionBox{parbox}{\parbox[b]{#1}{#2}}
-%\DeclareCaptionBox{colorbox}{%
-% \colorbox{\caption@boxcolor}{\caption@box@parbox{\dimexpr #1-2\fboxsep}{#2}}}
-\DeclareCaptionBox{colorbox}{\colorbox{\caption@boxcolor}{%
- \setlength\caption@tempdima{#1}%
- \addtolength\caption@tempdima{-2\fboxsep}%
- \linewidth\caption@tempdima
- \hsize\caption@tempdima
- #2}}
+\DeclareCaptionBox{colorbox}{%
+ \colorbox\caption@boxcolor{%
+ \setlength\caption@tempdima{#1}%
+ \addtolength\caption@tempdima{-2\fboxsep}%
+ \linewidth\caption@tempdima
+ \hsize\caption@tempdima
+ #2}}
\DeclareCaptionOption{boxcolor}{\def\caption@boxcolor{#1}}
\DeclareCaptionOption{boxsep}{\setlength\fboxsep{#1}}
% \end{macrocode}
%
-% `default' usually maps to `none`.
+% `default' usually maps to `none' resp.~`parbox'.
% \begin{macrocode}
-\def\caption@box@default{\caption@box@none}
+\SetCaptionDefault{box}{none}
+%\SetCaptionDefault{parbox}{parbox}
% \end{macrocode}
%
% \section{Formats}
%
% \begin{macro}{\DeclareCaptionFormat}
-% \changes{v1.0a}{2004/01/17}{Pass through argument \#3 so extra spaces
-% between arguments do make any harm}
+% \changes{v1.0a}{2004/01/17}{Pass through argument \#3 so extra spaces between arguments do make any harm}
% \changes{v1.0c}{2005/02/09}{Starred variant added}
% \changes{v1.1c}{2007/10/15}{Optional argument added}
-% |\DeclareCaptionFormat|\marg{name}\marg{code with \#1, \#2, and \#3}\\
-% |\DeclareCaptionFormat*|\marg{name}\marg{code with \#1, \#2, and \#3}\par
-% The starred form causes the code being typeset in vertical (instead of
-% horizontal) mode, but does not support the |indention=| option.
+% \changes{v2.0}{2019/09/10}{Uses \cs{caption@decl} now}
+% \changes{v2.0}{2020/07/27}{\cs{caption@ifh} renamed to \cs{caption@ifhmode}}
+% |\DeclareCaptionFormat*|\marg{name}\marg{code with \#1, \#2, and \#3}\\
+% The starred form causes the code being typeset in vertical (instead of
+% horizontal) mode, but does not support the |indention=| option.
% \begin{macrocode}
\newcommand*\DeclareCaptionFormat{%
\caption@teststar\caption@declareformat\@gobble\@firstofone}
@@ -1592,62 +1897,44 @@
% \end{macrocode}
% \begin{macrocode}
\long\def\caption@@declareformat#1#2[#3]#4{%
- \global\expandafter\let\csname caption@ifh@#2\endcsname#1%
- \global\long\@namedef{caption@slfmt@#2}##1##2##3{#3}%
- \global\long\@namedef{caption@fmt@#2}##1##2##3{#4}}
+ \caption@decl[\edef]{format}{#2}{%
+ \unexpanded{\let\caption@ifhmode#1}%
+ \unexpanded{\long\def\caption@slfmt}####1####2####3\unexpanded{{#3}}%
+ \unexpanded{\long\def\caption@fmt}####1####2####3\unexpanded{{#4}}}}
\@onlypreamble\caption@@declareformat
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\caption@useformat}
+% \changes{v2.0}{2020/07/31}{This macro added}
+% |\caption@useformat|\marg{name}\\
+% expands |\caption@fmt| based on the given format \meta{name}.
% \begin{macrocode}
-\DeclareCaptionOption{format}{\caption@setformat{#1}}
-% \end{macrocode}
-%
-% \begin{macro}{\caption@setformat}
-% |\caption@setformat|\marg{name}\par
-% Selecting a caption format simply means saving the code (in |\caption@fmt|)
-% and if the code should be used in horizontal or vertical mode (|\caption@ifh|).
-% \begin{macrocode}
-\newcommand*\caption@setformat[1]{%
- \@ifundefined{caption@fmt@#1}%
- {\caption@Error{Undefined format `#1'}}%
- {\expandafter\let\expandafter\caption@ifh\csname caption@ifh@#1\endcsname
- \expandafter\let\expandafter\caption@slfmt\csname caption@slfmt@#1\endcsname
- \expandafter\let\expandafter\caption@fmt\csname caption@fmt@#1\endcsname}}
+\newcommand*\caption@useformat[1]{% used by caption-koma.sto
+ \caption@checkdecl{format}{#1}{%
+ \begingroup
+ \@nameuse{caption@format@#1}\global\let\caption@tempa\caption@fmt
+ \endgroup\caption@tempa}}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\DeclareCaptionDefaultFormat}
-% \changes{v1.2a}{2008/01/31}{This macro added}
% \begin{macrocode}
-\newcommand*\DeclareCaptionDefaultFormat[1]{%
- \expandafter\def\expandafter\caption@fmt@default\expandafter
- {\csname caption@fmt@#1\endcsname}%
- \expandafter\def\expandafter\caption@slfmt@default\expandafter
- {\csname caption@slfmt@#1\endcsname}%
- \expandafter\def\expandafter\caption@ifh@default\expandafter
- {\csname caption@ifh@#1\endcsname}}
-\@onlypreamble\DeclareCaptionDefaultFormat
+\DeclareCaptionOption{format}{\caption@set{format}{#1}}
% \end{macrocode}
-% \end{macro}
%
-% \changes{v1.0a}{2004/01/23}{%
-% Caption format \opt{default} renamed to \opt{normal}}
-% \changes{v1.0e}{2005/05/12}{%
-% Caption format \opt{normal} renamed to \opt{@normal}}
-% \changes{v1.0f}{2005/08/25}{%
-% Caption format \opt{@normal} renamed to \opt{plain} and documented}
-% \changes{v1.1c}{2007/10/14}{%
-% Single-line variant of caption format \opt{hang} added}
+% \changes{v1.0a}{2004/01/23}{Caption format \opt{default} renamed to \opt{normal}}
+% \changes{v1.0e}{2005/05/12}{Caption format \opt{normal} renamed to \opt{@normal}}
+% \changes{v1.0f}{2005/08/25}{Caption format \opt{@normal} renamed to \opt{plain} and documented}
+% \changes{v1.1c}{2007/10/14}{Single-line variant of caption format \opt{hang} added}
% There are two pre-defined formats, called `plain' and `hang'.
% \begin{macrocode}
\DeclareCaptionFormat{plain}{#1#2#3\par}
% \end{macrocode}
% \begin{macrocode}
\DeclareCaptionFormat{hang}[#1#2#3\par]{%
- \caption@ifin@list\caption@lsepcrlist\caption@lsepname
+ \caption@iflabelseparatorwithnewline
{\caption@Error{%
- The option `labelsep=\caption@lsepname' does not work\MessageBreak
+ The option `labelsep=\caption@labelsep@name' does not work\MessageBreak
with `format=hang'}}%
{\@hangfrom{#1#2}%
\advance\caption@parindent\hangindent
@@ -1655,47 +1942,35 @@
\caption@@par#3\par}}
% \end{macrocode}
%
-% \changes{v1.0a}{2004/01/23}{Caption format \opt{default} linked to \opt{plain}}
-% \changes{v1.0d}{2005/04/28}{Bugfix 05-04-28: Missing \cs{caption@ifh@default} added}
% `default' usually maps to `plain'.
% \begin{macrocode}
-\DeclareCaptionDefaultFormat{plain}
+\SetCaptionDefault{format}{plain}
% \end{macrocode}
%
% \section{Label formats}
%
% \begin{macro}{\DeclareCaptionLabelFormat}
-% \changes{v1.0a}{2004/01/17}{%
-% Pass through argument \#2 so extra spaces between arguments do make any harm}
-% |\DeclareCaptionLabelFormat|\marg{name}\marg{code with \#1 and \#2}
+% \changes{v1.0a}{2004/01/17}{Pass through argument \#2 so extra spaces between arguments do make any harm}
+% \changes{v2.0}{2019/09/10}{Uses \cs{caption@decl} now}
+% |\DeclareCaptionLabelFormat|\marg{name}\marg{code with \#1 and \#2}
% \begin{macrocode}
\newcommand*\DeclareCaptionLabelFormat[2]{%
- \global\@namedef{caption@lfmt@#1}##1##2{#2}}
+ \caption@decl{labelformat}{#1}##1##2{#2}}
\@onlypreamble\DeclareCaptionLabelFormat
% \end{macrocode}
% \end{macro}
%
% \begin{macrocode}
-\DeclareCaptionOption{labelformat}{\caption@setlabelformat{#1}}
+\DeclareCaptionOption{labelformat}{\caption@set{labelformat}{#1}}
% \end{macrocode}
%
-% \begin{macro}{\caption@setlabelformat}
-% |\caption@setlabelformat|\marg{name}\par
-% Selecting a caption label format simply means saving the code (in |\caption@lfmt|).
-% \begin{macrocode}
-\newcommand*\caption@setlabelformat[1]{%
- \@ifundefined{caption@lfmt@#1}%
- {\caption@Error{Undefined label format `#1'}}%
- {\expandafter\let\expandafter\caption@lfmt\csname caption@lfmt@#1\endcsname}}
-% \end{macrocode}
-% \end{macro}
-%
% \changes{v1.2}{2007/12/16}{Caption label format \opt{brace} added}
% \changes{v1.7}{2015/09/16}{Caption label format \opt{autodot} added}
% \changes{v1.7}{2016/05/22}{Caption label format \opt{autodot} fixed}
% \changes{v1.8}{2016/05/22}{Caption label format \opt{unnumbered} added}
% There are six pre-defined label formats, called `empty', `simple',
% `parens', `brace', `autodot', and `unnumbered'.
+%
% \begin{macrocode}
\DeclareCaptionLabelFormat{empty}{}
\DeclareCaptionLabelFormat{simple}{\bothIfFirst{#1}{\nobreakspace}#2}
@@ -1705,63 +1980,120 @@
\DeclareCaptionLabelFormat{unnumbered}{#1}
% \end{macrocode}
%
-% `default' usually maps to `simple'.
+% \changes{v2.0}{2020/08/03}{Caption label format \opt{original} added}
+% The label format `original' tries to preserve the original definition
+% of the label format which was defined by |\fnum@|\meta{environment}.
+% If no original definition is available, use the label format `simple'
+% as fallback.
+%
+% \begin{macrocode}
+\DeclareCaptionLabelFormat{original}{%
+ \caption@ifdefined\caption@original@fnum
+ {\caption@original@fnum}%
+ {\caption@labelformat@simple{#1}{#2}}}
+% \end{macrocode}
+%
+% `default' usually maps to `original'.
% \begin{macrocode}
-\def\caption@lfmt@default{\caption@lfmt@simple}
+\SetCaptionDefault{labelformat}{original}
% \end{macrocode}
%
% \section{Label separators}
%
% \begin{macro}{\DeclareCaptionLabelSeparator}
-% \changes{v1.0a}{2004/01/17}{Pass through argument \#2 so extra spaces
-% between arguments do make any harm}
+% \changes{v1.0a}{2004/01/17}{Pass through argument \#2 so extra spaces between arguments do make any harm}
% \changes{v1.0f}{2005/08/25}{Starred variant added}
% \changes{v1.1}{2007/07/13}{Test for CR added}
% \changes{v1.3}{2011/08/06}{Test for CR revised}
-% |\DeclareCaptionLabelSeparator|\marg{name}\marg{code}\\
-% |\DeclareCaptionLabelSeparator*|\marg{name}\marg{code}\par
-% The starred form causes the label separator to be typeset \emph{without} using |\captionlabelfont|.
+% \changes{v2.0}{2018/05/15}{Variant with two stars added}
+% \changes{v2.0}{2019/09/10}{Uses \cs{caption@decl} now}
+% \changes{v2.0}{2020/07/27}{\cs{caption@iflf} renamed to \cs{caption@iflabelfont}}
+% \changes{v2.0}{2020/07/27}{\cs{caption@lsep} renamed to \cs{caption@labelsep}}
+% \changes{v2.0}{2020/07/27}{Definition of \cs{caption@labelsep@name} added}
+% |\DeclareCaptionLabelSeparator|\marg{name}\marg{code}\\
+% |\DeclareCaptionLabelSeparator*|\marg{name}\marg{code}\\
+% |\DeclareCaptionLabelSeparator**|\marg{name}\marg{condition}\marg{code}\\
+% The starred form causes the label separator to be typeset \emph{without}
+% using |\caption|\-|label|\-|font|.
+% The two-starred form uses \meta{condition} to decide if the label separator
+% should be typeset with or without using |\caption|\-|label|\-|font|.
% \begin{macrocode}
\newcommand\DeclareCaptionLabelSeparator{%
- \caption@teststar\caption@declarelabelseparator\@gobble\@firstofone}
+ \@ifstar
+ \DeclareCaptionLabelSeparator@
+ {\caption@declarelabelseparator\@firstofone}}
\@onlypreamble\DeclareCaptionLabelSeparator
% \end{macrocode}
% \begin{macrocode}
+\newcommand\DeclareCaptionLabelSeparator@{%
+ \@ifstar
+ \DeclareCaptionLabelSeparator@@
+ {\caption@declarelabelseparator\@gobble}}
+\@onlypreamble\DeclareCaptionLabelSeparator@
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\DeclareCaptionLabelSeparator@@[2]{%
+ \caption@declarelabelseparator
+ {#2\@gobble\@firstofone}%
+ {#1}}
+\@onlypreamble\DeclareCaptionLabelSeparator@@
+% \end{macrocode}
+% \begin{macrocode}
\newcommand\caption@declarelabelseparator[3]{%
- \global\@namedef{caption@iflf@#2}{#1}%
- \global\long\@namedef{caption@lsep@#2}{#3}%
- \caption@@declarelabelseparator{#2}#3\\\@nil}
-\@onlypreamble\caption@declarelabelseparator
+ \caption@decl{labelseparator}{#2}%
+ {\def\caption@iflabelfont{#1}%
+ \def\caption@labelsep@name{#2}%
+ \def\caption@labelsep{#3}}%
% \end{macrocode}
+% Unfortunately |\Declare|\-|Float|\-|Separators| of the \package{floatrow}
+% package mis-uses |\Declare|\-|Caption|\-|Label|\-|Separator| instead of
+% storing the definition on its own. Since the \package{floatrow} package is
+% unmaintained we have to store the separator definition inside
+% |\caption@lsep@|\meta{name} for \package{floatrow}, too. (Sigh!)
% \begin{macrocode}
-\long\def\caption@@declarelabelseparator#1#2\\#3\@nil{%
- \def\@tempa{#3}\ifx\@tempa\@empty \else
- \caption@g@addto@list\caption@lsepcrlist{#1}%
- \fi}
-\@onlypreamble\caption@@declarelabelseparator
+ \@namedef{caption@lsep@#2}{#3}}
+% \end{macrocode}
+% Since the `default' caption label separator will usually not be defined
+% with |\Declare|\-|Caption|\-|Label|\-|Separator|, we need to define
+% |\caption@lsep@default| manually.
+% \Note{This definition is used by \package{magyar.ldf} but only needs to be different
+% than \cs{caption@lsep} (which is usually undefined).}
+% \begin{macrocode}
+\newcommand*\caption@lsep@default{\caption@labelseparator@default\caption@labelsep}%
+% \end{macrocode}
+% \begin{macrocode}
+\@onlypreamble\caption@declarelabelseparator
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\caption@LabelSeparatorWithNewline}
+% \changes{v2.0}{2020/07/27}{This macro added}
+% |\caption@LabelSeparatorWithNewline|\marg{name}\\
+% adds the given label separator to a list of label separators which uses
+% |\\| internally. (They are incompatible to the `hang' caption format.)
% \begin{macrocode}
-\DeclareCaptionOption{labelsep}{\caption@setlabelseparator{#1}}
-\DeclareCaptionOption{labelseparator}{\caption@setlabelseparator{#1}}
+\newcommand*\caption@LabelSeparatorWithNewline[1]{%
+ \caption@g@addto@list\caption@labelsep@crlist{#1}}
+\@onlypreamble\caption@LabelSeparatorWithNewline
% \end{macrocode}
+% \end{macro}
%
-% \begin{macro}{\caption@setlabelseparator}
-% |\caption@setlabelseparator|\marg{name}\par
-% Selecting a caption label separator simply means saving the code (in |\caption@lsep|).
+% \begin{macro}{\caption@iflabelseparatorwithnewline}
+% \changes{v2.0}{2020/07/31}{This macro added}
+% |\caption@iflabelseparatorwithnewline|\marg{yes-code}\marg{no-code}\\
+% tests if the current label separator uses |\\| internally.
% \begin{macrocode}
-\newcommand*\caption@setlabelseparator[1]{%
- \@ifundefined{caption@lsep@#1}%
- {\caption@Error{Undefined label separator `#1'}}%
- {\edef\caption@lsepname{#1}%
- \expandafter\let\expandafter\caption@iflf\csname caption@iflf@#1\endcsname
- \expandafter\let\expandafter\caption@lsep\csname caption@lsep@#1\endcsname}}
+\newcommand*\caption@iflabelseparatorwithnewline{%
+ \caption@ifin@list\caption@labelsep@crlist\caption@labelsep@name}
% \end{macrocode}
% \end{macro}
%
-% \changes{v1.0e}{2005/06/11}{Bugfix 05-03-23: Caption label separator
-% \opt{newline} implementation changed from \cs{newline} to \cs{\textbackslash}}
+% \begin{macrocode}
+\DeclareCaptionOption{labelsep}{\caption@set{labelseparator}{#1}}
+\DeclareCaptionOption{labelseparator}{\caption@set{labelseparator}{#1}}
+% \end{macrocode}
+%
+% \changes{v1.0e}{2005/06/11}{Bugfix 05-03-23: Caption label separator \opt{newline} implementation changed from \cs{newline} to \cs{\textbackslash}}
% \changes{v1.0f}{2005/08/24}{Caption label separator \opt{endash} added}
% There are seven pre-defined label separators, called `none', `colon', `period', `space',
% `quad', `newline', and `endash'.
@@ -1772,71 +2104,44 @@
\DeclareCaptionLabelSeparator{space}{ }
\DeclareCaptionLabelSeparator*{quad}{\quad}
\DeclareCaptionLabelSeparator*{newline}{\captionnewline}
+\caption@LabelSeparatorWithNewline{newline} % does not work with "format=hang"
\DeclareCaptionLabelSeparator*{endash}{\space\textendash\space}
% \end{macrocode}
%
% \begin{macro}{\captionnewline}
% \changes{v1.12}{2020/05/30}{This macro added}
-% Will be used in the caption label separator |new|\-|line|,
-% and re-defined for |long|\-|table| environments.
+% \changes{v2.0}{2020/07/31}{\cs{relax} added to definition}
+% |\captionnewline|\\
+% will be used in the caption label separator |new|\-|line|,
+% and re-defined for |long|\-|table| environments
+% (in package \package{ltcaption}).
% \begin{macrocode}
-\newcommand*\captionnewline{\\}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\caption@setdefaultlabelsep}
-% \changes{v1.2d}{2009/03/29}{This macro added}
-% \begin{macrocode}
-\newcommand*\caption@setdefaultlabelsep[1]{%
- \ifx\caption@lsep\caption@lsep@default
- \caption@set@default@labelsep{#1}%
- \caption@setlabelseparator{default}%
- \else
- \caption@set@default@labelsep{#1}%
- \fi}
-% \end{macrocode}
-% \begin{macrocode}
-\newcommand*\caption@set@default@labelsep[1]{%
- \def\caption@lsep@default{\@nameuse{caption@lsep@#1}}%
- \def\caption@iflf@default{\@nameuse{caption@iflf@#1}}}
+\newcommand*\captionnewline{\\\relax}
% \end{macrocode}
% \end{macro}
%
% `default' usually maps to `colon'.
% \begin{macrocode}
-\caption@set@default@labelsep{colon}
+\SetCaptionDefault{labelseparator}{colon}
% \end{macrocode}
%
% \section{Text formats}
%
% \begin{macro}{\DeclareCaptionTextFormat}
% \changes{v1.0j}{2007/02/18}{This macro added}
-% |\DeclareCaptionTextFormat|\marg{name}\marg{code with \#1}
+% \changes{v2.0}{2019/09/10}{Uses \cs{caption@decl} now}
+% |\DeclareCaptionTextFormat|\marg{name}\marg{code with \#1}
% \begin{macrocode}
\newcommand*\DeclareCaptionTextFormat[2]{%
- \global\long\@namedef{caption@tfmt@#1}##1{#2}}
+ \caption@decl{textformat}{#1}##1{#2}}
\@onlypreamble\DeclareCaptionTextFormat
% \end{macrocode}
% \end{macro}
%
-% \changes{v1.0c}{2005/02/12}{Option \opt{strut=} added}
% \begin{macrocode}
-\DeclareCaptionOption{textformat}{\caption@settextformat{#1}}
-\DeclareCaptionOption{strut}[1]{\caption@set@bool\caption@ifstrut{#1}}
+\DeclareCaptionOption{textformat}{\caption@set{textformat}{#1}}
% \end{macrocode}
%
-% \begin{macro}{\caption@settextformat}
-% \changes{v1.0j}{2007/02/18}{This macro added}
-% |\caption@settextformat|\marg{name}\par
-% Selecting a caption text format simply means saving the code (in |\caption@tfmt|).
-% \begin{macrocode}
-\newcommand*\caption@settextformat[1]{%
- \@ifundefined{caption@tfmt@#1}%
- {\caption@Error{Undefined text format `#1'}}%
- {\expandafter\let\expandafter\caption@tfmt\csname caption@tfmt@#1\endcsname}}
-% \end{macrocode}
-% \end{macro}
-%
% There are three pre-defined text formats, called `empty', `simple' and `period'.
% \changes{v1.4}{2011/10/05}{Pre-defined text format `empty' added}
% \changes{v1.7}{2015/09/16}{The text format `empty' now takes care of the \cs{label}}
@@ -1848,9 +2153,9 @@
\long\def\caption@get@label#1\caption@makeanchor#2#3\@nil{%
\def\caption@tempa{#2}%
\ifx\caption@tempa\@empty
- \caption@getlabel#1\label{}\@nil
+ \caption@getlabel{#1}%
\else
- \caption@getlabel#2\label{}\@nil
+ \caption@getlabel{#2}%
\fi}
% \end{macrocode}
% \begin{macrocode}
@@ -1860,16 +2165,21 @@
%
% `default' usually maps to `simple'.
% \begin{macrocode}
-\def\caption@tfmt@default{\caption@tfmt@simple}
+\SetCaptionDefault{textformat}{simple}
% \end{macrocode}
%
% \begin{macro}{\caption@getlabel}
% \changes{v1.0}{2011/09/03}{\cs{label} can have optional arguments now}
% \changes{v1.7}{2015/09/16}{Moved from \package{bicaption} package to \package{caption3}}
% \changes{v1.8d}{2019/09/01}{Bugfix: Global definition of \cs{caption@thelabel} added}
-% Gets the label command out of the (first) caption text and stores it to |\caption@thelabel|.
-% \begin{macrocode}
-\long\def\caption@getlabel#1\label#2#3\@nil{%
+% \changes{v2.0}{2020/08/23}{Syntax changed}
+% |\caption@getlabel|\marg{text}\\
+% gets the label command out of the given caption text and stores it to
+% |\caption@the|\-|label|.
+% \begin{macrocode}
+\newcommand\caption@getlabel[1]{%
+ \caption@@getlabel#1\label{}\@nil}
+\long\def\caption@@getlabel#1\label#2#3\@nil{%
\def\@tempa{#2}%
\ifx\@tempa\@empty
\let\caption@thelabel\relax
@@ -1877,33 +2187,38 @@
\def\@tempb{*}%
\ifx\@tempa\@tempb
\def\caption@thelabel{\label*}%
- \caption@@getlabel#3\@nil
+ \caption@@@getlabel#3\@nil
\else
\def\caption@thelabel{\label}%
- \caption@@getlabel{#2}#3\@nil
+ \caption@@@getlabel{#2}#3\@nil
\fi
\fi}
% \end{macrocode}
% \begin{macrocode}
-\long\def\caption@@getlabel#1#2\@nil{%
+\long\def\caption@@@getlabel#1#2\@nil{%
\def\@tempa{#1}%
\def\@tempb{[}%
\ifx\@tempa\@tempb
- \caption@@@getlabel#1#2\@nil
+ \caption@@@@getlabel#1#2\@nil
\else
\l@addto@macro\caption@thelabel{{#1}}%
\fi}
% \end{macrocode}
% \begin{macrocode}
-\long\def\caption@@@getlabel[#1]#2\@nil{%
+\long\def\caption@@@@getlabel[#1]#2\@nil{%
\l@addto@macro\caption@thelabel{[{#1}]}%
- \caption@@getlabel#2\@nil}
+ \caption@@@getlabel#2\@nil}
% \end{macrocode}
% \begin{macrocode}
\let\caption@thelabel\relax
% \end{macrocode}
% \end{macro}
%
+% \changes{v1.0c}{2005/02/12}{Option \opt{strut=} added}
+% \begin{macrocode}
+\DeclareCaptionOption{strut}[1]{\caption@set@bool\caption@ifstrut{#1}}
+% \end{macrocode}
+%
% \section{Fonts}
%
% \begin{macro}{\DeclareCaptionFont}
@@ -1911,79 +2226,56 @@
% \changes{v1.1}{2007/05/07}{Internal: Uses \cs{caption@fnt} instead of \cs{caption@temp} now}
% \changes{v1.8h}{2020/01/03}{Check for \package{ragged2e} package related options added}
% \changes{v1.10}{2020/05/10}{Optional argument \opt{package} added}
-% |\DeclareCaptionFont|\oarg{package}\marg{name}\marg{code}
+% |\DeclareCaptionFont|\oarg{package}\marg{name}\marg{code}
% \begin{macrocode}
\newcommand*\DeclareCaptionFont{%
- \@ifnextchar[%]
- \caption@declare@font
- \caption@declarefont}
+ \caption@decl@package{font}{\caption@declarefont}}
\@onlypreamble\DeclareCaptionFont
% \end{macrocode}
% \begin{macrocode}
-\def\caption@declare@font[#1]#2{%
- \global\@namedef{caption@fnt@#2@package}{#1}%
- \caption@@declarefont{#2}}
-\@onlypreamble\caption@declare@font
+\newcommand*\caption@declarefont[2]{%
+ \caption@decl{font}{#1}##1{#2}%
+ \define@key{caption@font}{#1}[]{\caption@addto@font{#1}{##1}}}
+\@onlypreamble\caption@@declarefont
% \end{macrocode}
% \begin{macrocode}
-\newcommand*\caption@declarefont[1]{%
- \global\@nameundef{caption@fnt@#1@package}%
- \caption@@declarefont{#1}}
-\@onlypreamble\caption@declarefont
+\newcommand*\caption@addto@font[1]{%
% \end{macrocode}
% \begin{macrocode}
-\newcommand*\caption@@declarefont[2]{%
- \define@key{caption@fnt}{#1}[]{\caption@addto@fnt{#1}{#2}}%
- \caption@@@declarefont{#1}{#2}}
-\@onlypreamble\caption@@declarefont
+% Load package first, if necessary
+ \caption@load@package{font}{#1}%
% \end{macrocode}
+% Add the content to \cs{caption@fnt}
% \begin{macrocode}
-\newcommand*\caption@@@declarefont[2]{}% will be used by \DeclareCaptionJustification
-\@onlypreamble\caption@@@declarefont
+ \caption@add@to@font{font}{#1}}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*\caption@addto@fnt[2]{%
- \expandafter\let\expandafter\caption@package\csname caption@fnt@#1@package\endcsname
- \caption@ifdefined\caption@package
- {\caption@requirepackage\caption@package{#1}}% load package, if necessary
- {}%
- \l@addto@macro\caption@fnt{#2}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\DeclareCaptionDefaultFont}
-% \changes{v1.1}{2006/05/14}{This macro added}
-% \changes{v1.2a}{2008/01/31}{Renamed from \cs{DeclareDefaultCaptionFont} to \cs{DeclareCaptionDefaultFont}}
-% |\DeclareCaptionDefaultFont|\marg{name}\marg{code}
-% \begin{macrocode}
-\newcommand*\DeclareCaptionDefaultFont[2]{%
- \global\@namedef{caption#1@default}{#2}}
-\@onlypreamble\DeclareCaptionDefaultFont
+\newcommand*\caption@add@to@font[3]{%
+ \expandafter\g@addto@macro\expandafter\caption@fnt\expandafter{\csname caption@#1@#2\endcsname{#3}}}
% \end{macrocode}
% \end{macro}
%
% \begin{macrocode}
\DeclareCaptionOption{font}{\caption@setfont{font}{#1}}
\DeclareCaptionOption{font+}{\caption@addtofont{font}{#1}}
-\DeclareCaptionDefaultFont{font}{}
% \end{macrocode}
% \begin{macrocode}
\DeclareCaptionOption{labelfont}{\caption@setfont{labelfont}{#1}}
\DeclareCaptionOption{labelfont+}{\caption@addtofont{labelfont}{#1}}
-\DeclareCaptionDefaultFont{labelfont}{}
+\caption@setmapping{labelfont}{font}
% \end{macrocode}
% \begin{macrocode}
\DeclareCaptionOption{textfont}{\caption@setfont{textfont}{#1}}
\DeclareCaptionOption{textfont+}{\caption@addtofont{textfont}{#1}}
-\DeclareCaptionDefaultFont{textfont}{}
+\caption@setmapping{textfont}{font}
% \end{macrocode}
%
% \begin{macro}{\caption@setfont}
% \changes{v1.0j}{2007/01/30}{Usage of \cs{caption@setkeys} with optional argument}
% \changes{v1.1}{2006/05/14}{Support of \cs{DeclareDefaultCaptionFont} added}
-% |\caption@setfont|\marg{name}\marg{keyval-list of names}\par
-% Selecting a caption font means saving all the code snippets
-% in |\caption|\meta{name}.
+% |\caption@setfont|\marg{name}\marg{keyval-list of names}\\
+% Selecting a caption font means saving all the code snippets
+% in |\caption|\meta{name}.
% \begin{macrocode}
\newcommand*\caption@setfont[1]{%
\expandafter\let\csname caption#1\endcsname\@empty
@@ -1993,38 +2285,18 @@
%
% \begin{macro}{\caption@addtofont}
% \changes{v1.2}{2007/11/17}{This macro added}
-% |\caption@addtofont|\marg{name}\marg{keyval-list of names}\par
-% Like |\caption@setfont|, but adds the code snippets to |\caption|\meta{name}.\par
-% Because we use |\setkeys| recursive here we need to do this inside an
-% extra group.
+% |\caption@addtofont|\marg{name}\marg{keyval-list of names}\\
+% Like |\caption@set|\-|font|, but adds the code snippets to |\caption|\meta{name}.
+% Because we use |\set|\-|keys| recursive here we need to do this inside an
+% extra group.
% \begin{macrocode}
\newcommand*\caption@addtofont[2]{%
+ \expandafter\let\expandafter\caption@fnt\csname caption#1\endcsname
\begingroup
- \expandafter\let\expandafter\caption@fnt\csname caption#1\endcsname
- \define@key{caption@fnt}{default}[]{%
- \l@addto@macro\caption@fnt{\csname caption#1@default\endcsname}}%
- \caption@setkeys[caption]{caption@fnt}{#2}%
- \global\let\caption@tempa\caption@fnt
+ \define@key{caption@font}{default}[]{\caption@add@to@font{#1}{default}{##1}}%
+ \caption@setkeys[caption]{caption@font}{#2}%
\endgroup
- \expandafter\let\csname caption#1\endcsname\caption@tempa}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\caption@font}
-% \changes{v1.1}{2007/05/07}{This macro added}
-% |\caption@font|\marg{keyval-list of names}\\
-% |\caption@font*|\marg{keyval-code}\par
-% Sets the given font, e.g.~|\caption@font{small,it}|
-% is equivalent to |\small\itshape|.
-% \begin{macrocode}
-\newcommand*\caption@font{%
- \caption@teststar\caption@@font\@firstofone
- {\caption@setkeys[caption]{caption@fnt}}}
-\newcommand*\caption@@font[2]{%
- \begingroup
- \def\caption@fnt{\endgroup}%
- #1{#2}%
- \caption@fnt}
+ \expandafter\let\csname caption#1\endcsname\caption@fnt}
% \end{macrocode}
% \end{macro}
%
@@ -2063,7 +2335,31 @@
\DeclareCaptionFont{Huge}{\Huge}
% \end{macrocode}
%
-% \changes{v1.8}{2018/05/01}{Font size \texttt{smaller} added}
+% \changes{v1.8}{2018/05/01}{Font sizes \texttt{smaller} and \texttt{larger} added}
+% \begin{macrocode}
+\DeclareCaptionFont{smaller}{\caption@smaller}
+\DeclareCaptionFont{larger}{\caption@larger}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareCaptionFont{none}{}
+\DeclareCaptionFont{normal}{%
+ \caption@font@normalcolor\@unused
+ \caption@font@normalfont\@unused
+ \caption@font@normalsize\@unused
+ \caption@font@singlespacing\@unused}
+% \end{macrocode}
+%
+% `default' usually maps to `none'.
+% \begin{macrocode}
+\SetCaptionDefault{font}{none}
+\SetCaptionDefault{labelfont}{none}
+\SetCaptionDefault{textfont}{none}
+% \end{macrocode}
+%
+% \begin{macro}{\caption@smaller}
+% |\caption@smaller|\\
+% selects a font size which is smaller than the current one.
% \begin{macrocode}
\newcommand\caption@smaller{%
\ifx\@currsize\tiny
@@ -2091,10 +2387,12 @@
Cannot determine current font size.\MessageBreak
Try setting it with `size=' explicitly}%
\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}
-\DeclareCaptionFont{smaller}{\caption@smaller}
% \end{macrocode}
+% \end{macro}
%
-% \changes{v1.8}{2018/05/02}{Font size \texttt{larger} added}
+% \begin{macro}{\caption@larger}
+% |\caption@larger|\\
+% selects a font size which is larger than the current one.
% \begin{macrocode}
\newcommand\caption@larger{%
\ifx\@currsize\tiny
@@ -2122,23 +2420,20 @@
Cannot determine current font size.\MessageBreak
Try setting it with `size=' explicitly}%
\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}
-\DeclareCaptionFont{larger}{\caption@larger}
% \end{macrocode}
+% \end{macro}
%
+% \begin{macro}{\caption@hypersetup}
+% |\caption@hypersetup|\marg{options}\\
+% expands to |\hypersetup|\marg{options} if defined, to nothing otherwise.
% \begin{macrocode}
-\DeclareCaptionFont{singlespacing}{}
+\newcommand*\caption@hypersetup{\caption@ifdefined\hypersetup\hypersetup\@gobble}
+\DeclareCaptionFont{hypersetup}{\caption@hypersetup{#1}} % for usage in \captionsetup{font={hypersetup=...}}
+\DeclareCaptionOption{hypersetup}{\caption@hypersetup{#1}} % for usage in \captionsetup[<env>]{hypersetup=...}
% \end{macrocode}
+% \end{macro}
%
-% \begin{macrocode}
-%\DeclareCaptionFont{normal}{%
-% \caption@font{normalcolor,normalfont,normalsize,singlespacing}
-\DeclareCaptionFont{normal}{%
- \caption@font*{%
- \KV@caption@fnt@normalcolor\@unused
- \KV@caption@fnt@normalfont\@unused
- \KV@caption@fnt@normalsize\@unused
- \KV@caption@fnt@singlespacing\@unused}}
-% \end{macrocode}
+% \section{Sizes}
%
% \changes{v1.0a}{2004/01/23}{Option \opt{size=} now sets \cs{captionsize} instead of \cs{captionfont}}
% The old versions \version{1.x} of \thispackage\ offered this
@@ -2146,51 +2441,46 @@
% so old documents will work fine.
% \begin{macrocode}
\DeclareCaptionOption{size}{\caption@setfont{size}{#1}}
-\DeclareCaptionDefaultFont{size}{}
+\caption@setmapping{size}{font}
+% \end{macrocode}
+%
+% `default' usually maps to `none'.
+% \begin{macrocode}
+\SetCaptionDefault{size}{none}
% \end{macrocode}
%
% \section{Justifications}
%
% \begin{macro}{\DeclareCaptionJustification}
-% \changes{v1.0a}{2004/01/17}{Pass through argument \#2 so extra spaces
-% between arguments do make any harm}
+% \changes{v1.0a}{2004/01/17}{Pass through argument \#2 so extra spaces between arguments do make any harm}
% \changes{v1.1}{2007/07/03}{Mapped to \cs{DeclareCaptionFont}}
-% |\DeclareCaptionJustification|\marg{name}\marg{code}
+% \changes{v2.0}{2020/07/26}{Uses \cs{caption@decl} now}
+% |\DeclareCaptionJustification|\oarg{package}\marg{name}\marg{code}
% \begin{macrocode}
\newcommand*\DeclareCaptionJustification{%
- \def\caption@@@declarefont##1##2{%
- \global\@namedef{caption@hj@##1}{##2}% for compatibility to v1.0, needed by floatrow package
- \let\caption@@@declarefont\@gobbletwo}%
- \DeclareCaptionFont}
-\@onlypreamble\DeclareCaptionJustification
+% \caption@decl@package{justification}{\caption@decl{justification}}} % Because of floatrow it isn't so easy...
% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\DeclareCaptionDefaultJustification}
-% \changes{v1.1}{2007/07/03}{This macro added}
-% \changes{v1.2a}{2008/01/31}{Renamed from \cs{DeclareDefaultCaptionJustification} to \cs{DeclareCaptionDefaultJustification}}
-% |\DeclareCaptionDefaultJustification|\marg{code}
+% Unfortunately the (unmaintained) \package{floatrow} uses the old storage scheme
+% of the \package{caption} package and therefore expects the justification code
+% in |\caption@hj@|\meta{name} instead of |\caption@justification@|\meta{name}.
+% For this reason we have to store the code for the \package{floatrow} package
+% additionally, so |\flrow@FBo|\-|Align| will still work fine.
% \begin{macrocode}
-\newcommand*\DeclareCaptionDefaultJustification[1]{%
- \global\@namedef{caption@hj@default}{#1}% for compatibility to v1.0
- \DeclareCaptionDefaultFont{@hj}{#1}}
-\@onlypreamble\DeclareCaptionDefaultJustification
+ \caption@withoptargs\caption@declare@justification}
% \end{macrocode}
-% \end{macro}
-%
% \begin{macrocode}
-\DeclareCaptionOption{justification}{\caption@setjustification{#1}}
-\DeclareCaptionDefaultJustification{}
+\newcommand*\caption@declare@justification[3]{%
+ \caption@decl@package{justification}{\caption@decl{justification}}#1{#2}{#3}%
+ \expandafter\let\csname caption@hj@#2\expandafter\endcsname\csname caption@justification@#2\endcsname}
+\@onlypreamble\DeclareCaptionJustification
% \end{macrocode}
+% \end{macro}
%
-% \begin{macro}{\caption@setjustification}
-% \changes{v1.1}{2007/07/03}{Mapped to \cs{caption@setfont}}
-% |\caption@setjustification|\marg{name}\par
-% Selecting a caption justification simply means saving the code (in |\caption@hj|).
% \begin{macrocode}
-\newcommand*\caption@setjustification{\caption@setfont{@hj}}
+\DeclareCaptionOption{justification}{%
+ \caption@load@package{justification}{#1}%
+ \caption@set{justification}{#1}}
% \end{macrocode}
-% \end{macro}
%
% These are the pre-defined justification code snippets.
% \begin{macrocode}
@@ -2202,10 +2492,15 @@
\DeclareCaptionJustification{raggedright}{\raggedright}
% \end{macrocode}
%
+% `default' usually maps to `justified'.
+% \begin{macrocode}
+\SetCaptionDefault{justification}{justified}
+% \end{macrocode}
+%
% \begin{macro}{\centerfirst}
% \changes{v1.0j}{2007/01/21}{Bugfix: Usage of \cs{@centercr} added (Thanks to Olga!)}
% \changes{v1.0j}{2007/01/21}{This macro renamed from \cs{caption@centerfirst} to \cs{centerfirst}}
-% Please blame Frank Mittelbach for the code of |\centerfirst| |:-)|
+% Please blame Frank Mittelbach for the code of |\center|\-|first| |:-)|
% \begin{macrocode}
\providecommand\centerfirst{%
\let\\\@centercr
@@ -2224,7 +2519,7 @@
% \begin{macro}{\centerlast}
% \changes{v1.0j}{2007/01/21}{Bugfix: Usage of \cs{@centercr} added (Thanks to Olga!)}
% \changes{v1.0j}{2007/01/21}{This macro renamed from \cs{caption@centerlast} to \cs{centerlast}}
-% This is based on code from Anne Br\"uggemann-Klein\cite{Anne}
+% This one is based on code from Anne Br\"uggemann-Klein\cite{Anne}.
% \begin{macrocode}
\providecommand\centerlast{%
\let\\\@centercr
@@ -2238,8 +2533,8 @@
%
% \begin{macro}{\abovecaptionskip}
% \begin{macro}{\belowcaptionskip}
-% Usually these skips are defined within the document class, but some
-% document classes don't do so.
+% Usually these skips are defined within the document class, but some
+% document classes don't.
% \begin{macrocode}
\caption@ifundefined\abovecaptionskip{%
\newlength\abovecaptionskip\setlength\abovecaptionskip{10\p@}}{}
@@ -2258,8 +2553,8 @@
%
% \begin{macro}{\caption@rule}
% \changes{v1.2b}{2008/05/06}{This macro added}
-% |\caption@rule|\par
-% Draws an invisible rule to adjust the ``skip'' setting.
+% |\caption@rule|\\
+% Draws an invisible rule to adjust the ``skip'' setting.
% \begin{macrocode}
\newcommand*\caption@rule{\caption@ifrule\caption@hrule\relax}
% \end{macrocode}
@@ -2284,57 +2579,71 @@
% usually has to take care for himself that this hint actually matches the
% right position.
%
+% \begin{macro}{\caption@declare@position}
+% \changes{v2.0}{2020/07/26}{This macro added}
+% |\caption@declare@position|\marg{name}\marg{code}\\
+% declares a captionposition setting of the given \meta{name},
+% \meta{code} must either expand to |\@first|\-|of|\-|two| (top) or
+% |\@second|\-|of|\-|two| (below).
+% \begin{macrocode}
+\newcommand*\caption@declare@position[2]{%
+ \caption@decl{position}{#1}{#2}}
+\@onlypreamble\caption@declare@position
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macrocode}
\DeclareCaptionOption{position}{\caption@setposition{#1}}
% \end{macrocode}
% \changes{v1.0a}{2004/01/09}{Options \opt{figureposition} and \opt{tableposition} added}
% \begin{macrocode}
-\DeclareCaptionOption{figureposition}{%
- \captionsetup*[figure]{position=#1}}
+\DeclareCaptionOption{figureposition}{\captionsetup*[figure]{position=#1}}
\@onlypreamble@key{caption}{figureposition}
% \end{macrocode}
% \begin{macrocode}
-\DeclareCaptionOption{tableposition}{%
- \captionsetup*[table]{position=#1}}
+\DeclareCaptionOption{tableposition}{\captionsetup*[table]{position=#1}}
\@onlypreamble@key{caption}{tableposition}
% \end{macrocode}
%
% \begin{macro}{\caption@setposition}
-% \changes{v1.0a}{2004/01/22}{Now the positions \opt{t}, \opt{above}, \opt{b},
-% \opt{below}, and \opt{a} are allowed, too}
+% \changes{v1.0a}{2004/01/22}{Now the positions \opt{t}, \opt{above}, \opt{b}, \opt{below}, and \opt{a} are allowed, too}
% \changes{v1.0c}{2004/08/10}{Usage of \cs{caption@defaultpos} added}
-% |\caption@setposition|\marg{position}\par
-% Selecting the caption position means that we put |\caption@position| to
-% the right value. \emph{Please do \textbf{not} use the internal macro
-% \cs{caption@position} in your own package or document, but use the wrapper
-% macro \cs{caption@iftop} instead.}
-% \begin{macrocode}
-\newcommand*\caption@setposition[1]{%
- \caption@ifinlist{#1}{d,default}{%
- \let\caption@position\caption@defaultpos
- }{\caption@ifinlist{#1}{t,top,above}{%
- \let\caption@position\@firstoftwo
- }{\caption@ifinlist{#1}{b,bottom,below}{%
- \let\caption@position\@secondoftwo
- }{\caption@ifinlist{#1}{a,auto}{%
- \let\caption@position\@undefined
- }{%
- \caption@Error{Undefined position `#1'}%
- }}}}}
+% \changes{v2.0}{2020/07/27}{Uses \cs{caption@set} now}
+% |\caption@setposition|\marg{position}\\
+% puts |\caption@position| to the right value.
+% \emph{Please do \textbf{not} use the internal macro
+% \cs{caption@position} in your own package or document, but use the
+% wrapper command \cs{caption@iftop} instead.}\par
+% (Note: Since this command is used by the \package{floatrow} package as well
+% its syntax should not change.)
+% \begin{macrocode}
+\newcommand*\caption@setposition{\caption@set{position}}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\caption@defaultpos}
+% These are the pre-defined position code snippets.
+% \begin{macrocode}
+\caption@declare@position{t}{\@firstoftwo}
+\caption@declare@position{top}{\@firstoftwo}
+\caption@declare@position{above}{\@firstoftwo}
+\caption@declare@position{b}{\@secondoftwo}
+\caption@declare@position{bottom}{\@secondoftwo}
+\caption@declare@position{below}{\@secondoftwo}
+\caption@declare@position{a}{\caption@autoposition}% needed by floatrow package, \flrow@cappos
+\caption@declare@position{auto}{\caption@autoposition}
+% \end{macrocode}
+%
% \changes{v1.1}{2007/05/08}{Default position changed from `bottom' to `auto'}
-% The default `position' is `auto', this means that \thispackage\ will try
-% to guess the current position of the caption.
-% (But in many cases, for example in |longtable|s, this is doomed to fail!)\par
-% The setting `bottom' correspondents to the |\@makecaption| implementation
-% in the standard \LaTeX\ document classes, but `auto' should give better
-% results in most cases.
+% `default' usually maps to `auto'.
% \begin{macrocode}
-%\caption@setdefaultpos{a}% default = auto
-\let\caption@defaultpos\@undefined
+\SetCaptionDefault{position}{auto}
+% \end{macrocode}
+%
+% \begin{macro}{\caption@autoposition}
+% \changes{v2.0}{2020/07/27}{This macro added}
+% If in doubt, `position=auto' maps to `position=below'.
+% \begin{macrocode}
+\let\caption@autoposition\@secondoftwo
% \end{macrocode}
% \end{macro}
%
@@ -2342,70 +2651,51 @@
% \changes{v1.0a}{2004/01/23}{Split into \cs{caption@iftop} \& \cs{caption@fixposition}}
% \changes{v1.0c}{2005/02/12}{Adapted to \cs{caption@defaultpos}}
% \changes{v1.1}{2007/05/08}{Position will be fixed to `bottom' if `auto'}
-% |\caption@iftop|\marg{true-code}\marg{false-code}\par
-% (If the |position=| is set to |auto| we assume a |bottom| position here.)
+% \changes{v2.0}{2020/07/27}{Adapted to current implementation of `auto'}
+% |\caption@iftop|\marg{true-code}\marg{false-code}\\
+% Since version \version{2.0} this command is identical to |\caption@position|.
% \begin{macrocode}
-\newcommand*\caption@iftop{%
- \ifx\caption@position\@undefined
- \let\caption@position\@secondoftwo
-% = \caption@setposition b%
- \fi
- \caption@position}
+\newcommand*\caption@iftop{\caption@position}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\caption@fixposition}
-% \changes{v1.0b}{2004/05/16}{%
-% Split into \cs{caption@fixposition} & \cs{caption@autoposition}}
-% |\caption@fixposition|\par
-% This macro checks if the `position' is set to `auto'.
-% If yes, |\caption@autoposition| will be called to
-% set |\caption@position| to a proper value we can actually use.
+% \changes{v1.0a}{2004/01/23}{\cs{ifvmode} added}
+% \changes{v1.0b}{2004/05/16}{Split into \cs{caption@fixposition} & \cs{caption@autoposition}}
+% \changes{v2.0}{2020/07/27}{Adapted to current implementation of `auto'}
+% |\caption@fixposition|\\
+% We try to guess the current position of the caption by checking |\prev|\-|depth|.\par
+% A different solution would be setting the |\space|\-|factor| to something
+% not much less than 1000 (for example 994) in |\caption@start| and
+% checking this value here by |\ifnum\space|\-|factor=994|.
+% (It's implemented in the \package{threeparttable} package\cite{threeparttable} this way.)\par
+% Another idea would be checking |\@if|\-|mini|\-|page|, but since some packages
+% typeset the caption within a simple |\vbox| this does not seem to be a good one.
% \begin{macrocode}
\newcommand*\caption@fixposition{%
- \ifx\caption@position\@undefined
- \caption@autoposition
- \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\caption@autoposition}
-% \changes{v1.0a}{2004/01/23}{\cs{ifvmode} added}
-% |\caption@autoposition|\par
-% We guess the current position of the caption by checking |\prevdepth|.\par
-% A different solution would be setting the |\spacefactor| to something
-% not much less than 1000 (for example 994) in |\caption@start| and
-% checking this value here by |\ifnum\spacefactor=994|.
-% (It's implemented in the \package{threeparttable}
-% package\cite{threeparttable} this way.)\par
-% Another idea would be checking |\@ifminipage|, but since some packages
-% typeset the caption within a simple |\vbox| this does not seem to be a
-% good one.
-% \begin{macrocode}
-\newcommand*\caption@autoposition{%
\ifvmode
\edef\caption@tempa{\the\prevdepth}%
\caption@Debug{\protect\prevdepth=\caption@tempa}%
\ifdim\prevdepth>-\p@
- \let\caption@position\@secondoftwo
+ \let\caption@autoposition\@secondoftwo % position=below
\else
- \let\caption@position\@firstoftwo
+ \let\caption@autoposition\@firstoftwo % position=above
\fi
-% = \caption@setposition{\ifdim\prevdepth>-\p@ b\else t\fi}%
\else
\caption@Debug{no \protect\prevdepth}%
- \let\caption@position\@secondoftwo
-% = \caption@setposition b%
+ \let\caption@autoposition\@secondoftwo % position=below
\fi}
% \end{macrocode}
% \end{macro}
+%
% \begin{macro}{\caption@setautoposition}
% \changes{v1.1}{2007/06/10}{This macro added}
-% |\caption@setautoposition|\marg{position}\par
-% replaces the above algorithm by a different one (or a fixed position setting).
+% \changes{v2.0}{2020/07/27}{Adapted to current implementation of `auto'}
+% |\caption@setautoposition|\marg{position}\\
+% replaces the above algorithm by a different one (or a fixed position setting).
% \begin{macrocode}
\newcommand*\caption@setautoposition[1]{%
- \def\caption@autoposition{\caption@setposition{#1}}}
+ \def\caption@fixposition{\caption@@set{position}{autoposition}{#1}}}
% \end{macrocode}
% \end{macro}
%
@@ -2413,9 +2703,10 @@
%
% \begin{macro}{\AtBeginCaption}
% \begin{macro}{\AtEndCaption}
-% |\AtBeginCaption| \marg{code}\\
-% |\AtEndCaption| \marg{code}\par
-% These hooks can be used analogous to |\AtBeginDocument| and |\AtEndDocument|.
+% |\AtBeginCaption|\marg{code}\\
+% |\AtEndCaption|\marg{code}\\
+% These hooks can be used analogous to |\At|\-|Begin|\-|Document| and
+% |\At|\-|End|\-|Document|.
% \begin{macrocode}
\newcommand*\caption@beginhook{}
\newcommand*\caption@endhook{}
@@ -2436,10 +2727,14 @@
%
% \begin{macro}{\caption@setlist}
% \changes{v1.2a}{2008/03/20}{This macro added}
-% |\caption@setlist|\marg{boolean}
+% |\caption@setlist|\marg{boolean value}\\
+% sets the `list' option to either `off' or `on'.
% \begin{macrocode}
\newcommand*\caption@setlist{\caption@set@bool\caption@iflist}
% \end{macrocode}
+% \begin{macrocode}
+\caption@setlist{on}
+% \end{macrocode}
% \end{macro}
%
% \changes{v1.4}{2011/08/30}{Option \opt{listtype=} added}
@@ -2451,7 +2746,8 @@
%
% \begin{macro}{\caption@setlisttype}
% \changes{v1.4}{2011/08/30}{This macro added}
-% |\caption@setlisttype|\marg{type}
+% |\caption@setlisttype|\marg{type}\\
+% sets the `listtype' option to the given \meta{type}.
% \begin{macrocode}
\newcommand*\caption@setlisttype{%
\caption@setlisttype@ext{}%
@@ -2463,9 +2759,11 @@
\ifx#1\@empty \let#1\@undefined \fi}
% \end{macrocode}
% \end{macro}
+%
% \begin{macro}{\caption@setlisttype@ext}
% \changes{v1.4}{2011/08/30}{This macro added}
-% |\caption@setlisttype@ext|\marg{type extension}
+% |\caption@setlisttype@ext|\marg{type extension}\\
+% sets the `listtype' option to the given \meta{type extension}.
% \begin{macrocode}
\newcommand*\caption@setlisttype@ext{%
\caption@@setlisttype\caption@listtype@ext}
@@ -2475,10 +2773,11 @@
% \begin{macro}{\DeclareCaptionListFormat}
% \changes{v1.1}{2004/07/15}{This macro added}
% \changes{v1.2}{2007/11/17}{Renamed from \cs{DeclareCaptionListOfFormat} to \cs{DeclareCaptionListFormat}}
-% |\DeclareCaptionListFormat|\marg{name}\marg{code with \#1 and \#2}
+% \changes{v2.0}{2020/07/26}{Uses \cs{caption@decl} now}
+% |\DeclareCaptionListFormat|\marg{name}\marg{code with \#1 and \#2}
% \begin{macrocode}
\newcommand*\DeclareCaptionListFormat[2]{%
- \global\@namedef{caption@lstfmt@#1}##1##2{#2}}
+ \caption@decl{listformat}{#1}##1##2{#2}}
\@onlypreamble\DeclareCaptionListFormat
% \end{macrocode}
% \end{macro}
@@ -2486,53 +2785,33 @@
% \changes{v1.1}{2007/07/15}{Option \opt{listofformat=} added}
% \changes{v1.2}{2007/11/17}{Option \opt{listofformat=} renamed to \opt{listformat=}}
% \begin{macrocode}
-\DeclareCaptionOption{listformat}{\caption@setlistformat{#1}}
+\DeclareCaptionOption{listformat}{\caption@set{listformat}{#1}}
% \end{macrocode}
%
-% \begin{macro}{\caption@setlistformat}
-% \changes{v1.1}{2004/07/15}{This macro added}
-% \changes{v1.2}{2007/11/17}{Renamed from \cs{caption@setlistofformat} to \cs{caption@setlistformat}}
-% |\caption@setlistformat|\marg{name}\par
-% Selecting a caption list format simply means saving the code (in |\caption@lstfmt|).
-% \begin{macrocode}
-\newcommand*\caption@setlistformat[1]{%
- \@ifundefined{caption@lstfmt@#1}%
- {\caption@Error{Undefined list format `#1'}}%
- {\expandafter\let\expandafter\caption@lstfmt
- \csname caption@lstfmt@#1\endcsname}}
-% \end{macrocode}
-% \end{macro}
-%
-% There are five pre-defined list formats, taken from the \package{subfig} package.
+% There are seven pre-defined list formats. (The first five were taken from the \package{subfig} package.)
% \begin{macrocode}
\DeclareCaptionListFormat{empty}{}
\DeclareCaptionListFormat{simple}{#1#2}
-\DeclareCaptionListFormat{parens}{#1(#2)}
\DeclareCaptionListFormat{subsimple}{#2}
+\DeclareCaptionListFormat{parens}{#1(#2)}
\DeclareCaptionListFormat{subparens}{(#2)}
+\DeclareCaptionListFormat{period}{#1#2.}
+\DeclareCaptionListFormat{subperiod}{#2.}
% \end{macrocode}
%
-% \begin{macro}{\caption@setdefaultlistformat}
-% \changes{v1.2d}{2009/03/29}{This macro added}
-% \begin{macrocode}
-\newcommand*\caption@setdefaultlistformat[1]{%
- \ifx\caption@lstfmt\caption@lstfmt@default
- \caption@set@default@listformat{#1}%
- \caption@setlistformat{default}%
- \else
- \caption@set@default@listformat{#1}%
- \fi}
-% \end{macrocode}
+% `default' usually maps to `subsimple'.
% \begin{macrocode}
-\newcommand*\caption@set@default@listformat[1]{%
- \def\caption@lstfmt@default{\@nameuse{caption@lstfmt@#1}}}
+\SetCaptionDefault{listformat}{subsimple}
% \end{macrocode}
-% \end{macro}
%
-% `default' usually maps to `subsimple'.
+% \begin{macro}{\caption@lstfmt}
+% \changes{v2.0}{This macro added}
+% To provide backward compatibility we still offer \cs{caption@lstfmt}.
+% (\cs{caption@lstfmt} is used in the \package{dgruyter} package.)
% \begin{macrocode}
-\caption@set@default@listformat{subsimple}
+\newcommand*\caption@lstfmt{\caption@listformat}
% \end{macrocode}
+% \end{macro}
%
% \section{Debug option}
% \changes{v1.0k}{2007/03/04}{Debug option added}
@@ -2551,12 +2830,70 @@
\setkeys{caption}{debug=0}
% \end{macrocode}
%
-% \section{Document classes \& Babel support}
+% \section{Document class support}
+% \changes{v2.0}{2018/05/11}{Document class support re-written}
+%
+% \begin{macro}{\@makecaption@standard}
+% \begin{macrocode}
+% article|report|book.sty [2005/09/16 v1.4f Standard LaTeX document class]
+\newcommand\@makecaption@standard[2]{%
+ \vskip\abovecaptionskip
+ \sbox\@tempboxa{#1: #2}%
+ \ifdim \wd\@tempboxa >\hsize
+ #1: #2\par
+ \else
+ \global \@minipagefalse
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
+ \fi
+ \vskip\belowcaptionskip}
+\@onlypreamble\@makecaption@standard
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@makecaption@arabic}
+% \begin{macrocode}
+% arabicore.sty [2006/01/01 v1.0 Arabi Core switching commands (may still change)]
+\newcommand\@makecaption@arabic[2]{%
+ \vskip\abovecaptionskip
+ \sbox\@tempboxa{#1: #2}%
+ \sbox\@Arabitempboxa{\textRL{#2} : #1}%
+ \if@rl{
+ \ifdim \wd\@Arabitempboxa >\hsize
+ \textRL{#2} : #1\par
+ \else
+ \global \@minipagefalse
+ \hb@xt@\hsize{\hfil\box\@Arabitempboxa\hfil}%
+ \fi}\else{
+ \ifdim \wd\@tempboxa >\hsize
+ #1: #2\par
+ \else
+ \global \@minipagefalse
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
+ \fi}\fi
+ \vskip\belowcaptionskip}
+\@onlypreamble\@makecaption@arabic
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@makecaption@latvian}
+% \begin{macrocode}
+% latvian.ldf [2018/02/19 v2.0b Latvian support from the babel system]
+\newcommand\@makecaption@latvian[2]{%
+ \vskip10\p@
+ \sbox\@tempboxa{#1\if\empty#2\else: #2\fi}%
+ \ifdim\wd\@tempboxa>\hsize
+ #1: #2\par
+ \else
+ \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \fi}
+\@onlypreamble\@makecaption@latvian
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\caption@ifdocumentclass}
-% Boolean switch which is set if the document class could be detected successfully,
-% i.e. |\caption@document|\-|class| is set to a proper value.
-% (If |\caption@document|\-|class| is already set, this flag will also be set.)
+% Boolean switch which is set if the document class could be detected
+% successfully, i.e. |\caption@document|\-|class| is set to a proper value.
+% (If |\caption@document|\-|class| is already set, this flag will also be set.)
% \begin{macrocode}
\caption@setbool{documentclass}{1}
% \end{macrocode}
@@ -2564,8 +2901,8 @@
%
% \begin{macro}{\caption@documentclass}
% \changes{v1.8e}{2018/05/11}{This macro added}
-% Determine document class used.
-% Set |\caption@document|\-|class| by good-guessing, if not already set.
+% Determine document class used.
+% Set |\caption@document|\-|class| by good-guessing, if not already set.
% \begin{macrocode}
\caption@ifundefined\caption@documentclass{%
% \end{macrocode}
@@ -2589,19 +2926,19 @@
\caption@InfoNoLine{KOMA-Script document class detected}%
\def\caption@documentclass{koma}%
% \end{macrocode}
-% If |\@captionheadfont| is defined, we assume it's a AMS or SMF document class.
+% If |\@captionheadfont| is defined, we assume it's a AMS or SMF document class.
% \begin{macrocode}
}{\caption@ifdefined\@captionheadfont{%
\caption@InfoNoLine{AMS or SMF document class detected}%
- \def\caption@documentclass{ams}%
+ \def\caption@documentclass{ams-smf}%
% \end{macrocode}
-% If |\@CaptionFonts| is defined, we assume it's a NTG Dutch document class.
+% If |\CaptionFonts| is defined, we assume it's a NTG Dutch document class.
% \begin{macrocode}
}{\caption@ifdefined\CaptionFonts{%
\caption@InfoNoLine{NTG document class detected}%
\def\caption@documentclass{ntg}%
% \end{macrocode}
-% If |\cph@font| and |\cpb@font| are defined, we assume it's a NTG Dutch document class.
+% If |\cph@font| and |\cpb@font| are defined, we assume it's the thesis document class.
% \begin{macrocode}
}{\caption@ifdefined\cph@font{%
\caption@ifdefined\cpb@font\@firstoftwo\@secondoftwo
@@ -2612,453 +2949,376 @@
\def\caption@documentclass{thesis}%
}{%
% \end{macrocode}
-% If the definition of |\@makecaption| matches the one from the standard \LaTeX\ document classes
-% |article|, |report|, or |book|, we assume it's either one of them or is compatible to them.
+% If the definition of |\@make|\-|caption| matches the one from the standard
+% \LaTeX\ document classes |article|, |report|, or |book|, we assume it's
+% either one of them or is compatible to them.
% \begin{macrocode}
- % article|report|book [2005/09/16 v1.4f Standard LaTeX document class]
- \long\def\caption@tempa#1#2{%
- \vskip\abovecaptionskip
- \sbox\@tempboxa{#1: #2}%
- \ifdim \wd\@tempboxa >\hsize
- #1: #2\par
- \else
- \global \@minipagefalse
- \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
- \fi
- \vskip\belowcaptionskip}}
- \ifx\caption@tempa\@makecaption
- \caption@InfoNoLine{Standard document class detected}%
+ \ifx\@makecaption\@undefined
+ \caption@InfoNoLine{Document class w/o caption stuff detected}%
\else
+ \ifx\@makecaption\@makecaption@standard
+ \caption@InfoNoLine{Standard document class detected}%
+ \else
+ \ifx\@makecaption\@makecaption@arabic
+ \caption@InfoNoLine{arabic babel option detected}%
+ \else
+ \ifx\@makecaption\@makecaption@latvian
+ \caption@InfoNoLine{latvian babel option detected}%
+ \else
% \end{macrocode}
-% Otherwise we are clueless and use standard default settings for the captions anyway.
-% (And we unset the |document|\-|class| flag to indicate that the content of |\caption@document|\-|class| is not correct.)
+% Otherwise we are clueless and use standard default settings for the captions.
+% (And we unset the |document|\-|class| flag to indicate that the content of
+% |\caption@document|\-|class| is not correct.)
% \begin{macrocode}
- \caption@InfoNoLine{%
- Unknown document class (or package),\MessageBreak
- standard defaults will be used}%
- \caption@InfoNoLine{\string\@makecaption\space=\space\meaning\@makecaption\@gobble}%
- \caption@setbool{documentclass}{0}%
+ \caption@InfoNoLine{%
+ Unknown document class (or package),\MessageBreak
+ standard defaults will be used}%
+ \caption@InfoNoLine{\string\@makecaption\space=\space\meaning\@makecaption\@gobble}%
+ \caption@setbool{documentclass}{0}% unknown document class
+ \fi
+ \fi
+ \fi
\fi
- \def\caption@documentclass{base}%
- }}}}}}%
-}{}
% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\caption@ifclassloaded}
-% \changes{v1.8e}{2019/09/09}{This macro added}
-% |\caption@ifclassloaded|\marg{name}\marg{yes-code}\marg{no-code}
% \begin{macrocode}
-\newcommand*\caption@ifclassloaded[1]{%
- \edef\caption@tempa{#1}%
- \ifx\caption@tempa\caption@documentclass
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi}
+ \let\caption@documentclass\@empty % don't load adaption code later on
+ }}}}}}}%
+}{}
% \end{macrocode}
% \end{macro}
%
-% \subsection{The standard \texorpdfstring{\LaTeX{}}{LaTeX} classes}
-%
-% Since this is the default, there is no extra work to be done here.
-%
-% \subsection{The elsarticle classes}
-% \changes{v1.5}{2013/01/06}{elsarticle class support added}
-%
+% \begin{macro}{\AtCaptionPackage}
+% \changes{v2.0}{2018/05/14}{This macro added}
+% |\AtCaptionPackage|\marg{code}\\
+% can be used by the document class adaption packages to execute extra code
+% if the \package{caption} package is loaded (later on).
% \begin{macrocode}
-\caption@ifclassloaded{elsarticle}{%
+\newcommand*\AtCaptionPackage{%
+ \g@addto@macro\caption@documentclass@code}
+\@onlypreamble\AtCaptionPackage
% \end{macrocode}
% \begin{macrocode}
- \DeclareCaptionDefaultFont{font}{\footnotesize}
+\providecommand*\caption@documentclass@code{}
+\@onlypreamble\caption@documentclass@code
% \end{macrocode}
+% \end{macro}
+%
+% \section{Babel support}
+%
+% \begin{macro}{\caption@IfBabelPackageLoaded}
+% |\caption@IfBabelPackageLoaded|\marg{option}\marg{cmd}\marg{yes-code}\marg{no-code}\\
+% expands the given \meta{yes-code} if |\caption@if|\-|babel@|\meta{option}
+% is set and \meta{cmd} is defined.
+% Otherwise the \meta{no-code} is expanded.\par
+% This way the adaption could be prevented by defining
+% \begin{quote}|\def\caption@ifbabel@|\meta{option}|{false}|\end{quote}
% \begin{macrocode}
-}{}
+\newcommand*\caption@IfBabelPackageLoaded[4]{%
+ \caption@ifdefined#2\@firstofone\caption@AtBeginDocument{%
+ \caption@if@bool{\@nameuse{caption@ifbabel@#1}}%
+ {\def\caption@tempa{\caption@ifdefined#2}}%
+ {\let\caption@tempa\@secondoftwo}%
+ \caption@tempa
+ {\caption@InfoNoLine{#1 babel package is loaded}#3}%
+ {#4}}}
+\@onlypreamble\caption@IfBabelPackageLoaded
% \end{macrocode}
+% \end{macro}
%
-% \subsection{The \AmS{} \& \SmF{} classes}
-% \changes{v1.1}{2007/07/29}{\AmS\ \& \SmF\ classes support added}
+% \subsection{The arabic \& farsi babel option}
+% \changes{v1.8}{2018/05/20}{\package{arabic} babel support added}
+% \changes{v2.0}{2020/08/02}{\package{arabic} babel support updated}
+% \changes{v2.0}{2020/08/02}{\package{farsi} babel support added}
%
% \begin{macrocode}
-\caption@ifclassloaded{ams}{%
+\DeclareCaptionLabelSeparator{arabi}{\if@rl\space\fi: }
% \end{macrocode}
+%
+% \begin{macro}{\caption@IfBabelArabi}
+% |\caption@IfBabelArabic|\marg{yes-code}\marg{no-code}
% \begin{macrocode}
- \let\captionmargin\captionindent % set to 3pc by AMS class
- \begingroup\edef\@tempa{\endgroup
- \noexpand\caption@g@addto@list\noexpand\caption@sty@default
- {margin=\the\captionmargin
- \caption@ifdefined\smf@makecaption{,maxmargin=.1\linewidth}{}}}
- \@tempa
- \caption@g@addto@list\caption@sls@default{margin*=.5\captionmargin}
- \DeclareCaptionLabelSeparator{default}{.\enspace}
- \DeclareCaptionDefaultFont{font}{\@captionfont}
- \DeclareCaptionDefaultFont{labelfont}{\@captionheadfont}
- \DeclareCaptionDefaultFont{textfont}{\@captionfont\upshape}
- \captionsetup[figure]{position=b}
- \captionsetup[table]{position=t}
+\newcommand*\caption@IfBabelArabi{%
+ \caption@IfBabelPackageLoaded{arabi}{\ArabiCoreLoaded}}
+\@onlypreamble\caption@IfBabelArabi
% \end{macrocode}
% \begin{macrocode}
-}{}
+\providecommand*\caption@ifbabel@arabi{true}
% \end{macrocode}
-%
-% \subsection{The beamer class (Part one)}
-% \changes{v1.1}{2007/03/10}{\package{beamer} class support added}
-% \changes{v1.3}{2011/08/06}{\package{beamer} class support revised}
-% \changes{v1.5}{2013/04/27}{The \package{beamer} template \texttt{caption label separator} will be used now}
-% \changes{v1.7}{2016/05/22}{Re-definition of label format \texttt{simpleMagyar} added to \package{beamer} class support}
-% \changes{v1.7}{2018/04/15}{Re-definition of label format \texttt{simpleMagyar} revised}
-% \changes{v1.7}{2018/05/01}{Definition of \package{beamer} default label font revised}
+% \end{macro}
%
% \begin{macrocode}
-\caption@ifclassloaded{beamer}{%
+\caption@IfBabelArabi{%
% \end{macrocode}
%
-% \begin{macro}{\caption@ifbeamertemplate}
-% |\caption@ifbeamertemplate|\marg{caption template name}\marg{yes-code}\marg{no-code}\\
-% tests if the given beamer caption template was selected by the user (or not).
+% \begin{macro}{\caption@rl}
+% \changes{v1.8}{2018/05/20}{This macro added}
% \begin{macrocode}
- \newcommand*\caption@ifbeamertemplate[1]{%
- \begingroup
- \let\beamer@@tmpl@caption@ORI\beamer@@tmpl@caption
- \@nameuse{beamer@@tmpop@caption@#1}%
- \ifx\beamer@@tmpl@caption@ORI\beamer@@tmpl@caption
- \endgroup\expandafter\@firstoftwo
- \else
- \endgroup\expandafter\@secondoftwo
- \fi}
+ \newcommand\caption@rl[1]{\if@rl\textRL{#1}\else\textLR{#1}\fi}%
% \end{macrocode}
% \end{macro}
%
+% If the language `arabic' or `farsi' is selected, we switch the default label separator to `arabi'.
+%
% \begin{macrocode}
- \DeclareCaptionLabelFormat{default}{%
- \caption@ifbeamertemplate{numbered}%
- \caption@lfmt@simple
- \caption@lfmt@unnumbered
- {#1}{#2}}
-% \end{macrocode}
-% The \package{magyar} babel package redefines the current label format to a one called |simple|\-|Magyar|,
-% defined within |\@@magyar@caption|\-|fix| which will be executed |\At|\-|Begin|\-|Document|.
-% \begin{macrocode}
- \DeclareCaptionLabelFormat{default@magyar}{%
- \caption@ifbeamertemplate{numbered}%
- \caption@lfmt@simple@magyar
- \caption@lfmt@unnumbered
- {#1}{#2}}
- \@ifundefined{@@magyar@captionfix}\AtBeginDocument\@firstofone{%
- \@ifundefined{@@magyar@captionfix}{}{%
- \g@addto@macro\@@magyar@captionfix{%
- \let\caption@lfmt@simple@magyar\caption@lfmt@simpleMagyar
- \let\caption@lfmt@simpleMagyar\caption@lfmt@default@magyar}}}
+ \caption@ifdefined\extrasarabic{%
+ \addto\extrasarabic{%
+ \caption@switchdefault{labelseparator}{\babel@save #1}{arabi}}}{}%
+ \caption@ifdefined\extrasfarsi{%
+ \addto\extrasfarsi{%
+ \caption@switchdefault{labelseparator}{\babel@save #1}{arabi}}}{}%
% \end{macrocode}
+%
% \begin{macrocode}
- \caption@declarelabelseparator
- {\caption@ifbeamertemplate{caption name own line}\@gobble\@firstofone}
- {default}
- {\caption@ifbeamertemplate{caption name own line}{\\}%
- {\usebeamertemplate{caption label separator}}}
- \DeclareCaptionDefaultFont{font}{%
- \usebeamerfont*{caption}%
- \usebeamercolor[fg]{caption}}
- \DeclareCaptionDefaultFont{labelfont}{%
- \setbeamercolor*{caption}{}% avoid setting "caption" color additionally
- \usebeamercolor[fg]{caption name}%
- \setbeamerfont*{caption}{}% avoid setting "caption" font additionally
- \usebeamerfont{caption name}}
- \DeclareCaptionDefaultJustification{\raggedright}
+}{%
+ \let\caption@rl\@firstofone
+}
% \end{macrocode}
+%
+% \subsection{The french babel option}
+% \changes{v1.1}{2006/05/14}{\package{frenchb} babel support added}
+% \changes{v2.0}{2020/08/01}{\package{french} babel support updated}
+%
+% We provide a dummy `french' caption label separator (so |labelsep=french| works fine);
+% it will be re-defined dependant on the `french' package used later on.
% \begin{macrocode}
- \DeclareOption{beamerclass}{%
- \renewcommand\caption@ifslc{%
- \caption@ifbeamertemplate{caption name own line}\@secondoftwo\@firstoftwo}
- % Since the beamer class do not offer a `list of figures' we switch this support off.
- \captionsetup{list=0}}
- \PassOptionsToPackage{beamerclass}{caption3}
+\caption@ifdecl{labelseparator}{french}
+ {\let\caption@french@labelseparator\@undefined}%
+ {\caption@@set{labelseparator}{labelseparator@french}{default}%
+ \let\caption@french@labelseparator\caption@labelseparator@french}
% \end{macrocode}
%
-% If the \package{beamer} document class is used, we offer a beamer
-% template called `caption3' which can be used with option `beamer' or
-% |\setbeamertemplate{caption}[caption3]|.\par
-% (Note that this is of no use when the \package{caption} package is used, too.)
+% \begin{macro}{\caption@IfBabelFrench}
+% |\caption@IfBabelFrench|\marg{yes-code}\marg{no-code}
% \begin{macrocode}
- \defbeamertemplate{caption}{caption3}{%
- \caption@make\insertcaptionname\insertcaptionnumber\insertcaption}
+\newcommand*\caption@IfBabelFrench{%
+ \caption@IfBabelPackageLoaded{french}{\FB@makecaption}}
+\@onlypreamble\caption@IfBabelFrench
% \end{macrocode}
% \begin{macrocode}
- \DeclareOption{beamer}{%
- % \usebeamertemplate**{caption} will set font
- \DeclareCaptionDefaultFont{font}{}%
- \setbeamertemplate{caption}[caption3]}
+\providecommand*\caption@ifbabel@french{true}
% \end{macrocode}
-% \begin{macrocode}
+% \end{macro}
%
-% \begin{macrocode]
-}{}
+% \begin{macrocode}
+\caption@IfBabelFrench{%
% \end{macrocode}
%
-% \subsection{The KOMA-Script classes}
-% \changes{v1.1}{2007/03/31}{\KOMAScript\ classes support added}
+% If the language `french' is selected, we switch the default label separator to `french'
+% which uses |\if|\-|FB|\-|Customise|\-|Fig|\-|Tab|\-|Captions| and |\Caption|\-|Separator|.
%
% \begin{macrocode}
-\caption@ifclassloaded{koma}{%
-% \end{macrocode}
-% \begin{macrocode}
- \DeclareCaptionFormat{default}[#1#2#3\par]{%
- \ifdofullc@p
- \caption@ifin@list\caption@lsepcrlist\caption@lsepname
- {\caption@Error{%
- The option `labelsep=\caption@lsepname' does not work\MessageBreak
- with \noexpand\setcaphanging (which is set by default)}}%
- {\caption@fmt@hang{#1}{#2}{#3}}%
- \else
- #1#2%
- \ifdim\cap@indent<\z@
- \par
- \noindent\hspace*{-\cap@indent}%
- \else\if@capbreak
- \par
- \fi\fi
- #3\par
- \fi}
- \DeclareCaptionLabelSeparator{default}{\captionformat}
- \DeclareCaptionDefaultFont{font}{\scr@fnt@caption}
- \DeclareCaptionDefaultFont{labelfont}{\scr@fnt@captionlabel}
-% \end{macrocode}
-%
-% \changes{v1.0f}{2005/08/22}{Increased compatibility to KOMA-Script:
-% A special version of options `parindent' and `parskip' added}
-% \changes{v1.0g}{2006/01/03}{Bugfix 06-01-03: KOMA-Script variants of
-% `parskip' and `parindent' options revised and moved into caption kernel}
-% \changes{v1.0h}{2006/02/23}{KOMA-Script variants of `parskip' and
-% `parindent' are obsolete now, removed}
-% \changes{v1.0m}{2007/03/30}{KOMA-Script variants of `parskip' and
-% `parindent' re-added, since they still collide with the current
-% version of the subfig package (Sigh!)}
-%
-% There is an option clash between the \KOMAScript\ document classes
-% and the \package{caption} kernel, both define the options |parindent| and
-% |parskip| but with different meaning.
-% Furthermore the ones defined by the \package{caption} kernel take a
-% value as parameter but the \KOMAScript\ ones do not.
-% So we need special versions of the options |parindent| and |parskip| here
-% which determine if a value is given (and therefore should be treated as
-% our option) or not (and therefore should be ignored by us).\footnote{%^^A
-% This problem was completely solved due a change of \cs{caption@ProcessOptions}
-% in \thispackage\ \version{1.0h}, but we still need this workaround since
-% these options would otherwise still collide with the current version $1.3$
-% of the \package{subfig} package (Sigh!)}
-% \begin{macrocode}
- \let\caption@KV@parindent\KV@caption@parindent
- \DeclareCaptionOption{parindent}[]{%
- \ifx,#1,%
- \caption@Debug{Option `parindent' ignored}%
- \else
- \caption@KV@parindent{#1}%
- \fi}%
+ \ifx\caption@french@labelseparator\caption@labelseparator@french % still set to dummy label separator?
+ \DeclareCaptionLabelSeparator{french}{%
+ \ifFBCustomiseFigTabCaptions
+ \CaptionSeparator
+ \else
+ \space : %
+ \fi}%
+ \fi
+ \caption@ifdefined\extrasfrench{%
+ \addto\extrasfrench{%
+ \caption@switchdefault{labelseparator}{\babel@save #1}{french}}}{}%
% \end{macrocode}
+%
+% Suppress the warning about load order (since it's not longer valid anymore).
% \begin{macrocode}
- \let\caption@KV@parskip\KV@caption@parskip
- \DeclareCaptionOption{parskip}[]{%
- \ifx,#1,%
- \caption@Debug{Option `parskip' ignored}%
- \else
- \caption@KV@parskip{#1}%
- \fi}%
+ \caption@AtBeginDocument{\@nameuse{@FBwarning@capsepfalse}}%
% \end{macrocode}
+%
% \begin{macrocode}
}{}
% \end{macrocode}
%
-% \subsection{The \NTG{} Dutch classes}
-% \changes{v1.1}{2007/04/06}{NTG classes support added}
+% \subsection{The frenchle \& frenchpro package}
+% \changes{v1.1}{2006/05/14}{\package{frenchle/pro} package support added}
+% \changes{v2.0}{2020/08/01}{\package{frenchle/pro} package support updated}
%
+% \begin{macro}{\caption@IfFrenchLe}
+% |\caption@IfFrenchLe|\marg{yes-code}\marg{no-code}
% \begin{macrocode}
-\caption@ifclassloaded{ntg}{%
+\newcommand*\caption@IfFrenchLe{%
+ \caption@IfBabelPackageLoaded{frenchle}{\frenchTeXmods}}
+\@onlypreamble\caption@IfBabelFrenchLe
% \end{macrocode}
% \begin{macrocode}
- \DeclareCaptionDefaultFont{labelfont}{\CaptionLabelFont}
- \DeclareCaptionDefaultFont{textfont}{\CaptionTextFont}
+\providecommand*\caption@ifbabel@frenchle{true}
% \end{macrocode}
+% \end{macro}
+%
% \begin{macrocode}
-}{}
+\caption@IfFrenchLe{%
% \end{macrocode}
%
-% \subsection{The thesis class}
-% \changes{v1.2a}{2008/01/31}{thesis class support added}
-% \changes{v1.2e}{2009/11/15}{Bugfix 09-11-14: thesis class support revised}
+% If the language `french' is selected, we switch the default label separator to `french'
+% which uses |\caption|\-|separator|, and switch the default font to `it' and the default label font to `up'.
%
% \begin{macrocode}
-\caption@ifclassloaded{thesis}{%
+ \ifx\caption@french@labelseparator\caption@labelseparator@french % still set to dummy label separator?
+ \DeclareCaptionLabelSeparator{french}{\captionseparator\space}%
+ \fi
+ \g@addto@macro\extrasfrench{%
+ \caption@switchdefault{labelseparator}{\let\caption@original@labelseparator#1}{french}%
+ \caption@switchdefault{font}{\let\caption@original@font#1}{it}%
+ \caption@switchdefault{labelfont}{\let\caption@original@labelfont#1}{up}}%
+ \g@addto@macro\extrasenglish{%
+ \caption@restoredefault{labelseparator}{\caption@original@labelseparator}%
+ \caption@restoredefault{font}{\caption@original@font}%
+ \caption@restoredefault{labelfont}{\caption@original@labelfont}}%
% \end{macrocode}
+%
+% Since the \package{frenchle} package overwrites |\caption|\-|font| and |\caption|\-|label|\-|font|
+% (within |\GOfrench|) we need to save them beforehand and restore them afterwards.
+%
% \begin{macrocode}
- \DeclareCaptionDefaultFormat{hang}
- \DeclareCaptionDefaultFont{labelfont}{\cph@font}
- \DeclareCaptionDefaultFont{textfont}{\cpb@font}
+ \caption@AtBeginDocument{%
+ \let\captionfont@original\captionfont
+ \let\captionlabelfont@original\captionlabelfont}%
+ \g@addto@macro\GOfrench{%
+ \let\captionfont\captionfont@original
+ \let\captionlabelfont\captionlabelfont@original}%
% \end{macrocode}
+%
% \begin{macrocode}
}{}
% \end{macrocode}
%
-% \subsection{The arabic Babel option}
-% \changes{v1.8}{2018/05/20}{\package{arabic} babel package support added}
+% \subsection{The hungarian \& magyar babel option}
+% \changes{v1.3}{2009/03/29}{\package{magyar} babel support added}
+% \changes{v1.3a}{2011/08/12}{\package{magyar} babel support revised}
+% \changes{v1.8b}{2018/08/26}{\package{magyar} babel support revised}
+% \changes{v2.0}{2020/08/03}{\package{magyar} babel support updated}
%
% \begin{macrocode}
-\caption@ifdefined\ArabiCoreLoaded{%
+\DeclareCaptionLabelFormat{magyar}{#2\bothIfSecond{.~}{#1}}
% \end{macrocode}
%
-% \begin{macro}{\caption@rl}
-% \changes{v1.8}{2018/05/20}{This macro added}
+% \begin{macro}{\caption@IfBabelHungarian}
+% |\caption@IfBabelHungarian|\marg{yes-code}\marg{no-code}
% \begin{macrocode}
- \newcommand\caption@rl[1]{\if@rl\textRL{#1}\else\textLR{#1}\fi}
+\newcommand*\caption@IfBabelHungarian{%
+ \caption@IfBabelPackageLoaded{hungarian}{\magyar@opt@defaults}}
+\@onlypreamble\caption@IfBabelHungarian
% \end{macrocode}
-% \end{macro}
-%
% \begin{macrocode}
- \def\fnum@figure{\figurename\nobreakspace\thefigure}%
- \def\fnum@table{\tablename\nobreakspace\thetable}%
-% \end{macrocode}
-% \begin{macrocode}
- \DeclareCaptionLabelSeparator{arabi}{ : }
- \DeclareCaptionLabelSeparator{default}{%
- \if@rl\caption@lsep@arabi\else\caption@lsep@colon\fi}
+\providecommand*\caption@ifbabel@hungarian{true}
% \end{macrocode}
+% \end{macro}
+%
% \begin{macrocode}
-}{%
- \let\caption@rl\@firstofone
-}
+\caption@IfBabelHungarian{%
% \end{macrocode}
%
-% \subsection{The frenchb Babel option}
-% \changes{v1.1}{2006/05/14}{\package{frenchb} babel package support added}
+% If the language `hungarian' or `magyar' is selected,
+% we switch the default label format to `magyar', the default separator to `period',
+% and the default list format to `subperiod'.
%
% \begin{macrocode}
-\caption@ifdefined\FB@makecaption{%
-% \end{macrocode}
-% \begin{macrocode}
- \ifx\@makecaption\STD@makecaption
- \DeclareCaptionLabelSeparator{default}{\CaptionSeparator}
- \def\caption@frenchb{% supress frenchb warning
- \let\STD@makecaption\@makecaption
- \let\FB@makecaption\@makecaption}
- \else
- \ifx\@makecaption\@undefined\else
- \caption@InfoNoLine{%
- The definition of \protect\@makecaption\space
- has been changed,\MessageBreak
- frenchb will NOT customize it}%
- \fi
- \fi
+ \caption@ifdefined\extrashungarian{%
+ \addto\extrashungarian{%
+ \caption@switchdefault{labelformat}{\babel@save #1}{magyar}%
+ \caption@switchdefault{labelseparator}{\babel@save #1}{period}%
+ \caption@switchdefault{listformat}{\babel@save #1}{subperiod}}}{}%
+ \caption@ifdefined\extrasmagyar{%
+ \addto\extrasmagyar{%
+ \caption@switchdefault{labelformat}{\babel@save #1}{magyar}%
+ \caption@switchdefault{labelseparator}{\babel@save #1}{period}%
+ \caption@switchdefault{listformat}{\babel@save #1}{subperiod}}}{}%
% \end{macrocode}
+%
% \begin{macrocode}
}{}
% \end{macrocode}
%
-% \subsection{The frenchle/pro package}
-% \changes{v1.1}{2006/05/14}{\package{frenchle/pro} package support added}
+% \subsection{The latvian babel option}
%
% \begin{macrocode}
-\caption@ifdefined\frenchTeXmods{%
+\DeclareCaptionLabelFormat{latvian}{#2\bothIfSecond{~}{#1}}
% \end{macrocode}
+%
+% \begin{macro}{\caption@IfBabelLatvian}
+% |\caption@IfBabelLatvian|\marg{yes-code}\marg{no-code}
% \begin{macrocode}
- \DeclareCaptionDefaultFont{textfont}{\itshape}%
- \DeclareCaptionLabelSeparator{default}{\captionseparator\space}%
+\newcommand*\caption@IfBabelLatvian{%
+ \caption@IfBabelPackageLoaded{latvian}{\bbl@latvianindent}}
+\@onlypreamble\caption@IfBabelLatvian
% \end{macrocode}
% \begin{macrocode}
-}{}
+\providecommand*\caption@ifbabel@latvian{true}
% \end{macrocode}
-%
-% \subsection{The hungarian and magyar Babel option}
-% \changes{v1.3}{2009/03/29}{\package{magyar} package support added}
-% \changes{v1.3a}{2011/08/12}{\package{magyar} package support revised}
-% \changes{v1.8b}{2018/08/26}{\package{magyar} package support revised}
+% \end{macro}
%
% \begin{macrocode}
-\DeclareCaptionListFormat{subperiod}{#2.}
+\caption@IfBabelLatvian{%
% \end{macrocode}
%
+% If the language `latvian' is selected, we switch the default label format to `latvian'.
+%
% \begin{macrocode}
-\def\caption@tempa#1{%
- \@ifpackagewith{babel}{#1}{%
- \caption@InfoNoLine{#1 babel option is loaded}%
- \expandafter\addto\csname extras#1\endcsname{%
- % change default labelsep and listformat
- \caption@setdefaultlabelsep{period}%
- \caption@setdefaultlistformat{subperiod}}%
- \expandafter\addto\csname noextras#1\endcsname{%
- % change default labelsep and listformat
- \caption@setdefaultlabelsep{colon}%
- \caption@setdefaultlistformat{subsimple}}%
- }{}}
+ \caption@ifdefined\extraslatvian{%
+ \addto\extraslatvian{%
+ \caption@switchdefault{labelformat}{\babel@save #1}{latvian}}}{}%
% \end{macrocode}
+%
% \begin{macrocode}
-\caption@tempa{hungarian}
-\caption@tempa{magyar}
+}{}
% \end{macrocode}
%
-% TODO: babel-latvian/latvian.ldf
-%
% \section{Package support}
%
-% \begin{macro}{\caption@xpackage}
-% \changes{v1.11}{2020/05/10}{This macro added}
-% |\caption@xpackage|\marg{macro}\marg{package}\marg{option}
-% expands the given macro if the given package is not loaded.
-% (Note: We cannot use |\@ifpackageloaded| here since it's not available after |\AtBeginDocument|.)
+% \begin{macro}{\caption@ifpackageloaded}
+% \changes{v2.0}{2020/07/26}{This macro added}
+% |\caption@ifpackageloaded|\marg{package}\marg{yes-code}\marg{no-code}\\
+% expands the given code if the given package is (not) loaded.
+% (Note: We cannot use |\@if|\-|package|\-|loaded| here since it's not
+% available after |\At|\-|Begin|\-|Document|.)
% \begin{macrocode}
-\newcommand*\caption@xpackage[2]{%
- \expandafter\ifx\csname ver@#2.\caption@pkgextension\endcsname\relax
- \expandafter\@firstofone
+\newcommand*\caption@ifpackageloaded[1]{%
+ \expandafter\ifx\csname ver@#1.\caption@pkgextension\endcsname\relax
+ \expandafter\@secondoftwo
\else
- \expandafter\@gobbletwo
- \fi
- {#1{#2}}}
+ \expandafter\@firstoftwo
+ \fi}
% \end{macrocode}
% \begin{macrocode}
\let\caption@pkgextension\@pkgextension
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\caption@loadpackage}
-% \changes{v1.11}{2020/05/10}{This macro added}
-% |\caption@loadpackage|\marg{package}\marg{caption option}
-% loads the given package immediately.
-% \begin{macrocode}
-\newcommand*\caption@loadpackage{%
- \caption@xpackage\caption@@loadpackage}
-% \end{macrocode}
+% \begin{macro}{\caption@pkg@list}
+% \changes{v1.4b}{2012/01/12}{This macro added}
+% We used this in the past as list of packages loaded
+% |\At|\-|Begin|\-|Document|.
+% (Note: Old |.aux| files could contain
+% |\@cons|\-|\caption@pkg@list|\-|{{|\meta{package}|}}|,
+% so this macro should always be defined, even if we don't use it anymore.)
% \begin{macrocode}
-\newcommand*\caption@@loadpackage[2]{%
- \caption@Info{Option `#2' requires the `#1' package}%
- \RequirePackage{#1}\relax}
+\newcommand*\caption@pkg@list{}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\caption@requirepackage}
% \changes{v1.10}{2020/05/10}{This macro added}
-% |\caption@requirepackage|\marg{package}\marg{caption option}
-% indicates that the given package option needs a package.
+% \changes{v2.0}{2020/07/27}{This macro revised}
+% |\caption@requirepackage|\marg{package}\marg{option}\marg{value}\\
+% indicates that the given package option needs a package.
% \begin{macrocode}
-\newcommand*\caption@requirepackage{%
- \caption@xpackage\caption@@requirepackage}
+\newcommand*\caption@requirepackage[2]{%
+ \caption@ifpackageloaded{#1}{}{\caption@@requirepackage{#1}{#2}}}
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption@@requirepackage[2]{%
- \@cons\caption@packagelist{{#1}{#2}}}% load package later on
+ \@cons\caption@packagelist{{#1}{#2}}} % load package later on
% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\caption@pkg@list}
-% \changes{v1.4b}{2012/01/12}{This macro added}
-% We used this in the past as list of packages loaded |\AtBeginDocument|.
-% (Note: Old |.aux| files could contain |\@cons|\-|\caption@pkg@list|\-|{{|\meta{package}|}}|,
-% so this macro should always be defined, even if we change the following code in the future.)
% \begin{macrocode}
-\newcommand*\caption@pkg@list{}
+\caption@AtBeginDocument{%
+ \renewcommand*\caption@@requirepackage[2]{%
+ \caption@Error{Option `#2' requires the `#1' package}}}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\caption@packagelist}
% \changes{v1.11}{2020/05/10}{This macro added}
-% We use this as list of packages loaded |\AtBeginDocument|.
+% We use this as list of packages loaded |\At|\-|Begin|\-|Document|.
% \begin{macrocode}
\newcommand*\caption@packagelist{}
\@onlypreamble\caption@packagelist
@@ -3071,45 +3331,131 @@
\g@addto@macro\caption@tempa{%
\caption@loadpackage{#1}{#2}}}%
\caption@packagelist
- \caption@tempa
+ \caption@tempa}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@loadpackage}
+% \changes{v1.11}{2020/05/10}{This macro added}
+% \changes{v2.0}{2020/07/26}{This macro revised}
+% |\caption@loadpackage|\marg{package}\marg{option}\marg{value}\\
+% loads the given package immediately.
+% \begin{macrocode}
+\newcommand*\caption@loadpackage[2]{%
+ \caption@ifpackageloaded{#1}{}{\caption@@loadpackage{#1}{#2}}}
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\caption@@loadpackage[2]{%
+ \caption@Info{Option `#2' requires the `#1' package}%
+ \RequirePackage{#1}\relax}
% \end{macrocode}
% \begin{macrocode}
- \renewcommand*\caption@@loadpackage[2]{%
- \caption@Error{Option `#2' requires the `#1' package}}%
- \let\caption@@requirepackage\caption@@loadpackage
- }
+\caption@AtBeginDocument{%
+ \let\caption@@loadpackage\caption@@requirepackage}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\caption@usepackage}
-% \changes{v1.11}{2020/05/10}{This macro added}
-% |\caption@usepackage|\marg{package}\marg{option}\marg{code}
-% loads the given package and executes the given code.
-% (Note: Since the package might use the crappy \package{keyval}
-% package, too, we need to save \& restore some macros here, otherwise this
-% recursion won't work properly.)
+% \subsection{The floatrow package}
+% \changes{v2.0}{2020/07/28}{Adaptions to the \package{floatrow} package added}
+%
+% Since the \package{floatrow} package is not maintained anymore,
+% we have to make adaptions to \thispackage~\version{2.0} here.
+% Please note that we only support the version $0.3b$ of the \package{floatrow} package,
+% so older versions do not work with this version of \thispackage, and newer
+% versions are expected to be adapted.
+%
% \begin{macrocode}
-\newcommand*\caption@usepackage[3]{%
- \IfCaptionOptionCheck
- {\caption@requirepackage{#1}{#2}}%
- {\let\KV@prefix@ORI\KV@prefix
- \let\@tempc@ORI\@tempc
- \caption@loadpackage{#1}{#2}%
- #3%
- \let\@tempc\@tempc@ORI
- \let\KV@prefix\KV@prefix@ORI}}
+\caption@AtBeginDocument{%
+ \def\@tempa{2008/08/02 v0.3b floatrow: float package extension}%
+ \expandafter\ifx\csname ver@floatrow.sty\endcsname\@tempa
+ \caption@InfoNoLine{floatrow package v0.3b is loaded}%
+% \end{macrocode}
+%
+% \begin{macro}{\captionlabel}
+% |\caption@format| needs to be expanded prior the use of |\caption@@@make|.
+% \begin{macrocode}
+ \renewcommand\captionlabel[1]{{% l.559
+ \def\FR@tmp{\@captype}%
+ \ifnum\floatbox@depth>\@ne
+ \def\FR@tmp{sub\@captype}\caption@setsubtype*{\FR@tmp}\stepcounter{\FR@tmp}%
+ \fi
+ \caption@format % <= This line added
+ \caption@@@make{\caption@fnum\FR@tmp}{#1}}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\flrow@setstyle}
+% This patch isn't working since |\flrow@setstyle| will be used by
+% \package{floatrow} right after loading \package{caption3}.
+% For this reason we still define |\caption@sty@|\meta{name} in
+% |\Declare|\-|Caption|\-|Style| instead.
+% \begin{macrocode}
+% \renewcommand*\flrow@setstyle[1]{% l.986
+% \@ifundefined{flrow@sty@#1}%
+% {\flrow@error{Undefined float style `#1'}}%
+% {\FBstyle@reset
+% \def\flrow@capsetup{%
+% \caption@ifdecl{style}{#1}{\caption@setstyle*{#1}}{}%
+% \caption@setoptions{#1}}%
+% \flrow@esetup{\csname flrow@sty@#1\endcsname}}}
+% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\flrow@FBoAlign}
+% This patch isn't working since |\flrow@FBoAlign| will be used by
+% \package{floatrow} right after loading \package{caption3}.
+% For this reason we still define |\caption@hj@|\meta{name} in
+% |\Declare|\-|Caption|\-|Justification| instead.
+% \begin{macrocode}
+% \renewcommand*\flrow@FBoAlign[1]{% l.1168
+% \caption@ifdecl{justification}{#1}%
+% {\expandafter\let\expandafter\floatobjectset
+% \csname caption@justification@#1\endcsname}%
+% {\flrow@error{Undefined object setting `#1'}}}%
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\flrow@setFRsep}
+% This patch isn't working since |\flrow@setFRsep| will be used by
+% \package{floatrow} right after loading \package{caption3}.
+% For this reason we still define |\caption@lsep@|\meta{name} in
+% |\Declare|\-|Caption|\-|Label|\-|Separator| instead.
+% \begin{macrocode}
+% \renewcommand*\flrow@setFRsep[2]{% l.1187
+% \caption@ifdecl{labelseparator}{#2}%
+% {\@nameuse{caption@labelseparator@#2}% defines \caption@labelsep
+% \let#1\caption@labelsep}%
+% {\flrow@error{Undefined float separator `#2'}}}%
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+ \fi}
+% \end{macrocode}
+%
% \subsection{The newfloat package}
%
% \begin{macro}{\caption@newfloat}
% \changes{v1.4b}{2012/01/12}{This macro added}
% \changes{v1.8h}{2020/01/03}{Usage of \cs{caption@ifpackageloaded} replaced by \cs{RequirePackage}}
% \changes{v1.11}{2020/05/10}{Usage of \cs{RequirePackage} replaced by \cs{caption@usepackage}}
-% |\caption@newfloat|\marg{option}\marg{code}
-% loads the \package{newfloat} package and executes the given code afterwards.
-% \begin{macrocode}
-\newcommand*\caption@newfloat{\caption@usepackage{newfloat}}
+% \changes{v2.0}{2020/07/27}{This macro revised}
+% |\caption@newfloat|\marg{option}\marg{value}\marg{code}\\
+% loads the \package{newfloat} package and executes the given code afterwards.
+% (Note: Since the package might use the crappy \package{keyval}
+% package, too, we need to save \& restore some macros here, otherwise this
+% recursion won't work properly.)
+% \begin{macrocode}
+\newcommand*\caption@newfloat[2]{%
+ \IfCaptionOptionCheck
+ {\caption@requirepackage{newfloat}{#1}}%
+ {\let\KV@prefix@ORI\KV@prefix
+ \let\@tempc@ORI\@tempc
+ \caption@loadpackage{newfloat}{#1}%
+ #2%
+ \let\@tempc\@tempc@ORI
+ \let\KV@prefix\KV@prefix@ORI}}
+% \end{macro}
% \end{macrocode}
% \end{macro}
%
@@ -3138,8 +3484,9 @@
% \changes{v1.2b}{2008/08/02}{Bugfix: Works now without \cs{addto}, too}
% \changes{v1.4a}{2011/10/29}{Outsourced to \package{newfloat} package}
% \changes{v1.4b}{2012/01/12}{Bugfix: Uses \cs{caption@newfloat} now}
-% |\caption@SetName|\marg{float}\marg{name}
-% \begin{macrocode}
+% |\caption@SetName|\marg{float}\marg{name}\\
+% loads the \package{newfloat} package and uses |\newfloat@set|\-|name|.
+% \begin{macrocode}
\newcommand*\caption@SetName[2]{%
\caption@newfloat{#1name}{\newfloat@setname{#1}{#2}}}
\@onlypreamble\caption@SetName
@@ -3152,7 +3499,8 @@
% \end{macrocode}
%
% \begin{macro}{\caption@setname}
-% |\caption@setname|\marg{float}\marg{name}
+% |\caption@setname|\marg{float}\marg{name}\\
+% sets the given float name, e.g.: `Figure` for `figure`.
% \begin{macrocode}
\newcommand*\caption@setname[2]{%
\@namedef{#1name}{#2}}
@@ -3173,10 +3521,11 @@
% \changes{v1.2}{2007/12/21}{This macro added}
% \changes{v1.4a}{2011/10/29}{Outsourced to \package{newfloat} package}
% \changes{v1.4b}{2012/01/12}{Bugfix: Uses \cs{caption@newfloat} now}
-% |\caption@within|\marg{float}\marg{value}
+% |\caption@within|\marg{float}\marg{value}\\
+% loads the \package{newfloat} package and uses |\newfloat@set|\-|within|.
% \begin{macrocode}
\newcommand*\caption@within[2]{%
- \caption@newfloat{#1within}{\newfloat@setwithin{#1}{#2}}}
+ \caption@newfloat{#1within=#2}{\newfloat@setwithin{#1}{#2}}}
% \end{macrocode}
% \end{macro}
%
@@ -3185,7 +3534,7 @@
%
% \begin{macrocode}
\DeclareCaptionOption{within}{%
- \caption@newfloat{within}{\newfloatsetup{within=#1}}}
+ \caption@newfloat{within=#1}{\newfloatsetup{within=#1}}}
\DeclareCaptionOptionNoValue{without}{%
\caption@newfloat{without}{\newfloatsetup{without}}}
% \end{macrocode}
@@ -3227,14 +3576,15 @@
% \end{macrocode}
%
% \subsection{The subfig package}
-% \changes{v1.1}{2007/07/07}{Several adaptions to the \package{subfig} package added}
+% \changes{v1.1}{2007/07/07}{Adaptions to the \package{subfig} package added}
% \changes{v1.4a}{2011/11/01}{Test for the \package{subfig} package revised}
%
% Since the \package{subfig} package is not maintained anymore,
-% we have to make several adaptions to \thispackage~\version{1.1} here.
-% Please note that we only support the version $1.3$ of the \package{subfig} package here.
-% So older versions do not work with this version of \thispackage, and newer
+% we have to make adaptions to \thispackage~\version{1.1} here.
+% Please note that we only support the version $1.3$ of the \package{subfig} package,
+% so older versions do not work with this version of \thispackage, and newer
% versions are expected to be adapted.
+%
% \begin{macrocode}
\caption@AtBeginDocument{%
\def\@tempa{2005/06/28 ver: 1.3 subfig package}%
@@ -3253,7 +3603,7 @@
% \end{macrocode}
%
% \begin{macro}{\@dottedxxxline}
-% New version of |\@dottedxxxline|
+% New version of |\@dottedxxxline|
% \begin{macrocode}
\def\sf@NEW@dottedxxxline#1#2#3#4#5#6#7{%
\begingroup
@@ -3269,7 +3619,7 @@
%
% \begin{macro}{\sf@subfloat}
% \changes{v1.4b}{2011/12/29}{Bugfix 11-12-23: Usage of \cs{caption@warmup} added}
-% New version of |\sf@subfloat|
+% New version of |\sf@subfloat|
% \begin{macrocode}
\def\sf@NEW@subfloat{%
\begingroup
@@ -3297,21 +3647,10 @@
%
% Make the \package{subfig} package documentation compile.
% \begin{macrocode}
-%%\@ifl@aded{dtx}{subfig}{\caption@loadpackage{ragged2e}{}}{} % not needed
\DeclareCaptionOption{lofdepth}[2]{\caption@ifdefined\c@lofdepth{\setcounter{lofdepth}{#1}}{}}
\DeclareCaptionOption{lotdepth}[2]{\caption@ifdefined\c@lotdepth{\setcounter{lotdepth}{#1}}{}}
% \end{macrocode}
%
-% \section{Execution of options}
-%
-% \begin{macrocode}
-\captionsetup{style=default,position=default,%
- list,listformat=default,twoside=\if@twoside 1\else 0\fi}
-% \end{macrocode}
-% \begin{macrocode}
-\ProcessOptions*
-% \end{macrocode}
-%
% \section{Making an `List of' entry}
%
% \begin{macro}{\caption@addcontentsline}
@@ -3324,10 +3663,9 @@
% \changes{v1.7}{2015/09/15}{Argument \#3 which holds the environment name added to \cs{caption@lstfmt}}
% \changes{v1.7}{2015/09/20}{Unfortunately \package{subfig} defines and uses \cs{caption@lstfmt} as well, so I replaced the third argument with \cs{captionlisttype}}
% \changes{v1.8}{2018/09/06}{Adapted to the \package{chkfloat} package}
-% |\caption@addcontentsline|\marg{type}\marg{list entry}\par
-% Makes an entry in the list-of-whatever, if requested,
-% i.e.~the argument \meta{list entry} is not empty and
-% |listof=| was set to |true|.
+% |\caption@addcontentsline|\marg{type}\marg{list entry}\\
+% makes an entry in the list-of-whatever, if requested, i.e.~the argument
+% \meta{list entry} is not empty and |list|\-|of=| was set to |true|.
% \begin{macrocode}
\newcommand\caption@addcontentsline[2]{%
\caption@ifcontentsline{#2}{%
@@ -3357,7 +3695,7 @@
\caption@add@contentsline
{\csname ext@#1\endcsname}%
{#1}%
- {\caption@lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}}%
+ {\caption@listformat{\@nameuse{p@#1}}{\@nameuse{the#1}}}%
{\ignorespaces #2}%
\caption@chkfloat{#1}{#2}}}}
% \end{macrocode}
@@ -3400,39 +3738,54 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\caption@aboveskip}
+% \begin{macro}{\caption@belowskip}
+% \changes{v2.0}{2020/08/23}{This macro moved from package to kernel}
+% |\caption@aboveskip| and |\caption@belowskip|\\
+% typeset the skip above resp.~below the caption.
+% \begin{macrocode}
+\newcommand*\caption@aboveskip{%
+ \vskip\abovecaptionskip}
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\caption@belowskip{%
+ \vskip\belowcaptionskip}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
% \begin{macro}{\caption@fnum}
% \changes{v1.1}{2007/08/21}{This macro added}
-% |\caption@fnum|\marg{float type}\par
-% Typesets the caption label; as replacement for |\fnum@|\meta{float type}.
+% \changes{v2.0}{2020/08/03}{The original definition will be stored in \cs{caption@original@fnum}}
+% |\caption@fnum|\marg{float type}\\
+% typesets the caption label; this acts as replacement for |\fnum@|\meta{float type}.
% \begin{macrocode}
-\newcommand*\caption@fnum[1]{\caption@lfmt{\@nameuse{#1name}}{\@nameuse{the#1}}}
+\newcommand*\caption@fnum[1]{%
+ \expandafter\let\expandafter\caption@original@fnum\csname caption@fnum@#1\endcsname % for label format `original'
+ \caption@labelformat{\@nameuse{#1name}}{\@nameuse{the#1}}}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\caption@make}
-% |\caption@make|\marg{float name}\marg{ref.\ number}\marg{text}\par
-% Typesets the caption.
+% |\caption@make|\marg{float name}\marg{ref.\ number}\marg{text}\\
+% typesets the caption.
% \begin{macrocode}
-\newcommand\caption@make[2]{\caption@@make{\caption@lfmt{#1}{#2}}}
+\newcommand\caption@make[2]{\caption@@make{\caption@labelformat{#1}{#2}}}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\caption@@make}
% \changes{v1.0b}{2004/05/16}{Bugfix 04-05-05: \cs{ifdim}\cs{captionindent=}\cs{z@} added}
-% \changes{v1.0c}{2005/02/12}{Bugfix 04-10-26: Use \cs{@tempdima} instead of
-% \cs{captionmargin} resp. \cs{captionwidth}; check for \cs{z@} added}
-% \changes{v1.0c}{2005/02/12}{Bugfix: \cs{hskip}\cs{captionmargin} to the end
-% of caption added}
+% \changes{v1.0c}{2005/02/12}{Bugfix 04-10-26: Use \cs{@tempdima} instead of \cs{captionmargin} resp. \cs{captionwidth}; check for \cs{z@} added}
+% \changes{v1.0c}{2005/02/12}{Bugfix: \cs{hskip}\cs{captionmargin} to the end of caption added}
% \changes{v1.0c}{2005/02/12}{Bugfix: \cs{strut} moved from here to \cs{caption@@@make}}
% \changes{v1.0c}{2005/02/12}{Single-line-check moved up so it can affect margins now}
-% \changes{v1.0c}{2005/02/09}{Improvement: \cs{caption@ifh} added}
+% \changes{v1.0c}{2005/02/09}{Improvement: \cs{caption@ifhmode} added}
% \changes{v1.0c}{2005/02/09}{Bugfix: \cs{leavevmode} added}
% \changes{v1.0f}{2005/08/24}{Uses \cs{sbox} instead of \cs{setbox} in single-line-check}
% \changes{v1.0g}{2005/12/04}{Uses \cs{caption@slc} now}
-% \changes{v1.0g}{2006/01/11}{Bugfix: \cs{caption@calcmargin} inside
-% single-line-check replaced by \cs{relax}}
-% \changes{v1.0g}{2006/01/11}{Bugfix: \cs{caption@startbox} will always be
-% typeset in horizontal mode}
+% \changes{v1.0g}{2006/01/11}{Bugfix: \cs{caption@calcmargin} inside single-line-check replaced by \cs{relax}}
+% \changes{v1.0g}{2006/01/11}{Bugfix: \cs{caption@startbox} will always be typeset in horizontal mode}
% \changes{v1.0i}{2006/05/13}{Uses \cs{caption@parbox} instead of \cs{caption@start/endbox}}
% \changes{v1.0j}{2007/01/04}{Oops, bugfix 04-05-05 got lost in v1.0h, re-added}
% \changes{v1.0n}{2007/04/03}{Usage of \cs{caption@ifoddpage} added}
@@ -3443,7 +3796,7 @@
% \changes{v1.6}{2013/05/01}{Usage of \cs{caption@box} added}
% \changes{v1.7}{2016/01/31}{Adapted to the \package{bicaption} package}
% \changes{v1.8f}{2019/12/18}{Usage of \cs{linewidth} replaced by \cs{hsize}}
-% |\caption@@make|\marg{caption label}\marg{caption text}
+% |\caption@@make|\marg{caption label}\marg{caption text}
% \begin{macrocode}
\newcommand\caption@@make[2]{%
\begingroup
@@ -3456,56 +3809,49 @@
\caption@stepthecounter
\caption@beginhook
% \end{macrocode}
-%
-% Typeset the outer box |\caption@box|
+% Typeset the outer box |\caption@box|
% \begin{macrocode}
\caption@box\hsize{%
% \end{macrocode}
-%
-% Special single-line treatment (option |singlelinecheck=|)
+% Special single-line treatment (option |singlelinecheck=|)
% \begin{macrocode}
- \caption@ifslc{\caption@slc{#1}{#2}\caption@singleline\relax}{}%
+ \caption@singlelinecheck{\caption@slc{#1}{#2}\caption@singleline\caption@multiline}{\caption@multiline}%
% \end{macrocode}
-%
-% Typeset the left margin (option |margin=|)
+% Typeset the left margin (option |margin=|)
% \begin{macrocode}
\caption@calcmargin
\caption@tempdima\captionmargin
\ifdim\captionmargin@=\z@ \else
\caption@ifoddpage{}{\advance\caption@tempdima\captionmargin@}%
\fi
- \caption@ifh{\advance\caption@tempdima\caption@indent}%
+ \caption@ifhmode{\advance\caption@tempdima\caption@indent}%
\hspace\caption@tempdima
% \end{macrocode}
-%
-% We actually use a |\vbox| of width |\captionwidth - \caption@indent|
-% to typeset the caption.
-% \Note{\cs{captionindent} is \emph{not} supported if the caption format
-% was defined with \cs{DeclareCaptionFormat*}.}
+% We actually use a |\vbox| of width |\captionwidth - \caption@indent|
+% to typeset the caption.
+% \Note{\cs{captionindent} is \emph{not} supported if the caption format
+% was defined with \cs{DeclareCaptionFormat*}.}
% \begin{macrocode}
\caption@tempdima\captionwidth
- \caption@ifh{\advance\caption@tempdima-\caption@indent}%
+ \caption@ifhmode{\advance\caption@tempdima-\caption@indent}%
\caption@parbox\caption@tempdima{%
% \end{macrocode}
-%
-% Typeset the indention (option |indention=|)\\
-% {\small Bugfix 04-05-05:
-% |\hskip-\caption@indent| replaced by |\ifdim\caption@indent=\z@|\ldots}
+% Typeset the indention (option |indention=|)\\
+% {\small Bugfix 04-05-05:
+% |\hskip-\caption@indent| replaced by |\ifdim\caption@indent=\z@|\ldots}
% \begin{macrocode}
- \caption@ifh{%
+ \caption@ifhmode{%
\ifdim\caption@indent=\z@
\leavevmode
\else
\hskip-\caption@indent
\fi}%
% \end{macrocode}
-%
-% Typeset the caption itself and close the |\caption@parbox|
+% Typeset the caption itself and close the |\caption@parbox|
% \begin{macrocode}
\caption@@@make{#1}{#2}}%
% \end{macrocode}
-%
-% Typeset the right margin (option |margin=|)
+% Typeset the right margin (option |margin=|)
% \begin{macrocode}
\caption@tempdima\captionmargin
\ifdim\captionmargin@=\z@ \else
@@ -3513,12 +3859,10 @@
\fi
\hspace\caption@tempdima
% \end{macrocode}
-%
-% Close the outer box |\caption@box|
+% Close the outer box |\caption@box|
% \begin{macrocode}
}%
% \end{macrocode}
-%
% \begin{macrocode}
\caption@endhook}
% \end{macrocode}
@@ -3534,14 +3878,14 @@
% \changes{v1.1}{2006/05/13}{Check of \cs{@listdepth} removed (not necessary anymore), use \cs{linewidth} instead of \cs{hsize}}
% \changes{v1.5}{2012/12/26}{max-margin stuff moved from \cs{caption@@make} to here}
% \changes{v1.8f}{2019/12/18}{Usage of \cs{linewidth} replaced by \cs{hsize}}
-% |\caption@calcmargin|\par
-% Calculate |\captionmargin| \& |\captionwidth|, so both contain valid
-% values.
+% |\caption@calcmargin|\\
+% calculates |\caption|\-|margin| and |\caption|\-|width|, so both contain
+% valid values.
% \begin{macrocode}
\newcommand*\caption@calcmargin{%
\caption@calcmargin@hook
% \end{macrocode}
-% Check margin, if |\caption@minmargin| or |\caption@maxmargin| is set
+% Check margin, if |\caption@min|\-|margin| or |\caption@max|\-|margin| is set
% \begin{macrocode}
\ifx\caption@maxmargin\@undefined \else
\ifdim\captionmargin>\caption@maxmargin\relax
@@ -3579,23 +3923,22 @@
% \end{macro}
%
% \begin{macro}{\caption@slc}
-% \changes{v1.1}{2007/06/13}{\cs{let}\cs{caption@hj}\cs{relax} added}
-% \changes{v1.1}{2007/07/29}{\cs{caption@setup}\cs{caption@sls} added after \cs{begingroup}}
+% \changes{v1.1}{2007/06/13}{\cs{let}\cs{caption@justification}\cs{relax} added}
+% \changes{v1.1}{2007/07/29}{\cs{caption@setup}\cs{\caption@sls} added after \cs{begingroup}}
% \changes{v1.1}{2007/07/29}{\cs{caption@calcmargin} added}
-% \changes{v1.1c}{2007/10/14}{Support of \cs{caption@slfmt} added}
-% \changes{v1.1d}{2007/10/23}{`SingleLine' renamed to `singleline' for consistency}
+% \changes{v1.1c}{2007/10/14}{\cs{caption@setup}\cs{\caption@opt@SingleLine} outsourced to \cs{caption@SingleLine}}
% \changes{v1.3}{2010/09/04}{Split into \cs{caption@slc} and \cs{caption@@slc}}
% \changes{v1.5}{2012/12/26}{Merged into a single macro again}
-% \changes{v1.5}{2013/04/14}{Definition and usage of \cs{ifsinglelinecaption} added}
-% |\caption@slc|\marg{label}\marg{text}\marg{single-line-code}\marg{multi-line-code}\par
-% This one does the single-line-check.
+% \changes{v1.5}{2013/04/14}{Usage of \cs{ifsinglelinecaption} added}
+% |\caption@slc|\marg{label}\marg{text}\marg{single-line-code}\marg{multi-line-code}\\
+% This one does the single-line-check.
% \begin{macrocode}
\newcommand\caption@slc[4]{%
\caption@Debug{Begin SLC}%
\singlelinecaptiontrue
\begingroup
\caption@singleline
- \let\caption@hj\@empty
+ \let\caption@justification\relax
\caption@calcmargin % calculate \captionwidth
\caption@prepareslc
\sbox\@tempboxa{\caption@@@make{#1}{#2}}%
@@ -3609,47 +3952,72 @@
\fi
\caption@Debug{End SLC}}
% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ifsinglelinecaption}
+% \changes{v1.5}{2013/04/14}{This definition added}
+% |\ifsinglelinecaption|\\
+% could be used inside own caption formats to test if the caption is
+% currently typeset as single-line caption (or not).
% \begin{macrocode}
\newif\ifsinglelinecaption
% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@singleline}
+% \changes{v1.1c}{2007/10/14}{This macro extracted from \cs{caption@slc}}
+% \changes{v1.1c}{2007/10/14}{Support of \cs{caption@slfmt} added}
+% \changes{v1.1d}{2007/10/23}{This macro renamed from \cs{caption@SingleLine} to \cs{caption@singleline} for consistency}
+% |\caption@singleline|\\
+% prepares the typesetting of a single-line caption.
% \begin{macrocode}
\newcommand*\caption@singleline{%
- \caption@xsetup\caption@opt@singleline
+ \caption@xsetup\caption@slsty % Note: This could change \caption@format
+ \caption@format % defines \caption@ifhmode, \caption@slfmt, and \caption@fmt
\let\caption@fmt\caption@slfmt}
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\caption@multiline}
+% \changes{v2.0}{2020/07/28}{This macro added}
+% |\caption@multiline|\\
+% prepares the typesetting of a multi-line caption.
+% \begin{macrocode}
+\newcommand*\caption@multiline{%
+ \caption@format} % defines \caption@ifhmode, \caption@slfmt, and \caption@fmt
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\caption@prepareslc}
% \changes{v1.0b}{2004/05/16}{Bugfix: Redefinition of \cs{label} \& \cs{@footnotetext} added}
% \changes{v1.0b}{2004/05/16}{Redefine \cs{stepcounter} instead of \cs{footnote(mark)}}
-% \changes{v1.0c}{2005/02/12}{\cs{let}\cs{caption@hj}\cs{relax} added}
+% \changes{v1.0c}{2005/02/12}{\cs{let}\cs{caption@justification}\cs{relax} added}
% \changes{v1.0f}{2005/07/09}{Support of \package{endnotes} package added}
-% \changes{v1.1}{2007/06/13}{\cs{let}\cs{caption@hj}\cs{relax} moved to \cs{caption@slc}}
+% \changes{v1.1}{2007/06/13}{\cs{let}\cs{caption@justification}\cs{relax} moved to \cs{caption@slc}}
% \changes{v1.1}{2007/06/13}{Redefinition of \cs{(H@)refstepcounter} added}
% \changes{v1.1}{2007/08/12}{Redefinition of \cs{label} improved}
% \changes{v1.1c}{2007/10/06}{Definition of \cs{caption@l@stepcounter} added}
% \changes{v1.3}{2011/07/07}{Bugfix 11-07-06: Redefinition of \cs{footnote} and \cs{footnotemark} added, redefinition of \cs{stepcounter} and \cs{refstepcounter} dropped}
-% \changes{v1.4a}{2011/10/21}{Redefinition of \cs{pagenote} from \textsf{memoir} document class added}
% \changes{v1.4a}{2011/10/22}{Redefinition of \cs{footnote} revised}
% \changes{v1.5}{2013/04/13}{Redefinition os \cs{glsunset} added}
% \changes{v1.8}{2018/01/21}{Redefinition of \cs{endnote} added (thanks to Markus Kohm)}
% \changes{v1.8}{2018/05/16}{Redefinition of \cs{acused} added}
% \changes{v1.8}{2018/05/26}{Definition method changed so it can be pre-defined by other packages}
% \changes{v1.8}{2018/05/27}{Redefinition of \cs{hypertarget} added}
-% \changes{v1.12b}{2020/07/20}{Special adaption to \class{beamer} added}
-% |\caption@prepareslc|\par
-% Re-define anything which would disturb the single-line-check.
+% |\caption@prepareslc|\\
+% re-defines anything which could disturb the single-line-check.
% \begin{macrocode}
\providecommand*\caption@prepareslc{}
\g@addto@macro\caption@prepareslc{%
\let\label\caption@gobble
\let\hypertarget\@gobbletwo
% \end{macrocode}
-% We re-define \cs{footnote} so
-% \begin{enumerate}
-% \item The footnote counter will not be increased twice (but still the correct footnote mark will be used within the single-line-check)
-% \item The footnote text will not be evaluated twice
-% \end{enumerate}
+% We re-define \cs{footnote} so
+% \begin{enumerate}
+% \item The footnote counter will not be increased twice (but still the
+% correct footnote mark will be used within the single-line-check)
+% \item The footnote text will not be evaluated twice
+% \end{enumerate}
% \begin{macrocode}
\let\caption@footnote@ORI\footnote
\def\footnote{\caption@withoptargs\caption@footnote}%
@@ -3658,7 +4026,7 @@
\let\caption@footnotetext@ORI\@footnotetext
\let\@footnotetext\caption@gobble
% \end{macrocode}
-% Same for \cs{endnote}
+% Same for \cs{endnote}
% \begin{macrocode}
\let\caption@endnote@ORI\endnote
\def\endnote{\caption@withoptargs\caption@endnote}%
@@ -3667,22 +4035,19 @@
\let\caption@endnotetext@ORI\@endnotetext
\let\@endnotetext\caption@gobble
% \end{macrocode}
-% \begin{macrocode}
- \let\pagenote\caption@gobble
-% \end{macrocode}
-% Adaption to the \package{acronym} package\par
-% See also \url{https://tex.stackexchange.com/questions/428788}
+% Adaption to the \package{acronym} package\par
+% See also \url{https://tex.stackexchange.com/questions/428788}
% \begin{macrocode}
\let\acused\@gobble
\let\AC@placelabel\@gobble
% \end{macrocode}
-% Adaption to the \package{glossaries} package.\par
-% Please note that while this adaption is usually sufficient
-% it could give incorrect measuring results if \cs{gls} is both used
-% for the very first time and more than once (for a particular acronym).
-% The alternative would be using internal macros of the
-% \package{glossaries} package which I would like to avoid.\par
-% See also \url{https://tex.stackexchange.com/questions/108368}
+% Adaption to the \package{glossaries} package.\par
+% Please note that while this adaption is usually sufficient
+% it could give incorrect measuring results if \cs{gls} is both used
+% for the very first time and more than once (for a particular acronym).
+% The alternative would be using internal macros of the
+% \package{glossaries} package which I would like to avoid.\par
+% See also \url{https://tex.stackexchange.com/questions/108368}
% \begin{macrocode}
\let\glsunset\@gobble
% \end{macrocode}
@@ -3715,88 +4080,66 @@
\newcommand*\caption@l@stepcounter[1]{%
\advance\csname c@#1\endcsname\@ne\relax}
% \end{macrocode}
-% The patch above assumes that the optional arguments of \cs{footnote} and
-% \cs{footnotemark} match. Since this is not the case in \class{beamer} based documents,
-% and since \class{beamer} extents the syntax of \cs{footnote} in a special way,
-% we need a special patch here.\par
-% \emph{Note:} For this patch we assume that \cs{footnote} will always end with the usage of
-% \cs{beamer@footnotetext}. (Unfortunately \cs{footnote} is defined too monolithic
-% in \class{beamer} to offer a less dirty patch.)
-% \begin{macrocode}
-\caption@ifclassloaded{beamer}{%
- \g@addto@macro\caption@prepareslc{%
- \def\footnote{%
- \begingroup
- \let\stepcounter\caption@l@stepcounter
- \renewcommand<>\beamer@framefootnotetext[1]{%
- \endgroup}%
- \let\@footnotetext\beamer@framefootnotetext
- \caption@footnote@ORI}}}{}
-% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\caption@applyfont}
% \changes{v1.3}{2010/09/04}{This macro added}
-% |\caption@applyfont|\par
-% This macro executes the font relevant macros, i.e. by default
-% the options set by |justification=|, |font=|, and |size=|.
+% |\caption@applyfont|\\
+% applies the relevant font settings, i.e. by default
+% the options set by |justification=|, |font=|, and |size=|.
% \begin{macrocode}
\newcommand*\caption@applyfont{%
- \caption@hj\captionfont\captionsize}
+ \caption@justification\captionfont\captionsize}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\caption@@@make}
% \changes{v1.0b}{2004/05/16}{Bugfix 04-05-06: \cs{allowhyphens} added}
-% \changes{v1.0c}{2005/02/12}{Bugfix 04-12-16: Use some kind of
-% \cs{@startstrut}\cs{strutbox} instead of \cs{strut}}
+% \changes{v1.0c}{2005/02/12}{Bugfix 04-12-16: Use some kind of \cs{@startstrut}\cs{strutbox} instead of \cs{strut}}
% \changes{v1.0c}{2005/02/12}{Bugfix 05-01-23: \cs{@finalstrut}\cs{strutbox} added}
-% \changes{v1.0d}{2005/05/05}{Use \cs{caption@ifempty};
-% \cs{let}\cs{caption@ifstrut}\cs{@secondoftwo} added}
+% \changes{v1.0d}{2005/05/05}{Use \cs{caption@ifempty}; \cs{let}\cs{caption@ifstrut}\cs{@secondoftwo} added}
% \changes{v1.0d}{2005/05/05}{Bugfix: Handling of \cs{ifcaption@star} changed}
% \changes{v1.0f}{2005/08/24}{Check for empty label added}
% \changes{v1.0f}{2005/08/25}{\cs{caption@iflf} added}
-% \changes{v1.0j}{2007/02/18}{Usage of \cs{caption@tfmt} added}
+% \changes{v1.0j}{2007/02/18}{Usage of \cs{caption@textformat} added}
% \changes{v1.1}{2007/05/07}{Bugfix: \cs{ifhmode} added to \cs{@finalstrut}}
% \changes{v1.2}{2007/11/17}{Made option \opt{size=} stronger than \opt{font=}}
% \changes{v1.3}{2010/09/04}{Uses \cs{caption@applyfont} now}
% \changes{v1.3}{2010/11/01}{Bugfix: If the caption text is empty, the text format will be set to \opt{simple} now}
-% \changes{v1.7}{2016/02/01}{Bugfix: \cs{relax} added before \cs{caption@lsep} so the label separator
-% will not be gobbled if the label font command ignores spaces, e.g. by usage of \cs{color}}
-% \changes{v1.8}{2018/09/12}{\cs{par} replaced by \cs{captiontextend}}
-% |\caption@@@make|\marg{caption label}\marg{caption text}\par
-% This one finally typesets the caption paragraph, without margin and indention.
+% \changes{v1.7}{2016/02/01}{Bugfix: \cs{relax} added before \cs{caption@lsep} so the label separator will not be gobbled if the label font command ignores spaces, e.g. by usage of \cs{color}}
+% \changes{v1.8}{2018/09/12}{\cs{par} replaced by \cs{caption@textend}}
+% |\caption@@@make|\marg{caption label}\marg{caption text}\\
+% This one finally typesets the caption paragraph, without margin and indention.
% \begin{macrocode}
\newcommand\caption@@@make[2]{%
% \end{macrocode}
-%
-% If the label is empty, we use no caption label separator.
+% If the label is empty, we use no caption label separator.
% \begin{macrocode}
\sbox\@tempboxa{#1}%
\ifdim\wd\@tempboxa=\z@
- \let\caption@lsep\relax
+ \caption@set{labelseparator}{none}%
% \@capbreakfalse
\fi
% \end{macrocode}
-%
-% If the text is empty, we use no caption label separator, too.
-% (And no text format either.)
+% If the text is empty, we use no caption label separator, too.
+% (And no text format either.)
% \begin{macrocode}
\caption@ifempty{#2}{%
- \let\caption@lsep\@empty
- \let\caption@tfmt\@firstofone
+ \caption@set{labelseparator}{none}%
+ \caption@set{textformat}{simple}%
% \@capbreakfalse
% \let\caption@ifstrut\@secondoftwo
}%
% \end{macrocode}
-%
-% Take care that |\caption@parindent| and |\caption@hangindent| will be used
-% to typeset the paragraph.
+% \begin{macrocode}
+ \caption@labelseparator % defines \caption@iflabelfont, \caption@labelsep and \caption@labelsep@name (the latter is needed by \caption@fmt)
+% \end{macrocode}
+% Take care that |\caption@par|\-|indent| and |\caption@hang|\-|indent|
+% will be used to typeset the paragraph.
% \begin{macrocode}
\@setpar{\@@par\caption@@par}\caption@@par
% \end{macrocode}
-%
-% Finally typeset the caption.
+% Finally typeset the caption.
% \begin{macrocode}
\caption@applyfont
\caption@fmt
@@ -3808,26 +4151,26 @@
\fi}%
{\ifcaption@star\else
\begingroup
- \caption@iflf\captionlabelfont
- \relax\caption@lsep
+ \caption@iflabelfont\captionlabelfont
+ \relax\caption@labelsep
\endgroup
\fi}%
{{\captiontextfont
- \captiontextstart
+ \caption@textstart
\caption@ifstrut
{\vrule\@height\ht\strutbox\@width\z@}%
{}%
\nobreak\hskip\z@skip % enable hyphenation
- \caption@tfmt{#2}%
+ \caption@textformat{#2}%
% \caption@ifstrut{\vrule\@height\z@\@depth\dp\strutbox\@width\z@}{}%
\caption@ifstrut
{\ifhmode\@finalstrut\strutbox\fi}%
{}%
- \captiontextend}}}
+ \caption@textend}}}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*\captiontextstart{}
-\newcommand*\captiontextend{\par}
+\newcommand*\caption@textstart{}
+\newcommand*\caption@textend{\par}
% \end{macrocode}
% \end{macro}
%
@@ -3836,12 +4179,12 @@
% \changes{v1.1}{2007/07/04}{Re-defines itself now}
% \changes{v1.2a}{2007/01/22}{Revised so \cs{label} will be detected, too}
% \changes{v1.2b}{2008/08/02}{Revised so \cs{index} and \cs{glossary} will be detected, too}
-% |\caption@ifempty|\marg{text}\marg{true} (\emph{no} \meta{false})\par
-% This one tests if the \meta{text} is actually empty.
-% \Note{This will be done without expanding the text,
-% therefore this is far away from being bullet-proof.}
-% \Note{This macro is re-defining itself so only
-% the first test (in a group) will actually be done.}
+% |\caption@ifempty|\marg{text}\marg{yes-code}\\
+% tests if the \meta{text} is actually empty.
+% \Note{This will be done without expanding the text,
+% therefore this is far away from being bullet-proof.}
+% \Note{This macro is re-defining itself so only
+% the first test (in a group) will actually be done.}
% \begin{macrocode}
\newcommand\caption@ifempty[1]{%
\caption@if@empty{#1}%
@@ -3890,8 +4233,8 @@
%
% \begin{macro}{\caption@@par}
% \changes{v1.0f}{2005/08/22}{Made this definition global}
-% |\caption@@par|\par
-% This command will be executed with every |\par| inside the caption.
+% |\caption@@par|\\
+% will be expanded with every |\par| inside the caption.
% \begin{macrocode}
\newcommand*\caption@@par{%
\parindent\caption@parindent\hangindent\caption@hangindent}%
@@ -3909,36 +4252,58 @@
% \changes{v1.2b}{2008/08/02}{Support of \cs{float@exts} and \cs{float@addtolists} added}
% \changes{v1.2e}{2010/01/09}{Usage of \cs{caption@DeclareWithinOption} added}
% \changes{v1.3}{2011/08/06}{Definition of \cs{listofXXXes} added}
-% \changes{v1.4a}{2011/10/29}{Outsourced as \package{newfloat} package}
-% |\DeclareCaptionType|\oarg{options}\marg{environment}\oarg{name}\oarg{list name}
+% \changes{v1.4a}{2011/10/29}{Outsourced to \package{newfloat} package}
+% |\DeclareCaptionType|\oarg{options}\marg{environment}\oarg{name}\oarg{list name}\\
+% loads the \package{newfloat} package and uses |\Declare|\-|Floating|\-|Environment|.
% \begin{macrocode}
\newcommand*\DeclareCaptionType{%
- \caption@loadpackage{newfloat}{}%
+ \caption@loadpackage{newfloat}{declare type}%
\DeclareFloatingEnvironment}
\@onlypreamble\DeclareCaptionType
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\caption@ForEachType}
+% \begin{macro}{\ForEachCaptionType}
% \changes{v1.4a}{2011/10/29}{This macro added}
-% |\caption@ForEachType|\marg{code}
-% will execute the given code for all (known) floating environments.
+% \changes{v1.13}{2020/07/29}{Renamed from \cs{caption@ForEachType} to \cs{ForEachCaptionType} and starred variant added}
+% |\ForEachCaptionType*|\marg{code with \#1}\\
+% will execute the given code for each (known) floating environment.
+% The starred variant will only work for already existing environments,
+% i.e.~no hook will be placed inside |\Declare|\-|Floating|\-|Environment|
+% (offered by the \package{newfloat} package).
+% \begin{macrocode}
+\newcommand*\ForEachCaptionType{%
+ \@ifstar
+ {\caption@foreach@type\@gobble}%
+ {\caption@foreach@type\@iden}}
+% \end{macrocode}
% \begin{macrocode}
-\newcommand\caption@ForEachType[1]{%
+\newcommand\caption@foreach@type[2]{%
\caption@ifdefined\ForEachFloatingEnvironment
- {\ForEachFloatingEnvironment{#1}}%
- {\def\@elt##1{#1}%
+ {\ForEachFloatingEnvironment*{#2}}%
+ {\def\@elt##1{#2}%
\caption@ifdefined\c@figure\@elt\@gobble{figure}%
\caption@ifdefined\c@table\@elt\@gobble{table}%
- \let\@elt\relax
- \newfloat@addtohook{#1}}}
+ \let\@elt\relax}%
+ #1{\newfloat@addtohook{#2}}}
% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\newfloat@addtohook}
+% |\newfloat@addtohook|\marg{code with \#1}\\
+% adds code to the hook called in |\Declare|\-|Floating|\-|Environment|.\par
+% Note: We use |\provide|\-|command| instead of |\new|\-|command| here since the
+% exact same code is defined in the \package{newfloat} package.
% \begin{macrocode}
\providecommand\newfloat@addtohook[1]{%
\toks@=\expandafter{\newfloat@hook{##1}#1}%
\edef\@tempa{\def\noexpand\newfloat@hook####1{\the\toks@}}%
\@tempa}
% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\newfloat@hook}
+% Hook used in |\Declare|\-|Floating|\-|Environment|.
% \begin{macrocode}
\providecommand*\newfloat@hook[1]{}
% \end{macrocode}
@@ -3954,11 +4319,13 @@
% \changes{v1.5}{2013/01/10}{Bugfix: Definition of autoref string corrected}
% \changes{v1.6}{2013/06/17}{Bugfix: \cs{c@tocdepth} will be set (locally) now}
% \changes{v1.8g}{2020/01/02}{Check revised if the sub-type is already defined or not}
-% |\DeclareCaptionSubType|\oarg{numbering scheme}\marg{type}\\
-% |\DeclareCaptionSubType*|\oarg{numbering scheme}\marg{type}\par
-% The starred variant provides the numbering format
-% \meta{type}|.|\meta{subtype} while the non-starred variant simply
-% uses \meta{subtype}.
+% \changes{v1.13}{2020/07/28}{Uses \cs{caption@l@addto@list} instead of \cs{@cons} now}
+% \changes{v1.13}{2020/07/29}{Usage of \cs{caption@subtype@hook} added}
+% \changes{v1.13}{2020/07/29}{We don't re-use existing counters anymore (This was a bad idea anyway)}
+% |\DeclareCaptionSubType*|\oarg{numbering scheme}\marg{type}\\
+% The starred variant provides the numbering format
+% \meta{type}|.|\meta{subtype} while the non-starred variant simply uses
+% \meta{subtype}.
% \begin{macrocode}
\newcommand*\DeclareCaptionSubType{%
\caption@teststar\caption@declaresubtype\@firstoftwo\@secondoftwo}
@@ -3973,39 +4340,42 @@
\def\caption@@declaresubtype#1[#2]#3{%
\@ifundefined{c@#3}%
{\caption@Error{No float type '#3' defined}}%
+ {\caption@@@declaresubtype{#1}{#2}{#3}{sub#3}}}
+\@onlypreamble\caption@@declaresubtype
% \end{macrocode}
-% Check if the sub-type was already defined by |\Declare|\-|Sub|\-|Type|.
-% If not, define the counter and list entry.
% \begin{macrocode}
- {\caption@ifsubtype{sub#3}%
- {\caption@Debug{Modify subtype `sub#3'}}%
- {\caption@Debug{New subtype `sub#3'}%
- \@ifundefined{c@sub#3}%
- {\newcounter{sub#3}\relax}%
- {\caption@Warning{Using already defined counter `sub#3'}}%
- \@addtoreset{sub#3}{#3}%
- \@namedef{ext@sub#3}{\csname ext@#3\endcsname}%
- \caption@declaresublistentry{#3}%
- \@cons\caption@subtypelist{{#3}}}%
+\newcommand*\caption@@@declaresubtype[4]{%
% \end{macrocode}
-% Support of \package{titletoc} package
% \begin{macrocode}
- \caption@ifdefined\contentsuse{%
- \contentsuse{sub#3}{\csname ext@sub#3\endcsname}}{}%
+% Check if the sub-type was already defined by |\Declare|\-|Sub|\-|Type|.
+% If not, define the counter and list entry.
+% \begin{macrocode}
+ \caption@ifin@list\caption@subtypelist{#4}%
+ {\caption@Debug{Modify subtype `#4'}}%
+ {\caption@Debug{New subtype `#4'}%
+ \newcounter{#4}[{#3}]%
+ \@namedef{ext@#4}{\csname ext@#3\endcsname}%
+ \caption@declaresublistentry{#3}%
+ \caption@l@addto@list\caption@subtypelist{#4}%
+ \caption@subtype@hook{#4}}%
% \end{macrocode}
+% Support of \package{titletoc} package
% \begin{macrocode}
- \@namedef{sub#3name}{}%
- \@namedef{sub#3autorefname}{\csname #3autorefname\endcsname}%
- #1% is \@firstoftwo in star form, and \@secondoftwo otherwise
- {\@namedef{p@sub#3}{}%
- \@namedef{thesub#3}{\csname the#3\endcsname.\@nameuse{#2}{sub#3}}}%
- {\@namedef{p@sub#3}{\csname the#3\endcsname}%
- \@namedef{thesub#3}{\@nameuse{#2}{sub#3}}}%
- \@namedef{theHsub#3}{\csname theH#3\endcsname.\arabic{sub#3}}%
- }}
+ \caption@ifdefined\contentsuse{%
+ \contentsuse{#4}{\csname ext@#4\endcsname}}{}%
% \end{macrocode}
% \begin{macrocode}
-\@onlypreamble\caption@@declaresubtype
+ \@namedef{#4name}{}%
+ \@namedef{#4autorefname}{\csname #3autorefname\endcsname}%
+ #1% is \@firstoftwo in star form, and \@secondoftwo otherwise
+ {\@namedef{p@#4}{}%
+ \@namedef{the#4}{\csname the#3\endcsname.\@nameuse{#2}{#4}}}%
+ {\@namedef{p@#4}{\csname the#3\endcsname}%
+ \@namedef{the#4}{\@nameuse{#2}{#4}}}%
+ \@namedef{theH#4}{\csname theH#3\endcsname.\arabic{#4}}}
+% \end{macrocode}
+% \begin{macrocode}
+\@onlypreamble\caption@@@declaresubtype
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption@declaresublistentry{%
@@ -4026,12 +4396,12 @@
% \begin{macrocode}
\long\def\caption@@@declaresublistentry#1\@dottedtocline#2\caption@nil#3{%
\def\@tempa{#1}%
-% Does \l@(sub)subsection start with \@dottedtocline?
+% Does \l@(sub)subsection start with \@dottedtocline?
\ifx\@tempa\@empty
-% Yes
+% Yes
\caption@@@@declaresublistentry{#3}#2\caption@nil
\else
-% No
+% No
\caption@@@@declaresublistentry{#3}@{3.8em}{3.2em}\caption@nil
\fi}
\@onlypreamble\caption@@@declaresublistentry
@@ -4067,8 +4437,8 @@
% \end{macro}
%
% \begin{macro}{\caption@subtypelist}
-% An \cs{@elt}-list containing the subtypes defined
-% with |\Declare|\-|Caption|\-|Sub|\-|Type|.
+% A list containing the sub-types defined with
+% |\Declare|\-|Caption|\-|Sub|\-|Type|.
% \begin{macrocode}
\newcommand*\caption@subtypelist{}
% \end{macrocode}
@@ -4076,53 +4446,68 @@
%
% \begin{macro}{\caption@ifsubtype}
% \changes{v1.8g}{2020/01/02}{This macro added}
-% This macro checks if the given subtype was defined
-% with |\Declare|\-|Caption|\-|Sub|\-|Type| or not.
+% \changes{v1.13}{2020/07/28}{Uses \cs{caption@ifin@list} now}
+% |\caption@ifsubtype|\marg{yes-code}\marg{no-code}\\
+% checks if the given subtype was defined with
+% |\Declare|\-|Caption|\-|Sub|\-|Type|.
% \begin{macrocode}
-\newcommand*\caption@ifsubtype[1]{%
- \begingroup
- \let\next\@secondoftwo
- \edef\@tempa{#1}%
- \def\@elt##1{%
- \def\@tempb{sub##1}%
- \ifx\@tempa\@tempb
- \let\next\@firstoftwo
- \fi}%
- \caption@subtypelist
- \expandafter\endgroup\next}
+\newcommand*\caption@ifsubtype{%
+ \caption@ifin@list\caption@subtypelist}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ForEachCaptionSubType}
+% \changes{v1.13}{2020/07/29}{This macro added as replacement for \cs{caption@For}}
+% |\ForEachCaptionSubType*|\marg{code with \#1}\\
+% will execute the given code for each (known) sub-type.
+% The starred variant will only work for already existing sub-types,
+% i.e.~no hook will be placed inside |\Declare|\-|Caption|\-|Sub|\-|Type|.
+% \begin{macrocode}
+\newcommand*\ForEachCaptionSubType{%
+ \@ifstar
+ {\caption@foreach@subtype\@gobble}%
+ {\caption@foreach@subtype\@iden}}
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand\caption@foreach@subtype[2]{%
+ \caption@for@list\caption@subtypelist{#2}%
+ #1{\caption@addto@subtype@hook{#2}}}
+% \end{macrocode}
+% \begin{macrocode}
+\providecommand\caption@addto@subtype@hook[1]{%
+ \toks@=\expandafter{\caption@subtype@hook{##1}#1}%
+ \edef\@tempa{\def\noexpand\caption@subtype@hook####1{\the\toks@}}%
+ \@tempa}
+% \end{macrocode}
+% \begin{macrocode}
+\providecommand*\caption@subtype@hook[1]{}
% \end{macrocode}
% \end{macro}
%
% Unfortunately the \class{memoir} document class resets the
% \texttt{subfigure} resp.~\texttt{subtable} counter at the begin
% of floating environments, i.e.~at |\@float|.
-% As a side-effect |\Continued|\-|Float| does not work correctly.
+% As a side-effect |\continued|\-|float| does not work correctly.
% For that reason we need to introduce macros to save and restore
% all sub-caption counters here.
%
-% \begin{macro}{\caption@restorecounters}
-% \changes{v1.5}{2013/05/01}{This macro added}
-% |\caption@restore|\-|counters| restores all counters saved with
-% |\caption@save|\-|counter|.
-% \begin{macrocode}
-\newcommand*\caption@restorecounters{%
- \caption@restore@counters
- \global\let\caption@restore@counters\@empty}
-% \end{macrocode}
-% \begin{macrocode}
-\newcommand*\caption@restore@counters{}
-% \end{macrocode}
-% \end{macro}
% \begin{macro}{\caption@savesubcounters}
% \changes{v1.5}{2013/05/01}{This macro added}
-% |\caption@save|\-|sub|\-|counters| saves all sub-caption counters,
-% so they can be restored with |\caption@restore|\-|counters| later on.
+% \changes{v1.13}{2020/07/28}{Uses \cs{caption@for@list} now for iterating the list}
+% |\caption@save|\-|sub|\-|counters|\\
+% saves all sub-caption counters,
+% so they can be restored with |\caption@restore|\-|counters| later on.
% \begin{macrocode}
\newcommand*\caption@savesubcounters{%
- \def\@elt##1{\caption@savecounter{sub##1}}%
- \caption@subtypelist
- \let\@elt\relax}%
+ \caption@for@list\caption@subtypelist{\caption@savecounter{##1}}}
% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@savecounter}
+% \changes{v1.5}{2013/05/01}{This macro added}
+% |\caption@save|\-|counter|\marg{counter}\\
+% saves the given counter, so it can be restored with
+% |\caption@restore|\-|counters| later on.
% \begin{macrocode}
\newcommand*\caption@savecounter[1]{%
\edef\caption@tempa{%
@@ -4132,26 +4517,42 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\caption@For}
-% \changes{v1.1a}{2007/09/07}{This macro added}
-% \changes{v1.2}{2007/11/16}{Renamed from \cs{ForFloatingEnvironments} to \cs{caption@For}}
-% |\caption@For|\marg{elt-list}\marg{code with \#1}\\
-% |\caption@For*|\marg{elt-list}\marg{code with \#1}
+% \begin{macro}{\caption@restorecounters}
+% \changes{v1.5}{2013/05/01}{This macro added}
+% |\caption@restore|\-|counters|
+% restores all counters saved with |\caption@save|\-|counter|.
% \begin{macrocode}
-\newcommand*\caption@For{%
- \caption@withoptargs\caption@@For}
-%\@onlypreamble\caption@For
+\newcommand*\caption@restorecounters{%
+ \caption@restore@counters
+ \global\let\caption@restore@counters\@empty}
% \end{macrocode}
% \begin{macrocode}
-\newcommand\caption@@For[3]{%
- \caption@AtBeginDocument#1{%
- \def\@elt##1{#3}%
- \@nameuse{caption@#2}%
- \let\@elt\relax}}%
-%\@onlypreamble\caption@@For
+\newcommand*\caption@restore@counters{}
% \end{macrocode}
% \end{macro}
%
+% \section{Execution of options}
+%
+% \begin{macrocode}
+\ifx\caption@documentclass\@empty\else
+ \@pushfilename
+ \edef\@currname{caption-\caption@documentclass}
+ \edef\@currext{sto}
+ \InputIfFileExists
+ {\@currname.\@currext}%
+ {}%
+ {\@missingfileerror\@currname\@currext}%
+ \@popfilename
+\fi
+% \end{macrocode}
+%
+% \begin{macrocode}
+\captionsetup{style=default,position=default,listformat=default}
+% \end{macrocode}
+% \begin{macrocode}
+\ProcessOptions*
+% \end{macrocode}
+%
% \iffalse
%</package>
% \fi
diff --git a/macros/latex/contrib/caption/ltcaption.dtx b/macros/latex/contrib/caption/ltcaption.dtx
index 314528d58b..a4f75ae72a 100644
--- a/macros/latex/contrib/caption/ltcaption.dtx
+++ b/macros/latex/contrib/caption/ltcaption.dtx
@@ -19,11 +19,15 @@
% This Current Maintainer of this work is Axel Sommerfeldt.
%
% This work consists of the files
-% caption.ins, caption.dtx, caption2.dtx, caption3.dtx,
-% bicaption.dtx, ltcaption.dtx, subcaption.dtx, totalcount.dtx,
+% caption.ins, caption.dtx, caption-light.dtx, caption2.dtx, caption3.dtx,
+% caption-ams-smf.dtx, caption-beamer.dtx, caption-elsarticle.dtx,
+% caption-koma.dtx, caption-memoir.dtx, caption-ntg.dtx,
+% caption-thesis.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx,
% the derived files
-% caption.sty, caption2.sty, caption3.sty,
-% bicaption.sty, ltcaption.sty, subcaption.sty, totalcount.sty,
+% caption.sty, caption-light.sty, caption2.sty, caption3.sty,
+% caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
+% caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
+% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty,
% and the user manuals
% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%
@@ -33,9 +37,7 @@
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{ltcaption.drv}%
- [2013/06/01 v1.4 This package fixes caption problems with
- other-than-centered aligned longtables]
+\ProvidesFile{ltcaption.drv}[2013/06/01 v1.4 This package fixes caption problems with other-than-centered aligned longtables]
\hbadness=9999 \newcount\hbadness \hfuzz=48pt % Make TeX shut up.
%
\documentclass{ltxdoc}
diff --git a/macros/latex/contrib/caption/subcaption.dtx b/macros/latex/contrib/caption/subcaption.dtx
index a3b8bdb2ee..90586d10d9 100644
--- a/macros/latex/contrib/caption/subcaption.dtx
+++ b/macros/latex/contrib/caption/subcaption.dtx
@@ -19,21 +19,25 @@
% This Current Maintainer of this work is Axel Sommerfeldt.
%
% This work consists of the files
-% caption.ins, caption.dtx, caption2.dtx, caption3.dtx,
-% bicaption.dtx, ltcaption.dtx, subcaption.dtx, totalcount.dtx,
+% caption.ins, caption.dtx, caption-light.dtx, caption2.dtx, caption3.dtx,
+% caption-ams-smf.dtx, caption-beamer.dtx, caption-elsarticle.dtx,
+% caption-koma.dtx, caption-memoir.dtx, caption-ntg.dtx,
+% caption-thesis.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx,
% the derived files
-% caption.sty, caption2.sty, caption3.sty,
-% bicaption.sty, ltcaption.sty, subcaption.sty, totalcount.sty,
+% caption.sty, caption-light.sty, caption2.sty, caption3.sty,
+% caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
+% caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
+% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty,
% and the user manuals
% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%
% \fi
-% \CheckSum{232}
+% \CheckSum{228}
%
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{subcaption.drv}[2019/09/10 v1.3 Adds a sub-caption feature to the caption package]
+\ProvidesFile{subcaption.drv}[2020/08/24 v1.3 Adds a sub-caption feature to the caption package]
\hbadness=9999 \newcount\hbadness \hfuzz=74pt % Make TeX shut up.
%\errorcontextlines=3
%
@@ -176,7 +180,7 @@
%
% The default settings for |sub|captions are:
% \begin{quote}
-% |margin=0pt,size=smaller,labelformat=parens,labelsep=space,|\\
+% |margin=0pt,font+=smaller,labelformat=parens,labelsep=space,|\\
% |skip=6pt,list=false,hypcap=false|~\footnote{%^^A
% This means that sub-captions are not listed in the List of Figures
% or Tables by default, but you can enable that by
@@ -197,7 +201,7 @@
% \item Local settings
% {\small(|\captionsetup{|\ldots|}| inside |figure| or |table| environment)}
% \item Default `sub' settings
-% {\small(|margin=0pt,size=smaller,|\ldots, see above)}
+% {\small(|margin=0pt,font+=smaller,|\ldots, see above)}
% \item Custom `sub' settings
% {\small(|\usepackage[|\ldots|]{subcaption}| and |\captionsetup[sub]{|\ldots|}|)}
% \item Environmental `sub' settings
@@ -349,7 +353,16 @@
% \begin{background}
% The |\sub|\-|caption|\-|box| is a |\par|\-|box| with
% |\set|\-|caption|\-|sub|\-|type| as first contents line.
-% \iffalse See implementation for details.\fi
+% \iffalse
+% Prepared with |\Declare|\-|Caption|\-|Sub|\-|Type| (offered by the
+% \package{caption} package), the caption package command |\set|\-|caption|\-|sub|\-|type|
+% becames available.
+% Analogous to the |\set|\-|caption|\-|type| command of the \package{caption} package,
+% the |\set|\-|caption|\-|sub|\-|type| command sets the sub-type of the box or environment
+% (so |\caption| will typeset a sub-caption instead of an ordinary one),
+% places a proper hyperlink anchor (non-starred variant only),
+% executes options associated with the sub-type etc.
+% \fi
% \end{background}
%
% \PageBreak
@@ -416,7 +429,7 @@
% The |subfigure| \& |subtable| environments are just simple |minipage|
% environments with |\set|\-|caption|\-|sub|\-|type| as first contents line.
% These environments are defined with the help of
-% |\caption@For{subtypelist}|, which executes code for every sub-type
+% |\For|\-|Each|\-|Caption|\-|Sub|\-|Type|, which executes code for every sub-type
% declared with |\Declare|\-|Caption|\-|Sub|\-|Type|.
% \end{background}
%
@@ -466,14 +479,6 @@
% \bigskip
%
% \begin{background}
-% Prepared with |\Declare|\-|Caption|\-|Sub|\-|Type| (offered by the
-% \package{caption} package), the caption package command |\set|\-|caption|\-|sub|\-|type|
-% becames available.
-% Analogous to the |\set|\-|caption|\-|type| command of the \package{caption} package,
-% the |\set|\-|caption|\-|sub|\-|type| command sets the sub-type of the box or environment
-% (so |\caption| will typeset a sub-caption instead of an ordinary one),
-% places a proper hyperlink anchor (non-starred variant only),
-% executes options associated with the sub-type etc.\par
% The |\subcaption| command is just a simple combination of
% |\set|\-|caption|\-|sub|\-|type*| and |\caption|.
% \end{background}
@@ -484,9 +489,6 @@
% \DescribeMacro\DeclareCaptionSubType
% For using the sub-caption feature of the \package{caption} package some
% commands and counters must be prepared. This is done with
-% \iffalse\footnote{%^^A
-% \cs{newsubfloat} offered by the \package{subfig} package\cite{subfig}
-% could be used for this purpose as well.}\fi
% \begin{quote}
% |\DeclareCaptionSubType|\oarg{numbering scheme}\marg{type}\\
% |\DeclareCaptionSubType*|\oarg{numbering scheme}\marg{type}
@@ -536,8 +538,8 @@
% \end{minipage}
%
% \begin{background}
-% |\Declare|\-|Caption|\-|Sub|\-|Type| is an integral part of the \package{caption}
-% package kernel.
+% |\Declare|\-|Caption|\-|Sub|\-|Type| and |\For|\-|Each|\-|Caption|\-|Sub|\-|Type|
+% are integral parts of the \package{caption} package kernel.
% \end{background}
%
% \PageBreak
@@ -797,12 +799,16 @@
%
% \pagebreak[3]
% \section{Beyond this package}
-% \label{floatrow}
+% \label{keyfloat}\label{floatrow}
%
% For a more advanced usage of the sub-caption feature of the
-% \package{caption} package, please take a look at the \package{floatrow}
-% package\cite{floatrow} which provides the powerful \texttt{subfloatrow}
-% environment for typesetting sub-figures.
+% \package{caption} package, please take a look at the excellent
+% \package{keyfloat} package\cite{keyfloat} which provides the environments
+% |key|\-|sub|\-|figs|, |key|\-|sub|\-|tabs|, and |key|\-|sub|\-|floats| for
+% typesetting sub-figures and sub-tables.
+%
+% Furthermore the \package{floatrow} package\cite{floatrow} provides the
+% |sub|\-|float|\-|row| environment for typesetting sub-figures.
%
% \iffalse
% --------------------------------------------------------------------------- %
@@ -840,6 +846,11 @@
% \href{http://www.ctan.org/pkg/hypcap}%
% {\emph{The hypcap package -- Adjusting anchors of captions}},
% 2007/04/09
+% \bibitem{keyfloat}
+% Brian Duun:\\
+% \href{http://www.ctan.org/pkg/keyfloat}%
+% {\emph{The \LaTeX\ keyfloat Package}},
+% 2019/09/23
% \iffalse
% \bibitem{subfig}
% Steven D. Cochran:\\
@@ -924,37 +935,39 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{subcaption}[2020/01/22 v1.3d Sub-captions (AR)]
+\ProvidesPackage{subcaption}[2020/08/23 v1.3g Sub-captions (AR)]
% \end{macrocode}
%
% \subsection{Initial code}
%
% Since we base on the \package{caption} package we load it here.
% \begin{macrocode}
-\RequirePackage{caption}[2020/01/03] % needs v3.4h or newer
+\RequirePackage{caption}[2020/08/23] % needs v3.5 or newer
% \end{macrocode}
%
% \begin{macro}{\subcaption@CheckCompatibility}
% \changes{v1.1}{2011/09/01}{Compatibility error added}
% \changes{v1.1}{2016/05/22}{The presence of \package{subfigure} or \package{subfig} will be checked \cs{AtBeginDocument}, too}
+% \changes{v1.3g}{2020/08/01}{Error text adapted to \package{caption} package~\version{4.0}}
% Since we are incompatible to them an error message will be issued when
% the \package{subfigure} or \package{subfig} package is loaded.
% \begin{macrocode}
-\newcommand\subcaption@CheckCompatibility{%
+\newcommand*\subcaption@CheckCompatibility{%
% \end{macrocode}
% \begin{macrocode}
- \@ifundefined{caption@ifcompatibility}{}{%
- \caption@ifcompatibility{%
- \caption@Error{%
- The `subcaption' package does not work correctly\MessageBreak
- in compatibility mode}}{}}%
+ \caption@ifcompatibility{%
+ \PackageError{subcaption}%
+ {This package does not work with\MessageBreak
+ caption option `compatibility=v1'}%
+ {\subcaption@eh}%
+ \endinput}{}%
% \end{macrocode}
% \begin{macrocode}
\@ifpackageloaded{subfigure}{%
\PackageError{subcaption}%
{This package can't be used in cooperation\MessageBreak
with the subfigure package}%
- {\subcaption@EH}%
+ {\subcaption@eh}%
\endinput}{}%
% \end{macrocode}
% \begin{macrocode}
@@ -962,27 +975,23 @@
\PackageError{subcaption}%
{This package can't be used in cooperation\MessageBreak
with the subfig package}%
- {\subcaption@EH}%
+ {\subcaption@eh}%
\endinput}{}%
% \end{macrocode}
% \begin{macrocode}
}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*\subcaption@EH{%
+\newcommand*\subcaption@eh{%
If you do not understand this error, please take a closer look\MessageBreak
at the documentation of the `subcaption' package, especially the\MessageBreak
section about errors.\MessageBreak\@ehc}
% \end{macrocode}
% \begin{macrocode}
\subcaption@CheckCompatibility
-% \end{macrocode}
-% \begin{macrocode}
\caption@AtBeginDocument{%
\subcaption@CheckCompatibility
- \let\subcaption@CheckCompatibility\@undefined
- \let\subcaption@EH\@undefined
-}
+ \let\subcaption@CheckCompatibility\@undefined}
% \end{macrocode}
% \end{macro}
%
@@ -990,9 +999,9 @@
%
% \changes{v1.1}{2011/10/30}{Adapted to the newfloat package}
% We call |\Declare|\-|Caption|\-|Sub|\-|Type| for |figure|, |table|,
-% and each caption type declared with |\Declare|\-|Floating|\-|Environment| here.
+% and each floating environment declared with |\Declare|\-|Floating|\-|Environment| here.
% \begin{macrocode}
-\caption@ForEachType{\DeclareCaptionSubType{#1}}
+\ForEachCaptionType{\DeclareCaptionSubType{#1}}
% \end{macrocode}
%
% \begin{macro}{\newsubfloat}
@@ -1055,20 +1064,21 @@
% \begin{macro}{subtable}
% \changes{v1.2}{2016/02/21}{Optional argument values `B' and `T' added}
% \changes{v1.3d}{2020/01/22}{Definition and usage of \cs{@subfloatboxreset} added}
+% \changes{v1.3e}{2020/07/29}{Uses \cs{ForEachCaptionSubType} (instead of \cs{caption@For}) to define the environments now}
% This is just an ordinary \env{minipage} environment with
% |\setcaptionsubtype| as first contents line.
-% It will be defined using the helper macro |\caption@For{sub|\-|type|\-|list}|
-% offered by the \package{caption} kernel, so for every caption type
-% declared with |\Declare|\-|Floating|\-|Environment| a corresponding
+% It will be defined using the helper macro |\For|\-|Each|\-|Caption|\-|Sub|\-|Type|
+% offered by the \package{caption} kernel, so for every caption sub-type
+% declared with |\Declare|\-|Caption|\-|Sub|\-|Type| a corresponding
% `sub' environment will be defined automatically.
% \begin{macrocode}
-\caption@For{subtypelist}{%
- \newenvironment{sub#1}%
+\ForEachCaptionSubType{%
+ \newenvironment{#1}%
{\@ifnextchar[%]
\subcaption@iminipage
{\subcaption@iminipage[c]}}%
{\subcaption@endminipage
- \endminipage}}%
+ \endminipage}}
% \end{macrocode}
% We pass all other optional arguments using the generic helper macro
% |\caption@with|\-|opt|\-|args| offered by the \package{caption} kernel).
@@ -1183,13 +1193,14 @@
% \end{macrocode}
%
% \begin{macro}{\subcaption@setrefformat}
+% \changes{v1.3g}{2020/07/27}{Adapted to \package{caption3} v2.0}
% |\subcaption@setrefformat|\marg{name}\par
% Selecting a subref format simply means saving the code (in |\subcaption@reffmt|).
% \begin{macrocode}
\newcommand*\subcaption@setrefformat[1]{%
- \@ifundefined{caption@lfmt@#1}%
+ \@ifundefined{caption@labelformat@#1}%
{\caption@Error{Undefined label format `#1'}}%
- {\expandafter\let\expandafter\subcaption@reffmt\csname caption@lfmt@#1\endcsname}}
+ {\expandafter\let\expandafter\subcaption@reffmt\csname caption@labelformat@#1\endcsname}}
% \end{macrocode}
% \begin{macrocode}
\subcaption@setrefformat{simple}
@@ -1200,11 +1211,12 @@
%
% We use |\caption@ExecuteOptions| and |\caption@ProcessOptions| here to add
% the options to the `|sub|' option list instead of executing them immediately.
-% \changes{v1.1}{2018/05/01}{Bugfix: Option \texttt{font+=small} changed to \texttt{size=smaller}}
+% \changes{v1.1}{2018/05/01}{Option \texttt{font+=smaller} changed to \texttt{size=smaller}}
+% \changes{v1.3e}{2020/07/27}{Option \texttt{size=smaller} changed back to \texttt{font+=smaller}}
% \begin{macrocode}
\caption@SetupOptions{subcaption}{\captionsetup[sub]{#2}}%
\caption@ExecuteOptions{subcaption}{%
- size=smaller,labelformat=parens,labelsep=space,skip=6pt,list=0,hypcap=0}
+ font+=smaller,labelformat=parens,labelsep=space,skip=6pt,list=0,hypcap=0}
\caption@ProcessOptions*{subcaption}
% \end{macrocode}
%
@@ -1218,6 +1230,7 @@
% \changes{v1.3}{2019/08/31}{This macro re-added and revised}
% \changes{v1.3a}{2019/09/01}{\cs{ignorespaces} copied from \cs{sf@@@subfloat}}
% \changes{v1.3b}{2020/01/03}{Previous definition of \cs{subfloat} will be overwritten}
+% \changes{v1.3f}{2020/07/29}{Bugfix: Usage of \cs{caption@hj@default} replaced by \cs{captionbox@innerpos@default}}
% |\subfloat|\oarg{list\_entry}\oarg{sub-caption}\marg{body}\par
% If \meta{sub-caption} is given, we map this to |\sub|\-|caption|\-|box|
% but transfer the |\label| from \meta{body} to \meta{sub-caption}.
@@ -1237,7 +1250,7 @@
% \end{macrocode}
% \begin{macrocode}
\long\def\@@@subfloat#1#2#3{%
- \caption@getlabel#3\label{}\@nil
+ \caption@getlabel{#3}%
#1{#2\caption@thelabel}{\let\label\caption@gobble#3}%
\global\let\caption@thelabel\relax
\ignorespaces}
@@ -1250,7 +1263,7 @@
{\phantomcaption\@gobble}{\phantomcaption\@gobble}% no box with \caption
{}% no optional arguments for \caption
{}% no sub-caption
- [\wd\@tempboxa][\caption@hj@default]%
+ [\wd\@tempboxa][\captionbox@innerpos@default]%
{\unhbox\@tempboxa}%
\ignorespaces}
% \end{macrocode}
diff --git a/macros/latex/contrib/caption/subcaption.pdf b/macros/latex/contrib/caption/subcaption.pdf
index 8a4257ed5e..4f31cd934a 100644
--- a/macros/latex/contrib/caption/subcaption.pdf
+++ b/macros/latex/contrib/caption/subcaption.pdf
Binary files differ
diff --git a/macros/latex/contrib/fduthesis/README.md b/macros/latex/contrib/fduthesis/README.md
index 563fb4b89d..1a43d90b6a 100644
--- a/macros/latex/contrib/fduthesis/README.md
+++ b/macros/latex/contrib/fduthesis/README.md
@@ -1,7 +1,7 @@
The `fduthesis` Class
=====================
-*LaTeX thesis template for Fudan University, v0.7d*
+*LaTeX thesis template for Fudan University, v0.7e*
Overview
--------
@@ -78,4 +78,4 @@ version.
-----
-Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
+Copyright (C) 2017&ndash;2020 by Xiangdong Zeng <xdzeng96@gmail.com>.
diff --git a/macros/latex/contrib/fduthesis/fduthesis-code.pdf b/macros/latex/contrib/fduthesis/fduthesis-code.pdf
index 6848703e9a..428fde6903 100644
--- a/macros/latex/contrib/fduthesis/fduthesis-code.pdf
+++ b/macros/latex/contrib/fduthesis/fduthesis-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/fduthesis/fduthesis-doc.dtx b/macros/latex/contrib/fduthesis/fduthesis-doc.dtx
index 6952003bca..9bc77b7821 100644
--- a/macros/latex/contrib/fduthesis/fduthesis-doc.dtx
+++ b/macros/latex/contrib/fduthesis/fduthesis-doc.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96@gmail.com>
+% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96@gmail.com>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -350,7 +350,7 @@
%
% \changes{v0.4}{2017/08/09}{[\pkg{fdudoc}] 修复 \cls{ctxdoc}
% 文档类 v2.4.10 之前版本中行距偏小的问题,见 ctex-kit
-% \href{https://github.com/CTeX-org/ctex-kit/issues/303}{\#~303}。}
+% \href{https://github.com/CTeX-org/ctex-kit/issues/303}{\#303}。}
%
% \begin{macro}{\@@_swap_cr:,\@@_swap_cr_aux:w}
% 把 \cs{l_@@_macro_code_line_tl} 中的回车符 |^^M| 挪到外面。
@@ -1722,12 +1722,12 @@
% 西文字体。为兼容 macOS,系统字体需使用字体名,而 \TeXLive{}
% 中的字体需使用文件名。
% \begin{macrocode}
-\setmainfont{libertinusserif}[%
+\setmainfont{LibertinusSerif}[%
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic,
+ UprightFont = *-Regular,
+ BoldFont = *-Bold,
+ ItalicFont = *-Italic,
+ BoldItalicFont = *-BoldItalic,
Scale = 1.1]
\setsansfont{IBMPlexSansCondensed}[%
Extension = .otf,
@@ -1739,7 +1739,7 @@
UprightFont = * Light,
BoldFont = * Semibold,
Scale = MatchLowercase]
-\setmathfont{libertinusmath-regular.otf}
+\setmathfont{LibertinusMath-Regular.otf}
% \end{macrocode}
%
% 中文字体。
diff --git a/macros/latex/contrib/fduthesis/fduthesis-en.pdf b/macros/latex/contrib/fduthesis/fduthesis-en.pdf
index abbd146003..2ee02030d2 100644
--- a/macros/latex/contrib/fduthesis/fduthesis-en.pdf
+++ b/macros/latex/contrib/fduthesis/fduthesis-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/fduthesis/fduthesis-logo.dtx b/macros/latex/contrib/fduthesis/fduthesis-logo.dtx
index 46edb6afca..fc8735f1a2 100644
--- a/macros/latex/contrib/fduthesis/fduthesis-logo.dtx
+++ b/macros/latex/contrib/fduthesis/fduthesis-logo.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96@gmail.com>
+% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96@gmail.com>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
diff --git a/macros/latex/contrib/fduthesis/fduthesis.dtx b/macros/latex/contrib/fduthesis/fduthesis.dtx
index cd50a39ec6..6f536377da 100644
--- a/macros/latex/contrib/fduthesis/fduthesis.dtx
+++ b/macros/latex/contrib/fduthesis/fduthesis.dtx
@@ -2,7 +2,7 @@
% !TeX program = XeLaTeX
% !TeX encoding = UTF-8
%
-% Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96@gmail.com>
+% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96@gmail.com>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -47,7 +47,7 @@
The `fduthesis` Class
=====================
-*LaTeX thesis template for Fudan University, v0.7d*
+*LaTeX thesis template for Fudan University, v0.7e*
Overview
--------
@@ -124,7 +124,7 @@ version.
-----
-Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
+Copyright (C) 2017&ndash;2020 by Xiangdong Zeng <xdzeng96@gmail.com>.
%</readme>
%
%<*internal>
@@ -142,7 +142,7 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
\preamble
- Copyright (C) 2017--2019 by Xiangdong Zeng <xdzeng96@gmail.com>
+ Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96@gmail.com>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -236,7 +236,7 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
%<class|class-en|doc|logo>\NeedsTeXFormat{LaTeX2e}
%<class|class-en|doc|logo>\RequirePackage{expl3}
%<*!(driver|install|ex-logo|cover)>
-%<!readme>\GetIdInfo $Id: fduthesis.dtx 0.7d 2019-04-03 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $
+%<!readme>\GetIdInfo $Id: fduthesis.dtx 0.7e 2020-08-30 12:00:00Z Xiangdong Zeng <xdzeng96@gmail.com> $
%<class> {Thesis template for Fudan University}
%<class>\ProvidesExplClass{\ExplFileName}
%<class-en> {Thesis template for Fudan University (English version)}
@@ -252,7 +252,7 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
%<*driver>
% \PassOptionsToPackage{showframe}{geometry}
\documentclass{fdudoc}
-\usepackage{multirow,xpinyin}
+\usepackage{multirow,xeCJKfntef,xpinyin}
\hypersetup{
pdftitle = {fduthesis: 复旦大学论文模板},
pdfauthor = {曾祥东}}
@@ -261,8 +261,6 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
\def\FSFW{“{\xeCJKsetup{PunctStyle=banjiao}.}”} % U+FF0E
\def\COFW{“{\xeCJKsetup{PunctStyle=banjiao}:}”} % U+FF1A
\def\SCFW{“{\xeCJKsetup{PunctStyle=banjiao};}”} % U+FF1B
-% Libertinus Math 字体不包含 `\QED`,暂时使用 `\blacksquare` 代替
-\AtBeginDocument{\def\QED{\blacksquare}}
%^^A! \PassOptionsToPackage{scheme=plain, linespread=1.1}{ctex}
%^^A! \documentclass{fdudoc}
%^^A! \hypersetup{
@@ -274,19 +272,18 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
%^^A! \pagestyle{headings}
%^^A! \def\FSID{{\xeCJKsetup{PunctStyle=banjiao}。}}
%^^A! \def\FSFW{{\xeCJKsetup{PunctStyle=banjiao}.}}
-%^^A! \AtBeginDocument{\def\QED{\blacksquare}}
%^^A!
\title{\textcolor{MaterialIndigo800}{%
- \textbf{fduthesis: 复旦大学论文\xpinyin[font=\sffamily]{模}{mu2}板}}}
+ \textbf{fduthesis: 复旦大学论文\xpinyin[font=\sffamily,format=\color{MaterialIndigo800}]{模}{mu2}板}}}
\author{曾祥东}
-\date{2019/04/03\quad v0.7d%
+\date{2020/08/30\quad v0.7e%
\thanks{\url{https://github.com/stone-zeng/fduthesis}.}}
%^^A! \title{\textcolor{MaterialIndigo800}{%
%^^A! \textbf{The \textsf{fduthesis} Class \\
%^^A! \LaTeX{} Thesis Template for Fudan University}}}
%^^A! \author{Xiangdong Zeng}
-%^^A! \date{2019/04/03\quad v0.7d%
+%^^A! \date{2020/08/30\quad v0.7e%
%^^A! \thanks{\url{https://github.com/stone-zeng/fduthesis}.}}
%^^A!
@@ -1844,12 +1841,17 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
%^^A! main matter.
%^^A!
%
-% \begin{function}{\tableofcontents}
-% 生成目录。为了生成完整、正确的目录,您至少需要编译\emph{两次}。
+% \begin{function}{\tableofcontents,\listoffigures,\listoftables}
+% 生成目录。为了生成完整、正确的目录,您至少需要编译\emph{两次}。对于图表
+% 较多的论文,也可以使用 \cs{listoffigures} 和 \cs{listoftables} 生成单独的
+% 插图、表格目录。
% \end{function}
%^^A! \begin{function}{\tableofcontents}
%^^A! Generate the table of contents (TOC). You need to compile
%^^A! the source file at least \emph{twice} to get the correct TOC.
+%^^A! If your thesis contains many figures or tables, you may also
+%^^A! use \cs{listoffigures} or \cs{listoftables} to generate a list
+%^^A! of them.
%^^A! \end{function}
%^^A!
%
@@ -2384,14 +2386,14 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \bibitem{clreq}
% W3C.
% \newblock \textit{中文排版需求(Requirements for Chinese Text Layout)} [EB/OL].
-% \newblock (2019-03-13)
+% \newblock (2020-08-17)
% \urlprefix\url{https://w3c.github.io/clreq/}
%
% \bibitem{复旦大学论文规范}
% 复旦大学图书馆, 复旦大学研究生院.
% \newblock \textit{复旦大学博士、硕士学位论文规范} [EB/OL].
% \newblock 2017 年 3 月修订版.
-% \newblock (2017-03-27)
+% \newblock (2017-03-27)
% \urlprefix\url{http://www.gs.fudan.edu.cn/_upload/article/4c/a8/a82545ef443b9c057c14ba13782c/c883c6f3-6d7f-410c-8f30-d8bde6fcb990.doc}
%
% \subsection{宏包、模版}
@@ -2399,23 +2401,23 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \bibitem{source2e}
% \textsc{Braams J}, \textsc{Carlisle D}, \textsc{Jeffrey A}, et al.
% \newblock \textit{The \LaTeXe{} Sources} [CP/OL].
-% \newblock (2018-12-01)
+% \newblock (2020-02-02)
% \urlprefix\url{https://ctan.org/pkg/latex}
% \urlprefix\CTANurl[源代码:]{macros/latex/base/source2e.pdf}
%
% \bibitem{CTeX}
% \textsc{CTEX.ORG}.
% \newblock \textit{\CTeX{} 宏集手册} [EB/OL].
-% \newblock version 2.4.14,
-% \newblock (2018-05-02)
+% \newblock version 2.5.4,
+% \newblock (2020-08-23)
% \urlprefix\url{https://ctan.org/pkg/ctex}
% \urlprefix\CTANurl[文档及源代码:]{language/chinese/ctex/ctex.pdf}
%
% \bibitem{xeCJK}
% \textsc{CTEX.ORG}.
% \newblock \textit{\pkg{xeCJK} 宏包} [EB/OL].
-% \newblock version 3.7.1,
-% \newblock (2018-04-30)
+% \newblock version 3.8.5,
+% \newblock (2020-08-23)
% \urlprefix\url{https://ctan.org/pkg/xecjk}
% \urlprefix\CTANurl[文档及源代码:]{macros/xetex/latex/xecjk/xeCJK.pdf}
%
@@ -2423,22 +2425,22 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \textsc{Daly P W}.
% \newblock \textit{Natural Sciences Citations and References} [EB/OL].
% \newblock version 8.31b,
-% \newblock (2010-09-13)
+% \newblock (2010-09-13)
% \urlprefix\url{https://ctan.org/pkg/natbib}
% \urlprefix\CTANurl[文档及源代码:]{macros/latex/contrib/natbib/natbib.pdf}
%
% \bibitem{source3}
% \textsc{The \LaTeX3 Project}.
% \newblock \textit{The \LaTeX3 Sources} [CP/OL].
-% \newblock (2019-03-05)
+% \newblock (2020-08-07)
% \urlprefix\url{https://ctan.org/pkg/l3kernel}
% \urlprefix\CTANurl[源代码:]{macros/latex/contrib/l3kernel/source3.pdf}
%
% \bibitem{biblatex}
% \textsc{Lehman P}, \textsc{Kime P}, \textsc{Boruvka A}, et al.
% \newblock \textit{The \pkg{biblatex} Package} [EB/OL].
-% \newblock version 3.12,
-% \newblock (2018-10-18)
+% \newblock version 3.15a,
+% \newblock (2020-08-23)
% \urlprefix\url{https://ctan.org/pkg/biblatex}
% \urlprefix\CTANurl[文档:]{macros/latex/contrib/biblatex/doc/biblatex.pdf}
%
@@ -2446,48 +2448,48 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \textsc{Oetiker T}, \textsc{Partl H}, \textsc{Hyna I}, et al.
% \newblock \textit{The Not So Short Introduction to \LaTeXe{}: Or \LaTeXe{} in 139 minutes} [EB/OL].
% \newblock version 6.2,
-% \newblock (2018-02-28)
+% \newblock (2018-02-28)
% \urlprefix\url{https://ctan.org/pkg/lshort-english}
% \urlprefix\CTANurl[文档:]{info/lshort/english/lshort.pdf}
%
% \bibitem{lshort-zh-cn}
% \textsc{Oetiker T}, \textsc{Partl H}, \textsc{Hyna I}, et al.
-% \newblock \textit{一份不太简短的 \LaTeXe{} 介绍: 或 106 分钟了解 \LaTeXe{}} [EB/OL].
+% \newblock \textit{一份(不太)简短的 \LaTeXe{} 介绍: 或 112 分钟了解 \LaTeXe{}} [EB/OL].
% \newblock \CTeX{} 开发小组, 译.
-% \newblock 原版版本 version 6.2, 中文版本 version 6.0,
-% \newblock (2018-09-01)
+% \newblock 原版版本 version 6.2, 中文版本 version 6.02,
+% \newblock (2020-08-03)
% \urlprefix\url{https://ctan.org/pkg/lshort-zh-cn}
% \urlprefix\CTANurl[文档:]{info/lshort/chinese/lshort-zh-cn.pdf}
%
% \bibitem{biblatex-gb7714-2015}
% 胡振震.
% \newblock \textit{符合 GB/T 7714-2015 标准的 biblatex 参考文献样式} [EB/OL].
-% \newblock version 1.0q,
-% \newblock (2019-02-11)
+% \newblock version 1.0v,
+% \newblock (2020-07-21)
% \urlprefix\url{https://ctan.org/pkg/biblatex-gb7714-2015}
% \urlprefix\CTANurl[文档:]{biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf}
%
% \bibitem{gbt7714}
% 李泽平(\textsc{Zeping L}).
% \newblock \textit{GB/T 7714-2015 \BibTeX{} Style} [EB/OL].
-% \newblock version 1.0.9,
-% \newblock (2018-08-05)
+% \newblock version 2.0.2,
+% \newblock (2020-06-08)
% \urlprefix\url{https://ctan.org/pkg/gbt7714}
% \urlprefix\CTANurl[文档:]{biblio/bibtex/contrib/gbt7714/gbt7714.pdf}
%
% \bibitem{cquthesis}
% 李振楠.
% \newblock \textit{\textsc{CquThesis}:重庆大学毕业论文 \LaTeX{} 模板} [EB/OL].
-% \newblock version 1.30,
-% \newblock (2018-02-23)
+% \newblock version 1.50,
+% \newblock (2020-06-23)
% \urlprefix\url{https://ctan.org/pkg/cquthesis}
% \urlprefix\CTANurl[文档及源代码:]{macros/latex/contrib/cquthesis/cquthesis.pdf}
%
% \bibitem{thuthesis}
-% 薛瑞尼.
+% 清华大学 TUNA 协会.
% \newblock \textit{\textsc{ThuThesis}:清华大学学位论文模板} [EB/OL].
-% \newblock version 5.4.5,
-% \newblock (2018-05-17)
+% \newblock version 6.1.3,
+% \newblock (2020-07-09)
% \urlprefix\url{https://ctan.org/pkg/thuthesis}
% \urlprefix\CTANurl[文档及源代码:]{macros/latex/contrib/thuthesis/thuthesis.pdf}
%
@@ -2495,22 +2497,23 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
%
% \bibitem{sjtuthesis}
% \textsc{SJTUG}.
-% \newblock \textit{上海交通大学 \XeLaTeX{} 学位论文及课程论文模板} [EB/OL].
-% \newblock version 0.10.2,
-% \newblock (2018-11-05)
+% \newblock \textit{上海交通大学学位论文模板} [EB/OL].
+% \newblock version 1.0.0rc7,
+% \newblock (2020-07-31)
% \urlprefix\url{https://github.com/sjtug/SJTUThesis}
+% \urlprefix\url[源代码仓库:]{https://github.com/sjtug/SJTUTeX}
%
% \bibitem{ustcthesis}
% \textsc{USTC \TeX{} User Group}.
% \newblock \textit{中国科学技术大学学位论文 \LaTeX{} 模板} [EB/OL].
-% \newblock version 3.1.03,
-% \newblock (2019-01-01)
+% \newblock version 3.2.1,
+% \newblock (2020-04-03)
% \urlprefix\url{https://github.com/ustctug/ustcthesis}
%
% \bibitem{ucasthesis}
% \textsc{mohuangrui}.
% \newblock \textit{\pkg{ucasthesis} 国科大学位论文 \LaTeX{} 模板} [EB/OL].
-% \newblock (2019-03-14)
+% \newblock (2020-07-28)
% \urlprefix\url{https://github.com/mohuangrui/ucasthesis}
%
% \emph{以下模版现已停止更新。}
@@ -2518,13 +2521,13 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \bibitem{pandoxie2014fduthesislatex}
% \textsc{Pandoxie}.
% \newblock \textit{Fudan University-Latex Template} [EB/OL].
-% \newblock (2014-06-07)
+% \newblock (2014-06-07)
% \urlprefix\url{https://github.com/Pandoxie/FDU-Thesis-Latex}
%
% \bibitem{richard2016fudanthesis}
% \textsc{richard}.
% \newblock \textit{复旦大学硕士学位论文模板} [EB/OL].
-% \newblock (2016-01-31)
+% \newblock (2016-01-31)
% \urlprefix\url{https://github.com/richarddzh/fudan-thesis}
%
% \bibitem{数院毕业论文格式}
@@ -2542,7 +2545,7 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \bibitem{wright2009dtxfile}
% \textsc{Wright J}.
% \newblock \textit{A model dtx file} [EB/OL].
-% \newblock (2009-10-06)
+% \newblock (2009-10-06)
% \urlprefix\url{https://www.texdev.net/2009/10/06/a-model-dtx-file/}
%
% \bibitem{孔雀计划}
@@ -2829,7 +2832,7 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \begin{macrocode}
type .choice:,
type .value_required:n = true,
- type .choices:nn =
+ type .choices:nn =
{ doctor, master, bachelor }
{ \int_set_eq:NN \g_@@_thesis_type_int \l_keys_choice_int },
type .initial:n = bachelor,
@@ -3032,11 +3035,11 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
%
% \changes{v0.7c}{2019/03/05}{重构字体配置,并兼容 macOS。}
%
-% \begin{variable}{\g_@@_font_set_tl, \g_@@_cjk_font_set_tl}
+% \begin{variable}{\g_@@_fontset_tl, \g_@@_cjk_fontset_tl}
% 存放字体选项值。
% \begin{macrocode}
-\tl_new:N \g_@@_font_set_tl
-%<class>\tl_new:N \g_@@_cjk_font_set_tl
+\tl_new:N \g_@@_fontset_tl
+%<class>\tl_new:N \g_@@_cjk_fontset_tl
% \end{macrocode}
% \end{variable}
%
@@ -3048,7 +3051,7 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
{
font .choices:nn =
{ garamond, libertinus, lm, palatino, times, times*, none }
- { \tl_set_eq:NN \g_@@_font_set_tl \l_keys_choice_tl }
+ { \tl_set_eq:NN \g_@@_fontset_tl \l_keys_choice_tl }
}
% \end{macrocode}
% \end{macro}
@@ -3062,7 +3065,7 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
{
cjk-font .choices:nn =
{ adobe, fandol, founder, mac, sinotype, sourcehan, windows, none }
- { \tl_set_eq:NN \g_@@_cjk_font_set_tl \l_keys_choice_tl }
+ { \tl_set_eq:NN \g_@@_cjk_fontset_tl \l_keys_choice_tl }
}
% \end{macrocode}
%</class>
@@ -3180,6 +3183,97 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \end{macrocode}
% \end{macro}
%
+% \changes{v0.7e}{2019/04/10}{兼容 Libertinus 和 XITS 字体的文件名变动。}
+% \begin{macro}{
+% \g_@@_font_family_libertinus_serif_tl,
+% \g_@@_font_family_libertinus_sans_tl,
+% \g_@@_font_style_libertinus_rm_tl,
+% \g_@@_font_style_libertinus_bf_tl,
+% \g_@@_font_style_libertinus_it_tl,
+% \g_@@_font_style_libertinus_bfit_tl,
+% \g_@@_font_style_libertinus_bfsl_tl,
+% \g_@@_font_family_xits_tl,
+% \g_@@_font_style_xits_rm_tl,
+% \g_@@_font_style_xits_bf_tl,
+% \g_@@_font_style_xits_it_tl,
+% \g_@@_font_style_xits_bfit_tl,
+% \g_@@_font_name_libertinus_serif_tl,
+% \g_@@_font_name_libertinus_sans_tl,
+% \g_@@_font_name_libertinus_math_tl,
+% \g_@@_font_name_xits_tl,
+% \g_@@_font_name_xits_math_rm_tl,
+% \g_@@_font_name_xits_math_bf_tl}
+% Libertinus 和 XITS 字体的文件名做过变动,需要特殊处理。
+% \begin{macrocode}
+\tl_new:N \g_@@_font_family_libertinus_serif_tl
+\tl_new:N \g_@@_font_family_libertinus_sans_tl
+\tl_new:N \g_@@_font_style_libertinus_rm_tl
+\tl_new:N \g_@@_font_style_libertinus_bf_tl
+\tl_new:N \g_@@_font_style_libertinus_it_tl
+\tl_new:N \g_@@_font_style_libertinus_bfit_tl
+\tl_new:N \g_@@_font_style_libertinus_bfsl_tl
+\tl_new:N \g_@@_font_family_xits_tl
+\tl_new:N \g_@@_font_style_xits_rm_tl
+\tl_new:N \g_@@_font_style_xits_bf_tl
+\tl_new:N \g_@@_font_style_xits_it_tl
+\tl_new:N \g_@@_font_style_xits_bfit_tl
+\tl_new:N \g_@@_font_name_libertinus_serif_tl
+\tl_new:N \g_@@_font_name_libertinus_sans_tl
+\tl_new:N \g_@@_font_name_libertinus_math_tl
+\tl_new:N \g_@@_font_name_xits_tl
+\tl_new:N \g_@@_font_name_xits_math_rm_tl
+\tl_new:N \g_@@_font_name_xits_math_bf_tl
+\fontspec_font_if_exist:nTF { LibertinusSerif-Regular.otf }
+ {
+ \tl_set:Nn \g_@@_font_family_libertinus_serif_tl { LibertinusSerif }
+ \tl_set:Nn \g_@@_font_family_libertinus_sans_tl { LibertinusSans }
+ \tl_set:Nn \g_@@_font_family_libertinus_math_tl { LibertinusMath }
+ \tl_set:Nn \g_@@_font_style_libertinus_rm_tl { Regular }
+ \tl_set:Nn \g_@@_font_style_libertinus_bf_tl { Bold }
+ \tl_set:Nn \g_@@_font_style_libertinus_it_tl { Italic }
+ \tl_set:Nn \g_@@_font_style_libertinus_bfit_tl { BoldItalic }
+ \tl_set:Nn \g_@@_font_style_libertinus_bfsl_tl { BoldOblique }
+ }
+ {
+ \tl_set:Nn \g_@@_font_family_libertinus_serif_tl { libertinusserif }
+ \tl_set:Nn \g_@@_font_family_libertinus_sans_tl { libertinussans }
+ \tl_set:Nn \g_@@_font_family_libertinus_math_tl { libertinusmath }
+ \tl_set:Nn \g_@@_font_style_libertinus_rm_tl { regular }
+ \tl_set:Nn \g_@@_font_style_libertinus_bf_tl { bold }
+ \tl_set:Nn \g_@@_font_style_libertinus_it_tl { italic }
+ \tl_set:Nn \g_@@_font_style_libertinus_bfit_tl { bolditalic }
+ \tl_set:Nn \g_@@_font_style_libertinus_bfsl_tl { bolditalic }
+ }
+\fontspec_font_if_exist:nTF { XITS-Regular.otf }
+ {
+ \tl_set:Nn \g_@@_font_family_xits_tl { XITS }
+ \tl_set:Nn \g_@@_font_style_xits_rm_tl { Regular }
+ \tl_set:Nn \g_@@_font_style_xits_bf_tl { Bold }
+ \tl_set:Nn \g_@@_font_style_xits_it_tl { Italic }
+ \tl_set:Nn \g_@@_font_style_xits_bfit_tl { BoldItalic }
+ \tl_set:Nn \g_@@_font_name_xits_math_rm_tl { XITSMath-Regular }
+ \tl_set:Nn \g_@@_font_name_xits_math_bf_tl { XITSMath-Bold }
+ }
+ {
+ \tl_set:Nn \g_@@_font_family_xits_tl { xits }
+ \tl_set:Nn \g_@@_font_style_xits_rm_tl { regular }
+ \tl_set:Nn \g_@@_font_style_xits_bf_tl { bold }
+ \tl_set:Nn \g_@@_font_style_xits_it_tl { italic }
+ \tl_set:Nn \g_@@_font_style_xits_bfit_tl { bolditalic }
+ \tl_set:Nn \g_@@_font_name_xits_math_rm_tl { xits-math }
+ \tl_set:Nn \g_@@_font_name_xits_math_bf_tl { xits-mathbold }
+ }
+\tl_set:Nx \g_@@_font_name_libertinus_serif_tl
+ { \g_@@_font_family_libertinus_serif_tl - \g_@@_font_style_libertinus_rm_tl }
+\tl_set:Nx \g_@@_font_name_libertinus_sans_tl
+ { \g_@@_font_family_libertinus_sans_tl - \g_@@_font_style_libertinus_rm_tl }
+\tl_set:Nx \g_@@_font_name_libertinus_math_tl
+ { \g_@@_font_family_libertinus_math_tl - \g_@@_font_style_libertinus_rm_tl }
+\tl_set:Nx \g_@@_font_name_xits_tl
+ { \g_@@_font_family_xits_tl - \g_@@_font_style_xits_rm_tl }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\@@_load_font_garamond:}
% EB Garamond 系列。
% \begin{macrocode}
@@ -3193,13 +3287,13 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
ItalicFont = *-Italic,
BoldItalicFont = *-BoldItalic
}
- \@@_setsansfont:nn { libertinussans }
+ \@@_setsansfont:nn { \g_@@_font_family_libertinus_sans_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic
+ UprightFont = *-\g_@@_font_style_libertinus_rm_tl,
+ BoldFont = *-\g_@@_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g_@@_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g_@@_font_style_libertinus_bfsl_tl
}
\@@_setmonofont:nn { lmmonolt10 }
{
@@ -3219,21 +3313,21 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \begin{macrocode}
\cs_new_protected:Npn \@@_load_font_libertinus:
{
- \@@_setmainfont:nn { libertinusserif }
+ \@@_setmainfont:nn { \g_@@_font_family_libertinus_serif_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic
+ UprightFont = *-\g_@@_font_style_libertinus_rm_tl,
+ BoldFont = *-\g_@@_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g_@@_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g_@@_font_style_libertinus_bfit_tl
}
- \@@_setsansfont:nn { libertinussans }
+ \@@_setsansfont:nn { \g_@@_font_family_libertinus_sans_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic
+ UprightFont = *-\g_@@_font_style_libertinus_rm_tl,
+ BoldFont = *-\g_@@_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g_@@_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g_@@_font_style_libertinus_bfsl_tl
}
\@@_setmonofont:nn { lmmonolt10 }
{
@@ -3243,7 +3337,7 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
ItalicFont = *-oblique,
BoldItalicFont = *-boldoblique
}
- \@@_setmathfont:nn { libertinusmath-regular.otf } { }
+ \@@_setmathfont:nn { \g_@@_font_name_libertinus_math_tl .otf } { }
}
% \end{macrocode}
% \end{macro}
@@ -3270,13 +3364,13 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
ItalicFont = *-italic,
BoldItalicFont = *-bolditalic
}
- \@@_setsansfont:nn { libertinussans }
+ \@@_setsansfont:nn { \g_@@_font_family_libertinus_sans_tl }
{
Extension = .otf,
- UprightFont = *-regular,
- BoldFont = *-bold,
- ItalicFont = *-italic,
- BoldItalicFont = *-bolditalic,
+ UprightFont = *-\g_@@_font_style_libertinus_rm_tl,
+ BoldFont = *-\g_@@_font_style_libertinus_bf_tl,
+ ItalicFont = *-\g_@@_font_style_libertinus_it_tl,
+ BoldItalicFont = *-\g_@@_font_style_libertinus_bfsl_tl,
Scale = MatchUppercase
}
\@@_setmonofont:nn { lmmonolt10 }
@@ -3297,17 +3391,13 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \begin{macrocode}
\cs_new_protected:Npn \@@_load_font_times:
{
- \@@_setmainfont:nn { XITS }
+ \@@_setmainfont:nn { \g_@@_font_family_xits_tl }
{
Extension = .otf,
- UprightFont = *-Regular,
- BoldFont = *-Bold,
- ItalicFont = *-Italic,
- BoldItalicFont = *-BoldItalic,
- UprightFeatures = { SmallCapsFont = *-Regular },
- BoldFeatures = { SmallCapsFont = *-Bold },
- ItalicFeatures = { SmallCapsFont = *-Italic },
- BoldItalicFeatures = { SmallCapsFont = *-BoldItalic }
+ UprightFont = *-\g_@@_font_style_xits_rm_tl,
+ BoldFont = *-\g_@@_font_style_xits_bf_tl,
+ ItalicFont = *-\g_@@_font_style_xits_it_tl,
+ BoldItalicFont = *-\g_@@_font_style_xits_bfit_tl
}
\@@_setsansfont:nn { texgyreheros }
{
@@ -3326,20 +3416,22 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
BoldItalicFont = *-bolditalic,
Ligatures = CommonOff
}
- \@@_setmathfont:nn { XITSMath-Regular.otf }{ BoldFont = XITSMath-Bold.otf }
+ \@@_setmathfont:nn { \g_@@_font_name_xits_math_rm_tl .otf }
+ { BoldFont = \g_@@_font_name_xits_math_bf_tl .otf }
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\@@_load_font_times*:}
-% Times* 系列,出数学部分外采用系统字体。
+% Times* 系列,除数学部分外采用系统字体。
% \begin{macrocode}
\cs_new_protected:cpn { @@_load_font_ times* : }
{
\@@_setmainfont:nn { Times~ New~ Roman } { }
\@@_setsansfont:nn { Arial } { }
\@@_setmonofont:nn { Courier~ New } { }
- \@@_setmathfont:nn { XITSMath-Regular.otf }{ BoldFont = XITSMath-Bold.otf }
+ \@@_setmathfont:nn { \g_@@_font_name_xits_math_rm_tl .otf }
+ { BoldFont = \g_@@_font_name_xits_math_bf_tl .otf }
}
% \end{macrocode}
% \end{macro}
@@ -3499,8 +3591,8 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \begin{macrocode}
\cs_new_protected:Npn \@@_load_font:
{
- \use:c { @@_load_font_ \g_@@_font_set_tl : }
-%<class> \use:c { @@_load_cjk_font_ \g_@@_cjk_font_set_tl : }
+ \use:c { @@_load_font_ \g_@@_fontset_tl : }
+%<class> \use:c { @@_load_cjk_font_ \g_@@_cjk_fontset_tl : }
}
\ctex_at_end_preamble:n { \@@_load_font: }
% \end{macrocode}
@@ -3915,8 +4007,7 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \begin{macro}{\@@_fn_symbol_libertinus_sans:n}
% \opt{libertinus} 阳文无衬线版。符号排列与普通版相同。
% \begin{macrocode}
-\cs_new_eq:NN \@@_fn_symbol_libertinus_sans:n
- \@@_fn_symbol_libertinus:n
+\cs_new_eq:NN \@@_fn_symbol_libertinus_sans:n \@@_fn_symbol_libertinus:n
% \end{macrocode}
% \end{macro}
%
@@ -4011,17 +4102,17 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \begin{macrocode}
\c_@@_fn_style_libertinus_tl
{
- \fontspec { libertinusserif-regular.otf }
+ \fontspec { \g_@@_font_name_libertinus_serif_tl .otf }
\@@_fn_symbol_libertinus:n {#1}
}
\c_@@_fn_style_libertinus_neg_tl
{
- \fontspec { libertinusserif-regular.otf }
+ \fontspec { \g_@@_font_name_libertinus_serif_tl .otf }
\@@_fn_symbol_libertinus_neg:n {#1}
}
\c_@@_fn_style_libertinus_sans_tl
{
- \fontspec { libertinussans-regular.otf }
+ \fontspec { \g_@@_font_name_libertinus_sans_tl .otf }
\@@_fn_symbol_libertinus_sans:n {#1}
}
% \end{macrocode}
@@ -4040,17 +4131,17 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \begin{macrocode}
\c_@@_fn_style_xits_tl
{
- \fontspec { XITS-Regular.otf }
+ \fontspec { \g_@@_font_name_xits_tl .otf }
\@@_fn_symbol_xits:n {#1}
}
\c_@@_fn_style_xits_sans_tl
{
- \fontspec { XITS-Regular.otf }
+ \fontspec { \g_@@_font_name_xits_tl .otf }
\@@_fn_symbol_xits_sans:n {#1}
}
\c_@@_fn_style_xits_sans_neg_tl
{
- \fontspec { XITS-Regular.otf }
+ \fontspec { \g_@@_font_name_xits_tl .otf }
\@@_fn_symbol_xits_sans_neg:n {#1}
}
}
@@ -5094,9 +5185,9 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
authorization-decl-sig / content =
\@@_cover_signature:N \c_@@_auth_decl_sign_clist,
originality-decl-name / format =
- \@@_line_spread:n { 1.2 } \zihao { -2 } \sffamily,
+ \@@_line_spread:n { 1.2 } \zihao { -2 } \bfseries,
authorization-decl-name / format =
- \@@_line_spread:n { 1.2 } \zihao { -2 } \sffamily,
+ \@@_line_spread:n { 1.2 } \zihao { -2 } \bfseries,
originality-decl-name / bottom-skip = 0.4 cm,
originality-decl-text / bottom-skip = 0.4 cm,
originality-decl-sig / bottom-skip = 0 pt plus 2.5 fill,
@@ -5148,8 +5239,9 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \begin{macrocode}
\keys_set:nn { ctex }
{
-%<class> contentsname = \c_@@_name_toc_tl,
-%<class-en> contentsname = \c_@@_name_toc_en_tl,
+%<class> contentsname = \c_@@_name_toc_tl,
+%<class> listfigurename = \c_@@_name_lof_tl,
+%<class> listtablename = \c_@@_name_lot_tl,
% \end{macrocode}
%
% 设置目录中章节标题的样式。
@@ -5173,17 +5265,36 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
}
% \end{macrocode}
%
-% \begin{macro}{\tableofcontents}
-% 修改 \cs{tableofcontents} 的定义,使得页眉正确显示,并出现在目录中。原代码
-% 来自于 \LaTeXe{} 标准文档类 \file{book.cls}。
+% \changes{v0.7e}{2019/05/12}{增加对插图、表格目录的处理。}
+%
+% \begin{macro}{\tableofcontents,\listoffigures,\listoftables}
+% 修改 \cs{tableofcontents}、\cs{listoffigures} 和 \cs{listoftables} 的定义,
+% 使得页眉正确显示,并出现在目录及 PDF 书签中。来自于 \LaTeXe{} 标准文档类
+% \file{book.cls}
+% \footnote{原代码中只有 \cs{tableofcontents} 的 \cs{@mkboth} 出现在
+% \cs{chapter*} 内部,这是出于兼容性的考虑而非 typo。}。
% \begin{macrocode}
\@@_patch_cmd:Nnn \tableofcontents
{
\chapter*{\contentsname
- \@mkboth{%
- \MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
+ \@mkboth{\MakeUppercase\contentsname}
+ {\MakeUppercase\contentsname}}
}
{ \@@_chapter_no_toc:V \contentsname }
+\@@_patch_cmd:Nnn \listoffigures
+ {
+ \chapter*{\listfigurename}
+ \@mkboth{\MakeUppercase\listfigurename}
+ {\MakeUppercase\listfigurename}
+ }
+ { \@@_chapter:V \listfigurename }
+\@@_patch_cmd:Nnn \listoftables
+ {
+ \chapter*{\listtablename}
+ \@mkboth{\MakeUppercase\listtablename}
+ {\MakeUppercase\listtablename}
+ }
+ { \@@_chapter:V \listtablename }
% \end{macrocode}
% \end{macro}
%
@@ -5440,6 +5551,7 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \changes{v0.7}{2018/01/25}{统一使用 \cs{printbibliography} 命令
% 生成参考文献列表。}
% \changes{v0.7d}{2019/03/23}{使参考文献在目录中正常显示。}
+% \changes{v0.7e}{2020/08/30}{同步 \pkg{gbt7714} v2.0。}
%
% \begin{macro}{\@@_bibtex_setup:,\bibsection,\printbibliography}
% \BibTeX{} 相关设置。
@@ -5450,13 +5562,13 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
{
\tl_if_eq:VnTF \l_@@_bib_gb_style_tl { numerical }
{
- \bibliographystyle { gbt7714-unsrt }
+ \bibliographystyle { gbt7714-numerical }
\@@_set_cite_style_numerical:
}
{
\tl_if_eq:VnT \l_@@_bib_gb_style_tl { author-year }
{
- \bibliographystyle { gbt7714-plain }
+ \bibliographystyle { gbt7714-author-year }
\@@_set_cite_style_author_year:
\cs_set_eq:NN \cite \citep
}
@@ -5697,6 +5809,8 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
% \end{macrocode}
% \end{variable}
%
+% \changes{v0.7e}{2019/04/23}{处理 \pkg{hyperref} 与 \pkg{unicode-math} 的兼容性问题。}
+%
% 在导言区末尾引入 \pkg{hyperref} 宏包。
% \begin{macrocode}
\ctex_at_end_preamble:n
@@ -5708,6 +5822,8 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
\hypersetup
{
bookmarksnumbered = true,
+ psdextra = true,
+ unicode = true,
% \end{macrocode}
% 填写 PDF 元信息。
% \begin{macrocode}
@@ -5984,6 +6100,9 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
{ author_sign } { 作者签名 },
{ supervisor_sign } { 导师签名 },
{ sign_date } { 日期 },
+ { toc } { 目 \quad 录 },
+ { lof } { 插图目录 },
+ { lot } { 表格目录 },
{ bib_en } { Bibliography },
{ pdf_creator } { LaTeX~ with~ fduthesis~ class },
{ orig_decl } { \c_@@_name_simp_tl \\ 学位论文独创性声明 },
@@ -5995,7 +6114,6 @@ Copyright (C) 2017&ndash;2019 by Xiangdong Zeng <xdzeng96@gmail.com>.
{ abstract } { 摘 \quad 要 } { Abstract },
{ keywords } { 关键字 } { Keywords: },
{ clc } { 中图分类号 } { CLC~ number: },
- { toc } { 目 \quad 录 } { Contents },
{ notation } { 符号表 } { List~ of~ Symbols }
}
{ \@@_define_name:nnn #1 }
diff --git a/macros/latex/contrib/fduthesis/fduthesis.pdf b/macros/latex/contrib/fduthesis/fduthesis.pdf
index d3662983bf..37b0b8ebbf 100644
--- a/macros/latex/contrib/fduthesis/fduthesis.pdf
+++ b/macros/latex/contrib/fduthesis/fduthesis.pdf
Binary files differ
diff --git a/macros/latex/contrib/texnegar/INSTALL.txt b/macros/latex/contrib/texnegar/INSTALL.txt
index bc9b2a85d3..cac38811d9 100644
--- a/macros/latex/contrib/texnegar/INSTALL.txt
+++ b/macros/latex/contrib/texnegar/INSTALL.txt
@@ -1,7 +1,7 @@
texnegar -- INSTALL
======================
- Source: texnegar.dtx (2020-08-29 v0.1a)
+ Source: texnegar.dtx (2020-08-30 v0.1b)
Author: Hossein Movahhedian
Info: filecontents + macro + verbatim
License: LPPL 1.3c
diff --git a/macros/latex/contrib/texnegar/doc-ligature-texnegar.pdf b/macros/latex/contrib/texnegar/doc-ligature-texnegar.pdf
index 055db30a9a..824d833e3a 100644
--- a/macros/latex/contrib/texnegar/doc-ligature-texnegar.pdf
+++ b/macros/latex/contrib/texnegar/doc-ligature-texnegar.pdf
Binary files differ
diff --git a/macros/latex/contrib/texnegar/doc-ligature-xep.pdf b/macros/latex/contrib/texnegar/doc-ligature-xep.pdf
index ff1afa5c70..85a25c35d5 100644
--- a/macros/latex/contrib/texnegar/doc-ligature-xep.pdf
+++ b/macros/latex/contrib/texnegar/doc-ligature-xep.pdf
Binary files differ
diff --git a/macros/latex/contrib/texnegar/doc-samples-glyph.pdf b/macros/latex/contrib/texnegar/doc-samples-glyph.pdf
index 2a242cc985..2db6e61796 100644
--- a/macros/latex/contrib/texnegar/doc-samples-glyph.pdf
+++ b/macros/latex/contrib/texnegar/doc-samples-glyph.pdf
Binary files differ
diff --git a/macros/latex/contrib/texnegar/doc-samples-hrule.pdf b/macros/latex/contrib/texnegar/doc-samples-hrule.pdf
index 303bebee91..f1a806958d 100644
--- a/macros/latex/contrib/texnegar/doc-samples-hrule.pdf
+++ b/macros/latex/contrib/texnegar/doc-samples-hrule.pdf
Binary files differ
diff --git a/macros/latex/contrib/texnegar/doc-samples-xep.pdf b/macros/latex/contrib/texnegar/doc-samples-xep.pdf
index 0e60c2020d..a1da366355 100644
--- a/macros/latex/contrib/texnegar/doc-samples-xep.pdf
+++ b/macros/latex/contrib/texnegar/doc-samples-xep.pdf
Binary files differ
diff --git a/macros/latex/contrib/texnegar/texnegar-doc.ltx b/macros/latex/contrib/texnegar/texnegar-doc.ltx
index 2bffbf9aa1..d3da27ee43 100644
--- a/macros/latex/contrib/texnegar/texnegar-doc.ltx
+++ b/macros/latex/contrib/texnegar/texnegar-doc.ltx
@@ -62,7 +62,7 @@
}
}
-\date{Released \quad 2020-08-29 \quad v0.1a}
+\date{Released \quad 2020-08-30 \quad v0.1b}
\definecolor{HMhighlightBlueI}{rgb}{0,0,1}
\definecolor{HMhighlightbgYellowII}{rgb}{1,1,1}
@@ -497,6 +497,8 @@ I also would like to thank the developer teams of TeX's friends especially LaTeX
\HistoryItem{2020-08-29~v0.1a}{First standalone version.}
+ \HistoryItem{2020-08-30~v0.1b}{Changed some file names.}
+
\end{itemize}
\section*{To Do's}
diff --git a/macros/latex/contrib/texnegar/texnegar-doc.pdf b/macros/latex/contrib/texnegar/texnegar-doc.pdf
index d23b3f96cd..dbc009499d 100644
--- a/macros/latex/contrib/texnegar/texnegar-doc.pdf
+++ b/macros/latex/contrib/texnegar/texnegar-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/texnegar/texnegar-luatex-glyph.pdf b/macros/latex/contrib/texnegar/texnegar-luatex-glyph.pdf
index 675efce316..bfd2ac60c3 100644
--- a/macros/latex/contrib/texnegar/texnegar-luatex-glyph.pdf
+++ b/macros/latex/contrib/texnegar/texnegar-luatex-glyph.pdf
Binary files differ
diff --git a/macros/latex/contrib/texnegar/texnegar-luatex-leaders-glyph.pdf b/macros/latex/contrib/texnegar/texnegar-luatex-leaders-glyph.pdf
index 2f838c492d..561f608926 100644
--- a/macros/latex/contrib/texnegar/texnegar-luatex-leaders-glyph.pdf
+++ b/macros/latex/contrib/texnegar/texnegar-luatex-leaders-glyph.pdf
Binary files differ
diff --git a/macros/latex/contrib/texnegar/texnegar-luatex-leaders-hrule.pdf b/macros/latex/contrib/texnegar/texnegar-luatex-leaders-hrule.pdf
index 45a0990fbd..ec33a722c8 100644
--- a/macros/latex/contrib/texnegar/texnegar-luatex-leaders-hrule.pdf
+++ b/macros/latex/contrib/texnegar/texnegar-luatex-leaders-hrule.pdf
Binary files differ
diff --git a/macros/latex/contrib/texnegar/texnegar-xetex-bidi-glyph.pdf b/macros/latex/contrib/texnegar/texnegar-xetex-bidi-glyph.pdf
index 7f574e30ab..f7965fcb96 100644
--- a/macros/latex/contrib/texnegar/texnegar-xetex-bidi-glyph.pdf
+++ b/macros/latex/contrib/texnegar/texnegar-xetex-bidi-glyph.pdf
Binary files differ
diff --git a/macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-glyph.pdf b/macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-glyph.pdf
index 3b393c374b..c240edb0e5 100644
--- a/macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-glyph.pdf
+++ b/macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-glyph.pdf
Binary files differ
diff --git a/macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-hrule.pdf b/macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-hrule.pdf
index 1d08e99a77..ac1526bf5e 100644
--- a/macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-hrule.pdf
+++ b/macros/latex/contrib/texnegar/texnegar-xetex-bidi-leaders-hrule.pdf
Binary files differ
diff --git a/macros/latex/contrib/texnegar/texnegar-xetex-xepersian-glyph.pdf b/macros/latex/contrib/texnegar/texnegar-xetex-xepersian-glyph.pdf
index 0a285b450f..c7034473fe 100644
--- a/macros/latex/contrib/texnegar/texnegar-xetex-xepersian-glyph.pdf
+++ b/macros/latex/contrib/texnegar/texnegar-xetex-xepersian-glyph.pdf
Binary files differ
diff --git a/macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-glyph.pdf b/macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-glyph.pdf
index 12098ea3dc..005ec607bc 100644
--- a/macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-glyph.pdf
+++ b/macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-glyph.pdf
Binary files differ
diff --git a/macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-hrule.pdf b/macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-hrule.pdf
index b574694222..9b5961a7c4 100644
--- a/macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-hrule.pdf
+++ b/macros/latex/contrib/texnegar/texnegar-xetex-xepersian-leaders-hrule.pdf
Binary files differ
diff --git a/macros/latex/contrib/texnegar/texnegar.dtx b/macros/latex/contrib/texnegar/texnegar.dtx
index af171614c5..4b27c5c054 100644
--- a/macros/latex/contrib/texnegar/texnegar.dtx
+++ b/macros/latex/contrib/texnegar/texnegar.dtx
@@ -100,7 +100,7 @@ make time to fix.
% }^^A
% }
%
-% \date{Released \quad 2020-08-29 \quad v0.1a}
+% \date{Released \quad 2020-08-30 \quad v0.1b}
%
% \maketitle
%
@@ -131,7 +131,7 @@ make time to fix.
\RequirePackage{l3keys2e}
\RequirePackage{graphicx}[2019-11-30]
\RequirePackage[dvipsnames,svgnames,x11names]{xcolor}[2016/05/11]
-\ProvidesExplPackage {texnegar} {2020-08-29} {0.1a} { Full implementation of kashida feature in XeLaTex and LuaLaTeX }
+\ProvidesExplPackage {texnegar} {2020-08-30} {0.1b} { Full implementation of kashida feature in XeLaTex and LuaLaTeX }
\sys_if_engine_luatex:T
{
@@ -159,7 +159,7 @@ make time to fix.
%
% \begin{macrocode}
%<*texnegar-luatex-sty>
-\ProvidesExplPackage {texnegar-luatex} {2020-08-29} {0.1a} { Full implementation of kashida feature in xetex and luatex }
+\ProvidesExplPackage {texnegar-luatex} {2020-08-30} {0.1b} { Full implementation of kashida feature in xetex and luatex }
\tex_input:D { texnegar-ini.tex }
@@ -195,7 +195,7 @@ make time to fix.
% \begin{macrocode}
%<*texnegar-xetex-sty>
\RequirePackage{zref-savepos}[2020-03-03]
-\ProvidesExplPackage {texnegar-xetex} {2020-08-29} {0.1a} { Full implementation of kashida feature in XeLaTex and LuaLaTeX }
+\ProvidesExplPackage {texnegar-xetex} {2020-08-30} {0.1b} { Full implementation of kashida feature in XeLaTex and LuaLaTeX }
\tex_input:D { texnegar-ini.tex }
@@ -212,7 +212,7 @@ make time to fix.
%
% \begin{macrocode}
%<*texnegar-ini-tex>
-\ProvidesExplFile {texnegar-ini.tex} {2020-08-29} {0.1a} { Full implementation of kashida feature in XeLaTex and LuaLaTeX }
+\ProvidesExplFile {texnegar-ini.tex} {2020-08-30} {0.1b} { Full implementation of kashida feature in XeLaTex and LuaLaTeX }
\def\TeXNegar{\TeX Negar}
@@ -609,7 +609,7 @@ make time to fix.
% \subsection{File: \texttt{texnegar-common-kashida.tex}}
% \begin{macrocode}
%<*texnegar-common-kashida-tex>
-\ProvidesExplFile {texnegar-common-kashida.tex} {2020-08-29} {0.1a} { Full implementation of kashida feature in XeLaTex and LuaLaTeX }
+\ProvidesExplFile {texnegar-common-kashida.tex} {2020-08-30} {0.1b} { Full implementation of kashida feature in XeLaTex and LuaLaTeX }
\bool_if:NT \l_texnegar_ligature_bool
{
@@ -684,7 +684,7 @@ make time to fix.
%
% \begin{macrocode}
%<*texnegar-xetex-kashida-tex>
-\ProvidesExplFile {texnegar-xetex-kashida.tex} {2020-08-29} {0.1a} { Full implementation of kashida feature in XeLaTex and LuaLaTeX }
+\ProvidesExplFile {texnegar-xetex-kashida.tex} {2020-08-30} {0.1b} { Full implementation of kashida feature in XeLaTex and LuaLaTeX }
\newXeTeXintercharclass \c_texnegar_d_charclass % dual-joiner class
\newXeTeXintercharclass \c_texnegar_l_charclass % lam
@@ -883,17 +883,17 @@ make time to fix.
%</texnegar-xetex-kashida-tex>
% \end{macrocode}
%
-% \subsection{File: \texttt{pe-char-table.lua}}
+% \subsection{File: \texttt{texnegar-char-table.lua}}
%
% \begin{macrocode}
-%<*pe-char-table-lua>
+%<*texnegar-char-table-lua>
--
--- This is file `pe-char-table.lua',
+-- This is file `texnegar-char-table.lua',
-- generated with the docstrip utility.
--
-- The original source files were:
--
--- texnegar.dtx (with options: `pe-char-table-lua')
+-- texnegar.dtx (with options: `texnegar-char-table-lua')
--
-- Copyright (C) 2020 Hossein Movahhedian
--
@@ -901,23 +901,23 @@ make time to fix.
-- version 1.3c or higher (your choice). The latest version of
-- this license is at: http://www.latex-project.org/lppl.txt
--
--- pe_char_table = pe_char_table or {}
--- local pe_char_table = pe_char_table
--- pe_char_table.module = {
--- name = "pe_char_table",
--- version = "0.1a",
--- date = "2020-08-29",
--- description = "Full implementation of kashida feature in XeLaTex and LuaLaTeX",
--- author = "Hossein Movahhedian",
--- copyright = "Hossein Movahhedian",
--- license = "LPPL v1.3c"
+-- texnegar_char_table = texnegar_char_table or {}
+-- local texnegar_char_table = texnegar_char_table
+-- texnegar_char_table.module = {
+-- name = "texnegar_char_table",
+-- version = "0.1b",
+-- date = "2020-08-30",
+-- description = "Full implementation of kashida feature in XeLaTex and LuaLaTeX",
+-- author = "Hossein Movahhedian",
+-- copyright = "Hossein Movahhedian",
+-- license = "LPPL v1.3c"
-- }
--
-- -- ^^A%% texnegar-lua.dtx -- part of TEXNEGAR <bitbucket.org/dma8hm1334/texnegar>
--- local err, warn, info, log = luatexbase.provides_module(pe_char_table.module)
--- pe_char_table.log = log or (function (s) luatexbase.module_info("pe_char_table", s) end)
--- pe_char_table.warning = warn or (function (s) luatexbase.module_warning("pe_char_table", s) end)
--- pe_char_table.error = err or (function (s) luatexbase.module_error("pe_char_table", s) end)
+-- local err, warn, info, log = luatexbase.provides_module(texnegar_char_table.module)
+-- texnegar_char_table.log = log or (function (s) luatexbase.module_info("texnegar_char_table", s) end)
+-- texnegar_char_table.warning = warn or (function (s) luatexbase.module_warning("texnegar_char_table", s) end)
+-- texnegar_char_table.error = err or (function (s) luatexbase.module_error("texnegar_char_table", s) end)
local peCharTableInitial = {
[64344] = utf8.char(64344), -- "ﭘ", utf8.codepoint("ﭘ") == 64344, "\u{FB58}", INITIAL FORM PEH
@@ -950,7 +950,6 @@ local peCharTableInitial = {
}
local peCharTableMedial = {
- [1565] = utf8.char(1565), -- "؝ؘ؝؝", utf8.codepoint("؝؝") == 1565, "\u{061D}", KASHIDA
[1600] = utf8.char(1600), -- "ـ", utf8.codepoint("ـ") == 1600, "\u{0640}", ARABIC TATWEEL
[64345] = utf8.char(64345), -- "ﭙ", utf8.codepoint("ﭙ") == 64345, "\u{FB59}", MEDIAL FORM PEH
[64381] = utf8.char(64381), -- "ﭽ", utf8.codepoint("ﭽ") == 64381, "\u{FB7D}", MEDIAL FORM TCHEH
@@ -1027,8 +1026,8 @@ local peCharTableFinal = {
return peCharTableInitial, peCharTableMedial, peCharTableFinal
--
--
--- End of file `pe-char-table.lua'.
-%</pe-char-table-lua>
+-- End of file `texnegar-char-table.lua'.
+%</texnegar-char-table-lua>
% \end{macrocode}
%
% \subsection{File: \texttt{texnegar.lua}}
@@ -1053,8 +1052,8 @@ return peCharTableInitial, peCharTableMedial, peCharTableFinal
-- local texnegar = texnegar
-- texnegar.module = {
-- name = "texnegar",
--- version = "0.1a",
--- date = "2020-08-29",
+-- version = "0.1b",
+-- date = "2020-08-30",
-- description = "Full implementation of kashida feature in XeLaTex and LuaLaTeX",
-- author = "Hossein Movahhedian",
-- copyright = "Hossein Movahhedian",
@@ -1097,8 +1096,8 @@ dofile(kpse.find_file("texnegar-ini.lua"))
-- local texnegar_ini = texnegar_ini
-- texnegar_ini.module = {
-- name = "texnegar_ini",
--- version = "0.1a",
--- date = "2020-08-29",
+-- version = "0.1b",
+-- date = "2020-08-30",
-- description = "Full implementation of kashida feature in XeLaTex and LuaLaTeX",
-- author = "Hossein Movahhedian",
-- copyright = "Hossein Movahhedian",
@@ -1111,36 +1110,8 @@ dofile(kpse.find_file("texnegar-ini.lua"))
-- texnegar_ini.warning = warn or (function (s) luatexbase.module_warning("texnegar_ini", s) end)
-- texnegar_ini.error = err or (function (s) luatexbase.module_error("texnegar_ini", s) end)
--- enCharTableInitial, enCharTableMedial, enCharTableFinal = dofile(kpse.find_file("en-char-table.lua"))
--- peCharTableInitial, peCharTableMedial, peCharTableFinal = dofile(kpse.find_file("pe-char-table.lua"))
-
--- kashida_unicode = 1600
--- kashida_subtype = 256
-
--- COLORSTACK = node.subtype("pdf_colorstack")
--- GLUE = node.id("glue")
--- GLYPH = node.id("glyph")
--- HLIST = node.id("hlist")
--- KERN = node.id("kern")
--- RULE = node.id("rule")
--- WHATSIT = node.id("whatsit")
-
--- c_false_bool = token.create("c_false_bool")
c_true_bool = token.create("c_true_bool")
--- l_texnegar_kashida_fix_bool = token.create("l_texnegar_kashida_fix_bool")
-
--- l_texnegar_kashida_glyph_bool = token.create("l_texnegar_kashida_glyph_bool")
--- l_texnegar_kashida_leaders_glyph_bool = token.create("l_texnegar_kashida_leaders_glyph_bool")
--- l_texnegar_kashida_leaders_hrule_bool = token.create("l_texnegar_kashida_leaders_hrule_bool")
-
--- l_texnegar_ligature_bool = token.create("l_texnegar_ligature_bool")
-
--- l_texnegar_linebreakpenalty_bool = token.create("l_texnegar_linebreakpenalty_bool")
-
--- l_texnegar_hboxrecursion_bool = token.create("l_texnegar_hboxrecursion_bool")
--- l_texnegar_vboxrecursion_bool = token.create("l_texnegar_vboxrecursion_bool")
-
l_texnegar_color_bool = token.create("l_texnegar_color_bool")
if l_texnegar_color_bool.mode == c_true_bool.mode then
@@ -1150,8 +1121,6 @@ if l_texnegar_color_bool.mode == c_true_bool.mode then
end
end
--- selected_font = font.current()
--- selected_font_old = selected_font
dofile(kpse.find_file("texnegar-luatex-kashida.lua")) -- leaders + resized glyph U+0640
--
--
@@ -1181,8 +1150,8 @@ dofile(kpse.find_file("texnegar-luatex-kashida.lua")) -- leaders + resized gly
-- local texnegar_luatex_kashida = texnegar_luatex_kashida
-- texnegar_luatex_kashida.module = {
-- name = "texnegar_luatex_kashida",
--- version = "0.1a",
--- date = "2020-08-29",
+-- version = "0.1b",
+-- date = "2020-08-30",
-- description = "Full implementation of kashida feature in XeLaTex and LuaLaTeX",
-- author = "Hossein Movahhedian",
-- copyright = "Hossein Movahhedian",
@@ -1195,7 +1164,7 @@ dofile(kpse.find_file("texnegar-luatex-kashida.lua")) -- leaders + resized gly
-- texnegar_luatex_kashida.warning = warn or (function (s) luatexbase.module_warning("texnegar_luatex_kashida", s) end)
-- texnegar_luatex_kashida.error = err or (function (s) luatexbase.module_error("texnegar_luatex_kashida", s) end)
-local peCharTableInitial, peCharTableMedial, peCharTableFinal = dofile(kpse.find_file("pe-char-table.lua"))
+local peCharTableInitial, peCharTableMedial, peCharTableFinal = dofile(kpse.find_file("texnegar-char-table.lua"))
local kashida_unicode = 1600
local kashida_subtype = 256
@@ -1716,6 +1685,8 @@ end
%
% \HistoryItem{2020-08-29~v0.1a}{First standalone version.}
%
+% \HistoryItem{2020-08-30~v0.1b}{Changed some file names.}
+%
% \end{itemize}
%
% \section*{To Do's}
diff --git a/macros/latex/contrib/texnegar/texnegar.ins b/macros/latex/contrib/texnegar/texnegar.ins
index cfdf9150a6..6ed26bf948 100644
--- a/macros/latex/contrib/texnegar/texnegar.ins
+++ b/macros/latex/contrib/texnegar/texnegar.ins
@@ -36,9 +36,7 @@ this license is at: http://www.latex-project.org/lppl.txt
\generate{\file{README.txt} {\from{texnegar.dtx} {README-txt}}}
-\generate{\file{en-char-table.lua} {\from{texnegar.dtx} {en-char-table-lua}}}
-
-\generate{\file{pe-char-table.lua} {\from{texnegar.dtx} {pe-char-table-lua}}}
+\generate{\file{texnegar-char-table.lua} {\from{texnegar.dtx} {texnegar-char-table-lua}}}
\generate{\file{texnegar.lua} {\from{texnegar.dtx} {texnegar-lua}}}
diff --git a/macros/latex/contrib/texnegar/texnegar.pdf b/macros/latex/contrib/texnegar/texnegar.pdf
index f176290f43..521dfdcfc0 100644
--- a/macros/latex/contrib/texnegar/texnegar.pdf
+++ b/macros/latex/contrib/texnegar/texnegar.pdf
Binary files differ
diff --git a/macros/latex/contrib/texnegar/xepersian-XB.pdf b/macros/latex/contrib/texnegar/xepersian-XB.pdf
index 8dd873ed13..b0cb0b76f3 100644
--- a/macros/latex/contrib/texnegar/xepersian-XB.pdf
+++ b/macros/latex/contrib/texnegar/xepersian-XB.pdf
Binary files differ
diff --git a/macros/latex/contrib/totalcount/CHANGELOG b/macros/latex/contrib/totalcount/CHANGELOG
new file mode 100644
index 0000000000..934daeb260
--- /dev/null
+++ b/macros/latex/contrib/totalcount/CHANGELOG
@@ -0,0 +1,10 @@
+Changes made in the totalcount package
+======================================
+
+Please note that this document does not reflect bugfix-releases, and that the dates given are the dates of the release w/o bugfixes.
+
+If you are interested in a complete changelog -- including bugfixes -- process the dtx files with \RecordChanges and \PrintChanges.
+
+v1.0 (2008/03/09)
+- 1st published version
+
diff --git a/macros/latex/contrib/totalcount/README b/macros/latex/contrib/totalcount/README
new file mode 100644
index 0000000000..8833eeb8d5
--- /dev/null
+++ b/macros/latex/contrib/totalcount/README
@@ -0,0 +1,36 @@
+==========================================================================
+
+The `totalcount' package
+Copyright (C) 2010-2018 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+
+License: LPPL = LaTeX Project Public Licence
+Maintenance Status: maintained (by Axel Sommerfeldt)
+
+Home page:
+ https://gitlab.com/axelsommerfeldt/totalcount
+
+If you need help for installation please visit:
+ https://texfaq.org/FAQ-inst-miktexstar
+ https://texfaq.org/FAQ-installthings
+ https://texfaq.org/FAQ-privinst
+
+If you need help using this package please visit:
+ https://latex.org/forum/
+ https://tex.stackexchange.com/
+ https://golatex.de/ (German)
+ https://texwelt.de/ (German)
+
+If you think you may have found a bug in this package,
+or want to report a suggestion for improvement, please either visit
+ https://gitlab.com/axelsommerfeldt/totalcount/issues (preferred)
+or send an e-mail to
+ axel.sommerfeldt@f-m.fm
+
+--------------------------------------------------------------------------
+
+The `totalcount' package v1.0 offers commands for typesetting total values of counters.
+
+User Manual: totalcount.pdf (English)
+
+==========================================================================
+
diff --git a/macros/latex/contrib/totalcount/SUMMARY b/macros/latex/contrib/totalcount/SUMMARY
new file mode 100644
index 0000000000..543fd186a6
--- /dev/null
+++ b/macros/latex/contrib/totalcount/SUMMARY
@@ -0,0 +1 @@
+This LaTeX package offers commands for typesetting total values of counters.
diff --git a/macros/latex/contrib/caption/totalcount.dtx b/macros/latex/contrib/totalcount/totalcount.dtx
index a2e0d934a3..291484587f 100644
--- a/macros/latex/contrib/caption/totalcount.dtx
+++ b/macros/latex/contrib/totalcount/totalcount.dtx
@@ -18,7 +18,7 @@
%
% This Current Maintainer of this work is Axel Sommerfeldt.
%
-% This work consists of the file totalcount.dtx,
+% This work consists of the files totalcount.ins, totalcount.dtx,
% and the derived file totalcount.sty.
%
% \fi
@@ -83,7 +83,7 @@
% This package has version number \docversion.}}%^^A
% {The totalcount package}}
% \author{Axel Sommerfeldt\\
-% \url{https://gitlab.com/axelsommerfeldt/caption}}
+% \url{https://gitlab.com/axelsommerfeldt/totalcount}}
% \date{\docdate}
% \maketitle
%
diff --git a/macros/latex/contrib/totalcount/totalcount.ins b/macros/latex/contrib/totalcount/totalcount.ins
new file mode 100644
index 0000000000..a1e82fb561
--- /dev/null
+++ b/macros/latex/contrib/totalcount/totalcount.ins
@@ -0,0 +1,42 @@
+\def\batchfile{totalcount.ins}
+\input docstrip
+
+\askforoverwritefalse
+\keepsilent
+
+\preamble
+
+Copyright (C) 2010-2018 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+
+https://gitlab.com/axelsommerfeldt/totalcount
+
+--------------------------------------------------------------------------
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+of this license or (at your option) any later version.
+The latest version of this license is in
+ http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX
+version 2003/12/01 or later.
+
+This work has the LPPL maintenance status "maintained".
+
+This Current Maintainer of this work is Axel Sommerfeldt.
+
+This work consists of the files totalcount.ins, totalcount.dtx,
+and the derived file totalcount.sty.
+
+\endpreamble
+
+\generate{\file{totalcount.sty}{\from{totalcount.dtx}{package}}}
+
+\Msg{***********************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the file}
+\Msg{* `totalcount.sty' into a directory searched by TeX.}
+\Msg{*}
+\Msg{* To produce the documentation run the file}
+\Msg{* `totalcount.dtx' through LaTeX.}
+\Msg{*}
+\Msg{***********************************************************}
diff --git a/macros/latex/contrib/caption/totalcount.pdf b/macros/latex/contrib/totalcount/totalcount.pdf
index bbe1a9dfd3..9eb1221308 100644
--- a/macros/latex/contrib/caption/totalcount.pdf
+++ b/macros/latex/contrib/totalcount/totalcount.pdf
Binary files differ
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index f13746212b..fd54434886 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,11 +26,11 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2020
-depend revision/56210
+depend revision/56217
name 00texlive.image
category TLCore
-revision 56210
+revision 56215
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
@@ -3729,6 +3729,7 @@ runfiles size=5027
tlpkg/tlpsrc/texlogos.tlpsrc
tlpkg/tlpsrc/texmate.tlpsrc
tlpkg/tlpsrc/texments.tlpsrc
+ tlpkg/tlpsrc/texnegar.tlpsrc
tlpkg/tlpsrc/texonly.tlpsrc
tlpkg/tlpsrc/texosquery.tlpsrc
tlpkg/tlpsrc/texplate.tlpsrc
@@ -3864,6 +3865,7 @@ runfiles size=5027
tlpkg/tlpsrc/topiclongtable.tlpsrc
tlpkg/tlpsrc/topletter.tlpsrc
tlpkg/tlpsrc/toptesi.tlpsrc
+ tlpkg/tlpsrc/totalcount.tlpsrc
tlpkg/tlpsrc/totcount.tlpsrc
tlpkg/tlpsrc/totpages.tlpsrc
tlpkg/tlpsrc/tpic2pdftex.tlpsrc
@@ -44622,7 +44624,7 @@ catalogue-topics caption
name caption
category Package
-revision 55900
+revision 56213
shortdesc Customising captions in floating environments
relocated 1
longdesc The caption package provides many ways to customise the
@@ -44634,28 +44636,36 @@ longdesc compatibility notes, for other packages, is provided in the
longdesc documentation. The package also provides the "caption outside
longdesc float" facility, in the same way that simpler packages like
longdesc capt-of do. The package supersedes caption2.
-containersize 29188
-containerchecksum 1e4ad1a4a44956931069d2455ce5584484f1f7f4c6b033b3969480106b247b2fad1c620cd81d83b6ee870ea688a8e24f9f6f225a7a9a4908136e5de6a77de872
-doccontainersize 1585184
-doccontainerchecksum 2f20715ad036602613d5768c8e6648752e2c5f9d7277e015a8f10f23fd1a5d1abbbc1817409a236dc5058d75419961eac57b5daaaf1a05555f922dec4cc586e3
-docfiles size=444
+containersize 30364
+containerchecksum 50cdeda5436f58b17493aeb5b7d0b0857d3012d5dddb670d1d71be8abdd80113f6d723cef6ea71e2e3d242f5481d28159fc1b97b3a83897fb7b6b659f8946f12
+doccontainersize 1563004
+doccontainerchecksum ebed4e01db40c28ee9161d776d297c2ef0517252decaad7f0b19408a33f4389e1c781721eead207027c9c92959df6717e50062204799fb3e7db95462f6fa1d45
+docfiles size=486
RELOC/doc/latex/caption/CHANGELOG
RELOC/doc/latex/caption/README details="Readme"
RELOC/doc/latex/caption/SUMMARY
RELOC/doc/latex/caption/bicaption.pdf
RELOC/doc/latex/caption/caption-deu.pdf details="German documentation" language="de"
RELOC/doc/latex/caption/caption-eng.pdf details="English documentation" language="en"
+ RELOC/doc/latex/caption/caption-light.pdf
RELOC/doc/latex/caption/caption-rus.pdf details="Russian documentation" language="ru"
RELOC/doc/latex/caption/ltcaption.pdf
RELOC/doc/latex/caption/subcaption.pdf
- RELOC/doc/latex/caption/totalcount.pdf
-srccontainersize 193356
-srccontainerchecksum 5c649b310d49db3a64ae0a8ca575483d2db3700b196406ed79355c1705bbac7793e60236ff4fca106048b6a89284a151300e48e2d7dd8216b90d42d1aaa39f7d
-srcfiles size=283
+srccontainersize 201680
+srccontainerchecksum 67df0eb833bfa90b702450a3b882fe111f1246da911a0cb5bb47e9ac1b43d8f84e020321ee4dd7b6c6193268976743fb576e3097f1024f9af91e5860f3c58bd7
+srcfiles size=311
RELOC/source/latex/caption/bicaption.dtx
+ RELOC/source/latex/caption/caption-ams-smf.dtx
+ RELOC/source/latex/caption/caption-beamer.dtx
RELOC/source/latex/caption/caption-deu.tex
+ RELOC/source/latex/caption/caption-elsarticle.dtx
RELOC/source/latex/caption/caption-eng.tex
+ RELOC/source/latex/caption/caption-koma.dtx
+ RELOC/source/latex/caption/caption-light.dtx
+ RELOC/source/latex/caption/caption-memoir.dtx
+ RELOC/source/latex/caption/caption-ntg.dtx
RELOC/source/latex/caption/caption-rus.tex
+ RELOC/source/latex/caption/caption-thesis.dtx
RELOC/source/latex/caption/caption.dtx
RELOC/source/latex/caption/caption.ins
RELOC/source/latex/caption/caption2.dtx
@@ -44664,15 +44674,21 @@ srcfiles size=283
RELOC/source/latex/caption/elephant.eps
RELOC/source/latex/caption/ltcaption.dtx
RELOC/source/latex/caption/subcaption.dtx
- RELOC/source/latex/caption/totalcount.dtx
-runfiles size=43
+runfiles size=52
RELOC/tex/latex/caption/bicaption.sty
+ RELOC/tex/latex/caption/caption-ams-smf.sto
+ RELOC/tex/latex/caption/caption-beamer.sto
+ RELOC/tex/latex/caption/caption-elsarticle.sto
+ RELOC/tex/latex/caption/caption-koma.sto
+ RELOC/tex/latex/caption/caption-light.sty
+ RELOC/tex/latex/caption/caption-memoir.sto
+ RELOC/tex/latex/caption/caption-ntg.sto
+ RELOC/tex/latex/caption/caption-thesis.sto
RELOC/tex/latex/caption/caption.sty
RELOC/tex/latex/caption/caption2.sty
RELOC/tex/latex/caption/caption3.sty
RELOC/tex/latex/caption/ltcaption.sty
RELOC/tex/latex/caption/subcaption.sty
- RELOC/tex/latex/caption/totalcount.sty
catalogue-also subcaption bicaption
catalogue-contact-bugs https://gitlab.com/axelsommerfeldt/caption/issues
catalogue-contact-repository https://gitlab.com/axelsommerfeldt/caption
@@ -63818,7 +63834,7 @@ containerchecksum a9a39c515fa867aec0382485ddb07d219cc5d501e7ecbeb9681ee4af375435
name collection-langarabic
category Collection
-revision 55495
+revision 56215
shortdesc Arabic
relocated 1
longdesc Support for Arabic and Persian.
@@ -63846,11 +63862,12 @@ depend persian-bib
depend quran
depend sexam
depend simurgh
+depend texnegar
depend tram
depend xepersian
depend xepersian-hm
-containersize 436
-containerchecksum e508ca1a893d1e2b0e78ed7a6e988102de7680712684ed5b84b6053f62d3d63c3823657205c9a0b19c5afc29d53f484c378d19f65f17c8cb345cdeba21d58b70
+containersize 444
+containerchecksum 3c9a530b444eb34dd9c5a1a0b49e662edda54868820633e281c0501146a59b0d0671a61ac6407049913640320d28d4c6e2afbf6907b152176de55d865da5fafb
name collection-langchinese
category Collection
@@ -64609,7 +64626,7 @@ containerchecksum 697ec7c80c0eaaf3d0aef232cc5077bc6305745f238c9d3325a1a0a4bddb31
name collection-latexextra
category Collection
-revision 56182
+revision 56214
shortdesc LaTeX additional packages
relocated 1
longdesc A very large collection of add-on packages for LaTeX.
@@ -65816,6 +65833,7 @@ depend tokenizer
depend toolbox
depend topfloat
depend topiclongtable
+depend totalcount
depend totcount
depend totpages
depend translations
@@ -65936,8 +65954,8 @@ depend ziffer
depend zref
depend zwgetfdate
depend zwpagelayout
-containersize 6148
-containerchecksum aa7f3a0e77e798e94435e26f0f7076f65f9f68b36ead3c11781e42791bcb15b419417c7e8407791f8abcf74f8319bc746c5aad09998869653e07db48f3c01042
+containersize 6156
+containerchecksum 37330b43885c55455b5061f7ce98cce69c4882f0fae6d733627f5ede207adcc969dc084dd718c16e189231c574fc38469bffd4c85ddc3a977137a92ab8747901
name collection-latexrecommended
category Collection
@@ -110697,17 +110715,17 @@ catalogue-version 0.8
name fduthesis
category Package
-revision 50738
+revision 56216
shortdesc LaTeX thesis template for Fudan University
relocated 1
longdesc This package is a LaTeX thesis template package for Fudan
longdesc University. It can make it easy to write theses both in Chinese
longdesc and English.
-containersize 108108
-containerchecksum 2c33af9559603c08ee844cc0dd6dcb8a6c215f0b0c7cd25435b64b1ad6c83dec608c601ce16efdfbeda890258bb36df8eb549bf43bca21bd778e003cd637507c
-doccontainersize 1370704
-doccontainerchecksum bc3d2c383233846631e5042742a08b5ca05d0cbe68fad908065310f00c50e9732af0b912eecf01496615d221a1ea6fa5f3d9be91c9533b97fdd642c47d6d8c5d
-docfiles size=382
+containersize 108324
+containerchecksum c91ca063c73e97947fc36c5d5c33cee2e9e963f9a4c993d209d3c2b0c950ba9a34f928a9e6fb5e3922b2757938651ea8f5eb6014f3878b0ae3f7f9cf4bab91c1
+doccontainersize 1361508
+doccontainerchecksum 1be56ed247773a6a28a17aa0a29446f1e2f63333efbfaa4533fc288a3ef7b2d635c10f36e51d8e1a414cf067155ad9dc109fdd93f5ed83900bc2a5eb5d94e4b4
+docfiles size=381
RELOC/doc/latex/fduthesis/README.md details="Readme"
RELOC/doc/latex/fduthesis/fdulogo-example.tex
RELOC/doc/latex/fduthesis/fduthesis-code.pdf details="Code Implementation (Chinese)" language="zh"
@@ -110716,14 +110734,14 @@ docfiles size=382
RELOC/doc/latex/fduthesis/fduthesis-en.tex
RELOC/doc/latex/fduthesis/fduthesis-template.tex
RELOC/doc/latex/fduthesis/fduthesis.pdf details="Package documentation (Chinese)" language="zh"
-srccontainersize 115396
-srccontainerchecksum 4f048791cfdfa5eb1dec273618111f0d8e685c9a638bb4aa2edc1e6ffcd11097aeaa85d9130be4ae8136c14277f85a22580c42fdde9a8f3602cdc57eb4beefdc
-srcfiles size=135
+srccontainersize 116284
+srccontainerchecksum 73b13aa52c6cc5884b6785a995767e7de161071cb98fa6f695947efce7faafc6a61f1cca5c8cd73edca0216555b96c5f7a72b901bda9aac35df34f5d0b4fbe7a
+srcfiles size=136
RELOC/source/latex/fduthesis/fduthesis-doc.dtx
RELOC/source/latex/fduthesis/fduthesis-logo.dtx
RELOC/source/latex/fduthesis/fduthesis.dtx
RELOC/source/latex/fduthesis/fduthesis.ins
-runfiles size=112
+runfiles size=114
RELOC/tex/latex/fduthesis/fdudoc.cls
RELOC/tex/latex/fduthesis/fdulogo.sty
RELOC/tex/latex/fduthesis/fduthesis-en.cls
@@ -110738,7 +110756,7 @@ catalogue-contact-repository https://github.com/stone-zeng/fduthesis
catalogue-ctan /macros/latex/contrib/fduthesis
catalogue-license lppl1.3c
catalogue-topics dissertation class chinese latex3
-catalogue-version 0.7d
+catalogue-version 0.7e
name featpost
category Package
@@ -184684,16 +184702,16 @@ catalogue-version 0.4
name mcf2graph
category Package
-revision 56086
+revision 56217
shortdesc Draw chemical structure diagrams with Metafont/MetaPost
relocated 1
longdesc The Molecular Coding Format (MCF) is a linear notation for
longdesc describing chemical structure diagrams. This package converts
longdesc MCF to graphic files using Metafont / MetaPost.
-containersize 20912
-containerchecksum 1ec52ec6fe67b8644a4cb41d15fa8a74f69e98d4f2898028db6788e07eb9f61e9020d681c2a91ef1015d5ea29ce18fcc9528921f628a9531e6eb4f3c4ac297de
-doccontainersize 1060304
-doccontainerchecksum 723fbabe83bc6d6e3baaad5e1256258ed0502bc0010fef7a2f409f37020b7fe3a540b16aacfdc548204dcc6fab44b7a63a1125cf601bcb8653c1d795851528a6
+containersize 21040
+containerchecksum 4905ad4033c29884811f0ef2da7da18be259904f41fda3f6d3145c7dca3f490ee317faffcac30a643ee04465ce3180025e8687dc878c713fc1623e341e95934b
+doccontainersize 1059444
+doccontainerchecksum 65759a94b05106edb4cf8453b47694c8baf4bfd68b7165bbbd57979881384e7a0862d4d14b8d3650e7a2dafaf46744059ee9a393f53f67565b75396a7b532209
docfiles size=303
RELOC/doc/metapost/mcf2graph/CHANGELOG
RELOC/doc/metapost/mcf2graph/README details="Readme"
@@ -184711,7 +184729,7 @@ runfiles size=23
catalogue-ctan /graphics/mcf2graph
catalogue-license mit
catalogue-topics graphics graphics-mpost chemistry
-catalogue-version 4.51
+catalogue-version 4.52
name mcite
category Package
@@ -288589,15 +288607,15 @@ docfiles size=592
name texlive-docindex
category TLCore
-revision 56204
+revision 56212
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
longdesc the process.
containersize 388
-containerchecksum d996ba19e9a4792d675dbff1e4211dbd6e56f1849c5d4421cbbc5bcf08b73b2c659c32767828d84198ef2258140c1ba7231a6284071f0492838e68bf9e27a878
-doccontainersize 168540
-doccontainerchecksum 2c433d9ac38efe37c502fcb169ea9c745808c291cc7cf097746f822dad3a33b9ec15a63c0c88e7b57814ed1781fc59dbc64889bc434cf213fc15c31fee594b21
+containerchecksum 25fa2212e697611d87cd91a9de166108d351ce9576d17ff536a20afa683bd698410741a3cd33f2e13cba2e8b13716d957e0c33dd116515af1c389c1107c39fad
+doccontainersize 168528
+doccontainerchecksum a14854197a057ee2b37ede100eee487d08c92e0732ec07748799704548cfe9a3f72af9a1e4165a469eaf4fb422775eea16bf6ba948d697a26d638f4644eef323
docfiles size=334
doc.html
@@ -290467,6 +290485,83 @@ catalogue-license lppl
catalogue-topics listing
catalogue-version 0.2.0
+name texnegar
+category Package
+revision 56215
+shortdesc Kashida justification in XeLaTeX and LuaLaTeX
+relocated 1
+longdesc In some cursive scripts such as Persian or Arabic, kashida is
+longdesc used to create justification. In this type of justification
+longdesc characters are elongated rather than expanding spaces between
+longdesc words. The kashida justification in xepersian has many bugs.
+longdesc Also it has problems with some fonts. The xepersian-hm package
+longdesc was the first attempt to fix these bugs in xepersian, which
+longdesc uses the XeTeX engine. This package extends the kashida
+longdesc justification to be used with the LuaTeX engine, too.
+longdesc Explanation of the package name: Negar, in Persian, is the
+longdesc present stem of negaashtan meaning to design, to paint, to
+longdesc write; and as a noun it means "sweetheart, idol, beloved,
+longdesc figuratively referring to a beautiful woman, pattern, painting,
+longdesc and artistic design".
+containersize 12284
+containerchecksum ea05aed87a09be31df532f15bf38c22e4fa0c19860921192d42bed49729de932731bb429115a8448bb05421e9ba69342f86bec61fac5d84a2fd2eaf7e01c0e5c
+doccontainersize 2095644
+doccontainerchecksum bf4d0c943e209477ee36b89457687353a9c60f78c554b2a46dc3a9d7f72d645594f807a4ac59c331303d9993b235b79a6a4febcc305d217c6673b2ce7df39405
+docfiles size=1650
+ RELOC/doc/latex/texnegar/INSTALL.txt
+ RELOC/doc/latex/texnegar/README.txt details="Readme"
+ RELOC/doc/latex/texnegar/doc-ligature-texnegar.pdf
+ RELOC/doc/latex/texnegar/doc-ligature-xep.pdf
+ RELOC/doc/latex/texnegar/doc-samples-glyph.pdf
+ RELOC/doc/latex/texnegar/doc-samples-hrule.pdf
+ RELOC/doc/latex/texnegar/doc-samples-xep.pdf
+ RELOC/doc/latex/texnegar/texnegar-doc.ltx
+ RELOC/doc/latex/texnegar/texnegar-doc.pdf details="User documentation"
+ RELOC/doc/latex/texnegar/texnegar-luatex-glyph.pdf
+ RELOC/doc/latex/texnegar/texnegar-luatex-glyph.tex
+ RELOC/doc/latex/texnegar/texnegar-luatex-leaders-glyph.pdf
+ RELOC/doc/latex/texnegar/texnegar-luatex-leaders-glyph.tex
+ RELOC/doc/latex/texnegar/texnegar-luatex-leaders-hrule.pdf
+ RELOC/doc/latex/texnegar/texnegar-luatex-leaders-hrule.tex
+ RELOC/doc/latex/texnegar/texnegar-xetex-bidi-glyph.pdf
+ RELOC/doc/latex/texnegar/texnegar-xetex-bidi-glyph.tex
+ RELOC/doc/latex/texnegar/texnegar-xetex-bidi-leaders-glyph.pdf
+ RELOC/doc/latex/texnegar/texnegar-xetex-bidi-leaders-glyph.tex
+ RELOC/doc/latex/texnegar/texnegar-xetex-bidi-leaders-hrule.pdf
+ RELOC/doc/latex/texnegar/texnegar-xetex-bidi-leaders-hrule.tex
+ RELOC/doc/latex/texnegar/texnegar-xetex-xepersian-glyph.pdf
+ RELOC/doc/latex/texnegar/texnegar-xetex-xepersian-glyph.tex
+ RELOC/doc/latex/texnegar/texnegar-xetex-xepersian-leaders-glyph.pdf
+ RELOC/doc/latex/texnegar/texnegar-xetex-xepersian-leaders-glyph.tex
+ RELOC/doc/latex/texnegar/texnegar-xetex-xepersian-leaders-hrule.pdf
+ RELOC/doc/latex/texnegar/texnegar-xetex-xepersian-leaders-hrule.tex
+ RELOC/doc/latex/texnegar/texnegar.pdf details="Source code documentation"
+ RELOC/doc/latex/texnegar/xepersian-XB.pdf
+ RELOC/doc/latex/texnegar/xepersian-XB.tex
+srccontainersize 14784
+srccontainerchecksum 63efdcad942c40ce156dab0b720b5fc727b0f0c25ccc4b0a2cafbde86dd09c497326fb1dba85249b9e943608f72fea8ea4ae29ab45a66dd49f1c210094268283
+srcfiles size=21
+ RELOC/source/latex/texnegar/texnegar.dtx
+ RELOC/source/latex/texnegar/texnegar.ins
+runfiles size=23
+ RELOC/tex/latex/texnegar/texnegar-char-table.lua
+ RELOC/tex/latex/texnegar/texnegar-common-kashida.tex
+ RELOC/tex/latex/texnegar/texnegar-ini.lua
+ RELOC/tex/latex/texnegar/texnegar-ini.tex
+ RELOC/tex/latex/texnegar/texnegar-luatex-kashida.lua
+ RELOC/tex/latex/texnegar/texnegar-luatex.sty
+ RELOC/tex/latex/texnegar/texnegar-xetex-kashida.tex
+ RELOC/tex/latex/texnegar/texnegar-xetex.sty
+ RELOC/tex/latex/texnegar/texnegar.lua
+ RELOC/tex/latex/texnegar/texnegar.sty
+catalogue-contact-bugs https://bitbucket.org/dma8hm1334/texnegar/issues
+catalogue-contact-home https://dma8hm1334.bitbucket.io
+catalogue-contact-repository https://bitbucket.org/dma8hm1334/texnegar
+catalogue-ctan /macros/latex/contrib/texnegar
+catalogue-license lppl1.3c
+catalogue-topics arabic persian expl3
+catalogue-version 0.1b
+
name texonly
category Package
revision 50985
@@ -302101,6 +302196,36 @@ catalogue-license lppl1.3c
catalogue-topics dissertation class multilingual
catalogue-version 6.4.04
+name totalcount
+category Package
+revision 56214
+shortdesc Commands for typesetting total values of counters
+relocated 1
+longdesc This LaTeX package offers commands for typesetting total values
+longdesc of counters.
+containersize 1640
+containerchecksum 77d12ae2b41ccc54e88338c47cd8071bcbbb130901cd383a8ab976147c510c52c437e722939882aad859d1bc58f52b7a698033a695ce10551f86874dcd58d425
+doccontainersize 74156
+doccontainerchecksum 1be9ee133e33a859d9dfc91102dfc4511211eee462a0eb9ab2b5610a342d949cff0a883656afa8a1ff0c0d7088a94391c2f5c60894644f3985b9e916ef9df221
+docfiles size=24
+ RELOC/doc/latex/totalcount/CHANGELOG
+ RELOC/doc/latex/totalcount/README details="Readme"
+ RELOC/doc/latex/totalcount/SUMMARY
+ RELOC/doc/latex/totalcount/totalcount.pdf details="Package documentation"
+srccontainersize 4616
+srccontainerchecksum bb5d5a15c2ce9cf51fc777808ecf0e551a10b1b709786d45cc25276eb787b44a54ebb217c122b170d01f72a393bf5343173d3d94e5e46194e758141e436c2f1f
+srcfiles size=5
+ RELOC/source/latex/totalcount/totalcount.dtx
+ RELOC/source/latex/totalcount/totalcount.ins
+runfiles size=1
+ RELOC/tex/latex/totalcount/totalcount.sty
+catalogue-contact-bugs https://gitlab.com/axelsommerfeldt/totalcount/issues
+catalogue-contact-repository https://gitlab.com/axelsommerfeldt/totalcount
+catalogue-ctan /macros/latex/contrib/totalcount
+catalogue-license lppl1.3
+catalogue-topics counter-mgmt
+catalogue-version 1.0a
+
name totcount
category Package
revision 21178
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index df0ba686d5..6aae1e3b79 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-a09aa43781a4ea40f9e6c042aacacd24 texlive.tlpdb
+7ad9d48833138db3d71346d5bc3ebb24 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index a8715bb37c..74e43ba401 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-5152c9d1873b326454b24fb5727568f97b6e75b525568ae24106008a0e89ab74ae8f418cae101ee828c17e453bfc9053cbedd52c4556fc333d5e12cee05944f6 texlive.tlpdb
+86d8735a6d1d53384ce9ccc1f5b4b3fc5c0dfc51b430d1fd0d1014a66c5b79a111e51475f9b0cabc9a1eceee1dc0c9cd16e2e44b3e145d54e7b02eb0adf4f1da texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index a7dd7d6d29..dbe9dafc02 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
@@ -1,10 +1,10 @@
-----BEGIN PGP SIGNATURE-----
-iQEcBAEBCgAGBQJfSutPAAoJEEzhh34ZQ4xwxp4H/j2ltplSjAnpwjfg371x6J7C
-TSZZ2hzTrr0vACk92SQVWEHa1XcIIypH+2eU1rgSqEEfDqLU0jUrwvIqKtH+ram3
-XLJvQRkdAXLENfQqsQECKQMu8aUinwSnaGYNxNHjbKCHeTIb6ayUtKrDr8+/skFw
-pq/ZE6rOLsTxE0A3ySjhnynJTsxs6FChs4lkKjRosbzHEEPro4ZYVV7PpQo17ISC
-aIcKSzbjOLsIbJuR/gzjt+Ld++knvSWzvCad/HGcsKgq6N9O+/YNsWiu6qZQDAUg
-JSsu8bSR8DJs24afylPotYkrhq0WV+ZmsptQTepr2h8Oyjnnc1ZOOiB3ED0tpWg=
-=DO5y
+iQEcBAEBCgAGBQJfTDyrAAoJEEzhh34ZQ4xwigwH/j0+UHC0Ez5AagpxGDF9zOK9
+rBel0hXLuWXNSMXhX/KpdlK2GnP3NfDLdGGj9sbinVyfI02xNYZJQmlM2zaGLzyi
+QK9Q3AT/uR+o2qDMJaEoYSU8gAxBDGpiZwVucCzSSgQA7daw0WmjhHdqPUh+0QKh
+BKCfj7Wle7S3O8z1aLKsTY27gvRs0hQy1qMHkuIny7CkDqo55RXVMmeRbIH3SDo2
+QmJ6K4byqIZ79YLWVhOJbFGg/PgJdbDLNLhv30seWOh2rR6qqVJOjb/JS4IlRqJH
+aZ/1ZxhF/7FSVFar/fWSvMRA4W/SnV5SpeBzcH0cXJHYFU2JxI64xZ4Chb8zYDQ=
+=ogK6
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index c94b056f74..8c845ae1fe 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/systems/win32/miktex/tm/packages/files.csv.lzma b/systems/win32/miktex/tm/packages/files.csv.lzma
index fb97c86a93..c27a7c7161 100644
--- a/systems/win32/miktex/tm/packages/files.csv.lzma
+++ b/systems/win32/miktex/tm/packages/files.csv.lzma
Binary files differ
diff --git a/systems/win32/miktex/tm/packages/next/files.csv.lzma b/systems/win32/miktex/tm/packages/next/files.csv.lzma
index aba8fb3fdc..560c3e14d6 100644
--- a/systems/win32/miktex/tm/packages/next/files.csv.lzma
+++ b/systems/win32/miktex/tm/packages/next/files.csv.lzma
Binary files differ
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index e10f717730..befd3b0d04 100644
--- a/systems/win32/miktex/tm/packages/next/pr.ini
+++ b/systems/win32/miktex/tm/packages/next/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1598732139
+date=1598818840
lastupd=miktex-arctrl-bin-2.9 miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-2.9 miktex-asymptote-bin-x64-2.9 miktex-autosp-bin-2.9 miktex-autosp-bin-x64-2.9 miktex-axohelp-bin-2.9 miktex-axohelp-bin-x64-2.9 miktex-bibarts-bin-2.9 miktex-bibarts-bin-x64-2.9 miktex-bibtex-bin-2.9 miktex-bibtex-bin-x64-2.9 miktex-bibtex8bit-bin-2.9 miktex-bibtex8bit-bin-x64-2.9 miktex-bzip2-bin-2.9 miktex-bzip2-bin-x64-2.9 miktex-cairo-bin-2.9 miktex-cairo-bin-x64-2.9 miktex-chktex-bin-2.9 miktex-chktex-bin-x64-2.9
-lstdigest=c64b2398ab49592ee98828f6bcac7753
-numpkg=3963
+lstdigest=d37a2f968fd010313fbf8d7ba0a70724
+numpkg=3970
relstate=next
-version=7546
+version=7547
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: OkytiK2YNz4+XgF762sEW33gnTgH2c26Zs4JoM5UIewApo5C+B4ozYMGRW/yP8uTRBgVZOGVrpvOyjjN94NpvBqELCCgRaDcyuMWc8KaViblYXf3Pnk3u/UyEI7dQY/Pa2Hj/qBg6HVWH3nAuB7HMOoSKww1GMtSPQgLOaQs1dziMIh/Ys0PSu7PwpCuWSifQv9ItKTJIrm4B+Nkmlmt4mOCPLeQnmrlXz7uDAVvysLAT5LOQ4o0yJFlz4EJ1ezsI6dekRYzzk45m2mIdsrhQcciLIH2rxAGVWRxLYD7VeH676XMz4wiyql0Cl5ui3aRpMciTG5ckUsYUUclPiuzuA==
+;;;; signature/miktex: b2IkzmOX0rqrZ5k/9/dKxQNRwx3AT3CRtQnz32HHPFOR/OuTA80TbUa5GHQNFMVEaMTpwMo1Z7HrJc+altM7aeqkmZ84IBh7WmDbVVjeLoj4uMlmI4Gw98yKK70Z6UY2pMX98CZwy2Et7yH7IenOTps4yrfAd+Qklmz0nPnOEL/eVmf0ART6OL8uDxnKuKQOHkzmgCrw7lSp1Uit0KS9c9xuWhXjMgmFYP4iYncoS5nRh02DfqGXHept4OeiZAKByrPfPYgPx0+XA55RRWaq+BiCY3gWwJcfyM6StY3+kgceEcOESemJcGUgqehK6q4KZ4tUyhvlbIU8ern1gYl84g==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index 9c095707e0..370d22a18c 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1598731920
-lastupd=academicons acmart algpseudocodex apa7 asmeconf beamerauxtheme biblatex-ext chhaya ekdosis expkv-opt fontsetup frpseudocode hopatch logix luaprogtable marathi mcf2graph newcomputermodern oberdiek overlock
-lstdigest=d81a2550922e2a6ebfd31c78d529edb2
-numpkg=3963
+date=1598818315
+lastupd=adjustbox animate beamer-rl beamerthemenord beilstein biber-darwin-x86_64 biber-doc biber-linux-x86_64 biber-windows-x64 biber-windows-x86 biblatex biblatex-apa biblatex-apa6 biblatex-ext biblatex-jura2 biblatex-publist changelog ctex decision-table ebproof
+lstdigest=b40569e0bb7ff73dc146df5fc619eea3
+numpkg=3970
relstate=stable
-version=7546
+version=7547
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: P5+P92jxjclwBK6Wo2qQz3NBdRh8tSJyef1d5l4t5UNlEYB5j0DPMFhrkI2swhLj07DH+NtRXlJoaYRh4K2dXAtEXUEOoipvsGdDobsPiRGOjWOUlRZ2fabgEBbG6SmEdtq+A1K7vmPQEdlmqbb8/fskcPcIfuXjLNnIHRDuiU2X0XkgOOm2hivkVN+JMkGjvuV0RxUeqQ8/wx5XOfCx3S5x00TUN2s4U3YoBxylvAZk83jdY9qAhgnvOhnSx9F1a01y3++02MV33s/HNDhrlQ+Uu+WECb2yLB2Yf+326OU366VYLaS1yL9rba56eTwkDFNKbG0SmcADmX5YcizVUA==
+;;;; signature/miktex: nL6sb5J/69YZfs73mjQr/VlJ7H0peb9m4IQTnFZMLh01zlSEROACZRGiLGTxNj4IL3csXAdI7jn3K6db51i3+/6VNX3UKQJFtKac/bVaJ7tA4E0i3HyM7lu2wANr7bbWTJpNeSYeIexfsc0hFxFbp5uJj+6ZTnvMBKA1wnEkOu7epMZE+UBItrOp3Vnq4XsVuPRR5DqtMPAlOqBxmOJzz9n5RAYNft1ejICd3kHy1hcmLZaAENfDp6uaaIMwVbLc8hsZnRqOBUue9LnriPIaVpF28ZKw11xEtoVQXSWUKMfqUIQUh9jYpqukaBrG4dXICa+A3tz1ONs/b7zTpmH4tQ==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/w32tex/ChangeLog b/systems/win32/w32tex/ChangeLog
index 83a1bb892b..fac4d82f71 100644
--- a/systems/win32/w32tex/ChangeLog
+++ b/systems/win32/w32tex/ChangeLog
@@ -1,5 +1,19 @@
W32TeX (x86 & x64) ChangeLog
+[2020/08/30]
+(01) biblatex-biber.tar.xz
+ Update biblatex-apa and biblatex-apa6.
+(02) ltxpkgs.tar.xz
+ Update animate.
+(03) ptex-w32.tar.xz
+ Update pdvitype.exe.
+(04) uptex-w32.tar.xz
+ Update updvitype.exe.
+(05) win64/ptex-w64.tar.xz
+ Update pdvitype.exe.
+(06) win64/uptex-w64.tar.xz
+ Update updvitype.exe.
+
[2020/08/29]
(01) context.tar.xz
ConTeXt version: 2020.08.28 13:55.
diff --git a/timestamp b/timestamp
index 71b705b612..2e8667cfad 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2020-08-30-02-02
+2020-08-31-02-02