From 2d9d44100d72263a7df34c12aaa89dbe6ee6fe0c Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 20 Dec 2020 03:01:07 +0000 Subject: CTAN sync 202012200301 --- fonts/scholax/README | 5 +- fonts/scholax/afm/TeXGyreScholaX-Regular.afm | 2 +- fonts/scholax/enc/zcs_2p3dps.enc | 66 + fonts/scholax/enc/zcs_2ulndi.enc | 4 +- fonts/scholax/enc/zcs_2zpiql.enc | 66 + fonts/scholax/enc/zcs_3uk2yo.enc | 65 + fonts/scholax/enc/zcs_4dtzhu.enc | 65 - fonts/scholax/enc/zcs_6ff7e3.enc | 64 - fonts/scholax/enc/zcs_6ln7pl.enc | 66 - fonts/scholax/enc/zcs_6nir6i.enc | 65 - fonts/scholax/enc/zcs_72zhkj.enc | 65 + fonts/scholax/enc/zcs_7awbtq.enc | 66 - fonts/scholax/enc/zcs_7e5ds2.enc | 65 - fonts/scholax/enc/zcs_7xuij4.enc | 4 +- fonts/scholax/enc/zcs_aisocu.enc | 4 +- fonts/scholax/enc/zcs_b3lkzu.enc | 65 - fonts/scholax/enc/zcs_c3rnvk.enc | 4 +- fonts/scholax/enc/zcs_c5ugpk.enc | 4 +- fonts/scholax/enc/zcs_cpzha2.enc | 66 - fonts/scholax/enc/zcs_czuex4.enc | 65 + fonts/scholax/enc/zcs_dcwile.enc | 65 + fonts/scholax/enc/zcs_dodlyj.enc | 4 +- fonts/scholax/enc/zcs_dstn3c.enc | 65 - fonts/scholax/enc/zcs_elm6ky.enc | 65 - fonts/scholax/enc/zcs_fn6vum.enc | 65 + fonts/scholax/enc/zcs_heobe3.enc | 8 +- fonts/scholax/enc/zcs_ibl2ck.enc | 66 - fonts/scholax/enc/zcs_ioc2dx.enc | 4 +- fonts/scholax/enc/zcs_jkq3qs.enc | 4 +- fonts/scholax/enc/zcs_k56gxg.enc | 65 + fonts/scholax/enc/zcs_kqv4hm.enc | 64 - fonts/scholax/enc/zcs_lewktp.enc | 66 + fonts/scholax/enc/zcs_litts3.enc | 4 +- fonts/scholax/enc/zcs_mett7y.enc | 4 +- fonts/scholax/enc/zcs_mnnbkz.enc | 4 +- fonts/scholax/enc/zcs_oun2tw.enc | 65 - fonts/scholax/enc/zcs_qfh2v7.enc | 4 +- fonts/scholax/enc/zcs_ra2vxf.enc | 4 +- fonts/scholax/enc/zcs_t6txtr.enc | 65 + fonts/scholax/enc/zcs_tpfstq.enc | 4 +- fonts/scholax/enc/zcs_ujimmk.enc | 66 + fonts/scholax/enc/zcs_wg6py3.enc | 65 + fonts/scholax/enc/zcs_wlo5nq.enc | 4 +- fonts/scholax/enc/zcs_wylu46.enc | 4 +- fonts/scholax/enc/zcs_x5uxyb.enc | 4 +- fonts/scholax/enc/zcs_xrqdd6.enc | 65 + fonts/scholax/enc/zcs_xzuu25.enc | 65 + fonts/scholax/enc/zcs_y6waxr.enc | 8 +- fonts/scholax/enc/zcs_ygq5eo.enc | 65 - fonts/scholax/enc/zcs_zgzte3.enc | 4 +- fonts/scholax/map/ScholaX.map | 312 ++-- fonts/scholax/opentype/TeXGyreScholaX-Regular.otf | Bin 145816 -> 145912 bytes fonts/scholax/tex/LY1TeXGyreScholaX-Inf.fd | 74 +- fonts/scholax/tex/LY1TeXGyreScholaX-Sup.fd | 74 +- fonts/scholax/tex/OT1TeXGyreScholaX-Inf.fd | 72 +- fonts/scholax/tex/OT1TeXGyreScholaX-Sup.fd | 72 +- fonts/scholax/tex/T1TeXGyreScholaX-Inf.fd | 72 +- fonts/scholax/tex/T1TeXGyreScholaX-Sup.fd | 70 +- fonts/scholax/tex/scholax.sty | 5 +- fonts/scholax/tfm/TeXGyreScholaX-Bold-inf-ot1.tfm | Bin 1520 -> 1168 bytes fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-ot1.tfm | Bin 3876 -> 3536 bytes .../tfm/TeXGyreScholaX-Bold-lf-sc-ot1--base.tfm | Bin 1576 -> 1220 bytes .../scholax/tfm/TeXGyreScholaX-Bold-lf-sc-ot1.tfm | Bin 4140 -> 3760 bytes .../tfm/TeXGyreScholaX-Bold-lf-ts1--base.tfm | Bin 1552 -> 1564 bytes fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-ts1.tfm | Bin 1580 -> 1592 bytes fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-ot1.tfm | Bin 3868 -> 3528 bytes .../tfm/TeXGyreScholaX-Bold-osf-sc-ot1--base.tfm | Bin 1576 -> 1220 bytes .../scholax/tfm/TeXGyreScholaX-Bold-osf-sc-ot1.tfm | Bin 4132 -> 3748 bytes .../tfm/TeXGyreScholaX-Bold-osf-ts1--base.tfm | Bin 1552 -> 1564 bytes fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-ts1.tfm | Bin 1580 -> 1592 bytes fonts/scholax/tfm/TeXGyreScholaX-Bold-sup-ot1.tfm | Bin 1672 -> 1316 bytes fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-ot1.tfm | Bin 3864 -> 3524 bytes .../tfm/TeXGyreScholaX-Bold-tlf-sc-ot1--base.tfm | Bin 1548 -> 1192 bytes .../scholax/tfm/TeXGyreScholaX-Bold-tlf-sc-ot1.tfm | Bin 4132 -> 3752 bytes .../tfm/TeXGyreScholaX-Bold-tlf-ts1--base.tfm | Bin 1520 -> 1532 bytes fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-ts1.tfm | Bin 1548 -> 1560 bytes fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-ot1.tfm | Bin 3836 -> 3496 bytes .../tfm/TeXGyreScholaX-Bold-tosf-sc-ot1--base.tfm | Bin 1548 -> 1192 bytes .../tfm/TeXGyreScholaX-Bold-tosf-sc-ot1.tfm | Bin 4104 -> 3720 bytes .../tfm/TeXGyreScholaX-Bold-tosf-ts1--base.tfm | Bin 1520 -> 1532 bytes fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-ts1.tfm | Bin 1548 -> 1560 bytes .../tfm/TeXGyreScholaX-BoldItalic-inf-ot1.tfm | Bin 1636 -> 1288 bytes .../tfm/TeXGyreScholaX-BoldItalic-lf-ot1.tfm | Bin 4000 -> 3660 bytes .../TeXGyreScholaX-BoldItalic-lf-sc-ot1--base.tfm | Bin 1752 -> 1400 bytes .../tfm/TeXGyreScholaX-BoldItalic-lf-sc-ot1.tfm | Bin 4356 -> 3976 bytes .../tfm/TeXGyreScholaX-BoldItalic-lf-ts1--base.tfm | Bin 1668 -> 1704 bytes .../tfm/TeXGyreScholaX-BoldItalic-lf-ts1.tfm | Bin 1700 -> 1736 bytes .../tfm/TeXGyreScholaX-BoldItalic-osf-ot1.tfm | Bin 3988 -> 3648 bytes .../TeXGyreScholaX-BoldItalic-osf-sc-ot1--base.tfm | Bin 1748 -> 1396 bytes .../tfm/TeXGyreScholaX-BoldItalic-osf-sc-ot1.tfm | Bin 4340 -> 3964 bytes .../TeXGyreScholaX-BoldItalic-osf-ts1--base.tfm | Bin 1668 -> 1704 bytes .../tfm/TeXGyreScholaX-BoldItalic-osf-ts1.tfm | Bin 1700 -> 1736 bytes .../tfm/TeXGyreScholaX-BoldItalic-sup-ot1.tfm | Bin 1792 -> 1432 bytes .../tfm/TeXGyreScholaX-BoldItalic-tlf-ot1.tfm | Bin 3964 -> 3624 bytes .../TeXGyreScholaX-BoldItalic-tlf-sc-ot1--base.tfm | Bin 1704 -> 1352 bytes .../tfm/TeXGyreScholaX-BoldItalic-tlf-sc-ot1.tfm | Bin 4328 -> 3952 bytes .../TeXGyreScholaX-BoldItalic-tlf-ts1--base.tfm | Bin 1628 -> 1664 bytes .../tfm/TeXGyreScholaX-BoldItalic-tlf-ts1.tfm | Bin 1660 -> 1696 bytes .../tfm/TeXGyreScholaX-BoldItalic-tosf-ot1.tfm | Bin 3940 -> 3600 bytes ...TeXGyreScholaX-BoldItalic-tosf-sc-ot1--base.tfm | Bin 1700 -> 1348 bytes .../tfm/TeXGyreScholaX-BoldItalic-tosf-sc-ot1.tfm | Bin 4292 -> 3916 bytes .../TeXGyreScholaX-BoldItalic-tosf-ts1--base.tfm | Bin 1628 -> 1664 bytes .../tfm/TeXGyreScholaX-BoldItalic-tosf-ts1.tfm | Bin 1660 -> 1696 bytes .../tfm/TeXGyreScholaX-BoldSlanted-inf-ot1.tfm | Bin 1724 -> 1376 bytes .../tfm/TeXGyreScholaX-BoldSlanted-lf-ot1.tfm | Bin 4096 -> 3756 bytes .../TeXGyreScholaX-BoldSlanted-lf-sc-ot1--base.tfm | Bin 1780 -> 1428 bytes .../tfm/TeXGyreScholaX-BoldSlanted-lf-sc-ot1.tfm | Bin 4344 -> 3968 bytes .../TeXGyreScholaX-BoldSlanted-lf-ts1--base.tfm | Bin 1740 -> 1752 bytes .../tfm/TeXGyreScholaX-BoldSlanted-lf-ts1.tfm | Bin 1768 -> 1780 bytes .../tfm/TeXGyreScholaX-BoldSlanted-osf-ot1.tfm | Bin 4088 -> 3748 bytes ...TeXGyreScholaX-BoldSlanted-osf-sc-ot1--base.tfm | Bin 1780 -> 1428 bytes .../tfm/TeXGyreScholaX-BoldSlanted-osf-sc-ot1.tfm | Bin 4336 -> 3956 bytes .../TeXGyreScholaX-BoldSlanted-osf-ts1--base.tfm | Bin 1740 -> 1752 bytes .../tfm/TeXGyreScholaX-BoldSlanted-osf-ts1.tfm | Bin 1768 -> 1780 bytes .../tfm/TeXGyreScholaX-BoldSlanted-sup-ot1.tfm | Bin 1892 -> 1540 bytes .../tfm/TeXGyreScholaX-BoldSlanted-tlf-ot1.tfm | Bin 4084 -> 3744 bytes ...TeXGyreScholaX-BoldSlanted-tlf-sc-ot1--base.tfm | Bin 1752 -> 1400 bytes .../tfm/TeXGyreScholaX-BoldSlanted-tlf-sc-ot1.tfm | Bin 4336 -> 3960 bytes .../TeXGyreScholaX-BoldSlanted-tlf-ts1--base.tfm | Bin 1708 -> 1720 bytes .../tfm/TeXGyreScholaX-BoldSlanted-tlf-ts1.tfm | Bin 1736 -> 1748 bytes .../tfm/TeXGyreScholaX-BoldSlanted-tosf-ot1.tfm | Bin 4056 -> 3716 bytes ...eXGyreScholaX-BoldSlanted-tosf-sc-ot1--base.tfm | Bin 1752 -> 1400 bytes .../tfm/TeXGyreScholaX-BoldSlanted-tosf-sc-ot1.tfm | Bin 4308 -> 3928 bytes .../TeXGyreScholaX-BoldSlanted-tosf-ts1--base.tfm | Bin 1708 -> 1720 bytes .../tfm/TeXGyreScholaX-BoldSlanted-tosf-ts1.tfm | Bin 1736 -> 1748 bytes .../scholax/tfm/TeXGyreScholaX-Italic-inf-ot1.tfm | Bin 1616 -> 1268 bytes fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-ot1.tfm | Bin 3920 -> 3580 bytes .../tfm/TeXGyreScholaX-Italic-lf-sc-ot1--base.tfm | Bin 1732 -> 1384 bytes .../tfm/TeXGyreScholaX-Italic-lf-sc-ot1.tfm | Bin 4260 -> 3888 bytes .../tfm/TeXGyreScholaX-Italic-lf-ts1--base.tfm | Bin 1676 -> 1696 bytes fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-ts1.tfm | Bin 1704 -> 1724 bytes .../scholax/tfm/TeXGyreScholaX-Italic-osf-ot1.tfm | Bin 3904 -> 3564 bytes .../tfm/TeXGyreScholaX-Italic-osf-sc-ot1--base.tfm | Bin 1720 -> 1372 bytes .../tfm/TeXGyreScholaX-Italic-osf-sc-ot1.tfm | Bin 4240 -> 3868 bytes .../tfm/TeXGyreScholaX-Italic-osf-ts1--base.tfm | Bin 1676 -> 1696 bytes .../scholax/tfm/TeXGyreScholaX-Italic-osf-ts1.tfm | Bin 1704 -> 1724 bytes .../scholax/tfm/TeXGyreScholaX-Italic-sup-ot1.tfm | Bin 1792 -> 1436 bytes .../scholax/tfm/TeXGyreScholaX-Italic-tlf-ot1.tfm | Bin 3872 -> 3532 bytes .../tfm/TeXGyreScholaX-Italic-tlf-sc-ot1--base.tfm | Bin 1660 -> 1312 bytes .../tfm/TeXGyreScholaX-Italic-tlf-sc-ot1.tfm | Bin 4208 -> 3836 bytes .../tfm/TeXGyreScholaX-Italic-tlf-ts1--base.tfm | Bin 1616 -> 1644 bytes .../scholax/tfm/TeXGyreScholaX-Italic-tlf-ts1.tfm | Bin 1644 -> 1672 bytes .../scholax/tfm/TeXGyreScholaX-Italic-tosf-ot1.tfm | Bin 3840 -> 3500 bytes .../TeXGyreScholaX-Italic-tosf-sc-ot1--base.tfm | Bin 1656 -> 1308 bytes .../tfm/TeXGyreScholaX-Italic-tosf-sc-ot1.tfm | Bin 4176 -> 3804 bytes .../tfm/TeXGyreScholaX-Italic-tosf-ts1--base.tfm | Bin 1616 -> 1644 bytes .../scholax/tfm/TeXGyreScholaX-Italic-tosf-ts1.tfm | Bin 1644 -> 1672 bytes .../scholax/tfm/TeXGyreScholaX-Regular-inf-ot1.tfm | Bin 1500 -> 1148 bytes .../scholax/tfm/TeXGyreScholaX-Regular-lf-ot1.tfm | Bin 3876 -> 3536 bytes .../tfm/TeXGyreScholaX-Regular-lf-sc-ot1--base.tfm | Bin 1544 -> 1192 bytes .../tfm/TeXGyreScholaX-Regular-lf-sc-ot1.tfm | Bin 4236 -> 3860 bytes .../tfm/TeXGyreScholaX-Regular-lf-ts1--base.tfm | Bin 1532 -> 1540 bytes .../scholax/tfm/TeXGyreScholaX-Regular-lf-ts1.tfm | Bin 1560 -> 1568 bytes .../scholax/tfm/TeXGyreScholaX-Regular-osf-ot1.tfm | Bin 3868 -> 3528 bytes .../TeXGyreScholaX-Regular-osf-sc-ot1--base.tfm | Bin 1544 -> 1192 bytes .../tfm/TeXGyreScholaX-Regular-osf-sc-ot1.tfm | Bin 4228 -> 3852 bytes .../tfm/TeXGyreScholaX-Regular-osf-ts1--base.tfm | Bin 1532 -> 1540 bytes .../scholax/tfm/TeXGyreScholaX-Regular-osf-ts1.tfm | Bin 1560 -> 1568 bytes .../scholax/tfm/TeXGyreScholaX-Regular-sup-ot1.tfm | Bin 1660 -> 1304 bytes .../scholax/tfm/TeXGyreScholaX-Regular-tlf-ot1.tfm | Bin 3868 -> 3528 bytes .../TeXGyreScholaX-Regular-tlf-sc-ot1--base.tfm | Bin 1516 -> 1164 bytes .../tfm/TeXGyreScholaX-Regular-tlf-sc-ot1.tfm | Bin 4228 -> 3852 bytes .../tfm/TeXGyreScholaX-Regular-tlf-ts1--base.tfm | Bin 1500 -> 1508 bytes .../scholax/tfm/TeXGyreScholaX-Regular-tlf-ts1.tfm | Bin 1528 -> 1536 bytes .../tfm/TeXGyreScholaX-Regular-tosf-ot1.tfm | Bin 3840 -> 3500 bytes .../TeXGyreScholaX-Regular-tosf-sc-ot1--base.tfm | Bin 1516 -> 1164 bytes .../tfm/TeXGyreScholaX-Regular-tosf-sc-ot1.tfm | Bin 4200 -> 3824 bytes .../tfm/TeXGyreScholaX-Regular-tosf-ts1--base.tfm | Bin 1500 -> 1508 bytes .../tfm/TeXGyreScholaX-Regular-tosf-ts1.tfm | Bin 1528 -> 1536 bytes .../scholax/tfm/TeXGyreScholaX-Slanted-inf-ot1.tfm | Bin 1724 -> 1376 bytes .../scholax/tfm/TeXGyreScholaX-Slanted-lf-ot1.tfm | Bin 4120 -> 3780 bytes .../tfm/TeXGyreScholaX-Slanted-lf-sc-ot1--base.tfm | Bin 1772 -> 1424 bytes .../tfm/TeXGyreScholaX-Slanted-lf-sc-ot1.tfm | Bin 4464 -> 4092 bytes .../tfm/TeXGyreScholaX-Slanted-lf-ts1--base.tfm | Bin 1744 -> 1752 bytes .../scholax/tfm/TeXGyreScholaX-Slanted-lf-ts1.tfm | Bin 1772 -> 1780 bytes .../scholax/tfm/TeXGyreScholaX-Slanted-osf-ot1.tfm | Bin 4112 -> 3772 bytes .../TeXGyreScholaX-Slanted-osf-sc-ot1--base.tfm | Bin 1772 -> 1424 bytes .../tfm/TeXGyreScholaX-Slanted-osf-sc-ot1.tfm | Bin 4456 -> 4084 bytes .../tfm/TeXGyreScholaX-Slanted-osf-ts1--base.tfm | Bin 1744 -> 1752 bytes .../scholax/tfm/TeXGyreScholaX-Slanted-osf-ts1.tfm | Bin 1772 -> 1780 bytes .../scholax/tfm/TeXGyreScholaX-Slanted-sup-ot1.tfm | Bin 1864 -> 1512 bytes .../scholax/tfm/TeXGyreScholaX-Slanted-tlf-ot1.tfm | Bin 4112 -> 3772 bytes .../TeXGyreScholaX-Slanted-tlf-sc-ot1--base.tfm | Bin 1744 -> 1396 bytes .../tfm/TeXGyreScholaX-Slanted-tlf-sc-ot1.tfm | Bin 4456 -> 4084 bytes .../tfm/TeXGyreScholaX-Slanted-tlf-ts1--base.tfm | Bin 1712 -> 1720 bytes .../scholax/tfm/TeXGyreScholaX-Slanted-tlf-ts1.tfm | Bin 1740 -> 1748 bytes .../tfm/TeXGyreScholaX-Slanted-tosf-ot1.tfm | Bin 4084 -> 3744 bytes .../TeXGyreScholaX-Slanted-tosf-sc-ot1--base.tfm | Bin 1744 -> 1396 bytes .../tfm/TeXGyreScholaX-Slanted-tosf-sc-ot1.tfm | Bin 4428 -> 4056 bytes .../tfm/TeXGyreScholaX-Slanted-tosf-ts1--base.tfm | Bin 1712 -> 1720 bytes .../tfm/TeXGyreScholaX-Slanted-tosf-ts1.tfm | Bin 1740 -> 1748 bytes fonts/scholax/type1/TeXGyreScholaX-Regular.pfb | Bin 157903 -> 158344 bytes fonts/scholax/vf/TeXGyreScholaX-Bold-lf-sc-ot1.vf | Bin 856 -> 820 bytes fonts/scholax/vf/TeXGyreScholaX-Bold-lf-ts1.vf | Bin 932 -> 976 bytes fonts/scholax/vf/TeXGyreScholaX-Bold-osf-sc-ot1.vf | Bin 856 -> 820 bytes fonts/scholax/vf/TeXGyreScholaX-Bold-osf-ts1.vf | Bin 932 -> 976 bytes fonts/scholax/vf/TeXGyreScholaX-Bold-tlf-sc-ot1.vf | Bin 856 -> 820 bytes fonts/scholax/vf/TeXGyreScholaX-Bold-tlf-ts1.vf | Bin 932 -> 976 bytes .../scholax/vf/TeXGyreScholaX-Bold-tosf-sc-ot1.vf | Bin 856 -> 820 bytes fonts/scholax/vf/TeXGyreScholaX-Bold-tosf-ts1.vf | Bin 932 -> 980 bytes .../vf/TeXGyreScholaX-BoldItalic-lf-sc-ot1.vf | Bin 860 -> 824 bytes .../scholax/vf/TeXGyreScholaX-BoldItalic-lf-ts1.vf | Bin 936 -> 984 bytes .../vf/TeXGyreScholaX-BoldItalic-osf-sc-ot1.vf | Bin 860 -> 828 bytes .../vf/TeXGyreScholaX-BoldItalic-osf-ts1.vf | Bin 940 -> 984 bytes .../vf/TeXGyreScholaX-BoldItalic-tlf-sc-ot1.vf | Bin 860 -> 828 bytes .../vf/TeXGyreScholaX-BoldItalic-tlf-ts1.vf | Bin 940 -> 984 bytes .../vf/TeXGyreScholaX-BoldItalic-tosf-sc-ot1.vf | Bin 864 -> 828 bytes .../vf/TeXGyreScholaX-BoldItalic-tosf-ts1.vf | Bin 940 -> 984 bytes .../vf/TeXGyreScholaX-BoldSlanted-lf-sc-ot1.vf | Bin 860 -> 828 bytes .../vf/TeXGyreScholaX-BoldSlanted-lf-ts1.vf | Bin 940 -> 984 bytes .../vf/TeXGyreScholaX-BoldSlanted-osf-sc-ot1.vf | Bin 864 -> 828 bytes .../vf/TeXGyreScholaX-BoldSlanted-osf-ts1.vf | Bin 940 -> 984 bytes .../vf/TeXGyreScholaX-BoldSlanted-tlf-sc-ot1.vf | Bin 864 -> 828 bytes .../vf/TeXGyreScholaX-BoldSlanted-tlf-ts1.vf | Bin 940 -> 984 bytes .../vf/TeXGyreScholaX-BoldSlanted-tosf-sc-ot1.vf | Bin 864 -> 828 bytes .../vf/TeXGyreScholaX-BoldSlanted-tosf-ts1.vf | Bin 940 -> 984 bytes .../scholax/vf/TeXGyreScholaX-Italic-lf-sc-ot1.vf | Bin 856 -> 820 bytes fonts/scholax/vf/TeXGyreScholaX-Italic-lf-ts1.vf | Bin 932 -> 980 bytes .../scholax/vf/TeXGyreScholaX-Italic-osf-sc-ot1.vf | Bin 856 -> 824 bytes fonts/scholax/vf/TeXGyreScholaX-Italic-osf-ts1.vf | Bin 936 -> 980 bytes .../scholax/vf/TeXGyreScholaX-Italic-tlf-sc-ot1.vf | Bin 856 -> 824 bytes fonts/scholax/vf/TeXGyreScholaX-Italic-tlf-ts1.vf | Bin 936 -> 980 bytes .../vf/TeXGyreScholaX-Italic-tosf-sc-ot1.vf | Bin 860 -> 824 bytes fonts/scholax/vf/TeXGyreScholaX-Italic-tosf-ts1.vf | Bin 936 -> 980 bytes .../scholax/vf/TeXGyreScholaX-Regular-lf-sc-ot1.vf | Bin 856 -> 824 bytes fonts/scholax/vf/TeXGyreScholaX-Regular-lf-ts1.vf | Bin 928 -> 976 bytes .../vf/TeXGyreScholaX-Regular-osf-sc-ot1.vf | Bin 860 -> 824 bytes fonts/scholax/vf/TeXGyreScholaX-Regular-osf-ts1.vf | Bin 932 -> 976 bytes .../vf/TeXGyreScholaX-Regular-tlf-sc-ot1.vf | Bin 860 -> 824 bytes fonts/scholax/vf/TeXGyreScholaX-Regular-tlf-ts1.vf | Bin 932 -> 976 bytes .../vf/TeXGyreScholaX-Regular-tosf-sc-ot1.vf | Bin 860 -> 824 bytes .../scholax/vf/TeXGyreScholaX-Regular-tosf-ts1.vf | Bin 932 -> 976 bytes .../scholax/vf/TeXGyreScholaX-Slanted-lf-sc-ot1.vf | Bin 856 -> 824 bytes fonts/scholax/vf/TeXGyreScholaX-Slanted-lf-ts1.vf | Bin 928 -> 976 bytes .../vf/TeXGyreScholaX-Slanted-osf-sc-ot1.vf | Bin 860 -> 824 bytes fonts/scholax/vf/TeXGyreScholaX-Slanted-osf-ts1.vf | Bin 932 -> 976 bytes .../vf/TeXGyreScholaX-Slanted-tlf-sc-ot1.vf | Bin 860 -> 824 bytes fonts/scholax/vf/TeXGyreScholaX-Slanted-tlf-ts1.vf | Bin 932 -> 976 bytes .../vf/TeXGyreScholaX-Slanted-tosf-sc-ot1.vf | Bin 860 -> 824 bytes .../scholax/vf/TeXGyreScholaX-Slanted-tosf-ts1.vf | Bin 932 -> 976 bytes fonts/utilities/fontools/bin/afm2afm | 4 +- fonts/utilities/fontools/bin/autoinst | 1766 ++++++++++---------- fonts/utilities/fontools/bin/ot2kpx | 4 +- fonts/utilities/fontools/bin/splitttc | 4 +- fonts/utilities/fontools/doc/afm2afm.pdf | Bin 26995 -> 26974 bytes fonts/utilities/fontools/doc/autoinst.pdf | Bin 68451 -> 68663 bytes fonts/utilities/fontools/doc/ot2kpx.pdf | Bin 27380 -> 27352 bytes fonts/utilities/fontools/doc/splitttc.pdf | Bin 20385 -> 20354 bytes 248 files changed, 2186 insertions(+), 2264 deletions(-) create mode 100644 fonts/scholax/enc/zcs_2p3dps.enc create mode 100644 fonts/scholax/enc/zcs_2zpiql.enc create mode 100644 fonts/scholax/enc/zcs_3uk2yo.enc delete mode 100644 fonts/scholax/enc/zcs_4dtzhu.enc delete mode 100644 fonts/scholax/enc/zcs_6ff7e3.enc delete mode 100644 fonts/scholax/enc/zcs_6ln7pl.enc delete mode 100644 fonts/scholax/enc/zcs_6nir6i.enc create mode 100644 fonts/scholax/enc/zcs_72zhkj.enc delete mode 100644 fonts/scholax/enc/zcs_7awbtq.enc delete mode 100644 fonts/scholax/enc/zcs_7e5ds2.enc delete mode 100644 fonts/scholax/enc/zcs_b3lkzu.enc delete mode 100644 fonts/scholax/enc/zcs_cpzha2.enc create mode 100644 fonts/scholax/enc/zcs_czuex4.enc create mode 100644 fonts/scholax/enc/zcs_dcwile.enc delete mode 100644 fonts/scholax/enc/zcs_dstn3c.enc delete mode 100644 fonts/scholax/enc/zcs_elm6ky.enc create mode 100644 fonts/scholax/enc/zcs_fn6vum.enc delete mode 100644 fonts/scholax/enc/zcs_ibl2ck.enc create mode 100644 fonts/scholax/enc/zcs_k56gxg.enc delete mode 100644 fonts/scholax/enc/zcs_kqv4hm.enc create mode 100644 fonts/scholax/enc/zcs_lewktp.enc delete mode 100644 fonts/scholax/enc/zcs_oun2tw.enc create mode 100644 fonts/scholax/enc/zcs_t6txtr.enc create mode 100644 fonts/scholax/enc/zcs_ujimmk.enc create mode 100644 fonts/scholax/enc/zcs_wg6py3.enc create mode 100644 fonts/scholax/enc/zcs_xrqdd6.enc create mode 100644 fonts/scholax/enc/zcs_xzuu25.enc delete mode 100644 fonts/scholax/enc/zcs_ygq5eo.enc (limited to 'fonts') diff --git a/fonts/scholax/README b/fonts/scholax/README index c7d4ae241c..bee2c60537 100644 --- a/fonts/scholax/README +++ b/fonts/scholax/README @@ -8,7 +8,10 @@ The licence of fourier-GUTenberg is LPPL (Latex Public Project Licence) and the licence for TeXGyre fonts is equivalent to the LPPL, so this package is released under the LPPL. -Current version: 1.027 2020-11-30 +Current version: 1.028 2020-12-18 + +Changes in version 1.028 +Corrected ts1 encoding so that glyph coverage is complete. Changes in version 1.027 Corrected scholax.sty, adding code to enable missing option 'shrink'. (Thanks Arash Esbati.) diff --git a/fonts/scholax/afm/TeXGyreScholaX-Regular.afm b/fonts/scholax/afm/TeXGyreScholaX-Regular.afm index bdad09e664..c509a0ee5b 100644 --- a/fonts/scholax/afm/TeXGyreScholaX-Regular.afm +++ b/fonts/scholax/afm/TeXGyreScholaX-Regular.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 Comment Generated by FontForge 20200314 -Comment Creation Date: Sun May 31 16:48:08 2020 +Comment Creation Date: Fri Dec 18 15:08:02 2020 FontName TeXGyreScholaX-Regular FullName TeXGyreScholaX-Regular FamilyName TeXGyreScholaX diff --git a/fonts/scholax/enc/zcs_2p3dps.enc b/fonts/scholax/enc/zcs_2p3dps.enc new file mode 100644 index 0000000000..d341d196e0 --- /dev/null +++ b/fonts/scholax/enc/zcs_2p3dps.enc @@ -0,0 +1,66 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_2p3dpsncuttwo4u7mg4vxajzgc +% Encoding created by otftotfm on Fri Dec 18 17:26:41 2020 +% Command line follows encoding +/AutoEnc_2p3dpsncuttwo4u7mg4vxajzgc [ +%00 + /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon + /Phi /Psi /ohm /.notdef /.notdef /.notdef /.notdef /.notdef +%10 + /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring + /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash +%20 + /space /exclam /quotedblright /numbersign /dollar.oldstyle /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle + /eight.taboldstyle /nine.taboldstyle /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 + /s.sc /.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/public/scholax +% --vf-directory=texmf/fonts/vf/public/scholax +% --type1-directory=texmf/fonts/type1/public/scholax +% --encoding-directory=texmf/fonts/enc/dvips/scholax +% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.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 TeXGyreScholaX-Bold.otf +% TeXGyreScholaX-Bold-tosf-sc-ot1' diff --git a/fonts/scholax/enc/zcs_2ulndi.enc b/fonts/scholax/enc/zcs_2ulndi.enc index 4ecee289f9..bc07f16a14 100644 --- a/fonts/scholax/enc/zcs_2ulndi.enc +++ b/fonts/scholax/enc/zcs_2ulndi.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_2ulndivj7rgfusakdjkyiqkeeh -% Encoding created by otftotfm on Sun May 31 18:00:22 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:44 2020 % Command line follows encoding /AutoEnc_2ulndivj7rgfusakdjkyiqkeeh [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern +% --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 TeXGyreScholaX-Bold.otf TeXGyreScholaX-Bold-osf-t1' diff --git a/fonts/scholax/enc/zcs_2zpiql.enc b/fonts/scholax/enc/zcs_2zpiql.enc new file mode 100644 index 0000000000..699e0ee2e5 --- /dev/null +++ b/fonts/scholax/enc/zcs_2zpiql.enc @@ -0,0 +1,66 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_2zpiqlgetjw2lcxp65c2xrr2lc +% Encoding created by otftotfm on Fri Dec 18 17:26:44 2020 +% Command line follows encoding +/AutoEnc_2zpiqlgetjw2lcxp65c2xrr2lc [ +%00 + /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon + /Phi /Psi /ohm /.notdef /.notdef /.notdef /.notdef /.notdef +%10 + /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring + /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash +%20 + /space /exclam /quotedblright /numbersign /dollar.oldstyle /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle + /eight.oldstyle /nine.oldstyle /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 + /s.sc /.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/public/scholax +% --vf-directory=texmf/fonts/vf/public/scholax +% --type1-directory=texmf/fonts/type1/public/scholax +% --encoding-directory=texmf/fonts/enc/dvips/scholax +% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.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 TeXGyreScholaX-Bold.otf +% TeXGyreScholaX-Bold-osf-sc-ot1' diff --git a/fonts/scholax/enc/zcs_3uk2yo.enc b/fonts/scholax/enc/zcs_3uk2yo.enc new file mode 100644 index 0000000000..bd8139ab77 --- /dev/null +++ b/fonts/scholax/enc/zcs_3uk2yo.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_3uk2yosnyfskjsi3yyvfv6qzud +% Encoding created by otftotfm on Fri Dec 18 17:26:39 2020 +% Command line follows encoding +/AutoEnc_3uk2yosnyfskjsi3yyvfv6qzud [ +%00 + /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon + /Phi /Psi /ohm /.notdef /.notdef /.notdef /.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.oldstyle /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle + /eight.taboldstyle /nine.taboldstyle /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_l /f_f_l /f_i /f_f_i /.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/public/scholax +% --vf-directory=texmf/fonts/vf/public/scholax +% --type1-directory=texmf/fonts/type1/public/scholax +% --encoding-directory=texmf/fonts/enc/dvips/scholax +% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.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 +% TeXGyreScholaX-Bold.otf TeXGyreScholaX-Bold-tosf-ot1' diff --git a/fonts/scholax/enc/zcs_4dtzhu.enc b/fonts/scholax/enc/zcs_4dtzhu.enc deleted file mode 100644 index 28ea834a18..0000000000 --- a/fonts/scholax/enc/zcs_4dtzhu.enc +++ /dev/null @@ -1,65 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_4dtzhuqoio5tdiyokynap3bwdd -% Encoding created by otftotfm on Sun May 31 18:00:19 2020 -% Command line follows encoding -/AutoEnc_4dtzhuqoio5tdiyokynap3bwdd [ -%00 - /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap - /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /bar /endash -%10 - /.notdef /.notdef /quotedblbase /.notdef /.notdef /.notdef /threequartersemdash /.notdef - /uni2190 /uni2192 /tieaccentlowercase /tieaccentcapital /.notdef /.notdef /.notdef /.notdef -%20 - /blanksymbol /.notdef /.notdef /.notdef /dollar.oldstyle /.notdef /.notdef /quotesingle - /.notdef /.notdef /asterisk.math /.notdef /comma /hyphendbl /period /fraction -%30 - /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle - /eight.taboldstyle /nine.taboldstyle /.notdef /.notdef /angleleft /minus /angleright /.notdef -%40 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /bigcircle -%50 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /ohm - /.notdef /.notdef /.notdef /dblbracketleft /.notdef /dblbracketright /uni2191 /uni2193 -%60 - /grave /.notdef /.notdef /divorced /died /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /leaf /married /.notdef /.notdef -%70 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /hyphendbl -%80 - /breve /caron /hungarumlaut /.notdef /dagger /daggerdbl /.notdef /perthousand - /bullet /centigrade /dollar.oldstyle /cent.oldstyle /florin /colonmonetary /won /naira -%90 - /guarani /peso /lira /recipe /interrobang /gnaborretni /dong /trademark - /permyriad /.notdef /baht /numero /discount /estimated /openbullet /servicemark -%A0 - /quillbracketleft /quillbracketright /cent.oldstyle /sterling /currency /yen /brokenbar /section - /dieresis /copyright /ordfeminine /copyleft /logicalnot /.notdef /registered /macron -%B0 - /degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered - /referencemark /one.superior /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 - /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=texmf/fonts/tfm/public/scholax -% --vf-directory=texmf/fonts/vf/public/scholax -% --type1-directory=texmf/fonts/type1/public/scholax -% --encoding-directory=texmf/fonts/enc/dvips/scholax -% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum -% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff -% --ligkern=ff i =: ffi --ligkern=ff l =: ffl TeXGyreScholaX-Bold.otf -% TeXGyreScholaX-Bold-tlf-ts1' diff --git a/fonts/scholax/enc/zcs_6ff7e3.enc b/fonts/scholax/enc/zcs_6ff7e3.enc deleted file mode 100644 index 8ea319b6e3..0000000000 --- a/fonts/scholax/enc/zcs_6ff7e3.enc +++ /dev/null @@ -1,64 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_6ff7e3l7hqxbsf44xh22cdtube -% Encoding created by otftotfm on Sun May 31 18:00:16 2020 -% Command line follows encoding -/AutoEnc_6ff7e3l7hqxbsf44xh22cdtube [ -%00 - /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon - /Phi /Psi /Omega /.notdef /.notdef /.notdef /.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.inferior /one.inferior /two.inferior /three.inferior /four.inferior /five.inferior /six.inferior /seven.inferior - /eight.inferior /nine.inferior /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 /f_f_l /f_f_i /f_f /f_l /f_i -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmf/fonts/tfm/public/scholax -% --vf-directory=texmf/fonts/vf/public/scholax -% --type1-directory=texmf/fonts/type1/public/scholax -% --encoding-directory=texmf/fonts/enc/dvips/scholax -% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=TEX TEXT --feature=sinf --ligkern=f i =: fi --ligkern=f l -% =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl -% --ligkern=* {KL} * TeXGyreScholaX-Bold.otf TeXGyreScholaX-Bold-inf-ot1' diff --git a/fonts/scholax/enc/zcs_6ln7pl.enc b/fonts/scholax/enc/zcs_6ln7pl.enc deleted file mode 100644 index 6542fbcc49..0000000000 --- a/fonts/scholax/enc/zcs_6ln7pl.enc +++ /dev/null @@ -1,66 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_6ln7plwn2ribwu6p3jnonof7ge -% Encoding created by otftotfm on Sun May 31 18:00:20 2020 -% Command line follows encoding -/AutoEnc_6ln7plwn2ribwu6p3jnonof7ge [ -%00 - /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon - /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring - /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash -%20 - /space /exclam /quotedblright /numbersign /dollar.oldstyle /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle - /eight.taboldstyle /nine.taboldstyle /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 - /s.sc /.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 /f_f_l /f_f_i /f_f /f_l /f_i -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmf/fonts/tfm/public/scholax -% --vf-directory=texmf/fonts/vf/public/scholax -% --type1-directory=texmf/fonts/type1/public/scholax -% --encoding-directory=texmf/fonts/enc/dvips/scholax -% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --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 TeXGyreScholaX-Bold.otf -% TeXGyreScholaX-Bold-tosf-sc-ot1' diff --git a/fonts/scholax/enc/zcs_6nir6i.enc b/fonts/scholax/enc/zcs_6nir6i.enc deleted file mode 100644 index ca9d8510b4..0000000000 --- a/fonts/scholax/enc/zcs_6nir6i.enc +++ /dev/null @@ -1,65 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_6nir6ieqtortirzio6sbv34efb -% Encoding created by otftotfm on Sun May 31 18:00:18 2020 -% Command line follows encoding -/AutoEnc_6nir6ieqtortirzio6sbv34efb [ -%00 - /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap - /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /bar /endash -%10 - /.notdef /.notdef /quotedblbase /.notdef /.notdef /.notdef /threequartersemdash /.notdef - /uni2190 /uni2192 /tieaccentlowercase /tieaccentcapital /.notdef /.notdef /.notdef /.notdef -%20 - /blanksymbol /.notdef /.notdef /.notdef /dollar.oldstyle /.notdef /.notdef /quotesingle - /.notdef /.notdef /asterisk.math /.notdef /comma /hyphendbl /period /fraction -%30 - /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle - /eight.oldstyle /nine.oldstyle /.notdef /.notdef /angleleft /minus /angleright /.notdef -%40 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /bigcircle -%50 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /ohm - /.notdef /.notdef /.notdef /dblbracketleft /.notdef /dblbracketright /uni2191 /uni2193 -%60 - /grave /.notdef /.notdef /divorced /died /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /leaf /married /.notdef /.notdef -%70 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /hyphendbl -%80 - /breve /caron /hungarumlaut /.notdef /dagger /daggerdbl /.notdef /perthousand - /bullet /centigrade /dollar.oldstyle /cent.oldstyle /florin /colonmonetary /won /naira -%90 - /guarani /peso /lira /recipe /interrobang /gnaborretni /dong /trademark - /permyriad /.notdef /baht /numero /discount /estimated /openbullet /servicemark -%A0 - /quillbracketleft /quillbracketright /cent.oldstyle /sterling /currency /yen /brokenbar /section - /dieresis /copyright /ordfeminine /copyleft /logicalnot /.notdef /registered /macron -%B0 - /degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered - /referencemark /one.superior /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 - /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=texmf/fonts/tfm/public/scholax -% --vf-directory=texmf/fonts/vf/public/scholax -% --type1-directory=texmf/fonts/type1/public/scholax -% --encoding-directory=texmf/fonts/enc/dvips/scholax -% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum -% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff -% --ligkern=ff i =: ffi --ligkern=ff l =: ffl TeXGyreScholaX-Bold.otf -% TeXGyreScholaX-Bold-lf-ts1' diff --git a/fonts/scholax/enc/zcs_72zhkj.enc b/fonts/scholax/enc/zcs_72zhkj.enc new file mode 100644 index 0000000000..dac4a1544b --- /dev/null +++ b/fonts/scholax/enc/zcs_72zhkj.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_72zhkjxx6uepxvvroc3u3svsab +% Encoding created by otftotfm on Fri Dec 18 17:27:19 2020 +% Command line follows encoding +/AutoEnc_72zhkjxx6uepxvvroc3u3svsab [ +%00 + /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap + /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /bar /.notdef +%10 + /.notdef /.notdef /quotedblbase /.notdef /.notdef /twelveudash /threequartersemdash /.notdef + /uni2190 /uni2192 /tieaccentlowercase /tieaccentcapital /tieaccentlowercase.new /tieaccentcapital.new /.notdef /.notdef +%20 + /blanksymbol /.notdef /.notdef /.notdef /dollar.oldstyle /.notdef /.notdef /quotesingle + /.notdef /.notdef /asterisk.math /.notdef /comma /hyphendbl /period /fraction +%30 + /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle + /eight.oldstyle /nine.oldstyle /.notdef /.notdef /angleleft /minus /angleright /.notdef +%40 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /bigcircle +%50 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /ohm + /.notdef /.notdef /.notdef /dblbracketleft /.notdef /dblbracketright /uni2191 /uni2193 +%60 + /grave /.notdef /star.alt /divorced /died /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /leaf /married /uni266A /.notdef +%70 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde.low /hyphendbl +%80 + /breve /caron /hungarumlaut /dblgrave.ts1 /dagger /daggerdbl /.notdef /perthousand + /bullet /centigrade /dollar.oldstyle /cent.oldstyle /florin /colonmonetary /won /naira +%90 + /guarani /peso /lira /recipe /interrobang /gnaborretni /dong /trademark + /permyriad /paragraph.alt /baht /numero /discount /estimated /openbullet /servicemark +%A0 + /quillbracketleft /quillbracketright /cent.oldstyle /sterling /currency /yen /brokenbar /section + /dieresis.ts1 /copyright /ordfeminine /copyleft /logicalnot /published /registered /macron.dup +%B0 + /degree /plusminus /two.superior /three.superior /acute.dup /uni00B5 /paragraph /periodcentered + /referencemark /one.superior /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 + /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ts1 +% --tfm-directory=texmf/fonts/tfm/public/scholax +% --vf-directory=texmf/fonts/vf/public/scholax +% --type1-directory=texmf/fonts/type1/public/scholax +% --encoding-directory=texmf/fonts/enc/dvips/scholax +% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap +% --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum +% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl TeXGyreScholaX-Regular.otf +% TeXGyreScholaX-Regular-osf-ts1' diff --git a/fonts/scholax/enc/zcs_7awbtq.enc b/fonts/scholax/enc/zcs_7awbtq.enc deleted file mode 100644 index f478fc6094..0000000000 --- a/fonts/scholax/enc/zcs_7awbtq.enc +++ /dev/null @@ -1,66 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_7awbtqdl3hpgcsuyjx6s4khjgf -% Encoding created by otftotfm on Sun May 31 18:00:19 2020 -% Command line follows encoding -/AutoEnc_7awbtqdl3hpgcsuyjx6s4khjgf [ -%00 - /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon - /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi /uni0237 /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 /one /two /three /four /five /six /seven - /eight /nine /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 - /s.sc /.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 /f_f_l /f_f_i /f_f /f_l /f_i -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmf/fonts/tfm/public/scholax -% --vf-directory=texmf/fonts/vf/public/scholax -% --type1-directory=texmf/fonts/type1/public/scholax -% --encoding-directory=texmf/fonts/enc/dvips/scholax -% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --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 TeXGyreScholaX-Bold.otf -% TeXGyreScholaX-Bold-tlf-sc-ot1' diff --git a/fonts/scholax/enc/zcs_7e5ds2.enc b/fonts/scholax/enc/zcs_7e5ds2.enc deleted file mode 100644 index d12b803b77..0000000000 --- a/fonts/scholax/enc/zcs_7e5ds2.enc +++ /dev/null @@ -1,65 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_7e5ds2wistmhezopzoc563gogf -% Encoding created by otftotfm on Sun May 31 18:00:22 2020 -% Command line follows encoding -/AutoEnc_7e5ds2wistmhezopzoc563gogf [ -%00 - /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon - /Phi /Psi /Omega /.notdef /.notdef /.notdef /.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.oldstyle /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle - /eight.oldstyle /nine.oldstyle /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 /f_f_l /f_f_i /f_f /f_l /f_i -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmf/fonts/tfm/public/scholax -% --vf-directory=texmf/fonts/vf/public/scholax -% --type1-directory=texmf/fonts/type1/public/scholax -% --encoding-directory=texmf/fonts/enc/dvips/scholax -% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --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 TeXGyreScholaX-Bold.otf -% TeXGyreScholaX-Bold-osf-ot1' diff --git a/fonts/scholax/enc/zcs_7xuij4.enc b/fonts/scholax/enc/zcs_7xuij4.enc index 0ca66a4541..097de7460b 100644 --- a/fonts/scholax/enc/zcs_7xuij4.enc +++ b/fonts/scholax/enc/zcs_7xuij4.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_7xuij4o4iyim23goes2cm7brke -% Encoding created by otftotfm on Sun May 31 18:00:16 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:45 2020 % Command line follows encoding /AutoEnc_7xuij4o4iyim23goes2cm7brke [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=sinf +% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=sinf % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i % =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * TeXGyreScholaX-Bold.otf % TeXGyreScholaX-Bold-inf-t1' diff --git a/fonts/scholax/enc/zcs_aisocu.enc b/fonts/scholax/enc/zcs_aisocu.enc index c99d6e4b55..060378f7a5 100644 --- a/fonts/scholax/enc/zcs_aisocu.enc +++ b/fonts/scholax/enc/zcs_aisocu.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_aisocu2uo5rogrg4vhfqztoiyf -% Encoding created by otftotfm on Sun May 31 18:00:19 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:42 2020 % Command line follows encoding /AutoEnc_aisocu2uo5rogrg4vhfqztoiyf [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern +% --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 TeXGyreScholaX-Bold.otf TeXGyreScholaX-Bold-tlf-t1' diff --git a/fonts/scholax/enc/zcs_b3lkzu.enc b/fonts/scholax/enc/zcs_b3lkzu.enc deleted file mode 100644 index 8be1e679fe..0000000000 --- a/fonts/scholax/enc/zcs_b3lkzu.enc +++ /dev/null @@ -1,65 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_b3lkzut46ubckugduopn3zhh6d -% Encoding created by otftotfm on Sun May 31 18:00:17 2020 -% Command line follows encoding -/AutoEnc_b3lkzut46ubckugduopn3zhh6d [ -%00 - /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon - /Phi /Psi /Omega /.notdef /.notdef /.notdef /.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.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop - /eight.prop /nine.prop /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 /f_f_l /f_f_i /f_f /f_l /f_i -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmf/fonts/tfm/public/scholax -% --vf-directory=texmf/fonts/vf/public/scholax -% --type1-directory=texmf/fonts/type1/public/scholax -% --encoding-directory=texmf/fonts/enc/dvips/scholax -% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --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 TeXGyreScholaX-Bold.otf -% TeXGyreScholaX-Bold-lf-ot1' diff --git a/fonts/scholax/enc/zcs_c3rnvk.enc b/fonts/scholax/enc/zcs_c3rnvk.enc index ad1521a8f0..8e93385b00 100644 --- a/fonts/scholax/enc/zcs_c3rnvk.enc +++ b/fonts/scholax/enc/zcs_c3rnvk.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_c3rnvkohcz232dy4amvq4dmtma -% Encoding created by otftotfm on Sun May 31 18:00:20 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:41 2020 % Command line follows encoding /AutoEnc_c3rnvkohcz232dy4amvq4dmtma [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --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 diff --git a/fonts/scholax/enc/zcs_c5ugpk.enc b/fonts/scholax/enc/zcs_c5ugpk.enc index 5f1125f67b..4bc8dbf100 100644 --- a/fonts/scholax/enc/zcs_c5ugpk.enc +++ b/fonts/scholax/enc/zcs_c5ugpk.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_c5ugpkj3p35gvyexvvqhyd5bjd -% Encoding created by otftotfm on Sun May 31 18:00:19 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:43 2020 % Command line follows encoding /AutoEnc_c5ugpkj3p35gvyexvvqhyd5bjd [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern +% --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 diff --git a/fonts/scholax/enc/zcs_cpzha2.enc b/fonts/scholax/enc/zcs_cpzha2.enc deleted file mode 100644 index 21e463c165..0000000000 --- a/fonts/scholax/enc/zcs_cpzha2.enc +++ /dev/null @@ -1,66 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_cpzha2rjzvslif34iqxbiylbte -% Encoding created by otftotfm on Sun May 31 18:00:17 2020 -% Command line follows encoding -/AutoEnc_cpzha2rjzvslif34iqxbiylbte [ -%00 - /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon - /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi /uni0237 /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.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop - /eight.prop /nine.prop /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 - /s.sc /.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 /f_f_l /f_f_i /f_f /f_l /f_i -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmf/fonts/tfm/public/scholax -% --vf-directory=texmf/fonts/vf/public/scholax -% --type1-directory=texmf/fonts/type1/public/scholax -% --encoding-directory=texmf/fonts/enc/dvips/scholax -% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --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 TeXGyreScholaX-Bold.otf -% TeXGyreScholaX-Bold-lf-sc-ot1' diff --git a/fonts/scholax/enc/zcs_czuex4.enc b/fonts/scholax/enc/zcs_czuex4.enc new file mode 100644 index 0000000000..f9b8c539e5 --- /dev/null +++ b/fonts/scholax/enc/zcs_czuex4.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_czuex4nljvlgmsw2tadm23mh6f +% Encoding created by otftotfm on Fri Dec 18 17:26:45 2020 +% Command line follows encoding +/AutoEnc_czuex4nljvlgmsw2tadm23mh6f [ +%00 + /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap + /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /bar /endash +%10 + /.notdef /.notdef /quotedblbase /.notdef /.notdef /.notdef /threequartersemdash /.notdef + /uni2190 /uni2192 /tieaccentlowercase /tieaccentcapital /tieaccentlowercase.new /tieaccentcapital.new /.notdef /.notdef +%20 + /blanksymbol /.notdef /.notdef /.notdef /dollar.oldstyle /.notdef /.notdef /quotesingle + /.notdef /.notdef /asterisk.math /.notdef /comma /hyphendbl /period /fraction +%30 + /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle + /eight.oldstyle /nine.oldstyle /.notdef /.notdef /angleleft /minus /angleright /.notdef +%40 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /bigcircle +%50 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /ohm + /.notdef /.notdef /.notdef /dblbracketleft /.notdef /dblbracketright /uni2191 /uni2193 +%60 + /grave /.notdef /star.alt /divorced /died /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /leaf /married /uni266A /.notdef +%70 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde.low /hyphendbl +%80 + /breve /caron /hungarumlaut /dblgrave.ts1 /dagger /daggerdbl /.notdef /perthousand + /bullet /centigrade /dollar.oldstyle /cent.oldstyle /florin /colonmonetary /won /naira +%90 + /guarani /peso /lira /recipe /interrobang /gnaborretni /dong /trademark + /permyriad /paragraph.alt /baht /numero /discount /estimated /openbullet /servicemark +%A0 + /quillbracketleft /quillbracketright /cent.oldstyle /sterling /currency /yen /brokenbar /section + /dieresis.ts1 /copyright /ordfeminine /copyleft /logicalnot /published /registered /macron.dup +%B0 + /degree /plusminus /two.superior /three.superior /acute.dup /uni00B5 /paragraph /periodcentered + /referencemark /one.superior /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 + /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ts1 +% --tfm-directory=texmf/fonts/tfm/public/scholax +% --vf-directory=texmf/fonts/vf/public/scholax +% --type1-directory=texmf/fonts/type1/public/scholax +% --encoding-directory=texmf/fonts/enc/dvips/scholax +% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap +% --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum +% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl TeXGyreScholaX-Bold.otf +% TeXGyreScholaX-Bold-osf-ts1' diff --git a/fonts/scholax/enc/zcs_dcwile.enc b/fonts/scholax/enc/zcs_dcwile.enc new file mode 100644 index 0000000000..e7188d7fb5 --- /dev/null +++ b/fonts/scholax/enc/zcs_dcwile.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_dcwilendy7acydqpmlz2tq3hia +% Encoding created by otftotfm on Fri Dec 18 17:26:41 2020 +% Command line follows encoding +/AutoEnc_dcwilendy7acydqpmlz2tq3hia [ +%00 + /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap + /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /bar /endash +%10 + /.notdef /.notdef /quotedblbase /.notdef /.notdef /.notdef /threequartersemdash /.notdef + /uni2190 /uni2192 /tieaccentlowercase /tieaccentcapital /tieaccentlowercase.new /tieaccentcapital.new /.notdef /.notdef +%20 + /blanksymbol /.notdef /.notdef /.notdef /dollar.oldstyle /.notdef /.notdef /quotesingle + /.notdef /.notdef /asterisk.math /.notdef /comma /hyphendbl /period /fraction +%30 + /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle + /eight.taboldstyle /nine.taboldstyle /.notdef /.notdef /angleleft /minus /angleright /.notdef +%40 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /bigcircle +%50 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /ohm + /.notdef /.notdef /.notdef /dblbracketleft /.notdef /dblbracketright /uni2191 /uni2193 +%60 + /grave /.notdef /star.alt /divorced /died /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /leaf /married /uni266A /.notdef +%70 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde.low /hyphendbl +%80 + /breve /caron /hungarumlaut /dblgrave.ts1 /dagger /daggerdbl /.notdef /perthousand + /bullet /centigrade /dollar.oldstyle /cent.oldstyle /florin /colonmonetary /won /naira +%90 + /guarani /peso /lira /recipe /interrobang /gnaborretni /dong /trademark + /permyriad /paragraph.alt /baht /numero /discount /estimated /openbullet /servicemark +%A0 + /quillbracketleft /quillbracketright /cent.oldstyle /sterling /currency /yen /brokenbar /section + /dieresis.ts1 /copyright /ordfeminine /copyleft /logicalnot /published /registered /macron.dup +%B0 + /degree /plusminus /two.superior /three.superior /acute.dup /uni00B5 /paragraph /periodcentered + /referencemark /one.superior /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 + /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ts1 +% --tfm-directory=texmf/fonts/tfm/public/scholax +% --vf-directory=texmf/fonts/vf/public/scholax +% --type1-directory=texmf/fonts/type1/public/scholax +% --encoding-directory=texmf/fonts/enc/dvips/scholax +% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap +% --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum +% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl TeXGyreScholaX-Bold.otf +% TeXGyreScholaX-Bold-tosf-ts1' diff --git a/fonts/scholax/enc/zcs_dodlyj.enc b/fonts/scholax/enc/zcs_dodlyj.enc index 050f9a8de3..c1ad230947 100644 --- a/fonts/scholax/enc/zcs_dodlyj.enc +++ b/fonts/scholax/enc/zcs_dodlyj.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_dodlyjs2j6s5jsmywryamwqrwh -% Encoding created by otftotfm on Sun May 31 18:00:17 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:47 2020 % Command line follows encoding /AutoEnc_dodlyjs2j6s5jsmywryamwqrwh [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --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 diff --git a/fonts/scholax/enc/zcs_dstn3c.enc b/fonts/scholax/enc/zcs_dstn3c.enc deleted file mode 100644 index 046a150b5b..0000000000 --- a/fonts/scholax/enc/zcs_dstn3c.enc +++ /dev/null @@ -1,65 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_dstn3cx6a2vihcntekkxllsk2h -% Encoding created by otftotfm on Sun May 31 18:00:20 2020 -% Command line follows encoding -/AutoEnc_dstn3cx6a2vihcntekkxllsk2h [ -%00 - /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon - /Phi /Psi /Omega /.notdef /.notdef /.notdef /.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.oldstyle /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle - /eight.taboldstyle /nine.taboldstyle /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 /f_f_l /f_f_i /f_f /f_l /f_i -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmf/fonts/tfm/public/scholax -% --vf-directory=texmf/fonts/vf/public/scholax -% --type1-directory=texmf/fonts/type1/public/scholax -% --encoding-directory=texmf/fonts/enc/dvips/scholax -% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --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 TeXGyreScholaX-Bold.otf -% TeXGyreScholaX-Bold-tosf-ot1' diff --git a/fonts/scholax/enc/zcs_elm6ky.enc b/fonts/scholax/enc/zcs_elm6ky.enc deleted file mode 100644 index 250f00d848..0000000000 --- a/fonts/scholax/enc/zcs_elm6ky.enc +++ /dev/null @@ -1,65 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_elm6kyllrxiincbqt26owznb6h -% Encoding created by otftotfm on Sun May 31 18:00:48 2020 -% Command line follows encoding -/AutoEnc_elm6kyllrxiincbqt26owznb6h [ -%00 - /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap - /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /bar /.notdef -%10 - /.notdef /.notdef /quotedblbase /.notdef /.notdef /twelveudash /threequartersemdash /.notdef - /uni2190 /uni2192 /tieaccentlowercase /tieaccentcapital /.notdef /.notdef /.notdef /.notdef -%20 - /blanksymbol /.notdef /.notdef /.notdef /dollar.oldstyle /.notdef /.notdef /quotesingle - /.notdef /.notdef /asterisk.math /.notdef /comma /hyphendbl /period /fraction -%30 - /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle - /eight.taboldstyle /nine.taboldstyle /.notdef /.notdef /angleleft /minus /angleright /.notdef -%40 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /bigcircle -%50 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /ohm - /.notdef /.notdef /.notdef /dblbracketleft /.notdef /dblbracketright /uni2191 /uni2193 -%60 - /grave /.notdef /.notdef /divorced /died /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /leaf /married /.notdef /.notdef -%70 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /hyphendbl -%80 - /breve /caron /hungarumlaut /.notdef /dagger /daggerdbl /.notdef /perthousand - /bullet /centigrade /dollar.oldstyle /cent.oldstyle /florin /colonmonetary /won /naira -%90 - /guarani /peso /lira /recipe /interrobang /gnaborretni /dong /trademark - /permyriad /.notdef /baht /numero /discount /estimated /openbullet /servicemark -%A0 - /quillbracketleft /quillbracketright /cent.oldstyle /sterling /currency /yen /brokenbar /section - /dieresis /copyright /ordfeminine /copyleft /logicalnot /.notdef /registered /macron -%B0 - /degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered - /referencemark /one.superior /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 - /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=texmf/fonts/tfm/public/scholax -% --vf-directory=texmf/fonts/vf/public/scholax -% --type1-directory=texmf/fonts/type1/public/scholax -% --encoding-directory=texmf/fonts/enc/dvips/scholax -% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum -% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff -% --ligkern=ff i =: ffi --ligkern=ff l =: ffl TeXGyreScholaX-Regular.otf -% TeXGyreScholaX-Regular-tlf-ts1' diff --git a/fonts/scholax/enc/zcs_fn6vum.enc b/fonts/scholax/enc/zcs_fn6vum.enc new file mode 100644 index 0000000000..3b4853fe11 --- /dev/null +++ b/fonts/scholax/enc/zcs_fn6vum.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_fn6vumzrpzrraa3lt7hf5borqg +% Encoding created by otftotfm on Fri Dec 18 17:26:42 2020 +% Command line follows encoding +/AutoEnc_fn6vumzrpzrraa3lt7hf5borqg [ +%00 + /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon + /Phi /Psi /ohm /.notdef /.notdef /.notdef /.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 /one /two /three /four /five /six /seven + /eight /nine /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_l /f_f_l /f_i /f_f_i /.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/public/scholax +% --vf-directory=texmf/fonts/vf/public/scholax +% --type1-directory=texmf/fonts/type1/public/scholax +% --encoding-directory=texmf/fonts/enc/dvips/scholax +% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.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 +% TeXGyreScholaX-Bold.otf TeXGyreScholaX-Bold-tlf-ot1' diff --git a/fonts/scholax/enc/zcs_heobe3.enc b/fonts/scholax/enc/zcs_heobe3.enc index ef7981c26c..7fd9ae2db2 100644 --- a/fonts/scholax/enc/zcs_heobe3.enc +++ b/fonts/scholax/enc/zcs_heobe3.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_heobe3gtm44p7abbrvwxbswpyf -% Encoding created by otftotfm on Sun May 31 18:00:16 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:45 2020 % Command line follows encoding /AutoEnc_heobe3gtm44p7abbrvwxbswpyf [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sinf --ligkern=f -% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi -% --ligkern=ff l =: ffl --ligkern=* {KL} * TeXGyreScholaX-Bold.otf +% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sinf +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * TeXGyreScholaX-Bold.otf % TeXGyreScholaX-Bold-inf-ly1' diff --git a/fonts/scholax/enc/zcs_ibl2ck.enc b/fonts/scholax/enc/zcs_ibl2ck.enc deleted file mode 100644 index 094f58f1c3..0000000000 --- a/fonts/scholax/enc/zcs_ibl2ck.enc +++ /dev/null @@ -1,66 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_ibl2ck7thgjnr3yf4bv5wg46cg -% Encoding created by otftotfm on Sun May 31 18:00:22 2020 -% Command line follows encoding -/AutoEnc_ibl2ck7thgjnr3yf4bv5wg46cg [ -%00 - /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon - /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring - /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash -%20 - /space /exclam /quotedblright /numbersign /dollar.oldstyle /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle - /eight.oldstyle /nine.oldstyle /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 - /s.sc /.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 /f_f_l /f_f_i /f_f /f_l /f_i -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmf/fonts/tfm/public/scholax -% --vf-directory=texmf/fonts/vf/public/scholax -% --type1-directory=texmf/fonts/type1/public/scholax -% --encoding-directory=texmf/fonts/enc/dvips/scholax -% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --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 TeXGyreScholaX-Bold.otf -% TeXGyreScholaX-Bold-osf-sc-ot1' diff --git a/fonts/scholax/enc/zcs_ioc2dx.enc b/fonts/scholax/enc/zcs_ioc2dx.enc index afc6515501..0f2c529c52 100644 --- a/fonts/scholax/enc/zcs_ioc2dx.enc +++ b/fonts/scholax/enc/zcs_ioc2dx.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_ioc2dxscg7nqm6djo6k2vwtatg -% Encoding created by otftotfm on Sun May 31 18:00:22 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:44 2020 % Command line follows encoding /AutoEnc_ioc2dxscg7nqm6djo6k2vwtatg [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --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 diff --git a/fonts/scholax/enc/zcs_jkq3qs.enc b/fonts/scholax/enc/zcs_jkq3qs.enc index 8a8515474b..b51522121f 100644 --- a/fonts/scholax/enc/zcs_jkq3qs.enc +++ b/fonts/scholax/enc/zcs_jkq3qs.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_jkq3qsu5yebfbxzlmpiab7p37h -% Encoding created by otftotfm on Sun May 31 18:00:23 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:44 2020 % Command line follows encoding /AutoEnc_jkq3qsu5yebfbxzlmpiab7p37h [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern +% --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 diff --git a/fonts/scholax/enc/zcs_k56gxg.enc b/fonts/scholax/enc/zcs_k56gxg.enc new file mode 100644 index 0000000000..d617a1ad0f --- /dev/null +++ b/fonts/scholax/enc/zcs_k56gxg.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_k56gxgypxz6vtxsvsaiq3ml7ia +% Encoding created by otftotfm on Fri Dec 18 17:26:45 2020 +% Command line follows encoding +/AutoEnc_k56gxgypxz6vtxsvsaiq3ml7ia [ +%00 + /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon + /Phi /Psi /ohm /.notdef /.notdef /.notdef /.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.inferior /one.inferior /two.inferior /three.inferior /four.inferior /five.inferior /six.inferior /seven.inferior + /eight.inferior /nine.inferior /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/public/scholax +% --vf-directory=texmf/fonts/vf/public/scholax +% --type1-directory=texmf/fonts/type1/public/scholax +% --encoding-directory=texmf/fonts/enc/dvips/scholax +% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap +% --force --coding-scheme=TEX TEXT --feature=sinf --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl --ligkern=* {KL} * TeXGyreScholaX-Bold.otf +% TeXGyreScholaX-Bold-inf-ot1' diff --git a/fonts/scholax/enc/zcs_kqv4hm.enc b/fonts/scholax/enc/zcs_kqv4hm.enc deleted file mode 100644 index bb2090e640..0000000000 --- a/fonts/scholax/enc/zcs_kqv4hm.enc +++ /dev/null @@ -1,64 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_kqv4hmom5wxwxzlnw42ssffygg -% Encoding created by otftotfm on Sun May 31 18:00:21 2020 -% Command line follows encoding -/AutoEnc_kqv4hmom5wxwxzlnw42ssffygg [ -%00 - /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon - /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi /uni0237 /grave.superior /acute /caron /breve /macron /ring - /cedilla /germandbls /ae.superior /oe /oslash /AE /OE /Oslash -%20 - /space /exclam.superior /quotedblright /numbersign.superior /dollar.superior /percent.superior /ampersand.superior /quoteright.superior - /parenleft.superior /parenright.superior /asterisk.superior /plus.superior /comma.superior /hyphen.superior /period.superior /slash.superior -%30 - /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior - /eight.superior /nine.superior /colon.superior /semicolon.superior /exclamdown.superior /equal.superior /questiondown /question.superior -%40 - /at.superior /A.superior /B.superior /C.superior /D.superior /E.superior /F.superior /G.superior - /H.superior /I.superior /J.superior /K.superior /L.superior /M.superior /N.superior /O.superior -%50 - /P.superior /Q.superior /R.superior /S.superior /T.superior /U.superior /V.superior /W.superior - /X.superior /Y.superior /Z.superior /bracketleft.superior /quotedblleft /bracketright.superior /circumflex /dotaccent -%60 - /quoteleft /a.superior /b.superior /c.superior /d.superior /e.superior /f.superior /g.superior - /h.superior /i.superior /j.superior /k.superior /l.superior /m.superior /n.superior /o.superior -%70 - /p.superior /q.superior /r.superior /s.superior /t.superior /u.superior /v.superior /w.superior - /x.superior /y.superior /z.superior /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 /f_f_l /f_f_i /f_f /f_l /f_i -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmf/fonts/tfm/public/scholax -% --vf-directory=texmf/fonts/vf/public/scholax -% --type1-directory=texmf/fonts/type1/public/scholax -% --encoding-directory=texmf/fonts/enc/dvips/scholax -% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=TEX TEXT --feature=sups --ligkern=f i =: fi --ligkern=f l -% =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl -% --ligkern=* {KL} * TeXGyreScholaX-Bold.otf TeXGyreScholaX-Bold-sup-ot1' diff --git a/fonts/scholax/enc/zcs_lewktp.enc b/fonts/scholax/enc/zcs_lewktp.enc new file mode 100644 index 0000000000..692084b679 --- /dev/null +++ b/fonts/scholax/enc/zcs_lewktp.enc @@ -0,0 +1,66 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_lewktpyhrrdxc2lkuddr5vv65f +% Encoding created by otftotfm on Fri Dec 18 17:26:47 2020 +% Command line follows encoding +/AutoEnc_lewktpyhrrdxc2lkuddr5vv65f [ +%00 + /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon + /Phi /Psi /ohm /.notdef /.notdef /.notdef /.notdef /.notdef +%10 + /dotlessi /uni0237 /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.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop + /eight.prop /nine.prop /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 + /s.sc /.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/public/scholax +% --vf-directory=texmf/fonts/vf/public/scholax +% --type1-directory=texmf/fonts/type1/public/scholax +% --encoding-directory=texmf/fonts/enc/dvips/scholax +% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.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 TeXGyreScholaX-Bold.otf +% TeXGyreScholaX-Bold-lf-sc-ot1' diff --git a/fonts/scholax/enc/zcs_litts3.enc b/fonts/scholax/enc/zcs_litts3.enc index aa93d6e8ce..66749eac58 100644 --- a/fonts/scholax/enc/zcs_litts3.enc +++ b/fonts/scholax/enc/zcs_litts3.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_litts3qb5ahkbm5zf3lw2iuugb -% Encoding created by otftotfm on Sun May 31 18:00:21 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:41 2020 % Command line follows encoding /AutoEnc_litts3qb5ahkbm5zf3lw2iuugb [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern +% --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 diff --git a/fonts/scholax/enc/zcs_mett7y.enc b/fonts/scholax/enc/zcs_mett7y.enc index a20f807404..4ba06fd5c8 100644 --- a/fonts/scholax/enc/zcs_mett7y.enc +++ b/fonts/scholax/enc/zcs_mett7y.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_mett7ysdtobnmu4rz3dpa2rcwb -% Encoding created by otftotfm on Sun May 31 18:00:17 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:46 2020 % Command line follows encoding /AutoEnc_mett7ysdtobnmu4rz3dpa2rcwb [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --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 TeXGyreScholaX-Bold.otf TeXGyreScholaX-Bold-lf-ly1' diff --git a/fonts/scholax/enc/zcs_mnnbkz.enc b/fonts/scholax/enc/zcs_mnnbkz.enc index afdda1c54f..80321f1387 100644 --- a/fonts/scholax/enc/zcs_mnnbkz.enc +++ b/fonts/scholax/enc/zcs_mnnbkz.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_mnnbkzutv65ptrkg5baqdnqeyb -% Encoding created by otftotfm on Sun May 31 18:00:20 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:40 2020 % Command line follows encoding /AutoEnc_mnnbkzutv65ptrkg5baqdnqeyb [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern +% --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 TeXGyreScholaX-Bold.otf TeXGyreScholaX-Bold-tosf-t1' diff --git a/fonts/scholax/enc/zcs_oun2tw.enc b/fonts/scholax/enc/zcs_oun2tw.enc deleted file mode 100644 index b21221d1be..0000000000 --- a/fonts/scholax/enc/zcs_oun2tw.enc +++ /dev/null @@ -1,65 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_oun2twc3gtpehur5x7cnxcxvjd -% Encoding created by otftotfm on Sun May 31 18:00:18 2020 -% Command line follows encoding -/AutoEnc_oun2twc3gtpehur5x7cnxcxvjd [ -%00 - /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon - /Phi /Psi /Omega /.notdef /.notdef /.notdef /.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 /one /two /three /four /five /six /seven - /eight /nine /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 /f_f_l /f_f_i /f_f /f_l /f_i -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmf/fonts/tfm/public/scholax -% --vf-directory=texmf/fonts/vf/public/scholax -% --type1-directory=texmf/fonts/type1/public/scholax -% --encoding-directory=texmf/fonts/enc/dvips/scholax -% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --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 TeXGyreScholaX-Bold.otf -% TeXGyreScholaX-Bold-tlf-ot1' diff --git a/fonts/scholax/enc/zcs_qfh2v7.enc b/fonts/scholax/enc/zcs_qfh2v7.enc index 6a94228b54..7f89fb3d4c 100644 --- a/fonts/scholax/enc/zcs_qfh2v7.enc +++ b/fonts/scholax/enc/zcs_qfh2v7.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_qfh2v7zh5jh32m3g6cnnanug2d -% Encoding created by otftotfm on Sun May 31 18:00:18 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:42 2020 % Command line follows encoding /AutoEnc_qfh2v7zh5jh32m3g6cnnanug2d [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --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 TeXGyreScholaX-Bold.otf TeXGyreScholaX-Bold-tlf-ly1' diff --git a/fonts/scholax/enc/zcs_ra2vxf.enc b/fonts/scholax/enc/zcs_ra2vxf.enc index 58fc5da937..722ff727ce 100644 --- a/fonts/scholax/enc/zcs_ra2vxf.enc +++ b/fonts/scholax/enc/zcs_ra2vxf.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_ra2vxf5mbij62edxizdv7ugoue -% Encoding created by otftotfm on Sun May 31 18:00:17 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:47 2020 % Command line follows encoding /AutoEnc_ra2vxf5mbij62edxizdv7ugoue [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern +% --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 TeXGyreScholaX-Bold.otf TeXGyreScholaX-Bold-lf-t1' diff --git a/fonts/scholax/enc/zcs_t6txtr.enc b/fonts/scholax/enc/zcs_t6txtr.enc new file mode 100644 index 0000000000..af5d90c592 --- /dev/null +++ b/fonts/scholax/enc/zcs_t6txtr.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_t6txtrsix2mn4j67lrjveoafxa +% Encoding created by otftotfm on Fri Dec 18 17:26:46 2020 +% Command line follows encoding +/AutoEnc_t6txtrsix2mn4j67lrjveoafxa [ +%00 + /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon + /Phi /Psi /ohm /.notdef /.notdef /.notdef /.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.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop + /eight.prop /nine.prop /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_l /f_f_l /f_i /f_f_i /.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/public/scholax +% --vf-directory=texmf/fonts/vf/public/scholax +% --type1-directory=texmf/fonts/type1/public/scholax +% --encoding-directory=texmf/fonts/enc/dvips/scholax +% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --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 +% TeXGyreScholaX-Bold.otf TeXGyreScholaX-Bold-lf-ot1' diff --git a/fonts/scholax/enc/zcs_tpfstq.enc b/fonts/scholax/enc/zcs_tpfstq.enc index c56b226b65..fe8afe9627 100644 --- a/fonts/scholax/enc/zcs_tpfstq.enc +++ b/fonts/scholax/enc/zcs_tpfstq.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_tpfstqhcxklxhbvbynmonphhfe -% Encoding created by otftotfm on Sun May 31 18:00:21 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:46 2020 % Command line follows encoding /AutoEnc_tpfstqhcxklxhbvbynmonphhfe [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=sups +% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=sups % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i % =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * TeXGyreScholaX-Bold.otf % TeXGyreScholaX-Bold-sup-t1' diff --git a/fonts/scholax/enc/zcs_ujimmk.enc b/fonts/scholax/enc/zcs_ujimmk.enc new file mode 100644 index 0000000000..6dafbff070 --- /dev/null +++ b/fonts/scholax/enc/zcs_ujimmk.enc @@ -0,0 +1,66 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_ujimmksap65cmzfbumltca5m3f +% Encoding created by otftotfm on Fri Dec 18 17:26:42 2020 +% Command line follows encoding +/AutoEnc_ujimmksap65cmzfbumltca5m3f [ +%00 + /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon + /Phi /Psi /ohm /.notdef /.notdef /.notdef /.notdef /.notdef +%10 + /dotlessi /uni0237 /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 /one /two /three /four /five /six /seven + /eight /nine /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 + /s.sc /.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/public/scholax +% --vf-directory=texmf/fonts/vf/public/scholax +% --type1-directory=texmf/fonts/type1/public/scholax +% --encoding-directory=texmf/fonts/enc/dvips/scholax +% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.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 TeXGyreScholaX-Bold.otf +% TeXGyreScholaX-Bold-tlf-sc-ot1' diff --git a/fonts/scholax/enc/zcs_wg6py3.enc b/fonts/scholax/enc/zcs_wg6py3.enc new file mode 100644 index 0000000000..3aa33597aa --- /dev/null +++ b/fonts/scholax/enc/zcs_wg6py3.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_wg6py3fzjgspqb3wd7rffivb6f +% Encoding created by otftotfm on Fri Dec 18 17:27:15 2020 +% Command line follows encoding +/AutoEnc_wg6py3fzjgspqb3wd7rffivb6f [ +%00 + /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap + /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /bar /.notdef +%10 + /.notdef /.notdef /quotedblbase /.notdef /.notdef /twelveudash /threequartersemdash /.notdef + /uni2190 /uni2192 /tieaccentlowercase /tieaccentcapital /tieaccentlowercase.new /tieaccentcapital.new /.notdef /.notdef +%20 + /blanksymbol /.notdef /.notdef /.notdef /dollar.oldstyle /.notdef /.notdef /quotesingle + /.notdef /.notdef /asterisk.math /.notdef /comma /hyphendbl /period /fraction +%30 + /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle + /eight.taboldstyle /nine.taboldstyle /.notdef /.notdef /angleleft /minus /angleright /.notdef +%40 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /bigcircle +%50 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /ohm + /.notdef /.notdef /.notdef /dblbracketleft /.notdef /dblbracketright /uni2191 /uni2193 +%60 + /grave /.notdef /star.alt /divorced /died /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /leaf /married /uni266A /.notdef +%70 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde.low /hyphendbl +%80 + /breve /caron /hungarumlaut /dblgrave.ts1 /dagger /daggerdbl /.notdef /perthousand + /bullet /centigrade /dollar.oldstyle /cent.oldstyle /florin /colonmonetary /won /naira +%90 + /guarani /peso /lira /recipe /interrobang /gnaborretni /dong /trademark + /permyriad /paragraph.alt /baht /numero /discount /estimated /openbullet /servicemark +%A0 + /quillbracketleft /quillbracketright /cent.oldstyle /sterling /currency /yen /brokenbar /section + /dieresis.ts1 /copyright /ordfeminine /copyleft /logicalnot /published /registered /macron.dup +%B0 + /degree /plusminus /two.superior /three.superior /acute.dup /uni00B5 /paragraph /periodcentered + /referencemark /one.superior /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 + /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ts1 +% --tfm-directory=texmf/fonts/tfm/public/scholax +% --vf-directory=texmf/fonts/vf/public/scholax +% --type1-directory=texmf/fonts/type1/public/scholax +% --encoding-directory=texmf/fonts/enc/dvips/scholax +% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap +% --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum +% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl TeXGyreScholaX-Regular.otf +% TeXGyreScholaX-Regular-tosf-ts1' diff --git a/fonts/scholax/enc/zcs_wlo5nq.enc b/fonts/scholax/enc/zcs_wlo5nq.enc index 82e2f3ddf2..5c27fc6c1e 100644 --- a/fonts/scholax/enc/zcs_wlo5nq.enc +++ b/fonts/scholax/enc/zcs_wlo5nq.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_wlo5nq3tu2sqpxbs3hp6yyd2od -% Encoding created by otftotfm on Sun May 31 18:00:19 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:42 2020 % Command line follows encoding /AutoEnc_wlo5nq3tu2sqpxbs3hp6yyd2od [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --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 diff --git a/fonts/scholax/enc/zcs_wylu46.enc b/fonts/scholax/enc/zcs_wylu46.enc index d162e5a68f..db5246b0f4 100644 --- a/fonts/scholax/enc/zcs_wylu46.enc +++ b/fonts/scholax/enc/zcs_wylu46.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_wylu46m3gvdspkfn3h3tplyavh -% Encoding created by otftotfm on Sun May 31 18:00:22 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:43 2020 % Command line follows encoding /AutoEnc_wylu46m3gvdspkfn3h3tplyavh [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --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 TeXGyreScholaX-Bold.otf TeXGyreScholaX-Bold-osf-ly1' diff --git a/fonts/scholax/enc/zcs_x5uxyb.enc b/fonts/scholax/enc/zcs_x5uxyb.enc index 15a605554d..45478728a3 100644 --- a/fonts/scholax/enc/zcs_x5uxyb.enc +++ b/fonts/scholax/enc/zcs_x5uxyb.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_x5uxyb4kvkfg4q23aej7tnic5a -% Encoding created by otftotfm on Sun May 31 18:00:18 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:47 2020 % Command line follows encoding /AutoEnc_x5uxyb4kvkfg4q23aej7tnic5a [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern +% --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 diff --git a/fonts/scholax/enc/zcs_xrqdd6.enc b/fonts/scholax/enc/zcs_xrqdd6.enc new file mode 100644 index 0000000000..702944ceff --- /dev/null +++ b/fonts/scholax/enc/zcs_xrqdd6.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_xrqdd6wswdnms3wrzdglt6hqtd +% Encoding created by otftotfm on Fri Dec 18 17:26:46 2020 +% Command line follows encoding +/AutoEnc_xrqdd6wswdnms3wrzdglt6hqtd [ +%00 + /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon + /Phi /Psi /ohm /.notdef /.notdef /.notdef /.notdef /.notdef +%10 + /dotlessi /uni0237 /grave.superior /acute /caron /breve /macron /ring + /cedilla /germandbls /ae.superior /oe /oslash /AE /OE /Oslash +%20 + /space /exclam.superior /quotedblright /numbersign.superior /dollar.superior /percent.superior /ampersand.superior /quoteright.superior + /parenleft.superior /parenright.superior /asterisk.superior /plus.superior /comma.superior /hyphen.superior /period.superior /slash.superior +%30 + /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior + /eight.superior /nine.superior /colon.superior /semicolon.superior /exclamdown.superior /equal.superior /questiondown /question.superior +%40 + /at.superior /A.superior /B.superior /C.superior /D.superior /E.superior /F.superior /G.superior + /H.superior /I.superior /J.superior /K.superior /L.superior /M.superior /N.superior /O.superior +%50 + /P.superior /Q.superior /R.superior /S.superior /T.superior /U.superior /V.superior /W.superior + /X.superior /Y.superior /Z.superior /bracketleft.superior /quotedblleft /bracketright.superior /circumflex /dotaccent +%60 + /quoteleft /a.superior /b.superior /c.superior /d.superior /e.superior /f.superior /g.superior + /h.superior /i.superior /j.superior /k.superior /l.superior /m.superior /n.superior /o.superior +%70 + /p.superior /q.superior /r.superior /s.superior /t.superior /u.superior /v.superior /w.superior + /x.superior /y.superior /z.superior /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/public/scholax +% --vf-directory=texmf/fonts/vf/public/scholax +% --type1-directory=texmf/fonts/type1/public/scholax +% --encoding-directory=texmf/fonts/enc/dvips/scholax +% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap +% --force --coding-scheme=TEX TEXT --feature=sups --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl --ligkern=* {KL} * TeXGyreScholaX-Bold.otf +% TeXGyreScholaX-Bold-sup-ot1' diff --git a/fonts/scholax/enc/zcs_xzuu25.enc b/fonts/scholax/enc/zcs_xzuu25.enc new file mode 100644 index 0000000000..b1233e3847 --- /dev/null +++ b/fonts/scholax/enc/zcs_xzuu25.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_xzuu25wpjpugw5aahmp2ntxvca +% Encoding created by otftotfm on Fri Dec 18 17:26:43 2020 +% Command line follows encoding +/AutoEnc_xzuu25wpjpugw5aahmp2ntxvca [ +%00 + /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon + /Phi /Psi /ohm /.notdef /.notdef /.notdef /.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.oldstyle /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle + /eight.oldstyle /nine.oldstyle /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_l /f_f_l /f_i /f_f_i /.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/public/scholax +% --vf-directory=texmf/fonts/vf/public/scholax +% --type1-directory=texmf/fonts/type1/public/scholax +% --encoding-directory=texmf/fonts/enc/dvips/scholax +% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.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 +% TeXGyreScholaX-Bold.otf TeXGyreScholaX-Bold-osf-ot1' diff --git a/fonts/scholax/enc/zcs_y6waxr.enc b/fonts/scholax/enc/zcs_y6waxr.enc index 7abf59ff7c..c0e81e4805 100644 --- a/fonts/scholax/enc/zcs_y6waxr.enc +++ b/fonts/scholax/enc/zcs_y6waxr.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_y6waxrojkr76ohk3o5a26bs6qh -% Encoding created by otftotfm on Sun May 31 18:00:21 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:46 2020 % Command line follows encoding /AutoEnc_y6waxrojkr76ohk3o5a26bs6qh [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sups --ligkern=f -% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi -% --ligkern=ff l =: ffl --ligkern=* {KL} * TeXGyreScholaX-Bold.otf +% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sups +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * TeXGyreScholaX-Bold.otf % TeXGyreScholaX-Bold-sup-ly1' diff --git a/fonts/scholax/enc/zcs_ygq5eo.enc b/fonts/scholax/enc/zcs_ygq5eo.enc deleted file mode 100644 index 202a388fc9..0000000000 --- a/fonts/scholax/enc/zcs_ygq5eo.enc +++ /dev/null @@ -1,65 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_ygq5eopzrmtm7gzhj3zdcndfla -% Encoding created by otftotfm on Sun May 31 18:00:47 2020 -% Command line follows encoding -/AutoEnc_ygq5eopzrmtm7gzhj3zdcndfla [ -%00 - /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap - /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /bar /.notdef -%10 - /.notdef /.notdef /quotedblbase /.notdef /.notdef /twelveudash /threequartersemdash /.notdef - /uni2190 /uni2192 /tieaccentlowercase /tieaccentcapital /.notdef /.notdef /.notdef /.notdef -%20 - /blanksymbol /.notdef /.notdef /.notdef /dollar.oldstyle /.notdef /.notdef /quotesingle - /.notdef /.notdef /asterisk.math /.notdef /comma /hyphendbl /period /fraction -%30 - /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle - /eight.oldstyle /nine.oldstyle /.notdef /.notdef /angleleft /minus /angleright /.notdef -%40 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /bigcircle -%50 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /ohm - /.notdef /.notdef /.notdef /dblbracketleft /.notdef /dblbracketright /uni2191 /uni2193 -%60 - /grave /.notdef /.notdef /divorced /died /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /leaf /married /.notdef /.notdef -%70 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /hyphendbl -%80 - /breve /caron /hungarumlaut /.notdef /dagger /daggerdbl /.notdef /perthousand - /bullet /centigrade /dollar.oldstyle /cent.oldstyle /florin /colonmonetary /won /naira -%90 - /guarani /peso /lira /recipe /interrobang /gnaborretni /dong /trademark - /permyriad /.notdef /baht /numero /discount /estimated /openbullet /servicemark -%A0 - /quillbracketleft /quillbracketright /cent.oldstyle /sterling /currency /yen /brokenbar /section - /dieresis /copyright /ordfeminine /copyleft /logicalnot /.notdef /registered /macron -%B0 - /degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered - /referencemark /one.superior /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 - /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=texmf/fonts/tfm/public/scholax -% --vf-directory=texmf/fonts/vf/public/scholax -% --type1-directory=texmf/fonts/type1/public/scholax -% --encoding-directory=texmf/fonts/enc/dvips/scholax -% --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum -% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff -% --ligkern=ff i =: ffi --ligkern=ff l =: ffl TeXGyreScholaX-Regular.otf -% TeXGyreScholaX-Regular-lf-ts1' diff --git a/fonts/scholax/enc/zcs_zgzte3.enc b/fonts/scholax/enc/zcs_zgzte3.enc index c41df43e31..6784bec75b 100644 --- a/fonts/scholax/enc/zcs_zgzte3.enc +++ b/fonts/scholax/enc/zcs_zgzte3.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_zgzte3jgepmc4a5zhqmqntszwc -% Encoding created by otftotfm on Sun May 31 18:00:20 2020 +% Encoding created by otftotfm on Fri Dec 18 17:26:40 2020 % Command line follows encoding /AutoEnc_zgzte3jgepmc4a5zhqmqntszwc [ %00 @@ -59,7 +59,7 @@ % --type1-directory=texmf/fonts/type1/public/scholax % --encoding-directory=texmf/fonts/enc/dvips/scholax % --map-file=texmf/fonts/map/dvips/scholax/TeXGyreScholaX.map --no-updmap -% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --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 TeXGyreScholaX-Bold.otf TeXGyreScholaX-Bold-tosf-ly1' diff --git a/fonts/scholax/map/ScholaX.map b/fonts/scholax/map/ScholaX.map index 7e053fb705..30397cc658 100644 --- a/fonts/scholax/map/ScholaX.map +++ b/fonts/scholax/map/ScholaX.map @@ -1,209 +1,209 @@ % Automatically maintained by otftotfm or other programs. Do not edit. -TeXGyreScholaX-Bold-inf-ot1 TeXGyreScholaX-Bold "AutoEnc_6ff7e3l7hqxbsf44xh22cdtube ReEncodeFont" <[zcs_6ff7e3.enc \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-inf-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{b}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-inf-ly1 }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{regular}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-inf-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bold}{n}{ + <-> alias * TeXGyreScholaX-Inf/b/n }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{regular}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-inf-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{b}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-inf-ly1 }{} - -% ---- bold ---- - -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bold}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-inf-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bold}{it}{ + <-> alias * TeXGyreScholaX-Inf/b/it }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bold}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-inf-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{b}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-inf-ly1 }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bold}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-inf-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bold}{sl}{ + <-> alias * TeXGyreScholaX-Inf/b/sl }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- m = regular ---- -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{m}{sl}{ - <-> alias * TeXGyreScholaX-Inf/regular/sl +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{m}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-inf-ly1 }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{m}{n}{ - <-> alias * TeXGyreScholaX-Inf/regular/n +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{regular}{n}{ + <-> alias * TeXGyreScholaX-Inf/m/n }{} \DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{m}{it}{ - <-> alias * TeXGyreScholaX-Inf/regular/it + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-inf-ly1 }{} - -% b --> bold - -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{b}{sl}{ - <-> alias * TeXGyreScholaX-Inf/bold/sl +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{regular}{it}{ + <-> alias * TeXGyreScholaX-Inf/m/it }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{b}{n}{ - <-> alias * TeXGyreScholaX-Inf/bold/n +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{m}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-inf-ly1 }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{b}{it}{ - <-> alias * TeXGyreScholaX-Inf/bold/it +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{regular}{sl}{ + <-> alias * TeXGyreScholaX-Inf/m/sl }{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + \DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bx}{sl}{ <-> ssub * TeXGyreScholaX-Inf/b/sl }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bx}{n}{ - <-> ssub * TeXGyreScholaX-Inf/b/n -}{} - \DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bx}{it}{ <-> ssub * TeXGyreScholaX-Inf/b/it }{} +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bx}{n}{ + <-> ssub * TeXGyreScholaX-Inf/b/n +}{} + \endinput diff --git a/fonts/scholax/tex/LY1TeXGyreScholaX-Sup.fd b/fonts/scholax/tex/LY1TeXGyreScholaX-Sup.fd index f48122759f..959f68d1f5 100644 --- a/fonts/scholax/tex/LY1TeXGyreScholaX-Sup.fd +++ b/fonts/scholax/tex/LY1TeXGyreScholaX-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/05/31 +%% Generated by autoinst on 2020/12/18 %% \ProvidesFile{LY1TeXGyreScholaX-Sup.fd} - [2020/05/31 (autoinst) Font definitions for LY1/TeXGyreScholaX-Sup.] + [2020/12/18 (autoinst) Font definitions for LY1/TeXGyreScholaX-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,76 +20,70 @@ \DeclareFontFamily{LY1}{TeXGyreScholaX-Sup}{} -% ---- bold ---- +% ---- b = bold ---- -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bold}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-sup-ly1 -}{} - -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bold}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-sup-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{b}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-sup-ly1 }{} \DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bold}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-sup-ly1 + <-> alias * TeXGyreScholaX-Sup/b/n }{} +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{b}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-sup-ly1 +}{} -% ---- regular ---- - -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{regular}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-sup-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bold}{it}{ + <-> alias * TeXGyreScholaX-Sup/b/it }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{regular}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-sup-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{b}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-sup-ly1 }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{regular}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-sup-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bold}{sl}{ + <-> alias * TeXGyreScholaX-Sup/b/sl }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- m = regular ---- -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{m}{sl}{ - <-> alias * TeXGyreScholaX-Sup/regular/sl +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{m}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-sup-ly1 }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{m}{n}{ - <-> alias * TeXGyreScholaX-Sup/regular/n +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{regular}{it}{ + <-> alias * TeXGyreScholaX-Sup/m/it }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{m}{it}{ - <-> alias * TeXGyreScholaX-Sup/regular/it +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{m}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-sup-ly1 }{} - -% b --> bold - -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{b}{it}{ - <-> alias * TeXGyreScholaX-Sup/bold/it +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{regular}{sl}{ + <-> alias * TeXGyreScholaX-Sup/m/sl }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{b}{sl}{ - <-> alias * TeXGyreScholaX-Sup/bold/sl +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{m}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-sup-ly1 }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{b}{n}{ - <-> alias * TeXGyreScholaX-Sup/bold/n +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{regular}{n}{ + <-> alias * TeXGyreScholaX-Sup/m/n }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bx}{sl}{ - <-> ssub * TeXGyreScholaX-Sup/b/sl -}{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- \DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bx}{n}{ <-> ssub * TeXGyreScholaX-Sup/b/n }{} +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bx}{sl}{ + <-> ssub * TeXGyreScholaX-Sup/b/sl +}{} + \DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bx}{it}{ <-> ssub * TeXGyreScholaX-Sup/b/it }{} diff --git a/fonts/scholax/tex/OT1TeXGyreScholaX-Inf.fd b/fonts/scholax/tex/OT1TeXGyreScholaX-Inf.fd index 55bee26265..795deab233 100644 --- a/fonts/scholax/tex/OT1TeXGyreScholaX-Inf.fd +++ b/fonts/scholax/tex/OT1TeXGyreScholaX-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/05/31 +%% Generated by autoinst on 2020/12/18 %% \ProvidesFile{OT1TeXGyreScholaX-Inf.fd} - [2020/05/31 (autoinst) Font definitions for OT1/TeXGyreScholaX-Inf.] + [2020/12/18 (autoinst) Font definitions for OT1/TeXGyreScholaX-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,78 +20,72 @@ \DeclareFontFamily{OT1}{TeXGyreScholaX-Inf}{} -% ---- bold ---- +% ---- b = bold ---- -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bold}{sl}{ +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{b}{sl}{ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-inf-ot1 }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bold}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-inf-ot1 +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bold}{sl}{ + <-> alias * TeXGyreScholaX-Inf/b/sl }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bold}{it}{ +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{b}{it}{ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-inf-ot1 }{} - -% ---- regular ---- - -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{regular}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-inf-ot1 +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bold}{it}{ + <-> alias * TeXGyreScholaX-Inf/b/it }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{regular}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-inf-ot1 +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{b}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-inf-ot1 }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{regular}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-inf-ot1 +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bold}{n}{ + <-> alias * TeXGyreScholaX-Inf/b/n }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- m = regular ---- -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{m}{it}{ - <-> alias * TeXGyreScholaX-Inf/regular/it +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{m}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-inf-ot1 }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{m}{sl}{ - <-> alias * TeXGyreScholaX-Inf/regular/sl +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{regular}{n}{ + <-> alias * TeXGyreScholaX-Inf/m/n }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{m}{n}{ - <-> alias * TeXGyreScholaX-Inf/regular/n +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{m}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-inf-ot1 }{} - -% b --> bold - -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{b}{sl}{ - <-> alias * TeXGyreScholaX-Inf/bold/sl +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{regular}{it}{ + <-> alias * TeXGyreScholaX-Inf/m/it }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{b}{n}{ - <-> alias * TeXGyreScholaX-Inf/bold/n +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{m}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-inf-ot1 }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{b}{it}{ - <-> alias * TeXGyreScholaX-Inf/bold/it +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{regular}{sl}{ + <-> alias * TeXGyreScholaX-Inf/m/sl }{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + \DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bx}{n}{ <-> ssub * TeXGyreScholaX-Inf/b/n }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bx}{sl}{ - <-> ssub * TeXGyreScholaX-Inf/b/sl -}{} - \DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bx}{it}{ <-> ssub * TeXGyreScholaX-Inf/b/it }{} +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bx}{sl}{ + <-> ssub * TeXGyreScholaX-Inf/b/sl +}{} + \endinput diff --git a/fonts/scholax/tex/OT1TeXGyreScholaX-Sup.fd b/fonts/scholax/tex/OT1TeXGyreScholaX-Sup.fd index 49a06ad976..3e6fb87e0f 100644 --- a/fonts/scholax/tex/OT1TeXGyreScholaX-Sup.fd +++ b/fonts/scholax/tex/OT1TeXGyreScholaX-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/05/31 +%% Generated by autoinst on 2020/12/18 %% \ProvidesFile{OT1TeXGyreScholaX-Sup.fd} - [2020/05/31 (autoinst) Font definitions for OT1/TeXGyreScholaX-Sup.] + [2020/12/18 (autoinst) Font definitions for OT1/TeXGyreScholaX-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,71 +20,61 @@ \DeclareFontFamily{OT1}{TeXGyreScholaX-Sup}{} -% ---- regular ---- +% ---- m = regular ---- -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{regular}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-sup-ot1 -}{} - -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{regular}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-sup-ot1 +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{m}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-sup-ot1 }{} \DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{regular}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-sup-ot1 + <-> alias * TeXGyreScholaX-Sup/m/n }{} +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{m}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-sup-ot1 +}{} -% ---- bold ---- - -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bold}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-sup-ot1 +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{regular}{sl}{ + <-> alias * TeXGyreScholaX-Sup/m/sl }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bold}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-sup-ot1 +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{m}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-sup-ot1 }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bold}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-sup-ot1 +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{regular}{it}{ + <-> alias * TeXGyreScholaX-Sup/m/it }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- b = bold ---- -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{m}{it}{ - <-> alias * TeXGyreScholaX-Sup/regular/it +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{b}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-sup-ot1 }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{m}{sl}{ - <-> alias * TeXGyreScholaX-Sup/regular/sl +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bold}{n}{ + <-> alias * TeXGyreScholaX-Sup/b/n }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{m}{n}{ - <-> alias * TeXGyreScholaX-Sup/regular/n +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{b}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-sup-ot1 }{} - -% b --> bold - -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{b}{it}{ - <-> alias * TeXGyreScholaX-Sup/bold/it +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bold}{it}{ + <-> alias * TeXGyreScholaX-Sup/b/it }{} \DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{b}{sl}{ - <-> alias * TeXGyreScholaX-Sup/bold/sl + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-sup-ot1 }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{b}{n}{ - <-> alias * TeXGyreScholaX-Sup/bold/n +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bold}{sl}{ + <-> alias * TeXGyreScholaX-Sup/b/sl }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bx}{it}{ - <-> ssub * TeXGyreScholaX-Sup/b/it -}{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- \DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bx}{n}{ <-> ssub * TeXGyreScholaX-Sup/b/n @@ -94,4 +84,8 @@ <-> ssub * TeXGyreScholaX-Sup/b/sl }{} +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bx}{it}{ + <-> ssub * TeXGyreScholaX-Sup/b/it +}{} + \endinput diff --git a/fonts/scholax/tex/T1TeXGyreScholaX-Inf.fd b/fonts/scholax/tex/T1TeXGyreScholaX-Inf.fd index 9a3c1f1fb7..145220e8a8 100644 --- a/fonts/scholax/tex/T1TeXGyreScholaX-Inf.fd +++ b/fonts/scholax/tex/T1TeXGyreScholaX-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/05/31 +%% Generated by autoinst on 2020/12/18 %% \ProvidesFile{T1TeXGyreScholaX-Inf.fd} - [2020/05/31 (autoinst) Font definitions for T1/TeXGyreScholaX-Inf.] + [2020/12/18 (autoinst) Font definitions for T1/TeXGyreScholaX-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,72 +20,62 @@ \DeclareFontFamily{T1}{TeXGyreScholaX-Inf}{} -% ---- regular ---- +% ---- m = regular ---- -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{regular}{it}{ +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{m}{it}{ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-inf-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{regular}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-inf-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{regular}{it}{ + <-> alias * TeXGyreScholaX-Inf/m/it }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{regular}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-inf-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{m}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-inf-t1 }{} - -% ---- bold ---- - -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bold}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-inf-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{regular}{sl}{ + <-> alias * TeXGyreScholaX-Inf/m/sl }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bold}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-inf-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{m}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-inf-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bold}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-inf-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{regular}{n}{ + <-> alias * TeXGyreScholaX-Inf/m/n }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular - -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{m}{it}{ - <-> alias * TeXGyreScholaX-Inf/regular/it -}{} +% ---- b = bold ---- -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{m}{sl}{ - <-> alias * TeXGyreScholaX-Inf/regular/sl +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{b}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-inf-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{m}{n}{ - <-> alias * TeXGyreScholaX-Inf/regular/n +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bold}{it}{ + <-> alias * TeXGyreScholaX-Inf/b/it }{} - -% b --> bold - -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{b}{it}{ - <-> alias * TeXGyreScholaX-Inf/bold/it +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{b}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-inf-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{b}{sl}{ - <-> alias * TeXGyreScholaX-Inf/bold/sl +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bold}{sl}{ + <-> alias * TeXGyreScholaX-Inf/b/sl }{} \DeclareFontShape{T1}{TeXGyreScholaX-Inf}{b}{n}{ - <-> alias * TeXGyreScholaX-Inf/bold/n + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-inf-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bx}{it}{ - <-> ssub * TeXGyreScholaX-Inf/b/it +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bold}{n}{ + <-> alias * TeXGyreScholaX-Inf/b/n }{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + \DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bx}{n}{ <-> ssub * TeXGyreScholaX-Inf/b/n }{} @@ -94,4 +84,8 @@ <-> ssub * TeXGyreScholaX-Inf/b/sl }{} +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bx}{it}{ + <-> ssub * TeXGyreScholaX-Inf/b/it +}{} + \endinput diff --git a/fonts/scholax/tex/T1TeXGyreScholaX-Sup.fd b/fonts/scholax/tex/T1TeXGyreScholaX-Sup.fd index b86f779502..9977a63af2 100644 --- a/fonts/scholax/tex/T1TeXGyreScholaX-Sup.fd +++ b/fonts/scholax/tex/T1TeXGyreScholaX-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/05/31 +%% Generated by autoinst on 2020/12/18 %% \ProvidesFile{T1TeXGyreScholaX-Sup.fd} - [2020/05/31 (autoinst) Font definitions for T1/TeXGyreScholaX-Sup.] + [2020/12/18 (autoinst) Font definitions for T1/TeXGyreScholaX-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,78 +20,72 @@ \DeclareFontFamily{T1}{TeXGyreScholaX-Sup}{} -% ---- bold ---- +% ---- m = regular ---- -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bold}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-sup-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{m}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-sup-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bold}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-sup-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{regular}{sl}{ + <-> alias * TeXGyreScholaX-Sup/m/sl }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bold}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-sup-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{m}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-sup-t1 }{} - -% ---- regular ---- - \DeclareFontShape{T1}{TeXGyreScholaX-Sup}{regular}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-sup-t1 + <-> alias * TeXGyreScholaX-Sup/m/it }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{regular}{n}{ +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{m}{n}{ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-sup-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{regular}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-sup-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{regular}{n}{ + <-> alias * TeXGyreScholaX-Sup/m/n }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- b = bold ---- -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{m}{it}{ - <-> alias * TeXGyreScholaX-Sup/regular/it +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{b}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-sup-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{m}{n}{ - <-> alias * TeXGyreScholaX-Sup/regular/n +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bold}{sl}{ + <-> alias * TeXGyreScholaX-Sup/b/sl }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{m}{sl}{ - <-> alias * TeXGyreScholaX-Sup/regular/sl +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{b}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-sup-t1 }{} - -% b --> bold - -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{b}{it}{ - <-> alias * TeXGyreScholaX-Sup/bold/it +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bold}{it}{ + <-> alias * TeXGyreScholaX-Sup/b/it }{} \DeclareFontShape{T1}{TeXGyreScholaX-Sup}{b}{n}{ - <-> alias * TeXGyreScholaX-Sup/bold/n + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-sup-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{b}{sl}{ - <-> alias * TeXGyreScholaX-Sup/bold/sl +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bold}{n}{ + <-> alias * TeXGyreScholaX-Sup/b/n }{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + \DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bx}{n}{ <-> ssub * TeXGyreScholaX-Sup/b/n }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bx}{sl}{ - <-> ssub * TeXGyreScholaX-Sup/b/sl -}{} - \DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bx}{it}{ <-> ssub * TeXGyreScholaX-Sup/b/it }{} +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bx}{sl}{ + <-> ssub * TeXGyreScholaX-Sup/b/sl +}{} + \endinput diff --git a/fonts/scholax/tex/scholax.sty b/fonts/scholax/tex/scholax.sty index b2d715049b..a73208f97b 100644 --- a/fonts/scholax/tex/scholax.sty +++ b/fonts/scholax/tex/scholax.sty @@ -1,7 +1,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{1.027} -\def\filedate{2020/11/30} +\def\fileversion{1.028} +\def\filedate{2020/12/18} \ProvidesPackage{scholax} [\filedate\space v\fileversion] @@ -9,6 +9,7 @@ \RequirePackage[LY1,T1]{fontenc} \RequirePackage{textcomp} +\DeclareEncodingSubset{TS1}{TeXGyreScholaX-*}{0} \RequirePackage{etoolbox} \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{} \IfFileExists{fontaxes.sty}{ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-inf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-inf-ot1.tfm index db64ab4884..7d9baa71d4 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-inf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-inf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-ot1.tfm index 7f0d6f11b8..dd0273be77 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-sc-ot1--base.tfm index d9646bd2b3..4d1cddb9a5 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-sc-ot1.tfm index f5dd911275..bba6fef3d5 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-ts1--base.tfm index a9e340726b..a99b48a041 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-ts1.tfm index bcebc0a24a..b4216cb404 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-lf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-ot1.tfm index 5c8b88ad62..358484d081 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-sc-ot1--base.tfm index 2aec69b372..dba6047593 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-sc-ot1.tfm index d96388ee4c..700ea230bb 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-ts1--base.tfm index a9e340726b..a99b48a041 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-ts1.tfm index bcebc0a24a..b4216cb404 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-osf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-sup-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-sup-ot1.tfm index 1c81163c99..fc17a8cdc2 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-sup-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-sup-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-ot1.tfm index 0c039729cf..6f67743662 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-sc-ot1--base.tfm index 79f0e4b7a5..a39fe0b2cf 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-sc-ot1.tfm index 0eb2418d0d..cbb3117973 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-ts1--base.tfm index ec5571c8b9..85ed575d64 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-ts1.tfm index f7ec661022..1123b5f864 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tlf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-ot1.tfm index 0060c63592..cfa3662e7e 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-sc-ot1--base.tfm index 2f988a849b..35f7efbb51 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-sc-ot1.tfm index 0527332d27..a701e3ae26 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-ts1--base.tfm index ec5571c8b9..85ed575d64 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-ts1.tfm index f7ec661022..1123b5f864 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Bold-tosf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-inf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-inf-ot1.tfm index 389a1403e4..85a6f67b09 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-inf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-inf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-ot1.tfm index b363dee8b9..e0bc37034a 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-sc-ot1--base.tfm index 4750efce2a..78a97463b4 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-sc-ot1.tfm index 00e1f585ef..47fc790043 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-ts1--base.tfm index 2d6540781a..b3b4718fef 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-ts1.tfm index f7ab58d9e4..57efa926ff 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-lf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-ot1.tfm index d5f5f14c14..be02d3772e 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-sc-ot1--base.tfm index 160178ee28..7a7be36379 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-sc-ot1.tfm index 6e7d3a7b05..393d120efe 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-ts1--base.tfm index 2d6540781a..b3b4718fef 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-ts1.tfm index f7ab58d9e4..57efa926ff 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-osf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-sup-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-sup-ot1.tfm index 8c54dedfe0..743c90f9a4 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-sup-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-sup-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-ot1.tfm index 5629dbad4e..3fa22fdeba 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-sc-ot1--base.tfm index abd6d2c4d3..21287013fc 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-sc-ot1.tfm index 60fb27ddff..90e94e9ea7 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-ts1--base.tfm index edd01953e3..f9966e06ab 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-ts1.tfm index d9ed9a5e6c..b615519936 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tlf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-ot1.tfm index 5285cb915e..b947135c18 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-sc-ot1--base.tfm index ccd38095b4..c168ceb49f 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-sc-ot1.tfm index 245d19b512..f3cfbc1cdb 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-ts1--base.tfm index edd01953e3..f9966e06ab 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-ts1.tfm index d9ed9a5e6c..b615519936 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldItalic-tosf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-inf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-inf-ot1.tfm index c052f6506a..567838cd7a 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-inf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-inf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-ot1.tfm index bbd13daabd..8afbdc5feb 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-sc-ot1--base.tfm index 055b0f5fff..cb8ef52df3 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-sc-ot1.tfm index 68ecf3fb22..0dc8029850 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-ts1--base.tfm index c83d2f6355..623c1fffdc 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-ts1.tfm index 716c8ac357..2b4a28b9b3 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-lf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-ot1.tfm index e0caea0c84..13417f1df5 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-sc-ot1--base.tfm index 66d757d7d0..147cefbeda 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-sc-ot1.tfm index 4e2f7e1776..17eb864de5 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-ts1--base.tfm index c83d2f6355..623c1fffdc 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-ts1.tfm index 716c8ac357..2b4a28b9b3 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-osf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-sup-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-sup-ot1.tfm index dd5df78ffb..76fc6bf0b3 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-sup-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-sup-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-ot1.tfm index ebabb997be..082e81155c 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-sc-ot1--base.tfm index e5fa0870b1..ca4f7e2e70 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-sc-ot1.tfm index 33bc140cde..63e1903138 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-ts1--base.tfm index d6d8100ec2..93a8e48221 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-ts1.tfm index a597ceb048..4997968595 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tlf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-ot1.tfm index 0c01574cc4..cff14733a7 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-sc-ot1--base.tfm index 4b114904e2..04422287bf 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-sc-ot1.tfm index 712182e938..f0f7464113 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-ts1--base.tfm index d6d8100ec2..93a8e48221 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-ts1.tfm index a597ceb048..4997968595 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-BoldSlanted-tosf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-inf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-inf-ot1.tfm index d581687835..ef20f4a110 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-inf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-inf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-ot1.tfm index dd6ccd239b..c2ca75400e 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-sc-ot1--base.tfm index 15169260cd..3f6e84bb7f 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-sc-ot1.tfm index 45b786a777..dfd362e81e 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-ts1--base.tfm index aa57ce3fdc..76dbd0c58b 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-ts1.tfm index 51ad9d7b9e..c8c670aeb4 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-lf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-ot1.tfm index 28f0e6e713..7def840905 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-sc-ot1--base.tfm index bf17b744b2..db6b532224 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-sc-ot1.tfm index 1a31b23947..b970e11854 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-ts1--base.tfm index aa57ce3fdc..76dbd0c58b 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-ts1.tfm index 51ad9d7b9e..c8c670aeb4 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-osf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-sup-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-sup-ot1.tfm index e00707db80..83c553fd4f 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-sup-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-sup-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-ot1.tfm index bcefd1b735..adac0dcd0b 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-sc-ot1--base.tfm index c09bdd6959..ca686ac8ee 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-sc-ot1.tfm index a85ffeb0bf..dea8495c38 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-ts1--base.tfm index 5dffc6f06b..29fe51547c 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-ts1.tfm index d259af3585..595c145887 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tlf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-ot1.tfm index 2e28a15751..685c0a2501 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-sc-ot1--base.tfm index 24d7cf4b82..b1b937cfcb 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-sc-ot1.tfm index 605e096b59..4a85ea730d 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-ts1--base.tfm index 5dffc6f06b..29fe51547c 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-ts1.tfm index d259af3585..595c145887 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Italic-tosf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-inf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-inf-ot1.tfm index 65df01e4db..b51d12b99e 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-inf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-inf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-ot1.tfm index 33c1952378..c78568c4b2 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-sc-ot1--base.tfm index 4d6884000c..a2ad632a54 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-sc-ot1.tfm index ba0549573d..6344d88e35 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-ts1--base.tfm index 031a3bbcf5..56096c44d1 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-ts1.tfm index ef7648918e..0c9992f84e 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-lf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-ot1.tfm index e0437901f1..dc40657b12 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-sc-ot1--base.tfm index 11c7264327..66479fffb7 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-sc-ot1.tfm index b086325f91..97c87dc30e 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-ts1--base.tfm index 031a3bbcf5..56096c44d1 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-ts1.tfm index ef7648918e..0c9992f84e 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-osf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-sup-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-sup-ot1.tfm index fff97f9c75..e78e1c6ae9 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-sup-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-sup-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-ot1.tfm index d9312fb0e2..6fc93c00ff 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-sc-ot1--base.tfm index 7bf96dc337..b223778204 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-sc-ot1.tfm index 6b160bce1d..cf37a7a4cc 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-ts1--base.tfm index 3afdb02e12..64a3413aa5 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-ts1.tfm index 8e7e70cd94..2d4c9bda71 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tlf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-ot1.tfm index 2192c5f254..c260ca431c 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-sc-ot1--base.tfm index a08e01af16..35f62599d2 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-sc-ot1.tfm index b4dd270e87..7bbe24a0a1 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-ts1--base.tfm index 3afdb02e12..64a3413aa5 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-ts1.tfm index 8e7e70cd94..2d4c9bda71 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Regular-tosf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-inf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-inf-ot1.tfm index f3fbbf3707..f0340553c6 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-inf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-inf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-ot1.tfm index b4f2f00ba4..26a54e60a1 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-sc-ot1--base.tfm index a7b7b0c274..818cf17dd4 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-sc-ot1.tfm index 13fec0f146..4e22b81319 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-ts1--base.tfm index 227a7da7d9..d781e4d47c 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-ts1.tfm index 0a8c274d28..fde59ec60b 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-lf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-ot1.tfm index 300a7c8ca1..5ad26e8eba 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-sc-ot1--base.tfm index ba9b3f52da..0f1e12e512 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-sc-ot1.tfm index 5464d42c12..ee5e957a55 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-ts1--base.tfm index 227a7da7d9..d781e4d47c 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-ts1.tfm index 0a8c274d28..fde59ec60b 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-osf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-sup-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-sup-ot1.tfm index d55a9dcae1..6c451a1e5a 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-sup-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-sup-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-ot1.tfm index 863e15d321..f8b12edf45 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-sc-ot1--base.tfm index 29108520bd..dff50faefd 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-sc-ot1.tfm index 11e8127ffa..006f86d45b 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-ts1--base.tfm index b80314a744..24c7f16e4c 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-ts1.tfm index c828b66db0..08da5c4c06 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tlf-ts1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-ot1.tfm index 0bdfca3301..afe541bc1e 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-sc-ot1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-sc-ot1--base.tfm index 73b8cfb676..719fde785d 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-sc-ot1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-sc-ot1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-sc-ot1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-sc-ot1.tfm index 0adb723074..0a33d84fa0 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-sc-ot1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-sc-ot1.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-ts1--base.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-ts1--base.tfm index b80314a744..24c7f16e4c 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-ts1--base.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-ts1--base.tfm differ diff --git a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-ts1.tfm b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-ts1.tfm index c828b66db0..08da5c4c06 100644 Binary files a/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-ts1.tfm and b/fonts/scholax/tfm/TeXGyreScholaX-Slanted-tosf-ts1.tfm differ diff --git a/fonts/scholax/type1/TeXGyreScholaX-Regular.pfb b/fonts/scholax/type1/TeXGyreScholaX-Regular.pfb index a3f9f2862e..58aad3dc43 100644 Binary files a/fonts/scholax/type1/TeXGyreScholaX-Regular.pfb and b/fonts/scholax/type1/TeXGyreScholaX-Regular.pfb differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Bold-lf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-Bold-lf-sc-ot1.vf index 2953da48fc..c30130c7d3 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Bold-lf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Bold-lf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Bold-lf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-Bold-lf-ts1.vf index e2c81406ef..59fd5c67b4 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Bold-lf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Bold-lf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Bold-osf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-Bold-osf-sc-ot1.vf index a3a054e21c..e0b35fe93c 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Bold-osf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Bold-osf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Bold-osf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-Bold-osf-ts1.vf index 4f4690dbee..cc6ef138a9 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Bold-osf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Bold-osf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Bold-tlf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-Bold-tlf-sc-ot1.vf index d8b4271549..d5301b69c8 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Bold-tlf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Bold-tlf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Bold-tlf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-Bold-tlf-ts1.vf index 1a09b6c96a..ea5a8a4042 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Bold-tlf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Bold-tlf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Bold-tosf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-Bold-tosf-sc-ot1.vf index 4ad6d63c01..9b27eb469d 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Bold-tosf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Bold-tosf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Bold-tosf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-Bold-tosf-ts1.vf index cd1e7302dd..07f7bdef98 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Bold-tosf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Bold-tosf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-lf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-lf-sc-ot1.vf index 635002edd4..94b7d10957 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-lf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-lf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-lf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-lf-ts1.vf index a4bc1c5094..1bf5f65d9a 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-lf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-lf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-osf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-osf-sc-ot1.vf index 34cb604990..69a8628d0f 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-osf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-osf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-osf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-osf-ts1.vf index 4b08052629..e164ad8e18 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-osf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-osf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-tlf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-tlf-sc-ot1.vf index c1e5743ed6..e33dfa6fee 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-tlf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-tlf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-tlf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-tlf-ts1.vf index fb6a8df9da..f17d117fca 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-tlf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-tlf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-tosf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-tosf-sc-ot1.vf index 8c1442a950..2bfb239802 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-tosf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-tosf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-tosf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-tosf-ts1.vf index 302558e648..74ca0c9392 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-tosf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-BoldItalic-tosf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-lf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-lf-sc-ot1.vf index cb75840150..1005216a1b 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-lf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-lf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-lf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-lf-ts1.vf index 94d89fbba1..a7f1d5bb62 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-lf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-lf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-osf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-osf-sc-ot1.vf index 5215ff231b..6d6e2a255f 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-osf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-osf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-osf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-osf-ts1.vf index 5a932e4573..b15ec808f5 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-osf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-osf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-tlf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-tlf-sc-ot1.vf index 8c58fd6d88..33a96f0d8c 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-tlf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-tlf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-tlf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-tlf-ts1.vf index 6c3973692f..ede3160e49 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-tlf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-tlf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-tosf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-tosf-sc-ot1.vf index d4267f7717..e8a7ce2f19 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-tosf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-tosf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-tosf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-tosf-ts1.vf index 154b67245c..5f5c234f3b 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-tosf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-BoldSlanted-tosf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Italic-lf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-Italic-lf-sc-ot1.vf index 89dc70ec6b..dbdb440d4b 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Italic-lf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Italic-lf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Italic-lf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-Italic-lf-ts1.vf index 38ae3529d1..a4fc5fa8e3 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Italic-lf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Italic-lf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Italic-osf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-Italic-osf-sc-ot1.vf index 857adfff75..a3d5252c74 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Italic-osf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Italic-osf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Italic-osf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-Italic-osf-ts1.vf index d97d5bd6ae..e6c88ead3b 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Italic-osf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Italic-osf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Italic-tlf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-Italic-tlf-sc-ot1.vf index 25476e0626..0d6db59a8f 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Italic-tlf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Italic-tlf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Italic-tlf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-Italic-tlf-ts1.vf index 6259efb534..f992dc9f5d 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Italic-tlf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Italic-tlf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Italic-tosf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-Italic-tosf-sc-ot1.vf index a760d60948..2bd2de9a1e 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Italic-tosf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Italic-tosf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Italic-tosf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-Italic-tosf-ts1.vf index c52d21357b..57d3fae2d5 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Italic-tosf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Italic-tosf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Regular-lf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-Regular-lf-sc-ot1.vf index 31f4c4b0b5..43b7523a57 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Regular-lf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Regular-lf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Regular-lf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-Regular-lf-ts1.vf index 73f906e50d..b723cebe6a 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Regular-lf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Regular-lf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Regular-osf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-Regular-osf-sc-ot1.vf index 3b9b99a975..55deaec5c9 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Regular-osf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Regular-osf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Regular-osf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-Regular-osf-ts1.vf index 0dd1352ea9..6c5614a2ee 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Regular-osf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Regular-osf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Regular-tlf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-Regular-tlf-sc-ot1.vf index d9cfc726e3..adc9e5f4c0 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Regular-tlf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Regular-tlf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Regular-tlf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-Regular-tlf-ts1.vf index 8b22c3810e..159de97a6e 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Regular-tlf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Regular-tlf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Regular-tosf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-Regular-tosf-sc-ot1.vf index 7d12eac740..0a6527eee9 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Regular-tosf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Regular-tosf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Regular-tosf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-Regular-tosf-ts1.vf index 957c8e29c2..541e393793 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Regular-tosf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Regular-tosf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Slanted-lf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-Slanted-lf-sc-ot1.vf index 55409ba088..a117443217 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Slanted-lf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Slanted-lf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Slanted-lf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-Slanted-lf-ts1.vf index 2e2b236245..62b1f84888 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Slanted-lf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Slanted-lf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Slanted-osf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-Slanted-osf-sc-ot1.vf index 4047bba27f..cac2065215 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Slanted-osf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Slanted-osf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Slanted-osf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-Slanted-osf-ts1.vf index dde18dcacc..6869d5a67c 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Slanted-osf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Slanted-osf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Slanted-tlf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-Slanted-tlf-sc-ot1.vf index 4ca093c149..e36cdd1d58 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Slanted-tlf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Slanted-tlf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Slanted-tlf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-Slanted-tlf-ts1.vf index a5366bd5de..0ea2b1e29f 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Slanted-tlf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Slanted-tlf-ts1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Slanted-tosf-sc-ot1.vf b/fonts/scholax/vf/TeXGyreScholaX-Slanted-tosf-sc-ot1.vf index 93eb035893..42435ef988 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Slanted-tosf-sc-ot1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Slanted-tosf-sc-ot1.vf differ diff --git a/fonts/scholax/vf/TeXGyreScholaX-Slanted-tosf-ts1.vf b/fonts/scholax/vf/TeXGyreScholaX-Slanted-tosf-ts1.vf index dca9688495..ad6701b08e 100644 Binary files a/fonts/scholax/vf/TeXGyreScholaX-Slanted-tosf-ts1.vf and b/fonts/scholax/vf/TeXGyreScholaX-Slanted-tosf-ts1.vf differ diff --git a/fonts/utilities/fontools/bin/afm2afm b/fonts/utilities/fontools/bin/afm2afm index d379d73fb7..e5ace31b1c 100755 --- a/fonts/utilities/fontools/bin/afm2afm +++ b/fonts/utilities/fontools/bin/afm2afm @@ -37,7 +37,7 @@ use File::Basename; use Getopt::Long; use Pod::Usage; -my $VERSION = "20200729"; +my $VERSION = "20201218"; parse_commandline(); @@ -421,7 +421,7 @@ See the GNU General Public License for more details. =head1 VERSION -This document describes B version 20200729. +This document describes B version 20201218. =head1 RECENT CHANGES diff --git a/fonts/utilities/fontools/bin/autoinst b/fonts/utilities/fontools/bin/autoinst index 494f84b6dc..79eb1e1302 100755 --- a/fonts/utilities/fontools/bin/autoinst +++ b/fonts/utilities/fontools/bin/autoinst @@ -40,7 +40,7 @@ use Getopt::Long (); use Pod::Usage (); use POSIX (); -my $VERSION = '20200729'; +my $VERSION = '20201218'; my ($d, $m, $y) = (localtime time)[3 .. 5]; my $TODAY = sprintf "%04d/%02d/%02d", $y + 1900, $m + 1, $d; @@ -63,21 +63,16 @@ my $RUNNING_AS_MAIN = (__PACKAGE__ eq 'main'); Log Logs the font parsing and creation process. - Font Code for getting font info. Contains two subpackages: + Attr Contains tables and routines that represent + font attributes (weight, width, shape). - Font::Raw Gets 'raw' data from font files. - Font::Info Extracts font info from raw data. + Font Parses an OpenType font's metadata. Tables Contains tables that drive the font creation process (especially the decisions which fonts to create). Work Generates all font files, driven by data from `Tables`. - NFSS Contains tables and routines that map - font characteristics (weight, width, shape) - to NFSS attributes. This data is also used by - `Font::Info`, to avoid duplication. - LaTeX Creates LaTeX support (.sty and .fd files). Otftotfm Drives `otftotfm` to actually generate the fonts. @@ -99,7 +94,7 @@ sub main { my %fontfamily; for my $fontfile (@ARGV) { - my $font = Font::get_fontinfo($fontfile); + my $font = Font::parse($fontfile); my $family = $font->{family}; push @{$fontfamily{$family}}, $font; } @@ -117,8 +112,9 @@ sub main { # until after the results of the parsing have been logged. Font::assert_unique($log, $fontlist); - my $nfss_mapping = NFSS::map_nfss_codes($fontlist); - $log->log_nfss_mapping($nfss_mapping); + my $mappings = Attr::map_nfss_codes($fontlist); + my ($from_nfss, $to_nfss) = @{$mappings}; + $log->log_nfss_mapping($from_nfss); my @workitems = Work::generate_worklist($fontlist); $log->log_worklist(\@workitems); @@ -129,8 +125,7 @@ sub main { $log->log_commands(\@commands) if $ARGV{verbose} >= 1; if (!$ARGV{dryrun}) { - $nfss_mapping = NFSS::invert_mapping($nfss_mapping); - LaTeX::create_support_files(\@workitems, $family, $nfss_mapping); + LaTeX::create_support_files(\@workitems, $family, $to_nfss); Otftotfm::run_commands(\@commands, $family, $log); if ($ARGV{t1suffix}) { @@ -154,365 +149,458 @@ END_MESSAGE_UPDMAP ############################################################################ -package Font; +package Attr; -# -------------------------------------------------------------------------- -# Collects all needed info about a font file. -# -------------------------------------------------------------------------- -sub get_fontinfo { - my $filename = shift; +=begin Comment + + Some fontnames contain abbreviated words for width, weight and/or shape; + we unabbreviate these using the following table. - my $info = Font::Info->new($filename); +=end Comment - my $basicinfo = Font::Raw::get_basicinfo($filename); - $info->process_basicinfo($basicinfo); +=cut - my $os2_table = Font::Raw::get_classdata($filename); - $info->process_classdata($os2_table); +my %FULL_FORM = ( + cmp => 'compressed', + comp => 'compressed', + cond => 'condensed', + demi => 'demibold', + extcond => 'extracondensed', + hair => 'hairline', + incline => 'inclined', + it => 'italic', + ita => 'italic', + md => 'medium', + slant => 'slanted', + ultra => 'ultrablack', +); - my $featuredata = Font::Raw::get_featuredata($filename); - $info->process_featuredata($featuredata); +# Auxiliary table that reverses FULL_FORM; maps full forms to abbrevs. +my %abbrev; +while (my ($k, $v) = each %FULL_FORM) { + push @{$abbrev{$v}}, $k; +} - my $sizedata = Font::Raw::get_sizedata($filename); - $info->process_sizedata($sizedata); +# Add full forms as known abbreviations of themselves. +for my $full (keys %abbrev) { + push @{$abbrev{$full}}, $full; +} - my $nfssdata = Font::Raw::get_nfss_classification($filename); - $info->process_nfss_classification($nfssdata); +# Internal helper: returns a list of known abbreviations of its argument. +sub _get_abbreviated_forms { + my $key = shift; - return $info; + return @{ $abbrev{$key} // [$key] }; } -# Error messages, used in assert_unique(). -my $ERR_DETAIL =<<'END_ERR_DETAIL'; -[ERROR] I've parsed both %s - and %s as +=begin Comment - Family: %s - Weight: %s - Width: %s - Shape: %s - Size: %s-%s - Smallcaps: %s + LaTeX's NFSS contains a number of standard codes for weight and width: + - weight: ul, el, l, sl, m, sb, b, eb, ub + - width: uc, ec, c, sc, m, sx, x, ex, ux -END_ERR_DETAIL + These codes are not always a perfect match with the weights and widths + present in a font family; some families (especially many sans serif ones) + contain more or different weights and widths, and the naming of those + weights and widths isn't always consistent between font families. + To handle this situation, we use a two-tiered approach: + 1. We install all fonts using a "series" name that is the concatenation + of whatever the font designer has chosen to call the weight and width + (but in all *lower*case). + 2. We add "alias" rules to the .fd files that map the standard NFSS codes + to actual fonts. -my $ERR_PARSE =<<'END_ERR_PARSE'; -[ERROR] I failed to parse all fonts in a unique way; - presumably some fonts have unusual widths, weights or shapes. + In step 1, we follow NFSS in leaving out any occurrence of + the word "regular" unless *both* weight and width are Regular; + in that case, the 'series' attribute becomes "regular". - Try one of the following: - - Run 'autoinst' on a smaller set of fonts, - omitting the ones that weren't parsed correctly; - - Add the missing widths, weights or shapes to the tables - 'WIDTH', 'WEIGHT' or 'SHAPE' in the source code; + The two tables WEIGHT and WIDTH are used to control step 2. + It contains several entries of the form - Please also send a bug report to the author. -END_ERR_PARSE + sc => [ qw( semicondensed narrow ) ], -# -------------------------------------------------------------------------- -# Asserts all parsed fonts are unique. -# -------------------------------------------------------------------------- -sub assert_unique { - my ($log, $fontlist) = @_; + This should be read as follows: the NFSS code "sc" is mapped to + the *first* width on the right hand side present in the current family. - # These attributes should uniquely identify each font. - my @attributes - = qw(family weight width shape minsize maxsize is_smallcaps); + Please note that the tables contain empty keys instead of "m" for the + regular weight and width. NFSS actually combines weight and width into + a single "series" attribute; a weight or width of "m" is left out of + this combination (unless *both* weight and width are equal to "m"; then + the series becomes "m", but that's a special case we deal with later on). - my (%seen, $err_details); - for my $font (@{$fontlist}) { - my $key = join "\x00", @{$font}{@attributes}; + In addition to the mapping of NFSS codes, the two mentioned tables are + also used in parsing the font's metadata to determine its weight and + width: any string that occurs on the right hand side is considered a + possible name to be searched for. - if ($seen{$key}) { - $err_details .= sprintf $ERR_DETAIL, - $seen{$key}{filename}, - $font->{filename}, - @{$font}{@attributes}; - } - else { - $seen{$key} = $font; - } - } + These tables can be extended to teach autoinst about new weights or + widths. Suppose your font family contains a "Hemibold" weight, that + you want mapped to the "sb" code. Then add the name "hemibold" to + the right hand side of the "sb" entry in the WEIGHT table: - # Die with detailed error message if the font infos aren't unique. - if ($err_details) { - $log->log($err_details, $ERR_PARSE); - die $err_details, $ERR_PARSE; - } + sb => [ qw( semibold demibold medium hemibold ) ], - return 1; -} + In this case, since it's in last position, it's only mapped to "sb" + if none of the other fonts are present. Put it earlier in the list + to give it higher priority. + Note that autoinst converts all metadata to lowercase to avoid + inconsistent capitalization; so all entries in these tables should + be *lowercase* as well. -############################################################################ + Technical notes: + - We define WEIGHT and WIDTH first as arrays + and then as hashtables; this allows us to use the array-variants + as an *ordered* (by weight/width) list of values (in the routines + get_all_nfss_weights and get_all_nfss_widths). +=end Comment -package Font::Info; +=cut -# -------------------------------------------------------------------------- -# Constructor: returns a new (mostly empty) Font::Info object. -# -------------------------------------------------------------------------- -sub new { - my ($cls, $filename) = @_; +my @WEIGHT = ( + ul => [ qw( ultralight thin 100 hairline ) ], + el => [ qw( extralight 200 ) ], + l => [ qw( light 300 ) ], + sl => [ qw( semilight blond ) ], + '' => [ qw( regular normal text book 400 normallight normaldark ) ], + sb => [ qw( semibold demibold 600 medium 500 ) ], + b => [ qw( bold 700 ) ], + eb => [ qw( extrabold 800 ) ], + ub => [ qw( ultrabold black heavy extrablack ultrablack 900 fatface + ultraheavy poster super 1000 ) ], +); - my $self = { - filename => $filename, - width => 'regular', - weight => 'regular', - shape => 'roman', - minsize => 0, - maxsize => 0, - is_smallcaps => 0, - weight_class => 0, - width_class => 0, - }; +my @WIDTH = ( + uc => [ qw( ultracondensed extracompressed ultracompressed ) ], + ec => [ qw( extracondensed compressed compact ) ], + c => [ qw( condensed ) ], + sc => [ qw( semicondensed narrow ) ], + '' => [ qw( regular ) ], + sx => [ qw( semiextended semiexpanded wide ) ], + x => [ qw( extended expanded ) ], + ex => [], + ux => [], +); - my ($ext) = $filename =~ m/[.] ([^.]+) \z/xmsi; - $ext = lc $ext; - if ($ext eq 'otf') { $self->{fonttype} = 'opentype' } - elsif ($ext eq 'ttf') { $self->{fonttype} = 'truetype' } - else { - die "[ERROR] Unknown font type '.$ext' ($filename)"; - } +my %WEIGHT = @WEIGHT; +@WEIGHT = grep { !ref } @WEIGHT; +# Add abbreviated forms of weight names. +for my $code (@WEIGHT) { + $WEIGHT{$code} + = [ map { _get_abbreviated_forms($_) } @{$WEIGHT{$code}} ]; +} + +my @allweights = grep { $_ !~ m/ medium | regular | text /xms } + map { @{$_} } values %WEIGHT; +@allweights = ( + Util::sort_desc_length(@allweights), + qw(medium regular text) +); - return bless $self, $cls; + +my %WIDTH = @WIDTH; +@WIDTH = grep { !ref } @WIDTH; +# Add abbreviated forms. +for my $code (@WIDTH) { + $WIDTH{$code} + = [ map { _get_abbreviated_forms($_) } @{$WIDTH{$code}} ]; } +my @allwidths = grep { $_ ne 'regular' } map { @{$_} } values %WIDTH; +@allwidths = Util::sort_desc_length(@allwidths); -# -------------------------------------------------------------------------- -# Processes the basic info (given as a list of key-value pairs) for a font. -# -------------------------------------------------------------------------- -sub process_basicinfo { - my ($self, $data) = @_; - $self->{originalfamily} = $data->{family}; +=begin Comment - for my $key (keys %{$data}) { - $data->{$key} =~ s/\s+//xmsg; - } + The SHAPE table maps various shape names to NFSS codes. - $data->{family} = $data->{preferredfamily} || $data->{family}; - $data->{subfamily} = $data->{preferredsubfamily} || $data->{subfamily}; - $data->{fullname} =~ s/\A$data->{family}//xms; - $data->{fullname} = lc $data->{fullname}; + Like in the other * tables, entries may be added to teach autoinst + about new shapes. Note that this table is "the other way around" + compared to WEIGHT and WIDTH; those map NFSS codes to names, + this one maps names to NFSS codes. That's because the data from + this table is used in a slightly different way; notably, it isn't + used in the map_nfss_codes routine. - # clean up family name (it's used in LaTeX command names) - my @DIGITS = qw(Zero One Two Three Four Five Six Seven Eight Nine); - $data->{family} =~ s/(?: LT | MT)(?: Std | Pro )\z//xms; - $data->{family} =~ s/(\d)/$DIGITS[$1]/xmsge; - $data->{family} =~ s/[^A-Za-z]+//xmsg; +=end Comment - # remove Adobe's SmallText size, to avoid mistaking it for Text weight - $data->{family} =~ s/(?: SmallText | SmText )\z//xmsi; - $data->{subfamily} =~ s/(?: SmallText | SmText )\z//xmsi; - $data->{fullname} =~ s/(?: SmallText | SmText )\z//xmsi; +=cut - # Sometimes the relevant info is in Fullname, sometimes in Subfamily; - # so we need to test against both - my $fullinfo = lc "$data->{subfamily} | $data->{fullname}"; +my %SHAPE = ( + roman => 'n', + upright => 'n', + italic => 'it', + inclined => 'sl', + oblique => 'sl', + slanted => 'sl', + romani => 'n', # Silentium has two roman shapes, but no italic; + romanii => 'it', # so we cheat by mapping the second roman to 'it' +); - # We need to be careful when parsing the font info; in particular - # we must parse strings like 'UltraCondensed' as 'Regular' weight - # and 'UltraCondensed' width, not as 'Ultra' weight and 'Condensed' width. - # The following rules should prevent accidents: - # 1. Search for matching widths before matching weights - # (as none of the widths is a proper substring of some weight) - # 2. Remove any recognised search string from the 'fullinfo' - # 3. Test the weights 'medium' and 'regular' *last*, since these strings - # may also occur in Subfamily without indicating the weight; - # so we only take them to mean weight if we find no other hit. - my @widths = NFSS::get_all_widths(); - for my $width (@widths) { - if ($fullinfo =~ m/$width/xms) { - $self->{width} = $width; - my $widths = join '|', @widths; - $fullinfo =~ s/$widths//gxmsi; - last; - } - } - my @weights = NFSS::get_all_weights(); - for my $weight (@weights) { - if ($fullinfo =~ m/$weight/xms) { - $self->{weight} = $weight; - my $weights = join '|', @weights; - $fullinfo =~ s/$weights//gxmsi; - last; - } - } - my @shapes = NFSS::get_all_shapes(); - for my $shape (@shapes) { - if ($fullinfo =~ m/$shape/xms) { - $self->{shape} = $shape; - my $shapes = join '|', @shapes; - $fullinfo =~ s/$shapes//gxmsi; - last; +# Add abbreviated forms. +for my $full (keys %abbrev) { + if (defined $SHAPE{$full}) { + for my $abbrev (_get_abbreviated_forms($full)) { + $SHAPE{$abbrev} = $SHAPE{$full}; } } +} - # In many font families, each font is in a subfamily of its own; - # so we remove width, weight and shape from the 'subfamily' value. - $data->{subfamily} =~ s/$self->{width}//xmsi; - $data->{subfamily} =~ s/$self->{weight}//xmsi; - $data->{subfamily} =~ s/$self->{shape}//xmsi; +my @allshapes = Util::sort_desc_length(keys %SHAPE); - $self->{name} = $data->{postscriptname}; - $self->{family} = $data->{family}; - $self->{subfamily} = $data->{subfamily}; - # Take care to unabbreviate weight and width; CondensedUltra fonts - # might end up as 'ultracondensed' instead of 'ultrablackcondensed'! - $self->{width} = NFSS::unabbreviate($self->{width}); - $self->{weight} = NFSS::unabbreviate($self->{weight}); - $self->{shape} = NFSS::unabbreviate($self->{shape}); +# -------------------------------------------------------------------------- +# Returns the unabbreviated form of its argument, +# or its argument itself if no unabbreviated form is known. +# -------------------------------------------------------------------------- +sub unabbreviate { + my $key = shift; - # Some font families put small caps into separate families; - # we merge these into the 'main' family. - # We have to test both 'family', 'subfamily' and 'name' for hints - # that this is a small caps font, as some fonts (e.g., Dolly) - # only mention this in their name. - my $shapes = join '|', Util::sort_desc_length(qw(smallcaps sc smcp caps)); - if ($self->{family} =~ m/(.+?) (?: $shapes) \z/xmsi) { - $self->{family} = $1; - $self->{is_smallcaps} = 1; - } - if ($self->{subfamily} =~ m/(.+?) (?: $shapes) \z/xmsi) { - $self->{subfamily} = $1; - $self->{is_smallcaps} = 1; - } - if ($self->{name} =~ m/(.+?) (?: $shapes) \z/xmsi) { - $self->{is_smallcaps} = 1; - } - # Some font families put italic shapes into separate families; - # we merge these into the 'main' family. - $shapes = join '|', Util::sort_desc_length(qw(it italic)); - if ($self->{family} =~ m/(.+?) ($shapes) \z/xmsi - and ($self->{shape} eq 'regular' - or $self->{shape} eq NFSS::unabbreviate(lc($2)))) { - $self->{family} = $1; - $self->{shape} = NFSS::unabbreviate(lc($2)); - } + return $FULL_FORM{$key} // $key; +} - # Some font families put different widths into separate families; - # we merge these into the 'main' font family. - my $widths = join '|', NFSS::get_all_widths(); - if ($self->{family} =~ m/(.+?) ($widths) \z/xmsi - and ($self->{width} eq 'regular' - or $self->{width} eq NFSS::unabbreviate(lc($2)))) { - $self->{family} = $1; - $self->{width} = NFSS::unabbreviate(lc($2)); - } - # Some font families put unusual weights into separate families; - # we merge these into the 'main' font family. But we have to be - # careful with the word 'Text': this might be part of the family name - # (i.e., Libre Caslon Text) and should not be mistaken for a weight. - my $weights = join '|', NFSS::get_all_weights(); - if ($self->{family} =~ m/text \z/xmsi) { - $weights =~ s/[|]? text//xms; - } - if ($self->{family} =~ m/(.+?) ($weights) \z/xmsi - and ($self->{weight} eq 'regular' - or $self->{weight} eq NFSS::unabbreviate(lc($2)))) { - $self->{family} = $1; - $self->{weight} = NFSS::unabbreviate(lc($2)); - } +# -------------------------------------------------------------------------- +# Prepends weight names to the WEIGHT table for a given NFSS code. +# -------------------------------------------------------------------------- +sub set_weight { + my ($key, @values) = @_; - $self->{basicshape} = NFSS::get_nfss_shape($self->{shape}); + $WEIGHT{$key} = [ @values, @{$WEIGHT{$key}} ]; + return; +} - # We define 'series' as 'weight + width'. This matches NFSS, - # but contradicts how most fonts are named (which is 'width + weight'). - $self->{series} - = ($self->{width} eq 'regular') ? $self->{weight} - : ($self->{weight} eq 'regular') ? $self->{width} - : $self->{weight} . $self->{width} - ; - return; +# -------------------------------------------------------------------------- +# Returns a list of NFSS weight names, sorted by weight. +# -------------------------------------------------------------------------- +sub get_all_nfss_weights { + return @WEIGHT; } # -------------------------------------------------------------------------- -# Processes the usWeightClass and usWidthClass data. +# Returns a list of all known weights, in an order suitable for searching. # -------------------------------------------------------------------------- -sub process_classdata { - my ($self, $classdata) = @_; +sub get_all_weights { + return @allweights; +} + - $self->{weight_class} = $classdata->{weight_class}; - $self->{width_class} = $classdata->{width_class}; +# -------------------------------------------------------------------------- +# Prepends weight names to the WIDTH table for a given NFSS code. +# -------------------------------------------------------------------------- +sub set_width { + my ($key, @values) = @_; + $WIDTH{$key} = [ @values, @{$WIDTH{$key}} ]; return; } # -------------------------------------------------------------------------- -# Processes the list of features this font supports. +# Returns a list of NFSS width names, sorted by width. # -------------------------------------------------------------------------- -sub process_featuredata { - my ($self, $data) = @_; +sub get_all_nfss_widths { + return @WIDTH; +} - %{$self->{feature}} = map { $_ => 1 } @$data; - return; +# -------------------------------------------------------------------------- +# Returns a list of all known widths, in an order suitable for searching. +# -------------------------------------------------------------------------- +sub get_all_widths { + return @allwidths; } # -------------------------------------------------------------------------- -# Extracts 'minsize' and 'maxsize' from the optical design size info. +# Returns the NFSS code for the given shape. +# -------------------------------------------------------------------------- +sub to_nfss { + my $key = shift; + + return $SHAPE{$key}; +} + + # -------------------------------------------------------------------------- -sub process_sizedata { - my ($self, $sizedata) = @_; +# Returns a list of all known shapes, in an order suitable for searching. +# -------------------------------------------------------------------------- +sub get_all_shapes { + return @allshapes; +} - my ($minsize, $maxsize) = @$sizedata; - # fix some known bugs - if ($self->{name} eq 'GaramondPremrPro-It' - && $minsize == 6 && $maxsize == 8.9) { - ($minsize, $maxsize) = (8.9, 14.9); +# -------------------------------------------------------------------------- +# Returns mappings of NFSS codes to weight and width, and vice versa. +# -------------------------------------------------------------------------- +sub map_nfss_codes { + my $fontlist = shift; + + my (%weight, %width); + for my $font (@{$fontlist}) { + $weight{ $font->{weight} } //= $font->{weight_class}; + $width{ $font->{width} } //= $font->{width_class}; } - elsif ($self->{family} eq 'KeplerStd' - && $self->{subfamily} =~ m/Caption/xms - && $minsize == 8.9 && $maxsize == 13.9) { - ($minsize, $maxsize) = (6, 8.9); + + my $from_nfss = { + weight => {}, + width => {}, + }; + + for my $nfssweight (get_all_nfss_weights()) { + $from_nfss->{weight}{$nfssweight} + = [ grep { $weight{$_} } @{$WEIGHT{$nfssweight}} ]; } - elsif ($self->{family} eq 'KeplerStd' - && $self->{subfamily} =~ m/Subhead/xms - && $minsize == 8.9 && $maxsize == 13.9) { - ($minsize, $maxsize) = (13.9, 23); + + # Some trickery to handle the case where the ul/ub codes are mapped + # but the el/eb codes are still empty. We try two things: + # 1. if there is a Thin (Heavy) weight and this is less extreme + # than the weight mapped to ul (ub), we map Thin (Heavy) to ul (ub) + # 2. otherwise we move the ul/ub weight to the el/eb position, + # unless that weight is the Ultralight/Ultrabold weight + if (!$ARGV{el} and !$ARGV{ul}) { + if (@{$from_nfss->{weight}{ul}} + and !@{$from_nfss->{weight}{el}}) { + if ($weight{thin} + and $weight{thin} + > $weight{$from_nfss->{weight}{ul}[0]}) { + $from_nfss->{weight}{el} = ['thin',]; + } + elsif ($from_nfss->{weight}{ul}[0] ne 'ultralight') { + $from_nfss->{weight}{el} + = [ shift @{$from_nfss->{weight}{ul}} ]; + } + } } - elsif ($self->{family} eq 'KeplerStd' - && $self->{subfamily} =~ m/Display/xms - && $minsize == 8.9 && $maxsize == 13.9) { - ($minsize, $maxsize) = (23, 72); + if (!$ARGV{eb} and !$ARGV{ub}) { + if (@{$from_nfss->{weight}{ub}} + and !@{$from_nfss->{weight}{eb}}) { + if ($weight{heavy} + and $weight{heavy} + < $weight{$from_nfss->{weight}{ub}[0]}) { + $from_nfss->{weight}{eb} = ['heavy',] + unless @{$from_nfss->{weight}{b}} + and $weight{$from_nfss->{weight}{b}[0]} + > $weight{heavy}; + } + elsif ($from_nfss->{weight}{ub}[0] ne 'ultrabold') { + $from_nfss->{weight}{eb} + = [ shift @{$from_nfss->{weight}{ub}} ]; + } + } } - @{$self}{qw(minsize maxsize)} = ($minsize, $maxsize); + # Special case: if we don't have Regular but we *do* have Medium, + # move Medium from the "sb" list to the "m" (i.e., Regular) one. + if (!@{$from_nfss->{weight}{''}}) { + my $alternate = ( grep { $weight{$_} } qw(medium 500) )[0]; + if ($alternate) { + $from_nfss->{weight}{''} = [$alternate]; + $from_nfss->{weight}{sb} + = [ grep { $_ ne $alternate } @{$from_nfss->{weight}{sb}} ]; + } + } - return; + # Some more trickery to map the sl code to Book or Text (but of course + # only if sl is empty and Book/Text is lighter than Regular) + if (!@{$from_nfss->{weight}{sl}}) { + $from_nfss->{weight}{sl} + = [ grep { $weight{$_} < $weight{$from_nfss->{weight}{''}[0]} } + @{$from_nfss->{weight}{''}} ]; + } + + NFSSWIDTH: + for my $nfsswidth (get_all_nfss_widths()) { + for my $width ( @{$WIDTH{$nfsswidth}} ) { + if ($width{$width}) { + $from_nfss->{width}{$nfsswidth} = [$width]; + next NFSSWIDTH; + } + } + $from_nfss->{width}{$nfsswidth} = []; + } + + # Reverse the %from_nfss mapping to get %to_nfss + my %to_nfss; + NFSSWEIGHT: + for my $nfssweight (get_all_nfss_weights()) { + next unless @{$from_nfss->{weight}{$nfssweight}}; + my $weight = $from_nfss->{weight}{$nfssweight}[0]; + $weight = "" if $weight eq 'regular'; + + NFSSWIDTH: + for my $nfsswidth (get_all_nfss_widths()) { + my $nfssseries = ($nfssweight . $nfsswidth) || 'm'; + + next unless @{$from_nfss->{width}{$nfsswidth}}; + my $width = $from_nfss->{width}{$nfsswidth}[0]; + $width = "" if $width eq 'regular'; + my $series = ($weight . $width) || 'regular'; + $to_nfss{$series} = $nfssseries; + } + } + + return [ $from_nfss, \%to_nfss ]; } +############################################################################ + + +package Font; + # -------------------------------------------------------------------------- -# Adds the NFSS classification (rm, sf, tt) to self. +# Constructor: returns a new Font object. # -------------------------------------------------------------------------- -sub process_nfss_classification { - my ($self, $data) = @_; +sub _new { + my ($class, $filename) = @_; - $self->{nfss} = $data; + my $self = { + filename => $filename, + width => 'regular', + weight => 'regular', + shape => 'roman', + minsize => 0, + maxsize => 0, + is_smallcaps => 0, + weight_class => 0, + width_class => 0, + nfss => 'rm', + }; - return; + return bless $self, $class; } -############################################################################ +# -------------------------------------------------------------------------- +# Factory function: parses a font's metadata and creates a Font object. +# -------------------------------------------------------------------------- +sub parse { + my $filename = shift; + + my $self = __PACKAGE__->_new($filename); + + my $metadata = _get_metadata($filename); + $self->_parse_metadata($metadata) + ->_parse_os2data() + ->_parse_featuredata() + ->_parse_sizedata() + ->_parse_nfss_classification() + ->_parse_fonttype() + ; + + return $self; +} -package Font::Raw; # -------------------------------------------------------------------------- # Returns the output of otfinfo -i as a list of key-value pairs. # -------------------------------------------------------------------------- -sub get_basicinfo { +sub _get_metadata { my $filename = shift; my $cmd = qq(otfinfo --info "$filename"); @@ -531,46 +619,206 @@ sub get_basicinfo { # -------------------------------------------------------------------------- -# Returns usWeightClass and usWidthClass from the OS/2 table. +# Processes the basic metadata for this font. # -------------------------------------------------------------------------- -sub get_classdata { - my $filename = shift; +sub _parse_metadata { + my ($self, $data) = @_; - my $os2_table; - eval { - my $cmd = qq(otfinfo --dump-table "OS/2" "$filename"); - open my $otfinfo, '-|:raw', $cmd - or die "could not fork(): $!"; - $os2_table = do { local $/; <$otfinfo> }; - close $otfinfo - or die "'$cmd' failed"; - } or warn "[WARNING] $@"; + $self->{originalfamily} = $data->{family}; - my ($weight_class, $width_class) = unpack '@4n @6n', $os2_table; + for my $key (keys %{$data}) { + $data->{$key} =~ s/\s+//xmsg; + } - return { - weight_class => $weight_class, - width_class => $width_class, - }; -} + $data->{family} = $data->{preferredfamily} || $data->{family}; + $data->{subfamily} = $data->{preferredsubfamily} || $data->{subfamily}; + $data->{fullname} =~ s/\A$data->{family}//xms; + $data->{fullname} = lc $data->{fullname}; + + # clean up family name (it's used in LaTeX command names) + my @DIGITS = qw(Zero One Two Three Four Five Six Seven Eight Nine); + $data->{family} =~ s/(?: LT | MT)(?: Std | Pro )\z//xms; + $data->{family} =~ s/(\d)/$DIGITS[$1]/xmsge; + $data->{family} =~ s/[^A-Za-z]+//xmsg; + + if ($data->{family} =~ m/\A DTL/xms) { + $data->{family} =~ s/\A DTL//xms; + $data->{subfamily} =~ s/\A (?: ST | T)//xms; + } + + # remove Adobe's SmallText size, to avoid mistaking it for Text weight + $data->{family} =~ s/(?: SmallText | SmText )\z//xmsi; + $data->{subfamily} =~ s/(?: SmallText | SmText )\z//xmsi; + $data->{fullname} =~ s/(?: SmallText | SmText )\z//xmsi; + + # Sometimes the relevant info is in Fullname, sometimes in Subfamily; + # so we need to test against both + my $fullinfo = lc "$data->{subfamily} | $data->{fullname}"; + + # We need to be careful when parsing the font info; in particular + # we must parse strings like 'UltraCondensed' as 'Regular' weight + # and 'UltraCondensed' width, not as 'Ultra' weight and 'Condensed' width. + # The following rules should prevent accidents: + # 1. Search for matching widths before matching weights + # (as none of the widths is a proper substring of some weight) + # 2. Remove any recognised search string from the 'fullinfo' + # 3. Test the weights 'medium' and 'regular' *last*, since these strings + # may also occur in Subfamily without indicating the weight; + # so we only take them to mean weight if we find no other hit. + my @widths = Attr::get_all_widths(); + for my $width (@widths) { + if ($fullinfo =~ m/$width/xms) { + $self->{width} = $width; + my $widths = join '|', @widths; + $fullinfo =~ s/$widths//gxmsi; + last; + } + } + my @weights = Attr::get_all_weights(); + for my $weight (@weights) { + if ($fullinfo =~ m/$weight/xms) { + $self->{weight} = $weight; + my $weights = join '|', @weights; + $fullinfo =~ s/$weights//gxmsi; + last; + } + } + my @shapes = Attr::get_all_shapes(); + for my $shape (@shapes) { + if ($fullinfo =~ m/$shape/xms) { + $self->{shape} = $shape; + my $shapes = join '|', @shapes; + $fullinfo =~ s/$shapes//gxmsi; + last; + } + } + + # In many font families, each font is in a subfamily of its own; + # so we remove width, weight and shape from the 'subfamily' value. + $data->{subfamily} =~ s/$self->{width}//xmsi; + $data->{subfamily} =~ s/$self->{weight}//xmsi; + $data->{subfamily} =~ s/$self->{shape}//xmsi; + + $self->{name} = $data->{postscriptname}; + $self->{family} = $data->{family}; + $self->{subfamily} = $data->{subfamily}; + + # Take care to unabbreviate weight and width; CondensedUltra fonts + # might end up as 'ultracondensed' instead of 'ultrablackcondensed'! + $self->{width} = Attr::unabbreviate($self->{width}); + $self->{weight} = Attr::unabbreviate($self->{weight}); + $self->{shape} = Attr::unabbreviate($self->{shape}); + + # Some font families put small caps into separate families; + # we merge these into the 'main' family. + # We have to test both 'family', 'subfamily' and 'name' for hints + # that this is a small caps font, as some fonts (e.g., Dolly) + # only mention this in their name. + my $shapes = join '|', Util::sort_desc_length(qw(smallcaps sc smcp caps)); + if ($self->{family} =~ m/(.+?) (?: $shapes) \z/xmsi) { + $self->{family} = $1; + $self->{is_smallcaps} = 1; + } + if ($self->{subfamily} =~ m/(.+?) (?: $shapes) \z/xmsi) { + $self->{subfamily} = $1; + $self->{is_smallcaps} = 1; + } + if ($self->{name} =~ m/\A DTL/xms && $self->{subfamily} =~ s/Caps//xms) { + $self->{is_smallcaps} = 1; + } + if ($self->{name} =~ m/(.+?) (?: $shapes) \z/xmsi) { + $self->{is_smallcaps} = 1; + } + # Some font families put italic shapes into separate families; + # we merge these into the 'main' family. + $shapes = join '|', Util::sort_desc_length(qw(it italic)); + if ($self->{family} =~ m/(.+?) ($shapes) \z/xmsi + and ($self->{shape} eq 'regular' + or $self->{shape} eq Attr::unabbreviate(lc($2)))) { + $self->{family} = $1; + $self->{shape} = Attr::unabbreviate(lc($2)); + } + + # Some font families put different widths into separate families; + # we merge these into the 'main' font family. + my $widths = join '|', Attr::get_all_widths(); + if ($self->{family} =~ m/(.+?) ($widths) \z/xmsi + and ($self->{width} eq 'regular' + or $self->{width} eq Attr::unabbreviate(lc($2)))) { + $self->{family} = $1; + $self->{width} = Attr::unabbreviate(lc($2)); + } + + # Some font families put unusual weights into separate families; + # we merge these into the 'main' font family. But we have to be + # careful with the word 'Text': this might be part of the family name + # (i.e., Libre Caslon Text) and should not be mistaken for a weight. + my $weights = join '|', Attr::get_all_weights(); + if ($self->{family} =~ m/text \z/xmsi) { + $weights =~ s/[|]? text//xms; + } + if ($self->{family} =~ m/(.+?) ($weights) \z/xmsi + and ($self->{weight} eq 'regular' + or $self->{weight} eq Attr::unabbreviate(lc($2)))) { + $self->{family} = $1; + $self->{weight} = Attr::unabbreviate(lc($2)); + } + + $self->{basicshape} = Attr::to_nfss($self->{shape}); + + # We define 'series' as 'weight + width'. This matches NFSS, + # but contradicts how most fonts are named (which is 'width + weight'). + $self->{series} + = ($self->{width} eq 'regular') ? $self->{weight} + : ($self->{weight} eq 'regular') ? $self->{width} + : $self->{weight} . $self->{width} + ; + + return $self; +} # -------------------------------------------------------------------------- -# Returns a list of features that this font supports. -# We include 'kern' in this list even if there is only a 'kern' table -# (but no feature), since otftotfm can also use the (legacy) table. -# -------------------------------------------------------------------------- -sub get_featuredata { - my $filename = shift; +# Parses usWeightClass and usWidthClass from the OS/2 table. +# -------------------------------------------------------------------------- +sub _parse_os2data { + my $self = shift; + + my $os2_table; + eval { + my $cmd = qq(otfinfo --dump-table "OS/2" "$self->{filename}"); + open my $otfinfo, '-|:raw', $cmd + or die "could not fork(): $!"; + $os2_table = do { local $/; <$otfinfo> }; + close $otfinfo + or die "'$cmd' failed"; + } or warn "[WARNING] $@"; + + my ($weight_class, $width_class) = unpack '@4n @6n', $os2_table; + + $self->{weight_class} = $weight_class; + $self->{width_class} = $width_class; + + return $self; +} + + +# -------------------------------------------------------------------------- +# Returns a list of features that this font supports. +# We include 'kern' in this list even if there is only a 'kern' table +# (but no feature), since otftotfm can also use the (legacy) table. +# -------------------------------------------------------------------------- +sub _parse_featuredata { + my $self = shift; - my $cmd = qq(otfinfo --features "$filename"); + my $cmd = qq(otfinfo --features "$self->{filename}"); open my $otfinfo, '-|', $cmd or die "[ERROR] Could not fork(): $!"; my @data = map { substr $_, 0, 4 } <$otfinfo>; close $otfinfo or die "[ERROR] '$cmd' failed."; - $cmd = qq(otfinfo --tables "$filename"); + $cmd = qq(otfinfo --tables "$self->{filename}"); open $otfinfo, '-|', $cmd or die "[ERROR] Could not fork(): $!"; my $data = do { local $/; <$otfinfo> }; @@ -581,17 +829,19 @@ sub get_featuredata { push @data, 'kern'; } - return \@data; + %{$self->{feature}} = map { $_ => 1 } @data; + + return $self; } # -------------------------------------------------------------------------- -# Returns the size info for this font (which may be empty). +# Extracts 'minsize' and 'maxsize' from the optical design size info. # -------------------------------------------------------------------------- -sub get_sizedata { - my $filename = shift; +sub _parse_sizedata { + my $self = shift; - my $cmd = qq(otfinfo --optical-size "$filename"); + my $cmd = qq(otfinfo --optical-size "$self->{filename}"); open my $otfinfo, '-|', $cmd or die "[ERROR] Could not fork(): $!"; my $data = do { local $/; <$otfinfo> }; @@ -604,21 +854,43 @@ sub get_sizedata { $minsize //= 0; $maxsize //= 0; - return [ $minsize, $maxsize ]; + + # fix some known bugs + if ($self->{name} eq 'GaramondPremrPro-It' + && $minsize == 6 && $maxsize == 8.9) { + ($minsize, $maxsize) = (8.9, 14.9); + } + elsif ($self->{family} eq 'KeplerStd' + && $self->{subfamily} =~ m/Caption/xms + && $minsize == 8.9 && $maxsize == 13.9) { + ($minsize, $maxsize) = (6, 8.9); + } + elsif ($self->{family} eq 'KeplerStd' + && $self->{subfamily} =~ m/Subhead/xms + && $minsize == 8.9 && $maxsize == 13.9) { + ($minsize, $maxsize) = (13.9, 23); + } + elsif ($self->{family} eq 'KeplerStd' + && $self->{subfamily} =~ m/Display/xms + && $minsize == 8.9 && $maxsize == 13.9) { + ($minsize, $maxsize) = (23, 72); + } + + @{$self}{qw(minsize maxsize)} = ($minsize, $maxsize); + + return $self; } # -------------------------------------------------------------------------- -# Returns the NFSS classification (i.e., rm, sf or tt) for this font. -# Note that the algorithm used is "best effort only", so its results -# may be wrong. +# Adds the NFSS classification (rm, sf, tt) to self. # -------------------------------------------------------------------------- -sub get_nfss_classification { - my $filename = shift; +sub _parse_nfss_classification { + my $self = shift; my $classification; eval { - my $cmd = qq(otfinfo --dump-table "post" "$filename"); + my $cmd = qq(otfinfo --dump-table "post" "$self->{filename}"); open my $otfinfo, '-|:raw', $cmd or die "could not fork(): $!"; my $post_table = do { local $/; <$otfinfo> }; @@ -627,14 +899,112 @@ sub get_nfss_classification { my $is_fixed_pitch = unpack '@12N', $post_table; - $classification = $is_fixed_pitch ? 'tt' - : $filename =~ m/mono(?!type)/xmsi ? 'tt' - : $filename =~ m/sans/xmsi ? 'sf' - : 'rm' - ; + $self->{nfss} = $is_fixed_pitch ? 'tt' + : $self->{filename} =~ m/mono(?!type)/xmsi ? 'tt' + : $self->{filename} =~ m/sans/xmsi ? 'sf' + : 'rm' + ; } or warn "[WARNING] $@"; - return $classification; + return $self; +} + + +# -------------------------------------------------------------------------- +# Determines the OpenType flavor of this font. +# -------------------------------------------------------------------------- +sub _parse_fonttype() { + my $self = shift; + + my ($ext) = $self->{filename} =~ m/[.] ([^.]+) \z/xmsi; + $ext = lc $ext; + + $self->{fonttype} + = $ext eq 'otf' ? 'opentype' + : $ext eq 'ttf' ? 'truetype' + : '' + ; + + if (!$self->{fonttype}) { + open my $fontfile, '<:raw', $self->{filename} + or die "[ERROR] Could not open '$self->{filename}': $!"; + my $fontsignature; + read $fontfile, $fontsignature, 4; + $self->{fonttype} + = $fontsignature eq 'OTTO' ? 'opentype' + : $fontsignature eq "\x00\x01\x00\x00" ? 'truetype' + : '' + ; + close $fontfile; + } + + if (!$self->{fonttype}) { + die "[ERROR] Unknown font type ($self->{filename})" + } + + return $self; +} + + +# Error messages, used in assert_unique(). +my $ERR_DETAIL =<<'END_ERR_DETAIL'; +[ERROR] I've parsed both %s + and %s as + + Family: %s + Weight: %s + Width: %s + Shape: %s + Size: %s-%s + Smallcaps: %s + +END_ERR_DETAIL + +my $ERR_PARSE =<<'END_ERR_PARSE'; +[ERROR] I failed to parse all fonts in a unique way; + presumably some fonts have unusual widths, weights or shapes. + + Try one of the following: + - Run 'autoinst' on a smaller set of fonts, + omitting the ones that weren't parsed correctly; + - Add the missing widths, weights or shapes to the tables + 'WIDTH', 'WEIGHT' or 'SHAPE' in the source code; + + Please also send a bug report to the author. +END_ERR_PARSE + +# -------------------------------------------------------------------------- +# Asserts all parsed fonts are unique. +# -------------------------------------------------------------------------- +sub assert_unique { + my ($log, $fontlist) = @_; + + # These attributes should uniquely identify each font. + my @attributes + = qw(family weight width shape minsize maxsize is_smallcaps); + + my (%seen, $err_details); + for my $font (@{$fontlist}) { + my $key = join "\x00", @{$font}{@attributes}; + + if ($seen{$key}) { + $err_details .= sprintf $ERR_DETAIL, + $seen{$key}{filename}, + $font->{filename}, + @{$font}{@attributes}; + } + else { + $seen{$key} = $font; + } + } + + # Die with detailed error message if the font infos aren't unique. + if ($err_details) { + $log->log($err_details, $ERR_PARSE); + die $err_details, $ERR_PARSE; + } + + return 1; } @@ -1432,650 +1802,222 @@ package Log; sub new { my ($class, $filename) = @_; - if (-e $filename) { - print "[WARNING] File '$filename' already exists;\n" . - " appending new log data to end.\n"; - } - open my $log, '>>', $filename - or die "$0: cannot create '$filename': $!"; - - return bless $log, $class; -} - - -# -------------------------------------------------------------------------- -# Writes a message to the log file. -# -------------------------------------------------------------------------- -sub log { - my ($self, $msg) = @_; - - print {$self} $msg; - - return; -} - - -# -------------------------------------------------------------------------- -# Closes the logfile associated with this Log object. -# -------------------------------------------------------------------------- -sub close { - my $self = shift; - - close $self; - - return; -} - - -# -------------------------------------------------------------------------- -# Logs the command line options. -# -------------------------------------------------------------------------- -sub log_options { - my $self = shift; - - print {$self} <<"END_ARGUMENTS"; - - -############################################################################ - - -@{[ POSIX::strftime("[%F %T]", localtime time) ]} $0, version $VERSION - -Command was: - - "$ARGV{cmdline}" - ----------------------------------------------------------------------------- - -I'm using the following options: - - encoding(s): @{[ join ', ', @{$ARGV{encoding}} ]} - NFSS: $ARGV{nfss} @{[ $ARGV{nfss} eq 'rm' ? '(serif)' - : $ARGV{nfss} eq 'sf' ? '(sanserif)' - : $ARGV{nfss} eq 'tt' ? '(typewriter)' - : '(unknown)' - ]} - - lining: @{[ $ARGV{lining} ? 'yes' : 'no' ]} - oldstyle: @{[ $ARGV{oldstyle} ? 'yes' : 'no' ]} - proportional: @{[ $ARGV{proportional} ? 'yes' : 'no' ]} - tabular: @{[ $ARGV{tabular} ? 'yes' : 'no' ]} - ts1: @{[ $ARGV{textcomp} ? 'yes' : 'no' ]} - smallcaps: @{[ $ARGV{smallcaps} ? 'yes' : 'no' ]} - swash: @{[ $ARGV{swash} ? 'yes' : 'no' ]} - titling: @{[ $ARGV{titling} ? 'yes' : 'no' ]} - superiors: @{[ $ARGV{superiors} ? 'yes' : 'no' ]} - inferiors: $ARGV{inferiors} - ornaments: @{[ $ARGV{ornaments} ? 'yes' : 'no' ]} - fractions: @{[ $ARGV{fractions} ? 'yes' : 'no' ]} - ligatures: @{[ $ARGV{ligatures} ? 'yes' : 'no' ]} - - target: $ARGV{target} - extra: $ARGV{extra} - - figurekern: @{[ $ARGV{figurekern} ? 'keep' : 'remove' ]} - - nfssweight: @{[ join q{, }, @{$ARGV{nfssweight}} ]} - nfsswidth: @{[ join q{, }, @{$ARGV{nfsswidth}} ]} - - math: @{[ $ARGV{math} ? 'yes' : 'no' ]} - mathspacing: $ARGV{mathspacing} - - fontname suffix: @{[ $ARGV{t1suffix} || '(none)' ]} - -END_ARGUMENTS - - if ($ARGV{fig_height} or $ARGV{fig_width}) { - print {$self} <<"END_FIGURE_DEFAULTS"; - default figures: @{[ - $ARGV{fig_width} eq 'pnum' ? 'proportional' - : 'tabular' - ]} @{[ - $ARGV{fig_height} eq 'onum' ? 'oldstyle' - : 'lining' - ]} - -END_FIGURE_DEFAULTS - } - - if ($ARGV{dryrun}) { - print {$self} " DRY RUN\n\n"; - } - - return; -} - - -# -------------------------------------------------------------------------- -# Logs command line options and the results of font info parsing. -# -------------------------------------------------------------------------- -sub log_parsing { - my ($self, $fontlist) = @_; - - print {$self} '-' x 76 . "\n\n" . "Results of font info parsing:\n"; - - for my $font (@{$fontlist}) { - print {$self} <<"END_PARSE_FONT"; - - $font->{filename} - Name: $font->{name} - Family: $font->{family} - Subfamily: $font->{subfamily} - Weight: $font->{weight} ($font->{weight_class}) - Width: $font->{width} ($font->{width_class}) - Shape: $font->{shape} @{[ $font->{is_smallcaps} - ? 'smallcaps' : '' ]} - Size: $font->{minsize}-$font->{maxsize} - Features: @{[ join q(, ), sort keys %{$font->{feature}} ]} -END_PARSE_FONT - } - - return; -} - - -# -------------------------------------------------------------------------- -# Logs the mapping of NFSS codes to weights and widths. -# -------------------------------------------------------------------------- -sub log_nfss_mapping { - my ($self, $nfss_mapping) = @_; - - print {$self} "\n" . '-' x 76 . "\n\nNFSS mappings:\n\n"; - for my $weight (NFSS::get_all_nfss_weights()) { - printf {$self} " %-3s => %s\n", - $weight || 'm', - $nfss_mapping->{weight}{$weight}[0] || ''; - } - printf {$self} "\n"; - for my $width (NFSS::get_all_nfss_widths()) { - printf {$self} " %-3s => %s\n", - $width || 'm', - $nfss_mapping->{width}{$width}[0] || ''; - } - - return; -} - - -# -------------------------------------------------------------------------- -# Logs all fonts we're going to create. -# -------------------------------------------------------------------------- -sub log_worklist { - my ($self, $worklist) = @_; - - my @workitems - = sort { $a->{font}{filename} cmp $b->{font}{filename} - || $a->{encoding} cmp $b->{encoding} - || $a->{figurestyle} cmp $b->{figurestyle} - } - @{$worklist}; - - my $prevfn = q{}; - for my $workitem (@workitems) { - if ($prevfn ne $workitem->{font}{filename}) { - print {$self} <<"END_FONTINFO"; - - ------------------------------------------------------------------------ - - $workitem->{font}{filename} - - Generating these encodings, figure styles and shapes: - - ENC STYLE SHAPE FEATURES USED - -END_FONTINFO - } - printf {$self} " %-3s %-4s %-4s %s\n", - $workitem->{encoding}, - $workitem->{figurestyle}, - $workitem->{fdshape}, - join(q{, }, @{$workitem->{features}}); - $prevfn = $workitem->{font}{filename}; - } - - return; -} - - -# -------------------------------------------------------------------------- -# Logs all generated otftotfm commands. -# -------------------------------------------------------------------------- -sub log_commands { - my ($self, $commandlist) = @_; - - print {$self} "\n\n"; - print {$self} join "\n\n", @{$commandlist}; - print {$self} "\n"; - - return; -} - - -############################################################################ - - -package NFSS; - -=begin Comment - - Some fontnames contain abbreviated words for width, weight and/or shape; - we unabbreviate these using the following table. - -=end Comment - -=cut - -my %FULL_FORM = ( - cmp => 'compressed', - comp => 'compressed', - cond => 'condensed', - demi => 'demibold', - extcond => 'extracondensed', - hair => 'hairline', - incline => 'inclined', - it => 'italic', - ita => 'italic', - md => 'medium', - slant => 'slanted', - ultra => 'ultrablack', -); - -=begin Comment - - LaTeX's NFSS contains a number of standard codes for weight and width: - - weight: ul, el, l, sl, m, sb, b, eb, ub - - width: uc, ec, c, sc, m, sx, x, ex, ux - - These codes are not always a perfect match with the weights and widths - present in a font family; some families (especially many sans serif ones) - contain more or different weights and widths, and the naming of those - weights and widths isn't always consistent between font families. - To handle this situation, we use a two-tiered approach: - 1. We install all fonts using a "series" name that is the concatenation - of whatever the font designer has chosen to call the weight and width - (but in all *lower*case). - 2. We add "alias" rules to the .fd files that map the standard NFSS codes - to actual fonts. - - In step 1, we follow NFSS in leaving out any occurrence of - the word "regular" unless *both* weight and width are Regular; - in that case, the 'series' attribute becomes "regular". - - The two tables WEIGHT and WIDTH are used to control step 2. - It contains several entries of the form - - sc => [ qw( semicondensed narrow ) ], - - This should be read as follows: the NFSS code "sc" is mapped to - the *first* width on the right hand side present in the current family. - - Please note that the tables contain empty keys instead of "m" for the - regular weight and width. NFSS actually combines weight and width into - a single "series" attribute; a weight or width of "m" is left out of - this combination (unless *both* weight and width are equal to "m"; then - the series becomes "m", but that's a special case we deal with later on). - - In addition to the mapping of NFSS codes, the two mentioned tables are - also used in parsing the font's metadata to determine its weight and - width: any string that occurs on the right hand side is considered a - possible name to be searched for. - - These tables can be extended to teach autoinst about new weights or - widths. Suppose your font family contains a "Hemibold" weight, that - you want mapped to the "sb" code. Then add the name "hemibold" to - the right hand side of the "sb" entry in the WEIGHT table: - - sb => [ qw( semibold demibold medium hemibold ) ], - - In this case, since it's in last position, it's only mapped to "sb" - if none of the other fonts are present. Put it earlier in the list - to give it higher priority. - - Note that autoinst converts all metadata to lowercase to avoid - inconsistent capitalization; so all entries in these tables should - be *lowercase* as well. - - Technical notes: - - We define WEIGHT and WIDTH first as arrays - and then as hashtables; this allows us to use the array-variants - as an *ordered* (by weight/width) list of values (in the routines - get_all_nfss_weights and get_all_nfss_widths). - -=end Comment - -=cut - -my @WEIGHT = ( - ul => [ qw( ultralight thin 100 hairline ) ], - el => [ qw( extralight 200 ) ], - l => [ qw( light 300 ) ], - sl => [ qw( semilight blond ) ], - '' => [ qw( regular normal text book 400 ) ], - sb => [ qw( semibold demibold 600 medium 500 ) ], - b => [ qw( bold 700 ) ], - eb => [ qw( extrabold 800 ) ], - ub => [ qw( ultrabold black heavy extrablack ultrablack 900 fatface - ultraheavy poster super 1000 ) ], -); - -my @WIDTH = ( - uc => [ qw( ultracondensed extracompressed ultracompressed ) ], - ec => [ qw( extracondensed compressed compact ) ], - c => [ qw( condensed ) ], - sc => [ qw( semicondensed narrow ) ], - '' => [ qw( regular ) ], - sx => [ qw( semiextended semiexpanded wide ) ], - x => [ qw( extended expanded ) ], - ex => [], - ux => [], -); - -=begin Comment - - The SHAPE table maps various shape names to NFSS codes. - - Like in the other * tables, entries may be added to teach autoinst - about new shapes. Note that this table is "the other way around" - compared to WEIGHT and WIDTH; those map NFSS codes to names, - this one maps names to NFSS codes. That's because the data from - this table is used in a slightly different way; notably, it isn't - used in the map_nfss_codes routine. - -=end Comment - -=cut - -my %SHAPE = ( - roman => 'n', - upright => 'n', - italic => 'it', - inclined => 'sl', - oblique => 'sl', - slanted => 'sl', - romani => 'n', # Silentium has two roman shapes, but no italic; - romanii => 'it', # so we cheat by mapping the second roman to 'it' -); - - -#### FUNCTIONS FOR ACCESSING DATA FROM THE TABLES #### - - -# -------------------------------------------------------------------------- -# Returns the unabbreviated form of its argument, -# or its argument itself if no unabbreviated form is known. -# -------------------------------------------------------------------------- -sub unabbreviate { - my $key = shift; - - return $FULL_FORM{$key} // $key; -} - - -# Auxiliary table that reverses FULL_FORM; maps full forms to abbrevs. -my %abbrev; -while (my ($k, $v) = each %FULL_FORM) { - push @{$abbrev{$v}}, $k; -} -for my $full (keys %abbrev) { - push @{$abbrev{$full}}, $full; -} - - -# -------------------------------------------------------------------------- -# Returns a list of known abbreviations of its argument, -# or a singleton list containing just the argument itself -# if no abbreviations are known. -# -------------------------------------------------------------------------- -sub get_abbreviated_forms { - my $key = shift; - - return @{ $abbrev{$key} // [$key] }; -} - - -my %WEIGHT = @WEIGHT; -@WEIGHT = grep { !ref } @WEIGHT; + if (-e $filename) { + print "[WARNING] File '$filename' already exists;\n" . + " appending new log data to end.\n"; + } + open my $log, '>>', $filename + or die "$0: cannot create '$filename': $!"; -# Add abbreviated forms, using the %ABBREV table constructed earlier. -for my $code (@WEIGHT) { - $WEIGHT{$code} - = [ map { get_abbreviated_forms($_) } @{$WEIGHT{$code}} ]; + return bless $log, $class; } # -------------------------------------------------------------------------- -# Returns all weight names that might map to the given NFSS code. +# Writes a message to the log file. # -------------------------------------------------------------------------- -sub get_weights { - my $key = shift; +sub log { + my ($self, $msg) = @_; + + print {$self} $msg; - return @{$WEIGHT{$key}}; + return; } # -------------------------------------------------------------------------- -# Adds weight names to the WEIGHT table. +# Closes the logfile associated with this Log object. # -------------------------------------------------------------------------- -sub set_weights { - my ($key, @values) = @_; +sub close { + my $self = shift; + + close $self; - $WEIGHT{$key} = [ @values, @{$WEIGHT{$key}} ]; return; } # -------------------------------------------------------------------------- -# Returns a list of NFSS weights, sorted from light to heavy. +# Logs the command line options. # -------------------------------------------------------------------------- -sub get_all_nfss_weights { - return @WEIGHT; -} +sub log_options { + my $self = shift; + print {$self} <<"END_ARGUMENTS"; -my @allweights = grep { $_ !~ m/ medium | regular | text /xms } - map { @{$_} } values %WEIGHT; -@allweights = (Util::sort_desc_length(@allweights), qw(medium regular text)); -# -------------------------------------------------------------------------- -# Returns a list of all known weight names, -# in an order that's suitable for search routines. -# -------------------------------------------------------------------------- -sub get_all_weights { - return @allweights; -} +############################################################################ -my %WIDTH = @WIDTH; -@WIDTH = grep { !ref } @WIDTH; -# Add abbreviated forms, using the %ABBREV table constructed earlier. -for my $code (@WIDTH) { - $WIDTH{$code} - = [ map { get_abbreviated_forms($_) } @{$WIDTH{$code}} ]; -} +@{[ POSIX::strftime("[%F %T]", localtime time) ]} $0, version $VERSION +Command was: -# -------------------------------------------------------------------------- -# Returns all width names that might map to the given NFSS code. -# -------------------------------------------------------------------------- -sub get_widths { - my $key = shift; + "$ARGV{cmdline}" - return @{$WIDTH{$key}}; -} +---------------------------------------------------------------------------- +I'm using the following options: -# -------------------------------------------------------------------------- -# Adds width names to the WEIGHT table. -# -------------------------------------------------------------------------- -sub set_widths { - my ($key, @values) = @_; + encoding(s): @{[ join ', ', @{$ARGV{encoding}} ]} + NFSS: $ARGV{nfss} @{[ $ARGV{nfss} eq 'rm' ? '(serif)' + : $ARGV{nfss} eq 'sf' ? '(sanserif)' + : $ARGV{nfss} eq 'tt' ? '(typewriter)' + : '(unknown)' + ]} - $WIDTH{$key} = [ @values, @{$WIDTH{$key}} ]; - return; -} + lining: @{[ $ARGV{lining} ? 'yes' : 'no' ]} + oldstyle: @{[ $ARGV{oldstyle} ? 'yes' : 'no' ]} + proportional: @{[ $ARGV{proportional} ? 'yes' : 'no' ]} + tabular: @{[ $ARGV{tabular} ? 'yes' : 'no' ]} + ts1: @{[ $ARGV{textcomp} ? 'yes' : 'no' ]} + smallcaps: @{[ $ARGV{smallcaps} ? 'yes' : 'no' ]} + swash: @{[ $ARGV{swash} ? 'yes' : 'no' ]} + titling: @{[ $ARGV{titling} ? 'yes' : 'no' ]} + superiors: @{[ $ARGV{superiors} ? 'yes' : 'no' ]} + inferiors: $ARGV{inferiors} + ornaments: @{[ $ARGV{ornaments} ? 'yes' : 'no' ]} + fractions: @{[ $ARGV{fractions} ? 'yes' : 'no' ]} + ligatures: @{[ $ARGV{ligatures} ? 'yes' : 'no' ]} + target: $ARGV{target} + extra: $ARGV{extra} -# -------------------------------------------------------------------------- -# Returns a list of NFSS widths, sorted from narrow to wide. -# -------------------------------------------------------------------------- -sub get_all_nfss_widths { - return @WIDTH; -} + figurekern: @{[ $ARGV{figurekern} ? 'keep' : 'remove' ]} + nfssweight: @{[ join q{, }, @{$ARGV{nfssweight}} ]} + nfsswidth: @{[ join q{, }, @{$ARGV{nfsswidth}} ]} -my @allwidths = grep { $_ ne 'regular' } map { @{$_} } values %WIDTH; -@allwidths = Util::sort_desc_length(@allwidths); + math: @{[ $ARGV{math} ? 'yes' : 'no' ]} + mathspacing: $ARGV{mathspacing} -# -------------------------------------------------------------------------- -# Returns a list of all known width names, -# in an order that's suitable for search routines. -# -------------------------------------------------------------------------- -sub get_all_widths { - return @allwidths; -} + fontname suffix: @{[ $ARGV{t1suffix} || '(none)' ]} +END_ARGUMENTS -# Add abbreviated forms to %SHAPE table. -for my $full (keys %abbrev) { - if (defined $SHAPE{$full}) { - for my $abbrev (get_abbreviated_forms($full)) { - $SHAPE{$abbrev} = $SHAPE{$full}; - } + if ($ARGV{fig_height} or $ARGV{fig_width}) { + print {$self} <<"END_FIGURE_DEFAULTS"; + default figures: @{[ + $ARGV{fig_width} eq 'pnum' ? 'proportional' + : 'tabular' + ]} @{[ + $ARGV{fig_height} eq 'onum' ? 'oldstyle' + : 'lining' + ]} + +END_FIGURE_DEFAULTS + } + + if ($ARGV{dryrun}) { + print {$self} " DRY RUN\n\n"; } + + return; } + # -------------------------------------------------------------------------- -# Returns the NFSS code for the given shape. +# Logs command line options and the results of font info parsing. # -------------------------------------------------------------------------- -sub get_nfss_shape { - my $key = shift; +sub log_parsing { + my ($self, $fontlist) = @_; - return $SHAPE{$key}; -} + print {$self} '-' x 76 . "\n\n" . "Results of font info parsing:\n"; + for my $font (@{$fontlist}) { + print {$self} <<"END_PARSE_FONT"; + + $font->{filename} + Name: $font->{name} + Family: $font->{family} + Subfamily: $font->{subfamily} + Weight: $font->{weight} ($font->{weight_class}) + Width: $font->{width} ($font->{width_class}) + Shape: $font->{shape} @{[ $font->{is_smallcaps} + ? 'smallcaps' : '' ]} + Size: $font->{minsize}-$font->{maxsize} + Features: @{[ join q(, ), sort keys %{$font->{feature}} ]} +END_PARSE_FONT + } + + return; +} -my @allshapes = Util::sort_desc_length(keys %SHAPE); # -------------------------------------------------------------------------- -# Returns a list of all known shape names, -# in an order that's suitable for search routines. +# Logs the mapping of NFSS codes to weights and widths. # -------------------------------------------------------------------------- -sub get_all_shapes { - return @allshapes; +sub log_nfss_mapping { + my ($self, $nfss_mapping) = @_; + + print {$self} "\n" . '-' x 76 . "\n\nNFSS mappings:\n\n"; + for my $weight (Attr::get_all_nfss_weights()) { + printf {$self} " %-3s => %s\n", + $weight || 'm', + $nfss_mapping->{weight}{$weight}[0] || ''; + } + printf {$self} "\n"; + for my $width (Attr::get_all_nfss_widths()) { + printf {$self} " %-3s => %s\n", + $width || 'm', + $nfss_mapping->{width}{$width}[0] || ''; + } + + return; } + # -------------------------------------------------------------------------- -# Returns a mapping of NFSS codes to weight and width names. +# Logs all fonts we're going to create. # -------------------------------------------------------------------------- -sub map_nfss_codes { - my $fontlist = shift; +sub log_worklist { + my ($self, $worklist) = @_; - my (%weight, %width); - for my $font (@{$fontlist}) { - $weight{ $font->{weight} } //= $font->{weight_class}; - $width{ $font->{width} } //= $font->{width_class}; - } + my @workitems + = sort { $a->{font}{filename} cmp $b->{font}{filename} + || $a->{encoding} cmp $b->{encoding} + || $a->{figurestyle} cmp $b->{figurestyle} + } + @{$worklist}; - my $mapping = { - weight => {}, - width => {}, - }; + my $prevfn = q{}; + for my $workitem (@workitems) { + if ($prevfn ne $workitem->{font}{filename}) { + print {$self} <<"END_FONTINFO"; - for my $nfssweight (NFSS::get_all_nfss_weights()) { - $mapping->{weight}{$nfssweight} - = [ grep { $weight{$_} } NFSS::get_weights($nfssweight) ]; - } + ------------------------------------------------------------------------ - # Some trickery to handle the case where the ul/ub codes are mapped - # but the el/eb codes are still empty. We try two things: - # 1. if there is a Thin (Heavy) weight and this is less extreme - # than the weight mapped to ul (ub), we map Thin (Heavy) to ul (ub) - # 2. otherwise we move the ul/ub weight to the el/eb position, - # unless that weight is the Ultralight/Ultrabold weight - if (!$ARGV{el} and !$ARGV{ul}) { - if (@{$mapping->{weight}{ul}} and !@{$mapping->{weight}{el}}) { - if ($weight{thin} - and $weight{thin} > $weight{$mapping->{weight}{ul}[0]}) { - $mapping->{weight}{el} = ['thin',]; - } - elsif ($mapping->{weight}{ul}[0] ne 'ultralight') { - $mapping->{weight}{el} = [ shift @{$mapping->{weight}{ul}} ]; - } - } - } - if (!$ARGV{eb} and !$ARGV{ub}) { - if (@{$mapping->{weight}{ub}} and !@{$mapping->{weight}{eb}}) { - if ($weight{heavy} - and $weight{heavy} < $weight{$mapping->{weight}{ub}[0]}) { - $mapping->{weight}{eb} = ['heavy',] - unless @{$mapping->{weight}{b}} - and $weight{$mapping->{weight}{b}[0]} > $weight{heavy}; - } - elsif ($mapping->{weight}{ub}[0] ne 'ultrabold') { - $mapping->{weight}{eb} = [ shift @{$mapping->{weight}{ub}} ]; - } - } - } + $workitem->{font}{filename} - # Special case: if we don't have Regular but we *do* have Medium, - # move Medium from the "sb" list to the "m" (i.e., Regular) one. - if (!@{$mapping->{weight}{''}}) { - my $alternate = ( grep { $weight{$_} } qw(medium 500) )[0]; - if ($alternate) { - $mapping->{weight}{''} = [$alternate]; - $mapping->{weight}{sb} - = [ grep { $_ ne $alternate } @{$mapping->{weight}{sb}} ]; - } - } + Generating these encodings, figure styles and shapes: - # Some more trickery to map the sl code to Book or Text (but of course - # only if sl is empty and Book/Text is lighter than Regular) - if (!@{$mapping->{weight}{sl}}) { - $mapping->{weight}{sl} - = [ grep { $weight{$_} < $weight{$mapping->{weight}{''}[0]} } - @{$mapping->{weight}{''}} ]; - } + ENC STYLE SHAPE FEATURES USED - NFSSWIDTH: - for my $nfsswidth (NFSS::get_all_nfss_widths()) { - for my $width ( NFSS::get_widths($nfsswidth) ) { - if ($width{$width}) { - $mapping->{width}{$nfsswidth} = [$width]; - next NFSSWIDTH; - } +END_FONTINFO } - $mapping->{width}{$nfsswidth} = []; + printf {$self} " %-3s %-4s %-4s %s\n", + $workitem->{encoding}, + $workitem->{figurestyle}, + $workitem->{fdshape}, + join(q{, }, @{$workitem->{features}}); + $prevfn = $workitem->{font}{filename}; } - return $mapping; + return; } + # -------------------------------------------------------------------------- -# Returns a mapping of weight and width names to NFSS codes. +# Logs all generated otftotfm commands. # -------------------------------------------------------------------------- -sub invert_mapping { - my $nfss_mapping = shift; - - my %to_nfss; - NFSSWEIGHT: - for my $nfssweight (NFSS::get_all_nfss_weights()) { - next unless @{$nfss_mapping->{weight}{$nfssweight}}; - my $weight = $nfss_mapping->{weight}{$nfssweight}[0]; - $weight = "" if $weight eq 'regular'; - - NFSSWIDTH: - for my $nfsswidth (NFSS::get_all_nfss_widths()) { - my $nfssseries = ($nfssweight . $nfsswidth) || 'm'; +sub log_commands { + my ($self, $commandlist) = @_; - next unless @{$nfss_mapping->{width}{$nfsswidth}}; - my $width = $nfss_mapping->{width}{$nfsswidth}[0]; - $width = "" if $width eq 'regular'; - my $series = ($weight . $width) || 'regular'; - $to_nfss{$series} = $nfssseries; - } - } + print {$self} "\n\n"; + print {$self} join "\n\n", @{$commandlist}; + print {$self} "\n"; - return \%to_nfss; + return; } @@ -2228,7 +2170,7 @@ sub parse_options { "$key=$values"; my @values = split m/,/, lc $values; $key = q{} if $key eq 'm'; - NFSS::set_weights($key, @values); + Attr::set_weight($key, @values); $ARGV{$key} = 'user-defined'; }, 'nfsswidth=s%' => sub { @@ -2238,7 +2180,7 @@ sub parse_options { push @{$ARGV{nfsswidth}}, "$key=$values"; $key = q{} if $key eq 'm'; - NFSS::set_widths($key, @values); + Attr::set_width($key, @values); $ARGV{$key} = 'user-defined'; }, 'math!' => \$ARGV{math}, @@ -2438,7 +2380,7 @@ my %STYLE = ( code => { n => 'sc', it => 'scit', sl => 'scsl' }, reqd => [ 'smcp' ], nice => [], - extra => '--unicoding="germandbls =: SSsmall"', + extra => '--unicoding="germandbls =: SSsmall" --unicoding="ff =: FFsmall" --unicoding="fi =: FIsmall" --unicoding="ffi =: FFIsmall" --unicoding="fl =: FLsmall" --unicoding="ffl =: FFLsmall"', name => 'sc', }, swash => { @@ -2738,7 +2680,7 @@ sub process_encoding_options { my @encodings = split /,/, $ARGV{encoding}; for my $enc (@encodings) { if ($enc !~ m/\A(OT1|T1|TS1|LY1|LGR|T2[ABC]|T3|TS3)\z/xmsi) { - my $try = Cwd::abs_path($enc); + my $try = $enc; $try .= '.enc' if $try !~ m/[.]enc\z/xms; if (!-e $try) { die "[ERROR] No .enc file found for '$enc'"; @@ -2753,7 +2695,7 @@ sub process_encoding_options { # - the text encodings contain T1 and the user didn't turn off TS1 if ($ARGV{textcomp} == 1 or ($ARGV{textcomp} >= 1 - and grep { $_ =~ m/T1/xmsi } @{$ARGV{encoding}})) { + and grep { uc $_ eq 'T1' } @{$ARGV{encoding}})) { $ARGV{textcomp} = 1; } else { @@ -3106,8 +3048,10 @@ sub cleanup { return; } - # Figure out which encoding file to use for this font. - my $try = Cwd::abs_path($workitem->{encoding}); + # Figure out whether the encoding option refers to a custom encoding file + # in the current directory, or to the name of one of our standard + # encodings. In the latter case, we add the 'fontools_' prefix. + my $try = $workitem->{encoding}; $try .= '.enc' if $try !~ m/[.]enc\z/xms; if (-e $try) { $workitem->{enc_file} = $try; @@ -3171,7 +3115,7 @@ sub modify_fontnames { $ARGV{typeface} || $family); # The otftotfm-generated map file refers to the original otf files; - # we need to change this to use our name-modifyd Type1 fonts instead. + # we need to change this to use our name-modified Type1 fonts instead. my $mapfile = File::Spec->catfile( $ARGV{target}, 'fonts', @@ -4053,7 +3997,7 @@ GNU General Public License for more details. =head1 VERSION -This document describes B version 20200729. +This document describes B version 20201218. =head1 RECENT CHANGES @@ -4062,6 +4006,14 @@ This document describes B version 20200729. =over 12 +=item I<2020-12-18> + +Fixed a problem with files not being found on Windows. +Added extra C<--unicoding> options to prevent getting +lowercase f-ligatures in smallcaps for some buggy fonts. +Optimized font info parsing for DTL and TypeBy font families. +Cleaned up the code for better maintainability. + =item I<2020-07-29> Some changes in the generated F and F files, diff --git a/fonts/utilities/fontools/bin/ot2kpx b/fonts/utilities/fontools/bin/ot2kpx index cb7809f1e4..164fc2b149 100755 --- a/fonts/utilities/fontools/bin/ot2kpx +++ b/fonts/utilities/fontools/bin/ot2kpx @@ -38,7 +38,7 @@ use Getopt::Long (); use List::Util @List::Util::EXPORT_OK; use Pod::Usage; -my $VERSION = "20200729"; +my $VERSION = "20201218"; our ($NUM_GLYPHS, $UNITS_PER_EM, %kern); @@ -858,7 +858,7 @@ See the GNU General Public License for more details. =head1 VERSION -This document describes B version 20200729. +This document describes B version 20201218. =head1 RECENT CHANGES diff --git a/fonts/utilities/fontools/bin/splitttc b/fonts/utilities/fontools/bin/splitttc index b039b33875..48ef2f6676 100755 --- a/fonts/utilities/fontools/bin/splitttc +++ b/fonts/utilities/fontools/bin/splitttc @@ -38,7 +38,7 @@ use File::Basename; use Getopt::Long; use Pod::Usage; -my $VERSION = "20200729"; +my $VERSION = "20201218"; parse_commandline(); @@ -303,7 +303,7 @@ See the GNU General Public License for more details. =head1 VERSION -This document describes B version 20200729. +This document describes B version 20201218. =head1 RECENT CHANGES diff --git a/fonts/utilities/fontools/doc/afm2afm.pdf b/fonts/utilities/fontools/doc/afm2afm.pdf index 1ca5d13897..30f127136f 100644 Binary files a/fonts/utilities/fontools/doc/afm2afm.pdf and b/fonts/utilities/fontools/doc/afm2afm.pdf differ diff --git a/fonts/utilities/fontools/doc/autoinst.pdf b/fonts/utilities/fontools/doc/autoinst.pdf index 7c11671def..35bfdc8590 100644 Binary files a/fonts/utilities/fontools/doc/autoinst.pdf and b/fonts/utilities/fontools/doc/autoinst.pdf differ diff --git a/fonts/utilities/fontools/doc/ot2kpx.pdf b/fonts/utilities/fontools/doc/ot2kpx.pdf index 392db35467..f9888446e1 100644 Binary files a/fonts/utilities/fontools/doc/ot2kpx.pdf and b/fonts/utilities/fontools/doc/ot2kpx.pdf differ diff --git a/fonts/utilities/fontools/doc/splitttc.pdf b/fonts/utilities/fontools/doc/splitttc.pdf index 2a9f50b7a1..66f4ec685a 100644 Binary files a/fonts/utilities/fontools/doc/splitttc.pdf and b/fonts/utilities/fontools/doc/splitttc.pdf differ -- cgit v1.2.3