From 3710c23789342d9d88783cbe9ad23eb5263a7c33 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 7 Aug 2020 03:02:55 +0000 Subject: CTAN sync 202008070302 --- FILES.byname | 3982 +++++------ FILES.byname.gz | Bin 2232830 -> 2233737 bytes FILES.last07days | 2566 +++++-- fonts/xcharter/README | 8 +- fonts/xcharter/doc/altone.py | 11 +- fonts/xcharter/doc/xcharter-doc.pdf | Bin 711124 -> 719666 bytes fonts/xcharter/doc/xcharter-doc.tex | 18 +- fonts/xcharter/enc/xch1_3nubio.enc | 12 +- fonts/xcharter/enc/xch1_5xfeuz.enc | 4 +- fonts/xcharter/enc/xch1_62ztbr.enc | 12 +- fonts/xcharter/enc/xch1_64qgug.enc | 10 +- fonts/xcharter/enc/xch1_6l4ixg.enc | 8 +- fonts/xcharter/enc/xch1_7p4e2o.enc | 4 +- fonts/xcharter/enc/xch1_bcg6lk.enc | 72 + fonts/xcharter/enc/xch1_bpv7ty.enc | 71 + fonts/xcharter/enc/xch1_dbdfpx.enc | 4 +- fonts/xcharter/enc/xch1_e3nxtd.enc | 14 +- fonts/xcharter/enc/xch1_erwtw3.enc | 4 +- fonts/xcharter/enc/xch1_evj3rb.enc | 14 +- fonts/xcharter/enc/xch1_gb4haz.enc | 8 +- fonts/xcharter/enc/xch1_gvbfhh.enc | 4 +- fonts/xcharter/enc/xch1_ivnpe7.enc | 4 +- fonts/xcharter/enc/xch1_jg3oo5.enc | 4 +- fonts/xcharter/enc/xch1_l4c4ke.enc | 10 +- fonts/xcharter/enc/xch1_l6an6k.enc | 73 + fonts/xcharter/enc/xch1_oj27u4.enc | 13 +- fonts/xcharter/enc/xch1_ph46id.enc | 70 + fonts/xcharter/enc/xch1_pqp4df.enc | 70 + fonts/xcharter/enc/xch1_q2nwaj.enc | 4 +- fonts/xcharter/enc/xch1_qdfne6.enc | 4 +- fonts/xcharter/enc/xch1_tis6bf.enc | 70 + fonts/xcharter/enc/xch1_vv7waw.enc | 10 +- fonts/xcharter/enc/xch1_wi6ykn.enc | 8 +- fonts/xcharter/enc/xch1_wqeam3.enc | 10 +- fonts/xcharter/enc/xch1_wwsmtw.enc | 4 +- fonts/xcharter/enc/xch1_xmfb6b.enc | 10 +- fonts/xcharter/enc/xch1_xqcxen.enc | 70 + fonts/xcharter/enc/xch1_yz7cd7.enc | 4 +- fonts/xcharter/enc/xch_26pbhy.enc | 6 +- fonts/xcharter/enc/xch_2acc4n.enc | 4 +- fonts/xcharter/enc/xch_2jytnu.enc | 8 +- fonts/xcharter/enc/xch_3j6jnh.enc | 12 +- fonts/xcharter/enc/xch_3nubio.enc | 12 +- fonts/xcharter/enc/xch_3oyzty.enc | 4 +- fonts/xcharter/enc/xch_3reguq.enc | 10 +- fonts/xcharter/enc/xch_4siibn.enc | 66 + fonts/xcharter/enc/xch_57lqj7.enc | 4 +- fonts/xcharter/enc/xch_5klbw4.enc | 8 +- fonts/xcharter/enc/xch_5xfeuz.enc | 4 +- fonts/xcharter/enc/xch_62z5ot.enc | 7 +- fonts/xcharter/enc/xch_62ztbr.enc | 12 +- fonts/xcharter/enc/xch_64qgug.enc | 10 +- fonts/xcharter/enc/xch_6l4ixg.enc | 8 +- fonts/xcharter/enc/xch_6zxmh3.enc | 4 +- fonts/xcharter/enc/xch_7cmdv6.enc | 6 +- fonts/xcharter/enc/xch_7p4e2o.enc | 4 +- fonts/xcharter/enc/xch_abgjzu.enc | 4 +- fonts/xcharter/enc/xch_ao7ayk.enc | 6 +- fonts/xcharter/enc/xch_ay4e7o.enc | 4 +- fonts/xcharter/enc/xch_bcg6lk.enc | 66 + fonts/xcharter/enc/xch_bk4eiy.enc | 10 +- fonts/xcharter/enc/xch_bpv7ty.enc | 65 + fonts/xcharter/enc/xch_bxmb3o.enc | 4 +- fonts/xcharter/enc/xch_ch4v2b.enc | 14 +- fonts/xcharter/enc/xch_ckugtc.enc | 10 +- fonts/xcharter/enc/xch_ct4qni.enc | 8 +- fonts/xcharter/enc/xch_dbdfpx.enc | 4 +- fonts/xcharter/enc/xch_dcwqct.enc | 4 +- fonts/xcharter/enc/xch_dwd75d.enc | 11 +- fonts/xcharter/enc/xch_e3nxtd.enc | 14 +- fonts/xcharter/enc/xch_erwtw3.enc | 4 +- fonts/xcharter/enc/xch_evj3rb.enc | 14 +- fonts/xcharter/enc/xch_gb4haz.enc | 8 +- fonts/xcharter/enc/xch_gvbfhh.enc | 4 +- fonts/xcharter/enc/xch_h2xo5a.enc | 12 +- fonts/xcharter/enc/xch_h4dyum.enc | 6 +- fonts/xcharter/enc/xch_hk5uz5.enc | 64 + fonts/xcharter/enc/xch_hnm3ex.enc | 4 +- fonts/xcharter/enc/xch_hrleas.enc | 6 +- fonts/xcharter/enc/xch_imj3v4.enc | 6 +- fonts/xcharter/enc/xch_ivnpe7.enc | 4 +- fonts/xcharter/enc/xch_jg3oo5.enc | 4 +- fonts/xcharter/enc/xch_kivgfk.enc | 8 +- fonts/xcharter/enc/xch_kkifs2.enc | 10 +- fonts/xcharter/enc/xch_l4c4ke.enc | 10 +- fonts/xcharter/enc/xch_l6an6k.enc | 67 + fonts/xcharter/enc/xch_l7jokp.enc | 6 +- fonts/xcharter/enc/xch_lotb2t.enc | 4 +- fonts/xcharter/enc/xch_nxyw3t.enc | 10 +- fonts/xcharter/enc/xch_o6avng.enc | 4 +- fonts/xcharter/enc/xch_og2pus.enc | 6 +- fonts/xcharter/enc/xch_oj27u4.enc | 13 +- fonts/xcharter/enc/xch_opza6q.enc | 4 +- fonts/xcharter/enc/xch_ouuvex.enc | 14 +- fonts/xcharter/enc/xch_ph46id.enc | 6 +- fonts/xcharter/enc/xch_pqp4df.enc | 6 +- fonts/xcharter/enc/xch_q2nwaj.enc | 4 +- fonts/xcharter/enc/xch_qdfne6.enc | 4 +- fonts/xcharter/enc/xch_s3y5jv.enc | 6 +- fonts/xcharter/enc/xch_sbtai3.enc | 63 - fonts/xcharter/enc/xch_sbuybh.enc | 8 +- fonts/xcharter/enc/xch_tis6bf.enc | 6 +- fonts/xcharter/enc/xch_tkkgpv.enc | 64 - fonts/xcharter/enc/xch_ukw3hq.enc | 7 +- fonts/xcharter/enc/xch_uoo6px.enc | 4 +- fonts/xcharter/enc/xch_uv5z4v.enc | 4 +- fonts/xcharter/enc/xch_uy5hgr.enc | 4 +- fonts/xcharter/enc/xch_v6llfb.enc | 7 +- fonts/xcharter/enc/xch_vtvjjk.enc | 6 +- fonts/xcharter/enc/xch_vv7waw.enc | 10 +- fonts/xcharter/enc/xch_wi6ykn.enc | 8 +- fonts/xcharter/enc/xch_wiwj7n.enc | 12 +- fonts/xcharter/enc/xch_wizqmm.enc | 10 +- fonts/xcharter/enc/xch_wmw2bj.enc | 63 - fonts/xcharter/enc/xch_wqeam3.enc | 10 +- fonts/xcharter/enc/xch_wwsmtw.enc | 4 +- fonts/xcharter/enc/xch_x25wg5.enc | 6 +- fonts/xcharter/enc/xch_xmfb6b.enc | 10 +- fonts/xcharter/enc/xch_xqcxen.enc | 6 +- fonts/xcharter/enc/xch_ybxeq6.enc | 4 +- fonts/xcharter/enc/xch_ykltyo.enc | 67 + fonts/xcharter/enc/xch_yrgi2d.enc | 65 + fonts/xcharter/enc/xch_yz7cd7.enc | 4 +- fonts/xcharter/map/XCharter.map | 234 +- fonts/xcharter/tex/T2ASRBXCharter-Sup.fd | 91 + fonts/xcharter/tex/T2ASRBXCharter-TLF.fd | 151 + fonts/xcharter/tex/T2ASRBXCharter-TOsF.fd | 151 + fonts/xcharter/tex/TS1XCharter-TLF.fd | 18 +- fonts/xcharter/tex/TS1XCharter-TOsF.fd | 18 +- fonts/xcharter/tex/newtx-xcharter-subs.tex | 17 + fonts/xcharter/tfm/XCharter-Bold-sup-t2a--base.tfm | Bin 0 -> 1836 bytes fonts/xcharter/tfm/XCharter-Bold-sup-t2a.tfm | Bin 0 -> 1840 bytes .../tfm/XCharter-Bold-sup-t2asrb--base.tfm | Bin 0 -> 1836 bytes fonts/xcharter/tfm/XCharter-Bold-sup-t2asrb.tfm | Bin 0 -> 1840 bytes .../tfm/XCharter-Bold-tlf-sc-t2a--base.tfm | Bin 0 -> 1844 bytes fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2a.tfm | Bin 0 -> 8712 bytes .../tfm/XCharter-Bold-tlf-sc-t2asrb--base.tfm | Bin 0 -> 1848 bytes fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2asrb.tfm | Bin 0 -> 8704 bytes fonts/xcharter/tfm/XCharter-Bold-tlf-t2a--base.tfm | Bin 1820 -> 1832 bytes fonts/xcharter/tfm/XCharter-Bold-tlf-t2a.tfm | Bin 8444 -> 8456 bytes .../tfm/XCharter-Bold-tlf-t2asrb--base.tfm | Bin 1820 -> 1832 bytes fonts/xcharter/tfm/XCharter-Bold-tlf-t2asrb.tfm | Bin 8436 -> 8448 bytes .../tfm/XCharter-Bold-tosf-sc-t2a--base.tfm | Bin 0 -> 1868 bytes fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2a.tfm | Bin 0 -> 8736 bytes .../tfm/XCharter-Bold-tosf-sc-t2asrb--base.tfm | Bin 0 -> 1872 bytes .../xcharter/tfm/XCharter-Bold-tosf-sc-t2asrb.tfm | Bin 0 -> 8728 bytes .../xcharter/tfm/XCharter-Bold-tosf-t2a--base.tfm | Bin 0 -> 1868 bytes fonts/xcharter/tfm/XCharter-Bold-tosf-t2a.tfm | Bin 0 -> 8492 bytes .../tfm/XCharter-Bold-tosf-t2asrb--base.tfm | Bin 0 -> 1868 bytes fonts/xcharter/tfm/XCharter-Bold-tosf-t2asrb.tfm | Bin 0 -> 8484 bytes .../tfm/XCharter-BoldSlanted-sup-t2a--base.tfm | Bin 0 -> 2088 bytes .../xcharter/tfm/XCharter-BoldSlanted-sup-t2a.tfm | Bin 0 -> 2092 bytes .../tfm/XCharter-BoldSlanted-sup-t2asrb--base.tfm | Bin 0 -> 2088 bytes .../tfm/XCharter-BoldSlanted-sup-t2asrb.tfm | Bin 0 -> 2092 bytes .../tfm/XCharter-BoldSlanted-tlf-sc-t2a--base.tfm | Bin 0 -> 2116 bytes .../tfm/XCharter-BoldSlanted-tlf-sc-t2a.tfm | Bin 0 -> 8324 bytes .../XCharter-BoldSlanted-tlf-sc-t2asrb--base.tfm | Bin 0 -> 2120 bytes .../tfm/XCharter-BoldSlanted-tlf-sc-t2asrb.tfm | Bin 0 -> 8316 bytes .../tfm/XCharter-BoldSlanted-tlf-t2a--base.tfm | Bin 2072 -> 2084 bytes .../xcharter/tfm/XCharter-BoldSlanted-tlf-t2a.tfm | Bin 8120 -> 8136 bytes .../tfm/XCharter-BoldSlanted-tlf-t2asrb--base.tfm | Bin 2072 -> 2084 bytes .../tfm/XCharter-BoldSlanted-tlf-t2asrb.tfm | Bin 8112 -> 8128 bytes .../tfm/XCharter-BoldSlanted-tosf-sc-t2a--base.tfm | Bin 0 -> 2132 bytes .../tfm/XCharter-BoldSlanted-tosf-sc-t2a.tfm | Bin 0 -> 8340 bytes .../XCharter-BoldSlanted-tosf-sc-t2asrb--base.tfm | Bin 0 -> 2136 bytes .../tfm/XCharter-BoldSlanted-tosf-sc-t2asrb.tfm | Bin 0 -> 8332 bytes .../tfm/XCharter-BoldSlanted-tosf-t2a--base.tfm | Bin 0 -> 2112 bytes .../xcharter/tfm/XCharter-BoldSlanted-tosf-t2a.tfm | Bin 0 -> 8164 bytes .../tfm/XCharter-BoldSlanted-tosf-t2asrb--base.tfm | Bin 0 -> 2112 bytes .../tfm/XCharter-BoldSlanted-tosf-t2asrb.tfm | Bin 0 -> 8156 bytes .../xcharter/tfm/XCharter-Italic-sup-t2a--base.tfm | Bin 0 -> 1912 bytes fonts/xcharter/tfm/XCharter-Italic-sup-t2a.tfm | Bin 0 -> 1916 bytes .../tfm/XCharter-Italic-sup-t2asrb--base.tfm | Bin 0 -> 1908 bytes fonts/xcharter/tfm/XCharter-Italic-sup-t2asrb.tfm | Bin 0 -> 1912 bytes .../tfm/XCharter-Italic-tlf-sc-t2a--base.tfm | Bin 0 -> 1952 bytes fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2a.tfm | Bin 0 -> 8700 bytes .../tfm/XCharter-Italic-tlf-sc-t2asrb--base.tfm | Bin 0 -> 1940 bytes .../xcharter/tfm/XCharter-Italic-tlf-sc-t2asrb.tfm | Bin 0 -> 8672 bytes .../xcharter/tfm/XCharter-Italic-tlf-t2a--base.tfm | Bin 1892 -> 1908 bytes fonts/xcharter/tfm/XCharter-Italic-tlf-t2a.tfm | Bin 8136 -> 8152 bytes .../tfm/XCharter-Italic-tlf-t2asrb--base.tfm | Bin 1888 -> 1904 bytes fonts/xcharter/tfm/XCharter-Italic-tlf-t2asrb.tfm | Bin 8116 -> 8132 bytes .../tfm/XCharter-Italic-tosf-sc-t2a--base.tfm | Bin 0 -> 1976 bytes fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2a.tfm | Bin 0 -> 8724 bytes .../tfm/XCharter-Italic-tosf-sc-t2asrb--base.tfm | Bin 0 -> 1968 bytes .../tfm/XCharter-Italic-tosf-sc-t2asrb.tfm | Bin 0 -> 8700 bytes .../tfm/XCharter-Italic-tosf-t2a--base.tfm | Bin 0 -> 1940 bytes fonts/xcharter/tfm/XCharter-Italic-tosf-t2a.tfm | Bin 0 -> 8184 bytes .../tfm/XCharter-Italic-tosf-t2asrb--base.tfm | Bin 0 -> 1936 bytes fonts/xcharter/tfm/XCharter-Italic-tosf-t2asrb.tfm | Bin 0 -> 8164 bytes .../tfm/XCharter-Slanted-sup-t2a--base.tfm | Bin 0 -> 2112 bytes fonts/xcharter/tfm/XCharter-Slanted-sup-t2a.tfm | Bin 0 -> 2116 bytes .../tfm/XCharter-Slanted-sup-t2asrb--base.tfm | Bin 0 -> 2112 bytes fonts/xcharter/tfm/XCharter-Slanted-sup-t2asrb.tfm | Bin 0 -> 2116 bytes .../tfm/XCharter-Slanted-tlf-sc-t2a--base.tfm | Bin 0 -> 2100 bytes fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2a.tfm | Bin 0 -> 8680 bytes .../tfm/XCharter-Slanted-tlf-sc-t2asrb--base.tfm | Bin 0 -> 2100 bytes .../tfm/XCharter-Slanted-tlf-sc-t2asrb.tfm | Bin 0 -> 8676 bytes .../tfm/XCharter-Slanted-tlf-t2a--base.tfm | Bin 2092 -> 2104 bytes fonts/xcharter/tfm/XCharter-Slanted-tlf-t2a.tfm | Bin 8244 -> 8260 bytes .../tfm/XCharter-Slanted-tlf-t2asrb--base.tfm | Bin 2092 -> 2104 bytes fonts/xcharter/tfm/XCharter-Slanted-tlf-t2asrb.tfm | Bin 8236 -> 8252 bytes .../tfm/XCharter-Slanted-tosf-sc-t2a--base.tfm | Bin 0 -> 2128 bytes .../xcharter/tfm/XCharter-Slanted-tosf-sc-t2a.tfm | Bin 0 -> 8708 bytes .../tfm/XCharter-Slanted-tosf-sc-t2asrb--base.tfm | Bin 0 -> 2128 bytes .../tfm/XCharter-Slanted-tosf-sc-t2asrb.tfm | Bin 0 -> 8704 bytes .../tfm/XCharter-Slanted-tosf-t2a--base.tfm | Bin 0 -> 2132 bytes fonts/xcharter/tfm/XCharter-Slanted-tosf-t2a.tfm | Bin 0 -> 8288 bytes .../tfm/XCharter-Slanted-tosf-t2asrb--base.tfm | Bin 0 -> 2132 bytes .../xcharter/tfm/XCharter-Slanted-tosf-t2asrb.tfm | Bin 0 -> 8280 bytes .../tfm/XCharter1-Bold-tosf-sc-t2a--base.tfm | Bin 0 -> 1860 bytes fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2a.tfm | Bin 0 -> 8684 bytes .../tfm/XCharter1-Bold-tosf-sc-t2asrb--base.tfm | Bin 0 -> 1864 bytes .../xcharter/tfm/XCharter1-Bold-tosf-sc-t2asrb.tfm | Bin 0 -> 8676 bytes .../xcharter/tfm/XCharter1-Bold-tosf-t2a--base.tfm | Bin 0 -> 1860 bytes fonts/xcharter/tfm/XCharter1-Bold-tosf-t2a.tfm | Bin 0 -> 8540 bytes .../tfm/XCharter1-Bold-tosf-t2asrb--base.tfm | Bin 0 -> 1860 bytes fonts/xcharter/tfm/XCharter1-Bold-tosf-t2asrb.tfm | Bin 0 -> 8532 bytes fonts/xcharter/tfm/XCharter1-Bold-ts1--base.tfm | Bin 0 -> 1400 bytes fonts/xcharter/tfm/XCharter1-Bold-ts1.tfm | Bin 0 -> 1432 bytes .../tfm/XCharter1-BoldItalic-ts1--base.tfm | Bin 0 -> 1452 bytes fonts/xcharter/tfm/XCharter1-BoldItalic-ts1.tfm | Bin 0 -> 1484 bytes .../XCharter1-BoldSlanted-tosf-sc-t2a--base.tfm | Bin 0 -> 2124 bytes .../tfm/XCharter1-BoldSlanted-tosf-sc-t2a.tfm | Bin 0 -> 8284 bytes .../XCharter1-BoldSlanted-tosf-sc-t2asrb--base.tfm | Bin 0 -> 2128 bytes .../tfm/XCharter1-BoldSlanted-tosf-sc-t2asrb.tfm | Bin 0 -> 8276 bytes .../tfm/XCharter1-BoldSlanted-tosf-t2a--base.tfm | Bin 0 -> 2104 bytes .../tfm/XCharter1-BoldSlanted-tosf-t2a.tfm | Bin 0 -> 8208 bytes .../XCharter1-BoldSlanted-tosf-t2asrb--base.tfm | Bin 0 -> 2104 bytes .../tfm/XCharter1-BoldSlanted-tosf-t2asrb.tfm | Bin 0 -> 8200 bytes .../tfm/XCharter1-BoldSlanted-ts1--base.tfm | Bin 0 -> 1540 bytes fonts/xcharter/tfm/XCharter1-BoldSlanted-ts1.tfm | Bin 0 -> 1568 bytes .../tfm/XCharter1-Italic-tosf-sc-t2a--base.tfm | Bin 0 -> 1968 bytes .../xcharter/tfm/XCharter1-Italic-tosf-sc-t2a.tfm | Bin 0 -> 8664 bytes .../tfm/XCharter1-Italic-tosf-sc-t2asrb--base.tfm | Bin 0 -> 1960 bytes .../tfm/XCharter1-Italic-tosf-sc-t2asrb.tfm | Bin 0 -> 8640 bytes .../tfm/XCharter1-Italic-tosf-t2a--base.tfm | Bin 0 -> 1928 bytes fonts/xcharter/tfm/XCharter1-Italic-tosf-t2a.tfm | Bin 0 -> 8192 bytes .../tfm/XCharter1-Italic-tosf-t2asrb--base.tfm | Bin 0 -> 1924 bytes .../xcharter/tfm/XCharter1-Italic-tosf-t2asrb.tfm | Bin 0 -> 8172 bytes fonts/xcharter/tfm/XCharter1-Italic-ts1--base.tfm | Bin 0 -> 1436 bytes fonts/xcharter/tfm/XCharter1-Italic-ts1.tfm | Bin 0 -> 1468 bytes fonts/xcharter/tfm/XCharter1-Roman-ts1--base.tfm | Bin 0 -> 1516 bytes fonts/xcharter/tfm/XCharter1-Roman-ts1.tfm | Bin 0 -> 1544 bytes .../tfm/XCharter1-Slanted-tosf-sc-t2a--base.tfm | Bin 0 -> 2120 bytes .../xcharter/tfm/XCharter1-Slanted-tosf-sc-t2a.tfm | Bin 0 -> 8628 bytes .../tfm/XCharter1-Slanted-tosf-sc-t2asrb--base.tfm | Bin 0 -> 2120 bytes .../tfm/XCharter1-Slanted-tosf-sc-t2asrb.tfm | Bin 0 -> 8624 bytes .../tfm/XCharter1-Slanted-tosf-t2a--base.tfm | Bin 0 -> 2124 bytes fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2a.tfm | Bin 0 -> 8296 bytes .../tfm/XCharter1-Slanted-tosf-t2asrb--base.tfm | Bin 0 -> 2124 bytes .../xcharter/tfm/XCharter1-Slanted-tosf-t2asrb.tfm | Bin 0 -> 8288 bytes fonts/xcharter/tfm/XCharter1-Slanted-ts1--base.tfm | Bin 0 -> 1548 bytes fonts/xcharter/tfm/XCharter1-Slanted-ts1.tfm | Bin 0 -> 1576 bytes fonts/xcharter/vf/XCharter-Bold-sup-t2a.vf | Bin 0 -> 1512 bytes fonts/xcharter/vf/XCharter-Bold-sup-t2asrb.vf | Bin 0 -> 1516 bytes fonts/xcharter/vf/XCharter-Bold-tlf-sc-t2a.vf | Bin 0 -> 1516 bytes fonts/xcharter/vf/XCharter-Bold-tlf-sc-t2asrb.vf | Bin 0 -> 1520 bytes fonts/xcharter/vf/XCharter-Bold-tlf-t2a.vf | Bin 1512 -> 1536 bytes fonts/xcharter/vf/XCharter-Bold-tlf-t2asrb.vf | Bin 1516 -> 1540 bytes fonts/xcharter/vf/XCharter-Bold-tosf-sc-t2a.vf | Bin 0 -> 1516 bytes fonts/xcharter/vf/XCharter-Bold-tosf-sc-t2asrb.vf | Bin 0 -> 1520 bytes fonts/xcharter/vf/XCharter-Bold-tosf-t2a.vf | Bin 0 -> 1540 bytes fonts/xcharter/vf/XCharter-Bold-tosf-t2asrb.vf | Bin 0 -> 1540 bytes fonts/xcharter/vf/XCharter-BoldSlanted-sup-t2a.vf | Bin 0 -> 1520 bytes .../xcharter/vf/XCharter-BoldSlanted-sup-t2asrb.vf | Bin 0 -> 1524 bytes .../xcharter/vf/XCharter-BoldSlanted-tlf-sc-t2a.vf | Bin 0 -> 1524 bytes .../vf/XCharter-BoldSlanted-tlf-sc-t2asrb.vf | Bin 0 -> 1528 bytes fonts/xcharter/vf/XCharter-BoldSlanted-tlf-t2a.vf | Bin 1520 -> 1544 bytes .../xcharter/vf/XCharter-BoldSlanted-tlf-t2asrb.vf | Bin 1524 -> 1548 bytes .../vf/XCharter-BoldSlanted-tosf-sc-t2a.vf | Bin 0 -> 1524 bytes .../vf/XCharter-BoldSlanted-tosf-sc-t2asrb.vf | Bin 0 -> 1528 bytes fonts/xcharter/vf/XCharter-BoldSlanted-tosf-t2a.vf | Bin 0 -> 1544 bytes .../vf/XCharter-BoldSlanted-tosf-t2asrb.vf | Bin 0 -> 1548 bytes fonts/xcharter/vf/XCharter-Italic-sup-t2a.vf | Bin 0 -> 1516 bytes fonts/xcharter/vf/XCharter-Italic-sup-t2asrb.vf | Bin 0 -> 1520 bytes fonts/xcharter/vf/XCharter-Italic-tlf-sc-t2a.vf | Bin 0 -> 1520 bytes fonts/xcharter/vf/XCharter-Italic-tlf-sc-t2asrb.vf | Bin 0 -> 1520 bytes fonts/xcharter/vf/XCharter-Italic-tlf-t2a.vf | Bin 1516 -> 1540 bytes fonts/xcharter/vf/XCharter-Italic-tlf-t2asrb.vf | Bin 1520 -> 1544 bytes fonts/xcharter/vf/XCharter-Italic-tosf-sc-t2a.vf | Bin 0 -> 1520 bytes .../xcharter/vf/XCharter-Italic-tosf-sc-t2asrb.vf | Bin 0 -> 1524 bytes fonts/xcharter/vf/XCharter-Italic-tosf-t2a.vf | Bin 0 -> 1540 bytes fonts/xcharter/vf/XCharter-Italic-tosf-t2asrb.vf | Bin 0 -> 1544 bytes fonts/xcharter/vf/XCharter-Slanted-sup-t2a.vf | Bin 0 -> 1516 bytes fonts/xcharter/vf/XCharter-Slanted-sup-t2asrb.vf | Bin 0 -> 1520 bytes fonts/xcharter/vf/XCharter-Slanted-tlf-sc-t2a.vf | Bin 0 -> 1520 bytes .../xcharter/vf/XCharter-Slanted-tlf-sc-t2asrb.vf | Bin 0 -> 1524 bytes fonts/xcharter/vf/XCharter-Slanted-tlf-t2a.vf | Bin 1516 -> 1540 bytes fonts/xcharter/vf/XCharter-Slanted-tlf-t2asrb.vf | Bin 1520 -> 1544 bytes fonts/xcharter/vf/XCharter-Slanted-tosf-sc-t2a.vf | Bin 0 -> 1520 bytes .../xcharter/vf/XCharter-Slanted-tosf-sc-t2asrb.vf | Bin 0 -> 1524 bytes fonts/xcharter/vf/XCharter-Slanted-tosf-t2a.vf | Bin 0 -> 1540 bytes fonts/xcharter/vf/XCharter-Slanted-tosf-t2asrb.vf | Bin 0 -> 1544 bytes fonts/xcharter/vf/XCharter1-Bold-tosf-sc-t2a.vf | Bin 0 -> 1624 bytes fonts/xcharter/vf/XCharter1-Bold-tosf-sc-t2asrb.vf | Bin 0 -> 1632 bytes fonts/xcharter/vf/XCharter1-Bold-tosf-t2a.vf | Bin 0 -> 1644 bytes fonts/xcharter/vf/XCharter1-Bold-tosf-t2asrb.vf | Bin 0 -> 1648 bytes fonts/xcharter/vf/XCharter1-Bold-ts1.vf | Bin 0 -> 740 bytes fonts/xcharter/vf/XCharter1-BoldItalic-ts1.vf | Bin 0 -> 752 bytes .../vf/XCharter1-BoldSlanted-tosf-sc-t2a.vf | Bin 0 -> 1648 bytes .../vf/XCharter1-BoldSlanted-tosf-sc-t2asrb.vf | Bin 0 -> 1652 bytes .../xcharter/vf/XCharter1-BoldSlanted-tosf-t2a.vf | Bin 0 -> 1664 bytes .../vf/XCharter1-BoldSlanted-tosf-t2asrb.vf | Bin 0 -> 1672 bytes fonts/xcharter/vf/XCharter1-BoldSlanted-ts1.vf | Bin 0 -> 752 bytes fonts/xcharter/vf/XCharter1-Italic-tosf-sc-t2a.vf | Bin 0 -> 1632 bytes .../xcharter/vf/XCharter1-Italic-tosf-sc-t2asrb.vf | Bin 0 -> 1636 bytes fonts/xcharter/vf/XCharter1-Italic-tosf-t2a.vf | Bin 0 -> 1648 bytes fonts/xcharter/vf/XCharter1-Italic-tosf-t2asrb.vf | Bin 0 -> 1656 bytes fonts/xcharter/vf/XCharter1-Italic-ts1.vf | Bin 0 -> 744 bytes fonts/xcharter/vf/XCharter1-Roman-ts1.vf | Bin 0 -> 1004 bytes fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-t2a.vf | Bin 0 -> 1636 bytes .../vf/XCharter1-Slanted-tosf-sc-t2asrb.vf | Bin 0 -> 1640 bytes fonts/xcharter/vf/XCharter1-Slanted-tosf-t2a.vf | Bin 0 -> 1652 bytes fonts/xcharter/vf/XCharter1-Slanted-tosf-t2asrb.vf | Bin 0 -> 1660 bytes fonts/xcharter/vf/XCharter1-Slanted-ts1.vf | Bin 0 -> 740 bytes fonts/xcharter/vf/zchmi0.vf | Bin 1228 -> 2360 bytes graphics/asymptote/ChangeLog | 546 ++ graphics/asymptote/Delaunay.cc | 12 +- graphics/asymptote/GUI/icons_rc.py | 3654 +++++----- graphics/asymptote/GUI/xasy2asy.py | 13 +- graphics/asymptote/Makefile.in | 5 +- graphics/asymptote/ReleaseNotes | 24 +- graphics/asymptote/access.cc | 10 +- graphics/asymptote/access.h | 14 +- graphics/asymptote/align.h | 12 +- graphics/asymptote/angle.h | 6 +- graphics/asymptote/application.cc | 122 +- graphics/asymptote/application.h | 10 +- graphics/asymptote/array.cc | 2 +- graphics/asymptote/array.h | 14 +- graphics/asymptote/arrayop.h | 46 +- graphics/asymptote/asy-keywords.el | 2 +- graphics/asymptote/asy.list | 118 +- graphics/asymptote/asymptote.spec | 2 +- graphics/asymptote/base/animation.asy | 14 +- graphics/asymptote/base/babel.asy | 2 +- graphics/asymptote/base/bezulate.asy | 62 +- graphics/asymptote/base/binarytree.asy | 100 +- graphics/asymptote/base/bsp.asy | 48 +- graphics/asymptote/base/colormap.asy | 7034 ++++++++++---------- graphics/asymptote/base/contour.asy | 74 +- graphics/asymptote/base/contour3.asy | 54 +- graphics/asymptote/base/embed.asy | 10 +- graphics/asymptote/base/external.asy | 4 +- graphics/asymptote/base/feynman.asy | 16 +- graphics/asymptote/base/flowchart.asy | 200 +- graphics/asymptote/base/geometry.asy | 516 +- graphics/asymptote/base/graph.asy | 266 +- graphics/asymptote/base/graph3.asy | 200 +- graphics/asymptote/base/graph_splinetype.asy | 30 +- graphics/asymptote/base/grid3.asy | 6 +- graphics/asymptote/base/interpolate.asy | 8 +- graphics/asymptote/base/labelpath3.asy | 8 +- graphics/asymptote/base/latin1.asy | 2 - graphics/asymptote/base/lmfit.asy | 76 +- graphics/asymptote/base/math.asy | 16 +- graphics/asymptote/base/metapost.asy | 4 +- graphics/asymptote/base/obj.asy | 2 +- graphics/asymptote/base/ode.asy | 62 +- graphics/asymptote/base/palette.asy | 70 +- graphics/asymptote/base/patterns.asy | 4 +- graphics/asymptote/base/plain.asy | 12 +- graphics/asymptote/base/plain_Label.asy | 86 +- graphics/asymptote/base/plain_arcs.asy | 4 +- graphics/asymptote/base/plain_arrows.asy | 308 +- graphics/asymptote/base/plain_bounds.asy | 20 +- graphics/asymptote/base/three.asy | 2 +- graphics/asymptote/base/unicode.asy | 2 - graphics/asymptote/base/webgl/asygl.js | 4 +- graphics/asymptote/bbox.h | 32 +- graphics/asymptote/bbox3.h | 30 +- graphics/asymptote/beziercurve.cc | 12 +- graphics/asymptote/beziercurve.h | 16 +- graphics/asymptote/bezierpatch.cc | 637 +- graphics/asymptote/bezierpatch.h | 26 +- .../asymptote/binaries/i386-windows/texlive/README | 2 +- .../asymptote/binaries/x86_64-windows/cygwin1.dll | Bin 3339661 -> 3541856 bytes .../binaries/x86_64-windows/texlive/README | 2 +- graphics/asymptote/build-scripts/HOWTO-MSWindows | 18 +- graphics/asymptote/build-scripts/README-binaries | 2 +- graphics/asymptote/build-scripts/asy-format.el | 52 + graphics/asymptote/build-scripts/asy-indent.el | 6 + graphics/asymptote/build-scripts/build-asygl | 2 +- .../asymptote/build-scripts/build-asymptote.dos | 2 + graphics/asymptote/build-scripts/cc-format.el | 52 + graphics/asymptote/build-scripts/cc-indent.el | 6 + graphics/asymptote/build-scripts/run-in-indent.el | 6 + graphics/asymptote/builtin.cc | 148 +- graphics/asymptote/builtin.h | 8 +- graphics/asymptote/callable.h | 4 +- graphics/asymptote/camperror.cc | 10 +- graphics/asymptote/camperror.h | 4 +- graphics/asymptote/castop.h | 21 +- graphics/asymptote/cc-mode2.el | 38 + graphics/asymptote/coder.cc | 14 +- graphics/asymptote/coder.h | 16 +- graphics/asymptote/common.h | 13 +- graphics/asymptote/config.h.in | 3 + graphics/asymptote/configure | 67 +- graphics/asymptote/configure.ac | 5 +- graphics/asymptote/constructor.cc | 6 +- graphics/asymptote/dec.cc | 50 +- graphics/asymptote/dec.h | 28 +- graphics/asymptote/doc/CAD.pdf | Bin 186207 -> 186116 bytes graphics/asymptote/doc/CDlabel.asy | 2 +- graphics/asymptote/doc/FAQ/asy-faq.bfnn | 42 +- graphics/asymptote/doc/FAQ/asy-faq.info | 44 +- graphics/asymptote/doc/HermiteSpline.asy | 12 +- graphics/asymptote/doc/TeXShopAndAsymptote.pdf | Bin 76935 -> 77144 bytes graphics/asymptote/doc/asy-latex.pdf | Bin 194595 -> 194604 bytes graphics/asymptote/doc/asy.1 | 6 + graphics/asymptote/doc/asyRefCard.pdf | Bin 121144 -> 121144 bytes graphics/asymptote/doc/asymptote.pdf | Bin 1282789 -> 1284725 bytes graphics/asymptote/doc/asymptote.texi | 252 +- graphics/asymptote/doc/diatom.asy | 12 +- graphics/asymptote/doc/elliptic.asy | 4 +- graphics/asymptote/doc/flowchartdemo.asy | 4 +- graphics/asymptote/doc/icon.asy | 4 +- graphics/asymptote/doc/imagecontour.asy | 2 +- graphics/asymptote/doc/leastsquares.asy | 12 +- graphics/asymptote/doc/legend.asy | 26 +- graphics/asymptote/doc/linetype.asy | 2 +- graphics/asymptote/doc/logo.asy | 4 +- graphics/asymptote/doc/markers1.asy | 2 +- graphics/asymptote/doc/png/asymptote.info | 1279 ++-- graphics/asymptote/doc/secondaryaxis.asy | 2 +- graphics/asymptote/drawclipbegin.h | 20 +- graphics/asymptote/drawclipend.h | 16 +- graphics/asymptote/drawelement.h | 132 +- graphics/asymptote/drawfill.cc | 38 +- graphics/asymptote/drawfill.h | 100 +- graphics/asymptote/drawgrestore.h | 2 +- graphics/asymptote/drawgroup.h | 34 +- graphics/asymptote/drawgsave.h | 2 +- graphics/asymptote/drawimage.h | 14 +- graphics/asymptote/drawlabel.cc | 54 +- graphics/asymptote/drawlabel.h | 30 +- graphics/asymptote/drawlayer.h | 4 +- graphics/asymptote/drawpath.cc | 42 +- graphics/asymptote/drawpath.h | 6 +- graphics/asymptote/drawpath3.cc | 56 +- graphics/asymptote/drawpath3.h | 76 +- graphics/asymptote/drawsurface.cc | 162 +- graphics/asymptote/drawsurface.h | 228 +- graphics/asymptote/drawverbatim.h | 16 +- graphics/asymptote/entry.cc | 264 +- graphics/asymptote/entry.h | 53 +- graphics/asymptote/env.cc | 10 +- graphics/asymptote/env.h | 6 +- graphics/asymptote/errormsg.cc | 30 +- graphics/asymptote/errormsg.h | 46 +- graphics/asymptote/examples/100d.pdb1 | 535 ++ graphics/asymptote/examples/1overx.asy | 2 +- graphics/asymptote/examples/BezierPatch.asy | 6 +- graphics/asymptote/examples/BezierSurface.asy | 16 +- graphics/asymptote/examples/Klein.asy | 11 +- graphics/asymptote/examples/NURBScurve.asy | 15 +- graphics/asymptote/examples/NURBSsphere.asy | 28 +- graphics/asymptote/examples/NURBSsurface.asy | 80 +- graphics/asymptote/examples/RiemannSphere.asy | 6 +- graphics/asymptote/examples/RiemannSurface.asy | 6 +- graphics/asymptote/examples/RiemannSurfaceRoot.asy | 4 +- graphics/asymptote/examples/SierpinskiGasket.asy | 14 +- graphics/asymptote/examples/SierpinskiSponge.asy | 56 +- graphics/asymptote/examples/bars3.asy | 2 +- graphics/asymptote/examples/centroidfg.asy | 6 +- graphics/asymptote/examples/colorpatch.asy | 6 +- graphics/asymptote/examples/colorplanes.asy | 2 +- graphics/asymptote/examples/conicurv.asy | 4 +- graphics/asymptote/examples/contextfonts.asy | 2 +- graphics/asymptote/examples/controlsystem.asy | 4 +- graphics/asymptote/examples/cosaddition.asy | 2 +- graphics/asymptote/examples/cpkcolors.asy | 472 +- graphics/asymptote/examples/curvedlabel3.asy | 2 +- graphics/asymptote/examples/dimension.asy | 24 +- graphics/asymptote/examples/electromagnetic.asy | 56 +- graphics/asymptote/examples/equilchord.asy | 2 +- graphics/asymptote/examples/fequlogo.asy | 4 +- graphics/asymptote/examples/filesurface.asy | 12 +- graphics/asymptote/examples/fillcontour.asy | 2 +- graphics/asymptote/examples/fin.asy | 44 +- graphics/asymptote/examples/floatingdisk.asy | 50 +- graphics/asymptote/examples/floor.asy | 4 +- graphics/asymptote/examples/gamma.asy | 2 +- graphics/asymptote/examples/gamma3.asy | 2 +- graphics/asymptote/examples/genustwo.asy | 14 +- graphics/asymptote/examples/imagehistogram.asy | 58 +- graphics/asymptote/examples/integraltest.asy | 12 +- graphics/asymptote/examples/interpolate1.asy | 6 +- graphics/asymptote/examples/jump.asy | 4 +- graphics/asymptote/examples/label3zoom.asy | 16 +- graphics/asymptote/examples/linearregression.asy | 8 +- graphics/asymptote/examples/lmfit1.asy | 6 +- graphics/asymptote/examples/logo3.asy | 21 +- graphics/asymptote/examples/lowupint.asy | 4 +- graphics/asymptote/examples/markregular.asy | 10 +- graphics/asymptote/examples/mergeExample.asy | 18 +- graphics/asymptote/examples/mosaic.asy | 26 +- graphics/asymptote/examples/mosquito.asy | 4 +- graphics/asymptote/examples/near_earth.asy | 4 +- graphics/asymptote/examples/oneoverx.asy | 2 +- graphics/asymptote/examples/p-orbital.asy | 31 - graphics/asymptote/examples/pOrbital.asy | 31 + .../asymptote/examples/pathintersectsurface.asy | 11 +- graphics/asymptote/examples/pdb.asy | 21 +- graphics/asymptote/examples/pipes.asy | 56 +- graphics/asymptote/examples/poster.asy | 2 +- graphics/asymptote/examples/projectrevolution.asy | 22 +- graphics/asymptote/examples/rainbow.asy | 2 +- graphics/asymptote/examples/roll.asy | 2 +- graphics/asymptote/examples/roundpath.asy | 2 +- graphics/asymptote/examples/shadestroke.asy | 2 +- graphics/asymptote/examples/sinxlex.asy | 4 +- graphics/asymptote/examples/slope.asy | 22 +- graphics/asymptote/examples/soccerball.asy | 57 +- graphics/asymptote/examples/spectrum.asy | 2 +- graphics/asymptote/examples/sphereskeleton.asy | 6 +- graphics/asymptote/examples/spiral3.asy | 4 +- graphics/asymptote/examples/spline.asy | 20 +- graphics/asymptote/examples/splitpatch.asy | 32 +- graphics/asymptote/examples/spring.asy | 6 +- graphics/asymptote/examples/stereoscopic.asy | 4 +- graphics/asymptote/examples/strokeshade.asy | 2 +- graphics/asymptote/examples/teapot.asy | 100 +- graphics/asymptote/examples/thermodynamics.asy | 100 +- graphics/asymptote/examples/torus.asy | 6 +- graphics/asymptote/examples/triads.asy | 10 +- graphics/asymptote/examples/triangle.asy | 2 +- .../asymptote/examples/truncatedIcosahedron.asy | 29 +- graphics/asymptote/examples/tvgen.asy | 384 +- graphics/asymptote/examples/twistedtubes.asy | 30 +- graphics/asymptote/examples/vertexshading.asy | 6 +- graphics/asymptote/examples/worldmap.asy | 10 +- graphics/asymptote/examples/xstitch.asy | 14 +- graphics/asymptote/examples/xxsq01x-1.asy | 4 +- graphics/asymptote/examples/xxsq01y.asy | 4 +- graphics/asymptote/examples/yingyang.asy | 2 +- graphics/asymptote/exp.cc | 126 +- graphics/asymptote/exp.h | 28 +- graphics/asymptote/fftw++.h | 418 +- graphics/asymptote/fileio.cc | 55 +- graphics/asymptote/fileio.h | 259 +- graphics/asymptote/flatguide.h | 18 +- graphics/asymptote/fpu.h | 8 +- graphics/asymptote/frame.h | 6 +- graphics/asymptote/fundec.cc | 20 +- graphics/asymptote/fundec.h | 6 +- graphics/asymptote/genv.cc | 8 +- graphics/asymptote/glrender.cc | 426 +- graphics/asymptote/glrender.h | 36 +- graphics/asymptote/gsl.cc | 32 +- graphics/asymptote/guide.cc | 20 +- graphics/asymptote/guide.h | 54 +- graphics/asymptote/guideflags.h | 4 +- graphics/asymptote/impdatum.cc | 62 +- graphics/asymptote/inst.h | 6 +- graphics/asymptote/interact.cc | 28 +- graphics/asymptote/interact.h | 4 +- graphics/asymptote/item.h | 94 +- graphics/asymptote/jsfile.cc | 80 +- graphics/asymptote/jsfile.h | 35 +- graphics/asymptote/knot.cc | 12 +- graphics/asymptote/knot.h | 38 +- graphics/asymptote/lexical.h | 6 +- graphics/asymptote/locate.cc | 10 +- graphics/asymptote/main.cc | 40 +- graphics/asymptote/material.h | 28 +- graphics/asymptote/mathop.h | 26 +- graphics/asymptote/memory.h | 26 +- graphics/asymptote/mod.h | 6 +- graphics/asymptote/name.cc | 10 +- graphics/asymptote/name.h | 4 +- graphics/asymptote/newexp.cc | 6 +- graphics/asymptote/newexp.h | 4 +- graphics/asymptote/opcodes.h | 2 +- graphics/asymptote/pair.h | 34 +- graphics/asymptote/parser.cc | 121 +- graphics/asymptote/parser.h | 13 +- graphics/asymptote/path.cc | 174 +- graphics/asymptote/path.h | 74 +- graphics/asymptote/path3.cc | 220 +- graphics/asymptote/path3.h | 64 +- graphics/asymptote/pen.h | 294 +- graphics/asymptote/picture.cc | 288 +- graphics/asymptote/picture.h | 43 +- graphics/asymptote/pipestream.cc | 10 +- graphics/asymptote/pipestream.h | 10 +- graphics/asymptote/policy.h | 4 +- graphics/asymptote/prcfile.h | 4 +- graphics/asymptote/primitives.h | 2 +- graphics/asymptote/process.cc | 38 +- graphics/asymptote/process.h | 22 +- graphics/asymptote/profiler.h | 98 +- graphics/asymptote/program.cc | 10 +- graphics/asymptote/program.h | 2 +- graphics/asymptote/psfile.cc | 192 +- graphics/asymptote/psfile.h | 94 +- graphics/asymptote/record.cc | 6 +- graphics/asymptote/record.h | 6 +- graphics/asymptote/refaccess.cc | 2 +- graphics/asymptote/revision.cc | 2 +- graphics/asymptote/rounding.h | 34 +- graphics/asymptote/runarray.cc | 264 +- graphics/asymptote/runarray.in | 268 +- graphics/asymptote/runbacktrace.in | 2 +- graphics/asymptote/runfile.cc | 58 +- graphics/asymptote/runfile.in | 54 +- graphics/asymptote/runhistory.cc | 74 +- graphics/asymptote/runhistory.in | 44 +- graphics/asymptote/runlabel.cc | 72 +- graphics/asymptote/runlabel.in | 74 +- graphics/asymptote/runmath.cc | 80 +- graphics/asymptote/runmath.in | 108 +- graphics/asymptote/runpair.cc | 16 +- graphics/asymptote/runpair.in | 38 +- graphics/asymptote/runpath.cc | 34 +- graphics/asymptote/runpath.in | 26 +- graphics/asymptote/runpath3d.cc | 8 +- graphics/asymptote/runpath3d.in | 12 +- graphics/asymptote/runpicture.cc | 140 +- graphics/asymptote/runpicture.in | 88 +- graphics/asymptote/runstring.cc | 106 +- graphics/asymptote/runstring.in | 72 +- graphics/asymptote/runsystem.cc | 32 +- graphics/asymptote/runsystem.in | 10 +- graphics/asymptote/runtime.cc | 437 +- graphics/asymptote/runtime.in | 86 +- graphics/asymptote/runtimebase.in | 4 +- graphics/asymptote/runtriple.in | 24 +- graphics/asymptote/seconds.h | 70 +- graphics/asymptote/settings.cc | 260 +- graphics/asymptote/settings.h | 27 +- graphics/asymptote/shaders.cc | 12 +- graphics/asymptote/simpson.cc | 12 +- graphics/asymptote/stack.cc | 122 +- graphics/asymptote/stack.h | 32 +- graphics/asymptote/statistics.h | 12 +- graphics/asymptote/stm.cc | 36 +- graphics/asymptote/stm.h | 8 +- graphics/asymptote/symbol.cc | 14 +- graphics/asymptote/symbol.h | 6 +- graphics/asymptote/texfile.cc | 221 +- graphics/asymptote/texfile.h | 108 +- graphics/asymptote/tr.cc | 528 +- graphics/asymptote/tr.h | 82 +- graphics/asymptote/transform.h | 12 +- graphics/asymptote/triple.h | 70 +- graphics/asymptote/types.cc | 144 +- graphics/asymptote/types.h | 24 +- graphics/asymptote/util.cc | 86 +- graphics/asymptote/util.h | 24 +- graphics/asymptote/varinit.cc | 2 +- graphics/asymptote/varinit.h | 2 +- graphics/asymptote/vm.h | 6 +- graphics/asymptote/wce | 2 +- graphics/asymptote/webgl/gl.js | 171 +- graphics/asymptote/webgl/license | 2 +- graphics/asymptote/xstream.h | 69 +- info/biblio/texbook3.bib | 14 +- info/biblio/texbook3.ltx | 12 +- info/biblio/tugboat.bib | 1490 ++++- info/biblio/tugboat.ltx | 15 +- macros/latex/contrib/hausarbeit-jura/README.md | 38 +- .../contrib/hausarbeit-jura/hausarbeit-jura.dtx | 36 +- .../contrib/hausarbeit-jura/hausarbeit-jura.ins | 2 +- .../contrib/hausarbeit-jura/hausarbeit-jura.pdf | Bin 336866 -> 340891 bytes macros/latex/contrib/mercatormap/README | 2 +- .../contrib/mercatormap/mercatormap-example.tex | 2 +- .../mercatormap/mercatormap.doc.drawing.tex | 4 +- .../mercatormap/mercatormap.doc.examples.tex | 4 +- .../mercatormap/mercatormap.doc.limitations.tex | 3 +- .../mercatormap/mercatormap.doc.maptiles.tex | 96 +- .../contrib/mercatormap/mercatormap.doc.marker.tex | 5 + .../latex/contrib/mercatormap/mercatormap.doc.sty | 12 + .../mercatormap/mercatormap.doc.versionhistory.tex | 19 + macros/latex/contrib/mercatormap/mercatormap.pdf | Bin 26056519 -> 24872307 bytes macros/latex/contrib/mercatormap/mercatormap.sty | 91 +- macros/latex/contrib/mercatormap/mercatormap.tex | 7 +- macros/latex/contrib/mercatormap/mercatorpy.def | 4 +- .../latex/contrib/mercatormap/mercatorsupplier.def | 4 +- support/pkfix-helper/README | 9 +- support/pkfix-helper/encoding-samples.pdf | Bin 364761 -> 364537 bytes support/pkfix-helper/pkfix-helper.1 | 2 +- support/pkfix-helper/pkfix-helper.pdf | Bin 86712 -> 77529 bytes systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm | 6 +- systems/texlive/tlnet/tlpkg/texlive.tlpdb | 255 +- systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 | 2 +- systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 | 2 +- .../texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc | 14 +- systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz | Bin 2212308 -> 2213140 bytes systems/win32/miktex/tm/packages/next/pr.ini | 8 +- systems/win32/miktex/tm/packages/pr.ini | 8 +- systems/win32/w32tex/ChangeLog | 4 + timestamp | 2 +- 695 files changed, 23520 insertions(+), 17252 deletions(-) create mode 100644 fonts/xcharter/enc/xch1_bcg6lk.enc create mode 100644 fonts/xcharter/enc/xch1_bpv7ty.enc create mode 100644 fonts/xcharter/enc/xch1_l6an6k.enc create mode 100644 fonts/xcharter/enc/xch1_ph46id.enc create mode 100644 fonts/xcharter/enc/xch1_pqp4df.enc create mode 100644 fonts/xcharter/enc/xch1_tis6bf.enc create mode 100644 fonts/xcharter/enc/xch1_xqcxen.enc create mode 100644 fonts/xcharter/enc/xch_4siibn.enc create mode 100644 fonts/xcharter/enc/xch_bcg6lk.enc create mode 100644 fonts/xcharter/enc/xch_bpv7ty.enc create mode 100644 fonts/xcharter/enc/xch_hk5uz5.enc create mode 100644 fonts/xcharter/enc/xch_l6an6k.enc delete mode 100644 fonts/xcharter/enc/xch_sbtai3.enc delete mode 100644 fonts/xcharter/enc/xch_tkkgpv.enc delete mode 100644 fonts/xcharter/enc/xch_wmw2bj.enc create mode 100644 fonts/xcharter/enc/xch_ykltyo.enc create mode 100644 fonts/xcharter/enc/xch_yrgi2d.enc create mode 100644 fonts/xcharter/tex/T2ASRBXCharter-Sup.fd create mode 100644 fonts/xcharter/tex/T2ASRBXCharter-TLF.fd create mode 100644 fonts/xcharter/tex/T2ASRBXCharter-TOsF.fd create mode 100644 fonts/xcharter/tex/newtx-xcharter-subs.tex create mode 100644 fonts/xcharter/tfm/XCharter-Bold-sup-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Bold-sup-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Bold-sup-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Bold-sup-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Bold-tosf-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Bold-tosf-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Bold-tosf-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Bold-tosf-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Italic-sup-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Italic-sup-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Italic-sup-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Italic-sup-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Italic-tosf-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Italic-tosf-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Italic-tosf-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Italic-tosf-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Slanted-sup-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Slanted-sup-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Slanted-sup-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Slanted-sup-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Slanted-tosf-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Slanted-tosf-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Slanted-tosf-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter-Slanted-tosf-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Bold-tosf-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Bold-tosf-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Bold-tosf-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Bold-tosf-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Bold-ts1--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Bold-ts1.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-BoldItalic-ts1--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-BoldItalic-ts1.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-BoldSlanted-ts1--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-BoldSlanted-ts1.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Italic-tosf-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Italic-tosf-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Italic-tosf-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Italic-tosf-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Italic-ts1--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Italic-ts1.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Roman-ts1--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Roman-ts1.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2a--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2a.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2asrb--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2asrb.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Slanted-ts1--base.tfm create mode 100644 fonts/xcharter/tfm/XCharter1-Slanted-ts1.tfm create mode 100644 fonts/xcharter/vf/XCharter-Bold-sup-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter-Bold-sup-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter-Bold-tlf-sc-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter-Bold-tlf-sc-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter-Bold-tosf-sc-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter-Bold-tosf-sc-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter-Bold-tosf-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter-Bold-tosf-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter-BoldSlanted-sup-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter-BoldSlanted-sup-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter-BoldSlanted-tosf-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter-BoldSlanted-tosf-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter-Italic-sup-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter-Italic-sup-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter-Italic-tlf-sc-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter-Italic-tlf-sc-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter-Italic-tosf-sc-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter-Italic-tosf-sc-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter-Italic-tosf-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter-Italic-tosf-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter-Slanted-sup-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter-Slanted-sup-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter-Slanted-tlf-sc-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter-Slanted-tlf-sc-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter-Slanted-tosf-sc-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter-Slanted-tosf-sc-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter-Slanted-tosf-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter-Slanted-tosf-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter1-Bold-tosf-sc-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter1-Bold-tosf-sc-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter1-Bold-tosf-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter1-Bold-tosf-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter1-Bold-ts1.vf create mode 100644 fonts/xcharter/vf/XCharter1-BoldItalic-ts1.vf create mode 100644 fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter1-BoldSlanted-ts1.vf create mode 100644 fonts/xcharter/vf/XCharter1-Italic-tosf-sc-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter1-Italic-tosf-sc-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter1-Italic-tosf-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter1-Italic-tosf-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter1-Italic-ts1.vf create mode 100644 fonts/xcharter/vf/XCharter1-Roman-ts1.vf create mode 100644 fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter1-Slanted-tosf-t2a.vf create mode 100644 fonts/xcharter/vf/XCharter1-Slanted-tosf-t2asrb.vf create mode 100644 fonts/xcharter/vf/XCharter1-Slanted-ts1.vf delete mode 100644 graphics/asymptote/base/latin1.asy delete mode 100644 graphics/asymptote/base/unicode.asy create mode 100644 graphics/asymptote/build-scripts/asy-format.el create mode 100644 graphics/asymptote/build-scripts/asy-indent.el create mode 100644 graphics/asymptote/build-scripts/cc-format.el create mode 100644 graphics/asymptote/build-scripts/cc-indent.el create mode 100644 graphics/asymptote/build-scripts/run-in-indent.el create mode 100644 graphics/asymptote/cc-mode2.el create mode 100644 graphics/asymptote/examples/100d.pdb1 delete mode 100644 graphics/asymptote/examples/p-orbital.asy create mode 100644 graphics/asymptote/examples/pOrbital.asy diff --git a/FILES.byname b/FILES.byname index a8d096addb..1586106145 100644 --- a/FILES.byname +++ b/FILES.byname @@ -5003,7 +5003,7 @@ 1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp 1990/10/02 | 812 | dviware/vutex/vaxvms.ins 1990/10/02 | 127576 | dviware/vutex/vutex.web -2020/08/05 | 144736 | FILES.last07days +2020/08/06 | 139987 | FILES.last07days 2018/06/27 | 99883 | fonts/academicons/academicons.pdf 2018/06/27 | 10779 | fonts/academicons/academicons.sty 2018/06/27 | 5774 | fonts/academicons/academicons.tex @@ -126736,131 +126736,143 @@ 2019/09/24 | 3761 | fonts/xcharter/afm/XCharterMathRM.afm 2020/05/25 | 278766 | fonts/xcharter/afm/XCharter-Roman.afm 2020/05/25 | 258911 | fonts/xcharter/afm/XCharter-Slanted.afm -2018/06/02 | 3719 | fonts/xcharter/doc/altone.py +2020/08/06 | 3895 | fonts/xcharter/doc/altone.py 2019/06/04 | 18419 | fonts/xcharter/doc/newgermanfxch-crop.pdf 2019/06/04 | 17633 | fonts/xcharter/doc/newgermanfxch.pdf 2019/06/04 | 4688 | fonts/xcharter/doc/newgermanfxch.tex -2020/06/28 | 711124 | fonts/xcharter/doc/xcharter-doc.pdf -2020/06/28 | 21012 | fonts/xcharter/doc/xcharter-doc.tex +2020/08/06 | 719666 | fonts/xcharter/doc/xcharter-doc.pdf +2020/08/06 | 20940 | fonts/xcharter/doc/xcharter-doc.tex 2014/11/04 | 2276 | fonts/xcharter/enc/chalph.enc 2014/11/04 | 2667 | fonts/xcharter/enc/chtabosf.enc -2020/06/28 | 3881 | fonts/xcharter/enc/xch1_3nubio.enc -2020/06/28 | 3657 | fonts/xcharter/enc/xch1_5xfeuz.enc -2020/06/28 | 3763 | fonts/xcharter/enc/xch1_62ztbr.enc -2020/06/28 | 3612 | fonts/xcharter/enc/xch1_64qgug.enc -2020/06/28 | 3776 | fonts/xcharter/enc/xch1_6l4ixg.enc -2020/06/28 | 3499 | fonts/xcharter/enc/xch1_7p4e2o.enc -2020/06/28 | 3631 | fonts/xcharter/enc/xch1_dbdfpx.enc -2020/06/28 | 4013 | fonts/xcharter/enc/xch1_e3nxtd.enc -2020/06/28 | 3902 | fonts/xcharter/enc/xch1_erwtw3.enc -2020/06/28 | 3904 | fonts/xcharter/enc/xch1_evj3rb.enc -2020/06/28 | 4057 | fonts/xcharter/enc/xch1_gb4haz.enc -2020/06/28 | 3626 | fonts/xcharter/enc/xch1_gvbfhh.enc -2020/06/28 | 3464 | fonts/xcharter/enc/xch1_ivnpe7.enc -2020/06/28 | 3624 | fonts/xcharter/enc/xch1_jg3oo5.enc -2020/06/28 | 3875 | fonts/xcharter/enc/xch1_l4c4ke.enc -2020/06/28 | 3735 | fonts/xcharter/enc/xch1_oj27u4.enc -2020/06/28 | 3462 | fonts/xcharter/enc/xch1_q2nwaj.enc -2020/06/28 | 3910 | fonts/xcharter/enc/xch1_qdfne6.enc -2020/06/28 | 3880 | fonts/xcharter/enc/xch1_vv7waw.enc -2020/06/28 | 3929 | fonts/xcharter/enc/xch1_wi6ykn.enc -2020/06/28 | 3614 | fonts/xcharter/enc/xch1_wqeam3.enc -2020/06/28 | 3592 | fonts/xcharter/enc/xch1_wwsmtw.enc -2020/06/28 | 3786 | fonts/xcharter/enc/xch1_xmfb6b.enc -2020/06/28 | 3911 | fonts/xcharter/enc/xch1_yz7cd7.enc -2020/06/28 | 3101 | fonts/xcharter/enc/xch_26pbhy.enc -2020/06/28 | 3179 | fonts/xcharter/enc/xch_2acc4n.enc -2020/06/28 | 3329 | fonts/xcharter/enc/xch_2jytnu.enc -2020/06/28 | 3288 | fonts/xcharter/enc/xch_3j6jnh.enc -2020/06/28 | 3525 | fonts/xcharter/enc/xch_3nubio.enc -2020/06/28 | 3150 | fonts/xcharter/enc/xch_3oyzty.enc -2020/06/28 | 3433 | fonts/xcharter/enc/xch_3reguq.enc -2020/06/28 | 3098 | fonts/xcharter/enc/xch_57lqj7.enc -2020/06/28 | 3610 | fonts/xcharter/enc/xch_5klbw4.enc -2020/06/28 | 3301 | fonts/xcharter/enc/xch_5xfeuz.enc -2020/06/28 | 3189 | fonts/xcharter/enc/xch_62z5ot.enc -2020/06/28 | 3407 | fonts/xcharter/enc/xch_62ztbr.enc -2020/06/28 | 3256 | fonts/xcharter/enc/xch_64qgug.enc -2020/06/28 | 3420 | fonts/xcharter/enc/xch_6l4ixg.enc -2020/06/28 | 3802 | fonts/xcharter/enc/xch_6zxmh3.enc -2020/06/28 | 3135 | fonts/xcharter/enc/xch_7cmdv6.enc -2020/06/28 | 3143 | fonts/xcharter/enc/xch_7p4e2o.enc -2020/06/28 | 3017 | fonts/xcharter/enc/xch_abgjzu.enc -2020/06/28 | 3073 | fonts/xcharter/enc/xch_ao7ayk.enc -2020/06/28 | 6740 | fonts/xcharter/enc/xcharter-ot2.enc -2020/06/28 | 3170 | fonts/xcharter/enc/xch_ay4e7o.enc -2020/06/28 | 3262 | fonts/xcharter/enc/xch_bk4eiy.enc -2020/06/28 | 3015 | fonts/xcharter/enc/xch_bxmb3o.enc -2020/06/28 | 3457 | fonts/xcharter/enc/xch_ch4v2b.enc -2020/06/28 | 3167 | fonts/xcharter/enc/xch_ckugtc.enc -2020/06/28 | 3482 | fonts/xcharter/enc/xch_ct4qni.enc -2020/06/28 | 3275 | fonts/xcharter/enc/xch_dbdfpx.enc -2020/06/28 | 3464 | fonts/xcharter/enc/xch_dcwqct.enc -2020/06/28 | 3287 | fonts/xcharter/enc/xch_dwd75d.enc -2020/06/28 | 3657 | fonts/xcharter/enc/xch_e3nxtd.enc -2020/06/28 | 3546 | fonts/xcharter/enc/xch_erwtw3.enc -2020/06/28 | 3548 | fonts/xcharter/enc/xch_evj3rb.enc -2020/06/28 | 3701 | fonts/xcharter/enc/xch_gb4haz.enc -2020/06/28 | 3270 | fonts/xcharter/enc/xch_gvbfhh.enc -2020/06/28 | 3316 | fonts/xcharter/enc/xch_h2xo5a.enc -2020/06/28 | 3093 | fonts/xcharter/enc/xch_h4dyum.enc -2020/06/28 | 3052 | fonts/xcharter/enc/xch_hnm3ex.enc -2020/06/28 | 3036 | fonts/xcharter/enc/xch_hrleas.enc -2020/06/28 | 3605 | fonts/xcharter/enc/xch_imj3v4.enc -2020/06/28 | 3108 | fonts/xcharter/enc/xch_ivnpe7.enc -2020/06/28 | 3268 | fonts/xcharter/enc/xch_jg3oo5.enc -2020/06/28 | 3900 | fonts/xcharter/enc/xch_kivgfk.enc -2020/06/28 | 3339 | fonts/xcharter/enc/xch_kkifs2.enc -2020/06/28 | 3519 | fonts/xcharter/enc/xch_l4c4ke.enc -2020/06/28 | 3003 | fonts/xcharter/enc/xch_l7jokp.enc -2020/06/28 | 3463 | fonts/xcharter/enc/xch_lotb2t.enc -2020/06/28 | 3428 | fonts/xcharter/enc/xch_nxyw3t.enc -2020/06/28 | 3177 | fonts/xcharter/enc/xch_o6avng.enc -2020/06/28 | 2983 | fonts/xcharter/enc/xch_og2pus.enc -2020/06/28 | 3379 | fonts/xcharter/enc/xch_oj27u4.enc -2020/06/28 | 3455 | fonts/xcharter/enc/xch_opza6q.enc -2020/06/28 | 3566 | fonts/xcharter/enc/xch_ouuvex.enc -2020/06/28 | 3522 | fonts/xcharter/enc/xch_ph46id.enc -2020/06/28 | 3508 | fonts/xcharter/enc/xch_pqp4df.enc -2020/06/28 | 3106 | fonts/xcharter/enc/xch_q2nwaj.enc -2020/06/28 | 3554 | fonts/xcharter/enc/xch_qdfne6.enc -2020/06/28 | 2966 | fonts/xcharter/enc/xch_s3y5jv.enc -2020/06/28 | 3184 | fonts/xcharter/enc/xch_sbtai3.enc -2020/06/28 | 3941 | fonts/xcharter/enc/xch_sbuybh.enc -2020/06/28 | 3638 | fonts/xcharter/enc/xch_tis6bf.enc -2020/06/28 | 3205 | fonts/xcharter/enc/xch_tkkgpv.enc -2020/06/28 | 3829 | fonts/xcharter/enc/xch_ukw3hq.enc -2020/06/28 | 3184 | fonts/xcharter/enc/xch_uoo6px.enc -2020/06/28 | 3210 | fonts/xcharter/enc/xch_uv5z4v.enc -2020/06/28 | 3145 | fonts/xcharter/enc/xch_uy5hgr.enc -2020/06/28 | 3215 | fonts/xcharter/enc/xch_v6llfb.enc -2020/06/28 | 3020 | fonts/xcharter/enc/xch_vtvjjk.enc -2020/06/28 | 3524 | fonts/xcharter/enc/xch_vv7waw.enc -2020/06/28 | 3573 | fonts/xcharter/enc/xch_wi6ykn.enc -2020/06/28 | 3434 | fonts/xcharter/enc/xch_wiwj7n.enc -2020/06/28 | 3165 | fonts/xcharter/enc/xch_wizqmm.enc -2020/06/28 | 3164 | fonts/xcharter/enc/xch_wmw2bj.enc -2020/06/28 | 3258 | fonts/xcharter/enc/xch_wqeam3.enc -2020/06/28 | 3236 | fonts/xcharter/enc/xch_wwsmtw.enc -2020/06/28 | 3056 | fonts/xcharter/enc/xch_x25wg5.enc -2020/06/28 | 3430 | fonts/xcharter/enc/xch_xmfb6b.enc -2020/06/28 | 3516 | fonts/xcharter/enc/xch_xqcxen.enc -2020/06/28 | 3081 | fonts/xcharter/enc/xch_ybxeq6.enc -2020/06/28 | 3555 | fonts/xcharter/enc/xch_yz7cd7.enc -2020/06/28 | 32100 | fonts/xcharter/map/XCharter.map +2020/08/06 | 3889 | fonts/xcharter/enc/xch1_3nubio.enc +2020/08/06 | 3665 | fonts/xcharter/enc/xch1_5xfeuz.enc +2020/08/06 | 3766 | fonts/xcharter/enc/xch1_62ztbr.enc +2020/08/06 | 3620 | fonts/xcharter/enc/xch1_64qgug.enc +2020/08/06 | 3779 | fonts/xcharter/enc/xch1_6l4ixg.enc +2020/08/06 | 3507 | fonts/xcharter/enc/xch1_7p4e2o.enc +2020/08/06 | 4011 | fonts/xcharter/enc/xch1_bcg6lk.enc +2020/08/06 | 3736 | fonts/xcharter/enc/xch1_bpv7ty.enc +2020/08/06 | 3639 | fonts/xcharter/enc/xch1_dbdfpx.enc +2020/08/06 | 4016 | fonts/xcharter/enc/xch1_e3nxtd.enc +2020/08/06 | 3910 | fonts/xcharter/enc/xch1_erwtw3.enc +2020/08/06 | 3907 | fonts/xcharter/enc/xch1_evj3rb.enc +2020/08/06 | 4060 | fonts/xcharter/enc/xch1_gb4haz.enc +2020/08/06 | 3634 | fonts/xcharter/enc/xch1_gvbfhh.enc +2020/08/06 | 3472 | fonts/xcharter/enc/xch1_ivnpe7.enc +2020/08/06 | 3632 | fonts/xcharter/enc/xch1_jg3oo5.enc +2020/08/06 | 3883 | fonts/xcharter/enc/xch1_l4c4ke.enc +2020/08/06 | 4055 | fonts/xcharter/enc/xch1_l6an6k.enc +2020/08/06 | 3740 | fonts/xcharter/enc/xch1_oj27u4.enc +2020/08/06 | 3873 | fonts/xcharter/enc/xch1_ph46id.enc +2020/08/06 | 3859 | fonts/xcharter/enc/xch1_pqp4df.enc +2020/08/06 | 3470 | fonts/xcharter/enc/xch1_q2nwaj.enc +2020/08/06 | 3918 | fonts/xcharter/enc/xch1_qdfne6.enc +2020/08/06 | 3989 | fonts/xcharter/enc/xch1_tis6bf.enc +2020/08/06 | 3888 | fonts/xcharter/enc/xch1_vv7waw.enc +2020/08/06 | 3932 | fonts/xcharter/enc/xch1_wi6ykn.enc +2020/08/06 | 3622 | fonts/xcharter/enc/xch1_wqeam3.enc +2020/08/06 | 3600 | fonts/xcharter/enc/xch1_wwsmtw.enc +2020/08/06 | 3777 | fonts/xcharter/enc/xch1_xmfb6b.enc +2020/08/06 | 3867 | fonts/xcharter/enc/xch1_xqcxen.enc +2020/08/06 | 3919 | fonts/xcharter/enc/xch1_yz7cd7.enc +2020/08/06 | 3109 | fonts/xcharter/enc/xch_26pbhy.enc +2020/08/06 | 3187 | fonts/xcharter/enc/xch_2acc4n.enc +2020/08/06 | 3332 | fonts/xcharter/enc/xch_2jytnu.enc +2020/08/06 | 3291 | fonts/xcharter/enc/xch_3j6jnh.enc +2020/08/06 | 3533 | fonts/xcharter/enc/xch_3nubio.enc +2020/08/06 | 3158 | fonts/xcharter/enc/xch_3oyzty.enc +2020/08/06 | 3441 | fonts/xcharter/enc/xch_3reguq.enc +2020/08/06 | 3564 | fonts/xcharter/enc/xch_4siibn.enc +2020/08/06 | 3106 | fonts/xcharter/enc/xch_57lqj7.enc +2020/08/06 | 3613 | fonts/xcharter/enc/xch_5klbw4.enc +2020/08/06 | 3309 | fonts/xcharter/enc/xch_5xfeuz.enc +2020/08/06 | 3199 | fonts/xcharter/enc/xch_62z5ot.enc +2020/08/06 | 3410 | fonts/xcharter/enc/xch_62ztbr.enc +2020/08/06 | 3264 | fonts/xcharter/enc/xch_64qgug.enc +2020/08/06 | 3423 | fonts/xcharter/enc/xch_6l4ixg.enc +2020/08/06 | 3810 | fonts/xcharter/enc/xch_6zxmh3.enc +2020/08/06 | 3143 | fonts/xcharter/enc/xch_7cmdv6.enc +2020/08/06 | 3151 | fonts/xcharter/enc/xch_7p4e2o.enc +2020/08/06 | 3025 | fonts/xcharter/enc/xch_abgjzu.enc +2020/08/06 | 3081 | fonts/xcharter/enc/xch_ao7ayk.enc +2020/08/06 | 6740 | fonts/xcharter/enc/xcharter-ot2.enc +2020/08/06 | 3178 | fonts/xcharter/enc/xch_ay4e7o.enc +2020/08/06 | 3655 | fonts/xcharter/enc/xch_bcg6lk.enc +2020/08/06 | 3265 | fonts/xcharter/enc/xch_bk4eiy.enc +2020/08/06 | 3380 | fonts/xcharter/enc/xch_bpv7ty.enc +2020/08/06 | 3023 | fonts/xcharter/enc/xch_bxmb3o.enc +2020/08/06 | 3460 | fonts/xcharter/enc/xch_ch4v2b.enc +2020/08/06 | 3175 | fonts/xcharter/enc/xch_ckugtc.enc +2020/08/06 | 3485 | fonts/xcharter/enc/xch_ct4qni.enc +2020/08/06 | 3283 | fonts/xcharter/enc/xch_dbdfpx.enc +2020/08/06 | 3472 | fonts/xcharter/enc/xch_dcwqct.enc +2020/08/06 | 3276 | fonts/xcharter/enc/xch_dwd75d.enc +2020/08/06 | 3660 | fonts/xcharter/enc/xch_e3nxtd.enc +2020/08/06 | 3554 | fonts/xcharter/enc/xch_erwtw3.enc +2020/08/06 | 3551 | fonts/xcharter/enc/xch_evj3rb.enc +2020/08/06 | 3704 | fonts/xcharter/enc/xch_gb4haz.enc +2020/08/06 | 3278 | fonts/xcharter/enc/xch_gvbfhh.enc +2020/08/06 | 3319 | fonts/xcharter/enc/xch_h2xo5a.enc +2020/08/06 | 3101 | fonts/xcharter/enc/xch_h4dyum.enc +2020/08/06 | 3237 | fonts/xcharter/enc/xch_hk5uz5.enc +2020/08/06 | 3060 | fonts/xcharter/enc/xch_hnm3ex.enc +2020/08/06 | 3044 | fonts/xcharter/enc/xch_hrleas.enc +2020/08/06 | 3613 | fonts/xcharter/enc/xch_imj3v4.enc +2020/08/06 | 3116 | fonts/xcharter/enc/xch_ivnpe7.enc +2020/08/06 | 3276 | fonts/xcharter/enc/xch_jg3oo5.enc +2020/08/06 | 3903 | fonts/xcharter/enc/xch_kivgfk.enc +2020/08/06 | 3330 | fonts/xcharter/enc/xch_kkifs2.enc +2020/08/06 | 3527 | fonts/xcharter/enc/xch_l4c4ke.enc +2020/08/06 | 3699 | fonts/xcharter/enc/xch_l6an6k.enc +2020/08/06 | 3011 | fonts/xcharter/enc/xch_l7jokp.enc +2020/08/06 | 3471 | fonts/xcharter/enc/xch_lotb2t.enc +2020/08/06 | 3436 | fonts/xcharter/enc/xch_nxyw3t.enc +2020/08/06 | 3185 | fonts/xcharter/enc/xch_o6avng.enc +2020/08/06 | 2991 | fonts/xcharter/enc/xch_og2pus.enc +2020/08/06 | 3384 | fonts/xcharter/enc/xch_oj27u4.enc +2020/08/06 | 3463 | fonts/xcharter/enc/xch_opza6q.enc +2020/08/06 | 3569 | fonts/xcharter/enc/xch_ouuvex.enc +2020/08/06 | 3517 | fonts/xcharter/enc/xch_ph46id.enc +2020/08/06 | 3503 | fonts/xcharter/enc/xch_pqp4df.enc +2020/08/06 | 3114 | fonts/xcharter/enc/xch_q2nwaj.enc +2020/08/06 | 3562 | fonts/xcharter/enc/xch_qdfne6.enc +2020/08/06 | 2974 | fonts/xcharter/enc/xch_s3y5jv.enc +2020/08/06 | 3944 | fonts/xcharter/enc/xch_sbuybh.enc +2020/08/06 | 3633 | fonts/xcharter/enc/xch_tis6bf.enc +2020/08/06 | 3839 | fonts/xcharter/enc/xch_ukw3hq.enc +2020/08/06 | 3192 | fonts/xcharter/enc/xch_uoo6px.enc +2020/08/06 | 3218 | fonts/xcharter/enc/xch_uv5z4v.enc +2020/08/06 | 3153 | fonts/xcharter/enc/xch_uy5hgr.enc +2020/08/06 | 3225 | fonts/xcharter/enc/xch_v6llfb.enc +2020/08/06 | 3028 | fonts/xcharter/enc/xch_vtvjjk.enc +2020/08/06 | 3532 | fonts/xcharter/enc/xch_vv7waw.enc +2020/08/06 | 3576 | fonts/xcharter/enc/xch_wi6ykn.enc +2020/08/06 | 3442 | fonts/xcharter/enc/xch_wiwj7n.enc +2020/08/06 | 3173 | fonts/xcharter/enc/xch_wizqmm.enc +2020/08/06 | 3266 | fonts/xcharter/enc/xch_wqeam3.enc +2020/08/06 | 3244 | fonts/xcharter/enc/xch_wwsmtw.enc +2020/08/06 | 3064 | fonts/xcharter/enc/xch_x25wg5.enc +2020/08/06 | 3421 | fonts/xcharter/enc/xch_xmfb6b.enc +2020/08/06 | 3511 | fonts/xcharter/enc/xch_xqcxen.enc +2020/08/06 | 3089 | fonts/xcharter/enc/xch_ybxeq6.enc +2020/08/06 | 3608 | fonts/xcharter/enc/xch_ykltyo.enc +2020/08/06 | 3289 | fonts/xcharter/enc/xch_yrgi2d.enc +2020/08/06 | 3563 | fonts/xcharter/enc/xch_yz7cd7.enc +2020/08/06 | 39719 | fonts/xcharter/map/XCharter.map 2020/05/25 | 111956 | fonts/xcharter/opentype/XCharter-BoldItalic.otf 2020/05/25 | 131836 | fonts/xcharter/opentype/XCharter-Bold.otf 2020/05/25 | 133144 | fonts/xcharter/opentype/XCharter-BoldSlanted.otf 2020/05/25 | 120020 | fonts/xcharter/opentype/XCharter-Italic.otf 2020/05/25 | 143948 | fonts/xcharter/opentype/XCharter-Roman.otf 2020/05/25 | 130052 | fonts/xcharter/opentype/XCharter-Slanted.otf -2020/06/28 | 11117 | fonts/xcharter/README +2020/08/06 | 11293 | fonts/xcharter/README 2017/06/27 | 1248 | fonts/xcharter/tex/LY1XCharter-Dnom.fd 2017/06/27 | 1226 | fonts/xcharter/tex/LY1XCharter-Inf.fd 2017/06/27 | 1247 | fonts/xcharter/tex/LY1XCharter-Numr.fd 2017/06/27 | 1226 | fonts/xcharter/tex/LY1XCharter-Sup.fd 2017/06/27 | 2131 | fonts/xcharter/tex/LY1XCharter-TLF.fd 2017/06/25 | 2521 | fonts/xcharter/tex/LY1XCharter-TOsF.fd +2019/09/21 | 150 | fonts/xcharter/tex/newtx-xcharter-subs.tex 2019/11/21 | 1690 | fonts/xcharter/tex/omlzchmi.fd 2017/06/27 | 1247 | fonts/xcharter/tex/OT1XCharter-Dnom.fd 2017/06/27 | 1226 | fonts/xcharter/tex/OT1XCharter-Inf.fd @@ -126877,433 +126889,544 @@ 2017/06/25 | 2488 | fonts/xcharter/tex/T1XCharter-TOsF.fd 2018/08/26 | 830 | fonts/xcharter/tex/t2asrbcmr.fd 2018/08/26 | 10839 | fonts/xcharter/tex/t2asrbenc.def +2020/08/06 | 2207 | fonts/xcharter/tex/T2ASRBXCharter-Sup.fd +2020/08/06 | 3734 | fonts/xcharter/tex/T2ASRBXCharter-TLF.fd +2020/08/06 | 3797 | fonts/xcharter/tex/T2ASRBXCharter-TOsF.fd 2018/06/02 | 1473 | fonts/xcharter/tex/T2AXCharter-Sup.fd 2018/06/02 | 2462 | fonts/xcharter/tex/T2AXCharter-TLF.fd 2018/06/02 | 2851 | fonts/xcharter/tex/T2AXCharter-TOsF.fd -2020/05/25 | 1162 | fonts/xcharter/tex/TS1XCharter-TLF.fd -2020/05/25 | 1177 | fonts/xcharter/tex/TS1XCharter-TOsF.fd +2020/08/06 | 1410 | fonts/xcharter/tex/TS1XCharter-TLF.fd +2020/08/06 | 1425 | fonts/xcharter/tex/TS1XCharter-TOsF.fd 2017/06/16 | 311 | fonts/xcharter/tex/XCharter.fontspec -2020/06/28 | 6961 | fonts/xcharter/tex/XCharter.sty -2020/06/28 | 1852 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-ly1--base.tfm -2020/06/28 | 25424 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-ly1.tfm -2020/06/28 | 6832 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-ot1.tfm -2020/06/28 | 1872 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-ly1--base.tfm -2020/06/28 | 27252 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-ly1.tfm -2020/06/28 | 1364 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-ot1--base.tfm -2020/06/28 | 7664 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-ot1.tfm -2020/06/28 | 1824 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-t1--base.tfm -2020/06/28 | 26044 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-t1.tfm -2020/06/28 | 1980 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-t2a--base.tfm -2020/06/28 | 1968 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-t2asrb--base.tfm -2020/06/28 | 8948 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-t2asrb.tfm -2020/06/28 | 8964 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-t2a.tfm -2020/06/28 | 1816 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-t1--base.tfm -2020/06/28 | 23772 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-t1.tfm -2020/06/28 | 1924 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-t2a--base.tfm -2020/06/28 | 1920 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-t2asrb--base.tfm -2020/06/28 | 8132 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-t2asrb.tfm -2020/06/28 | 8140 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-t2a.tfm -2020/06/28 | 2008 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-ly1--base.tfm -2020/06/28 | 25160 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-ly1.tfm -2020/06/28 | 6656 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-ot1.tfm -2020/06/28 | 1992 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-ly1--base.tfm -2020/06/28 | 25332 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-ly1.tfm -2020/06/28 | 1572 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-ot1--base.tfm -2020/06/28 | 6924 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-ot1.tfm -2020/06/28 | 1940 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t1--base.tfm -2020/06/28 | 24048 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t1.tfm -2020/06/28 | 1972 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t1--base.tfm -2020/06/28 | 23520 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t1.tfm -2020/06/28 | 1768 | fonts/xcharter/tfm/XCharter1-Bold-tosf-ly1--base.tfm -2020/06/28 | 26076 | fonts/xcharter/tfm/XCharter1-Bold-tosf-ly1.tfm -2020/06/28 | 7072 | fonts/xcharter/tfm/XCharter1-Bold-tosf-ot1.tfm -2020/06/28 | 1732 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-ly1--base.tfm -2020/06/28 | 26328 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-ly1.tfm -2020/06/28 | 1344 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-ot1--base.tfm -2020/06/28 | 7424 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-ot1.tfm -2020/06/28 | 1668 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t1--base.tfm -2020/06/28 | 25036 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t1.tfm -2020/06/28 | 1716 | fonts/xcharter/tfm/XCharter1-Bold-tosf-t1--base.tfm -2020/06/28 | 24384 | fonts/xcharter/tfm/XCharter1-Bold-tosf-t1.tfm -2020/06/28 | 1832 | fonts/xcharter/tfm/XCharter1-Italic-tosf-ly1--base.tfm -2020/06/28 | 25576 | fonts/xcharter/tfm/XCharter1-Italic-tosf-ly1.tfm -2020/06/28 | 6772 | fonts/xcharter/tfm/XCharter1-Italic-tosf-ot1.tfm -2020/06/28 | 1864 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-ly1--base.tfm -2020/06/28 | 25996 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-ly1.tfm -2020/06/28 | 1440 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-ot1--base.tfm -2020/06/28 | 7208 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-ot1.tfm -2020/06/28 | 1824 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t1--base.tfm -2020/06/28 | 24764 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t1.tfm -2020/06/28 | 1800 | fonts/xcharter/tfm/XCharter1-Italic-tosf-t1--base.tfm -2020/06/28 | 23944 | fonts/xcharter/tfm/XCharter1-Italic-tosf-t1.tfm -2020/06/28 | 1752 | fonts/xcharter/tfm/XCharter1-Roman-tosf-ly1--base.tfm -2020/06/28 | 26348 | fonts/xcharter/tfm/XCharter1-Roman-tosf-ly1.tfm -2020/06/28 | 7044 | fonts/xcharter/tfm/XCharter1-Roman-tosf-ot1.tfm -2020/06/28 | 1728 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-ly1--base.tfm -2020/06/28 | 27452 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-ly1.tfm -2020/06/28 | 1332 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-ot1--base.tfm -2020/06/28 | 7568 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-ot1.tfm -2020/06/28 | 1656 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-t1--base.tfm -2020/06/28 | 26572 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-t1.tfm -2020/06/28 | 1880 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-t2a--base.tfm -2020/06/28 | 1880 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-t2asrb--base.tfm -2020/06/28 | 9012 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-t2asrb.tfm -2020/06/28 | 9016 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-t2a.tfm -2020/06/28 | 1692 | fonts/xcharter/tfm/XCharter1-Roman-tosf-t1--base.tfm -2020/06/28 | 25072 | fonts/xcharter/tfm/XCharter1-Roman-tosf-t1.tfm -2020/06/28 | 1864 | fonts/xcharter/tfm/XCharter1-Roman-tosf-t2a--base.tfm -2020/06/28 | 1864 | fonts/xcharter/tfm/XCharter1-Roman-tosf-t2asrb--base.tfm -2020/06/28 | 8564 | fonts/xcharter/tfm/XCharter1-Roman-tosf-t2asrb.tfm -2020/06/28 | 8572 | fonts/xcharter/tfm/XCharter1-Roman-tosf-t2a.tfm -2020/06/28 | 2012 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-ly1--base.tfm -2020/06/28 | 25220 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-ly1.tfm -2020/06/28 | 6692 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-ot1.tfm -2020/06/28 | 1980 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-ly1--base.tfm -2020/06/28 | 26276 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-ly1.tfm -2020/06/28 | 1564 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-ot1--base.tfm -2020/06/28 | 7144 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-ot1.tfm -2020/06/28 | 1920 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t1--base.tfm -2020/06/28 | 25024 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t1.tfm -2020/06/28 | 1956 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-t1--base.tfm -2020/06/28 | 23620 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-t1.tfm -2020/06/28 | 1700 | fonts/xcharter/tfm/XCharter-Bold-dnom-ly1--base.tfm -2020/06/28 | 1704 | fonts/xcharter/tfm/XCharter-Bold-dnom-ly1.tfm -2020/06/28 | 1328 | fonts/xcharter/tfm/XCharter-Bold-dnom-ot1.tfm -2020/06/28 | 1672 | fonts/xcharter/tfm/XCharter-Bold-dnom-t1--base.tfm -2020/06/28 | 1680 | fonts/xcharter/tfm/XCharter-Bold-dnom-t1.tfm -2020/06/28 | 1700 | fonts/xcharter/tfm/XCharter-Bold-inf-ly1--base.tfm -2020/06/28 | 1704 | fonts/xcharter/tfm/XCharter-Bold-inf-ly1.tfm -2020/06/28 | 1324 | fonts/xcharter/tfm/XCharter-Bold-inf-ot1.tfm -2020/06/28 | 1672 | fonts/xcharter/tfm/XCharter-Bold-inf-t1--base.tfm -2020/06/28 | 1680 | fonts/xcharter/tfm/XCharter-Bold-inf-t1.tfm -2020/06/28 | 1792 | fonts/xcharter/tfm/XCharter-BoldItalic-dnom-ly1--base.tfm -2020/06/28 | 1796 | fonts/xcharter/tfm/XCharter-BoldItalic-dnom-ly1.tfm -2020/06/28 | 1284 | fonts/xcharter/tfm/XCharter-BoldItalic-dnom-ot1.tfm -2020/06/28 | 1788 | fonts/xcharter/tfm/XCharter-BoldItalic-dnom-t1--base.tfm -2020/06/28 | 1796 | fonts/xcharter/tfm/XCharter-BoldItalic-dnom-t1.tfm -2020/06/28 | 1792 | fonts/xcharter/tfm/XCharter-BoldItalic-inf-ly1--base.tfm -2020/06/28 | 1796 | fonts/xcharter/tfm/XCharter-BoldItalic-inf-ly1.tfm -2020/06/28 | 1280 | fonts/xcharter/tfm/XCharter-BoldItalic-inf-ot1.tfm -2020/06/28 | 1792 | fonts/xcharter/tfm/XCharter-BoldItalic-inf-t1--base.tfm -2020/06/28 | 1800 | fonts/xcharter/tfm/XCharter-BoldItalic-inf-t1.tfm -2020/06/28 | 1788 | fonts/xcharter/tfm/XCharter-BoldItalic-numr-ly1--base.tfm -2020/06/28 | 1792 | fonts/xcharter/tfm/XCharter-BoldItalic-numr-ly1.tfm -2020/06/28 | 1284 | fonts/xcharter/tfm/XCharter-BoldItalic-numr-ot1.tfm -2020/06/28 | 1788 | fonts/xcharter/tfm/XCharter-BoldItalic-numr-t1--base.tfm -2020/06/28 | 1796 | fonts/xcharter/tfm/XCharter-BoldItalic-numr-t1.tfm -2020/06/28 | 1800 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-ly1--base.tfm -2020/06/28 | 1804 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-ly1.tfm -2020/06/28 | 1288 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-ot1.tfm -2020/06/28 | 1800 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-t1--base.tfm -2020/06/28 | 1808 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-t1.tfm -2020/06/28 | 1912 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-t2a--base.tfm -2020/06/28 | 1908 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-t2asrb--base.tfm -2020/06/28 | 1912 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-t2asrb.tfm -2020/06/28 | 1916 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-t2a.tfm -2020/06/28 | 1836 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-ly1--base.tfm -2020/06/28 | 25812 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-ly1.tfm -2020/06/28 | 6852 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-ot1G.tfm -2020/06/28 | 6776 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-ot1.tfm -2020/06/28 | 2880 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-ot2.tfm -2020/06/28 | 1840 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-ly1--base.tfm -2020/06/28 | 27204 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-ly1.tfm -2020/06/28 | 1328 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-ot1--base.tfm -2020/06/28 | 7632 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-ot1.tfm -2020/06/28 | 1792 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-t1--base.tfm -2020/06/28 | 25988 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-t1.tfm -2020/06/28 | 1964 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-t2a--base.tfm -2020/06/28 | 1952 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-t2asrb--base.tfm -2020/06/28 | 8988 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-t2asrb.tfm -2020/06/28 | 9004 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-t2a.tfm -2020/06/28 | 1804 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-t1--base.tfm -2020/06/28 | 23696 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-t1.tfm -2020/06/28 | 1908 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-t2a--base.tfm -2020/06/28 | 1904 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-t2asrb--base.tfm -2020/06/28 | 8092 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-t2asrb.tfm -2020/06/28 | 8100 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-t2a.tfm -2020/06/28 | 1864 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-ly1--base.tfm -2020/06/28 | 25840 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-ly1.tfm -2020/06/28 | 6808 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-ot1.tfm -2020/06/28 | 1872 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-ly1--base.tfm -2020/06/28 | 27236 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-ly1.tfm -2020/06/28 | 1364 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-ot1--base.tfm -2020/06/28 | 7668 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-ot1.tfm -2020/06/28 | 1824 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-t1--base.tfm -2020/06/28 | 26020 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-t1.tfm -2020/06/28 | 1988 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-t2a--base.tfm -2020/06/28 | 1976 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-t2asrb--base.tfm -2020/06/28 | 9012 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-t2asrb.tfm -2020/06/28 | 9028 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-t2a.tfm -2020/06/28 | 1828 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-t1--base.tfm -2020/06/28 | 23720 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-t1.tfm -2020/06/28 | 1932 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-t2a--base.tfm -2020/06/28 | 1928 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-t2asrb--base.tfm -2020/06/28 | 8116 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-t2asrb.tfm -2020/06/28 | 8124 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-t2a.tfm -2020/06/28 | 1460 | fonts/xcharter/tfm/XCharter-BoldItalic-ts1--base.tfm -2020/06/28 | 1472 | fonts/xcharter/tfm/XCharter-BoldItalic-ts1.tfm -2020/06/28 | 1700 | fonts/xcharter/tfm/XCharter-Bold-numr-ly1--base.tfm -2020/06/28 | 1704 | fonts/xcharter/tfm/XCharter-Bold-numr-ly1.tfm -2020/06/28 | 1328 | fonts/xcharter/tfm/XCharter-Bold-numr-ot1.tfm -2020/06/28 | 1672 | fonts/xcharter/tfm/XCharter-Bold-numr-t1--base.tfm -2020/06/28 | 1680 | fonts/xcharter/tfm/XCharter-Bold-numr-t1.tfm -2020/06/28 | 1948 | fonts/xcharter/tfm/XCharter-BoldSlanted-dnom-ly1--base.tfm -2020/06/28 | 1952 | fonts/xcharter/tfm/XCharter-BoldSlanted-dnom-ly1.tfm -2020/06/28 | 1544 | fonts/xcharter/tfm/XCharter-BoldSlanted-dnom-ot1.tfm -2020/06/28 | 1940 | fonts/xcharter/tfm/XCharter-BoldSlanted-dnom-t1--base.tfm -2020/06/28 | 1948 | fonts/xcharter/tfm/XCharter-BoldSlanted-dnom-t1.tfm -2020/06/28 | 1948 | fonts/xcharter/tfm/XCharter-BoldSlanted-inf-ly1--base.tfm -2020/06/28 | 1952 | fonts/xcharter/tfm/XCharter-BoldSlanted-inf-ly1.tfm -2020/06/28 | 1540 | fonts/xcharter/tfm/XCharter-BoldSlanted-inf-ot1.tfm -2020/06/28 | 1940 | fonts/xcharter/tfm/XCharter-BoldSlanted-inf-t1--base.tfm -2020/06/28 | 1948 | fonts/xcharter/tfm/XCharter-BoldSlanted-inf-t1.tfm -2020/06/28 | 1948 | fonts/xcharter/tfm/XCharter-BoldSlanted-numr-ly1--base.tfm -2020/06/28 | 1952 | fonts/xcharter/tfm/XCharter-BoldSlanted-numr-ly1.tfm -2020/06/28 | 1544 | fonts/xcharter/tfm/XCharter-BoldSlanted-numr-ot1.tfm -2020/06/28 | 1940 | fonts/xcharter/tfm/XCharter-BoldSlanted-numr-t1--base.tfm -2020/06/28 | 1948 | fonts/xcharter/tfm/XCharter-BoldSlanted-numr-t1.tfm -2020/06/28 | 1960 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-ly1--base.tfm -2020/06/28 | 1964 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-ly1.tfm -2020/06/28 | 1552 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-ot1.tfm -2020/06/28 | 1952 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t1--base.tfm -2020/06/28 | 1960 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t1.tfm -2020/06/28 | 1988 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-ly1--base.tfm -2020/06/28 | 25452 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-ly1.tfm -2020/06/28 | 6552 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-ot1.tfm -2020/06/28 | 3480 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-ot2.tfm -2020/06/28 | 1960 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-ly1--base.tfm -2020/06/28 | 25268 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-ly1.tfm -2020/06/28 | 1544 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-ot1--base.tfm -2020/06/28 | 6896 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-ot1.tfm -2020/06/28 | 1908 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t1--base.tfm -2020/06/28 | 23992 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t1.tfm -2020/06/28 | 1952 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t1--base.tfm -2020/06/28 | 23332 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t1.tfm -2020/06/28 | 2072 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2a--base.tfm -2020/06/28 | 2072 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2asrb--base.tfm -2020/06/28 | 8112 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2asrb.tfm -2020/06/28 | 8120 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2a.tfm -2020/06/28 | 2020 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-ly1--base.tfm -2020/06/28 | 25484 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-ly1.tfm -2020/06/28 | 6584 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-ot1.tfm -2020/06/28 | 1992 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-ly1--base.tfm -2020/06/28 | 25300 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-ly1.tfm -2020/06/28 | 1572 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-ot1--base.tfm -2020/06/28 | 6924 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-ot1.tfm -2020/06/28 | 1940 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t1--base.tfm -2020/06/28 | 24024 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t1.tfm -2020/06/28 | 1984 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t1--base.tfm -2020/06/28 | 23364 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t1.tfm -2020/06/28 | 1540 | fonts/xcharter/tfm/XCharter-BoldSlanted-ts1--base.tfm -2020/06/28 | 1544 | fonts/xcharter/tfm/XCharter-BoldSlanted-ts1.tfm -2020/06/28 | 1712 | fonts/xcharter/tfm/XCharter-Bold-sup-ly1--base.tfm -2020/06/28 | 1716 | fonts/xcharter/tfm/XCharter-Bold-sup-ly1.tfm -2020/06/28 | 1336 | fonts/xcharter/tfm/XCharter-Bold-sup-ot1.tfm -2020/06/28 | 1684 | fonts/xcharter/tfm/XCharter-Bold-sup-t1--base.tfm -2020/06/28 | 1692 | fonts/xcharter/tfm/XCharter-Bold-sup-t1.tfm -2020/06/28 | 1744 | fonts/xcharter/tfm/XCharter-Bold-tlf-ly1--base.tfm -2020/06/28 | 26356 | fonts/xcharter/tfm/XCharter-Bold-tlf-ly1.tfm -2020/06/28 | 6928 | fonts/xcharter/tfm/XCharter-Bold-tlf-ot1G.tfm -2020/06/28 | 6956 | fonts/xcharter/tfm/XCharter-Bold-tlf-ot1.tfm -2020/06/28 | 3348 | fonts/xcharter/tfm/XCharter-Bold-tlf-ot2.tfm -2020/06/28 | 1696 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-ly1--base.tfm -2020/06/28 | 26256 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-ly1.tfm -2020/06/28 | 1308 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-ot1--base.tfm -2020/06/28 | 7384 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-ot1.tfm -2020/06/28 | 1628 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t1--base.tfm -2020/06/28 | 24952 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t1.tfm -2020/06/28 | 1688 | fonts/xcharter/tfm/XCharter-Bold-tlf-t1--base.tfm -2020/06/28 | 24172 | fonts/xcharter/tfm/XCharter-Bold-tlf-t1.tfm -2020/06/28 | 1820 | fonts/xcharter/tfm/XCharter-Bold-tlf-t2a--base.tfm -2020/06/28 | 1820 | fonts/xcharter/tfm/XCharter-Bold-tlf-t2asrb--base.tfm -2020/06/28 | 8436 | fonts/xcharter/tfm/XCharter-Bold-tlf-t2asrb.tfm -2020/06/28 | 8444 | fonts/xcharter/tfm/XCharter-Bold-tlf-t2a.tfm -2020/06/28 | 1780 | fonts/xcharter/tfm/XCharter-Bold-tosf-ly1--base.tfm -2020/06/28 | 26392 | fonts/xcharter/tfm/XCharter-Bold-tosf-ly1.tfm -2020/06/28 | 6996 | fonts/xcharter/tfm/XCharter-Bold-tosf-ot1.tfm -2020/06/28 | 1732 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-ly1--base.tfm -2020/06/28 | 26292 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-ly1.tfm -2020/06/28 | 1344 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-ot1--base.tfm -2020/06/28 | 7420 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-ot1.tfm -2020/06/28 | 1668 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t1--base.tfm -2020/06/28 | 24992 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t1.tfm -2020/06/28 | 1728 | fonts/xcharter/tfm/XCharter-Bold-tosf-t1--base.tfm -2020/06/28 | 24212 | fonts/xcharter/tfm/XCharter-Bold-tosf-t1.tfm -2020/06/28 | 1408 | fonts/xcharter/tfm/XCharter-Bold-ts1--base.tfm -2020/06/28 | 1420 | fonts/xcharter/tfm/XCharter-Bold-ts1.tfm +2020/06/29 | 6961 | fonts/xcharter/tex/XCharter.sty +2020/08/06 | 1852 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-ly1--base.tfm +2020/08/06 | 25424 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-ly1.tfm +2020/08/06 | 6832 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-ot1.tfm +2020/08/06 | 1872 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-ly1--base.tfm +2020/08/06 | 27252 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-ly1.tfm +2020/08/06 | 1364 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-ot1--base.tfm +2020/08/06 | 7664 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-ot1.tfm +2020/08/06 | 1824 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-t1--base.tfm +2020/08/06 | 26044 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-t1.tfm +2020/08/06 | 1980 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-t2a--base.tfm +2020/08/06 | 1968 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-t2asrb--base.tfm +2020/08/06 | 8948 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-t2asrb.tfm +2020/08/06 | 8964 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-t2a.tfm +2020/08/06 | 1816 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-t1--base.tfm +2020/08/06 | 23772 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-t1.tfm +2020/08/06 | 1924 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-t2a--base.tfm +2020/08/06 | 1920 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-t2asrb--base.tfm +2020/08/06 | 8132 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-t2asrb.tfm +2020/08/06 | 8140 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-t2a.tfm +2020/08/06 | 1452 | fonts/xcharter/tfm/XCharter1-BoldItalic-ts1--base.tfm +2020/08/06 | 1484 | fonts/xcharter/tfm/XCharter1-BoldItalic-ts1.tfm +2020/08/06 | 2008 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-ly1--base.tfm +2020/08/06 | 25160 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-ly1.tfm +2020/08/06 | 6656 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-ot1.tfm +2020/08/06 | 1992 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-ly1--base.tfm +2020/08/06 | 25332 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-ly1.tfm +2020/08/06 | 1572 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-ot1--base.tfm +2020/08/06 | 6924 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-ot1.tfm +2020/08/06 | 1940 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t1--base.tfm +2020/08/06 | 24048 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t1.tfm +2020/08/06 | 2124 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2a--base.tfm +2020/08/06 | 2128 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2asrb--base.tfm +2020/08/06 | 8276 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2asrb.tfm +2020/08/06 | 8284 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2a.tfm +2020/08/06 | 1972 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t1--base.tfm +2020/08/06 | 23520 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t1.tfm +2020/08/06 | 2104 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2a--base.tfm +2020/08/06 | 2104 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2asrb--base.tfm +2020/08/06 | 8200 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2asrb.tfm +2020/08/06 | 8208 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2a.tfm +2020/08/06 | 1540 | fonts/xcharter/tfm/XCharter1-BoldSlanted-ts1--base.tfm +2020/08/06 | 1568 | fonts/xcharter/tfm/XCharter1-BoldSlanted-ts1.tfm +2020/08/06 | 1768 | fonts/xcharter/tfm/XCharter1-Bold-tosf-ly1--base.tfm +2020/08/06 | 26076 | fonts/xcharter/tfm/XCharter1-Bold-tosf-ly1.tfm +2020/08/06 | 7072 | fonts/xcharter/tfm/XCharter1-Bold-tosf-ot1.tfm +2020/08/06 | 1732 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-ly1--base.tfm +2020/08/06 | 26328 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-ly1.tfm +2020/08/06 | 1344 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-ot1--base.tfm +2020/08/06 | 7424 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-ot1.tfm +2020/08/06 | 1668 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t1--base.tfm +2020/08/06 | 25036 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t1.tfm +2020/08/06 | 1860 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2a--base.tfm +2020/08/06 | 1864 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2asrb--base.tfm +2020/08/06 | 8676 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2asrb.tfm +2020/08/06 | 8684 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2a.tfm +2020/08/06 | 1716 | fonts/xcharter/tfm/XCharter1-Bold-tosf-t1--base.tfm +2020/08/06 | 24384 | fonts/xcharter/tfm/XCharter1-Bold-tosf-t1.tfm +2020/08/06 | 1860 | fonts/xcharter/tfm/XCharter1-Bold-tosf-t2a--base.tfm +2020/08/06 | 1860 | fonts/xcharter/tfm/XCharter1-Bold-tosf-t2asrb--base.tfm +2020/08/06 | 8532 | fonts/xcharter/tfm/XCharter1-Bold-tosf-t2asrb.tfm +2020/08/06 | 8540 | fonts/xcharter/tfm/XCharter1-Bold-tosf-t2a.tfm +2020/08/06 | 1400 | fonts/xcharter/tfm/XCharter1-Bold-ts1--base.tfm +2020/08/06 | 1432 | fonts/xcharter/tfm/XCharter1-Bold-ts1.tfm +2020/08/06 | 1832 | fonts/xcharter/tfm/XCharter1-Italic-tosf-ly1--base.tfm +2020/08/06 | 25576 | fonts/xcharter/tfm/XCharter1-Italic-tosf-ly1.tfm +2020/08/06 | 6772 | fonts/xcharter/tfm/XCharter1-Italic-tosf-ot1.tfm +2020/08/06 | 1864 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-ly1--base.tfm +2020/08/06 | 25996 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-ly1.tfm +2020/08/06 | 1440 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-ot1--base.tfm +2020/08/06 | 7208 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-ot1.tfm +2020/08/06 | 1824 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t1--base.tfm +2020/08/06 | 24764 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t1.tfm +2020/08/06 | 1968 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2a--base.tfm +2020/08/06 | 1960 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2asrb--base.tfm +2020/08/06 | 8640 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2asrb.tfm +2020/08/06 | 8664 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2a.tfm +2020/08/06 | 1800 | fonts/xcharter/tfm/XCharter1-Italic-tosf-t1--base.tfm +2020/08/06 | 23944 | fonts/xcharter/tfm/XCharter1-Italic-tosf-t1.tfm +2020/08/06 | 1928 | fonts/xcharter/tfm/XCharter1-Italic-tosf-t2a--base.tfm +2020/08/06 | 1924 | fonts/xcharter/tfm/XCharter1-Italic-tosf-t2asrb--base.tfm +2020/08/06 | 8172 | fonts/xcharter/tfm/XCharter1-Italic-tosf-t2asrb.tfm +2020/08/06 | 8192 | fonts/xcharter/tfm/XCharter1-Italic-tosf-t2a.tfm +2020/08/06 | 1436 | fonts/xcharter/tfm/XCharter1-Italic-ts1--base.tfm +2020/08/06 | 1468 | fonts/xcharter/tfm/XCharter1-Italic-ts1.tfm +2020/08/06 | 1752 | fonts/xcharter/tfm/XCharter1-Roman-tosf-ly1--base.tfm +2020/08/06 | 26348 | fonts/xcharter/tfm/XCharter1-Roman-tosf-ly1.tfm +2020/08/06 | 7044 | fonts/xcharter/tfm/XCharter1-Roman-tosf-ot1.tfm +2020/08/06 | 1728 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-ly1--base.tfm +2020/08/06 | 27452 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-ly1.tfm +2020/08/06 | 1332 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-ot1--base.tfm +2020/08/06 | 7568 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-ot1.tfm +2020/08/06 | 1656 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-t1--base.tfm +2020/08/06 | 26572 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-t1.tfm +2020/08/06 | 1880 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-t2a--base.tfm +2020/08/06 | 1880 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-t2asrb--base.tfm +2020/08/06 | 9012 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-t2asrb.tfm +2020/08/06 | 9016 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-t2a.tfm +2020/08/06 | 1692 | fonts/xcharter/tfm/XCharter1-Roman-tosf-t1--base.tfm +2020/08/06 | 25072 | fonts/xcharter/tfm/XCharter1-Roman-tosf-t1.tfm +2020/08/06 | 1864 | fonts/xcharter/tfm/XCharter1-Roman-tosf-t2a--base.tfm +2020/08/06 | 1864 | fonts/xcharter/tfm/XCharter1-Roman-tosf-t2asrb--base.tfm +2020/08/06 | 8564 | fonts/xcharter/tfm/XCharter1-Roman-tosf-t2asrb.tfm +2020/08/06 | 8572 | fonts/xcharter/tfm/XCharter1-Roman-tosf-t2a.tfm +2020/08/06 | 1516 | fonts/xcharter/tfm/XCharter1-Roman-ts1--base.tfm +2020/08/06 | 1544 | fonts/xcharter/tfm/XCharter1-Roman-ts1.tfm +2020/08/06 | 2012 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-ly1--base.tfm +2020/08/06 | 25220 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-ly1.tfm +2020/08/06 | 6692 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-ot1.tfm +2020/08/06 | 1980 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-ly1--base.tfm +2020/08/06 | 26276 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-ly1.tfm +2020/08/06 | 1564 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-ot1--base.tfm +2020/08/06 | 7144 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-ot1.tfm +2020/08/06 | 1920 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t1--base.tfm +2020/08/06 | 25024 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t1.tfm +2020/08/06 | 2120 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2a--base.tfm +2020/08/06 | 2120 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2asrb--base.tfm +2020/08/06 | 8624 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2asrb.tfm +2020/08/06 | 8628 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2a.tfm +2020/08/06 | 1956 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-t1--base.tfm +2020/08/06 | 23620 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-t1.tfm +2020/08/06 | 2124 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2a--base.tfm +2020/08/06 | 2124 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2asrb--base.tfm +2020/08/06 | 8288 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2asrb.tfm +2020/08/06 | 8296 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2a.tfm +2020/08/06 | 1548 | fonts/xcharter/tfm/XCharter1-Slanted-ts1--base.tfm +2020/08/06 | 1576 | fonts/xcharter/tfm/XCharter1-Slanted-ts1.tfm +2020/08/06 | 1700 | fonts/xcharter/tfm/XCharter-Bold-dnom-ly1--base.tfm +2020/08/06 | 1704 | fonts/xcharter/tfm/XCharter-Bold-dnom-ly1.tfm +2020/08/06 | 1328 | fonts/xcharter/tfm/XCharter-Bold-dnom-ot1.tfm +2020/08/06 | 1672 | fonts/xcharter/tfm/XCharter-Bold-dnom-t1--base.tfm +2020/08/06 | 1680 | fonts/xcharter/tfm/XCharter-Bold-dnom-t1.tfm +2020/08/06 | 1700 | fonts/xcharter/tfm/XCharter-Bold-inf-ly1--base.tfm +2020/08/06 | 1704 | fonts/xcharter/tfm/XCharter-Bold-inf-ly1.tfm +2020/08/06 | 1324 | fonts/xcharter/tfm/XCharter-Bold-inf-ot1.tfm +2020/08/06 | 1672 | fonts/xcharter/tfm/XCharter-Bold-inf-t1--base.tfm +2020/08/06 | 1680 | fonts/xcharter/tfm/XCharter-Bold-inf-t1.tfm +2020/08/06 | 1792 | fonts/xcharter/tfm/XCharter-BoldItalic-dnom-ly1--base.tfm +2020/08/06 | 1796 | fonts/xcharter/tfm/XCharter-BoldItalic-dnom-ly1.tfm +2020/08/06 | 1284 | fonts/xcharter/tfm/XCharter-BoldItalic-dnom-ot1.tfm +2020/08/06 | 1788 | fonts/xcharter/tfm/XCharter-BoldItalic-dnom-t1--base.tfm +2020/08/06 | 1796 | fonts/xcharter/tfm/XCharter-BoldItalic-dnom-t1.tfm +2020/08/06 | 1792 | fonts/xcharter/tfm/XCharter-BoldItalic-inf-ly1--base.tfm +2020/08/06 | 1796 | fonts/xcharter/tfm/XCharter-BoldItalic-inf-ly1.tfm +2020/08/06 | 1280 | fonts/xcharter/tfm/XCharter-BoldItalic-inf-ot1.tfm +2020/08/06 | 1792 | fonts/xcharter/tfm/XCharter-BoldItalic-inf-t1--base.tfm +2020/08/06 | 1800 | fonts/xcharter/tfm/XCharter-BoldItalic-inf-t1.tfm +2020/08/06 | 1788 | fonts/xcharter/tfm/XCharter-BoldItalic-numr-ly1--base.tfm +2020/08/06 | 1792 | fonts/xcharter/tfm/XCharter-BoldItalic-numr-ly1.tfm +2020/08/06 | 1284 | fonts/xcharter/tfm/XCharter-BoldItalic-numr-ot1.tfm +2020/08/06 | 1788 | fonts/xcharter/tfm/XCharter-BoldItalic-numr-t1--base.tfm +2020/08/06 | 1796 | fonts/xcharter/tfm/XCharter-BoldItalic-numr-t1.tfm +2020/08/06 | 1800 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-ly1--base.tfm +2020/08/06 | 1804 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-ly1.tfm +2020/08/06 | 1288 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-ot1.tfm +2020/08/06 | 1800 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-t1--base.tfm +2020/08/06 | 1808 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-t1.tfm +2020/08/06 | 1912 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-t2a--base.tfm +2020/08/06 | 1908 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-t2asrb--base.tfm +2020/08/06 | 1912 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-t2asrb.tfm +2020/08/06 | 1916 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-t2a.tfm +2020/08/06 | 1836 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-ly1--base.tfm +2020/08/06 | 25812 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-ly1.tfm +2020/08/06 | 6852 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-ot1G.tfm +2020/08/06 | 6776 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-ot1.tfm +2020/08/06 | 2880 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-ot2.tfm +2020/08/06 | 1840 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-ly1--base.tfm +2020/08/06 | 27204 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-ly1.tfm +2020/08/06 | 1328 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-ot1--base.tfm +2020/08/06 | 7632 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-ot1.tfm +2020/08/06 | 1792 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-t1--base.tfm +2020/08/06 | 25988 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-t1.tfm +2020/08/06 | 1964 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-t2a--base.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-t2asrb--base.tfm +2020/08/06 | 8988 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-t2asrb.tfm +2020/08/06 | 9004 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-t2a.tfm +2020/08/06 | 1804 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-t1--base.tfm +2020/08/06 | 23696 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-t1.tfm +2020/08/06 | 1908 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-t2a--base.tfm +2020/08/06 | 1904 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-t2asrb--base.tfm +2020/08/06 | 8092 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-t2asrb.tfm +2020/08/06 | 8100 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-t2a.tfm +2020/08/06 | 1864 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-ly1--base.tfm +2020/08/06 | 25840 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-ly1.tfm +2020/08/06 | 6808 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-ot1.tfm +2020/08/06 | 1872 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-ly1--base.tfm +2020/08/06 | 27236 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-ly1.tfm +2020/08/06 | 1364 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-ot1--base.tfm +2020/08/06 | 7668 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-ot1.tfm +2020/08/06 | 1824 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-t1--base.tfm +2020/08/06 | 26020 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-t1.tfm +2020/08/06 | 1988 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-t2a--base.tfm +2020/08/06 | 1976 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-t2asrb--base.tfm +2020/08/06 | 9012 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-t2asrb.tfm +2020/08/06 | 9028 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-t2a.tfm +2020/08/06 | 1828 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-t1--base.tfm +2020/08/06 | 23720 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-t1.tfm +2020/08/06 | 1932 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-t2a--base.tfm +2020/08/06 | 1928 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-t2asrb--base.tfm +2020/08/06 | 8116 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-t2asrb.tfm +2020/08/06 | 8124 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-t2a.tfm +2020/08/06 | 1460 | fonts/xcharter/tfm/XCharter-BoldItalic-ts1--base.tfm +2020/08/06 | 1472 | fonts/xcharter/tfm/XCharter-BoldItalic-ts1.tfm +2020/08/06 | 1700 | fonts/xcharter/tfm/XCharter-Bold-numr-ly1--base.tfm +2020/08/06 | 1704 | fonts/xcharter/tfm/XCharter-Bold-numr-ly1.tfm +2020/08/06 | 1328 | fonts/xcharter/tfm/XCharter-Bold-numr-ot1.tfm +2020/08/06 | 1672 | fonts/xcharter/tfm/XCharter-Bold-numr-t1--base.tfm +2020/08/06 | 1680 | fonts/xcharter/tfm/XCharter-Bold-numr-t1.tfm +2020/08/06 | 1948 | fonts/xcharter/tfm/XCharter-BoldSlanted-dnom-ly1--base.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-BoldSlanted-dnom-ly1.tfm +2020/08/06 | 1544 | fonts/xcharter/tfm/XCharter-BoldSlanted-dnom-ot1.tfm +2020/08/06 | 1940 | fonts/xcharter/tfm/XCharter-BoldSlanted-dnom-t1--base.tfm +2020/08/06 | 1948 | fonts/xcharter/tfm/XCharter-BoldSlanted-dnom-t1.tfm +2020/08/06 | 1948 | fonts/xcharter/tfm/XCharter-BoldSlanted-inf-ly1--base.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-BoldSlanted-inf-ly1.tfm +2020/08/06 | 1540 | fonts/xcharter/tfm/XCharter-BoldSlanted-inf-ot1.tfm +2020/08/06 | 1940 | fonts/xcharter/tfm/XCharter-BoldSlanted-inf-t1--base.tfm +2020/08/06 | 1948 | fonts/xcharter/tfm/XCharter-BoldSlanted-inf-t1.tfm +2020/08/06 | 1948 | fonts/xcharter/tfm/XCharter-BoldSlanted-numr-ly1--base.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-BoldSlanted-numr-ly1.tfm +2020/08/06 | 1544 | fonts/xcharter/tfm/XCharter-BoldSlanted-numr-ot1.tfm +2020/08/06 | 1940 | fonts/xcharter/tfm/XCharter-BoldSlanted-numr-t1--base.tfm +2020/08/06 | 1948 | fonts/xcharter/tfm/XCharter-BoldSlanted-numr-t1.tfm +2020/08/06 | 1960 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-ly1--base.tfm +2020/08/06 | 1964 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-ly1.tfm +2020/08/06 | 1552 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-ot1.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t1--base.tfm +2020/08/06 | 1960 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t1.tfm +2020/08/06 | 2088 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2a--base.tfm +2020/08/06 | 2088 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2asrb--base.tfm +2020/08/06 | 2092 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2asrb.tfm +2020/08/06 | 2092 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2a.tfm +2020/08/06 | 1988 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-ly1--base.tfm +2020/08/06 | 25452 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-ly1.tfm +2020/08/06 | 6552 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-ot1.tfm +2020/08/06 | 3480 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-ot2.tfm +2020/08/06 | 1960 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-ly1--base.tfm +2020/08/06 | 25268 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-ly1.tfm +2020/08/06 | 1544 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-ot1--base.tfm +2020/08/06 | 6896 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-ot1.tfm +2020/08/06 | 1908 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t1--base.tfm +2020/08/06 | 23992 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t1.tfm +2020/08/06 | 2116 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2a--base.tfm +2020/08/06 | 2120 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2asrb--base.tfm +2020/08/06 | 8316 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2asrb.tfm +2020/08/06 | 8324 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2a.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t1--base.tfm +2020/08/06 | 23332 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t1.tfm +2020/08/06 | 2084 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2a--base.tfm +2020/08/06 | 2084 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2asrb--base.tfm +2020/08/06 | 8128 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2asrb.tfm +2020/08/06 | 8136 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2a.tfm +2020/08/06 | 2020 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-ly1--base.tfm +2020/08/06 | 25484 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-ly1.tfm +2020/08/06 | 6584 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-ot1.tfm +2020/08/06 | 1992 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-ly1--base.tfm +2020/08/06 | 25300 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-ly1.tfm +2020/08/06 | 1572 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-ot1--base.tfm +2020/08/06 | 6924 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-ot1.tfm +2020/08/06 | 1940 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t1--base.tfm +2020/08/06 | 24024 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t1.tfm +2020/08/06 | 2132 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2a--base.tfm +2020/08/06 | 2136 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2asrb--base.tfm +2020/08/06 | 8332 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2asrb.tfm +2020/08/06 | 8340 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2a.tfm +2020/08/06 | 1984 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t1--base.tfm +2020/08/06 | 23364 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t1.tfm +2020/08/06 | 2112 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2a--base.tfm +2020/08/06 | 2112 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2asrb--base.tfm +2020/08/06 | 8156 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2asrb.tfm +2020/08/06 | 8164 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2a.tfm +2020/08/06 | 1540 | fonts/xcharter/tfm/XCharter-BoldSlanted-ts1--base.tfm +2020/08/06 | 1544 | fonts/xcharter/tfm/XCharter-BoldSlanted-ts1.tfm +2020/08/06 | 1712 | fonts/xcharter/tfm/XCharter-Bold-sup-ly1--base.tfm +2020/08/06 | 1716 | fonts/xcharter/tfm/XCharter-Bold-sup-ly1.tfm +2020/08/06 | 1336 | fonts/xcharter/tfm/XCharter-Bold-sup-ot1.tfm +2020/08/06 | 1684 | fonts/xcharter/tfm/XCharter-Bold-sup-t1--base.tfm +2020/08/06 | 1692 | fonts/xcharter/tfm/XCharter-Bold-sup-t1.tfm +2020/08/06 | 1836 | fonts/xcharter/tfm/XCharter-Bold-sup-t2a--base.tfm +2020/08/06 | 1836 | fonts/xcharter/tfm/XCharter-Bold-sup-t2asrb--base.tfm +2020/08/06 | 1840 | fonts/xcharter/tfm/XCharter-Bold-sup-t2asrb.tfm +2020/08/06 | 1840 | fonts/xcharter/tfm/XCharter-Bold-sup-t2a.tfm +2020/08/06 | 1744 | fonts/xcharter/tfm/XCharter-Bold-tlf-ly1--base.tfm +2020/08/06 | 26356 | fonts/xcharter/tfm/XCharter-Bold-tlf-ly1.tfm +2020/08/06 | 6928 | fonts/xcharter/tfm/XCharter-Bold-tlf-ot1G.tfm +2020/08/06 | 6956 | fonts/xcharter/tfm/XCharter-Bold-tlf-ot1.tfm +2020/08/06 | 3348 | fonts/xcharter/tfm/XCharter-Bold-tlf-ot2.tfm +2020/08/06 | 1696 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-ly1--base.tfm +2020/08/06 | 26256 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-ly1.tfm +2020/08/06 | 1308 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-ot1--base.tfm +2020/08/06 | 7384 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-ot1.tfm +2020/08/06 | 1628 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t1--base.tfm +2020/08/06 | 24952 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t1.tfm +2020/08/06 | 1844 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2a--base.tfm +2020/08/06 | 1848 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2asrb--base.tfm +2020/08/06 | 8704 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2asrb.tfm +2020/08/06 | 8712 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2a.tfm +2020/08/06 | 1688 | fonts/xcharter/tfm/XCharter-Bold-tlf-t1--base.tfm +2020/08/06 | 24172 | fonts/xcharter/tfm/XCharter-Bold-tlf-t1.tfm +2020/08/06 | 1832 | fonts/xcharter/tfm/XCharter-Bold-tlf-t2a--base.tfm +2020/08/06 | 1832 | fonts/xcharter/tfm/XCharter-Bold-tlf-t2asrb--base.tfm +2020/08/06 | 8448 | fonts/xcharter/tfm/XCharter-Bold-tlf-t2asrb.tfm +2020/08/06 | 8456 | fonts/xcharter/tfm/XCharter-Bold-tlf-t2a.tfm +2020/08/06 | 1780 | fonts/xcharter/tfm/XCharter-Bold-tosf-ly1--base.tfm +2020/08/06 | 26392 | fonts/xcharter/tfm/XCharter-Bold-tosf-ly1.tfm +2020/08/06 | 6996 | fonts/xcharter/tfm/XCharter-Bold-tosf-ot1.tfm +2020/08/06 | 1732 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-ly1--base.tfm +2020/08/06 | 26292 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-ly1.tfm +2020/08/06 | 1344 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-ot1--base.tfm +2020/08/06 | 7420 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-ot1.tfm +2020/08/06 | 1668 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t1--base.tfm +2020/08/06 | 24992 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t1.tfm +2020/08/06 | 1868 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2a--base.tfm +2020/08/06 | 1872 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2asrb--base.tfm +2020/08/06 | 8728 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2asrb.tfm +2020/08/06 | 8736 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2a.tfm +2020/08/06 | 1728 | fonts/xcharter/tfm/XCharter-Bold-tosf-t1--base.tfm +2020/08/06 | 24212 | fonts/xcharter/tfm/XCharter-Bold-tosf-t1.tfm +2020/08/06 | 1868 | fonts/xcharter/tfm/XCharter-Bold-tosf-t2a--base.tfm +2020/08/06 | 1868 | fonts/xcharter/tfm/XCharter-Bold-tosf-t2asrb--base.tfm +2020/08/06 | 8484 | fonts/xcharter/tfm/XCharter-Bold-tosf-t2asrb.tfm +2020/08/06 | 8492 | fonts/xcharter/tfm/XCharter-Bold-tosf-t2a.tfm +2020/08/06 | 1408 | fonts/xcharter/tfm/XCharter-Bold-ts1--base.tfm +2020/08/06 | 1420 | fonts/xcharter/tfm/XCharter-Bold-ts1.tfm 2014/11/04 | 776 | fonts/xcharter/tfm/XCharter-BolIta-alph.tfm 2014/11/04 | 272 | fonts/xcharter/tfm/XCharter-Bol-osf.tfm 2014/11/04 | 772 | fonts/xcharter/tfm/XCharter-Ita-alph.tfm -2020/06/28 | 1772 | fonts/xcharter/tfm/XCharter-Italic-dnom-ly1--base.tfm -2020/06/28 | 1776 | fonts/xcharter/tfm/XCharter-Italic-dnom-ly1.tfm -2020/06/28 | 1380 | fonts/xcharter/tfm/XCharter-Italic-dnom-ot1.tfm -2020/06/28 | 1768 | fonts/xcharter/tfm/XCharter-Italic-dnom-t1--base.tfm -2020/06/28 | 1776 | fonts/xcharter/tfm/XCharter-Italic-dnom-t1.tfm -2020/06/28 | 1780 | fonts/xcharter/tfm/XCharter-Italic-inf-ly1--base.tfm -2020/06/28 | 1784 | fonts/xcharter/tfm/XCharter-Italic-inf-ly1.tfm -2020/06/28 | 1384 | fonts/xcharter/tfm/XCharter-Italic-inf-ot1.tfm -2020/06/28 | 1772 | fonts/xcharter/tfm/XCharter-Italic-inf-t1--base.tfm -2020/06/28 | 1780 | fonts/xcharter/tfm/XCharter-Italic-inf-t1.tfm -2020/06/28 | 1772 | fonts/xcharter/tfm/XCharter-Italic-numr-ly1--base.tfm -2020/06/28 | 1776 | fonts/xcharter/tfm/XCharter-Italic-numr-ly1.tfm -2020/06/28 | 1380 | fonts/xcharter/tfm/XCharter-Italic-numr-ot1.tfm -2020/06/28 | 1768 | fonts/xcharter/tfm/XCharter-Italic-numr-t1--base.tfm -2020/06/28 | 1776 | fonts/xcharter/tfm/XCharter-Italic-numr-t1.tfm -2020/06/28 | 1784 | fonts/xcharter/tfm/XCharter-Italic-sup-ly1--base.tfm -2020/06/28 | 1788 | fonts/xcharter/tfm/XCharter-Italic-sup-ly1.tfm -2020/06/28 | 1392 | fonts/xcharter/tfm/XCharter-Italic-sup-ot1.tfm -2020/06/28 | 1780 | fonts/xcharter/tfm/XCharter-Italic-sup-t1--base.tfm -2020/06/28 | 1788 | fonts/xcharter/tfm/XCharter-Italic-sup-t1.tfm -2020/06/28 | 1812 | fonts/xcharter/tfm/XCharter-Italic-tlf-ly1--base.tfm -2020/06/28 | 25980 | fonts/xcharter/tfm/XCharter-Italic-tlf-ly1.tfm -2020/06/28 | 6680 | fonts/xcharter/tfm/XCharter-Italic-tlf-ot1G.tfm -2020/06/28 | 6712 | fonts/xcharter/tfm/XCharter-Italic-tlf-ot1.tfm -2020/06/28 | 3220 | fonts/xcharter/tfm/XCharter-Italic-tlf-ot2.tfm -2020/06/28 | 1828 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-ly1--base.tfm -2020/06/28 | 25944 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-ly1.tfm -2020/06/28 | 1404 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-ot1--base.tfm -2020/06/28 | 7176 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-ot1.tfm -2020/06/28 | 1788 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t1--base.tfm -2020/06/28 | 24704 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t1.tfm -2020/06/28 | 1780 | fonts/xcharter/tfm/XCharter-Italic-tlf-t1--base.tfm -2020/06/28 | 23860 | fonts/xcharter/tfm/XCharter-Italic-tlf-t1.tfm -2020/06/28 | 1892 | fonts/xcharter/tfm/XCharter-Italic-tlf-t2a--base.tfm -2020/06/28 | 1888 | fonts/xcharter/tfm/XCharter-Italic-tlf-t2asrb--base.tfm -2020/06/28 | 8116 | fonts/xcharter/tfm/XCharter-Italic-tlf-t2asrb.tfm -2020/06/28 | 8136 | fonts/xcharter/tfm/XCharter-Italic-tlf-t2a.tfm -2020/06/28 | 1848 | fonts/xcharter/tfm/XCharter-Italic-tosf-ly1--base.tfm -2020/06/28 | 26016 | fonts/xcharter/tfm/XCharter-Italic-tosf-ly1.tfm -2020/06/28 | 6752 | fonts/xcharter/tfm/XCharter-Italic-tosf-ot1.tfm -2020/06/28 | 1864 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-ly1--base.tfm -2020/06/28 | 25980 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-ly1.tfm -2020/06/28 | 1440 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-ot1--base.tfm -2020/06/28 | 7212 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-ot1.tfm -2020/06/28 | 1824 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t1--base.tfm -2020/06/28 | 24740 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t1.tfm -2020/06/28 | 1812 | fonts/xcharter/tfm/XCharter-Italic-tosf-t1--base.tfm -2020/06/28 | 23892 | fonts/xcharter/tfm/XCharter-Italic-tosf-t1.tfm -2020/06/28 | 1448 | fonts/xcharter/tfm/XCharter-Italic-ts1--base.tfm -2020/06/28 | 1460 | fonts/xcharter/tfm/XCharter-Italic-ts1.tfm +2020/08/06 | 1772 | fonts/xcharter/tfm/XCharter-Italic-dnom-ly1--base.tfm +2020/08/06 | 1776 | fonts/xcharter/tfm/XCharter-Italic-dnom-ly1.tfm +2020/08/06 | 1380 | fonts/xcharter/tfm/XCharter-Italic-dnom-ot1.tfm +2020/08/06 | 1768 | fonts/xcharter/tfm/XCharter-Italic-dnom-t1--base.tfm +2020/08/06 | 1776 | fonts/xcharter/tfm/XCharter-Italic-dnom-t1.tfm +2020/08/06 | 1780 | fonts/xcharter/tfm/XCharter-Italic-inf-ly1--base.tfm +2020/08/06 | 1784 | fonts/xcharter/tfm/XCharter-Italic-inf-ly1.tfm +2020/08/06 | 1384 | fonts/xcharter/tfm/XCharter-Italic-inf-ot1.tfm +2020/08/06 | 1772 | fonts/xcharter/tfm/XCharter-Italic-inf-t1--base.tfm +2020/08/06 | 1780 | fonts/xcharter/tfm/XCharter-Italic-inf-t1.tfm +2020/08/06 | 1772 | fonts/xcharter/tfm/XCharter-Italic-numr-ly1--base.tfm +2020/08/06 | 1776 | fonts/xcharter/tfm/XCharter-Italic-numr-ly1.tfm +2020/08/06 | 1380 | fonts/xcharter/tfm/XCharter-Italic-numr-ot1.tfm +2020/08/06 | 1768 | fonts/xcharter/tfm/XCharter-Italic-numr-t1--base.tfm +2020/08/06 | 1776 | fonts/xcharter/tfm/XCharter-Italic-numr-t1.tfm +2020/08/06 | 1784 | fonts/xcharter/tfm/XCharter-Italic-sup-ly1--base.tfm +2020/08/06 | 1788 | fonts/xcharter/tfm/XCharter-Italic-sup-ly1.tfm +2020/08/06 | 1392 | fonts/xcharter/tfm/XCharter-Italic-sup-ot1.tfm +2020/08/06 | 1780 | fonts/xcharter/tfm/XCharter-Italic-sup-t1--base.tfm +2020/08/06 | 1788 | fonts/xcharter/tfm/XCharter-Italic-sup-t1.tfm +2020/08/06 | 1912 | fonts/xcharter/tfm/XCharter-Italic-sup-t2a--base.tfm +2020/08/06 | 1908 | fonts/xcharter/tfm/XCharter-Italic-sup-t2asrb--base.tfm +2020/08/06 | 1912 | fonts/xcharter/tfm/XCharter-Italic-sup-t2asrb.tfm +2020/08/06 | 1916 | fonts/xcharter/tfm/XCharter-Italic-sup-t2a.tfm +2020/08/06 | 1812 | fonts/xcharter/tfm/XCharter-Italic-tlf-ly1--base.tfm +2020/08/06 | 25980 | fonts/xcharter/tfm/XCharter-Italic-tlf-ly1.tfm +2020/08/06 | 6680 | fonts/xcharter/tfm/XCharter-Italic-tlf-ot1G.tfm +2020/08/06 | 6712 | fonts/xcharter/tfm/XCharter-Italic-tlf-ot1.tfm +2020/08/06 | 3220 | fonts/xcharter/tfm/XCharter-Italic-tlf-ot2.tfm +2020/08/06 | 1828 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-ly1--base.tfm +2020/08/06 | 25944 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-ly1.tfm +2020/08/06 | 1404 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-ot1--base.tfm +2020/08/06 | 7176 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-ot1.tfm +2020/08/06 | 1788 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t1--base.tfm +2020/08/06 | 24704 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t1.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2a--base.tfm +2020/08/06 | 1940 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2asrb--base.tfm +2020/08/06 | 8672 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2asrb.tfm +2020/08/06 | 8700 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2a.tfm +2020/08/06 | 1780 | fonts/xcharter/tfm/XCharter-Italic-tlf-t1--base.tfm +2020/08/06 | 23860 | fonts/xcharter/tfm/XCharter-Italic-tlf-t1.tfm +2020/08/06 | 1908 | fonts/xcharter/tfm/XCharter-Italic-tlf-t2a--base.tfm +2020/08/06 | 1904 | fonts/xcharter/tfm/XCharter-Italic-tlf-t2asrb--base.tfm +2020/08/06 | 8132 | fonts/xcharter/tfm/XCharter-Italic-tlf-t2asrb.tfm +2020/08/06 | 8152 | fonts/xcharter/tfm/XCharter-Italic-tlf-t2a.tfm +2020/08/06 | 1848 | fonts/xcharter/tfm/XCharter-Italic-tosf-ly1--base.tfm +2020/08/06 | 26016 | fonts/xcharter/tfm/XCharter-Italic-tosf-ly1.tfm +2020/08/06 | 6752 | fonts/xcharter/tfm/XCharter-Italic-tosf-ot1.tfm +2020/08/06 | 1864 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-ly1--base.tfm +2020/08/06 | 25980 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-ly1.tfm +2020/08/06 | 1440 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-ot1--base.tfm +2020/08/06 | 7212 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-ot1.tfm +2020/08/06 | 1824 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t1--base.tfm +2020/08/06 | 24740 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t1.tfm +2020/08/06 | 1976 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2a--base.tfm +2020/08/06 | 1968 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2asrb--base.tfm +2020/08/06 | 8700 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2asrb.tfm +2020/08/06 | 8724 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2a.tfm +2020/08/06 | 1812 | fonts/xcharter/tfm/XCharter-Italic-tosf-t1--base.tfm +2020/08/06 | 23892 | fonts/xcharter/tfm/XCharter-Italic-tosf-t1.tfm +2020/08/06 | 1940 | fonts/xcharter/tfm/XCharter-Italic-tosf-t2a--base.tfm +2020/08/06 | 1936 | fonts/xcharter/tfm/XCharter-Italic-tosf-t2asrb--base.tfm +2020/08/06 | 8164 | fonts/xcharter/tfm/XCharter-Italic-tosf-t2asrb.tfm +2020/08/06 | 8184 | fonts/xcharter/tfm/XCharter-Italic-tosf-t2a.tfm +2020/08/06 | 1448 | fonts/xcharter/tfm/XCharter-Italic-ts1--base.tfm +2020/08/06 | 1460 | fonts/xcharter/tfm/XCharter-Italic-ts1.tfm 2019/11/21 | 1540 | fonts/xcharter/tfm/XCharterMathBMI.tfm 2019/09/24 | 1164 | fonts/xcharter/tfm/XCharterMathBRM.tfm 2019/11/21 | 1536 | fonts/xcharter/tfm/XCharterMathMI.tfm 2019/09/24 | 752 | fonts/xcharter/tfm/XCharterMathRM.tfm 2014/11/04 | 284 | fonts/xcharter/tfm/XCharter-osf.tfm -2020/06/28 | 1680 | fonts/xcharter/tfm/XCharter-Roman-dnom-ly1--base.tfm -2020/06/28 | 1684 | fonts/xcharter/tfm/XCharter-Roman-dnom-ly1.tfm -2020/06/28 | 1300 | fonts/xcharter/tfm/XCharter-Roman-dnom-ot1.tfm -2020/06/28 | 1652 | fonts/xcharter/tfm/XCharter-Roman-dnom-t1--base.tfm -2020/06/28 | 1660 | fonts/xcharter/tfm/XCharter-Roman-dnom-t1.tfm -2020/06/28 | 1684 | fonts/xcharter/tfm/XCharter-Roman-inf-ly1--base.tfm -2020/06/28 | 1688 | fonts/xcharter/tfm/XCharter-Roman-inf-ly1.tfm -2020/06/28 | 1300 | fonts/xcharter/tfm/XCharter-Roman-inf-ot1.tfm -2020/06/28 | 1656 | fonts/xcharter/tfm/XCharter-Roman-inf-t1--base.tfm -2020/06/28 | 1664 | fonts/xcharter/tfm/XCharter-Roman-inf-t1.tfm -2020/06/28 | 1680 | fonts/xcharter/tfm/XCharter-Roman-numr-ly1--base.tfm -2020/06/28 | 1684 | fonts/xcharter/tfm/XCharter-Roman-numr-ly1.tfm -2020/06/28 | 1300 | fonts/xcharter/tfm/XCharter-Roman-numr-ot1.tfm -2020/06/28 | 1652 | fonts/xcharter/tfm/XCharter-Roman-numr-t1--base.tfm -2020/06/28 | 1660 | fonts/xcharter/tfm/XCharter-Roman-numr-t1.tfm -2020/06/28 | 1844 | fonts/xcharter/tfm/XCharter-Roman-sup-ly1--base.tfm -2020/06/28 | 1848 | fonts/xcharter/tfm/XCharter-Roman-sup-ly1.tfm -2020/06/28 | 1360 | fonts/xcharter/tfm/XCharter-Roman-sup-ot1.tfm -2020/06/28 | 1840 | fonts/xcharter/tfm/XCharter-Roman-sup-t1--base.tfm -2020/06/28 | 1848 | fonts/xcharter/tfm/XCharter-Roman-sup-t1.tfm -2020/06/28 | 1996 | fonts/xcharter/tfm/XCharter-Roman-sup-t2a--base.tfm -2020/06/28 | 1992 | fonts/xcharter/tfm/XCharter-Roman-sup-t2asrb--base.tfm -2020/06/28 | 1992 | fonts/xcharter/tfm/XCharter-Roman-sup-t2asrb.tfm -2020/06/28 | 1996 | fonts/xcharter/tfm/XCharter-Roman-sup-t2a.tfm -2020/06/28 | 1728 | fonts/xcharter/tfm/XCharter-Roman-tlf-ly1--base.tfm -2020/06/28 | 26768 | fonts/xcharter/tfm/XCharter-Roman-tlf-ly1.tfm -2020/06/28 | 6952 | fonts/xcharter/tfm/XCharter-Roman-tlf-ot1G.tfm -2020/06/28 | 6984 | fonts/xcharter/tfm/XCharter-Roman-tlf-ot1.tfm -2020/06/28 | 3428 | fonts/xcharter/tfm/XCharter-Roman-tlf-ot2.tfm -2020/06/28 | 1692 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-ly1--base.tfm -2020/06/28 | 27400 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-ly1.tfm -2020/06/28 | 1296 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-ot1--base.tfm -2020/06/28 | 7536 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-ot1.tfm -2020/06/28 | 1620 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-t1--base.tfm -2020/06/28 | 26512 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-t1.tfm -2020/06/28 | 1860 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-t2a--base.tfm -2020/06/28 | 1860 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-t2asrb--base.tfm -2020/06/28 | 9064 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-t2asrb.tfm -2020/06/28 | 9068 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-t2a.tfm -2020/06/28 | 1668 | fonts/xcharter/tfm/XCharter-Roman-tlf-t1--base.tfm -2020/06/28 | 24984 | fonts/xcharter/tfm/XCharter-Roman-tlf-t1.tfm -2020/06/28 | 1840 | fonts/xcharter/tfm/XCharter-Roman-tlf-t2a--base.tfm -2020/06/28 | 1840 | fonts/xcharter/tfm/XCharter-Roman-tlf-t2asrb--base.tfm -2020/06/28 | 8524 | fonts/xcharter/tfm/XCharter-Roman-tlf-t2asrb.tfm -2020/06/28 | 8532 | fonts/xcharter/tfm/XCharter-Roman-tlf-t2a.tfm -2020/06/28 | 1764 | fonts/xcharter/tfm/XCharter-Roman-tosf-ly1--base.tfm -2020/06/28 | 26804 | fonts/xcharter/tfm/XCharter-Roman-tosf-ly1.tfm -2020/06/28 | 7020 | fonts/xcharter/tfm/XCharter-Roman-tosf-ot1.tfm -2020/06/28 | 1728 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-ly1--base.tfm -2020/06/28 | 27436 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-ly1.tfm -2020/06/28 | 1332 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-ot1--base.tfm -2020/06/28 | 7572 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-ot1.tfm -2020/06/28 | 1656 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-t1--base.tfm -2020/06/28 | 26548 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-t1.tfm -2020/06/28 | 1888 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-t2a--base.tfm -2020/06/28 | 1888 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-t2asrb--base.tfm -2020/06/28 | 9092 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-t2asrb.tfm -2020/06/28 | 9096 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-t2a.tfm -2020/06/28 | 1704 | fonts/xcharter/tfm/XCharter-Roman-tosf-t1--base.tfm -2020/06/28 | 25020 | fonts/xcharter/tfm/XCharter-Roman-tosf-t1.tfm -2020/06/28 | 1872 | fonts/xcharter/tfm/XCharter-Roman-tosf-t2a--base.tfm -2020/06/28 | 1872 | fonts/xcharter/tfm/XCharter-Roman-tosf-t2asrb--base.tfm -2020/06/28 | 8556 | fonts/xcharter/tfm/XCharter-Roman-tosf-t2asrb.tfm -2020/06/28 | 8564 | fonts/xcharter/tfm/XCharter-Roman-tosf-t2a.tfm -2020/06/28 | 1524 | fonts/xcharter/tfm/XCharter-Roman-ts1--base.tfm -2020/06/28 | 1544 | fonts/xcharter/tfm/XCharter-Roman-ts1.tfm -2020/06/28 | 1948 | fonts/xcharter/tfm/XCharter-Slanted-dnom-ly1--base.tfm -2020/06/28 | 1952 | fonts/xcharter/tfm/XCharter-Slanted-dnom-ly1.tfm -2020/06/28 | 1536 | fonts/xcharter/tfm/XCharter-Slanted-dnom-ot1.tfm -2020/06/28 | 1920 | fonts/xcharter/tfm/XCharter-Slanted-dnom-t1--base.tfm -2020/06/28 | 1928 | fonts/xcharter/tfm/XCharter-Slanted-dnom-t1.tfm -2020/06/28 | 1948 | fonts/xcharter/tfm/XCharter-Slanted-inf-ly1--base.tfm -2020/06/28 | 1952 | fonts/xcharter/tfm/XCharter-Slanted-inf-ly1.tfm -2020/06/28 | 1536 | fonts/xcharter/tfm/XCharter-Slanted-inf-ot1.tfm -2020/06/28 | 1920 | fonts/xcharter/tfm/XCharter-Slanted-inf-t1--base.tfm -2020/06/28 | 1928 | fonts/xcharter/tfm/XCharter-Slanted-inf-t1.tfm -2020/06/28 | 1948 | fonts/xcharter/tfm/XCharter-Slanted-numr-ly1--base.tfm -2020/06/28 | 1952 | fonts/xcharter/tfm/XCharter-Slanted-numr-ly1.tfm -2020/06/28 | 1536 | fonts/xcharter/tfm/XCharter-Slanted-numr-ot1.tfm -2020/06/28 | 1920 | fonts/xcharter/tfm/XCharter-Slanted-numr-t1--base.tfm -2020/06/28 | 1928 | fonts/xcharter/tfm/XCharter-Slanted-numr-t1.tfm -2020/06/28 | 1964 | fonts/xcharter/tfm/XCharter-Slanted-sup-ly1--base.tfm -2020/06/28 | 1968 | fonts/xcharter/tfm/XCharter-Slanted-sup-ly1.tfm -2020/06/28 | 1552 | fonts/xcharter/tfm/XCharter-Slanted-sup-ot1.tfm -2020/06/28 | 1936 | fonts/xcharter/tfm/XCharter-Slanted-sup-t1--base.tfm -2020/06/28 | 1944 | fonts/xcharter/tfm/XCharter-Slanted-sup-t1.tfm -2020/06/28 | 1992 | fonts/xcharter/tfm/XCharter-Slanted-tlf-ly1--base.tfm -2020/06/28 | 25640 | fonts/xcharter/tfm/XCharter-Slanted-tlf-ly1.tfm -2020/06/28 | 6636 | fonts/xcharter/tfm/XCharter-Slanted-tlf-ot1.tfm -2020/06/28 | 3556 | fonts/xcharter/tfm/XCharter-Slanted-tlf-ot2.tfm -2020/06/28 | 1944 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-ly1--base.tfm -2020/06/28 | 26224 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-ly1.tfm -2020/06/28 | 1528 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-ot1--base.tfm -2020/06/28 | 7112 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-ot1.tfm -2020/06/28 | 1884 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t1--base.tfm -2020/06/28 | 24976 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t1.tfm -2020/06/28 | 1936 | fonts/xcharter/tfm/XCharter-Slanted-tlf-t1--base.tfm -2020/06/28 | 23536 | fonts/xcharter/tfm/XCharter-Slanted-tlf-t1.tfm -2020/06/28 | 2092 | fonts/xcharter/tfm/XCharter-Slanted-tlf-t2a--base.tfm -2020/06/28 | 2092 | fonts/xcharter/tfm/XCharter-Slanted-tlf-t2asrb--base.tfm -2020/06/28 | 8236 | fonts/xcharter/tfm/XCharter-Slanted-tlf-t2asrb.tfm -2020/06/28 | 8244 | fonts/xcharter/tfm/XCharter-Slanted-tlf-t2a.tfm -2020/06/28 | 2024 | fonts/xcharter/tfm/XCharter-Slanted-tosf-ly1--base.tfm -2020/06/28 | 25672 | fonts/xcharter/tfm/XCharter-Slanted-tosf-ly1.tfm -2020/06/28 | 6668 | fonts/xcharter/tfm/XCharter-Slanted-tosf-ot1.tfm -2020/06/28 | 1980 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-ly1--base.tfm -2020/06/28 | 26260 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-ly1.tfm -2020/06/28 | 1564 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-ot1--base.tfm -2020/06/28 | 7148 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-ot1.tfm -2020/06/28 | 1920 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t1--base.tfm -2020/06/28 | 25012 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t1.tfm -2020/06/28 | 1968 | fonts/xcharter/tfm/XCharter-Slanted-tosf-t1--base.tfm -2020/06/28 | 23568 | fonts/xcharter/tfm/XCharter-Slanted-tosf-t1.tfm -2020/06/28 | 1540 | fonts/xcharter/tfm/XCharter-Slanted-ts1--base.tfm -2020/06/28 | 1548 | fonts/xcharter/tfm/XCharter-Slanted-ts1.tfm +2020/08/06 | 1680 | fonts/xcharter/tfm/XCharter-Roman-dnom-ly1--base.tfm +2020/08/06 | 1684 | fonts/xcharter/tfm/XCharter-Roman-dnom-ly1.tfm +2020/08/06 | 1300 | fonts/xcharter/tfm/XCharter-Roman-dnom-ot1.tfm +2020/08/06 | 1652 | fonts/xcharter/tfm/XCharter-Roman-dnom-t1--base.tfm +2020/08/06 | 1660 | fonts/xcharter/tfm/XCharter-Roman-dnom-t1.tfm +2020/08/06 | 1684 | fonts/xcharter/tfm/XCharter-Roman-inf-ly1--base.tfm +2020/08/06 | 1688 | fonts/xcharter/tfm/XCharter-Roman-inf-ly1.tfm +2020/08/06 | 1300 | fonts/xcharter/tfm/XCharter-Roman-inf-ot1.tfm +2020/08/06 | 1656 | fonts/xcharter/tfm/XCharter-Roman-inf-t1--base.tfm +2020/08/06 | 1664 | fonts/xcharter/tfm/XCharter-Roman-inf-t1.tfm +2020/08/06 | 1680 | fonts/xcharter/tfm/XCharter-Roman-numr-ly1--base.tfm +2020/08/06 | 1684 | fonts/xcharter/tfm/XCharter-Roman-numr-ly1.tfm +2020/08/06 | 1300 | fonts/xcharter/tfm/XCharter-Roman-numr-ot1.tfm +2020/08/06 | 1652 | fonts/xcharter/tfm/XCharter-Roman-numr-t1--base.tfm +2020/08/06 | 1660 | fonts/xcharter/tfm/XCharter-Roman-numr-t1.tfm +2020/08/06 | 1844 | fonts/xcharter/tfm/XCharter-Roman-sup-ly1--base.tfm +2020/08/06 | 1848 | fonts/xcharter/tfm/XCharter-Roman-sup-ly1.tfm +2020/08/06 | 1360 | fonts/xcharter/tfm/XCharter-Roman-sup-ot1.tfm +2020/08/06 | 1840 | fonts/xcharter/tfm/XCharter-Roman-sup-t1--base.tfm +2020/08/06 | 1848 | fonts/xcharter/tfm/XCharter-Roman-sup-t1.tfm +2020/08/06 | 1996 | fonts/xcharter/tfm/XCharter-Roman-sup-t2a--base.tfm +2020/08/06 | 1992 | fonts/xcharter/tfm/XCharter-Roman-sup-t2asrb--base.tfm +2020/08/06 | 1992 | fonts/xcharter/tfm/XCharter-Roman-sup-t2asrb.tfm +2020/08/06 | 1996 | fonts/xcharter/tfm/XCharter-Roman-sup-t2a.tfm +2020/08/06 | 1728 | fonts/xcharter/tfm/XCharter-Roman-tlf-ly1--base.tfm +2020/08/06 | 26768 | fonts/xcharter/tfm/XCharter-Roman-tlf-ly1.tfm +2020/08/06 | 6952 | fonts/xcharter/tfm/XCharter-Roman-tlf-ot1G.tfm +2020/08/06 | 6984 | fonts/xcharter/tfm/XCharter-Roman-tlf-ot1.tfm +2020/08/06 | 3428 | fonts/xcharter/tfm/XCharter-Roman-tlf-ot2.tfm +2020/08/06 | 1692 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-ly1--base.tfm +2020/08/06 | 27400 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-ly1.tfm +2020/08/06 | 1296 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-ot1--base.tfm +2020/08/06 | 7536 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-ot1.tfm +2020/08/06 | 1620 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-t1--base.tfm +2020/08/06 | 26512 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-t1.tfm +2020/08/06 | 1860 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-t2a--base.tfm +2020/08/06 | 1860 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-t2asrb--base.tfm +2020/08/06 | 9064 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-t2asrb.tfm +2020/08/06 | 9068 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-t2a.tfm +2020/08/06 | 1668 | fonts/xcharter/tfm/XCharter-Roman-tlf-t1--base.tfm +2020/08/06 | 24984 | fonts/xcharter/tfm/XCharter-Roman-tlf-t1.tfm +2020/08/06 | 1840 | fonts/xcharter/tfm/XCharter-Roman-tlf-t2a--base.tfm +2020/08/06 | 1840 | fonts/xcharter/tfm/XCharter-Roman-tlf-t2asrb--base.tfm +2020/08/06 | 8524 | fonts/xcharter/tfm/XCharter-Roman-tlf-t2asrb.tfm +2020/08/06 | 8532 | fonts/xcharter/tfm/XCharter-Roman-tlf-t2a.tfm +2020/08/06 | 1764 | fonts/xcharter/tfm/XCharter-Roman-tosf-ly1--base.tfm +2020/08/06 | 26804 | fonts/xcharter/tfm/XCharter-Roman-tosf-ly1.tfm +2020/08/06 | 7020 | fonts/xcharter/tfm/XCharter-Roman-tosf-ot1.tfm +2020/08/06 | 1728 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-ly1--base.tfm +2020/08/06 | 27436 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-ly1.tfm +2020/08/06 | 1332 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-ot1--base.tfm +2020/08/06 | 7572 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-ot1.tfm +2020/08/06 | 1656 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-t1--base.tfm +2020/08/06 | 26548 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-t1.tfm +2020/08/06 | 1888 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-t2a--base.tfm +2020/08/06 | 1888 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-t2asrb--base.tfm +2020/08/06 | 9092 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-t2asrb.tfm +2020/08/06 | 9096 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-t2a.tfm +2020/08/06 | 1704 | fonts/xcharter/tfm/XCharter-Roman-tosf-t1--base.tfm +2020/08/06 | 25020 | fonts/xcharter/tfm/XCharter-Roman-tosf-t1.tfm +2020/08/06 | 1872 | fonts/xcharter/tfm/XCharter-Roman-tosf-t2a--base.tfm +2020/08/06 | 1872 | fonts/xcharter/tfm/XCharter-Roman-tosf-t2asrb--base.tfm +2020/08/06 | 8556 | fonts/xcharter/tfm/XCharter-Roman-tosf-t2asrb.tfm +2020/08/06 | 8564 | fonts/xcharter/tfm/XCharter-Roman-tosf-t2a.tfm +2020/08/06 | 1524 | fonts/xcharter/tfm/XCharter-Roman-ts1--base.tfm +2020/08/06 | 1544 | fonts/xcharter/tfm/XCharter-Roman-ts1.tfm +2020/08/06 | 1948 | fonts/xcharter/tfm/XCharter-Slanted-dnom-ly1--base.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-Slanted-dnom-ly1.tfm +2020/08/06 | 1536 | fonts/xcharter/tfm/XCharter-Slanted-dnom-ot1.tfm +2020/08/06 | 1920 | fonts/xcharter/tfm/XCharter-Slanted-dnom-t1--base.tfm +2020/08/06 | 1928 | fonts/xcharter/tfm/XCharter-Slanted-dnom-t1.tfm +2020/08/06 | 1948 | fonts/xcharter/tfm/XCharter-Slanted-inf-ly1--base.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-Slanted-inf-ly1.tfm +2020/08/06 | 1536 | fonts/xcharter/tfm/XCharter-Slanted-inf-ot1.tfm +2020/08/06 | 1920 | fonts/xcharter/tfm/XCharter-Slanted-inf-t1--base.tfm +2020/08/06 | 1928 | fonts/xcharter/tfm/XCharter-Slanted-inf-t1.tfm +2020/08/06 | 1948 | fonts/xcharter/tfm/XCharter-Slanted-numr-ly1--base.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-Slanted-numr-ly1.tfm +2020/08/06 | 1536 | fonts/xcharter/tfm/XCharter-Slanted-numr-ot1.tfm +2020/08/06 | 1920 | fonts/xcharter/tfm/XCharter-Slanted-numr-t1--base.tfm +2020/08/06 | 1928 | fonts/xcharter/tfm/XCharter-Slanted-numr-t1.tfm +2020/08/06 | 1964 | fonts/xcharter/tfm/XCharter-Slanted-sup-ly1--base.tfm +2020/08/06 | 1968 | fonts/xcharter/tfm/XCharter-Slanted-sup-ly1.tfm +2020/08/06 | 1552 | fonts/xcharter/tfm/XCharter-Slanted-sup-ot1.tfm +2020/08/06 | 1936 | fonts/xcharter/tfm/XCharter-Slanted-sup-t1--base.tfm +2020/08/06 | 1944 | fonts/xcharter/tfm/XCharter-Slanted-sup-t1.tfm +2020/08/06 | 2112 | fonts/xcharter/tfm/XCharter-Slanted-sup-t2a--base.tfm +2020/08/06 | 2112 | fonts/xcharter/tfm/XCharter-Slanted-sup-t2asrb--base.tfm +2020/08/06 | 2116 | fonts/xcharter/tfm/XCharter-Slanted-sup-t2asrb.tfm +2020/08/06 | 2116 | fonts/xcharter/tfm/XCharter-Slanted-sup-t2a.tfm +2020/08/06 | 1992 | fonts/xcharter/tfm/XCharter-Slanted-tlf-ly1--base.tfm +2020/08/06 | 25640 | fonts/xcharter/tfm/XCharter-Slanted-tlf-ly1.tfm +2020/08/06 | 6636 | fonts/xcharter/tfm/XCharter-Slanted-tlf-ot1.tfm +2020/08/06 | 3556 | fonts/xcharter/tfm/XCharter-Slanted-tlf-ot2.tfm +2020/08/06 | 1944 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-ly1--base.tfm +2020/08/06 | 26224 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-ly1.tfm +2020/08/06 | 1528 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-ot1--base.tfm +2020/08/06 | 7112 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-ot1.tfm +2020/08/06 | 1884 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t1--base.tfm +2020/08/06 | 24976 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t1.tfm +2020/08/06 | 2100 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2a--base.tfm +2020/08/06 | 2100 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2asrb--base.tfm +2020/08/06 | 8676 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2asrb.tfm +2020/08/06 | 8680 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2a.tfm +2020/08/06 | 1936 | fonts/xcharter/tfm/XCharter-Slanted-tlf-t1--base.tfm +2020/08/06 | 23536 | fonts/xcharter/tfm/XCharter-Slanted-tlf-t1.tfm +2020/08/06 | 2104 | fonts/xcharter/tfm/XCharter-Slanted-tlf-t2a--base.tfm +2020/08/06 | 2104 | fonts/xcharter/tfm/XCharter-Slanted-tlf-t2asrb--base.tfm +2020/08/06 | 8252 | fonts/xcharter/tfm/XCharter-Slanted-tlf-t2asrb.tfm +2020/08/06 | 8260 | fonts/xcharter/tfm/XCharter-Slanted-tlf-t2a.tfm +2020/08/06 | 2024 | fonts/xcharter/tfm/XCharter-Slanted-tosf-ly1--base.tfm +2020/08/06 | 25672 | fonts/xcharter/tfm/XCharter-Slanted-tosf-ly1.tfm +2020/08/06 | 6668 | fonts/xcharter/tfm/XCharter-Slanted-tosf-ot1.tfm +2020/08/06 | 1980 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-ly1--base.tfm +2020/08/06 | 26260 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-ly1.tfm +2020/08/06 | 1564 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-ot1--base.tfm +2020/08/06 | 7148 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-ot1.tfm +2020/08/06 | 1920 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t1--base.tfm +2020/08/06 | 25012 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t1.tfm +2020/08/06 | 2128 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2a--base.tfm +2020/08/06 | 2128 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2asrb--base.tfm +2020/08/06 | 8704 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2asrb.tfm +2020/08/06 | 8708 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2a.tfm +2020/08/06 | 1968 | fonts/xcharter/tfm/XCharter-Slanted-tosf-t1--base.tfm +2020/08/06 | 23568 | fonts/xcharter/tfm/XCharter-Slanted-tosf-t1.tfm +2020/08/06 | 2132 | fonts/xcharter/tfm/XCharter-Slanted-tosf-t2a--base.tfm +2020/08/06 | 2132 | fonts/xcharter/tfm/XCharter-Slanted-tosf-t2asrb--base.tfm +2020/08/06 | 8280 | fonts/xcharter/tfm/XCharter-Slanted-tosf-t2asrb.tfm +2020/08/06 | 8288 | fonts/xcharter/tfm/XCharter-Slanted-tosf-t2a.tfm +2020/08/06 | 1540 | fonts/xcharter/tfm/XCharter-Slanted-ts1--base.tfm +2020/08/06 | 1548 | fonts/xcharter/tfm/XCharter-Slanted-ts1.tfm 2019/11/22 | 3256 | fonts/xcharter/tfm/zchbmi0.tfm 2019/11/22 | 3256 | fonts/xcharter/tfm/zchbmi2.tfm 2019/11/22 | 3256 | fonts/xcharter/tfm/zchbmi3.tfm @@ -127324,207 +127447,261 @@ 2019/09/24 | 14856 | fonts/xcharter/type1/XCharterMathRM.pfb 2020/05/25 | 231934 | fonts/xcharter/type1/XCharter-Roman.pfb 2020/05/25 | 204227 | fonts/xcharter/type1/XCharter-Slanted.pfb -2020/06/28 | 1880 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-ly1.vf -2020/06/28 | 964 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-ot1.vf -2020/06/28 | 1848 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-sc-ly1.vf -2020/06/28 | 940 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-sc-ot1.vf -2020/06/28 | 1872 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-sc-t1.vf -2020/06/28 | 1648 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-sc-t2asrb.vf -2020/06/28 | 1644 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-sc-t2a.vf -2020/06/28 | 1876 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-t1.vf -2020/06/28 | 1668 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-t2asrb.vf -2020/06/28 | 1660 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-t2a.vf -2020/06/28 | 1880 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-ly1.vf -2020/06/28 | 1032 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-ot1.vf -2020/06/28 | 1848 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-ly1.vf -2020/06/28 | 1012 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-ot1.vf -2020/06/28 | 1876 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-t1.vf -2020/06/28 | 1876 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-t1.vf -2020/06/28 | 1860 | fonts/xcharter/vf/XCharter1-Bold-tosf-ly1.vf -2020/06/28 | 1012 | fonts/xcharter/vf/XCharter1-Bold-tosf-ot1.vf -2020/06/28 | 1828 | fonts/xcharter/vf/XCharter1-Bold-tosf-sc-ly1.vf -2020/06/28 | 988 | fonts/xcharter/vf/XCharter1-Bold-tosf-sc-ot1.vf -2020/06/28 | 1856 | fonts/xcharter/vf/XCharter1-Bold-tosf-sc-t1.vf -2020/06/28 | 1856 | fonts/xcharter/vf/XCharter1-Bold-tosf-t1.vf -2020/06/28 | 1868 | fonts/xcharter/vf/XCharter1-Italic-tosf-ly1.vf -2020/06/28 | 1016 | fonts/xcharter/vf/XCharter1-Italic-tosf-ot1.vf -2020/06/28 | 1836 | fonts/xcharter/vf/XCharter1-Italic-tosf-sc-ly1.vf -2020/06/28 | 996 | fonts/xcharter/vf/XCharter1-Italic-tosf-sc-ot1.vf -2020/06/28 | 1860 | fonts/xcharter/vf/XCharter1-Italic-tosf-sc-t1.vf -2020/06/28 | 1864 | fonts/xcharter/vf/XCharter1-Italic-tosf-t1.vf -2020/06/28 | 1864 | fonts/xcharter/vf/XCharter1-Roman-tosf-ly1.vf -2020/06/28 | 1016 | fonts/xcharter/vf/XCharter1-Roman-tosf-ot1.vf -2020/06/28 | 1832 | fonts/xcharter/vf/XCharter1-Roman-tosf-sc-ly1.vf -2020/06/28 | 992 | fonts/xcharter/vf/XCharter1-Roman-tosf-sc-ot1.vf -2020/06/28 | 1860 | fonts/xcharter/vf/XCharter1-Roman-tosf-sc-t1.vf -2020/06/28 | 1636 | fonts/xcharter/vf/XCharter1-Roman-tosf-sc-t2asrb.vf -2020/06/28 | 1628 | fonts/xcharter/vf/XCharter1-Roman-tosf-sc-t2a.vf -2020/06/28 | 1860 | fonts/xcharter/vf/XCharter1-Roman-tosf-t1.vf -2020/06/28 | 1652 | fonts/xcharter/vf/XCharter1-Roman-tosf-t2asrb.vf -2020/06/28 | 1648 | fonts/xcharter/vf/XCharter1-Roman-tosf-t2a.vf -2020/06/28 | 1868 | fonts/xcharter/vf/XCharter1-Slanted-tosf-ly1.vf -2020/06/28 | 1020 | fonts/xcharter/vf/XCharter1-Slanted-tosf-ot1.vf -2020/06/28 | 1836 | fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-ly1.vf -2020/06/28 | 1000 | fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-ot1.vf -2020/06/28 | 1864 | fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-t1.vf -2020/06/28 | 1864 | fonts/xcharter/vf/XCharter1-Slanted-tosf-t1.vf -2020/06/28 | 1668 | fonts/xcharter/vf/XCharter-Bold-dnom-ly1.vf -2020/06/28 | 1700 | fonts/xcharter/vf/XCharter-Bold-dnom-t1.vf -2020/06/28 | 1668 | fonts/xcharter/vf/XCharter-Bold-inf-ly1.vf -2020/06/28 | 1696 | fonts/xcharter/vf/XCharter-Bold-inf-t1.vf -2020/06/28 | 1676 | fonts/xcharter/vf/XCharter-BoldItalic-dnom-ly1.vf -2020/06/28 | 1704 | fonts/xcharter/vf/XCharter-BoldItalic-dnom-t1.vf -2020/06/28 | 1676 | fonts/xcharter/vf/XCharter-BoldItalic-inf-ly1.vf -2020/06/28 | 1704 | fonts/xcharter/vf/XCharter-BoldItalic-inf-t1.vf -2020/06/28 | 1676 | fonts/xcharter/vf/XCharter-BoldItalic-numr-ly1.vf -2020/06/28 | 1704 | fonts/xcharter/vf/XCharter-BoldItalic-numr-t1.vf -2020/06/28 | 1676 | fonts/xcharter/vf/XCharter-BoldItalic-sup-ly1.vf -2020/06/28 | 1704 | fonts/xcharter/vf/XCharter-BoldItalic-sup-t1.vf -2020/06/28 | 1524 | fonts/xcharter/vf/XCharter-BoldItalic-sup-t2asrb.vf -2020/06/28 | 1520 | fonts/xcharter/vf/XCharter-BoldItalic-sup-t2a.vf -2020/06/28 | 1728 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-ly1.vf -2020/06/28 | 984 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-ot1G.vf -2020/06/28 | 1860 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-sc-ly1.vf -2020/06/28 | 956 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-sc-ot1.vf -2020/06/28 | 1888 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-sc-t1.vf -2020/06/28 | 1524 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-sc-t2asrb.vf -2020/06/28 | 1524 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-sc-t2a.vf -2020/06/28 | 1736 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-t1.vf -2020/06/28 | 1548 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-t2asrb.vf -2020/06/28 | 1544 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-t2a.vf -2020/06/28 | 1728 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-ly1.vf -2020/06/28 | 1864 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-sc-ly1.vf -2020/06/28 | 960 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-sc-ot1.vf -2020/06/28 | 1892 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-sc-t1.vf -2020/06/28 | 1528 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-sc-t2asrb.vf -2020/06/28 | 1524 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-sc-t2a.vf -2020/06/28 | 1736 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-t1.vf -2020/06/28 | 1548 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-t2asrb.vf -2020/06/28 | 1544 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-t2a.vf -2020/06/28 | 652 | fonts/xcharter/vf/XCharter-BoldItalic-ts1.vf -2020/06/28 | 1668 | fonts/xcharter/vf/XCharter-Bold-numr-ly1.vf -2020/06/28 | 1700 | fonts/xcharter/vf/XCharter-Bold-numr-t1.vf -2020/06/28 | 1676 | fonts/xcharter/vf/XCharter-BoldSlanted-dnom-ly1.vf -2020/06/28 | 1704 | fonts/xcharter/vf/XCharter-BoldSlanted-dnom-t1.vf -2020/06/28 | 1676 | fonts/xcharter/vf/XCharter-BoldSlanted-inf-ly1.vf -2020/06/28 | 1704 | fonts/xcharter/vf/XCharter-BoldSlanted-inf-t1.vf -2020/06/28 | 1676 | fonts/xcharter/vf/XCharter-BoldSlanted-numr-ly1.vf -2020/06/28 | 1704 | fonts/xcharter/vf/XCharter-BoldSlanted-numr-t1.vf -2020/06/28 | 1676 | fonts/xcharter/vf/XCharter-BoldSlanted-sup-ly1.vf -2020/06/28 | 1704 | fonts/xcharter/vf/XCharter-BoldSlanted-sup-t1.vf -2020/06/28 | 1728 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-ly1.vf -2020/06/28 | 1864 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-ly1.vf -2020/06/28 | 1024 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-ot1.vf -2020/06/28 | 1892 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-t1.vf -2020/06/28 | 1736 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-t1.vf -2020/06/28 | 1524 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-t2asrb.vf -2020/06/28 | 1520 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-t2a.vf -2020/06/28 | 1732 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-ly1.vf -2020/06/28 | 1868 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-ly1.vf -2020/06/28 | 1028 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-ot1.vf -2020/06/28 | 1892 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-t1.vf -2020/06/28 | 1740 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-t1.vf -2020/06/28 | 644 | fonts/xcharter/vf/XCharter-BoldSlanted-ts1.vf -2020/06/28 | 1668 | fonts/xcharter/vf/XCharter-Bold-sup-ly1.vf -2020/06/28 | 1696 | fonts/xcharter/vf/XCharter-Bold-sup-t1.vf -2020/06/28 | 1724 | fonts/xcharter/vf/XCharter-Bold-tlf-ly1.vf -2020/06/28 | 832 | fonts/xcharter/vf/XCharter-Bold-tlf-ot1G.vf -2020/06/28 | 1844 | fonts/xcharter/vf/XCharter-Bold-tlf-sc-ly1.vf -2020/06/28 | 1004 | fonts/xcharter/vf/XCharter-Bold-tlf-sc-ot1.vf -2020/06/28 | 1872 | fonts/xcharter/vf/XCharter-Bold-tlf-sc-t1.vf -2020/06/28 | 1732 | fonts/xcharter/vf/XCharter-Bold-tlf-t1.vf -2020/06/28 | 1516 | fonts/xcharter/vf/XCharter-Bold-tlf-t2asrb.vf -2020/06/28 | 1512 | fonts/xcharter/vf/XCharter-Bold-tlf-t2a.vf -2020/06/28 | 1724 | fonts/xcharter/vf/XCharter-Bold-tosf-ly1.vf -2020/06/28 | 1844 | fonts/xcharter/vf/XCharter-Bold-tosf-sc-ly1.vf -2020/06/28 | 1008 | fonts/xcharter/vf/XCharter-Bold-tosf-sc-ot1.vf -2020/06/28 | 1872 | fonts/xcharter/vf/XCharter-Bold-tosf-sc-t1.vf -2020/06/28 | 1732 | fonts/xcharter/vf/XCharter-Bold-tosf-t1.vf -2020/06/28 | 652 | fonts/xcharter/vf/XCharter-Bold-ts1.vf -2020/06/28 | 1672 | fonts/xcharter/vf/XCharter-Italic-dnom-ly1.vf -2020/06/28 | 1700 | fonts/xcharter/vf/XCharter-Italic-dnom-t1.vf -2020/06/28 | 1672 | fonts/xcharter/vf/XCharter-Italic-inf-ly1.vf -2020/06/28 | 1700 | fonts/xcharter/vf/XCharter-Italic-inf-t1.vf -2020/06/28 | 1672 | fonts/xcharter/vf/XCharter-Italic-numr-ly1.vf -2020/06/28 | 1700 | fonts/xcharter/vf/XCharter-Italic-numr-t1.vf -2020/06/28 | 1672 | fonts/xcharter/vf/XCharter-Italic-sup-ly1.vf -2020/06/28 | 1700 | fonts/xcharter/vf/XCharter-Italic-sup-t1.vf -2020/06/28 | 1724 | fonts/xcharter/vf/XCharter-Italic-tlf-ly1.vf -2020/06/28 | 836 | fonts/xcharter/vf/XCharter-Italic-tlf-ot1G.vf -2020/06/28 | 1848 | fonts/xcharter/vf/XCharter-Italic-tlf-sc-ly1.vf -2020/06/28 | 1012 | fonts/xcharter/vf/XCharter-Italic-tlf-sc-ot1.vf -2020/06/28 | 1876 | fonts/xcharter/vf/XCharter-Italic-tlf-sc-t1.vf -2020/06/28 | 1732 | fonts/xcharter/vf/XCharter-Italic-tlf-t1.vf -2020/06/28 | 1520 | fonts/xcharter/vf/XCharter-Italic-tlf-t2asrb.vf -2020/06/28 | 1516 | fonts/xcharter/vf/XCharter-Italic-tlf-t2a.vf -2020/06/28 | 1724 | fonts/xcharter/vf/XCharter-Italic-tosf-ly1.vf -2020/06/28 | 1852 | fonts/xcharter/vf/XCharter-Italic-tosf-sc-ly1.vf -2020/06/28 | 1012 | fonts/xcharter/vf/XCharter-Italic-tosf-sc-ot1.vf -2020/06/28 | 1880 | fonts/xcharter/vf/XCharter-Italic-tosf-sc-t1.vf -2020/06/28 | 1732 | fonts/xcharter/vf/XCharter-Italic-tosf-t1.vf -2020/06/28 | 656 | fonts/xcharter/vf/XCharter-Italic-ts1.vf -2020/06/28 | 1672 | fonts/xcharter/vf/XCharter-Roman-dnom-ly1.vf -2020/06/28 | 1700 | fonts/xcharter/vf/XCharter-Roman-dnom-t1.vf -2020/06/28 | 1668 | fonts/xcharter/vf/XCharter-Roman-inf-ly1.vf -2020/06/28 | 1700 | fonts/xcharter/vf/XCharter-Roman-inf-t1.vf -2020/06/28 | 1672 | fonts/xcharter/vf/XCharter-Roman-numr-ly1.vf -2020/06/28 | 1700 | fonts/xcharter/vf/XCharter-Roman-numr-t1.vf -2020/06/28 | 1668 | fonts/xcharter/vf/XCharter-Roman-sup-ly1.vf -2020/06/28 | 1700 | fonts/xcharter/vf/XCharter-Roman-sup-t1.vf -2020/06/28 | 1516 | fonts/xcharter/vf/XCharter-Roman-sup-t2asrb.vf -2020/06/28 | 1516 | fonts/xcharter/vf/XCharter-Roman-sup-t2a.vf -2020/06/28 | 1724 | fonts/xcharter/vf/XCharter-Roman-tlf-ly1.vf -2020/06/28 | 832 | fonts/xcharter/vf/XCharter-Roman-tlf-ot1G.vf -2020/06/28 | 1848 | fonts/xcharter/vf/XCharter-Roman-tlf-sc-ly1.vf -2020/06/28 | 1008 | fonts/xcharter/vf/XCharter-Roman-tlf-sc-ot1.vf -2020/06/28 | 1872 | fonts/xcharter/vf/XCharter-Roman-tlf-sc-t1.vf -2020/06/28 | 1520 | fonts/xcharter/vf/XCharter-Roman-tlf-sc-t2asrb.vf -2020/06/28 | 1516 | fonts/xcharter/vf/XCharter-Roman-tlf-sc-t2a.vf -2020/06/28 | 1732 | fonts/xcharter/vf/XCharter-Roman-tlf-t1.vf -2020/06/28 | 1540 | fonts/xcharter/vf/XCharter-Roman-tlf-t2asrb.vf -2020/06/28 | 1540 | fonts/xcharter/vf/XCharter-Roman-tlf-t2a.vf -2020/06/28 | 1724 | fonts/xcharter/vf/XCharter-Roman-tosf-ly1.vf -2020/06/28 | 1848 | fonts/xcharter/vf/XCharter-Roman-tosf-sc-ly1.vf -2020/06/28 | 1008 | fonts/xcharter/vf/XCharter-Roman-tosf-sc-ot1.vf -2020/06/28 | 1876 | fonts/xcharter/vf/XCharter-Roman-tosf-sc-t1.vf -2020/06/28 | 1520 | fonts/xcharter/vf/XCharter-Roman-tosf-sc-t2asrb.vf -2020/06/28 | 1520 | fonts/xcharter/vf/XCharter-Roman-tosf-sc-t2a.vf -2020/06/28 | 1732 | fonts/xcharter/vf/XCharter-Roman-tosf-t1.vf -2020/06/28 | 1544 | fonts/xcharter/vf/XCharter-Roman-tosf-t2asrb.vf -2020/06/28 | 1540 | fonts/xcharter/vf/XCharter-Roman-tosf-t2a.vf -2020/06/28 | 904 | fonts/xcharter/vf/XCharter-Roman-ts1.vf -2020/06/28 | 1672 | fonts/xcharter/vf/XCharter-Slanted-dnom-ly1.vf -2020/06/28 | 1700 | fonts/xcharter/vf/XCharter-Slanted-dnom-t1.vf -2020/06/28 | 1672 | fonts/xcharter/vf/XCharter-Slanted-inf-ly1.vf -2020/06/28 | 1700 | fonts/xcharter/vf/XCharter-Slanted-inf-t1.vf -2020/06/28 | 1672 | fonts/xcharter/vf/XCharter-Slanted-numr-ly1.vf -2020/06/28 | 1700 | fonts/xcharter/vf/XCharter-Slanted-numr-t1.vf -2020/06/28 | 1672 | fonts/xcharter/vf/XCharter-Slanted-sup-ly1.vf -2020/06/28 | 1700 | fonts/xcharter/vf/XCharter-Slanted-sup-t1.vf -2020/06/28 | 1724 | fonts/xcharter/vf/XCharter-Slanted-tlf-ly1.vf -2020/06/28 | 1852 | fonts/xcharter/vf/XCharter-Slanted-tlf-sc-ly1.vf -2020/06/28 | 1012 | fonts/xcharter/vf/XCharter-Slanted-tlf-sc-ot1.vf -2020/06/28 | 1880 | fonts/xcharter/vf/XCharter-Slanted-tlf-sc-t1.vf -2020/06/28 | 1732 | fonts/xcharter/vf/XCharter-Slanted-tlf-t1.vf -2020/06/28 | 1520 | fonts/xcharter/vf/XCharter-Slanted-tlf-t2asrb.vf -2020/06/28 | 1516 | fonts/xcharter/vf/XCharter-Slanted-tlf-t2a.vf -2020/06/28 | 1728 | fonts/xcharter/vf/XCharter-Slanted-tosf-ly1.vf -2020/06/28 | 1856 | fonts/xcharter/vf/XCharter-Slanted-tosf-sc-ly1.vf -2020/06/28 | 1016 | fonts/xcharter/vf/XCharter-Slanted-tosf-sc-ot1.vf -2020/06/28 | 1880 | fonts/xcharter/vf/XCharter-Slanted-tosf-sc-t1.vf -2020/06/28 | 1736 | fonts/xcharter/vf/XCharter-Slanted-tosf-t1.vf -2020/06/28 | 640 | fonts/xcharter/vf/XCharter-Slanted-ts1.vf +2020/08/06 | 1880 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-ly1.vf +2020/08/06 | 964 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-ot1.vf +2020/08/06 | 1848 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-sc-ly1.vf +2020/08/06 | 940 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-sc-ot1.vf +2020/08/06 | 1872 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-sc-t1.vf +2020/08/06 | 1648 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-sc-t2asrb.vf +2020/08/06 | 1644 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-sc-t2a.vf +2020/08/06 | 1876 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-t1.vf +2020/08/06 | 1668 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-t2asrb.vf +2020/08/06 | 1660 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-t2a.vf +2020/08/06 | 752 | fonts/xcharter/vf/XCharter1-BoldItalic-ts1.vf +2020/08/06 | 1880 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-ly1.vf +2020/08/06 | 1032 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-ot1.vf +2020/08/06 | 1848 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-ly1.vf +2020/08/06 | 1012 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-ot1.vf +2020/08/06 | 1876 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-t1.vf +2020/08/06 | 1652 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-t2asrb.vf +2020/08/06 | 1648 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-t2a.vf +2020/08/06 | 1876 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-t1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-t2asrb.vf +2020/08/06 | 1664 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-t2a.vf +2020/08/06 | 752 | fonts/xcharter/vf/XCharter1-BoldSlanted-ts1.vf +2020/08/06 | 1860 | fonts/xcharter/vf/XCharter1-Bold-tosf-ly1.vf +2020/08/06 | 1012 | fonts/xcharter/vf/XCharter1-Bold-tosf-ot1.vf +2020/08/06 | 1828 | fonts/xcharter/vf/XCharter1-Bold-tosf-sc-ly1.vf +2020/08/06 | 988 | fonts/xcharter/vf/XCharter1-Bold-tosf-sc-ot1.vf +2020/08/06 | 1856 | fonts/xcharter/vf/XCharter1-Bold-tosf-sc-t1.vf +2020/08/06 | 1632 | fonts/xcharter/vf/XCharter1-Bold-tosf-sc-t2asrb.vf +2020/08/06 | 1624 | fonts/xcharter/vf/XCharter1-Bold-tosf-sc-t2a.vf +2020/08/06 | 1856 | fonts/xcharter/vf/XCharter1-Bold-tosf-t1.vf +2020/08/06 | 1648 | fonts/xcharter/vf/XCharter1-Bold-tosf-t2asrb.vf +2020/08/06 | 1644 | fonts/xcharter/vf/XCharter1-Bold-tosf-t2a.vf +2020/08/06 | 740 | fonts/xcharter/vf/XCharter1-Bold-ts1.vf +2020/08/06 | 1868 | fonts/xcharter/vf/XCharter1-Italic-tosf-ly1.vf +2020/08/06 | 1016 | fonts/xcharter/vf/XCharter1-Italic-tosf-ot1.vf +2020/08/06 | 1836 | fonts/xcharter/vf/XCharter1-Italic-tosf-sc-ly1.vf +2020/08/06 | 996 | fonts/xcharter/vf/XCharter1-Italic-tosf-sc-ot1.vf +2020/08/06 | 1860 | fonts/xcharter/vf/XCharter1-Italic-tosf-sc-t1.vf +2020/08/06 | 1636 | fonts/xcharter/vf/XCharter1-Italic-tosf-sc-t2asrb.vf +2020/08/06 | 1632 | fonts/xcharter/vf/XCharter1-Italic-tosf-sc-t2a.vf +2020/08/06 | 1864 | fonts/xcharter/vf/XCharter1-Italic-tosf-t1.vf +2020/08/06 | 1656 | fonts/xcharter/vf/XCharter1-Italic-tosf-t2asrb.vf +2020/08/06 | 1648 | fonts/xcharter/vf/XCharter1-Italic-tosf-t2a.vf +2020/08/06 | 744 | fonts/xcharter/vf/XCharter1-Italic-ts1.vf +2020/08/06 | 1864 | fonts/xcharter/vf/XCharter1-Roman-tosf-ly1.vf +2020/08/06 | 1016 | fonts/xcharter/vf/XCharter1-Roman-tosf-ot1.vf +2020/08/06 | 1832 | fonts/xcharter/vf/XCharter1-Roman-tosf-sc-ly1.vf +2020/08/06 | 992 | fonts/xcharter/vf/XCharter1-Roman-tosf-sc-ot1.vf +2020/08/06 | 1860 | fonts/xcharter/vf/XCharter1-Roman-tosf-sc-t1.vf +2020/08/06 | 1636 | fonts/xcharter/vf/XCharter1-Roman-tosf-sc-t2asrb.vf +2020/08/06 | 1628 | fonts/xcharter/vf/XCharter1-Roman-tosf-sc-t2a.vf +2020/08/06 | 1860 | fonts/xcharter/vf/XCharter1-Roman-tosf-t1.vf +2020/08/06 | 1652 | fonts/xcharter/vf/XCharter1-Roman-tosf-t2asrb.vf +2020/08/06 | 1648 | fonts/xcharter/vf/XCharter1-Roman-tosf-t2a.vf +2020/08/06 | 1004 | fonts/xcharter/vf/XCharter1-Roman-ts1.vf +2020/08/06 | 1868 | fonts/xcharter/vf/XCharter1-Slanted-tosf-ly1.vf +2020/08/06 | 1020 | fonts/xcharter/vf/XCharter1-Slanted-tosf-ot1.vf +2020/08/06 | 1836 | fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-ly1.vf +2020/08/06 | 1000 | fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-ot1.vf +2020/08/06 | 1864 | fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-t1.vf +2020/08/06 | 1640 | fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-t2asrb.vf +2020/08/06 | 1636 | fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-t2a.vf +2020/08/06 | 1864 | fonts/xcharter/vf/XCharter1-Slanted-tosf-t1.vf +2020/08/06 | 1660 | fonts/xcharter/vf/XCharter1-Slanted-tosf-t2asrb.vf +2020/08/06 | 1652 | fonts/xcharter/vf/XCharter1-Slanted-tosf-t2a.vf +2020/08/06 | 740 | fonts/xcharter/vf/XCharter1-Slanted-ts1.vf +2020/08/06 | 1668 | fonts/xcharter/vf/XCharter-Bold-dnom-ly1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Bold-dnom-t1.vf +2020/08/06 | 1668 | fonts/xcharter/vf/XCharter-Bold-inf-ly1.vf +2020/08/06 | 1696 | fonts/xcharter/vf/XCharter-Bold-inf-t1.vf +2020/08/06 | 1676 | fonts/xcharter/vf/XCharter-BoldItalic-dnom-ly1.vf +2020/08/06 | 1704 | fonts/xcharter/vf/XCharter-BoldItalic-dnom-t1.vf +2020/08/06 | 1676 | fonts/xcharter/vf/XCharter-BoldItalic-inf-ly1.vf +2020/08/06 | 1704 | fonts/xcharter/vf/XCharter-BoldItalic-inf-t1.vf +2020/08/06 | 1676 | fonts/xcharter/vf/XCharter-BoldItalic-numr-ly1.vf +2020/08/06 | 1704 | fonts/xcharter/vf/XCharter-BoldItalic-numr-t1.vf +2020/08/06 | 1676 | fonts/xcharter/vf/XCharter-BoldItalic-sup-ly1.vf +2020/08/06 | 1704 | fonts/xcharter/vf/XCharter-BoldItalic-sup-t1.vf +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-BoldItalic-sup-t2asrb.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-BoldItalic-sup-t2a.vf +2020/08/06 | 1728 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-ly1.vf +2020/08/06 | 984 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-ot1G.vf +2020/08/06 | 1860 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-sc-ly1.vf +2020/08/06 | 956 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-sc-ot1.vf +2020/08/06 | 1888 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-sc-t1.vf +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-sc-t2asrb.vf +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-sc-t2a.vf +2020/08/06 | 1736 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-t1.vf +2020/08/06 | 1548 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-t2asrb.vf +2020/08/06 | 1544 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-t2a.vf +2020/08/06 | 1728 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-ly1.vf +2020/08/06 | 1864 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-sc-ly1.vf +2020/08/06 | 960 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-sc-ot1.vf +2020/08/06 | 1892 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-sc-t1.vf +2020/08/06 | 1528 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-sc-t2asrb.vf +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-sc-t2a.vf +2020/08/06 | 1736 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-t1.vf +2020/08/06 | 1548 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-t2asrb.vf +2020/08/06 | 1544 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-t2a.vf +2020/08/06 | 652 | fonts/xcharter/vf/XCharter-BoldItalic-ts1.vf +2020/08/06 | 1668 | fonts/xcharter/vf/XCharter-Bold-numr-ly1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Bold-numr-t1.vf +2020/08/06 | 1676 | fonts/xcharter/vf/XCharter-BoldSlanted-dnom-ly1.vf +2020/08/06 | 1704 | fonts/xcharter/vf/XCharter-BoldSlanted-dnom-t1.vf +2020/08/06 | 1676 | fonts/xcharter/vf/XCharter-BoldSlanted-inf-ly1.vf +2020/08/06 | 1704 | fonts/xcharter/vf/XCharter-BoldSlanted-inf-t1.vf +2020/08/06 | 1676 | fonts/xcharter/vf/XCharter-BoldSlanted-numr-ly1.vf +2020/08/06 | 1704 | fonts/xcharter/vf/XCharter-BoldSlanted-numr-t1.vf +2020/08/06 | 1676 | fonts/xcharter/vf/XCharter-BoldSlanted-sup-ly1.vf +2020/08/06 | 1704 | fonts/xcharter/vf/XCharter-BoldSlanted-sup-t1.vf +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-BoldSlanted-sup-t2asrb.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-BoldSlanted-sup-t2a.vf +2020/08/06 | 1728 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-ly1.vf +2020/08/06 | 1864 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-ly1.vf +2020/08/06 | 1024 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-ot1.vf +2020/08/06 | 1892 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-t1.vf +2020/08/06 | 1528 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-t2asrb.vf +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-t2a.vf +2020/08/06 | 1736 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-t1.vf +2020/08/06 | 1548 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-t2asrb.vf +2020/08/06 | 1544 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-t2a.vf +2020/08/06 | 1732 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-ly1.vf +2020/08/06 | 1868 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-ly1.vf +2020/08/06 | 1028 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-ot1.vf +2020/08/06 | 1892 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-t1.vf +2020/08/06 | 1528 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-t2asrb.vf +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-t2a.vf +2020/08/06 | 1740 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-t1.vf +2020/08/06 | 1548 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-t2asrb.vf +2020/08/06 | 1544 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-t2a.vf +2020/08/06 | 644 | fonts/xcharter/vf/XCharter-BoldSlanted-ts1.vf +2020/08/06 | 1668 | fonts/xcharter/vf/XCharter-Bold-sup-ly1.vf +2020/08/06 | 1696 | fonts/xcharter/vf/XCharter-Bold-sup-t1.vf +2020/08/06 | 1516 | fonts/xcharter/vf/XCharter-Bold-sup-t2asrb.vf +2020/08/06 | 1512 | fonts/xcharter/vf/XCharter-Bold-sup-t2a.vf +2020/08/06 | 1724 | fonts/xcharter/vf/XCharter-Bold-tlf-ly1.vf +2020/08/06 | 832 | fonts/xcharter/vf/XCharter-Bold-tlf-ot1G.vf +2020/08/06 | 1844 | fonts/xcharter/vf/XCharter-Bold-tlf-sc-ly1.vf +2020/08/06 | 1004 | fonts/xcharter/vf/XCharter-Bold-tlf-sc-ot1.vf +2020/08/06 | 1872 | fonts/xcharter/vf/XCharter-Bold-tlf-sc-t1.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Bold-tlf-sc-t2asrb.vf +2020/08/06 | 1516 | fonts/xcharter/vf/XCharter-Bold-tlf-sc-t2a.vf +2020/08/06 | 1732 | fonts/xcharter/vf/XCharter-Bold-tlf-t1.vf +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Bold-tlf-t2asrb.vf +2020/08/06 | 1536 | fonts/xcharter/vf/XCharter-Bold-tlf-t2a.vf +2020/08/06 | 1724 | fonts/xcharter/vf/XCharter-Bold-tosf-ly1.vf +2020/08/06 | 1844 | fonts/xcharter/vf/XCharter-Bold-tosf-sc-ly1.vf +2020/08/06 | 1008 | fonts/xcharter/vf/XCharter-Bold-tosf-sc-ot1.vf +2020/08/06 | 1872 | fonts/xcharter/vf/XCharter-Bold-tosf-sc-t1.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Bold-tosf-sc-t2asrb.vf +2020/08/06 | 1516 | fonts/xcharter/vf/XCharter-Bold-tosf-sc-t2a.vf +2020/08/06 | 1732 | fonts/xcharter/vf/XCharter-Bold-tosf-t1.vf +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Bold-tosf-t2asrb.vf +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Bold-tosf-t2a.vf +2020/08/06 | 652 | fonts/xcharter/vf/XCharter-Bold-ts1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Italic-dnom-ly1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Italic-dnom-t1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Italic-inf-ly1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Italic-inf-t1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Italic-numr-ly1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Italic-numr-t1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Italic-sup-ly1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Italic-sup-t1.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Italic-sup-t2asrb.vf +2020/08/06 | 1516 | fonts/xcharter/vf/XCharter-Italic-sup-t2a.vf +2020/08/06 | 1724 | fonts/xcharter/vf/XCharter-Italic-tlf-ly1.vf +2020/08/06 | 836 | fonts/xcharter/vf/XCharter-Italic-tlf-ot1G.vf +2020/08/06 | 1848 | fonts/xcharter/vf/XCharter-Italic-tlf-sc-ly1.vf +2020/08/06 | 1012 | fonts/xcharter/vf/XCharter-Italic-tlf-sc-ot1.vf +2020/08/06 | 1876 | fonts/xcharter/vf/XCharter-Italic-tlf-sc-t1.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Italic-tlf-sc-t2asrb.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Italic-tlf-sc-t2a.vf +2020/08/06 | 1732 | fonts/xcharter/vf/XCharter-Italic-tlf-t1.vf +2020/08/06 | 1544 | fonts/xcharter/vf/XCharter-Italic-tlf-t2asrb.vf +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Italic-tlf-t2a.vf +2020/08/06 | 1724 | fonts/xcharter/vf/XCharter-Italic-tosf-ly1.vf +2020/08/06 | 1852 | fonts/xcharter/vf/XCharter-Italic-tosf-sc-ly1.vf +2020/08/06 | 1012 | fonts/xcharter/vf/XCharter-Italic-tosf-sc-ot1.vf +2020/08/06 | 1880 | fonts/xcharter/vf/XCharter-Italic-tosf-sc-t1.vf +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-Italic-tosf-sc-t2asrb.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Italic-tosf-sc-t2a.vf +2020/08/06 | 1732 | fonts/xcharter/vf/XCharter-Italic-tosf-t1.vf +2020/08/06 | 1544 | fonts/xcharter/vf/XCharter-Italic-tosf-t2asrb.vf +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Italic-tosf-t2a.vf +2020/08/06 | 656 | fonts/xcharter/vf/XCharter-Italic-ts1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Roman-dnom-ly1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Roman-dnom-t1.vf +2020/08/06 | 1668 | fonts/xcharter/vf/XCharter-Roman-inf-ly1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Roman-inf-t1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Roman-numr-ly1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Roman-numr-t1.vf +2020/08/06 | 1668 | fonts/xcharter/vf/XCharter-Roman-sup-ly1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Roman-sup-t1.vf +2020/08/06 | 1516 | fonts/xcharter/vf/XCharter-Roman-sup-t2asrb.vf +2020/08/06 | 1516 | fonts/xcharter/vf/XCharter-Roman-sup-t2a.vf +2020/08/06 | 1724 | fonts/xcharter/vf/XCharter-Roman-tlf-ly1.vf +2020/08/06 | 832 | fonts/xcharter/vf/XCharter-Roman-tlf-ot1G.vf +2020/08/06 | 1848 | fonts/xcharter/vf/XCharter-Roman-tlf-sc-ly1.vf +2020/08/06 | 1008 | fonts/xcharter/vf/XCharter-Roman-tlf-sc-ot1.vf +2020/08/06 | 1872 | fonts/xcharter/vf/XCharter-Roman-tlf-sc-t1.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Roman-tlf-sc-t2asrb.vf +2020/08/06 | 1516 | fonts/xcharter/vf/XCharter-Roman-tlf-sc-t2a.vf +2020/08/06 | 1732 | fonts/xcharter/vf/XCharter-Roman-tlf-t1.vf +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Roman-tlf-t2asrb.vf +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Roman-tlf-t2a.vf +2020/08/06 | 1724 | fonts/xcharter/vf/XCharter-Roman-tosf-ly1.vf +2020/08/06 | 1848 | fonts/xcharter/vf/XCharter-Roman-tosf-sc-ly1.vf +2020/08/06 | 1008 | fonts/xcharter/vf/XCharter-Roman-tosf-sc-ot1.vf +2020/08/06 | 1876 | fonts/xcharter/vf/XCharter-Roman-tosf-sc-t1.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Roman-tosf-sc-t2asrb.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Roman-tosf-sc-t2a.vf +2020/08/06 | 1732 | fonts/xcharter/vf/XCharter-Roman-tosf-t1.vf +2020/08/06 | 1544 | fonts/xcharter/vf/XCharter-Roman-tosf-t2asrb.vf +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Roman-tosf-t2a.vf +2020/08/06 | 904 | fonts/xcharter/vf/XCharter-Roman-ts1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Slanted-dnom-ly1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Slanted-dnom-t1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Slanted-inf-ly1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Slanted-inf-t1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Slanted-numr-ly1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Slanted-numr-t1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Slanted-sup-ly1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Slanted-sup-t1.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Slanted-sup-t2asrb.vf +2020/08/06 | 1516 | fonts/xcharter/vf/XCharter-Slanted-sup-t2a.vf +2020/08/06 | 1724 | fonts/xcharter/vf/XCharter-Slanted-tlf-ly1.vf +2020/08/06 | 1852 | fonts/xcharter/vf/XCharter-Slanted-tlf-sc-ly1.vf +2020/08/06 | 1012 | fonts/xcharter/vf/XCharter-Slanted-tlf-sc-ot1.vf +2020/08/06 | 1880 | fonts/xcharter/vf/XCharter-Slanted-tlf-sc-t1.vf +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-Slanted-tlf-sc-t2asrb.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Slanted-tlf-sc-t2a.vf +2020/08/06 | 1732 | fonts/xcharter/vf/XCharter-Slanted-tlf-t1.vf +2020/08/06 | 1544 | fonts/xcharter/vf/XCharter-Slanted-tlf-t2asrb.vf +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Slanted-tlf-t2a.vf +2020/08/06 | 1728 | fonts/xcharter/vf/XCharter-Slanted-tosf-ly1.vf +2020/08/06 | 1856 | fonts/xcharter/vf/XCharter-Slanted-tosf-sc-ly1.vf +2020/08/06 | 1016 | fonts/xcharter/vf/XCharter-Slanted-tosf-sc-ot1.vf +2020/08/06 | 1880 | fonts/xcharter/vf/XCharter-Slanted-tosf-sc-t1.vf +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-Slanted-tosf-sc-t2asrb.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Slanted-tosf-sc-t2a.vf +2020/08/06 | 1736 | fonts/xcharter/vf/XCharter-Slanted-tosf-t1.vf +2020/08/06 | 1544 | fonts/xcharter/vf/XCharter-Slanted-tosf-t2asrb.vf +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Slanted-tosf-t2a.vf +2020/08/06 | 640 | fonts/xcharter/vf/XCharter-Slanted-ts1.vf 2019/11/22 | 2448 | fonts/xcharter/vf/zchbmi0.vf 2019/11/22 | 2448 | fonts/xcharter/vf/zchbmi2.vf 2019/11/22 | 2448 | fonts/xcharter/vf/zchbmi3.vf 2020/06/04 | 1832 | fonts/xcharter/vf/zchbmia.vf 2019/11/22 | 2448 | fonts/xcharter/vf/zchbmi.vf -2018/04/11 | 1228 | fonts/xcharter/vf/zchmi0.vf +2019/11/22 | 2360 | fonts/xcharter/vf/zchmi0.vf 2019/11/22 | 2360 | fonts/xcharter/vf/zchmi2.vf 2019/11/22 | 2360 | fonts/xcharter/vf/zchmi3.vf 2020/06/04 | 2060 | fonts/xcharter/vf/zchmia.vf 2019/11/22 | 2360 | fonts/xcharter/vf/zchmi.vf -2020/06/28 | 4254242 | fonts/xcharter.zip +2020/08/06 | 4662243 | fonts/xcharter.zip 2020/07/02 | 9550 | fonts/xits/FONTLOG.txt 2020/07/02 | 4998 | fonts/xits/OFL.txt 2020/07/02 | 652 | fonts/xits/README.txt @@ -127767,932 +127944,937 @@ 2012/11/17 | 1096 | graphics/AddTeX2Eps/default.tex 2006/04/17 | 836 | graphics/AddTeX2Eps/readme.txt 2012/11/17 | 5620 | graphics/AddTeX2Eps.zip -2020/07/07 | 472 | graphics/asymptote/absyn.cc -2020/07/07 | 1030 | graphics/asymptote/absyn.h -2020/07/07 | 3309 | graphics/asymptote/access.cc -2020/07/07 | 2976 | graphics/asymptote/access.h -2020/07/07 | 2278 | graphics/asymptote/align.h -2020/07/07 | 891 | graphics/asymptote/angle.h -2020/07/07 | 18591 | graphics/asymptote/application.cc -2020/07/07 | 9094 | graphics/asymptote/application.h -2020/07/07 | 4736 | graphics/asymptote/array.cc -2020/07/07 | 1986 | graphics/asymptote/array.h -2020/07/07 | 14023 | graphics/asymptote/arrayop.h -2020/07/07 | 11541 | graphics/asymptote/aspy.py -2020/07/07 | 4286 | graphics/asymptote/asy.ico -2020/07/07 | 17816 | graphics/asymptote/asy-keywords.el -2020/07/07 | 206707 | graphics/asymptote/asy.list -2020/07/07 | 1612 | graphics/asymptote/asy-list.pl -2020/07/07 | 6300 | graphics/asymptote/asymptote.nsi -2020/07/07 | 3001 | graphics/asymptote/asymptote.spec -2020/07/07 | 770 | graphics/asymptote/asy.rc -2020/07/07 | 34 | graphics/asymptote/autogen.sh -2020/07/07 | 12534 | graphics/asymptote/ax_pthread.m4 -2020/07/07 | 42 | graphics/asymptote/base/animate.asy -2020/07/07 | 5254 | graphics/asymptote/base/animation.asy -2020/07/07 | 578 | graphics/asymptote/base/annotate.asy -2020/07/07 | 99 | graphics/asymptote/base/asy_filetype.vim -2020/07/07 | 268 | graphics/asymptote/base/asy-init.el -2020/07/07 | 8243 | graphics/asymptote/base/asy-kate.sh -2020/07/07 | 71223 | graphics/asymptote/base/asy-mode.el -2020/07/07 | 1276 | graphics/asymptote/base/asymptote.py -2020/07/07 | 8870 | graphics/asymptote/base/asy.vim -2020/07/07 | 51 | graphics/asymptote/base/babel.asy -2020/07/07 | 9566 | graphics/asymptote/base/bezulate.asy -2020/07/07 | 11482 | graphics/asymptote/base/binarytree.asy -2020/07/07 | 5440 | graphics/asymptote/base/bsp.asy -2020/07/07 | 10830 | graphics/asymptote/base/CAD.asy -2020/07/07 | 174673 | graphics/asymptote/base/colormap.asy -2020/07/07 | 14660 | graphics/asymptote/base/contour3.asy -2020/07/07 | 20105 | graphics/asymptote/base/contour.asy -2020/07/07 | 2109 | graphics/asymptote/base/drawtree.asy -2020/07/07 | 1183 | graphics/asymptote/base/embed.asy -2020/07/07 | 1122 | graphics/asymptote/base/external.asy -2020/07/07 | 21459 | graphics/asymptote/base/feynman.asy -2020/07/07 | 14311 | graphics/asymptote/base/flowchart.asy -2020/07/07 | 35 | graphics/asymptote/base/fontsize.asy -2020/07/07 | 320533 | graphics/asymptote/base/geometry.asy -2020/07/07 | 68543 | graphics/asymptote/base/graph3.asy -2020/07/07 | 63886 | graphics/asymptote/base/graph.asy -2020/07/07 | 314 | graphics/asymptote/base/graph_settings.asy -2020/07/07 | 7422 | graphics/asymptote/base/graph_splinetype.asy -2020/07/07 | 13476 | graphics/asymptote/base/grid3.asy -2020/07/07 | 3944 | graphics/asymptote/base/interpolate.asy -2020/07/07 | 2465 | graphics/asymptote/base/labelpath3.asy -2020/07/07 | 729 | graphics/asymptote/base/labelpath.asy -2020/07/07 | 61 | graphics/asymptote/base/latin1.asy -2020/07/07 | 24659 | graphics/asymptote/base/lmfit.asy -2020/07/07 | 908 | graphics/asymptote/base/map.asy -2020/07/07 | 7302 | graphics/asymptote/base/markers.asy -2020/07/07 | 11030 | graphics/asymptote/base/math.asy -2020/07/07 | 253 | graphics/asymptote/base/metapost.asy -2020/07/07 | 39 | graphics/asymptote/base/nopapersize.ps -2020/07/07 | 3279 | graphics/asymptote/base/obj.asy -2020/07/07 | 15192 | graphics/asymptote/base/ode.asy -2020/07/07 | 14801 | graphics/asymptote/base/palette.asy -2020/07/07 | 2615 | graphics/asymptote/base/patterns.asy -2020/07/07 | 1259 | graphics/asymptote/base/plain_arcs.asy -2020/07/07 | 19561 | graphics/asymptote/base/plain_arrows.asy -2020/07/07 | 7508 | graphics/asymptote/base/plain.asy -2020/07/07 | 21005 | graphics/asymptote/base/plain_bounds.asy -2020/07/07 | 4128 | graphics/asymptote/base/plain_boxes.asy -2020/07/07 | 3716 | graphics/asymptote/base/plain_constants.asy -2020/07/07 | 2187 | graphics/asymptote/base/plain_debugger.asy -2020/07/07 | 6292 | graphics/asymptote/base/plain_filldraw.asy -2020/07/07 | 16578 | graphics/asymptote/base/plain_Label.asy -2020/07/07 | 2552 | graphics/asymptote/base/plain_margins.asy -2020/07/07 | 11320 | graphics/asymptote/base/plain_markers.asy -2020/07/07 | 9309 | graphics/asymptote/base/plain_paths.asy -2020/07/07 | 8661 | graphics/asymptote/base/plain_pens.asy -2020/07/07 | 46727 | graphics/asymptote/base/plain_picture.asy -2020/07/07 | 6285 | graphics/asymptote/base/plain_prethree.asy -2020/07/07 | 5760 | graphics/asymptote/base/plain_scaling.asy -2020/07/07 | 4078 | graphics/asymptote/base/plain_shipout.asy -2020/07/07 | 6169 | graphics/asymptote/base/plain_strings.asy -2020/07/07 | 358 | graphics/asymptote/base/pstoedit.asy -2020/07/07 | 5003 | graphics/asymptote/base/rational.asy -2020/07/07 | 9399 | graphics/asymptote/base/rationalSimplex.asy -2020/07/07 | 657 | graphics/asymptote/base/reload.js -2020/07/07 | 289 | graphics/asymptote/base/res/notes.txt -2020/07/07 | 3430 | graphics/asymptote/base/roundedpath.asy -2020/07/07 | 5277 | graphics/asymptote/base/shaders/fragment.glsl -2020/07/07 | 630 | graphics/asymptote/base/shaders/vertex.glsl -2020/07/07 | 8290 | graphics/asymptote/base/simplex.asy -2020/07/07 | 608 | graphics/asymptote/base/size10.asy -2020/07/07 | 600 | graphics/asymptote/base/size11.asy -2020/07/07 | 16138 | graphics/asymptote/base/slide.asy -2020/07/07 | 2046 | graphics/asymptote/base/slopefield.asy -2020/07/07 | 56037 | graphics/asymptote/base/smoothcontour3.asy -2020/07/07 | 12035 | graphics/asymptote/base/solids.asy -2020/07/07 | 7307 | graphics/asymptote/base/stats.asy -2020/07/07 | 22971 | graphics/asymptote/base/syzygy.asy -2020/07/07 | 2277 | graphics/asymptote/base/texcolors.asy -2020/07/07 | 23791 | graphics/asymptote/base/three_arrows.asy -2020/07/07 | 85383 | graphics/asymptote/base/three.asy -2020/07/07 | 3724 | graphics/asymptote/base/three_light.asy -2020/07/07 | 2764 | graphics/asymptote/base/three_margins.asy -2020/07/07 | 72387 | graphics/asymptote/base/three_surface.asy -2020/07/07 | 5879 | graphics/asymptote/base/three_tube.asy -2020/07/07 | 1375 | graphics/asymptote/base/tree.asy -2020/07/07 | 5797 | graphics/asymptote/base/trembling.asy -2020/07/07 | 4991 | graphics/asymptote/base/tube.asy -2020/07/07 | 51 | graphics/asymptote/base/unicode.asy -2020/07/07 | 60325 | graphics/asymptote/base/webgl/asygl.js -2020/07/07 | 4812 | graphics/asymptote/base/x11colors.asy -2020/07/07 | 3670 | graphics/asymptote/bbox3.h -2020/07/07 | 4503 | graphics/asymptote/bbox.h -2020/07/07 | 1851 | graphics/asymptote/beziercurve.cc -2020/07/07 | 1288 | graphics/asymptote/beziercurve.h -2020/07/07 | 32279 | graphics/asymptote/bezierpatch.cc -2020/07/07 | 5631 | graphics/asymptote/bezierpatch.h +2020/08/06 | 472 | graphics/asymptote/absyn.cc +2020/08/06 | 1030 | graphics/asymptote/absyn.h +2020/08/06 | 3297 | graphics/asymptote/access.cc +2020/08/06 | 2964 | graphics/asymptote/access.h +2020/08/06 | 2266 | graphics/asymptote/align.h +2020/08/06 | 886 | graphics/asymptote/angle.h +2020/08/06 | 18578 | graphics/asymptote/application.cc +2020/08/06 | 9088 | graphics/asymptote/application.h +2020/08/06 | 4735 | graphics/asymptote/array.cc +2020/08/06 | 1975 | graphics/asymptote/array.h +2020/08/06 | 13980 | graphics/asymptote/arrayop.h +2020/08/06 | 11541 | graphics/asymptote/aspy.py +2020/08/06 | 4286 | graphics/asymptote/asy.ico +2020/08/06 | 17816 | graphics/asymptote/asy-keywords.el +2020/08/06 | 206707 | graphics/asymptote/asy.list +2020/08/06 | 1612 | graphics/asymptote/asy-list.pl +2020/08/06 | 6300 | graphics/asymptote/asymptote.nsi +2020/08/06 | 3001 | graphics/asymptote/asymptote.spec +2020/08/06 | 770 | graphics/asymptote/asy.rc +2020/08/06 | 34 | graphics/asymptote/autogen.sh +2020/08/06 | 12534 | graphics/asymptote/ax_pthread.m4 +2020/08/06 | 42 | graphics/asymptote/base/animate.asy +2020/08/06 | 5238 | graphics/asymptote/base/animation.asy +2020/08/06 | 578 | graphics/asymptote/base/annotate.asy +2020/08/06 | 99 | graphics/asymptote/base/asy_filetype.vim +2020/08/06 | 268 | graphics/asymptote/base/asy-init.el +2020/08/06 | 8243 | graphics/asymptote/base/asy-kate.sh +2020/08/06 | 71223 | graphics/asymptote/base/asy-mode.el +2020/08/06 | 1276 | graphics/asymptote/base/asymptote.py +2020/08/06 | 8870 | graphics/asymptote/base/asy.vim +2020/08/06 | 50 | graphics/asymptote/base/babel.asy +2020/08/06 | 9569 | graphics/asymptote/base/bezulate.asy +2020/08/06 | 11656 | graphics/asymptote/base/binarytree.asy +2020/08/06 | 5279 | graphics/asymptote/base/bsp.asy +2020/08/06 | 10830 | graphics/asymptote/base/CAD.asy +2020/08/06 | 205495 | graphics/asymptote/base/colormap.asy +2020/08/06 | 14749 | graphics/asymptote/base/contour3.asy +2020/08/06 | 19990 | graphics/asymptote/base/contour.asy +2020/08/06 | 2109 | graphics/asymptote/base/drawtree.asy +2020/08/06 | 1178 | graphics/asymptote/base/embed.asy +2020/08/06 | 1120 | graphics/asymptote/base/external.asy +2020/08/06 | 21448 | graphics/asymptote/base/feynman.asy +2020/08/06 | 15277 | graphics/asymptote/base/flowchart.asy +2020/08/06 | 35 | graphics/asymptote/base/fontsize.asy +2020/08/06 | 320398 | graphics/asymptote/base/geometry.asy +2020/08/06 | 68266 | graphics/asymptote/base/graph3.asy +2020/08/06 | 63520 | graphics/asymptote/base/graph.asy +2020/08/06 | 314 | graphics/asymptote/base/graph_settings.asy +2020/08/06 | 7407 | graphics/asymptote/base/graph_splinetype.asy +2020/08/06 | 13605 | graphics/asymptote/base/grid3.asy +2020/08/06 | 3935 | graphics/asymptote/base/interpolate.asy +2020/08/06 | 2451 | graphics/asymptote/base/labelpath3.asy +2020/08/06 | 729 | graphics/asymptote/base/labelpath.asy +2020/08/06 | 25357 | graphics/asymptote/base/lmfit.asy +2020/08/06 | 908 | graphics/asymptote/base/map.asy +2020/08/06 | 7302 | graphics/asymptote/base/markers.asy +2020/08/06 | 11008 | graphics/asymptote/base/math.asy +2020/08/06 | 251 | graphics/asymptote/base/metapost.asy +2020/08/06 | 39 | graphics/asymptote/base/nopapersize.ps +2020/08/06 | 3278 | graphics/asymptote/base/obj.asy +2020/08/06 | 15274 | graphics/asymptote/base/ode.asy +2020/08/06 | 14669 | graphics/asymptote/base/palette.asy +2020/08/06 | 2613 | graphics/asymptote/base/patterns.asy +2020/08/06 | 1213 | graphics/asymptote/base/plain_arcs.asy +2020/08/06 | 22594 | graphics/asymptote/base/plain_arrows.asy +2020/08/06 | 7488 | graphics/asymptote/base/plain.asy +2020/08/06 | 20989 | graphics/asymptote/base/plain_bounds.asy +2020/08/06 | 4128 | graphics/asymptote/base/plain_boxes.asy +2020/08/06 | 3716 | graphics/asymptote/base/plain_constants.asy +2020/08/06 | 2187 | graphics/asymptote/base/plain_debugger.asy +2020/08/06 | 6292 | graphics/asymptote/base/plain_filldraw.asy +2020/08/06 | 16492 | graphics/asymptote/base/plain_Label.asy +2020/08/06 | 2552 | graphics/asymptote/base/plain_margins.asy +2020/08/06 | 11320 | graphics/asymptote/base/plain_markers.asy +2020/08/06 | 9309 | graphics/asymptote/base/plain_paths.asy +2020/08/06 | 8661 | graphics/asymptote/base/plain_pens.asy +2020/08/06 | 46727 | graphics/asymptote/base/plain_picture.asy +2020/08/06 | 6285 | graphics/asymptote/base/plain_prethree.asy +2020/08/06 | 5760 | graphics/asymptote/base/plain_scaling.asy +2020/08/06 | 4078 | graphics/asymptote/base/plain_shipout.asy +2020/08/06 | 6169 | graphics/asymptote/base/plain_strings.asy +2020/08/06 | 358 | graphics/asymptote/base/pstoedit.asy +2020/08/06 | 5003 | graphics/asymptote/base/rational.asy +2020/08/06 | 9399 | graphics/asymptote/base/rationalSimplex.asy +2020/08/06 | 657 | graphics/asymptote/base/reload.js +2020/08/06 | 289 | graphics/asymptote/base/res/notes.txt +2020/08/06 | 3430 | graphics/asymptote/base/roundedpath.asy +2020/08/06 | 5277 | graphics/asymptote/base/shaders/fragment.glsl +2020/08/06 | 630 | graphics/asymptote/base/shaders/vertex.glsl +2020/08/06 | 8290 | graphics/asymptote/base/simplex.asy +2020/08/06 | 608 | graphics/asymptote/base/size10.asy +2020/08/06 | 600 | graphics/asymptote/base/size11.asy +2020/08/06 | 16138 | graphics/asymptote/base/slide.asy +2020/08/06 | 2046 | graphics/asymptote/base/slopefield.asy +2020/08/06 | 56037 | graphics/asymptote/base/smoothcontour3.asy +2020/08/06 | 12035 | graphics/asymptote/base/solids.asy +2020/08/06 | 7307 | graphics/asymptote/base/stats.asy +2020/08/06 | 22971 | graphics/asymptote/base/syzygy.asy +2020/08/06 | 2277 | graphics/asymptote/base/texcolors.asy +2020/08/06 | 23791 | graphics/asymptote/base/three_arrows.asy +2020/08/06 | 85383 | graphics/asymptote/base/three.asy +2020/08/06 | 3724 | graphics/asymptote/base/three_light.asy +2020/08/06 | 2764 | graphics/asymptote/base/three_margins.asy +2020/08/06 | 72387 | graphics/asymptote/base/three_surface.asy +2020/08/06 | 5879 | graphics/asymptote/base/three_tube.asy +2020/08/06 | 1375 | graphics/asymptote/base/tree.asy +2020/08/06 | 5797 | graphics/asymptote/base/trembling.asy +2020/08/06 | 4991 | graphics/asymptote/base/tube.asy +2020/08/06 | 60150 | graphics/asymptote/base/webgl/asygl.js +2020/08/06 | 4812 | graphics/asymptote/base/x11colors.asy +2020/08/06 | 3640 | graphics/asymptote/bbox3.h +2020/08/06 | 4473 | graphics/asymptote/bbox.h +2020/08/06 | 1828 | graphics/asymptote/beziercurve.cc +2020/08/06 | 1270 | graphics/asymptote/beziercurve.h +2020/08/06 | 32094 | graphics/asymptote/bezierpatch.cc +2020/08/06 | 5595 | graphics/asymptote/bezierpatch.h 2018/02/02 | 3002325 | graphics/asymptote/binaries/i386-windows/cygwin1.dll -2020/07/07 | 2505 | graphics/asymptote/binaries/i386-windows/README -2020/07/07 | 7605760 | graphics/asymptote/binaries/i386-windows/texlive/asy.exe -2018/04/05 | 288 | graphics/asymptote/binaries/i386-windows/texlive/README -2018/11/08 | 3339661 | graphics/asymptote/binaries/x86_64-windows/cygwin1.dll -2020/07/07 | 2505 | graphics/asymptote/binaries/x86_64-windows/README -2020/07/07 | 7872000 | graphics/asymptote/binaries/x86_64-windows/texlive/asy.exe -2019/10/11 | 288 | graphics/asymptote/binaries/x86_64-windows/texlive/README -2020/07/07 | 255 | graphics/asymptote/BUGS -2020/07/07 | 1229 | graphics/asymptote/build-scripts/build-asygl -2020/07/07 | 2482 | graphics/asymptote/build-scripts/build-asymptote -2020/07/07 | 3449 | graphics/asymptote/build-scripts/build-asymptote.dos -2020/07/07 | 1907 | graphics/asymptote/build-scripts/HOWTO-MSWindows -2020/07/07 | 288 | graphics/asymptote/build-scripts/README-binaries -2020/07/07 | 31244 | graphics/asymptote/builtin.cc -2020/07/07 | 1637 | graphics/asymptote/builtin.h -2020/07/07 | 1151 | graphics/asymptote/callable.cc -2020/07/07 | 1642 | graphics/asymptote/callable.h -2020/07/07 | 1191 | graphics/asymptote/camperror.cc -2020/07/07 | 818 | graphics/asymptote/camperror.h -2020/07/07 | 13339 | graphics/asymptote/camp.l -2020/07/07 | 127885 | graphics/asymptote/camp.tab.cc -2020/07/07 | 4089 | graphics/asymptote/camp.tab.h -2020/07/07 | 20029 | graphics/asymptote/camp.y -2020/07/07 | 4687 | graphics/asymptote/castop.h -2020/07/07 | 1415947 | graphics/asymptote/ChangeLog -2020/07/07 | 7808 | graphics/asymptote/coder.cc -2020/07/07 | 11658 | graphics/asymptote/coder.h -2020/07/07 | 1126 | graphics/asymptote/coenv.cc -2020/07/07 | 908 | graphics/asymptote/coenv.h -2020/07/07 | 1610 | graphics/asymptote/common.h -2020/07/07 | 48441 | graphics/asymptote/config.guess -2020/07/07 | 6871 | graphics/asymptote/config.h.in -2020/07/07 | 31609 | graphics/asymptote/config.sub -2020/07/07 | 285954 | graphics/asymptote/configure -2020/07/07 | 14764 | graphics/asymptote/configure.ac -2020/07/07 | 3673 | graphics/asymptote/constructor.cc -2020/07/07 | 20866 | graphics/asymptote/dec.cc -2020/07/07 | 15845 | graphics/asymptote/dec.h -2020/07/07 | 5897 | graphics/asymptote/Delaunay.cc -2020/07/07 | 384 | graphics/asymptote/Delaunay.h -2020/07/07 | 7975 | graphics/asymptote/doc/asy.1 -2020/07/07 | 1005 | graphics/asymptote/doc/asy.1.begin -2020/07/07 | 333 | graphics/asymptote/doc/asy.1.end -2020/07/07 | 2800 | graphics/asymptote/doc/asycolors.sty -2020/07/07 | 18126 | graphics/asymptote/doc/asy-latex.dtx -2020/07/07 | 194595 | graphics/asymptote/doc/asy-latex.pdf -2020/07/07 | 1282789 | graphics/asymptote/doc/asymptote.pdf -2020/07/07 | 9836 | graphics/asymptote/doc/asymptote.sty -2020/07/07 | 386752 | graphics/asymptote/doc/asymptote.texi -2020/07/07 | 121144 | graphics/asymptote/doc/asyRefCard.pdf -2020/07/07 | 20051 | graphics/asymptote/doc/asyRefCard.tex -2020/07/07 | 246 | graphics/asymptote/doc/axis3.asy -2020/07/07 | 416 | graphics/asymptote/doc/bezier2.asy -2020/07/07 | 81 | graphics/asymptote/doc/bezier.asy -2020/07/07 | 234 | graphics/asymptote/doc/beziercurve.asy -2020/07/07 | 41 | graphics/asymptote/doc/bigdiagonal.asy -2020/07/07 | 306 | graphics/asymptote/doc/binarytreetest.asy -2020/07/07 | 677 | graphics/asymptote/doc/Bode.asy -2020/07/07 | 524 | graphics/asymptote/doc/brokenaxis.asy -2020/07/07 | 1391 | graphics/asymptote/doc/CAD1.asy -2020/07/07 | 186207 | graphics/asymptote/doc/CAD.pdf -2020/07/07 | 10196 | graphics/asymptote/doc/CAD.tex -2020/07/07 | 492 | graphics/asymptote/doc/CDlabel.asy -2020/07/07 | 4348 | graphics/asymptote/doc/colo-asy.tex -2020/07/07 | 49 | graphics/asymptote/doc/colons.asy -2020/07/07 | 1620 | graphics/asymptote/doc/colors.asy -2020/07/07 | 243 | graphics/asymptote/doc/cube.asy -2020/07/07 | 86 | graphics/asymptote/doc/cylinderskeleton.asy -2020/07/07 | 218 | graphics/asymptote/doc/datagraph.asy -2020/07/07 | 24 | graphics/asymptote/doc/diagonal.asy -2020/07/07 | 2882 | graphics/asymptote/doc/diatom.asy -2020/07/07 | 4067 | graphics/asymptote/doc/diatom.csv -2020/07/07 | 49 | graphics/asymptote/doc/dots.asy -2020/07/07 | 1051 | graphics/asymptote/doc/eetomumu.asy -2020/07/07 | 2039 | graphics/asymptote/doc/elliptic.asy -2020/07/07 | 912 | graphics/asymptote/doc/errorbars.asy -2020/07/07 | 202 | graphics/asymptote/doc/exp.asy -2020/07/07 | 343 | graphics/asymptote/doc/externalprc.tex -2020/07/07 | 19597 | graphics/asymptote/doc/external-proposal.html -2020/07/07 | 25137 | graphics/asymptote/doc/extra/intro.asy -2020/07/07 | 40764 | graphics/asymptote/doc/FAQ/asy-faq.bfnn -2020/07/07 | 63140 | graphics/asymptote/doc/FAQ/asy-faq.info -2020/07/07 | 9202 | graphics/asymptote/doc/FAQ/bfnnconv.pl -2020/07/07 | 13663 | graphics/asymptote/doc/FAQ/install-sh -2020/07/07 | 1000 | graphics/asymptote/doc/FAQ/Makefile -2020/07/07 | 4718 | graphics/asymptote/doc/FAQ/m-ascii.pl -2020/07/07 | 9725 | graphics/asymptote/doc/FAQ/m-html.pl -2020/07/07 | 5627 | graphics/asymptote/doc/FAQ/m-info.pl -2020/07/07 | 6104 | graphics/asymptote/doc/FAQ/m-lout.pl -2020/07/07 | 4578 | graphics/asymptote/doc/FAQ/m-post.pl -2020/07/07 | 238 | graphics/asymptote/doc/filegraph.asy -2020/07/07 | 26 | graphics/asymptote/doc/filegraph.dat -2020/07/07 | 604 | graphics/asymptote/doc/flow.asy -2020/07/07 | 862 | graphics/asymptote/doc/flowchartdemo.asy -2020/07/07 | 464 | graphics/asymptote/doc/GaussianSurface.asy -2020/07/07 | 376 | graphics/asymptote/doc/generalaxis3.asy -2020/07/07 | 277 | graphics/asymptote/doc/generalaxis.asy -2020/07/07 | 754 | graphics/asymptote/doc/graphmarkers.asy -2020/07/07 | 426 | graphics/asymptote/doc/grid3xyz.asy -2020/07/07 | 279 | graphics/asymptote/doc/hatch.asy -2020/07/07 | 423 | graphics/asymptote/doc/helix.asy -2020/07/07 | 330 | graphics/asymptote/doc/HermiteSpline.asy -2020/07/07 | 441 | graphics/asymptote/doc/histogram.asy -2020/07/07 | 521 | graphics/asymptote/doc/Hobbycontrol.asy -2020/07/07 | 500 | graphics/asymptote/doc/Hobbydir.asy -2020/07/07 | 380 | graphics/asymptote/doc/icon.asy -2020/07/07 | 401 | graphics/asymptote/doc/image.asy -2020/07/07 | 872 | graphics/asymptote/doc/imagecontour.asy -2020/07/07 | 13663 | graphics/asymptote/doc/install-sh -2020/07/07 | 357 | graphics/asymptote/doc/irregularcontour.asy -2020/07/07 | 442 | graphics/asymptote/doc/join3.asy -2020/07/07 | 261 | graphics/asymptote/doc/join.asy -2020/07/07 | 417 | graphics/asymptote/doc/knots.asy -2020/07/07 | 121 | graphics/asymptote/doc/labelsquare.asy -2020/07/07 | 144 | graphics/asymptote/doc/latexmkrc -2020/07/07 | 150 | graphics/asymptote/doc/latexmkrc_asydir -2020/07/07 | 3106 | graphics/asymptote/doc/latexusage.tex -2020/07/07 | 1025 | graphics/asymptote/doc/leastsquares.asy -2020/07/07 | 6318 | graphics/asymptote/doc/leastsquares.dat -2020/07/07 | 410 | graphics/asymptote/doc/legend.asy -2020/07/07 | 366 | graphics/asymptote/doc/lineargraph0.asy -2020/07/07 | 373 | graphics/asymptote/doc/lineargraph.asy -2020/07/07 | 416 | graphics/asymptote/doc/linetype.asy -2020/07/07 | 423 | graphics/asymptote/doc/log2graph.asy -2020/07/07 | 262 | graphics/asymptote/doc/loggraph.asy -2020/07/07 | 382 | graphics/asymptote/doc/loggrid.asy -2020/07/07 | 480 | graphics/asymptote/doc/logimage.asy -2020/07/07 | 619 | graphics/asymptote/doc/logo.asy -2020/07/07 | 314 | graphics/asymptote/doc/logticks.asy -2020/07/07 | 3023 | graphics/asymptote/doc/Makefile.in -2020/07/07 | 293 | graphics/asymptote/doc/makepen.asy -2020/07/07 | 2653 | graphics/asymptote/doc/markers1.asy -2020/07/07 | 877 | graphics/asymptote/doc/markers2.asy -2020/07/07 | 288 | graphics/asymptote/doc/mexicanhat.asy -2020/07/07 | 374 | graphics/asymptote/doc/monthaxis.asy -2020/07/07 | 458 | graphics/asymptote/doc/multicontour.asy -2020/07/07 | 3497 | graphics/asymptote/doc/ocg.sty -2020/07/07 | 115 | graphics/asymptote/doc/onecontour.asy -2020/07/07 | 240 | graphics/asymptote/doc/parametricgraph.asy -2020/07/07 | 498 | graphics/asymptote/doc/penfunctionimage.asy -2020/07/07 | 219 | graphics/asymptote/doc/penimage.asy -2020/07/07 | 2771 | graphics/asymptote/doc/pixel.pdf -2020/07/07 | 354 | graphics/asymptote/doc/planes.asy -2020/07/07 | 463387 | graphics/asymptote/doc/png/asymptote.info -2020/07/07 | 1469 | graphics/asymptote/doc/png/Makefile.in -2020/07/07 | 49 | graphics/asymptote/doc/quartercircle.asy -2020/07/07 | 354 | graphics/asymptote/doc/reloadpdf.tex -2020/07/07 | 157 | graphics/asymptote/doc/saddle.asy -2020/07/07 | 355 | graphics/asymptote/doc/scaledgraph.asy -2020/07/07 | 821 | graphics/asymptote/doc/secondaryaxis.asy -2020/07/07 | 48847 | graphics/asymptote/doc/secondaryaxis.csv -2020/07/07 | 256 | graphics/asymptote/doc/shadedtiling.asy -2020/07/07 | 154 | graphics/asymptote/doc/slopefield1.asy -2020/07/07 | 52 | graphics/asymptote/doc/square.asy -2020/07/07 | 341 | graphics/asymptote/doc/subpictures.asy -2020/07/07 | 123 | graphics/asymptote/doc/superpath.asy -2020/07/07 | 76935 | graphics/asymptote/doc/TeXShopAndAsymptote.pdf -2020/07/07 | 2653 | graphics/asymptote/doc/TeXShopAndAsymptote.tex -2020/07/07 | 390 | graphics/asymptote/doc/tile.asy -2020/07/07 | 396 | graphics/asymptote/doc/triangulate.asy -2020/07/07 | 186 | graphics/asymptote/doc/unitcircle3.asy -2020/07/07 | 147 | graphics/asymptote/doc/vectorfield.asy -2020/07/07 | 1746 | graphics/asymptote/doc/westnile.asy -2020/07/07 | 4727 | graphics/asymptote/doc/westnile.csv -2020/07/07 | 880 | graphics/asymptote/doc/xasy.1x -2020/07/07 | 1878 | graphics/asymptote/drawclipbegin.h -2020/07/07 | 1213 | graphics/asymptote/drawclipend.h -2020/07/07 | 11384 | graphics/asymptote/drawelement.h -2020/07/07 | 4619 | graphics/asymptote/drawfill.cc -2020/07/07 | 6625 | graphics/asymptote/drawfill.h -2020/07/07 | 496 | graphics/asymptote/drawgrestore.h -2020/07/07 | 2924 | graphics/asymptote/drawgroup.h -2020/07/07 | 466 | graphics/asymptote/drawgsave.h -2020/07/07 | 3042 | graphics/asymptote/drawimage.h -2020/07/07 | 6865 | graphics/asymptote/drawlabel.cc -2020/07/07 | 2163 | graphics/asymptote/drawlabel.h -2020/07/07 | 773 | graphics/asymptote/drawlayer.h -2020/07/07 | 5633 | graphics/asymptote/drawpath3.cc -2020/07/07 | 5931 | graphics/asymptote/drawpath3.h -2020/07/07 | 3522 | graphics/asymptote/drawpath.cc -2020/07/07 | 674 | graphics/asymptote/drawpath.h -2020/07/07 | 23876 | graphics/asymptote/drawsurface.cc -2020/07/07 | 20202 | graphics/asymptote/drawsurface.h -2020/07/07 | 1279 | graphics/asymptote/drawverbatim.h -2020/07/07 | 20738 | graphics/asymptote/entry.cc -2020/07/07 | 14795 | graphics/asymptote/entry.h -2020/07/07 | 5465 | graphics/asymptote/env.cc -2020/07/07 | 1142 | graphics/asymptote/envcompleter.cc -2020/07/07 | 845 | graphics/asymptote/envcompleter.h -2020/07/07 | 4575 | graphics/asymptote/env.h -2020/07/07 | 10632 | graphics/asymptote/EnvVarUpdate.nsh -2020/07/07 | 1753 | graphics/asymptote/errormsg.cc -2020/07/07 | 5098 | graphics/asymptote/errormsg.h -2020/07/07 | 9251 | graphics/asymptote/errors -2020/07/07 | 6911 | graphics/asymptote/errortest.asy -2020/07/07 | 657 | graphics/asymptote/examples/100d.views -2020/07/07 | 309 | graphics/asymptote/examples/1overx.asy -2020/07/07 | 4158 | graphics/asymptote/examples/advection.asy -2020/07/07 | 245 | graphics/asymptote/examples/alignbox.asy -2020/07/07 | 2832 | graphics/asymptote/examples/alignedaxis.asy -2020/07/07 | 946 | graphics/asymptote/examples/animations/cube.asy -2020/07/07 | 160672 | graphics/asymptote/examples/animations/dice.u3d -2020/07/07 | 1919 | graphics/asymptote/examples/animations/earthmoon.asy -2020/07/07 | 503 | graphics/asymptote/examples/animations/embeddedmovie.asy -2020/07/07 | 196 | graphics/asymptote/examples/animations/embeddedu3d.asy -2020/07/07 | 411 | graphics/asymptote/examples/animations/externalmovie.asy -2020/07/07 | 414 | graphics/asymptote/examples/animations/glmovie.asy -2020/07/07 | 1760 | graphics/asymptote/examples/animations/heatequation.asy -2020/07/07 | 1037 | graphics/asymptote/examples/animations/inlinemovie3.tex -2020/07/07 | 1235 | graphics/asymptote/examples/animations/inlinemovie.tex -2020/07/07 | 326 | graphics/asymptote/examples/animations/pdfmovie.asy -2020/07/07 | 1238 | graphics/asymptote/examples/animations/slidemovies.asy -2020/07/07 | 856 | graphics/asymptote/examples/animations/sphere.asy -2020/07/07 | 798 | graphics/asymptote/examples/animations/torusanimation.asy -2020/07/07 | 1498 | graphics/asymptote/examples/animations/wavepacket.asy -2020/07/07 | 1120 | graphics/asymptote/examples/animations/wheel.asy -2020/07/07 | 236 | graphics/asymptote/examples/annotation.asy -2020/07/07 | 1240 | graphics/asymptote/examples/arrows3.asy -2020/07/07 | 61 | graphics/asymptote/examples/axialshade.asy -2020/07/07 | 497 | graphics/asymptote/examples/bars3.asy -2020/07/07 | 1033 | graphics/asymptote/examples/basealign.asy -2020/07/07 | 395 | graphics/asymptote/examples/BezierPatch.asy -2020/07/07 | 581 | graphics/asymptote/examples/BezierSaddle.asy -2020/07/07 | 1526 | graphics/asymptote/examples/BezierSurface.asy -2020/07/07 | 199 | graphics/asymptote/examples/BezierTriangle.asy -2020/07/07 | 154 | graphics/asymptote/examples/billboard.asy -2020/07/07 | 513 | graphics/asymptote/examples/buildcycle.asy -2020/07/07 | 233 | graphics/asymptote/examples/cardioid.asy -2020/07/07 | 485 | graphics/asymptote/examples/cards.asy -2020/07/07 | 691 | graphics/asymptote/examples/centroidfg.asy -2020/07/07 | 322 | graphics/asymptote/examples/cheese.asy -2020/07/07 | 576 | graphics/asymptote/examples/circles.asy -2020/07/07 | 228 | graphics/asymptote/examples/circumcircle.asy -2020/07/07 | 762 | graphics/asymptote/examples/clockarray.asy -2020/07/07 | 264 | graphics/asymptote/examples/coag.asy -2020/07/07 | 424 | graphics/asymptote/examples/colorpatch.asy -2020/07/07 | 465 | graphics/asymptote/examples/colorplanes.asy -2020/07/07 | 739 | graphics/asymptote/examples/condor.asy -2020/07/07 | 495 | graphics/asymptote/examples/cones.asy -2020/07/07 | 1780 | graphics/asymptote/examples/conicurv.asy -2020/07/07 | 255 | graphics/asymptote/examples/contextfonts.asy -2020/07/07 | 778 | graphics/asymptote/examples/controlsystem.asy -2020/07/07 | 123 | graphics/asymptote/examples/Coons.asy -2020/07/07 | 235 | graphics/asymptote/examples/cos2theta.asy -2020/07/07 | 582 | graphics/asymptote/examples/cos3.asy -2020/07/07 | 461 | graphics/asymptote/examples/cosaddition.asy -2020/07/07 | 5740 | graphics/asymptote/examples/cpkcolors.asy -2020/07/07 | 573 | graphics/asymptote/examples/curvedlabel3.asy -2020/07/07 | 177 | graphics/asymptote/examples/curvedlabel.asy -2020/07/07 | 1835 | graphics/asymptote/examples/cyclohexane.asy -2020/07/07 | 352 | graphics/asymptote/examples/cylinder.asy -2020/07/07 | 506 | graphics/asymptote/examples/delu.asy -2020/07/07 | 521 | graphics/asymptote/examples/dimension.asy -2020/07/07 | 1216 | graphics/asymptote/examples/dragon.asy -2020/07/07 | 1326 | graphics/asymptote/examples/electromagnetic.asy -2020/07/07 | 325 | graphics/asymptote/examples/elevation.asy -2020/07/07 | 398 | graphics/asymptote/examples/epix.asy -2020/07/07 | 242 | graphics/asymptote/examples/equilateral.asy -2020/07/07 | 549 | graphics/asymptote/examples/equilchord.asy -2020/07/07 | 579 | graphics/asymptote/examples/exp3.asy -2020/07/07 | 519 | graphics/asymptote/examples/extrudedcontour.asy -2020/07/07 | 498 | graphics/asymptote/examples/fano.asy -2020/07/07 | 972 | graphics/asymptote/examples/fequlogo.asy -2020/07/07 | 727 | graphics/asymptote/examples/fermi.asy -2020/07/07 | 971 | graphics/asymptote/examples/filesurface.asy -2020/07/07 | 5543 | graphics/asymptote/examples/filesurface.dat -2020/07/07 | 574 | graphics/asymptote/examples/fillcontour.asy -2020/07/07 | 4203 | graphics/asymptote/examples/fin.asy -2020/07/07 | 710 | graphics/asymptote/examples/fjortoft.asy -2020/07/07 | 581 | graphics/asymptote/examples/floatingdisk.asy -2020/07/07 | 502 | graphics/asymptote/examples/floor.asy -2020/07/07 | 683 | graphics/asymptote/examples/fractaltree.asy -2020/07/07 | 1185 | graphics/asymptote/examples/functionshading.asy -2020/07/07 | 499 | graphics/asymptote/examples/galleon.asy -2020/07/07 | 714 | graphics/asymptote/examples/gamma3.asy -2020/07/07 | 440 | graphics/asymptote/examples/gamma.asy -2020/07/07 | 679 | graphics/asymptote/examples/genusthree.asy -2020/07/07 | 1136 | graphics/asymptote/examples/genustwo.asy -2020/07/07 | 383 | graphics/asymptote/examples/Gouraud.asy -2020/07/07 | 616 | graphics/asymptote/examples/Gouraudcontour.asy -2020/07/07 | 76 | graphics/asymptote/examples/grid.asy -2020/07/07 | 459 | graphics/asymptote/examples/hierarchy.asy -2020/07/07 | 315 | graphics/asymptote/examples/hyperboloid.asy -2020/07/07 | 267 | graphics/asymptote/examples/hyperboloidsilhouette.asy -2020/07/07 | 1140 | graphics/asymptote/examples/imagehistogram.asy -2020/07/07 | 610 | graphics/asymptote/examples/impact.asy -2020/07/07 | 605 | graphics/asymptote/examples/integraltest.asy -2020/07/07 | 4825 | graphics/asymptote/examples/interpolate1.asy -2020/07/07 | 291 | graphics/asymptote/examples/jump.asy -2020/07/07 | 1309 | graphics/asymptote/examples/Klein.asy -2020/07/07 | 182 | graphics/asymptote/examples/label3.asy -2020/07/07 | 196 | graphics/asymptote/examples/label3ribbon.asy -2020/07/07 | 187 | graphics/asymptote/examples/label3solid.asy -2020/07/07 | 546 | graphics/asymptote/examples/label3zoom.asy -2020/07/07 | 264 | graphics/asymptote/examples/labelbox.asy -2020/07/07 | 1114 | graphics/asymptote/examples/laserlattice.asy -2020/07/07 | 136 | graphics/asymptote/examples/latticeshading.asy -2020/07/07 | 688 | graphics/asymptote/examples/layers.asy -2020/07/07 | 460 | graphics/asymptote/examples/lever.asy -2020/07/07 | 654 | graphics/asymptote/examples/limit.asy -2020/07/07 | 1908 | graphics/asymptote/examples/linearregression.asy -2020/07/07 | 168 | graphics/asymptote/examples/lines.asy -2020/07/07 | 980 | graphics/asymptote/examples/lmfit1.asy -2020/07/07 | 206 | graphics/asymptote/examples/log.asy -2020/07/07 | 349 | graphics/asymptote/examples/logdown.asy -2020/07/07 | 1231 | graphics/asymptote/examples/logo3.asy -2020/07/07 | 196 | graphics/asymptote/examples/lowint.asy -2020/07/07 | 659 | graphics/asymptote/examples/lowupint.asy -2020/07/07 | 479 | graphics/asymptote/examples/magnetic.asy -2020/07/07 | 833 | graphics/asymptote/examples/markregular.asy -2020/07/07 | 1950 | graphics/asymptote/examples/mergeExample.asy -2020/07/07 | 5258 | graphics/asymptote/examples/mosaic.asy -2020/07/07 | 2512 | graphics/asymptote/examples/mosquito.asy -2020/07/07 | 1569 | graphics/asymptote/examples/near_earth.asy -2020/07/07 | 649 | graphics/asymptote/examples/NURBScurve.asy -2020/07/07 | 1020 | graphics/asymptote/examples/NURBSsphere.asy -2020/07/07 | 1461 | graphics/asymptote/examples/NURBSsurface.asy -2020/07/07 | 1251 | graphics/asymptote/examples/odetest.asy -2020/07/07 | 309 | graphics/asymptote/examples/oneoverx.asy -2020/07/07 | 861 | graphics/asymptote/examples/orthocenter.asy -2020/07/07 | 254 | graphics/asymptote/examples/parametricelevation.asy -2020/07/07 | 407 | graphics/asymptote/examples/parametricsurface.asy -2020/07/07 | 711 | graphics/asymptote/examples/partialsurface.asy -2020/07/07 | 1055 | graphics/asymptote/examples/partitionExample.asy -2020/07/07 | 419 | graphics/asymptote/examples/pathintersectsurface.asy -2020/07/07 | 3344 | graphics/asymptote/examples/pdb.asy -2020/07/07 | 361 | graphics/asymptote/examples/phase.asy -2020/07/07 | 22873 | graphics/asymptote/examples/piicon.png -2020/07/07 | 362 | graphics/asymptote/examples/pipeintersection.asy -2020/07/07 | 3873 | graphics/asymptote/examples/pipes.asy -2020/07/07 | 418 | graphics/asymptote/examples/planeproject.asy -2020/07/07 | 930 | graphics/asymptote/examples/polararea.asy -2020/07/07 | 628 | graphics/asymptote/examples/polarcircle.asy -2020/07/07 | 326 | graphics/asymptote/examples/polardatagraph.asy -2020/07/07 | 643 | graphics/asymptote/examples/p-orbital.asy -2020/07/07 | 956 | graphics/asymptote/examples/poster.asy -2020/07/07 | 58 | graphics/asymptote/examples/progrid.asy -2020/07/07 | 373 | graphics/asymptote/examples/projectelevation.asy -2020/07/07 | 438 | graphics/asymptote/examples/projectrevolution.asy -2020/07/07 | 747 | graphics/asymptote/examples/pseudosphere.asy -2020/07/07 | 557 | graphics/asymptote/examples/Pythagoras.asy -2020/07/07 | 420 | graphics/asymptote/examples/PythagoreanTree.asy -2020/07/07 | 734 | graphics/asymptote/examples/quilt.asy -2020/07/07 | 325 | graphics/asymptote/examples/rainbow.asy -2020/07/07 | 78 | graphics/asymptote/examples/randompath3.asy -2020/07/07 | 1537 | graphics/asymptote/examples/refs.bib -2020/07/07 | 993 | graphics/asymptote/examples/RiemannSphere.asy -2020/07/07 | 369 | graphics/asymptote/examples/RiemannSurface.asy -2020/07/07 | 386 | graphics/asymptote/examples/RiemannSurfaceRoot.asy -2020/07/07 | 141 | graphics/asymptote/examples/ring.asy -2020/07/07 | 182 | graphics/asymptote/examples/roll.asy -2020/07/07 | 1310 | graphics/asymptote/examples/roundpath.asy -2020/07/07 | 288 | graphics/asymptote/examples/sacone3D.asy -2020/07/07 | 445 | graphics/asymptote/examples/sacone.asy -2020/07/07 | 341 | graphics/asymptote/examples/sacylinder3D.asy -2020/07/07 | 400 | graphics/asymptote/examples/sacylinder.asy -2020/07/07 | 66 | graphics/asymptote/examples/shade.asy -2020/07/07 | 104 | graphics/asymptote/examples/shadestroke.asy -2020/07/07 | 1065 | graphics/asymptote/examples/shellmethod.asy -2020/07/07 | 829 | graphics/asymptote/examples/shellsqrtx01.asy -2020/07/07 | 410 | graphics/asymptote/examples/Sierpinski.asy -2020/07/07 | 849 | graphics/asymptote/examples/SierpinskiGasket.asy -2020/07/07 | 2361 | graphics/asymptote/examples/SierpinskiSponge.asy -2020/07/07 | 327 | graphics/asymptote/examples/sin1x.asy -2020/07/07 | 579 | graphics/asymptote/examples/sin3.asy -2020/07/07 | 591 | graphics/asymptote/examples/sinc.asy -2020/07/07 | 385 | graphics/asymptote/examples/sinxlex.asy -2020/07/07 | 3340 | graphics/asymptote/examples/slidedemo.asy -2020/07/07 | 341 | graphics/asymptote/examples/slidedemo_.bbl -2020/07/07 | 2043 | graphics/asymptote/examples/slope.asy -2020/07/07 | 520 | graphics/asymptote/examples/smoothelevation.asy -2020/07/07 | 2678 | graphics/asymptote/examples/soccerball.asy -2020/07/07 | 2362 | graphics/asymptote/examples/spectrum.asy -2020/07/07 | 141 | graphics/asymptote/examples/sphere.asy -2020/07/07 | 150 | graphics/asymptote/examples/spheresilhouette.asy -2020/07/07 | 165 | graphics/asymptote/examples/sphereskeleton.asy -2020/07/07 | 376 | graphics/asymptote/examples/sphericalharmonic.asy -2020/07/07 | 426 | graphics/asymptote/examples/spiral3.asy -2020/07/07 | 210 | graphics/asymptote/examples/spiral.asy -2020/07/07 | 618 | graphics/asymptote/examples/spline.asy -2020/07/07 | 2180 | graphics/asymptote/examples/splitpatch.asy -2020/07/07 | 38 | graphics/asymptote/examples/spring0.asy -2020/07/07 | 43 | graphics/asymptote/examples/spring2.asy -2020/07/07 | 671 | graphics/asymptote/examples/spring.asy -2020/07/07 | 674 | graphics/asymptote/examples/sqrtx01.asy -2020/07/07 | 579 | graphics/asymptote/examples/sqrtx01y1.asy -2020/07/07 | 145 | graphics/asymptote/examples/star.asy -2020/07/07 | 170 | graphics/asymptote/examples/stereoscopic.asy -2020/07/07 | 59 | graphics/asymptote/examples/stroke3.asy -2020/07/07 | 315 | graphics/asymptote/examples/strokepath.asy -2020/07/07 | 168 | graphics/asymptote/examples/strokeshade.asy -2020/07/07 | 198 | graphics/asymptote/examples/tanh.asy -2020/07/07 | 13739 | graphics/asymptote/examples/teapot.asy -2020/07/07 | 303 | graphics/asymptote/examples/tensor.asy -2020/07/07 | 547 | graphics/asymptote/examples/tetra.asy -2020/07/07 | 312 | graphics/asymptote/examples/textpath.asy -2020/07/07 | 10210 | graphics/asymptote/examples/thermodynamics.asy -2020/07/07 | 576 | graphics/asymptote/examples/threeviews.asy -2020/07/07 | 104 | graphics/asymptote/examples/tiling.asy -2020/07/07 | 413 | graphics/asymptote/examples/torus.asy -2020/07/07 | 246 | graphics/asymptote/examples/transparency.asy -2020/07/07 | 250 | graphics/asymptote/examples/transparentCubes.asy -2020/07/07 | 602 | graphics/asymptote/examples/treetest.asy -2020/07/07 | 589 | graphics/asymptote/examples/trefoilknot.asy -2020/07/07 | 969 | graphics/asymptote/examples/triads.asy -2020/07/07 | 209 | graphics/asymptote/examples/triangle.asy -2020/07/07 | 441 | graphics/asymptote/examples/triangles.asy -2020/07/07 | 251 | graphics/asymptote/examples/triceratops.asy -2020/07/07 | 291 | graphics/asymptote/examples/trumpet.asy -2020/07/07 | 2084 | graphics/asymptote/examples/truncatedIcosahedron.asy -2020/07/07 | 40326 | graphics/asymptote/examples/tvgen.asy -2020/07/07 | 885 | graphics/asymptote/examples/twistedtubes.asy -2020/07/07 | 26096 | graphics/asymptote/examples/uhrturm.obj -2020/07/07 | 322 | graphics/asymptote/examples/unitcircle.asy -2020/07/07 | 430 | graphics/asymptote/examples/unitoctant.asy -2020/07/07 | 714 | graphics/asymptote/examples/unitoctantx.asy -2020/07/07 | 199 | graphics/asymptote/examples/upint.asy -2020/07/07 | 525 | graphics/asymptote/examples/vectorfield3.asy -2020/07/07 | 351 | graphics/asymptote/examples/vectorfieldsphere.asy -2020/07/07 | 839 | graphics/asymptote/examples/venn3.asy -2020/07/07 | 626 | graphics/asymptote/examples/venn.asy -2020/07/07 | 784 | graphics/asymptote/examples/vertexshading.asy -2020/07/07 | 360 | graphics/asymptote/examples/washer.asy -2020/07/07 | 1010 | graphics/asymptote/examples/washermethod.asy -2020/07/07 | 628 | graphics/asymptote/examples/wedge.asy -2020/07/07 | 1036 | graphics/asymptote/examples/workcone.asy -2020/07/07 | 978 | graphics/asymptote/examples/worksheet.asy -2020/07/07 | 2633 | graphics/asymptote/examples/worldmap.asy -2020/07/07 | 1261761 | graphics/asymptote/examples/worldmap.dat -2020/07/07 | 580 | graphics/asymptote/examples/xsin1x.asy -2020/07/07 | 3746 | graphics/asymptote/examples/xstitch.asy -2020/07/07 | 743 | graphics/asymptote/examples/xxsq01.asy -2020/07/07 | 868 | graphics/asymptote/examples/xxsq01x-1.asy -2020/07/07 | 827 | graphics/asymptote/examples/xxsq01y.asy -2020/07/07 | 223 | graphics/asymptote/examples/yingyang.asy -2020/07/07 | 33877 | graphics/asymptote/exp.cc -2020/07/07 | 28809 | graphics/asymptote/exp.h -2020/07/07 | 119 | graphics/asymptote/fftw++asy.cc -2020/07/07 | 1694 | graphics/asymptote/fftw++.cc -2020/07/07 | 44894 | graphics/asymptote/fftw++.h -2020/07/07 | 4063 | graphics/asymptote/fileio.cc -2020/07/07 | 20163 | graphics/asymptote/fileio.h -2020/07/07 | 1245 | graphics/asymptote/findsym.pl -2020/07/07 | 1020 | graphics/asymptote/flatguide.cc -2020/07/07 | 4231 | graphics/asymptote/flatguide.h -2020/07/07 | 666 | graphics/asymptote/fpu.h -2020/07/07 | 2173 | graphics/asymptote/frame.h -2020/07/07 | 7935 | graphics/asymptote/fundec.cc -2020/07/07 | 4347 | graphics/asymptote/fundec.h -2020/07/07 | 1160528 | graphics/asymptote/gc-8.0.4.tar.gz -2020/07/07 | 3161 | graphics/asymptote/genv.cc -2020/07/07 | 1626 | graphics/asymptote/genv.h -2020/07/07 | 4520 | graphics/asymptote/getopt1.c -2020/07/07 | 30147 | graphics/asymptote/getopt.c -2020/07/07 | 6650 | graphics/asymptote/getopt.h -2020/07/07 | 202 | graphics/asymptote/glew.c -2020/07/07 | 1235777 | graphics/asymptote/GL/glew.c -2020/07/07 | 1186601 | graphics/asymptote/GL/glew.h -2020/07/07 | 73435 | graphics/asymptote/GL/glxew.h -2020/07/07 | 76801 | graphics/asymptote/gl-matrix-2.4.0-pruned/dist/gl-matrix.js -2020/07/07 | 1131 | graphics/asymptote/gl-matrix-2.4.0-pruned/LICENSE.js -2020/07/07 | 45928 | graphics/asymptote/glrender.cc -2020/07/07 | 9314 | graphics/asymptote/glrender.h -2020/07/07 | 63314 | graphics/asymptote/GL/wglew.h -2020/07/07 | 50697 | graphics/asymptote/gsl.cc -2020/07/07 | 22 | graphics/asymptote/GUI/configs/__init__.py -2020/07/07 | 1148 | graphics/asymptote/GUI/configs/xasyconfig.cson -2020/07/07 | 395 | graphics/asymptote/GUI/configs/xasykeymap.cson -2020/07/07 | 3503 | graphics/asymptote/GUI/CustMatTransform.py -2020/07/07 | 131 | graphics/asymptote/GUI/DebugFlags.py -2020/07/07 | 1175 | graphics/asymptote/guide.cc -2020/07/07 | 298 | graphics/asymptote/guideflags.h -2020/07/07 | 6783 | graphics/asymptote/guide.h -2020/07/07 | 1724 | graphics/asymptote/GUI/GuidesManager.py -2020/07/07 | 164511 | graphics/asymptote/GUI/icons_rc.py -2020/07/07 | 23 | graphics/asymptote/GUI/__init__.py -2020/07/07 | 11528 | graphics/asymptote/GUI/InplaceAddObj.py -2020/07/07 | 5151 | graphics/asymptote/GUI/labelEditor.py -2020/07/07 | 700 | graphics/asymptote/GUI/locale/th/LC_MESSAGES/base.po -2020/07/07 | 2399 | graphics/asymptote/GUI/PrimitiveShape.py -2020/07/07 | 9945 | graphics/asymptote/GUI/pyUIClass/custMatTransform.py -2020/07/07 | 6154 | graphics/asymptote/GUI/pyUIClass/labelTextEditor.py -2020/07/07 | 2825 | graphics/asymptote/GUI/pyUIClass/setCustomAnchor.py -2020/07/07 | 7129 | graphics/asymptote/GUI/pyUIClass/widg_addLabel.py -2020/07/07 | 2193 | graphics/asymptote/GUI/pyUIClass/widg_addPolyOpt.py -2020/07/07 | 4849 | graphics/asymptote/GUI/pyUIClass/widg_editBezier.py -2020/07/07 | 4668 | graphics/asymptote/GUI/pyUIClass/widgetPointEditor.py -2020/07/07 | 56646 | graphics/asymptote/GUI/pyUIClass/window1.py -2020/07/07 | 57 | graphics/asymptote/GUI/requirements.txt -2020/07/07 | 361 | graphics/asymptote/GUI/res/icons/anchor.svg -2020/07/07 | 637 | graphics/asymptote/GUI/res/icons/android-arrow-back.svg -2020/07/07 | 637 | graphics/asymptote/GUI/res/icons/android-arrow-forward.svg -2020/07/07 | 802 | graphics/asymptote/GUI/res/icons/android-camera.svg -2020/07/07 | 695 | graphics/asymptote/GUI/res/icons/android-close.svg -2020/07/07 | 1319 | graphics/asymptote/GUI/res/icons/android-color-palette.svg -2020/07/07 | 674 | graphics/asymptote/GUI/res/icons/android-delete.svg -2020/07/07 | 633 | graphics/asymptote/GUI/res/icons/android-done.svg -2020/07/07 | 822 | graphics/asymptote/GUI/res/icons/android-expand.svg -2020/07/07 | 850 | graphics/asymptote/GUI/res/icons/android-folder-open.svg -2020/07/07 | 1482 | graphics/asymptote/GUI/res/icons/android-hand.svg -2020/07/07 | 1124 | graphics/asymptote/GUI/res/icons/android-locate.svg -2020/07/07 | 764 | graphics/asymptote/GUI/res/icons/android-radio-button-off.svg -2020/07/07 | 844 | graphics/asymptote/GUI/res/icons/android-radio-button-on.svg -2020/07/07 | 806 | graphics/asymptote/GUI/res/icons/android-refresh.svg -2020/07/07 | 713 | graphics/asymptote/GUI/res/icons/arrow-move.svg -2020/07/07 | 639 | graphics/asymptote/GUI/res/icons/arrow-resize.svg -2020/07/07 | 589 | graphics/asymptote/GUI/res/icons/bucket.asy -2020/07/07 | 1492 | graphics/asymptote/GUI/res/icons/bucket.svg -2020/07/07 | 111 | graphics/asymptote/GUI/res/icons/center.asy -2020/07/07 | 124 | graphics/asymptote/GUI/res/icons/centerorigin.asy -2020/07/07 | 1052 | graphics/asymptote/GUI/res/icons/centerorigin.svg -2020/07/07 | 892 | graphics/asymptote/GUI/res/icons/center.svg -2020/07/07 | 780 | graphics/asymptote/GUI/res/icons/check.svg -2020/07/07 | 1013 | graphics/asymptote/GUI/res/icons/chevron-with-circle-left.svg -2020/07/07 | 998 | graphics/asymptote/GUI/res/icons/chevron-with-circle-right.svg -2020/07/07 | 754 | graphics/asymptote/GUI/res/icons/circle.svg -2020/07/07 | 105 | graphics/asymptote/GUI/res/icons/closedcurve.asy -2020/07/07 | 1237 | graphics/asymptote/GUI/res/icons/closedcurve.svg -2020/07/07 | 105 | graphics/asymptote/GUI/res/icons/closedpolygon.asy -2020/07/07 | 1102 | graphics/asymptote/GUI/res/icons/closedpolygon.svg -2020/07/07 | 838 | graphics/asymptote/GUI/res/icons/close-round.svg -2020/07/07 | 1194 | graphics/asymptote/GUI/res/icons/code.svg -2020/07/07 | 876 | graphics/asymptote/GUI/res/icons/edit.svg -2020/07/07 | 1003 | graphics/asymptote/GUI/res/icons/eye.svg -2020/07/07 | 1967 | graphics/asymptote/GUI/res/icons/filledbucket.svg -2020/07/07 | 1764 | graphics/asymptote/GUI/res/icons/grid.svg -2020/07/07 | 964 | graphics/asymptote/GUI/res/icons/magnifying-glass.svg -2020/07/07 | 98 | graphics/asymptote/GUI/res/icons/opencurve.asy -2020/07/07 | 1186 | graphics/asymptote/GUI/res/icons/opencurve.svg -2020/07/07 | 98 | graphics/asymptote/GUI/res/icons/openpolygon.asy -2020/07/07 | 1085 | graphics/asymptote/GUI/res/icons/openpolygon.svg -2020/07/07 | 759 | graphics/asymptote/GUI/res/icons/plus-round.svg -2020/07/07 | 1711 | graphics/asymptote/GUI/res/icons.qrc -2020/07/07 | 673 | graphics/asymptote/GUI/res/icons/save.svg -2020/07/07 | 1920 | graphics/asymptote/GUI/res/icons/social-python.svg -2020/07/07 | 108 | graphics/asymptote/GUI/res/icons/subdirectory-left.svg -2020/07/07 | 284 | graphics/asymptote/GUI/res/icons/text.svg -2020/07/07 | 1226 | graphics/asymptote/GUI/res/icons/triangle-stroked-15.svg -2020/07/07 | 1393 | graphics/asymptote/GUI/SetCustomAnchor.py -2020/07/07 | 394 | graphics/asymptote/GUI/setup.py -2020/07/07 | 3616 | graphics/asymptote/GUI/UndoRedoStack.py -2020/07/07 | 3249 | graphics/asymptote/GUI/Widg_addLabel.py -2020/07/07 | 883 | graphics/asymptote/GUI/Widg_addPolyOpt.py -2020/07/07 | 1665 | graphics/asymptote/GUI/Widg_editBezier.py -2020/07/07 | 72687 | graphics/asymptote/GUI/Window1.py -2020/07/07 | 10271 | graphics/asymptote/GUI/windows/custMatTransform.ui -2020/07/07 | 6552 | graphics/asymptote/GUI/windows/labelTextEditor.ui -2020/07/07 | 2631 | graphics/asymptote/GUI/windows/setCustomAnchor.ui -2020/07/07 | 6896 | graphics/asymptote/GUI/windows/widg_addLabel.ui -2020/07/07 | 2148 | graphics/asymptote/GUI/windows/widg_addPolyOpt.ui -2020/07/07 | 4474 | graphics/asymptote/GUI/windows/widg_editBezier.ui -2020/07/07 | 4166 | graphics/asymptote/GUI/windows/widgetPointEditor.ui -2020/07/07 | 75576 | graphics/asymptote/GUI/windows/window1.ui -2020/07/07 | 50492 | graphics/asymptote/GUI/xasy2asy.py -2020/07/07 | 821 | graphics/asymptote/GUI/xasyArgs.py -2020/07/07 | 13550 | graphics/asymptote/GUI/xasyBezierInterface.py -2020/07/07 | 2554 | graphics/asymptote/GUI/xasyFile.py -2020/07/07 | 5048 | graphics/asymptote/GUI/xasyOptions.py -2020/07/07 | 503 | graphics/asymptote/GUI/xasy.py -2020/07/07 | 599 | graphics/asymptote/GUI/xasyStrings.py -2020/07/07 | 710 | graphics/asymptote/GUI/xasySvg.py -2020/07/07 | 964 | graphics/asymptote/GUI/xasyTransform.py -2020/07/07 | 1504 | graphics/asymptote/GUI/xasyUtils.py -2020/07/07 | 238 | graphics/asymptote/GUI/xasyValidator.py -2020/07/07 | 12744 | graphics/asymptote/impdatum.cc -2020/07/07 | 10445 | graphics/asymptote/INSTALL -2020/07/07 | 15645 | graphics/asymptote/install-sh -2020/07/07 | 1986 | graphics/asymptote/inst.h -2020/07/07 | 5538 | graphics/asymptote/interact.cc -2020/07/07 | 1349 | graphics/asymptote/interact.h -2020/07/07 | 5857 | graphics/asymptote/item.h -2020/07/07 | 9771 | graphics/asymptote/jsfile.cc -2020/07/07 | 2104 | graphics/asymptote/jsfile.h -2020/07/07 | 609 | graphics/asymptote/keywords.cc -2020/07/07 | 1253 | graphics/asymptote/keywords.pl -2020/07/07 | 22355 | graphics/asymptote/knot.cc -2020/07/07 | 12300 | graphics/asymptote/knot.h -2020/07/07 | 345 | graphics/asymptote/lexical.h -2020/07/07 | 83431 | graphics/asymptote/lex.yy.cc -2020/07/07 | 503734 | graphics/asymptote/libatomic_ops-7.6.10.tar.gz -2020/07/07 | 35147 | graphics/asymptote/LICENSE -2020/07/07 | 7639 | graphics/asymptote/LICENSE.LESSER -2020/07/07 | 2766 | graphics/asymptote/lnkX64IconFix.nsh -2020/07/07 | 2197 | graphics/asymptote/locate.cc -2020/07/07 | 577 | graphics/asymptote/locate.h -2020/07/07 | 5424 | graphics/asymptote/main.cc -2020/07/07 | 11604 | graphics/asymptote/Makefile.in -2020/07/07 | 2632 | graphics/asymptote/material.h -2020/07/07 | 6425 | graphics/asymptote/mathop.h -2020/07/07 | 5070 | graphics/asymptote/memory.h -2020/07/07 | 720 | graphics/asymptote/mod.h -2020/07/07 | 908 | graphics/asymptote/modifier.h -2020/07/07 | 7445 | graphics/asymptote/name.cc -2020/07/07 | 5239 | graphics/asymptote/name.h -2020/07/07 | 4269 | graphics/asymptote/newexp.cc -2020/07/07 | 1278 | graphics/asymptote/newexp.h -2020/07/07 | 917 | graphics/asymptote/opcodes.h -2020/07/07 | 1050 | graphics/asymptote/opsymbols.pl -2020/07/07 | 5145 | graphics/asymptote/pair.h -2020/07/07 | 3498 | graphics/asymptote/parser.cc -2020/07/07 | 852 | graphics/asymptote/parser.h -2020/07/07 | 5262 | graphics/asymptote/patches/bison.patch -2020/07/07 | 1805 | graphics/asymptote/patches/cygwin_freeglut-3.0.0.patch -2020/07/07 | 1311 | graphics/asymptote/patches/dvipdf -2020/07/07 | 113 | graphics/asymptote/patches/fixmem.reg -2020/07/07 | 1524 | graphics/asymptote/patches/flex.patch -2020/07/07 | 271 | graphics/asymptote/patches/gc6.8_AIX.patch -2020/07/07 | 489 | graphics/asymptote/patches/gc-7.0nomem.patch -2020/07/07 | 318 | graphics/asymptote/patches/gcc3.3.2curses.patch -2020/07/07 | 19462 | graphics/asymptote/patches/gl-matrix-2.4.0-pruned.patch -2020/07/07 | 1082 | graphics/asymptote/patches/README -2020/07/07 | 38217 | graphics/asymptote/path3.cc -2020/07/07 | 10604 | graphics/asymptote/path3.h -2020/07/07 | 34126 | graphics/asymptote/path.cc -2020/07/07 | 11680 | graphics/asymptote/path.h -2020/07/07 | 1594 | graphics/asymptote/pen.cc -2020/07/07 | 28156 | graphics/asymptote/pen.h -2020/07/07 | 40864 | graphics/asymptote/picture.cc -2020/07/07 | 3514 | graphics/asymptote/picture.h -2020/07/07 | 5248 | graphics/asymptote/pipestream.cc -2020/07/07 | 2624 | graphics/asymptote/pipestream.h -2020/07/07 | 138 | graphics/asymptote/Pipfile -2020/07/07 | 2526 | graphics/asymptote/policy.h -2020/07/07 | 654 | graphics/asymptote/prcfile.h -2020/07/07 | 974 | graphics/asymptote/prc/Makefile -2020/07/07 | 70751 | graphics/asymptote/prc/oPRCFile.cc -2020/07/07 | 51432 | graphics/asymptote/prc/oPRCFile.h -2020/07/07 | 8371 | graphics/asymptote/prc/PRCbitStream.cc -2020/07/07 | 2518 | graphics/asymptote/prc/PRCbitStream.h -2020/07/07 | 177246 | graphics/asymptote/prc/PRCdouble.cc -2020/07/07 | 3765 | graphics/asymptote/prc/PRCdouble.h -2020/07/07 | 30208 | graphics/asymptote/prc/PRC.h -2020/07/07 | 6021 | graphics/asymptote/prc/PRCTools/bitData.cc -2020/07/07 | 1860 | graphics/asymptote/prc/PRCTools/bitData.h -2020/07/07 | 1927 | graphics/asymptote/prc/PRCTools/bitSearchDouble.cc -2020/07/07 | 1863 | graphics/asymptote/prc/PRCTools/bitSearchUI.cc -2020/07/07 | 1245 | graphics/asymptote/prc/PRCTools/describeMain.cc -2020/07/07 | 68126 | graphics/asymptote/prc/PRCTools/describePRC.cc -2020/07/07 | 4335 | graphics/asymptote/prc/PRCTools/describePRC.h -2020/07/07 | 1310 | graphics/asymptote/prc/PRCTools/extractSections.cc -2020/07/07 | 2276 | graphics/asymptote/prc/PRCTools/inflation.cc -2020/07/07 | 1051 | graphics/asymptote/prc/PRCTools/inflation.h -2020/07/07 | 1479 | graphics/asymptote/prc/PRCTools/inflationMain.cc -2020/07/07 | 8792 | graphics/asymptote/prc/PRCTools/iPRCFile.cc -2020/07/07 | 2341 | graphics/asymptote/prc/PRCTools/iPRCFile.h -2020/07/07 | 1658 | graphics/asymptote/prc/PRCTools/Makefile -2020/07/07 | 4716 | graphics/asymptote/prc/PRCTools/makePRC.cc -2020/07/07 | 95 | graphics/asymptote/prc/test.asy -2020/07/07 | 36243 | graphics/asymptote/prc/test.cc -2020/07/07 | 66751 | graphics/asymptote/prc/writePRC.cc -2020/07/07 | 48481 | graphics/asymptote/prc/writePRC.h -2020/07/07 | 116025 | graphics/asymptote/predicates.cc -2020/07/07 | 986 | graphics/asymptote/predicates.h -2020/07/07 | 1234 | graphics/asymptote/primitives.h -2020/07/07 | 25292 | graphics/asymptote/process.cc -2020/07/07 | 3003 | graphics/asymptote/process.h -2020/07/07 | 2378 | graphics/asymptote/profile.py -2020/07/07 | 9892 | graphics/asymptote/profiler.h -2020/07/07 | 3275 | graphics/asymptote/program.cc -2020/07/07 | 2562 | graphics/asymptote/program.h -2020/07/07 | 19124 | graphics/asymptote/psfile.cc -2020/07/07 | 9027 | graphics/asymptote/psfile.h -2020/07/07 | 2505 | graphics/asymptote/README -2020/07/07 | 1704 | graphics/asymptote/record.cc -2020/07/07 | 2738 | graphics/asymptote/record.h -2020/07/07 | 1098 | graphics/asymptote/refaccess.cc -2020/07/07 | 1936 | graphics/asymptote/refaccess.h -2020/07/07 | 121567 | graphics/asymptote/ReleaseNotes -2020/07/07 | 62 | graphics/asymptote/revision.cc -2020/07/07 | 3553 | graphics/asymptote/rounding.h -2020/07/07 | 73550 | graphics/asymptote/runarray.cc -2020/07/07 | 1492 | graphics/asymptote/runarray.h -2020/07/07 | 48715 | graphics/asymptote/runarray.in -2020/07/07 | 2661 | graphics/asymptote/runbacktrace.cc -2020/07/07 | 169 | graphics/asymptote/runbacktrace.h -2020/07/07 | 833 | graphics/asymptote/runbacktrace.in -2020/07/07 | 17790 | graphics/asymptote/runfile.cc -2020/07/07 | 969 | graphics/asymptote/runfile.h -2020/07/07 | 5971 | graphics/asymptote/runfile.in -2020/07/07 | 8062 | graphics/asymptote/runhistory.cc -2020/07/07 | 161 | graphics/asymptote/runhistory.h -2020/07/07 | 5024 | graphics/asymptote/runhistory.in -2020/07/07 | 16635 | graphics/asymptote/runlabel.cc -2020/07/07 | 153 | graphics/asymptote/runlabel.h -2020/07/07 | 12892 | graphics/asymptote/runlabel.in -2020/07/07 | 21977 | graphics/asymptote/runmath.cc -2020/07/07 | 269 | graphics/asymptote/runmath.h -2020/07/07 | 8929 | graphics/asymptote/runmath.in -2020/07/07 | 16491 | graphics/asymptote/runpair.cc -2020/07/07 | 299 | graphics/asymptote/runpair.h -2020/07/07 | 4175 | graphics/asymptote/runpair.in -2020/07/07 | 25707 | graphics/asymptote/runpath3d.cc -2020/07/07 | 186 | graphics/asymptote/runpath3d.h -2020/07/07 | 8016 | graphics/asymptote/runpath3d.in -2020/07/07 | 26872 | graphics/asymptote/runpath.cc -2020/07/07 | 177 | graphics/asymptote/runpath.h -2020/07/07 | 8458 | graphics/asymptote/runpath.in -2020/07/07 | 57302 | graphics/asymptote/runpicture.cc -2020/07/07 | 191 | graphics/asymptote/runpicture.h -2020/07/07 | 19561 | graphics/asymptote/runpicture.in -2020/07/07 | 18772 | graphics/asymptote/runstring.cc -2020/07/07 | 188 | graphics/asymptote/runstring.h -2020/07/07 | 9871 | graphics/asymptote/runstring.in -2020/07/07 | 12629 | graphics/asymptote/runsystem.cc -2020/07/07 | 157 | graphics/asymptote/runsystem.h -2020/07/07 | 5119 | graphics/asymptote/runsystem.in -2020/07/07 | 1343 | graphics/asymptote/runtimebase.in -2020/07/07 | 60505 | graphics/asymptote/runtime.cc -2020/07/07 | 1163 | graphics/asymptote/runtime.h -2020/07/07 | 20545 | graphics/asymptote/runtime.in -2020/07/07 | 7230 | graphics/asymptote/runtime.pl -2020/07/07 | 13944 | graphics/asymptote/runtriple.cc -2020/07/07 | 320 | graphics/asymptote/runtriple.h -2020/07/07 | 2719 | graphics/asymptote/runtriple.in -2020/07/07 | 2113 | graphics/asymptote/seconds.h -2020/07/07 | 51631 | graphics/asymptote/settings.cc -2020/07/07 | 2690 | graphics/asymptote/settings.h -2020/07/07 | 2905 | graphics/asymptote/shaders.cc -2020/07/07 | 882 | graphics/asymptote/shaders.h -2020/07/07 | 6660 | graphics/asymptote/simpson.cc -2020/07/07 | 14494 | graphics/asymptote/stack.cc -2020/07/07 | 3328 | graphics/asymptote/stack.h -2020/07/07 | 958 | graphics/asymptote/statistics.h -2020/07/07 | 12103 | graphics/asymptote/stm.cc -2020/07/07 | 4400 | graphics/asymptote/stm.h -2020/07/07 | 8912 | graphics/asymptote/symbol.cc -2020/07/07 | 2662 | graphics/asymptote/symbol.h -2020/07/07 | 2697 | graphics/asymptote/table.h -2020/07/07 | 620 | graphics/asymptote/tests/arith/integer.asy -2020/07/07 | 449 | graphics/asymptote/tests/arith/pair.asy -2020/07/07 | 193 | graphics/asymptote/tests/arith/random.asy -2020/07/07 | 383 | graphics/asymptote/tests/arith/real.asy -2020/07/07 | 1710 | graphics/asymptote/tests/arith/roots.asy -2020/07/07 | 639 | graphics/asymptote/tests/arith/transform.asy -2020/07/07 | 244 | graphics/asymptote/tests/arith/triple.asy -2020/07/07 | 936 | graphics/asymptote/tests/array/array.asy -2020/07/07 | 680 | graphics/asymptote/tests/array/delete.asy -2020/07/07 | 737 | graphics/asymptote/tests/array/determinant.asy -2020/07/07 | 1927 | graphics/asymptote/tests/array/fields.asy -2020/07/07 | 4841 | graphics/asymptote/tests/array/slice.asy -2020/07/07 | 966 | graphics/asymptote/tests/array/solve.asy -2020/07/07 | 746 | graphics/asymptote/tests/array/sort.asy -2020/07/07 | 1096 | graphics/asymptote/tests/array/transpose.asy -2020/07/07 | 276 | graphics/asymptote/tests/bench/6000circles.asy -2020/07/07 | 2222 | graphics/asymptote/tests/frames/loop.asy -2020/07/07 | 202 | graphics/asymptote/tests/frames/stat2.asy -2020/07/07 | 158 | graphics/asymptote/tests/frames/stat.asy -2020/07/07 | 62 | graphics/asymptote/tests/gc/array.asy -2020/07/07 | 102 | graphics/asymptote/tests/gc/file.asy -2020/07/07 | 54 | graphics/asymptote/tests/gc/funcall.asy -2020/07/07 | 65 | graphics/asymptote/tests/gc/guide.asy -2020/07/07 | 143 | graphics/asymptote/tests/gc/label.asy -2020/07/07 | 124 | graphics/asymptote/tests/gc/path.asy -2020/07/07 | 72 | graphics/asymptote/tests/gc/pen.asy -2020/07/07 | 193 | graphics/asymptote/tests/gc/shipout.asy -2020/07/07 | 77 | graphics/asymptote/tests/gc/string.asy -2020/07/07 | 129 | graphics/asymptote/tests/gc/struct.asy -2020/07/07 | 70 | graphics/asymptote/tests/gc/transform.asy -2020/07/07 | 369 | graphics/asymptote/tests/gs/ghostscript.asy -2020/07/07 | 11907 | graphics/asymptote/tests/gsl/random.asy -2020/07/07 | 1209 | graphics/asymptote/tests/imp/unravel.asy -2020/07/07 | 308 | graphics/asymptote/tests/Makefile -2020/07/07 | 18 | graphics/asymptote/tests/output/circle.asy -2020/07/07 | 22 | graphics/asymptote/tests/output/line.asy -2020/07/07 | 1284 | graphics/asymptote/tests/output/Makefile -2020/07/07 | 1384 | graphics/asymptote/tests/pic/trans.asy -2020/07/07 | 236 | graphics/asymptote/tests/string/erase.asy -2020/07/07 | 182 | graphics/asymptote/tests/string/find.asy -2020/07/07 | 109 | graphics/asymptote/tests/string/insert.asy -2020/07/07 | 132 | graphics/asymptote/tests/string/length.asy -2020/07/07 | 187 | graphics/asymptote/tests/string/rfind.asy -2020/07/07 | 118 | graphics/asymptote/tests/string/substr.asy -2020/07/07 | 238 | graphics/asymptote/tests/TestLib.asy -2020/07/07 | 159 | graphics/asymptote/tests/types/cast.asy -2020/07/07 | 6503 | graphics/asymptote/tests/types/constructor.asy -2020/07/07 | 155 | graphics/asymptote/tests/types/ecast.asy -2020/07/07 | 3375 | graphics/asymptote/tests/types/guide.asy -2020/07/07 | 224 | graphics/asymptote/tests/types/init.asy -2020/07/07 | 4242 | graphics/asymptote/tests/types/keyword.asy -2020/07/07 | 4072 | graphics/asymptote/tests/types/order.asy -2020/07/07 | 2731 | graphics/asymptote/tests/types/resolve.asy -2020/07/07 | 308 | graphics/asymptote/tests/types/shadow.asy -2020/07/07 | 1331 | graphics/asymptote/tests/types/spec.asy -2020/07/07 | 1189 | graphics/asymptote/tests/types/var.asy -2020/07/07 | 18307 | graphics/asymptote/texfile.cc -2020/07/07 | 10798 | graphics/asymptote/texfile.h -2020/07/07 | 1293 | graphics/asymptote/TODO -2020/07/07 | 6185 | graphics/asymptote/transform.h -2020/07/07 | 10582 | graphics/asymptote/tr.cc -2020/07/07 | 3676 | graphics/asymptote/tr.h -2020/07/07 | 9651 | graphics/asymptote/triple.h -2020/07/07 | 13884 | graphics/asymptote/types.cc -2020/07/07 | 15372 | graphics/asymptote/types.h -2020/07/07 | 11180 | graphics/asymptote/util.cc -2020/07/07 | 4557 | graphics/asymptote/util.h -2020/07/07 | 1978 | graphics/asymptote/varinit.cc -2020/07/07 | 2013 | graphics/asymptote/varinit.h -2020/07/07 | 901 | graphics/asymptote/virtualfieldaccess.cc -2020/07/07 | 2328 | graphics/asymptote/virtualfieldaccess.h -2020/07/07 | 750 | graphics/asymptote/vm.h -2020/07/07 | 219 | graphics/asymptote/wce -2020/07/07 | 2146 | graphics/asymptote/webgl/fragment.glsl -2020/07/07 | 83751 | graphics/asymptote/webgl/gl.js -2020/07/07 | 815 | graphics/asymptote/webgl/license -2020/07/07 | 1446 | graphics/asymptote/webgl/vertex.glsl -2020/07/07 | 6661 | graphics/asymptote/xstream.h -2020/07/07 | 14756413 | graphics/asymptote.zip +2020/08/06 | 2505 | graphics/asymptote/binaries/i386-windows/README +2020/08/06 | 8647680 | graphics/asymptote/binaries/i386-windows/texlive/asy.exe +2020/08/06 | 297 | graphics/asymptote/binaries/i386-windows/texlive/README +2020/07/09 | 3541856 | graphics/asymptote/binaries/x86_64-windows/cygwin1.dll +2020/08/06 | 2505 | graphics/asymptote/binaries/x86_64-windows/README +2020/08/06 | 8617472 | graphics/asymptote/binaries/x86_64-windows/texlive/asy.exe +2020/08/06 | 297 | graphics/asymptote/binaries/x86_64-windows/texlive/README +2020/08/06 | 255 | graphics/asymptote/BUGS +2020/08/06 | 1588 | graphics/asymptote/build-scripts/asy-format.el +2020/08/06 | 210 | graphics/asymptote/build-scripts/asy-indent.el +2020/08/06 | 1227 | graphics/asymptote/build-scripts/build-asygl +2020/08/06 | 2482 | graphics/asymptote/build-scripts/build-asymptote +2020/08/06 | 3507 | graphics/asymptote/build-scripts/build-asymptote.dos +2020/08/06 | 1578 | graphics/asymptote/build-scripts/cc-format.el +2020/08/06 | 183 | graphics/asymptote/build-scripts/cc-indent.el +2020/08/06 | 2181 | graphics/asymptote/build-scripts/HOWTO-MSWindows +2020/08/06 | 297 | graphics/asymptote/build-scripts/README-binaries +2020/08/06 | 202 | graphics/asymptote/build-scripts/run-in-indent.el +2020/08/06 | 31342 | graphics/asymptote/builtin.cc +2020/08/06 | 1630 | graphics/asymptote/builtin.h +2020/08/06 | 1151 | graphics/asymptote/callable.cc +2020/08/06 | 1640 | graphics/asymptote/callable.h +2020/08/06 | 1183 | graphics/asymptote/camperror.cc +2020/08/06 | 814 | graphics/asymptote/camperror.h +2020/08/06 | 13339 | graphics/asymptote/camp.l +2020/08/06 | 127885 | graphics/asymptote/camp.tab.cc +2020/08/06 | 4089 | graphics/asymptote/camp.tab.h +2020/08/06 | 20029 | graphics/asymptote/camp.y +2020/08/06 | 4612 | graphics/asymptote/castop.h +2020/08/06 | 1876 | graphics/asymptote/cc-mode2.el +2020/08/06 | 1430994 | graphics/asymptote/ChangeLog +2020/08/06 | 7790 | graphics/asymptote/coder.cc +2020/08/06 | 11642 | graphics/asymptote/coder.h +2020/08/06 | 1126 | graphics/asymptote/coenv.cc +2020/08/06 | 908 | graphics/asymptote/coenv.h +2020/08/06 | 1846 | graphics/asymptote/common.h +2020/08/06 | 48441 | graphics/asymptote/config.guess +2020/08/06 | 6951 | graphics/asymptote/config.h.in +2020/08/06 | 31609 | graphics/asymptote/config.sub +2020/08/06 | 287360 | graphics/asymptote/configure +2020/08/06 | 14897 | graphics/asymptote/configure.ac +2020/08/06 | 3668 | graphics/asymptote/constructor.cc +2020/08/06 | 20840 | graphics/asymptote/dec.cc +2020/08/06 | 15822 | graphics/asymptote/dec.h +2020/08/06 | 5883 | graphics/asymptote/Delaunay.cc +2020/08/06 | 384 | graphics/asymptote/Delaunay.h +2020/08/06 | 8116 | graphics/asymptote/doc/asy.1 +2020/08/06 | 1005 | graphics/asymptote/doc/asy.1.begin +2020/08/06 | 333 | graphics/asymptote/doc/asy.1.end +2020/08/06 | 2800 | graphics/asymptote/doc/asycolors.sty +2020/08/06 | 18126 | graphics/asymptote/doc/asy-latex.dtx +2020/08/06 | 194604 | graphics/asymptote/doc/asy-latex.pdf +2020/08/06 | 1284725 | graphics/asymptote/doc/asymptote.pdf +2020/08/06 | 9836 | graphics/asymptote/doc/asymptote.sty +2020/08/06 | 388435 | graphics/asymptote/doc/asymptote.texi +2020/08/06 | 121144 | graphics/asymptote/doc/asyRefCard.pdf +2020/08/06 | 20051 | graphics/asymptote/doc/asyRefCard.tex +2020/08/06 | 246 | graphics/asymptote/doc/axis3.asy +2020/08/06 | 416 | graphics/asymptote/doc/bezier2.asy +2020/08/06 | 81 | graphics/asymptote/doc/bezier.asy +2020/08/06 | 234 | graphics/asymptote/doc/beziercurve.asy +2020/08/06 | 41 | graphics/asymptote/doc/bigdiagonal.asy +2020/08/06 | 306 | graphics/asymptote/doc/binarytreetest.asy +2020/08/06 | 677 | graphics/asymptote/doc/Bode.asy +2020/08/06 | 524 | graphics/asymptote/doc/brokenaxis.asy +2020/08/06 | 1391 | graphics/asymptote/doc/CAD1.asy +2020/08/06 | 186116 | graphics/asymptote/doc/CAD.pdf +2020/08/06 | 10196 | graphics/asymptote/doc/CAD.tex +2020/08/06 | 518 | graphics/asymptote/doc/CDlabel.asy +2020/08/06 | 4348 | graphics/asymptote/doc/colo-asy.tex +2020/08/06 | 49 | graphics/asymptote/doc/colons.asy +2020/08/06 | 1620 | graphics/asymptote/doc/colors.asy +2020/08/06 | 243 | graphics/asymptote/doc/cube.asy +2020/08/06 | 86 | graphics/asymptote/doc/cylinderskeleton.asy +2020/08/06 | 218 | graphics/asymptote/doc/datagraph.asy +2020/08/06 | 24 | graphics/asymptote/doc/diagonal.asy +2020/08/06 | 2979 | graphics/asymptote/doc/diatom.asy +2020/08/06 | 4067 | graphics/asymptote/doc/diatom.csv +2020/08/06 | 49 | graphics/asymptote/doc/dots.asy +2020/08/06 | 1051 | graphics/asymptote/doc/eetomumu.asy +2020/08/06 | 2034 | graphics/asymptote/doc/elliptic.asy +2020/08/06 | 912 | graphics/asymptote/doc/errorbars.asy +2020/08/06 | 202 | graphics/asymptote/doc/exp.asy +2020/08/06 | 343 | graphics/asymptote/doc/externalprc.tex +2020/08/06 | 19597 | graphics/asymptote/doc/external-proposal.html +2020/08/06 | 25137 | graphics/asymptote/doc/extra/intro.asy +2020/08/06 | 40761 | graphics/asymptote/doc/FAQ/asy-faq.bfnn +2020/08/06 | 63137 | graphics/asymptote/doc/FAQ/asy-faq.info +2020/08/06 | 9202 | graphics/asymptote/doc/FAQ/bfnnconv.pl +2020/08/06 | 13663 | graphics/asymptote/doc/FAQ/install-sh +2020/08/06 | 1000 | graphics/asymptote/doc/FAQ/Makefile +2020/08/06 | 4718 | graphics/asymptote/doc/FAQ/m-ascii.pl +2020/08/06 | 9725 | graphics/asymptote/doc/FAQ/m-html.pl +2020/08/06 | 5627 | graphics/asymptote/doc/FAQ/m-info.pl +2020/08/06 | 6104 | graphics/asymptote/doc/FAQ/m-lout.pl +2020/08/06 | 4578 | graphics/asymptote/doc/FAQ/m-post.pl +2020/08/06 | 238 | graphics/asymptote/doc/filegraph.asy +2020/08/06 | 26 | graphics/asymptote/doc/filegraph.dat +2020/08/06 | 604 | graphics/asymptote/doc/flow.asy +2020/08/06 | 897 | graphics/asymptote/doc/flowchartdemo.asy +2020/08/06 | 464 | graphics/asymptote/doc/GaussianSurface.asy +2020/08/06 | 376 | graphics/asymptote/doc/generalaxis3.asy +2020/08/06 | 277 | graphics/asymptote/doc/generalaxis.asy +2020/08/06 | 754 | graphics/asymptote/doc/graphmarkers.asy +2020/08/06 | 426 | graphics/asymptote/doc/grid3xyz.asy +2020/08/06 | 279 | graphics/asymptote/doc/hatch.asy +2020/08/06 | 423 | graphics/asymptote/doc/helix.asy +2020/08/06 | 324 | graphics/asymptote/doc/HermiteSpline.asy +2020/08/06 | 441 | graphics/asymptote/doc/histogram.asy +2020/08/06 | 521 | graphics/asymptote/doc/Hobbycontrol.asy +2020/08/06 | 500 | graphics/asymptote/doc/Hobbydir.asy +2020/08/06 | 378 | graphics/asymptote/doc/icon.asy +2020/08/06 | 401 | graphics/asymptote/doc/image.asy +2020/08/06 | 868 | graphics/asymptote/doc/imagecontour.asy +2020/08/06 | 13663 | graphics/asymptote/doc/install-sh +2020/08/06 | 357 | graphics/asymptote/doc/irregularcontour.asy +2020/08/06 | 442 | graphics/asymptote/doc/join3.asy +2020/08/06 | 261 | graphics/asymptote/doc/join.asy +2020/08/06 | 417 | graphics/asymptote/doc/knots.asy +2020/08/06 | 121 | graphics/asymptote/doc/labelsquare.asy +2020/08/06 | 144 | graphics/asymptote/doc/latexmkrc +2020/08/06 | 150 | graphics/asymptote/doc/latexmkrc_asydir +2020/08/06 | 3106 | graphics/asymptote/doc/latexusage.tex +2020/08/06 | 1008 | graphics/asymptote/doc/leastsquares.asy +2020/08/06 | 6318 | graphics/asymptote/doc/leastsquares.dat +2020/08/06 | 397 | graphics/asymptote/doc/legend.asy +2020/08/06 | 366 | graphics/asymptote/doc/lineargraph0.asy +2020/08/06 | 373 | graphics/asymptote/doc/lineargraph.asy +2020/08/06 | 415 | graphics/asymptote/doc/linetype.asy +2020/08/06 | 423 | graphics/asymptote/doc/log2graph.asy +2020/08/06 | 262 | graphics/asymptote/doc/loggraph.asy +2020/08/06 | 382 | graphics/asymptote/doc/loggrid.asy +2020/08/06 | 480 | graphics/asymptote/doc/logimage.asy +2020/08/06 | 617 | graphics/asymptote/doc/logo.asy +2020/08/06 | 314 | graphics/asymptote/doc/logticks.asy +2020/08/06 | 3023 | graphics/asymptote/doc/Makefile.in +2020/08/06 | 293 | graphics/asymptote/doc/makepen.asy +2020/08/06 | 2674 | graphics/asymptote/doc/markers1.asy +2020/08/06 | 877 | graphics/asymptote/doc/markers2.asy +2020/08/06 | 288 | graphics/asymptote/doc/mexicanhat.asy +2020/08/06 | 374 | graphics/asymptote/doc/monthaxis.asy +2020/08/06 | 458 | graphics/asymptote/doc/multicontour.asy +2020/08/06 | 3497 | graphics/asymptote/doc/ocg.sty +2020/08/06 | 115 | graphics/asymptote/doc/onecontour.asy +2020/08/06 | 240 | graphics/asymptote/doc/parametricgraph.asy +2020/08/06 | 498 | graphics/asymptote/doc/penfunctionimage.asy +2020/08/06 | 219 | graphics/asymptote/doc/penimage.asy +2020/08/06 | 2771 | graphics/asymptote/doc/pixel.pdf +2020/08/06 | 354 | graphics/asymptote/doc/planes.asy +2020/08/06 | 465530 | graphics/asymptote/doc/png/asymptote.info +2020/08/06 | 1469 | graphics/asymptote/doc/png/Makefile.in +2020/08/06 | 49 | graphics/asymptote/doc/quartercircle.asy +2020/08/06 | 354 | graphics/asymptote/doc/reloadpdf.tex +2020/08/06 | 157 | graphics/asymptote/doc/saddle.asy +2020/08/06 | 355 | graphics/asymptote/doc/scaledgraph.asy +2020/08/06 | 792 | graphics/asymptote/doc/secondaryaxis.asy +2020/08/06 | 48847 | graphics/asymptote/doc/secondaryaxis.csv +2020/08/06 | 256 | graphics/asymptote/doc/shadedtiling.asy +2020/08/06 | 154 | graphics/asymptote/doc/slopefield1.asy +2020/08/06 | 52 | graphics/asymptote/doc/square.asy +2020/08/06 | 341 | graphics/asymptote/doc/subpictures.asy +2020/08/06 | 123 | graphics/asymptote/doc/superpath.asy +2020/08/06 | 77144 | graphics/asymptote/doc/TeXShopAndAsymptote.pdf +2020/08/06 | 2653 | graphics/asymptote/doc/TeXShopAndAsymptote.tex +2020/08/06 | 390 | graphics/asymptote/doc/tile.asy +2020/08/06 | 396 | graphics/asymptote/doc/triangulate.asy +2020/08/06 | 186 | graphics/asymptote/doc/unitcircle3.asy +2020/08/06 | 147 | graphics/asymptote/doc/vectorfield.asy +2020/08/06 | 1746 | graphics/asymptote/doc/westnile.asy +2020/08/06 | 4727 | graphics/asymptote/doc/westnile.csv +2020/08/06 | 880 | graphics/asymptote/doc/xasy.1x +2020/08/06 | 1851 | graphics/asymptote/drawclipbegin.h +2020/08/06 | 1197 | graphics/asymptote/drawclipend.h +2020/08/06 | 11212 | graphics/asymptote/drawelement.h +2020/08/06 | 4597 | graphics/asymptote/drawfill.cc +2020/08/06 | 6525 | graphics/asymptote/drawfill.h +2020/08/06 | 494 | graphics/asymptote/drawgrestore.h +2020/08/06 | 2880 | graphics/asymptote/drawgroup.h +2020/08/06 | 464 | graphics/asymptote/drawgsave.h +2020/08/06 | 3024 | graphics/asymptote/drawimage.h +2020/08/06 | 6789 | graphics/asymptote/drawlabel.cc +2020/08/06 | 2134 | graphics/asymptote/drawlabel.h +2020/08/06 | 770 | graphics/asymptote/drawlayer.h +2020/08/06 | 5578 | graphics/asymptote/drawpath3.cc +2020/08/06 | 5811 | graphics/asymptote/drawpath3.h +2020/08/06 | 3465 | graphics/asymptote/drawpath.cc +2020/08/06 | 669 | graphics/asymptote/drawpath.h +2020/08/06 | 23631 | graphics/asymptote/drawsurface.cc +2020/08/06 | 19915 | graphics/asymptote/drawsurface.h +2020/08/06 | 1266 | graphics/asymptote/drawverbatim.h +2020/08/06 | 17987 | graphics/asymptote/entry.cc +2020/08/06 | 13615 | graphics/asymptote/entry.h +2020/08/06 | 5441 | graphics/asymptote/env.cc +2020/08/06 | 1142 | graphics/asymptote/envcompleter.cc +2020/08/06 | 845 | graphics/asymptote/envcompleter.h +2020/08/06 | 4570 | graphics/asymptote/env.h +2020/08/06 | 10632 | graphics/asymptote/EnvVarUpdate.nsh +2020/08/06 | 2287 | graphics/asymptote/errormsg.cc +2020/08/06 | 5052 | graphics/asymptote/errormsg.h +2020/08/06 | 9251 | graphics/asymptote/errors +2020/08/06 | 6911 | graphics/asymptote/errortest.asy +2020/08/06 | 43335 | graphics/asymptote/examples/100d.pdb1 +2020/08/06 | 657 | graphics/asymptote/examples/100d.views +2020/08/06 | 308 | graphics/asymptote/examples/1overx.asy +2020/08/06 | 4158 | graphics/asymptote/examples/advection.asy +2020/08/06 | 245 | graphics/asymptote/examples/alignbox.asy +2020/08/06 | 2832 | graphics/asymptote/examples/alignedaxis.asy +2020/08/06 | 946 | graphics/asymptote/examples/animations/cube.asy +2020/08/06 | 160672 | graphics/asymptote/examples/animations/dice.u3d +2020/08/06 | 1919 | graphics/asymptote/examples/animations/earthmoon.asy +2020/08/06 | 503 | graphics/asymptote/examples/animations/embeddedmovie.asy +2020/08/06 | 196 | graphics/asymptote/examples/animations/embeddedu3d.asy +2020/08/06 | 411 | graphics/asymptote/examples/animations/externalmovie.asy +2020/08/06 | 414 | graphics/asymptote/examples/animations/glmovie.asy +2020/08/06 | 1760 | graphics/asymptote/examples/animations/heatequation.asy +2020/08/06 | 1037 | graphics/asymptote/examples/animations/inlinemovie3.tex +2020/08/06 | 1235 | graphics/asymptote/examples/animations/inlinemovie.tex +2020/08/06 | 326 | graphics/asymptote/examples/animations/pdfmovie.asy +2020/08/06 | 1238 | graphics/asymptote/examples/animations/slidemovies.asy +2020/08/06 | 856 | graphics/asymptote/examples/animations/sphere.asy +2020/08/06 | 798 | graphics/asymptote/examples/animations/torusanimation.asy +2020/08/06 | 1498 | graphics/asymptote/examples/animations/wavepacket.asy +2020/08/06 | 1120 | graphics/asymptote/examples/animations/wheel.asy +2020/08/06 | 236 | graphics/asymptote/examples/annotation.asy +2020/08/06 | 1240 | graphics/asymptote/examples/arrows3.asy +2020/08/06 | 61 | graphics/asymptote/examples/axialshade.asy +2020/08/06 | 496 | graphics/asymptote/examples/bars3.asy +2020/08/06 | 1033 | graphics/asymptote/examples/basealign.asy +2020/08/06 | 407 | graphics/asymptote/examples/BezierPatch.asy +2020/08/06 | 581 | graphics/asymptote/examples/BezierSaddle.asy +2020/08/06 | 1548 | graphics/asymptote/examples/BezierSurface.asy +2020/08/06 | 199 | graphics/asymptote/examples/BezierTriangle.asy +2020/08/06 | 154 | graphics/asymptote/examples/billboard.asy +2020/08/06 | 513 | graphics/asymptote/examples/buildcycle.asy +2020/08/06 | 233 | graphics/asymptote/examples/cardioid.asy +2020/08/06 | 485 | graphics/asymptote/examples/cards.asy +2020/08/06 | 688 | graphics/asymptote/examples/centroidfg.asy +2020/08/06 | 322 | graphics/asymptote/examples/cheese.asy +2020/08/06 | 576 | graphics/asymptote/examples/circles.asy +2020/08/06 | 228 | graphics/asymptote/examples/circumcircle.asy +2020/08/06 | 762 | graphics/asymptote/examples/clockarray.asy +2020/08/06 | 264 | graphics/asymptote/examples/coag.asy +2020/08/06 | 436 | graphics/asymptote/examples/colorpatch.asy +2020/08/06 | 472 | graphics/asymptote/examples/colorplanes.asy +2020/08/06 | 739 | graphics/asymptote/examples/condor.asy +2020/08/06 | 495 | graphics/asymptote/examples/cones.asy +2020/08/06 | 1778 | graphics/asymptote/examples/conicurv.asy +2020/08/06 | 254 | graphics/asymptote/examples/contextfonts.asy +2020/08/06 | 802 | graphics/asymptote/examples/controlsystem.asy +2020/08/06 | 123 | graphics/asymptote/examples/Coons.asy +2020/08/06 | 235 | graphics/asymptote/examples/cos2theta.asy +2020/08/06 | 582 | graphics/asymptote/examples/cos3.asy +2020/08/06 | 460 | graphics/asymptote/examples/cosaddition.asy +2020/08/06 | 5537 | graphics/asymptote/examples/cpkcolors.asy +2020/08/06 | 572 | graphics/asymptote/examples/curvedlabel3.asy +2020/08/06 | 177 | graphics/asymptote/examples/curvedlabel.asy +2020/08/06 | 1835 | graphics/asymptote/examples/cyclohexane.asy +2020/08/06 | 352 | graphics/asymptote/examples/cylinder.asy +2020/08/06 | 506 | graphics/asymptote/examples/delu.asy +2020/08/06 | 509 | graphics/asymptote/examples/dimension.asy +2020/08/06 | 1216 | graphics/asymptote/examples/dragon.asy +2020/08/06 | 1298 | graphics/asymptote/examples/electromagnetic.asy +2020/08/06 | 325 | graphics/asymptote/examples/elevation.asy +2020/08/06 | 398 | graphics/asymptote/examples/epix.asy +2020/08/06 | 242 | graphics/asymptote/examples/equilateral.asy +2020/08/06 | 548 | graphics/asymptote/examples/equilchord.asy +2020/08/06 | 579 | graphics/asymptote/examples/exp3.asy +2020/08/06 | 519 | graphics/asymptote/examples/extrudedcontour.asy +2020/08/06 | 498 | graphics/asymptote/examples/fano.asy +2020/08/06 | 973 | graphics/asymptote/examples/fequlogo.asy +2020/08/06 | 727 | graphics/asymptote/examples/fermi.asy +2020/08/06 | 980 | graphics/asymptote/examples/filesurface.asy +2020/08/06 | 5543 | graphics/asymptote/examples/filesurface.dat +2020/08/06 | 570 | graphics/asymptote/examples/fillcontour.asy +2020/08/06 | 4244 | graphics/asymptote/examples/fin.asy +2020/08/06 | 710 | graphics/asymptote/examples/fjortoft.asy +2020/08/06 | 558 | graphics/asymptote/examples/floatingdisk.asy +2020/08/06 | 500 | graphics/asymptote/examples/floor.asy +2020/08/06 | 683 | graphics/asymptote/examples/fractaltree.asy +2020/08/06 | 1185 | graphics/asymptote/examples/functionshading.asy +2020/08/06 | 499 | graphics/asymptote/examples/galleon.asy +2020/08/06 | 713 | graphics/asymptote/examples/gamma3.asy +2020/08/06 | 439 | graphics/asymptote/examples/gamma.asy +2020/08/06 | 679 | graphics/asymptote/examples/genusthree.asy +2020/08/06 | 1164 | graphics/asymptote/examples/genustwo.asy +2020/08/06 | 383 | graphics/asymptote/examples/Gouraud.asy +2020/08/06 | 616 | graphics/asymptote/examples/Gouraudcontour.asy +2020/08/06 | 76 | graphics/asymptote/examples/grid.asy +2020/08/06 | 459 | graphics/asymptote/examples/hierarchy.asy +2020/08/06 | 315 | graphics/asymptote/examples/hyperboloid.asy +2020/08/06 | 267 | graphics/asymptote/examples/hyperboloidsilhouette.asy +2020/08/06 | 1111 | graphics/asymptote/examples/imagehistogram.asy +2020/08/06 | 610 | graphics/asymptote/examples/impact.asy +2020/08/06 | 598 | graphics/asymptote/examples/integraltest.asy +2020/08/06 | 4808 | graphics/asymptote/examples/interpolate1.asy +2020/08/06 | 289 | graphics/asymptote/examples/jump.asy +2020/08/06 | 1352 | graphics/asymptote/examples/Klein.asy +2020/08/06 | 182 | graphics/asymptote/examples/label3.asy +2020/08/06 | 196 | graphics/asymptote/examples/label3ribbon.asy +2020/08/06 | 187 | graphics/asymptote/examples/label3solid.asy +2020/08/06 | 632 | graphics/asymptote/examples/label3zoom.asy +2020/08/06 | 264 | graphics/asymptote/examples/labelbox.asy +2020/08/06 | 1114 | graphics/asymptote/examples/laserlattice.asy +2020/08/06 | 136 | graphics/asymptote/examples/latticeshading.asy +2020/08/06 | 688 | graphics/asymptote/examples/layers.asy +2020/08/06 | 460 | graphics/asymptote/examples/lever.asy +2020/08/06 | 654 | graphics/asymptote/examples/limit.asy +2020/08/06 | 1910 | graphics/asymptote/examples/linearregression.asy +2020/08/06 | 168 | graphics/asymptote/examples/lines.asy +2020/08/06 | 1040 | graphics/asymptote/examples/lmfit1.asy +2020/08/06 | 206 | graphics/asymptote/examples/log.asy +2020/08/06 | 349 | graphics/asymptote/examples/logdown.asy +2020/08/06 | 1461 | graphics/asymptote/examples/logo3.asy +2020/08/06 | 196 | graphics/asymptote/examples/lowint.asy +2020/08/06 | 657 | graphics/asymptote/examples/lowupint.asy +2020/08/06 | 479 | graphics/asymptote/examples/magnetic.asy +2020/08/06 | 896 | graphics/asymptote/examples/markregular.asy +2020/08/06 | 1968 | graphics/asymptote/examples/mergeExample.asy +2020/08/06 | 5216 | graphics/asymptote/examples/mosaic.asy +2020/08/06 | 2504 | graphics/asymptote/examples/mosquito.asy +2020/08/06 | 1566 | graphics/asymptote/examples/near_earth.asy +2020/08/06 | 658 | graphics/asymptote/examples/NURBScurve.asy +2020/08/06 | 1042 | graphics/asymptote/examples/NURBSsphere.asy +2020/08/06 | 1551 | graphics/asymptote/examples/NURBSsurface.asy +2020/08/06 | 1251 | graphics/asymptote/examples/odetest.asy +2020/08/06 | 308 | graphics/asymptote/examples/oneoverx.asy +2020/08/06 | 861 | graphics/asymptote/examples/orthocenter.asy +2020/08/06 | 254 | graphics/asymptote/examples/parametricelevation.asy +2020/08/06 | 407 | graphics/asymptote/examples/parametricsurface.asy +2020/08/06 | 711 | graphics/asymptote/examples/partialsurface.asy +2020/08/06 | 1055 | graphics/asymptote/examples/partitionExample.asy +2020/08/06 | 426 | graphics/asymptote/examples/pathintersectsurface.asy +2020/08/06 | 3335 | graphics/asymptote/examples/pdb.asy +2020/08/06 | 361 | graphics/asymptote/examples/phase.asy +2020/08/06 | 22873 | graphics/asymptote/examples/piicon.png +2020/08/06 | 362 | graphics/asymptote/examples/pipeintersection.asy +2020/08/06 | 3857 | graphics/asymptote/examples/pipes.asy +2020/08/06 | 418 | graphics/asymptote/examples/planeproject.asy +2020/08/06 | 930 | graphics/asymptote/examples/polararea.asy +2020/08/06 | 628 | graphics/asymptote/examples/polarcircle.asy +2020/08/06 | 326 | graphics/asymptote/examples/polardatagraph.asy +2020/08/06 | 641 | graphics/asymptote/examples/pOrbital.asy +2020/08/06 | 954 | graphics/asymptote/examples/poster.asy +2020/08/06 | 58 | graphics/asymptote/examples/progrid.asy +2020/08/06 | 373 | graphics/asymptote/examples/projectelevation.asy +2020/08/06 | 427 | graphics/asymptote/examples/projectrevolution.asy +2020/08/06 | 747 | graphics/asymptote/examples/pseudosphere.asy +2020/08/06 | 557 | graphics/asymptote/examples/Pythagoras.asy +2020/08/06 | 420 | graphics/asymptote/examples/PythagoreanTree.asy +2020/08/06 | 734 | graphics/asymptote/examples/quilt.asy +2020/08/06 | 345 | graphics/asymptote/examples/rainbow.asy +2020/08/06 | 78 | graphics/asymptote/examples/randompath3.asy +2020/08/06 | 1537 | graphics/asymptote/examples/refs.bib +2020/08/06 | 990 | graphics/asymptote/examples/RiemannSphere.asy +2020/08/06 | 348 | graphics/asymptote/examples/RiemannSurface.asy +2020/08/06 | 384 | graphics/asymptote/examples/RiemannSurfaceRoot.asy +2020/08/06 | 141 | graphics/asymptote/examples/ring.asy +2020/08/06 | 184 | graphics/asymptote/examples/roll.asy +2020/08/06 | 1309 | graphics/asymptote/examples/roundpath.asy +2020/08/06 | 288 | graphics/asymptote/examples/sacone3D.asy +2020/08/06 | 445 | graphics/asymptote/examples/sacone.asy +2020/08/06 | 341 | graphics/asymptote/examples/sacylinder3D.asy +2020/08/06 | 400 | graphics/asymptote/examples/sacylinder.asy +2020/08/06 | 66 | graphics/asymptote/examples/shade.asy +2020/08/06 | 111 | graphics/asymptote/examples/shadestroke.asy +2020/08/06 | 1065 | graphics/asymptote/examples/shellmethod.asy +2020/08/06 | 829 | graphics/asymptote/examples/shellsqrtx01.asy +2020/08/06 | 410 | graphics/asymptote/examples/Sierpinski.asy +2020/08/06 | 821 | graphics/asymptote/examples/SierpinskiGasket.asy +2020/08/06 | 2398 | graphics/asymptote/examples/SierpinskiSponge.asy +2020/08/06 | 327 | graphics/asymptote/examples/sin1x.asy +2020/08/06 | 579 | graphics/asymptote/examples/sin3.asy +2020/08/06 | 591 | graphics/asymptote/examples/sinc.asy +2020/08/06 | 378 | graphics/asymptote/examples/sinxlex.asy +2020/08/06 | 3340 | graphics/asymptote/examples/slidedemo.asy +2020/08/06 | 341 | graphics/asymptote/examples/slidedemo_.bbl +2020/08/06 | 2023 | graphics/asymptote/examples/slope.asy +2020/08/06 | 520 | graphics/asymptote/examples/smoothelevation.asy +2020/08/06 | 2680 | graphics/asymptote/examples/soccerball.asy +2020/08/06 | 2360 | graphics/asymptote/examples/spectrum.asy +2020/08/06 | 141 | graphics/asymptote/examples/sphere.asy +2020/08/06 | 150 | graphics/asymptote/examples/spheresilhouette.asy +2020/08/06 | 162 | graphics/asymptote/examples/sphereskeleton.asy +2020/08/06 | 376 | graphics/asymptote/examples/sphericalharmonic.asy +2020/08/06 | 424 | graphics/asymptote/examples/spiral3.asy +2020/08/06 | 210 | graphics/asymptote/examples/spiral.asy +2020/08/06 | 608 | graphics/asymptote/examples/spline.asy +2020/08/06 | 2191 | graphics/asymptote/examples/splitpatch.asy +2020/08/06 | 38 | graphics/asymptote/examples/spring0.asy +2020/08/06 | 43 | graphics/asymptote/examples/spring2.asy +2020/08/06 | 667 | graphics/asymptote/examples/spring.asy +2020/08/06 | 674 | graphics/asymptote/examples/sqrtx01.asy +2020/08/06 | 579 | graphics/asymptote/examples/sqrtx01y1.asy +2020/08/06 | 145 | graphics/asymptote/examples/star.asy +2020/08/06 | 162 | graphics/asymptote/examples/stereoscopic.asy +2020/08/06 | 59 | graphics/asymptote/examples/stroke3.asy +2020/08/06 | 315 | graphics/asymptote/examples/strokepath.asy +2020/08/06 | 175 | graphics/asymptote/examples/strokeshade.asy +2020/08/06 | 198 | graphics/asymptote/examples/tanh.asy +2020/08/06 | 13901 | graphics/asymptote/examples/teapot.asy +2020/08/06 | 303 | graphics/asymptote/examples/tensor.asy +2020/08/06 | 547 | graphics/asymptote/examples/tetra.asy +2020/08/06 | 312 | graphics/asymptote/examples/textpath.asy +2020/08/06 | 8429 | graphics/asymptote/examples/thermodynamics.asy +2020/08/06 | 576 | graphics/asymptote/examples/threeviews.asy +2020/08/06 | 104 | graphics/asymptote/examples/tiling.asy +2020/08/06 | 419 | graphics/asymptote/examples/torus.asy +2020/08/06 | 246 | graphics/asymptote/examples/transparency.asy +2020/08/06 | 250 | graphics/asymptote/examples/transparentCubes.asy +2020/08/06 | 602 | graphics/asymptote/examples/treetest.asy +2020/08/06 | 589 | graphics/asymptote/examples/trefoilknot.asy +2020/08/06 | 972 | graphics/asymptote/examples/triads.asy +2020/08/06 | 207 | graphics/asymptote/examples/triangle.asy +2020/08/06 | 441 | graphics/asymptote/examples/triangles.asy +2020/08/06 | 251 | graphics/asymptote/examples/triceratops.asy +2020/08/06 | 291 | graphics/asymptote/examples/trumpet.asy +2020/08/06 | 2101 | graphics/asymptote/examples/truncatedIcosahedron.asy +2020/08/06 | 40665 | graphics/asymptote/examples/tvgen.asy +2020/08/06 | 868 | graphics/asymptote/examples/twistedtubes.asy +2020/08/06 | 26096 | graphics/asymptote/examples/uhrturm.obj +2020/08/06 | 322 | graphics/asymptote/examples/unitcircle.asy +2020/08/06 | 430 | graphics/asymptote/examples/unitoctant.asy +2020/08/06 | 714 | graphics/asymptote/examples/unitoctantx.asy +2020/08/06 | 199 | graphics/asymptote/examples/upint.asy +2020/08/06 | 525 | graphics/asymptote/examples/vectorfield3.asy +2020/08/06 | 351 | graphics/asymptote/examples/vectorfieldsphere.asy +2020/08/06 | 839 | graphics/asymptote/examples/venn3.asy +2020/08/06 | 626 | graphics/asymptote/examples/venn.asy +2020/08/06 | 802 | graphics/asymptote/examples/vertexshading.asy +2020/08/06 | 360 | graphics/asymptote/examples/washer.asy +2020/08/06 | 1010 | graphics/asymptote/examples/washermethod.asy +2020/08/06 | 628 | graphics/asymptote/examples/wedge.asy +2020/08/06 | 1036 | graphics/asymptote/examples/workcone.asy +2020/08/06 | 978 | graphics/asymptote/examples/worksheet.asy +2020/08/06 | 2626 | graphics/asymptote/examples/worldmap.asy +2020/08/06 | 1261761 | graphics/asymptote/examples/worldmap.dat +2020/08/06 | 580 | graphics/asymptote/examples/xsin1x.asy +2020/08/06 | 3739 | graphics/asymptote/examples/xstitch.asy +2020/08/06 | 743 | graphics/asymptote/examples/xxsq01.asy +2020/08/06 | 866 | graphics/asymptote/examples/xxsq01x-1.asy +2020/08/06 | 825 | graphics/asymptote/examples/xxsq01y.asy +2020/08/06 | 222 | graphics/asymptote/examples/yingyang.asy +2020/08/06 | 33828 | graphics/asymptote/exp.cc +2020/08/06 | 28783 | graphics/asymptote/exp.h +2020/08/06 | 119 | graphics/asymptote/fftw++asy.cc +2020/08/06 | 1694 | graphics/asymptote/fftw++.cc +2020/08/06 | 44472 | graphics/asymptote/fftw++.h +2020/08/06 | 4800 | graphics/asymptote/fileio.cc +2020/08/06 | 19629 | graphics/asymptote/fileio.h +2020/08/06 | 1245 | graphics/asymptote/findsym.pl +2020/08/06 | 1020 | graphics/asymptote/flatguide.cc +2020/08/06 | 4209 | graphics/asymptote/flatguide.h +2020/08/06 | 654 | graphics/asymptote/fpu.h +2020/08/06 | 2164 | graphics/asymptote/frame.h +2020/08/06 | 7919 | graphics/asymptote/fundec.cc +2020/08/06 | 4341 | graphics/asymptote/fundec.h +2020/08/06 | 1160528 | graphics/asymptote/gc-8.0.4.tar.gz +2020/08/06 | 3153 | graphics/asymptote/genv.cc +2020/08/06 | 1626 | graphics/asymptote/genv.h +2020/08/06 | 4520 | graphics/asymptote/getopt1.c +2020/08/06 | 30147 | graphics/asymptote/getopt.c +2020/08/06 | 6650 | graphics/asymptote/getopt.h +2020/08/06 | 202 | graphics/asymptote/glew.c +2020/08/06 | 1235777 | graphics/asymptote/GL/glew.c +2020/08/06 | 1186601 | graphics/asymptote/GL/glew.h +2020/08/06 | 73435 | graphics/asymptote/GL/glxew.h +2020/08/06 | 76801 | graphics/asymptote/gl-matrix-2.4.0-pruned/dist/gl-matrix.js +2020/08/06 | 1131 | graphics/asymptote/gl-matrix-2.4.0-pruned/LICENSE.js +2020/08/06 | 45841 | graphics/asymptote/glrender.cc +2020/08/06 | 9243 | graphics/asymptote/glrender.h +2020/08/06 | 63314 | graphics/asymptote/GL/wglew.h +2020/08/06 | 50437 | graphics/asymptote/gsl.cc +2020/08/06 | 22 | graphics/asymptote/GUI/configs/__init__.py +2020/08/06 | 1148 | graphics/asymptote/GUI/configs/xasyconfig.cson +2020/08/06 | 395 | graphics/asymptote/GUI/configs/xasykeymap.cson +2020/08/06 | 3503 | graphics/asymptote/GUI/CustMatTransform.py +2020/08/06 | 131 | graphics/asymptote/GUI/DebugFlags.py +2020/08/06 | 1149 | graphics/asymptote/guide.cc +2020/08/06 | 294 | graphics/asymptote/guideflags.h +2020/08/06 | 6725 | graphics/asymptote/guide.h +2020/08/06 | 1724 | graphics/asymptote/GUI/GuidesManager.py +2020/08/06 | 164511 | graphics/asymptote/GUI/icons_rc.py +2020/08/06 | 23 | graphics/asymptote/GUI/__init__.py +2020/08/06 | 11528 | graphics/asymptote/GUI/InplaceAddObj.py +2020/08/06 | 5151 | graphics/asymptote/GUI/labelEditor.py +2020/08/06 | 700 | graphics/asymptote/GUI/locale/th/LC_MESSAGES/base.po +2020/08/06 | 2399 | graphics/asymptote/GUI/PrimitiveShape.py +2020/08/06 | 9945 | graphics/asymptote/GUI/pyUIClass/custMatTransform.py +2020/08/06 | 6154 | graphics/asymptote/GUI/pyUIClass/labelTextEditor.py +2020/08/06 | 2825 | graphics/asymptote/GUI/pyUIClass/setCustomAnchor.py +2020/08/06 | 7129 | graphics/asymptote/GUI/pyUIClass/widg_addLabel.py +2020/08/06 | 2193 | graphics/asymptote/GUI/pyUIClass/widg_addPolyOpt.py +2020/08/06 | 4849 | graphics/asymptote/GUI/pyUIClass/widg_editBezier.py +2020/08/06 | 4668 | graphics/asymptote/GUI/pyUIClass/widgetPointEditor.py +2020/08/06 | 56646 | graphics/asymptote/GUI/pyUIClass/window1.py +2020/08/06 | 57 | graphics/asymptote/GUI/requirements.txt +2020/08/06 | 361 | graphics/asymptote/GUI/res/icons/anchor.svg +2020/08/06 | 637 | graphics/asymptote/GUI/res/icons/android-arrow-back.svg +2020/08/06 | 637 | graphics/asymptote/GUI/res/icons/android-arrow-forward.svg +2020/08/06 | 802 | graphics/asymptote/GUI/res/icons/android-camera.svg +2020/08/06 | 695 | graphics/asymptote/GUI/res/icons/android-close.svg +2020/08/06 | 1319 | graphics/asymptote/GUI/res/icons/android-color-palette.svg +2020/08/06 | 674 | graphics/asymptote/GUI/res/icons/android-delete.svg +2020/08/06 | 633 | graphics/asymptote/GUI/res/icons/android-done.svg +2020/08/06 | 822 | graphics/asymptote/GUI/res/icons/android-expand.svg +2020/08/06 | 850 | graphics/asymptote/GUI/res/icons/android-folder-open.svg +2020/08/06 | 1482 | graphics/asymptote/GUI/res/icons/android-hand.svg +2020/08/06 | 1124 | graphics/asymptote/GUI/res/icons/android-locate.svg +2020/08/06 | 764 | graphics/asymptote/GUI/res/icons/android-radio-button-off.svg +2020/08/06 | 844 | graphics/asymptote/GUI/res/icons/android-radio-button-on.svg +2020/08/06 | 806 | graphics/asymptote/GUI/res/icons/android-refresh.svg +2020/08/06 | 713 | graphics/asymptote/GUI/res/icons/arrow-move.svg +2020/08/06 | 639 | graphics/asymptote/GUI/res/icons/arrow-resize.svg +2020/08/06 | 589 | graphics/asymptote/GUI/res/icons/bucket.asy +2020/08/06 | 1492 | graphics/asymptote/GUI/res/icons/bucket.svg +2020/08/06 | 111 | graphics/asymptote/GUI/res/icons/center.asy +2020/08/06 | 124 | graphics/asymptote/GUI/res/icons/centerorigin.asy +2020/08/06 | 1052 | graphics/asymptote/GUI/res/icons/centerorigin.svg +2020/08/06 | 892 | graphics/asymptote/GUI/res/icons/center.svg +2020/08/06 | 780 | graphics/asymptote/GUI/res/icons/check.svg +2020/08/06 | 1013 | graphics/asymptote/GUI/res/icons/chevron-with-circle-left.svg +2020/08/06 | 998 | graphics/asymptote/GUI/res/icons/chevron-with-circle-right.svg +2020/08/06 | 754 | graphics/asymptote/GUI/res/icons/circle.svg +2020/08/06 | 105 | graphics/asymptote/GUI/res/icons/closedcurve.asy +2020/08/06 | 1237 | graphics/asymptote/GUI/res/icons/closedcurve.svg +2020/08/06 | 105 | graphics/asymptote/GUI/res/icons/closedpolygon.asy +2020/08/06 | 1102 | graphics/asymptote/GUI/res/icons/closedpolygon.svg +2020/08/06 | 838 | graphics/asymptote/GUI/res/icons/close-round.svg +2020/08/06 | 1194 | graphics/asymptote/GUI/res/icons/code.svg +2020/08/06 | 876 | graphics/asymptote/GUI/res/icons/edit.svg +2020/08/06 | 1003 | graphics/asymptote/GUI/res/icons/eye.svg +2020/08/06 | 1967 | graphics/asymptote/GUI/res/icons/filledbucket.svg +2020/08/06 | 1764 | graphics/asymptote/GUI/res/icons/grid.svg +2020/08/06 | 964 | graphics/asymptote/GUI/res/icons/magnifying-glass.svg +2020/08/06 | 98 | graphics/asymptote/GUI/res/icons/opencurve.asy +2020/08/06 | 1186 | graphics/asymptote/GUI/res/icons/opencurve.svg +2020/08/06 | 98 | graphics/asymptote/GUI/res/icons/openpolygon.asy +2020/08/06 | 1085 | graphics/asymptote/GUI/res/icons/openpolygon.svg +2020/08/06 | 759 | graphics/asymptote/GUI/res/icons/plus-round.svg +2020/08/06 | 1711 | graphics/asymptote/GUI/res/icons.qrc +2020/08/06 | 673 | graphics/asymptote/GUI/res/icons/save.svg +2020/08/06 | 1920 | graphics/asymptote/GUI/res/icons/social-python.svg +2020/08/06 | 108 | graphics/asymptote/GUI/res/icons/subdirectory-left.svg +2020/08/06 | 284 | graphics/asymptote/GUI/res/icons/text.svg +2020/08/06 | 1226 | graphics/asymptote/GUI/res/icons/triangle-stroked-15.svg +2020/08/06 | 1393 | graphics/asymptote/GUI/SetCustomAnchor.py +2020/08/06 | 394 | graphics/asymptote/GUI/setup.py +2020/08/06 | 3616 | graphics/asymptote/GUI/UndoRedoStack.py +2020/08/06 | 3249 | graphics/asymptote/GUI/Widg_addLabel.py +2020/08/06 | 883 | graphics/asymptote/GUI/Widg_addPolyOpt.py +2020/08/06 | 1665 | graphics/asymptote/GUI/Widg_editBezier.py +2020/08/06 | 72687 | graphics/asymptote/GUI/Window1.py +2020/08/06 | 10271 | graphics/asymptote/GUI/windows/custMatTransform.ui +2020/08/06 | 6552 | graphics/asymptote/GUI/windows/labelTextEditor.ui +2020/08/06 | 2631 | graphics/asymptote/GUI/windows/setCustomAnchor.ui +2020/08/06 | 6896 | graphics/asymptote/GUI/windows/widg_addLabel.ui +2020/08/06 | 2148 | graphics/asymptote/GUI/windows/widg_addPolyOpt.ui +2020/08/06 | 4474 | graphics/asymptote/GUI/windows/widg_editBezier.ui +2020/08/06 | 4166 | graphics/asymptote/GUI/windows/widgetPointEditor.ui +2020/08/06 | 75576 | graphics/asymptote/GUI/windows/window1.ui +2020/08/06 | 50600 | graphics/asymptote/GUI/xasy2asy.py +2020/08/06 | 821 | graphics/asymptote/GUI/xasyArgs.py +2020/08/06 | 13550 | graphics/asymptote/GUI/xasyBezierInterface.py +2020/08/06 | 2554 | graphics/asymptote/GUI/xasyFile.py +2020/08/06 | 5048 | graphics/asymptote/GUI/xasyOptions.py +2020/08/06 | 503 | graphics/asymptote/GUI/xasy.py +2020/08/06 | 599 | graphics/asymptote/GUI/xasyStrings.py +2020/08/06 | 710 | graphics/asymptote/GUI/xasySvg.py +2020/08/06 | 964 | graphics/asymptote/GUI/xasyTransform.py +2020/08/06 | 1504 | graphics/asymptote/GUI/xasyUtils.py +2020/08/06 | 238 | graphics/asymptote/GUI/xasyValidator.py +2020/08/06 | 12813 | graphics/asymptote/impdatum.cc +2020/08/06 | 10445 | graphics/asymptote/INSTALL +2020/08/06 | 15645 | graphics/asymptote/install-sh +2020/08/06 | 1982 | graphics/asymptote/inst.h +2020/08/06 | 5505 | graphics/asymptote/interact.cc +2020/08/06 | 1345 | graphics/asymptote/interact.h +2020/08/06 | 5733 | graphics/asymptote/item.h +2020/08/06 | 10072 | graphics/asymptote/jsfile.cc +2020/08/06 | 2107 | graphics/asymptote/jsfile.h +2020/08/06 | 609 | graphics/asymptote/keywords.cc +2020/08/06 | 1253 | graphics/asymptote/keywords.pl +2020/08/06 | 22345 | graphics/asymptote/knot.cc +2020/08/06 | 12259 | graphics/asymptote/knot.h +2020/08/06 | 342 | graphics/asymptote/lexical.h +2020/08/06 | 83431 | graphics/asymptote/lex.yy.cc +2020/08/06 | 503734 | graphics/asymptote/libatomic_ops-7.6.10.tar.gz +2020/08/06 | 35147 | graphics/asymptote/LICENSE +2020/08/06 | 7639 | graphics/asymptote/LICENSE.LESSER +2020/08/06 | 2766 | graphics/asymptote/lnkX64IconFix.nsh +2020/08/06 | 2187 | graphics/asymptote/locate.cc +2020/08/06 | 577 | graphics/asymptote/locate.h +2020/08/06 | 5443 | graphics/asymptote/main.cc +2020/08/06 | 11671 | graphics/asymptote/Makefile.in +2020/08/06 | 2632 | graphics/asymptote/material.h +2020/08/06 | 6396 | graphics/asymptote/mathop.h +2020/08/06 | 4972 | graphics/asymptote/memory.h +2020/08/06 | 714 | graphics/asymptote/mod.h +2020/08/06 | 908 | graphics/asymptote/modifier.h +2020/08/06 | 7435 | graphics/asymptote/name.cc +2020/08/06 | 5236 | graphics/asymptote/name.h +2020/08/06 | 4265 | graphics/asymptote/newexp.cc +2020/08/06 | 1274 | graphics/asymptote/newexp.h +2020/08/06 | 916 | graphics/asymptote/opcodes.h +2020/08/06 | 1050 | graphics/asymptote/opsymbols.pl +2020/08/06 | 5104 | graphics/asymptote/pair.h +2020/08/06 | 4691 | graphics/asymptote/parser.cc +2020/08/06 | 1171 | graphics/asymptote/parser.h +2020/08/06 | 5262 | graphics/asymptote/patches/bison.patch +2020/08/06 | 1805 | graphics/asymptote/patches/cygwin_freeglut-3.0.0.patch +2020/08/06 | 1311 | graphics/asymptote/patches/dvipdf +2020/08/06 | 113 | graphics/asymptote/patches/fixmem.reg +2020/08/06 | 1524 | graphics/asymptote/patches/flex.patch +2020/08/06 | 271 | graphics/asymptote/patches/gc6.8_AIX.patch +2020/08/06 | 489 | graphics/asymptote/patches/gc-7.0nomem.patch +2020/08/06 | 318 | graphics/asymptote/patches/gcc3.3.2curses.patch +2020/08/06 | 19462 | graphics/asymptote/patches/gl-matrix-2.4.0-pruned.patch +2020/08/06 | 1082 | graphics/asymptote/patches/README +2020/08/06 | 37917 | graphics/asymptote/path3.cc +2020/08/06 | 10585 | graphics/asymptote/path3.h +2020/08/06 | 33813 | graphics/asymptote/path.cc +2020/08/06 | 11627 | graphics/asymptote/path.h +2020/08/06 | 1594 | graphics/asymptote/pen.cc +2020/08/06 | 27767 | graphics/asymptote/pen.h +2020/08/06 | 40578 | graphics/asymptote/picture.cc +2020/08/06 | 3431 | graphics/asymptote/picture.h +2020/08/06 | 5250 | graphics/asymptote/pipestream.cc +2020/08/06 | 2614 | graphics/asymptote/pipestream.h +2020/08/06 | 138 | graphics/asymptote/Pipfile +2020/08/06 | 2542 | graphics/asymptote/policy.h +2020/08/06 | 650 | graphics/asymptote/prcfile.h +2020/08/06 | 974 | graphics/asymptote/prc/Makefile +2020/08/06 | 70751 | graphics/asymptote/prc/oPRCFile.cc +2020/08/06 | 51432 | graphics/asymptote/prc/oPRCFile.h +2020/08/06 | 8371 | graphics/asymptote/prc/PRCbitStream.cc +2020/08/06 | 2518 | graphics/asymptote/prc/PRCbitStream.h +2020/08/06 | 177246 | graphics/asymptote/prc/PRCdouble.cc +2020/08/06 | 3765 | graphics/asymptote/prc/PRCdouble.h +2020/08/06 | 30208 | graphics/asymptote/prc/PRC.h +2020/08/06 | 6021 | graphics/asymptote/prc/PRCTools/bitData.cc +2020/08/06 | 1860 | graphics/asymptote/prc/PRCTools/bitData.h +2020/08/06 | 1927 | graphics/asymptote/prc/PRCTools/bitSearchDouble.cc +2020/08/06 | 1863 | graphics/asymptote/prc/PRCTools/bitSearchUI.cc +2020/08/06 | 1245 | graphics/asymptote/prc/PRCTools/describeMain.cc +2020/08/06 | 68126 | graphics/asymptote/prc/PRCTools/describePRC.cc +2020/08/06 | 4335 | graphics/asymptote/prc/PRCTools/describePRC.h +2020/08/06 | 1310 | graphics/asymptote/prc/PRCTools/extractSections.cc +2020/08/06 | 2276 | graphics/asymptote/prc/PRCTools/inflation.cc +2020/08/06 | 1051 | graphics/asymptote/prc/PRCTools/inflation.h +2020/08/06 | 1479 | graphics/asymptote/prc/PRCTools/inflationMain.cc +2020/08/06 | 8792 | graphics/asymptote/prc/PRCTools/iPRCFile.cc +2020/08/06 | 2341 | graphics/asymptote/prc/PRCTools/iPRCFile.h +2020/08/06 | 1658 | graphics/asymptote/prc/PRCTools/Makefile +2020/08/06 | 4716 | graphics/asymptote/prc/PRCTools/makePRC.cc +2020/08/06 | 95 | graphics/asymptote/prc/test.asy +2020/08/06 | 36243 | graphics/asymptote/prc/test.cc +2020/08/06 | 66751 | graphics/asymptote/prc/writePRC.cc +2020/08/06 | 48481 | graphics/asymptote/prc/writePRC.h +2020/08/06 | 116025 | graphics/asymptote/predicates.cc +2020/08/06 | 986 | graphics/asymptote/predicates.h +2020/08/06 | 1236 | graphics/asymptote/primitives.h +2020/08/06 | 25223 | graphics/asymptote/process.cc +2020/08/06 | 2982 | graphics/asymptote/process.h +2020/08/06 | 2378 | graphics/asymptote/profile.py +2020/08/06 | 9923 | graphics/asymptote/profiler.h +2020/08/06 | 3265 | graphics/asymptote/program.cc +2020/08/06 | 2561 | graphics/asymptote/program.h +2020/08/06 | 18938 | graphics/asymptote/psfile.cc +2020/08/06 | 8937 | graphics/asymptote/psfile.h +2020/08/06 | 2505 | graphics/asymptote/README +2020/08/06 | 1698 | graphics/asymptote/record.cc +2020/08/06 | 2732 | graphics/asymptote/record.h +2020/08/06 | 1096 | graphics/asymptote/refaccess.cc +2020/08/06 | 1936 | graphics/asymptote/refaccess.h +2020/08/06 | 122922 | graphics/asymptote/ReleaseNotes +2020/08/06 | 62 | graphics/asymptote/revision.cc +2020/08/06 | 3441 | graphics/asymptote/rounding.h +2020/08/06 | 73211 | graphics/asymptote/runarray.cc +2020/08/06 | 1492 | graphics/asymptote/runarray.h +2020/08/06 | 48374 | graphics/asymptote/runarray.in +2020/08/06 | 2661 | graphics/asymptote/runbacktrace.cc +2020/08/06 | 169 | graphics/asymptote/runbacktrace.h +2020/08/06 | 831 | graphics/asymptote/runbacktrace.in +2020/08/06 | 17736 | graphics/asymptote/runfile.cc +2020/08/06 | 969 | graphics/asymptote/runfile.h +2020/08/06 | 5925 | graphics/asymptote/runfile.in +2020/08/06 | 8095 | graphics/asymptote/runhistory.cc +2020/08/06 | 161 | graphics/asymptote/runhistory.h +2020/08/06 | 5063 | graphics/asymptote/runhistory.in +2020/08/06 | 16552 | graphics/asymptote/runlabel.cc +2020/08/06 | 153 | graphics/asymptote/runlabel.h +2020/08/06 | 12812 | graphics/asymptote/runlabel.in +2020/08/06 | 21926 | graphics/asymptote/runmath.cc +2020/08/06 | 269 | graphics/asymptote/runmath.h +2020/08/06 | 8856 | graphics/asymptote/runmath.in +2020/08/06 | 16483 | graphics/asymptote/runpair.cc +2020/08/06 | 299 | graphics/asymptote/runpair.h +2020/08/06 | 4156 | graphics/asymptote/runpair.in +2020/08/06 | 25701 | graphics/asymptote/runpath3d.cc +2020/08/06 | 186 | graphics/asymptote/runpath3d.h +2020/08/06 | 8008 | graphics/asymptote/runpath3d.in +2020/08/06 | 26844 | graphics/asymptote/runpath.cc +2020/08/06 | 177 | graphics/asymptote/runpath.h +2020/08/06 | 8439 | graphics/asymptote/runpath.in +2020/08/06 | 57126 | graphics/asymptote/runpicture.cc +2020/08/06 | 191 | graphics/asymptote/runpicture.h +2020/08/06 | 19455 | graphics/asymptote/runpicture.in +2020/08/06 | 18676 | graphics/asymptote/runstring.cc +2020/08/06 | 188 | graphics/asymptote/runstring.h +2020/08/06 | 9804 | graphics/asymptote/runstring.in +2020/08/06 | 12604 | graphics/asymptote/runsystem.cc +2020/08/06 | 157 | graphics/asymptote/runsystem.h +2020/08/06 | 5111 | graphics/asymptote/runsystem.in +2020/08/06 | 1341 | graphics/asymptote/runtimebase.in +2020/08/06 | 60454 | graphics/asymptote/runtime.cc +2020/08/06 | 1163 | graphics/asymptote/runtime.h +2020/08/06 | 20495 | graphics/asymptote/runtime.in +2020/08/06 | 7230 | graphics/asymptote/runtime.pl +2020/08/06 | 13944 | graphics/asymptote/runtriple.cc +2020/08/06 | 320 | graphics/asymptote/runtriple.h +2020/08/06 | 2707 | graphics/asymptote/runtriple.in +2020/08/06 | 2136 | graphics/asymptote/seconds.h +2020/08/06 | 51869 | graphics/asymptote/settings.cc +2020/08/06 | 2684 | graphics/asymptote/settings.h +2020/08/06 | 2894 | graphics/asymptote/shaders.cc +2020/08/06 | 882 | graphics/asymptote/shaders.h +2020/08/06 | 6634 | graphics/asymptote/simpson.cc +2020/08/06 | 14469 | graphics/asymptote/stack.cc +2020/08/06 | 3295 | graphics/asymptote/stack.h +2020/08/06 | 951 | graphics/asymptote/statistics.h +2020/08/06 | 12024 | graphics/asymptote/stm.cc +2020/08/06 | 4392 | graphics/asymptote/stm.h +2020/08/06 | 8960 | graphics/asymptote/symbol.cc +2020/08/06 | 2654 | graphics/asymptote/symbol.h +2020/08/06 | 2697 | graphics/asymptote/table.h +2020/08/06 | 620 | graphics/asymptote/tests/arith/integer.asy +2020/08/06 | 449 | graphics/asymptote/tests/arith/pair.asy +2020/08/06 | 193 | graphics/asymptote/tests/arith/random.asy +2020/08/06 | 383 | graphics/asymptote/tests/arith/real.asy +2020/08/06 | 1710 | graphics/asymptote/tests/arith/roots.asy +2020/08/06 | 639 | graphics/asymptote/tests/arith/transform.asy +2020/08/06 | 244 | graphics/asymptote/tests/arith/triple.asy +2020/08/06 | 936 | graphics/asymptote/tests/array/array.asy +2020/08/06 | 680 | graphics/asymptote/tests/array/delete.asy +2020/08/06 | 737 | graphics/asymptote/tests/array/determinant.asy +2020/08/06 | 1927 | graphics/asymptote/tests/array/fields.asy +2020/08/06 | 4841 | graphics/asymptote/tests/array/slice.asy +2020/08/06 | 966 | graphics/asymptote/tests/array/solve.asy +2020/08/06 | 746 | graphics/asymptote/tests/array/sort.asy +2020/08/06 | 1096 | graphics/asymptote/tests/array/transpose.asy +2020/08/06 | 276 | graphics/asymptote/tests/bench/6000circles.asy +2020/08/06 | 2222 | graphics/asymptote/tests/frames/loop.asy +2020/08/06 | 202 | graphics/asymptote/tests/frames/stat2.asy +2020/08/06 | 158 | graphics/asymptote/tests/frames/stat.asy +2020/08/06 | 62 | graphics/asymptote/tests/gc/array.asy +2020/08/06 | 102 | graphics/asymptote/tests/gc/file.asy +2020/08/06 | 54 | graphics/asymptote/tests/gc/funcall.asy +2020/08/06 | 65 | graphics/asymptote/tests/gc/guide.asy +2020/08/06 | 143 | graphics/asymptote/tests/gc/label.asy +2020/08/06 | 124 | graphics/asymptote/tests/gc/path.asy +2020/08/06 | 72 | graphics/asymptote/tests/gc/pen.asy +2020/08/06 | 193 | graphics/asymptote/tests/gc/shipout.asy +2020/08/06 | 77 | graphics/asymptote/tests/gc/string.asy +2020/08/06 | 129 | graphics/asymptote/tests/gc/struct.asy +2020/08/06 | 70 | graphics/asymptote/tests/gc/transform.asy +2020/08/06 | 369 | graphics/asymptote/tests/gs/ghostscript.asy +2020/08/06 | 11907 | graphics/asymptote/tests/gsl/random.asy +2020/08/06 | 1209 | graphics/asymptote/tests/imp/unravel.asy +2020/08/06 | 308 | graphics/asymptote/tests/Makefile +2020/08/06 | 18 | graphics/asymptote/tests/output/circle.asy +2020/08/06 | 22 | graphics/asymptote/tests/output/line.asy +2020/08/06 | 1284 | graphics/asymptote/tests/output/Makefile +2020/08/06 | 1384 | graphics/asymptote/tests/pic/trans.asy +2020/08/06 | 236 | graphics/asymptote/tests/string/erase.asy +2020/08/06 | 182 | graphics/asymptote/tests/string/find.asy +2020/08/06 | 109 | graphics/asymptote/tests/string/insert.asy +2020/08/06 | 132 | graphics/asymptote/tests/string/length.asy +2020/08/06 | 187 | graphics/asymptote/tests/string/rfind.asy +2020/08/06 | 118 | graphics/asymptote/tests/string/substr.asy +2020/08/06 | 238 | graphics/asymptote/tests/TestLib.asy +2020/08/06 | 159 | graphics/asymptote/tests/types/cast.asy +2020/08/06 | 6503 | graphics/asymptote/tests/types/constructor.asy +2020/08/06 | 155 | graphics/asymptote/tests/types/ecast.asy +2020/08/06 | 3375 | graphics/asymptote/tests/types/guide.asy +2020/08/06 | 224 | graphics/asymptote/tests/types/init.asy +2020/08/06 | 4242 | graphics/asymptote/tests/types/keyword.asy +2020/08/06 | 4072 | graphics/asymptote/tests/types/order.asy +2020/08/06 | 2731 | graphics/asymptote/tests/types/resolve.asy +2020/08/06 | 308 | graphics/asymptote/tests/types/shadow.asy +2020/08/06 | 1331 | graphics/asymptote/tests/types/spec.asy +2020/08/06 | 1189 | graphics/asymptote/tests/types/var.asy +2020/08/06 | 18384 | graphics/asymptote/texfile.cc +2020/08/06 | 10701 | graphics/asymptote/texfile.h +2020/08/06 | 1293 | graphics/asymptote/TODO +2020/08/06 | 6178 | graphics/asymptote/transform.h +2020/08/06 | 10224 | graphics/asymptote/tr.cc +2020/08/06 | 3912 | graphics/asymptote/tr.h +2020/08/06 | 9574 | graphics/asymptote/triple.h +2020/08/06 | 14072 | graphics/asymptote/types.cc +2020/08/06 | 15451 | graphics/asymptote/types.h +2020/08/06 | 11521 | graphics/asymptote/util.cc +2020/08/06 | 4602 | graphics/asymptote/util.h +2020/08/06 | 1976 | graphics/asymptote/varinit.cc +2020/08/06 | 2012 | graphics/asymptote/varinit.h +2020/08/06 | 901 | graphics/asymptote/virtualfieldaccess.cc +2020/08/06 | 2328 | graphics/asymptote/virtualfieldaccess.h +2020/08/06 | 766 | graphics/asymptote/vm.h +2020/08/06 | 222 | graphics/asymptote/wce +2020/08/06 | 2146 | graphics/asymptote/webgl/fragment.glsl +2020/08/06 | 83897 | graphics/asymptote/webgl/gl.js +2020/08/06 | 820 | graphics/asymptote/webgl/license +2020/08/06 | 1446 | graphics/asymptote/webgl/vertex.glsl +2020/08/06 | 6585 | graphics/asymptote/xstream.h +2020/08/06 | 15630652 | graphics/asymptote.zip 2014/04/16 | 55108 | graphics/asypictureb/asypictureB.dtx 2014/04/16 | 2401 | graphics/asypictureb/asypictureB.ins 2014/04/15 | 637107 | graphics/asypictureb/asypictureB.pdf @@ -163323,7 +163505,7 @@ 2012/02/06 | 254553 | install/fonts/urw/arial.tds.zip 2014/08/28 | 1312858 | install/fonts/urw/classico.tds.zip 2016/01/09 | 254062 | install/fonts/verdana.tds.zip -2020/06/28 | 4319252 | install/fonts/xcharter.tds.zip +2020/08/06 | 4740981 | install/fonts/xcharter.tds.zip 2019/06/11 | 58442 | install/fonts/zlmtt.tds.zip 2019/12/25 | 20258750 | install/graphics/ketcindy.tds.zip 2012/12/03 | 1483078 | install/graphics/mfpic.tds.zip @@ -163568,7 +163750,7 @@ 2020/07/08 | 7430658 | install/macros/latex/contrib/media9.tds.zip 2020/06/02 | 3612086 | install/macros/latex/contrib/memoir.tds.zip 2016/08/08 | 586877 | install/macros/latex/contrib/menukeys.tds.zip -2020/05/05 | 25615149 | install/macros/latex/contrib/mercatormap.tds.zip +2020/08/06 | 24409080 | install/macros/latex/contrib/mercatormap.tds.zip 2017/11/14 | 704736 | install/macros/latex/contrib/mfirstuc.tds.zip 2019/11/18 | 1918343 | install/macros/latex/contrib/microtype.tds.zip 2016/07/03 | 499067 | install/macros/latex/contrib/milog.tds.zip @@ -191508,11 +191690,11 @@ 2009/01/30 | 38053 | macros/latex/contrib/harvard/nederlands.bst 2009/01/30 | 2624 | macros/latex/contrib/harvard/README 2009/01/30 | 125790 | macros/latex/contrib/harvard.zip -2019/04/04 | 42177 | macros/latex/contrib/hausarbeit-jura/hausarbeit-jura.dtx -2019/04/04 | 1671 | macros/latex/contrib/hausarbeit-jura/hausarbeit-jura.ins -2019/04/04 | 336866 | macros/latex/contrib/hausarbeit-jura/hausarbeit-jura.pdf -2019/04/04 | 2510 | macros/latex/contrib/hausarbeit-jura/README.md -2019/04/04 | 351294 | macros/latex/contrib/hausarbeit-jura.zip +2020/08/06 | 42157 | macros/latex/contrib/hausarbeit-jura/hausarbeit-jura.dtx +2020/08/06 | 1671 | macros/latex/contrib/hausarbeit-jura/hausarbeit-jura.ins +2020/08/06 | 340891 | macros/latex/contrib/hausarbeit-jura/hausarbeit-jura.pdf +2020/08/06 | 2536 | macros/latex/contrib/hausarbeit-jura/README.md +2020/08/06 | 355211 | macros/latex/contrib/hausarbeit-jura.zip 2015/02/21 | 30421 | macros/latex/contrib/havannah/havannah.dtx 2015/02/21 | 984 | macros/latex/contrib/havannah/havannah.ins 2015/02/21 | 225361 | macros/latex/contrib/havannah/havannah.pdf @@ -195182,28 +195364,28 @@ 2009/01/29 | 132906 | macros/latex/contrib/menu/menu.pdf 2009/01/29 | 915 | macros/latex/contrib/menu/README 2009/03/04 | 122601 | macros/latex/contrib/menu.zip -2020/05/05 | 1451 | macros/latex/contrib/mercatormap/mercatormap.bib -2020/05/05 | 3775 | macros/latex/contrib/mercatormap/mercatormap.doc.abstract.tex -2020/05/05 | 21276 | macros/latex/contrib/mercatormap/mercatormap.doc.definition.tex -2020/05/05 | 10316 | macros/latex/contrib/mercatormap/mercatormap.doc.drawing.tex -2020/05/05 | 15654 | macros/latex/contrib/mercatormap/mercatormap.doc.examples.tex -2020/05/05 | 5677 | macros/latex/contrib/mercatormap/mercatormap.doc.intro.tex -2020/05/05 | 12946 | macros/latex/contrib/mercatormap/mercatormap.doc.limitations.tex -2020/05/05 | 39842 | macros/latex/contrib/mercatormap/mercatormap.doc.maptiles.tex -2020/05/05 | 25437 | macros/latex/contrib/mercatormap/mercatormap.doc.marker.tex -2020/05/05 | 6367 | macros/latex/contrib/mercatormap/mercatormap.doc.orthodromes.tex -2020/05/05 | 4842 | macros/latex/contrib/mercatormap/mercatormap.doc.routes.tex -2020/05/05 | 15771 | macros/latex/contrib/mercatormap/mercatormap.doc.scales.tex -2020/05/05 | 3542 | macros/latex/contrib/mercatormap/mercatormap.doc.sty -2020/05/05 | 1097 | macros/latex/contrib/mercatormap/mercatormap.doc.versionhistory.tex -2020/05/05 | 3049 | macros/latex/contrib/mercatormap/mercatormap-example.tex -2020/05/05 | 26056519 | macros/latex/contrib/mercatormap/mercatormap.pdf -2020/05/05 | 79180 | macros/latex/contrib/mercatormap/mercatormap.sty -2020/05/05 | 3049 | macros/latex/contrib/mercatormap/mercatormap.tex -2020/05/05 | 21399 | macros/latex/contrib/mercatormap/mercatorpy.def -2020/05/05 | 11213 | macros/latex/contrib/mercatormap/mercatorsupplier.def -2020/05/05 | 1879 | macros/latex/contrib/mercatormap/README -2020/05/05 | 25617242 | macros/latex/contrib/mercatormap.zip +2020/08/06 | 1451 | macros/latex/contrib/mercatormap/mercatormap.bib +2020/08/06 | 3775 | macros/latex/contrib/mercatormap/mercatormap.doc.abstract.tex +2020/08/06 | 21276 | macros/latex/contrib/mercatormap/mercatormap.doc.definition.tex +2020/08/06 | 10310 | macros/latex/contrib/mercatormap/mercatormap.doc.drawing.tex +2020/08/06 | 15647 | macros/latex/contrib/mercatormap/mercatormap.doc.examples.tex +2020/08/06 | 5677 | macros/latex/contrib/mercatormap/mercatormap.doc.intro.tex +2020/08/06 | 12865 | macros/latex/contrib/mercatormap/mercatormap.doc.limitations.tex +2020/08/06 | 41079 | macros/latex/contrib/mercatormap/mercatormap.doc.maptiles.tex +2020/08/06 | 25696 | macros/latex/contrib/mercatormap/mercatormap.doc.marker.tex +2020/08/06 | 6367 | macros/latex/contrib/mercatormap/mercatormap.doc.orthodromes.tex +2020/08/06 | 4842 | macros/latex/contrib/mercatormap/mercatormap.doc.routes.tex +2020/08/06 | 15771 | macros/latex/contrib/mercatormap/mercatormap.doc.scales.tex +2020/08/06 | 3923 | macros/latex/contrib/mercatormap/mercatormap.doc.sty +2020/08/06 | 1908 | macros/latex/contrib/mercatormap/mercatormap.doc.versionhistory.tex +2020/08/06 | 3049 | macros/latex/contrib/mercatormap/mercatormap-example.tex +2020/08/06 | 24872307 | macros/latex/contrib/mercatormap/mercatormap.pdf +2020/08/06 | 82254 | macros/latex/contrib/mercatormap/mercatormap.sty +2020/08/06 | 2983 | macros/latex/contrib/mercatormap/mercatormap.tex +2020/08/06 | 21399 | macros/latex/contrib/mercatormap/mercatorpy.def +2020/08/06 | 11354 | macros/latex/contrib/mercatormap/mercatorsupplier.def +2020/08/06 | 1879 | macros/latex/contrib/mercatormap/README +2020/08/06 | 24411354 | macros/latex/contrib/mercatormap.zip 2012/03/05 | 927 | macros/latex/contrib/messagebubbles/messagebubbles.sty 2012/03/06 | 68997 | macros/latex/contrib/messagebubbles/messagebubbles-usage.pdf 2012/03/06 | 1321 | macros/latex/contrib/messagebubbles/messagebubbles-usage.tex @@ -249751,13 +249933,13 @@ 1991/07/25 | 54800 | support/pictex-converter/pictexte.exe 1991/07/25 | 43757 | support/pictex-converter/pictexte.pas 1991/07/29 | 27946 | support/pictex-converter/PiCUNIX.PASCAL -2020/07/21 | 364761 | support/pkfix-helper/encoding-samples.pdf -2020/07/21 | 64329 | support/pkfix-helper/encoding-samples.tex -2020/07/21 | 71863 | support/pkfix-helper/pkfix-helper -2020/07/21 | 26603 | support/pkfix-helper/pkfix-helper.1 -2020/07/21 | 86712 | support/pkfix-helper/pkfix-helper.pdf -2020/04/19 | 2261 | support/pkfix-helper/README -2020/07/21 | 430876 | support/pkfix-helper.zip +2020/08/06 | 364537 | support/pkfix-helper/encoding-samples.pdf +2020/08/06 | 64329 | support/pkfix-helper/encoding-samples.tex +2020/08/06 | 71863 | support/pkfix-helper/pkfix-helper +2020/08/06 | 26603 | support/pkfix-helper/pkfix-helper.1 +2020/08/06 | 77529 | support/pkfix-helper/pkfix-helper.pdf +2020/08/04 | 2306 | support/pkfix-helper/README +2020/08/06 | 426285 | support/pkfix-helper.zip 2012/04/18 | 27484 | support/pkfix/pkfix.pl 2012/04/18 | 9740 | support/pkfix/README 2012/04/18 | 12122 | support/pkfix.zip @@ -255472,7 +255654,7 @@ 2020/04/22 | 787504 | systems/texlive/tlnet/archive/bearwear.doc.r54826.tar.xz 2020/04/22 | 2376 | systems/texlive/tlnet/archive/bearwear.r54826.tar.xz 2020/04/22 | 5992 | systems/texlive/tlnet/archive/bearwear.source.r54826.tar.xz -2020/07/08 | 825728 | systems/texlive/tlnet/archive/beebe.r55769.tar.xz +2020/08/06 | 827256 | systems/texlive/tlnet/archive/beebe.r56047.tar.xz 2019/02/28 | 709916 | systems/texlive/tlnet/archive/begingreek.doc.r36294.tar.xz 2019/02/28 | 1664 | systems/texlive/tlnet/archive/begingreek.r36294.tar.xz 2019/02/28 | 7448 | systems/texlive/tlnet/archive/begingreek.source.r36294.tar.xz @@ -256607,7 +256789,7 @@ 2020/05/29 | 1224 | systems/texlive/tlnet/archive/collection-bibtexextra.r55339.tar.xz 2020/07/25 | 940 | systems/texlive/tlnet/archive/collection-binextra.r55933.tar.xz 2020/03/04 | 596 | systems/texlive/tlnet/archive/collection-context.r54074.tar.xz -2020/07/21 | 1820 | systems/texlive/tlnet/archive/collection-fontsextra.r55888.tar.xz +2020/08/06 | 1824 | systems/texlive/tlnet/archive/collection-fontsextra.r56050.tar.xz 2020/03/04 | 560 | systems/texlive/tlnet/archive/collection-fontsrecommended.r54074.tar.xz 2020/03/04 | 524 | systems/texlive/tlnet/archive/collection-fontutils.r54074.tar.xz 2020/03/04 | 568 | systems/texlive/tlnet/archive/collection-formatsextra.r54074.tar.xz @@ -256620,7 +256802,7 @@ 2020/03/04 | 372 | systems/texlive/tlnet/archive/collection-langczechslovak.r54074.tar.xz 2020/07/25 | 820 | systems/texlive/tlnet/archive/collection-langenglish.r55930.tar.xz 2020/03/26 | 696 | systems/texlive/tlnet/archive/collection-langeuropean.r54568.tar.xz -2020/04/12 | 576 | systems/texlive/tlnet/archive/collection-langfrench.r54675.tar.xz +2020/08/06 | 584 | systems/texlive/tlnet/archive/collection-langfrench.r56051.tar.xz 2020/07/01 | 628 | systems/texlive/tlnet/archive/collection-langgerman.r55706.tar.xz 2020/03/07 | 428 | systems/texlive/tlnet/archive/collection-langgreek.r54139.tar.xz 2020/05/14 | 432 | systems/texlive/tlnet/archive/collection-langitalian.r55129.tar.xz @@ -258994,6 +259176,8 @@ 2019/02/28 | 885988 | systems/texlive/tlnet/archive/frontespizio.doc.r24054.tar.xz 2019/02/28 | 5464 | systems/texlive/tlnet/archive/frontespizio.r24054.tar.xz 2019/02/28 | 22604 | systems/texlive/tlnet/archive/frontespizio.source.r24054.tar.xz +2020/08/06 | 63572 | systems/texlive/tlnet/archive/frpseudocode.doc.r56051.tar.xz +2020/08/06 | 864 | systems/texlive/tlnet/archive/frpseudocode.r56051.tar.xz 2019/02/28 | 210700 | systems/texlive/tlnet/archive/ftcap.doc.r17275.tar.xz 2019/02/28 | 2044 | systems/texlive/tlnet/archive/ftcap.r17275.tar.xz 2019/02/28 | 3622556 | systems/texlive/tlnet/archive/ftc-notebook.doc.r50043.tar.xz @@ -262214,8 +262398,8 @@ 2019/02/28 | 196212 | systems/texlive/tlnet/archive/newspaper.doc.r15878.tar.xz 2019/02/28 | 1924 | systems/texlive/tlnet/archive/newspaper.r15878.tar.xz 2019/02/28 | 6804 | systems/texlive/tlnet/archive/newspaper.source.r15878.tar.xz -2020/07/24 | 940052 | systems/texlive/tlnet/archive/newtx.doc.r55920.tar.xz -2020/07/24 | 5577920 | systems/texlive/tlnet/archive/newtx.r55920.tar.xz +2020/08/06 | 940504 | systems/texlive/tlnet/archive/newtx.doc.r56049.tar.xz +2020/08/06 | 5578296 | systems/texlive/tlnet/archive/newtx.r56049.tar.xz 2020/05/05 | 332260 | systems/texlive/tlnet/archive/newtxsf.doc.r55014.tar.xz 2020/05/05 | 105568 | systems/texlive/tlnet/archive/newtxsf.r55014.tar.xz 2020/03/24 | 171356 | systems/texlive/tlnet/archive/newtxtt.doc.r54512.tar.xz @@ -262320,6 +262504,8 @@ 2020/03/24 | 312836 | systems/texlive/tlnet/archive/noto.doc.r54512.tar.xz 2020/02/29 | 608 | systems/texlive/tlnet/archive/noto-emoji.doc.r53968.tar.xz 2020/02/29 | 8952232 | systems/texlive/tlnet/archive/noto-emoji.r53968.tar.xz +2020/08/06 | 403056 | systems/texlive/tlnet/archive/notomath.doc.r56050.tar.xz +2020/08/06 | 213400 | systems/texlive/tlnet/archive/notomath.r56050.tar.xz 2020/03/24 | 67199024 | systems/texlive/tlnet/archive/noto.r54512.tar.xz 2020/03/24 | 4672576 | systems/texlive/tlnet/archive/novel.doc.r54512.tar.xz 2020/03/24 | 120892 | systems/texlive/tlnet/archive/novel.r54512.tar.xz @@ -265285,7 +265471,7 @@ 2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r55172.tar.xz 2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r55172.tar.xz 2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r55172.tar.xz -2020/08/05 | 218656 | systems/texlive/tlnet/archive/texlive-scripts.doc.r56040.tar.xz +2020/08/06 | 218656 | systems/texlive/tlnet/archive/texlive-scripts.doc.r56047.tar.xz 2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.aarch64-linux.r53577.tar.xz 2020/01/27 | 924 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-freebsd.r53577.tar.xz 2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-netbsd.r53577.tar.xz @@ -265309,7 +265495,7 @@ 2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r55172.tar.xz 2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r55172.tar.xz 2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r55172.tar.xz -2020/08/05 | 132036 | systems/texlive/tlnet/archive/texlive-scripts.r56040.tar.xz +2020/08/06 | 131984 | systems/texlive/tlnet/archive/texlive-scripts.r56047.tar.xz 2020/05/31 | 36284 | systems/texlive/tlnet/archive/texlive-scripts.win32.r55357.tar.xz 2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz 2020/05/12 | 592 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-darwinlegacy.r55117.tar.xz @@ -265888,8 +266074,8 @@ 2020/04/29 | 12256 | systems/texlive/tlnet/archive/translations.r54929.tar.xz 2019/02/28 | 355420 | systems/texlive/tlnet/archive/translation-tabbing-fr.doc.r24228.tar.xz 2019/02/28 | 404 | systems/texlive/tlnet/archive/translation-tabbing-fr.r24228.tar.xz -2020/07/28 | 215132 | systems/texlive/tlnet/archive/translator.doc.r55967.tar.xz -2020/07/28 | 25432 | systems/texlive/tlnet/archive/translator.r55967.tar.xz +2020/08/06 | 215600 | systems/texlive/tlnet/archive/translator.doc.r56052.tar.xz +2020/08/06 | 25580 | systems/texlive/tlnet/archive/translator.r56052.tar.xz 2019/12/01 | 266624 | systems/texlive/tlnet/archive/transparent.doc.r52981.tar.xz 2019/12/01 | 1992 | systems/texlive/tlnet/archive/transparent.r52981.tar.xz 2019/12/01 | 5448 | systems/texlive/tlnet/archive/transparent.source.r52981.tar.xz @@ -266639,9 +266825,9 @@ 2019/02/28 | 1716 | systems/texlive/tlnet/archive/xellipsis.r47546.tar.xz 2019/02/28 | 7092 | systems/texlive/tlnet/archive/xellipsis.source.r47546.tar.xz 2020/05/18 | 987500 | systems/texlive/tlnet/archive/xepersian.doc.r55194.tar.xz -2020/07/21 | 692804 | systems/texlive/tlnet/archive/xepersian-hm.doc.r55892.tar.xz -2020/07/21 | 5700 | systems/texlive/tlnet/archive/xepersian-hm.r55892.tar.xz -2020/07/21 | 6652 | systems/texlive/tlnet/archive/xepersian-hm.source.r55892.tar.xz +2020/08/06 | 693120 | systems/texlive/tlnet/archive/xepersian-hm.doc.r56053.tar.xz +2020/08/06 | 5692 | systems/texlive/tlnet/archive/xepersian-hm.r56053.tar.xz +2020/08/06 | 6636 | systems/texlive/tlnet/archive/xepersian-hm.source.r56053.tar.xz 2020/05/18 | 58564 | systems/texlive/tlnet/archive/xepersian.r55194.tar.xz 2020/05/18 | 74624 | systems/texlive/tlnet/archive/xepersian.source.r55194.tar.xz 2019/08/20 | 614800 | systems/texlive/tlnet/archive/xesearch.doc.r51908.tar.xz @@ -266953,16 +267139,16 @@ 2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz 2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz 2020/06/13 | 105829 | systems/texlive/tlnet/install-tl -2020/08/05 | 5500571 | systems/texlive/tlnet/install-tl-unx.tar.gz -2020/08/05 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2020/08/05 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2020/08/06 | 5500779 | systems/texlive/tlnet/install-tl-unx.tar.gz +2020/08/06 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2020/08/06 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2020/05/31 | 4770 | systems/texlive/tlnet/install-tl-windows.bat -2020/08/05 | 19382284 | systems/texlive/tlnet/install-tl-windows.exe -2020/08/05 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2020/08/05 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2020/08/05 | 24269323 | systems/texlive/tlnet/install-tl.zip -2020/08/05 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2020/08/05 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2020/08/06 | 19380892 | systems/texlive/tlnet/install-tl-windows.exe +2020/08/06 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2020/08/06 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2020/08/06 | 24269284 | systems/texlive/tlnet/install-tl.zip +2020/08/06 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2020/08/06 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc 2020/03/05 | 1215 | systems/texlive/tlnet/README.md 2020/04/06 | 5961 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg 2016/04/12 | 600 | systems/texlive/tlnet/tlpkg/gpg/random_seed @@ -266971,7 +267157,7 @@ 2020/04/06 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg 2020/07/15 | 48932 | systems/texlive/tlnet/tlpkg/installer/config.guess 2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt -2020/08/03 | 6633 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +2020/08/05 | 6469 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2020/04/15 | 223687 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt 2020/04/15 | 2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe 2018/04/29 | 13647 | systems/texlive/tlnet/tlpkg/installer/DirSelect.pm @@ -267018,12 +267204,12 @@ 2020/05/17 | 20322 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm 2020/05/03 | 4786 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm 2017/11/14 | 27560 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm -2020/08/05 | 16360422 | systems/texlive/tlnet/tlpkg/texlive.tlpdb -2020/08/05 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2020/08/06 | 16364630 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2020/08/06 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 2020/05/13 | 86417 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm -2020/08/05 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2020/08/05 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2020/08/05 | 2213512 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2020/08/06 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2020/08/06 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2020/08/06 | 2212308 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2020/04/15 | 58761 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm 2020/03/20 | 41736 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm 2020/05/11 | 15010 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm @@ -271509,7 +271695,7 @@ 2020/02/04 | 281488 | systems/win32/miktex/tm/packages/filehook.tar.lzma 2012/12/04 | 924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma 2011/09/21 | 281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma -2020/08/05 | 537434 | systems/win32/miktex/tm/packages/files.csv.lzma +2020/08/06 | 537434 | systems/win32/miktex/tm/packages/files.csv.lzma 2001/05/14 | 5617 | systems/win32/miktex/tm/packages/finbib.tar.lzma 2015/10/20 | 44379 | systems/win32/miktex/tm/packages/findhyph.tar.lzma 2011/10/21 | 89323 | systems/win32/miktex/tm/packages/fink.tar.lzma @@ -272670,9 +272856,9 @@ 2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma 2020/08/01 | 38929 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma 2020/08/01 | 43039 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma -2020/08/05 | 202093 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma -2020/08/05 | 1206355 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma -2020/08/05 | 1124956 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma +2020/08/06 | 202087 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma +2020/08/06 | 1206299 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma +2020/08/06 | 1124940 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma 2020/08/01 | 13102 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma 2020/08/01 | 14104 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma 2016/07/15 | 35914 | systems/win32/miktex/tm/packages/mil3.tar.lzma @@ -272826,187 +273012,187 @@ 2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma 2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma 2019/09/11 | 231430 | systems/win32/miktex/tm/packages/newverbs.tar.lzma -2020/08/05 | 537457 | systems/win32/miktex/tm/packages/next/files.csv.lzma -2020/08/05 | 59342 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma -2020/08/05 | 67258 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma -2020/08/05 | 956333 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma -2020/08/05 | 1061412 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma -2020/08/05 | 28604 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma -2020/08/05 | 30908 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma -2020/08/05 | 29399 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma -2020/08/05 | 34774 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma -2020/08/05 | 49590 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma -2020/08/05 | 57159 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma -2020/08/05 | 84662 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma -2020/08/05 | 93640 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma -2020/08/05 | 65818 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma -2020/08/05 | 73450 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma -2020/08/05 | 27007 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma -2020/08/05 | 30889 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma -2020/08/05 | 329617 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma -2020/08/05 | 392366 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma -2020/08/05 | 32351 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma -2020/08/05 | 36360 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma -2020/08/05 | 72255 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma -2020/08/05 | 79418 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma -2020/08/05 | 203964 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma -2020/08/05 | 224087 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma -2020/08/05 | 169656 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma -2020/08/05 | 184490 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma -2020/08/05 | 51937 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma -2020/08/05 | 58661 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma -2020/08/05 | 20816 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma -2020/08/05 | 22980 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma -2020/08/05 | 460434 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma -2020/08/05 | 45318 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma -2020/08/05 | 51136 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma -2020/08/05 | 273697 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma -2020/08/05 | 310934 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma -2020/08/05 | 40821 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma -2020/08/05 | 45031 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma -2020/08/05 | 115881 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma -2020/08/05 | 130358 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma -2020/08/05 | 1265431 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma -2020/08/05 | 1404301 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma -2020/08/05 | 95398 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma -2020/08/05 | 109731 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma -2020/08/05 | 43314 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma -2020/08/05 | 48085 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma -2020/08/05 | 46357 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma -2020/08/05 | 51236 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma -2020/08/05 | 57148 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma -2020/08/05 | 62977 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma -2020/08/05 | 133656 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma -2020/08/05 | 151862 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma -2020/08/05 | 72861 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma -2020/08/05 | 77366 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma -2020/08/05 | 68968 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma -2020/08/05 | 77315 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma -2020/08/05 | 246825 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma -2020/08/05 | 281780 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma -2020/08/05 | 25504 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma -2020/08/05 | 29058 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma -2020/08/05 | 100917 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma -2020/08/05 | 116786 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma -2020/08/05 | 63514 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma -2020/08/05 | 72612 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma -2020/08/05 | 94382 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma -2020/08/05 | 113579 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma -2020/08/05 | 59041 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma -2020/08/05 | 65547 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma -2020/08/05 | 462705 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma -2020/08/05 | 549968 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma -2020/08/05 | 141852 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma -2020/08/05 | 154417 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma -2020/08/05 | 94512 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma -2020/08/05 | 108991 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma -2020/08/05 | 15948 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma -2020/08/05 | 17626 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma -2020/08/05 | 27801 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma -2020/08/05 | 29636 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma -2020/08/05 | 623928 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma -2020/08/05 | 677579 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma -2020/08/05 | 500565 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma -2020/08/05 | 561890 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma -2020/08/05 | 544358 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma -2020/08/05 | 583960 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma -2020/08/05 | 93622 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma -2020/08/05 | 102588 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma -2020/08/05 | 1746183 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma -2020/08/05 | 2031792 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma -2020/08/05 | 67278 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma -2020/08/05 | 73690 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma -2020/08/05 | 26995 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma -2020/08/05 | 31254 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma -2020/08/05 | 7549 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma -2020/08/05 | 8567 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma -2020/08/05 | 192837 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma -2020/08/05 | 211538 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma -2020/08/05 | 269404 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma -2020/08/05 | 305085 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma -2020/08/05 | 96480 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma -2020/08/05 | 101783 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma -2020/08/05 | 79691 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma -2020/08/05 | 88874 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma -2020/08/05 | 170418 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma -2020/08/05 | 189152 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma -2020/08/05 | 159878 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma -2020/08/05 | 180900 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma -2020/08/05 | 196318 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma -2020/08/05 | 177376 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma -2020/08/05 | 85158 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma -2020/08/05 | 96845 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma -2020/08/05 | 31225 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma -2020/08/05 | 35033 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma -2020/08/05 | 57313 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma -2020/08/05 | 64237 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma -2020/08/05 | 63360 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma -2020/08/05 | 69912 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma -2020/08/05 | 45775 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma -2020/08/05 | 52203 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma -2020/08/05 | 192590 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma -2020/08/05 | 210276 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma -2020/08/05 | 35216 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma -2020/08/05 | 39332 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma -2020/08/05 | 327551 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma -2020/08/05 | 360766 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma -2020/08/05 | 187721 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma -2020/08/05 | 193836 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma -2020/08/05 | 207672 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma -2020/08/05 | 243052 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma -2020/08/05 | 78101 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma -2020/08/05 | 87297 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma -2020/08/05 | 922274 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma -2020/08/05 | 1021969 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma -2020/08/05 | 20006 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma -2020/08/05 | 23599 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma -2020/08/05 | 31208 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma -2020/08/05 | 36865 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma -2020/08/05 | 63553 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma -2020/08/05 | 71553 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma -2020/08/05 | 42623 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma -2020/08/05 | 50913 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma -2020/08/05 | 1192973 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma -2020/08/05 | 1325257 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma -2020/08/05 | 42061 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma -2020/08/05 | 51421 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma -2020/08/05 | 76797 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma -2020/08/05 | 82787 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma -2020/08/05 | 26852 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma -2020/08/05 | 29027 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma -2020/08/05 | 16022 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma -2020/08/05 | 17728 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma -2020/08/05 | 63428 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma -2020/08/05 | 69183 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma -2020/08/05 | 151837 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma -2020/08/05 | 165592 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma -2020/08/05 | 77486 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma -2020/08/05 | 87981 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma -2020/08/05 | 97375 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma -2020/08/05 | 104547 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma -2020/08/05 | 2534479 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma -2020/08/05 | 2657478 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma -2020/08/05 | 55562 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma -2020/08/05 | 62028 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma -2020/08/05 | 33089 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma -2020/08/05 | 36921 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma -2020/08/05 | 26612 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma -2020/08/05 | 32393 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma -2020/08/05 | 66014 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma -2020/08/05 | 70139 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma -2020/08/05 | 250289 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma -2020/08/05 | 279882 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma -2020/08/05 | 597784 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma -2020/08/05 | 638662 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma -2020/08/05 | 39268 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma -2020/08/05 | 43074 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma -2020/08/05 | 202036 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma -2020/08/05 | 1206373 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma -2020/08/05 | 1124817 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma -2020/08/05 | 13129 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma -2020/08/05 | 14131 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma +2020/08/06 | 537457 | systems/win32/miktex/tm/packages/next/files.csv.lzma +2020/08/06 | 59341 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma +2020/08/06 | 67256 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma +2020/08/06 | 956332 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma +2020/08/06 | 1061411 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma +2020/08/06 | 28602 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma +2020/08/06 | 30909 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma +2020/08/06 | 29398 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma +2020/08/06 | 34774 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma +2020/08/06 | 49589 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma +2020/08/06 | 57159 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma +2020/08/06 | 84661 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma +2020/08/06 | 93640 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma +2020/08/06 | 65819 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma +2020/08/06 | 73450 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma +2020/08/06 | 27008 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma +2020/08/06 | 30890 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma +2020/08/06 | 329617 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma +2020/08/06 | 392365 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma +2020/08/06 | 32349 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma +2020/08/06 | 36361 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma +2020/08/06 | 72254 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma +2020/08/06 | 79418 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma +2020/08/06 | 203964 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma +2020/08/06 | 224086 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma +2020/08/06 | 169656 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma +2020/08/06 | 184490 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma +2020/08/06 | 51936 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma +2020/08/06 | 58660 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma +2020/08/06 | 20816 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma +2020/08/06 | 22981 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma +2020/08/06 | 460430 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma +2020/08/06 | 45318 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma +2020/08/06 | 51136 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma +2020/08/06 | 273697 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma +2020/08/06 | 310935 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma +2020/08/06 | 40820 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma +2020/08/06 | 45031 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma +2020/08/06 | 115879 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma +2020/08/06 | 130358 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma +2020/08/06 | 1265429 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma +2020/08/06 | 1404301 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma +2020/08/06 | 95400 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma +2020/08/06 | 109730 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma +2020/08/06 | 43311 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma +2020/08/06 | 48085 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma +2020/08/06 | 46355 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma +2020/08/06 | 51236 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma +2020/08/06 | 57146 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma +2020/08/06 | 62977 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma +2020/08/06 | 133655 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma +2020/08/06 | 151864 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma +2020/08/06 | 72861 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma +2020/08/06 | 77366 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma +2020/08/06 | 68968 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma +2020/08/06 | 77315 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma +2020/08/06 | 246825 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma +2020/08/06 | 281781 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma +2020/08/06 | 25502 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma +2020/08/06 | 29058 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma +2020/08/06 | 100918 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma +2020/08/06 | 116787 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma +2020/08/06 | 63513 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma +2020/08/06 | 72610 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma +2020/08/06 | 94380 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma +2020/08/06 | 113581 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma +2020/08/06 | 59040 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma +2020/08/06 | 65546 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma +2020/08/06 | 462706 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma +2020/08/06 | 549966 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma +2020/08/06 | 141852 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma +2020/08/06 | 154419 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma +2020/08/06 | 94512 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma +2020/08/06 | 108990 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma +2020/08/06 | 15950 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma +2020/08/06 | 17626 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma +2020/08/06 | 27800 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma +2020/08/06 | 29637 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma +2020/08/06 | 623926 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma +2020/08/06 | 677578 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma +2020/08/06 | 500565 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma +2020/08/06 | 561889 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma +2020/08/06 | 544357 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma +2020/08/06 | 583962 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma +2020/08/06 | 93618 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma +2020/08/06 | 102588 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma +2020/08/06 | 1746181 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma +2020/08/06 | 2031791 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma +2020/08/06 | 67276 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma +2020/08/06 | 73690 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma +2020/08/06 | 26996 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma +2020/08/06 | 31254 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma +2020/08/06 | 7548 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma +2020/08/06 | 8567 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma +2020/08/06 | 192836 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma +2020/08/06 | 211538 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma +2020/08/06 | 269404 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma +2020/08/06 | 305083 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma +2020/08/06 | 96479 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma +2020/08/06 | 101781 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma +2020/08/06 | 79691 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma +2020/08/06 | 88874 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma +2020/08/06 | 170417 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma +2020/08/06 | 189151 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma +2020/08/06 | 159878 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma +2020/08/06 | 180902 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma +2020/08/06 | 196317 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma +2020/08/06 | 177374 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma +2020/08/06 | 85158 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma +2020/08/06 | 96846 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma +2020/08/06 | 31223 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma +2020/08/06 | 35033 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma +2020/08/06 | 57312 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma +2020/08/06 | 64237 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma +2020/08/06 | 63359 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma +2020/08/06 | 69912 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma +2020/08/06 | 45773 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma +2020/08/06 | 52201 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma +2020/08/06 | 192587 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma +2020/08/06 | 210276 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma +2020/08/06 | 35215 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma +2020/08/06 | 39332 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma +2020/08/06 | 327551 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma +2020/08/06 | 360764 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma +2020/08/06 | 187719 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma +2020/08/06 | 193833 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma +2020/08/06 | 207671 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma +2020/08/06 | 243052 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma +2020/08/06 | 78100 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma +2020/08/06 | 87296 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma +2020/08/06 | 922274 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma +2020/08/06 | 1021969 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma +2020/08/06 | 20006 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma +2020/08/06 | 23600 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma +2020/08/06 | 31207 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma +2020/08/06 | 36860 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma +2020/08/06 | 63553 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma +2020/08/06 | 71551 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma +2020/08/06 | 42622 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma +2020/08/06 | 50914 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma +2020/08/06 | 1192974 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma +2020/08/06 | 1325258 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma +2020/08/06 | 42062 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma +2020/08/06 | 51419 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma +2020/08/06 | 76796 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma +2020/08/06 | 82786 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma +2020/08/06 | 26851 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma +2020/08/06 | 29026 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma +2020/08/06 | 16021 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma +2020/08/06 | 17727 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma +2020/08/06 | 63427 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma +2020/08/06 | 69182 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma +2020/08/06 | 151836 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma +2020/08/06 | 165592 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma +2020/08/06 | 77486 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma +2020/08/06 | 87981 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma +2020/08/06 | 97373 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma +2020/08/06 | 104547 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma +2020/08/06 | 2534481 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma +2020/08/06 | 2657477 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma +2020/08/06 | 55558 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma +2020/08/06 | 62026 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma +2020/08/06 | 33090 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma +2020/08/06 | 36921 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma +2020/08/06 | 26612 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma +2020/08/06 | 32392 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma +2020/08/06 | 66014 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma +2020/08/06 | 70140 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma +2020/08/06 | 250290 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma +2020/08/06 | 279881 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma +2020/08/06 | 597783 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma +2020/08/06 | 638663 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma +2020/08/06 | 39269 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma +2020/08/06 | 43074 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma +2020/08/06 | 202064 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma +2020/08/06 | 1206057 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma +2020/08/06 | 1124797 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma +2020/08/06 | 13128 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma +2020/08/06 | 14130 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma 2019/03/12 | 1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma -2020/08/05 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini +2020/08/06 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini 2018/07/06 | 145915 | systems/win32/miktex/tm/packages/nexus-otf.tar.lzma 2017/03/30 | 191149 | systems/win32/miktex/tm/packages/nfssext-cfr.tar.lzma 2012/12/20 | 612251 | systems/win32/miktex/tm/packages/nicefilelist.tar.lzma @@ -273323,7 +273509,7 @@ 2008/11/07 | 35981 | systems/win32/miktex/tm/packages/prettyref.tar.lzma 2017/07/26 | 201385 | systems/win32/miktex/tm/packages/preview.tar.lzma 2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma -2020/08/05 | 1155 | systems/win32/miktex/tm/packages/pr.ini +2020/08/06 | 1155 | systems/win32/miktex/tm/packages/pr.ini 2010/09/27 | 248469 | systems/win32/miktex/tm/packages/printlen.tar.lzma 2008/06/17 | 77313 | systems/win32/miktex/tm/packages/proba.tar.lzma 2017/07/12 | 988486 | systems/win32/miktex/tm/packages/probsoln.tar.lzma @@ -274473,7 +274659,7 @@ 2020/07/18 | 4918556 | systems/win32/w32tex/aleph-w32.tar.xz 2020/08/01 | 65831724 | systems/win32/w32tex/biblatex-biber.tar.xz 2016/12/13 | 65971452 | systems/win32/w32tex/cbfonts.tar.xz -2020/08/03 | 693835 | systems/win32/w32tex/ChangeLog +2020/08/05 | 694207 | systems/win32/w32tex/ChangeLog 2009/08/03 | 141221 | systems/win32/w32tex/ChangeLog.0 2009/08/03 | 221890 | systems/win32/w32tex/ChangeLog.1 2009/08/03 | 116462 | systems/win32/w32tex/ChangeLog.2 @@ -274481,7 +274667,7 @@ 2017/06/24 | 644754 | systems/win32/w32tex/ChangeLog.4 2020/07/09 | 23424956 | systems/win32/w32tex/cjkzr.tar.xz 2013/04/27 | 15858676 | systems/win32/w32tex/context-doc.tar.xz -2020/08/04 | 140495696 | systems/win32/w32tex/context.tar.xz +2020/08/04 | 140493980 | systems/win32/w32tex/context.tar.xz 2020/06/13 | 910472 | systems/win32/w32tex/cweb-w32.tar.xz 2020/03/02 | 6281164 | systems/win32/w32tex/datetime2.tar.xz 2020/06/13 | 845760 | systems/win32/w32tex/dvi2ps-w32.tar.xz @@ -274493,11 +274679,11 @@ 2020/06/13 | 17351036 | systems/win32/w32tex/gregorio-w32.tar.xz 2009/08/03 | 1072620 | systems/win32/w32tex/gtftex.zip 2020/07/14 | 1830716 | systems/win32/w32tex/jtex-w32.tar.xz -2020/07/22 | 45585756 | systems/win32/w32tex/latex-dev.tar.xz +2020/08/04 | 45599024 | systems/win32/w32tex/latex-dev.tar.xz 2020/05/30 | 29268960 | systems/win32/w32tex/latex.tar.xz 2020/06/13 | 996116 | systems/win32/w32tex/lcdf-typetools-w32.tar.xz 2020/07/31 | 398767444 | systems/win32/w32tex/ltxpkgdocs.tar.xz -2020/07/31 | 33836960 | systems/win32/w32tex/ltxpkgs.tar.xz +2020/08/05 | 33850480 | systems/win32/w32tex/ltxpkgs.tar.xz 2020/07/25 | 3833528 | systems/win32/w32tex/luajittex-dev-w32.tar.xz 2020/08/03 | 3808640 | systems/win32/w32tex/luajittex-exp-w32.tar.xz 2020/07/25 | 3839216 | systems/win32/w32tex/luajittex-w32.tar.xz @@ -274514,13 +274700,13 @@ 2020/07/24 | 9766264 | systems/win32/w32tex/newtxpx-boondoxfonts.tar.xz 2020/06/13 | 1235252 | systems/win32/w32tex/omegaj-w32.tar.xz 2020/03/01 | 355876 | systems/win32/w32tex/otfbeta.tar.xz -2020/08/02 | 20663188 | systems/win32/w32tex/pdftex-w32.tar.xz +2020/08/05 | 20692364 | systems/win32/w32tex/pdftex-w32.tar.xz 2020/07/28 | 81490532 | systems/win32/w32tex/pgfcontrib.tar.xz 2015/01/26 | 189072 | systems/win32/w32tex/plain2-2.54-w32.tar.xz 2020/05/26 | 2823676 | systems/win32/w32tex/platex.tar.xz 2020/03/20 | 1598792 | systems/win32/w32tex/pmx.tar.xz 2020/06/13 | 1169008 | systems/win32/w32tex/pstoedit-w32.tar.xz -2020/07/15 | 274409012 | systems/win32/w32tex/pstricks.tar.xz +2020/08/05 | 273771768 | systems/win32/w32tex/pstricks.tar.xz 2020/06/13 | 517656 | systems/win32/w32tex/psutils-w32.tar.xz 2020/07/31 | 6476204 | systems/win32/w32tex/ptex-ng-w32.tar.xz 2020/07/20 | 10483700 | systems/win32/w32tex/ptex-w32.tar.xz @@ -274553,7 +274739,7 @@ 2020/07/30 | 45622296 | systems/win32/w32tex/web2c-w32.tar.xz 2020/07/07 | 810800 | systems/win32/w32tex/win64/aleph-w64.tar.xz 2019/12/09 | 22317480 | systems/win32/w32tex/win64/biblatex-biber-w64.tar.xz -2020/07/29 | 2147772 | systems/win32/w32tex/win64/context-w64.tar.xz +2020/08/04 | 2147600 | systems/win32/w32tex/win64/context-w64.tar.xz 2020/06/13 | 82884 | systems/win32/w32tex/win64/cweb-w64.tar.xz 2020/06/13 | 758152 | systems/win32/w32tex/win64/dvi2ps-w64.tar.xz 2020/06/13 | 447760 | systems/win32/w32tex/win64/dvi2tty-w64.tar.xz @@ -274576,7 +274762,7 @@ 2020/06/13 | 376316 | systems/win32/w32tex/win64/mftrace-w64.tar.xz 2020/01/18 | 362540 | systems/win32/w32tex/win64/m-tx-w64.tar.xz 2020/06/13 | 406920 | systems/win32/w32tex/win64/omegaj-w64.tar.xz -2020/08/02 | 6324784 | systems/win32/w32tex/win64/pdftex-w64.tar.xz +2020/08/05 | 6321260 | systems/win32/w32tex/win64/pdftex-w64.tar.xz 2015/01/26 | 41440 | systems/win32/w32tex/win64/plain2-2.54-w64.tar.xz 2020/03/20 | 557532 | systems/win32/w32tex/win64/pmx-w64.tar.xz 2020/06/13 | 789904 | systems/win32/w32tex/win64/pstoedit-w64.tar.xz @@ -274689,7 +274875,7 @@ 2004/06/04 | 404 | tds/tds.sed 2004/06/23 | 65418 | tds/tds.tex 2019/05/29 | 304264 | tds.zip -2020/08/06 | 186 | timestamp +2020/08/07 | 186 | timestamp 2002/08/26 | 61898 | usergrps/dante/antrag.pdf 2002/08/26 | 118217 | usergrps/dante/antrag.ps 2017/06/30 | 917 | usergrps/dante/dtk/doc/beispiel.bib diff --git a/FILES.byname.gz b/FILES.byname.gz index 9f447a838e..e82d2e6060 100644 Binary files a/FILES.byname.gz and b/FILES.byname.gz differ diff --git a/FILES.last07days b/FILES.last07days index 7f53302c44..afb3cbf5b4 100644 --- a/FILES.last07days +++ b/FILES.last07days @@ -1,249 +1,2140 @@ +2020/08/06 | 99 | graphics/asymptote/base/asy_filetype.vim +2020/08/06 | 998 | graphics/asymptote/GUI/res/icons/chevron-with-circle-right.svg +2020/08/06 | 996 | fonts/xcharter/vf/XCharter1-Italic-tosf-sc-ot1.vf +2020/08/06 | 9945 | graphics/asymptote/GUI/pyUIClass/custMatTransform.py +2020/08/06 | 992 | fonts/xcharter/vf/XCharter1-Roman-tosf-sc-ot1.vf +2020/08/06 | 9923 | graphics/asymptote/profiler.h +2020/08/06 | 990 | graphics/asymptote/examples/RiemannSphere.asy +2020/08/06 | 98 | graphics/asymptote/GUI/res/icons/openpolygon.asy +2020/08/06 | 98 | graphics/asymptote/GUI/res/icons/opencurve.asy +2020/08/06 | 988 | fonts/xcharter/vf/XCharter1-Bold-tosf-sc-ot1.vf +2020/08/06 | 986 | graphics/asymptote/predicates.h +2020/08/06 | 984 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-ot1G.vf +2020/08/06 | 9836 | graphics/asymptote/doc/asymptote.sty +2020/08/06 | 980 | graphics/asymptote/examples/filesurface.asy +2020/08/06 | 9804 | graphics/asymptote/runstring.in +2020/08/06 | 978 | graphics/asymptote/examples/worksheet.asy +2020/08/06 | 974 | graphics/asymptote/prc/Makefile +2020/08/06 | 973 | graphics/asymptote/examples/fequlogo.asy +2020/08/06 | 97373 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma +2020/08/06 | 972 | graphics/asymptote/examples/triads.asy +2020/08/06 | 9725 | graphics/asymptote/doc/FAQ/m-html.pl +2020/08/06 | 969 | graphics/asymptote/runfile.h +2020/08/06 | 96846 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma +2020/08/06 | 966 | graphics/asymptote/tests/array/solve.asy +2020/08/06 | 964 | graphics/asymptote/GUI/xasyTransform.py +2020/08/06 | 964 | graphics/asymptote/GUI/res/icons/magnifying-glass.svg +2020/08/06 | 964 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-ot1.vf +2020/08/06 | 96479 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma +2020/08/06 | 960 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-sc-ot1.vf +2020/08/06 | 95 | graphics/asymptote/prc/test.asy +2020/08/06 | 9574 | graphics/asymptote/triple.h +2020/08/06 | 956 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-sc-ot1.vf +2020/08/06 | 9569 | graphics/asymptote/base/bezulate.asy +2020/08/06 | 956332 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma +2020/08/06 | 954 | graphics/asymptote/examples/poster.asy +2020/08/06 | 95400 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma +2020/08/06 | 951 | graphics/asymptote/statistics.h +2020/08/06 | 946 | graphics/asymptote/examples/animations/cube.asy +2020/08/06 | 94512 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma +2020/08/06 | 94380 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma +2020/08/06 | 940 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-sc-ot1.vf +2020/08/06 | 940504 | systems/texlive/tlnet/archive/newtx.doc.r56049.tar.xz +2020/08/06 | 9399 | graphics/asymptote/base/rationalSimplex.asy +2020/08/06 | 936 | graphics/asymptote/tests/array/array.asy +2020/08/06 | 93640 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma +2020/08/06 | 93618 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma +2020/08/06 | 930 | graphics/asymptote/examples/polararea.asy +2020/08/06 | 9309 | graphics/asymptote/base/plain_paths.asy +2020/08/06 | 9251 | graphics/asymptote/errors +2020/08/06 | 9243 | graphics/asymptote/glrender.h +2020/08/06 | 922274 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma +2020/08/06 | 9202 | graphics/asymptote/doc/FAQ/bfnnconv.pl +2020/08/06 | 916 | graphics/asymptote/opcodes.h +2020/08/06 | 912 | graphics/asymptote/doc/errorbars.asy +2020/08/06 | 9096 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-t2a.tfm +2020/08/06 | 9092 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-t2asrb.tfm +2020/08/06 | 908 | graphics/asymptote/modifier.h +2020/08/06 | 908 | graphics/asymptote/coenv.h +2020/08/06 | 908 | graphics/asymptote/base/map.asy +2020/08/06 | 9088 | graphics/asymptote/application.h +2020/08/06 | 9068 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-t2a.tfm +2020/08/06 | 9064 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-t2asrb.tfm +2020/08/06 | 904 | fonts/xcharter/vf/XCharter-Roman-ts1.vf +2020/08/06 | 9028 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-t2a.tfm +2020/08/06 | 901 | graphics/asymptote/virtualfieldaccess.cc +2020/08/06 | 9016 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-t2a.tfm +2020/08/06 | 9012 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-t2asrb.tfm +2020/08/06 | 9012 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-t2asrb.tfm +2020/08/06 | 9004 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-t2a.tfm +2020/08/06 | 8988 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-t2asrb.tfm +2020/08/06 | 897 | graphics/asymptote/doc/flowchartdemo.asy +2020/08/06 | 896 | graphics/asymptote/examples/markregular.asy +2020/08/06 | 8964 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-t2a.tfm +2020/08/06 | 8960 | graphics/asymptote/symbol.cc +2020/08/06 | 8948 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-t2asrb.tfm +2020/08/06 | 8937 | graphics/asymptote/psfile.h +2020/08/06 | 892 | graphics/asymptote/GUI/res/icons/center.svg +2020/08/06 | 88874 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma +2020/08/06 | 8870 | graphics/asymptote/base/asy.vim +2020/08/06 | 886 | graphics/asymptote/angle.h +2020/08/06 | 8856 | graphics/asymptote/runmath.in +2020/08/06 | 883 | graphics/asymptote/GUI/Widg_addPolyOpt.py +2020/08/06 | 882 | graphics/asymptote/shaders.h +2020/08/06 | 880 | graphics/asymptote/doc/xasy.1x +2020/08/06 | 87981 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma +2020/08/06 | 8792 | graphics/asymptote/prc/PRCTools/iPRCFile.cc +2020/08/06 | 877 | graphics/asymptote/doc/markers2.asy +2020/08/06 | 876 | graphics/asymptote/GUI/res/icons/edit.svg +2020/08/06 | 8736 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2a.tfm +2020/08/06 | 87296 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma +2020/08/06 | 8728 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2asrb.tfm +2020/08/06 | 8724 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2a.tfm +2020/08/06 | 8712 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2a.tfm +2020/08/06 | 8708 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2a.tfm +2020/08/06 | 8704 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2asrb.tfm +2020/08/06 | 8704 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2asrb.tfm +2020/08/06 | 8700 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2asrb.tfm +2020/08/06 | 8700 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2a.tfm +2020/08/06 | 86 | graphics/asymptote/doc/cylinderskeleton.asy +2020/08/06 | 868 | graphics/asymptote/examples/twistedtubes.asy +2020/08/06 | 868 | graphics/asymptote/doc/imagecontour.asy +2020/08/06 | 8684 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2a.tfm +2020/08/06 | 8680 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2a.tfm +2020/08/06 | 8676 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2asrb.tfm +2020/08/06 | 8676 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2asrb.tfm +2020/08/06 | 8672 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2asrb.tfm +2020/08/06 | 866 | graphics/asymptote/examples/xxsq01x-1.asy +2020/08/06 | 8664 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2a.tfm +2020/08/06 | 8661 | graphics/asymptote/base/plain_pens.asy +2020/08/06 | 864 | systems/texlive/tlnet/archive/frpseudocode.r56051.tar.xz +2020/08/06 | 8647680 | graphics/asymptote/binaries/i386-windows/texlive/asy.exe +2020/08/06 | 8640 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2asrb.tfm +2020/08/06 | 8628 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2a.tfm +2020/08/06 | 8624 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2asrb.tfm +2020/08/06 | 861 | graphics/asymptote/examples/orthocenter.asy +2020/08/06 | 8617472 | graphics/asymptote/binaries/x86_64-windows/texlive/asy.exe +2020/08/06 | 8572 | fonts/xcharter/tfm/XCharter1-Roman-tosf-t2a.tfm +2020/08/06 | 856 | graphics/asymptote/examples/animations/sphere.asy +2020/08/06 | 8567 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma +2020/08/06 | 8564 | fonts/xcharter/tfm/XCharter-Roman-tosf-t2a.tfm +2020/08/06 | 8564 | fonts/xcharter/tfm/XCharter1-Roman-tosf-t2asrb.tfm +2020/08/06 | 8556 | fonts/xcharter/tfm/XCharter-Roman-tosf-t2asrb.tfm +2020/08/06 | 8540 | fonts/xcharter/tfm/XCharter1-Bold-tosf-t2a.tfm +2020/08/06 | 85383 | graphics/asymptote/base/three.asy +2020/08/06 | 8532 | fonts/xcharter/tfm/XCharter-Roman-tlf-t2a.tfm +2020/08/06 | 8532 | fonts/xcharter/tfm/XCharter1-Bold-tosf-t2asrb.tfm +2020/08/06 | 8524 | fonts/xcharter/tfm/XCharter-Roman-tlf-t2asrb.tfm +2020/08/06 | 85158 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma +2020/08/06 | 850 | graphics/asymptote/GUI/res/icons/android-folder-open.svg +2020/08/06 | 8492 | fonts/xcharter/tfm/XCharter-Bold-tosf-t2a.tfm +2020/08/06 | 8484 | fonts/xcharter/tfm/XCharter-Bold-tosf-t2asrb.tfm +2020/08/06 | 84661 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma +2020/08/06 | 845 | graphics/asymptote/envcompleter.h +2020/08/06 | 8456 | fonts/xcharter/tfm/XCharter-Bold-tlf-t2a.tfm +2020/08/06 | 844 | graphics/asymptote/GUI/res/icons/android-radio-button-on.svg +2020/08/06 | 8448 | fonts/xcharter/tfm/XCharter-Bold-tlf-t2asrb.tfm +2020/08/06 | 8439 | graphics/asymptote/runpath.in +2020/08/06 | 8429 | graphics/asymptote/examples/thermodynamics.asy +2020/08/06 | 839 | graphics/asymptote/examples/venn3.asy +2020/08/06 | 838 | graphics/asymptote/GUI/res/icons/close-round.svg +2020/08/06 | 83897 | graphics/asymptote/webgl/gl.js +2020/08/06 | 8371 | graphics/asymptote/prc/PRCbitStream.cc +2020/08/06 | 836 | fonts/xcharter/vf/XCharter-Italic-tlf-ot1G.vf +2020/08/06 | 83431 | graphics/asymptote/lex.yy.cc +2020/08/06 | 8340 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2a.tfm +2020/08/06 | 8332 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2asrb.tfm +2020/08/06 | 832 | fonts/xcharter/vf/XCharter-Roman-tlf-ot1G.vf +2020/08/06 | 832 | fonts/xcharter/vf/XCharter-Bold-tlf-ot1G.vf +2020/08/06 | 8324 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2a.tfm +2020/08/06 | 831 | graphics/asymptote/runbacktrace.in +2020/08/06 | 8316 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2asrb.tfm +2020/08/06 | 829 | graphics/asymptote/examples/shellsqrtx01.asy +2020/08/06 | 8296 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2a.tfm +2020/08/06 | 8290 | graphics/asymptote/base/simplex.asy +2020/08/06 | 8288 | fonts/xcharter/tfm/XCharter-Slanted-tosf-t2a.tfm +2020/08/06 | 8288 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2asrb.tfm +2020/08/06 | 8284 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2a.tfm +2020/08/06 | 8280 | fonts/xcharter/tfm/XCharter-Slanted-tosf-t2asrb.tfm +2020/08/06 | 82786 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma +2020/08/06 | 8276 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2asrb.tfm +2020/08/06 | 827256 | systems/texlive/tlnet/archive/beebe.r56047.tar.xz +2020/08/06 | 8260 | fonts/xcharter/tfm/XCharter-Slanted-tlf-t2a.tfm +2020/08/06 | 825 | graphics/asymptote/examples/xxsq01y.asy +2020/08/06 | 8252 | fonts/xcharter/tfm/XCharter-Slanted-tlf-t2asrb.tfm +2020/08/06 | 8243 | graphics/asymptote/base/asy-kate.sh +2020/08/06 | 822 | graphics/asymptote/GUI/res/icons/android-expand.svg +2020/08/06 | 82254 | macros/latex/contrib/mercatormap/mercatormap.sty +2020/08/06 | 821 | graphics/asymptote/GUI/xasyArgs.py +2020/08/06 | 821 | graphics/asymptote/examples/SierpinskiGasket.asy +2020/08/06 | 820 | graphics/asymptote/webgl/license +2020/08/06 | 8208 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2a.tfm +2020/08/06 | 8200 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2asrb.tfm +2020/08/06 | 81 | graphics/asymptote/doc/bezier.asy +2020/08/06 | 8192 | fonts/xcharter/tfm/XCharter1-Italic-tosf-t2a.tfm +2020/08/06 | 8184 | fonts/xcharter/tfm/XCharter-Italic-tosf-t2a.tfm +2020/08/06 | 8172 | fonts/xcharter/tfm/XCharter1-Italic-tosf-t2asrb.tfm +2020/08/06 | 8164 | fonts/xcharter/tfm/XCharter-Italic-tosf-t2asrb.tfm +2020/08/06 | 8164 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2a.tfm +2020/08/06 | 8156 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2asrb.tfm +2020/08/06 | 8152 | fonts/xcharter/tfm/XCharter-Italic-tlf-t2a.tfm +2020/08/06 | 814 | graphics/asymptote/camperror.h +2020/08/06 | 8140 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-t2a.tfm +2020/08/06 | 8136 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2a.tfm +2020/08/06 | 8132 | fonts/xcharter/tfm/XCharter-Italic-tlf-t2asrb.tfm +2020/08/06 | 8132 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-t2asrb.tfm +2020/08/06 | 8128 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2asrb.tfm +2020/08/06 | 8124 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-t2a.tfm +2020/08/06 | 8116 | graphics/asymptote/doc/asy.1 +2020/08/06 | 8116 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-t2asrb.tfm +2020/08/06 | 8100 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-t2a.tfm +2020/08/06 | 8095 | graphics/asymptote/runhistory.cc +2020/08/06 | 8092 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-t2asrb.tfm +2020/08/06 | 806 | graphics/asymptote/GUI/res/icons/android-refresh.svg +2020/08/06 | 802 | graphics/asymptote/GUI/res/icons/android-camera.svg +2020/08/06 | 802 | graphics/asymptote/examples/vertexshading.asy +2020/08/06 | 802 | graphics/asymptote/examples/controlsystem.asy +2020/08/06 | 8008 | graphics/asymptote/runpath3d.in +2020/08/06 | 798 | graphics/asymptote/examples/animations/torusanimation.asy +2020/08/06 | 79691 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma +2020/08/06 | 79418 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma +2020/08/06 | 792 | graphics/asymptote/doc/secondaryaxis.asy +2020/08/06 | 7919 | graphics/asymptote/fundec.cc +2020/08/06 | 78 | graphics/asymptote/examples/randompath3.asy +2020/08/06 | 78100 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma +2020/08/06 | 780 | graphics/asymptote/GUI/res/icons/check.svg +2020/08/06 | 77 | graphics/asymptote/tests/gc/string.asy +2020/08/06 | 7790 | graphics/asymptote/coder.cc +2020/08/06 | 77529 | support/pkfix-helper/pkfix-helper.pdf +2020/08/06 | 77486 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma +2020/08/06 | 77366 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma +2020/08/06 | 77315 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma +2020/08/06 | 77144 | graphics/asymptote/doc/TeXShopAndAsymptote.pdf +2020/08/06 | 770 | graphics/asymptote/drawlayer.h +2020/08/06 | 770 | graphics/asymptote/asy.rc +2020/08/06 | 76 | graphics/asymptote/examples/grid.asy +2020/08/06 | 76801 | graphics/asymptote/gl-matrix-2.4.0-pruned/dist/gl-matrix.js +2020/08/06 | 76796 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma +2020/08/06 | 766 | graphics/asymptote/vm.h +2020/08/06 | 7668 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-ot1.tfm +2020/08/06 | 7664 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-ot1.tfm +2020/08/06 | 764 | graphics/asymptote/GUI/res/icons/android-radio-button-off.svg +2020/08/06 | 7639 | graphics/asymptote/LICENSE.LESSER +2020/08/06 | 7632 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-ot1.tfm +2020/08/06 | 762 | graphics/asymptote/examples/clockarray.asy +2020/08/06 | 759 | graphics/asymptote/GUI/res/icons/plus-round.svg +2020/08/06 | 7572 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-ot1.tfm +2020/08/06 | 7568 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-ot1.tfm +2020/08/06 | 75576 | graphics/asymptote/GUI/windows/window1.ui +2020/08/06 | 754 | graphics/asymptote/GUI/res/icons/circle.svg +2020/08/06 | 754 | graphics/asymptote/doc/graphmarkers.asy +2020/08/06 | 7548 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma +2020/08/06 | 7536 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-ot1.tfm +2020/08/06 | 752 | fonts/xcharter/vf/XCharter1-BoldSlanted-ts1.vf +2020/08/06 | 752 | fonts/xcharter/vf/XCharter1-BoldItalic-ts1.vf +2020/08/06 | 7488 | graphics/asymptote/base/plain.asy +2020/08/06 | 747 | graphics/asymptote/examples/pseudosphere.asy +2020/08/06 | 746 | graphics/asymptote/tests/array/sort.asy +2020/08/06 | 744 | fonts/xcharter/vf/XCharter1-Italic-ts1.vf +2020/08/06 | 743 | graphics/asymptote/examples/xxsq01.asy +2020/08/06 | 7435 | graphics/asymptote/name.cc +2020/08/06 | 7424 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-ot1.tfm +2020/08/06 | 7420 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-ot1.tfm +2020/08/06 | 740 | fonts/xcharter/vf/XCharter1-Slanted-ts1.vf +2020/08/06 | 740 | fonts/xcharter/vf/XCharter1-Bold-ts1.vf +2020/08/06 | 7407 | graphics/asymptote/base/graph_splinetype.asy +2020/08/06 | 739 | graphics/asymptote/examples/condor.asy +2020/08/06 | 7384 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-ot1.tfm +2020/08/06 | 737 | graphics/asymptote/tests/array/determinant.asy +2020/08/06 | 73690 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma +2020/08/06 | 734 | graphics/asymptote/examples/quilt.asy +2020/08/06 | 73450 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma +2020/08/06 | 73435 | graphics/asymptote/GL/glxew.h +2020/08/06 | 73211 | graphics/asymptote/runarray.cc +2020/08/06 | 7307 | graphics/asymptote/base/stats.asy +2020/08/06 | 7302 | graphics/asymptote/base/markers.asy +2020/08/06 | 72 | graphics/asymptote/tests/gc/pen.asy +2020/08/06 | 729 | graphics/asymptote/base/labelpath.asy +2020/08/06 | 72861 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma +2020/08/06 | 727 | graphics/asymptote/examples/fermi.asy +2020/08/06 | 72687 | graphics/asymptote/GUI/Window1.py +2020/08/06 | 72610 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma +2020/08/06 | 72387 | graphics/asymptote/base/three_surface.asy +2020/08/06 | 7230 | graphics/asymptote/runtime.pl +2020/08/06 | 72254 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma +2020/08/06 | 7212 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-ot1.tfm +2020/08/06 | 7208 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-ot1.tfm +2020/08/06 | 719666 | fonts/xcharter/doc/xcharter-doc.pdf +2020/08/06 | 71863 | support/pkfix-helper/pkfix-helper +2020/08/06 | 7176 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-ot1.tfm +2020/08/06 | 71551 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma +2020/08/06 | 714 | graphics/asymptote/mod.h +2020/08/06 | 714 | graphics/asymptote/examples/unitoctantx.asy +2020/08/06 | 7148 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-ot1.tfm +2020/08/06 | 7144 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-ot1.tfm +2020/08/06 | 713 | graphics/asymptote/GUI/res/icons/arrow-move.svg +2020/08/06 | 713 | graphics/asymptote/examples/gamma3.asy +2020/08/06 | 7129 | graphics/asymptote/GUI/pyUIClass/widg_addLabel.py +2020/08/06 | 71223 | graphics/asymptote/base/asy-mode.el +2020/08/06 | 711 | graphics/asymptote/examples/partialsurface.asy +2020/08/06 | 7112 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-ot1.tfm +2020/08/06 | 710 | graphics/asymptote/GUI/xasySvg.py +2020/08/06 | 710 | graphics/asymptote/examples/fjortoft.asy +2020/08/06 | 70 | graphics/asymptote/tests/gc/transform.asy +2020/08/06 | 70751 | graphics/asymptote/prc/oPRCFile.cc +2020/08/06 | 7072 | fonts/xcharter/tfm/XCharter1-Bold-tosf-ot1.tfm +2020/08/06 | 7044 | fonts/xcharter/tfm/XCharter1-Roman-tosf-ot1.tfm +2020/08/06 | 7020 | fonts/xcharter/tfm/XCharter-Roman-tosf-ot1.tfm +2020/08/06 | 70140 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma +2020/08/06 | 700 | graphics/asymptote/GUI/locale/th/LC_MESSAGES/base.po +2020/08/06 | 6996 | fonts/xcharter/tfm/XCharter-Bold-tosf-ot1.tfm +2020/08/06 | 69912 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma +2020/08/06 | 6984 | fonts/xcharter/tfm/XCharter-Roman-tlf-ot1.tfm +2020/08/06 | 695 | graphics/asymptote/GUI/res/icons/android-close.svg +2020/08/06 | 6956 | fonts/xcharter/tfm/XCharter-Bold-tlf-ot1.tfm +2020/08/06 | 6952 | fonts/xcharter/tfm/XCharter-Roman-tlf-ot1G.tfm +2020/08/06 | 6951 | graphics/asymptote/config.h.in +2020/08/06 | 693120 | systems/texlive/tlnet/archive/xepersian-hm.doc.r56053.tar.xz +2020/08/06 | 6928 | fonts/xcharter/tfm/XCharter-Bold-tlf-ot1G.tfm +2020/08/06 | 6924 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-ot1.tfm +2020/08/06 | 6924 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-ot1.tfm +2020/08/06 | 69182 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma +2020/08/06 | 6911 | graphics/asymptote/errortest.asy +2020/08/06 | 6896 | graphics/asymptote/GUI/windows/widg_addLabel.ui +2020/08/06 | 6896 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-ot1.tfm +2020/08/06 | 68968 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma +2020/08/06 | 688 | graphics/asymptote/examples/layers.asy +2020/08/06 | 688 | graphics/asymptote/examples/centroidfg.asy +2020/08/06 | 6852 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-ot1G.tfm +2020/08/06 | 683 | graphics/asymptote/examples/fractaltree.asy +2020/08/06 | 6832 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-ot1.tfm +2020/08/06 | 68266 | graphics/asymptote/base/graph3.asy +2020/08/06 | 68126 | graphics/asymptote/prc/PRCTools/describePRC.cc +2020/08/06 | 680 | graphics/asymptote/tests/array/delete.asy +2020/08/06 | 6808 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-ot1.tfm +2020/08/06 | 679 | graphics/asymptote/examples/genusthree.asy +2020/08/06 | 6789 | graphics/asymptote/drawlabel.cc +2020/08/06 | 677 | graphics/asymptote/doc/Bode.asy +2020/08/06 | 6776 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-ot1.tfm +2020/08/06 | 677578 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma +2020/08/06 | 6772 | fonts/xcharter/tfm/XCharter1-Italic-tosf-ot1.tfm +2020/08/06 | 6752 | fonts/xcharter/tfm/XCharter-Italic-tosf-ot1.tfm +2020/08/06 | 674 | graphics/asymptote/GUI/res/icons/android-delete.svg +2020/08/06 | 674 | graphics/asymptote/examples/sqrtx01.asy +2020/08/06 | 6740 | fonts/xcharter/enc/xcharter-ot2.enc +2020/08/06 | 673 | graphics/asymptote/GUI/res/icons/save.svg +2020/08/06 | 67276 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma +2020/08/06 | 6725 | graphics/asymptote/guide.h +2020/08/06 | 67256 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma +2020/08/06 | 6712 | fonts/xcharter/tfm/XCharter-Italic-tlf-ot1.tfm +2020/08/06 | 66 | graphics/asymptote/examples/shade.asy +2020/08/06 | 669 | graphics/asymptote/drawpath.h +2020/08/06 | 6692 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-ot1.tfm +2020/08/06 | 6680 | fonts/xcharter/tfm/XCharter-Italic-tlf-ot1G.tfm +2020/08/06 | 667 | graphics/asymptote/examples/spring.asy +2020/08/06 | 66751 | graphics/asymptote/prc/writePRC.cc +2020/08/06 | 6668 | fonts/xcharter/tfm/XCharter-Slanted-tosf-ot1.tfm +2020/08/06 | 6656 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-ot1.tfm +2020/08/06 | 6650 | graphics/asymptote/getopt.h +2020/08/06 | 6636 | systems/texlive/tlnet/archive/xepersian-hm.source.r56053.tar.xz +2020/08/06 | 6636 | fonts/xcharter/tfm/XCharter-Slanted-tlf-ot1.tfm +2020/08/06 | 6634 | graphics/asymptote/simpson.cc +2020/08/06 | 66014 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma +2020/08/06 | 65 | graphics/asymptote/tests/gc/guide.asy +2020/08/06 | 658 | graphics/asymptote/examples/NURBScurve.asy +2020/08/06 | 6585 | graphics/asymptote/xstream.h +2020/08/06 | 6584 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-ot1.tfm +2020/08/06 | 65819 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma +2020/08/06 | 657 | graphics/asymptote/examples/lowupint.asy +2020/08/06 | 657 | graphics/asymptote/examples/100d.views +2020/08/06 | 657 | graphics/asymptote/base/reload.js +2020/08/06 | 656 | fonts/xcharter/vf/XCharter-Italic-ts1.vf +2020/08/06 | 65546 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma +2020/08/06 | 6552 | graphics/asymptote/GUI/windows/labelTextEditor.ui +2020/08/06 | 6552 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-ot1.tfm +2020/08/06 | 654 | graphics/asymptote/fpu.h +2020/08/06 | 654 | graphics/asymptote/examples/limit.asy +2020/08/06 | 652 | fonts/xcharter/vf/XCharter-Bold-ts1.vf +2020/08/06 | 652 | fonts/xcharter/vf/XCharter-BoldItalic-ts1.vf +2020/08/06 | 6525 | graphics/asymptote/drawfill.h +2020/08/06 | 650 | graphics/asymptote/prcfile.h +2020/08/06 | 6503 | graphics/asymptote/tests/types/constructor.asy +2020/08/06 | 644 | fonts/xcharter/vf/XCharter-BoldSlanted-ts1.vf +2020/08/06 | 64329 | support/pkfix-helper/encoding-samples.tex +2020/08/06 | 64237 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma +2020/08/06 | 641 | graphics/asymptote/examples/pOrbital.asy +2020/08/06 | 640 | fonts/xcharter/vf/XCharter-Slanted-ts1.vf +2020/08/06 | 639 | graphics/asymptote/tests/arith/transform.asy +2020/08/06 | 639 | graphics/asymptote/GUI/res/icons/arrow-resize.svg +2020/08/06 | 6396 | graphics/asymptote/mathop.h +2020/08/06 | 638663 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma +2020/08/06 | 637 | graphics/asymptote/GUI/res/icons/android-arrow-forward.svg +2020/08/06 | 637 | graphics/asymptote/GUI/res/icons/android-arrow-back.svg +2020/08/06 | 6367 | macros/latex/contrib/mercatormap/mercatormap.doc.orthodromes.tex +2020/08/06 | 63572 | systems/texlive/tlnet/archive/frpseudocode.doc.r56051.tar.xz +2020/08/06 | 63553 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma +2020/08/06 | 63520 | graphics/asymptote/base/graph.asy +2020/08/06 | 63513 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma +2020/08/06 | 63427 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma +2020/08/06 | 633 | graphics/asymptote/GUI/res/icons/android-done.svg +2020/08/06 | 63359 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma +2020/08/06 | 63314 | graphics/asymptote/GL/wglew.h +2020/08/06 | 632 | graphics/asymptote/examples/label3zoom.asy +2020/08/06 | 6318 | graphics/asymptote/doc/leastsquares.dat +2020/08/06 | 63137 | graphics/asymptote/doc/FAQ/asy-faq.info +2020/08/06 | 630 | graphics/asymptote/base/shaders/vertex.glsl +2020/08/06 | 6300 | graphics/asymptote/asymptote.nsi +2020/08/06 | 62 | graphics/asymptote/tests/gc/array.asy +2020/08/06 | 62 | graphics/asymptote/revision.cc +2020/08/06 | 62977 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma +2020/08/06 | 6292 | graphics/asymptote/base/plain_filldraw.asy +2020/08/06 | 628 | graphics/asymptote/examples/wedge.asy +2020/08/06 | 628 | graphics/asymptote/examples/polarcircle.asy +2020/08/06 | 6285 | graphics/asymptote/base/plain_prethree.asy +2020/08/06 | 626 | graphics/asymptote/examples/venn.asy +2020/08/06 | 623926 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma +2020/08/06 | 620 | graphics/asymptote/tests/arith/integer.asy +2020/08/06 | 62026 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma +2020/08/06 | 61 | graphics/asymptote/examples/axialshade.asy +2020/08/06 | 617 | graphics/asymptote/doc/logo.asy +2020/08/06 | 6178 | graphics/asymptote/transform.h +2020/08/06 | 616 | graphics/asymptote/examples/Gouraudcontour.asy +2020/08/06 | 6169 | graphics/asymptote/base/plain_strings.asy +2020/08/06 | 6154 | graphics/asymptote/GUI/pyUIClass/labelTextEditor.py +2020/08/06 | 610 | graphics/asymptote/examples/impact.asy +2020/08/06 | 6104 | graphics/asymptote/doc/FAQ/m-lout.pl +2020/08/06 | 609 | graphics/asymptote/keywords.cc +2020/08/06 | 608 | graphics/asymptote/examples/spline.asy +2020/08/06 | 608 | graphics/asymptote/base/size10.asy +2020/08/06 | 604 | graphics/asymptote/doc/flow.asy +2020/08/06 | 60454 | graphics/asymptote/runtime.cc +2020/08/06 | 602 | graphics/asymptote/examples/treetest.asy +2020/08/06 | 6021 | graphics/asymptote/prc/PRCTools/bitData.cc +2020/08/06 | 60150 | graphics/asymptote/base/webgl/asygl.js +2020/08/06 | 600 | graphics/asymptote/base/size11.asy +2020/08/06 | 59 | graphics/asymptote/examples/stroke3.asy +2020/08/06 | 599 | graphics/asymptote/GUI/xasyStrings.py +2020/08/06 | 598 | graphics/asymptote/examples/integraltest.asy +2020/08/06 | 597783 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma +2020/08/06 | 59341 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma +2020/08/06 | 5925 | graphics/asymptote/runfile.in +2020/08/06 | 591 | graphics/asymptote/examples/sinc.asy +2020/08/06 | 59040 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma +2020/08/06 | 58 | graphics/asymptote/examples/progrid.asy +2020/08/06 | 589 | graphics/asymptote/GUI/res/icons/bucket.asy +2020/08/06 | 589 | graphics/asymptote/examples/trefoilknot.asy +2020/08/06 | 5883 | graphics/asymptote/Delaunay.cc +2020/08/06 | 5879 | graphics/asymptote/base/three_tube.asy +2020/08/06 | 58660 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma +2020/08/06 | 584 | systems/texlive/tlnet/archive/collection-langfrench.r56051.tar.xz +2020/08/06 | 583962 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma +2020/08/06 | 582 | graphics/asymptote/examples/cos3.asy +2020/08/06 | 581 | graphics/asymptote/examples/BezierSaddle.asy +2020/08/06 | 5811 | graphics/asymptote/drawpath3.h +2020/08/06 | 580 | graphics/asymptote/examples/xsin1x.asy +2020/08/06 | 57 | graphics/asymptote/GUI/requirements.txt +2020/08/06 | 579 | graphics/asymptote/examples/sqrtx01y1.asy +2020/08/06 | 579 | graphics/asymptote/examples/sin3.asy +2020/08/06 | 579 | graphics/asymptote/examples/exp3.asy +2020/08/06 | 5797 | graphics/asymptote/base/trembling.asy +2020/08/06 | 578 | graphics/asymptote/base/annotate.asy +2020/08/06 | 577 | graphics/asymptote/locate.h +2020/08/06 | 576 | graphics/asymptote/examples/threeviews.asy +2020/08/06 | 576 | graphics/asymptote/examples/circles.asy +2020/08/06 | 5760 | graphics/asymptote/base/plain_scaling.asy +2020/08/06 | 5733 | graphics/asymptote/item.h +2020/08/06 | 57312 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma +2020/08/06 | 572 | graphics/asymptote/examples/curvedlabel3.asy +2020/08/06 | 57159 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma +2020/08/06 | 57146 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma +2020/08/06 | 57126 | graphics/asymptote/runpicture.cc +2020/08/06 | 570 | graphics/asymptote/examples/fillcontour.asy +2020/08/06 | 5692 | systems/texlive/tlnet/archive/xepersian-hm.r56053.tar.xz +2020/08/06 | 5677 | macros/latex/contrib/mercatormap/mercatormap.doc.intro.tex +2020/08/06 | 56646 | graphics/asymptote/GUI/pyUIClass/window1.py +2020/08/06 | 5627 | graphics/asymptote/doc/FAQ/m-info.pl +2020/08/06 | 561889 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma +2020/08/06 | 56037 | graphics/asymptote/base/smoothcontour3.asy +2020/08/06 | 5595 | graphics/asymptote/bezierpatch.h +2020/08/06 | 558 | graphics/asymptote/examples/floatingdisk.asy +2020/08/06 | 557 | graphics/asymptote/examples/Pythagoras.asy +2020/08/06 | 5578 | graphics/asymptote/drawpath3.cc +2020/08/06 | 5578296 | systems/texlive/tlnet/archive/newtx.r56049.tar.xz +2020/08/06 | 55558 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma +2020/08/06 | 5543 | graphics/asymptote/examples/filesurface.dat +2020/08/06 | 5537 | graphics/asymptote/examples/cpkcolors.asy +2020/08/06 | 5505 | graphics/asymptote/interact.cc +2020/08/06 | 5500779 | systems/texlive/tlnet/install-tl-unx.tar.gz +2020/08/06 | 54 | graphics/asymptote/tests/gc/funcall.asy +2020/08/06 | 549966 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma +2020/08/06 | 548 | graphics/asymptote/examples/equilchord.asy +2020/08/06 | 547 | graphics/asymptote/examples/tetra.asy +2020/08/06 | 5443 | graphics/asymptote/main.cc +2020/08/06 | 544357 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma +2020/08/06 | 5441 | graphics/asymptote/env.cc +2020/08/06 | 537457 | systems/win32/miktex/tm/packages/next/files.csv.lzma +2020/08/06 | 537434 | systems/win32/miktex/tm/packages/files.csv.lzma +2020/08/06 | 52 | graphics/asymptote/doc/square.asy +2020/08/06 | 5279 | graphics/asymptote/base/bsp.asy +2020/08/06 | 5277 | graphics/asymptote/base/shaders/fragment.glsl +2020/08/06 | 5262 | graphics/asymptote/patches/bison.patch +2020/08/06 | 525 | graphics/asymptote/examples/vectorfield3.asy +2020/08/06 | 5250 | graphics/asymptote/pipestream.cc +2020/08/06 | 524 | graphics/asymptote/doc/brokenaxis.asy +2020/08/06 | 5238 | graphics/asymptote/base/animation.asy +2020/08/06 | 5236 | graphics/asymptote/name.h +2020/08/06 | 52201 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma +2020/08/06 | 521 | graphics/asymptote/doc/Hobbycontrol.asy +2020/08/06 | 5216 | graphics/asymptote/examples/mosaic.asy +2020/08/06 | 520 | graphics/asymptote/examples/smoothelevation.asy +2020/08/06 | 519 | graphics/asymptote/examples/extrudedcontour.asy +2020/08/06 | 51936 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma +2020/08/06 | 518 | graphics/asymptote/doc/CDlabel.asy +2020/08/06 | 51869 | graphics/asymptote/settings.cc +2020/08/06 | 5151 | graphics/asymptote/GUI/labelEditor.py +2020/08/06 | 51432 | graphics/asymptote/prc/oPRCFile.h +2020/08/06 | 51419 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma +2020/08/06 | 513 | graphics/asymptote/examples/buildcycle.asy +2020/08/06 | 51236 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma +2020/08/06 | 51136 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma +2020/08/06 | 5111 | graphics/asymptote/runsystem.in +2020/08/06 | 5104 | graphics/asymptote/pair.h +2020/08/06 | 50 | graphics/asymptote/base/babel.asy +2020/08/06 | 509 | graphics/asymptote/examples/dimension.asy +2020/08/06 | 50914 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma +2020/08/06 | 506 | graphics/asymptote/examples/delu.asy +2020/08/06 | 5063 | graphics/asymptote/runhistory.in +2020/08/06 | 50600 | graphics/asymptote/GUI/xasy2asy.py +2020/08/06 | 5052 | graphics/asymptote/errormsg.h +2020/08/06 | 5048 | graphics/asymptote/GUI/xasyOptions.py +2020/08/06 | 50437 | graphics/asymptote/gsl.cc +2020/08/06 | 503 | graphics/asymptote/GUI/xasy.py +2020/08/06 | 503 | graphics/asymptote/examples/animations/embeddedmovie.asy +2020/08/06 | 503734 | graphics/asymptote/libatomic_ops-7.6.10.tar.gz +2020/08/06 | 500 | graphics/asymptote/examples/floor.asy +2020/08/06 | 500 | graphics/asymptote/doc/Hobbydir.asy +2020/08/06 | 500565 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma +2020/08/06 | 5003 | graphics/asymptote/base/rational.asy +2020/08/06 | 49 | graphics/asymptote/doc/quartercircle.asy +2020/08/06 | 49 | graphics/asymptote/doc/dots.asy +2020/08/06 | 49 | graphics/asymptote/doc/colons.asy +2020/08/06 | 499 | graphics/asymptote/examples/galleon.asy +2020/08/06 | 4991 | graphics/asymptote/base/tube.asy +2020/08/06 | 498 | graphics/asymptote/examples/fano.asy +2020/08/06 | 498 | graphics/asymptote/doc/penfunctionimage.asy +2020/08/06 | 4972 | graphics/asymptote/memory.h +2020/08/06 | 496 | graphics/asymptote/examples/bars3.asy +2020/08/06 | 495 | graphics/asymptote/examples/cones.asy +2020/08/06 | 49589 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma +2020/08/06 | 494 | graphics/asymptote/drawgrestore.h +2020/08/06 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2020/08/06 | 489 | graphics/asymptote/patches/gc-7.0nomem.patch +2020/08/06 | 48847 | graphics/asymptote/doc/secondaryaxis.csv +2020/08/06 | 485 | graphics/asymptote/examples/cards.asy +2020/08/06 | 4849 | graphics/asymptote/GUI/pyUIClass/widg_editBezier.py +2020/08/06 | 48481 | graphics/asymptote/prc/writePRC.h +2020/08/06 | 48441 | graphics/asymptote/config.guess +2020/08/06 | 4842 | macros/latex/contrib/mercatormap/mercatormap.doc.routes.tex +2020/08/06 | 4841 | graphics/asymptote/tests/array/slice.asy +2020/08/06 | 48374 | graphics/asymptote/runarray.in +2020/08/06 | 4812 | graphics/asymptote/base/x11colors.asy +2020/08/06 | 480 | graphics/asymptote/doc/logimage.asy +2020/08/06 | 4808 | graphics/asymptote/examples/interpolate1.asy +2020/08/06 | 48085 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma +2020/08/06 | 4800 | graphics/asymptote/fileio.cc +2020/08/06 | 479 | graphics/asymptote/examples/magnetic.asy +2020/08/06 | 4740981 | install/fonts/xcharter.tds.zip +2020/08/06 | 4735 | graphics/asymptote/array.cc +2020/08/06 | 472 | graphics/asymptote/examples/colorplanes.asy +2020/08/06 | 472 | graphics/asymptote/absyn.cc +2020/08/06 | 4727 | graphics/asymptote/doc/westnile.csv +2020/08/06 | 4718 | graphics/asymptote/doc/FAQ/m-ascii.pl +2020/08/06 | 4716 | graphics/asymptote/prc/PRCTools/makePRC.cc +2020/08/06 | 4691 | graphics/asymptote/parser.cc +2020/08/06 | 46727 | graphics/asymptote/base/plain_picture.asy +2020/08/06 | 4668 | graphics/asymptote/GUI/pyUIClass/widgetPointEditor.py +2020/08/06 | 4662243 | fonts/xcharter.zip +2020/08/06 | 465530 | graphics/asymptote/doc/png/asymptote.info +2020/08/06 | 464 | graphics/asymptote/drawgsave.h +2020/08/06 | 464 | graphics/asymptote/doc/GaussianSurface.asy +2020/08/06 | 46355 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma +2020/08/06 | 462706 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma +2020/08/06 | 4612 | graphics/asymptote/castop.h +2020/08/06 | 460 | graphics/asymptote/examples/lever.asy +2020/08/06 | 460 | graphics/asymptote/examples/cosaddition.asy +2020/08/06 | 460430 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma +2020/08/06 | 4602 | graphics/asymptote/util.h +2020/08/06 | 459 | graphics/asymptote/examples/hierarchy.asy +2020/08/06 | 4597 | graphics/asymptote/drawfill.cc +2020/08/06 | 458 | graphics/asymptote/doc/multicontour.asy +2020/08/06 | 45841 | graphics/asymptote/glrender.cc +2020/08/06 | 4578 | graphics/asymptote/doc/FAQ/m-post.pl +2020/08/06 | 45773 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma +2020/08/06 | 4570 | graphics/asymptote/env.h +2020/08/06 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2020/08/06 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2020/08/06 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2020/08/06 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2020/08/06 | 45318 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma +2020/08/06 | 4520 | graphics/asymptote/getopt1.c +2020/08/06 | 45031 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma +2020/08/06 | 449 | graphics/asymptote/tests/arith/pair.asy +2020/08/06 | 4474 | graphics/asymptote/GUI/windows/widg_editBezier.ui +2020/08/06 | 4473 | graphics/asymptote/bbox.h +2020/08/06 | 445 | graphics/asymptote/examples/sacone.asy +2020/08/06 | 44472 | graphics/asymptote/fftw++.h +2020/08/06 | 442 | graphics/asymptote/doc/join3.asy +2020/08/06 | 441 | graphics/asymptote/examples/triangles.asy +2020/08/06 | 441 | graphics/asymptote/doc/histogram.asy +2020/08/06 | 43 | graphics/asymptote/examples/spring2.asy +2020/08/06 | 439 | graphics/asymptote/examples/gamma.asy +2020/08/06 | 4392 | graphics/asymptote/stm.h +2020/08/06 | 436 | graphics/asymptote/examples/colorpatch.asy +2020/08/06 | 4348 | graphics/asymptote/doc/colo-asy.tex +2020/08/06 | 4341 | graphics/asymptote/fundec.h +2020/08/06 | 4335 | graphics/asymptote/prc/PRCTools/describePRC.h +2020/08/06 | 43335 | graphics/asymptote/examples/100d.pdb1 +2020/08/06 | 43311 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma +2020/08/06 | 430 | graphics/asymptote/examples/unitoctant.asy +2020/08/06 | 43074 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma +2020/08/06 | 42 | graphics/asymptote/base/animate.asy +2020/08/06 | 4286 | graphics/asymptote/asy.ico +2020/08/06 | 427 | graphics/asymptote/examples/projectrevolution.asy +2020/08/06 | 426 | graphics/asymptote/examples/pathintersectsurface.asy +2020/08/06 | 426 | graphics/asymptote/doc/grid3xyz.asy +2020/08/06 | 4265 | graphics/asymptote/newexp.cc +2020/08/06 | 426285 | support/pkfix-helper.zip +2020/08/06 | 42622 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma +2020/08/06 | 424 | graphics/asymptote/examples/spiral3.asy +2020/08/06 | 4244 | graphics/asymptote/examples/fin.asy +2020/08/06 | 4242 | graphics/asymptote/tests/types/keyword.asy +2020/08/06 | 423 | graphics/asymptote/doc/log2graph.asy +2020/08/06 | 423 | graphics/asymptote/doc/helix.asy +2020/08/06 | 42157 | macros/latex/contrib/hausarbeit-jura/hausarbeit-jura.dtx +2020/08/06 | 420 | graphics/asymptote/examples/PythagoreanTree.asy +2020/08/06 | 4209 | graphics/asymptote/flatguide.h +2020/08/06 | 42062 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma +2020/08/06 | 41 | graphics/asymptote/doc/bigdiagonal.asy +2020/08/06 | 419 | graphics/asymptote/examples/torus.asy +2020/08/06 | 418 | graphics/asymptote/examples/planeproject.asy +2020/08/06 | 417 | graphics/asymptote/doc/knots.asy +2020/08/06 | 416 | graphics/asymptote/doc/bezier2.asy +2020/08/06 | 4166 | graphics/asymptote/GUI/windows/widgetPointEditor.ui +2020/08/06 | 415 | graphics/asymptote/doc/linetype.asy +2020/08/06 | 4158 | graphics/asymptote/examples/advection.asy +2020/08/06 | 4156 | graphics/asymptote/runpair.in +2020/08/06 | 414 | graphics/asymptote/examples/animations/glmovie.asy +2020/08/06 | 4128 | graphics/asymptote/base/plain_boxes.asy +2020/08/06 | 411 | graphics/asymptote/examples/animations/externalmovie.asy +2020/08/06 | 410 | graphics/asymptote/examples/Sierpinski.asy +2020/08/06 | 41079 | macros/latex/contrib/mercatormap/mercatormap.doc.maptiles.tex +2020/08/06 | 4089 | graphics/asymptote/camp.tab.h +2020/08/06 | 40820 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma +2020/08/06 | 407 | graphics/asymptote/examples/parametricsurface.asy +2020/08/06 | 407 | graphics/asymptote/examples/BezierPatch.asy +2020/08/06 | 4078 | graphics/asymptote/base/plain_shipout.asy +2020/08/06 | 40761 | graphics/asymptote/doc/FAQ/asy-faq.bfnn +2020/08/06 | 4072 | graphics/asymptote/tests/types/order.asy +2020/08/06 | 4067 | graphics/asymptote/doc/diatom.csv +2020/08/06 | 40665 | graphics/asymptote/examples/tvgen.asy +2020/08/06 | 4060 | fonts/xcharter/enc/xch1_gb4haz.enc +2020/08/06 | 40578 | graphics/asymptote/picture.cc +2020/08/06 | 4055 | fonts/xcharter/enc/xch1_l6an6k.enc +2020/08/06 | 403056 | systems/texlive/tlnet/archive/notomath.doc.r56050.tar.xz +2020/08/06 | 401 | graphics/asymptote/doc/image.asy +2020/08/06 | 4016 | fonts/xcharter/enc/xch1_e3nxtd.enc +2020/08/06 | 4011 | fonts/xcharter/enc/xch1_bcg6lk.enc +2020/08/06 | 400 | graphics/asymptote/examples/sacylinder.asy +2020/08/06 | 39 | graphics/asymptote/base/nopapersize.ps +2020/08/06 | 398 | graphics/asymptote/examples/epix.asy +2020/08/06 | 3989 | fonts/xcharter/enc/xch1_tis6bf.enc +2020/08/06 | 397 | graphics/asymptote/doc/legend.asy +2020/08/06 | 39719 | fonts/xcharter/map/XCharter.map +2020/08/06 | 396 | graphics/asymptote/doc/triangulate.asy +2020/08/06 | 395 | graphics/asymptote/GUI/configs/xasykeymap.cson +2020/08/06 | 394 | graphics/asymptote/GUI/setup.py +2020/08/06 | 3944 | fonts/xcharter/enc/xch_sbuybh.enc +2020/08/06 | 3935 | graphics/asymptote/base/interpolate.asy +2020/08/06 | 39332 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma +2020/08/06 | 3932 | fonts/xcharter/enc/xch1_wi6ykn.enc +2020/08/06 | 39269 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma +2020/08/06 | 3923 | macros/latex/contrib/mercatormap/mercatormap.doc.sty +2020/08/06 | 392365 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma +2020/08/06 | 3919 | fonts/xcharter/enc/xch1_yz7cd7.enc +2020/08/06 | 3918 | fonts/xcharter/enc/xch1_qdfne6.enc +2020/08/06 | 3912 | graphics/asymptote/tr.h +2020/08/06 | 3910 | fonts/xcharter/enc/xch1_erwtw3.enc +2020/08/06 | 390 | graphics/asymptote/doc/tile.asy +2020/08/06 | 3907 | fonts/xcharter/enc/xch1_evj3rb.enc +2020/08/06 | 3903 | fonts/xcharter/enc/xch_kivgfk.enc +2020/08/06 | 38 | graphics/asymptote/examples/spring0.asy +2020/08/06 | 3895 | fonts/xcharter/doc/altone.py +2020/08/06 | 3889 | fonts/xcharter/enc/xch1_3nubio.enc +2020/08/06 | 3888 | fonts/xcharter/enc/xch1_vv7waw.enc +2020/08/06 | 388435 | graphics/asymptote/doc/asymptote.texi +2020/08/06 | 3883 | fonts/xcharter/enc/xch1_l4c4ke.enc +2020/08/06 | 3873 | fonts/xcharter/enc/xch1_ph46id.enc +2020/08/06 | 3867 | fonts/xcharter/enc/xch1_xqcxen.enc +2020/08/06 | 3859 | fonts/xcharter/enc/xch1_pqp4df.enc +2020/08/06 | 3857 | graphics/asymptote/examples/pipes.asy +2020/08/06 | 384 | graphics/asymptote/examples/RiemannSurfaceRoot.asy +2020/08/06 | 384 | graphics/asymptote/Delaunay.h +2020/08/06 | 383 | graphics/asymptote/tests/arith/real.asy +2020/08/06 | 383 | graphics/asymptote/examples/Gouraud.asy +2020/08/06 | 3839 | fonts/xcharter/enc/xch_ukw3hq.enc +2020/08/06 | 382 | graphics/asymptote/doc/loggrid.asy +2020/08/06 | 3810 | fonts/xcharter/enc/xch_6zxmh3.enc +2020/08/06 | 3797 | fonts/xcharter/tex/T2ASRBXCharter-TOsF.fd +2020/08/06 | 37917 | graphics/asymptote/path3.cc +2020/08/06 | 378 | graphics/asymptote/examples/sinxlex.asy +2020/08/06 | 378 | graphics/asymptote/doc/icon.asy +2020/08/06 | 3779 | fonts/xcharter/enc/xch1_6l4ixg.enc +2020/08/06 | 3777 | fonts/xcharter/enc/xch1_xmfb6b.enc +2020/08/06 | 3775 | macros/latex/contrib/mercatormap/mercatormap.doc.abstract.tex +2020/08/06 | 376 | graphics/asymptote/examples/sphericalharmonic.asy +2020/08/06 | 376 | graphics/asymptote/doc/generalaxis3.asy +2020/08/06 | 3766 | fonts/xcharter/enc/xch1_62ztbr.enc +2020/08/06 | 3765 | graphics/asymptote/prc/PRCdouble.h +2020/08/06 | 374 | graphics/asymptote/doc/monthaxis.asy +2020/08/06 | 3740 | fonts/xcharter/enc/xch1_oj27u4.enc +2020/08/06 | 373 | graphics/asymptote/examples/projectelevation.asy +2020/08/06 | 373 | graphics/asymptote/doc/lineargraph.asy +2020/08/06 | 3739 | graphics/asymptote/examples/xstitch.asy +2020/08/06 | 3736 | fonts/xcharter/enc/xch1_bpv7ty.enc +2020/08/06 | 3734 | fonts/xcharter/tex/T2ASRBXCharter-TLF.fd +2020/08/06 | 3724 | graphics/asymptote/base/three_light.asy +2020/08/06 | 3716 | graphics/asymptote/base/plain_constants.asy +2020/08/06 | 3704 | fonts/xcharter/enc/xch_gb4haz.enc +2020/08/06 | 369 | graphics/asymptote/tests/gs/ghostscript.asy +2020/08/06 | 3699 | fonts/xcharter/enc/xch_l6an6k.enc +2020/08/06 | 36921 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma +2020/08/06 | 36860 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma +2020/08/06 | 366 | graphics/asymptote/doc/lineargraph0.asy +2020/08/06 | 3668 | graphics/asymptote/constructor.cc +2020/08/06 | 3665 | fonts/xcharter/enc/xch1_5xfeuz.enc +2020/08/06 | 3660 | fonts/xcharter/enc/xch_e3nxtd.enc +2020/08/06 | 3655 | fonts/xcharter/enc/xch_bcg6lk.enc +2020/08/06 | 364537 | support/pkfix-helper/encoding-samples.pdf +2020/08/06 | 3640 | graphics/asymptote/bbox3.h +2020/08/06 | 3639 | fonts/xcharter/enc/xch1_dbdfpx.enc +2020/08/06 | 36361 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma +2020/08/06 | 3634 | fonts/xcharter/enc/xch1_gvbfhh.enc +2020/08/06 | 3633 | fonts/xcharter/enc/xch_tis6bf.enc +2020/08/06 | 3632 | fonts/xcharter/enc/xch1_jg3oo5.enc +2020/08/06 | 362 | graphics/asymptote/examples/pipeintersection.asy +2020/08/06 | 36243 | graphics/asymptote/prc/test.cc +2020/08/06 | 3622 | fonts/xcharter/enc/xch1_wqeam3.enc +2020/08/06 | 3620 | fonts/xcharter/enc/xch1_64qgug.enc +2020/08/06 | 361 | graphics/asymptote/GUI/res/icons/anchor.svg +2020/08/06 | 361 | graphics/asymptote/examples/phase.asy +2020/08/06 | 3616 | graphics/asymptote/GUI/UndoRedoStack.py +2020/08/06 | 3613 | fonts/xcharter/enc/xch_imj3v4.enc +2020/08/06 | 3613 | fonts/xcharter/enc/xch_5klbw4.enc +2020/08/06 | 360 | graphics/asymptote/examples/washer.asy +2020/08/06 | 3608 | fonts/xcharter/enc/xch_ykltyo.enc +2020/08/06 | 360764 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma +2020/08/06 | 3600 | fonts/xcharter/enc/xch1_wwsmtw.enc +2020/08/06 | 35 | graphics/asymptote/base/fontsize.asy +2020/08/06 | 358 | graphics/asymptote/base/pstoedit.asy +2020/08/06 | 357 | graphics/asymptote/doc/irregularcontour.asy +2020/08/06 | 3576 | fonts/xcharter/enc/xch_wi6ykn.enc +2020/08/06 | 3569 | fonts/xcharter/enc/xch_ouuvex.enc +2020/08/06 | 3564 | fonts/xcharter/enc/xch_4siibn.enc +2020/08/06 | 3563 | fonts/xcharter/enc/xch_yz7cd7.enc +2020/08/06 | 3562 | fonts/xcharter/enc/xch_qdfne6.enc +2020/08/06 | 355 | graphics/asymptote/doc/scaledgraph.asy +2020/08/06 | 3556 | fonts/xcharter/tfm/XCharter-Slanted-tlf-ot2.tfm +2020/08/06 | 3554 | fonts/xcharter/enc/xch_erwtw3.enc +2020/08/06 | 355211 | macros/latex/contrib/hausarbeit-jura.zip +2020/08/06 | 3551 | fonts/xcharter/enc/xch_evj3rb.enc +2020/08/06 | 354 | graphics/asymptote/doc/reloadpdf.tex +2020/08/06 | 354 | graphics/asymptote/doc/planes.asy +2020/08/06 | 3533 | fonts/xcharter/enc/xch_3nubio.enc +2020/08/06 | 3532 | fonts/xcharter/enc/xch_vv7waw.enc +2020/08/06 | 352 | graphics/asymptote/examples/cylinder.asy +2020/08/06 | 3527 | fonts/xcharter/enc/xch_l4c4ke.enc +2020/08/06 | 35215 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma +2020/08/06 | 351 | graphics/asymptote/examples/vectorfieldsphere.asy +2020/08/06 | 3517 | fonts/xcharter/enc/xch_ph46id.enc +2020/08/06 | 35147 | graphics/asymptote/LICENSE +2020/08/06 | 3511 | fonts/xcharter/enc/xch_xqcxen.enc +2020/08/06 | 3507 | graphics/asymptote/build-scripts/build-asymptote.dos +2020/08/06 | 3507 | fonts/xcharter/enc/xch1_7p4e2o.enc +2020/08/06 | 3503 | graphics/asymptote/GUI/CustMatTransform.py +2020/08/06 | 3503 | fonts/xcharter/enc/xch_pqp4df.enc +2020/08/06 | 35033 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma +2020/08/06 | 34 | graphics/asymptote/autogen.sh +2020/08/06 | 349 | graphics/asymptote/examples/logdown.asy +2020/08/06 | 3497 | graphics/asymptote/doc/ocg.sty +2020/08/06 | 348 | graphics/asymptote/examples/RiemannSurface.asy +2020/08/06 | 3485 | fonts/xcharter/enc/xch_ct4qni.enc +2020/08/06 | 3480 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-ot2.tfm +2020/08/06 | 34774 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma +2020/08/06 | 3472 | fonts/xcharter/enc/xch_dcwqct.enc +2020/08/06 | 3472 | fonts/xcharter/enc/xch1_ivnpe7.enc +2020/08/06 | 3471 | fonts/xcharter/enc/xch_lotb2t.enc +2020/08/06 | 3470 | fonts/xcharter/enc/xch1_q2nwaj.enc +2020/08/06 | 3465 | graphics/asymptote/drawpath.cc +2020/08/06 | 3463 | fonts/xcharter/enc/xch_opza6q.enc +2020/08/06 | 3460 | fonts/xcharter/enc/xch_ch4v2b.enc +2020/08/06 | 345 | graphics/asymptote/examples/rainbow.asy +2020/08/06 | 3442 | fonts/xcharter/enc/xch_wiwj7n.enc +2020/08/06 | 3441 | graphics/asymptote/rounding.h +2020/08/06 | 3441 | fonts/xcharter/enc/xch_3reguq.enc +2020/08/06 | 343 | graphics/asymptote/doc/externalprc.tex +2020/08/06 | 3436 | fonts/xcharter/enc/xch_nxyw3t.enc +2020/08/06 | 3431 | graphics/asymptote/picture.h +2020/08/06 | 3430 | graphics/asymptote/base/roundedpath.asy +2020/08/06 | 342 | graphics/asymptote/lexical.h +2020/08/06 | 3428 | fonts/xcharter/tfm/XCharter-Roman-tlf-ot2.tfm +2020/08/06 | 3423 | fonts/xcharter/enc/xch_6l4ixg.enc +2020/08/06 | 3421 | fonts/xcharter/enc/xch_xmfb6b.enc +2020/08/06 | 341 | graphics/asymptote/examples/slidedemo_.bbl +2020/08/06 | 341 | graphics/asymptote/examples/sacylinder3D.asy +2020/08/06 | 341 | graphics/asymptote/doc/subpictures.asy +2020/08/06 | 3410 | fonts/xcharter/enc/xch_62ztbr.enc +2020/08/06 | 340891 | macros/latex/contrib/hausarbeit-jura/hausarbeit-jura.pdf +2020/08/06 | 3384 | fonts/xcharter/enc/xch_oj27u4.enc +2020/08/06 | 33828 | graphics/asymptote/exp.cc +2020/08/06 | 33813 | graphics/asymptote/path.cc +2020/08/06 | 3380 | fonts/xcharter/enc/xch_bpv7ty.enc +2020/08/06 | 3375 | graphics/asymptote/tests/types/guide.asy +2020/08/06 | 3348 | fonts/xcharter/tfm/XCharter-Bold-tlf-ot2.tfm +2020/08/06 | 3340 | graphics/asymptote/examples/slidedemo.asy +2020/08/06 | 333 | graphics/asymptote/doc/asy.1.end +2020/08/06 | 3335 | graphics/asymptote/examples/pdb.asy +2020/08/06 | 3332 | fonts/xcharter/enc/xch_2jytnu.enc +2020/08/06 | 3330 | fonts/xcharter/enc/xch_kkifs2.enc +2020/08/06 | 3319 | fonts/xcharter/enc/xch_h2xo5a.enc +2020/08/06 | 3309 | fonts/xcharter/enc/xch_5xfeuz.enc +2020/08/06 | 33090 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma +2020/08/06 | 3297 | graphics/asymptote/access.cc +2020/08/06 | 329617 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma +2020/08/06 | 3295 | graphics/asymptote/stack.h +2020/08/06 | 3291 | fonts/xcharter/enc/xch_3j6jnh.enc +2020/08/06 | 3289 | fonts/xcharter/enc/xch_yrgi2d.enc +2020/08/06 | 3283 | fonts/xcharter/enc/xch_dbdfpx.enc +2020/08/06 | 327 | graphics/asymptote/examples/sin1x.asy +2020/08/06 | 3278 | graphics/asymptote/base/obj.asy +2020/08/06 | 3278 | fonts/xcharter/enc/xch_gvbfhh.enc +2020/08/06 | 3276 | fonts/xcharter/enc/xch_jg3oo5.enc +2020/08/06 | 3276 | fonts/xcharter/enc/xch_dwd75d.enc +2020/08/06 | 327551 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma +2020/08/06 | 326 | graphics/asymptote/examples/polardatagraph.asy +2020/08/06 | 326 | graphics/asymptote/examples/animations/pdfmovie.asy +2020/08/06 | 3266 | fonts/xcharter/enc/xch_wqeam3.enc +2020/08/06 | 3265 | graphics/asymptote/program.cc +2020/08/06 | 3265 | fonts/xcharter/enc/xch_bk4eiy.enc +2020/08/06 | 3264 | fonts/xcharter/enc/xch_64qgug.enc +2020/08/06 | 325 | graphics/asymptote/examples/elevation.asy +2020/08/06 | 324 | graphics/asymptote/doc/HermiteSpline.asy +2020/08/06 | 3249 | graphics/asymptote/GUI/Widg_addLabel.py +2020/08/06 | 3244 | fonts/xcharter/enc/xch_wwsmtw.enc +2020/08/06 | 32392 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma +2020/08/06 | 3237 | fonts/xcharter/enc/xch_hk5uz5.enc +2020/08/06 | 32349 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma +2020/08/06 | 322 | graphics/asymptote/examples/unitcircle.asy +2020/08/06 | 322 | graphics/asymptote/examples/cheese.asy +2020/08/06 | 3225 | fonts/xcharter/enc/xch_v6llfb.enc +2020/08/06 | 3220 | fonts/xcharter/tfm/XCharter-Italic-tlf-ot2.tfm +2020/08/06 | 3218 | fonts/xcharter/enc/xch_uv5z4v.enc +2020/08/06 | 320 | graphics/asymptote/runtriple.h +2020/08/06 | 32094 | graphics/asymptote/bezierpatch.cc +2020/08/06 | 320398 | graphics/asymptote/base/geometry.asy +2020/08/06 | 3199 | fonts/xcharter/enc/xch_62z5ot.enc +2020/08/06 | 3192 | fonts/xcharter/enc/xch_uoo6px.enc +2020/08/06 | 318 | graphics/asymptote/patches/gcc3.3.2curses.patch +2020/08/06 | 3187 | fonts/xcharter/enc/xch_2acc4n.enc +2020/08/06 | 3185 | fonts/xcharter/enc/xch_o6avng.enc +2020/08/06 | 3178 | fonts/xcharter/enc/xch_ay4e7o.enc +2020/08/06 | 3175 | fonts/xcharter/enc/xch_ckugtc.enc +2020/08/06 | 3173 | fonts/xcharter/enc/xch_wizqmm.enc +2020/08/06 | 31609 | graphics/asymptote/config.sub +2020/08/06 | 315 | graphics/asymptote/examples/strokepath.asy +2020/08/06 | 315 | graphics/asymptote/examples/hyperboloid.asy +2020/08/06 | 3158 | fonts/xcharter/enc/xch_3oyzty.enc +2020/08/06 | 3153 | graphics/asymptote/genv.cc +2020/08/06 | 3153 | fonts/xcharter/enc/xch_uy5hgr.enc +2020/08/06 | 3151 | fonts/xcharter/enc/xch_7p4e2o.enc +2020/08/06 | 314 | graphics/asymptote/doc/logticks.asy +2020/08/06 | 314 | graphics/asymptote/base/graph_settings.asy +2020/08/06 | 3143 | fonts/xcharter/enc/xch_7cmdv6.enc +2020/08/06 | 31342 | graphics/asymptote/builtin.cc +2020/08/06 | 312 | graphics/asymptote/examples/textpath.asy +2020/08/06 | 31254 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma +2020/08/06 | 31223 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma +2020/08/06 | 31207 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma +2020/08/06 | 3116 | fonts/xcharter/enc/xch_ivnpe7.enc +2020/08/06 | 3114 | fonts/xcharter/enc/xch_q2nwaj.enc +2020/08/06 | 3109 | fonts/xcharter/enc/xch_26pbhy.enc +2020/08/06 | 310935 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma +2020/08/06 | 3106 | graphics/asymptote/doc/latexusage.tex +2020/08/06 | 3106 | fonts/xcharter/enc/xch_57lqj7.enc +2020/08/06 | 3101 | fonts/xcharter/enc/xch_h4dyum.enc +2020/08/06 | 30909 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma +2020/08/06 | 308 | graphics/asymptote/tests/types/shadow.asy +2020/08/06 | 308 | graphics/asymptote/tests/Makefile +2020/08/06 | 308 | graphics/asymptote/examples/oneoverx.asy +2020/08/06 | 308 | graphics/asymptote/examples/1overx.asy +2020/08/06 | 3089 | fonts/xcharter/enc/xch_ybxeq6.enc +2020/08/06 | 30890 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma +2020/08/06 | 3081 | fonts/xcharter/enc/xch_ao7ayk.enc +2020/08/06 | 306 | graphics/asymptote/doc/binarytreetest.asy +2020/08/06 | 3064 | fonts/xcharter/enc/xch_x25wg5.enc +2020/08/06 | 3060 | fonts/xcharter/enc/xch_hnm3ex.enc +2020/08/06 | 305083 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma +2020/08/06 | 3049 | macros/latex/contrib/mercatormap/mercatormap-example.tex +2020/08/06 | 3044 | fonts/xcharter/enc/xch_hrleas.enc +2020/08/06 | 303 | graphics/asymptote/examples/tensor.asy +2020/08/06 | 3028 | fonts/xcharter/enc/xch_vtvjjk.enc +2020/08/06 | 3025 | fonts/xcharter/enc/xch_abgjzu.enc +2020/08/06 | 3024 | graphics/asymptote/drawimage.h +2020/08/06 | 3023 | graphics/asymptote/doc/Makefile.in +2020/08/06 | 3023 | fonts/xcharter/enc/xch_bxmb3o.enc +2020/08/06 | 30208 | graphics/asymptote/prc/PRC.h +2020/08/06 | 30147 | graphics/asymptote/getopt.c +2020/08/06 | 3011 | fonts/xcharter/enc/xch_l7jokp.enc +2020/08/06 | 3001 | graphics/asymptote/asymptote.spec +2020/08/06 | 299 | graphics/asymptote/runpair.h +2020/08/06 | 2991 | fonts/xcharter/enc/xch_og2pus.enc +2020/08/06 | 2983 | macros/latex/contrib/mercatormap/mercatormap.tex +2020/08/06 | 2982 | graphics/asymptote/process.h +2020/08/06 | 297 | graphics/asymptote/build-scripts/README-binaries +2020/08/06 | 297 | graphics/asymptote/binaries/x86_64-windows/texlive/README +2020/08/06 | 297 | graphics/asymptote/binaries/i386-windows/texlive/README +2020/08/06 | 2979 | graphics/asymptote/doc/diatom.asy +2020/08/06 | 2974 | fonts/xcharter/enc/xch_s3y5jv.enc +2020/08/06 | 2964 | graphics/asymptote/access.h +2020/08/06 | 29637 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma +2020/08/06 | 294 | graphics/asymptote/guideflags.h +2020/08/06 | 293 | graphics/asymptote/doc/makepen.asy +2020/08/06 | 29398 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma +2020/08/06 | 291 | graphics/asymptote/examples/trumpet.asy +2020/08/06 | 29058 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma +2020/08/06 | 29026 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma +2020/08/06 | 289 | graphics/asymptote/examples/jump.asy +2020/08/06 | 289 | graphics/asymptote/base/res/notes.txt +2020/08/06 | 2894 | graphics/asymptote/shaders.cc +2020/08/06 | 288 | graphics/asymptote/examples/sacone3D.asy +2020/08/06 | 288 | graphics/asymptote/doc/mexicanhat.asy +2020/08/06 | 2880 | graphics/asymptote/drawgroup.h +2020/08/06 | 2880 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-ot2.tfm +2020/08/06 | 28783 | graphics/asymptote/exp.h +2020/08/06 | 287360 | graphics/asymptote/configure +2020/08/06 | 28602 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma +2020/08/06 | 284 | graphics/asymptote/GUI/res/icons/text.svg +2020/08/06 | 2832 | graphics/asymptote/examples/alignedaxis.asy +2020/08/06 | 2825 | graphics/asymptote/GUI/pyUIClass/setCustomAnchor.py +2020/08/06 | 281781 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma +2020/08/06 | 2800 | graphics/asymptote/doc/asycolors.sty +2020/08/06 | 279 | graphics/asymptote/doc/hatch.asy +2020/08/06 | 279881 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma +2020/08/06 | 27800 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma +2020/08/06 | 277 | graphics/asymptote/doc/generalaxis.asy +2020/08/06 | 27767 | graphics/asymptote/pen.h +2020/08/06 | 2771 | graphics/asymptote/doc/pixel.pdf +2020/08/06 | 276 | graphics/asymptote/tests/bench/6000circles.asy +2020/08/06 | 2766 | graphics/asymptote/lnkX64IconFix.nsh +2020/08/06 | 2764 | graphics/asymptote/base/three_margins.asy +2020/08/06 | 27452 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-ly1.tfm +2020/08/06 | 27436 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-ly1.tfm +2020/08/06 | 27400 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-ly1.tfm +2020/08/06 | 273697 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma +2020/08/06 | 2732 | graphics/asymptote/record.h +2020/08/06 | 2731 | graphics/asymptote/tests/types/resolve.asy +2020/08/06 | 27252 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-ly1.tfm +2020/08/06 | 27236 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-ly1.tfm +2020/08/06 | 27204 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-ly1.tfm +2020/08/06 | 271 | graphics/asymptote/patches/gc6.8_AIX.patch +2020/08/06 | 2707 | graphics/asymptote/runtriple.in +2020/08/06 | 27008 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma +2020/08/06 | 26 | graphics/asymptote/doc/filegraph.dat +2020/08/06 | 269 | graphics/asymptote/runmath.h +2020/08/06 | 26996 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma +2020/08/06 | 2697 | graphics/asymptote/table.h +2020/08/06 | 269404 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma +2020/08/06 | 268 | graphics/asymptote/base/asy-init.el +2020/08/06 | 26851 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma +2020/08/06 | 2684 | graphics/asymptote/settings.h +2020/08/06 | 26844 | graphics/asymptote/runpath.cc +2020/08/06 | 2680 | graphics/asymptote/examples/soccerball.asy +2020/08/06 | 26804 | fonts/xcharter/tfm/XCharter-Roman-tosf-ly1.tfm +2020/08/06 | 267 | graphics/asymptote/examples/hyperboloidsilhouette.asy +2020/08/06 | 26768 | fonts/xcharter/tfm/XCharter-Roman-tlf-ly1.tfm +2020/08/06 | 2674 | graphics/asymptote/doc/markers1.asy +2020/08/06 | 2661 | graphics/asymptote/runbacktrace.cc +2020/08/06 | 26612 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma +2020/08/06 | 26603 | support/pkfix-helper/pkfix-helper.1 +2020/08/06 | 2657477 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma +2020/08/06 | 26572 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-t1.tfm +2020/08/06 | 2654 | graphics/asymptote/symbol.h +2020/08/06 | 26548 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-t1.tfm +2020/08/06 | 2653 | graphics/asymptote/doc/TeXShopAndAsymptote.tex +2020/08/06 | 26512 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-t1.tfm +2020/08/06 | 264 | graphics/asymptote/examples/labelbox.asy +2020/08/06 | 264 | graphics/asymptote/examples/coag.asy +2020/08/06 | 26392 | fonts/xcharter/tfm/XCharter-Bold-tosf-ly1.tfm +2020/08/06 | 26356 | fonts/xcharter/tfm/XCharter-Bold-tlf-ly1.tfm +2020/08/06 | 26348 | fonts/xcharter/tfm/XCharter1-Roman-tosf-ly1.tfm +2020/08/06 | 2632 | graphics/asymptote/material.h +2020/08/06 | 26328 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-ly1.tfm +2020/08/06 | 2631 | graphics/asymptote/GUI/windows/setCustomAnchor.ui +2020/08/06 | 262 | graphics/asymptote/doc/loggraph.asy +2020/08/06 | 26292 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-ly1.tfm +2020/08/06 | 26276 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-ly1.tfm +2020/08/06 | 2626 | graphics/asymptote/examples/worldmap.asy +2020/08/06 | 26260 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-ly1.tfm +2020/08/06 | 26256 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-ly1.tfm +2020/08/06 | 26224 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-ly1.tfm +2020/08/06 | 261 | graphics/asymptote/doc/join.asy +2020/08/06 | 2614 | graphics/asymptote/pipestream.h +2020/08/06 | 2613 | graphics/asymptote/base/patterns.asy +2020/08/06 | 26096 | graphics/asymptote/examples/uhrturm.obj +2020/08/06 | 26076 | fonts/xcharter/tfm/XCharter1-Bold-tosf-ly1.tfm +2020/08/06 | 26044 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-t1.tfm +2020/08/06 | 26020 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-t1.tfm +2020/08/06 | 26016 | fonts/xcharter/tfm/XCharter-Italic-tosf-ly1.tfm +2020/08/06 | 25996 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-ly1.tfm +2020/08/06 | 25988 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-t1.tfm +2020/08/06 | 25980 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-ly1.tfm +2020/08/06 | 25980 | fonts/xcharter/tfm/XCharter-Italic-tlf-ly1.tfm +2020/08/06 | 25944 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-ly1.tfm +2020/08/06 | 25840 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-ly1.tfm +2020/08/06 | 25812 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-ly1.tfm +2020/08/06 | 25701 | graphics/asymptote/runpath3d.cc +2020/08/06 | 256 | graphics/asymptote/doc/shadedtiling.asy +2020/08/06 | 25696 | macros/latex/contrib/mercatormap/mercatormap.doc.marker.tex +2020/08/06 | 25672 | fonts/xcharter/tfm/XCharter-Slanted-tosf-ly1.tfm +2020/08/06 | 25640 | fonts/xcharter/tfm/XCharter-Slanted-tlf-ly1.tfm +2020/08/06 | 2561 | graphics/asymptote/program.h +2020/08/06 | 255 | graphics/asymptote/BUGS +2020/08/06 | 25580 | systems/texlive/tlnet/archive/translator.r56052.tar.xz +2020/08/06 | 25576 | fonts/xcharter/tfm/XCharter1-Italic-tosf-ly1.tfm +2020/08/06 | 2554 | graphics/asymptote/GUI/xasyFile.py +2020/08/06 | 2552 | graphics/asymptote/base/plain_margins.asy +2020/08/06 | 25502 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma +2020/08/06 | 254 | graphics/asymptote/examples/parametricelevation.asy +2020/08/06 | 254 | graphics/asymptote/examples/contextfonts.asy +2020/08/06 | 25484 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-ly1.tfm +2020/08/06 | 25452 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-ly1.tfm +2020/08/06 | 2542 | graphics/asymptote/policy.h +2020/08/06 | 25424 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-ly1.tfm +2020/08/06 | 2536 | macros/latex/contrib/hausarbeit-jura/README.md +2020/08/06 | 25357 | graphics/asymptote/base/lmfit.asy +2020/08/06 | 2534481 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma +2020/08/06 | 25332 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-ly1.tfm +2020/08/06 | 25300 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-ly1.tfm +2020/08/06 | 25268 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-ly1.tfm +2020/08/06 | 25223 | graphics/asymptote/process.cc +2020/08/06 | 25220 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-ly1.tfm +2020/08/06 | 251 | graphics/asymptote/examples/triceratops.asy +2020/08/06 | 251 | graphics/asymptote/base/metapost.asy +2020/08/06 | 2518 | graphics/asymptote/prc/PRCbitStream.h +2020/08/06 | 25160 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-ly1.tfm +2020/08/06 | 25137 | graphics/asymptote/doc/extra/intro.asy +2020/08/06 | 250 | graphics/asymptote/examples/transparentCubes.asy +2020/08/06 | 25072 | fonts/xcharter/tfm/XCharter1-Roman-tosf-t1.tfm +2020/08/06 | 2505 | graphics/asymptote/README +2020/08/06 | 2505 | graphics/asymptote/binaries/x86_64-windows/README +2020/08/06 | 2505 | graphics/asymptote/binaries/i386-windows/README +2020/08/06 | 2504 | graphics/asymptote/examples/mosquito.asy +2020/08/06 | 25036 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t1.tfm +2020/08/06 | 250290 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma +2020/08/06 | 25024 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t1.tfm +2020/08/06 | 25020 | fonts/xcharter/tfm/XCharter-Roman-tosf-t1.tfm +2020/08/06 | 25012 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t1.tfm +2020/08/06 | 24 | graphics/asymptote/doc/diagonal.asy +2020/08/06 | 24992 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t1.tfm +2020/08/06 | 24984 | fonts/xcharter/tfm/XCharter-Roman-tlf-t1.tfm +2020/08/06 | 24976 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t1.tfm +2020/08/06 | 24952 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t1.tfm +2020/08/06 | 24872307 | macros/latex/contrib/mercatormap/mercatormap.pdf +2020/08/06 | 2482 | graphics/asymptote/build-scripts/build-asymptote +2020/08/06 | 24764 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t1.tfm +2020/08/06 | 24740 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t1.tfm +2020/08/06 | 24704 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t1.tfm +2020/08/06 | 246 | graphics/asymptote/examples/transparency.asy +2020/08/06 | 246 | graphics/asymptote/doc/axis3.asy +2020/08/06 | 246825 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma +2020/08/06 | 245 | graphics/asymptote/examples/alignbox.asy +2020/08/06 | 2451 | graphics/asymptote/base/labelpath3.asy +2020/08/06 | 244 | graphics/asymptote/tests/arith/triple.asy +2020/08/06 | 24411354 | macros/latex/contrib/mercatormap.zip +2020/08/06 | 24409080 | install/macros/latex/contrib/mercatormap.tds.zip +2020/08/06 | 243 | graphics/asymptote/doc/cube.asy +2020/08/06 | 24384 | fonts/xcharter/tfm/XCharter1-Bold-tosf-t1.tfm +2020/08/06 | 243052 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma +2020/08/06 | 242 | graphics/asymptote/examples/equilateral.asy +2020/08/06 | 24269284 | systems/texlive/tlnet/install-tl.zip +2020/08/06 | 24212 | fonts/xcharter/tfm/XCharter-Bold-tosf-t1.tfm +2020/08/06 | 24172 | fonts/xcharter/tfm/XCharter-Bold-tlf-t1.tfm +2020/08/06 | 240 | graphics/asymptote/doc/parametricgraph.asy +2020/08/06 | 24048 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t1.tfm +2020/08/06 | 24024 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t1.tfm +2020/08/06 | 23 | graphics/asymptote/GUI/__init__.py +2020/08/06 | 2399 | graphics/asymptote/GUI/PrimitiveShape.py +2020/08/06 | 23992 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t1.tfm +2020/08/06 | 2398 | graphics/asymptote/examples/SierpinskiSponge.asy +2020/08/06 | 23944 | fonts/xcharter/tfm/XCharter1-Italic-tosf-t1.tfm +2020/08/06 | 238 | graphics/asymptote/tests/TestLib.asy +2020/08/06 | 238 | graphics/asymptote/GUI/xasyValidator.py +2020/08/06 | 238 | graphics/asymptote/doc/filegraph.asy +2020/08/06 | 23892 | fonts/xcharter/tfm/XCharter-Italic-tosf-t1.tfm +2020/08/06 | 23860 | fonts/xcharter/tfm/XCharter-Italic-tlf-t1.tfm +2020/08/06 | 23791 | graphics/asymptote/base/three_arrows.asy +2020/08/06 | 2378 | graphics/asymptote/profile.py +2020/08/06 | 23772 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-t1.tfm +2020/08/06 | 23720 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-t1.tfm +2020/08/06 | 236 | graphics/asymptote/tests/string/erase.asy +2020/08/06 | 236 | graphics/asymptote/examples/annotation.asy +2020/08/06 | 23696 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-t1.tfm +2020/08/06 | 23631 | graphics/asymptote/drawsurface.cc +2020/08/06 | 23620 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-t1.tfm +2020/08/06 | 2360 | graphics/asymptote/examples/spectrum.asy +2020/08/06 | 23600 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma +2020/08/06 | 235 | graphics/asymptote/examples/cos2theta.asy +2020/08/06 | 23568 | fonts/xcharter/tfm/XCharter-Slanted-tosf-t1.tfm +2020/08/06 | 23536 | fonts/xcharter/tfm/XCharter-Slanted-tlf-t1.tfm +2020/08/06 | 23520 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t1.tfm +2020/08/06 | 234 | graphics/asymptote/doc/beziercurve.asy +2020/08/06 | 2341 | graphics/asymptote/prc/PRCTools/iPRCFile.h +2020/08/06 | 233 | graphics/asymptote/examples/cardioid.asy +2020/08/06 | 23364 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t1.tfm +2020/08/06 | 23332 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t1.tfm +2020/08/06 | 2328 | graphics/asymptote/virtualfieldaccess.h +2020/08/06 | 22 | graphics/asymptote/tests/output/line.asy +2020/08/06 | 22 | graphics/asymptote/GUI/configs/__init__.py +2020/08/06 | 22981 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma +2020/08/06 | 22971 | graphics/asymptote/base/syzygy.asy +2020/08/06 | 228 | graphics/asymptote/examples/circumcircle.asy +2020/08/06 | 2287 | graphics/asymptote/errormsg.cc +2020/08/06 | 22873 | graphics/asymptote/examples/piicon.png +2020/08/06 | 2277 | graphics/asymptote/base/texcolors.asy +2020/08/06 | 2276 | graphics/asymptote/prc/PRCTools/inflation.cc +2020/08/06 | 2266 | graphics/asymptote/align.h +2020/08/06 | 22594 | graphics/asymptote/base/plain_arrows.asy +2020/08/06 | 224 | graphics/asymptote/tests/types/init.asy +2020/08/06 | 224086 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma +2020/08/06 | 22345 | graphics/asymptote/knot.cc +2020/08/06 | 222 | graphics/asymptote/wce +2020/08/06 | 222 | graphics/asymptote/examples/yingyang.asy +2020/08/06 | 2222 | graphics/asymptote/tests/frames/loop.asy +2020/08/06 | 2212308 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2020/08/06 | 2207 | fonts/xcharter/tex/T2ASRBXCharter-Sup.fd +2020/08/06 | 219 | graphics/asymptote/doc/penimage.asy +2020/08/06 | 2193 | graphics/asymptote/GUI/pyUIClass/widg_addPolyOpt.py +2020/08/06 | 21926 | graphics/asymptote/runmath.cc +2020/08/06 | 2191 | graphics/asymptote/examples/splitpatch.asy +2020/08/06 | 218 | graphics/asymptote/doc/datagraph.asy +2020/08/06 | 2187 | graphics/asymptote/locate.cc +2020/08/06 | 2187 | graphics/asymptote/base/plain_debugger.asy +2020/08/06 | 218656 | systems/texlive/tlnet/archive/texlive-scripts.doc.r56047.tar.xz +2020/08/06 | 2181 | graphics/asymptote/build-scripts/HOWTO-MSWindows +2020/08/06 | 2164 | graphics/asymptote/frame.h +2020/08/06 | 215600 | systems/texlive/tlnet/archive/translator.doc.r56052.tar.xz +2020/08/06 | 2148 | graphics/asymptote/GUI/windows/widg_addPolyOpt.ui +2020/08/06 | 2146 | graphics/asymptote/webgl/fragment.glsl +2020/08/06 | 21448 | graphics/asymptote/base/feynman.asy +2020/08/06 | 21399 | macros/latex/contrib/mercatormap/mercatorpy.def +2020/08/06 | 2136 | graphics/asymptote/seconds.h +2020/08/06 | 2136 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2asrb--base.tfm +2020/08/06 | 2134 | graphics/asymptote/drawlabel.h +2020/08/06 | 213400 | systems/texlive/tlnet/archive/notomath.r56050.tar.xz +2020/08/06 | 2132 | fonts/xcharter/tfm/XCharter-Slanted-tosf-t2asrb--base.tfm +2020/08/06 | 2132 | fonts/xcharter/tfm/XCharter-Slanted-tosf-t2a--base.tfm +2020/08/06 | 2132 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2a--base.tfm +2020/08/06 | 2128 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2asrb--base.tfm +2020/08/06 | 2128 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2a--base.tfm +2020/08/06 | 2128 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2asrb--base.tfm +2020/08/06 | 21276 | macros/latex/contrib/mercatormap/mercatormap.doc.definition.tex +2020/08/06 | 2124 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2asrb--base.tfm +2020/08/06 | 2124 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2a--base.tfm +2020/08/06 | 2124 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2a--base.tfm +2020/08/06 | 2120 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2asrb--base.tfm +2020/08/06 | 2120 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2asrb--base.tfm +2020/08/06 | 2120 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2a--base.tfm +2020/08/06 | 2116 | fonts/xcharter/tfm/XCharter-Slanted-sup-t2a.tfm +2020/08/06 | 2116 | fonts/xcharter/tfm/XCharter-Slanted-sup-t2asrb.tfm +2020/08/06 | 2116 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2a--base.tfm +2020/08/06 | 211538 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma +2020/08/06 | 2112 | fonts/xcharter/tfm/XCharter-Slanted-sup-t2asrb--base.tfm +2020/08/06 | 2112 | fonts/xcharter/tfm/XCharter-Slanted-sup-t2a--base.tfm +2020/08/06 | 2112 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2asrb--base.tfm +2020/08/06 | 2112 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2a--base.tfm +2020/08/06 | 210 | graphics/asymptote/examples/spiral.asy +2020/08/06 | 210 | graphics/asymptote/build-scripts/asy-indent.el +2020/08/06 | 2109 | graphics/asymptote/base/drawtree.asy +2020/08/06 | 2107 | graphics/asymptote/jsfile.h +2020/08/06 | 2104 | fonts/xcharter/tfm/XCharter-Slanted-tlf-t2asrb--base.tfm +2020/08/06 | 2104 | fonts/xcharter/tfm/XCharter-Slanted-tlf-t2a--base.tfm +2020/08/06 | 2104 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2asrb--base.tfm +2020/08/06 | 2104 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2a--base.tfm +2020/08/06 | 210276 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma +2020/08/06 | 2101 | graphics/asymptote/examples/truncatedIcosahedron.asy +2020/08/06 | 2100 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2asrb--base.tfm +2020/08/06 | 2100 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2a--base.tfm +2020/08/06 | 20989 | graphics/asymptote/base/plain_bounds.asy +2020/08/06 | 20940 | fonts/xcharter/doc/xcharter-doc.tex +2020/08/06 | 2092 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2a.tfm +2020/08/06 | 2092 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2asrb.tfm +2020/08/06 | 2088 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2asrb--base.tfm +2020/08/06 | 2088 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2a--base.tfm +2020/08/06 | 2084 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2asrb--base.tfm +2020/08/06 | 2084 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2a--base.tfm +2020/08/06 | 20840 | graphics/asymptote/dec.cc +2020/08/06 | 20816 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma +2020/08/06 | 207 | graphics/asymptote/examples/triangle.asy +2020/08/06 | 207671 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma +2020/08/06 | 206 | graphics/asymptote/examples/log.asy +2020/08/06 | 206707 | graphics/asymptote/asy.list +2020/08/06 | 205495 | graphics/asymptote/base/colormap.asy +2020/08/06 | 20495 | graphics/asymptote/runtime.in +2020/08/06 | 2046 | graphics/asymptote/base/slopefield.asy +2020/08/06 | 203964 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma +2020/08/06 | 2034 | graphics/asymptote/doc/elliptic.asy +2020/08/06 | 2031791 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma +2020/08/06 | 202 | graphics/asymptote/tests/frames/stat2.asy +2020/08/06 | 202 | graphics/asymptote/glew.c +2020/08/06 | 202 | graphics/asymptote/doc/exp.asy +2020/08/06 | 202 | graphics/asymptote/build-scripts/run-in-indent.el +2020/08/06 | 2024 | fonts/xcharter/tfm/XCharter-Slanted-tosf-ly1--base.tfm +2020/08/06 | 2023 | graphics/asymptote/examples/slope.asy +2020/08/06 | 2020 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-ly1--base.tfm +2020/08/06 | 202087 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma +2020/08/06 | 202064 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma +2020/08/06 | 2012 | graphics/asymptote/varinit.h +2020/08/06 | 2012 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-ly1--base.tfm +2020/08/06 | 2008 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-ly1--base.tfm +2020/08/06 | 20051 | graphics/asymptote/doc/asyRefCard.tex +2020/08/06 | 20029 | graphics/asymptote/camp.y +2020/08/06 | 20006 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma +2020/08/06 | 199 | graphics/asymptote/examples/upint.asy +2020/08/06 | 199 | graphics/asymptote/examples/BezierTriangle.asy +2020/08/06 | 19990 | graphics/asymptote/base/contour.asy +2020/08/06 | 1996 | fonts/xcharter/tfm/XCharter-Roman-sup-t2a.tfm +2020/08/06 | 1996 | fonts/xcharter/tfm/XCharter-Roman-sup-t2a--base.tfm +2020/08/06 | 1992 | fonts/xcharter/tfm/XCharter-Slanted-tlf-ly1--base.tfm +2020/08/06 | 1992 | fonts/xcharter/tfm/XCharter-Roman-sup-t2asrb.tfm +2020/08/06 | 1992 | fonts/xcharter/tfm/XCharter-Roman-sup-t2asrb--base.tfm +2020/08/06 | 1992 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-ly1--base.tfm +2020/08/06 | 1992 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-ly1--base.tfm +2020/08/06 | 19915 | graphics/asymptote/drawsurface.h +2020/08/06 | 198 | graphics/asymptote/examples/tanh.asy +2020/08/06 | 1988 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-ly1--base.tfm +2020/08/06 | 1988 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-t2a--base.tfm +2020/08/06 | 1984 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t1--base.tfm +2020/08/06 | 1982 | graphics/asymptote/inst.h +2020/08/06 | 1980 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-ly1--base.tfm +2020/08/06 | 1980 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-ly1--base.tfm +2020/08/06 | 1980 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-t2a--base.tfm +2020/08/06 | 1976 | graphics/asymptote/varinit.cc +2020/08/06 | 1976 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2a--base.tfm +2020/08/06 | 1976 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-t2asrb--base.tfm +2020/08/06 | 1975 | graphics/asymptote/array.h +2020/08/06 | 1972 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t1--base.tfm +2020/08/06 | 196 | graphics/asymptote/examples/lowint.asy +2020/08/06 | 196 | graphics/asymptote/examples/label3ribbon.asy +2020/08/06 | 196 | graphics/asymptote/examples/animations/embeddedu3d.asy +2020/08/06 | 1968 | graphics/asymptote/examples/mergeExample.asy +2020/08/06 | 1968 | fonts/xcharter/tfm/XCharter-Slanted-tosf-t1--base.tfm +2020/08/06 | 1968 | fonts/xcharter/tfm/XCharter-Slanted-sup-ly1.tfm +2020/08/06 | 1968 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2asrb--base.tfm +2020/08/06 | 1968 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2a--base.tfm +2020/08/06 | 1968 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-t2asrb--base.tfm +2020/08/06 | 1967 | graphics/asymptote/GUI/res/icons/filledbucket.svg +2020/08/06 | 1964 | fonts/xcharter/tfm/XCharter-Slanted-sup-ly1--base.tfm +2020/08/06 | 1964 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-ly1.tfm +2020/08/06 | 1964 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-t2a--base.tfm +2020/08/06 | 196317 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma +2020/08/06 | 19629 | graphics/asymptote/fileio.h +2020/08/06 | 1960 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-ly1--base.tfm +2020/08/06 | 1960 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t1.tfm +2020/08/06 | 1960 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-ly1--base.tfm +2020/08/06 | 1960 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2asrb--base.tfm +2020/08/06 | 19597 | graphics/asymptote/doc/external-proposal.html +2020/08/06 | 1956 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-t1--base.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-Slanted-numr-ly1.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-Slanted-inf-ly1.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-Slanted-dnom-ly1.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2a--base.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t1--base.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t1--base.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-BoldSlanted-numr-ly1.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-BoldSlanted-inf-ly1.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-BoldSlanted-dnom-ly1.tfm +2020/08/06 | 1952 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-t2asrb--base.tfm +2020/08/06 | 1948 | fonts/xcharter/tfm/XCharter-Slanted-numr-ly1--base.tfm +2020/08/06 | 1948 | fonts/xcharter/tfm/XCharter-Slanted-inf-ly1--base.tfm +2020/08/06 | 1948 | fonts/xcharter/tfm/XCharter-Slanted-dnom-ly1--base.tfm +2020/08/06 | 1948 | fonts/xcharter/tfm/XCharter-BoldSlanted-numr-t1.tfm +2020/08/06 | 1948 | fonts/xcharter/tfm/XCharter-BoldSlanted-numr-ly1--base.tfm +2020/08/06 | 1948 | fonts/xcharter/tfm/XCharter-BoldSlanted-inf-t1.tfm +2020/08/06 | 1948 | fonts/xcharter/tfm/XCharter-BoldSlanted-inf-ly1--base.tfm +2020/08/06 | 1948 | fonts/xcharter/tfm/XCharter-BoldSlanted-dnom-t1.tfm +2020/08/06 | 1948 | fonts/xcharter/tfm/XCharter-BoldSlanted-dnom-ly1--base.tfm +2020/08/06 | 19462 | graphics/asymptote/patches/gl-matrix-2.4.0-pruned.patch +2020/08/06 | 194604 | graphics/asymptote/doc/asy-latex.pdf +2020/08/06 | 19455 | graphics/asymptote/runpicture.in +2020/08/06 | 1944 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-ly1--base.tfm +2020/08/06 | 1944 | fonts/xcharter/tfm/XCharter-Slanted-sup-t1.tfm +2020/08/06 | 1940 | fonts/xcharter/tfm/XCharter-Italic-tosf-t2a--base.tfm +2020/08/06 | 1940 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2asrb--base.tfm +2020/08/06 | 1940 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t1--base.tfm +2020/08/06 | 1940 | fonts/xcharter/tfm/XCharter-BoldSlanted-numr-t1--base.tfm +2020/08/06 | 1940 | fonts/xcharter/tfm/XCharter-BoldSlanted-inf-t1--base.tfm +2020/08/06 | 1940 | fonts/xcharter/tfm/XCharter-BoldSlanted-dnom-t1--base.tfm +2020/08/06 | 1940 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t1--base.tfm +2020/08/06 | 193 | graphics/asymptote/tests/gc/shipout.asy +2020/08/06 | 193 | graphics/asymptote/tests/arith/random.asy +2020/08/06 | 193833 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma +2020/08/06 | 19380892 | systems/texlive/tlnet/install-tl-windows.exe +2020/08/06 | 1936 | graphics/asymptote/refaccess.h +2020/08/06 | 1936 | fonts/xcharter/tfm/XCharter-Slanted-tlf-t1--base.tfm +2020/08/06 | 1936 | fonts/xcharter/tfm/XCharter-Slanted-sup-t1--base.tfm +2020/08/06 | 1936 | fonts/xcharter/tfm/XCharter-Italic-tosf-t2asrb--base.tfm +2020/08/06 | 1932 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-t2a--base.tfm +2020/08/06 | 1928 | fonts/xcharter/tfm/XCharter-Slanted-numr-t1.tfm +2020/08/06 | 1928 | fonts/xcharter/tfm/XCharter-Slanted-inf-t1.tfm +2020/08/06 | 1928 | fonts/xcharter/tfm/XCharter-Slanted-dnom-t1.tfm +2020/08/06 | 1928 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-t2asrb--base.tfm +2020/08/06 | 1928 | fonts/xcharter/tfm/XCharter1-Italic-tosf-t2a--base.tfm +2020/08/06 | 192836 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma +2020/08/06 | 1927 | graphics/asymptote/tests/array/fields.asy +2020/08/06 | 1927 | graphics/asymptote/prc/PRCTools/bitSearchDouble.cc +2020/08/06 | 192587 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma +2020/08/06 | 1924 | fonts/xcharter/tfm/XCharter1-Italic-tosf-t2asrb--base.tfm +2020/08/06 | 1924 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-t2a--base.tfm +2020/08/06 | 1920 | graphics/asymptote/GUI/res/icons/social-python.svg +2020/08/06 | 1920 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t1--base.tfm +2020/08/06 | 1920 | fonts/xcharter/tfm/XCharter-Slanted-numr-t1--base.tfm +2020/08/06 | 1920 | fonts/xcharter/tfm/XCharter-Slanted-inf-t1--base.tfm +2020/08/06 | 1920 | fonts/xcharter/tfm/XCharter-Slanted-dnom-t1--base.tfm +2020/08/06 | 1920 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t1--base.tfm +2020/08/06 | 1920 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-t2asrb--base.tfm +2020/08/06 | 191 | graphics/asymptote/runpicture.h +2020/08/06 | 1919 | graphics/asymptote/examples/animations/earthmoon.asy +2020/08/06 | 1916 | fonts/xcharter/tfm/XCharter-Italic-sup-t2a.tfm +2020/08/06 | 1916 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-t2a.tfm +2020/08/06 | 1912 | fonts/xcharter/tfm/XCharter-Italic-sup-t2asrb.tfm +2020/08/06 | 1912 | fonts/xcharter/tfm/XCharter-Italic-sup-t2a--base.tfm +2020/08/06 | 1912 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-t2asrb.tfm +2020/08/06 | 1912 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-t2a--base.tfm +2020/08/06 | 1910 | graphics/asymptote/examples/linearregression.asy +2020/08/06 | 1908 | macros/latex/contrib/mercatormap/mercatormap.doc.versionhistory.tex +2020/08/06 | 1908 | fonts/xcharter/tfm/XCharter-Italic-tlf-t2a--base.tfm +2020/08/06 | 1908 | fonts/xcharter/tfm/XCharter-Italic-sup-t2asrb--base.tfm +2020/08/06 | 1908 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t1--base.tfm +2020/08/06 | 1908 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-t2a--base.tfm +2020/08/06 | 1908 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-t2asrb--base.tfm +2020/08/06 | 1904 | fonts/xcharter/tfm/XCharter-Italic-tlf-t2asrb--base.tfm +2020/08/06 | 1904 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-t2asrb--base.tfm +2020/08/06 | 18 | graphics/asymptote/tests/output/circle.asy +2020/08/06 | 18938 | graphics/asymptote/psfile.cc +2020/08/06 | 1892 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-t1.vf +2020/08/06 | 1892 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-t1.vf +2020/08/06 | 1892 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-sc-t1.vf +2020/08/06 | 189151 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma +2020/08/06 | 188 | graphics/asymptote/runstring.h +2020/08/06 | 1888 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-sc-t1.vf +2020/08/06 | 1888 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-t2asrb--base.tfm +2020/08/06 | 1888 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-t2a--base.tfm +2020/08/06 | 1884 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t1--base.tfm +2020/08/06 | 1880 | fonts/xcharter/vf/XCharter-Slanted-tosf-sc-t1.vf +2020/08/06 | 1880 | fonts/xcharter/vf/XCharter-Slanted-tlf-sc-t1.vf +2020/08/06 | 1880 | fonts/xcharter/vf/XCharter-Italic-tosf-sc-t1.vf +2020/08/06 | 1880 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-ly1.vf +2020/08/06 | 1880 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-ly1.vf +2020/08/06 | 1880 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-t2asrb--base.tfm +2020/08/06 | 1880 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-t2a--base.tfm +2020/08/06 | 187 | graphics/asymptote/tests/string/rfind.asy +2020/08/06 | 187 | graphics/asymptote/examples/label3solid.asy +2020/08/06 | 1879 | macros/latex/contrib/mercatormap/README +2020/08/06 | 187719 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma +2020/08/06 | 1876 | graphics/asymptote/cc-mode2.el +2020/08/06 | 1876 | fonts/xcharter/vf/XCharter-Roman-tosf-sc-t1.vf +2020/08/06 | 1876 | fonts/xcharter/vf/XCharter-Italic-tlf-sc-t1.vf +2020/08/06 | 1876 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-t1.vf +2020/08/06 | 1876 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-t1.vf +2020/08/06 | 1876 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-t1.vf +2020/08/06 | 1872 | fonts/xcharter/vf/XCharter-Roman-tlf-sc-t1.vf +2020/08/06 | 1872 | fonts/xcharter/vf/XCharter-Bold-tosf-sc-t1.vf +2020/08/06 | 1872 | fonts/xcharter/vf/XCharter-Bold-tlf-sc-t1.vf +2020/08/06 | 1872 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-sc-t1.vf +2020/08/06 | 1872 | fonts/xcharter/tfm/XCharter-Roman-tosf-t2asrb--base.tfm +2020/08/06 | 1872 | fonts/xcharter/tfm/XCharter-Roman-tosf-t2a--base.tfm +2020/08/06 | 1872 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2asrb--base.tfm +2020/08/06 | 1872 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-ly1--base.tfm +2020/08/06 | 1872 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-ly1--base.tfm +2020/08/06 | 186 | graphics/asymptote/runpath3d.h +2020/08/06 | 186 | graphics/asymptote/doc/unitcircle3.asy +2020/08/06 | 1868 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-ly1.vf +2020/08/06 | 1868 | fonts/xcharter/vf/XCharter1-Slanted-tosf-ly1.vf +2020/08/06 | 1868 | fonts/xcharter/vf/XCharter1-Italic-tosf-ly1.vf +2020/08/06 | 1868 | fonts/xcharter/tfm/XCharter-Bold-tosf-t2asrb--base.tfm +2020/08/06 | 1868 | fonts/xcharter/tfm/XCharter-Bold-tosf-t2a--base.tfm +2020/08/06 | 1868 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2a--base.tfm +2020/08/06 | 18676 | graphics/asymptote/runstring.cc +2020/08/06 | 1864 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-ly1.vf +2020/08/06 | 1864 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-sc-ly1.vf +2020/08/06 | 1864 | fonts/xcharter/vf/XCharter1-Slanted-tosf-t1.vf +2020/08/06 | 1864 | fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-t1.vf +2020/08/06 | 1864 | fonts/xcharter/vf/XCharter1-Roman-tosf-ly1.vf +2020/08/06 | 1864 | fonts/xcharter/vf/XCharter1-Italic-tosf-t1.vf +2020/08/06 | 1864 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-ly1--base.tfm +2020/08/06 | 1864 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-ly1--base.tfm +2020/08/06 | 1864 | fonts/xcharter/tfm/XCharter1-Roman-tosf-t2asrb--base.tfm +2020/08/06 | 1864 | fonts/xcharter/tfm/XCharter1-Roman-tosf-t2a--base.tfm +2020/08/06 | 1864 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-ly1--base.tfm +2020/08/06 | 1864 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2asrb--base.tfm +2020/08/06 | 1863 | graphics/asymptote/prc/PRCTools/bitSearchUI.cc +2020/08/06 | 186116 | graphics/asymptote/doc/CAD.pdf +2020/08/06 | 1860 | graphics/asymptote/prc/PRCTools/bitData.h +2020/08/06 | 1860 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-sc-ly1.vf +2020/08/06 | 1860 | fonts/xcharter/vf/XCharter1-Roman-tosf-t1.vf +2020/08/06 | 1860 | fonts/xcharter/vf/XCharter1-Roman-tosf-sc-t1.vf +2020/08/06 | 1860 | fonts/xcharter/vf/XCharter1-Italic-tosf-sc-t1.vf +2020/08/06 | 1860 | fonts/xcharter/vf/XCharter1-Bold-tosf-ly1.vf +2020/08/06 | 1860 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-t2asrb--base.tfm +2020/08/06 | 1860 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-t2a--base.tfm +2020/08/06 | 1860 | fonts/xcharter/tfm/XCharter1-Bold-tosf-t2asrb--base.tfm +2020/08/06 | 1860 | fonts/xcharter/tfm/XCharter1-Bold-tosf-t2a--base.tfm +2020/08/06 | 1860 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2a--base.tfm +2020/08/06 | 18578 | graphics/asymptote/application.cc +2020/08/06 | 1856 | fonts/xcharter/vf/XCharter-Slanted-tosf-sc-ly1.vf +2020/08/06 | 1856 | fonts/xcharter/vf/XCharter1-Bold-tosf-t1.vf +2020/08/06 | 1856 | fonts/xcharter/vf/XCharter1-Bold-tosf-sc-t1.vf +2020/08/06 | 1852 | fonts/xcharter/vf/XCharter-Slanted-tlf-sc-ly1.vf +2020/08/06 | 1852 | fonts/xcharter/vf/XCharter-Italic-tosf-sc-ly1.vf +2020/08/06 | 1852 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-ly1--base.tfm +2020/08/06 | 1851 | graphics/asymptote/drawclipbegin.h +2020/08/06 | 184 | graphics/asymptote/examples/roll.asy +2020/08/06 | 1848 | fonts/xcharter/vf/XCharter-Roman-tosf-sc-ly1.vf +2020/08/06 | 1848 | fonts/xcharter/vf/XCharter-Roman-tlf-sc-ly1.vf +2020/08/06 | 1848 | fonts/xcharter/vf/XCharter-Italic-tlf-sc-ly1.vf +2020/08/06 | 1848 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-ly1.vf +2020/08/06 | 1848 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-sc-ly1.vf +2020/08/06 | 1848 | fonts/xcharter/tfm/XCharter-Roman-sup-t1.tfm +2020/08/06 | 1848 | fonts/xcharter/tfm/XCharter-Roman-sup-ly1.tfm +2020/08/06 | 1848 | fonts/xcharter/tfm/XCharter-Italic-tosf-ly1--base.tfm +2020/08/06 | 1848 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2asrb--base.tfm +2020/08/06 | 1846 | graphics/asymptote/common.h +2020/08/06 | 1844 | fonts/xcharter/vf/XCharter-Bold-tosf-sc-ly1.vf +2020/08/06 | 1844 | fonts/xcharter/vf/XCharter-Bold-tlf-sc-ly1.vf +2020/08/06 | 1844 | fonts/xcharter/tfm/XCharter-Roman-sup-ly1--base.tfm +2020/08/06 | 1844 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2a--base.tfm +2020/08/06 | 184490 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma +2020/08/06 | 1840 | fonts/xcharter/tfm/XCharter-Roman-tlf-t2asrb--base.tfm +2020/08/06 | 1840 | fonts/xcharter/tfm/XCharter-Roman-tlf-t2a--base.tfm +2020/08/06 | 1840 | fonts/xcharter/tfm/XCharter-Roman-sup-t1--base.tfm +2020/08/06 | 1840 | fonts/xcharter/tfm/XCharter-Bold-sup-t2a.tfm +2020/08/06 | 1840 | fonts/xcharter/tfm/XCharter-Bold-sup-t2asrb.tfm +2020/08/06 | 1840 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-ly1--base.tfm +2020/08/06 | 183 | graphics/asymptote/build-scripts/cc-indent.el +2020/08/06 | 18384 | graphics/asymptote/texfile.cc +2020/08/06 | 1836 | fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-ly1.vf +2020/08/06 | 1836 | fonts/xcharter/vf/XCharter1-Italic-tosf-sc-ly1.vf +2020/08/06 | 1836 | fonts/xcharter/tfm/XCharter-Bold-sup-t2asrb--base.tfm +2020/08/06 | 1836 | fonts/xcharter/tfm/XCharter-Bold-sup-t2a--base.tfm +2020/08/06 | 1836 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-ly1--base.tfm +2020/08/06 | 1835 | graphics/asymptote/examples/cyclohexane.asy +2020/08/06 | 1832 | fonts/xcharter/vf/XCharter1-Roman-tosf-sc-ly1.vf +2020/08/06 | 1832 | fonts/xcharter/tfm/XCharter-Bold-tlf-t2asrb--base.tfm +2020/08/06 | 1832 | fonts/xcharter/tfm/XCharter-Bold-tlf-t2a--base.tfm +2020/08/06 | 1832 | fonts/xcharter/tfm/XCharter1-Italic-tosf-ly1--base.tfm +2020/08/06 | 182 | graphics/asymptote/tests/string/find.asy +2020/08/06 | 182 | graphics/asymptote/examples/label3.asy +2020/08/06 | 1828 | graphics/asymptote/beziercurve.cc +2020/08/06 | 1828 | fonts/xcharter/vf/XCharter1-Bold-tosf-sc-ly1.vf +2020/08/06 | 1828 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-ly1--base.tfm +2020/08/06 | 1828 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-t1--base.tfm +2020/08/06 | 1824 | systems/texlive/tlnet/archive/collection-fontsextra.r56050.tar.xz +2020/08/06 | 1824 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t1--base.tfm +2020/08/06 | 1824 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-t1--base.tfm +2020/08/06 | 1824 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t1--base.tfm +2020/08/06 | 1824 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-t1--base.tfm +2020/08/06 | 1816 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-t1--base.tfm +2020/08/06 | 1812 | fonts/xcharter/tfm/XCharter-Italic-tosf-t1--base.tfm +2020/08/06 | 1812 | fonts/xcharter/tfm/XCharter-Italic-tlf-ly1--base.tfm +2020/08/06 | 18126 | graphics/asymptote/doc/asy-latex.dtx +2020/08/06 | 180902 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma +2020/08/06 | 1808 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-t1.tfm +2020/08/06 | 1805 | graphics/asymptote/patches/cygwin_freeglut-3.0.0.patch +2020/08/06 | 1804 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-t1--base.tfm +2020/08/06 | 1804 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-ly1.tfm +2020/08/06 | 1800 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-t1--base.tfm +2020/08/06 | 1800 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-ly1--base.tfm +2020/08/06 | 1800 | fonts/xcharter/tfm/XCharter-BoldItalic-inf-t1.tfm +2020/08/06 | 1800 | fonts/xcharter/tfm/XCharter1-Italic-tosf-t1--base.tfm +2020/08/06 | 17987 | graphics/asymptote/entry.cc +2020/08/06 | 1796 | fonts/xcharter/tfm/XCharter-BoldItalic-numr-t1.tfm +2020/08/06 | 1796 | fonts/xcharter/tfm/XCharter-BoldItalic-inf-ly1.tfm +2020/08/06 | 1796 | fonts/xcharter/tfm/XCharter-BoldItalic-dnom-t1.tfm +2020/08/06 | 1796 | fonts/xcharter/tfm/XCharter-BoldItalic-dnom-ly1.tfm +2020/08/06 | 1792 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-t1--base.tfm +2020/08/06 | 1792 | fonts/xcharter/tfm/XCharter-BoldItalic-numr-ly1.tfm +2020/08/06 | 1792 | fonts/xcharter/tfm/XCharter-BoldItalic-inf-t1--base.tfm +2020/08/06 | 1792 | fonts/xcharter/tfm/XCharter-BoldItalic-inf-ly1--base.tfm +2020/08/06 | 1792 | fonts/xcharter/tfm/XCharter-BoldItalic-dnom-ly1--base.tfm +2020/08/06 | 1788 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t1--base.tfm +2020/08/06 | 1788 | fonts/xcharter/tfm/XCharter-Italic-sup-t1.tfm +2020/08/06 | 1788 | fonts/xcharter/tfm/XCharter-Italic-sup-ly1.tfm +2020/08/06 | 1788 | fonts/xcharter/tfm/XCharter-BoldItalic-numr-t1--base.tfm +2020/08/06 | 1788 | fonts/xcharter/tfm/XCharter-BoldItalic-numr-ly1--base.tfm +2020/08/06 | 1788 | fonts/xcharter/tfm/XCharter-BoldItalic-dnom-t1--base.tfm +2020/08/06 | 1784 | fonts/xcharter/tfm/XCharter-Italic-sup-ly1--base.tfm +2020/08/06 | 1784 | fonts/xcharter/tfm/XCharter-Italic-inf-ly1.tfm +2020/08/06 | 17816 | graphics/asymptote/asy-keywords.el +2020/08/06 | 1780 | fonts/xcharter/tfm/XCharter-Italic-tlf-t1--base.tfm +2020/08/06 | 1780 | fonts/xcharter/tfm/XCharter-Italic-sup-t1--base.tfm +2020/08/06 | 1780 | fonts/xcharter/tfm/XCharter-Italic-inf-t1.tfm +2020/08/06 | 1780 | fonts/xcharter/tfm/XCharter-Italic-inf-ly1--base.tfm +2020/08/06 | 1780 | fonts/xcharter/tfm/XCharter-Bold-tosf-ly1--base.tfm +2020/08/06 | 177 | graphics/asymptote/runpath.h +2020/08/06 | 177 | graphics/asymptote/examples/curvedlabel.asy +2020/08/06 | 1778 | graphics/asymptote/examples/conicurv.asy +2020/08/06 | 1776 | fonts/xcharter/tfm/XCharter-Italic-numr-t1.tfm +2020/08/06 | 1776 | fonts/xcharter/tfm/XCharter-Italic-numr-ly1.tfm +2020/08/06 | 1776 | fonts/xcharter/tfm/XCharter-Italic-dnom-t1.tfm +2020/08/06 | 1776 | fonts/xcharter/tfm/XCharter-Italic-dnom-ly1.tfm +2020/08/06 | 177374 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma +2020/08/06 | 17736 | graphics/asymptote/runfile.cc +2020/08/06 | 1772 | fonts/xcharter/tfm/XCharter-Italic-numr-ly1--base.tfm +2020/08/06 | 1772 | fonts/xcharter/tfm/XCharter-Italic-inf-t1--base.tfm +2020/08/06 | 1772 | fonts/xcharter/tfm/XCharter-Italic-dnom-ly1--base.tfm +2020/08/06 | 17727 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma +2020/08/06 | 177246 | graphics/asymptote/prc/PRCdouble.cc +2020/08/06 | 1768 | fonts/xcharter/tfm/XCharter-Italic-numr-t1--base.tfm +2020/08/06 | 1768 | fonts/xcharter/tfm/XCharter-Italic-dnom-t1--base.tfm +2020/08/06 | 1768 | fonts/xcharter/tfm/XCharter1-Bold-tosf-ly1--base.tfm +2020/08/06 | 1764 | graphics/asymptote/GUI/res/icons/grid.svg +2020/08/06 | 1764 | fonts/xcharter/tfm/XCharter-Roman-tosf-ly1--base.tfm +2020/08/06 | 17626 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma +2020/08/06 | 1760 | graphics/asymptote/examples/animations/heatequation.asy +2020/08/06 | 175 | graphics/asymptote/examples/strokeshade.asy +2020/08/06 | 1752 | fonts/xcharter/tfm/XCharter1-Roman-tosf-ly1--base.tfm +2020/08/06 | 1746 | graphics/asymptote/doc/westnile.asy +2020/08/06 | 1746181 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma +2020/08/06 | 1744 | fonts/xcharter/tfm/XCharter-Bold-tlf-ly1--base.tfm +2020/08/06 | 1740 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-t1.vf +2020/08/06 | 1736 | fonts/xcharter/vf/XCharter-Slanted-tosf-t1.vf +2020/08/06 | 1736 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-t1.vf +2020/08/06 | 1736 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-t1.vf +2020/08/06 | 1736 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-t1.vf +2020/08/06 | 1732 | fonts/xcharter/vf/XCharter-Slanted-tlf-t1.vf +2020/08/06 | 1732 | fonts/xcharter/vf/XCharter-Roman-tosf-t1.vf +2020/08/06 | 1732 | fonts/xcharter/vf/XCharter-Roman-tlf-t1.vf +2020/08/06 | 1732 | fonts/xcharter/vf/XCharter-Italic-tosf-t1.vf +2020/08/06 | 1732 | fonts/xcharter/vf/XCharter-Italic-tlf-t1.vf +2020/08/06 | 1732 | fonts/xcharter/vf/XCharter-Bold-tosf-t1.vf +2020/08/06 | 1732 | fonts/xcharter/vf/XCharter-Bold-tlf-t1.vf +2020/08/06 | 1732 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-ly1.vf +2020/08/06 | 1732 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-ly1--base.tfm +2020/08/06 | 1732 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-ly1--base.tfm +2020/08/06 | 1728 | fonts/xcharter/vf/XCharter-Slanted-tosf-ly1.vf +2020/08/06 | 1728 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-ly1.vf +2020/08/06 | 1728 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-ly1.vf +2020/08/06 | 1728 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-ly1.vf +2020/08/06 | 1728 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-ly1--base.tfm +2020/08/06 | 1728 | fonts/xcharter/tfm/XCharter-Roman-tlf-ly1--base.tfm +2020/08/06 | 1728 | fonts/xcharter/tfm/XCharter-Bold-tosf-t1--base.tfm +2020/08/06 | 1728 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-ly1--base.tfm +2020/08/06 | 1724 | graphics/asymptote/GUI/GuidesManager.py +2020/08/06 | 1724 | fonts/xcharter/vf/XCharter-Slanted-tlf-ly1.vf +2020/08/06 | 1724 | fonts/xcharter/vf/XCharter-Roman-tosf-ly1.vf +2020/08/06 | 1724 | fonts/xcharter/vf/XCharter-Roman-tlf-ly1.vf +2020/08/06 | 1724 | fonts/xcharter/vf/XCharter-Italic-tosf-ly1.vf +2020/08/06 | 1724 | fonts/xcharter/vf/XCharter-Italic-tlf-ly1.vf +2020/08/06 | 1724 | fonts/xcharter/vf/XCharter-Bold-tosf-ly1.vf +2020/08/06 | 1724 | fonts/xcharter/vf/XCharter-Bold-tlf-ly1.vf +2020/08/06 | 1716 | fonts/xcharter/tfm/XCharter-Bold-sup-ly1.tfm +2020/08/06 | 1716 | fonts/xcharter/tfm/XCharter1-Bold-tosf-t1--base.tfm +2020/08/06 | 1712 | fonts/xcharter/tfm/XCharter-Bold-sup-ly1--base.tfm +2020/08/06 | 1711 | graphics/asymptote/GUI/res/icons.qrc +2020/08/06 | 1710 | graphics/asymptote/tests/arith/roots.asy +2020/08/06 | 1704 | fonts/xcharter/vf/XCharter-BoldSlanted-sup-t1.vf +2020/08/06 | 1704 | fonts/xcharter/vf/XCharter-BoldSlanted-numr-t1.vf +2020/08/06 | 1704 | fonts/xcharter/vf/XCharter-BoldSlanted-inf-t1.vf +2020/08/06 | 1704 | fonts/xcharter/vf/XCharter-BoldSlanted-dnom-t1.vf +2020/08/06 | 1704 | fonts/xcharter/vf/XCharter-BoldItalic-sup-t1.vf +2020/08/06 | 1704 | fonts/xcharter/vf/XCharter-BoldItalic-numr-t1.vf +2020/08/06 | 1704 | fonts/xcharter/vf/XCharter-BoldItalic-inf-t1.vf +2020/08/06 | 1704 | fonts/xcharter/vf/XCharter-BoldItalic-dnom-t1.vf +2020/08/06 | 1704 | fonts/xcharter/tfm/XCharter-Roman-tosf-t1--base.tfm +2020/08/06 | 1704 | fonts/xcharter/tfm/XCharter-Bold-numr-ly1.tfm +2020/08/06 | 1704 | fonts/xcharter/tfm/XCharter-Bold-inf-ly1.tfm +2020/08/06 | 1704 | fonts/xcharter/tfm/XCharter-Bold-dnom-ly1.tfm +2020/08/06 | 170417 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Slanted-sup-t1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Slanted-numr-t1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Slanted-inf-t1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Slanted-dnom-t1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Roman-sup-t1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Roman-numr-t1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Roman-inf-t1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Roman-dnom-t1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Italic-sup-t1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Italic-numr-t1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Italic-inf-t1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Italic-dnom-t1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Bold-numr-t1.vf +2020/08/06 | 1700 | fonts/xcharter/vf/XCharter-Bold-dnom-t1.vf +2020/08/06 | 1700 | fonts/xcharter/tfm/XCharter-Bold-numr-ly1--base.tfm +2020/08/06 | 1700 | fonts/xcharter/tfm/XCharter-Bold-inf-ly1--base.tfm +2020/08/06 | 1700 | fonts/xcharter/tfm/XCharter-Bold-dnom-ly1--base.tfm +2020/08/06 | 169 | graphics/asymptote/runbacktrace.h +2020/08/06 | 1698 | graphics/asymptote/record.cc +2020/08/06 | 1696 | fonts/xcharter/vf/XCharter-Bold-sup-t1.vf +2020/08/06 | 1696 | fonts/xcharter/vf/XCharter-Bold-inf-t1.vf +2020/08/06 | 1696 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-ly1--base.tfm +2020/08/06 | 169656 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma +2020/08/06 | 1694 | graphics/asymptote/fftw++.cc +2020/08/06 | 1692 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-ly1--base.tfm +2020/08/06 | 1692 | fonts/xcharter/tfm/XCharter-Bold-sup-t1.tfm +2020/08/06 | 1692 | fonts/xcharter/tfm/XCharter1-Roman-tosf-t1--base.tfm +2020/08/06 | 168 | graphics/asymptote/examples/lines.asy +2020/08/06 | 1688 | fonts/xcharter/tfm/XCharter-Roman-inf-ly1.tfm +2020/08/06 | 1688 | fonts/xcharter/tfm/XCharter-Bold-tlf-t1--base.tfm +2020/08/06 | 1684 | fonts/xcharter/tfm/XCharter-Roman-numr-ly1.tfm +2020/08/06 | 1684 | fonts/xcharter/tfm/XCharter-Roman-inf-ly1--base.tfm +2020/08/06 | 1684 | fonts/xcharter/tfm/XCharter-Roman-dnom-ly1.tfm +2020/08/06 | 1684 | fonts/xcharter/tfm/XCharter-Bold-sup-t1--base.tfm +2020/08/06 | 1680 | fonts/xcharter/tfm/XCharter-Roman-numr-ly1--base.tfm +2020/08/06 | 1680 | fonts/xcharter/tfm/XCharter-Roman-dnom-ly1--base.tfm +2020/08/06 | 1680 | fonts/xcharter/tfm/XCharter-Bold-numr-t1.tfm +2020/08/06 | 1680 | fonts/xcharter/tfm/XCharter-Bold-inf-t1.tfm +2020/08/06 | 1680 | fonts/xcharter/tfm/XCharter-Bold-dnom-t1.tfm +2020/08/06 | 1676 | fonts/xcharter/vf/XCharter-BoldSlanted-sup-ly1.vf +2020/08/06 | 1676 | fonts/xcharter/vf/XCharter-BoldSlanted-numr-ly1.vf +2020/08/06 | 1676 | fonts/xcharter/vf/XCharter-BoldSlanted-inf-ly1.vf +2020/08/06 | 1676 | fonts/xcharter/vf/XCharter-BoldSlanted-dnom-ly1.vf +2020/08/06 | 1676 | fonts/xcharter/vf/XCharter-BoldItalic-sup-ly1.vf +2020/08/06 | 1676 | fonts/xcharter/vf/XCharter-BoldItalic-numr-ly1.vf +2020/08/06 | 1676 | fonts/xcharter/vf/XCharter-BoldItalic-inf-ly1.vf +2020/08/06 | 1676 | fonts/xcharter/vf/XCharter-BoldItalic-dnom-ly1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Slanted-sup-ly1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Slanted-numr-ly1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Slanted-inf-ly1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Slanted-dnom-ly1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Roman-numr-ly1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Roman-dnom-ly1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Italic-sup-ly1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Italic-numr-ly1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Italic-inf-ly1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter-Italic-dnom-ly1.vf +2020/08/06 | 1672 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-t2asrb.vf +2020/08/06 | 1672 | fonts/xcharter/tfm/XCharter-Bold-numr-t1--base.tfm +2020/08/06 | 1672 | fonts/xcharter/tfm/XCharter-Bold-inf-t1--base.tfm +2020/08/06 | 1672 | fonts/xcharter/tfm/XCharter-Bold-dnom-t1--base.tfm +2020/08/06 | 1671 | macros/latex/contrib/hausarbeit-jura/hausarbeit-jura.ins +2020/08/06 | 1668 | fonts/xcharter/vf/XCharter-Roman-sup-ly1.vf +2020/08/06 | 1668 | fonts/xcharter/vf/XCharter-Roman-inf-ly1.vf +2020/08/06 | 1668 | fonts/xcharter/vf/XCharter-Bold-sup-ly1.vf +2020/08/06 | 1668 | fonts/xcharter/vf/XCharter-Bold-numr-ly1.vf +2020/08/06 | 1668 | fonts/xcharter/vf/XCharter-Bold-inf-ly1.vf +2020/08/06 | 1668 | fonts/xcharter/vf/XCharter-Bold-dnom-ly1.vf +2020/08/06 | 1668 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-t2asrb.vf +2020/08/06 | 1668 | fonts/xcharter/tfm/XCharter-Roman-tlf-t1--base.tfm +2020/08/06 | 1668 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t1--base.tfm +2020/08/06 | 1668 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t1--base.tfm +2020/08/06 | 1665 | graphics/asymptote/GUI/Widg_editBezier.py +2020/08/06 | 1664 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-t2a.vf +2020/08/06 | 1664 | fonts/xcharter/tfm/XCharter-Roman-inf-t1.tfm +2020/08/06 | 1660 | fonts/xcharter/vf/XCharter1-Slanted-tosf-t2asrb.vf +2020/08/06 | 1660 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-t2a.vf +2020/08/06 | 1660 | fonts/xcharter/tfm/XCharter-Roman-numr-t1.tfm +2020/08/06 | 1660 | fonts/xcharter/tfm/XCharter-Roman-dnom-t1.tfm +2020/08/06 | 1658 | graphics/asymptote/prc/PRCTools/Makefile +2020/08/06 | 1656 | fonts/xcharter/vf/XCharter1-Italic-tosf-t2asrb.vf +2020/08/06 | 1656 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-t1--base.tfm +2020/08/06 | 1656 | fonts/xcharter/tfm/XCharter-Roman-inf-t1--base.tfm +2020/08/06 | 1656 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-t1--base.tfm +2020/08/06 | 165592 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma +2020/08/06 | 16552 | graphics/asymptote/runlabel.cc +2020/08/06 | 1652 | fonts/xcharter/vf/XCharter1-Slanted-tosf-t2a.vf +2020/08/06 | 1652 | fonts/xcharter/vf/XCharter1-Roman-tosf-t2asrb.vf +2020/08/06 | 1652 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-t2asrb.vf +2020/08/06 | 1652 | fonts/xcharter/tfm/XCharter-Roman-numr-t1--base.tfm +2020/08/06 | 1652 | fonts/xcharter/tfm/XCharter-Roman-dnom-t1--base.tfm +2020/08/06 | 16492 | graphics/asymptote/base/plain_Label.asy +2020/08/06 | 1648 | fonts/xcharter/vf/XCharter1-Roman-tosf-t2a.vf +2020/08/06 | 1648 | fonts/xcharter/vf/XCharter1-Italic-tosf-t2a.vf +2020/08/06 | 1648 | fonts/xcharter/vf/XCharter1-Bold-tosf-t2asrb.vf +2020/08/06 | 1648 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-t2a.vf +2020/08/06 | 1648 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-sc-t2asrb.vf +2020/08/06 | 16483 | graphics/asymptote/runpair.cc +2020/08/06 | 164511 | graphics/asymptote/GUI/icons_rc.py +2020/08/06 | 1644 | fonts/xcharter/vf/XCharter1-Bold-tosf-t2a.vf +2020/08/06 | 1644 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-sc-t2a.vf +2020/08/06 | 1640 | graphics/asymptote/callable.h +2020/08/06 | 1640 | fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-t2asrb.vf +2020/08/06 | 1636 | fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-t2a.vf +2020/08/06 | 1636 | fonts/xcharter/vf/XCharter1-Roman-tosf-sc-t2asrb.vf +2020/08/06 | 1636 | fonts/xcharter/vf/XCharter1-Italic-tosf-sc-t2asrb.vf +2020/08/06 | 16364630 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2020/08/06 | 1632 | fonts/xcharter/vf/XCharter1-Italic-tosf-sc-t2a.vf +2020/08/06 | 1632 | fonts/xcharter/vf/XCharter1-Bold-tosf-sc-t2asrb.vf +2020/08/06 | 1630 | graphics/asymptote/builtin.h +2020/08/06 | 162 | graphics/asymptote/examples/stereoscopic.asy +2020/08/06 | 162 | graphics/asymptote/examples/sphereskeleton.asy +2020/08/06 | 1628 | fonts/xcharter/vf/XCharter1-Roman-tosf-sc-t2a.vf +2020/08/06 | 1628 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t1--base.tfm +2020/08/06 | 1626 | graphics/asymptote/genv.h +2020/08/06 | 1624 | fonts/xcharter/vf/XCharter1-Bold-tosf-sc-t2a.vf +2020/08/06 | 1620 | graphics/asymptote/doc/colors.asy +2020/08/06 | 1620 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-t1--base.tfm +2020/08/06 | 161 | graphics/asymptote/runhistory.h +2020/08/06 | 16138 | graphics/asymptote/base/slide.asy +2020/08/06 | 1612 | graphics/asymptote/asy-list.pl +2020/08/06 | 160672 | graphics/asymptote/examples/animations/dice.u3d +2020/08/06 | 16021 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma +2020/08/06 | 159 | graphics/asymptote/tests/types/cast.asy +2020/08/06 | 159878 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma +2020/08/06 | 15950 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma +2020/08/06 | 1594 | graphics/asymptote/pen.cc +2020/08/06 | 158 | graphics/asymptote/tests/frames/stat.asy +2020/08/06 | 1588 | graphics/asymptote/build-scripts/asy-format.el +2020/08/06 | 15822 | graphics/asymptote/dec.h +2020/08/06 | 157 | graphics/asymptote/runsystem.h +2020/08/06 | 157 | graphics/asymptote/doc/saddle.asy +2020/08/06 | 1578 | graphics/asymptote/build-scripts/cc-format.el +2020/08/06 | 15771 | macros/latex/contrib/mercatormap/mercatormap.doc.scales.tex +2020/08/06 | 1576 | fonts/xcharter/tfm/XCharter1-Slanted-ts1.tfm +2020/08/06 | 1572 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-ot1--base.tfm +2020/08/06 | 1572 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-ot1--base.tfm +2020/08/06 | 1568 | fonts/xcharter/tfm/XCharter1-BoldSlanted-ts1.tfm +2020/08/06 | 1566 | graphics/asymptote/examples/near_earth.asy +2020/08/06 | 1564 | fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-ot1--base.tfm +2020/08/06 | 1564 | fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-ot1--base.tfm +2020/08/06 | 15647 | macros/latex/contrib/mercatormap/mercatormap.doc.examples.tex +2020/08/06 | 15645 | graphics/asymptote/install-sh +2020/08/06 | 15630652 | graphics/asymptote.zip +2020/08/06 | 155 | graphics/asymptote/tests/types/ecast.asy +2020/08/06 | 1552 | fonts/xcharter/tfm/XCharter-Slanted-sup-ot1.tfm +2020/08/06 | 1552 | fonts/xcharter/tfm/XCharter-BoldSlanted-sup-ot1.tfm +2020/08/06 | 1551 | graphics/asymptote/examples/NURBSsurface.asy +2020/08/06 | 154 | graphics/asymptote/examples/billboard.asy +2020/08/06 | 154 | graphics/asymptote/doc/slopefield1.asy +2020/08/06 | 1548 | graphics/asymptote/examples/BezierSurface.asy +2020/08/06 | 1548 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-t2asrb.vf +2020/08/06 | 1548 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-t2asrb.vf +2020/08/06 | 1548 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-t2asrb.vf +2020/08/06 | 1548 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-t2asrb.vf +2020/08/06 | 1548 | fonts/xcharter/tfm/XCharter-Slanted-ts1.tfm +2020/08/06 | 1548 | fonts/xcharter/tfm/XCharter1-Slanted-ts1--base.tfm +2020/08/06 | 15451 | graphics/asymptote/types.h +2020/08/06 | 1544 | fonts/xcharter/vf/XCharter-Slanted-tosf-t2asrb.vf +2020/08/06 | 1544 | fonts/xcharter/vf/XCharter-Slanted-tlf-t2asrb.vf +2020/08/06 | 1544 | fonts/xcharter/vf/XCharter-Roman-tosf-t2asrb.vf +2020/08/06 | 1544 | fonts/xcharter/vf/XCharter-Italic-tosf-t2asrb.vf +2020/08/06 | 1544 | fonts/xcharter/vf/XCharter-Italic-tlf-t2asrb.vf +2020/08/06 | 1544 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-t2a.vf +2020/08/06 | 1544 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-t2a.vf +2020/08/06 | 1544 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-t2a.vf +2020/08/06 | 1544 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-t2a.vf +2020/08/06 | 1544 | fonts/xcharter/tfm/XCharter-Roman-ts1.tfm +2020/08/06 | 1544 | fonts/xcharter/tfm/XCharter-BoldSlanted-ts1.tfm +2020/08/06 | 1544 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-ot1--base.tfm +2020/08/06 | 1544 | fonts/xcharter/tfm/XCharter-BoldSlanted-numr-ot1.tfm +2020/08/06 | 1544 | fonts/xcharter/tfm/XCharter-BoldSlanted-dnom-ot1.tfm +2020/08/06 | 1544 | fonts/xcharter/tfm/XCharter1-Roman-ts1.tfm +2020/08/06 | 154419 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Slanted-tosf-t2a.vf +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Slanted-tlf-t2a.vf +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Roman-tosf-t2a.vf +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Roman-tlf-t2a.vf +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Roman-tlf-t2asrb.vf +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Italic-tosf-t2a.vf +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Italic-tlf-t2a.vf +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Bold-tosf-t2a.vf +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Bold-tosf-t2asrb.vf +2020/08/06 | 1540 | fonts/xcharter/vf/XCharter-Bold-tlf-t2asrb.vf +2020/08/06 | 1540 | fonts/xcharter/tfm/XCharter-Slanted-ts1--base.tfm +2020/08/06 | 1540 | fonts/xcharter/tfm/XCharter-BoldSlanted-ts1--base.tfm +2020/08/06 | 1540 | fonts/xcharter/tfm/XCharter-BoldSlanted-inf-ot1.tfm +2020/08/06 | 1540 | fonts/xcharter/tfm/XCharter1-BoldSlanted-ts1--base.tfm +2020/08/06 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2020/08/06 | 153 | graphics/asymptote/runlabel.h +2020/08/06 | 1537 | graphics/asymptote/examples/refs.bib +2020/08/06 | 1536 | fonts/xcharter/vf/XCharter-Bold-tlf-t2a.vf +2020/08/06 | 1536 | fonts/xcharter/tfm/XCharter-Slanted-numr-ot1.tfm +2020/08/06 | 1536 | fonts/xcharter/tfm/XCharter-Slanted-inf-ot1.tfm +2020/08/06 | 1536 | fonts/xcharter/tfm/XCharter-Slanted-dnom-ot1.tfm +2020/08/06 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2020/08/06 | 1528 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-t2asrb.vf +2020/08/06 | 1528 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-t2asrb.vf +2020/08/06 | 1528 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-sc-t2asrb.vf +2020/08/06 | 1528 | fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-ot1--base.tfm +2020/08/06 | 15277 | graphics/asymptote/base/flowchart.asy +2020/08/06 | 15274 | graphics/asymptote/base/ode.asy +2020/08/06 | 1524 | graphics/asymptote/patches/flex.patch +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-Slanted-tosf-sc-t2asrb.vf +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-Slanted-tlf-sc-t2asrb.vf +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-Italic-tosf-sc-t2asrb.vf +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-t2a.vf +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-t2a.vf +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-BoldSlanted-sup-t2asrb.vf +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-BoldItalic-tosf-sc-t2a.vf +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-sc-t2a.vf +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-BoldItalic-tlf-sc-t2asrb.vf +2020/08/06 | 1524 | fonts/xcharter/vf/XCharter-BoldItalic-sup-t2asrb.vf +2020/08/06 | 1524 | fonts/xcharter/tfm/XCharter-Roman-ts1--base.tfm +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Slanted-tosf-sc-t2a.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Slanted-tlf-sc-t2a.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Slanted-sup-t2asrb.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Roman-tosf-sc-t2a.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Roman-tosf-sc-t2asrb.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Roman-tlf-sc-t2asrb.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Italic-tosf-sc-t2a.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Italic-tlf-sc-t2a.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Italic-tlf-sc-t2asrb.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Italic-sup-t2asrb.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Bold-tosf-sc-t2asrb.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-Bold-tlf-sc-t2asrb.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-BoldSlanted-sup-t2a.vf +2020/08/06 | 1520 | fonts/xcharter/vf/XCharter-BoldItalic-sup-t2a.vf +2020/08/06 | 151864 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma +2020/08/06 | 151836 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma +2020/08/06 | 1516 | fonts/xcharter/vf/XCharter-Slanted-sup-t2a.vf +2020/08/06 | 1516 | fonts/xcharter/vf/XCharter-Roman-tlf-sc-t2a.vf +2020/08/06 | 1516 | fonts/xcharter/vf/XCharter-Roman-sup-t2a.vf +2020/08/06 | 1516 | fonts/xcharter/vf/XCharter-Roman-sup-t2asrb.vf +2020/08/06 | 1516 | fonts/xcharter/vf/XCharter-Italic-sup-t2a.vf +2020/08/06 | 1516 | fonts/xcharter/vf/XCharter-Bold-tosf-sc-t2a.vf +2020/08/06 | 1516 | fonts/xcharter/vf/XCharter-Bold-tlf-sc-t2a.vf +2020/08/06 | 1516 | fonts/xcharter/vf/XCharter-Bold-sup-t2asrb.vf +2020/08/06 | 1516 | fonts/xcharter/tfm/XCharter1-Roman-ts1--base.tfm +2020/08/06 | 1512 | fonts/xcharter/vf/XCharter-Bold-sup-t2a.vf +2020/08/06 | 150 | graphics/asymptote/examples/spheresilhouette.asy +2020/08/06 | 150 | graphics/asymptote/doc/latexmkrc_asydir +2020/08/06 | 1504 | graphics/asymptote/GUI/xasyUtils.py +2020/08/06 | 1498 | graphics/asymptote/examples/animations/wavepacket.asy +2020/08/06 | 1492 | graphics/asymptote/runarray.h +2020/08/06 | 1492 | graphics/asymptote/GUI/res/icons/bucket.svg +2020/08/06 | 14897 | graphics/asymptote/configure.ac +2020/08/06 | 1484 | fonts/xcharter/tfm/XCharter1-BoldItalic-ts1.tfm +2020/08/06 | 1482 | graphics/asymptote/GUI/res/icons/android-hand.svg +2020/08/06 | 147 | graphics/asymptote/doc/vectorfield.asy +2020/08/06 | 1479 | graphics/asymptote/prc/PRCTools/inflationMain.cc +2020/08/06 | 14749 | graphics/asymptote/base/contour3.asy +2020/08/06 | 1472 | fonts/xcharter/tfm/XCharter-BoldItalic-ts1.tfm +2020/08/06 | 1469 | graphics/asymptote/doc/png/Makefile.in +2020/08/06 | 1468 | fonts/xcharter/tfm/XCharter1-Italic-ts1.tfm +2020/08/06 | 14669 | graphics/asymptote/base/palette.asy +2020/08/06 | 1461 | graphics/asymptote/examples/logo3.asy +2020/08/06 | 1460 | fonts/xcharter/tfm/XCharter-Italic-ts1.tfm +2020/08/06 | 1460 | fonts/xcharter/tfm/XCharter-BoldItalic-ts1--base.tfm +2020/08/06 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2020/08/06 | 145 | graphics/asymptote/examples/star.asy +2020/08/06 | 1452 | fonts/xcharter/tfm/XCharter1-BoldItalic-ts1--base.tfm +2020/08/06 | 1451 | macros/latex/contrib/mercatormap/mercatormap.bib +2020/08/06 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2020/08/06 | 144 | graphics/asymptote/doc/latexmkrc +2020/08/06 | 1448 | fonts/xcharter/tfm/XCharter-Italic-ts1--base.tfm +2020/08/06 | 1446 | graphics/asymptote/webgl/vertex.glsl +2020/08/06 | 14469 | graphics/asymptote/stack.cc +2020/08/06 | 1440 | fonts/xcharter/tfm/XCharter-Italic-tosf-sc-ot1--base.tfm +2020/08/06 | 1440 | fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-ot1--base.tfm +2020/08/06 | 143 | graphics/asymptote/tests/gc/label.asy +2020/08/06 | 1436 | fonts/xcharter/tfm/XCharter1-Italic-ts1--base.tfm +2020/08/06 | 1432 | fonts/xcharter/tfm/XCharter1-Bold-ts1.tfm +2020/08/06 | 1430994 | graphics/asymptote/ChangeLog +2020/08/06 | 1425 | fonts/xcharter/tex/TS1XCharter-TOsF.fd +2020/08/06 | 1420 | fonts/xcharter/tfm/XCharter-Bold-ts1.tfm +2020/08/06 | 141 | graphics/asymptote/examples/sphere.asy +2020/08/06 | 141 | graphics/asymptote/examples/ring.asy +2020/08/06 | 141852 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma +2020/08/06 | 14130 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma +2020/08/06 | 1410 | fonts/xcharter/tex/TS1XCharter-TLF.fd +2020/08/06 | 1408 | fonts/xcharter/tfm/XCharter-Bold-ts1--base.tfm +2020/08/06 | 14072 | graphics/asymptote/types.cc +2020/08/06 | 1404 | fonts/xcharter/tfm/XCharter-Italic-tlf-sc-ot1--base.tfm +2020/08/06 | 1404301 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma +2020/08/06 | 1400 | fonts/xcharter/tfm/XCharter1-Bold-ts1--base.tfm +2020/08/06 | 13980 | graphics/asymptote/arrayop.h +2020/08/06 | 13944 | graphics/asymptote/runtriple.cc +2020/08/06 | 1393 | graphics/asymptote/GUI/SetCustomAnchor.py +2020/08/06 | 1392 | fonts/xcharter/tfm/XCharter-Italic-sup-ot1.tfm +2020/08/06 | 1391 | graphics/asymptote/doc/CAD1.asy +2020/08/06 | 13901 | graphics/asymptote/examples/teapot.asy +2020/08/06 | 138 | graphics/asymptote/Pipfile +2020/08/06 | 1384 | graphics/asymptote/tests/pic/trans.asy +2020/08/06 | 1384 | fonts/xcharter/tfm/XCharter-Italic-inf-ot1.tfm +2020/08/06 | 1380 | fonts/xcharter/tfm/XCharter-Italic-numr-ot1.tfm +2020/08/06 | 1380 | fonts/xcharter/tfm/XCharter-Italic-dnom-ot1.tfm +2020/08/06 | 1375 | graphics/asymptote/base/tree.asy +2020/08/06 | 136 | graphics/asymptote/examples/latticeshading.asy +2020/08/06 | 13663 | graphics/asymptote/doc/install-sh +2020/08/06 | 13663 | graphics/asymptote/doc/FAQ/install-sh +2020/08/06 | 1364 | fonts/xcharter/tfm/XCharter-BoldItalic-tosf-sc-ot1--base.tfm +2020/08/06 | 1364 | fonts/xcharter/tfm/XCharter1-BoldItalic-tosf-sc-ot1--base.tfm +2020/08/06 | 13615 | graphics/asymptote/entry.h +2020/08/06 | 1360 | fonts/xcharter/tfm/XCharter-Roman-sup-ot1.tfm +2020/08/06 | 13605 | graphics/asymptote/base/grid3.asy +2020/08/06 | 13550 | graphics/asymptote/GUI/xasyBezierInterface.py +2020/08/06 | 1352 | graphics/asymptote/examples/Klein.asy +2020/08/06 | 1345 | graphics/asymptote/interact.h +2020/08/06 | 1344 | fonts/xcharter/tfm/XCharter-Bold-tosf-sc-ot1--base.tfm +2020/08/06 | 1344 | fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-ot1--base.tfm +2020/08/06 | 1341 | graphics/asymptote/runtimebase.in +2020/08/06 | 1336 | fonts/xcharter/tfm/XCharter-Bold-sup-ot1.tfm +2020/08/06 | 133655 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma +2020/08/06 | 13339 | graphics/asymptote/camp.l +2020/08/06 | 1332 | fonts/xcharter/tfm/XCharter-Roman-tosf-sc-ot1--base.tfm +2020/08/06 | 1332 | fonts/xcharter/tfm/XCharter1-Roman-tosf-sc-ot1--base.tfm +2020/08/06 | 1331 | graphics/asymptote/tests/types/spec.asy +2020/08/06 | 132 | graphics/asymptote/tests/string/length.asy +2020/08/06 | 1328 | fonts/xcharter/tfm/XCharter-Bold-numr-ot1.tfm +2020/08/06 | 1328 | fonts/xcharter/tfm/XCharter-BoldItalic-tlf-sc-ot1--base.tfm +2020/08/06 | 1328 | fonts/xcharter/tfm/XCharter-Bold-dnom-ot1.tfm +2020/08/06 | 1325258 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma +2020/08/06 | 1324 | fonts/xcharter/tfm/XCharter-Bold-inf-ot1.tfm +2020/08/06 | 131 | graphics/asymptote/GUI/DebugFlags.py +2020/08/06 | 1319 | graphics/asymptote/GUI/res/icons/android-color-palette.svg +2020/08/06 | 131984 | systems/texlive/tlnet/archive/texlive-scripts.r56047.tar.xz +2020/08/06 | 13128 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma +2020/08/06 | 1311 | graphics/asymptote/patches/dvipdf +2020/08/06 | 1310 | graphics/asymptote/prc/PRCTools/extractSections.cc +2020/08/06 | 1309 | graphics/asymptote/examples/roundpath.asy +2020/08/06 | 1308 | fonts/xcharter/tfm/XCharter-Bold-tlf-sc-ot1--base.tfm +2020/08/06 | 130358 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma +2020/08/06 | 1300 | fonts/xcharter/tfm/XCharter-Roman-numr-ot1.tfm +2020/08/06 | 1300 | fonts/xcharter/tfm/XCharter-Roman-inf-ot1.tfm +2020/08/06 | 1300 | fonts/xcharter/tfm/XCharter-Roman-dnom-ot1.tfm +2020/08/06 | 129 | graphics/asymptote/tests/gc/struct.asy +2020/08/06 | 1298 | graphics/asymptote/examples/electromagnetic.asy +2020/08/06 | 1296 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-ot1--base.tfm +2020/08/06 | 1293 | graphics/asymptote/TODO +2020/08/06 | 1288 | fonts/xcharter/tfm/XCharter-BoldItalic-sup-ot1.tfm +2020/08/06 | 12865 | macros/latex/contrib/mercatormap/mercatormap.doc.limitations.tex +2020/08/06 | 1284 | graphics/asymptote/tests/output/Makefile +2020/08/06 | 1284 | fonts/xcharter/tfm/XCharter-BoldItalic-numr-ot1.tfm +2020/08/06 | 1284 | fonts/xcharter/tfm/XCharter-BoldItalic-dnom-ot1.tfm +2020/08/06 | 1284725 | graphics/asymptote/doc/asymptote.pdf +2020/08/06 | 12813 | graphics/asymptote/impdatum.cc +2020/08/06 | 12812 | graphics/asymptote/runlabel.in +2020/08/06 | 1280 | fonts/xcharter/tfm/XCharter-BoldItalic-inf-ot1.tfm +2020/08/06 | 127885 | graphics/asymptote/camp.tab.cc +2020/08/06 | 1276 | graphics/asymptote/base/asymptote.py +2020/08/06 | 1274 | graphics/asymptote/newexp.h +2020/08/06 | 1270 | graphics/asymptote/beziercurve.h +2020/08/06 | 1266 | graphics/asymptote/drawverbatim.h +2020/08/06 | 1265429 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma +2020/08/06 | 1261761 | graphics/asymptote/examples/worldmap.dat +2020/08/06 | 12604 | graphics/asymptote/runsystem.cc +2020/08/06 | 1253 | graphics/asymptote/keywords.pl +2020/08/06 | 12534 | graphics/asymptote/ax_pthread.m4 +2020/08/06 | 1251 | graphics/asymptote/examples/odetest.asy +2020/08/06 | 124 | graphics/asymptote/tests/gc/path.asy +2020/08/06 | 124 | graphics/asymptote/GUI/res/icons/centerorigin.asy +2020/08/06 | 1245 | graphics/asymptote/prc/PRCTools/describeMain.cc +2020/08/06 | 1245 | graphics/asymptote/findsym.pl +2020/08/06 | 1240 | graphics/asymptote/examples/arrows3.asy +2020/08/06 | 123 | graphics/asymptote/examples/Coons.asy +2020/08/06 | 123 | graphics/asymptote/doc/superpath.asy +2020/08/06 | 1238 | graphics/asymptote/examples/animations/slidemovies.asy +2020/08/06 | 1237 | graphics/asymptote/GUI/res/icons/closedcurve.svg +2020/08/06 | 1236 | graphics/asymptote/primitives.h +2020/08/06 | 1235 | graphics/asymptote/examples/animations/inlinemovie.tex +2020/08/06 | 1235777 | graphics/asymptote/GL/glew.c +2020/08/06 | 122922 | graphics/asymptote/ReleaseNotes +2020/08/06 | 1227 | graphics/asymptote/build-scripts/build-asygl +2020/08/06 | 1226 | graphics/asymptote/GUI/res/icons/triangle-stroked-15.svg +2020/08/06 | 12259 | graphics/asymptote/knot.h +2020/08/06 | 121 | graphics/asymptote/doc/labelsquare.asy +2020/08/06 | 1216 | graphics/asymptote/examples/dragon.asy +2020/08/06 | 1213 | graphics/asymptote/base/plain_arcs.asy +2020/08/06 | 121144 | graphics/asymptote/doc/asyRefCard.pdf +2020/08/06 | 1209 | graphics/asymptote/tests/imp/unravel.asy +2020/08/06 | 1206299 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma +2020/08/06 | 1206057 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma +2020/08/06 | 12035 | graphics/asymptote/base/solids.asy +2020/08/06 | 12024 | graphics/asymptote/stm.cc +2020/08/06 | 119 | graphics/asymptote/fftw++asy.cc +2020/08/06 | 1197 | graphics/asymptote/drawclipend.h +2020/08/06 | 1194 | graphics/asymptote/GUI/res/icons/code.svg +2020/08/06 | 1192974 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma +2020/08/06 | 11907 | graphics/asymptote/tests/gsl/random.asy +2020/08/06 | 118 | graphics/asymptote/tests/string/substr.asy +2020/08/06 | 1189 | graphics/asymptote/tests/types/var.asy +2020/08/06 | 1186 | graphics/asymptote/GUI/res/icons/opencurve.svg +2020/08/06 | 1186601 | graphics/asymptote/GL/glew.h +2020/08/06 | 1185 | graphics/asymptote/examples/functionshading.asy +2020/08/06 | 1183 | graphics/asymptote/camperror.cc +2020/08/06 | 1178 | graphics/asymptote/base/embed.asy +2020/08/06 | 1171 | graphics/asymptote/parser.h +2020/08/06 | 116787 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma +2020/08/06 | 11671 | graphics/asymptote/Makefile.in +2020/08/06 | 11656 | graphics/asymptote/base/binarytree.asy +2020/08/06 | 1164 | graphics/asymptote/examples/genustwo.asy +2020/08/06 | 11642 | graphics/asymptote/coder.h +2020/08/06 | 1163 | graphics/asymptote/runtime.h +2020/08/06 | 11627 | graphics/asymptote/path.h +2020/08/06 | 1160528 | graphics/asymptote/gc-8.0.4.tar.gz +2020/08/06 | 116025 | graphics/asymptote/predicates.cc +2020/08/06 | 115 | graphics/asymptote/doc/onecontour.asy +2020/08/06 | 115879 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma +2020/08/06 | 1155 | systems/win32/miktex/tm/packages/pr.ini +2020/08/06 | 11541 | graphics/asymptote/aspy.py +2020/08/06 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini +2020/08/06 | 11528 | graphics/asymptote/GUI/InplaceAddObj.py +2020/08/06 | 11521 | graphics/asymptote/util.cc +2020/08/06 | 1151 | graphics/asymptote/callable.cc +2020/08/06 | 1149 | graphics/asymptote/guide.cc +2020/08/06 | 1148 | graphics/asymptote/GUI/configs/xasyconfig.cson +2020/08/06 | 1142 | graphics/asymptote/envcompleter.cc +2020/08/06 | 113 | graphics/asymptote/patches/fixmem.reg +2020/08/06 | 113581 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma +2020/08/06 | 11354 | macros/latex/contrib/mercatormap/mercatorsupplier.def +2020/08/06 | 11320 | graphics/asymptote/base/plain_markers.asy +2020/08/06 | 1131 | graphics/asymptote/gl-matrix-2.4.0-pruned/LICENSE.js +2020/08/06 | 11293 | fonts/xcharter/README +2020/08/06 | 1126 | graphics/asymptote/coenv.cc +2020/08/06 | 1124 | graphics/asymptote/GUI/res/icons/android-locate.svg +2020/08/06 | 1124940 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma +2020/08/06 | 1124797 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma +2020/08/06 | 11212 | graphics/asymptote/drawelement.h +2020/08/06 | 1120 | graphics/asymptote/examples/animations/wheel.asy +2020/08/06 | 1120 | graphics/asymptote/base/external.asy +2020/08/06 | 111 | graphics/asymptote/GUI/res/icons/center.asy +2020/08/06 | 111 | graphics/asymptote/examples/shadestroke.asy +2020/08/06 | 1114 | graphics/asymptote/examples/laserlattice.asy +2020/08/06 | 1111 | graphics/asymptote/examples/imagehistogram.asy +2020/08/06 | 1102 | graphics/asymptote/GUI/res/icons/closedpolygon.svg +2020/08/06 | 11008 | graphics/asymptote/base/math.asy +2020/08/06 | 109 | graphics/asymptote/tests/string/insert.asy +2020/08/06 | 109730 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma +2020/08/06 | 1096 | graphics/asymptote/tests/array/transpose.asy +2020/08/06 | 1096 | graphics/asymptote/refaccess.cc +2020/08/06 | 108 | graphics/asymptote/GUI/res/icons/subdirectory-left.svg +2020/08/06 | 108990 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma +2020/08/06 | 1085 | graphics/asymptote/GUI/res/icons/openpolygon.svg +2020/08/06 | 10830 | graphics/asymptote/base/CAD.asy +2020/08/06 | 1082 | graphics/asymptote/patches/README +2020/08/06 | 10701 | graphics/asymptote/texfile.h +2020/08/06 | 1065 | graphics/asymptote/examples/shellmethod.asy +2020/08/06 | 10632 | graphics/asymptote/EnvVarUpdate.nsh +2020/08/06 | 1061411 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma +2020/08/06 | 105 | graphics/asymptote/GUI/res/icons/closedpolygon.asy +2020/08/06 | 105 | graphics/asymptote/GUI/res/icons/closedcurve.asy +2020/08/06 | 10585 | graphics/asymptote/path3.h +2020/08/06 | 1055 | graphics/asymptote/examples/partitionExample.asy +2020/08/06 | 1052 | graphics/asymptote/GUI/res/icons/centerorigin.svg +2020/08/06 | 1051 | graphics/asymptote/prc/PRCTools/inflation.h +2020/08/06 | 1051 | graphics/asymptote/doc/eetomumu.asy +2020/08/06 | 1050 | graphics/asymptote/opsymbols.pl +2020/08/06 | 104 | graphics/asymptote/examples/tiling.asy +2020/08/06 | 104547 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma +2020/08/06 | 10445 | graphics/asymptote/INSTALL +2020/08/06 | 1042 | graphics/asymptote/examples/NURBSsphere.asy +2020/08/06 | 1040 | graphics/asymptote/examples/lmfit1.asy +2020/08/06 | 1037 | graphics/asymptote/examples/animations/inlinemovie3.tex +2020/08/06 | 1036 | graphics/asymptote/examples/workcone.asy +2020/08/06 | 1033 | graphics/asymptote/examples/basealign.asy +2020/08/06 | 1032 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-ot1.vf +2020/08/06 | 10310 | macros/latex/contrib/mercatormap/mercatormap.doc.drawing.tex +2020/08/06 | 1030 | graphics/asymptote/absyn.h +2020/08/06 | 102 | graphics/asymptote/tests/gc/file.asy +2020/08/06 | 1028 | fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-ot1.vf +2020/08/06 | 10271 | graphics/asymptote/GUI/windows/custMatTransform.ui +2020/08/06 | 102588 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma +2020/08/06 | 1024 | fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-ot1.vf +2020/08/06 | 10224 | graphics/asymptote/tr.cc +2020/08/06 | 1021969 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma +2020/08/06 | 1020 | graphics/asymptote/flatguide.cc +2020/08/06 | 1020 | fonts/xcharter/vf/XCharter1-Slanted-tosf-ot1.vf +2020/08/06 | 10196 | graphics/asymptote/doc/CAD.tex +2020/08/06 | 101781 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma +2020/08/06 | 1016 | fonts/xcharter/vf/XCharter-Slanted-tosf-sc-ot1.vf +2020/08/06 | 1016 | fonts/xcharter/vf/XCharter1-Roman-tosf-ot1.vf +2020/08/06 | 1016 | fonts/xcharter/vf/XCharter1-Italic-tosf-ot1.vf +2020/08/06 | 1013 | graphics/asymptote/GUI/res/icons/chevron-with-circle-left.svg +2020/08/06 | 1012 | fonts/xcharter/vf/XCharter-Slanted-tlf-sc-ot1.vf +2020/08/06 | 1012 | fonts/xcharter/vf/XCharter-Italic-tosf-sc-ot1.vf +2020/08/06 | 1012 | fonts/xcharter/vf/XCharter-Italic-tlf-sc-ot1.vf +2020/08/06 | 1012 | fonts/xcharter/vf/XCharter1-Bold-tosf-ot1.vf +2020/08/06 | 1012 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-ot1.vf +2020/08/06 | 1010 | graphics/asymptote/examples/washermethod.asy +2020/08/06 | 100918 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma +2020/08/06 | 1008 | graphics/asymptote/doc/leastsquares.asy +2020/08/06 | 1008 | fonts/xcharter/vf/XCharter-Roman-tosf-sc-ot1.vf +2020/08/06 | 1008 | fonts/xcharter/vf/XCharter-Roman-tlf-sc-ot1.vf +2020/08/06 | 1008 | fonts/xcharter/vf/XCharter-Bold-tosf-sc-ot1.vf +2020/08/06 | 10072 | graphics/asymptote/jsfile.cc +2020/08/06 | 1005 | graphics/asymptote/doc/asy.1.begin +2020/08/06 | 1004 | fonts/xcharter/vf/XCharter-Bold-tlf-sc-ot1.vf +2020/08/06 | 1004 | fonts/xcharter/vf/XCharter1-Roman-ts1.vf +2020/08/06 | 1003 | graphics/asymptote/GUI/res/icons/eye.svg +2020/08/06 | 1000 | graphics/asymptote/doc/FAQ/Makefile +2020/08/06 | 1000 | fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-ot1.vf 2020/08/05 | 9999 | usergrps/usergrps/labels.pdf -2020/08/05 | 97375 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma -2020/08/05 | 96845 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma -2020/08/05 | 96480 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma -2020/08/05 | 956333 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma -2020/08/05 | 95398 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma -2020/08/05 | 94512 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma -2020/08/05 | 94382 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma 2020/08/05 | 941 | macros/latex/contrib/frpseudocode/README.md -2020/08/05 | 93640 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma -2020/08/05 | 93622 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma -2020/08/05 | 922274 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma 2020/08/05 | 917 | macros/latex/contrib/frpseudocode/frpseudocode.sty 2020/08/05 | 889 | fonts/notomath/doc/manifest -2020/08/05 | 88874 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma -2020/08/05 | 87981 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma -2020/08/05 | 87297 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma 2020/08/05 | 859 | macros/xetex/latex/xepersian-hm/README.txt -2020/08/05 | 8567 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma -2020/08/05 | 85158 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma -2020/08/05 | 84662 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma 2020/08/05 | 8334 | usergrps/usergrps/index.html 2020/08/05 | 8316869 | install/fonts/newtx.tds.zip -2020/08/05 | 82787 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma 2020/08/05 | 825 | fonts/notomath/tex/omlnotosansmi.fd 2020/08/05 | 8254027 | fonts/newtx.zip -2020/08/05 | 79691 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma -2020/08/05 | 79418 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma -2020/08/05 | 78101 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma -2020/08/05 | 77486 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma -2020/08/05 | 77366 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma -2020/08/05 | 77315 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma -2020/08/05 | 76797 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma 2020/08/05 | 761 | fonts/notomath/tex/omlnotomi.fd -2020/08/05 | 7549 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma -2020/08/05 | 73690 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma -2020/08/05 | 73450 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma -2020/08/05 | 72861 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma -2020/08/05 | 72612 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma -2020/08/05 | 72255 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma -2020/08/05 | 71553 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma 2020/08/05 | 715344 | install/fonts/notomath.tds.zip 2020/08/05 | 709830 | fonts/notomath.zip 2020/08/05 | 70686 | fonts/newtx/doc/newtxdoc.tex -2020/08/05 | 70139 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma -2020/08/05 | 69912 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma -2020/08/05 | 69183 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma -2020/08/05 | 68968 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma -2020/08/05 | 677579 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma -2020/08/05 | 67278 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma -2020/08/05 | 67258 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma +2020/08/05 | 694207 | systems/win32/w32tex/ChangeLog 2020/08/05 | 66682 | usergrps/usergrps/lugs.html -2020/08/05 | 66014 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma -2020/08/05 | 65818 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma -2020/08/05 | 65547 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma 2020/08/05 | 65545 | macros/xetex/latex/xepersian-hm/doc-samples-xep.pdf -2020/08/05 | 64237 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma -2020/08/05 | 638662 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma +2020/08/05 | 6469 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2020/08/05 | 63647 | macros/latex/contrib/frpseudocode.zip -2020/08/05 | 63553 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma -2020/08/05 | 63514 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma 2020/08/05 | 63436 | macros/xetex/latex/xepersian-hm/doc-samples-glyph.pdf -2020/08/05 | 63428 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma -2020/08/05 | 63360 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma -2020/08/05 | 62977 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma +2020/08/05 | 6321260 | systems/win32/w32tex/win64/pdftex-w64.tar.xz 2020/08/05 | 62967 | macros/xetex/latex/xepersian-hm/doc-samples-hrule.pdf 2020/08/05 | 62553 | macros/latex/contrib/frpseudocode/frpseudocode-example.pdf -2020/08/05 | 623928 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma -2020/08/05 | 62028 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma -2020/08/05 | 597784 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma 2020/08/05 | 59704 | macros/xetex/latex/xepersian-hm/xepersian-hm.pdf -2020/08/05 | 59342 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma -2020/08/05 | 59041 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma -2020/08/05 | 58661 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma 2020/08/05 | 585 | fonts/notomath/README -2020/08/05 | 583960 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma -2020/08/05 | 57313 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma -2020/08/05 | 57159 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma -2020/08/05 | 57148 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma -2020/08/05 | 561890 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma 2020/08/05 | 5600 | systems/texlive/tlnet/archive/beamer-rl.r56045.tar.xz -2020/08/05 | 55562 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma -2020/08/05 | 5500571 | systems/texlive/tlnet/install-tl-unx.tar.gz -2020/08/05 | 549968 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma -2020/08/05 | 544358 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma -2020/08/05 | 537457 | systems/win32/miktex/tm/packages/next/files.csv.lzma -2020/08/05 | 537434 | systems/win32/miktex/tm/packages/files.csv.lzma -2020/08/05 | 52203 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma -2020/08/05 | 51937 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma -2020/08/05 | 51421 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma -2020/08/05 | 51236 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma -2020/08/05 | 51136 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma -2020/08/05 | 50913 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma 2020/08/05 | 505 | macros/latex/contrib/frpseudocode/frpseudocode-example.tex -2020/08/05 | 500565 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma 2020/08/05 | 49917 | usergrps/usergrps/lugs.pdf -2020/08/05 | 49590 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma -2020/08/05 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 -2020/08/05 | 48085 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma -2020/08/05 | 46357 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma -2020/08/05 | 462705 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma -2020/08/05 | 460434 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma -2020/08/05 | 45775 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma -2020/08/05 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2020/08/05 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc -2020/08/05 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2020/08/05 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc -2020/08/05 | 45318 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma -2020/08/05 | 45031 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma -2020/08/05 | 43314 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma -2020/08/05 | 43074 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma -2020/08/05 | 42623 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma -2020/08/05 | 42061 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma 2020/08/05 | 4185 | macros/xetex/latex/xepersian-hm/kashida-leaders-glyph-example.tex 2020/08/05 | 4126 | macros/xetex/latex/xepersian-hm/kashida-glyph-example.tex 2020/08/05 | 4098 | macros/xetex/latex/xepersian-hm/kashida-leaders-hrule-example.tex -2020/08/05 | 40821 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma 2020/08/05 | 400450 | fonts/notomath/doc/notomath-doc.pdf -2020/08/05 | 39332 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma 2020/08/05 | 392 | systems/texlive/tlnet/archive/texlive-docindex.r56039.tar.xz -2020/08/05 | 39268 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma -2020/08/05 | 392366 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma 2020/08/05 | 39141 | fonts/notomath/type1/NotoMathMI.pfb 2020/08/05 | 38445 | fonts/notomath/type1/NotoMathBMI.pfb -2020/08/05 | 36921 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma -2020/08/05 | 36865 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma 2020/08/05 | 364 | fonts/notomath/map/NotoMath.map -2020/08/05 | 36360 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma -2020/08/05 | 360766 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma 2020/08/05 | 35569 | fonts/newtx/README -2020/08/05 | 35216 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma -2020/08/05 | 35033 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma -2020/08/05 | 34774 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma -2020/08/05 | 33089 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma -2020/08/05 | 329617 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma -2020/08/05 | 327551 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma -2020/08/05 | 32393 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma -2020/08/05 | 32351 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma +2020/08/05 | 33850480 | systems/win32/w32tex/ltxpkgs.tar.xz 2020/08/05 | 3144460 | systems/texlive/tlnet/archive/animate.doc.r56044.tar.xz -2020/08/05 | 31254 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma -2020/08/05 | 31225 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma -2020/08/05 | 31208 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma -2020/08/05 | 310934 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma 2020/08/05 | 30944 | fonts/notomath/type1/NotoSansMathMI.pfb -2020/08/05 | 30908 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma -2020/08/05 | 30889 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma 2020/08/05 | 307048 | systems/texlive/tlnet/archive/updmap-map.r56040.tar.xz -2020/08/05 | 305085 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma 2020/08/05 | 30184 | systems/texlive/tlnet/archive/animate.source.r56044.tar.xz 2020/08/05 | 29984 | fonts/notomath/type1/NotoSansMathBMI.pfb -2020/08/05 | 29636 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma -2020/08/05 | 29399 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma 2020/08/05 | 29363 | macros/xetex/latex/xepersian-hm/xepersian-hm.dtx -2020/08/05 | 29058 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma -2020/08/05 | 29027 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma -2020/08/05 | 28604 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma 2020/08/05 | 28240 | fonts/notomath/type1/NotoMathBRM.pfb -2020/08/05 | 281780 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma -2020/08/05 | 279882 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma -2020/08/05 | 27801 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma -2020/08/05 | 273697 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma -2020/08/05 | 27007 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma -2020/08/05 | 26995 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma -2020/08/05 | 269404 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma -2020/08/05 | 26852 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma +2020/08/05 | 273771768 | systems/win32/w32tex/pstricks.tar.xz 2020/08/05 | 268014 | macros/xetex/latex/xepersian-hm/xepersian-hm-doc.pdf -2020/08/05 | 26612 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma -2020/08/05 | 2657478 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma -2020/08/05 | 25504 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma -2020/08/05 | 2534479 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma -2020/08/05 | 250289 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma -2020/08/05 | 246825 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma -2020/08/05 | 243052 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma -2020/08/05 | 24269323 | systems/texlive/tlnet/install-tl.zip 2020/08/05 | 23841 | usergrps/usergrps/lugs.tex -2020/08/05 | 23599 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma 2020/08/05 | 2357 | usergrps/usergrps/labels.tex 2020/08/05 | 23356 | systems/texlive/tlnet/archive/animate.r56044.tar.xz -2020/08/05 | 22980 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma -2020/08/05 | 224087 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma 2020/08/05 | 22218 | fonts/notomath/type1/NotoSansMathBRM.pfb -2020/08/05 | 2213512 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz -2020/08/05 | 218656 | systems/texlive/tlnet/archive/texlive-scripts.doc.r56040.tar.xz 2020/08/05 | 21772 | systems/texlive/tlnet/archive/pst-3dplot.r56043.tar.xz 2020/08/05 | 2129032 | systems/texlive/tlnet/archive/pst-3dplot.doc.r56043.tar.xz -2020/08/05 | 211538 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma -2020/08/05 | 210276 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma -2020/08/05 | 20816 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma -2020/08/05 | 207672 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma -2020/08/05 | 203964 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma -2020/08/05 | 2031792 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma -2020/08/05 | 202093 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma -2020/08/05 | 202036 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma -2020/08/05 | 20006 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma -2020/08/05 | 196318 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma -2020/08/05 | 193836 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma -2020/08/05 | 19382284 | systems/texlive/tlnet/install-tl-windows.exe +2020/08/05 | 20692364 | systems/win32/w32tex/pdftex-w32.tar.xz 2020/08/05 | 1937 | macros/xetex/latex/xepersian-hm/xepersian-hm.ins -2020/08/05 | 192837 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma -2020/08/05 | 192590 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma -2020/08/05 | 189152 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma 2020/08/05 | 1882 | macros/xetex/latex/xepersian-hm/kashida-xep-XB-example.tex -2020/08/05 | 187721 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma -2020/08/05 | 184490 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma 2020/08/05 | 182652 | systems/texlive/tlnet/archive/beamer-rl.doc.r56045.tar.xz -2020/08/05 | 180900 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma -2020/08/05 | 177376 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma -2020/08/05 | 17728 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma -2020/08/05 | 17626 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma -2020/08/05 | 1746183 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma -2020/08/05 | 170418 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma -2020/08/05 | 169656 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma 2020/08/05 | 168036 | systems/texlive/tlnet/archive/texlive-docindex.doc.r56039.tar.xz 2020/08/05 | 16743 | fonts/notomath/type1/NotoMathRM.pfb -2020/08/05 | 165592 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma -2020/08/05 | 16360422 | systems/texlive/tlnet/tlpkg/texlive.tlpdb -2020/08/05 | 16022 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma -2020/08/05 | 159878 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma -2020/08/05 | 15948 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma -2020/08/05 | 154417 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma -2020/08/05 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2020/08/05 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 2020/08/05 | 15233 | fonts/notomath/doc/notomath-doc.tex -2020/08/05 | 151862 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma -2020/08/05 | 151837 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma 2020/08/05 | 149502 | macros/xetex/latex/xepersian-hm/kashida-glyph-example.pdf 2020/08/05 | 147896 | macros/xetex/latex/xepersian-hm/kashida-leaders-hrule-example.pdf 2020/08/05 | 14657 | fonts/notomath/type1/NotoSansMathRM.pfb -2020/08/05 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 2020/08/05 | 145149 | macros/xetex/latex/xepersian-hm/kashida-leaders-glyph-example.pdf -2020/08/05 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2020/08/05 | 141852 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma -2020/08/05 | 14131 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma -2020/08/05 | 1404301 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma 2020/08/05 | 13827 | macros/xetex/latex/xepersian-hm/xepersian-hm-doc.ltx -2020/08/05 | 133656 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma -2020/08/05 | 1325257 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma -2020/08/05 | 132036 | systems/texlive/tlnet/archive/texlive-scripts.r56040.tar.xz -2020/08/05 | 13129 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma 2020/08/05 | 13119 | macros/xetex/latex/xepersian-hm/doc-ligature-xephm.pdf -2020/08/05 | 130358 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma 2020/08/05 | 12741 | usergrps/usergrps/pl.html 2020/08/05 | 12736 | usergrps/usergrps/de.html 2020/08/05 | 12713 | usergrps/usergrps/cz.html 2020/08/05 | 12712 | usergrps/usergrps/hu.html -2020/08/05 | 1265431 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma 2020/08/05 | 12616 | usergrps/usergrps/gr.html 2020/08/05 | 12542 | usergrps/usergrps/fr.html 2020/08/05 | 12514 | usergrps/usergrps/kr.html @@ -269,29 +2160,11 @@ 2020/08/05 | 12154 | usergrps/usergrps/uy.html 2020/08/05 | 12120 | usergrps/usergrps/mx.html 2020/08/05 | 12114 | usergrps/usergrps/kh.html -2020/08/05 | 1206373 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma -2020/08/05 | 1206355 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma 2020/08/05 | 12024 | usergrps/usergrps/ee.html 2020/08/05 | 1193 | macros/xetex/latex/xepersian-hm/INSTALL.txt -2020/08/05 | 1192973 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma 2020/08/05 | 1177425 | fonts/newtx/doc/newtxdoc.pdf -2020/08/05 | 116786 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma -2020/08/05 | 115881 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma -2020/08/05 | 1155 | systems/win32/miktex/tm/packages/pr.ini -2020/08/05 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini -2020/08/05 | 113579 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma -2020/08/05 | 1124956 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma -2020/08/05 | 1124817 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma -2020/08/05 | 109731 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma -2020/08/05 | 108991 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma -2020/08/05 | 1061412 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma 2020/08/05 | 1046300 | macros/xetex/latex/xepersian-hm.zip -2020/08/05 | 104547 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma -2020/08/05 | 102588 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma -2020/08/05 | 1021969 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma -2020/08/05 | 101783 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma 2020/08/05 | 10115 | macros/xetex/latex/xepersian-hm/doc-ligature-xep.pdf -2020/08/05 | 100917 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma 2020/08/05 | 100197 | macros/xetex/latex/xepersian-hm/kashida-xep-XB-example.pdf 2020/08/04 | 974760 | info/biblio/texbook3.bib 2020/08/04 | 93204 | graphics/pstricks/contrib/pst-3dplot/tex/pst-3dplot.tex @@ -306,6 +2179,7 @@ 2020/08/04 | 551 | graphics/pstricks/contrib/pst-3dplot/latex/pst-3dplot.sty 2020/08/04 | 486 | graphics/pstricks/contrib/pst-3dplot/README 2020/08/04 | 472 | systems/texlive/tlnet/archive/lshort-chinese.r56036.tar.xz +2020/08/04 | 45599024 | systems/win32/w32tex/latex-dev.tar.xz 2020/08/04 | 4137 | graphics/pstricks/contrib/pst-3dplot/doc/pst-3dplot-doc.bib 2020/08/04 | 3912 | info/biblio/texbook3.ltx 2020/08/04 | 3898615 | macros/latex/contrib/animate/animate.pdf @@ -330,13 +2204,15 @@ 2020/08/04 | 25498 | graphics/pstricks/contrib/pst-3dplot/dvips/pst-3dplot.pro 2020/08/04 | 2382647 | graphics/pstricks/contrib/pst-3dplot/doc/pst-3dplot-doc.pdf 2020/08/04 | 233286 | macros/luatex/latex/beamer-rl.zip +2020/08/04 | 2306 | support/pkfix-helper/README 2020/08/04 | 2202012 | graphics/pstricks/contrib/pst-3dplot.zip +2020/08/04 | 2147600 | systems/win32/w32tex/win64/context-w64.tar.xz 2020/08/04 | 209036 | macros/latex/contrib/translator/translator.pdf 2020/08/04 | 1780 | systems/mac/mactex/Licenses.txt 2020/08/04 | 15412 | macros/luatex/latex/beamer-rl/Example-of-use-ar.tex 2020/08/04 | 1539324 | systems/texlive/tlnet/archive/lshort-chinese.doc.r56036.tar.xz 2020/08/04 | 14639 | macros/luatex/latex/beamer-rl/beamer-rl.cls -2020/08/04 | 140495696 | systems/win32/w32tex/context.tar.xz +2020/08/04 | 140493980 | systems/win32/w32tex/context.tar.xz 2020/08/04 | 13992 | systems/texlive/tlnet/archive/apa7.r56037.tar.xz 2020/08/04 | 136881 | macros/latex/contrib/animate/animate.sty 2020/08/04 | 129688 | macros/luatex/latex/beamer-rl/Example-of-use-ar.pdf @@ -351,10 +2227,8 @@ 2020/08/03 | 752 | fonts/almendra/vf/Almndr-Italic-osf-ot1.vf 2020/08/03 | 748 | fonts/almendra/vf/Almndr-Bold-osf-ot1.vf 2020/08/03 | 725432 | systems/texlive/tlnet/archive/install-latex-guide-zh-cn.doc.r56027.tar.xz -2020/08/03 | 693835 | systems/win32/w32tex/ChangeLog 2020/08/03 | 69278612 | systems/win32/w32tex/luatexja.tar.xz 2020/08/03 | 675572 | systems/texlive/tlnet/archive/forum.r56025.tar.xz -2020/08/03 | 6633 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2020/08/03 | 62607 | fonts/almendra/type1/Almndr-Regular.pfb 2020/08/03 | 57324 | fonts/almendra/truetype/Almendra-Regular.ttf 2020/08/03 | 568 | systems/texlive/tlnet/archive/install-latex-guide-zh-cn.r56027.tar.xz @@ -486,7 +2360,6 @@ 2020/08/02 | 687538 | macros/luatex/generic/luatexja/doc/luatexja-en.pdf 2020/08/02 | 64106 | macros/latex/contrib/apa7/samples/shortsample.pdf 2020/08/02 | 6374 | macros/latex/contrib/apa7/apa7.ins -2020/08/02 | 6324784 | systems/win32/w32tex/win64/pdftex-w64.tar.xz 2020/08/02 | 617 | macros/luatex/generic/luatexja/src/patches/lltjp-array.sty 2020/08/02 | 6074 | macros/luatex/generic/luatexja/src/patches/lltjdefs.sty 2020/08/02 | 6060 | macros/luatex/generic/luatexja/tool/kyoikukanjiChars.tex @@ -590,7 +2463,6 @@ 2020/08/02 | 22987 | info/lshort/chinese/src/chap/fdl.tex 2020/08/02 | 2207 | macros/luatex/generic/luatexja/src/jfm-CCT.lua 2020/08/02 | 2193 | macros/luatex/generic/luatexja/src/addons/luatexja-zhfonts.sty -2020/08/02 | 20663188 | systems/win32/w32tex/pdftex-w32.tar.xz 2020/08/02 | 2060 | macros/luatex/generic/luatexja/src/patches/lltjp-atbegshi.sty 2020/08/02 | 2057 | macros/luatex/generic/luatexja/src/patches/lltjp-microtype.sty 2020/08/02 | 2036 | fonts/bitter/tfm/Bttr-Italic-tlf-ly1.tfm @@ -1072,7 +2944,6 @@ 2020/07/31 | 8184 | systems/texlive/tlnet/archive/marathi.source.r55998.tar.xz 2020/07/31 | 8118 | macros/latex/contrib/tcolorbox/tcbhooks.code.tex 2020/07/31 | 80456 | systems/texlive/tlnet/archive/marathi.doc.r55998.tar.xz -2020/07/31 | 803616 | systems/win32/w32tex/win64/dvipdfm-w64.tar.xz 2020/07/31 | 793307 | install/fonts/lobster2.tds.zip 2020/07/31 | 7928 | macros/latex/contrib/tcolorbox/tcolorbox.doc.graphics.tex 2020/07/31 | 7880 | fonts/playfair/tfm/PlyfrDisplay-Black-osf-sc-ot1.tfm @@ -1102,7 +2973,6 @@ 2020/07/31 | 6691 | macros/latex/contrib/tcolorbox/tcolorbox.doc.s_snippet.sty 2020/07/31 | 65796 | fonts/playfair/tfm/PlyfrDisplay-Bold-osf-t1.tfm 2020/07/31 | 65620 | fonts/playfair/tfm/PlyfrDisplay-Bold-lf-t1.tfm -2020/07/31 | 6476204 | systems/win32/w32tex/ptex-ng-w32.tar.xz 2020/07/31 | 6424 | macros/latex/contrib/tcolorbox/tcolorbox.doc.beamer.tex 2020/07/31 | 6386 | macros/latex/contrib/tcolorbox/tcolorbox.doc.recording.tex 2020/07/31 | 62882 | macros/latex/contrib/tcolorbox/blueshade.png @@ -1149,11 +3019,9 @@ 2020/07/31 | 5136 | fonts/playfair/tfm/PlyfrDisplay-BoldItalic-lf-sc-ot1.tfm 2020/07/31 | 5135 | fonts/playfair/latex/T1PlyfrDisplay-LF.fd 2020/07/31 | 50204 | systems/texlive/tlnet/archive/fontools.r55997.tar.xz -2020/07/31 | 48804976 | systems/win32/w32tex/xetex-w32.tar.xz 2020/07/31 | 48776 | fonts/playfair/tfm/PlyfrDisplay-Bold-osf-ly1.tfm 2020/07/31 | 48492 | fonts/playfair/tfm/PlyfrDisplay-Bold-lf-ly1.tfm 2020/07/31 | 4802 | fonts/librecaslon/latex/librecaslon.sty -2020/07/31 | 4662076 | systems/win32/w32tex/dvipdfm-w32.tar.xz 2020/07/31 | 457487 | macros/latex/contrib/tcolorbox/tcolorbox-example.pdf 2020/07/31 | 456378 | macros/latex/contrib/nicematrix/nicematrix.dtx 2020/07/31 | 45164 | fonts/playfair/tfm/PlyfrDisplay-Black-osf-ly1.tfm @@ -1189,7 +3057,6 @@ 2020/07/31 | 35224 | macros/latex/contrib/tcolorbox/lichtspiel.jpg 2020/07/31 | 3448 | macros/latex/contrib/tcolorbox/tcolorbox.doc.verbatim.tex 2020/07/31 | 3412 | macros/latex/contrib/tcolorbox/tcblistings.code.tex -2020/07/31 | 33836960 | systems/win32/w32tex/ltxpkgs.tar.xz 2020/07/31 | 33492 | macros/latex/contrib/tcolorbox/tcbbreakable.code.tex 2020/07/31 | 32893 | macros/latex/contrib/tcolorbox/tcolorbox.doc.raster.tex 2020/07/31 | 3288 | fonts/notomath/tfm/notobmi.tfm @@ -1239,7 +3106,6 @@ 2020/07/31 | 2605 | fonts/quattrocento/README 2020/07/31 | 25913 | macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex 2020/07/31 | 25816 | macros/latex/contrib/tcolorbox/tcolorbox.doc.external.tex -2020/07/31 | 2580392 | systems/win32/w32tex/tex4htk-w32.tar.xz 2020/07/31 | 25748 | fonts/playfair/tfm/PlyfrDisplay-Regular-osf-sc-ly1.tfm 2020/07/31 | 2564 | macros/latex/contrib/tcolorbox/tcbprocessing.code.tex 2020/07/31 | 25596 | fonts/playfair/tfm/PlyfrDisplay-Regular-lf-sc-ly1.tfm @@ -1393,7 +3259,6 @@ 2020/07/31 | 1712 | fonts/playfair/vf/PlyfrDisplay-Black-osf-sc-t1.vf 2020/07/31 | 1712 | fonts/playfair/vf/PlyfrDisplay-Black-lf-sc-t1.vf 2020/07/31 | 1708 | fonts/playfair/vf/PlyfrDisplay-Bold-lf-sc-t1.vf -2020/07/31 | 1707820 | systems/win32/w32tex/win64/ptex-ng-w64.tar.xz 2020/07/31 | 17052 | fonts/playfair/tfm/PlyfrDisplay-Italic-osf-ly1.tfm 2020/07/31 | 1704 | fonts/playfair/vf/PlyfrDisplay-BlackItalic-sup-t1.vf 2020/07/31 | 1700 | fonts/playfair/vf/PlyfrDisplay-Regular-sup-t1.vf @@ -1514,281 +3379,6 @@ 2020/07/31 | 111128 | fonts/merriweather/doc/merriweather-samples.pdf 2020/07/31 | 1106 | macros/latex/contrib/tcolorbox/tcolorbox.doc.picturecredits.tex 2020/07/31 | 1100 | fonts/merriweather/doc/merriweather-samples.tex -2020/07/31 | 10984868 | systems/win32/w32tex/win64/xetex-w64.tar.xz 2020/07/31 | 1076 | fonts/notomath/tfm/NotoMathBRM.tfm 2020/07/31 | 1056 | fonts/notomath/tfm/NotoSansMathBRM.tfm 2020/07/31 | 10004 | macros/latex/contrib/tcolorbox/tcbxparse.code.tex -2020/07/30 | 96460 | fonts/lobster2/doc/lobster2-samples.pdf -2020/07/30 | 95186 | language/marathi.zip -2020/07/30 | 9442 | language/marathi/namuna-book.tex -2020/07/30 | 9375 | language/marathi/namuna-article.tex -2020/07/30 | 908040 | systems/texlive/tlnet/archive/witharrows.doc.r55987.tar.xz -2020/07/30 | 90400 | fonts/merriweather/truetype/MerriweatherSans-BoldItalic.ttf -2020/07/30 | 90264 | fonts/merriweather/truetype/MerriweatherSans-ExBoldIt.ttf -2020/07/30 | 89820 | fonts/merriweather/truetype/MerriweatherSans-Italic.ttf -2020/07/30 | 89356 | fonts/merriweather/truetype/MerriweatherSans-LightItalic.ttf -2020/07/30 | 88316 | fonts/merriweather/truetype/MerriweatherSans-Regular.ttf -2020/07/30 | 88188 | fonts/merriweather/truetype/MerriweatherSans-ExtraBold.ttf -2020/07/30 | 88132 | fonts/merriweather/truetype/MerriweatherSans-Bold.ttf -2020/07/30 | 87752 | fonts/merriweather/truetype/MerriweatherSans-Light.ttf -2020/07/30 | 86073 | macros/latex/contrib/ltx4yt/examples/web-pkg/ltx4yt-w2.pdf -2020/07/30 | 810948 | systems/texlive/tlnet/archive/clefval.doc.r55985.tar.xz -2020/07/30 | 8076 | systems/texlive/tlnet/archive/clefval.source.r55985.tar.xz -2020/07/30 | 80005 | language/marathi/marathi.pdf -2020/07/30 | 78328 | fonts/merriweather/type1/MerriwthrSans-LightItalic.pfb -2020/07/30 | 77839 | fonts/merriweather/type1/MerriwthrSans-BoldItalic.pfb -2020/07/30 | 77136 | fonts/merriweather/type1/MerriwthrSans-ExtraBold.pfb -2020/07/30 | 76529 | fonts/merriweather/type1/MerriwthrSans-ExBoldIt.pfb -2020/07/30 | 76519 | fonts/merriweather/type1/MerriwthrSans-Regular.pfb -2020/07/30 | 76279 | fonts/merriweather/type1/MerriwthrSans-Light.pfb -2020/07/30 | 76203 | fonts/merriweather/type1/MerriwthrSans-Bold.pfb -2020/07/30 | 75833 | fonts/merriweather/type1/MerriwthrSans-Italic.pfb -2020/07/30 | 692 | language/marathi/table.tex -2020/07/30 | 667 | macros/latex/contrib/ltx4yt/README.md -2020/07/30 | 6136 | macros/latex/contrib/ejpecp/README -2020/07/30 | 5896 | systems/texlive/tlnet/archive/annee-scolaire.source.r55988.tar.xz -2020/07/30 | 572 | fonts/merriweather/vf/Merriwthr-UltraBold-osf-ts1.vf -2020/07/30 | 572 | fonts/merriweather/vf/Merriwthr-UltraBdIt-osf-ts1.vf -2020/07/30 | 572 | fonts/merriweather/vf/Merriwthr-Regular-osf-ts1.vf -2020/07/30 | 572 | fonts/merriweather/vf/Merriwthr-LightIt-osf-ts1.vf -2020/07/30 | 572 | fonts/merriweather/vf/Merriwthr-BoldItalic-osf-ts1.vf -2020/07/30 | 568 | fonts/merriweather/vf/Merriwthr-Light-osf-ts1.vf -2020/07/30 | 568 | fonts/merriweather/vf/Merriwthr-Italic-osf-ts1.vf -2020/07/30 | 568 | fonts/merriweather/vf/Merriwthr-Bold-osf-ts1.vf -2020/07/30 | 532 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-ts1.vf -2020/07/30 | 528 | fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-ts1.vf -2020/07/30 | 524 | fonts/merriweather/vf/MerriwthrSans-Regular-osf-ts1.vf -2020/07/30 | 524 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-ts1.vf -2020/07/30 | 524 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-ts1.vf -2020/07/30 | 52348 | systems/texlive/tlnet/archive/witharrows.source.r55987.tar.xz -2020/07/30 | 520 | fonts/merriweather/vf/MerriwthrSans-Light-osf-ts1.vf -2020/07/30 | 520 | fonts/merriweather/vf/MerriwthrSans-Italic-osf-ts1.vf -2020/07/30 | 520 | fonts/merriweather/vf/MerriwthrSans-Bold-osf-ts1.vf -2020/07/30 | 496920 | systems/texlive/tlnet/archive/babel-german.doc.r55989.tar.xz -2020/07/30 | 4450 | fonts/merriweather/doc/OFL.txt -2020/07/30 | 3944 | macros/latex/contrib/ltx4yt/examples/web-pkg/ltx4yt-w2.tex -2020/07/30 | 3920 | systems/texlive/tlnet/archive/babel-german.r55989.tar.xz -2020/07/30 | 3810 | fonts/merriweather/latex/TS1MerriwthrSans-OsF.fd -2020/07/30 | 3810 | fonts/merriweather/latex/OT1MerriwthrSans-Sup.fd -2020/07/30 | 3810 | fonts/merriweather/latex/OT1MerriwthrSans-OsF.fd -2020/07/30 | 3810 | fonts/merriweather/latex/LY1MerriwthrSans-Sup.fd -2020/07/30 | 3810 | fonts/merriweather/latex/LY1MerriwthrSans-OsF.fd -2020/07/30 | 3772 | fonts/merriweather/latex/T1MerriwthrSans-Sup.fd -2020/07/30 | 3772 | fonts/merriweather/latex/T1MerriwthrSans-OsF.fd -2020/07/30 | 35585 | language/marathi/marathi.dtx -2020/07/30 | 3524 | fonts/merriweather/latex/TS1Merriwthr-OsF.fd -2020/07/30 | 3524 | fonts/merriweather/latex/OT1Merriwthr-OsF.fd -2020/07/30 | 3524 | fonts/merriweather/latex/LY1Merriwthr-OsF.fd -2020/07/30 | 3486 | fonts/merriweather/latex/T1Merriwthr-OsF.fd -2020/07/30 | 32330 | macros/latex/contrib/ltx4yt/docs/ltx4yt-man.tex -2020/07/30 | 3211 | fonts/merriweather/enc/mwthr_n7ujmb.enc -2020/07/30 | 3201 | fonts/merriweather/enc/mwthr_u54ue6.enc -2020/07/30 | 315917 | macros/latex/contrib/ejpecp.zip -2020/07/30 | 3039 | fonts/merriweather/enc/mwthr_vi456v.enc -2020/07/30 | 3027 | fonts/merriweather/enc/mwthr_44qg5v.enc -2020/07/30 | 2992 | fonts/merriweather/enc/mwthr_3g4t7f.enc -2020/07/30 | 2980 | fonts/merriweather/enc/mwthr_zwbe7j.enc -2020/07/30 | 2980 | fonts/merriweather/enc/mwthr_iuohxq.enc -2020/07/30 | 2933 | fonts/merriweather/enc/mwthr_7ytifx.enc -2020/07/30 | 2919 | fonts/merriweather/enc/mwthr_hzrl5s.enc -2020/07/30 | 2893 | fonts/merriweather/enc/mwthr_tvbl63.enc -2020/07/30 | 2857 | fonts/merriweather/enc/mwthr_clyrx2.enc -2020/07/30 | 2844 | fonts/merriweather/enc/mwthr_czxicq.enc -2020/07/30 | 2770 | fonts/merriweather/enc/mwthr_6upxhe.enc -2020/07/30 | 2753 | language/marathi/marathi.ins -2020/07/30 | 27185 | macros/latex/contrib/ltx4yt/ltx4yt.dtx -2020/07/30 | 2683 | macros/latex/contrib/ltx4yt/examples/web-pkg/ltx4yt-w1.tex -2020/07/30 | 2556 | macros/latex/contrib/ejpecp/ejpecp.ins -2020/07/30 | 2546 | macros/latex/contrib/ltx4yt/examples/ltx4yt-1.tex -2020/07/30 | 2461 | language/marathi/README.txt -2020/07/30 | 242168 | macros/latex/contrib/ltx4yt/docs/ltx4yt-man.pdf -2020/07/30 | 23644 | macros/latex/contrib/ejpecp/sample.tex -2020/07/30 | 2312916 | macros/latex/contrib/ltx4yt.zip -2020/07/30 | 21851 | fonts/merriweather/map/merriweather.map -2020/07/30 | 2172 | language/marathi/namuna-beamer.tex -2020/07/30 | 2084 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-t1.tfm -2020/07/30 | 2084 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ly1.tfm -2020/07/30 | 2060 | fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ly1.tfm -2020/07/30 | 2060 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-t1.tfm -2020/07/30 | 2052 | fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-t1.tfm -2020/07/30 | 2048 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ly1.tfm -2020/07/30 | 2036 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ly1.tfm -2020/07/30 | 2028 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-t1.tfm -2020/07/30 | 2016 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-t1--base.tfm -2020/07/30 | 2004 | fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-t1--base.tfm -2020/07/30 | 1996 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-t1.tfm -2020/07/30 | 1994 | language/marathi/namuna-letter.tex -2020/07/30 | 1992 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-t1--base.tfm -2020/07/30 | 1992 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-t1--base.tfm -2020/07/30 | 1984 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-ly1.tfm -2020/07/30 | 1980 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ly1.tfm -2020/07/30 | 1980 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-t1--base.tfm -2020/07/30 | 1976 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-t1.tfm -2020/07/30 | 1972 | language/marathi/glossaries.gls -2020/07/30 | 1972 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-t1--base.tfm -2020/07/30 | 1972 | fonts/merriweather/tfm/Merriwthr-Italic-osf-t1.tfm -2020/07/30 | 1968 | fonts/merriweather/tfm/Merriwthr-Italic-osf-ly1.tfm -2020/07/30 | 1964 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ly1.tfm -2020/07/30 | 1956 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-t1.tfm -2020/07/30 | 1952 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-ly1.tfm -2020/07/30 | 1948 | fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ly1.tfm -2020/07/30 | 1944 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-t1.tfm -2020/07/30 | 19421 | macros/latex/contrib/ejpecp/ejpecp.dtx -2020/07/30 | 1940 | fonts/merriweather/tfm/Merriwthr-LightIt-osf-t1.tfm -2020/07/30 | 1936 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ly1.tfm -2020/07/30 | 1936 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ly1.tfm -2020/07/30 | 1936 | fonts/merriweather/tfm/Merriwthr-Bold-osf-ly1.tfm -2020/07/30 | 1928 | fonts/merriweather/tfm/Merriwthr-LightIt-osf-ly1.tfm -2020/07/30 | 1924 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-t1.tfm -2020/07/30 | 1924 | fonts/merriweather/tfm/Merriwthr-Regular-osf-ly1.tfm -2020/07/30 | 1924 | fonts/merriweather/tfm/Merriwthr-Italic-osf-t1--base.tfm -2020/07/30 | 1908 | fonts/merriweather/tfm/Merriwthr-UltraBold-osf-t1.tfm -2020/07/30 | 1908 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-ly1.tfm -2020/07/30 | 1908 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-t1.tfm -2020/07/30 | 1900 | fonts/merriweather/tfm/Merriwthr-Light-osf-ly1.tfm -2020/07/30 | 1896 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-ly1.tfm -2020/07/30 | 1892 | fonts/merriweather/tfm/Merriwthr-LightIt-osf-t1--base.tfm -2020/07/30 | 1888 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ly1.tfm -2020/07/30 | 1888 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-t1--base.tfm -2020/07/30 | 1884 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-t1.tfm -2020/07/30 | 1884 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-t1.tfm -2020/07/30 | 1884 | fonts/merriweather/tfm/Merriwthr-Regular-osf-t1.tfm -2020/07/30 | 1884 | fonts/merriweather/tfm/Merriwthr-Bold-osf-t1.tfm -2020/07/30 | 1880 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-t1--base.tfm -2020/07/30 | 1876 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-t1--base.tfm -2020/07/30 | 1868 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-ly1.tfm -2020/07/30 | 1860 | fonts/merriweather/tfm/Merriwthr-UltraBold-osf-t1--base.tfm -2020/07/30 | 1860 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-t1.tfm -2020/07/30 | 1860 | fonts/merriweather/tfm/MerriwthrSans-Italic-sup-t1.tfm -2020/07/30 | 1860 | fonts/merriweather/tfm/Merriwthr-Light-osf-t1.tfm -2020/07/30 | 1856 | fonts/merriweather/tfm/MerriwthrSans-Italic-sup-t1--base.tfm -2020/07/30 | 1856 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-t1--base.tfm -2020/07/30 | 1848 | fonts/merriweather/tfm/MerriwthrSans-Italic-sup-ly1.tfm -2020/07/30 | 1840 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-t1.tfm -2020/07/30 | 1840 | fonts/merriweather/tfm/MerriwthrSans-Bold-sup-ly1.tfm -2020/07/30 | 1840 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-t1--base.tfm -2020/07/30 | 1838044 | macros/latex/contrib/ltx4yt/docs/ltx4yt.pdf -2020/07/30 | 1836 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-t1--base.tfm -2020/07/30 | 1836 | fonts/merriweather/tfm/Merriwthr-Regular-osf-t1--base.tfm -2020/07/30 | 1836 | fonts/merriweather/tfm/Merriwthr-Bold-osf-t1--base.tfm -2020/07/30 | 1820 | fonts/merriweather/tfm/MerriwthrSans-Bold-sup-t1.tfm -2020/07/30 | 1816 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-t1--base.tfm -2020/07/30 | 1816 | fonts/merriweather/tfm/MerriwthrSans-Bold-sup-t1--base.tfm -2020/07/30 | 1812 | fonts/merriweather/tfm/MerriwthrSans-Light-sup-ly1.tfm -2020/07/30 | 1812 | fonts/merriweather/tfm/Merriwthr-Light-osf-t1--base.tfm -2020/07/30 | 1796 | fonts/merriweather/tfm/MerriwthrSans-Light-sup-t1.tfm -2020/07/30 | 1792 | fonts/merriweather/tfm/MerriwthrSans-Regular-sup-ly1.tfm -2020/07/30 | 1792 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-t1--base.tfm -2020/07/30 | 1792 | fonts/merriweather/tfm/MerriwthrSans-Light-sup-t1--base.tfm -2020/07/30 | 1772 | fonts/merriweather/tfm/MerriwthrSans-Regular-sup-t1.tfm -2020/07/30 | 1768 | fonts/merriweather/tfm/MerriwthrSans-Regular-sup-t1--base.tfm -2020/07/30 | 175092 | fonts/merriweather/truetype/Merriweather-LightIt.ttf -2020/07/30 | 175076 | fonts/merriweather/truetype/Merriweather-BoldIt.ttf -2020/07/30 | 174436 | fonts/merriweather/truetype/Merriweather-UltraBdIt.ttf -2020/07/30 | 174316 | fonts/merriweather/truetype/Merriweather-Italic.ttf -2020/07/30 | 1728 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-osf-t1.vf -2020/07/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-LightItalic-osf-t1.vf -2020/07/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-osf-t1.vf -2020/07/30 | 1724 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-osf-t1.vf -2020/07/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Regular-osf-t1.vf -2020/07/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Light-osf-t1.vf -2020/07/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Italic-osf-t1.vf -2020/07/30 | 1720 | fonts/merriweather/vf/MerriwthrSans-Bold-osf-t1.vf -2020/07/30 | 170180 | fonts/merriweather/truetype/Merriweather-UltraBold.ttf -2020/07/30 | 1700 | fonts/merriweather/vf/MerriwthrSans-ExtraBoldItalic-sup-t1.vf -2020/07/30 | 170016 | fonts/merriweather/truetype/Merriweather-Regular.ttf -2020/07/30 | 1696 | fonts/merriweather/vf/MerriwthrSans-LightItalic-sup-t1.vf -2020/07/30 | 1696 | fonts/merriweather/vf/MerriwthrSans-BoldItalic-sup-t1.vf -2020/07/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-Regular-sup-t1.vf -2020/07/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-Italic-sup-t1.vf -2020/07/30 | 1692 | fonts/merriweather/vf/MerriwthrSans-ExtraBold-sup-t1.vf -2020/07/30 | 1692 | fonts/merriweather/vf/Merriwthr-BoldItalic-osf-t1.vf -2020/07/30 | 1688 | fonts/merriweather/vf/Merriwthr-UltraBold-osf-t1.vf -2020/07/30 | 1688 | fonts/merriweather/vf/Merriwthr-UltraBdIt-osf-t1.vf -2020/07/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-Light-sup-t1.vf -2020/07/30 | 1688 | fonts/merriweather/vf/MerriwthrSans-Bold-sup-t1.vf -2020/07/30 | 1688 | fonts/merriweather/vf/Merriwthr-Regular-osf-t1.vf -2020/07/30 | 1688 | fonts/merriweather/vf/Merriwthr-LightIt-osf-t1.vf -2020/07/30 | 1688 | fonts/merriweather/vf/Merriwthr-Italic-osf-t1.vf -2020/07/30 | 168640 | fonts/merriweather/truetype/Merriweather-Light.ttf -2020/07/30 | 1684 | fonts/merriweather/vf/Merriwthr-Light-osf-t1.vf -2020/07/30 | 1684 | fonts/merriweather/vf/Merriwthr-Bold-osf-t1.vf -2020/07/30 | 167640 | fonts/merriweather/truetype/Merriweather-Bold.ttf -2020/07/30 | 155743 | macros/latex/contrib/ejpecp/sample.pdf -2020/07/30 | 15502 | CTAN.sites -2020/07/30 | 1540 | systems/texlive/tlnet/archive/clefval.r55985.tar.xz -2020/07/30 | 1524 | fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ot1.tfm -2020/07/30 | 1512 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ot1.tfm -2020/07/30 | 1504 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ot1.tfm -2020/07/30 | 14880 | systems/texlive/tlnet/archive/babel-german.source.r55989.tar.xz -2020/07/30 | 1480 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ot1.tfm -2020/07/30 | 14548 | systems/texlive/tlnet/archive/witharrows.r55987.tar.xz -2020/07/30 | 1452 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ot1.tfm -2020/07/30 | 1452 | fonts/merriweather/tfm/Merriwthr-Italic-osf-ot1.tfm -2020/07/30 | 1444 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ot1.tfm -2020/07/30 | 14439 | macros/latex/contrib/ejpecp/LPPL -2020/07/30 | 1440 | fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ts1.tfm -2020/07/30 | 1436 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-sup-ot1.tfm -2020/07/30 | 1432 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ts1.tfm -2020/07/30 | 1432 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ts1.tfm -2020/07/30 | 1428 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ot1.tfm -2020/07/30 | 1428 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ot1.tfm -2020/07/30 | 1428 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ts1.tfm -2020/07/30 | 1428 | fonts/merriweather/tfm/Merriwthr-LightIt-osf-ot1.tfm -2020/07/30 | 1424 | fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ts1.tfm -2020/07/30 | 1424 | fonts/merriweather/tfm/Merriwthr-Bold-osf-ts1.tfm -2020/07/30 | 1420 | fonts/merriweather/tfm/Merriwthr-UltraBdIt-osf-ts1--base.tfm -2020/07/30 | 1420 | fonts/merriweather/tfm/MerriwthrSans-ExtraBoldItalic-osf-ts1--base.tfm -2020/07/30 | 1420 | fonts/merriweather/tfm/Merriwthr-Regular-osf-ts1.tfm -2020/07/30 | 1416 | fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ot1.tfm -2020/07/30 | 1416 | fonts/merriweather/tfm/Merriwthr-Light-osf-ts1.tfm -2020/07/30 | 1416 | fonts/merriweather/tfm/Merriwthr-Italic-osf-ts1.tfm -2020/07/30 | 1412 | fonts/merriweather/tfm/Merriwthr-UltraBold-osf-ts1--base.tfm -2020/07/30 | 1412 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-osf-ts1--base.tfm -2020/07/30 | 1412 | fonts/merriweather/tfm/Merriwthr-Regular-osf-ts1--base.tfm -2020/07/30 | 1412 | fonts/merriweather/tfm/Merriwthr-Bold-osf-ts1--base.tfm -2020/07/30 | 1412 | fonts/merriweather/tfm/Merriwthr-BoldItalic-osf-ts1--base.tfm -2020/07/30 | 141029 | fonts/merriweather/type1/Merriwthr-LightIt.pfb -2020/07/30 | 1408 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ts1.tfm -2020/07/30 | 1408 | fonts/merriweather/tfm/MerriwthrSans-BoldItalic-sup-ot1.tfm -2020/07/30 | 140757 | fonts/merriweather/type1/Merriwthr-BoldIt.pfb -2020/07/30 | 140571 | fonts/merriweather/type1/Merriwthr-Italic.pfb -2020/07/30 | 1404 | systems/texlive/tlnet/archive/annee-scolaire.r55988.tar.xz -2020/07/30 | 1404 | fonts/merriweather/tfm/Merriwthr-Light-osf-ts1--base.tfm -2020/07/30 | 140313 | fonts/merriweather/type1/Merriwthr-UltraBdIt.pfb -2020/07/30 | 1400 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-ot1.tfm -2020/07/30 | 1400 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ts1.tfm -2020/07/30 | 1400 | fonts/merriweather/tfm/Merriwthr-LightIt-osf-ts1.tfm -2020/07/30 | 1400 | fonts/merriweather/tfm/Merriwthr-Italic-osf-ts1--base.tfm -2020/07/30 | 1396 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ot1.tfm -2020/07/30 | 1396 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-osf-ts1--base.tfm -2020/07/30 | 1396 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ts1.tfm -2020/07/30 | 1396 | fonts/merriweather/tfm/Merriwthr-Regular-osf-ot1.tfm -2020/07/30 | 1396 | fonts/merriweather/tfm/Merriwthr-Bold-osf-ot1.tfm -2020/07/30 | 1392 | fonts/merriweather/tfm/MerriwthrSans-LightItalic-sup-ot1.tfm -2020/07/30 | 1392 | fonts/merriweather/tfm/Merriwthr-Light-osf-ot1.tfm -2020/07/30 | 1384 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-ts1.tfm -2020/07/30 | 1384 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ts1.tfm -2020/07/30 | 1384 | fonts/merriweather/tfm/Merriwthr-LightIt-osf-ts1--base.tfm -2020/07/30 | 138139 | macros/latex/contrib/ejpecp/ejpecp.pdf -2020/07/30 | 1380 | fonts/merriweather/tfm/MerriwthrSans-Italic-osf-ts1--base.tfm -2020/07/30 | 1380 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-osf-ts1--base.tfm -2020/07/30 | 1372 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ts1.tfm -2020/07/30 | 1372 | fonts/merriweather/tfm/MerriwthrSans-ExtraBold-sup-ot1.tfm -2020/07/30 | 1364 | fonts/merriweather/tfm/MerriwthrSans-Light-osf-ts1--base.tfm -2020/07/30 | 1364 | fonts/merriweather/tfm/MerriwthrSans-Bold-osf-ts1--base.tfm -2020/07/30 | 1356 | fonts/merriweather/tfm/MerriwthrSans-Italic-sup-ot1.tfm -2020/07/30 | 1352 | fonts/merriweather/tfm/MerriwthrSans-Regular-osf-ts1--base.tfm -2020/07/30 | 1352 | fonts/merriweather/tfm/MerriwthrSans-Bold-sup-ot1.tfm -2020/07/30 | 134279 | fonts/merriweather/type1/Merriwthr-Regular.pfb -2020/07/30 | 1324 | fonts/merriweather/tfm/MerriwthrSans-Light-sup-ot1.tfm -2020/07/30 | 1320 | fonts/merriweather/tfm/MerriwthrSans-Regular-sup-ot1.tfm -2020/07/30 | 130032 | fonts/merriweather/type1/Merriwthr-Bold.pfb -2020/07/30 | 129903 | fonts/merriweather/type1/Merriwthr-UltraBold.pfb -2020/07/30 | 127524 | fonts/merriweather/type1/Merriwthr-Light.pfb -2020/07/30 | 12441 | macros/latex/contrib/ejpecp/mgetmref.py -2020/07/30 | 1235 | language/marathi/namuna-para.tex -2020/07/30 | 118148 | macros/latex/contrib/ltx4yt/examples/web-pkg/ltx4yt-w1.pdf -2020/07/30 | 1134124 | systems/texlive/tlnet/archive/annee-scolaire.doc.r55988.tar.xz -2020/07/30 | 109008 | macros/latex/contrib/ltx4yt/examples/ltx4yt-1.pdf -2020/07/30 | 10660 | language/marathi/namuna-report.tex diff --git a/fonts/xcharter/README b/fonts/xcharter/README index 72b8279bb0..cee69698f5 100644 --- a/fonts/xcharter/README +++ b/fonts/xcharter/README @@ -1,6 +1,6 @@ XCharter Fonts Michael Sharpe - 2020-06-28 + 2020-08-06 This package is an extension of Bitstream Charter, whose original license is reproduced below, as required under the terms of that license. The extension provides small caps, oldstyle figures and superior figures in all four styles, accompanied by LaTeX font support files. The font files themselves are in otf and pfb formats. The fonts are licensed as Free fonts under the same terms as the original from Bitstream. All other support files are subject to the LaTeX Project Public License. See http://www.ctan.org/license/lppl1.3 @@ -22,7 +22,11 @@ Original Bitstream Free font license: Portions of the font modifications are Copyright (c) 2009--2012, Andrey Panov; Copyright (c) 2013--2020, Michael Sharpe. -Current version: 1.206 2020-06-28 +Current version: 1.207 2020-08-06 + +Changes in version 1.207 +1. The last update broke much of the t2a support. That is corrected in this update. +2. Added alternate one.oldstyle in the text companion (ts1) font. Changes in version 1.206 1. Added many new glyphs so that coverage of the TS1 encoding is essentially complete. diff --git a/fonts/xcharter/doc/altone.py b/fonts/xcharter/doc/altone.py index 0f89240d09..d35e655692 100755 --- a/fonts/xcharter/doc/altone.py +++ b/fonts/xcharter/doc/altone.py @@ -15,9 +15,11 @@ t2aligs='''% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ; encfiles=set() enclst=[] enclstt1=[] +enclstts1=[] enclstly1=[] enclstot1=[] encfilest1=set() +encfilests1=set() encfilesly1=set() encfilesot1=set() newlines=[] @@ -34,8 +36,12 @@ with open(tmfv+"/fonts/map/dvips/xcharter/XCharter.map",'r') as f: enclstly1.append(enc) elif "-ot1-" in line: enclstot1.append(enc) - else: + elif "-t1-" in line: enclstt1.append(enc) + elif "-ts1-" in line: + enclstts1.append(enc) + else: + continue h=tmp[5][1:-4] # psfile, without .pfb or < a=tmp[0][:-6] # name of vf vflst.append(a) @@ -43,6 +49,7 @@ with open(tmfv+"/fonts/map/dvips/xcharter/XCharter.map",'r') as f: afmcmds.append(s) encfilest1=set(enclstt1) +encfilests1=set(enclstts1) encfilesly1=set(enclstly1) encfilesot1=set(enclstot1) for f in sorted(encfilest1): @@ -69,7 +76,7 @@ for f in sorted(encfilesly1): with open(tmfv+"/fonts/map/dvips/xcharter/XCharter.map",'r') as f: for line in f: - if "-tosf-" in line: + if ("-tosf-" in line) or ("-ts1" in line): tmp = line.split() enc=tmp[4][2:] if (enc[-4:]==".enc") and (enc[:4]=="xch_"): diff --git a/fonts/xcharter/doc/xcharter-doc.pdf b/fonts/xcharter/doc/xcharter-doc.pdf index 07cd58e72e..ceea635530 100644 Binary files a/fonts/xcharter/doc/xcharter-doc.pdf and b/fonts/xcharter/doc/xcharter-doc.pdf differ diff --git a/fonts/xcharter/doc/xcharter-doc.tex b/fonts/xcharter/doc/xcharter-doc.tex index ea13fc6078..a028f10b6c 100644 --- a/fonts/xcharter/doc/xcharter-doc.tex +++ b/fonts/xcharter/doc/xcharter-doc.tex @@ -16,8 +16,8 @@ \usepackage[scaled=.98,osf]{XCharter} \usepackage[OT2,T2A,T1]{fontenc} \linespread{1.04} -\usepackage[charter,alty,vvarbb,scaled=1.05]{newtxmath} -\usepackage[cal=boondoxo]{mathalfa} +\usepackage[uprightscript,charter,alty,vvarbb,scaled=1.05]{newtxmath} +%\usepackage[cal=boondoxo]{mathalfa} \font\osfIfnt=XCharter-Roman-tosf-t1 at 11pt \font\osffnt=XCharter1-Roman-tosf-t1 at 11pt \usepackage{fonttable} @@ -87,8 +87,7 @@ Three math packages seem to provide reasonable companions for \textsf{XCharter}. \usepackage[scaled=.98,sups,osf]{XCharter}% lining figures in math, osf in text \usepackage[scaled=1.04,varqu,varl]{inconsolata}% inconsolata typewriter \usepackage[type1]{cabin}% sans serif -\usepackage[libertine,vvarbb,scaled=1.05]{newtxmath} -\usepackage[cal=boondoxo]{mathalfa} +\usepackage[uprightscript,libertine,vvarbb,scaled=1.05]{newtxmath} \linespread{1.04} \end{verbatim} @@ -97,8 +96,7 @@ Three math packages seem to provide reasonable companions for \textsf{XCharter}. \usepackage[scaled=.98,sups,osf]{XCharter}% lining figures in math, osf in text \usepackage[scaled=1.04,varqu,varl]{inconsolata}% inconsolata typewriter \usepackage[type1]{cabin}% sans serif -\usepackage[charter,vvarbb,scaled=1.05]{newtxmath} -\usepackage[cal=boondoxo]{mathalfa} +\usepackage[uprightscript,charter,vvarbb,scaled=1.05]{newtxmath} \linespread{1.04} \end{verbatim} \textsc{Example 4:} @@ -107,8 +105,7 @@ Three math packages seem to provide reasonable companions for \textsf{XCharter}. \usepackage[scaled=.98,sups,osf]{XCharter}% osf in text, lining figures in math \usepackage[scaled=1.04,varqu,varl]{inconsolata}% inconsolata typewriter \usepackage[type1]{cabin}% sans serif -\usepackage[charter,vvarbb,scaled=1.05]{newtxmath} -\usepackage[cal=boondoxo]{mathalfa} +\usepackage[uprightscript,charter,vvarbb,scaled=1.05]{newtxmath} \linespread{1.04} \end{verbatim} @@ -125,9 +122,8 @@ Three math packages seem to provide reasonable companions for \textsf{XCharter}. \usepackage[scaled=.98,sups,osf]{XCharter}% osf in text, lining figures in math \usepackage[scaled=1.04,varqu,varl]{inconsolata}% inconsolata typewriter \usepackage[type1]{cabin}% sans serif -\usepackage[charter,vvarbb,scaled=1.05]{newtxmath} -\usepackage[cal=boondoxo]{mathalfa} -\linespread{1.04} +\usepackage[uprightscript,charter,vvarbb,scaled=1.05]{newtxmath} +\\linespread{1.04} \end{verbatim} diff --git a/fonts/xcharter/enc/xch1_3nubio.enc b/fonts/xcharter/enc/xch1_3nubio.enc index 5007299ddc..6e02fcab54 100644 --- a/fonts/xcharter/enc/xch1_3nubio.enc +++ b/fonts/xcharter/enc/xch1_3nubio.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_3nubiokzcgtqdeindwwkudeosg -% Encoding created by otftotfm on Sun Jun 28 11:19:01 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:18 2020 % Command line follows encoding /AutoEnc1_3nubiokzcgtqdeindwwkudeosg [ %00 @@ -65,8 +65,8 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --feature=liga --feature=onum --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 XCharter-BoldItalic.otf -% XCharter-BoldItalic-tosf-sc-ly1' +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=kern --feature=liga --feature=onum --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 +% XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-sc-ly1' diff --git a/fonts/xcharter/enc/xch1_5xfeuz.enc b/fonts/xcharter/enc/xch1_5xfeuz.enc index ab5a241df2..a534f3ca2d 100644 --- a/fonts/xcharter/enc/xch1_5xfeuz.enc +++ b/fonts/xcharter/enc/xch1_5xfeuz.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_5xfeuzjqehaqngyom6naldftpd -% Encoding created by otftotfm on Sun Jun 28 11:19:00 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:18 2020 % Command line follows encoding /AutoEnc1_5xfeuzjqehaqngyom6naldftpd [ %00 @@ -65,7 +65,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=onum --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 XCharter-BoldItalic.otf diff --git a/fonts/xcharter/enc/xch1_62ztbr.enc b/fonts/xcharter/enc/xch1_62ztbr.enc index 96d573f6a2..871067f999 100644 --- a/fonts/xcharter/enc/xch1_62ztbr.enc +++ b/fonts/xcharter/enc/xch1_62ztbr.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_62ztbr6nk2ftffcgxkbyqc63rc -% Encoding created by otftotfm on Sun Jun 28 11:19:43 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:52 2020 % Command line follows encoding /AutoEnc1_62ztbr6nk2ftffcgxkbyqc63rc [ %00 @@ -59,14 +59,14 @@ /afii10082 /afii10083 /afii10084.srb /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2Asrb.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --feature=kern --feature=liga --feature=onum --ligkern=f i =: -% fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi -% --ligkern=ff l =: ffl XCharter-BoldItalic.otf +% --no-updmap --force --feature=kern --feature=liga --feature=onum +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl XCharter-BoldItalic.otf % XCharter-BoldItalic-tosf-t2asrb' diff --git a/fonts/xcharter/enc/xch1_64qgug.enc b/fonts/xcharter/enc/xch1_64qgug.enc index 6cbfa30626..a487238220 100644 --- a/fonts/xcharter/enc/xch1_64qgug.enc +++ b/fonts/xcharter/enc/xch1_64qgug.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_64qgugv7glijhxes55r42djrte -% Encoding created by otftotfm on Sun Jun 28 11:18:54 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:12 2020 % Command line follows encoding /AutoEnc1_64qgugv7glijhxes55r42djrte [ %00 @@ -65,7 +65,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --feature=liga --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl -% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl -% XCharter-Bold.otf XCharter-Bold-tosf-ly1' +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-ly1' diff --git a/fonts/xcharter/enc/xch1_6l4ixg.enc b/fonts/xcharter/enc/xch1_6l4ixg.enc index c5742224c8..f783a343e9 100644 --- a/fonts/xcharter/enc/xch1_6l4ixg.enc +++ b/fonts/xcharter/enc/xch1_6l4ixg.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_6l4ixgnas6o4ztxvup7ir2i6ac -% Encoding created by otftotfm on Sun Jun 28 11:19:35 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:48 2020 % Command line follows encoding /AutoEnc1_6l4ixgnas6o4ztxvup7ir2i6ac [ %00 @@ -59,14 +59,14 @@ /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2A.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2A.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A +% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A % --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff % l =: ffl XCharter-Roman.otf XCharter-Roman-tosf-t2a' diff --git a/fonts/xcharter/enc/xch1_7p4e2o.enc b/fonts/xcharter/enc/xch1_7p4e2o.enc index 2b0bc81911..56cf245711 100644 --- a/fonts/xcharter/enc/xch1_7p4e2o.enc +++ b/fonts/xcharter/enc/xch1_7p4e2o.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_7p4e2okxw4m5ierz3rzoubdpud -% Encoding created by otftotfm on Sun Jun 28 11:19:00 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:17 2020 % Command line follows encoding /AutoEnc1_7p4e2okxw4m5ierz3rzoubdpud [ %00 @@ -65,7 +65,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff % --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-BoldItalic.otf % XCharter-BoldItalic-tosf-ot1' diff --git a/fonts/xcharter/enc/xch1_bcg6lk.enc b/fonts/xcharter/enc/xch1_bcg6lk.enc new file mode 100644 index 0000000000..601a03ebe9 --- /dev/null +++ b/fonts/xcharter/enc/xch1_bcg6lk.enc @@ -0,0 +1,72 @@ +% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ; +% LIGKERN quoteleft quoteleft =: quotedblleft ; +% LIGKERN quoteright quoteright =: quotedblright ; +% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ; +% LIGKERN greater greater =: guillemotright ; +% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ; +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc1_bcg6lktn6xbfjt5m2alhs5j7rc +% Encoding created by otftotfm on Wed Aug 5 17:49:51 2020 +% Command line follows encoding +/AutoEnc1_bcg6lktn6xbfjt5m2alhs5j7rc [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef +%10 + /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef + /.notdef /i.sc /j.sc /ff /FI.sc /FL.sc /ffi /ffl +%20 + /.notdef /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero.oldstyle /one.Alt.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle + /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc + /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc +%70 + /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc + /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen +%80 + /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058 + /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054 +%90 + /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef + /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section +%A0 + /afii10050.sc /.notdef /afii10051.sc /afii10060.sc /uni04BB /.notdef /.notdef /afii10058.sc + /afii10056.sc /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10054.sc +%B0 + /.notdef /uni04AB /afii10062.sc /.notdef /.notdef /.notdef /afii10145.sc /.notdef + /.notdef /afii10053.sc /.notdef /afii10059.sc /afii10023.sc /quotedblbase /guillemotleft /guillemotright +%C0 + /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 + /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 +%D0 + /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041 + /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049 +%E0 + /afii10017.sc /afii10066.srb /afii10019.sc /afii10020.sc /afii10021.sc /afii10022.sc /afii10024.sc /afii10025.sc + /afii10026.sc /afii10027.sc /afii10028.sc /afii10029.sc /afii10030.sc /afii10031.sc /afii10032.sc /afii10033.sc +%F0 + /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc + /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc +] def +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc +% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter +% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter +% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter +% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter +% --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map +% --no-updmap --force --feature=kern --feature=liga --feature=onum +% --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 XCharter-Bold.otf XCharter-Bold-tosf-sc-t2asrb' diff --git a/fonts/xcharter/enc/xch1_bpv7ty.enc b/fonts/xcharter/enc/xch1_bpv7ty.enc new file mode 100644 index 0000000000..71ccb35b90 --- /dev/null +++ b/fonts/xcharter/enc/xch1_bpv7ty.enc @@ -0,0 +1,71 @@ +% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ; +% LIGKERN quoteleft quoteleft =: quotedblleft ; +% LIGKERN quoteright quoteright =: quotedblright ; +% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ; +% LIGKERN greater greater =: guillemotright ; +% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ; +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc1_bpv7tyhroppqwztnxg3uk5mhnf +% Encoding created by otftotfm on Wed Aug 5 17:49:51 2020 +% Command line follows encoding +/AutoEnc1_bpv7tyhroppqwztnxg3uk5mhnf [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h +%10 + /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /.notdef + /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl +%20 + /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero.oldstyle /one.Alt.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle + /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /braceleft /bar /braceright /asciitilde /hyphen +%80 + /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058 + /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054 +%90 + /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef + /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section +%A0 + /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106 + /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102 +%B0 + /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef + /.notdef /afii10101 /.notdef /afii10107 /afii10071 /quotedblbase /guillemotleft /guillemotright +%C0 + /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 + /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 +%D0 + /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041 + /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049 +%E0 + /afii10065 /afii10066.srb /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073 + /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081 +%F0 + /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 + /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 +] def +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc +% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter +% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter +% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter +% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter +% --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map +% --no-updmap --force --feature=kern --feature=liga --feature=onum +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-t2asrb' diff --git a/fonts/xcharter/enc/xch1_dbdfpx.enc b/fonts/xcharter/enc/xch1_dbdfpx.enc index 80b363e82e..3f5ba337df 100644 --- a/fonts/xcharter/enc/xch1_dbdfpx.enc +++ b/fonts/xcharter/enc/xch1_dbdfpx.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_dbdfpx3fdtjihhb2wneglnieib -% Encoding created by otftotfm on Sun Jun 28 11:19:19 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:34 2020 % Command line follows encoding /AutoEnc1_dbdfpx3fdtjihhb2wneglnieib [ %00 @@ -65,7 +65,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=onum --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 XCharter-Roman.otf diff --git a/fonts/xcharter/enc/xch1_e3nxtd.enc b/fonts/xcharter/enc/xch1_e3nxtd.enc index 27c64cbab9..4a1d573b47 100644 --- a/fonts/xcharter/enc/xch1_e3nxtd.enc +++ b/fonts/xcharter/enc/xch1_e3nxtd.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_e3nxtdby7saxg6wiummzc35egf -% Encoding created by otftotfm on Sun Jun 28 11:19:46 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:56 2020 % Command line follows encoding /AutoEnc1_e3nxtdby7saxg6wiummzc35egf [ %00 @@ -59,14 +59,14 @@ /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2Asrb.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --feature=kern --feature=liga --feature=onum --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 -% XCharter-Roman.otf XCharter-Roman-tosf-sc-t2asrb' +% --no-updmap --force --feature=kern --feature=liga --feature=onum +% --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 XCharter-Roman.otf XCharter-Roman-tosf-sc-t2asrb' diff --git a/fonts/xcharter/enc/xch1_erwtw3.enc b/fonts/xcharter/enc/xch1_erwtw3.enc index 7898007c43..827ca27241 100644 --- a/fonts/xcharter/enc/xch1_erwtw3.enc +++ b/fonts/xcharter/enc/xch1_erwtw3.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_erwtw37osf2cer6akekrqmmbsh -% Encoding created by otftotfm on Sun Jun 28 11:18:55 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:13 2020 % Command line follows encoding /AutoEnc1_erwtw37osf2cer6akekrqmmbsh [ %00 @@ -65,7 +65,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN % --feature=kern --feature=liga --feature=onum --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 XCharter-Bold.otf diff --git a/fonts/xcharter/enc/xch1_evj3rb.enc b/fonts/xcharter/enc/xch1_evj3rb.enc index 12c1690c56..cfcb8ae21a 100644 --- a/fonts/xcharter/enc/xch1_evj3rb.enc +++ b/fonts/xcharter/enc/xch1_evj3rb.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_evj3rbxl3z6gpxzz5cspncj5vd -% Encoding created by otftotfm on Sun Jun 28 11:19:43 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:52 2020 % Command line follows encoding /AutoEnc1_evj3rbxl3z6gpxzz5cspncj5vd [ %00 @@ -59,14 +59,14 @@ /afii10082 /afii10083 /afii10084.srb /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2Asrb.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --feature=kern --feature=liga --feature=onum --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 -% XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-sc-t2asrb' +% --no-updmap --force --feature=kern --feature=liga --feature=onum +% --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 XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-sc-t2asrb' diff --git a/fonts/xcharter/enc/xch1_gb4haz.enc b/fonts/xcharter/enc/xch1_gb4haz.enc index c1dd1f5e3d..a9a9b5e541 100644 --- a/fonts/xcharter/enc/xch1_gb4haz.enc +++ b/fonts/xcharter/enc/xch1_gb4haz.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_gb4hazflrmw4ypysjleckozq4b -% Encoding created by otftotfm on Sun Jun 28 11:19:35 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:48 2020 % Command line follows encoding /AutoEnc1_gb4hazflrmw4ypysjleckozq4b [ %00 @@ -59,14 +59,14 @@ /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2A.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2A.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A +% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A % --feature=kern --feature=liga --feature=onum --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 XCharter-Roman.otf diff --git a/fonts/xcharter/enc/xch1_gvbfhh.enc b/fonts/xcharter/enc/xch1_gvbfhh.enc index d2d65c286e..530c8f5483 100644 --- a/fonts/xcharter/enc/xch1_gvbfhh.enc +++ b/fonts/xcharter/enc/xch1_gvbfhh.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_gvbfhh7voaflluona6ie7qmk6b -% Encoding created by otftotfm on Sun Jun 28 11:18:55 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:13 2020 % Command line follows encoding /AutoEnc1_gvbfhh7voaflluona6ie7qmk6b [ %00 @@ -65,7 +65,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=onum --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 XCharter-Bold.otf diff --git a/fonts/xcharter/enc/xch1_ivnpe7.enc b/fonts/xcharter/enc/xch1_ivnpe7.enc index 0a33240c0b..9d8d108b93 100644 --- a/fonts/xcharter/enc/xch1_ivnpe7.enc +++ b/fonts/xcharter/enc/xch1_ivnpe7.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_ivnpe75mj322okzj6wfooqsf5h -% Encoding created by otftotfm on Sun Jun 28 11:19:18 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:33 2020 % Command line follows encoding /AutoEnc1_ivnpe75mj322okzj6wfooqsf5h [ %00 @@ -65,7 +65,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff % --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-Roman.otf % XCharter-Roman-tosf-ot1' diff --git a/fonts/xcharter/enc/xch1_jg3oo5.enc b/fonts/xcharter/enc/xch1_jg3oo5.enc index a18d3bf352..8df4f1b090 100644 --- a/fonts/xcharter/enc/xch1_jg3oo5.enc +++ b/fonts/xcharter/enc/xch1_jg3oo5.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_jg3oo5vwipxa5p2cyuinwiyame -% Encoding created by otftotfm on Sun Jun 28 11:19:13 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:29 2020 % Command line follows encoding /AutoEnc1_jg3oo5vwipxa5p2cyuinwiyame [ %00 @@ -65,7 +65,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=onum --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 XCharter-Italic.otf diff --git a/fonts/xcharter/enc/xch1_l4c4ke.enc b/fonts/xcharter/enc/xch1_l4c4ke.enc index eecb50687d..ff70c96157 100644 --- a/fonts/xcharter/enc/xch1_l4c4ke.enc +++ b/fonts/xcharter/enc/xch1_l4c4ke.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_l4c4key5kiiwtb7im6dzu4sysa -% Encoding created by otftotfm on Sun Jun 28 11:18:55 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:13 2020 % Command line follows encoding /AutoEnc1_l4c4key5kiiwtb7im6dzu4sysa [ %00 @@ -65,8 +65,8 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --feature=liga --feature=onum --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 XCharter-Bold.otf +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=kern --feature=liga --feature=onum --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 XCharter-Bold.otf % XCharter-Bold-tosf-sc-ly1' diff --git a/fonts/xcharter/enc/xch1_l6an6k.enc b/fonts/xcharter/enc/xch1_l6an6k.enc new file mode 100644 index 0000000000..e2a6ec0fcc --- /dev/null +++ b/fonts/xcharter/enc/xch1_l6an6k.enc @@ -0,0 +1,73 @@ +% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ; +% LIGKERN quoteleft quoteleft =: quotedblleft ; +% LIGKERN quoteright quoteright =: quotedblright ; +% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ; +% LIGKERN greater greater =: guillemotright ; +% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ; +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc1_l6an6kxdiedrbf2cyc5zyit2hf +% Encoding created by otftotfm on Wed Aug 5 17:49:43 2020 +% Command line follows encoding +/AutoEnc1_l6an6kxdiedrbf2cyc5zyit2hf [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef +%10 + /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef + /.notdef /i.sc /j.sc /ff /FI.sc /FL.sc /ffi /ffl +%20 + /.notdef /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero.oldstyle /one.Alt.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle + /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc + /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc +%70 + /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc + /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen +%80 + /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058 + /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054 +%90 + /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef + /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section +%A0 + /afii10050.sc /.notdef /afii10051.sc /afii10060.sc /uni04BB /.notdef /.notdef /afii10058.sc + /afii10056.sc /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10054.sc +%B0 + /.notdef /uni04AB /afii10062.sc /.notdef /.notdef /.notdef /afii10145.sc /.notdef + /.notdef /afii10053.sc /.notdef /afii10059.sc /afii10023.sc /quotedblbase /guillemotleft /guillemotright +%C0 + /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 + /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 +%D0 + /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041 + /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049 +%E0 + /afii10017.sc /afii10018.sc /afii10019.sc /afii10020.sc /afii10021.sc /afii10022.sc /afii10024.sc /afii10025.sc + /afii10026.sc /afii10027.sc /afii10028.sc /afii10029.sc /afii10030.sc /afii10031.sc /afii10032.sc /afii10033.sc +%F0 + /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc + /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc +] def +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2A.enc +% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter +% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter +% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter +% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter +% --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map +% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A +% --feature=kern --feature=liga --feature=onum --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 XCharter-Bold.otf +% XCharter-Bold-tosf-sc-t2a' diff --git a/fonts/xcharter/enc/xch1_oj27u4.enc b/fonts/xcharter/enc/xch1_oj27u4.enc index c2fdc0c885..71dca601dc 100644 --- a/fonts/xcharter/enc/xch1_oj27u4.enc +++ b/fonts/xcharter/enc/xch1_oj27u4.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_oj27u4aotgolmhtzxfclg6w4yf -% Encoding created by otftotfm on Sun Jun 28 11:19:46 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:56 2020 % Command line follows encoding /AutoEnc1_oj27u4aotgolmhtzxfclg6w4yf [ %00 @@ -59,13 +59,14 @@ /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2Asrb.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --feature=kern --feature=liga --feature=onum --ligkern=f i =: -% fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi -% --ligkern=ff l =: ffl XCharter-Roman.otf XCharter-Roman-tosf-t2asrb' +% --no-updmap --force --feature=kern --feature=liga --feature=onum +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl XCharter-Roman.otf +% XCharter-Roman-tosf-t2asrb' diff --git a/fonts/xcharter/enc/xch1_ph46id.enc b/fonts/xcharter/enc/xch1_ph46id.enc new file mode 100644 index 0000000000..eeb7ff72dc --- /dev/null +++ b/fonts/xcharter/enc/xch1_ph46id.enc @@ -0,0 +1,70 @@ +% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ; +% LIGKERN quoteleft quoteleft =: quotedblleft ; +% LIGKERN quoteright quoteright =: quotedblright ; +% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ; +% LIGKERN greater greater =: guillemotright ; +% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ; +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc1_ph46idfft7to53v2kspy6xejya +% Encoding created by otftotfm on Wed Aug 5 17:49:58 2020 +% Command line follows encoding +/AutoEnc1_ph46idfft7to53v2kspy6xejya [ +%00 + /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut /ring.cap /caron.cap + /breve.cap /macron /dotaccent.cap /cedilla /ogonek /quotesinglbase /exclam /question +%10 + /C /bar /quotedblbase /exclamdown /questiondown /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /endash /.notdef +%20 + /.notdef /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle + /.notdef /.notdef /asteriskmath /.notdef /comma /.notdef /period /fraction +%30 + /zero.oldstyle /one.Alt.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle + /eight.oldstyle /nine.oldstyle /.notdef /.notdef /.notdef /minus /.notdef /.notdef +%40 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%50 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni03A9 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%60 + /grave /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%70 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /.notdef +%80 + /breve /caron /hungarumlaut /.notdef /dagger /daggerdbl /.notdef /perthousand + /bullet /.notdef /dollar /cent /florin /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark + /.notdef /.notdef /.notdef /uni2116 /.notdef /.notdef /.notdef /.notdef +%A0 + /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section + /dieresis /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /macron +%B0 + /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered + /.notdef /one.superior /ordmasculine /.notdef /onequarter /onehalf /threequarters /Euro +%C0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%D0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%E0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%F0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +] def +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/xcharter_ts1.enc +% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter +% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter +% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter +% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter +% --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map +% --no-updmap --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 +% --feature=onum XCharter-BoldSlanted.otf XCharter-BoldSlanted-ts1' diff --git a/fonts/xcharter/enc/xch1_pqp4df.enc b/fonts/xcharter/enc/xch1_pqp4df.enc new file mode 100644 index 0000000000..fff2ebf04f --- /dev/null +++ b/fonts/xcharter/enc/xch1_pqp4df.enc @@ -0,0 +1,70 @@ +% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ; +% LIGKERN quoteleft quoteleft =: quotedblleft ; +% LIGKERN quoteright quoteright =: quotedblright ; +% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ; +% LIGKERN greater greater =: guillemotright ; +% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ; +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc1_pqp4dfh24qktfeuqit5ll3ua4f +% Encoding created by otftotfm on Wed Aug 5 17:49:58 2020 +% Command line follows encoding +/AutoEnc1_pqp4dfh24qktfeuqit5ll3ua4f [ +%00 + /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut /ring.cap /caron.cap + /breve.cap /macron /dotaccent.cap /cedilla /ogonek /quotesinglbase /exclam /asterisk +%10 + /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef +%20 + /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle + /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction +%30 + /zero.oldstyle /one.Alt.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle + /eight.oldstyle /nine.oldstyle /.notdef /.notdef /.notdef /minus /.notdef /.notdef +%40 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%50 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni03A9 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%60 + /grave /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%70 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /.notdef +%80 + /breve /caron /hungarumlaut /.notdef /dagger /daggerdbl /.notdef /perthousand + /bullet /.notdef /dollar /cent /florin /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark + /.notdef /pilcrow /.notdef /uni2116 /.notdef /.notdef /.notdef /.notdef +%A0 + /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section + /dieresis /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /macron +%B0 + /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered + /.notdef /one.superior /ordmasculine /.notdef /onequarter /onehalf /threequarters /Euro +%C0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%D0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%E0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%F0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +] def +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/xcharter_ts1.enc +% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter +% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter +% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter +% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter +% --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map +% --no-updmap --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 +% --feature=onum XCharter-Italic.otf XCharter-Italic-ts1' diff --git a/fonts/xcharter/enc/xch1_q2nwaj.enc b/fonts/xcharter/enc/xch1_q2nwaj.enc index b1c96360a2..c508c5a21f 100644 --- a/fonts/xcharter/enc/xch1_q2nwaj.enc +++ b/fonts/xcharter/enc/xch1_q2nwaj.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_q2nwaj3r2ed2ei2xtolszzvvpd -% Encoding created by otftotfm on Sun Jun 28 11:18:54 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:12 2020 % Command line follows encoding /AutoEnc1_q2nwaj3r2ed2ei2xtolszzvvpd [ %00 @@ -65,7 +65,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff % --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-Bold.otf % XCharter-Bold-tosf-ot1' diff --git a/fonts/xcharter/enc/xch1_qdfne6.enc b/fonts/xcharter/enc/xch1_qdfne6.enc index 2eaedce423..399b6839a2 100644 --- a/fonts/xcharter/enc/xch1_qdfne6.enc +++ b/fonts/xcharter/enc/xch1_qdfne6.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_qdfne6lrxeqe45q3s3awg3vmie -% Encoding created by otftotfm on Sun Jun 28 11:19:20 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:35 2020 % Command line follows encoding /AutoEnc1_qdfne6lrxeqe45q3s3awg3vmie [ %00 @@ -65,7 +65,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN % --feature=kern --feature=liga --feature=onum --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 XCharter-Roman.otf diff --git a/fonts/xcharter/enc/xch1_tis6bf.enc b/fonts/xcharter/enc/xch1_tis6bf.enc new file mode 100644 index 0000000000..378cdc9a8a --- /dev/null +++ b/fonts/xcharter/enc/xch1_tis6bf.enc @@ -0,0 +1,70 @@ +% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ; +% LIGKERN quoteleft quoteleft =: quotedblleft ; +% LIGKERN quoteright quoteright =: quotedblright ; +% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ; +% LIGKERN greater greater =: guillemotright ; +% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ; +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc1_tis6bfdwvv5gilttppmccbkofh +% Encoding created by otftotfm on Wed Aug 5 17:49:58 2020 +% Command line follows encoding +/AutoEnc1_tis6bfdwvv5gilttppmccbkofh [ +%00 + /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut /ring.cap /caron.cap + /breve.cap /macron /dotaccent.cap /cedilla /ogonek /quotesinglbase /C /bar +%10 + /endash /.notdef /quotedblbase /.notdef /.notdef /.notdef /.notdef /.notdef + /arrowleft /arrowright /tieaccentlowercase /tieaccentcapital /newtieaccentlowercase /newtieaccentcapital /.notdef /.notdef +%20 + /uni2422 /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle + /.notdef /.notdef /asteriskmath /.notdef /comma /hyphendbl /period /fraction +%30 + /zero.oldstyle /one.Alt.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle + /eight.oldstyle /nine.oldstyle /.notdef /.notdef /uni27E8 /minus /uni27E9 /.notdef +%40 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /Omegainv /.notdef /bigcircle +%50 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni03A9 + /.notdef /.notdef /.notdef /openbracketleft /.notdef /openbracketright /arrowup /arrowdown +%60 + /grave /.notdef /born /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 /.notdef /dollar.oldstyle /cent.oldstyle /florin /colonmonetary /won /naira +%90 + /guarani /peso /lira /prescription /interrobang /interrobangdown /dong /trademark + /pertenthousand /pilcrow /baht /uni2116 /discount /estimated /openbullet /servicemark +%A0 + /quillbracketleft /quillbracketright /cent /sterling /currency /yen /brokenbar /section + /dieresis /copyright /ordfeminine /copyleft /logicalnot /circledP /registered /macron +%B0 + /degree /plusminus /two.superior /three.superior /acute /mu /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 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +] def +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/xcharter_ts1.enc +% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter +% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter +% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter +% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter +% --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map +% --no-updmap --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 +% --feature=onum XCharter-Roman.otf XCharter-Roman-ts1' diff --git a/fonts/xcharter/enc/xch1_vv7waw.enc b/fonts/xcharter/enc/xch1_vv7waw.enc index 454e0d2ab5..0e37eef93d 100644 --- a/fonts/xcharter/enc/xch1_vv7waw.enc +++ b/fonts/xcharter/enc/xch1_vv7waw.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_vv7wawb267dz2g6yzjc43rbfxd -% Encoding created by otftotfm on Sun Jun 28 11:19:19 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:34 2020 % Command line follows encoding /AutoEnc1_vv7wawb267dz2g6yzjc43rbfxd [ %00 @@ -65,8 +65,8 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --feature=liga --feature=onum --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 XCharter-Roman.otf +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=kern --feature=liga --feature=onum --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 XCharter-Roman.otf % XCharter-Roman-tosf-sc-ly1' diff --git a/fonts/xcharter/enc/xch1_wi6ykn.enc b/fonts/xcharter/enc/xch1_wi6ykn.enc index 374e9f4013..bc71da5fb6 100644 --- a/fonts/xcharter/enc/xch1_wi6ykn.enc +++ b/fonts/xcharter/enc/xch1_wi6ykn.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_wi6yknl3kt4py2tsiqef6clbfd -% Encoding created by otftotfm on Sun Jun 28 11:19:32 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:45 2020 % Command line follows encoding /AutoEnc1_wi6yknl3kt4py2tsiqef6clbfd [ %00 @@ -59,14 +59,14 @@ /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2A.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2A.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A +% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A % --feature=kern --feature=liga --feature=onum --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/xcharter/enc/xch1_wqeam3.enc b/fonts/xcharter/enc/xch1_wqeam3.enc index d9d31b6568..bb1655beac 100644 --- a/fonts/xcharter/enc/xch1_wqeam3.enc +++ b/fonts/xcharter/enc/xch1_wqeam3.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_wqeam3xphw5mmouhxu2uypuhte -% Encoding created by otftotfm on Sun Jun 28 11:19:19 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:34 2020 % Command line follows encoding /AutoEnc1_wqeam3xphw5mmouhxu2uypuhte [ %00 @@ -65,7 +65,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --feature=liga --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl -% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl -% XCharter-Roman.otf XCharter-Roman-tosf-ly1' +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl XCharter-Roman.otf XCharter-Roman-tosf-ly1' diff --git a/fonts/xcharter/enc/xch1_wwsmtw.enc b/fonts/xcharter/enc/xch1_wwsmtw.enc index 34b43fa65f..167a84aebc 100644 --- a/fonts/xcharter/enc/xch1_wwsmtw.enc +++ b/fonts/xcharter/enc/xch1_wwsmtw.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_wwsmtw5naaeoyrpn3g5g7goydc -% Encoding created by otftotfm on Sun Jun 28 11:18:55 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:12 2020 % Command line follows encoding /AutoEnc1_wwsmtw5naaeoyrpn3g5g7goydc [ %00 @@ -65,7 +65,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN % --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff % l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-t1' diff --git a/fonts/xcharter/enc/xch1_xmfb6b.enc b/fonts/xcharter/enc/xch1_xmfb6b.enc index 0d0a5513dc..bb328f36d2 100644 --- a/fonts/xcharter/enc/xch1_xmfb6b.enc +++ b/fonts/xcharter/enc/xch1_xmfb6b.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_xmfb6bhkkyqaejxdoyqfvnjqad -% Encoding created by otftotfm on Sun Jun 28 11:19:32 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:43 2020 % Command line follows encoding /AutoEnc1_xmfb6bhkkyqaejxdoyqfvnjqad [ %00 @@ -59,14 +59,14 @@ /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2A.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2A.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A +% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A % --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff -% l =: ffl XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-t2a' +% l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-t2a' diff --git a/fonts/xcharter/enc/xch1_xqcxen.enc b/fonts/xcharter/enc/xch1_xqcxen.enc new file mode 100644 index 0000000000..eb5a342965 --- /dev/null +++ b/fonts/xcharter/enc/xch1_xqcxen.enc @@ -0,0 +1,70 @@ +% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ; +% LIGKERN quoteleft quoteleft =: quotedblleft ; +% LIGKERN quoteright quoteright =: quotedblright ; +% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ; +% LIGKERN greater greater =: guillemotright ; +% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ; +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc1_xqcxendti4xfjtesusecvwojab +% Encoding created by otftotfm on Wed Aug 5 17:49:59 2020 +% Command line follows encoding +/AutoEnc1_xqcxendti4xfjtesusecvwojab [ +%00 + /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut /ring.cap /caron.cap + /breve.cap /macron /dotaccent.cap /cedilla /ogonek /quotesinglbase /exclam /asterisk +%10 + /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef +%20 + /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle + /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction +%30 + /zero.oldstyle /one.Alt.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle + /eight.oldstyle /nine.oldstyle /.notdef /.notdef /.notdef /minus /.notdef /.notdef +%40 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%50 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%60 + /grave /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%70 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /.notdef +%80 + /breve /caron /hungarumlaut /.notdef /dagger /daggerdbl /.notdef /perthousand + /bullet /.notdef /dollar /cent /florin /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark + /.notdef /pilcrow /.notdef /uni2116 /.notdef /.notdef /.notdef /.notdef +%A0 + /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section + /dieresis /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /macron +%B0 + /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered + /.notdef /one.superior /ordmasculine /.notdef /onequarter /onehalf /threequarters /Euro +%C0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%D0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%E0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%F0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +] def +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/xcharter_ts1.enc +% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter +% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter +% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter +% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter +% --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map +% --no-updmap --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 +% --feature=onum XCharter-BoldItalic.otf XCharter-BoldItalic-ts1' diff --git a/fonts/xcharter/enc/xch1_yz7cd7.enc b/fonts/xcharter/enc/xch1_yz7cd7.enc index af4bb6c8d1..6f87f153f3 100644 --- a/fonts/xcharter/enc/xch1_yz7cd7.enc +++ b/fonts/xcharter/enc/xch1_yz7cd7.enc @@ -7,7 +7,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc1_yz7cd7m4dutxjf4ebhvpvegzmh -% Encoding created by otftotfm on Sun Jun 28 11:19:01 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:18 2020 % Command line follows encoding /AutoEnc1_yz7cd7m4dutxjf4ebhvpvegzmh [ %00 @@ -65,7 +65,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN % --feature=kern --feature=liga --feature=onum --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/xcharter/enc/xch_26pbhy.enc b/fonts/xcharter/enc/xch_26pbhy.enc index 01493c64c2..78794a5fbf 100644 --- a/fonts/xcharter/enc/xch_26pbhy.enc +++ b/fonts/xcharter/enc/xch_26pbhy.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_26pbhyeyswcx6l35vecjqtozga -% Encoding created by otftotfm on Sun Jun 28 11:18:58 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:11 2020 % Command line follows encoding /AutoEnc_26pbhyeyswcx6l35vecjqtozga [ %00 @@ -59,5 +59,5 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=subs -% --ligkern=* {KL} * XCharter-Bold.otf XCharter-Bold-inf-ly1' +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=subs --ligkern=* {KL} * XCharter-Bold.otf XCharter-Bold-inf-ly1' diff --git a/fonts/xcharter/enc/xch_2acc4n.enc b/fonts/xcharter/enc/xch_2acc4n.enc index ea4ac56979..a3e3bdc014 100644 --- a/fonts/xcharter/enc/xch_2acc4n.enc +++ b/fonts/xcharter/enc/xch_2acc4n.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_2acc4ndhi344plu34rghmz2qee -% Encoding created by otftotfm on Sun Jun 28 11:18:56 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:14 2020 % Command line follows encoding /AutoEnc_2acc4ndhi344plu34rghmz2qee [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=lnum --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 XCharter-Bold.otf diff --git a/fonts/xcharter/enc/xch_2jytnu.enc b/fonts/xcharter/enc/xch_2jytnu.enc index 5eee977f6b..fd5581edbe 100644 --- a/fonts/xcharter/enc/xch_2jytnu.enc +++ b/fonts/xcharter/enc/xch_2jytnu.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_2jytnupoqjnqfypbpjui5xyn5g -% Encoding created by otftotfm on Sun Jun 28 11:19:36 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:49 2020 % Command line follows encoding /AutoEnc_2jytnupoqjnqfypbpjui5xyn5g [ %00 @@ -53,14 +53,14 @@ /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2A.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2A.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A +% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A % --feature=kern --feature=liga --feature=lnum --ligkern=f i =: fi % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff % l =: ffl XCharter-Roman.otf XCharter-Roman-tlf-t2a' diff --git a/fonts/xcharter/enc/xch_3j6jnh.enc b/fonts/xcharter/enc/xch_3j6jnh.enc index fde53a0ff9..660f14003b 100644 --- a/fonts/xcharter/enc/xch_3j6jnh.enc +++ b/fonts/xcharter/enc/xch_3j6jnh.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_3j6jnhwhxyv2rrlfo6jtdkk4nf -% Encoding created by otftotfm on Sun Jun 28 11:19:47 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:56 2020 % Command line follows encoding /AutoEnc_3j6jnhwhxyv2rrlfo6jtdkk4nf [ %00 @@ -53,13 +53,13 @@ /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2Asrb.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --feature=kern --feature=liga --feature=lnum --ligkern=f i =: -% fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi -% --ligkern=ff l =: ffl XCharter-Roman.otf XCharter-Roman-tlf-t2asrb' +% --no-updmap --force --feature=kern --feature=liga --feature=lnum +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl XCharter-Roman.otf XCharter-Roman-tlf-t2asrb' diff --git a/fonts/xcharter/enc/xch_3nubio.enc b/fonts/xcharter/enc/xch_3nubio.enc index 4a3e06bbc8..0ea6762031 100644 --- a/fonts/xcharter/enc/xch_3nubio.enc +++ b/fonts/xcharter/enc/xch_3nubio.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_3nubiokzcgtqdeindwwkudeosg -% Encoding created by otftotfm on Sun Jun 28 11:19:01 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:18 2020 % Command line follows encoding /AutoEnc_3nubiokzcgtqdeindwwkudeosg [ %00 @@ -59,8 +59,8 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --feature=liga --feature=onum --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 XCharter-BoldItalic.otf -% XCharter-BoldItalic-tosf-sc-ly1' +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=kern --feature=liga --feature=onum --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 +% XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-sc-ly1' diff --git a/fonts/xcharter/enc/xch_3oyzty.enc b/fonts/xcharter/enc/xch_3oyzty.enc index e7ab335d14..e56970befa 100644 --- a/fonts/xcharter/enc/xch_3oyzty.enc +++ b/fonts/xcharter/enc/xch_3oyzty.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_3oyztyj6ok7jmijofhabtwy55f -% Encoding created by otftotfm on Sun Jun 28 11:18:57 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:12 2020 % Command line follows encoding /AutoEnc_3oyztyj6ok7jmijofhabtwy55f [ %00 @@ -59,5 +59,5 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN % --feature=numr --ligkern=* {KL} * XCharter-Bold.otf XCharter-Bold-numr-t1' diff --git a/fonts/xcharter/enc/xch_3reguq.enc b/fonts/xcharter/enc/xch_3reguq.enc index 05e1ffa95f..04063986c5 100644 --- a/fonts/xcharter/enc/xch_3reguq.enc +++ b/fonts/xcharter/enc/xch_3reguq.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_3reguqn75ykfwk54ci2pkjgeid -% Encoding created by otftotfm on Sun Jun 28 11:19:21 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:36 2020 % Command line follows encoding /AutoEnc_3reguqn75ykfwk54ci2pkjgeid [ %00 @@ -59,8 +59,8 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --feature=liga --feature=lnum --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 XCharter-Roman.otf +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=kern --feature=liga --feature=lnum --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 XCharter-Roman.otf % XCharter-Roman-tlf-sc-ly1' diff --git a/fonts/xcharter/enc/xch_4siibn.enc b/fonts/xcharter/enc/xch_4siibn.enc new file mode 100644 index 0000000000..c2d8298b3b --- /dev/null +++ b/fonts/xcharter/enc/xch_4siibn.enc @@ -0,0 +1,66 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_4siibncubheqpamzb7gyl4v6db +% Encoding created by otftotfm on Wed Aug 5 17:49:52 2020 +% Command line follows encoding +/AutoEnc_4siibncubheqpamzb7gyl4v6db [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef +%10 + /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef + /.notdef /i.sc /j.sc /ff /FI.sc /FL.sc /ffi /ffl +%20 + /.notdef /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero /one /two /three /four /five /six /seven + /eight /nine /colon /semicolon /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc + /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc +%70 + /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc + /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen +%80 + /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058 + /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054 +%90 + /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef + /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section +%A0 + /afii10050.sc /.notdef /afii10051.sc /afii10060.sc /uni04BB /.notdef /.notdef /afii10058.sc + /afii10056.sc /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10054.sc +%B0 + /.notdef /uni04AB /afii10062.sc /.notdef /.notdef /.notdef /afii10145.sc /.notdef + /.notdef /afii10053.sc /.notdef /afii10059.sc /afii10023.sc /quotedblbase /guillemotleft /guillemotright +%C0 + /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 + /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 +%D0 + /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041 + /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049 +%E0 + /afii10017.sc /afii10066.srb /afii10019.sc /afii10020.sc /afii10021.sc /afii10022.sc /afii10024.sc /afii10025.sc + /afii10026.sc /afii10027.sc /afii10028.sc /afii10029.sc /afii10030.sc /afii10031.sc /afii10032.sc /afii10033.sc +%F0 + /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc + /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc +] def +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc +% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter +% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter +% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter +% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter +% --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map +% --no-updmap --force --feature=kern --feature=liga --feature=lnum +% --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 XCharter-Bold.otf XCharter-Bold-tlf-sc-t2asrb' diff --git a/fonts/xcharter/enc/xch_57lqj7.enc b/fonts/xcharter/enc/xch_57lqj7.enc index 173e7394d6..f784a5cbb1 100644 --- a/fonts/xcharter/enc/xch_57lqj7.enc +++ b/fonts/xcharter/enc/xch_57lqj7.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_57lqj7bzoaohq2younmvuxlspb -% Encoding created by otftotfm on Sun Jun 28 11:18:54 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:15 2020 % Command line follows encoding /AutoEnc_57lqj7bzoaohq2younmvuxlspb [ %00 @@ -59,5 +59,5 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN % --feature=sups --ligkern=* {KL} * XCharter-Bold.otf XCharter-Bold-sup-t1' diff --git a/fonts/xcharter/enc/xch_5klbw4.enc b/fonts/xcharter/enc/xch_5klbw4.enc index e9ca5cb566..6a5b5e151d 100644 --- a/fonts/xcharter/enc/xch_5klbw4.enc +++ b/fonts/xcharter/enc/xch_5klbw4.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_5klbw4qsdei625xf6arb5wssab -% Encoding created by otftotfm on Sun Jun 28 11:19:36 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:49 2020 % Command line follows encoding /AutoEnc_5klbw4qsdei625xf6arb5wssab [ %00 @@ -53,14 +53,14 @@ /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2A.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2A.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A +% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A % --feature=kern --feature=liga --feature=lnum --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 XCharter-Roman.otf diff --git a/fonts/xcharter/enc/xch_5xfeuz.enc b/fonts/xcharter/enc/xch_5xfeuz.enc index 71b4feba73..81044f68da 100644 --- a/fonts/xcharter/enc/xch_5xfeuz.enc +++ b/fonts/xcharter/enc/xch_5xfeuz.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_5xfeuzjqehaqngyom6naldftpd -% Encoding created by otftotfm on Sun Jun 28 11:19:00 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:18 2020 % Command line follows encoding /AutoEnc_5xfeuzjqehaqngyom6naldftpd [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=onum --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 XCharter-BoldItalic.otf diff --git a/fonts/xcharter/enc/xch_62z5ot.enc b/fonts/xcharter/enc/xch_62z5ot.enc index fa278ce05e..986fe3d48e 100644 --- a/fonts/xcharter/enc/xch_62z5ot.enc +++ b/fonts/xcharter/enc/xch_62z5ot.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_62z5otp5uxbu4kardxkb52z6sa -% Encoding created by otftotfm on Sun Jun 28 11:18:57 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:11 2020 % Command line follows encoding /AutoEnc_62z5otp5uxbu4kardxkb52z6sa [ %00 @@ -59,5 +59,6 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=numr -% --ligkern=* {KL} * XCharter-Bold.otf XCharter-Bold-numr-ly1' +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=numr --ligkern=* {KL} * XCharter-Bold.otf +% XCharter-Bold-numr-ly1' diff --git a/fonts/xcharter/enc/xch_62ztbr.enc b/fonts/xcharter/enc/xch_62ztbr.enc index c701088a8a..286d4daf26 100644 --- a/fonts/xcharter/enc/xch_62ztbr.enc +++ b/fonts/xcharter/enc/xch_62ztbr.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_62ztbr6nk2ftffcgxkbyqc63rc -% Encoding created by otftotfm on Sun Jun 28 11:19:43 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:52 2020 % Command line follows encoding /AutoEnc_62ztbr6nk2ftffcgxkbyqc63rc [ %00 @@ -53,14 +53,14 @@ /afii10082 /afii10083 /afii10084.srb /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2Asrb.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --feature=kern --feature=liga --feature=onum --ligkern=f i =: -% fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi -% --ligkern=ff l =: ffl XCharter-BoldItalic.otf +% --no-updmap --force --feature=kern --feature=liga --feature=onum +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl XCharter-BoldItalic.otf % XCharter-BoldItalic-tosf-t2asrb' diff --git a/fonts/xcharter/enc/xch_64qgug.enc b/fonts/xcharter/enc/xch_64qgug.enc index 2e6be4de85..41aa382bc2 100644 --- a/fonts/xcharter/enc/xch_64qgug.enc +++ b/fonts/xcharter/enc/xch_64qgug.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_64qgugv7glijhxes55r42djrte -% Encoding created by otftotfm on Sun Jun 28 11:18:54 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:12 2020 % Command line follows encoding /AutoEnc_64qgugv7glijhxes55r42djrte [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --feature=liga --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl -% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl -% XCharter-Bold.otf XCharter-Bold-tosf-ly1' +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-ly1' diff --git a/fonts/xcharter/enc/xch_6l4ixg.enc b/fonts/xcharter/enc/xch_6l4ixg.enc index acdfe6e6d1..8c305ef95b 100644 --- a/fonts/xcharter/enc/xch_6l4ixg.enc +++ b/fonts/xcharter/enc/xch_6l4ixg.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_6l4ixgnas6o4ztxvup7ir2i6ac -% Encoding created by otftotfm on Sun Jun 28 11:19:35 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:48 2020 % Command line follows encoding /AutoEnc_6l4ixgnas6o4ztxvup7ir2i6ac [ %00 @@ -53,14 +53,14 @@ /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2A.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2A.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A +% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A % --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff % l =: ffl XCharter-Roman.otf XCharter-Roman-tosf-t2a' diff --git a/fonts/xcharter/enc/xch_6zxmh3.enc b/fonts/xcharter/enc/xch_6zxmh3.enc index 00e0151868..6d9dee95d3 100644 --- a/fonts/xcharter/enc/xch_6zxmh3.enc +++ b/fonts/xcharter/enc/xch_6zxmh3.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_6zxmh3rsszeuew5irhqigo7fkh -% Encoding created by otftotfm on Sun Jun 28 11:19:18 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:37 2020 % Command line follows encoding /AutoEnc_6zxmh3rsszeuew5irhqigo7fkh [ %00 @@ -59,6 +59,6 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN % --feature=sups --ligkern=* {KL} * XCharter-Roman.otf % XCharter-Roman-sup-t1' diff --git a/fonts/xcharter/enc/xch_7cmdv6.enc b/fonts/xcharter/enc/xch_7cmdv6.enc index 1263bb52e1..acf422a408 100644 --- a/fonts/xcharter/enc/xch_7cmdv6.enc +++ b/fonts/xcharter/enc/xch_7cmdv6.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf -% Encoding created by otftotfm on Sun Jun 28 11:18:54 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:15 2020 % Command line follows encoding /AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf [ %00 @@ -59,5 +59,5 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sups -% --ligkern=* {KL} * XCharter-Bold.otf XCharter-Bold-sup-ly1' +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=sups --ligkern=* {KL} * XCharter-Bold.otf XCharter-Bold-sup-ly1' diff --git a/fonts/xcharter/enc/xch_7p4e2o.enc b/fonts/xcharter/enc/xch_7p4e2o.enc index a6e1cc108f..2ed3766920 100644 --- a/fonts/xcharter/enc/xch_7p4e2o.enc +++ b/fonts/xcharter/enc/xch_7p4e2o.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_7p4e2okxw4m5ierz3rzoubdpud -% Encoding created by otftotfm on Sun Jun 28 11:19:00 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:17 2020 % Command line follows encoding /AutoEnc_7p4e2okxw4m5ierz3rzoubdpud [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff % --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-BoldItalic.otf % XCharter-BoldItalic-tosf-ot1' diff --git a/fonts/xcharter/enc/xch_abgjzu.enc b/fonts/xcharter/enc/xch_abgjzu.enc index 4440b4bf41..5433a1553c 100644 --- a/fonts/xcharter/enc/xch_abgjzu.enc +++ b/fonts/xcharter/enc/xch_abgjzu.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_abgjzucpfylen2zent2njgtuwf -% Encoding created by otftotfm on Sun Jun 28 11:19:20 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:35 2020 % Command line follows encoding /AutoEnc_abgjzucpfylen2zent2njgtuwf [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=lnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff % --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-Roman.otf % XCharter-Roman-tlf-ot1' diff --git a/fonts/xcharter/enc/xch_ao7ayk.enc b/fonts/xcharter/enc/xch_ao7ayk.enc index fd63ed98ee..7e3cae4190 100644 --- a/fonts/xcharter/enc/xch_ao7ayk.enc +++ b/fonts/xcharter/enc/xch_ao7ayk.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_ao7aykitowiy6mof7pomrdbq3f -% Encoding created by otftotfm on Sun Jun 28 11:19:03 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:16 2020 % Command line follows encoding /AutoEnc_ao7aykitowiy6mof7pomrdbq3f [ %00 @@ -59,5 +59,5 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=numr --ligkern=* {KL} * -% XCharter-BoldItalic.otf XCharter-BoldItalic-numr-ot1' +% --no-updmap --force --coding-scheme=TEX TEXT --feature=numr --ligkern=* +% {KL} * XCharter-BoldItalic.otf XCharter-BoldItalic-numr-ot1' diff --git a/fonts/xcharter/enc/xch_ay4e7o.enc b/fonts/xcharter/enc/xch_ay4e7o.enc index 60fcc65852..1e278e4683 100644 --- a/fonts/xcharter/enc/xch_ay4e7o.enc +++ b/fonts/xcharter/enc/xch_ay4e7o.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_ay4e7o7mymjt4spagwpwsbzlac -% Encoding created by otftotfm on Sun Jun 28 11:18:53 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:16 2020 % Command line follows encoding /AutoEnc_ay4e7o7mymjt4spagwpwsbzlac [ %00 @@ -59,5 +59,5 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN % --feature=dnom --ligkern=* {KL} * XCharter-Bold.otf XCharter-Bold-dnom-t1' diff --git a/fonts/xcharter/enc/xch_bcg6lk.enc b/fonts/xcharter/enc/xch_bcg6lk.enc new file mode 100644 index 0000000000..6c2055ba1b --- /dev/null +++ b/fonts/xcharter/enc/xch_bcg6lk.enc @@ -0,0 +1,66 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_bcg6lktn6xbfjt5m2alhs5j7rc +% Encoding created by otftotfm on Wed Aug 5 17:49:51 2020 +% Command line follows encoding +/AutoEnc_bcg6lktn6xbfjt5m2alhs5j7rc [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef +%10 + /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef + /.notdef /i.sc /j.sc /ff /FI.sc /FL.sc /ffi /ffl +%20 + /.notdef /exclam /quotedbl /numbersign /dollar.sc /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 /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc + /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc +%70 + /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc + /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen +%80 + /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058 + /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054 +%90 + /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef + /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section +%A0 + /afii10050.sc /.notdef /afii10051.sc /afii10060.sc /uni04BB /.notdef /.notdef /afii10058.sc + /afii10056.sc /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10054.sc +%B0 + /.notdef /uni04AB /afii10062.sc /.notdef /.notdef /.notdef /afii10145.sc /.notdef + /.notdef /afii10053.sc /.notdef /afii10059.sc /afii10023.sc /quotedblbase /guillemotleft /guillemotright +%C0 + /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 + /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 +%D0 + /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041 + /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049 +%E0 + /afii10017.sc /afii10066.srb /afii10019.sc /afii10020.sc /afii10021.sc /afii10022.sc /afii10024.sc /afii10025.sc + /afii10026.sc /afii10027.sc /afii10028.sc /afii10029.sc /afii10030.sc /afii10031.sc /afii10032.sc /afii10033.sc +%F0 + /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc + /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc +] def +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc +% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter +% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter +% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter +% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter +% --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map +% --no-updmap --force --feature=kern --feature=liga --feature=onum +% --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 XCharter-Bold.otf XCharter-Bold-tosf-sc-t2asrb' diff --git a/fonts/xcharter/enc/xch_bk4eiy.enc b/fonts/xcharter/enc/xch_bk4eiy.enc index d7c41d4471..4791b8ac0e 100644 --- a/fonts/xcharter/enc/xch_bk4eiy.enc +++ b/fonts/xcharter/enc/xch_bk4eiy.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_bk4eiyxgpeuzzl5dgdyaqvulyg -% Encoding created by otftotfm on Sun Jun 28 11:19:45 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:52 2020 % Command line follows encoding /AutoEnc_bk4eiyxgpeuzzl5dgdyaqvulyg [ %00 @@ -53,12 +53,12 @@ /afii10082 /afii10083 /afii10084.srb /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2Asrb.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --feature=sups --ligkern=* {KL} * XCharter-BoldItalic.otf -% XCharter-BoldItalic-sup-t2asrb' +% --no-updmap --force --feature=sups --ligkern=* {KL} * +% XCharter-BoldItalic.otf XCharter-BoldItalic-sup-t2asrb' diff --git a/fonts/xcharter/enc/xch_bpv7ty.enc b/fonts/xcharter/enc/xch_bpv7ty.enc new file mode 100644 index 0000000000..68003f62e9 --- /dev/null +++ b/fonts/xcharter/enc/xch_bpv7ty.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_bpv7tyhroppqwztnxg3uk5mhnf +% Encoding created by otftotfm on Wed Aug 5 17:49:51 2020 +% Command line follows encoding +/AutoEnc_bpv7tyhroppqwztnxg3uk5mhnf [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h +%10 + /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /.notdef + /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl +%20 + /.notdef /exclam /quotedbl /numbersign /dollar /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 /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /braceleft /bar /braceright /asciitilde /hyphen +%80 + /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058 + /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054 +%90 + /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef + /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section +%A0 + /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106 + /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102 +%B0 + /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef + /.notdef /afii10101 /.notdef /afii10107 /afii10071 /quotedblbase /guillemotleft /guillemotright +%C0 + /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 + /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 +%D0 + /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041 + /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049 +%E0 + /afii10065 /afii10066.srb /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073 + /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081 +%F0 + /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 + /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 +] def +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc +% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter +% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter +% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter +% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter +% --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map +% --no-updmap --force --feature=kern --feature=liga --feature=onum +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-t2asrb' diff --git a/fonts/xcharter/enc/xch_bxmb3o.enc b/fonts/xcharter/enc/xch_bxmb3o.enc index 5638bf409f..270d72c22b 100644 --- a/fonts/xcharter/enc/xch_bxmb3o.enc +++ b/fonts/xcharter/enc/xch_bxmb3o.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_bxmb3o6ttiywvevh4ccqmv6rph -% Encoding created by otftotfm on Sun Jun 28 11:18:56 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:13 2020 % Command line follows encoding /AutoEnc_bxmb3o6ttiywvevh4ccqmv6rph [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=lnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff % --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-Bold.otf % XCharter-Bold-tlf-ot1' diff --git a/fonts/xcharter/enc/xch_ch4v2b.enc b/fonts/xcharter/enc/xch_ch4v2b.enc index ca5dcb73a8..cc047e8f76 100644 --- a/fonts/xcharter/enc/xch_ch4v2b.enc +++ b/fonts/xcharter/enc/xch_ch4v2b.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_ch4v2btqux72zuhgwahqqkxceh -% Encoding created by otftotfm on Sun Jun 28 11:19:44 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:53 2020 % Command line follows encoding /AutoEnc_ch4v2btqux72zuhgwahqqkxceh [ %00 @@ -53,14 +53,14 @@ /afii10082 /afii10083 /afii10084.srb /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2Asrb.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --feature=kern --feature=liga --feature=lnum --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 -% XCharter-BoldItalic.otf XCharter-BoldItalic-tlf-sc-t2asrb' +% --no-updmap --force --feature=kern --feature=liga --feature=lnum +% --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 XCharter-BoldItalic.otf XCharter-BoldItalic-tlf-sc-t2asrb' diff --git a/fonts/xcharter/enc/xch_ckugtc.enc b/fonts/xcharter/enc/xch_ckugtc.enc index fb428b7240..e93ce8f24f 100644 --- a/fonts/xcharter/enc/xch_ckugtc.enc +++ b/fonts/xcharter/enc/xch_ckugtc.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_ckugtclujsguxmcovvf3bkqf2b -% Encoding created by otftotfm on Sun Jun 28 11:19:20 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:35 2020 % Command line follows encoding /AutoEnc_ckugtclujsguxmcovvf3bkqf2b [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --feature=liga --feature=lnum --ligkern=f i =: fi --ligkern=f l =: fl -% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl -% XCharter-Roman.otf XCharter-Roman-tlf-ly1' +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=kern --feature=liga --feature=lnum --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl XCharter-Roman.otf XCharter-Roman-tlf-ly1' diff --git a/fonts/xcharter/enc/xch_ct4qni.enc b/fonts/xcharter/enc/xch_ct4qni.enc index cfd0db8873..2ba67472a0 100644 --- a/fonts/xcharter/enc/xch_ct4qni.enc +++ b/fonts/xcharter/enc/xch_ct4qni.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_ct4qniax6sbw4j4frehenox2rd -% Encoding created by otftotfm on Sun Jun 28 11:19:33 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:45 2020 % Command line follows encoding /AutoEnc_ct4qniax6sbw4j4frehenox2rd [ %00 @@ -53,14 +53,14 @@ /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2A.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2A.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A +% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A % --feature=kern --feature=liga --feature=lnum --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/xcharter/enc/xch_dbdfpx.enc b/fonts/xcharter/enc/xch_dbdfpx.enc index af43ef1d0b..ba2ef3fb09 100644 --- a/fonts/xcharter/enc/xch_dbdfpx.enc +++ b/fonts/xcharter/enc/xch_dbdfpx.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_dbdfpx3fdtjihhb2wneglnieib -% Encoding created by otftotfm on Sun Jun 28 11:19:19 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:34 2020 % Command line follows encoding /AutoEnc_dbdfpx3fdtjihhb2wneglnieib [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=onum --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 XCharter-Roman.otf diff --git a/fonts/xcharter/enc/xch_dcwqct.enc b/fonts/xcharter/enc/xch_dcwqct.enc index e2ee5eaa30..85276e72f9 100644 --- a/fonts/xcharter/enc/xch_dcwqct.enc +++ b/fonts/xcharter/enc/xch_dcwqct.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_dcwqct2ugnmdvzrrfjgznfcshg -% Encoding created by otftotfm on Sun Jun 28 11:19:02 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:20 2020 % Command line follows encoding /AutoEnc_dcwqct2ugnmdvzrrfjgznfcshg [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN % --feature=kern --feature=liga --feature=lnum --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/xcharter/enc/xch_dwd75d.enc b/fonts/xcharter/enc/xch_dwd75d.enc index 6844bcbd3c..88c775fe25 100644 --- a/fonts/xcharter/enc/xch_dwd75d.enc +++ b/fonts/xcharter/enc/xch_dwd75d.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_dwd75dyhlcch47jxer45hq6d2g -% Encoding created by otftotfm on Sun Jun 28 11:19:32 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:44 2020 % Command line follows encoding /AutoEnc_dwd75dyhlcch47jxer45hq6d2g [ %00 @@ -53,13 +53,12 @@ /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2A.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2A.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A -% --feature=sups --ligkern=* {KL} * XCharter-BoldItalic.otf -% XCharter-BoldItalic-sup-t2a' +% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A +% --feature=sups --ligkern=* {KL} * XCharter-Bold.otf XCharter-Bold-sup-t2a' diff --git a/fonts/xcharter/enc/xch_e3nxtd.enc b/fonts/xcharter/enc/xch_e3nxtd.enc index bd8ff140aa..de9ae97f6c 100644 --- a/fonts/xcharter/enc/xch_e3nxtd.enc +++ b/fonts/xcharter/enc/xch_e3nxtd.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_e3nxtdby7saxg6wiummzc35egf -% Encoding created by otftotfm on Sun Jun 28 11:19:46 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:56 2020 % Command line follows encoding /AutoEnc_e3nxtdby7saxg6wiummzc35egf [ %00 @@ -53,14 +53,14 @@ /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2Asrb.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --feature=kern --feature=liga --feature=onum --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 -% XCharter-Roman.otf XCharter-Roman-tosf-sc-t2asrb' +% --no-updmap --force --feature=kern --feature=liga --feature=onum +% --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 XCharter-Roman.otf XCharter-Roman-tosf-sc-t2asrb' diff --git a/fonts/xcharter/enc/xch_erwtw3.enc b/fonts/xcharter/enc/xch_erwtw3.enc index a97324f91b..fdfe2f4fa9 100644 --- a/fonts/xcharter/enc/xch_erwtw3.enc +++ b/fonts/xcharter/enc/xch_erwtw3.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_erwtw37osf2cer6akekrqmmbsh -% Encoding created by otftotfm on Sun Jun 28 11:18:55 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:13 2020 % Command line follows encoding /AutoEnc_erwtw37osf2cer6akekrqmmbsh [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN % --feature=kern --feature=liga --feature=onum --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 XCharter-Bold.otf diff --git a/fonts/xcharter/enc/xch_evj3rb.enc b/fonts/xcharter/enc/xch_evj3rb.enc index 4ead3c4063..9b6cc4358e 100644 --- a/fonts/xcharter/enc/xch_evj3rb.enc +++ b/fonts/xcharter/enc/xch_evj3rb.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_evj3rbxl3z6gpxzz5cspncj5vd -% Encoding created by otftotfm on Sun Jun 28 11:19:43 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:52 2020 % Command line follows encoding /AutoEnc_evj3rbxl3z6gpxzz5cspncj5vd [ %00 @@ -53,14 +53,14 @@ /afii10082 /afii10083 /afii10084.srb /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2Asrb.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --feature=kern --feature=liga --feature=onum --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 -% XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-sc-t2asrb' +% --no-updmap --force --feature=kern --feature=liga --feature=onum +% --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 XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-sc-t2asrb' diff --git a/fonts/xcharter/enc/xch_gb4haz.enc b/fonts/xcharter/enc/xch_gb4haz.enc index 3b814013d1..ded0869086 100644 --- a/fonts/xcharter/enc/xch_gb4haz.enc +++ b/fonts/xcharter/enc/xch_gb4haz.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_gb4hazflrmw4ypysjleckozq4b -% Encoding created by otftotfm on Sun Jun 28 11:19:35 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:48 2020 % Command line follows encoding /AutoEnc_gb4hazflrmw4ypysjleckozq4b [ %00 @@ -53,14 +53,14 @@ /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2A.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2A.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A +% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A % --feature=kern --feature=liga --feature=onum --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 XCharter-Roman.otf diff --git a/fonts/xcharter/enc/xch_gvbfhh.enc b/fonts/xcharter/enc/xch_gvbfhh.enc index 5f556e675b..942fa18e01 100644 --- a/fonts/xcharter/enc/xch_gvbfhh.enc +++ b/fonts/xcharter/enc/xch_gvbfhh.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_gvbfhh7voaflluona6ie7qmk6b -% Encoding created by otftotfm on Sun Jun 28 11:18:55 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:13 2020 % Command line follows encoding /AutoEnc_gvbfhh7voaflluona6ie7qmk6b [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=onum --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 XCharter-Bold.otf diff --git a/fonts/xcharter/enc/xch_h2xo5a.enc b/fonts/xcharter/enc/xch_h2xo5a.enc index 615fb6aa6d..1a51a6a875 100644 --- a/fonts/xcharter/enc/xch_h2xo5a.enc +++ b/fonts/xcharter/enc/xch_h2xo5a.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_h2xo5amb5x2vxzsnowtxc2m4jf -% Encoding created by otftotfm on Sun Jun 28 11:19:44 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:53 2020 % Command line follows encoding /AutoEnc_h2xo5amb5x2vxzsnowtxc2m4jf [ %00 @@ -53,14 +53,14 @@ /afii10082 /afii10083 /afii10084.srb /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2Asrb.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --feature=kern --feature=liga --feature=lnum --ligkern=f i =: -% fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi -% --ligkern=ff l =: ffl XCharter-BoldItalic.otf +% --no-updmap --force --feature=kern --feature=liga --feature=lnum +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl XCharter-BoldItalic.otf % XCharter-BoldItalic-tlf-t2asrb' diff --git a/fonts/xcharter/enc/xch_h4dyum.enc b/fonts/xcharter/enc/xch_h4dyum.enc index d750f0ffdf..114b53ebfc 100644 --- a/fonts/xcharter/enc/xch_h4dyum.enc +++ b/fonts/xcharter/enc/xch_h4dyum.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_h4dyumvfz6ek2rcxjxry72wymd -% Encoding created by otftotfm on Sun Jun 28 11:18:58 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:21 2020 % Command line follows encoding /AutoEnc_h4dyumvfz6ek2rcxjxry72wymd [ %00 @@ -59,5 +59,5 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=dnom --ligkern=* {KL} * -% XCharter-BoldItalic.otf XCharter-BoldItalic-dnom-ot1' +% --no-updmap --force --coding-scheme=TEX TEXT --feature=dnom --ligkern=* +% {KL} * XCharter-BoldItalic.otf XCharter-BoldItalic-dnom-ot1' diff --git a/fonts/xcharter/enc/xch_hk5uz5.enc b/fonts/xcharter/enc/xch_hk5uz5.enc new file mode 100644 index 0000000000..481c0a5a2a --- /dev/null +++ b/fonts/xcharter/enc/xch_hk5uz5.enc @@ -0,0 +1,64 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_hk5uz5as5p5eyx5dr4lhl5fpkd +% Encoding created by otftotfm on Wed Aug 5 17:49:51 2020 +% Command line follows encoding +/AutoEnc_hk5uz5as5p5eyx5dr4lhl5fpkd [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef +%10 + /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef + /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl +%20 + /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright + /uni207D /uni207E /asterisk /uni207A /comma /uni207B /period /slash +%30 + /uni2070 /one.superior /two.superior /three.superior /uni2074 /uni2075 /uni2076 /uni2077 + /uni2078 /uni2079 /colon /semicolon /less /uni207C /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /braceleft /bar /braceright /asciitilde /uni207B +%80 + /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058 + /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054 +%90 + /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef + /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section +%A0 + /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106 + /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102 +%B0 + /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef + /.notdef /afii10101 /.notdef /afii10107 /afii10071 /quotedblbase /guillemotleft /guillemotright +%C0 + /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 + /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 +%D0 + /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041 + /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049 +%E0 + /afii10065 /afii10066.srb /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073 + /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081 +%F0 + /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 + /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 +] def +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc +% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter +% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter +% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter +% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter +% --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map +% --no-updmap --force --feature=sups --ligkern=* {KL} * XCharter-Bold.otf +% XCharter-Bold-sup-t2asrb' diff --git a/fonts/xcharter/enc/xch_hnm3ex.enc b/fonts/xcharter/enc/xch_hnm3ex.enc index c5049d1fc4..12dad87cff 100644 --- a/fonts/xcharter/enc/xch_hnm3ex.enc +++ b/fonts/xcharter/enc/xch_hnm3ex.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_hnm3exhjnhih7v5eit3ir6bkod -% Encoding created by otftotfm on Sun Jun 28 11:19:01 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:19 2020 % Command line follows encoding /AutoEnc_hnm3exhjnhih7v5eit3ir6bkod [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=lnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff % --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-BoldItalic.otf % XCharter-BoldItalic-tlf-ot1' diff --git a/fonts/xcharter/enc/xch_hrleas.enc b/fonts/xcharter/enc/xch_hrleas.enc index 08eece616c..cd59c0c791 100644 --- a/fonts/xcharter/enc/xch_hrleas.enc +++ b/fonts/xcharter/enc/xch_hrleas.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_hrleasgmzc6qxql6x4t4lllivd -% Encoding created by otftotfm on Sun Jun 28 11:18:57 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:11 2020 % Command line follows encoding /AutoEnc_hrleasgmzc6qxql6x4t4lllivd [ %00 @@ -59,5 +59,5 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=numr --ligkern=* {KL} * -% XCharter-Bold.otf XCharter-Bold-numr-ot1' +% --no-updmap --force --coding-scheme=TEX TEXT --feature=numr --ligkern=* +% {KL} * XCharter-Bold.otf XCharter-Bold-numr-ot1' diff --git a/fonts/xcharter/enc/xch_imj3v4.enc b/fonts/xcharter/enc/xch_imj3v4.enc index c2d3187208..8db4a1752d 100644 --- a/fonts/xcharter/enc/xch_imj3v4.enc +++ b/fonts/xcharter/enc/xch_imj3v4.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_imj3v4gund2byhyqg54gxv3wvh -% Encoding created by otftotfm on Sun Jun 28 11:19:18 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:36 2020 % Command line follows encoding /AutoEnc_imj3v4gund2byhyqg54gxv3wvh [ %00 @@ -59,5 +59,5 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=sups --ligkern=* {KL} * -% XCharter-Roman.otf XCharter-Roman-sup-ot1' +% --no-updmap --force --coding-scheme=TEX TEXT --feature=sups --ligkern=* +% {KL} * XCharter-Roman.otf XCharter-Roman-sup-ot1' diff --git a/fonts/xcharter/enc/xch_ivnpe7.enc b/fonts/xcharter/enc/xch_ivnpe7.enc index 38db888939..2f0c4f81ba 100644 --- a/fonts/xcharter/enc/xch_ivnpe7.enc +++ b/fonts/xcharter/enc/xch_ivnpe7.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_ivnpe75mj322okzj6wfooqsf5h -% Encoding created by otftotfm on Sun Jun 28 11:19:18 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:33 2020 % Command line follows encoding /AutoEnc_ivnpe75mj322okzj6wfooqsf5h [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff % --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-Roman.otf % XCharter-Roman-tosf-ot1' diff --git a/fonts/xcharter/enc/xch_jg3oo5.enc b/fonts/xcharter/enc/xch_jg3oo5.enc index 8442191342..261ac8746c 100644 --- a/fonts/xcharter/enc/xch_jg3oo5.enc +++ b/fonts/xcharter/enc/xch_jg3oo5.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_jg3oo5vwipxa5p2cyuinwiyame -% Encoding created by otftotfm on Sun Jun 28 11:19:13 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:29 2020 % Command line follows encoding /AutoEnc_jg3oo5vwipxa5p2cyuinwiyame [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=onum --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 XCharter-Italic.otf diff --git a/fonts/xcharter/enc/xch_kivgfk.enc b/fonts/xcharter/enc/xch_kivgfk.enc index 33ccc0ef4d..cee40158a8 100644 --- a/fonts/xcharter/enc/xch_kivgfk.enc +++ b/fonts/xcharter/enc/xch_kivgfk.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_kivgfkz745ugmum46x3qjttovc -% Encoding created by otftotfm on Sun Jun 28 11:19:48 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:55 2020 % Command line follows encoding /AutoEnc_kivgfkz745ugmum46x3qjttovc [ %00 @@ -53,12 +53,12 @@ /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2Asrb.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --feature=sups --ligkern=* {KL} * XCharter-Roman.otf +% --no-updmap --force --feature=sups --ligkern=* {KL} * XCharter-Roman.otf % XCharter-Roman-sup-t2asrb' diff --git a/fonts/xcharter/enc/xch_kkifs2.enc b/fonts/xcharter/enc/xch_kkifs2.enc index a534a7b930..019bb9ab78 100644 --- a/fonts/xcharter/enc/xch_kkifs2.enc +++ b/fonts/xcharter/enc/xch_kkifs2.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_kkifs23kqxvoo6oqghiakxijzb -% Encoding created by otftotfm on Sun Jun 28 11:19:33 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:44 2020 % Command line follows encoding /AutoEnc_kkifs23kqxvoo6oqghiakxijzb [ %00 @@ -53,14 +53,14 @@ /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2A.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2A.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A +% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A % --feature=kern --feature=liga --feature=lnum --ligkern=f i =: fi % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff -% l =: ffl XCharter-BoldItalic.otf XCharter-BoldItalic-tlf-t2a' +% l =: ffl XCharter-Bold.otf XCharter-Bold-tlf-t2a' diff --git a/fonts/xcharter/enc/xch_l4c4ke.enc b/fonts/xcharter/enc/xch_l4c4ke.enc index f57f09b0c9..8628a3a4d6 100644 --- a/fonts/xcharter/enc/xch_l4c4ke.enc +++ b/fonts/xcharter/enc/xch_l4c4ke.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_l4c4key5kiiwtb7im6dzu4sysa -% Encoding created by otftotfm on Sun Jun 28 11:18:55 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:13 2020 % Command line follows encoding /AutoEnc_l4c4key5kiiwtb7im6dzu4sysa [ %00 @@ -59,8 +59,8 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --feature=liga --feature=onum --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 XCharter-Bold.otf +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=kern --feature=liga --feature=onum --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 XCharter-Bold.otf % XCharter-Bold-tosf-sc-ly1' diff --git a/fonts/xcharter/enc/xch_l6an6k.enc b/fonts/xcharter/enc/xch_l6an6k.enc new file mode 100644 index 0000000000..fafbf314ff --- /dev/null +++ b/fonts/xcharter/enc/xch_l6an6k.enc @@ -0,0 +1,67 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_l6an6kxdiedrbf2cyc5zyit2hf +% Encoding created by otftotfm on Wed Aug 5 17:49:43 2020 +% Command line follows encoding +/AutoEnc_l6an6kxdiedrbf2cyc5zyit2hf [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef +%10 + /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef + /.notdef /i.sc /j.sc /ff /FI.sc /FL.sc /ffi /ffl +%20 + /.notdef /exclam /quotedbl /numbersign /dollar.sc /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 /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc + /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc +%70 + /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc + /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen +%80 + /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058 + /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054 +%90 + /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef + /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section +%A0 + /afii10050.sc /.notdef /afii10051.sc /afii10060.sc /uni04BB /.notdef /.notdef /afii10058.sc + /afii10056.sc /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10054.sc +%B0 + /.notdef /uni04AB /afii10062.sc /.notdef /.notdef /.notdef /afii10145.sc /.notdef + /.notdef /afii10053.sc /.notdef /afii10059.sc /afii10023.sc /quotedblbase /guillemotleft /guillemotright +%C0 + /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 + /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 +%D0 + /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041 + /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049 +%E0 + /afii10017.sc /afii10018.sc /afii10019.sc /afii10020.sc /afii10021.sc /afii10022.sc /afii10024.sc /afii10025.sc + /afii10026.sc /afii10027.sc /afii10028.sc /afii10029.sc /afii10030.sc /afii10031.sc /afii10032.sc /afii10033.sc +%F0 + /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc + /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc +] def +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2A.enc +% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter +% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter +% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter +% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter +% --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map +% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A +% --feature=kern --feature=liga --feature=onum --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 XCharter-Bold.otf +% XCharter-Bold-tosf-sc-t2a' diff --git a/fonts/xcharter/enc/xch_l7jokp.enc b/fonts/xcharter/enc/xch_l7jokp.enc index 96aa80796b..1c6ae66e8a 100644 --- a/fonts/xcharter/enc/xch_l7jokp.enc +++ b/fonts/xcharter/enc/xch_l7jokp.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_l7jokpfcz44zpao2do3sbtw4rb -% Encoding created by otftotfm on Sun Jun 28 11:19:03 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:16 2020 % Command line follows encoding /AutoEnc_l7jokpfcz44zpao2do3sbtw4rb [ %00 @@ -59,5 +59,5 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=subs --ligkern=* {KL} * -% XCharter-BoldItalic.otf XCharter-BoldItalic-inf-ot1' +% --no-updmap --force --coding-scheme=TEX TEXT --feature=subs --ligkern=* +% {KL} * XCharter-BoldItalic.otf XCharter-BoldItalic-inf-ot1' diff --git a/fonts/xcharter/enc/xch_lotb2t.enc b/fonts/xcharter/enc/xch_lotb2t.enc index 960f2151b9..81e6eacde6 100644 --- a/fonts/xcharter/enc/xch_lotb2t.enc +++ b/fonts/xcharter/enc/xch_lotb2t.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_lotb2txowotzvwhykqots4r2eb -% Encoding created by otftotfm on Sun Jun 28 11:19:22 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:36 2020 % Command line follows encoding /AutoEnc_lotb2txowotzvwhykqots4r2eb [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN % --feature=kern --feature=liga --feature=lnum --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 XCharter-Roman.otf diff --git a/fonts/xcharter/enc/xch_nxyw3t.enc b/fonts/xcharter/enc/xch_nxyw3t.enc index a851f2d758..a595eb6c80 100644 --- a/fonts/xcharter/enc/xch_nxyw3t.enc +++ b/fonts/xcharter/enc/xch_nxyw3t.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_nxyw3tq5ihdbbiv6d6yhqdd74b -% Encoding created by otftotfm on Sun Jun 28 11:18:57 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:14 2020 % Command line follows encoding /AutoEnc_nxyw3tq5ihdbbiv6d6yhqdd74b [ %00 @@ -59,8 +59,8 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --feature=liga --feature=lnum --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 XCharter-Bold.otf +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=kern --feature=liga --feature=lnum --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 XCharter-Bold.otf % XCharter-Bold-tlf-sc-ly1' diff --git a/fonts/xcharter/enc/xch_o6avng.enc b/fonts/xcharter/enc/xch_o6avng.enc index 1c5ab95f36..aacaa2d155 100644 --- a/fonts/xcharter/enc/xch_o6avng.enc +++ b/fonts/xcharter/enc/xch_o6avng.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_o6avng67hcv7tbxmrhbu6rg66f -% Encoding created by otftotfm on Sun Jun 28 11:19:15 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:30 2020 % Command line follows encoding /AutoEnc_o6avng67hcv7tbxmrhbu6rg66f [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=lnum --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 XCharter-Italic.otf diff --git a/fonts/xcharter/enc/xch_og2pus.enc b/fonts/xcharter/enc/xch_og2pus.enc index 051031690f..ecef4cad58 100644 --- a/fonts/xcharter/enc/xch_og2pus.enc +++ b/fonts/xcharter/enc/xch_og2pus.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_og2pussftqyl45scunlcyi2pzh -% Encoding created by otftotfm on Sun Jun 28 11:18:53 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:15 2020 % Command line follows encoding /AutoEnc_og2pussftqyl45scunlcyi2pzh [ %00 @@ -59,5 +59,5 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=sups --ligkern=* {KL} * -% XCharter-Bold.otf XCharter-Bold-sup-ot1' +% --no-updmap --force --coding-scheme=TEX TEXT --feature=sups --ligkern=* +% {KL} * XCharter-Bold.otf XCharter-Bold-sup-ot1' diff --git a/fonts/xcharter/enc/xch_oj27u4.enc b/fonts/xcharter/enc/xch_oj27u4.enc index b8be281b3b..4c63f68c38 100644 --- a/fonts/xcharter/enc/xch_oj27u4.enc +++ b/fonts/xcharter/enc/xch_oj27u4.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_oj27u4aotgolmhtzxfclg6w4yf -% Encoding created by otftotfm on Sun Jun 28 11:19:46 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:56 2020 % Command line follows encoding /AutoEnc_oj27u4aotgolmhtzxfclg6w4yf [ %00 @@ -53,13 +53,14 @@ /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2Asrb.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --feature=kern --feature=liga --feature=onum --ligkern=f i =: -% fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi -% --ligkern=ff l =: ffl XCharter-Roman.otf XCharter-Roman-tosf-t2asrb' +% --no-updmap --force --feature=kern --feature=liga --feature=onum +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl XCharter-Roman.otf +% XCharter-Roman-tosf-t2asrb' diff --git a/fonts/xcharter/enc/xch_opza6q.enc b/fonts/xcharter/enc/xch_opza6q.enc index 2cbd704bbd..77ade83601 100644 --- a/fonts/xcharter/enc/xch_opza6q.enc +++ b/fonts/xcharter/enc/xch_opza6q.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_opza6qblv2lminaayl26j2ejob -% Encoding created by otftotfm on Sun Jun 28 11:18:57 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:14 2020 % Command line follows encoding /AutoEnc_opza6qblv2lminaayl26j2ejob [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN % --feature=kern --feature=liga --feature=lnum --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 XCharter-Bold.otf diff --git a/fonts/xcharter/enc/xch_ouuvex.enc b/fonts/xcharter/enc/xch_ouuvex.enc index 96167dc889..39129b0a00 100644 --- a/fonts/xcharter/enc/xch_ouuvex.enc +++ b/fonts/xcharter/enc/xch_ouuvex.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_ouuvexj34zgqmguu33ic4ftelf -% Encoding created by otftotfm on Sun Jun 28 11:19:47 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:56 2020 % Command line follows encoding /AutoEnc_ouuvexj34zgqmguu33ic4ftelf [ %00 @@ -53,14 +53,14 @@ /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2Asrb.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --feature=kern --feature=liga --feature=lnum --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 -% XCharter-Roman.otf XCharter-Roman-tlf-sc-t2asrb' +% --no-updmap --force --feature=kern --feature=liga --feature=lnum +% --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 XCharter-Roman.otf XCharter-Roman-tlf-sc-t2asrb' diff --git a/fonts/xcharter/enc/xch_ph46id.enc b/fonts/xcharter/enc/xch_ph46id.enc index 9bc8c11b5a..22b61b0864 100644 --- a/fonts/xcharter/enc/xch_ph46id.enc +++ b/fonts/xcharter/enc/xch_ph46id.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_ph46idfft7to53v2kspy6xejya -% Encoding created by otftotfm on Sun Jun 28 11:19:30 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:58 2020 % Command line follows encoding /AutoEnc_ph46idfft7to53v2kspy6xejya [ %00 @@ -53,8 +53,8 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/fontools_ts1.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/xcharter_ts1.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter diff --git a/fonts/xcharter/enc/xch_pqp4df.enc b/fonts/xcharter/enc/xch_pqp4df.enc index 5a469a694f..e1fd26fb38 100644 --- a/fonts/xcharter/enc/xch_pqp4df.enc +++ b/fonts/xcharter/enc/xch_pqp4df.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_pqp4dfh24qktfeuqit5ll3ua4f -% Encoding created by otftotfm on Sun Jun 28 11:19:30 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:58 2020 % Command line follows encoding /AutoEnc_pqp4dfh24qktfeuqit5ll3ua4f [ %00 @@ -53,8 +53,8 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/fontools_ts1.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/xcharter_ts1.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter diff --git a/fonts/xcharter/enc/xch_q2nwaj.enc b/fonts/xcharter/enc/xch_q2nwaj.enc index 1597851073..8cae07a035 100644 --- a/fonts/xcharter/enc/xch_q2nwaj.enc +++ b/fonts/xcharter/enc/xch_q2nwaj.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_q2nwaj3r2ed2ei2xtolszzvvpd -% Encoding created by otftotfm on Sun Jun 28 11:18:54 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:12 2020 % Command line follows encoding /AutoEnc_q2nwaj3r2ed2ei2xtolszzvvpd [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff % --ligkern=ff i =: ffi --ligkern=ff l =: ffl XCharter-Bold.otf % XCharter-Bold-tosf-ot1' diff --git a/fonts/xcharter/enc/xch_qdfne6.enc b/fonts/xcharter/enc/xch_qdfne6.enc index 86c5c94019..a13a53f7ae 100644 --- a/fonts/xcharter/enc/xch_qdfne6.enc +++ b/fonts/xcharter/enc/xch_qdfne6.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_qdfne6lrxeqe45q3s3awg3vmie -% Encoding created by otftotfm on Sun Jun 28 11:19:20 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:35 2020 % Command line follows encoding /AutoEnc_qdfne6lrxeqe45q3s3awg3vmie [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN % --feature=kern --feature=liga --feature=onum --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 XCharter-Roman.otf diff --git a/fonts/xcharter/enc/xch_s3y5jv.enc b/fonts/xcharter/enc/xch_s3y5jv.enc index 3f35434ccc..e9293c16ac 100644 --- a/fonts/xcharter/enc/xch_s3y5jv.enc +++ b/fonts/xcharter/enc/xch_s3y5jv.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_s3y5jvk4hx5jxjonvlutht5zbb -% Encoding created by otftotfm on Sun Jun 28 11:18:58 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:11 2020 % Command line follows encoding /AutoEnc_s3y5jvk4hx5jxjonvlutht5zbb [ %00 @@ -59,5 +59,5 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=subs --ligkern=* {KL} * -% XCharter-Bold.otf XCharter-Bold-inf-ot1' +% --no-updmap --force --coding-scheme=TEX TEXT --feature=subs --ligkern=* +% {KL} * XCharter-Bold.otf XCharter-Bold-inf-ot1' diff --git a/fonts/xcharter/enc/xch_sbtai3.enc b/fonts/xcharter/enc/xch_sbtai3.enc deleted file mode 100644 index ed533e7300..0000000000 --- a/fonts/xcharter/enc/xch_sbtai3.enc +++ /dev/null @@ -1,63 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_sbtai3atebcurtmtj3yhltrvsh -% Encoding created by otftotfm on Sun Jun 28 11:19:45 2020 -% Command line follows encoding -/AutoEnc_sbtai3atebcurtmtj3yhltrvsh [ -%00 - /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron - /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef -%10 - /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef - /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl -%20 - /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /less /equal /greater /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /asciitilde /hyphen -%80 - /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058 - /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054 -%90 - /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef - /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section -%A0 - /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106 - /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102 -%B0 - /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef - /.notdef /afii10101 /.notdef /afii10107 /afii10071 /quotedblbase /guillemotleft /guillemotright -%C0 - /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 - /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 -%D0 - /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041 - /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049 -%E0 - /afii10065 /afii10066.srb /afii10067 /afii10068.srb /afii10069.srb /afii10070 /afii10072 /afii10073 - /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081.srb -%F0 - /afii10082 /afii10083 /afii10084.srb /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 - /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 -] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2Asrb.enc -% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter -% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter -% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter -% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter -% --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --feature=kern XCharter-Italic.otf XCharter-Italic-tlf-t2asrb' diff --git a/fonts/xcharter/enc/xch_sbuybh.enc b/fonts/xcharter/enc/xch_sbuybh.enc index 48ee872d3b..b538935bac 100644 --- a/fonts/xcharter/enc/xch_sbuybh.enc +++ b/fonts/xcharter/enc/xch_sbuybh.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_sbuybhrcixtjd5f6vd474cjjoc -% Encoding created by otftotfm on Sun Jun 28 11:19:35 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:49 2020 % Command line follows encoding /AutoEnc_sbuybhrcixtjd5f6vd474cjjoc [ %00 @@ -53,13 +53,13 @@ /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2A.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2A.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A +% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A % --feature=sups --ligkern=* {KL} * XCharter-Roman.otf % XCharter-Roman-sup-t2a' diff --git a/fonts/xcharter/enc/xch_tis6bf.enc b/fonts/xcharter/enc/xch_tis6bf.enc index ac00f64a65..3f8b059d99 100644 --- a/fonts/xcharter/enc/xch_tis6bf.enc +++ b/fonts/xcharter/enc/xch_tis6bf.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_tis6bfdwvv5gilttppmccbkofh -% Encoding created by otftotfm on Sun Jun 28 11:19:30 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:58 2020 % Command line follows encoding /AutoEnc_tis6bfdwvv5gilttppmccbkofh [ %00 @@ -53,8 +53,8 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/fontools_ts1.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/xcharter_ts1.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter diff --git a/fonts/xcharter/enc/xch_tkkgpv.enc b/fonts/xcharter/enc/xch_tkkgpv.enc deleted file mode 100644 index d0f5bddeb2..0000000000 --- a/fonts/xcharter/enc/xch_tkkgpv.enc +++ /dev/null @@ -1,64 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_tkkgpv2tthfczcm4xyj5orptsg -% Encoding created by otftotfm on Sun Jun 28 11:19:31 2020 -% Command line follows encoding -/AutoEnc_tkkgpv2tthfczcm4xyj5orptsg [ -%00 - /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron - /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef -%10 - /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef - /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl -%20 - /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /less /equal /greater /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /asciitilde /hyphen -%80 - /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058 - /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054 -%90 - /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef - /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section -%A0 - /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106 - /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102 -%B0 - /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef - /.notdef /afii10101 /.notdef /afii10107 /afii10071 /quotedblbase /guillemotleft /guillemotright -%C0 - /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 - /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 -%D0 - /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041 - /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049 -%E0 - /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073 - /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081 -%F0 - /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 - /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 -] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2A.enc -% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter -% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter -% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter -% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter -% --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A -% --feature=kern XCharter-Bold.otf XCharter-Bold-tlf-t2a' diff --git a/fonts/xcharter/enc/xch_ukw3hq.enc b/fonts/xcharter/enc/xch_ukw3hq.enc index 4dd322dcf3..ea5864aabf 100644 --- a/fonts/xcharter/enc/xch_ukw3hq.enc +++ b/fonts/xcharter/enc/xch_ukw3hq.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_ukw3hq7h3prn34ryh2qktyrkse -% Encoding created by otftotfm on Sun Jun 28 11:19:18 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:37 2020 % Command line follows encoding /AutoEnc_ukw3hq7h3prn34ryh2qktyrkse [ %00 @@ -59,5 +59,6 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sups -% --ligkern=* {KL} * XCharter-Roman.otf XCharter-Roman-sup-ly1' +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=sups --ligkern=* {KL} * XCharter-Roman.otf +% XCharter-Roman-sup-ly1' diff --git a/fonts/xcharter/enc/xch_uoo6px.enc b/fonts/xcharter/enc/xch_uoo6px.enc index 4feeba3af3..bdbe366d79 100644 --- a/fonts/xcharter/enc/xch_uoo6px.enc +++ b/fonts/xcharter/enc/xch_uoo6px.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_uoo6pxpehqtlsycmfpn46gzmce -% Encoding created by otftotfm on Sun Jun 28 11:19:21 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:36 2020 % Command line follows encoding /AutoEnc_uoo6pxpehqtlsycmfpn46gzmce [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=lnum --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 XCharter-Roman.otf diff --git a/fonts/xcharter/enc/xch_uv5z4v.enc b/fonts/xcharter/enc/xch_uv5z4v.enc index 48ba3e0692..c40fa15a30 100644 --- a/fonts/xcharter/enc/xch_uv5z4v.enc +++ b/fonts/xcharter/enc/xch_uv5z4v.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_uv5z4vgovlrskdiufko4bahvvb -% Encoding created by otftotfm on Sun Jun 28 11:19:02 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:19 2020 % Command line follows encoding /AutoEnc_uv5z4vgovlrskdiufko4bahvvb [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga +% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga % --feature=lnum --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 XCharter-BoldItalic.otf diff --git a/fonts/xcharter/enc/xch_uy5hgr.enc b/fonts/xcharter/enc/xch_uy5hgr.enc index 6136043495..d0add3e8ee 100644 --- a/fonts/xcharter/enc/xch_uy5hgr.enc +++ b/fonts/xcharter/enc/xch_uy5hgr.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_uy5hgrldyhsgphq5chgxos5b2a -% Encoding created by otftotfm on Sun Jun 28 11:18:56 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:14 2020 % Command line follows encoding /AutoEnc_uy5hgrldyhsgphq5chgxos5b2a [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN % --feature=kern --feature=liga --feature=lnum --ligkern=f i =: fi % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff % l =: ffl XCharter-Bold.otf XCharter-Bold-tlf-t1' diff --git a/fonts/xcharter/enc/xch_v6llfb.enc b/fonts/xcharter/enc/xch_v6llfb.enc index 065c030f45..1f195739cc 100644 --- a/fonts/xcharter/enc/xch_v6llfb.enc +++ b/fonts/xcharter/enc/xch_v6llfb.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza -% Encoding created by otftotfm on Sun Jun 28 11:18:53 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:15 2020 % Command line follows encoding /AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza [ %00 @@ -59,5 +59,6 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dnom -% --ligkern=* {KL} * XCharter-Bold.otf XCharter-Bold-dnom-ly1' +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=dnom --ligkern=* {KL} * XCharter-Bold.otf +% XCharter-Bold-dnom-ly1' diff --git a/fonts/xcharter/enc/xch_vtvjjk.enc b/fonts/xcharter/enc/xch_vtvjjk.enc index 877e60a9a3..c18afe605a 100644 --- a/fonts/xcharter/enc/xch_vtvjjk.enc +++ b/fonts/xcharter/enc/xch_vtvjjk.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_vtvjjktdgjkkmdvqy3brwughzb -% Encoding created by otftotfm on Sun Jun 28 11:18:59 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:20 2020 % Command line follows encoding /AutoEnc_vtvjjktdgjkkmdvqy3brwughzb [ %00 @@ -59,5 +59,5 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=sups --ligkern=* {KL} * -% XCharter-BoldItalic.otf XCharter-BoldItalic-sup-ot1' +% --no-updmap --force --coding-scheme=TEX TEXT --feature=sups --ligkern=* +% {KL} * XCharter-BoldItalic.otf XCharter-BoldItalic-sup-ot1' diff --git a/fonts/xcharter/enc/xch_vv7waw.enc b/fonts/xcharter/enc/xch_vv7waw.enc index cb6c38ea75..f6460b5a35 100644 --- a/fonts/xcharter/enc/xch_vv7waw.enc +++ b/fonts/xcharter/enc/xch_vv7waw.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_vv7wawb267dz2g6yzjc43rbfxd -% Encoding created by otftotfm on Sun Jun 28 11:19:19 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:34 2020 % Command line follows encoding /AutoEnc_vv7wawb267dz2g6yzjc43rbfxd [ %00 @@ -59,8 +59,8 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --feature=liga --feature=onum --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 XCharter-Roman.otf +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=kern --feature=liga --feature=onum --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 XCharter-Roman.otf % XCharter-Roman-tosf-sc-ly1' diff --git a/fonts/xcharter/enc/xch_wi6ykn.enc b/fonts/xcharter/enc/xch_wi6ykn.enc index 0269192c5b..deead2fc48 100644 --- a/fonts/xcharter/enc/xch_wi6ykn.enc +++ b/fonts/xcharter/enc/xch_wi6ykn.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_wi6yknl3kt4py2tsiqef6clbfd -% Encoding created by otftotfm on Sun Jun 28 11:19:32 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:45 2020 % Command line follows encoding /AutoEnc_wi6yknl3kt4py2tsiqef6clbfd [ %00 @@ -53,14 +53,14 @@ /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2A.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2A.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A +% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A % --feature=kern --feature=liga --feature=onum --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/xcharter/enc/xch_wiwj7n.enc b/fonts/xcharter/enc/xch_wiwj7n.enc index 6980ddb9d7..ce431db30c 100644 --- a/fonts/xcharter/enc/xch_wiwj7n.enc +++ b/fonts/xcharter/enc/xch_wiwj7n.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_wiwj7nqo5txgvrdqgmxi6evy2c -% Encoding created by otftotfm on Sun Jun 28 11:19:02 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:19 2020 % Command line follows encoding /AutoEnc_wiwj7nqo5txgvrdqgmxi6evy2c [ %00 @@ -59,8 +59,8 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --feature=liga --feature=lnum --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 XCharter-BoldItalic.otf -% XCharter-BoldItalic-tlf-sc-ly1' +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=kern --feature=liga --feature=lnum --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 +% XCharter-BoldItalic.otf XCharter-BoldItalic-tlf-sc-ly1' diff --git a/fonts/xcharter/enc/xch_wizqmm.enc b/fonts/xcharter/enc/xch_wizqmm.enc index 4d6d8aff26..8698939b3b 100644 --- a/fonts/xcharter/enc/xch_wizqmm.enc +++ b/fonts/xcharter/enc/xch_wizqmm.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_wizqmmzl3mhmm6sbwmu3i6uufe -% Encoding created by otftotfm on Sun Jun 28 11:18:56 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:13 2020 % Command line follows encoding /AutoEnc_wizqmmzl3mhmm6sbwmu3i6uufe [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --feature=liga --feature=lnum --ligkern=f i =: fi --ligkern=f l =: fl -% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl -% XCharter-Bold.otf XCharter-Bold-tlf-ly1' +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=kern --feature=liga --feature=lnum --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl XCharter-Bold.otf XCharter-Bold-tlf-ly1' diff --git a/fonts/xcharter/enc/xch_wmw2bj.enc b/fonts/xcharter/enc/xch_wmw2bj.enc deleted file mode 100644 index fcc872cd6f..0000000000 --- a/fonts/xcharter/enc/xch_wmw2bj.enc +++ /dev/null @@ -1,63 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_wmw2bjyup5xylbgizdosbllkdh -% Encoding created by otftotfm on Sun Jun 28 11:19:43 2020 -% Command line follows encoding -/AutoEnc_wmw2bjyup5xylbgizdosbllkdh [ -%00 - /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron - /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef -%10 - /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef - /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl -%20 - /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /less /equal /greater /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /asciitilde /hyphen -%80 - /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058 - /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054 -%90 - /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef - /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section -%A0 - /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106 - /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102 -%B0 - /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef - /.notdef /afii10101 /.notdef /afii10107 /afii10071 /quotedblbase /guillemotleft /guillemotright -%C0 - /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 - /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 -%D0 - /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041 - /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049 -%E0 - /afii10065 /afii10066.srb /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073 - /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081 -%F0 - /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 - /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 -] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2Asrb.enc -% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter -% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter -% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter -% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter -% --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --feature=kern XCharter-Bold.otf XCharter-Bold-tlf-t2asrb' diff --git a/fonts/xcharter/enc/xch_wqeam3.enc b/fonts/xcharter/enc/xch_wqeam3.enc index d55b9d5552..b3215b4bd2 100644 --- a/fonts/xcharter/enc/xch_wqeam3.enc +++ b/fonts/xcharter/enc/xch_wqeam3.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_wqeam3xphw5mmouhxu2uypuhte -% Encoding created by otftotfm on Sun Jun 28 11:19:19 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:34 2020 % Command line follows encoding /AutoEnc_wqeam3xphw5mmouhxu2uypuhte [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --feature=liga --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl -% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl -% XCharter-Roman.otf XCharter-Roman-tosf-ly1' +% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI +% --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl XCharter-Roman.otf XCharter-Roman-tosf-ly1' diff --git a/fonts/xcharter/enc/xch_wwsmtw.enc b/fonts/xcharter/enc/xch_wwsmtw.enc index daeaea2989..3395b7fdf8 100644 --- a/fonts/xcharter/enc/xch_wwsmtw.enc +++ b/fonts/xcharter/enc/xch_wwsmtw.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_wwsmtw5naaeoyrpn3g5g7goydc -% Encoding created by otftotfm on Sun Jun 28 11:18:55 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:12 2020 % Command line follows encoding /AutoEnc_wwsmtw5naaeoyrpn3g5g7goydc [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN % --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff % l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-t1' diff --git a/fonts/xcharter/enc/xch_x25wg5.enc b/fonts/xcharter/enc/xch_x25wg5.enc index 16d0bfe9ba..52234b6cd9 100644 --- a/fonts/xcharter/enc/xch_x25wg5.enc +++ b/fonts/xcharter/enc/xch_x25wg5.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_x25wg5wzbfblxt2tm7d7pkp5mc -% Encoding created by otftotfm on Sun Jun 28 11:18:53 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:15 2020 % Command line follows encoding /AutoEnc_x25wg5wzbfblxt2tm7d7pkp5mc [ %00 @@ -59,5 +59,5 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX TEXT --feature=dnom --ligkern=* {KL} * -% XCharter-Bold.otf XCharter-Bold-dnom-ot1' +% --no-updmap --force --coding-scheme=TEX TEXT --feature=dnom --ligkern=* +% {KL} * XCharter-Bold.otf XCharter-Bold-dnom-ot1' diff --git a/fonts/xcharter/enc/xch_xmfb6b.enc b/fonts/xcharter/enc/xch_xmfb6b.enc index 56e4d7b9a4..5185def943 100644 --- a/fonts/xcharter/enc/xch_xmfb6b.enc +++ b/fonts/xcharter/enc/xch_xmfb6b.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_xmfb6bhkkyqaejxdoyqfvnjqad -% Encoding created by otftotfm on Sun Jun 28 11:19:32 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:43 2020 % Command line follows encoding /AutoEnc_xmfb6bhkkyqaejxdoyqfvnjqad [ %00 @@ -53,14 +53,14 @@ /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/T2A.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2A.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A +% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A % --feature=kern --feature=liga --feature=onum --ligkern=f i =: fi % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff -% l =: ffl XCharter-BoldItalic.otf XCharter-BoldItalic-tosf-t2a' +% l =: ffl XCharter-Bold.otf XCharter-Bold-tosf-t2a' diff --git a/fonts/xcharter/enc/xch_xqcxen.enc b/fonts/xcharter/enc/xch_xqcxen.enc index 2589f1343d..64db1ca149 100644 --- a/fonts/xcharter/enc/xch_xqcxen.enc +++ b/fonts/xcharter/enc/xch_xqcxen.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_xqcxendti4xfjtesusecvwojab -% Encoding created by otftotfm on Sun Jun 28 11:19:31 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:59 2020 % Command line follows encoding /AutoEnc_xqcxendti4xfjtesusecvwojab [ %00 @@ -53,8 +53,8 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def -% Command line: 'otftotfm --automatic --encoding=/Users/msharpe/Google -% Drive/Fontpkgs/xchartertext/fontools_ts1.enc +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/xcharter_ts1.enc % --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter % --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter diff --git a/fonts/xcharter/enc/xch_ybxeq6.enc b/fonts/xcharter/enc/xch_ybxeq6.enc index 894cb53327..039f12afa0 100644 --- a/fonts/xcharter/enc/xch_ybxeq6.enc +++ b/fonts/xcharter/enc/xch_ybxeq6.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_ybxeq66i2kr4mrhmreqj7x5ibg -% Encoding created by otftotfm on Sun Jun 28 11:18:58 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:11 2020 % Command line follows encoding /AutoEnc_ybxeq66i2kr4mrhmreqj7x5ibg [ %00 @@ -59,5 +59,5 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN % --feature=subs --ligkern=* {KL} * XCharter-Bold.otf XCharter-Bold-inf-t1' diff --git a/fonts/xcharter/enc/xch_ykltyo.enc b/fonts/xcharter/enc/xch_ykltyo.enc new file mode 100644 index 0000000000..d815584cb7 --- /dev/null +++ b/fonts/xcharter/enc/xch_ykltyo.enc @@ -0,0 +1,67 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_ykltyoqxg3qar3htqai7tovnxh +% Encoding created by otftotfm on Wed Aug 5 17:49:44 2020 +% Command line follows encoding +/AutoEnc_ykltyoqxg3qar3htqai7tovnxh [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef +%10 + /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef + /.notdef /i.sc /j.sc /ff /FI.sc /FL.sc /ffi /ffl +%20 + /.notdef /exclam /quotedbl /numbersign /dollar.sc /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero /one /two /three /four /five /six /seven + /eight /nine /colon /semicolon /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc + /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc +%70 + /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc + /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen +%80 + /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058 + /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054 +%90 + /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef + /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section +%A0 + /afii10050.sc /.notdef /afii10051.sc /afii10060.sc /uni04BB /.notdef /.notdef /afii10058.sc + /afii10056.sc /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10054.sc +%B0 + /.notdef /uni04AB /afii10062.sc /.notdef /.notdef /.notdef /afii10145.sc /.notdef + /.notdef /afii10053.sc /.notdef /afii10059.sc /afii10023.sc /quotedblbase /guillemotleft /guillemotright +%C0 + /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 + /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 +%D0 + /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041 + /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049 +%E0 + /afii10017.sc /afii10018.sc /afii10019.sc /afii10020.sc /afii10021.sc /afii10022.sc /afii10024.sc /afii10025.sc + /afii10026.sc /afii10027.sc /afii10028.sc /afii10029.sc /afii10030.sc /afii10031.sc /afii10032.sc /afii10033.sc +%F0 + /afii10034.sc /afii10035.sc /afii10036.sc /afii10037.sc /afii10038.sc /afii10039.sc /afii10040.sc /afii10041.sc + /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc +] def +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2A.enc +% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter +% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter +% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter +% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter +% --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map +% --no-updmap --force --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A +% --feature=kern --feature=liga --feature=lnum --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 XCharter-Bold.otf +% XCharter-Bold-tlf-sc-t2a' diff --git a/fonts/xcharter/enc/xch_yrgi2d.enc b/fonts/xcharter/enc/xch_yrgi2d.enc new file mode 100644 index 0000000000..5c77e6655d --- /dev/null +++ b/fonts/xcharter/enc/xch_yrgi2d.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_yrgi2dpbqrwqwzkn3nxmqozxeh +% Encoding created by otftotfm on Wed Aug 5 17:49:51 2020 +% Command line follows encoding +/AutoEnc_yrgi2dpbqrwqwzkn3nxmqozxeh [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h +%10 + /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /.notdef + /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl +%20 + /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero /one /two /three /four /five /six /seven + /eight /nine /colon /semicolon /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /braceleft /bar /braceright /asciitilde /hyphen +%80 + /afii10050 /.notdef /afii10051 /afii10060 /.notdef /.notdef /.notdef /afii10058 + /afii10056 /.notdef /.notdef /.notdef /uni04D4 /.notdef /.notdef /afii10054 +%90 + /.notdef /uni04AA /afii10062 /uni04AE /.notdef /.notdef /afii10145 /.notdef + /.notdef /afii10053 /.notdef /afii10059 /afii10023 /uni2116 /currency /section +%A0 + /afii10098 /.notdef /afii10099 /afii10108 /uni04BB /.notdef /.notdef /afii10106 + /afii10104 /.notdef /.notdef /.notdef /uni04D5 /.notdef /.notdef /afii10102 +%B0 + /.notdef /uni04AB /afii10110 /.notdef /.notdef /.notdef /afii10193 /.notdef + /.notdef /afii10101 /.notdef /afii10107 /afii10071 /quotedblbase /guillemotleft /guillemotright +%C0 + /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 + /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 +%D0 + /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041 + /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049 +%E0 + /afii10065 /afii10066.srb /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073 + /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081 +%F0 + /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 + /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 +] def +% Command line: 'otftotfm --automatic +% --encoding=/Users/msharpe/Desktop/XCharter/xchartertext/T2Asrb.enc +% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/tfm/public/xcharter +% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/vf/public/xcharter +% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter +% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter +% --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map +% --no-updmap --force --feature=kern --feature=liga --feature=lnum +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl XCharter-Bold.otf XCharter-Bold-tlf-t2asrb' diff --git a/fonts/xcharter/enc/xch_yz7cd7.enc b/fonts/xcharter/enc/xch_yz7cd7.enc index f52eeea8de..bb7863291b 100644 --- a/fonts/xcharter/enc/xch_yz7cd7.enc +++ b/fonts/xcharter/enc/xch_yz7cd7.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_yz7cd7m4dutxjf4ebhvpvegzmh -% Encoding created by otftotfm on Sun Jun 28 11:19:01 2020 +% Encoding created by otftotfm on Wed Aug 5 17:49:18 2020 % Command line follows encoding /AutoEnc_yz7cd7m4dutxjf4ebhvpvegzmh [ %00 @@ -59,7 +59,7 @@ % --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/type1/public/xcharter % --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/enc/dvips/xcharter % --map-file=/Users/msharpe/Library/texlive/2020/texmf-var/fonts/map/dvips/xcharter/XCharter.map -% --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN +% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN % --feature=kern --feature=liga --feature=onum --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/xcharter/map/XCharter.map b/fonts/xcharter/map/XCharter.map index e4f4c7744d..ce93d091a0 100644 --- a/fonts/xcharter/map/XCharter.map +++ b/fonts/xcharter/map/XCharter.map @@ -1,11 +1,11 @@ % Automatically maintained by otftotfm or other programs. Do not edit. -XCharter-Bold-dnom-ot1 XCharter-Bold "AutoEnc_x25wg5wzbfblxt2tm7d7pkp5mc ReEncodeFont" <[xch_x25wg5.enc \XCharter@@scale XCharter-Slanted-sup-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-Sup}{regular}{sl}{ + <-> alias * XCharter-Sup/m/sl +}{} + +\DeclareFontShape{T2ASRB}{XCharter-Sup}{m}{n}{ + <-> \XCharter@@scale XCharter-Roman-sup-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-Sup}{regular}{n}{ + <-> alias * XCharter-Sup/m/n +}{} + +\DeclareFontShape{T2ASRB}{XCharter-Sup}{m}{it}{ + <-> \XCharter@@scale XCharter-Italic-sup-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-Sup}{regular}{it}{ + <-> alias * XCharter-Sup/m/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{T2ASRB}{XCharter-Sup}{b}{n}{ + <-> \XCharter@@scale XCharter-Bold-sup-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-Sup}{bold}{n}{ + <-> alias * XCharter-Sup/b/n +}{} + +\DeclareFontShape{T2ASRB}{XCharter-Sup}{b}{sl}{ + <-> \XCharter@@scale XCharter-BoldSlanted-sup-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-Sup}{bold}{sl}{ + <-> alias * XCharter-Sup/b/sl +}{} + +\DeclareFontShape{T2ASRB}{XCharter-Sup}{b}{it}{ + <-> \XCharter@@scale XCharter-BoldItalic-sup-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-Sup}{bold}{it}{ + <-> alias * XCharter-Sup/b/it +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{T2ASRB}{XCharter-Sup}{bx}{it}{ + <-> ssub * XCharter-Sup/b/it +}{} + +\DeclareFontShape{T2ASRB}{XCharter-Sup}{bx}{sl}{ + <-> ssub * XCharter-Sup/b/sl +}{} + +\DeclareFontShape{T2ASRB}{XCharter-Sup}{bx}{n}{ + <-> ssub * XCharter-Sup/b/n +}{} + +\endinput diff --git a/fonts/xcharter/tex/T2ASRBXCharter-TLF.fd b/fonts/xcharter/tex/T2ASRBXCharter-TLF.fd new file mode 100644 index 0000000000..101c2f34a1 --- /dev/null +++ b/fonts/xcharter/tex/T2ASRBXCharter-TLF.fd @@ -0,0 +1,151 @@ +%% Generated by autoinst on 2020/08/05 +%% +\ProvidesFile{T2ASRBXCharter-TLF.fd} + [2020/08/05 (autoinst) Font definitions for T2ASRB/XCharter-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname XCharter@scale\endcsname\relax + \let\XCharter@@scale\@empty +\else + \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% +\fi + +\DeclareFontFamily{T2ASRB}{XCharter-TLF}{} + + +% ---- b = bold ---- + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{scit}{ + <-> \XCharter@@scale XCharter-BoldItalic-tlf-sc-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{scit}{ + <-> alias * XCharter-TLF/b/scit +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{it}{ + <-> \XCharter@@scale XCharter-BoldItalic-tlf-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{it}{ + <-> alias * XCharter-TLF/b/it +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{sl}{ + <-> \XCharter@@scale XCharter-BoldSlanted-tlf-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{sl}{ + <-> alias * XCharter-TLF/b/sl +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{n}{ + <-> \XCharter@@scale XCharter-Bold-tlf-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{n}{ + <-> alias * XCharter-TLF/b/n +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{sc}{ + <-> \XCharter@@scale XCharter-Bold-tlf-sc-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{sc}{ + <-> alias * XCharter-TLF/b/sc +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{scsl}{ + <-> \XCharter@@scale XCharter-BoldSlanted-tlf-sc-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{scsl}{ + <-> alias * XCharter-TLF/b/scsl +}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{scsl}{ + <-> \XCharter@@scale XCharter-Slanted-tlf-sc-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{scsl}{ + <-> alias * XCharter-TLF/m/scsl +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{sc}{ + <-> \XCharter@@scale XCharter-Roman-tlf-sc-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{sc}{ + <-> alias * XCharter-TLF/m/sc +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{sl}{ + <-> \XCharter@@scale XCharter-Slanted-tlf-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{sl}{ + <-> alias * XCharter-TLF/m/sl +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{n}{ + <-> \XCharter@@scale XCharter-Roman-tlf-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{n}{ + <-> alias * XCharter-TLF/m/n +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{scit}{ + <-> \XCharter@@scale XCharter-Italic-tlf-sc-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{scit}{ + <-> alias * XCharter-TLF/m/scit +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{it}{ + <-> \XCharter@@scale XCharter-Italic-tlf-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{it}{ + <-> alias * XCharter-TLF/m/it +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{sc}{ + <-> ssub * XCharter-TLF/b/sc +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{sl}{ + <-> ssub * XCharter-TLF/b/sl +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{n}{ + <-> ssub * XCharter-TLF/b/n +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{scit}{ + <-> ssub * XCharter-TLF/b/scit +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{it}{ + <-> ssub * XCharter-TLF/b/it +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{scsl}{ + <-> ssub * XCharter-TLF/b/scsl +}{} + +\endinput diff --git a/fonts/xcharter/tex/T2ASRBXCharter-TOsF.fd b/fonts/xcharter/tex/T2ASRBXCharter-TOsF.fd new file mode 100644 index 0000000000..b4bd5c3dc4 --- /dev/null +++ b/fonts/xcharter/tex/T2ASRBXCharter-TOsF.fd @@ -0,0 +1,151 @@ +%% Generated by autoinst on 2020/08/05 +%% +\ProvidesFile{T2ASRBXCharter-TOsF.fd} + [2020/08/05 (autoinst) Font definitions for T2ASRB/XCharter-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname XCharter@scale\endcsname\relax + \let\XCharter@@scale\@empty +\else + \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% +\fi + +\DeclareFontFamily{T2ASRB}{XCharter-TOsF}{} + + +% ---- b = bold ---- + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{n}{ + <-> \XCharter@@scale XCharter-Bold-tosf-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{n}{ + <-> alias * XCharter-TOsF/b/n +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{sl}{ + <-> \XCharter@@scale XCharter-BoldSlanted-tosf-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{sl}{ + <-> alias * XCharter-TOsF/b/sl +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{sc}{ + <-> \XCharter@@scale XCharter-Bold-tosf-sc-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{sc}{ + <-> alias * XCharter-TOsF/b/sc +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{it}{ + <-> \XCharter@@scale XCharter-BoldItalic-tosf-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{it}{ + <-> alias * XCharter-TOsF/b/it +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{scit}{ + <-> \XCharter@@scale XCharter-BoldItalic-tosf-sc-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{scit}{ + <-> alias * XCharter-TOsF/b/scit +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{scsl}{ + <-> \XCharter@@scale XCharter-BoldSlanted-tosf-sc-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{scsl}{ + <-> alias * XCharter-TOsF/b/scsl +}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{scsl}{ + <-> \XCharter@@scale XCharter-Slanted-tosf-sc-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{scsl}{ + <-> alias * XCharter-TOsF/m/scsl +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{scit}{ + <-> \XCharter@@scale XCharter-Italic-tosf-sc-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{scit}{ + <-> alias * XCharter-TOsF/m/scit +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{it}{ + <-> \XCharter@@scale XCharter-Italic-tosf-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{it}{ + <-> alias * XCharter-TOsF/m/it +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{sl}{ + <-> \XCharter@@scale XCharter-Slanted-tosf-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{sl}{ + <-> alias * XCharter-TOsF/m/sl +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{sc}{ + <-> \XCharter@@scale XCharter-Roman-tosf-sc-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{sc}{ + <-> alias * XCharter-TOsF/m/sc +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{n}{ + <-> \XCharter@@scale XCharter-Roman-tosf-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{n}{ + <-> alias * XCharter-TOsF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{it}{ + <-> ssub * XCharter-TOsF/b/it +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{scit}{ + <-> ssub * XCharter-TOsF/b/scit +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{sc}{ + <-> ssub * XCharter-TOsF/b/sc +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{sl}{ + <-> ssub * XCharter-TOsF/b/sl +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{n}{ + <-> ssub * XCharter-TOsF/b/n +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{scsl}{ + <-> ssub * XCharter-TOsF/b/scsl +}{} + +\endinput diff --git a/fonts/xcharter/tex/TS1XCharter-TLF.fd b/fonts/xcharter/tex/TS1XCharter-TLF.fd index c70ced7801..7a4a026191 100644 --- a/fonts/xcharter/tex/TS1XCharter-TLF.fd +++ b/fonts/xcharter/tex/TS1XCharter-TLF.fd @@ -8,30 +8,36 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi +\expandafter\ifx\csname XCharter@altone\endcsname\relax + \let\XCharter@@altone\@empty +\else + \edef\XCharter@@altone{\XCharter@altone}% +\fi + \DeclareFontFamily{TS1}{XCharter-TLF}{} \DeclareFontShape{TS1}{XCharter-TLF}{b}{it}{ - <-> \XCharter@@scale XCharter-BoldItalic-ts1 + <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-ts1 }{} \DeclareFontShape{TS1}{XCharter-TLF}{b}{sl}{ - <-> \XCharter@@scale XCharter-BoldSlanted-ts1 + <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-ts1 }{} \DeclareFontShape{TS1}{XCharter-TLF}{b}{n}{ - <-> \XCharter@@scale XCharter-Bold-ts1 + <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-ts1 }{} \DeclareFontShape{TS1}{XCharter-TLF}{m}{n}{ - <-> \XCharter@@scale XCharter-Roman-ts1 + <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-ts1 }{} \DeclareFontShape{TS1}{XCharter-TLF}{m}{sl}{ - <-> \XCharter@@scale XCharter-Slanted-ts1 + <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-ts1 }{} \DeclareFontShape{TS1}{XCharter-TLF}{m}{it}{ - <-> \XCharter@@scale XCharter-Italic-ts1 + <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-ts1 }{} \DeclareFontShape{TS1}{XCharter-TLF}{bx}{it}{ diff --git a/fonts/xcharter/tex/TS1XCharter-TOsF.fd b/fonts/xcharter/tex/TS1XCharter-TOsF.fd index 5014f62a87..fd6693037d 100644 --- a/fonts/xcharter/tex/TS1XCharter-TOsF.fd +++ b/fonts/xcharter/tex/TS1XCharter-TOsF.fd @@ -8,30 +8,36 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi +\expandafter\ifx\csname XCharter@altone\endcsname\relax + \let\XCharter@@altone\@empty +\else + \edef\XCharter@@altone{\XCharter@altone}% +\fi + \DeclareFontFamily{TS1}{XCharter-TOsF}{} \DeclareFontShape{TS1}{XCharter-TOsF}{b}{it}{ - <-> \XCharter@@scale XCharter-BoldItalic-ts1 + <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-ts1 }{} \DeclareFontShape{TS1}{XCharter-TOsF}{b}{sl}{ - <-> \XCharter@@scale XCharter-BoldSlanted-ts1 + <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-ts1 }{} \DeclareFontShape{TS1}{XCharter-TOsF}{b}{n}{ - <-> \XCharter@@scale XCharter-Bold-ts1 + <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-ts1 }{} \DeclareFontShape{TS1}{XCharter-TOsF}{m}{n}{ - <-> \XCharter@@scale XCharter-Roman-ts1 + <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-ts1 }{} \DeclareFontShape{TS1}{XCharter-TOsF}{m}{sl}{ - <-> \XCharter@@scale XCharter-Slanted-ts1 + <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-ts1 }{} \DeclareFontShape{TS1}{XCharter-TOsF}{m}{it}{ - <-> \XCharter@@scale XCharter-Italic-ts1 + <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-ts1 }{} \DeclareFontShape{TS1}{XCharter-TOsF}{bx}{it}{ diff --git a/fonts/xcharter/tex/newtx-xcharter-subs.tex b/fonts/xcharter/tex/newtx-xcharter-subs.tex new file mode 100644 index 0000000000..e88ea8eb7c --- /dev/null +++ b/fonts/xcharter/tex/newtx-xcharter-subs.tex @@ -0,0 +1,17 @@ +{f}{-2} +{j}{-2} +{p}{-1.5} +{y}{-1.5} +{A}{-1.5} +{B}{-1} +{D}{-1} +{H}{-1} +{I}{-1} +{K}{-1} +{L}{-1} +{M}{-1} +{N}{-0.5} +{P}{-1} +{X}{-1} +{\rho}{-1} +{\beta}{-1} \ No newline at end of file diff --git a/fonts/xcharter/tfm/XCharter-Bold-sup-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-Bold-sup-t2a--base.tfm new file mode 100644 index 0000000000..18c22232eb Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Bold-sup-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Bold-sup-t2a.tfm b/fonts/xcharter/tfm/XCharter-Bold-sup-t2a.tfm new file mode 100644 index 0000000000..c0ab398c43 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Bold-sup-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Bold-sup-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-Bold-sup-t2asrb--base.tfm new file mode 100644 index 0000000000..867e4a009a Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Bold-sup-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Bold-sup-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-Bold-sup-t2asrb.tfm new file mode 100644 index 0000000000..8e539c40bc Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Bold-sup-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2a--base.tfm new file mode 100644 index 0000000000..7c55ab7be9 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2a.tfm b/fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2a.tfm new file mode 100644 index 0000000000..9359ef58e4 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2asrb--base.tfm new file mode 100644 index 0000000000..2ab35ef7b0 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2asrb.tfm new file mode 100644 index 0000000000..3213278093 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Bold-tlf-sc-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Bold-tlf-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-Bold-tlf-t2a--base.tfm index 61a2890172..d86b933fab 100644 Binary files a/fonts/xcharter/tfm/XCharter-Bold-tlf-t2a--base.tfm and b/fonts/xcharter/tfm/XCharter-Bold-tlf-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Bold-tlf-t2a.tfm b/fonts/xcharter/tfm/XCharter-Bold-tlf-t2a.tfm index 8a67707958..22518dda1f 100644 Binary files a/fonts/xcharter/tfm/XCharter-Bold-tlf-t2a.tfm and b/fonts/xcharter/tfm/XCharter-Bold-tlf-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Bold-tlf-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-Bold-tlf-t2asrb--base.tfm index 43ff2e2b9c..05753d321f 100644 Binary files a/fonts/xcharter/tfm/XCharter-Bold-tlf-t2asrb--base.tfm and b/fonts/xcharter/tfm/XCharter-Bold-tlf-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Bold-tlf-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-Bold-tlf-t2asrb.tfm index fd01ab0147..9fcc422356 100644 Binary files a/fonts/xcharter/tfm/XCharter-Bold-tlf-t2asrb.tfm and b/fonts/xcharter/tfm/XCharter-Bold-tlf-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2a--base.tfm new file mode 100644 index 0000000000..3019bd6f1a Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2a.tfm b/fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2a.tfm new file mode 100644 index 0000000000..73a12475d9 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2asrb--base.tfm new file mode 100644 index 0000000000..f7220d6ba5 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2asrb.tfm new file mode 100644 index 0000000000..b6c6294804 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Bold-tosf-sc-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Bold-tosf-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-Bold-tosf-t2a--base.tfm new file mode 100644 index 0000000000..0ca403b669 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Bold-tosf-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Bold-tosf-t2a.tfm b/fonts/xcharter/tfm/XCharter-Bold-tosf-t2a.tfm new file mode 100644 index 0000000000..8a39a73e7f Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Bold-tosf-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Bold-tosf-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-Bold-tosf-t2asrb--base.tfm new file mode 100644 index 0000000000..ff97a0449b Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Bold-tosf-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Bold-tosf-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-Bold-tosf-t2asrb.tfm new file mode 100644 index 0000000000..e2eb73e7d9 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Bold-tosf-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2a--base.tfm new file mode 100644 index 0000000000..44c1b5fcbc Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2a.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2a.tfm new file mode 100644 index 0000000000..e017ae320a Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2asrb--base.tfm new file mode 100644 index 0000000000..614afe2c68 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2asrb.tfm new file mode 100644 index 0000000000..6eb1ab04a8 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-BoldSlanted-sup-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2a--base.tfm new file mode 100644 index 0000000000..3f41c8a85b Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2a.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2a.tfm new file mode 100644 index 0000000000..12477f3932 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2asrb--base.tfm new file mode 100644 index 0000000000..3b4ac5c7ac Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2asrb.tfm new file mode 100644 index 0000000000..2d089a48de Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-sc-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2a--base.tfm index 8a339be822..3ad7e7ecfb 100644 Binary files a/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2a--base.tfm and b/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2a.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2a.tfm index ff954b168b..8ba7b7aebb 100644 Binary files a/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2a.tfm and b/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2asrb--base.tfm index 2b284f8ca8..b89139c6ad 100644 Binary files a/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2asrb--base.tfm and b/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2asrb.tfm index e5f2905ea7..ed82031031 100644 Binary files a/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2asrb.tfm and b/fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2a--base.tfm new file mode 100644 index 0000000000..8a59897270 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2a.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2a.tfm new file mode 100644 index 0000000000..301ba2d395 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2asrb--base.tfm new file mode 100644 index 0000000000..82bbe0dcc6 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2asrb.tfm new file mode 100644 index 0000000000..d5e488b08d Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-sc-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2a--base.tfm new file mode 100644 index 0000000000..66f8958656 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2a.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2a.tfm new file mode 100644 index 0000000000..8258726e9b Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2asrb--base.tfm new file mode 100644 index 0000000000..948305978e Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2asrb.tfm new file mode 100644 index 0000000000..df022fc334 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-sup-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-Italic-sup-t2a--base.tfm new file mode 100644 index 0000000000..c6f3b65a84 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Italic-sup-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-sup-t2a.tfm b/fonts/xcharter/tfm/XCharter-Italic-sup-t2a.tfm new file mode 100644 index 0000000000..af157e8ab1 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Italic-sup-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-sup-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-Italic-sup-t2asrb--base.tfm new file mode 100644 index 0000000000..16e668a789 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Italic-sup-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-sup-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-Italic-sup-t2asrb.tfm new file mode 100644 index 0000000000..904d632c6d Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Italic-sup-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2a--base.tfm new file mode 100644 index 0000000000..a9e37a3207 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2a.tfm b/fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2a.tfm new file mode 100644 index 0000000000..abddb5d465 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2asrb--base.tfm new file mode 100644 index 0000000000..1788f264fd Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2asrb.tfm new file mode 100644 index 0000000000..5ee18e4a19 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Italic-tlf-sc-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-tlf-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-Italic-tlf-t2a--base.tfm index f9941e8bdd..a787f3e6b0 100644 Binary files a/fonts/xcharter/tfm/XCharter-Italic-tlf-t2a--base.tfm and b/fonts/xcharter/tfm/XCharter-Italic-tlf-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-tlf-t2a.tfm b/fonts/xcharter/tfm/XCharter-Italic-tlf-t2a.tfm index fc0ae91fd0..326b38660d 100644 Binary files a/fonts/xcharter/tfm/XCharter-Italic-tlf-t2a.tfm and b/fonts/xcharter/tfm/XCharter-Italic-tlf-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-tlf-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-Italic-tlf-t2asrb--base.tfm index 04019225fc..eff4c6313d 100644 Binary files a/fonts/xcharter/tfm/XCharter-Italic-tlf-t2asrb--base.tfm and b/fonts/xcharter/tfm/XCharter-Italic-tlf-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-tlf-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-Italic-tlf-t2asrb.tfm index a46e135f9e..a7fdbef06e 100644 Binary files a/fonts/xcharter/tfm/XCharter-Italic-tlf-t2asrb.tfm and b/fonts/xcharter/tfm/XCharter-Italic-tlf-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2a--base.tfm new file mode 100644 index 0000000000..e2db5aca5f Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2a.tfm b/fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2a.tfm new file mode 100644 index 0000000000..ac0d447dd7 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2asrb--base.tfm new file mode 100644 index 0000000000..1f83b759d0 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2asrb.tfm new file mode 100644 index 0000000000..7c7c05d90e Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Italic-tosf-sc-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-tosf-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-Italic-tosf-t2a--base.tfm new file mode 100644 index 0000000000..5efc1a24dc Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Italic-tosf-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-tosf-t2a.tfm b/fonts/xcharter/tfm/XCharter-Italic-tosf-t2a.tfm new file mode 100644 index 0000000000..c39832ed8d Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Italic-tosf-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-tosf-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-Italic-tosf-t2asrb--base.tfm new file mode 100644 index 0000000000..f5be412525 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Italic-tosf-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Italic-tosf-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-Italic-tosf-t2asrb.tfm new file mode 100644 index 0000000000..935823c6e9 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Italic-tosf-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-sup-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-Slanted-sup-t2a--base.tfm new file mode 100644 index 0000000000..b7f5ae4f96 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Slanted-sup-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-sup-t2a.tfm b/fonts/xcharter/tfm/XCharter-Slanted-sup-t2a.tfm new file mode 100644 index 0000000000..d8ad3a1959 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Slanted-sup-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-sup-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-Slanted-sup-t2asrb--base.tfm new file mode 100644 index 0000000000..efcc208a83 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Slanted-sup-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-sup-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-Slanted-sup-t2asrb.tfm new file mode 100644 index 0000000000..b21f643855 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Slanted-sup-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2a--base.tfm new file mode 100644 index 0000000000..15acf86c16 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2a.tfm b/fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2a.tfm new file mode 100644 index 0000000000..9adf3fc9a1 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2asrb--base.tfm new file mode 100644 index 0000000000..a0e1934806 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2asrb.tfm new file mode 100644 index 0000000000..cf28603f00 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Slanted-tlf-sc-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-tlf-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-Slanted-tlf-t2a--base.tfm index ec1b745218..1f2bf6153b 100644 Binary files a/fonts/xcharter/tfm/XCharter-Slanted-tlf-t2a--base.tfm and b/fonts/xcharter/tfm/XCharter-Slanted-tlf-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-tlf-t2a.tfm b/fonts/xcharter/tfm/XCharter-Slanted-tlf-t2a.tfm index 4e92519f18..d2d6b31b9b 100644 Binary files a/fonts/xcharter/tfm/XCharter-Slanted-tlf-t2a.tfm and b/fonts/xcharter/tfm/XCharter-Slanted-tlf-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-tlf-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-Slanted-tlf-t2asrb--base.tfm index 8c502b9ab5..db35e0e0e0 100644 Binary files a/fonts/xcharter/tfm/XCharter-Slanted-tlf-t2asrb--base.tfm and b/fonts/xcharter/tfm/XCharter-Slanted-tlf-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-tlf-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-Slanted-tlf-t2asrb.tfm index ba9b6e94d5..9b4201fdc9 100644 Binary files a/fonts/xcharter/tfm/XCharter-Slanted-tlf-t2asrb.tfm and b/fonts/xcharter/tfm/XCharter-Slanted-tlf-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2a--base.tfm new file mode 100644 index 0000000000..00c5a3cd40 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2a.tfm b/fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2a.tfm new file mode 100644 index 0000000000..802abe94af Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2asrb--base.tfm new file mode 100644 index 0000000000..ff3ad6b569 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2asrb.tfm new file mode 100644 index 0000000000..13595cff14 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Slanted-tosf-sc-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-tosf-t2a--base.tfm b/fonts/xcharter/tfm/XCharter-Slanted-tosf-t2a--base.tfm new file mode 100644 index 0000000000..2770026b93 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Slanted-tosf-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-tosf-t2a.tfm b/fonts/xcharter/tfm/XCharter-Slanted-tosf-t2a.tfm new file mode 100644 index 0000000000..c110b0d5b7 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Slanted-tosf-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-tosf-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter-Slanted-tosf-t2asrb--base.tfm new file mode 100644 index 0000000000..063e87d742 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Slanted-tosf-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter-Slanted-tosf-t2asrb.tfm b/fonts/xcharter/tfm/XCharter-Slanted-tosf-t2asrb.tfm new file mode 100644 index 0000000000..12881b0b05 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter-Slanted-tosf-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2a--base.tfm b/fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2a--base.tfm new file mode 100644 index 0000000000..6e272d0214 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2a.tfm b/fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2a.tfm new file mode 100644 index 0000000000..2d2c956af3 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2asrb--base.tfm new file mode 100644 index 0000000000..d58ae71728 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2asrb.tfm b/fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2asrb.tfm new file mode 100644 index 0000000000..3ebfba7c48 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Bold-tosf-sc-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Bold-tosf-t2a--base.tfm b/fonts/xcharter/tfm/XCharter1-Bold-tosf-t2a--base.tfm new file mode 100644 index 0000000000..8b8a9270c7 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Bold-tosf-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Bold-tosf-t2a.tfm b/fonts/xcharter/tfm/XCharter1-Bold-tosf-t2a.tfm new file mode 100644 index 0000000000..e58c8a6316 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Bold-tosf-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Bold-tosf-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter1-Bold-tosf-t2asrb--base.tfm new file mode 100644 index 0000000000..9e4a646b89 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Bold-tosf-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Bold-tosf-t2asrb.tfm b/fonts/xcharter/tfm/XCharter1-Bold-tosf-t2asrb.tfm new file mode 100644 index 0000000000..20d0e6dadb Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Bold-tosf-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Bold-ts1--base.tfm b/fonts/xcharter/tfm/XCharter1-Bold-ts1--base.tfm new file mode 100644 index 0000000000..b9cd5f4f25 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Bold-ts1--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Bold-ts1.tfm b/fonts/xcharter/tfm/XCharter1-Bold-ts1.tfm new file mode 100644 index 0000000000..a595efd21c Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Bold-ts1.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-BoldItalic-ts1--base.tfm b/fonts/xcharter/tfm/XCharter1-BoldItalic-ts1--base.tfm new file mode 100644 index 0000000000..b73c96fcc1 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-BoldItalic-ts1--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-BoldItalic-ts1.tfm b/fonts/xcharter/tfm/XCharter1-BoldItalic-ts1.tfm new file mode 100644 index 0000000000..4240692136 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-BoldItalic-ts1.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2a--base.tfm b/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2a--base.tfm new file mode 100644 index 0000000000..d919def9d9 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2a.tfm b/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2a.tfm new file mode 100644 index 0000000000..f4b5ecca3b Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2asrb--base.tfm new file mode 100644 index 0000000000..729e1827ee Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2asrb.tfm b/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2asrb.tfm new file mode 100644 index 0000000000..aa2c9683e3 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-sc-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2a--base.tfm b/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2a--base.tfm new file mode 100644 index 0000000000..6d6093e058 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2a.tfm b/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2a.tfm new file mode 100644 index 0000000000..b98b1ef626 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2asrb--base.tfm new file mode 100644 index 0000000000..4d06c3a8e5 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2asrb.tfm b/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2asrb.tfm new file mode 100644 index 0000000000..b8a00beba4 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-BoldSlanted-ts1--base.tfm b/fonts/xcharter/tfm/XCharter1-BoldSlanted-ts1--base.tfm new file mode 100644 index 0000000000..bdf65991d4 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-BoldSlanted-ts1--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-BoldSlanted-ts1.tfm b/fonts/xcharter/tfm/XCharter1-BoldSlanted-ts1.tfm new file mode 100644 index 0000000000..60f2e5e453 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-BoldSlanted-ts1.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2a--base.tfm b/fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2a--base.tfm new file mode 100644 index 0000000000..b5c226343b Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2a.tfm b/fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2a.tfm new file mode 100644 index 0000000000..ed068c9717 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2asrb--base.tfm new file mode 100644 index 0000000000..fe7bead0dd Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2asrb.tfm b/fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2asrb.tfm new file mode 100644 index 0000000000..1369d33474 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Italic-tosf-sc-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Italic-tosf-t2a--base.tfm b/fonts/xcharter/tfm/XCharter1-Italic-tosf-t2a--base.tfm new file mode 100644 index 0000000000..b39e37200a Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Italic-tosf-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Italic-tosf-t2a.tfm b/fonts/xcharter/tfm/XCharter1-Italic-tosf-t2a.tfm new file mode 100644 index 0000000000..27b1130f6f Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Italic-tosf-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Italic-tosf-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter1-Italic-tosf-t2asrb--base.tfm new file mode 100644 index 0000000000..308076d144 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Italic-tosf-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Italic-tosf-t2asrb.tfm b/fonts/xcharter/tfm/XCharter1-Italic-tosf-t2asrb.tfm new file mode 100644 index 0000000000..2d980c2eef Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Italic-tosf-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Italic-ts1--base.tfm b/fonts/xcharter/tfm/XCharter1-Italic-ts1--base.tfm new file mode 100644 index 0000000000..449bb05a9f Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Italic-ts1--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Italic-ts1.tfm b/fonts/xcharter/tfm/XCharter1-Italic-ts1.tfm new file mode 100644 index 0000000000..b56a384111 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Italic-ts1.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Roman-ts1--base.tfm b/fonts/xcharter/tfm/XCharter1-Roman-ts1--base.tfm new file mode 100644 index 0000000000..0d571b4c70 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Roman-ts1--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Roman-ts1.tfm b/fonts/xcharter/tfm/XCharter1-Roman-ts1.tfm new file mode 100644 index 0000000000..d49e305e84 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Roman-ts1.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2a--base.tfm b/fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2a--base.tfm new file mode 100644 index 0000000000..aea2eeecb0 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2a.tfm b/fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2a.tfm new file mode 100644 index 0000000000..563c0b945b Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2asrb--base.tfm new file mode 100644 index 0000000000..cb24a356a9 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2asrb.tfm b/fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2asrb.tfm new file mode 100644 index 0000000000..7641490d77 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Slanted-tosf-sc-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2a--base.tfm b/fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2a--base.tfm new file mode 100644 index 0000000000..7a35af5394 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2a--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2a.tfm b/fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2a.tfm new file mode 100644 index 0000000000..210dd34586 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2a.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2asrb--base.tfm b/fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2asrb--base.tfm new file mode 100644 index 0000000000..6ed7b27b68 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2asrb--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2asrb.tfm b/fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2asrb.tfm new file mode 100644 index 0000000000..3fbd5943ed Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Slanted-tosf-t2asrb.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Slanted-ts1--base.tfm b/fonts/xcharter/tfm/XCharter1-Slanted-ts1--base.tfm new file mode 100644 index 0000000000..2eb4f01e2f Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Slanted-ts1--base.tfm differ diff --git a/fonts/xcharter/tfm/XCharter1-Slanted-ts1.tfm b/fonts/xcharter/tfm/XCharter1-Slanted-ts1.tfm new file mode 100644 index 0000000000..8fc1e484a0 Binary files /dev/null and b/fonts/xcharter/tfm/XCharter1-Slanted-ts1.tfm differ diff --git a/fonts/xcharter/vf/XCharter-Bold-sup-t2a.vf b/fonts/xcharter/vf/XCharter-Bold-sup-t2a.vf new file mode 100644 index 0000000000..4c3f84dc82 Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Bold-sup-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-Bold-sup-t2asrb.vf b/fonts/xcharter/vf/XCharter-Bold-sup-t2asrb.vf new file mode 100644 index 0000000000..43d36c142e Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Bold-sup-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter-Bold-tlf-sc-t2a.vf b/fonts/xcharter/vf/XCharter-Bold-tlf-sc-t2a.vf new file mode 100644 index 0000000000..172c492892 Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Bold-tlf-sc-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-Bold-tlf-sc-t2asrb.vf b/fonts/xcharter/vf/XCharter-Bold-tlf-sc-t2asrb.vf new file mode 100644 index 0000000000..23ccb1d46f Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Bold-tlf-sc-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter-Bold-tlf-t2a.vf b/fonts/xcharter/vf/XCharter-Bold-tlf-t2a.vf index b1e2572b05..aad6ff7279 100644 Binary files a/fonts/xcharter/vf/XCharter-Bold-tlf-t2a.vf and b/fonts/xcharter/vf/XCharter-Bold-tlf-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-Bold-tlf-t2asrb.vf b/fonts/xcharter/vf/XCharter-Bold-tlf-t2asrb.vf index e4345595ed..12b059ec0f 100644 Binary files a/fonts/xcharter/vf/XCharter-Bold-tlf-t2asrb.vf and b/fonts/xcharter/vf/XCharter-Bold-tlf-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter-Bold-tosf-sc-t2a.vf b/fonts/xcharter/vf/XCharter-Bold-tosf-sc-t2a.vf new file mode 100644 index 0000000000..65c98a434b Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Bold-tosf-sc-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-Bold-tosf-sc-t2asrb.vf b/fonts/xcharter/vf/XCharter-Bold-tosf-sc-t2asrb.vf new file mode 100644 index 0000000000..fa0a17b1e7 Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Bold-tosf-sc-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter-Bold-tosf-t2a.vf b/fonts/xcharter/vf/XCharter-Bold-tosf-t2a.vf new file mode 100644 index 0000000000..6067da1054 Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Bold-tosf-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-Bold-tosf-t2asrb.vf b/fonts/xcharter/vf/XCharter-Bold-tosf-t2asrb.vf new file mode 100644 index 0000000000..332d91cdcb Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Bold-tosf-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter-BoldSlanted-sup-t2a.vf b/fonts/xcharter/vf/XCharter-BoldSlanted-sup-t2a.vf new file mode 100644 index 0000000000..a57c80e6d6 Binary files /dev/null and b/fonts/xcharter/vf/XCharter-BoldSlanted-sup-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-BoldSlanted-sup-t2asrb.vf b/fonts/xcharter/vf/XCharter-BoldSlanted-sup-t2asrb.vf new file mode 100644 index 0000000000..7160658db9 Binary files /dev/null and b/fonts/xcharter/vf/XCharter-BoldSlanted-sup-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-t2a.vf b/fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-t2a.vf new file mode 100644 index 0000000000..dabdd6ca74 Binary files /dev/null and b/fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-t2asrb.vf b/fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-t2asrb.vf new file mode 100644 index 0000000000..eed2a62b9b Binary files /dev/null and b/fonts/xcharter/vf/XCharter-BoldSlanted-tlf-sc-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter-BoldSlanted-tlf-t2a.vf b/fonts/xcharter/vf/XCharter-BoldSlanted-tlf-t2a.vf index 905b28a227..a598a4f2a2 100644 Binary files a/fonts/xcharter/vf/XCharter-BoldSlanted-tlf-t2a.vf and b/fonts/xcharter/vf/XCharter-BoldSlanted-tlf-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-BoldSlanted-tlf-t2asrb.vf b/fonts/xcharter/vf/XCharter-BoldSlanted-tlf-t2asrb.vf index 720980b66a..567ef1f93f 100644 Binary files a/fonts/xcharter/vf/XCharter-BoldSlanted-tlf-t2asrb.vf and b/fonts/xcharter/vf/XCharter-BoldSlanted-tlf-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-t2a.vf b/fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-t2a.vf new file mode 100644 index 0000000000..ef457b8684 Binary files /dev/null and b/fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-t2asrb.vf b/fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-t2asrb.vf new file mode 100644 index 0000000000..fde346bbc6 Binary files /dev/null and b/fonts/xcharter/vf/XCharter-BoldSlanted-tosf-sc-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter-BoldSlanted-tosf-t2a.vf b/fonts/xcharter/vf/XCharter-BoldSlanted-tosf-t2a.vf new file mode 100644 index 0000000000..1870888c7e Binary files /dev/null and b/fonts/xcharter/vf/XCharter-BoldSlanted-tosf-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-BoldSlanted-tosf-t2asrb.vf b/fonts/xcharter/vf/XCharter-BoldSlanted-tosf-t2asrb.vf new file mode 100644 index 0000000000..8cc4da16c1 Binary files /dev/null and b/fonts/xcharter/vf/XCharter-BoldSlanted-tosf-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter-Italic-sup-t2a.vf b/fonts/xcharter/vf/XCharter-Italic-sup-t2a.vf new file mode 100644 index 0000000000..be4756ce7e Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Italic-sup-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-Italic-sup-t2asrb.vf b/fonts/xcharter/vf/XCharter-Italic-sup-t2asrb.vf new file mode 100644 index 0000000000..c04c88005a Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Italic-sup-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter-Italic-tlf-sc-t2a.vf b/fonts/xcharter/vf/XCharter-Italic-tlf-sc-t2a.vf new file mode 100644 index 0000000000..4e835f3db4 Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Italic-tlf-sc-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-Italic-tlf-sc-t2asrb.vf b/fonts/xcharter/vf/XCharter-Italic-tlf-sc-t2asrb.vf new file mode 100644 index 0000000000..69c1e2ad5d Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Italic-tlf-sc-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter-Italic-tlf-t2a.vf b/fonts/xcharter/vf/XCharter-Italic-tlf-t2a.vf index 0c063b3a96..147739b094 100644 Binary files a/fonts/xcharter/vf/XCharter-Italic-tlf-t2a.vf and b/fonts/xcharter/vf/XCharter-Italic-tlf-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-Italic-tlf-t2asrb.vf b/fonts/xcharter/vf/XCharter-Italic-tlf-t2asrb.vf index b150e8e072..044445e8ec 100644 Binary files a/fonts/xcharter/vf/XCharter-Italic-tlf-t2asrb.vf and b/fonts/xcharter/vf/XCharter-Italic-tlf-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter-Italic-tosf-sc-t2a.vf b/fonts/xcharter/vf/XCharter-Italic-tosf-sc-t2a.vf new file mode 100644 index 0000000000..b4bd6c5380 Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Italic-tosf-sc-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-Italic-tosf-sc-t2asrb.vf b/fonts/xcharter/vf/XCharter-Italic-tosf-sc-t2asrb.vf new file mode 100644 index 0000000000..375db77eb9 Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Italic-tosf-sc-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter-Italic-tosf-t2a.vf b/fonts/xcharter/vf/XCharter-Italic-tosf-t2a.vf new file mode 100644 index 0000000000..dae897d05c Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Italic-tosf-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-Italic-tosf-t2asrb.vf b/fonts/xcharter/vf/XCharter-Italic-tosf-t2asrb.vf new file mode 100644 index 0000000000..a91a5f1237 Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Italic-tosf-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter-Slanted-sup-t2a.vf b/fonts/xcharter/vf/XCharter-Slanted-sup-t2a.vf new file mode 100644 index 0000000000..1d4dfa781a Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Slanted-sup-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-Slanted-sup-t2asrb.vf b/fonts/xcharter/vf/XCharter-Slanted-sup-t2asrb.vf new file mode 100644 index 0000000000..a6318711af Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Slanted-sup-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter-Slanted-tlf-sc-t2a.vf b/fonts/xcharter/vf/XCharter-Slanted-tlf-sc-t2a.vf new file mode 100644 index 0000000000..b60ea9e2df Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Slanted-tlf-sc-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-Slanted-tlf-sc-t2asrb.vf b/fonts/xcharter/vf/XCharter-Slanted-tlf-sc-t2asrb.vf new file mode 100644 index 0000000000..4e9ade9ee8 Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Slanted-tlf-sc-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter-Slanted-tlf-t2a.vf b/fonts/xcharter/vf/XCharter-Slanted-tlf-t2a.vf index 58a81ed40f..8991fea8c2 100644 Binary files a/fonts/xcharter/vf/XCharter-Slanted-tlf-t2a.vf and b/fonts/xcharter/vf/XCharter-Slanted-tlf-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-Slanted-tlf-t2asrb.vf b/fonts/xcharter/vf/XCharter-Slanted-tlf-t2asrb.vf index 7e0f85d57c..438c401c9d 100644 Binary files a/fonts/xcharter/vf/XCharter-Slanted-tlf-t2asrb.vf and b/fonts/xcharter/vf/XCharter-Slanted-tlf-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter-Slanted-tosf-sc-t2a.vf b/fonts/xcharter/vf/XCharter-Slanted-tosf-sc-t2a.vf new file mode 100644 index 0000000000..486c0175ac Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Slanted-tosf-sc-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-Slanted-tosf-sc-t2asrb.vf b/fonts/xcharter/vf/XCharter-Slanted-tosf-sc-t2asrb.vf new file mode 100644 index 0000000000..050d48f541 Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Slanted-tosf-sc-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter-Slanted-tosf-t2a.vf b/fonts/xcharter/vf/XCharter-Slanted-tosf-t2a.vf new file mode 100644 index 0000000000..3a7b821640 Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Slanted-tosf-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter-Slanted-tosf-t2asrb.vf b/fonts/xcharter/vf/XCharter-Slanted-tosf-t2asrb.vf new file mode 100644 index 0000000000..f46f094ee2 Binary files /dev/null and b/fonts/xcharter/vf/XCharter-Slanted-tosf-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter1-Bold-tosf-sc-t2a.vf b/fonts/xcharter/vf/XCharter1-Bold-tosf-sc-t2a.vf new file mode 100644 index 0000000000..db3787a00e Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-Bold-tosf-sc-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter1-Bold-tosf-sc-t2asrb.vf b/fonts/xcharter/vf/XCharter1-Bold-tosf-sc-t2asrb.vf new file mode 100644 index 0000000000..1d0b7acac9 Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-Bold-tosf-sc-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter1-Bold-tosf-t2a.vf b/fonts/xcharter/vf/XCharter1-Bold-tosf-t2a.vf new file mode 100644 index 0000000000..05f6b135b8 Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-Bold-tosf-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter1-Bold-tosf-t2asrb.vf b/fonts/xcharter/vf/XCharter1-Bold-tosf-t2asrb.vf new file mode 100644 index 0000000000..82223c42f7 Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-Bold-tosf-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter1-Bold-ts1.vf b/fonts/xcharter/vf/XCharter1-Bold-ts1.vf new file mode 100644 index 0000000000..c77f2fee28 Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-Bold-ts1.vf differ diff --git a/fonts/xcharter/vf/XCharter1-BoldItalic-ts1.vf b/fonts/xcharter/vf/XCharter1-BoldItalic-ts1.vf new file mode 100644 index 0000000000..27c9e4e937 Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-BoldItalic-ts1.vf differ diff --git a/fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-t2a.vf b/fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-t2a.vf new file mode 100644 index 0000000000..dae31c6f3f Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-t2asrb.vf b/fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-t2asrb.vf new file mode 100644 index 0000000000..6a57665c01 Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-t2a.vf b/fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-t2a.vf new file mode 100644 index 0000000000..6a950dfd03 Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-t2asrb.vf b/fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-t2asrb.vf new file mode 100644 index 0000000000..5210441f73 Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter1-BoldSlanted-ts1.vf b/fonts/xcharter/vf/XCharter1-BoldSlanted-ts1.vf new file mode 100644 index 0000000000..7522693231 Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-BoldSlanted-ts1.vf differ diff --git a/fonts/xcharter/vf/XCharter1-Italic-tosf-sc-t2a.vf b/fonts/xcharter/vf/XCharter1-Italic-tosf-sc-t2a.vf new file mode 100644 index 0000000000..ac69965b67 Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-Italic-tosf-sc-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter1-Italic-tosf-sc-t2asrb.vf b/fonts/xcharter/vf/XCharter1-Italic-tosf-sc-t2asrb.vf new file mode 100644 index 0000000000..4b6067354a Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-Italic-tosf-sc-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter1-Italic-tosf-t2a.vf b/fonts/xcharter/vf/XCharter1-Italic-tosf-t2a.vf new file mode 100644 index 0000000000..891d9c3d02 Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-Italic-tosf-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter1-Italic-tosf-t2asrb.vf b/fonts/xcharter/vf/XCharter1-Italic-tosf-t2asrb.vf new file mode 100644 index 0000000000..f80d329ebf Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-Italic-tosf-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter1-Italic-ts1.vf b/fonts/xcharter/vf/XCharter1-Italic-ts1.vf new file mode 100644 index 0000000000..b958ffe91f Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-Italic-ts1.vf differ diff --git a/fonts/xcharter/vf/XCharter1-Roman-ts1.vf b/fonts/xcharter/vf/XCharter1-Roman-ts1.vf new file mode 100644 index 0000000000..58d2d62301 Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-Roman-ts1.vf differ diff --git a/fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-t2a.vf b/fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-t2a.vf new file mode 100644 index 0000000000..aef4a7942a Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-t2asrb.vf b/fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-t2asrb.vf new file mode 100644 index 0000000000..bbfcb02a7d Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter1-Slanted-tosf-t2a.vf b/fonts/xcharter/vf/XCharter1-Slanted-tosf-t2a.vf new file mode 100644 index 0000000000..5a81695ac3 Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-Slanted-tosf-t2a.vf differ diff --git a/fonts/xcharter/vf/XCharter1-Slanted-tosf-t2asrb.vf b/fonts/xcharter/vf/XCharter1-Slanted-tosf-t2asrb.vf new file mode 100644 index 0000000000..575bc36d5d Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-Slanted-tosf-t2asrb.vf differ diff --git a/fonts/xcharter/vf/XCharter1-Slanted-ts1.vf b/fonts/xcharter/vf/XCharter1-Slanted-ts1.vf new file mode 100644 index 0000000000..6a83cba623 Binary files /dev/null and b/fonts/xcharter/vf/XCharter1-Slanted-ts1.vf differ diff --git a/fonts/xcharter/vf/zchmi0.vf b/fonts/xcharter/vf/zchmi0.vf index 4dad9f7dc7..a81f30e257 100644 Binary files a/fonts/xcharter/vf/zchmi0.vf and b/fonts/xcharter/vf/zchmi0.vf differ diff --git a/graphics/asymptote/ChangeLog b/graphics/asymptote/ChangeLog index 67c57b47ef..afd8de3855 100644 --- a/graphics/asymptote/ChangeLog +++ b/graphics/asymptote/ChangeLog @@ -1,3 +1,504 @@ +commit bccdb51e0cfa5b7b7bf5c08c1f9496a7ba9a012d +Author: John Bowman +Date: Wed Aug 5 17:45:17 2020 -0600 + + Reformat run*.in files. + +commit 37bf3ce87aed185a465da781db931a68aff7745d +Author: John Bowman +Date: Wed Aug 5 17:01:26 2020 -0600 + + Allow URL requests to be interrupted. + +commit 92d7b6fe3bbd0d1ee5238ac5d87469e6d17e89f4 +Author: John Bowman +Date: Wed Aug 5 16:19:42 2020 -0600 + + Port to MSDOS. + +commit 9dc14b7b56eeaddae51c5f24012ac51a5faf93f9 +Author: John Bowman +Date: Wed Aug 5 01:56:15 2020 -0600 + + Fix hang on quit under MSDOS. + +commit bfefd605c7eb661f03eba5405795d6dff3e9cd43 +Author: John Bowman +Date: Tue Aug 4 22:50:32 2020 -0600 + + Fix readline interrupt handling under MacOS X. + +commit 1fb62259fe1b94a5b3ef0b44ce7f7d32a3be76b3 +Author: John Bowman +Date: Tue Aug 4 12:40:53 2020 -0600 + + Remove xasy link from MSDOS build. + +commit 5050ce7ee703ef3ec3c4d84cd420a019178c6859 +Author: John Bowman +Date: Mon Aug 3 14:18:29 2020 -0600 + + Reformat examples. + +commit 372ae2ca61bea75271c85549dd166b71d4dc72b4 +Author: John Bowman +Date: Mon Aug 3 13:59:33 2020 -0600 + + Indent projection output. + +commit b552792d5adb112b469ea55e8b95ffc299969ec0 +Author: John Bowman +Date: Mon Aug 3 13:20:15 2020 -0600 + + Add C++ and asy indenting and formatting Emacs lisp scripts. + +commit b03e2ba9dc2287c16869dc51e87fe5715eb3c2d4 +Author: John Bowman +Date: Sun Aug 2 23:08:08 2020 -0600 + + Fix last revision. + +commit 55406a03c263d9a33c22f823110bee247146ffdc +Author: John Bowman +Date: Sun Aug 2 22:52:47 2020 -0600 + + Fix compilation without libcurl. + +commit e0f8c79e64f4b2d14f0dbd6f95472480bd718b72 +Author: John Bowman +Date: Sun Aug 2 22:50:42 2020 -0600 + + Reformat base files. + +commit ef00491a49965e998549a2df0bb6d01fb4bb7d61 +Author: John Bowman +Date: Sun Aug 2 21:13:13 2020 -0600 + + Reformat .cc and .h files. + +commit 5de4352e05ba6a03f95a128b81e702d6a3d27314 +Author: John Bowman +Date: Sun Aug 2 20:21:07 2020 -0600 + + Update asygl. + +commit 98b22e43550672e01cf257f982380efa18f4f92b +Author: John Bowman +Date: Sun Aug 2 19:15:52 2020 -0600 + + Document newpage. + +commit 083efd7710a851e2e33331bcbac9ac42cf4dabe6 +Author: John Bowman +Date: Sun Aug 2 18:12:45 2020 -0600 + + Avoid unnecessary remesh on zoom in AsyGL. + +commit 23c2ac57fd6336eda71251c25a7324732e1433d9 +Author: John Bowman +Date: Sun Aug 2 18:00:30 2020 -0600 + + Force remeshing on export. + +commit bfc7bc0db8ca496f5ea9545024f84749ae3ea636 +Author: John Bowman +Date: Sun Aug 2 17:50:26 2020 -0600 + + Fix exporting when devicepixelratio > 1. + +commit 5e57b75e78b4d596cdc00d3a35a2c8c40df17f90 +Author: John Bowman +Date: Sat Aug 1 21:02:48 2020 -0600 + + Implement devicepixelratio setting. + +commit ef0bb9f3fd39c3528fd963b27c6989c3287faacf +Author: John Bowman +Date: Sat Aug 1 20:27:52 2020 -0600 + + Extend URL support to input(). + +commit 45e8475ce686ca92aad94488c10824fc1f1d044f +Author: John Bowman +Date: Sat Aug 1 14:41:48 2020 -0600 + + Support importing URLs. + +commit 81b4d1e85225fb540c8cf64d733b810ab3ab07d6 +Author: John Bowman +Date: Fri Jul 31 18:18:57 2020 -0600 + + Remove obsolete code. + +commit 2e497032037cff813426a1ece1f42ec1ab924d68 +Author: John Bowman +Date: Wed Jul 29 22:58:25 2020 -0600 + + Fix interrupt handling under MacOS X. + +commit c2c8c095416e766063ad0af943d1a931d14095e0 +Author: John Bowman +Date: Wed Jul 29 01:52:40 2020 -0600 + + Implement portable whitespace skipping also for pairs. + +commit ed3e87bb4795ac6cf648af9b4f12e2418efad11a +Author: John Bowman +Date: Wed Jul 29 01:35:03 2020 -0600 + + Implement portable way of skipping whitespace. + Make casts from empty strings yield uninitialized values. + +commit 8ba38823755e09de6463a42396e1db7291276254 +Author: John Bowman +Date: Tue Jul 28 21:06:49 2020 -0600 + + Simplify code. + +commit ad7054342d291ce32f71951b7e7eeea381d29efb +Author: John Bowman +Date: Tue Jul 28 21:05:19 2020 -0600 + + Fix numerical precision issue. + +commit 111cd165f5c7f4a0496a9efbf746d4f2a316a48c +Author: John Bowman +Date: Mon Jul 27 00:30:18 2020 -0600 + + Format documentation. + +commit 9193d9d8ee934b325e575d405631d4fb252b1d8d +Merge: ef016d74 013e0cb2 +Author: John Bowman +Date: Mon Jul 27 00:20:41 2020 -0600 + + Merge pull request #144 from ivankokan/master + + Obsolete *encoding modules + +commit 013e0cb25362e46cecb40ea468aa95e66788dd12 +Merge: aa8a5244 ef016d74 +Author: Ivan Kokan +Date: Mon Jul 27 02:26:20 2020 +0200 + + Merge branch 'master' into master + +commit ef016d741c443e8e84ff8248a9622c820813b754 +Author: John Bowman +Date: Sun Jul 26 17:47:02 2020 -0600 + + Document that clipping has no notion of depth. + +commit 1b11525273e0661d3a3f4f8dc988b29982e7f5c2 +Author: John Bowman +Date: Sun Jul 26 12:15:06 2020 -0600 + + Fix segmentation fault caused by obsolete code. + +commit eb1ec4d911ee9b4c3f34a07505183291d3793e6e +Author: John Bowman +Date: Sun Jul 26 11:34:09 2020 -0600 + + Update documentation. + +commit 6473c8487d59a4891c406cd127b3bb2d200ebe62 +Author: John Bowman +Date: Sun Jul 26 11:02:35 2020 -0600 + + Simplify code. + +commit 52b458f036b7f9222a084ffef4e94092342608bf +Author: John Bowman +Date: Sat Jul 25 20:56:11 2020 -0600 + + Fix copy constructors for path and path3. + +commit e5da02595a16d3a6adc60cd9d4589b5cf31b4fd3 +Author: John Bowman +Date: Sat Jul 25 17:59:27 2020 -0600 + + Port to MacOS X. + +commit bb56b10d431a5acd66b28c4a4bb22ba99ef7c1c8 +Author: John Bowman +Date: Fri Jul 24 00:09:24 2020 -0600 + + Improve repositioning of OpenGL window. + +commit 47f463e5a739c02838fd549e7a4dc3b0f8471f21 +Author: John Bowman +Date: Thu Jul 23 03:39:28 2020 -0600 + + Always reposition OpenGL window when not fitting to screen. + +commit 1ba366e2ba2380e17c81df2b6cd4114869745ad4 +Author: John Bowman +Date: Wed Jul 22 20:19:12 2020 -0600 + + Normalize triple dir(path3, path3). + +commit bc0b6499e5f71b36a3177f677db5277078164dbd +Author: John Bowman +Date: Wed Jul 22 00:39:18 2020 -0600 + + Prevent xasy from hanging on asy errors. + +commit dee047a7596538e2012152c52a753938ea9d310b +Author: John Bowman +Date: Mon Jul 20 00:31:32 2020 -0600 + + Update asygl. + +commit 7574872dca70fda79c6cd65e350b57fc135bd794 +Author: John Bowman +Date: Mon Jul 20 00:28:29 2020 -0600 + + Make + and - keys zoom in and out, rather than expand and shrink viewport. + +commit 2066ef194ec9f7c135b165ea8b157e78320306a6 +Author: John Bowman +Date: Sat Jul 18 22:46:22 2020 -0600 + + Update asygl. + +commit 5089b775299a17831a86c4ae38d1081de3e1282a +Author: John Bowman +Date: Sat Jul 18 22:45:58 2020 -0600 + + Improve resizing. + +commit 242615a1b755ea943603daad9aa6060e5f2eca1e +Author: John Bowman +Date: Sat Jul 18 20:44:53 2020 -0600 + + Workaround JSON bug by escaping colons. + +commit 7294cb2bf8a3fc0c182b36c9b1ee8b49cc5a8b3d +Author: John Bowman +Date: Fri Jul 17 13:07:35 2020 -0600 + + Update asygl. + +commit 5a2bd75f8f8ee73c0617896f0d1183fe4c673c05 +Author: John Bowman +Date: Fri Jul 17 13:06:43 2020 -0600 + + Fix absolute mode. + +commit 55e4e0dba58565b91ae1dd1df715b49db339a305 +Author: John Bowman +Date: Fri Jul 17 12:47:08 2020 -0600 + + Update asygl. + +commit ba16a591ca3b924fb1e9db399f4c942d36341d68 +Author: John Bowman +Date: Fri Jul 17 12:46:45 2020 -0600 + + Reset initial zoom. + +commit c47728d59cb3d9a8ffb394cbffb79c2ddc631816 +Author: John Bowman +Date: Fri Jul 17 12:25:14 2020 -0600 + + Update asygl. + +commit e0281de557eb186728d66fd0c183d65a50b8f0b5 +Author: John Bowman +Date: Fri Jul 17 12:24:18 2020 -0600 + + Always listen for WebGL resize events. + +commit 99c614d893cea7dffb9a41c13c20460248944cd2 +Author: John Bowman +Date: Thu Jul 16 23:23:58 2020 -0600 + + Document settings.absolute. + +commit af6c53a9825bc1e2dc73f8aa8a720b299d6a4e6c +Author: John Bowman +Date: Thu Jul 16 23:00:29 2020 -0600 + + Fix invalid array dimensions error. + +commit b5eac1db427fbc956d01b243fffc2b4f20415355 +Author: John Bowman +Date: Wed Jul 15 11:41:01 2020 -0600 + + Update example. + +commit 9c9caaca5c63f04bde69205e0da9e163ee256344 +Author: John Bowman +Date: Wed Jul 15 02:59:52 2020 -0600 + + Disable cd with -noglobalread. + +commit 0278c8841589770d71e2803e57dcfb6ce002cfcf +Author: John Bowman +Date: Wed Jul 15 01:00:25 2020 -0600 + + Allow reading from search path even with -noglobalread. + +commit cf7c0373f82cb7d1de78bb95d7b619e096552628 +Author: John Bowman +Date: Wed Jul 15 00:13:00 2020 -0600 + + Add examples directory to search path. + +commit 516d7847b2a58425c7763bbb0e79eebea7f72c15 +Author: John Bowman +Date: Tue Jul 14 23:14:10 2020 -0600 + + Fix inpath. + +commit 0a5015b2f86a656a8b04d2592a606b68bb6e4d53 +Author: John Bowman +Date: Tue Jul 14 16:42:20 2020 -0600 + + Add missing file. + +commit cde71e2634cd45113f60cd9aec96f0221e1b1d58 +Author: John Bowman +Date: Tue Jul 14 16:37:57 2020 -0600 + + Install data file. + +commit 2056aa9c63bd1bf9fc7f3cdb7415aa7c1cefbe07 +Author: John Bowman +Date: Tue Jul 14 16:12:41 2020 -0600 + + Add -globalread setting (default true). + +commit 246022516af218d6ae4cebf027965479d049b8d9 +Author: John Bowman +Date: Tue Jul 14 10:57:38 2020 -0600 + + Open files using search path. + +commit 2e4762d4381307876a100e42116592d8aba3a75a +Author: John Bowman +Date: Tue Jul 14 01:56:07 2020 -0600 + + Reinstate putting clipPath definitions in section, with fix to Gouraud shading. + +commit 5b5c8aeddfe9e99eec14c30591713f4d128bb8cf +Author: John Bowman +Date: Tue Jul 14 01:52:54 2020 -0600 + + Revert "Put clipPath definitions in section." + + This reverts commit fbf03b07cfbabaeb7be861ac652f4b46fdc0e2cb. + +commit fbf03b07cfbabaeb7be861ac652f4b46fdc0e2cb +Author: John Bowman +Date: Tue Jul 14 01:24:40 2020 -0600 + + Put clipPath definitions in section. + +commit 62bfac5dc40fe8f9ceefe2f834fdf6febd5971d5 +Author: John Bowman +Date: Tue Jul 14 00:56:40 2020 -0600 + + Use distinct clipping IDs. + +commit 5778d7e16e456bf9caacdadcf354ccfd41aff4c2 +Author: John Bowman +Date: Tue Jul 14 00:39:31 2020 -0600 + + Fix svg clipping. + +commit cd0faa137d52fea979e73b3748986cbcd396f882 +Author: John Bowman +Date: Mon Jul 13 02:23:24 2020 -0600 + + Remove unused svg transform. + +commit 29004b9576e08e6da0aae0df07ea08351e555953 +Author: John Bowman +Date: Sun Jul 12 16:42:38 2020 -0600 + + Remove duplicate . + +commit a2eb67615714aaa43674da43b8e5be8f597dbb1f +Author: John Bowman +Date: Sun Jul 12 09:34:59 2020 -0600 + + Support compilation and 2D svg to html conversion without GLM library. + +commit 89ca60bd9e8ea5b23d7deea2dfdf2d54b8496d25 +Author: John Bowman +Date: Sat Jul 11 23:50:35 2020 -0600 + + Display error location in interactive mode when importing files; + output to stderr. + +commit 4c0160df84ee208b7f0b4f6480405299d4ae94d4 +Author: John Bowman +Date: Sat Jul 11 02:27:54 2020 -0600 + + Display error location. + +commit bde2b3f814ffaf77f10bf78352b34f3584523734 +Author: John Bowman +Date: Fri Jul 10 19:37:51 2020 -0600 + + Remove body margin and scrollbar. + +commit 7bb9309de9929be530547de88d1cdeac052f2231 +Author: John Bowman +Date: Fri Jul 10 12:53:41 2020 -0600 + + Fit 2D html output to canvas unless settings.absolute=true. + +commit 497363ecde2cc4856756ed54ae2723799a183674 +Author: John Bowman +Date: Fri Jul 10 12:49:41 2020 -0600 + + Show dvisvgm diagnostics. + +commit 97843dd13d26027a05a108e16f60f910703648b7 +Author: John Bowman +Date: Thu Jul 9 16:08:10 2020 -0600 + + Fix tutorial URL. + +commit b6d53dc435fda60c836606f8d763dbdaf56e8501 +Author: John Bowman +Date: Thu Jul 9 09:34:10 2020 -0600 + + Fix format in documentation. + +commit aa8a5244e46c1d04300513a4107245a3575ceedd +Author: ivankokan +Date: Thu Jul 9 15:53:58 2020 +0200 + + Format docs + +commit 9cca9e9106e6ad4aa89389d25b11712d7ac4edec +Merge: e0b8e3de d968c027 +Author: Ivan Kokan +Date: Thu Jul 9 15:14:31 2020 +0200 + + Merge branch 'master' into master + +commit d968c027432b225800655e508fa00bff2da086b5 +Author: John Bowman +Date: Thu Jul 9 00:58:10 2020 -0600 + + Improve logo3. + +commit 3fd657ee90bc66143b86d7c15a3eb28200e88611 +Author: John Bowman +Date: Tue Jul 7 23:06:48 2020 -0600 + + Work around dvisvgm bug. + +commit 978d0e0d8ce48a7f71d1880dea6454133c8f6698 +Author: John Bowman +Date: Tue Jul 7 02:01:25 2020 -0600 + + Increment version to 2.67. + commit 695f398ded015ec27835b833f29d220794c45831 Author: John Bowman Date: Mon Jul 6 22:54:59 2020 -0600 @@ -450,6 +951,24 @@ Date: Sat Apr 25 00:08:59 2020 -0600 Fix export of 3D rendered bitmaps to svg. +commit e0b8e3def55318505b24cd850b94efa2ac037d0b +Author: ivankokan +Date: Thu Apr 23 00:38:59 2020 +0200 + + Update sourceforge URLs in FAQ + +commit fcd9aeb92d892f97925f6f428a00efd376bd2da7 +Author: ivankokan +Date: Thu Apr 23 00:32:10 2020 +0200 + + Update FAQ for international fonts question + +commit 825488fbb1395202f35b436df146da6f8560a6af +Author: ivankokan +Date: Thu Apr 23 00:01:44 2020 +0200 + + CJK package URL + commit 285f855a0312465f1c1d96757a5098061d929725 Merge: 35428571 881b585a Author: John Bowman @@ -841,6 +1360,33 @@ Date: Mon Feb 17 21:25:27 2020 -0700 Fix test degenerate normals. +commit c1a8c0a212aa32eed3a0e78b91ad1abc540795cf +Author: ivankokan +Date: Wed Feb 12 17:25:00 2020 +0100 + + Update documentation + +commit 173d1e8c9d2de43a11053b98f0f964af658a8a02 +Author: ivankokan +Date: Wed Feb 12 14:35:31 2020 +0100 + + Remove latin1 module + +commit 525dbb95a60cc75f7f55075b8d0e1deaba981edf +Author: ivankokan +Date: Wed Feb 12 14:33:06 2020 +0100 + + Remove unicode module + +commit d560eaefbcffe9eb6c26db1d4fd1b365daa5799a +Merge: 2898b83f 9beb5b6c +Author: Ivan Kokan +Date: Wed Feb 12 13:42:05 2020 +0100 + + Merge pull request #2 from vectorgraphics/master + + Sync + commit 9beb5b6c72ce47c8fad8c33f14b78015c9baa40f Author: John Bowman Date: Wed Feb 5 22:26:02 2020 -0700 diff --git a/graphics/asymptote/Delaunay.cc b/graphics/asymptote/Delaunay.cc index 3e9e5507f2..2090ddfeb3 100644 --- a/graphics/asymptote/Delaunay.cc +++ b/graphics/asymptote/Delaunay.cc @@ -13,7 +13,7 @@ inline double max(double a, double b) return (a > b) ? a : b; } -int XYZCompare(const void *v1, const void *v2) +int XYZCompare(const void *v1, const void *v2) { double x1=((XYZ*)v1)->p[0]; double x2=((XYZ*)v2)->p[0]; @@ -48,7 +48,7 @@ Int Triangulate(Int nv, XYZ pxyz[], ITRIANGLE v[], Int &ntri, if(presort) qsort(pxyz,nv,sizeof(XYZ),XYZCompare); else postsort=false; - + /* Allocate memory for the completeness list, flag for each triangle */ Int trimax = 4 * nv; Int *complete = new Int[trimax]; @@ -114,14 +114,14 @@ Int Triangulate(Int nv, XYZ pxyz[], ITRIANGLE v[], Int &ntri, double *a=pxyz[vj->p1].p; double *b=pxyz[vj->p2].p; double *c=pxyz[vj->p3].p; - + if(incircle(a,b,c,d) <= 0.0) { // Point d is inside or on circumcircle /* Check that we haven't exceeded the edge list size */ if(nedge + 3 >= emax) { emax += 100; IEDGE *p_EdgeTemp = new IEDGE[emax]; for (Int i = 0; i < nedge; i++) { - p_EdgeTemp[i] = edges[i]; + p_EdgeTemp[i] = edges[i]; } delete[] edges; edges = p_EdgeTemp; @@ -199,7 +199,7 @@ Int Triangulate(Int nv, XYZ pxyz[], ITRIANGLE v[], Int &ntri, delete[] edges; delete[] complete; - if(postsort) { + if(postsort) { for(Int i = 0; i < ntri; i++) { ITRIANGLE *vi=v+i; vi->p1=pxyz[vi->p1].i; @@ -209,4 +209,4 @@ Int Triangulate(Int nv, XYZ pxyz[], ITRIANGLE v[], Int &ntri, } return 0; -} +} diff --git a/graphics/asymptote/GUI/icons_rc.py b/graphics/asymptote/GUI/icons_rc.py index 77097e5988..0ec79acfe3 100644 --- a/graphics/asymptote/GUI/icons_rc.py +++ b/graphics/asymptote/GUI/icons_rc.py @@ -9,13 +9,13 @@ from PyQt5 import QtCore qt_resource_data = b"\ -\x00\x00\x02\x7f\ +\x00\x00\x02\xf2\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ \x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ \x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\ -\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\ +\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x30\x2c\ \x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\ \x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\ \x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\ @@ -27,31 +27,39 @@ qt_resource_data = b"\ \x73\x2f\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\ \x67\x31\x31\x2e\x64\x74\x64\x22\x3e\x0d\x0a\x3c\x73\x76\x67\x20\ \x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\ -\x3d\x22\x4c\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\ -\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\ -\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\ -\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\ -\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\ -\x39\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\ -\x20\x79\x3d\x22\x30\x70\x78\x22\x0d\x0a\x09\x20\x77\x69\x64\x74\ -\x68\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\ -\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\ -\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x73\ -\x74\x79\x6c\x65\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\ -\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\ -\x35\x31\x32\x20\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\ -\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\ -\x0a\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\ -\x3d\x22\x32\x38\x38\x2c\x39\x36\x20\x33\x33\x37\x2e\x39\x2c\x31\ -\x34\x35\x2e\x39\x20\x32\x37\x34\x2c\x32\x30\x39\x2e\x37\x20\x32\ -\x37\x34\x2c\x32\x30\x39\x2e\x37\x20\x31\x34\x35\x2e\x39\x2c\x33\ -\x33\x37\x2e\x39\x20\x39\x36\x2c\x32\x38\x38\x20\x39\x36\x2c\x34\ -\x31\x36\x20\x32\x32\x34\x2c\x34\x31\x36\x20\x31\x37\x34\x2e\x31\ -\x2c\x33\x36\x36\x2e\x31\x20\x33\x35\x37\x2e\x34\x2c\x31\x38\x32\ -\x2e\x39\x20\x33\x36\x36\x2e\x31\x2c\x31\x37\x34\x2e\x31\x20\x0d\ -\x0a\x09\x34\x31\x36\x2c\x32\x32\x34\x20\x34\x31\x36\x2c\x39\x36\ -\x20\x22\x2f\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ -\x00\x00\x05\x27\ +\x3d\x22\x43\x69\x72\x63\x6c\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3d\ +\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\ +\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\ +\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\ +\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\ +\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x35\x31\x32\x70\x78\ +\x22\x20\x79\x3d\x22\x35\x31\x32\x70\x78\x22\x0d\x0a\x09\x20\x76\ +\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\ +\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\ +\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\ +\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\ +\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\ +\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\ +\x74\x72\x69\x78\x28\x32\x34\x20\x30\x20\x30\x20\x32\x34\x20\x30\ +\x20\x30\x29\x27\x3e\x0d\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\ +\x4d\x31\x30\x2c\x30\x2e\x34\x43\x34\x2e\x36\x39\x38\x2c\x30\x2e\ +\x34\x2c\x30\x2e\x34\x2c\x34\x2e\x36\x39\x38\x2c\x30\x2e\x34\x2c\ +\x31\x30\x43\x30\x2e\x34\x2c\x31\x35\x2e\x33\x30\x32\x2c\x34\x2e\ +\x36\x39\x38\x2c\x31\x39\x2e\x36\x2c\x31\x30\x2c\x31\x39\x2e\x36\ +\x63\x35\x2e\x33\x30\x31\x2c\x30\x2c\x39\x2e\x36\x2d\x34\x2e\x32\ +\x39\x38\x2c\x39\x2e\x36\x2d\x39\x2e\x36\x30\x31\x0d\x0a\x09\x43\ +\x31\x39\x2e\x36\x2c\x34\x2e\x36\x39\x38\x2c\x31\x35\x2e\x33\x30\ +\x31\x2c\x30\x2e\x34\x2c\x31\x30\x2c\x30\x2e\x34\x7a\x20\x4d\x31\ +\x30\x2c\x31\x37\x2e\x35\x39\x39\x63\x2d\x34\x2e\x31\x39\x37\x2c\ +\x30\x2d\x37\x2e\x36\x2d\x33\x2e\x34\x30\x32\x2d\x37\x2e\x36\x2d\ +\x37\x2e\x36\x53\x35\x2e\x38\x30\x32\x2c\x32\x2e\x34\x2c\x31\x30\ +\x2c\x32\x2e\x34\x63\x34\x2e\x31\x39\x37\x2c\x30\x2c\x37\x2e\x36\ +\x30\x31\x2c\x33\x2e\x34\x30\x32\x2c\x37\x2e\x36\x30\x31\x2c\x37\ +\x2e\x36\x0d\x0a\x09\x53\x31\x34\x2e\x31\x39\x37\x2c\x31\x37\x2e\ +\x35\x39\x39\x2c\x31\x30\x2c\x31\x37\x2e\x35\x39\x39\x7a\x22\x2f\ +\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\ +\x0a\ +\x00\x00\x05\xca\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ @@ -82,127 +90,71 @@ qt_resource_data = b"\ \x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\ \x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ \x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ -\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x69\x64\x3d\ -\x22\x49\x63\x6f\x6e\x5f\x31\x32\x5f\x22\x3e\x0d\x0a\x09\x3c\x67\ -\x3e\x0d\x0a\x09\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\ -\x35\x36\x2c\x36\x34\x43\x31\x35\x30\x2e\x34\x30\x31\x2c\x36\x34\ -\x2c\x36\x34\x2c\x31\x35\x30\x2e\x34\x30\x31\x2c\x36\x34\x2c\x32\ -\x35\x36\x63\x30\x2c\x31\x30\x35\x2e\x36\x30\x34\x2c\x38\x36\x2e\ -\x34\x30\x31\x2c\x31\x39\x32\x2c\x31\x39\x32\x2c\x31\x39\x32\x63\ -\x31\x38\x2e\x31\x33\x36\x2c\x30\x2c\x33\x32\x2d\x31\x33\x2e\x38\ -\x36\x34\x2c\x33\x32\x2d\x33\x32\x0d\x0a\x09\x09\x09\x63\x30\x2d\ -\x38\x2e\x35\x33\x31\x2d\x33\x2e\x31\x39\x38\x2d\x31\x36\x2d\x38\ -\x2e\x35\x33\x31\x2d\x32\x31\x2e\x33\x33\x33\x63\x2d\x35\x2e\x33\ -\x33\x33\x2d\x35\x2e\x33\x33\x34\x2d\x38\x2e\x35\x33\x31\x2d\x31\ -\x32\x2e\x38\x30\x33\x2d\x38\x2e\x35\x33\x31\x2d\x32\x31\x2e\x33\ -\x33\x34\x63\x30\x2d\x31\x38\x2e\x31\x33\x35\x2c\x31\x33\x2e\x38\ -\x36\x34\x2d\x33\x32\x2c\x33\x32\x2d\x33\x32\x68\x33\x38\x2e\x33\ -\x39\x36\x0d\x0a\x09\x09\x09\x63\x35\x38\x2e\x36\x36\x37\x2c\x30\ -\x2c\x31\x30\x36\x2e\x36\x36\x37\x2d\x34\x38\x2c\x31\x30\x36\x2e\ -\x36\x36\x37\x2d\x31\x30\x36\x2e\x36\x36\x36\x43\x34\x34\x38\x2c\ -\x31\x34\x30\x2e\x38\x30\x32\x2c\x33\x36\x31\x2e\x36\x30\x34\x2c\ -\x36\x34\x2c\x32\x35\x36\x2c\x36\x34\x7a\x20\x4d\x31\x33\x38\x2e\ -\x36\x36\x37\x2c\x32\x35\x36\x63\x2d\x31\x38\x2e\x31\x33\x36\x2c\ -\x30\x2d\x33\x32\x2d\x31\x33\x2e\x38\x36\x34\x2d\x33\x32\x2d\x33\ -\x32\x73\x31\x33\x2e\x38\x36\x34\x2d\x33\x32\x2c\x33\x32\x2d\x33\ -\x32\x0d\x0a\x09\x09\x09\x63\x31\x38\x2e\x31\x33\x35\x2c\x30\x2c\ -\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\x2c\x33\x32\x2c\x33\x32\x53\ -\x31\x35\x36\x2e\x38\x30\x32\x2c\x32\x35\x36\x2c\x31\x33\x38\x2e\ -\x36\x36\x37\x2c\x32\x35\x36\x7a\x20\x4d\x32\x30\x32\x2e\x36\x36\ -\x37\x2c\x31\x37\x30\x2e\x36\x36\x37\x63\x2d\x31\x38\x2e\x31\x33\ -\x36\x2c\x30\x2d\x33\x32\x2d\x31\x33\x2e\x38\x36\x35\x2d\x33\x32\ -\x2d\x33\x32\x63\x30\x2d\x31\x38\x2e\x31\x33\x36\x2c\x31\x33\x2e\ -\x38\x36\x34\x2d\x33\x32\x2c\x33\x32\x2d\x33\x32\x0d\x0a\x09\x09\ -\x09\x63\x31\x38\x2e\x31\x33\x35\x2c\x30\x2c\x33\x32\x2c\x31\x33\ -\x2e\x38\x36\x34\x2c\x33\x32\x2c\x33\x32\x43\x32\x33\x34\x2e\x36\ -\x36\x37\x2c\x31\x35\x36\x2e\x38\x30\x32\x2c\x32\x32\x30\x2e\x38\ -\x30\x32\x2c\x31\x37\x30\x2e\x36\x36\x37\x2c\x32\x30\x32\x2e\x36\ -\x36\x37\x2c\x31\x37\x30\x2e\x36\x36\x37\x7a\x20\x4d\x33\x30\x39\ -\x2e\x33\x33\x33\x2c\x31\x37\x30\x2e\x36\x36\x37\x63\x2d\x31\x38\ -\x2e\x31\x33\x35\x2c\x30\x2d\x33\x32\x2d\x31\x33\x2e\x38\x36\x35\ -\x2d\x33\x32\x2d\x33\x32\x0d\x0a\x09\x09\x09\x63\x30\x2d\x31\x38\ -\x2e\x31\x33\x36\x2c\x31\x33\x2e\x38\x36\x35\x2d\x33\x32\x2c\x33\ -\x32\x2d\x33\x32\x63\x31\x38\x2e\x31\x33\x36\x2c\x30\x2c\x33\x32\ -\x2c\x31\x33\x2e\x38\x36\x34\x2c\x33\x32\x2c\x33\x32\x43\x33\x34\ -\x31\x2e\x33\x33\x33\x2c\x31\x35\x36\x2e\x38\x30\x32\x2c\x33\x32\ -\x37\x2e\x34\x36\x39\x2c\x31\x37\x30\x2e\x36\x36\x37\x2c\x33\x30\ -\x39\x2e\x33\x33\x33\x2c\x31\x37\x30\x2e\x36\x36\x37\x7a\x20\x4d\ -\x33\x37\x33\x2e\x33\x33\x33\x2c\x32\x35\x36\x0d\x0a\x09\x09\x09\ -\x63\x2d\x31\x38\x2e\x31\x33\x35\x2c\x30\x2d\x33\x32\x2d\x31\x33\ -\x2e\x38\x36\x34\x2d\x33\x32\x2d\x33\x32\x73\x31\x33\x2e\x38\x36\ -\x35\x2d\x33\x32\x2c\x33\x32\x2d\x33\x32\x63\x31\x38\x2e\x31\x33\ -\x36\x2c\x30\x2c\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\x2c\x33\x32\ -\x2c\x33\x32\x53\x33\x39\x31\x2e\x34\x36\x39\x2c\x32\x35\x36\x2c\ -\x33\x37\x33\x2e\x33\x33\x33\x2c\x32\x35\x36\x7a\x22\x2f\x3e\x0d\ -\x0a\x09\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\ -\x73\x76\x67\x3e\x0d\x0a\ -\x00\x00\x03\xf5\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ -\x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ -\x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\ -\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x31\x2c\ -\x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\ -\x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\ -\x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\ -\x20\x20\x2d\x2d\x3e\x0d\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\ -\x20\x73\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\ -\x57\x33\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\ -\x2f\x2f\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\ -\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\ -\x73\x2f\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\ -\x67\x31\x31\x2e\x64\x74\x64\x22\x3e\x0d\x0a\x3c\x73\x76\x67\x20\ -\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\ -\x3d\x22\x43\x68\x65\x76\x72\x6f\x6e\x5f\x63\x69\x72\x63\x6c\x65\ -\x64\x5f\x6c\x65\x66\x74\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\ -\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\ -\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\ -\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\ -\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\ -\x6c\x69\x6e\x6b\x22\x0d\x0a\x09\x20\x78\x3d\x22\x30\x70\x78\x22\ -\x20\x79\x3d\x22\x30\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\ -\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\ -\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\ -\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ -\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ -\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x74\x72\x61\ -\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\ -\x34\x20\x30\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x0d\ -\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\x31\x2e\x33\x30\ -\x32\x2c\x36\x2e\x37\x37\x36\x63\x2d\x30\x2e\x31\x39\x36\x2d\x30\ -\x2e\x31\x39\x37\x2d\x30\x2e\x35\x31\x35\x2d\x30\x2e\x31\x39\x37\ -\x2d\x30\x2e\x37\x31\x2c\x30\x4c\x37\x2e\x37\x38\x35\x2c\x39\x2e\ -\x36\x34\x31\x63\x2d\x30\x2e\x31\x39\x36\x2c\x30\x2e\x31\x39\x39\ -\x2d\x30\x2e\x31\x39\x36\x2c\x30\x2e\x35\x32\x2c\x30\x2c\x30\x2e\ -\x37\x31\x37\x6c\x32\x2e\x38\x30\x37\x2c\x32\x2e\x38\x36\x34\x0d\ -\x0a\x09\x63\x30\x2e\x31\x39\x35\x2c\x30\x2e\x31\x39\x39\x2c\x30\ -\x2e\x35\x31\x34\x2c\x30\x2e\x31\x39\x38\x2c\x30\x2e\x37\x31\x2c\ -\x30\x63\x30\x2e\x31\x39\x36\x2d\x30\x2e\x31\x39\x37\x2c\x30\x2e\ -\x31\x39\x36\x2d\x30\x2e\x35\x31\x38\x2c\x30\x2d\x30\x2e\x37\x31\ -\x37\x4c\x39\x2c\x31\x30\x6c\x32\x2e\x33\x30\x32\x2d\x32\x2e\x35\ -\x30\x36\x43\x31\x31\x2e\x34\x39\x38\x2c\x37\x2e\x32\x39\x36\x2c\ -\x31\x31\x2e\x34\x39\x38\x2c\x36\x2e\x39\x37\x36\x2c\x31\x31\x2e\ -\x33\x30\x32\x2c\x36\x2e\x37\x37\x36\x7a\x0d\x0a\x09\x20\x4d\x31\ -\x30\x2c\x30\x2e\x34\x63\x2d\x35\x2e\x33\x30\x32\x2c\x30\x2d\x39\ -\x2e\x36\x2c\x34\x2e\x32\x39\x38\x2d\x39\x2e\x36\x2c\x39\x2e\x36\ -\x63\x30\x2c\x35\x2e\x33\x30\x33\x2c\x34\x2e\x32\x39\x38\x2c\x39\ -\x2e\x36\x2c\x39\x2e\x36\x2c\x39\x2e\x36\x73\x39\x2e\x36\x2d\x34\ -\x2e\x32\x39\x37\x2c\x39\x2e\x36\x2d\x39\x2e\x36\x43\x31\x39\x2e\ -\x36\x2c\x34\x2e\x36\x39\x38\x2c\x31\x35\x2e\x33\x30\x32\x2c\x30\ -\x2e\x34\x2c\x31\x30\x2c\x30\x2e\x34\x7a\x20\x4d\x31\x30\x2c\x31\ -\x38\x2e\x33\x35\x34\x0d\x0a\x09\x63\x2d\x34\x2e\x36\x31\x35\x2c\ -\x30\x2d\x38\x2e\x33\x35\x34\x2d\x33\x2e\x37\x34\x2d\x38\x2e\x33\ -\x35\x34\x2d\x38\x2e\x33\x35\x34\x63\x30\x2d\x34\x2e\x36\x31\x34\ -\x2c\x33\x2e\x37\x33\x39\x2d\x38\x2e\x33\x35\x34\x2c\x38\x2e\x33\ -\x35\x34\x2d\x38\x2e\x33\x35\x34\x63\x34\x2e\x36\x31\x33\x2c\x30\ -\x2c\x38\x2e\x33\x35\x34\x2c\x33\x2e\x37\x34\x2c\x38\x2e\x33\x35\ -\x34\x2c\x38\x2e\x33\x35\x34\x0d\x0a\x09\x43\x31\x38\x2e\x33\x35\ -\x34\x2c\x31\x34\x2e\x36\x31\x34\x2c\x31\x34\x2e\x36\x31\x33\x2c\ -\x31\x38\x2e\x33\x35\x34\x2c\x31\x30\x2c\x31\x38\x2e\x33\x35\x34\ -\x7a\x22\x2f\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\x76\ -\x67\x3e\x0d\x0a\ -\x00\x00\x03\x4c\ +\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x70\x61\x74\x68\x20\ +\x64\x3d\x22\x4d\x34\x35\x30\x2e\x36\x37\x39\x2c\x32\x37\x33\x2e\ +\x35\x63\x2d\x31\x34\x2e\x35\x38\x35\x2d\x31\x34\x2e\x35\x37\x37\ +\x2d\x33\x36\x2e\x30\x35\x34\x2d\x31\x35\x2e\x38\x39\x2d\x35\x30\ +\x2e\x36\x33\x39\x2d\x31\x2e\x33\x31\x32\x6c\x2d\x34\x31\x2e\x36\ +\x38\x37\x2c\x34\x31\x2e\x36\x36\x34\x63\x2d\x31\x30\x2e\x38\x35\ +\x32\x2c\x31\x30\x2e\x38\x33\x36\x2d\x32\x33\x2e\x39\x33\x2c\x31\ +\x30\x2e\x38\x35\x39\x2d\x33\x31\x2e\x35\x36\x34\x2c\x31\x2e\x38\ +\x35\x32\x0d\x0a\x09\x63\x2d\x35\x2e\x30\x35\x37\x2d\x35\x2e\x39\ +\x36\x38\x2d\x33\x2e\x30\x36\x31\x2d\x32\x34\x2e\x33\x37\x34\x2d\ +\x31\x2e\x36\x34\x34\x2d\x33\x36\x2e\x30\x34\x39\x6c\x32\x30\x2e\ +\x39\x30\x37\x2d\x31\x37\x31\x2e\x38\x34\x39\x63\x31\x2e\x38\x36\ +\x37\x2d\x31\x35\x2e\x33\x35\x33\x2d\x39\x2e\x30\x37\x2d\x33\x30\ +\x2e\x31\x38\x35\x2d\x32\x34\x2e\x34\x33\x2d\x33\x32\x2e\x30\x35\ +\x31\x0d\x0a\x09\x63\x2d\x31\x35\x2e\x33\x35\x38\x2d\x31\x2e\x38\ +\x36\x37\x2d\x32\x39\x2e\x33\x32\x32\x2c\x39\x2e\x39\x33\x39\x2d\ +\x33\x31\x2e\x31\x39\x31\x2c\x32\x35\x2e\x32\x38\x39\x4c\x32\x36\ +\x37\x2e\x33\x37\x2c\x32\x33\x36\x2e\x30\x32\x31\x63\x2d\x31\x2e\ +\x32\x30\x35\x2c\x33\x2e\x33\x35\x38\x2d\x33\x2e\x37\x39\x2c\x33\ +\x2e\x39\x33\x38\x2d\x34\x2e\x30\x38\x31\x2d\x30\x2e\x35\x38\x32\ +\x4c\x32\x35\x35\x2e\x34\x34\x2c\x36\x30\x0d\x0a\x09\x63\x30\x2d\ +\x31\x35\x2e\x34\x36\x35\x2d\x31\x32\x2e\x35\x34\x32\x2d\x32\x38\ +\x2d\x32\x38\x2e\x30\x31\x34\x2d\x32\x38\x63\x2d\x31\x35\x2e\x34\ +\x37\x33\x2c\x30\x2d\x32\x38\x2e\x30\x31\x35\x2c\x31\x32\x2e\x35\ +\x33\x35\x2d\x32\x38\x2e\x30\x31\x35\x2c\x32\x38\x6c\x2d\x30\x2e\ +\x35\x35\x32\x2c\x31\x37\x36\x2e\x37\x35\x32\x63\x30\x2e\x31\x34\ +\x36\x2c\x32\x2e\x30\x34\x2d\x31\x2e\x36\x30\x34\x2c\x32\x2e\x36\ +\x32\x34\x2d\x31\x2e\x39\x32\x2c\x30\x2e\x32\x39\x34\x4c\x31\x37\ +\x32\x2e\x30\x31\x36\x2c\x39\x39\x2e\x30\x37\x37\x0d\x0a\x09\x63\ +\x2d\x32\x2e\x37\x35\x2d\x31\x35\x2e\x32\x31\x39\x2d\x31\x37\x2e\ +\x33\x32\x33\x2d\x32\x36\x2e\x32\x30\x33\x2d\x33\x32\x2e\x35\x34\ +\x38\x2d\x32\x33\x2e\x34\x35\x33\x63\x2d\x31\x35\x2e\x32\x32\x37\ +\x2c\x32\x2e\x37\x34\x38\x2d\x32\x35\x2e\x33\x33\x39\x2c\x31\x38\ +\x2e\x31\x38\x37\x2d\x32\x32\x2e\x35\x39\x31\x2c\x33\x33\x2e\x34\ +\x30\x33\x6c\x32\x32\x2e\x31\x39\x33\x2c\x31\x36\x31\x2e\x34\x35\ +\x35\x0d\x0a\x09\x63\x30\x2e\x30\x32\x33\x2c\x32\x2e\x38\x37\x32\ +\x2d\x30\x2e\x39\x34\x31\x2c\x34\x2e\x35\x31\x33\x2d\x32\x2e\x33\ +\x30\x38\x2c\x30\x2e\x38\x33\x31\x6c\x2d\x33\x33\x2e\x31\x30\x39\ +\x2d\x38\x38\x2e\x35\x31\x37\x63\x2d\x35\x2e\x31\x38\x2d\x31\x34\ +\x2e\x35\x37\x32\x2d\x32\x31\x2e\x31\x39\x36\x2d\x32\x33\x2e\x30\ +\x36\x35\x2d\x33\x35\x2e\x37\x37\x36\x2d\x31\x37\x2e\x38\x38\x39\ +\x0d\x0a\x09\x63\x2d\x31\x34\x2e\x35\x37\x39\x2c\x35\x2e\x31\x37\ +\x37\x2d\x32\x32\x2e\x32\x30\x31\x2c\x32\x32\x2e\x30\x36\x31\x2d\ +\x31\x37\x2e\x30\x32\x33\x2c\x33\x36\x2e\x36\x33\x31\x6c\x35\x38\ +\x2e\x30\x34\x32\x2c\x31\x38\x39\x2e\x36\x32\x35\x63\x30\x2e\x33\ +\x30\x33\x2c\x31\x2e\x30\x34\x36\x2c\x30\x2e\x36\x32\x34\x2c\x32\ +\x2e\x30\x38\x35\x2c\x30\x2e\x39\x35\x33\x2c\x33\x2e\x31\x31\x38\ +\x6c\x30\x2e\x31\x32\x31\x2c\x30\x2e\x33\x39\x0d\x0a\x09\x63\x30\ +\x2e\x30\x31\x31\x2c\x30\x2e\x30\x33\x31\x2c\x30\x2e\x30\x32\x35\ +\x2c\x30\x2e\x30\x35\x38\x2c\x30\x2e\x30\x33\x35\x2c\x30\x2e\x30\ +\x38\x38\x43\x31\x32\x36\x2e\x30\x37\x39\x2c\x34\x34\x34\x2e\x32\ +\x33\x33\x2c\x31\x37\x32\x2e\x35\x37\x2c\x34\x38\x30\x2c\x32\x32\ +\x37\x2e\x34\x32\x37\x2c\x34\x38\x30\x63\x33\x35\x2e\x31\x31\x36\ +\x2c\x30\x2c\x37\x31\x2e\x35\x39\x31\x2d\x31\x32\x2e\x33\x37\x38\ +\x2c\x39\x39\x2e\x33\x35\x37\x2d\x33\x33\x2e\x36\x37\x32\x0d\x0a\ +\x09\x63\x30\x2e\x30\x30\x31\x2c\x30\x2c\x30\x2e\x30\x30\x33\x2d\ +\x30\x2e\x30\x30\x32\x2c\x30\x2e\x30\x30\x33\x2d\x30\x2e\x30\x30\ +\x32\x63\x32\x39\x2e\x39\x39\x2d\x31\x38\x2e\x30\x35\x31\x2c\x31\ +\x32\x36\x2e\x30\x37\x31\x2d\x31\x32\x31\x2e\x33\x34\x37\x2c\x31\ +\x32\x36\x2e\x30\x37\x31\x2d\x31\x32\x31\x2e\x33\x34\x37\x43\x34\ +\x36\x37\x2e\x34\x34\x35\x2c\x33\x31\x30\x2e\x34\x30\x32\x2c\x34\ +\x36\x35\x2e\x32\x36\x36\x2c\x32\x38\x38\x2e\x30\x38\x2c\x34\x35\ +\x30\x2e\x36\x37\x39\x2c\x32\x37\x33\x2e\x35\x7a\x22\x2f\x3e\x0d\ +\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ +\x00\x00\x02\xfc\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ @@ -234,203 +186,25 @@ qt_resource_data = b"\ \x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ \x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ \x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x69\x64\x3d\ -\x22\x49\x63\x6f\x6e\x5f\x32\x31\x5f\x22\x3e\x0d\x0a\x09\x3c\x67\ +\x22\x49\x63\x6f\x6e\x5f\x32\x30\x5f\x22\x3e\x0d\x0a\x09\x3c\x67\ \x3e\x0d\x0a\x09\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\ -\x35\x36\x2c\x31\x35\x32\x63\x2d\x35\x37\x2e\x32\x2c\x30\x2d\x31\ -\x30\x34\x2c\x34\x36\x2e\x38\x2d\x31\x30\x34\x2c\x31\x30\x34\x73\ -\x34\x36\x2e\x38\x2c\x31\x30\x34\x2c\x31\x30\x34\x2c\x31\x30\x34\ -\x73\x31\x30\x34\x2d\x34\x36\x2e\x38\x2c\x31\x30\x34\x2d\x31\x30\ -\x34\x53\x33\x31\x33\x2e\x32\x2c\x31\x35\x32\x2c\x32\x35\x36\x2c\ -\x31\x35\x32\x7a\x20\x4d\x32\x35\x36\x2c\x34\x38\x0d\x0a\x09\x09\ -\x09\x43\x31\x34\x31\x2e\x36\x30\x31\x2c\x34\x38\x2c\x34\x38\x2c\ -\x31\x34\x31\x2e\x36\x30\x31\x2c\x34\x38\x2c\x32\x35\x36\x73\x39\ -\x33\x2e\x36\x30\x31\x2c\x32\x30\x38\x2c\x32\x30\x38\x2c\x32\x30\ -\x38\x73\x32\x30\x38\x2d\x39\x33\x2e\x36\x30\x31\x2c\x32\x30\x38\ -\x2d\x32\x30\x38\x53\x33\x37\x30\x2e\x33\x39\x39\x2c\x34\x38\x2c\ -\x32\x35\x36\x2c\x34\x38\x7a\x20\x4d\x32\x35\x36\x2c\x34\x32\x32\ -\x2e\x34\x0d\x0a\x09\x09\x09\x63\x2d\x39\x31\x2e\x35\x31\x38\x2c\ -\x30\x2d\x31\x36\x36\x2e\x34\x2d\x37\x34\x2e\x38\x38\x33\x2d\x31\ -\x36\x36\x2e\x34\x2d\x31\x36\x36\x2e\x34\x53\x31\x36\x34\x2e\x34\ -\x38\x32\x2c\x38\x39\x2e\x36\x2c\x32\x35\x36\x2c\x38\x39\x2e\x36\ -\x53\x34\x32\x32\x2e\x34\x2c\x31\x36\x34\x2e\x34\x38\x32\x2c\x34\ -\x32\x32\x2e\x34\x2c\x32\x35\x36\x53\x33\x34\x37\x2e\x35\x31\x38\ -\x2c\x34\x32\x32\x2e\x34\x2c\x32\x35\x36\x2c\x34\x32\x32\x2e\x34\ +\x35\x36\x2c\x34\x38\x43\x31\x34\x31\x2e\x36\x30\x31\x2c\x34\x38\ +\x2c\x34\x38\x2c\x31\x34\x31\x2e\x36\x30\x31\x2c\x34\x38\x2c\x32\ +\x35\x36\x73\x39\x33\x2e\x36\x30\x31\x2c\x32\x30\x38\x2c\x32\x30\ +\x38\x2c\x32\x30\x38\x73\x32\x30\x38\x2d\x39\x33\x2e\x36\x30\x31\ +\x2c\x32\x30\x38\x2d\x32\x30\x38\x53\x33\x37\x30\x2e\x33\x39\x39\ +\x2c\x34\x38\x2c\x32\x35\x36\x2c\x34\x38\x7a\x20\x4d\x32\x35\x36\ +\x2c\x34\x32\x32\x2e\x33\x39\x39\x0d\x0a\x09\x09\x09\x63\x2d\x39\ +\x31\x2e\x35\x31\x38\x2c\x30\x2d\x31\x36\x36\x2e\x33\x39\x39\x2d\ +\x37\x34\x2e\x38\x38\x32\x2d\x31\x36\x36\x2e\x33\x39\x39\x2d\x31\ +\x36\x36\x2e\x33\x39\x39\x53\x31\x36\x34\x2e\x34\x38\x32\x2c\x38\ +\x39\x2e\x36\x2c\x32\x35\x36\x2c\x38\x39\x2e\x36\x53\x34\x32\x32\ +\x2e\x34\x2c\x31\x36\x34\x2e\x34\x38\x32\x2c\x34\x32\x32\x2e\x34\ +\x2c\x32\x35\x36\x53\x33\x34\x37\x2e\x35\x31\x38\x2c\x34\x32\x32\ +\x2e\x33\x39\x39\x2c\x32\x35\x36\x2c\x34\x32\x32\x2e\x33\x39\x39\ \x7a\x22\x2f\x3e\x0d\x0a\x09\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x67\ \x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ -\x00\x00\x05\xd4\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\ -\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\ -\x2d\x38\x27\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x54\x68\x69\x73\x20\ -\x66\x69\x6c\x65\x20\x77\x61\x73\x20\x67\x65\x6e\x65\x72\x61\x74\ -\x65\x64\x20\x62\x79\x20\x64\x76\x69\x73\x76\x67\x6d\x20\x32\x2e\ -\x38\x20\x2d\x2d\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\x73\x69\ -\x6f\x6e\x3d\x27\x31\x2e\x31\x27\x20\x78\x6d\x6c\x6e\x73\x3d\x27\ -\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\ -\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x27\x20\x78\x6d\x6c\x6e\ -\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x27\x68\x74\x74\x70\x3a\x2f\x2f\ -\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\ -\x78\x6c\x69\x6e\x6b\x27\x20\x77\x69\x64\x74\x68\x3d\x27\x36\x33\ -\x2e\x39\x39\x39\x36\x70\x74\x27\x20\x68\x65\x69\x67\x68\x74\x3d\ -\x27\x36\x33\x2e\x39\x39\x39\x37\x70\x74\x27\x20\x76\x69\x65\x77\ -\x42\x6f\x78\x3d\x27\x35\x36\x2e\x34\x30\x39\x34\x20\x35\x33\x2e\ -\x38\x35\x38\x33\x20\x36\x33\x2e\x39\x39\x39\x36\x20\x36\x33\x2e\ -\x39\x39\x39\x37\x27\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x27\x70\x61\ -\x67\x65\x31\x27\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\ -\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\ -\x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\ -\x20\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\ -\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x35\ -\x34\x2e\x38\x39\x32\x36\x20\x2d\x33\x39\x2e\x37\x31\x30\x39\x43\ -\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x2d\x34\x33\x2e\x39\x30\x33\ -\x32\x20\x34\x34\x2e\x36\x39\x36\x39\x20\x2d\x34\x37\x2e\x33\x30\ -\x31\x37\x20\x33\x32\x2e\x31\x32\x20\x2d\x34\x37\x2e\x33\x30\x31\ -\x37\x43\x20\x31\x39\x2e\x35\x34\x33\x31\x20\x2d\x34\x37\x2e\x33\ -\x30\x31\x37\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x2d\x34\x33\x2e\ -\x39\x30\x33\x32\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x2d\x33\x39\ -\x2e\x37\x31\x30\x39\x43\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x2d\ -\x33\x35\x2e\x35\x31\x38\x35\x20\x31\x39\x2e\x35\x34\x33\x31\x20\ -\x2d\x33\x32\x2e\x31\x32\x20\x33\x32\x2e\x31\x32\x20\x2d\x33\x32\ -\x2e\x31\x32\x43\x20\x34\x34\x2e\x36\x39\x36\x39\x20\x2d\x33\x32\ -\x2e\x31\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x2d\x33\x35\x2e\ -\x35\x31\x38\x35\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x2d\x33\x39\ -\x2e\x37\x31\x30\x39\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\ -\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\ -\x30\x30\x30\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\ -\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\ -\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\ -\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\ -\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\ -\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x33\x2e\ -\x35\x31\x33\x31\x32\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\ -\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\ -\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\x30\x20\ -\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x36\x2e\x34\x30\x39\x34\ -\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x70\x61\x74\ -\x68\x20\x64\x3d\x27\x4d\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x2d\ -\x33\x39\x2e\x37\x31\x30\x39\x4c\x20\x39\x2e\x33\x34\x37\x34\x32\ -\x20\x2d\x39\x2e\x33\x34\x37\x34\x32\x4c\x20\x39\x2e\x33\x34\x37\ -\x34\x32\x20\x2d\x39\x2e\x33\x34\x37\x34\x32\x43\x20\x39\x2e\x33\ -\x34\x37\x34\x32\x20\x2d\x39\x2e\x33\x34\x37\x34\x32\x20\x39\x2e\ -\x33\x34\x37\x34\x32\x20\x2d\x39\x2e\x33\x34\x37\x34\x32\x20\x39\ -\x2e\x33\x34\x37\x34\x32\x20\x2d\x39\x2e\x33\x34\x37\x34\x32\x43\ -\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x2d\x35\x2e\x31\x35\x35\x31\ -\x31\x20\x31\x39\x2e\x35\x34\x33\x31\x20\x2d\x31\x2e\x37\x35\x36\ -\x35\x36\x20\x33\x32\x2e\x31\x32\x20\x2d\x31\x2e\x37\x35\x36\x35\ -\x36\x43\x20\x34\x34\x2e\x36\x39\x36\x39\x20\x2d\x31\x2e\x37\x35\ -\x36\x35\x36\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x2d\x35\x2e\x31\ -\x35\x35\x31\x31\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x2d\x39\x2e\ -\x33\x34\x37\x34\x32\x4c\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x2d\ -\x39\x2e\x33\x34\x37\x34\x32\x4c\x20\x35\x34\x2e\x38\x39\x32\x36\ -\x20\x2d\x33\x39\x2e\x37\x31\x30\x39\x27\x20\x66\x69\x6c\x6c\x3d\ -\x27\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\ -\x30\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\ -\x69\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\ -\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\ -\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\ -\x74\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\ -\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\ -\x27\x33\x2e\x35\x31\x33\x31\x32\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\ -\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\ -\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\ -\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x36\x2e\x34\ -\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\ -\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x35\x34\x2e\x38\x39\x32\ -\x36\x20\x2d\x33\x39\x2e\x37\x31\x30\x39\x43\x20\x35\x34\x2e\x38\ -\x39\x32\x36\x20\x2d\x35\x32\x2e\x32\x38\x37\x38\x20\x34\x34\x2e\ -\x36\x39\x36\x39\x20\x2d\x36\x32\x2e\x34\x38\x33\x34\x20\x33\x32\ -\x2e\x31\x32\x20\x2d\x36\x32\x2e\x34\x38\x33\x34\x43\x20\x31\x39\ -\x2e\x35\x34\x33\x31\x20\x2d\x36\x32\x2e\x34\x38\x33\x34\x20\x39\ -\x2e\x33\x34\x37\x34\x32\x20\x2d\x35\x32\x2e\x32\x38\x37\x38\x20\ -\x39\x2e\x33\x34\x37\x34\x32\x20\x2d\x33\x39\x2e\x37\x31\x30\x39\ -\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\x74\ -\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x73\ -\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\x72\ -\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\ -\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\ -\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\x3d\ -\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\ -\x2d\x77\x69\x64\x74\x68\x3d\x27\x33\x2e\x35\x31\x33\x31\x32\x27\ -\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\ -\x76\x67\x3e\ -\x00\x00\x04\xaa\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ -\x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ -\x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\ -\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x30\x2c\ -\x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\ -\x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\ -\x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\ -\x20\x20\x2d\x2d\x3e\x0d\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\ -\x20\x73\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\ -\x57\x33\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\ -\x2f\x2f\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\ -\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\ -\x73\x2f\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\ -\x67\x31\x31\x2e\x64\x74\x64\x22\x3e\x0d\x0a\x3c\x73\x76\x67\x20\ -\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\ -\x3d\x22\x43\x6f\x64\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\ -\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\ -\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\ -\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\ -\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\ -\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x32\x34\x70\x78\x22\x20\x79\ -\x3d\x22\x32\x34\x70\x78\x22\x0d\x0a\x09\x20\x76\x69\x65\x77\x42\ -\x6f\x78\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\ -\x20\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\ -\x6e\x64\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\ -\x35\x31\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\ -\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x74\ -\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\ -\x28\x32\x34\x20\x30\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\ -\x3e\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x35\x2e\x37\x31\x39\ -\x2c\x31\x34\x2e\x37\x35\x63\x2d\x30\x2e\x32\x33\x36\x2c\x30\x2d\ -\x30\x2e\x34\x37\x34\x2d\x30\x2e\x30\x38\x33\x2d\x30\x2e\x36\x36\ -\x34\x2d\x30\x2e\x32\x35\x32\x4c\x2d\x30\x2e\x30\x30\x35\x2c\x31\ -\x30\x6c\x35\x2e\x33\x34\x31\x2d\x34\x2e\x37\x34\x38\x43\x35\x2e\ -\x37\x34\x38\x2c\x34\x2e\x38\x38\x37\x2c\x36\x2e\x33\x38\x2c\x34\ -\x2e\x39\x32\x32\x2c\x36\x2e\x37\x34\x37\x2c\x35\x2e\x33\x33\x35\ -\x0d\x0a\x09\x63\x30\x2e\x33\x36\x37\x2c\x30\x2e\x34\x31\x33\x2c\ -\x30\x2e\x33\x33\x2c\x31\x2e\x30\x34\x35\x2d\x30\x2e\x30\x38\x33\ -\x2c\x31\x2e\x34\x31\x32\x4c\x33\x2e\x30\x30\x35\x2c\x31\x30\x6c\ -\x33\x2e\x33\x37\x38\x2c\x33\x2e\x30\x30\x32\x63\x30\x2e\x34\x31\ -\x33\x2c\x30\x2e\x33\x36\x37\x2c\x30\x2e\x34\x35\x2c\x30\x2e\x39\ -\x39\x39\x2c\x30\x2e\x30\x38\x33\x2c\x31\x2e\x34\x31\x32\x0d\x0a\ -\x09\x43\x36\x2e\x32\x36\x39\x2c\x31\x34\x2e\x36\x33\x37\x2c\x35\ -\x2e\x39\x39\x34\x2c\x31\x34\x2e\x37\x35\x2c\x35\x2e\x37\x31\x39\ -\x2c\x31\x34\x2e\x37\x35\x7a\x20\x4d\x31\x34\x2e\x36\x36\x34\x2c\ -\x31\x34\x2e\x37\x34\x38\x4c\x32\x30\x2e\x30\x30\x35\x2c\x31\x30\ -\x6c\x2d\x35\x2e\x30\x36\x2d\x34\x2e\x34\x39\x38\x63\x2d\x30\x2e\ -\x34\x31\x33\x2d\x30\x2e\x33\x36\x37\x2d\x31\x2e\x30\x34\x35\x2d\ -\x30\x2e\x33\x33\x2d\x31\x2e\x34\x31\x31\x2c\x30\x2e\x30\x38\x33\ -\x0d\x0a\x09\x63\x2d\x30\x2e\x33\x36\x37\x2c\x30\x2e\x34\x31\x33\ -\x2d\x30\x2e\x33\x33\x2c\x31\x2e\x30\x34\x35\x2c\x30\x2e\x30\x38\ -\x33\x2c\x31\x2e\x34\x31\x32\x4c\x31\x36\x2e\x39\x39\x35\x2c\x31\ -\x30\x6c\x2d\x33\x2e\x36\x35\x39\x2c\x33\x2e\x32\x35\x32\x63\x2d\ -\x30\x2e\x34\x31\x33\x2c\x30\x2e\x33\x36\x37\x2d\x30\x2e\x34\x35\ -\x2c\x30\x2e\x39\x39\x39\x2d\x30\x2e\x30\x38\x33\x2c\x31\x2e\x34\ -\x31\x32\x43\x31\x33\x2e\x34\x35\x2c\x31\x34\x2e\x38\x38\x37\x2c\ -\x31\x33\x2e\x37\x32\x35\x2c\x31\x35\x2c\x31\x34\x2c\x31\x35\x0d\ -\x0a\x09\x43\x31\x34\x2e\x32\x33\x36\x2c\x31\x35\x2c\x31\x34\x2e\ -\x34\x37\x34\x2c\x31\x34\x2e\x39\x31\x37\x2c\x31\x34\x2e\x36\x36\ -\x34\x2c\x31\x34\x2e\x37\x34\x38\x7a\x20\x4d\x39\x2e\x39\x38\x36\ -\x2c\x31\x36\x2e\x31\x36\x35\x6c\x32\x2d\x31\x32\x63\x30\x2e\x30\ -\x39\x31\x2d\x30\x2e\x35\x34\x35\x2d\x30\x2e\x32\x37\x37\x2d\x31\ -\x2e\x30\x36\x2d\x30\x2e\x38\x32\x32\x2d\x31\x2e\x31\x35\x31\x0d\ -\x0a\x09\x63\x2d\x30\x2e\x35\x34\x37\x2d\x30\x2e\x30\x39\x32\x2d\ -\x31\x2e\x30\x36\x31\x2c\x30\x2e\x32\x37\x37\x2d\x31\x2e\x31\x35\ -\x2c\x30\x2e\x38\x32\x32\x6c\x2d\x32\x2c\x31\x32\x63\x2d\x30\x2e\ -\x30\x39\x31\x2c\x30\x2e\x35\x34\x35\x2c\x30\x2e\x32\x37\x37\x2c\ -\x31\x2e\x30\x36\x2c\x30\x2e\x38\x32\x32\x2c\x31\x2e\x31\x35\x31\ -\x43\x38\x2e\x38\x39\x32\x2c\x31\x36\x2e\x39\x39\x36\x2c\x38\x2e\ -\x39\x34\x36\x2c\x31\x37\x2c\x39\x2e\x30\x30\x31\x2c\x31\x37\x0d\ -\x0a\x09\x43\x39\x2e\x34\x38\x31\x2c\x31\x37\x2c\x39\x2e\x39\x30\ -\x35\x2c\x31\x36\x2e\x36\x35\x33\x2c\x39\x2e\x39\x38\x36\x2c\x31\ -\x36\x2e\x31\x36\x35\x7a\x22\x2f\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\ -\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ -\x00\x00\x02\xb7\ +\x00\x00\x02\xa2\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ @@ -461,28 +235,27 @@ qt_resource_data = b"\ \x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\ \x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ \x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ -\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x69\x64\x3d\ -\x22\x49\x63\x6f\x6e\x5f\x35\x5f\x22\x3e\x0d\x0a\x09\x3c\x67\x3e\ -\x0d\x0a\x09\x09\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\ -\x6e\x74\x73\x3d\x22\x34\x30\x35\x2c\x31\x33\x36\x2e\x37\x39\x38\ -\x20\x33\x37\x35\x2e\x32\x30\x32\x2c\x31\x30\x37\x20\x32\x35\x36\ -\x2c\x32\x32\x36\x2e\x32\x30\x32\x20\x31\x33\x36\x2e\x37\x39\x38\ -\x2c\x31\x30\x37\x20\x31\x30\x37\x2c\x31\x33\x36\x2e\x37\x39\x38\ -\x20\x32\x32\x36\x2e\x32\x30\x32\x2c\x32\x35\x36\x20\x31\x30\x37\ -\x2c\x33\x37\x35\x2e\x32\x30\x32\x20\x31\x33\x36\x2e\x37\x39\x38\ -\x2c\x34\x30\x35\x20\x32\x35\x36\x2c\x32\x38\x35\x2e\x37\x39\x38\ -\x20\x0d\x0a\x09\x09\x09\x33\x37\x35\x2e\x32\x30\x32\x2c\x34\x30\ -\x35\x20\x34\x30\x35\x2c\x33\x37\x35\x2e\x32\x30\x32\x20\x32\x38\ -\x35\x2e\x37\x39\x38\x2c\x32\x35\x36\x20\x09\x09\x22\x2f\x3e\x0d\ -\x0a\x09\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\ -\x73\x76\x67\x3e\x0d\x0a\ -\x00\x00\x05\xca\ +\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x3e\x0d\x0a\x09\ +\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\x32\x38\x2c\x34\x30\ +\x35\x2e\x34\x32\x39\x43\x31\x32\x38\x2c\x34\x32\x38\x2e\x38\x34\ +\x36\x2c\x31\x34\x37\x2e\x31\x39\x38\x2c\x34\x34\x38\x2c\x31\x37\ +\x30\x2e\x36\x36\x37\x2c\x34\x34\x38\x68\x31\x37\x30\x2e\x36\x36\ +\x37\x43\x33\x36\x34\x2e\x38\x30\x32\x2c\x34\x34\x38\x2c\x33\x38\ +\x34\x2c\x34\x32\x38\x2e\x38\x34\x36\x2c\x33\x38\x34\x2c\x34\x30\ +\x35\x2e\x34\x32\x39\x56\x31\x36\x30\x48\x31\x32\x38\x56\x34\x30\ +\x35\x2e\x34\x32\x39\x7a\x20\x4d\x34\x31\x36\x2c\x39\x36\x0d\x0a\ +\x09\x09\x68\x2d\x38\x30\x6c\x2d\x32\x36\x2e\x37\x38\x35\x2d\x33\ +\x32\x48\x32\x30\x32\x2e\x37\x38\x36\x4c\x31\x37\x36\x2c\x39\x36\ +\x48\x39\x36\x76\x33\x32\x68\x33\x32\x30\x56\x39\x36\x7a\x22\x2f\ +\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\ +\x0a\ +\x00\x00\x03\xc4\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ \x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ \x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\ -\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\ +\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x30\x2c\ \x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\ \x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\ \x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\ @@ -494,84 +267,52 @@ qt_resource_data = b"\ \x73\x2f\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\ \x67\x31\x31\x2e\x64\x74\x64\x22\x3e\x0d\x0a\x3c\x73\x76\x67\x20\ \x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\ -\x3d\x22\x4c\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\ -\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\ -\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\ -\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\ -\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\ -\x39\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\ -\x20\x79\x3d\x22\x30\x70\x78\x22\x0d\x0a\x09\x20\x77\x69\x64\x74\ -\x68\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\ -\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\ -\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\ -\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\ -\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ -\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ -\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x70\x61\x74\x68\x20\ -\x64\x3d\x22\x4d\x34\x35\x30\x2e\x36\x37\x39\x2c\x32\x37\x33\x2e\ -\x35\x63\x2d\x31\x34\x2e\x35\x38\x35\x2d\x31\x34\x2e\x35\x37\x37\ -\x2d\x33\x36\x2e\x30\x35\x34\x2d\x31\x35\x2e\x38\x39\x2d\x35\x30\ -\x2e\x36\x33\x39\x2d\x31\x2e\x33\x31\x32\x6c\x2d\x34\x31\x2e\x36\ -\x38\x37\x2c\x34\x31\x2e\x36\x36\x34\x63\x2d\x31\x30\x2e\x38\x35\ -\x32\x2c\x31\x30\x2e\x38\x33\x36\x2d\x32\x33\x2e\x39\x33\x2c\x31\ -\x30\x2e\x38\x35\x39\x2d\x33\x31\x2e\x35\x36\x34\x2c\x31\x2e\x38\ -\x35\x32\x0d\x0a\x09\x63\x2d\x35\x2e\x30\x35\x37\x2d\x35\x2e\x39\ -\x36\x38\x2d\x33\x2e\x30\x36\x31\x2d\x32\x34\x2e\x33\x37\x34\x2d\ -\x31\x2e\x36\x34\x34\x2d\x33\x36\x2e\x30\x34\x39\x6c\x32\x30\x2e\ -\x39\x30\x37\x2d\x31\x37\x31\x2e\x38\x34\x39\x63\x31\x2e\x38\x36\ -\x37\x2d\x31\x35\x2e\x33\x35\x33\x2d\x39\x2e\x30\x37\x2d\x33\x30\ -\x2e\x31\x38\x35\x2d\x32\x34\x2e\x34\x33\x2d\x33\x32\x2e\x30\x35\ -\x31\x0d\x0a\x09\x63\x2d\x31\x35\x2e\x33\x35\x38\x2d\x31\x2e\x38\ -\x36\x37\x2d\x32\x39\x2e\x33\x32\x32\x2c\x39\x2e\x39\x33\x39\x2d\ -\x33\x31\x2e\x31\x39\x31\x2c\x32\x35\x2e\x32\x38\x39\x4c\x32\x36\ -\x37\x2e\x33\x37\x2c\x32\x33\x36\x2e\x30\x32\x31\x63\x2d\x31\x2e\ -\x32\x30\x35\x2c\x33\x2e\x33\x35\x38\x2d\x33\x2e\x37\x39\x2c\x33\ -\x2e\x39\x33\x38\x2d\x34\x2e\x30\x38\x31\x2d\x30\x2e\x35\x38\x32\ -\x4c\x32\x35\x35\x2e\x34\x34\x2c\x36\x30\x0d\x0a\x09\x63\x30\x2d\ -\x31\x35\x2e\x34\x36\x35\x2d\x31\x32\x2e\x35\x34\x32\x2d\x32\x38\ -\x2d\x32\x38\x2e\x30\x31\x34\x2d\x32\x38\x63\x2d\x31\x35\x2e\x34\ -\x37\x33\x2c\x30\x2d\x32\x38\x2e\x30\x31\x35\x2c\x31\x32\x2e\x35\ -\x33\x35\x2d\x32\x38\x2e\x30\x31\x35\x2c\x32\x38\x6c\x2d\x30\x2e\ -\x35\x35\x32\x2c\x31\x37\x36\x2e\x37\x35\x32\x63\x30\x2e\x31\x34\ -\x36\x2c\x32\x2e\x30\x34\x2d\x31\x2e\x36\x30\x34\x2c\x32\x2e\x36\ -\x32\x34\x2d\x31\x2e\x39\x32\x2c\x30\x2e\x32\x39\x34\x4c\x31\x37\ -\x32\x2e\x30\x31\x36\x2c\x39\x39\x2e\x30\x37\x37\x0d\x0a\x09\x63\ -\x2d\x32\x2e\x37\x35\x2d\x31\x35\x2e\x32\x31\x39\x2d\x31\x37\x2e\ -\x33\x32\x33\x2d\x32\x36\x2e\x32\x30\x33\x2d\x33\x32\x2e\x35\x34\ -\x38\x2d\x32\x33\x2e\x34\x35\x33\x63\x2d\x31\x35\x2e\x32\x32\x37\ -\x2c\x32\x2e\x37\x34\x38\x2d\x32\x35\x2e\x33\x33\x39\x2c\x31\x38\ -\x2e\x31\x38\x37\x2d\x32\x32\x2e\x35\x39\x31\x2c\x33\x33\x2e\x34\ -\x30\x33\x6c\x32\x32\x2e\x31\x39\x33\x2c\x31\x36\x31\x2e\x34\x35\ -\x35\x0d\x0a\x09\x63\x30\x2e\x30\x32\x33\x2c\x32\x2e\x38\x37\x32\ -\x2d\x30\x2e\x39\x34\x31\x2c\x34\x2e\x35\x31\x33\x2d\x32\x2e\x33\ -\x30\x38\x2c\x30\x2e\x38\x33\x31\x6c\x2d\x33\x33\x2e\x31\x30\x39\ -\x2d\x38\x38\x2e\x35\x31\x37\x63\x2d\x35\x2e\x31\x38\x2d\x31\x34\ -\x2e\x35\x37\x32\x2d\x32\x31\x2e\x31\x39\x36\x2d\x32\x33\x2e\x30\ -\x36\x35\x2d\x33\x35\x2e\x37\x37\x36\x2d\x31\x37\x2e\x38\x38\x39\ -\x0d\x0a\x09\x63\x2d\x31\x34\x2e\x35\x37\x39\x2c\x35\x2e\x31\x37\ -\x37\x2d\x32\x32\x2e\x32\x30\x31\x2c\x32\x32\x2e\x30\x36\x31\x2d\ -\x31\x37\x2e\x30\x32\x33\x2c\x33\x36\x2e\x36\x33\x31\x6c\x35\x38\ -\x2e\x30\x34\x32\x2c\x31\x38\x39\x2e\x36\x32\x35\x63\x30\x2e\x33\ -\x30\x33\x2c\x31\x2e\x30\x34\x36\x2c\x30\x2e\x36\x32\x34\x2c\x32\ -\x2e\x30\x38\x35\x2c\x30\x2e\x39\x35\x33\x2c\x33\x2e\x31\x31\x38\ -\x6c\x30\x2e\x31\x32\x31\x2c\x30\x2e\x33\x39\x0d\x0a\x09\x63\x30\ -\x2e\x30\x31\x31\x2c\x30\x2e\x30\x33\x31\x2c\x30\x2e\x30\x32\x35\ -\x2c\x30\x2e\x30\x35\x38\x2c\x30\x2e\x30\x33\x35\x2c\x30\x2e\x30\ -\x38\x38\x43\x31\x32\x36\x2e\x30\x37\x39\x2c\x34\x34\x34\x2e\x32\ -\x33\x33\x2c\x31\x37\x32\x2e\x35\x37\x2c\x34\x38\x30\x2c\x32\x32\ -\x37\x2e\x34\x32\x37\x2c\x34\x38\x30\x63\x33\x35\x2e\x31\x31\x36\ -\x2c\x30\x2c\x37\x31\x2e\x35\x39\x31\x2d\x31\x32\x2e\x33\x37\x38\ -\x2c\x39\x39\x2e\x33\x35\x37\x2d\x33\x33\x2e\x36\x37\x32\x0d\x0a\ -\x09\x63\x30\x2e\x30\x30\x31\x2c\x30\x2c\x30\x2e\x30\x30\x33\x2d\ -\x30\x2e\x30\x30\x32\x2c\x30\x2e\x30\x30\x33\x2d\x30\x2e\x30\x30\ -\x32\x63\x32\x39\x2e\x39\x39\x2d\x31\x38\x2e\x30\x35\x31\x2c\x31\ -\x32\x36\x2e\x30\x37\x31\x2d\x31\x32\x31\x2e\x33\x34\x37\x2c\x31\ -\x32\x36\x2e\x30\x37\x31\x2d\x31\x32\x31\x2e\x33\x34\x37\x43\x34\ -\x36\x37\x2e\x34\x34\x35\x2c\x33\x31\x30\x2e\x34\x30\x32\x2c\x34\ -\x36\x35\x2e\x32\x36\x36\x2c\x32\x38\x38\x2e\x30\x38\x2c\x34\x35\ -\x30\x2e\x36\x37\x39\x2c\x32\x37\x33\x2e\x35\x7a\x22\x2f\x3e\x0d\ -\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ -\x00\x00\x03\x36\ +\x3d\x22\x4d\x61\x67\x6e\x69\x66\x79\x69\x6e\x67\x5f\x67\x6c\x61\ +\x73\x73\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\ +\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\x69\ +\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\ +\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\x6b\ +\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x0d\x0a\x09\x20\x79\x3d\x22\ +\x30\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\ +\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\ +\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\ +\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\ +\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\ +\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\ +\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\x34\x20\x30\x20\ +\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x0d\x0a\x3c\x70\x61\ +\x74\x68\x20\x64\x3d\x22\x4d\x31\x37\x2e\x35\x34\x35\x2c\x31\x35\ +\x2e\x34\x36\x37\x6c\x2d\x33\x2e\x37\x37\x39\x2d\x33\x2e\x37\x37\ +\x39\x63\x30\x2e\x35\x37\x2d\x30\x2e\x39\x33\x35\x2c\x30\x2e\x38\ +\x39\x38\x2d\x32\x2e\x30\x33\x35\x2c\x30\x2e\x38\x39\x38\x2d\x33\ +\x2e\x32\x31\x63\x30\x2d\x33\x2e\x34\x31\x37\x2d\x32\x2e\x39\x36\ +\x31\x2d\x36\x2e\x33\x37\x37\x2d\x36\x2e\x33\x37\x38\x2d\x36\x2e\ +\x33\x37\x37\x0d\x0a\x09\x43\x34\x2e\x38\x36\x39\x2c\x32\x2e\x31\ +\x2c\x32\x2e\x31\x2c\x34\x2e\x38\x37\x2c\x32\x2e\x31\x2c\x38\x2e\ +\x32\x38\x37\x63\x30\x2c\x33\x2e\x34\x31\x36\x2c\x32\x2e\x39\x36\ +\x31\x2c\x36\x2e\x33\x37\x37\x2c\x36\x2e\x33\x37\x37\x2c\x36\x2e\ +\x33\x37\x37\x63\x31\x2e\x31\x33\x37\x2c\x30\x2c\x32\x2e\x32\x2d\ +\x30\x2e\x33\x30\x39\x2c\x33\x2e\x31\x31\x35\x2d\x30\x2e\x38\x34\ +\x34\x6c\x33\x2e\x37\x39\x39\x2c\x33\x2e\x38\x30\x31\x0d\x0a\x09\ +\x63\x30\x2e\x33\x37\x32\x2c\x30\x2e\x33\x37\x31\x2c\x30\x2e\x39\ +\x37\x35\x2c\x30\x2e\x33\x37\x31\x2c\x31\x2e\x33\x34\x36\x2c\x30\ +\x6c\x30\x2e\x39\x34\x33\x2d\x30\x2e\x39\x34\x33\x43\x31\x38\x2e\ +\x30\x35\x31\x2c\x31\x36\x2e\x33\x30\x37\x2c\x31\x37\x2e\x39\x31\ +\x36\x2c\x31\x35\x2e\x38\x33\x38\x2c\x31\x37\x2e\x35\x34\x35\x2c\ +\x31\x35\x2e\x34\x36\x37\x7a\x20\x4d\x34\x2e\x30\x30\x34\x2c\x38\ +\x2e\x32\x38\x37\x0d\x0a\x09\x63\x30\x2d\x32\x2e\x33\x36\x36\x2c\ +\x31\x2e\x39\x31\x37\x2d\x34\x2e\x32\x38\x33\x2c\x34\x2e\x32\x38\ +\x32\x2d\x34\x2e\x32\x38\x33\x63\x32\x2e\x33\x36\x36\x2c\x30\x2c\ +\x34\x2e\x34\x37\x34\x2c\x32\x2e\x31\x30\x37\x2c\x34\x2e\x34\x37\ +\x34\x2c\x34\x2e\x34\x37\x34\x63\x30\x2c\x32\x2e\x33\x36\x35\x2d\ +\x31\x2e\x39\x31\x38\x2c\x34\x2e\x32\x38\x33\x2d\x34\x2e\x32\x38\ +\x33\x2c\x34\x2e\x32\x38\x33\x0d\x0a\x09\x43\x36\x2e\x31\x31\x31\ +\x2c\x31\x32\x2e\x37\x36\x2c\x34\x2e\x30\x30\x34\x2c\x31\x30\x2e\ +\x36\x35\x32\x2c\x34\x2e\x30\x30\x34\x2c\x38\x2e\x32\x38\x37\x7a\ +\x22\x2f\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\ +\x3e\x0d\x0a\ +\x00\x00\x05\x27\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ @@ -602,29 +343,60 @@ qt_resource_data = b"\ \x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\ \x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ \x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ -\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x3e\x0d\x0a\x09\ -\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\ -\x22\x33\x39\x36\x2e\x37\x39\x35\x2c\x33\x39\x36\x2e\x38\x20\x33\ -\x32\x30\x2c\x33\x39\x36\x2e\x38\x20\x33\x32\x30\x2c\x34\x34\x38\ -\x20\x34\x34\x38\x2c\x34\x34\x38\x20\x34\x34\x38\x2c\x33\x32\x30\ -\x20\x33\x39\x36\x2e\x37\x39\x35\x2c\x33\x32\x30\x20\x09\x22\x2f\ -\x3e\x0d\x0a\x09\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\ -\x6e\x74\x73\x3d\x22\x33\x39\x36\x2e\x38\x2c\x31\x31\x35\x2e\x32\ -\x30\x35\x20\x33\x39\x36\x2e\x38\x2c\x31\x39\x32\x20\x34\x34\x38\ -\x2c\x31\x39\x32\x20\x34\x34\x38\x2c\x36\x34\x20\x33\x32\x30\x2c\ -\x36\x34\x20\x33\x32\x30\x2c\x31\x31\x35\x2e\x32\x30\x35\x20\x09\ -\x22\x2f\x3e\x0d\x0a\x09\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\ -\x6f\x69\x6e\x74\x73\x3d\x22\x31\x31\x35\x2e\x32\x30\x35\x2c\x31\ -\x31\x35\x2e\x32\x20\x31\x39\x32\x2c\x31\x31\x35\x2e\x32\x20\x31\ -\x39\x32\x2c\x36\x34\x20\x36\x34\x2c\x36\x34\x20\x36\x34\x2c\x31\ -\x39\x32\x20\x31\x31\x35\x2e\x32\x30\x35\x2c\x31\x39\x32\x20\x09\ -\x22\x2f\x3e\x0d\x0a\x09\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\ -\x6f\x69\x6e\x74\x73\x3d\x22\x31\x31\x35\x2e\x32\x2c\x33\x39\x36\ -\x2e\x37\x39\x35\x20\x31\x31\x35\x2e\x32\x2c\x33\x32\x30\x20\x36\ -\x34\x2c\x33\x32\x30\x20\x36\x34\x2c\x34\x34\x38\x20\x31\x39\x32\ -\x2c\x34\x34\x38\x20\x31\x39\x32\x2c\x33\x39\x36\x2e\x37\x39\x35\ -\x20\x09\x22\x2f\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\ -\x76\x67\x3e\x0d\x0a\ +\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x69\x64\x3d\ +\x22\x49\x63\x6f\x6e\x5f\x31\x32\x5f\x22\x3e\x0d\x0a\x09\x3c\x67\ +\x3e\x0d\x0a\x09\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\ +\x35\x36\x2c\x36\x34\x43\x31\x35\x30\x2e\x34\x30\x31\x2c\x36\x34\ +\x2c\x36\x34\x2c\x31\x35\x30\x2e\x34\x30\x31\x2c\x36\x34\x2c\x32\ +\x35\x36\x63\x30\x2c\x31\x30\x35\x2e\x36\x30\x34\x2c\x38\x36\x2e\ +\x34\x30\x31\x2c\x31\x39\x32\x2c\x31\x39\x32\x2c\x31\x39\x32\x63\ +\x31\x38\x2e\x31\x33\x36\x2c\x30\x2c\x33\x32\x2d\x31\x33\x2e\x38\ +\x36\x34\x2c\x33\x32\x2d\x33\x32\x0d\x0a\x09\x09\x09\x63\x30\x2d\ +\x38\x2e\x35\x33\x31\x2d\x33\x2e\x31\x39\x38\x2d\x31\x36\x2d\x38\ +\x2e\x35\x33\x31\x2d\x32\x31\x2e\x33\x33\x33\x63\x2d\x35\x2e\x33\ +\x33\x33\x2d\x35\x2e\x33\x33\x34\x2d\x38\x2e\x35\x33\x31\x2d\x31\ +\x32\x2e\x38\x30\x33\x2d\x38\x2e\x35\x33\x31\x2d\x32\x31\x2e\x33\ +\x33\x34\x63\x30\x2d\x31\x38\x2e\x31\x33\x35\x2c\x31\x33\x2e\x38\ +\x36\x34\x2d\x33\x32\x2c\x33\x32\x2d\x33\x32\x68\x33\x38\x2e\x33\ +\x39\x36\x0d\x0a\x09\x09\x09\x63\x35\x38\x2e\x36\x36\x37\x2c\x30\ +\x2c\x31\x30\x36\x2e\x36\x36\x37\x2d\x34\x38\x2c\x31\x30\x36\x2e\ +\x36\x36\x37\x2d\x31\x30\x36\x2e\x36\x36\x36\x43\x34\x34\x38\x2c\ +\x31\x34\x30\x2e\x38\x30\x32\x2c\x33\x36\x31\x2e\x36\x30\x34\x2c\ +\x36\x34\x2c\x32\x35\x36\x2c\x36\x34\x7a\x20\x4d\x31\x33\x38\x2e\ +\x36\x36\x37\x2c\x32\x35\x36\x63\x2d\x31\x38\x2e\x31\x33\x36\x2c\ +\x30\x2d\x33\x32\x2d\x31\x33\x2e\x38\x36\x34\x2d\x33\x32\x2d\x33\ +\x32\x73\x31\x33\x2e\x38\x36\x34\x2d\x33\x32\x2c\x33\x32\x2d\x33\ +\x32\x0d\x0a\x09\x09\x09\x63\x31\x38\x2e\x31\x33\x35\x2c\x30\x2c\ +\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\x2c\x33\x32\x2c\x33\x32\x53\ +\x31\x35\x36\x2e\x38\x30\x32\x2c\x32\x35\x36\x2c\x31\x33\x38\x2e\ +\x36\x36\x37\x2c\x32\x35\x36\x7a\x20\x4d\x32\x30\x32\x2e\x36\x36\ +\x37\x2c\x31\x37\x30\x2e\x36\x36\x37\x63\x2d\x31\x38\x2e\x31\x33\ +\x36\x2c\x30\x2d\x33\x32\x2d\x31\x33\x2e\x38\x36\x35\x2d\x33\x32\ +\x2d\x33\x32\x63\x30\x2d\x31\x38\x2e\x31\x33\x36\x2c\x31\x33\x2e\ +\x38\x36\x34\x2d\x33\x32\x2c\x33\x32\x2d\x33\x32\x0d\x0a\x09\x09\ +\x09\x63\x31\x38\x2e\x31\x33\x35\x2c\x30\x2c\x33\x32\x2c\x31\x33\ +\x2e\x38\x36\x34\x2c\x33\x32\x2c\x33\x32\x43\x32\x33\x34\x2e\x36\ +\x36\x37\x2c\x31\x35\x36\x2e\x38\x30\x32\x2c\x32\x32\x30\x2e\x38\ +\x30\x32\x2c\x31\x37\x30\x2e\x36\x36\x37\x2c\x32\x30\x32\x2e\x36\ +\x36\x37\x2c\x31\x37\x30\x2e\x36\x36\x37\x7a\x20\x4d\x33\x30\x39\ +\x2e\x33\x33\x33\x2c\x31\x37\x30\x2e\x36\x36\x37\x63\x2d\x31\x38\ +\x2e\x31\x33\x35\x2c\x30\x2d\x33\x32\x2d\x31\x33\x2e\x38\x36\x35\ +\x2d\x33\x32\x2d\x33\x32\x0d\x0a\x09\x09\x09\x63\x30\x2d\x31\x38\ +\x2e\x31\x33\x36\x2c\x31\x33\x2e\x38\x36\x35\x2d\x33\x32\x2c\x33\ +\x32\x2d\x33\x32\x63\x31\x38\x2e\x31\x33\x36\x2c\x30\x2c\x33\x32\ +\x2c\x31\x33\x2e\x38\x36\x34\x2c\x33\x32\x2c\x33\x32\x43\x33\x34\ +\x31\x2e\x33\x33\x33\x2c\x31\x35\x36\x2e\x38\x30\x32\x2c\x33\x32\ +\x37\x2e\x34\x36\x39\x2c\x31\x37\x30\x2e\x36\x36\x37\x2c\x33\x30\ +\x39\x2e\x33\x33\x33\x2c\x31\x37\x30\x2e\x36\x36\x37\x7a\x20\x4d\ +\x33\x37\x33\x2e\x33\x33\x33\x2c\x32\x35\x36\x0d\x0a\x09\x09\x09\ +\x63\x2d\x31\x38\x2e\x31\x33\x35\x2c\x30\x2d\x33\x32\x2d\x31\x33\ +\x2e\x38\x36\x34\x2d\x33\x32\x2d\x33\x32\x73\x31\x33\x2e\x38\x36\ +\x35\x2d\x33\x32\x2c\x33\x32\x2d\x33\x32\x63\x31\x38\x2e\x31\x33\ +\x36\x2c\x30\x2c\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\x2c\x33\x32\ +\x2c\x33\x32\x53\x33\x39\x31\x2e\x34\x36\x39\x2c\x32\x35\x36\x2c\ +\x33\x37\x33\x2e\x33\x33\x33\x2c\x32\x35\x36\x7a\x22\x2f\x3e\x0d\ +\x0a\x09\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\ +\x73\x76\x67\x3e\x0d\x0a\ \x00\x00\x03\x22\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -678,13 +450,13 @@ qt_resource_data = b"\ \x35\x2c\x33\x39\x32\x2c\x32\x35\x36\x2c\x33\x39\x32\x7a\x22\x2f\ \x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\ \x0a\ -\x00\x00\x02\xa2\ +\x00\x00\x04\xaa\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ \x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ \x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\ -\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\ +\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x30\x2c\ \x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\ \x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\ \x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\ @@ -696,114 +468,66 @@ qt_resource_data = b"\ \x73\x2f\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\ \x67\x31\x31\x2e\x64\x74\x64\x22\x3e\x0d\x0a\x3c\x73\x76\x67\x20\ \x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\ -\x3d\x22\x4c\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\ -\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\ -\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\ -\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\ -\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\ -\x39\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\ -\x20\x79\x3d\x22\x30\x70\x78\x22\x0d\x0a\x09\x20\x77\x69\x64\x74\ -\x68\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\ -\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\ -\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\ -\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\ -\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ -\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ -\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x3e\x0d\x0a\x09\ -\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\x32\x38\x2c\x34\x30\ -\x35\x2e\x34\x32\x39\x43\x31\x32\x38\x2c\x34\x32\x38\x2e\x38\x34\ -\x36\x2c\x31\x34\x37\x2e\x31\x39\x38\x2c\x34\x34\x38\x2c\x31\x37\ -\x30\x2e\x36\x36\x37\x2c\x34\x34\x38\x68\x31\x37\x30\x2e\x36\x36\ -\x37\x43\x33\x36\x34\x2e\x38\x30\x32\x2c\x34\x34\x38\x2c\x33\x38\ -\x34\x2c\x34\x32\x38\x2e\x38\x34\x36\x2c\x33\x38\x34\x2c\x34\x30\ -\x35\x2e\x34\x32\x39\x56\x31\x36\x30\x48\x31\x32\x38\x56\x34\x30\ -\x35\x2e\x34\x32\x39\x7a\x20\x4d\x34\x31\x36\x2c\x39\x36\x0d\x0a\ -\x09\x09\x68\x2d\x38\x30\x6c\x2d\x32\x36\x2e\x37\x38\x35\x2d\x33\ -\x32\x48\x32\x30\x32\x2e\x37\x38\x36\x4c\x31\x37\x36\x2c\x39\x36\ -\x48\x39\x36\x76\x33\x32\x68\x33\x32\x30\x56\x39\x36\x7a\x22\x2f\ -\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\ -\x0a\ -\x00\x00\x04\xd5\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\ -\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\ -\x2d\x38\x27\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x54\x68\x69\x73\x20\ -\x66\x69\x6c\x65\x20\x77\x61\x73\x20\x67\x65\x6e\x65\x72\x61\x74\ -\x65\x64\x20\x62\x79\x20\x64\x76\x69\x73\x76\x67\x6d\x20\x32\x2e\ -\x38\x20\x2d\x2d\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\x73\x69\ -\x6f\x6e\x3d\x27\x31\x2e\x31\x27\x20\x78\x6d\x6c\x6e\x73\x3d\x27\ -\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\ -\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x27\x20\x78\x6d\x6c\x6e\ -\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x27\x68\x74\x74\x70\x3a\x2f\x2f\ -\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\ -\x78\x6c\x69\x6e\x6b\x27\x20\x77\x69\x64\x74\x68\x3d\x27\x36\x33\ -\x2e\x39\x39\x39\x36\x70\x74\x27\x20\x68\x65\x69\x67\x68\x74\x3d\ -\x27\x36\x33\x2e\x39\x39\x39\x37\x70\x74\x27\x20\x76\x69\x65\x77\ -\x42\x6f\x78\x3d\x27\x35\x36\x2e\x34\x30\x39\x34\x20\x35\x33\x2e\ -\x38\x35\x38\x33\x20\x36\x33\x2e\x39\x39\x39\x36\x20\x36\x33\x2e\ -\x39\x39\x39\x37\x27\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x27\x70\x61\ -\x67\x65\x31\x27\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\ -\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\ -\x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\ -\x20\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\ -\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x33\ -\x2e\x39\x35\x37\x33\x35\x20\x2d\x33\x32\x2e\x31\x32\x43\x20\x32\ -\x2e\x32\x38\x39\x32\x32\x20\x2d\x33\x39\x2e\x33\x31\x31\x33\x20\ -\x36\x2e\x33\x36\x37\x30\x32\x20\x2d\x34\x36\x2e\x32\x33\x38\x36\ -\x20\x31\x31\x2e\x39\x30\x33\x36\x20\x2d\x35\x31\x2e\x33\x30\x33\ -\x39\x43\x20\x32\x39\x2e\x36\x36\x38\x37\x20\x2d\x36\x37\x2e\x35\ -\x35\x36\x38\x20\x35\x35\x2e\x32\x32\x39\x32\x20\x2d\x36\x30\x2e\ -\x36\x34\x32\x20\x35\x36\x2e\x31\x35\x32\x33\x20\x2d\x34\x32\x2e\ -\x35\x30\x32\x32\x43\x20\x35\x36\x2e\x36\x31\x33\x36\x20\x2d\x33\ -\x33\x2e\x34\x33\x38\x31\x20\x34\x39\x2e\x31\x31\x33\x32\x20\x2d\ -\x32\x36\x2e\x35\x39\x35\x39\x20\x34\x30\x2e\x36\x37\x39\x34\x20\ -\x2d\x32\x32\x2e\x35\x32\x38\x31\x43\x20\x32\x35\x2e\x33\x39\x39\ -\x35\x20\x2d\x31\x35\x2e\x31\x35\x38\x32\x20\x37\x2e\x31\x39\x39\ -\x33\x35\x20\x2d\x31\x38\x2e\x31\x34\x33\x36\x20\x33\x2e\x39\x35\ -\x37\x33\x35\x20\x2d\x33\x32\x2e\x31\x32\x5a\x27\x20\x66\x69\x6c\ -\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\x65\x3d\ -\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\x6b\x65\ -\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\x64\x27\ -\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\ -\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\ -\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\x2e\x30\ -\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\x64\x74\ -\x68\x3d\x27\x32\x2e\x35\x30\x39\x33\x37\x27\x2f\x3e\x0a\x3c\x2f\ -\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\ -\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\ -\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x38\ -\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\ -\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x33\x2e\x39\ -\x35\x37\x33\x35\x27\x20\x63\x79\x3d\x27\x2d\x33\x32\x2e\x31\x32\ -\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\ -\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\ -\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\ -\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\ -\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x38\ -\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\ -\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x31\x31\x2e\ -\x39\x30\x33\x36\x27\x20\x63\x79\x3d\x27\x2d\x35\x31\x2e\x33\x30\ -\x33\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\ -\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\ -\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\ -\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\ -\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\ -\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\ -\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x35\ -\x36\x2e\x31\x35\x32\x33\x27\x20\x63\x79\x3d\x27\x2d\x34\x32\x2e\ -\x35\x30\x32\x32\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\ -\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\ -\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\ -\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\ -\x36\x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\ -\x34\x20\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\ -\x38\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\ -\x27\x34\x30\x2e\x36\x37\x39\x34\x27\x20\x63\x79\x3d\x27\x2d\x32\ -\x32\x2e\x35\x32\x38\x31\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\ -\x30\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\ -\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\ -\x73\x76\x67\x3e\ -\x00\x00\x02\x7d\ +\x3d\x22\x43\x6f\x64\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\ +\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\ +\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\ +\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\ +\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\ +\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x32\x34\x70\x78\x22\x20\x79\ +\x3d\x22\x32\x34\x70\x78\x22\x0d\x0a\x09\x20\x76\x69\x65\x77\x42\ +\x6f\x78\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\ +\x20\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\ +\x6e\x64\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\ +\x35\x31\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\ +\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x74\ +\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\ +\x28\x32\x34\x20\x30\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\ +\x3e\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x35\x2e\x37\x31\x39\ +\x2c\x31\x34\x2e\x37\x35\x63\x2d\x30\x2e\x32\x33\x36\x2c\x30\x2d\ +\x30\x2e\x34\x37\x34\x2d\x30\x2e\x30\x38\x33\x2d\x30\x2e\x36\x36\ +\x34\x2d\x30\x2e\x32\x35\x32\x4c\x2d\x30\x2e\x30\x30\x35\x2c\x31\ +\x30\x6c\x35\x2e\x33\x34\x31\x2d\x34\x2e\x37\x34\x38\x43\x35\x2e\ +\x37\x34\x38\x2c\x34\x2e\x38\x38\x37\x2c\x36\x2e\x33\x38\x2c\x34\ +\x2e\x39\x32\x32\x2c\x36\x2e\x37\x34\x37\x2c\x35\x2e\x33\x33\x35\ +\x0d\x0a\x09\x63\x30\x2e\x33\x36\x37\x2c\x30\x2e\x34\x31\x33\x2c\ +\x30\x2e\x33\x33\x2c\x31\x2e\x30\x34\x35\x2d\x30\x2e\x30\x38\x33\ +\x2c\x31\x2e\x34\x31\x32\x4c\x33\x2e\x30\x30\x35\x2c\x31\x30\x6c\ +\x33\x2e\x33\x37\x38\x2c\x33\x2e\x30\x30\x32\x63\x30\x2e\x34\x31\ +\x33\x2c\x30\x2e\x33\x36\x37\x2c\x30\x2e\x34\x35\x2c\x30\x2e\x39\ +\x39\x39\x2c\x30\x2e\x30\x38\x33\x2c\x31\x2e\x34\x31\x32\x0d\x0a\ +\x09\x43\x36\x2e\x32\x36\x39\x2c\x31\x34\x2e\x36\x33\x37\x2c\x35\ +\x2e\x39\x39\x34\x2c\x31\x34\x2e\x37\x35\x2c\x35\x2e\x37\x31\x39\ +\x2c\x31\x34\x2e\x37\x35\x7a\x20\x4d\x31\x34\x2e\x36\x36\x34\x2c\ +\x31\x34\x2e\x37\x34\x38\x4c\x32\x30\x2e\x30\x30\x35\x2c\x31\x30\ +\x6c\x2d\x35\x2e\x30\x36\x2d\x34\x2e\x34\x39\x38\x63\x2d\x30\x2e\ +\x34\x31\x33\x2d\x30\x2e\x33\x36\x37\x2d\x31\x2e\x30\x34\x35\x2d\ +\x30\x2e\x33\x33\x2d\x31\x2e\x34\x31\x31\x2c\x30\x2e\x30\x38\x33\ +\x0d\x0a\x09\x63\x2d\x30\x2e\x33\x36\x37\x2c\x30\x2e\x34\x31\x33\ +\x2d\x30\x2e\x33\x33\x2c\x31\x2e\x30\x34\x35\x2c\x30\x2e\x30\x38\ +\x33\x2c\x31\x2e\x34\x31\x32\x4c\x31\x36\x2e\x39\x39\x35\x2c\x31\ +\x30\x6c\x2d\x33\x2e\x36\x35\x39\x2c\x33\x2e\x32\x35\x32\x63\x2d\ +\x30\x2e\x34\x31\x33\x2c\x30\x2e\x33\x36\x37\x2d\x30\x2e\x34\x35\ +\x2c\x30\x2e\x39\x39\x39\x2d\x30\x2e\x30\x38\x33\x2c\x31\x2e\x34\ +\x31\x32\x43\x31\x33\x2e\x34\x35\x2c\x31\x34\x2e\x38\x38\x37\x2c\ +\x31\x33\x2e\x37\x32\x35\x2c\x31\x35\x2c\x31\x34\x2c\x31\x35\x0d\ +\x0a\x09\x43\x31\x34\x2e\x32\x33\x36\x2c\x31\x35\x2c\x31\x34\x2e\ +\x34\x37\x34\x2c\x31\x34\x2e\x39\x31\x37\x2c\x31\x34\x2e\x36\x36\ +\x34\x2c\x31\x34\x2e\x37\x34\x38\x7a\x20\x4d\x39\x2e\x39\x38\x36\ +\x2c\x31\x36\x2e\x31\x36\x35\x6c\x32\x2d\x31\x32\x63\x30\x2e\x30\ +\x39\x31\x2d\x30\x2e\x35\x34\x35\x2d\x30\x2e\x32\x37\x37\x2d\x31\ +\x2e\x30\x36\x2d\x30\x2e\x38\x32\x32\x2d\x31\x2e\x31\x35\x31\x0d\ +\x0a\x09\x63\x2d\x30\x2e\x35\x34\x37\x2d\x30\x2e\x30\x39\x32\x2d\ +\x31\x2e\x30\x36\x31\x2c\x30\x2e\x32\x37\x37\x2d\x31\x2e\x31\x35\ +\x2c\x30\x2e\x38\x32\x32\x6c\x2d\x32\x2c\x31\x32\x63\x2d\x30\x2e\ +\x30\x39\x31\x2c\x30\x2e\x35\x34\x35\x2c\x30\x2e\x32\x37\x37\x2c\ +\x31\x2e\x30\x36\x2c\x30\x2e\x38\x32\x32\x2c\x31\x2e\x31\x35\x31\ +\x43\x38\x2e\x38\x39\x32\x2c\x31\x36\x2e\x39\x39\x36\x2c\x38\x2e\ +\x39\x34\x36\x2c\x31\x37\x2c\x39\x2e\x30\x30\x31\x2c\x31\x37\x0d\ +\x0a\x09\x43\x39\x2e\x34\x38\x31\x2c\x31\x37\x2c\x39\x2e\x39\x30\ +\x35\x2c\x31\x36\x2e\x36\x35\x33\x2c\x39\x2e\x39\x38\x36\x2c\x31\ +\x36\x2e\x31\x36\x35\x7a\x22\x2f\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\ +\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ +\x00\x00\x02\xb7\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ @@ -835,17 +559,21 @@ qt_resource_data = b"\ \x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ \x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ \x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x69\x64\x3d\ -\x22\x49\x63\x6f\x6e\x5f\x38\x5f\x22\x3e\x0d\x0a\x09\x3c\x67\x3e\ -\x0d\x0a\x09\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x38\x35\ -\x2c\x32\x37\x37\x2e\x33\x37\x35\x68\x32\x35\x39\x2e\x37\x30\x34\ -\x4c\x32\x32\x35\x2e\x30\x30\x32\x2c\x33\x39\x37\x2e\x30\x37\x37\ -\x4c\x32\x35\x36\x2c\x34\x32\x37\x6c\x31\x37\x31\x2d\x31\x37\x31\ -\x4c\x32\x35\x36\x2c\x38\x35\x6c\x2d\x32\x39\x2e\x39\x32\x32\x2c\ -\x32\x39\x2e\x39\x32\x34\x6c\x31\x31\x38\x2e\x36\x32\x36\x2c\x31\ -\x31\x39\x2e\x37\x30\x31\x48\x38\x35\x56\x32\x37\x37\x2e\x33\x37\ -\x35\x7a\x22\x2f\x3e\x0d\x0a\x09\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\ -\x67\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ -\x00\x00\x03\x7c\ +\x22\x49\x63\x6f\x6e\x5f\x35\x5f\x22\x3e\x0d\x0a\x09\x3c\x67\x3e\ +\x0d\x0a\x09\x09\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\ +\x6e\x74\x73\x3d\x22\x34\x30\x35\x2c\x31\x33\x36\x2e\x37\x39\x38\ +\x20\x33\x37\x35\x2e\x32\x30\x32\x2c\x31\x30\x37\x20\x32\x35\x36\ +\x2c\x32\x32\x36\x2e\x32\x30\x32\x20\x31\x33\x36\x2e\x37\x39\x38\ +\x2c\x31\x30\x37\x20\x31\x30\x37\x2c\x31\x33\x36\x2e\x37\x39\x38\ +\x20\x32\x32\x36\x2e\x32\x30\x32\x2c\x32\x35\x36\x20\x31\x30\x37\ +\x2c\x33\x37\x35\x2e\x32\x30\x32\x20\x31\x33\x36\x2e\x37\x39\x38\ +\x2c\x34\x30\x35\x20\x32\x35\x36\x2c\x32\x38\x35\x2e\x37\x39\x38\ +\x20\x0d\x0a\x09\x09\x09\x33\x37\x35\x2e\x32\x30\x32\x2c\x34\x30\ +\x35\x20\x34\x30\x35\x2c\x33\x37\x35\x2e\x32\x30\x32\x20\x32\x38\ +\x35\x2e\x37\x39\x38\x2c\x32\x35\x36\x20\x09\x09\x22\x2f\x3e\x0d\ +\x0a\x09\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\ +\x73\x76\x67\x3e\x0d\x0a\ +\x00\x00\x04\x3d\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\ \x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\ @@ -867,43 +595,55 @@ qt_resource_data = b"\ \x67\x65\x31\x27\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\ \x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\ \x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\ -\x20\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\ -\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x32\ -\x2e\x30\x30\x37\x35\x20\x2d\x32\x2e\x30\x30\x37\x35\x4c\x20\x36\ -\x32\x2e\x32\x33\x32\x35\x20\x2d\x32\x2e\x30\x30\x37\x35\x4c\x20\ -\x36\x32\x2e\x32\x33\x32\x35\x20\x2d\x36\x32\x2e\x32\x33\x32\x35\ -\x4c\x20\x32\x2e\x30\x30\x37\x35\x20\x2d\x36\x32\x2e\x32\x33\x32\ -\x35\x4c\x20\x32\x2e\x30\x30\x37\x35\x20\x2d\x32\x2e\x30\x30\x37\ -\x35\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\ -\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\ -\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\ -\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\ -\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\ -\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\ -\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\ -\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x34\x2e\x30\x31\x35\x27\ -\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\ -\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\ -\x39\x36\x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\ -\x36\x34\x20\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\ -\x35\x38\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\ -\x20\x34\x37\x2e\x31\x37\x36\x32\x20\x2d\x33\x32\x2e\x31\x32\x43\ -\x20\x34\x37\x2e\x31\x37\x36\x32\x20\x2d\x34\x30\x2e\x34\x33\x35\ -\x33\x20\x34\x30\x2e\x34\x33\x35\x33\x20\x2d\x34\x37\x2e\x31\x37\ -\x36\x32\x20\x33\x32\x2e\x31\x32\x20\x2d\x34\x37\x2e\x31\x37\x36\ -\x32\x43\x20\x32\x33\x2e\x38\x30\x34\x37\x20\x2d\x34\x37\x2e\x31\ -\x37\x36\x32\x20\x31\x37\x2e\x30\x36\x33\x37\x20\x2d\x34\x30\x2e\ -\x34\x33\x35\x33\x20\x31\x37\x2e\x30\x36\x33\x37\x20\x2d\x33\x32\ -\x2e\x31\x32\x43\x20\x31\x37\x2e\x30\x36\x33\x37\x20\x2d\x32\x33\ -\x2e\x38\x30\x34\x37\x20\x32\x33\x2e\x38\x30\x34\x37\x20\x2d\x31\ -\x37\x2e\x30\x36\x33\x37\x20\x33\x32\x2e\x31\x32\x20\x2d\x31\x37\ -\x2e\x30\x36\x33\x37\x43\x20\x34\x30\x2e\x34\x33\x35\x33\x20\x2d\ -\x31\x37\x2e\x30\x36\x33\x37\x20\x34\x37\x2e\x31\x37\x36\x32\x20\ -\x2d\x32\x33\x2e\x38\x30\x34\x37\x20\x34\x37\x2e\x31\x37\x36\x32\ -\x20\x2d\x33\x32\x2e\x31\x32\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\ -\x23\x30\x30\x30\x30\x30\x30\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\ -\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\ -\x00\x00\x02\x79\ +\x20\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\ +\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x33\ +\x2e\x39\x35\x37\x33\x35\x20\x2d\x33\x32\x2e\x31\x32\x4c\x20\x31\ +\x31\x2e\x39\x30\x33\x36\x20\x2d\x35\x31\x2e\x33\x30\x33\x39\x4c\ +\x20\x35\x36\x2e\x31\x35\x32\x33\x20\x2d\x34\x32\x2e\x35\x30\x32\ +\x32\x4c\x20\x34\x30\x2e\x36\x37\x39\x34\x20\x2d\x32\x32\x2e\x35\ +\x32\x38\x31\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\ +\x20\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\ +\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\ +\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\ +\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\ +\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\ +\x69\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\ +\x6f\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x32\x2e\x35\x30\x39\ +\x33\x37\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\ +\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\ +\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\ +\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\ +\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\ +\x20\x63\x78\x3d\x27\x33\x2e\x39\x35\x37\x33\x35\x27\x20\x63\x79\ +\x3d\x27\x2d\x33\x32\x2e\x31\x32\x27\x20\x66\x69\x6c\x6c\x3d\x27\ +\x23\x30\x30\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\ +\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\ +\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\ +\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\ +\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\ +\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\ +\x20\x63\x78\x3d\x27\x31\x31\x2e\x39\x30\x33\x36\x27\x20\x63\x79\ +\x3d\x27\x2d\x35\x31\x2e\x33\x30\x33\x39\x27\x20\x66\x69\x6c\x6c\ +\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\ +\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\ +\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\ +\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\x30\x20\x30\ +\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\x36\x39\x20\ +\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\ +\x6c\x65\x20\x63\x78\x3d\x27\x35\x36\x2e\x31\x35\x32\x33\x27\x20\ +\x63\x79\x3d\x27\x2d\x34\x32\x2e\x35\x30\x32\x32\x27\x20\x66\x69\ +\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x72\x3d\x27\ +\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\ +\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\ +\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\x30\ +\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\x36\ +\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\x69\ +\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x34\x30\x2e\x36\x37\x39\x34\ +\x27\x20\x63\x79\x3d\x27\x2d\x32\x32\x2e\x35\x32\x38\x31\x27\x20\ +\x66\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x72\ +\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\ +\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\ +\x00\x00\x03\x46\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ @@ -930,26 +670,135 @@ qt_resource_data = b"\ \x20\x79\x3d\x22\x30\x70\x78\x22\x0d\x0a\x09\x20\x77\x69\x64\x74\ \x68\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\ \x3d\x22\x35\x31\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\ -\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\ -\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\ -\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ -\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ -\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x69\x64\x3d\ -\x22\x49\x63\x6f\x6e\x5f\x31\x5f\x22\x3e\x0d\x0a\x09\x3c\x67\x3e\ -\x0d\x0a\x09\x09\x3c\x67\x3e\x0d\x0a\x09\x09\x09\x3c\x70\x6f\x6c\ -\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x31\x38\x36\ -\x2e\x33\x30\x31\x2c\x33\x33\x39\x2e\x38\x39\x33\x20\x39\x36\x2c\ -\x32\x34\x39\x2e\x34\x36\x31\x20\x36\x34\x2c\x32\x37\x39\x2e\x39\ -\x36\x38\x20\x31\x38\x36\x2e\x33\x30\x31\x2c\x34\x30\x32\x20\x34\ -\x34\x38\x2c\x31\x34\x30\x2e\x35\x30\x36\x20\x34\x31\x36\x2c\x31\ -\x31\x30\x20\x09\x09\x09\x22\x2f\x3e\x0d\x0a\x09\x09\x3c\x2f\x67\ -\x3e\x0d\x0a\x09\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\ -\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ -\x00\x00\x02\x7d\ +\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x73\ +\x74\x79\x6c\x65\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\ +\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\ +\x35\x31\x32\x20\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\ +\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\ +\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x33\x37\x2e\x35\ +\x2c\x33\x38\x36\x2e\x36\x4c\x33\x30\x36\x2e\x39\x2c\x32\x35\x36\ +\x6c\x31\x33\x30\x2e\x36\x2d\x31\x33\x30\x2e\x36\x63\x31\x34\x2e\ +\x31\x2d\x31\x34\x2e\x31\x2c\x31\x34\x2e\x31\x2d\x33\x36\x2e\x38\ +\x2c\x30\x2d\x35\x30\x2e\x39\x63\x2d\x31\x34\x2e\x31\x2d\x31\x34\ +\x2e\x31\x2d\x33\x36\x2e\x38\x2d\x31\x34\x2e\x31\x2d\x35\x30\x2e\ +\x39\x2c\x30\x4c\x32\x35\x36\x2c\x32\x30\x35\x2e\x31\x4c\x31\x32\ +\x35\x2e\x34\x2c\x37\x34\x2e\x35\x0d\x0a\x09\x63\x2d\x31\x34\x2e\ +\x31\x2d\x31\x34\x2e\x31\x2d\x33\x36\x2e\x38\x2d\x31\x34\x2e\x31\ +\x2d\x35\x30\x2e\x39\x2c\x30\x63\x2d\x31\x34\x2e\x31\x2c\x31\x34\ +\x2e\x31\x2d\x31\x34\x2e\x31\x2c\x33\x36\x2e\x38\x2c\x30\x2c\x35\ +\x30\x2e\x39\x4c\x32\x30\x35\x2e\x31\x2c\x32\x35\x36\x4c\x37\x34\ +\x2e\x35\x2c\x33\x38\x36\x2e\x36\x63\x2d\x31\x34\x2e\x31\x2c\x31\ +\x34\x2e\x31\x2d\x31\x34\x2e\x31\x2c\x33\x36\x2e\x38\x2c\x30\x2c\ +\x35\x30\x2e\x39\x0d\x0a\x09\x63\x31\x34\x2e\x31\x2c\x31\x34\x2e\ +\x31\x2c\x33\x36\x2e\x38\x2c\x31\x34\x2e\x31\x2c\x35\x30\x2e\x39\ +\x2c\x30\x4c\x32\x35\x36\x2c\x33\x30\x36\x2e\x39\x6c\x31\x33\x30\ +\x2e\x36\x2c\x31\x33\x30\x2e\x36\x63\x31\x34\x2e\x31\x2c\x31\x34\ +\x2e\x31\x2c\x33\x36\x2e\x38\x2c\x31\x34\x2e\x31\x2c\x35\x30\x2e\ +\x39\x2c\x30\x43\x34\x35\x31\x2e\x35\x2c\x34\x32\x33\x2e\x34\x2c\ +\x34\x35\x31\x2e\x35\x2c\x34\x30\x30\x2e\x36\x2c\x34\x33\x37\x2e\ +\x35\x2c\x33\x38\x36\x2e\x36\x7a\x22\x2f\x3e\x0d\x0a\x3c\x2f\x73\ +\x76\x67\x3e\x0d\x0a\ +\x00\x00\x05\xd4\ \x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ -\x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\ +\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\ +\x2d\x38\x27\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x54\x68\x69\x73\x20\ +\x66\x69\x6c\x65\x20\x77\x61\x73\x20\x67\x65\x6e\x65\x72\x61\x74\ +\x65\x64\x20\x62\x79\x20\x64\x76\x69\x73\x76\x67\x6d\x20\x32\x2e\ +\x38\x20\x2d\x2d\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\x73\x69\ +\x6f\x6e\x3d\x27\x31\x2e\x31\x27\x20\x78\x6d\x6c\x6e\x73\x3d\x27\ +\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\ +\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x27\x20\x78\x6d\x6c\x6e\ +\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x27\x68\x74\x74\x70\x3a\x2f\x2f\ +\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\ +\x78\x6c\x69\x6e\x6b\x27\x20\x77\x69\x64\x74\x68\x3d\x27\x36\x33\ +\x2e\x39\x39\x39\x36\x70\x74\x27\x20\x68\x65\x69\x67\x68\x74\x3d\ +\x27\x36\x33\x2e\x39\x39\x39\x37\x70\x74\x27\x20\x76\x69\x65\x77\ +\x42\x6f\x78\x3d\x27\x35\x36\x2e\x34\x30\x39\x34\x20\x35\x33\x2e\ +\x38\x35\x38\x33\x20\x36\x33\x2e\x39\x39\x39\x36\x20\x36\x33\x2e\ +\x39\x39\x39\x37\x27\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x27\x70\x61\ +\x67\x65\x31\x27\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\ +\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\ +\x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\ +\x20\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\ +\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x35\ +\x34\x2e\x38\x39\x32\x36\x20\x2d\x33\x39\x2e\x37\x31\x30\x39\x43\ +\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x2d\x34\x33\x2e\x39\x30\x33\ +\x32\x20\x34\x34\x2e\x36\x39\x36\x39\x20\x2d\x34\x37\x2e\x33\x30\ +\x31\x37\x20\x33\x32\x2e\x31\x32\x20\x2d\x34\x37\x2e\x33\x30\x31\ +\x37\x43\x20\x31\x39\x2e\x35\x34\x33\x31\x20\x2d\x34\x37\x2e\x33\ +\x30\x31\x37\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x2d\x34\x33\x2e\ +\x39\x30\x33\x32\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x2d\x33\x39\ +\x2e\x37\x31\x30\x39\x43\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x2d\ +\x33\x35\x2e\x35\x31\x38\x35\x20\x31\x39\x2e\x35\x34\x33\x31\x20\ +\x2d\x33\x32\x2e\x31\x32\x20\x33\x32\x2e\x31\x32\x20\x2d\x33\x32\ +\x2e\x31\x32\x43\x20\x34\x34\x2e\x36\x39\x36\x39\x20\x2d\x33\x32\ +\x2e\x31\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x2d\x33\x35\x2e\ +\x35\x31\x38\x35\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x2d\x33\x39\ +\x2e\x37\x31\x30\x39\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\ +\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\ +\x30\x30\x30\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\ +\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\ +\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\ +\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\ +\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\ +\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x33\x2e\ +\x35\x31\x33\x31\x32\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\ +\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\ +\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\x30\x20\ +\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x36\x2e\x34\x30\x39\x34\ +\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x70\x61\x74\ +\x68\x20\x64\x3d\x27\x4d\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x2d\ +\x33\x39\x2e\x37\x31\x30\x39\x4c\x20\x39\x2e\x33\x34\x37\x34\x32\ +\x20\x2d\x39\x2e\x33\x34\x37\x34\x32\x4c\x20\x39\x2e\x33\x34\x37\ +\x34\x32\x20\x2d\x39\x2e\x33\x34\x37\x34\x32\x43\x20\x39\x2e\x33\ +\x34\x37\x34\x32\x20\x2d\x39\x2e\x33\x34\x37\x34\x32\x20\x39\x2e\ +\x33\x34\x37\x34\x32\x20\x2d\x39\x2e\x33\x34\x37\x34\x32\x20\x39\ +\x2e\x33\x34\x37\x34\x32\x20\x2d\x39\x2e\x33\x34\x37\x34\x32\x43\ +\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x2d\x35\x2e\x31\x35\x35\x31\ +\x31\x20\x31\x39\x2e\x35\x34\x33\x31\x20\x2d\x31\x2e\x37\x35\x36\ +\x35\x36\x20\x33\x32\x2e\x31\x32\x20\x2d\x31\x2e\x37\x35\x36\x35\ +\x36\x43\x20\x34\x34\x2e\x36\x39\x36\x39\x20\x2d\x31\x2e\x37\x35\ +\x36\x35\x36\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x2d\x35\x2e\x31\ +\x35\x35\x31\x31\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x2d\x39\x2e\ +\x33\x34\x37\x34\x32\x4c\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x2d\ +\x39\x2e\x33\x34\x37\x34\x32\x4c\x20\x35\x34\x2e\x38\x39\x32\x36\ +\x20\x2d\x33\x39\x2e\x37\x31\x30\x39\x27\x20\x66\x69\x6c\x6c\x3d\ +\x27\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\ +\x30\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\ +\x69\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\ +\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\ +\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\ +\x74\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\ +\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\ +\x27\x33\x2e\x35\x31\x33\x31\x32\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\ +\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\ +\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\ +\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x36\x2e\x34\ +\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\ +\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x35\x34\x2e\x38\x39\x32\ +\x36\x20\x2d\x33\x39\x2e\x37\x31\x30\x39\x43\x20\x35\x34\x2e\x38\ +\x39\x32\x36\x20\x2d\x35\x32\x2e\x32\x38\x37\x38\x20\x34\x34\x2e\ +\x36\x39\x36\x39\x20\x2d\x36\x32\x2e\x34\x38\x33\x34\x20\x33\x32\ +\x2e\x31\x32\x20\x2d\x36\x32\x2e\x34\x38\x33\x34\x43\x20\x31\x39\ +\x2e\x35\x34\x33\x31\x20\x2d\x36\x32\x2e\x34\x38\x33\x34\x20\x39\ +\x2e\x33\x34\x37\x34\x32\x20\x2d\x35\x32\x2e\x32\x38\x37\x38\x20\ +\x39\x2e\x33\x34\x37\x34\x32\x20\x2d\x33\x39\x2e\x37\x31\x30\x39\ +\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\x74\ +\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x73\ +\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\x72\ +\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\ +\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\ +\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\x3d\ +\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\ +\x2d\x77\x69\x64\x74\x68\x3d\x27\x33\x2e\x35\x31\x33\x31\x32\x27\ +\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\ +\x76\x67\x3e\ +\x00\x00\x02\x79\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ +\x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ \x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\ \x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\ \x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\ @@ -977,17 +826,17 @@ qt_resource_data = b"\ \x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ \x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ \x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x69\x64\x3d\ -\x22\x49\x63\x6f\x6e\x5f\x38\x5f\x22\x3e\x0d\x0a\x09\x3c\x67\x3e\ -\x0d\x0a\x09\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x32\ -\x37\x2c\x32\x33\x34\x2e\x36\x32\x35\x48\x31\x36\x37\x2e\x32\x39\ -\x36\x6c\x31\x31\x39\x2e\x37\x30\x32\x2d\x31\x31\x39\x2e\x37\x30\ -\x32\x4c\x32\x35\x36\x2c\x38\x35\x4c\x38\x35\x2c\x32\x35\x36\x6c\ -\x31\x37\x31\x2c\x31\x37\x31\x6c\x32\x39\x2e\x39\x32\x32\x2d\x32\ -\x39\x2e\x39\x32\x34\x4c\x31\x36\x37\x2e\x32\x39\x36\x2c\x32\x37\ -\x37\x2e\x33\x37\x35\x48\x34\x32\x37\x56\x32\x33\x34\x2e\x36\x32\ -\x35\x7a\x22\x2f\x3e\x0d\x0a\x09\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\ -\x67\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ -\x00\x00\x03\x52\ +\x22\x49\x63\x6f\x6e\x5f\x31\x5f\x22\x3e\x0d\x0a\x09\x3c\x67\x3e\ +\x0d\x0a\x09\x09\x3c\x67\x3e\x0d\x0a\x09\x09\x09\x3c\x70\x6f\x6c\ +\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x31\x38\x36\ +\x2e\x33\x30\x31\x2c\x33\x33\x39\x2e\x38\x39\x33\x20\x39\x36\x2c\ +\x32\x34\x39\x2e\x34\x36\x31\x20\x36\x34\x2c\x32\x37\x39\x2e\x39\ +\x36\x38\x20\x31\x38\x36\x2e\x33\x30\x31\x2c\x34\x30\x32\x20\x34\ +\x34\x38\x2c\x31\x34\x30\x2e\x35\x30\x36\x20\x34\x31\x36\x2c\x31\ +\x31\x30\x20\x09\x09\x09\x22\x2f\x3e\x0d\x0a\x09\x09\x3c\x2f\x67\ +\x3e\x0d\x0a\x09\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\ +\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ +\x00\x00\x03\x4c\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ @@ -1018,31 +867,97 @@ qt_resource_data = b"\ \x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\ \x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ \x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ -\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x70\x61\x74\x68\x20\ -\x64\x3d\x22\x4d\x34\x33\x37\x2e\x33\x33\x34\x2c\x31\x34\x34\x48\ -\x32\x35\x36\x2e\x30\x30\x36\x6c\x2d\x34\x32\x2e\x36\x36\x38\x2d\ -\x34\x38\x48\x37\x34\x2e\x36\x36\x36\x43\x35\x31\x2e\x31\x39\x37\ -\x2c\x39\x36\x2c\x33\x32\x2c\x31\x31\x35\x2e\x31\x39\x38\x2c\x33\ -\x32\x2c\x31\x33\x38\x2e\x36\x36\x37\x76\x32\x33\x34\x2e\x36\x36\ -\x36\x43\x33\x32\x2c\x33\x39\x36\x2e\x38\x30\x32\x2c\x35\x31\x2e\ -\x31\x39\x37\x2c\x34\x31\x36\x2c\x37\x34\x2e\x36\x36\x36\x2c\x34\ -\x31\x36\x68\x33\x36\x32\x2e\x36\x36\x38\x0d\x0a\x09\x43\x34\x36\ -\x30\x2e\x38\x30\x33\x2c\x34\x31\x36\x2c\x34\x38\x30\x2c\x33\x39\ -\x36\x2e\x38\x30\x32\x2c\x34\x38\x30\x2c\x33\x37\x33\x2e\x33\x33\ -\x33\x56\x31\x38\x36\x2e\x36\x36\x37\x43\x34\x38\x30\x2c\x31\x36\ -\x33\x2e\x31\x39\x38\x2c\x34\x36\x30\x2e\x38\x30\x33\x2c\x31\x34\ -\x34\x2c\x34\x33\x37\x2e\x33\x33\x34\x2c\x31\x34\x34\x7a\x20\x4d\ -\x34\x34\x38\x2c\x33\x37\x33\x2e\x33\x33\x33\x0d\x0a\x09\x63\x30\ -\x2c\x35\x2e\x37\x38\x32\x2d\x34\x2e\x38\x38\x35\x2c\x31\x30\x2e\ -\x36\x36\x37\x2d\x31\x30\x2e\x36\x36\x36\x2c\x31\x30\x2e\x36\x36\ -\x37\x48\x37\x34\x2e\x36\x36\x36\x43\x36\x38\x2e\x38\x38\x34\x2c\ -\x33\x38\x34\x2c\x36\x34\x2c\x33\x37\x39\x2e\x31\x31\x35\x2c\x36\ -\x34\x2c\x33\x37\x33\x2e\x33\x33\x33\x56\x31\x37\x36\x68\x33\x37\ -\x33\x2e\x33\x33\x34\x63\x35\x2e\x37\x38\x31\x2c\x30\x2c\x31\x30\ -\x2e\x36\x36\x36\x2c\x34\x2e\x38\x38\x35\x2c\x31\x30\x2e\x36\x36\ -\x36\x2c\x31\x30\x2e\x36\x36\x37\x0d\x0a\x09\x56\x33\x37\x33\x2e\ -\x33\x33\x33\x7a\x22\x2f\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\ -\x0a\ +\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x69\x64\x3d\ +\x22\x49\x63\x6f\x6e\x5f\x32\x31\x5f\x22\x3e\x0d\x0a\x09\x3c\x67\ +\x3e\x0d\x0a\x09\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\ +\x35\x36\x2c\x31\x35\x32\x63\x2d\x35\x37\x2e\x32\x2c\x30\x2d\x31\ +\x30\x34\x2c\x34\x36\x2e\x38\x2d\x31\x30\x34\x2c\x31\x30\x34\x73\ +\x34\x36\x2e\x38\x2c\x31\x30\x34\x2c\x31\x30\x34\x2c\x31\x30\x34\ +\x73\x31\x30\x34\x2d\x34\x36\x2e\x38\x2c\x31\x30\x34\x2d\x31\x30\ +\x34\x53\x33\x31\x33\x2e\x32\x2c\x31\x35\x32\x2c\x32\x35\x36\x2c\ +\x31\x35\x32\x7a\x20\x4d\x32\x35\x36\x2c\x34\x38\x0d\x0a\x09\x09\ +\x09\x43\x31\x34\x31\x2e\x36\x30\x31\x2c\x34\x38\x2c\x34\x38\x2c\ +\x31\x34\x31\x2e\x36\x30\x31\x2c\x34\x38\x2c\x32\x35\x36\x73\x39\ +\x33\x2e\x36\x30\x31\x2c\x32\x30\x38\x2c\x32\x30\x38\x2c\x32\x30\ +\x38\x73\x32\x30\x38\x2d\x39\x33\x2e\x36\x30\x31\x2c\x32\x30\x38\ +\x2d\x32\x30\x38\x53\x33\x37\x30\x2e\x33\x39\x39\x2c\x34\x38\x2c\ +\x32\x35\x36\x2c\x34\x38\x7a\x20\x4d\x32\x35\x36\x2c\x34\x32\x32\ +\x2e\x34\x0d\x0a\x09\x09\x09\x63\x2d\x39\x31\x2e\x35\x31\x38\x2c\ +\x30\x2d\x31\x36\x36\x2e\x34\x2d\x37\x34\x2e\x38\x38\x33\x2d\x31\ +\x36\x36\x2e\x34\x2d\x31\x36\x36\x2e\x34\x53\x31\x36\x34\x2e\x34\ +\x38\x32\x2c\x38\x39\x2e\x36\x2c\x32\x35\x36\x2c\x38\x39\x2e\x36\ +\x53\x34\x32\x32\x2e\x34\x2c\x31\x36\x34\x2e\x34\x38\x32\x2c\x34\ +\x32\x32\x2e\x34\x2c\x32\x35\x36\x53\x33\x34\x37\x2e\x35\x31\x38\ +\x2c\x34\x32\x32\x2e\x34\x2c\x32\x35\x36\x2c\x34\x32\x32\x2e\x34\ +\x7a\x22\x2f\x3e\x0d\x0a\x09\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x67\ +\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ +\x00\x00\x01\x69\ +\x3c\ +\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\ +\x30\x2f\x73\x76\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x35\x31\ +\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\x32\ +\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\x30\ +\x20\x35\x31\x32\x20\x35\x31\x32\x22\x3e\x3c\x67\x20\x74\x72\x61\ +\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\ +\x34\x20\x30\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x3c\ +\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x2e\x33\x34\x20\x31\x35\ +\x2e\x36\x36\x41\x37\x2e\x39\x37\x20\x37\x2e\x39\x37\x20\x30\x20\ +\x30\x20\x30\x20\x39\x20\x31\x37\x2e\x39\x34\x56\x31\x30\x48\x35\ +\x56\x38\x68\x34\x56\x35\x2e\x38\x33\x61\x33\x20\x33\x20\x30\x20\ +\x31\x20\x31\x20\x32\x20\x30\x56\x38\x68\x34\x76\x32\x68\x2d\x34\ +\x76\x37\x2e\x39\x34\x61\x37\x2e\x39\x37\x20\x37\x2e\x39\x37\x20\ +\x30\x20\x30\x20\x30\x20\x34\x2e\x36\x36\x2d\x32\x2e\x32\x38\x6c\ +\x2d\x31\x2e\x34\x32\x2d\x31\x2e\x34\x32\x68\x35\x2e\x36\x36\x6c\ +\x2d\x32\x2e\x38\x33\x20\x32\x2e\x38\x33\x61\x31\x30\x20\x31\x30\ +\x20\x30\x20\x30\x20\x31\x2d\x31\x34\x2e\x31\x34\x20\x30\x4c\x2e\ +\x31\x20\x31\x34\x2e\x32\x34\x68\x35\x2e\x36\x36\x6c\x2d\x31\x2e\ +\x34\x32\x20\x31\x2e\x34\x32\x7a\x4d\x31\x30\x20\x34\x61\x31\x20\ +\x31\x20\x30\x20\x31\x20\x30\x20\x30\x2d\x32\x20\x31\x20\x31\x20\ +\x30\x20\x30\x20\x30\x20\x30\x20\x32\x7a\x22\x2f\x3e\x3c\x2f\x67\ +\x3e\x3c\x2f\x73\x76\x67\x3e\x0a\ +\x00\x00\x02\x7d\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ +\x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ +\x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\ +\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\ +\x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\ +\x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\ +\x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\ +\x20\x20\x2d\x2d\x3e\x0d\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\ +\x20\x73\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\ +\x57\x33\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\ +\x2f\x2f\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\ +\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\ +\x73\x2f\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\ +\x67\x31\x31\x2e\x64\x74\x64\x22\x3e\x0d\x0a\x3c\x73\x76\x67\x20\ +\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\ +\x3d\x22\x4c\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\ +\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\ +\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\ +\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\ +\x39\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\ +\x20\x79\x3d\x22\x30\x70\x78\x22\x0d\x0a\x09\x20\x77\x69\x64\x74\ +\x68\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\ +\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\ +\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\ +\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\ +\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ +\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ +\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x69\x64\x3d\ +\x22\x49\x63\x6f\x6e\x5f\x38\x5f\x22\x3e\x0d\x0a\x09\x3c\x67\x3e\ +\x0d\x0a\x09\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x38\x35\ +\x2c\x32\x37\x37\x2e\x33\x37\x35\x68\x32\x35\x39\x2e\x37\x30\x34\ +\x4c\x32\x32\x35\x2e\x30\x30\x32\x2c\x33\x39\x37\x2e\x30\x37\x37\ +\x4c\x32\x35\x36\x2c\x34\x32\x37\x6c\x31\x37\x31\x2d\x31\x37\x31\ +\x4c\x32\x35\x36\x2c\x38\x35\x6c\x2d\x32\x39\x2e\x39\x32\x32\x2c\ +\x32\x39\x2e\x39\x32\x34\x6c\x31\x31\x38\x2e\x36\x32\x36\x2c\x31\ +\x31\x39\x2e\x37\x30\x31\x48\x38\x35\x56\x32\x37\x37\x2e\x33\x37\ +\x35\x7a\x22\x2f\x3e\x0d\x0a\x09\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\ +\x67\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ \x00\x00\x03\x6c\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -1100,142 +1015,26 @@ qt_resource_data = b"\ \x33\x32\x2c\x34\x38\x30\x20\x31\x34\x38\x2e\x37\x33\x37\x2c\x34\ \x34\x37\x2e\x39\x37\x39\x20\x09\x22\x2f\x3e\x0d\x0a\x3c\x2f\x67\ \x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ -\x00\x00\x04\xca\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\ -\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\ -\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x39\x2e\x32\x2e\x31\x2c\x20\ -\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\ -\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\ -\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\ -\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\ -\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\ -\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\ -\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\ -\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\ -\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\ -\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\ -\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x0a\x09\x20\x69\x64\x3d\ -\x22\x73\x76\x67\x34\x36\x31\x39\x22\x20\x69\x6e\x6b\x73\x63\x61\ -\x70\x65\x3a\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x30\x2e\x39\x31\ -\x2b\x64\x65\x76\x65\x6c\x2b\x6f\x73\x78\x6d\x65\x6e\x75\x20\x72\ -\x31\x32\x39\x31\x31\x22\x20\x73\x6f\x64\x69\x70\x6f\x64\x69\x3a\ -\x64\x6f\x63\x6e\x61\x6d\x65\x3d\x22\x74\x72\x69\x61\x6e\x67\x6c\ -\x65\x2d\x73\x74\x72\x6f\x6b\x65\x64\x2d\x31\x35\x2e\x73\x76\x67\ -\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x63\x63\x3d\x22\x68\x74\x74\x70\ -\x3a\x2f\x2f\x63\x72\x65\x61\x74\x69\x76\x65\x63\x6f\x6d\x6d\x6f\ -\x6e\x73\x2e\x6f\x72\x67\x2f\x6e\x73\x23\x22\x20\x78\x6d\x6c\x6e\ -\x73\x3a\x64\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x70\x75\x72\ -\x6c\x2e\x6f\x72\x67\x2f\x64\x63\x2f\x65\x6c\x65\x6d\x65\x6e\x74\ -\x73\x2f\x31\x2e\x31\x2f\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x69\x6e\ -\x6b\x73\x63\x61\x70\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\ -\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\x70\x65\x2e\x6f\x72\x67\x2f\ -\x6e\x61\x6d\x65\x73\x70\x61\x63\x65\x73\x2f\x69\x6e\x6b\x73\x63\ -\x61\x70\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x72\x64\x66\x3d\x22\ -\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\ -\x67\x2f\x31\x39\x39\x39\x2f\x30\x32\x2f\x32\x32\x2d\x72\x64\x66\ -\x2d\x73\x79\x6e\x74\x61\x78\x2d\x6e\x73\x23\x22\x20\x78\x6d\x6c\ -\x6e\x73\x3a\x73\x6f\x64\x69\x70\x6f\x64\x69\x3d\x22\x68\x74\x74\ -\x70\x3a\x2f\x2f\x73\x6f\x64\x69\x70\x6f\x64\x69\x2e\x73\x6f\x75\ -\x72\x63\x65\x66\x6f\x72\x67\x65\x2e\x6e\x65\x74\x2f\x44\x54\x44\ -\x2f\x73\x6f\x64\x69\x70\x6f\x64\x69\x2d\x30\x2e\x64\x74\x64\x22\ -\x20\x78\x6d\x6c\x6e\x73\x3a\x73\x76\x67\x3d\x22\x68\x74\x74\x70\ -\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\ -\x30\x30\x2f\x73\x76\x67\x22\x0a\x09\x20\x78\x6d\x6c\x6e\x73\x3d\ -\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\ -\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\ -\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\ -\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\ -\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\ -\x79\x3d\x22\x30\x70\x78\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x36\ -\x34\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x36\x34\x70\ -\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\ -\x30\x20\x31\x35\x20\x31\x35\x22\x20\x73\x74\x79\x6c\x65\x3d\x22\ -\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\ -\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x31\x35\x20\x31\x35\x3b\ -\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\ -\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x61\x74\x68\x20\x69\x64\ -\x3d\x22\x72\x65\x63\x74\x33\x33\x33\x38\x22\x20\x69\x6e\x6b\x73\ -\x63\x61\x70\x65\x3a\x63\x6f\x6e\x6e\x65\x63\x74\x6f\x72\x2d\x63\ -\x75\x72\x76\x61\x74\x75\x72\x65\x3d\x22\x30\x22\x20\x73\x6f\x64\ -\x69\x70\x6f\x64\x69\x3a\x6e\x6f\x64\x65\x74\x79\x70\x65\x73\x3d\ -\x22\x63\x63\x63\x63\x63\x63\x63\x63\x63\x63\x63\x63\x22\x20\x64\ -\x3d\x22\x4d\x37\x2e\x35\x32\x34\x33\x2c\x31\x2e\x35\x30\x30\x34\ -\x0a\x09\x43\x37\x2e\x32\x34\x32\x39\x2c\x31\x2e\x34\x39\x31\x33\ -\x2c\x36\x2e\x39\x37\x38\x37\x2c\x31\x2e\x36\x34\x32\x33\x2c\x36\ -\x2e\x38\x33\x33\x36\x2c\x31\x2e\x38\x39\x35\x32\x6c\x2d\x35\x2e\ -\x35\x2c\x39\x2e\x38\x36\x39\x32\x43\x31\x2e\x30\x32\x31\x38\x2c\ -\x31\x32\x2e\x33\x30\x37\x38\x2c\x31\x2e\x33\x39\x35\x2c\x31\x32\ -\x2e\x39\x39\x39\x39\x2c\x32\x2c\x31\x33\x68\x31\x31\x0a\x09\x63\ -\x30\x2e\x36\x30\x35\x2d\x30\x2e\x30\x30\x30\x31\x2c\x30\x2e\x39\ -\x37\x38\x32\x2d\x30\x2e\x36\x39\x32\x32\x2c\x30\x2e\x36\x36\x36\ -\x34\x2d\x31\x2e\x32\x33\x35\x35\x6c\x2d\x35\x2e\x35\x2d\x39\x2e\ -\x38\x36\x39\x32\x43\x38\x2e\x30\x33\x30\x32\x2c\x31\x2e\x36\x35\ -\x37\x39\x2c\x37\x2e\x37\x38\x38\x34\x2c\x31\x2e\x35\x30\x39\x32\ -\x2c\x37\x2e\x35\x32\x34\x33\x2c\x31\x2e\x35\x30\x30\x34\x7a\x20\ -\x4d\x37\x2e\x35\x2c\x33\x2e\x38\x39\x39\x33\x6c\x34\x2e\x31\x32\ -\x36\x37\x2c\x37\x2e\x34\x37\x30\x34\x0a\x09\x48\x33\x2e\x33\x37\ -\x33\x33\x4c\x37\x2e\x35\x2c\x33\x2e\x38\x39\x39\x33\x7a\x22\x2f\ -\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\ -\x00\x00\x01\xdd\ -\x00\ -\x00\x06\xe4\x78\x9c\xcd\x54\x4d\x6f\x9b\x40\x10\x3d\x13\x29\xff\ -\x61\xba\xb7\x4a\xec\x17\xc4\xd4\xa6\xa6\x51\xfd\x21\xcb\x52\x9a\ -\x58\x6a\xea\xaa\xa7\x0a\xc3\x16\x50\x28\x20\x58\xc0\xce\xaf\xef\ -\xee\x92\x54\x51\x95\xfa\x18\xfb\xb0\x33\xda\x79\x6f\xde\xbc\x65\ -\x24\xa6\xd7\xfb\xdf\x39\x74\xa2\x6e\xb2\xb2\x08\x10\x27\x0c\x81\ -\x28\xa2\x32\xce\x8a\x24\x40\xad\xfc\x85\xc7\xe8\xfa\xd3\xe5\xc5\ -\xf4\x1d\xc6\xb0\x12\x85\xa8\x43\x59\xd6\x3e\x7c\x8e\xcb\x9d\x80\ -\x75\x9e\xb7\x8d\x34\x25\xe0\x1e\x71\x08\xb7\xe1\xeb\x76\x05\xcb\ -\x7d\x55\xd6\x12\x36\x79\x9b\xe0\x75\x01\xc4\x14\xb7\xc3\x10\x1f\ -\x3c\xc2\x18\xcc\xda\x2c\x8f\x81\xbd\x07\xc0\xd8\xe8\x2f\xee\xe6\ -\xf7\x3f\x36\x4b\x68\xba\x04\x36\xdf\x66\x37\xeb\x39\x20\x4c\xe9\ -\x77\x77\x4e\xe9\xe2\x7e\x61\x24\x38\xe1\x94\x2e\x6f\x11\xa0\x54\ -\xca\xca\xa7\xb4\xef\x7b\xd2\xbb\xa4\xac\x13\xba\xaa\xc3\x2a\xcd\ -\xa2\x86\x2a\x22\xd5\x44\xd5\x44\x95\x18\xe7\x24\x96\x31\xd2\x33\ -\xb4\xf4\x8b\xa7\x72\x04\x59\x1c\xa0\x9b\xf0\x20\xea\x9f\xea\xa2\ -\xbe\x44\xd1\x04\xaf\x48\x3b\x8c\x31\x2d\xf5\x44\xf1\xf7\x79\x56\ -\x3c\xbc\x46\xe4\x93\xc9\x84\x1a\x54\x51\x03\xc4\xaa\x3d\x82\xc3\ -\x90\x2f\x2f\x2c\xe8\xb3\x58\xa6\x01\x1a\x71\x47\x03\xa9\xc8\x92\ -\x54\xfe\xbd\x76\x99\xe8\x67\xa5\xee\x02\x06\xaa\xa6\x0f\x82\x46\ -\x1e\x72\x11\x20\x51\x84\xbb\x5c\xe0\x5d\x18\x3d\x24\x75\xd9\x16\ -\xb1\x5f\x88\x1e\x5e\x30\x3f\x1a\x6f\x7e\x53\x85\x91\xa2\x57\xb5\ -\x68\x44\xdd\x09\xf3\xea\x44\x05\x6b\x88\xd6\xb4\x0a\x65\x0a\xea\ -\xd1\x5f\xb8\xc7\x6c\x3e\x72\x89\x1b\x31\xdb\x25\x1f\xb0\x6b\x7b\ -\x2a\xaa\xa3\x73\x8a\x47\x8c\x8c\x22\xac\x00\x9b\xe9\x22\x76\xf1\ -\x13\xdc\x0d\x10\x33\x98\xfb\xdc\xa0\x73\x6a\x00\xd3\xa2\x4b\xb6\ -\x51\xd4\x67\x6b\xe6\x3c\xea\x4f\x60\x59\xf4\x1f\x1f\xce\x78\x7c\ -\x16\x3e\xae\xb8\x77\x3a\x1f\x53\xfa\xff\x25\x39\x63\xfe\x26\xa6\ -\xcc\x9c\x23\x4b\x3a\x07\x1f\x7a\x49\x27\xf3\x71\x6c\x49\x57\x6c\ -\xf2\x26\xa6\xcc\x9c\x23\x4b\x3a\x07\x1f\x7a\x49\x27\xf3\x31\x2c\ -\xe9\x39\xaa\x7f\xb6\xca\x7f\x00\x99\x18\x96\x19\ -\x00\x00\x01\x69\ +\x00\x00\x01\x1c\ \x3c\ \x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\ \x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\ \x30\x2f\x73\x76\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x35\x31\ \x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\x32\ -\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\x30\ -\x20\x35\x31\x32\x20\x35\x31\x32\x22\x3e\x3c\x67\x20\x74\x72\x61\ -\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\ -\x34\x20\x30\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x3c\ -\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x2e\x33\x34\x20\x31\x35\ -\x2e\x36\x36\x41\x37\x2e\x39\x37\x20\x37\x2e\x39\x37\x20\x30\x20\ -\x30\x20\x30\x20\x39\x20\x31\x37\x2e\x39\x34\x56\x31\x30\x48\x35\ -\x56\x38\x68\x34\x56\x35\x2e\x38\x33\x61\x33\x20\x33\x20\x30\x20\ -\x31\x20\x31\x20\x32\x20\x30\x56\x38\x68\x34\x76\x32\x68\x2d\x34\ -\x76\x37\x2e\x39\x34\x61\x37\x2e\x39\x37\x20\x37\x2e\x39\x37\x20\ -\x30\x20\x30\x20\x30\x20\x34\x2e\x36\x36\x2d\x32\x2e\x32\x38\x6c\ -\x2d\x31\x2e\x34\x32\x2d\x31\x2e\x34\x32\x68\x35\x2e\x36\x36\x6c\ -\x2d\x32\x2e\x38\x33\x20\x32\x2e\x38\x33\x61\x31\x30\x20\x31\x30\ -\x20\x30\x20\x30\x20\x31\x2d\x31\x34\x2e\x31\x34\x20\x30\x4c\x2e\ -\x31\x20\x31\x34\x2e\x32\x34\x68\x35\x2e\x36\x36\x6c\x2d\x31\x2e\ -\x34\x32\x20\x31\x2e\x34\x32\x7a\x4d\x31\x30\x20\x34\x61\x31\x20\ -\x31\x20\x30\x20\x31\x20\x30\x20\x30\x2d\x32\x20\x31\x20\x31\x20\ -\x30\x20\x30\x20\x30\x20\x30\x20\x32\x7a\x22\x2f\x3e\x3c\x2f\x67\ -\x3e\x3c\x2f\x73\x76\x67\x3e\x0a\ +\x70\x78\x22\x0a\x20\x20\x20\x20\x20\x76\x69\x65\x77\x42\x6f\x78\ +\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x3e\x0a\ +\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\ +\x74\x72\x69\x78\x28\x34\x38\x20\x30\x20\x30\x20\x34\x38\x20\x34\ +\x38\x20\x34\x38\x29\x27\x3e\x0a\x20\x20\x3c\x70\x61\x74\x68\x20\ +\x64\x3d\x22\x4d\x30\x20\x30\x76\x32\x68\x2e\x35\x63\x30\x2d\x2e\ +\x35\x35\x2e\x34\x35\x2d\x31\x20\x31\x2d\x31\x68\x31\x2e\x35\x76\ +\x35\x2e\x35\x63\x30\x20\x2e\x32\x38\x2d\x2e\x32\x32\x2e\x35\x2d\ +\x2e\x35\x2e\x35\x68\x2d\x2e\x35\x76\x31\x68\x34\x76\x2d\x31\x68\ +\x2d\x2e\x35\x63\x2d\x2e\x32\x38\x20\x30\x2d\x2e\x35\x2d\x2e\x32\ +\x32\x2d\x2e\x35\x2d\x2e\x35\x76\x2d\x35\x2e\x35\x68\x31\x2e\x35\ +\x63\x2e\x35\x35\x20\x30\x20\x31\x20\x2e\x34\x35\x20\x31\x20\x31\ +\x68\x2e\x35\x76\x2d\x32\x68\x2d\x38\x7a\x22\x20\x2f\x3e\x0a\x3c\ +\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\ \x00\x00\x02\xc9\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -1283,13 +1082,13 @@ qt_resource_data = b"\ \x2e\x34\x2c\x32\x37\x35\x2e\x35\x20\x33\x38\x34\x2c\x32\x37\x35\ \x2e\x38\x20\x33\x38\x34\x2c\x33\x35\x32\x20\x22\x2f\x3e\x0d\x0a\ \x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ -\x00\x00\x03\xe6\ +\x00\x00\x02\xf7\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ \x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ \x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\ -\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x31\x2c\ +\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\ \x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\ \x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\ \x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\ @@ -1301,60 +1100,45 @@ qt_resource_data = b"\ \x73\x2f\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\ \x67\x31\x31\x2e\x64\x74\x64\x22\x3e\x0d\x0a\x3c\x73\x76\x67\x20\ \x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\ -\x3d\x22\x43\x68\x65\x76\x72\x6f\x6e\x5f\x63\x69\x72\x63\x6c\x65\ -\x64\x5f\x72\x69\x67\x68\x74\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\ -\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\ -\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\ -\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\ -\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\ -\x78\x6c\x69\x6e\x6b\x22\x0d\x0a\x09\x20\x78\x3d\x22\x30\x70\x78\ -\x22\x20\x79\x3d\x22\x30\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\ -\x78\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\ -\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\ -\x64\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\ -\x31\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\ -\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x74\x72\ -\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\ -\x32\x34\x20\x30\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\ -\x0d\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\x31\x2c\x31\ -\x30\x4c\x38\x2e\x36\x39\x38\x2c\x37\x2e\x34\x39\x34\x63\x2d\x30\ -\x2e\x31\x39\x36\x2d\x30\x2e\x31\x39\x38\x2d\x30\x2e\x31\x39\x36\ -\x2d\x30\x2e\x35\x31\x39\x2c\x30\x2d\x30\x2e\x37\x31\x38\x63\x30\ -\x2e\x31\x39\x36\x2d\x30\x2e\x31\x39\x37\x2c\x30\x2e\x35\x31\x35\ -\x2d\x30\x2e\x31\x39\x37\x2c\x30\x2e\x37\x31\x2c\x30\x6c\x32\x2e\ -\x38\x30\x37\x2c\x32\x2e\x38\x36\x34\x0d\x0a\x09\x63\x30\x2e\x31\ -\x39\x36\x2c\x30\x2e\x31\x39\x39\x2c\x30\x2e\x31\x39\x36\x2c\x30\ -\x2e\x35\x32\x2c\x30\x2c\x30\x2e\x37\x31\x37\x6c\x2d\x32\x2e\x38\ -\x30\x37\x2c\x32\x2e\x38\x36\x34\x63\x2d\x30\x2e\x31\x39\x35\x2c\ -\x30\x2e\x31\x39\x39\x2d\x30\x2e\x35\x31\x34\x2c\x30\x2e\x31\x39\ -\x38\x2d\x30\x2e\x37\x31\x2c\x30\x63\x2d\x30\x2e\x31\x39\x36\x2d\ -\x30\x2e\x31\x39\x37\x2d\x30\x2e\x31\x39\x36\x2d\x30\x2e\x35\x31\ -\x38\x2c\x30\x2d\x30\x2e\x37\x31\x37\x4c\x31\x31\x2c\x31\x30\x7a\ -\x20\x4d\x31\x30\x2c\x30\x2e\x34\x0d\x0a\x09\x63\x35\x2e\x33\x30\ -\x32\x2c\x30\x2c\x39\x2e\x36\x2c\x34\x2e\x32\x39\x38\x2c\x39\x2e\ -\x36\x2c\x39\x2e\x36\x63\x30\x2c\x35\x2e\x33\x30\x33\x2d\x34\x2e\ -\x32\x39\x38\x2c\x39\x2e\x36\x2d\x39\x2e\x36\x2c\x39\x2e\x36\x53\ -\x30\x2e\x34\x2c\x31\x35\x2e\x33\x30\x33\x2c\x30\x2e\x34\x2c\x31\ -\x30\x43\x30\x2e\x34\x2c\x34\x2e\x36\x39\x38\x2c\x34\x2e\x36\x39\ -\x38\x2c\x30\x2e\x34\x2c\x31\x30\x2c\x30\x2e\x34\x7a\x20\x4d\x31\ -\x30\x2c\x31\x38\x2e\x33\x35\x34\x0d\x0a\x09\x63\x34\x2e\x36\x31\ -\x33\x2c\x30\x2c\x38\x2e\x33\x35\x34\x2d\x33\x2e\x37\x34\x2c\x38\ -\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\x34\x63\x30\x2d\x34\x2e\x36\ -\x31\x34\x2d\x33\x2e\x37\x34\x31\x2d\x38\x2e\x33\x35\x34\x2d\x38\ -\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\x34\x63\x2d\x34\x2e\x36\x31\ -\x35\x2c\x30\x2d\x38\x2e\x33\x35\x34\x2c\x33\x2e\x37\x34\x2d\x38\ -\x2e\x33\x35\x34\x2c\x38\x2e\x33\x35\x34\x0d\x0a\x09\x43\x31\x2e\ -\x36\x34\x35\x2c\x31\x34\x2e\x36\x31\x34\x2c\x35\x2e\x33\x38\x35\ -\x2c\x31\x38\x2e\x33\x35\x34\x2c\x31\x30\x2c\x31\x38\x2e\x33\x35\ -\x34\x7a\x22\x2f\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\ -\x76\x67\x3e\x0d\x0a\ -\x00\x00\x02\xf2\ +\x3d\x22\x4c\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\ +\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\ +\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\ +\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\ +\x39\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\ +\x20\x79\x3d\x22\x30\x70\x78\x22\x0d\x0a\x09\x20\x77\x69\x64\x74\ +\x68\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\ +\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\ +\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x73\ +\x74\x79\x6c\x65\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\ +\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\ +\x35\x31\x32\x20\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\ +\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\ +\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x31\x37\x2e\x34\ +\x2c\x32\x32\x34\x48\x32\x38\x38\x56\x39\x34\x2e\x36\x63\x30\x2d\ +\x31\x36\x2e\x39\x2d\x31\x34\x2e\x33\x2d\x33\x30\x2e\x36\x2d\x33\ +\x32\x2d\x33\x30\x2e\x36\x63\x2d\x31\x37\x2e\x37\x2c\x30\x2d\x33\ +\x32\x2c\x31\x33\x2e\x37\x2d\x33\x32\x2c\x33\x30\x2e\x36\x56\x32\ +\x32\x34\x48\x39\x34\x2e\x36\x43\x37\x37\x2e\x37\x2c\x32\x32\x34\ +\x2c\x36\x34\x2c\x32\x33\x38\x2e\x33\x2c\x36\x34\x2c\x32\x35\x36\ +\x0d\x0a\x09\x63\x30\x2c\x31\x37\x2e\x37\x2c\x31\x33\x2e\x37\x2c\ +\x33\x32\x2c\x33\x30\x2e\x36\x2c\x33\x32\x48\x32\x32\x34\x76\x31\ +\x32\x39\x2e\x34\x63\x30\x2c\x31\x36\x2e\x39\x2c\x31\x34\x2e\x33\ +\x2c\x33\x30\x2e\x36\x2c\x33\x32\x2c\x33\x30\x2e\x36\x63\x31\x37\ +\x2e\x37\x2c\x30\x2c\x33\x32\x2d\x31\x33\x2e\x37\x2c\x33\x32\x2d\ +\x33\x30\x2e\x36\x56\x32\x38\x38\x68\x31\x32\x39\x2e\x34\x63\x31\ +\x36\x2e\x39\x2c\x30\x2c\x33\x30\x2e\x36\x2d\x31\x34\x2e\x33\x2c\ +\x33\x30\x2e\x36\x2d\x33\x32\x0d\x0a\x09\x43\x34\x34\x38\x2c\x32\ +\x33\x38\x2e\x33\x2c\x34\x33\x34\x2e\x33\x2c\x32\x32\x34\x2c\x34\ +\x31\x37\x2e\x34\x2c\x32\x32\x34\x7a\x22\x2f\x3e\x0d\x0a\x3c\x2f\ +\x73\x76\x67\x3e\x0d\x0a\ +\x00\x00\x03\xf5\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ \x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ \x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\ -\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x30\x2c\ +\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x31\x2c\ \x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\ \x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\ \x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\ @@ -1366,84 +1150,158 @@ qt_resource_data = b"\ \x73\x2f\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\ \x67\x31\x31\x2e\x64\x74\x64\x22\x3e\x0d\x0a\x3c\x73\x76\x67\x20\ \x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\ -\x3d\x22\x43\x69\x72\x63\x6c\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3d\ -\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\ -\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\ -\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\ -\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\ -\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x35\x31\x32\x70\x78\ -\x22\x20\x79\x3d\x22\x35\x31\x32\x70\x78\x22\x0d\x0a\x09\x20\x76\ -\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\ -\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\ -\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\ -\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\ -\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\ -\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\ -\x74\x72\x69\x78\x28\x32\x34\x20\x30\x20\x30\x20\x32\x34\x20\x30\ -\x20\x30\x29\x27\x3e\x0d\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\ -\x4d\x31\x30\x2c\x30\x2e\x34\x43\x34\x2e\x36\x39\x38\x2c\x30\x2e\ -\x34\x2c\x30\x2e\x34\x2c\x34\x2e\x36\x39\x38\x2c\x30\x2e\x34\x2c\ -\x31\x30\x43\x30\x2e\x34\x2c\x31\x35\x2e\x33\x30\x32\x2c\x34\x2e\ -\x36\x39\x38\x2c\x31\x39\x2e\x36\x2c\x31\x30\x2c\x31\x39\x2e\x36\ -\x63\x35\x2e\x33\x30\x31\x2c\x30\x2c\x39\x2e\x36\x2d\x34\x2e\x32\ -\x39\x38\x2c\x39\x2e\x36\x2d\x39\x2e\x36\x30\x31\x0d\x0a\x09\x43\ -\x31\x39\x2e\x36\x2c\x34\x2e\x36\x39\x38\x2c\x31\x35\x2e\x33\x30\ -\x31\x2c\x30\x2e\x34\x2c\x31\x30\x2c\x30\x2e\x34\x7a\x20\x4d\x31\ -\x30\x2c\x31\x37\x2e\x35\x39\x39\x63\x2d\x34\x2e\x31\x39\x37\x2c\ -\x30\x2d\x37\x2e\x36\x2d\x33\x2e\x34\x30\x32\x2d\x37\x2e\x36\x2d\ -\x37\x2e\x36\x53\x35\x2e\x38\x30\x32\x2c\x32\x2e\x34\x2c\x31\x30\ -\x2c\x32\x2e\x34\x63\x34\x2e\x31\x39\x37\x2c\x30\x2c\x37\x2e\x36\ -\x30\x31\x2c\x33\x2e\x34\x30\x32\x2c\x37\x2e\x36\x30\x31\x2c\x37\ -\x2e\x36\x0d\x0a\x09\x53\x31\x34\x2e\x31\x39\x37\x2c\x31\x37\x2e\ -\x35\x39\x39\x2c\x31\x30\x2c\x31\x37\x2e\x35\x39\x39\x7a\x22\x2f\ -\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\ -\x0a\ -\x00\x00\x02\xa1\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ -\x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ -\x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\ -\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x31\x2c\ -\x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\ -\x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\ -\x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\ -\x20\x20\x2d\x2d\x3e\x0d\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\ -\x20\x73\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\ -\x57\x33\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\ -\x2f\x2f\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\ -\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\ -\x73\x2f\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\ -\x67\x31\x31\x2e\x64\x74\x64\x22\x3e\x0d\x0a\x3c\x73\x76\x67\x20\ -\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\ -\x3d\x22\x53\x61\x76\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\ +\x3d\x22\x43\x68\x65\x76\x72\x6f\x6e\x5f\x63\x69\x72\x63\x6c\x65\ +\x64\x5f\x6c\x65\x66\x74\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\ \x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\ \x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\ \x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\ \x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\ -\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x35\x31\x32\x70\x78\x22\x20\ -\x79\x3d\x22\x35\x31\x32\x70\x78\x22\x0d\x0a\x09\x20\x76\x69\x65\ -\x77\x42\x6f\x78\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ -\x32\x22\x20\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\ -\x6f\x75\x6e\x64\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\ -\x32\x20\x35\x31\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\ -\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\ +\x6c\x69\x6e\x6b\x22\x0d\x0a\x09\x20\x78\x3d\x22\x30\x70\x78\x22\ +\x20\x79\x3d\x22\x30\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\ +\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\ +\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\ +\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ +\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ +\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x74\x72\x61\ +\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\ +\x34\x20\x30\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x0d\ +\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\x31\x2e\x33\x30\ +\x32\x2c\x36\x2e\x37\x37\x36\x63\x2d\x30\x2e\x31\x39\x36\x2d\x30\ +\x2e\x31\x39\x37\x2d\x30\x2e\x35\x31\x35\x2d\x30\x2e\x31\x39\x37\ +\x2d\x30\x2e\x37\x31\x2c\x30\x4c\x37\x2e\x37\x38\x35\x2c\x39\x2e\ +\x36\x34\x31\x63\x2d\x30\x2e\x31\x39\x36\x2c\x30\x2e\x31\x39\x39\ +\x2d\x30\x2e\x31\x39\x36\x2c\x30\x2e\x35\x32\x2c\x30\x2c\x30\x2e\ +\x37\x31\x37\x6c\x32\x2e\x38\x30\x37\x2c\x32\x2e\x38\x36\x34\x0d\ +\x0a\x09\x63\x30\x2e\x31\x39\x35\x2c\x30\x2e\x31\x39\x39\x2c\x30\ +\x2e\x35\x31\x34\x2c\x30\x2e\x31\x39\x38\x2c\x30\x2e\x37\x31\x2c\ +\x30\x63\x30\x2e\x31\x39\x36\x2d\x30\x2e\x31\x39\x37\x2c\x30\x2e\ +\x31\x39\x36\x2d\x30\x2e\x35\x31\x38\x2c\x30\x2d\x30\x2e\x37\x31\ +\x37\x4c\x39\x2c\x31\x30\x6c\x32\x2e\x33\x30\x32\x2d\x32\x2e\x35\ +\x30\x36\x43\x31\x31\x2e\x34\x39\x38\x2c\x37\x2e\x32\x39\x36\x2c\ +\x31\x31\x2e\x34\x39\x38\x2c\x36\x2e\x39\x37\x36\x2c\x31\x31\x2e\ +\x33\x30\x32\x2c\x36\x2e\x37\x37\x36\x7a\x0d\x0a\x09\x20\x4d\x31\ +\x30\x2c\x30\x2e\x34\x63\x2d\x35\x2e\x33\x30\x32\x2c\x30\x2d\x39\ +\x2e\x36\x2c\x34\x2e\x32\x39\x38\x2d\x39\x2e\x36\x2c\x39\x2e\x36\ +\x63\x30\x2c\x35\x2e\x33\x30\x33\x2c\x34\x2e\x32\x39\x38\x2c\x39\ +\x2e\x36\x2c\x39\x2e\x36\x2c\x39\x2e\x36\x73\x39\x2e\x36\x2d\x34\ +\x2e\x32\x39\x37\x2c\x39\x2e\x36\x2d\x39\x2e\x36\x43\x31\x39\x2e\ +\x36\x2c\x34\x2e\x36\x39\x38\x2c\x31\x35\x2e\x33\x30\x32\x2c\x30\ +\x2e\x34\x2c\x31\x30\x2c\x30\x2e\x34\x7a\x20\x4d\x31\x30\x2c\x31\ +\x38\x2e\x33\x35\x34\x0d\x0a\x09\x63\x2d\x34\x2e\x36\x31\x35\x2c\ +\x30\x2d\x38\x2e\x33\x35\x34\x2d\x33\x2e\x37\x34\x2d\x38\x2e\x33\ +\x35\x34\x2d\x38\x2e\x33\x35\x34\x63\x30\x2d\x34\x2e\x36\x31\x34\ +\x2c\x33\x2e\x37\x33\x39\x2d\x38\x2e\x33\x35\x34\x2c\x38\x2e\x33\ +\x35\x34\x2d\x38\x2e\x33\x35\x34\x63\x34\x2e\x36\x31\x33\x2c\x30\ +\x2c\x38\x2e\x33\x35\x34\x2c\x33\x2e\x37\x34\x2c\x38\x2e\x33\x35\ +\x34\x2c\x38\x2e\x33\x35\x34\x0d\x0a\x09\x43\x31\x38\x2e\x33\x35\ +\x34\x2c\x31\x34\x2e\x36\x31\x34\x2c\x31\x34\x2e\x36\x31\x33\x2c\ +\x31\x38\x2e\x33\x35\x34\x2c\x31\x30\x2c\x31\x38\x2e\x33\x35\x34\ +\x7a\x22\x2f\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\x76\ +\x67\x3e\x0d\x0a\ +\x00\x00\x04\x4e\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\ +\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\ +\x2d\x38\x27\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x54\x68\x69\x73\x20\ +\x66\x69\x6c\x65\x20\x77\x61\x73\x20\x67\x65\x6e\x65\x72\x61\x74\ +\x65\x64\x20\x62\x79\x20\x64\x76\x69\x73\x76\x67\x6d\x20\x32\x2e\ +\x38\x20\x2d\x2d\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\x73\x69\ +\x6f\x6e\x3d\x27\x31\x2e\x31\x27\x20\x78\x6d\x6c\x6e\x73\x3d\x27\ +\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\ +\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x27\x20\x78\x6d\x6c\x6e\ +\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x27\x68\x74\x74\x70\x3a\x2f\x2f\ +\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\ +\x78\x6c\x69\x6e\x6b\x27\x20\x77\x69\x64\x74\x68\x3d\x27\x36\x33\ +\x2e\x39\x39\x39\x36\x70\x74\x27\x20\x68\x65\x69\x67\x68\x74\x3d\ +\x27\x36\x33\x2e\x39\x39\x39\x37\x70\x74\x27\x20\x76\x69\x65\x77\ +\x42\x6f\x78\x3d\x27\x35\x36\x2e\x34\x30\x39\x34\x20\x35\x33\x2e\ +\x38\x35\x38\x33\x20\x36\x33\x2e\x39\x39\x39\x36\x20\x36\x33\x2e\ +\x39\x39\x39\x37\x27\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x27\x70\x61\ +\x67\x65\x31\x27\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\ +\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\ +\x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\ +\x20\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\ +\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x33\ +\x2e\x39\x35\x37\x33\x35\x20\x2d\x33\x32\x2e\x31\x32\x4c\x20\x31\ +\x31\x2e\x39\x30\x33\x36\x20\x2d\x35\x31\x2e\x33\x30\x33\x39\x4c\ +\x20\x35\x36\x2e\x31\x35\x32\x33\x20\x2d\x34\x32\x2e\x35\x30\x32\ +\x32\x4c\x20\x34\x30\x2e\x36\x37\x39\x34\x20\x2d\x32\x32\x2e\x35\ +\x32\x38\x31\x4c\x20\x33\x2e\x39\x35\x37\x33\x35\x20\x2d\x33\x32\ +\x2e\x31\x32\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\ +\x27\x20\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\ +\x30\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\ +\x70\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\ +\x2d\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\ +\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\ +\x6d\x69\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\ +\x72\x6f\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x32\x2e\x35\x30\ +\x39\x33\x37\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\ +\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\ +\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\ +\x39\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\x36\x39\x20\x31\ +\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\ +\x65\x20\x63\x78\x3d\x27\x33\x2e\x39\x35\x37\x33\x35\x27\x20\x63\ +\x79\x3d\x27\x2d\x33\x32\x2e\x31\x32\x27\x20\x66\x69\x6c\x6c\x3d\ +\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\ +\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\ +\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\ +\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\ +\x39\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\x36\x39\x20\x31\ +\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\ +\x65\x20\x63\x78\x3d\x27\x31\x31\x2e\x39\x30\x33\x36\x27\x20\x63\ +\x79\x3d\x27\x2d\x35\x31\x2e\x33\x30\x33\x39\x27\x20\x66\x69\x6c\ +\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\ +\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\ \x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\ -\x69\x78\x28\x32\x34\x20\x30\x20\x30\x20\x32\x34\x20\x30\x20\x30\ -\x29\x27\x3e\x0d\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\ -\x35\x2e\x31\x37\x33\x2c\x32\x48\x34\x43\x32\x2e\x38\x39\x39\x2c\ -\x32\x2c\x32\x2c\x32\x2e\x39\x2c\x32\x2c\x34\x76\x31\x32\x63\x30\ -\x2c\x31\x2e\x31\x2c\x30\x2e\x38\x39\x39\x2c\x32\x2c\x32\x2c\x32\ -\x68\x31\x32\x63\x31\x2e\x31\x30\x31\x2c\x30\x2c\x32\x2d\x30\x2e\ -\x39\x2c\x32\x2d\x32\x56\x35\x2e\x31\x32\x37\x4c\x31\x35\x2e\x31\ -\x37\x33\x2c\x32\x7a\x20\x4d\x31\x34\x2c\x38\x63\x30\x2c\x30\x2e\ -\x35\x34\x39\x2d\x30\x2e\x34\x35\x2c\x31\x2d\x31\x2c\x31\x48\x37\ -\x0d\x0a\x09\x43\x36\x2e\x34\x35\x2c\x39\x2c\x36\x2c\x38\x2e\x35\ -\x34\x39\x2c\x36\x2c\x38\x56\x33\x68\x38\x56\x38\x7a\x20\x4d\x31\ -\x33\x2c\x34\x68\x2d\x32\x76\x34\x68\x32\x56\x34\x7a\x22\x2f\x3e\ -\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ -\ -\x00\x00\x04\x64\ +\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\x30\x20\ +\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\x36\x39\ +\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\x69\x72\ +\x63\x6c\x65\x20\x63\x78\x3d\x27\x35\x36\x2e\x31\x35\x32\x33\x27\ +\x20\x63\x79\x3d\x27\x2d\x34\x32\x2e\x35\x30\x32\x32\x27\x20\x66\ +\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x72\x3d\ +\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\ +\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\ +\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\ +\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\ +\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\ +\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x34\x30\x2e\x36\x37\x39\ +\x34\x27\x20\x63\x79\x3d\x27\x2d\x32\x32\x2e\x35\x32\x38\x31\x27\ +\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\ +\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\ +\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\ +\x00\x00\x01\xdd\ +\x00\ +\x00\x06\xe4\x78\x9c\xcd\x54\x4d\x6f\x9b\x40\x10\x3d\x13\x29\xff\ +\x61\xba\xb7\x4a\xec\x17\xc4\xd4\xa6\xa6\x51\xfd\x21\xcb\x52\x9a\ +\x58\x6a\xea\xaa\xa7\x0a\xc3\x16\x50\x28\x20\x58\xc0\xce\xaf\xef\ +\xee\x92\x54\x51\x95\xfa\x18\xfb\xb0\x33\xda\x79\x6f\xde\xbc\x65\ +\x24\xa6\xd7\xfb\xdf\x39\x74\xa2\x6e\xb2\xb2\x08\x10\x27\x0c\x81\ +\x28\xa2\x32\xce\x8a\x24\x40\xad\xfc\x85\xc7\xe8\xfa\xd3\xe5\xc5\ +\xf4\x1d\xc6\xb0\x12\x85\xa8\x43\x59\xd6\x3e\x7c\x8e\xcb\x9d\x80\ +\x75\x9e\xb7\x8d\x34\x25\xe0\x1e\x71\x08\xb7\xe1\xeb\x76\x05\xcb\ +\x7d\x55\xd6\x12\x36\x79\x9b\xe0\x75\x01\xc4\x14\xb7\xc3\x10\x1f\ +\x3c\xc2\x18\xcc\xda\x2c\x8f\x81\xbd\x07\xc0\xd8\xe8\x2f\xee\xe6\ +\xf7\x3f\x36\x4b\x68\xba\x04\x36\xdf\x66\x37\xeb\x39\x20\x4c\xe9\ +\x77\x77\x4e\xe9\xe2\x7e\x61\x24\x38\xe1\x94\x2e\x6f\x11\xa0\x54\ +\xca\xca\xa7\xb4\xef\x7b\xd2\xbb\xa4\xac\x13\xba\xaa\xc3\x2a\xcd\ +\xa2\x86\x2a\x22\xd5\x44\xd5\x44\x95\x18\xe7\x24\x96\x31\xd2\x33\ +\xb4\xf4\x8b\xa7\x72\x04\x59\x1c\xa0\x9b\xf0\x20\xea\x9f\xea\xa2\ +\xbe\x44\xd1\x04\xaf\x48\x3b\x8c\x31\x2d\xf5\x44\xf1\xf7\x79\x56\ +\x3c\xbc\x46\xe4\x93\xc9\x84\x1a\x54\x51\x03\xc4\xaa\x3d\x82\xc3\ +\x90\x2f\x2f\x2c\xe8\xb3\x58\xa6\x01\x1a\x71\x47\x03\xa9\xc8\x92\ +\x54\xfe\xbd\x76\x99\xe8\x67\xa5\xee\x02\x06\xaa\xa6\x0f\x82\x46\ +\x1e\x72\x11\x20\x51\x84\xbb\x5c\xe0\x5d\x18\x3d\x24\x75\xd9\x16\ +\xb1\x5f\x88\x1e\x5e\x30\x3f\x1a\x6f\x7e\x53\x85\x91\xa2\x57\xb5\ +\x68\x44\xdd\x09\xf3\xea\x44\x05\x6b\x88\xd6\xb4\x0a\x65\x0a\xea\ +\xd1\x5f\xb8\xc7\x6c\x3e\x72\x89\x1b\x31\xdb\x25\x1f\xb0\x6b\x7b\ +\x2a\xaa\xa3\x73\x8a\x47\x8c\x8c\x22\xac\x00\x9b\xe9\x22\x76\xf1\ +\x13\xdc\x0d\x10\x33\x98\xfb\xdc\xa0\x73\x6a\x00\xd3\xa2\x4b\xb6\ +\x51\xd4\x67\x6b\xe6\x3c\xea\x4f\x60\x59\xf4\x1f\x1f\xce\x78\x7c\ +\x16\x3e\xae\xb8\x77\x3a\x1f\x53\xfa\xff\x25\x39\x63\xfe\x26\xa6\ +\xcc\x9c\x23\x4b\x3a\x07\x1f\x7a\x49\x27\xf3\x71\x6c\x49\x57\x6c\ +\xf2\x26\xa6\xcc\x9c\x23\x4b\x3a\x07\x1f\x7a\x49\x27\xf3\x31\x2c\ +\xe9\x39\xaa\x7f\xb6\xca\x7f\x00\x99\x18\x96\x19\ +\x00\x00\x03\x36\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ @@ -1474,49 +1332,30 @@ qt_resource_data = b"\ \x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\ \x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ \x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ -\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x69\x64\x3d\ -\x22\x49\x63\x6f\x6e\x22\x3e\x0d\x0a\x09\x3c\x67\x3e\x0d\x0a\x09\ -\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x31\ -\x37\x36\x63\x2d\x34\x34\x2e\x30\x30\x34\x2c\x30\x2d\x38\x30\x2e\ -\x30\x30\x31\x2c\x33\x36\x2d\x38\x30\x2e\x30\x30\x31\x2c\x38\x30\ -\x63\x30\x2c\x34\x34\x2e\x30\x30\x34\x2c\x33\x35\x2e\x39\x39\x37\ -\x2c\x38\x30\x2c\x38\x30\x2e\x30\x30\x31\x2c\x38\x30\x63\x34\x34\ -\x2e\x30\x30\x35\x2c\x30\x2c\x37\x39\x2e\x39\x39\x39\x2d\x33\x35\ -\x2e\x39\x39\x36\x2c\x37\x39\x2e\x39\x39\x39\x2d\x38\x30\x0d\x0a\ -\x09\x09\x09\x43\x33\x33\x35\x2e\x39\x39\x39\x2c\x32\x31\x32\x2c\ -\x33\x30\x30\x2e\x30\x30\x35\x2c\x31\x37\x36\x2c\x32\x35\x36\x2c\ -\x31\x37\x36\x7a\x20\x4d\x34\x34\x36\x2e\x39\x33\x38\x2c\x32\x33\ -\x34\x2e\x36\x36\x37\x63\x2d\x39\x2e\x36\x30\x35\x2d\x38\x38\x2e\ -\x35\x33\x31\x2d\x38\x31\x2e\x30\x37\x34\x2d\x31\x36\x30\x2d\x31\ -\x36\x39\x2e\x36\x30\x35\x2d\x31\x36\x39\x2e\x35\x39\x39\x56\x33\ -\x32\x68\x2d\x34\x32\x2e\x36\x36\x36\x76\x33\x33\x2e\x30\x36\x37\ -\x0d\x0a\x09\x09\x09\x63\x2d\x38\x38\x2e\x35\x33\x31\x2c\x39\x2e\ -\x35\x39\x39\x2d\x31\x36\x30\x2c\x38\x31\x2e\x30\x36\x38\x2d\x31\ -\x36\x39\x2e\x36\x30\x34\x2c\x31\x36\x39\x2e\x35\x39\x39\x48\x33\ -\x32\x76\x34\x32\x2e\x36\x36\x37\x68\x33\x33\x2e\x30\x36\x32\x63\ -\x39\x2e\x36\x30\x34\x2c\x38\x38\x2e\x35\x33\x31\x2c\x38\x31\x2e\ -\x30\x37\x32\x2c\x31\x36\x30\x2c\x31\x36\x39\x2e\x36\x30\x34\x2c\ -\x31\x36\x39\x2e\x36\x30\x34\x56\x34\x38\x30\x68\x34\x32\x2e\x36\ -\x36\x36\x76\x2d\x33\x33\x2e\x30\x36\x32\x0d\x0a\x09\x09\x09\x63\ -\x38\x38\x2e\x35\x33\x31\x2d\x39\x2e\x36\x30\x34\x2c\x31\x36\x30\ -\x2d\x38\x31\x2e\x30\x37\x33\x2c\x31\x36\x39\x2e\x36\x30\x35\x2d\ -\x31\x36\x39\x2e\x36\x30\x34\x48\x34\x38\x30\x76\x2d\x34\x32\x2e\ -\x36\x36\x37\x48\x34\x34\x36\x2e\x39\x33\x38\x7a\x20\x4d\x32\x35\ -\x36\x2c\x34\x30\x35\x2e\x33\x33\x33\x63\x2d\x38\x32\x2e\x31\x33\ -\x37\x2c\x30\x2d\x31\x34\x39\x2e\x33\x33\x34\x2d\x36\x37\x2e\x31\ -\x39\x38\x2d\x31\x34\x39\x2e\x33\x33\x34\x2d\x31\x34\x39\x2e\x33\ -\x33\x33\x0d\x0a\x09\x09\x09\x63\x30\x2d\x38\x32\x2e\x31\x33\x36\ -\x2c\x36\x37\x2e\x31\x39\x37\x2d\x31\x34\x39\x2e\x33\x33\x33\x2c\ -\x31\x34\x39\x2e\x33\x33\x34\x2d\x31\x34\x39\x2e\x33\x33\x33\x63\ -\x38\x32\x2e\x31\x33\x35\x2c\x30\x2c\x31\x34\x39\x2e\x33\x33\x32\ -\x2c\x36\x37\x2e\x31\x39\x38\x2c\x31\x34\x39\x2e\x33\x33\x32\x2c\ -\x31\x34\x39\x2e\x33\x33\x33\x43\x34\x30\x35\x2e\x33\x33\x32\x2c\ -\x33\x33\x38\x2e\x31\x33\x35\x2c\x33\x33\x38\x2e\x31\x33\x35\x2c\ -\x34\x30\x35\x2e\x33\x33\x33\x2c\x32\x35\x36\x2c\x34\x30\x35\x2e\ -\x33\x33\x33\x7a\x0d\x0a\x09\x09\x09\x22\x2f\x3e\x0d\x0a\x09\x3c\ -\x2f\x67\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\ -\x3e\x0d\x0a\ -\x00\x00\x04\x1c\ +\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x3e\x0d\x0a\x09\ +\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\ +\x22\x33\x39\x36\x2e\x37\x39\x35\x2c\x33\x39\x36\x2e\x38\x20\x33\ +\x32\x30\x2c\x33\x39\x36\x2e\x38\x20\x33\x32\x30\x2c\x34\x34\x38\ +\x20\x34\x34\x38\x2c\x34\x34\x38\x20\x34\x34\x38\x2c\x33\x32\x30\ +\x20\x33\x39\x36\x2e\x37\x39\x35\x2c\x33\x32\x30\x20\x09\x22\x2f\ +\x3e\x0d\x0a\x09\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\ +\x6e\x74\x73\x3d\x22\x33\x39\x36\x2e\x38\x2c\x31\x31\x35\x2e\x32\ +\x30\x35\x20\x33\x39\x36\x2e\x38\x2c\x31\x39\x32\x20\x34\x34\x38\ +\x2c\x31\x39\x32\x20\x34\x34\x38\x2c\x36\x34\x20\x33\x32\x30\x2c\ +\x36\x34\x20\x33\x32\x30\x2c\x31\x31\x35\x2e\x32\x30\x35\x20\x09\ +\x22\x2f\x3e\x0d\x0a\x09\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\ +\x6f\x69\x6e\x74\x73\x3d\x22\x31\x31\x35\x2e\x32\x30\x35\x2c\x31\ +\x31\x35\x2e\x32\x20\x31\x39\x32\x2c\x31\x31\x35\x2e\x32\x20\x31\ +\x39\x32\x2c\x36\x34\x20\x36\x34\x2c\x36\x34\x20\x36\x34\x2c\x31\ +\x39\x32\x20\x31\x31\x35\x2e\x32\x30\x35\x2c\x31\x39\x32\x20\x09\ +\x22\x2f\x3e\x0d\x0a\x09\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\ +\x6f\x69\x6e\x74\x73\x3d\x22\x31\x31\x35\x2e\x32\x2c\x33\x39\x36\ +\x2e\x37\x39\x35\x20\x31\x31\x35\x2e\x32\x2c\x33\x32\x30\x20\x36\ +\x34\x2c\x33\x32\x30\x20\x36\x34\x2c\x34\x34\x38\x20\x31\x39\x32\ +\x2c\x34\x34\x38\x20\x31\x39\x32\x2c\x33\x39\x36\x2e\x37\x39\x35\ +\x20\x09\x22\x2f\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\ +\x76\x67\x3e\x0d\x0a\ +\x00\x00\x04\xa2\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\ \x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\ @@ -1538,17 +1377,94 @@ qt_resource_data = b"\ \x67\x65\x31\x27\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\ \x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\ \x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\ -\x20\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\ -\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x32\ -\x2e\x30\x30\x37\x35\x20\x2d\x32\x2e\x30\x30\x37\x35\x4c\x20\x36\ -\x32\x2e\x32\x33\x32\x35\x20\x2d\x32\x2e\x30\x30\x37\x35\x4c\x20\ -\x36\x32\x2e\x32\x33\x32\x35\x20\x2d\x36\x32\x2e\x32\x33\x32\x35\ -\x4c\x20\x32\x2e\x30\x30\x37\x35\x20\x2d\x36\x32\x2e\x32\x33\x32\ -\x35\x4c\x20\x32\x2e\x30\x30\x37\x35\x20\x2d\x32\x2e\x30\x30\x37\ -\x35\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\ -\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\ -\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\ -\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\ +\x20\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\ +\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x33\ +\x2e\x39\x35\x37\x33\x35\x20\x2d\x33\x32\x2e\x31\x32\x43\x20\x34\ +\x2e\x31\x35\x35\x35\x36\x20\x2d\x33\x39\x2e\x32\x37\x34\x35\x20\ +\x36\x2e\x39\x38\x34\x37\x33\x20\x2d\x34\x36\x2e\x31\x30\x34\x37\ +\x20\x31\x31\x2e\x39\x30\x33\x36\x20\x2d\x35\x31\x2e\x33\x30\x33\ +\x39\x43\x20\x32\x37\x2e\x34\x34\x31\x31\x20\x2d\x36\x37\x2e\x37\ +\x32\x36\x39\x20\x35\x33\x2e\x33\x30\x32\x31\x20\x2d\x36\x31\x2e\ +\x35\x34\x30\x35\x20\x35\x36\x2e\x31\x35\x32\x33\x20\x2d\x34\x32\ +\x2e\x35\x30\x32\x32\x43\x20\x35\x37\x2e\x36\x32\x37\x20\x2d\x33\ +\x32\x2e\x36\x35\x31\x39\x20\x35\x30\x2e\x35\x38\x35\x36\x20\x2d\ +\x32\x33\x2e\x35\x36\x32\x31\x20\x34\x30\x2e\x36\x37\x39\x34\x20\ +\x2d\x32\x32\x2e\x35\x32\x38\x31\x27\x20\x66\x69\x6c\x6c\x3d\x27\ +\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\ +\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\ +\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\ +\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\ +\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\ +\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\ +\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\ +\x32\x2e\x35\x30\x39\x33\x37\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\ +\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\ +\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\ +\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\ +\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\ +\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x33\x2e\x39\x35\x37\x33\ +\x35\x27\x20\x63\x79\x3d\x27\x2d\x33\x32\x2e\x31\x32\x27\x20\x66\ +\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x72\x3d\ +\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\ +\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\ +\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\ +\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\ +\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\ +\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x31\x31\x2e\x39\x30\x33\ +\x36\x27\x20\x63\x79\x3d\x27\x2d\x35\x31\x2e\x33\x30\x33\x39\x27\ +\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\ +\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\ +\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\ +\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\ +\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x38\x2e\ +\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\ +\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x35\x36\x2e\x31\ +\x35\x32\x33\x27\x20\x63\x79\x3d\x27\x2d\x34\x32\x2e\x35\x30\x32\ +\x32\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\x30\ +\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\ +\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\ +\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\ +\x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\ +\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\ +\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x34\x30\ +\x2e\x36\x37\x39\x34\x27\x20\x63\x79\x3d\x27\x2d\x32\x32\x2e\x35\ +\x32\x38\x31\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\ +\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\ +\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\ +\x3e\ +\x00\x00\x03\x7c\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\ +\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\ +\x2d\x38\x27\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x54\x68\x69\x73\x20\ +\x66\x69\x6c\x65\x20\x77\x61\x73\x20\x67\x65\x6e\x65\x72\x61\x74\ +\x65\x64\x20\x62\x79\x20\x64\x76\x69\x73\x76\x67\x6d\x20\x32\x2e\ +\x38\x20\x2d\x2d\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\x73\x69\ +\x6f\x6e\x3d\x27\x31\x2e\x31\x27\x20\x78\x6d\x6c\x6e\x73\x3d\x27\ +\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\ +\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x27\x20\x78\x6d\x6c\x6e\ +\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x27\x68\x74\x74\x70\x3a\x2f\x2f\ +\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\ +\x78\x6c\x69\x6e\x6b\x27\x20\x77\x69\x64\x74\x68\x3d\x27\x36\x33\ +\x2e\x39\x39\x39\x36\x70\x74\x27\x20\x68\x65\x69\x67\x68\x74\x3d\ +\x27\x36\x33\x2e\x39\x39\x39\x37\x70\x74\x27\x20\x76\x69\x65\x77\ +\x42\x6f\x78\x3d\x27\x35\x36\x2e\x34\x30\x39\x34\x20\x35\x33\x2e\ +\x38\x35\x38\x33\x20\x36\x33\x2e\x39\x39\x39\x36\x20\x36\x33\x2e\ +\x39\x39\x39\x37\x27\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x27\x70\x61\ +\x67\x65\x31\x27\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\ +\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\ +\x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\ +\x20\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\ +\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x32\ +\x2e\x30\x30\x37\x35\x20\x2d\x32\x2e\x30\x30\x37\x35\x4c\x20\x36\ +\x32\x2e\x32\x33\x32\x35\x20\x2d\x32\x2e\x30\x30\x37\x35\x4c\x20\ +\x36\x32\x2e\x32\x33\x32\x35\x20\x2d\x36\x32\x2e\x32\x33\x32\x35\ +\x4c\x20\x32\x2e\x30\x30\x37\x35\x20\x2d\x36\x32\x2e\x32\x33\x32\ +\x35\x4c\x20\x32\x2e\x30\x30\x37\x35\x20\x2d\x32\x2e\x30\x30\x37\ +\x35\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\ +\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\ +\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\ +\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\ \x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\ \x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\ \x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\ @@ -1558,33 +1474,23 @@ qt_resource_data = b"\ \x39\x36\x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\ \x36\x34\x20\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\ \x35\x38\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\ -\x20\x32\x2e\x30\x30\x37\x35\x20\x2d\x33\x32\x2e\x31\x32\x4c\x20\ -\x36\x32\x2e\x32\x33\x32\x35\x20\x2d\x33\x32\x2e\x31\x32\x27\x20\ -\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\ -\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\ -\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\ -\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\ -\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\ -\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\ -\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\ -\x69\x64\x74\x68\x3d\x27\x34\x2e\x30\x31\x35\x27\x2f\x3e\x0a\x3c\ -\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\ -\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\ -\x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\ -\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\ -\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x33\x32\x2e\ -\x31\x32\x20\x2d\x32\x2e\x30\x30\x37\x35\x4c\x20\x33\x32\x2e\x31\ -\x32\x20\x2d\x36\x32\x2e\x32\x33\x32\x35\x27\x20\x66\x69\x6c\x6c\ -\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\x65\x3d\x27\ -\x23\x30\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\ -\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\ -\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\ -\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6d\ -\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\x2e\x30\x33\ -\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\x64\x74\x68\ -\x3d\x27\x34\x2e\x30\x31\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\ +\x20\x34\x37\x2e\x31\x37\x36\x32\x20\x2d\x33\x32\x2e\x31\x32\x43\ +\x20\x34\x37\x2e\x31\x37\x36\x32\x20\x2d\x34\x30\x2e\x34\x33\x35\ +\x33\x20\x34\x30\x2e\x34\x33\x35\x33\x20\x2d\x34\x37\x2e\x31\x37\ +\x36\x32\x20\x33\x32\x2e\x31\x32\x20\x2d\x34\x37\x2e\x31\x37\x36\ +\x32\x43\x20\x32\x33\x2e\x38\x30\x34\x37\x20\x2d\x34\x37\x2e\x31\ +\x37\x36\x32\x20\x31\x37\x2e\x30\x36\x33\x37\x20\x2d\x34\x30\x2e\ +\x34\x33\x35\x33\x20\x31\x37\x2e\x30\x36\x33\x37\x20\x2d\x33\x32\ +\x2e\x31\x32\x43\x20\x31\x37\x2e\x30\x36\x33\x37\x20\x2d\x32\x33\ +\x2e\x38\x30\x34\x37\x20\x32\x33\x2e\x38\x30\x34\x37\x20\x2d\x31\ +\x37\x2e\x30\x36\x33\x37\x20\x33\x32\x2e\x31\x32\x20\x2d\x31\x37\ +\x2e\x30\x36\x33\x37\x43\x20\x34\x30\x2e\x34\x33\x35\x33\x20\x2d\ +\x31\x37\x2e\x30\x36\x33\x37\x20\x34\x37\x2e\x31\x37\x36\x32\x20\ +\x2d\x32\x33\x2e\x38\x30\x34\x37\x20\x34\x37\x2e\x31\x37\x36\x32\ +\x20\x2d\x33\x32\x2e\x31\x32\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\ +\x23\x30\x30\x30\x30\x30\x30\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\ \x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\ -\x00\x00\x07\x80\ +\x00\x00\x03\x52\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ @@ -1615,222 +1521,32 @@ qt_resource_data = b"\ \x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\ \x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ \x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ -\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x3e\x0d\x0a\x09\ -\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\x39\x33\x2e\x34\x36\ -\x2c\x32\x34\x39\x2e\x30\x35\x36\x63\x33\x2e\x37\x32\x33\x2d\x30\ -\x2e\x36\x37\x2c\x37\x2e\x35\x38\x39\x2d\x31\x2e\x30\x34\x31\x2c\ -\x31\x31\x2e\x35\x38\x36\x2d\x31\x2e\x30\x34\x31\x4c\x32\x30\x31\ -\x2e\x39\x32\x34\x2c\x32\x34\x38\x68\x31\x30\x33\x2e\x38\x32\x33\ -\x63\x34\x2e\x35\x30\x33\x2c\x30\x2c\x38\x2e\x38\x30\x36\x2d\x30\ -\x2e\x36\x31\x37\x2c\x31\x32\x2e\x39\x30\x38\x2d\x31\x2e\x37\x35\ -\x34\x0d\x0a\x09\x09\x63\x31\x39\x2e\x33\x37\x2d\x35\x2e\x33\x36\ -\x33\x2c\x33\x33\x2e\x33\x34\x35\x2d\x32\x32\x2e\x35\x33\x37\x2c\ -\x33\x33\x2e\x33\x34\x35\x2d\x34\x33\x2e\x36\x36\x33\x76\x2d\x33\ -\x30\x2e\x38\x32\x32\x76\x2d\x35\x36\x2e\x34\x30\x32\x63\x30\x2d\ -\x32\x34\x2e\x38\x33\x32\x2d\x32\x31\x2e\x31\x35\x2d\x34\x33\x2e\ -\x34\x38\x34\x2d\x34\x36\x2e\x32\x38\x39\x2d\x34\x37\x2e\x36\x30\ -\x36\x0d\x0a\x09\x09\x63\x2d\x31\x35\x2e\x39\x33\x31\x2d\x32\x2e\ -\x36\x32\x34\x2d\x33\x39\x2e\x32\x35\x38\x2d\x33\x2e\x38\x32\x37\ -\x2d\x35\x35\x2e\x30\x38\x39\x2d\x33\x2e\x37\x34\x39\x63\x2d\x31\ -\x35\x2e\x38\x32\x39\x2c\x30\x2e\x30\x38\x36\x2d\x33\x30\x2e\x39\ -\x38\x31\x2c\x31\x2e\x34\x30\x34\x2d\x34\x34\x2e\x32\x37\x37\x2c\ -\x33\x2e\x37\x34\x39\x43\x31\x36\x37\x2e\x31\x34\x33\x2c\x37\x34\ -\x2e\x35\x37\x36\x2c\x31\x36\x30\x2c\x38\x38\x2e\x39\x32\x38\x2c\ -\x31\x36\x30\x2c\x31\x31\x35\x2e\x33\x35\x39\x56\x31\x34\x34\x68\ -\x39\x36\x0d\x0a\x09\x09\x76\x31\x36\x48\x31\x32\x38\x2e\x38\x32\ -\x63\x2d\x33\x35\x2e\x36\x32\x38\x2c\x30\x2d\x36\x34\x2e\x35\x33\ -\x38\x2c\x34\x32\x2e\x35\x37\x31\x2d\x36\x34\x2e\x38\x31\x33\x2c\ -\x39\x35\x2e\x32\x34\x32\x43\x36\x34\x2e\x30\x30\x35\x2c\x32\x35\ -\x35\x2e\x34\x39\x35\x2c\x36\x34\x2c\x32\x35\x35\x2e\x37\x34\x37\ -\x2c\x36\x34\x2c\x32\x35\x36\x63\x30\x2c\x39\x2e\x35\x32\x33\x2c\ -\x30\x2e\x39\x34\x2c\x31\x38\x2e\x37\x32\x2c\x32\x2e\x36\x38\x35\ -\x2c\x32\x37\x2e\x34\x30\x34\x0d\x0a\x09\x09\x43\x37\x34\x2e\x36\ -\x34\x38\x2c\x33\x32\x33\x2e\x30\x37\x2c\x39\x39\x2e\x34\x35\x31\ -\x2c\x33\x35\x32\x2c\x31\x32\x38\x2e\x38\x32\x2c\x33\x35\x32\x48\ -\x31\x34\x34\x76\x2d\x32\x2e\x36\x36\x32\x76\x2d\x34\x33\x2e\x32\ -\x37\x33\x43\x31\x34\x34\x2c\x32\x37\x39\x2e\x32\x33\x38\x2c\x31\ -\x36\x34\x2e\x31\x34\x36\x2c\x32\x35\x34\x2e\x33\x33\x32\x2c\x31\ -\x39\x33\x2e\x34\x36\x2c\x32\x34\x39\x2e\x30\x35\x36\x7a\x20\x4d\ -\x32\x30\x33\x2e\x36\x35\x36\x2c\x31\x32\x37\x2e\x30\x30\x32\x0d\ -\x0a\x09\x09\x63\x2d\x39\x2e\x35\x39\x32\x2c\x30\x2d\x31\x37\x2e\ -\x33\x38\x34\x2d\x37\x2e\x37\x38\x35\x2d\x31\x37\x2e\x33\x38\x34\ -\x2d\x31\x37\x2e\x34\x30\x33\x63\x30\x2d\x39\x2e\x36\x36\x34\x2c\ -\x37\x2e\x37\x37\x34\x2d\x31\x37\x2e\x35\x32\x2c\x31\x37\x2e\x33\ -\x38\x34\x2d\x31\x37\x2e\x35\x32\x63\x39\x2e\x35\x37\x34\x2c\x30\ -\x2c\x31\x37\x2e\x33\x39\x39\x2c\x37\x2e\x38\x35\x35\x2c\x31\x37\ -\x2e\x33\x39\x39\x2c\x31\x37\x2e\x35\x32\x0d\x0a\x09\x09\x43\x32\ -\x32\x31\x2e\x30\x35\x36\x2c\x31\x31\x39\x2e\x32\x31\x37\x2c\x32\ -\x31\x33\x2e\x32\x34\x36\x2c\x31\x32\x37\x2e\x30\x30\x32\x2c\x32\ -\x30\x33\x2e\x36\x35\x36\x2c\x31\x32\x37\x2e\x30\x30\x32\x7a\x22\ -\x2f\x3e\x0d\x0a\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\ -\x34\x33\x2e\x39\x35\x31\x2c\x32\x32\x32\x2e\x35\x34\x33\x43\x34\ -\x33\x34\x2e\x37\x38\x2c\x31\x38\x36\x2e\x30\x32\x31\x2c\x34\x31\ -\x31\x2e\x30\x33\x33\x2c\x31\x36\x30\x2c\x33\x38\x33\x2e\x31\x38\ -\x2c\x31\x36\x30\x48\x33\x36\x38\x76\x32\x2e\x36\x32\x36\x76\x33\ -\x38\x2e\x30\x34\x36\x63\x30\x2c\x33\x33\x2e\x39\x31\x35\x2d\x32\ -\x32\x2e\x32\x38\x36\x2c\x35\x38\x2e\x34\x37\x34\x2d\x34\x39\x2e\ -\x34\x38\x39\x2c\x36\x32\x2e\x36\x38\x31\x0d\x0a\x09\x09\x63\x2d\ -\x32\x2e\x37\x33\x37\x2c\x30\x2e\x34\x32\x34\x2d\x35\x2e\x34\x38\ -\x33\x2c\x30\x2e\x36\x34\x36\x2d\x38\x2e\x33\x30\x31\x2c\x30\x2e\ -\x36\x34\x36\x48\x32\x30\x36\x2e\x33\x35\x31\x63\x2d\x34\x2e\x35\ -\x31\x38\x2c\x30\x2d\x38\x2e\x39\x30\x34\x2c\x30\x2e\x35\x38\x34\ -\x2d\x31\x33\x2e\x30\x34\x39\x2c\x31\x2e\x36\x37\x32\x43\x31\x37\ -\x34\x2e\x31\x38\x2c\x32\x37\x30\x2e\x36\x38\x39\x2c\x31\x36\x30\ -\x2c\x32\x38\x36\x2e\x36\x2c\x31\x36\x30\x2c\x33\x30\x37\x2e\x32\ -\x33\x36\x76\x33\x32\x2e\x39\x32\x32\x0d\x0a\x09\x09\x76\x35\x34\ -\x2e\x33\x30\x35\x63\x30\x2c\x32\x34\x2e\x38\x33\x32\x2c\x32\x34\ -\x2e\x39\x37\x37\x2c\x33\x39\x2e\x34\x32\x36\x2c\x34\x39\x2e\x34\ -\x38\x31\x2c\x34\x36\x2e\x35\x35\x31\x63\x32\x39\x2e\x33\x32\x37\ -\x2c\x38\x2e\x35\x33\x31\x2c\x36\x31\x2e\x32\x36\x37\x2c\x31\x30\ -\x2e\x30\x36\x38\x2c\x39\x36\x2e\x33\x36\x36\x2c\x30\x43\x33\x32\ -\x39\x2e\x31\x35\x2c\x34\x33\x34\x2e\x33\x35\x34\x2c\x33\x35\x32\ -\x2c\x34\x32\x30\x2e\x38\x39\x33\x2c\x33\x35\x32\x2c\x33\x39\x34\ -\x2e\x34\x36\x33\x56\x33\x36\x38\x0d\x0a\x09\x09\x68\x2d\x39\x36\ -\x76\x2d\x31\x36\x68\x31\x32\x37\x2e\x31\x38\x63\x32\x35\x2e\x32\ -\x34\x2c\x30\x2c\x34\x37\x2e\x31\x30\x37\x2d\x32\x31\x2e\x33\x36\ -\x35\x2c\x35\x37\x2e\x38\x31\x34\x2d\x35\x32\x2e\x35\x34\x39\x43\ -\x34\x34\x35\x2e\x34\x37\x34\x2c\x32\x38\x36\x2e\x34\x30\x34\x2c\ -\x34\x34\x38\x2c\x32\x37\x31\x2e\x36\x34\x31\x2c\x34\x34\x38\x2c\ -\x32\x35\x36\x0d\x0a\x09\x09\x43\x34\x34\x38\x2c\x32\x34\x34\x2e\ -\x32\x33\x32\x2c\x34\x34\x36\x2e\x35\x36\x37\x2c\x32\x33\x32\x2e\ -\x39\x36\x32\x2c\x34\x34\x33\x2e\x39\x35\x31\x2c\x32\x32\x32\x2e\ -\x35\x34\x33\x7a\x20\x4d\x33\x30\x37\x2e\x38\x36\x37\x2c\x33\x38\ -\x32\x2e\x38\x32\x63\x39\x2e\x35\x39\x2c\x30\x2c\x31\x37\x2e\x33\ -\x38\x31\x2c\x37\x2e\x37\x38\x35\x2c\x31\x37\x2e\x33\x38\x31\x2c\ -\x31\x37\x2e\x34\x0d\x0a\x09\x09\x63\x30\x2c\x39\x2e\x36\x35\x2d\ -\x37\x2e\x37\x39\x31\x2c\x31\x37\x2e\x35\x32\x31\x2d\x31\x37\x2e\ -\x33\x38\x31\x2c\x31\x37\x2e\x35\x32\x31\x63\x2d\x39\x2e\x35\x37\ -\x37\x2c\x30\x2d\x31\x37\x2e\x33\x39\x39\x2d\x37\x2e\x38\x37\x31\ -\x2d\x31\x37\x2e\x33\x39\x39\x2d\x31\x37\x2e\x35\x32\x31\x43\x32\ -\x39\x30\x2e\x34\x36\x38\x2c\x33\x39\x30\x2e\x35\x39\x2c\x32\x39\ -\x38\x2e\x32\x37\x34\x2c\x33\x38\x32\x2e\x38\x32\x2c\x33\x30\x37\ -\x2e\x38\x36\x37\x2c\x33\x38\x32\x2e\x38\x32\x7a\x22\x2f\x3e\x0d\ -\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ -\x00\x00\x00\x6c\ -\x3c\ -\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\ -\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\ -\x30\x2f\x73\x76\x67\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\ -\x30\x20\x30\x20\x32\x30\x20\x32\x30\x22\x3e\x3c\x70\x61\x74\x68\ -\x20\x64\x3d\x22\x4d\x31\x38\x20\x31\x32\x76\x31\x48\x38\x76\x35\ -\x6c\x2d\x36\x2d\x36\x20\x36\x2d\x36\x76\x35\x68\x38\x56\x32\x68\ -\x32\x7a\x22\x2f\x3e\x3c\x2f\x73\x76\x67\x3e\ -\x00\x00\x03\xeb\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ -\x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ -\x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\ -\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\ -\x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\ -\x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\ -\x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\ -\x20\x20\x2d\x2d\x3e\x0d\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\ -\x20\x73\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\ -\x57\x33\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\ -\x2f\x2f\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\ -\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\ -\x73\x2f\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\ -\x67\x31\x31\x2e\x64\x74\x64\x22\x3e\x0d\x0a\x3c\x73\x76\x67\x20\ -\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\ -\x3d\x22\x4c\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\ -\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\ -\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\ -\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\ -\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\ -\x39\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\ -\x20\x79\x3d\x22\x30\x70\x78\x22\x0d\x0a\x09\x20\x77\x69\x64\x74\ -\x68\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\ -\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\ -\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x73\ -\x74\x79\x6c\x65\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\ -\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\ -\x35\x31\x32\x20\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\ -\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\ -\x0a\x3c\x67\x3e\x0d\x0a\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\ -\x4d\x32\x35\x36\x2c\x31\x32\x38\x63\x2d\x38\x31\x2e\x39\x2c\x30\ -\x2d\x31\x34\x35\x2e\x37\x2c\x34\x38\x2e\x38\x2d\x32\x32\x34\x2c\ -\x31\x32\x38\x63\x36\x37\x2e\x34\x2c\x36\x37\x2e\x37\x2c\x31\x32\ -\x34\x2c\x31\x32\x38\x2c\x32\x32\x34\x2c\x31\x32\x38\x63\x39\x39\ -\x2e\x39\x2c\x30\x2c\x31\x37\x33\x2e\x34\x2d\x37\x36\x2e\x34\x2c\ -\x32\x32\x34\x2d\x31\x32\x36\x2e\x36\x0d\x0a\x09\x09\x43\x34\x32\ -\x38\x2e\x32\x2c\x31\x39\x38\x2e\x36\x2c\x33\x35\x34\x2e\x38\x2c\ -\x31\x32\x38\x2c\x32\x35\x36\x2c\x31\x32\x38\x7a\x20\x4d\x32\x35\ -\x36\x2c\x33\x34\x37\x2e\x33\x63\x2d\x34\x39\x2e\x34\x2c\x30\x2d\ -\x38\x39\x2e\x36\x2d\x34\x31\x2d\x38\x39\x2e\x36\x2d\x39\x31\x2e\ -\x33\x63\x30\x2d\x35\x30\x2e\x34\x2c\x34\x30\x2e\x32\x2d\x39\x31\ -\x2e\x33\x2c\x38\x39\x2e\x36\x2d\x39\x31\x2e\x33\x73\x38\x39\x2e\ -\x36\x2c\x34\x31\x2c\x38\x39\x2e\x36\x2c\x39\x31\x2e\x33\x0d\x0a\ -\x09\x09\x43\x33\x34\x35\x2e\x36\x2c\x33\x30\x36\x2e\x34\x2c\x33\ -\x30\x35\x2e\x34\x2c\x33\x34\x37\x2e\x33\x2c\x32\x35\x36\x2c\x33\ -\x34\x37\x2e\x33\x7a\x22\x2f\x3e\x0d\x0a\x09\x3c\x67\x3e\x0d\x0a\ -\x09\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\ -\x32\x32\x34\x63\x30\x2d\x37\x2e\x39\x2c\x32\x2e\x39\x2d\x31\x35\ -\x2e\x31\x2c\x37\x2e\x36\x2d\x32\x30\x2e\x37\x63\x2d\x32\x2e\x35\ -\x2d\x30\x2e\x34\x2d\x35\x2d\x30\x2e\x36\x2d\x37\x2e\x36\x2d\x30\ -\x2e\x36\x63\x2d\x32\x38\x2e\x38\x2c\x30\x2d\x35\x32\x2e\x33\x2c\ -\x32\x33\x2e\x39\x2d\x35\x32\x2e\x33\x2c\x35\x33\x2e\x33\x63\x30\ -\x2c\x32\x39\x2e\x34\x2c\x32\x33\x2e\x35\x2c\x35\x33\x2e\x33\x2c\ -\x35\x32\x2e\x33\x2c\x35\x33\x2e\x33\x0d\x0a\x09\x09\x09\x73\x35\ -\x32\x2e\x33\x2d\x32\x33\x2e\x39\x2c\x35\x32\x2e\x33\x2d\x35\x33\ -\x2e\x33\x63\x30\x2d\x32\x2e\x33\x2d\x30\x2e\x32\x2d\x34\x2e\x36\ -\x2d\x30\x2e\x34\x2d\x36\x2e\x39\x63\x2d\x35\x2e\x35\x2c\x34\x2e\ -\x33\x2d\x31\x32\x2e\x33\x2c\x36\x2e\x39\x2d\x31\x39\x2e\x38\x2c\ -\x36\x2e\x39\x43\x32\x37\x30\x2e\x33\x2c\x32\x35\x36\x2c\x32\x35\ -\x36\x2c\x32\x34\x31\x2e\x37\x2c\x32\x35\x36\x2c\x32\x32\x34\x7a\ -\x22\x2f\x3e\x0d\x0a\x09\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x67\x3e\ -\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ -\x00\x00\x02\xfc\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ -\x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ -\x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\ -\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\ -\x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\ -\x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\ -\x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\ -\x20\x20\x2d\x2d\x3e\x0d\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\ -\x20\x73\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\ -\x57\x33\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\ -\x2f\x2f\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\ -\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\ -\x73\x2f\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\ -\x67\x31\x31\x2e\x64\x74\x64\x22\x3e\x0d\x0a\x3c\x73\x76\x67\x20\ -\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\ -\x3d\x22\x4c\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\ -\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\ -\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\ -\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\ -\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\ -\x39\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\ -\x20\x79\x3d\x22\x30\x70\x78\x22\x0d\x0a\x09\x20\x77\x69\x64\x74\ -\x68\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\ -\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\ -\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\ -\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\ -\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ -\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ -\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x69\x64\x3d\ -\x22\x49\x63\x6f\x6e\x5f\x32\x30\x5f\x22\x3e\x0d\x0a\x09\x3c\x67\ -\x3e\x0d\x0a\x09\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\ -\x35\x36\x2c\x34\x38\x43\x31\x34\x31\x2e\x36\x30\x31\x2c\x34\x38\ -\x2c\x34\x38\x2c\x31\x34\x31\x2e\x36\x30\x31\x2c\x34\x38\x2c\x32\ -\x35\x36\x73\x39\x33\x2e\x36\x30\x31\x2c\x32\x30\x38\x2c\x32\x30\ -\x38\x2c\x32\x30\x38\x73\x32\x30\x38\x2d\x39\x33\x2e\x36\x30\x31\ -\x2c\x32\x30\x38\x2d\x32\x30\x38\x53\x33\x37\x30\x2e\x33\x39\x39\ -\x2c\x34\x38\x2c\x32\x35\x36\x2c\x34\x38\x7a\x20\x4d\x32\x35\x36\ -\x2c\x34\x32\x32\x2e\x33\x39\x39\x0d\x0a\x09\x09\x09\x63\x2d\x39\ -\x31\x2e\x35\x31\x38\x2c\x30\x2d\x31\x36\x36\x2e\x33\x39\x39\x2d\ -\x37\x34\x2e\x38\x38\x32\x2d\x31\x36\x36\x2e\x33\x39\x39\x2d\x31\ -\x36\x36\x2e\x33\x39\x39\x53\x31\x36\x34\x2e\x34\x38\x32\x2c\x38\ -\x39\x2e\x36\x2c\x32\x35\x36\x2c\x38\x39\x2e\x36\x53\x34\x32\x32\ -\x2e\x34\x2c\x31\x36\x34\x2e\x34\x38\x32\x2c\x34\x32\x32\x2e\x34\ -\x2c\x32\x35\x36\x53\x33\x34\x37\x2e\x35\x31\x38\x2c\x34\x32\x32\ -\x2e\x33\x39\x39\x2c\x32\x35\x36\x2c\x34\x32\x32\x2e\x33\x39\x39\ -\x7a\x22\x2f\x3e\x0d\x0a\x09\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x67\ -\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ -\x00\x00\x04\x3d\ +\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x70\x61\x74\x68\x20\ +\x64\x3d\x22\x4d\x34\x33\x37\x2e\x33\x33\x34\x2c\x31\x34\x34\x48\ +\x32\x35\x36\x2e\x30\x30\x36\x6c\x2d\x34\x32\x2e\x36\x36\x38\x2d\ +\x34\x38\x48\x37\x34\x2e\x36\x36\x36\x43\x35\x31\x2e\x31\x39\x37\ +\x2c\x39\x36\x2c\x33\x32\x2c\x31\x31\x35\x2e\x31\x39\x38\x2c\x33\ +\x32\x2c\x31\x33\x38\x2e\x36\x36\x37\x76\x32\x33\x34\x2e\x36\x36\ +\x36\x43\x33\x32\x2c\x33\x39\x36\x2e\x38\x30\x32\x2c\x35\x31\x2e\ +\x31\x39\x37\x2c\x34\x31\x36\x2c\x37\x34\x2e\x36\x36\x36\x2c\x34\ +\x31\x36\x68\x33\x36\x32\x2e\x36\x36\x38\x0d\x0a\x09\x43\x34\x36\ +\x30\x2e\x38\x30\x33\x2c\x34\x31\x36\x2c\x34\x38\x30\x2c\x33\x39\ +\x36\x2e\x38\x30\x32\x2c\x34\x38\x30\x2c\x33\x37\x33\x2e\x33\x33\ +\x33\x56\x31\x38\x36\x2e\x36\x36\x37\x43\x34\x38\x30\x2c\x31\x36\ +\x33\x2e\x31\x39\x38\x2c\x34\x36\x30\x2e\x38\x30\x33\x2c\x31\x34\ +\x34\x2c\x34\x33\x37\x2e\x33\x33\x34\x2c\x31\x34\x34\x7a\x20\x4d\ +\x34\x34\x38\x2c\x33\x37\x33\x2e\x33\x33\x33\x0d\x0a\x09\x63\x30\ +\x2c\x35\x2e\x37\x38\x32\x2d\x34\x2e\x38\x38\x35\x2c\x31\x30\x2e\ +\x36\x36\x37\x2d\x31\x30\x2e\x36\x36\x36\x2c\x31\x30\x2e\x36\x36\ +\x37\x48\x37\x34\x2e\x36\x36\x36\x43\x36\x38\x2e\x38\x38\x34\x2c\ +\x33\x38\x34\x2c\x36\x34\x2c\x33\x37\x39\x2e\x31\x31\x35\x2c\x36\ +\x34\x2c\x33\x37\x33\x2e\x33\x33\x33\x56\x31\x37\x36\x68\x33\x37\ +\x33\x2e\x33\x33\x34\x63\x35\x2e\x37\x38\x31\x2c\x30\x2c\x31\x30\ +\x2e\x36\x36\x36\x2c\x34\x2e\x38\x38\x35\x2c\x31\x30\x2e\x36\x36\ +\x36\x2c\x31\x30\x2e\x36\x36\x37\x0d\x0a\x09\x56\x33\x37\x33\x2e\ +\x33\x33\x33\x7a\x22\x2f\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\ +\x0a\ +\x00\x00\x04\xd5\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\ \x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\ @@ -1854,53 +1570,63 @@ qt_resource_data = b"\ \x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\ \x20\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\ \x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x33\ -\x2e\x39\x35\x37\x33\x35\x20\x2d\x33\x32\x2e\x31\x32\x4c\x20\x31\ -\x31\x2e\x39\x30\x33\x36\x20\x2d\x35\x31\x2e\x33\x30\x33\x39\x4c\ -\x20\x35\x36\x2e\x31\x35\x32\x33\x20\x2d\x34\x32\x2e\x35\x30\x32\ -\x32\x4c\x20\x34\x30\x2e\x36\x37\x39\x34\x20\x2d\x32\x32\x2e\x35\ -\x32\x38\x31\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\ -\x20\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\ -\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\ +\x2e\x39\x35\x37\x33\x35\x20\x2d\x33\x32\x2e\x31\x32\x43\x20\x32\ +\x2e\x32\x38\x39\x32\x32\x20\x2d\x33\x39\x2e\x33\x31\x31\x33\x20\ +\x36\x2e\x33\x36\x37\x30\x32\x20\x2d\x34\x36\x2e\x32\x33\x38\x36\ +\x20\x31\x31\x2e\x39\x30\x33\x36\x20\x2d\x35\x31\x2e\x33\x30\x33\ +\x39\x43\x20\x32\x39\x2e\x36\x36\x38\x37\x20\x2d\x36\x37\x2e\x35\ +\x35\x36\x38\x20\x35\x35\x2e\x32\x32\x39\x32\x20\x2d\x36\x30\x2e\ +\x36\x34\x32\x20\x35\x36\x2e\x31\x35\x32\x33\x20\x2d\x34\x32\x2e\ +\x35\x30\x32\x32\x43\x20\x35\x36\x2e\x36\x31\x33\x36\x20\x2d\x33\ +\x33\x2e\x34\x33\x38\x31\x20\x34\x39\x2e\x31\x31\x33\x32\x20\x2d\ +\x32\x36\x2e\x35\x39\x35\x39\x20\x34\x30\x2e\x36\x37\x39\x34\x20\ +\x2d\x32\x32\x2e\x35\x32\x38\x31\x43\x20\x32\x35\x2e\x33\x39\x39\ +\x35\x20\x2d\x31\x35\x2e\x31\x35\x38\x32\x20\x37\x2e\x31\x39\x39\ +\x33\x35\x20\x2d\x31\x38\x2e\x31\x34\x33\x36\x20\x33\x2e\x39\x35\ +\x37\x33\x35\x20\x2d\x33\x32\x2e\x31\x32\x5a\x27\x20\x66\x69\x6c\ +\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\x65\x3d\ +\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\x6b\x65\ +\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\x64\x27\ +\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\ \x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\ -\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\ -\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\ -\x69\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\ -\x6f\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x32\x2e\x35\x30\x39\ -\x33\x37\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\ -\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\ -\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\ -\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\ -\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\ -\x20\x63\x78\x3d\x27\x33\x2e\x39\x35\x37\x33\x35\x27\x20\x63\x79\ -\x3d\x27\x2d\x33\x32\x2e\x31\x32\x27\x20\x66\x69\x6c\x6c\x3d\x27\ -\x23\x30\x30\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\ -\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\ -\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\ -\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\ -\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\ -\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\ -\x20\x63\x78\x3d\x27\x31\x31\x2e\x39\x30\x33\x36\x27\x20\x63\x79\ -\x3d\x27\x2d\x35\x31\x2e\x33\x30\x33\x39\x27\x20\x66\x69\x6c\x6c\ -\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\ -\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\ -\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\ -\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\x30\x20\x30\ -\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\x36\x39\x20\ -\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\ -\x6c\x65\x20\x63\x78\x3d\x27\x35\x36\x2e\x31\x35\x32\x33\x27\x20\ -\x63\x79\x3d\x27\x2d\x34\x32\x2e\x35\x30\x32\x32\x27\x20\x66\x69\ -\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x72\x3d\x27\ -\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\ -\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\ -\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\x30\ -\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\x36\ -\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\x69\ -\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x34\x30\x2e\x36\x37\x39\x34\ -\x27\x20\x63\x79\x3d\x27\x2d\x32\x32\x2e\x35\x32\x38\x31\x27\x20\ -\x66\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x72\ -\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\ -\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\ -\x00\x00\x04\xa2\ +\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\x2e\x30\ +\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\x64\x74\ +\x68\x3d\x27\x32\x2e\x35\x30\x39\x33\x37\x27\x2f\x3e\x0a\x3c\x2f\ +\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\ +\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\ +\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x38\ +\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\ +\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x33\x2e\x39\ +\x35\x37\x33\x35\x27\x20\x63\x79\x3d\x27\x2d\x33\x32\x2e\x31\x32\ +\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\ +\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\ +\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\ +\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\ +\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x38\ +\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\ +\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x31\x31\x2e\ +\x39\x30\x33\x36\x27\x20\x63\x79\x3d\x27\x2d\x35\x31\x2e\x33\x30\ +\x33\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\ +\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\ +\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\ +\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\ +\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\ +\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\ +\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x35\ +\x36\x2e\x31\x35\x32\x33\x27\x20\x63\x79\x3d\x27\x2d\x34\x32\x2e\ +\x35\x30\x32\x32\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\ +\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\ +\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\ +\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\ +\x36\x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\ +\x34\x20\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\ +\x38\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\ +\x27\x34\x30\x2e\x36\x37\x39\x34\x27\x20\x63\x79\x3d\x27\x2d\x32\ +\x32\x2e\x35\x32\x38\x31\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\ +\x30\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\ +\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\ +\x73\x76\x67\x3e\ +\x00\x00\x04\x1c\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\ \x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\ @@ -1922,82 +1648,417 @@ qt_resource_data = b"\ \x67\x65\x31\x27\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\ \x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\ \x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\ -\x20\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\ -\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x33\ -\x2e\x39\x35\x37\x33\x35\x20\x2d\x33\x32\x2e\x31\x32\x43\x20\x34\ -\x2e\x31\x35\x35\x35\x36\x20\x2d\x33\x39\x2e\x32\x37\x34\x35\x20\ -\x36\x2e\x39\x38\x34\x37\x33\x20\x2d\x34\x36\x2e\x31\x30\x34\x37\ -\x20\x31\x31\x2e\x39\x30\x33\x36\x20\x2d\x35\x31\x2e\x33\x30\x33\ -\x39\x43\x20\x32\x37\x2e\x34\x34\x31\x31\x20\x2d\x36\x37\x2e\x37\ -\x32\x36\x39\x20\x35\x33\x2e\x33\x30\x32\x31\x20\x2d\x36\x31\x2e\ -\x35\x34\x30\x35\x20\x35\x36\x2e\x31\x35\x32\x33\x20\x2d\x34\x32\ -\x2e\x35\x30\x32\x32\x43\x20\x35\x37\x2e\x36\x32\x37\x20\x2d\x33\ -\x32\x2e\x36\x35\x31\x39\x20\x35\x30\x2e\x35\x38\x35\x36\x20\x2d\ -\x32\x33\x2e\x35\x36\x32\x31\x20\x34\x30\x2e\x36\x37\x39\x34\x20\ -\x2d\x32\x32\x2e\x35\x32\x38\x31\x27\x20\x66\x69\x6c\x6c\x3d\x27\ -\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\ -\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\ -\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\ -\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\ -\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\ -\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\ -\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\ -\x32\x2e\x35\x30\x39\x33\x37\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\ -\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\ -\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\ -\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\ -\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\ -\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x33\x2e\x39\x35\x37\x33\ -\x35\x27\x20\x63\x79\x3d\x27\x2d\x33\x32\x2e\x31\x32\x27\x20\x66\ -\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x72\x3d\ -\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\ -\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\ -\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\ -\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\ -\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\ -\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x31\x31\x2e\x39\x30\x33\ -\x36\x27\x20\x63\x79\x3d\x27\x2d\x35\x31\x2e\x33\x30\x33\x39\x27\ -\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\ -\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\ -\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\ -\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\ -\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x38\x2e\ -\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\ -\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x35\x36\x2e\x31\ -\x35\x32\x33\x27\x20\x63\x79\x3d\x27\x2d\x34\x32\x2e\x35\x30\x32\ -\x32\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\x30\ -\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\ +\x20\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\ +\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x32\ +\x2e\x30\x30\x37\x35\x20\x2d\x32\x2e\x30\x30\x37\x35\x4c\x20\x36\ +\x32\x2e\x32\x33\x32\x35\x20\x2d\x32\x2e\x30\x30\x37\x35\x4c\x20\ +\x36\x32\x2e\x32\x33\x32\x35\x20\x2d\x36\x32\x2e\x32\x33\x32\x35\ +\x4c\x20\x32\x2e\x30\x30\x37\x35\x20\x2d\x36\x32\x2e\x32\x33\x32\ +\x35\x4c\x20\x32\x2e\x30\x30\x37\x35\x20\x2d\x32\x2e\x30\x30\x37\ +\x35\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\ +\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\ +\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\ +\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\ +\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\ +\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\ +\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\ +\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x34\x2e\x30\x31\x35\x27\ +\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\ +\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\ +\x39\x36\x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\ +\x36\x34\x20\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\ +\x35\x38\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\ +\x20\x32\x2e\x30\x30\x37\x35\x20\x2d\x33\x32\x2e\x31\x32\x4c\x20\ +\x36\x32\x2e\x32\x33\x32\x35\x20\x2d\x33\x32\x2e\x31\x32\x27\x20\ +\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\ +\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\ +\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\ +\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\ +\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\ +\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\ +\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\ +\x69\x64\x74\x68\x3d\x27\x34\x2e\x30\x31\x35\x27\x2f\x3e\x0a\x3c\ \x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\ \x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\ \x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\ -\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\ -\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x34\x30\ -\x2e\x36\x37\x39\x34\x27\x20\x63\x79\x3d\x27\x2d\x32\x32\x2e\x35\ -\x32\x38\x31\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\ -\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\ -\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\ -\x3e\ -\x00\x00\x01\x1c\ +\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\ +\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x33\x32\x2e\ +\x31\x32\x20\x2d\x32\x2e\x30\x30\x37\x35\x4c\x20\x33\x32\x2e\x31\ +\x32\x20\x2d\x36\x32\x2e\x32\x33\x32\x35\x27\x20\x66\x69\x6c\x6c\ +\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\x65\x3d\x27\ +\x23\x30\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\ +\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\ +\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\ +\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6d\ +\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\x2e\x30\x33\ +\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\x64\x74\x68\ +\x3d\x27\x34\x2e\x30\x31\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\ +\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\ +\x00\x00\x07\x80\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ +\x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ +\x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\ +\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\ +\x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\ +\x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\ +\x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\ +\x20\x20\x2d\x2d\x3e\x0d\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\ +\x20\x73\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\ +\x57\x33\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\ +\x2f\x2f\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\ +\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\ +\x73\x2f\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\ +\x67\x31\x31\x2e\x64\x74\x64\x22\x3e\x0d\x0a\x3c\x73\x76\x67\x20\ +\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\ +\x3d\x22\x4c\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\ +\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\ +\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\ +\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\ +\x39\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\ +\x20\x79\x3d\x22\x30\x70\x78\x22\x0d\x0a\x09\x20\x77\x69\x64\x74\ +\x68\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\ +\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\ +\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\ +\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\ +\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ +\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ +\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x3e\x0d\x0a\x09\ +\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\x39\x33\x2e\x34\x36\ +\x2c\x32\x34\x39\x2e\x30\x35\x36\x63\x33\x2e\x37\x32\x33\x2d\x30\ +\x2e\x36\x37\x2c\x37\x2e\x35\x38\x39\x2d\x31\x2e\x30\x34\x31\x2c\ +\x31\x31\x2e\x35\x38\x36\x2d\x31\x2e\x30\x34\x31\x4c\x32\x30\x31\ +\x2e\x39\x32\x34\x2c\x32\x34\x38\x68\x31\x30\x33\x2e\x38\x32\x33\ +\x63\x34\x2e\x35\x30\x33\x2c\x30\x2c\x38\x2e\x38\x30\x36\x2d\x30\ +\x2e\x36\x31\x37\x2c\x31\x32\x2e\x39\x30\x38\x2d\x31\x2e\x37\x35\ +\x34\x0d\x0a\x09\x09\x63\x31\x39\x2e\x33\x37\x2d\x35\x2e\x33\x36\ +\x33\x2c\x33\x33\x2e\x33\x34\x35\x2d\x32\x32\x2e\x35\x33\x37\x2c\ +\x33\x33\x2e\x33\x34\x35\x2d\x34\x33\x2e\x36\x36\x33\x76\x2d\x33\ +\x30\x2e\x38\x32\x32\x76\x2d\x35\x36\x2e\x34\x30\x32\x63\x30\x2d\ +\x32\x34\x2e\x38\x33\x32\x2d\x32\x31\x2e\x31\x35\x2d\x34\x33\x2e\ +\x34\x38\x34\x2d\x34\x36\x2e\x32\x38\x39\x2d\x34\x37\x2e\x36\x30\ +\x36\x0d\x0a\x09\x09\x63\x2d\x31\x35\x2e\x39\x33\x31\x2d\x32\x2e\ +\x36\x32\x34\x2d\x33\x39\x2e\x32\x35\x38\x2d\x33\x2e\x38\x32\x37\ +\x2d\x35\x35\x2e\x30\x38\x39\x2d\x33\x2e\x37\x34\x39\x63\x2d\x31\ +\x35\x2e\x38\x32\x39\x2c\x30\x2e\x30\x38\x36\x2d\x33\x30\x2e\x39\ +\x38\x31\x2c\x31\x2e\x34\x30\x34\x2d\x34\x34\x2e\x32\x37\x37\x2c\ +\x33\x2e\x37\x34\x39\x43\x31\x36\x37\x2e\x31\x34\x33\x2c\x37\x34\ +\x2e\x35\x37\x36\x2c\x31\x36\x30\x2c\x38\x38\x2e\x39\x32\x38\x2c\ +\x31\x36\x30\x2c\x31\x31\x35\x2e\x33\x35\x39\x56\x31\x34\x34\x68\ +\x39\x36\x0d\x0a\x09\x09\x76\x31\x36\x48\x31\x32\x38\x2e\x38\x32\ +\x63\x2d\x33\x35\x2e\x36\x32\x38\x2c\x30\x2d\x36\x34\x2e\x35\x33\ +\x38\x2c\x34\x32\x2e\x35\x37\x31\x2d\x36\x34\x2e\x38\x31\x33\x2c\ +\x39\x35\x2e\x32\x34\x32\x43\x36\x34\x2e\x30\x30\x35\x2c\x32\x35\ +\x35\x2e\x34\x39\x35\x2c\x36\x34\x2c\x32\x35\x35\x2e\x37\x34\x37\ +\x2c\x36\x34\x2c\x32\x35\x36\x63\x30\x2c\x39\x2e\x35\x32\x33\x2c\ +\x30\x2e\x39\x34\x2c\x31\x38\x2e\x37\x32\x2c\x32\x2e\x36\x38\x35\ +\x2c\x32\x37\x2e\x34\x30\x34\x0d\x0a\x09\x09\x43\x37\x34\x2e\x36\ +\x34\x38\x2c\x33\x32\x33\x2e\x30\x37\x2c\x39\x39\x2e\x34\x35\x31\ +\x2c\x33\x35\x32\x2c\x31\x32\x38\x2e\x38\x32\x2c\x33\x35\x32\x48\ +\x31\x34\x34\x76\x2d\x32\x2e\x36\x36\x32\x76\x2d\x34\x33\x2e\x32\ +\x37\x33\x43\x31\x34\x34\x2c\x32\x37\x39\x2e\x32\x33\x38\x2c\x31\ +\x36\x34\x2e\x31\x34\x36\x2c\x32\x35\x34\x2e\x33\x33\x32\x2c\x31\ +\x39\x33\x2e\x34\x36\x2c\x32\x34\x39\x2e\x30\x35\x36\x7a\x20\x4d\ +\x32\x30\x33\x2e\x36\x35\x36\x2c\x31\x32\x37\x2e\x30\x30\x32\x0d\ +\x0a\x09\x09\x63\x2d\x39\x2e\x35\x39\x32\x2c\x30\x2d\x31\x37\x2e\ +\x33\x38\x34\x2d\x37\x2e\x37\x38\x35\x2d\x31\x37\x2e\x33\x38\x34\ +\x2d\x31\x37\x2e\x34\x30\x33\x63\x30\x2d\x39\x2e\x36\x36\x34\x2c\ +\x37\x2e\x37\x37\x34\x2d\x31\x37\x2e\x35\x32\x2c\x31\x37\x2e\x33\ +\x38\x34\x2d\x31\x37\x2e\x35\x32\x63\x39\x2e\x35\x37\x34\x2c\x30\ +\x2c\x31\x37\x2e\x33\x39\x39\x2c\x37\x2e\x38\x35\x35\x2c\x31\x37\ +\x2e\x33\x39\x39\x2c\x31\x37\x2e\x35\x32\x0d\x0a\x09\x09\x43\x32\ +\x32\x31\x2e\x30\x35\x36\x2c\x31\x31\x39\x2e\x32\x31\x37\x2c\x32\ +\x31\x33\x2e\x32\x34\x36\x2c\x31\x32\x37\x2e\x30\x30\x32\x2c\x32\ +\x30\x33\x2e\x36\x35\x36\x2c\x31\x32\x37\x2e\x30\x30\x32\x7a\x22\ +\x2f\x3e\x0d\x0a\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\ +\x34\x33\x2e\x39\x35\x31\x2c\x32\x32\x32\x2e\x35\x34\x33\x43\x34\ +\x33\x34\x2e\x37\x38\x2c\x31\x38\x36\x2e\x30\x32\x31\x2c\x34\x31\ +\x31\x2e\x30\x33\x33\x2c\x31\x36\x30\x2c\x33\x38\x33\x2e\x31\x38\ +\x2c\x31\x36\x30\x48\x33\x36\x38\x76\x32\x2e\x36\x32\x36\x76\x33\ +\x38\x2e\x30\x34\x36\x63\x30\x2c\x33\x33\x2e\x39\x31\x35\x2d\x32\ +\x32\x2e\x32\x38\x36\x2c\x35\x38\x2e\x34\x37\x34\x2d\x34\x39\x2e\ +\x34\x38\x39\x2c\x36\x32\x2e\x36\x38\x31\x0d\x0a\x09\x09\x63\x2d\ +\x32\x2e\x37\x33\x37\x2c\x30\x2e\x34\x32\x34\x2d\x35\x2e\x34\x38\ +\x33\x2c\x30\x2e\x36\x34\x36\x2d\x38\x2e\x33\x30\x31\x2c\x30\x2e\ +\x36\x34\x36\x48\x32\x30\x36\x2e\x33\x35\x31\x63\x2d\x34\x2e\x35\ +\x31\x38\x2c\x30\x2d\x38\x2e\x39\x30\x34\x2c\x30\x2e\x35\x38\x34\ +\x2d\x31\x33\x2e\x30\x34\x39\x2c\x31\x2e\x36\x37\x32\x43\x31\x37\ +\x34\x2e\x31\x38\x2c\x32\x37\x30\x2e\x36\x38\x39\x2c\x31\x36\x30\ +\x2c\x32\x38\x36\x2e\x36\x2c\x31\x36\x30\x2c\x33\x30\x37\x2e\x32\ +\x33\x36\x76\x33\x32\x2e\x39\x32\x32\x0d\x0a\x09\x09\x76\x35\x34\ +\x2e\x33\x30\x35\x63\x30\x2c\x32\x34\x2e\x38\x33\x32\x2c\x32\x34\ +\x2e\x39\x37\x37\x2c\x33\x39\x2e\x34\x32\x36\x2c\x34\x39\x2e\x34\ +\x38\x31\x2c\x34\x36\x2e\x35\x35\x31\x63\x32\x39\x2e\x33\x32\x37\ +\x2c\x38\x2e\x35\x33\x31\x2c\x36\x31\x2e\x32\x36\x37\x2c\x31\x30\ +\x2e\x30\x36\x38\x2c\x39\x36\x2e\x33\x36\x36\x2c\x30\x43\x33\x32\ +\x39\x2e\x31\x35\x2c\x34\x33\x34\x2e\x33\x35\x34\x2c\x33\x35\x32\ +\x2c\x34\x32\x30\x2e\x38\x39\x33\x2c\x33\x35\x32\x2c\x33\x39\x34\ +\x2e\x34\x36\x33\x56\x33\x36\x38\x0d\x0a\x09\x09\x68\x2d\x39\x36\ +\x76\x2d\x31\x36\x68\x31\x32\x37\x2e\x31\x38\x63\x32\x35\x2e\x32\ +\x34\x2c\x30\x2c\x34\x37\x2e\x31\x30\x37\x2d\x32\x31\x2e\x33\x36\ +\x35\x2c\x35\x37\x2e\x38\x31\x34\x2d\x35\x32\x2e\x35\x34\x39\x43\ +\x34\x34\x35\x2e\x34\x37\x34\x2c\x32\x38\x36\x2e\x34\x30\x34\x2c\ +\x34\x34\x38\x2c\x32\x37\x31\x2e\x36\x34\x31\x2c\x34\x34\x38\x2c\ +\x32\x35\x36\x0d\x0a\x09\x09\x43\x34\x34\x38\x2c\x32\x34\x34\x2e\ +\x32\x33\x32\x2c\x34\x34\x36\x2e\x35\x36\x37\x2c\x32\x33\x32\x2e\ +\x39\x36\x32\x2c\x34\x34\x33\x2e\x39\x35\x31\x2c\x32\x32\x32\x2e\ +\x35\x34\x33\x7a\x20\x4d\x33\x30\x37\x2e\x38\x36\x37\x2c\x33\x38\ +\x32\x2e\x38\x32\x63\x39\x2e\x35\x39\x2c\x30\x2c\x31\x37\x2e\x33\ +\x38\x31\x2c\x37\x2e\x37\x38\x35\x2c\x31\x37\x2e\x33\x38\x31\x2c\ +\x31\x37\x2e\x34\x0d\x0a\x09\x09\x63\x30\x2c\x39\x2e\x36\x35\x2d\ +\x37\x2e\x37\x39\x31\x2c\x31\x37\x2e\x35\x32\x31\x2d\x31\x37\x2e\ +\x33\x38\x31\x2c\x31\x37\x2e\x35\x32\x31\x63\x2d\x39\x2e\x35\x37\ +\x37\x2c\x30\x2d\x31\x37\x2e\x33\x39\x39\x2d\x37\x2e\x38\x37\x31\ +\x2d\x31\x37\x2e\x33\x39\x39\x2d\x31\x37\x2e\x35\x32\x31\x43\x32\ +\x39\x30\x2e\x34\x36\x38\x2c\x33\x39\x30\x2e\x35\x39\x2c\x32\x39\ +\x38\x2e\x32\x37\x34\x2c\x33\x38\x32\x2e\x38\x32\x2c\x33\x30\x37\ +\x2e\x38\x36\x37\x2c\x33\x38\x32\x2e\x38\x32\x7a\x22\x2f\x3e\x0d\ +\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ +\x00\x00\x03\x0c\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ +\x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ +\x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\ +\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x30\x2c\ +\x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\ +\x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\ +\x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\ +\x20\x20\x2d\x2d\x3e\x0d\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\ +\x20\x73\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\ +\x57\x33\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\ +\x2f\x2f\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\ +\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\ +\x73\x2f\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\ +\x67\x31\x31\x2e\x64\x74\x64\x22\x3e\x0d\x0a\x3c\x73\x76\x67\x20\ +\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\ +\x3d\x22\x43\x68\x65\x63\x6b\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\ +\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\ +\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\ +\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\ +\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\ +\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\ +\x3d\x22\x30\x70\x78\x22\x0d\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\ +\x78\x3d\x22\x30\x20\x30\x20\x32\x30\x20\x32\x30\x22\x20\x65\x6e\ +\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\ +\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x32\x30\x20\x32\x30\x22\x20\ +\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\ +\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\ +\x4d\x38\x2e\x32\x39\x34\x2c\x31\x36\x2e\x39\x39\x38\x63\x2d\x30\ +\x2e\x34\x33\x35\x2c\x30\x2d\x30\x2e\x38\x34\x37\x2d\x30\x2e\x32\ +\x30\x33\x2d\x31\x2e\x31\x31\x31\x2d\x30\x2e\x35\x35\x33\x4c\x33\ +\x2e\x36\x31\x2c\x31\x31\x2e\x37\x32\x34\x63\x2d\x30\x2e\x34\x36\ +\x35\x2d\x30\x2e\x36\x31\x33\x2d\x30\x2e\x33\x34\x34\x2d\x31\x2e\ +\x34\x38\x36\x2c\x30\x2e\x32\x37\x2d\x31\x2e\x39\x35\x31\x0d\x0a\ +\x09\x63\x30\x2e\x36\x31\x35\x2d\x30\x2e\x34\x36\x37\x2c\x31\x2e\ +\x34\x38\x38\x2d\x30\x2e\x33\x34\x34\x2c\x31\x2e\x39\x35\x33\x2c\ +\x30\x2e\x32\x37\x6c\x32\x2e\x33\x35\x31\x2c\x33\x2e\x31\x30\x34\ +\x6c\x35\x2e\x39\x31\x31\x2d\x39\x2e\x34\x39\x32\x63\x30\x2e\x34\ +\x30\x37\x2d\x30\x2e\x36\x35\x32\x2c\x31\x2e\x32\x36\x37\x2d\x30\ +\x2e\x38\x35\x32\x2c\x31\x2e\x39\x32\x31\x2d\x30\x2e\x34\x34\x35\ +\x0d\x0a\x09\x63\x30\x2e\x36\x35\x33\x2c\x30\x2e\x34\x30\x36\x2c\ +\x30\x2e\x38\x35\x34\x2c\x31\x2e\x32\x36\x36\x2c\x30\x2e\x34\x34\ +\x36\x2c\x31\x2e\x39\x32\x4c\x39\x2e\x34\x37\x38\x2c\x31\x36\x2e\ +\x33\x34\x63\x2d\x30\x2e\x32\x34\x32\x2c\x30\x2e\x33\x39\x31\x2d\ +\x30\x2e\x36\x36\x31\x2c\x30\x2e\x36\x33\x35\x2d\x31\x2e\x31\x32\ +\x2c\x30\x2e\x36\x35\x36\x43\x38\x2e\x33\x33\x36\x2c\x31\x36\x2e\ +\x39\x39\x38\x2c\x38\x2e\x33\x31\x36\x2c\x31\x36\x2e\x39\x39\x38\ +\x2c\x38\x2e\x32\x39\x34\x2c\x31\x36\x2e\x39\x39\x38\x7a\x22\x2f\ +\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ +\x00\x00\x04\x64\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ +\x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ +\x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\ +\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\ +\x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\ +\x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\ +\x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\ +\x20\x20\x2d\x2d\x3e\x0d\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\ +\x20\x73\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\ +\x57\x33\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\ +\x2f\x2f\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\ +\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\ +\x73\x2f\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\ +\x67\x31\x31\x2e\x64\x74\x64\x22\x3e\x0d\x0a\x3c\x73\x76\x67\x20\ +\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\ +\x3d\x22\x4c\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\ +\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\ +\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\ +\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\ +\x39\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\ +\x20\x79\x3d\x22\x30\x70\x78\x22\x0d\x0a\x09\x20\x77\x69\x64\x74\ +\x68\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\ +\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\ +\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\ +\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\ +\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ +\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ +\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x69\x64\x3d\ +\x22\x49\x63\x6f\x6e\x22\x3e\x0d\x0a\x09\x3c\x67\x3e\x0d\x0a\x09\ +\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x31\ +\x37\x36\x63\x2d\x34\x34\x2e\x30\x30\x34\x2c\x30\x2d\x38\x30\x2e\ +\x30\x30\x31\x2c\x33\x36\x2d\x38\x30\x2e\x30\x30\x31\x2c\x38\x30\ +\x63\x30\x2c\x34\x34\x2e\x30\x30\x34\x2c\x33\x35\x2e\x39\x39\x37\ +\x2c\x38\x30\x2c\x38\x30\x2e\x30\x30\x31\x2c\x38\x30\x63\x34\x34\ +\x2e\x30\x30\x35\x2c\x30\x2c\x37\x39\x2e\x39\x39\x39\x2d\x33\x35\ +\x2e\x39\x39\x36\x2c\x37\x39\x2e\x39\x39\x39\x2d\x38\x30\x0d\x0a\ +\x09\x09\x09\x43\x33\x33\x35\x2e\x39\x39\x39\x2c\x32\x31\x32\x2c\ +\x33\x30\x30\x2e\x30\x30\x35\x2c\x31\x37\x36\x2c\x32\x35\x36\x2c\ +\x31\x37\x36\x7a\x20\x4d\x34\x34\x36\x2e\x39\x33\x38\x2c\x32\x33\ +\x34\x2e\x36\x36\x37\x63\x2d\x39\x2e\x36\x30\x35\x2d\x38\x38\x2e\ +\x35\x33\x31\x2d\x38\x31\x2e\x30\x37\x34\x2d\x31\x36\x30\x2d\x31\ +\x36\x39\x2e\x36\x30\x35\x2d\x31\x36\x39\x2e\x35\x39\x39\x56\x33\ +\x32\x68\x2d\x34\x32\x2e\x36\x36\x36\x76\x33\x33\x2e\x30\x36\x37\ +\x0d\x0a\x09\x09\x09\x63\x2d\x38\x38\x2e\x35\x33\x31\x2c\x39\x2e\ +\x35\x39\x39\x2d\x31\x36\x30\x2c\x38\x31\x2e\x30\x36\x38\x2d\x31\ +\x36\x39\x2e\x36\x30\x34\x2c\x31\x36\x39\x2e\x35\x39\x39\x48\x33\ +\x32\x76\x34\x32\x2e\x36\x36\x37\x68\x33\x33\x2e\x30\x36\x32\x63\ +\x39\x2e\x36\x30\x34\x2c\x38\x38\x2e\x35\x33\x31\x2c\x38\x31\x2e\ +\x30\x37\x32\x2c\x31\x36\x30\x2c\x31\x36\x39\x2e\x36\x30\x34\x2c\ +\x31\x36\x39\x2e\x36\x30\x34\x56\x34\x38\x30\x68\x34\x32\x2e\x36\ +\x36\x36\x76\x2d\x33\x33\x2e\x30\x36\x32\x0d\x0a\x09\x09\x09\x63\ +\x38\x38\x2e\x35\x33\x31\x2d\x39\x2e\x36\x30\x34\x2c\x31\x36\x30\ +\x2d\x38\x31\x2e\x30\x37\x33\x2c\x31\x36\x39\x2e\x36\x30\x35\x2d\ +\x31\x36\x39\x2e\x36\x30\x34\x48\x34\x38\x30\x76\x2d\x34\x32\x2e\ +\x36\x36\x37\x48\x34\x34\x36\x2e\x39\x33\x38\x7a\x20\x4d\x32\x35\ +\x36\x2c\x34\x30\x35\x2e\x33\x33\x33\x63\x2d\x38\x32\x2e\x31\x33\ +\x37\x2c\x30\x2d\x31\x34\x39\x2e\x33\x33\x34\x2d\x36\x37\x2e\x31\ +\x39\x38\x2d\x31\x34\x39\x2e\x33\x33\x34\x2d\x31\x34\x39\x2e\x33\ +\x33\x33\x0d\x0a\x09\x09\x09\x63\x30\x2d\x38\x32\x2e\x31\x33\x36\ +\x2c\x36\x37\x2e\x31\x39\x37\x2d\x31\x34\x39\x2e\x33\x33\x33\x2c\ +\x31\x34\x39\x2e\x33\x33\x34\x2d\x31\x34\x39\x2e\x33\x33\x33\x63\ +\x38\x32\x2e\x31\x33\x35\x2c\x30\x2c\x31\x34\x39\x2e\x33\x33\x32\ +\x2c\x36\x37\x2e\x31\x39\x38\x2c\x31\x34\x39\x2e\x33\x33\x32\x2c\ +\x31\x34\x39\x2e\x33\x33\x33\x43\x34\x30\x35\x2e\x33\x33\x32\x2c\ +\x33\x33\x38\x2e\x31\x33\x35\x2c\x33\x33\x38\x2e\x31\x33\x35\x2c\ +\x34\x30\x35\x2e\x33\x33\x33\x2c\x32\x35\x36\x2c\x34\x30\x35\x2e\ +\x33\x33\x33\x7a\x0d\x0a\x09\x09\x09\x22\x2f\x3e\x0d\x0a\x09\x3c\ +\x2f\x67\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\ +\x3e\x0d\x0a\ +\x00\x00\x03\x26\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ +\x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ +\x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\ +\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\ +\x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\ +\x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\ +\x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\ +\x20\x20\x2d\x2d\x3e\x0d\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\ +\x20\x73\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\ +\x57\x33\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\ +\x2f\x2f\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\ +\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\ +\x73\x2f\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\ +\x67\x31\x31\x2e\x64\x74\x64\x22\x3e\x0d\x0a\x3c\x73\x76\x67\x20\ +\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\ +\x3d\x22\x4c\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\ +\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\ +\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\ +\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\ +\x39\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\ +\x20\x79\x3d\x22\x30\x70\x78\x22\x0d\x0a\x09\x20\x77\x69\x64\x74\ +\x68\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\ +\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\ +\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\ +\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\ +\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ +\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ +\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x3e\x0d\x0a\x09\ +\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x33\x38\ +\x38\x63\x2d\x37\x32\x2e\x35\x39\x37\x2c\x30\x2d\x31\x33\x32\x2d\ +\x35\x39\x2e\x34\x30\x35\x2d\x31\x33\x32\x2d\x31\x33\x32\x63\x30\ +\x2d\x37\x32\x2e\x36\x30\x31\x2c\x35\x39\x2e\x34\x30\x33\x2d\x31\ +\x33\x32\x2c\x31\x33\x32\x2d\x31\x33\x32\x63\x33\x36\x2e\x33\x2c\ +\x30\x2c\x36\x39\x2e\x32\x39\x39\x2c\x31\x35\x2e\x34\x2c\x39\x32\ +\x2e\x34\x30\x36\x2c\x33\x39\x2e\x36\x30\x31\x4c\x32\x37\x38\x2c\ +\x32\x33\x34\x68\x31\x35\x34\x56\x38\x30\x0d\x0a\x09\x09\x6c\x2d\ +\x35\x31\x2e\x36\x39\x38\x2c\x35\x31\x2e\x37\x30\x32\x43\x33\x34\ +\x38\x2e\x34\x30\x36\x2c\x39\x39\x2e\x37\x39\x38\x2c\x33\x30\x34\ +\x2e\x34\x30\x36\x2c\x38\x30\x2c\x32\x35\x36\x2c\x38\x30\x63\x2d\ +\x39\x36\x2e\x37\x39\x37\x2c\x30\x2d\x31\x37\x36\x2c\x37\x39\x2e\ +\x32\x30\x33\x2d\x31\x37\x36\x2c\x31\x37\x36\x73\x37\x38\x2e\x30\ +\x39\x34\x2c\x31\x37\x36\x2c\x31\x37\x36\x2c\x31\x37\x36\x0d\x0a\ +\x09\x09\x63\x38\x31\x2e\x30\x34\x35\x2c\x30\x2c\x31\x34\x38\x2e\ +\x32\x38\x37\x2d\x35\x34\x2e\x31\x33\x34\x2c\x31\x36\x39\x2e\x34\ +\x30\x31\x2d\x31\x32\x38\x48\x33\x37\x38\x2e\x38\x35\x43\x33\x36\ +\x30\x2e\x31\x30\x35\x2c\x33\x35\x33\x2e\x35\x36\x31\x2c\x33\x31\ +\x31\x2e\x37\x31\x32\x2c\x33\x38\x38\x2c\x32\x35\x36\x2c\x33\x38\ +\x38\x7a\x22\x2f\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\ +\x76\x67\x3e\x0d\x0a\ +\x00\x00\x03\xe6\ \x3c\ -\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\ -\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\ -\x30\x2f\x73\x76\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x35\x31\ -\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\x32\ -\x70\x78\x22\x0a\x20\x20\x20\x20\x20\x76\x69\x65\x77\x42\x6f\x78\ -\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x3e\x0a\ -\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\ -\x74\x72\x69\x78\x28\x34\x38\x20\x30\x20\x30\x20\x34\x38\x20\x34\ -\x38\x20\x34\x38\x29\x27\x3e\x0a\x20\x20\x3c\x70\x61\x74\x68\x20\ -\x64\x3d\x22\x4d\x30\x20\x30\x76\x32\x68\x2e\x35\x63\x30\x2d\x2e\ -\x35\x35\x2e\x34\x35\x2d\x31\x20\x31\x2d\x31\x68\x31\x2e\x35\x76\ -\x35\x2e\x35\x63\x30\x20\x2e\x32\x38\x2d\x2e\x32\x32\x2e\x35\x2d\ -\x2e\x35\x2e\x35\x68\x2d\x2e\x35\x76\x31\x68\x34\x76\x2d\x31\x68\ -\x2d\x2e\x35\x63\x2d\x2e\x32\x38\x20\x30\x2d\x2e\x35\x2d\x2e\x32\ -\x32\x2d\x2e\x35\x2d\x2e\x35\x76\x2d\x35\x2e\x35\x68\x31\x2e\x35\ -\x63\x2e\x35\x35\x20\x30\x20\x31\x20\x2e\x34\x35\x20\x31\x20\x31\ -\x68\x2e\x35\x76\x2d\x32\x68\x2d\x38\x7a\x22\x20\x2f\x3e\x0a\x3c\ -\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\ -\x00\x00\x03\x46\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ +\x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ +\x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\ +\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x31\x2c\ +\x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\ +\x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\ +\x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\ +\x20\x20\x2d\x2d\x3e\x0d\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\ +\x20\x73\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\ +\x57\x33\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\ +\x2f\x2f\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\ +\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\ +\x73\x2f\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\ +\x67\x31\x31\x2e\x64\x74\x64\x22\x3e\x0d\x0a\x3c\x73\x76\x67\x20\ +\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\ +\x3d\x22\x43\x68\x65\x76\x72\x6f\x6e\x5f\x63\x69\x72\x63\x6c\x65\ +\x64\x5f\x72\x69\x67\x68\x74\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\ +\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\ +\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\ +\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\ +\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\ +\x78\x6c\x69\x6e\x6b\x22\x0d\x0a\x09\x20\x78\x3d\x22\x30\x70\x78\ +\x22\x20\x79\x3d\x22\x30\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\ +\x78\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\ +\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\ +\x64\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\ +\x31\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\ +\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x74\x72\ +\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\ +\x32\x34\x20\x30\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\ +\x0d\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\x31\x2c\x31\ +\x30\x4c\x38\x2e\x36\x39\x38\x2c\x37\x2e\x34\x39\x34\x63\x2d\x30\ +\x2e\x31\x39\x36\x2d\x30\x2e\x31\x39\x38\x2d\x30\x2e\x31\x39\x36\ +\x2d\x30\x2e\x35\x31\x39\x2c\x30\x2d\x30\x2e\x37\x31\x38\x63\x30\ +\x2e\x31\x39\x36\x2d\x30\x2e\x31\x39\x37\x2c\x30\x2e\x35\x31\x35\ +\x2d\x30\x2e\x31\x39\x37\x2c\x30\x2e\x37\x31\x2c\x30\x6c\x32\x2e\ +\x38\x30\x37\x2c\x32\x2e\x38\x36\x34\x0d\x0a\x09\x63\x30\x2e\x31\ +\x39\x36\x2c\x30\x2e\x31\x39\x39\x2c\x30\x2e\x31\x39\x36\x2c\x30\ +\x2e\x35\x32\x2c\x30\x2c\x30\x2e\x37\x31\x37\x6c\x2d\x32\x2e\x38\ +\x30\x37\x2c\x32\x2e\x38\x36\x34\x63\x2d\x30\x2e\x31\x39\x35\x2c\ +\x30\x2e\x31\x39\x39\x2d\x30\x2e\x35\x31\x34\x2c\x30\x2e\x31\x39\ +\x38\x2d\x30\x2e\x37\x31\x2c\x30\x63\x2d\x30\x2e\x31\x39\x36\x2d\ +\x30\x2e\x31\x39\x37\x2d\x30\x2e\x31\x39\x36\x2d\x30\x2e\x35\x31\ +\x38\x2c\x30\x2d\x30\x2e\x37\x31\x37\x4c\x31\x31\x2c\x31\x30\x7a\ +\x20\x4d\x31\x30\x2c\x30\x2e\x34\x0d\x0a\x09\x63\x35\x2e\x33\x30\ +\x32\x2c\x30\x2c\x39\x2e\x36\x2c\x34\x2e\x32\x39\x38\x2c\x39\x2e\ +\x36\x2c\x39\x2e\x36\x63\x30\x2c\x35\x2e\x33\x30\x33\x2d\x34\x2e\ +\x32\x39\x38\x2c\x39\x2e\x36\x2d\x39\x2e\x36\x2c\x39\x2e\x36\x53\ +\x30\x2e\x34\x2c\x31\x35\x2e\x33\x30\x33\x2c\x30\x2e\x34\x2c\x31\ +\x30\x43\x30\x2e\x34\x2c\x34\x2e\x36\x39\x38\x2c\x34\x2e\x36\x39\ +\x38\x2c\x30\x2e\x34\x2c\x31\x30\x2c\x30\x2e\x34\x7a\x20\x4d\x31\ +\x30\x2c\x31\x38\x2e\x33\x35\x34\x0d\x0a\x09\x63\x34\x2e\x36\x31\ +\x33\x2c\x30\x2c\x38\x2e\x33\x35\x34\x2d\x33\x2e\x37\x34\x2c\x38\ +\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\x34\x63\x30\x2d\x34\x2e\x36\ +\x31\x34\x2d\x33\x2e\x37\x34\x31\x2d\x38\x2e\x33\x35\x34\x2d\x38\ +\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\x34\x63\x2d\x34\x2e\x36\x31\ +\x35\x2c\x30\x2d\x38\x2e\x33\x35\x34\x2c\x33\x2e\x37\x34\x2d\x38\ +\x2e\x33\x35\x34\x2c\x38\x2e\x33\x35\x34\x0d\x0a\x09\x43\x31\x2e\ +\x36\x34\x35\x2c\x31\x34\x2e\x36\x31\x34\x2c\x35\x2e\x33\x38\x35\ +\x2c\x31\x38\x2e\x33\x35\x34\x2c\x31\x30\x2c\x31\x38\x2e\x33\x35\ +\x34\x7a\x22\x2f\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\ +\x76\x67\x3e\x0d\x0a\ +\x00\x00\x03\xeb\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ @@ -2029,36 +2090,55 @@ qt_resource_data = b"\ \x6b\x67\x72\x6f\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\ \x35\x31\x32\x20\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\ \x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\ -\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x33\x37\x2e\x35\ -\x2c\x33\x38\x36\x2e\x36\x4c\x33\x30\x36\x2e\x39\x2c\x32\x35\x36\ -\x6c\x31\x33\x30\x2e\x36\x2d\x31\x33\x30\x2e\x36\x63\x31\x34\x2e\ -\x31\x2d\x31\x34\x2e\x31\x2c\x31\x34\x2e\x31\x2d\x33\x36\x2e\x38\ -\x2c\x30\x2d\x35\x30\x2e\x39\x63\x2d\x31\x34\x2e\x31\x2d\x31\x34\ -\x2e\x31\x2d\x33\x36\x2e\x38\x2d\x31\x34\x2e\x31\x2d\x35\x30\x2e\ -\x39\x2c\x30\x4c\x32\x35\x36\x2c\x32\x30\x35\x2e\x31\x4c\x31\x32\ -\x35\x2e\x34\x2c\x37\x34\x2e\x35\x0d\x0a\x09\x63\x2d\x31\x34\x2e\ -\x31\x2d\x31\x34\x2e\x31\x2d\x33\x36\x2e\x38\x2d\x31\x34\x2e\x31\ -\x2d\x35\x30\x2e\x39\x2c\x30\x63\x2d\x31\x34\x2e\x31\x2c\x31\x34\ -\x2e\x31\x2d\x31\x34\x2e\x31\x2c\x33\x36\x2e\x38\x2c\x30\x2c\x35\ -\x30\x2e\x39\x4c\x32\x30\x35\x2e\x31\x2c\x32\x35\x36\x4c\x37\x34\ -\x2e\x35\x2c\x33\x38\x36\x2e\x36\x63\x2d\x31\x34\x2e\x31\x2c\x31\ -\x34\x2e\x31\x2d\x31\x34\x2e\x31\x2c\x33\x36\x2e\x38\x2c\x30\x2c\ -\x35\x30\x2e\x39\x0d\x0a\x09\x63\x31\x34\x2e\x31\x2c\x31\x34\x2e\ -\x31\x2c\x33\x36\x2e\x38\x2c\x31\x34\x2e\x31\x2c\x35\x30\x2e\x39\ -\x2c\x30\x4c\x32\x35\x36\x2c\x33\x30\x36\x2e\x39\x6c\x31\x33\x30\ -\x2e\x36\x2c\x31\x33\x30\x2e\x36\x63\x31\x34\x2e\x31\x2c\x31\x34\ -\x2e\x31\x2c\x33\x36\x2e\x38\x2c\x31\x34\x2e\x31\x2c\x35\x30\x2e\ -\x39\x2c\x30\x43\x34\x35\x31\x2e\x35\x2c\x34\x32\x33\x2e\x34\x2c\ -\x34\x35\x31\x2e\x35\x2c\x34\x30\x30\x2e\x36\x2c\x34\x33\x37\x2e\ -\x35\x2c\x33\x38\x36\x2e\x36\x7a\x22\x2f\x3e\x0d\x0a\x3c\x2f\x73\ -\x76\x67\x3e\x0d\x0a\ -\x00\x00\x03\xc4\ +\x0a\x3c\x67\x3e\x0d\x0a\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\ +\x4d\x32\x35\x36\x2c\x31\x32\x38\x63\x2d\x38\x31\x2e\x39\x2c\x30\ +\x2d\x31\x34\x35\x2e\x37\x2c\x34\x38\x2e\x38\x2d\x32\x32\x34\x2c\ +\x31\x32\x38\x63\x36\x37\x2e\x34\x2c\x36\x37\x2e\x37\x2c\x31\x32\ +\x34\x2c\x31\x32\x38\x2c\x32\x32\x34\x2c\x31\x32\x38\x63\x39\x39\ +\x2e\x39\x2c\x30\x2c\x31\x37\x33\x2e\x34\x2d\x37\x36\x2e\x34\x2c\ +\x32\x32\x34\x2d\x31\x32\x36\x2e\x36\x0d\x0a\x09\x09\x43\x34\x32\ +\x38\x2e\x32\x2c\x31\x39\x38\x2e\x36\x2c\x33\x35\x34\x2e\x38\x2c\ +\x31\x32\x38\x2c\x32\x35\x36\x2c\x31\x32\x38\x7a\x20\x4d\x32\x35\ +\x36\x2c\x33\x34\x37\x2e\x33\x63\x2d\x34\x39\x2e\x34\x2c\x30\x2d\ +\x38\x39\x2e\x36\x2d\x34\x31\x2d\x38\x39\x2e\x36\x2d\x39\x31\x2e\ +\x33\x63\x30\x2d\x35\x30\x2e\x34\x2c\x34\x30\x2e\x32\x2d\x39\x31\ +\x2e\x33\x2c\x38\x39\x2e\x36\x2d\x39\x31\x2e\x33\x73\x38\x39\x2e\ +\x36\x2c\x34\x31\x2c\x38\x39\x2e\x36\x2c\x39\x31\x2e\x33\x0d\x0a\ +\x09\x09\x43\x33\x34\x35\x2e\x36\x2c\x33\x30\x36\x2e\x34\x2c\x33\ +\x30\x35\x2e\x34\x2c\x33\x34\x37\x2e\x33\x2c\x32\x35\x36\x2c\x33\ +\x34\x37\x2e\x33\x7a\x22\x2f\x3e\x0d\x0a\x09\x3c\x67\x3e\x0d\x0a\ +\x09\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\ +\x32\x32\x34\x63\x30\x2d\x37\x2e\x39\x2c\x32\x2e\x39\x2d\x31\x35\ +\x2e\x31\x2c\x37\x2e\x36\x2d\x32\x30\x2e\x37\x63\x2d\x32\x2e\x35\ +\x2d\x30\x2e\x34\x2d\x35\x2d\x30\x2e\x36\x2d\x37\x2e\x36\x2d\x30\ +\x2e\x36\x63\x2d\x32\x38\x2e\x38\x2c\x30\x2d\x35\x32\x2e\x33\x2c\ +\x32\x33\x2e\x39\x2d\x35\x32\x2e\x33\x2c\x35\x33\x2e\x33\x63\x30\ +\x2c\x32\x39\x2e\x34\x2c\x32\x33\x2e\x35\x2c\x35\x33\x2e\x33\x2c\ +\x35\x32\x2e\x33\x2c\x35\x33\x2e\x33\x0d\x0a\x09\x09\x09\x73\x35\ +\x32\x2e\x33\x2d\x32\x33\x2e\x39\x2c\x35\x32\x2e\x33\x2d\x35\x33\ +\x2e\x33\x63\x30\x2d\x32\x2e\x33\x2d\x30\x2e\x32\x2d\x34\x2e\x36\ +\x2d\x30\x2e\x34\x2d\x36\x2e\x39\x63\x2d\x35\x2e\x35\x2c\x34\x2e\ +\x33\x2d\x31\x32\x2e\x33\x2c\x36\x2e\x39\x2d\x31\x39\x2e\x38\x2c\ +\x36\x2e\x39\x43\x32\x37\x30\x2e\x33\x2c\x32\x35\x36\x2c\x32\x35\ +\x36\x2c\x32\x34\x31\x2e\x37\x2c\x32\x35\x36\x2c\x32\x32\x34\x7a\ +\x22\x2f\x3e\x0d\x0a\x09\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x67\x3e\ +\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ +\x00\x00\x00\x6c\ +\x3c\ +\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\ +\x30\x2f\x73\x76\x67\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\ +\x30\x20\x30\x20\x32\x30\x20\x32\x30\x22\x3e\x3c\x70\x61\x74\x68\ +\x20\x64\x3d\x22\x4d\x31\x38\x20\x31\x32\x76\x31\x48\x38\x76\x35\ +\x6c\x2d\x36\x2d\x36\x20\x36\x2d\x36\x76\x35\x68\x38\x56\x32\x68\ +\x32\x7a\x22\x2f\x3e\x3c\x2f\x73\x76\x67\x3e\ +\x00\x00\x02\xa1\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ \x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ \x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\ -\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x30\x2c\ +\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x31\x2c\ \x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\ \x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\ \x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\ @@ -2070,51 +2150,33 @@ qt_resource_data = b"\ \x73\x2f\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\ \x67\x31\x31\x2e\x64\x74\x64\x22\x3e\x0d\x0a\x3c\x73\x76\x67\x20\ \x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\ -\x3d\x22\x4d\x61\x67\x6e\x69\x66\x79\x69\x6e\x67\x5f\x67\x6c\x61\ -\x73\x73\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\ -\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\ -\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\x69\ -\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\ -\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\x6b\ -\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x0d\x0a\x09\x20\x79\x3d\x22\ -\x30\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\ -\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\ -\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\ -\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\ -\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\ -\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\ -\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\x34\x20\x30\x20\ -\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x0d\x0a\x3c\x70\x61\ -\x74\x68\x20\x64\x3d\x22\x4d\x31\x37\x2e\x35\x34\x35\x2c\x31\x35\ -\x2e\x34\x36\x37\x6c\x2d\x33\x2e\x37\x37\x39\x2d\x33\x2e\x37\x37\ -\x39\x63\x30\x2e\x35\x37\x2d\x30\x2e\x39\x33\x35\x2c\x30\x2e\x38\ -\x39\x38\x2d\x32\x2e\x30\x33\x35\x2c\x30\x2e\x38\x39\x38\x2d\x33\ -\x2e\x32\x31\x63\x30\x2d\x33\x2e\x34\x31\x37\x2d\x32\x2e\x39\x36\ -\x31\x2d\x36\x2e\x33\x37\x37\x2d\x36\x2e\x33\x37\x38\x2d\x36\x2e\ -\x33\x37\x37\x0d\x0a\x09\x43\x34\x2e\x38\x36\x39\x2c\x32\x2e\x31\ -\x2c\x32\x2e\x31\x2c\x34\x2e\x38\x37\x2c\x32\x2e\x31\x2c\x38\x2e\ -\x32\x38\x37\x63\x30\x2c\x33\x2e\x34\x31\x36\x2c\x32\x2e\x39\x36\ -\x31\x2c\x36\x2e\x33\x37\x37\x2c\x36\x2e\x33\x37\x37\x2c\x36\x2e\ -\x33\x37\x37\x63\x31\x2e\x31\x33\x37\x2c\x30\x2c\x32\x2e\x32\x2d\ -\x30\x2e\x33\x30\x39\x2c\x33\x2e\x31\x31\x35\x2d\x30\x2e\x38\x34\ -\x34\x6c\x33\x2e\x37\x39\x39\x2c\x33\x2e\x38\x30\x31\x0d\x0a\x09\ -\x63\x30\x2e\x33\x37\x32\x2c\x30\x2e\x33\x37\x31\x2c\x30\x2e\x39\ -\x37\x35\x2c\x30\x2e\x33\x37\x31\x2c\x31\x2e\x33\x34\x36\x2c\x30\ -\x6c\x30\x2e\x39\x34\x33\x2d\x30\x2e\x39\x34\x33\x43\x31\x38\x2e\ -\x30\x35\x31\x2c\x31\x36\x2e\x33\x30\x37\x2c\x31\x37\x2e\x39\x31\ -\x36\x2c\x31\x35\x2e\x38\x33\x38\x2c\x31\x37\x2e\x35\x34\x35\x2c\ -\x31\x35\x2e\x34\x36\x37\x7a\x20\x4d\x34\x2e\x30\x30\x34\x2c\x38\ -\x2e\x32\x38\x37\x0d\x0a\x09\x63\x30\x2d\x32\x2e\x33\x36\x36\x2c\ -\x31\x2e\x39\x31\x37\x2d\x34\x2e\x32\x38\x33\x2c\x34\x2e\x32\x38\ -\x32\x2d\x34\x2e\x32\x38\x33\x63\x32\x2e\x33\x36\x36\x2c\x30\x2c\ -\x34\x2e\x34\x37\x34\x2c\x32\x2e\x31\x30\x37\x2c\x34\x2e\x34\x37\ -\x34\x2c\x34\x2e\x34\x37\x34\x63\x30\x2c\x32\x2e\x33\x36\x35\x2d\ -\x31\x2e\x39\x31\x38\x2c\x34\x2e\x32\x38\x33\x2d\x34\x2e\x32\x38\ -\x33\x2c\x34\x2e\x32\x38\x33\x0d\x0a\x09\x43\x36\x2e\x31\x31\x31\ -\x2c\x31\x32\x2e\x37\x36\x2c\x34\x2e\x30\x30\x34\x2c\x31\x30\x2e\ -\x36\x35\x32\x2c\x34\x2e\x30\x30\x34\x2c\x38\x2e\x32\x38\x37\x7a\ -\x22\x2f\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\ -\x3e\x0d\x0a\ +\x3d\x22\x53\x61\x76\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\ +\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\ +\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\ +\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\ +\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\ +\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x35\x31\x32\x70\x78\x22\x20\ +\x79\x3d\x22\x35\x31\x32\x70\x78\x22\x0d\x0a\x09\x20\x76\x69\x65\ +\x77\x42\x6f\x78\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ +\x32\x22\x20\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\ +\x6f\x75\x6e\x64\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\ +\x32\x20\x35\x31\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\ +\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\ +\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\ +\x69\x78\x28\x32\x34\x20\x30\x20\x30\x20\x32\x34\x20\x30\x20\x30\ +\x29\x27\x3e\x0d\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\ +\x35\x2e\x31\x37\x33\x2c\x32\x48\x34\x43\x32\x2e\x38\x39\x39\x2c\ +\x32\x2c\x32\x2c\x32\x2e\x39\x2c\x32\x2c\x34\x76\x31\x32\x63\x30\ +\x2c\x31\x2e\x31\x2c\x30\x2e\x38\x39\x39\x2c\x32\x2c\x32\x2c\x32\ +\x68\x31\x32\x63\x31\x2e\x31\x30\x31\x2c\x30\x2c\x32\x2d\x30\x2e\ +\x39\x2c\x32\x2d\x32\x56\x35\x2e\x31\x32\x37\x4c\x31\x35\x2e\x31\ +\x37\x33\x2c\x32\x7a\x20\x4d\x31\x34\x2c\x38\x63\x30\x2c\x30\x2e\ +\x35\x34\x39\x2d\x30\x2e\x34\x35\x2c\x31\x2d\x31\x2c\x31\x48\x37\ +\x0d\x0a\x09\x43\x36\x2e\x34\x35\x2c\x39\x2c\x36\x2c\x38\x2e\x35\ +\x34\x39\x2c\x36\x2c\x38\x56\x33\x68\x38\x56\x38\x7a\x20\x4d\x31\ +\x33\x2c\x34\x68\x2d\x32\x76\x34\x68\x32\x56\x34\x7a\x22\x2f\x3e\ +\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ +\ \x00\x00\x02\x21\ \x00\ \x00\x07\xaf\x78\x9c\xdd\x55\x4d\x6f\x9c\x30\x10\xbd\xf7\x57\x4c\ @@ -2152,7 +2214,86 @@ qt_resource_data = b"\ \x51\x0c\x8b\x84\xcf\x67\x8a\x37\x17\xad\x36\x39\x84\x6a\x79\x8a\ \xf5\x46\xf9\x6f\x96\xf1\xf2\x70\xbf\xc8\x9b\xdf\xf9\x80\xe2\xe1\ \ -\x00\x00\x03\x26\ +\x00\x00\x04\xca\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\ +\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\ +\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x39\x2e\x32\x2e\x31\x2c\x20\ +\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\ +\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\ +\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\ +\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\ +\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\ +\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\ +\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\ +\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\ +\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\ +\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\ +\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x0a\x09\x20\x69\x64\x3d\ +\x22\x73\x76\x67\x34\x36\x31\x39\x22\x20\x69\x6e\x6b\x73\x63\x61\ +\x70\x65\x3a\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x30\x2e\x39\x31\ +\x2b\x64\x65\x76\x65\x6c\x2b\x6f\x73\x78\x6d\x65\x6e\x75\x20\x72\ +\x31\x32\x39\x31\x31\x22\x20\x73\x6f\x64\x69\x70\x6f\x64\x69\x3a\ +\x64\x6f\x63\x6e\x61\x6d\x65\x3d\x22\x74\x72\x69\x61\x6e\x67\x6c\ +\x65\x2d\x73\x74\x72\x6f\x6b\x65\x64\x2d\x31\x35\x2e\x73\x76\x67\ +\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x63\x63\x3d\x22\x68\x74\x74\x70\ +\x3a\x2f\x2f\x63\x72\x65\x61\x74\x69\x76\x65\x63\x6f\x6d\x6d\x6f\ +\x6e\x73\x2e\x6f\x72\x67\x2f\x6e\x73\x23\x22\x20\x78\x6d\x6c\x6e\ +\x73\x3a\x64\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x70\x75\x72\ +\x6c\x2e\x6f\x72\x67\x2f\x64\x63\x2f\x65\x6c\x65\x6d\x65\x6e\x74\ +\x73\x2f\x31\x2e\x31\x2f\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x69\x6e\ +\x6b\x73\x63\x61\x70\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\ +\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\x70\x65\x2e\x6f\x72\x67\x2f\ +\x6e\x61\x6d\x65\x73\x70\x61\x63\x65\x73\x2f\x69\x6e\x6b\x73\x63\ +\x61\x70\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x72\x64\x66\x3d\x22\ +\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\ +\x67\x2f\x31\x39\x39\x39\x2f\x30\x32\x2f\x32\x32\x2d\x72\x64\x66\ +\x2d\x73\x79\x6e\x74\x61\x78\x2d\x6e\x73\x23\x22\x20\x78\x6d\x6c\ +\x6e\x73\x3a\x73\x6f\x64\x69\x70\x6f\x64\x69\x3d\x22\x68\x74\x74\ +\x70\x3a\x2f\x2f\x73\x6f\x64\x69\x70\x6f\x64\x69\x2e\x73\x6f\x75\ +\x72\x63\x65\x66\x6f\x72\x67\x65\x2e\x6e\x65\x74\x2f\x44\x54\x44\ +\x2f\x73\x6f\x64\x69\x70\x6f\x64\x69\x2d\x30\x2e\x64\x74\x64\x22\ +\x20\x78\x6d\x6c\x6e\x73\x3a\x73\x76\x67\x3d\x22\x68\x74\x74\x70\ +\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\ +\x30\x30\x2f\x73\x76\x67\x22\x0a\x09\x20\x78\x6d\x6c\x6e\x73\x3d\ +\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\ +\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\ +\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\ +\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\ +\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\ +\x79\x3d\x22\x30\x70\x78\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x36\ +\x34\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x36\x34\x70\ +\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\ +\x30\x20\x31\x35\x20\x31\x35\x22\x20\x73\x74\x79\x6c\x65\x3d\x22\ +\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\ +\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x31\x35\x20\x31\x35\x3b\ +\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\ +\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x61\x74\x68\x20\x69\x64\ +\x3d\x22\x72\x65\x63\x74\x33\x33\x33\x38\x22\x20\x69\x6e\x6b\x73\ +\x63\x61\x70\x65\x3a\x63\x6f\x6e\x6e\x65\x63\x74\x6f\x72\x2d\x63\ +\x75\x72\x76\x61\x74\x75\x72\x65\x3d\x22\x30\x22\x20\x73\x6f\x64\ +\x69\x70\x6f\x64\x69\x3a\x6e\x6f\x64\x65\x74\x79\x70\x65\x73\x3d\ +\x22\x63\x63\x63\x63\x63\x63\x63\x63\x63\x63\x63\x63\x22\x20\x64\ +\x3d\x22\x4d\x37\x2e\x35\x32\x34\x33\x2c\x31\x2e\x35\x30\x30\x34\ +\x0a\x09\x43\x37\x2e\x32\x34\x32\x39\x2c\x31\x2e\x34\x39\x31\x33\ +\x2c\x36\x2e\x39\x37\x38\x37\x2c\x31\x2e\x36\x34\x32\x33\x2c\x36\ +\x2e\x38\x33\x33\x36\x2c\x31\x2e\x38\x39\x35\x32\x6c\x2d\x35\x2e\ +\x35\x2c\x39\x2e\x38\x36\x39\x32\x43\x31\x2e\x30\x32\x31\x38\x2c\ +\x31\x32\x2e\x33\x30\x37\x38\x2c\x31\x2e\x33\x39\x35\x2c\x31\x32\ +\x2e\x39\x39\x39\x39\x2c\x32\x2c\x31\x33\x68\x31\x31\x0a\x09\x63\ +\x30\x2e\x36\x30\x35\x2d\x30\x2e\x30\x30\x30\x31\x2c\x30\x2e\x39\ +\x37\x38\x32\x2d\x30\x2e\x36\x39\x32\x32\x2c\x30\x2e\x36\x36\x36\ +\x34\x2d\x31\x2e\x32\x33\x35\x35\x6c\x2d\x35\x2e\x35\x2d\x39\x2e\ +\x38\x36\x39\x32\x43\x38\x2e\x30\x33\x30\x32\x2c\x31\x2e\x36\x35\ +\x37\x39\x2c\x37\x2e\x37\x38\x38\x34\x2c\x31\x2e\x35\x30\x39\x32\ +\x2c\x37\x2e\x35\x32\x34\x33\x2c\x31\x2e\x35\x30\x30\x34\x7a\x20\ +\x4d\x37\x2e\x35\x2c\x33\x2e\x38\x39\x39\x33\x6c\x34\x2e\x31\x32\ +\x36\x37\x2c\x37\x2e\x34\x37\x30\x34\x0a\x09\x48\x33\x2e\x33\x37\ +\x33\x33\x4c\x37\x2e\x35\x2c\x33\x2e\x38\x39\x39\x33\x7a\x22\x2f\ +\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\ +\x00\x00\x02\x7f\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ @@ -2179,155 +2320,22 @@ qt_resource_data = b"\ \x20\x79\x3d\x22\x30\x70\x78\x22\x0d\x0a\x09\x20\x77\x69\x64\x74\ \x68\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\ \x3d\x22\x35\x31\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\ -\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\ -\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\ -\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ -\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ -\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x3e\x0d\x0a\x09\ -\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x33\x38\ -\x38\x63\x2d\x37\x32\x2e\x35\x39\x37\x2c\x30\x2d\x31\x33\x32\x2d\ -\x35\x39\x2e\x34\x30\x35\x2d\x31\x33\x32\x2d\x31\x33\x32\x63\x30\ -\x2d\x37\x32\x2e\x36\x30\x31\x2c\x35\x39\x2e\x34\x30\x33\x2d\x31\ -\x33\x32\x2c\x31\x33\x32\x2d\x31\x33\x32\x63\x33\x36\x2e\x33\x2c\ -\x30\x2c\x36\x39\x2e\x32\x39\x39\x2c\x31\x35\x2e\x34\x2c\x39\x32\ -\x2e\x34\x30\x36\x2c\x33\x39\x2e\x36\x30\x31\x4c\x32\x37\x38\x2c\ -\x32\x33\x34\x68\x31\x35\x34\x56\x38\x30\x0d\x0a\x09\x09\x6c\x2d\ -\x35\x31\x2e\x36\x39\x38\x2c\x35\x31\x2e\x37\x30\x32\x43\x33\x34\ -\x38\x2e\x34\x30\x36\x2c\x39\x39\x2e\x37\x39\x38\x2c\x33\x30\x34\ -\x2e\x34\x30\x36\x2c\x38\x30\x2c\x32\x35\x36\x2c\x38\x30\x63\x2d\ -\x39\x36\x2e\x37\x39\x37\x2c\x30\x2d\x31\x37\x36\x2c\x37\x39\x2e\ -\x32\x30\x33\x2d\x31\x37\x36\x2c\x31\x37\x36\x73\x37\x38\x2e\x30\ -\x39\x34\x2c\x31\x37\x36\x2c\x31\x37\x36\x2c\x31\x37\x36\x0d\x0a\ -\x09\x09\x63\x38\x31\x2e\x30\x34\x35\x2c\x30\x2c\x31\x34\x38\x2e\ -\x32\x38\x37\x2d\x35\x34\x2e\x31\x33\x34\x2c\x31\x36\x39\x2e\x34\ -\x30\x31\x2d\x31\x32\x38\x48\x33\x37\x38\x2e\x38\x35\x43\x33\x36\ -\x30\x2e\x31\x30\x35\x2c\x33\x35\x33\x2e\x35\x36\x31\x2c\x33\x31\ -\x31\x2e\x37\x31\x32\x2c\x33\x38\x38\x2c\x32\x35\x36\x2c\x33\x38\ -\x38\x7a\x22\x2f\x3e\x0d\x0a\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\x73\ -\x76\x67\x3e\x0d\x0a\ -\x00\x00\x03\x0c\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ -\x2d\x38\x22\x3f\x3e\x0d\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\ -\x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\ -\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x30\x2c\ -\x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\ -\x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\ -\x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\ -\x20\x20\x2d\x2d\x3e\x0d\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\ -\x20\x73\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\ -\x57\x33\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\ -\x2f\x2f\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\ -\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\ -\x73\x2f\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\ -\x67\x31\x31\x2e\x64\x74\x64\x22\x3e\x0d\x0a\x3c\x73\x76\x67\x20\ -\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\ -\x3d\x22\x43\x68\x65\x63\x6b\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\ -\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\ -\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\ -\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\ -\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\ -\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\ -\x3d\x22\x30\x70\x78\x22\x0d\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\ -\x78\x3d\x22\x30\x20\x30\x20\x32\x30\x20\x32\x30\x22\x20\x65\x6e\ -\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\ -\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x32\x30\x20\x32\x30\x22\x20\ -\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\ -\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\ -\x4d\x38\x2e\x32\x39\x34\x2c\x31\x36\x2e\x39\x39\x38\x63\x2d\x30\ -\x2e\x34\x33\x35\x2c\x30\x2d\x30\x2e\x38\x34\x37\x2d\x30\x2e\x32\ -\x30\x33\x2d\x31\x2e\x31\x31\x31\x2d\x30\x2e\x35\x35\x33\x4c\x33\ -\x2e\x36\x31\x2c\x31\x31\x2e\x37\x32\x34\x63\x2d\x30\x2e\x34\x36\ -\x35\x2d\x30\x2e\x36\x31\x33\x2d\x30\x2e\x33\x34\x34\x2d\x31\x2e\ -\x34\x38\x36\x2c\x30\x2e\x32\x37\x2d\x31\x2e\x39\x35\x31\x0d\x0a\ -\x09\x63\x30\x2e\x36\x31\x35\x2d\x30\x2e\x34\x36\x37\x2c\x31\x2e\ -\x34\x38\x38\x2d\x30\x2e\x33\x34\x34\x2c\x31\x2e\x39\x35\x33\x2c\ -\x30\x2e\x32\x37\x6c\x32\x2e\x33\x35\x31\x2c\x33\x2e\x31\x30\x34\ -\x6c\x35\x2e\x39\x31\x31\x2d\x39\x2e\x34\x39\x32\x63\x30\x2e\x34\ -\x30\x37\x2d\x30\x2e\x36\x35\x32\x2c\x31\x2e\x32\x36\x37\x2d\x30\ -\x2e\x38\x35\x32\x2c\x31\x2e\x39\x32\x31\x2d\x30\x2e\x34\x34\x35\ -\x0d\x0a\x09\x63\x30\x2e\x36\x35\x33\x2c\x30\x2e\x34\x30\x36\x2c\ -\x30\x2e\x38\x35\x34\x2c\x31\x2e\x32\x36\x36\x2c\x30\x2e\x34\x34\ -\x36\x2c\x31\x2e\x39\x32\x4c\x39\x2e\x34\x37\x38\x2c\x31\x36\x2e\ -\x33\x34\x63\x2d\x30\x2e\x32\x34\x32\x2c\x30\x2e\x33\x39\x31\x2d\ -\x30\x2e\x36\x36\x31\x2c\x30\x2e\x36\x33\x35\x2d\x31\x2e\x31\x32\ -\x2c\x30\x2e\x36\x35\x36\x43\x38\x2e\x33\x33\x36\x2c\x31\x36\x2e\ -\x39\x39\x38\x2c\x38\x2e\x33\x31\x36\x2c\x31\x36\x2e\x39\x39\x38\ -\x2c\x38\x2e\x32\x39\x34\x2c\x31\x36\x2e\x39\x39\x38\x7a\x22\x2f\ -\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ -\x00\x00\x04\x4e\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\ -\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\ -\x2d\x38\x27\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x54\x68\x69\x73\x20\ -\x66\x69\x6c\x65\x20\x77\x61\x73\x20\x67\x65\x6e\x65\x72\x61\x74\ -\x65\x64\x20\x62\x79\x20\x64\x76\x69\x73\x76\x67\x6d\x20\x32\x2e\ -\x38\x20\x2d\x2d\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\x73\x69\ -\x6f\x6e\x3d\x27\x31\x2e\x31\x27\x20\x78\x6d\x6c\x6e\x73\x3d\x27\ -\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\ -\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x27\x20\x78\x6d\x6c\x6e\ -\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x27\x68\x74\x74\x70\x3a\x2f\x2f\ -\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\ -\x78\x6c\x69\x6e\x6b\x27\x20\x77\x69\x64\x74\x68\x3d\x27\x36\x33\ -\x2e\x39\x39\x39\x36\x70\x74\x27\x20\x68\x65\x69\x67\x68\x74\x3d\ -\x27\x36\x33\x2e\x39\x39\x39\x37\x70\x74\x27\x20\x76\x69\x65\x77\ -\x42\x6f\x78\x3d\x27\x35\x36\x2e\x34\x30\x39\x34\x20\x35\x33\x2e\ -\x38\x35\x38\x33\x20\x36\x33\x2e\x39\x39\x39\x36\x20\x36\x33\x2e\ -\x39\x39\x39\x37\x27\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x27\x70\x61\ -\x67\x65\x31\x27\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\ -\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\ -\x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\ -\x20\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\ -\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x33\ -\x2e\x39\x35\x37\x33\x35\x20\x2d\x33\x32\x2e\x31\x32\x4c\x20\x31\ -\x31\x2e\x39\x30\x33\x36\x20\x2d\x35\x31\x2e\x33\x30\x33\x39\x4c\ -\x20\x35\x36\x2e\x31\x35\x32\x33\x20\x2d\x34\x32\x2e\x35\x30\x32\ -\x32\x4c\x20\x34\x30\x2e\x36\x37\x39\x34\x20\x2d\x32\x32\x2e\x35\ -\x32\x38\x31\x4c\x20\x33\x2e\x39\x35\x37\x33\x35\x20\x2d\x33\x32\ -\x2e\x31\x32\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\ -\x27\x20\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\ -\x30\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\ -\x70\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\ -\x2d\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\ -\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\ -\x6d\x69\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\ -\x72\x6f\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x32\x2e\x35\x30\ -\x39\x33\x37\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\ -\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\ -\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\ -\x39\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\x36\x39\x20\x31\ -\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\ -\x65\x20\x63\x78\x3d\x27\x33\x2e\x39\x35\x37\x33\x35\x27\x20\x63\ -\x79\x3d\x27\x2d\x33\x32\x2e\x31\x32\x27\x20\x66\x69\x6c\x6c\x3d\ -\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\ -\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\ -\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\ -\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\x30\x20\x30\x2e\ -\x39\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\x36\x39\x20\x31\ -\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\ -\x65\x20\x63\x78\x3d\x27\x31\x31\x2e\x39\x30\x33\x36\x27\x20\x63\ -\x79\x3d\x27\x2d\x35\x31\x2e\x33\x30\x33\x39\x27\x20\x66\x69\x6c\ -\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\ -\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\ -\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\ -\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\x30\x20\ -\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\x36\x39\ -\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\x69\x72\ -\x63\x6c\x65\x20\x63\x78\x3d\x27\x35\x36\x2e\x31\x35\x32\x33\x27\ -\x20\x63\x79\x3d\x27\x2d\x34\x32\x2e\x35\x30\x32\x32\x27\x20\x66\ -\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x72\x3d\ -\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\ -\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\ -\x74\x72\x69\x78\x28\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x30\x20\ -\x30\x20\x30\x2e\x39\x39\x36\x32\x36\x34\x20\x35\x38\x2e\x34\x36\ -\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x27\x3e\x0a\x3c\x63\ -\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x34\x30\x2e\x36\x37\x39\ -\x34\x27\x20\x63\x79\x3d\x27\x2d\x32\x32\x2e\x35\x32\x38\x31\x27\ -\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\ -\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\ -\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\ -\x00\x00\x02\xf7\ +\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x73\ +\x74\x79\x6c\x65\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\ +\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\ +\x35\x31\x32\x20\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\ +\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\ +\x0a\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\ +\x3d\x22\x32\x38\x38\x2c\x39\x36\x20\x33\x33\x37\x2e\x39\x2c\x31\ +\x34\x35\x2e\x39\x20\x32\x37\x34\x2c\x32\x30\x39\x2e\x37\x20\x32\ +\x37\x34\x2c\x32\x30\x39\x2e\x37\x20\x31\x34\x35\x2e\x39\x2c\x33\ +\x33\x37\x2e\x39\x20\x39\x36\x2c\x32\x38\x38\x20\x39\x36\x2c\x34\ +\x31\x36\x20\x32\x32\x34\x2c\x34\x31\x36\x20\x31\x37\x34\x2e\x31\ +\x2c\x33\x36\x36\x2e\x31\x20\x33\x35\x37\x2e\x34\x2c\x31\x38\x32\ +\x2e\x39\x20\x33\x36\x36\x2e\x31\x2c\x31\x37\x34\x2e\x31\x20\x0d\ +\x0a\x09\x34\x31\x36\x2c\x32\x32\x34\x20\x34\x31\x36\x2c\x39\x36\ +\x20\x22\x2f\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ +\x00\x00\x02\x7d\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\ @@ -2354,29 +2362,21 @@ qt_resource_data = b"\ \x20\x79\x3d\x22\x30\x70\x78\x22\x0d\x0a\x09\x20\x77\x69\x64\x74\ \x68\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\ \x3d\x22\x35\x31\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\ -\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x73\ -\x74\x79\x6c\x65\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\ -\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\ -\x35\x31\x32\x20\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\ -\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\ -\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x31\x37\x2e\x34\ -\x2c\x32\x32\x34\x48\x32\x38\x38\x56\x39\x34\x2e\x36\x63\x30\x2d\ -\x31\x36\x2e\x39\x2d\x31\x34\x2e\x33\x2d\x33\x30\x2e\x36\x2d\x33\ -\x32\x2d\x33\x30\x2e\x36\x63\x2d\x31\x37\x2e\x37\x2c\x30\x2d\x33\ -\x32\x2c\x31\x33\x2e\x37\x2d\x33\x32\x2c\x33\x30\x2e\x36\x56\x32\ -\x32\x34\x48\x39\x34\x2e\x36\x43\x37\x37\x2e\x37\x2c\x32\x32\x34\ -\x2c\x36\x34\x2c\x32\x33\x38\x2e\x33\x2c\x36\x34\x2c\x32\x35\x36\ -\x0d\x0a\x09\x63\x30\x2c\x31\x37\x2e\x37\x2c\x31\x33\x2e\x37\x2c\ -\x33\x32\x2c\x33\x30\x2e\x36\x2c\x33\x32\x48\x32\x32\x34\x76\x31\ -\x32\x39\x2e\x34\x63\x30\x2c\x31\x36\x2e\x39\x2c\x31\x34\x2e\x33\ -\x2c\x33\x30\x2e\x36\x2c\x33\x32\x2c\x33\x30\x2e\x36\x63\x31\x37\ -\x2e\x37\x2c\x30\x2c\x33\x32\x2d\x31\x33\x2e\x37\x2c\x33\x32\x2d\ -\x33\x30\x2e\x36\x56\x32\x38\x38\x68\x31\x32\x39\x2e\x34\x63\x31\ -\x36\x2e\x39\x2c\x30\x2c\x33\x30\x2e\x36\x2d\x31\x34\x2e\x33\x2c\ -\x33\x30\x2e\x36\x2d\x33\x32\x0d\x0a\x09\x43\x34\x34\x38\x2c\x32\ -\x33\x38\x2e\x33\x2c\x34\x33\x34\x2e\x33\x2c\x32\x32\x34\x2c\x34\ -\x31\x37\x2e\x34\x2c\x32\x32\x34\x7a\x22\x2f\x3e\x0d\x0a\x3c\x2f\ -\x73\x76\x67\x3e\x0d\x0a\ +\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\ +\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\ +\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\ +\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\ +\x65\x73\x65\x72\x76\x65\x22\x3e\x0d\x0a\x3c\x67\x20\x69\x64\x3d\ +\x22\x49\x63\x6f\x6e\x5f\x38\x5f\x22\x3e\x0d\x0a\x09\x3c\x67\x3e\ +\x0d\x0a\x09\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x32\ +\x37\x2c\x32\x33\x34\x2e\x36\x32\x35\x48\x31\x36\x37\x2e\x32\x39\ +\x36\x6c\x31\x31\x39\x2e\x37\x30\x32\x2d\x31\x31\x39\x2e\x37\x30\ +\x32\x4c\x32\x35\x36\x2c\x38\x35\x4c\x38\x35\x2c\x32\x35\x36\x6c\ +\x31\x37\x31\x2c\x31\x37\x31\x6c\x32\x39\x2e\x39\x32\x32\x2d\x32\ +\x39\x2e\x39\x32\x34\x4c\x31\x36\x37\x2e\x32\x39\x36\x2c\x32\x37\ +\x37\x2e\x33\x37\x35\x48\x34\x32\x37\x56\x32\x33\x34\x2e\x36\x32\ +\x35\x7a\x22\x2f\x3e\x0d\x0a\x09\x3c\x2f\x67\x3e\x0d\x0a\x3c\x2f\ +\x67\x3e\x0d\x0a\x3c\x2f\x73\x76\x67\x3e\x0d\x0a\ " qt_resource_name = b"\ @@ -2384,29 +2384,39 @@ qt_resource_name = b"\ \x00\x6f\xa6\x53\ \x00\x69\ \x00\x63\x00\x6f\x00\x6e\x00\x73\ +\x00\x0a\ +\x0a\x2d\x1b\xc7\ +\x00\x63\ +\x00\x69\x00\x72\x00\x63\x00\x6c\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\ \x00\x10\ -\x0c\x57\x65\x47\ +\x06\xe3\xaf\xe7\ \x00\x61\ -\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x72\x00\x65\x00\x73\x00\x69\x00\x7a\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x68\x00\x61\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x1c\ +\x08\x8a\x79\x07\ +\x00\x61\ +\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x72\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x2d\x00\x62\x00\x75\x00\x74\ +\x00\x74\x00\x6f\x00\x6e\x00\x2d\x00\x6f\x00\x66\x00\x66\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x12\ +\x08\x55\xef\xc7\ +\x00\x61\ +\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x64\x00\x65\x00\x6c\x00\x65\x00\x74\x00\x65\x00\x2e\x00\x73\x00\x76\ +\x00\x67\ +\x00\x14\ +\x0f\xa5\xe0\xc7\ +\x00\x6d\ +\x00\x61\x00\x67\x00\x6e\x00\x69\x00\x66\x00\x79\x00\x69\x00\x6e\x00\x67\x00\x2d\x00\x67\x00\x6c\x00\x61\x00\x73\x00\x73\x00\x2e\ +\x00\x73\x00\x76\x00\x67\ \x00\x19\ \x0f\xef\x7b\xe7\ \x00\x61\ \x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x63\x00\x6f\x00\x6c\x00\x6f\x00\x72\x00\x2d\x00\x70\x00\x61\x00\x6c\ \x00\x65\x00\x74\x00\x74\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\ -\x00\x1c\ -\x04\x66\xe1\x67\ -\x00\x63\ -\x00\x68\x00\x65\x00\x76\x00\x72\x00\x6f\x00\x6e\x00\x2d\x00\x77\x00\x69\x00\x74\x00\x68\x00\x2d\x00\x63\x00\x69\x00\x72\x00\x63\ -\x00\x6c\x00\x65\x00\x2d\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\ -\x00\x1b\ -\x0e\xb5\x68\xe7\ +\x00\x12\ +\x08\x79\x97\xe7\ \x00\x61\ -\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x72\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x2d\x00\x62\x00\x75\x00\x74\ -\x00\x74\x00\x6f\x00\x6e\x00\x2d\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\ -\x00\x0a\ -\x01\xca\x6d\x87\ -\x00\x62\ -\x00\x75\x00\x63\x00\x6b\x00\x65\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x63\x00\x61\x00\x6d\x00\x65\x00\x72\x00\x61\x00\x2e\x00\x73\x00\x76\ +\x00\x67\ \x00\x08\ \x05\xa8\x57\x87\ \x00\x63\ @@ -2416,91 +2426,88 @@ qt_resource_name = b"\ \x00\x61\ \x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\ \ -\x00\x10\ -\x06\xe3\xaf\xe7\ -\x00\x61\ -\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x68\x00\x61\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\ -\x00\x12\ -\x04\xb2\x21\x47\ -\x00\x61\ -\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x65\x00\x78\x00\x70\x00\x61\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\ -\x00\x67\ -\x00\x12\ -\x08\x79\x97\xe7\ -\x00\x61\ -\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x63\x00\x61\x00\x6d\x00\x65\x00\x72\x00\x61\x00\x2e\x00\x73\x00\x76\ -\x00\x67\ -\x00\x12\ -\x08\x55\xef\xc7\ -\x00\x61\ -\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x64\x00\x65\x00\x6c\x00\x65\x00\x74\x00\x65\x00\x2e\x00\x73\x00\x76\ -\x00\x67\ \x00\x0f\ -\x04\xf2\xa7\x87\ +\x07\x0e\xc4\x87\ +\x00\x6f\ +\x00\x70\x00\x65\x00\x6e\x00\x70\x00\x6f\x00\x6c\x00\x79\x00\x67\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x0f\ +\x09\x76\x60\xc7\ \x00\x63\ -\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x63\x00\x75\x00\x72\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\ -\x00\x19\ -\x0a\x43\x45\xc7\ -\x00\x61\ -\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x61\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x66\x00\x6f\x00\x72\ -\x00\x77\x00\x61\x00\x72\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x2d\x00\x72\x00\x6f\x00\x75\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\ \x00\x0a\ -\x0a\xc8\x62\x67\ -\x00\x63\ -\x00\x65\x00\x6e\x00\x74\x00\x65\x00\x72\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x01\xca\x6d\x87\ +\x00\x62\ +\x00\x75\x00\x63\x00\x6b\x00\x65\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\ \x00\x10\ \x08\xe4\xaf\x47\ \x00\x61\ \x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x64\x00\x6f\x00\x6e\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\ -\x00\x16\ -\x01\xfb\x76\x27\ +\x00\x1b\ +\x0e\xb5\x68\xe7\ \x00\x61\ -\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x61\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x62\x00\x61\x00\x63\ -\x00\x6b\x00\x2e\x00\x73\x00\x76\x00\x67\ -\x00\x17\ -\x07\x87\x48\x27\ +\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x72\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x2d\x00\x62\x00\x75\x00\x74\ +\x00\x74\x00\x6f\x00\x6e\x00\x2d\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x0a\ +\x0f\x68\x53\xe7\ \x00\x61\ -\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x66\x00\x6f\x00\x6c\x00\x64\x00\x65\x00\x72\x00\x2d\x00\x6f\x00\x70\ -\x00\x65\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x6e\x00\x63\x00\x68\x00\x6f\x00\x72\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x19\ +\x0a\x43\x45\xc7\ +\x00\x61\ +\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x61\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x66\x00\x6f\x00\x72\ +\x00\x77\x00\x61\x00\x72\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\ \x00\x08\ \x0b\x07\x57\xa7\ \x00\x65\ \x00\x64\x00\x69\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\ -\x00\x17\ -\x06\xc6\x02\xa7\ -\x00\x74\ -\x00\x72\x00\x69\x00\x61\x00\x6e\x00\x67\x00\x6c\x00\x65\x00\x2d\x00\x73\x00\x74\x00\x72\x00\x6f\x00\x6b\x00\x65\x00\x64\x00\x2d\ -\x00\x31\x00\x35\x00\x2e\x00\x73\x00\x76\x00\x67\ \x00\x08\ -\x08\xf7\x57\x07\ -\x00\x67\ -\x00\x72\x00\x69\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\ -\x00\x0a\ -\x0f\x68\x53\xe7\ -\x00\x61\ -\x00\x6e\x00\x63\x00\x68\x00\x6f\x00\x72\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x0c\xf7\x55\x87\ +\x00\x74\ +\x00\x65\x00\x78\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\ \x00\x0e\ \x05\xed\x38\x67\ \x00\x61\ \x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\ -\x00\x1d\ -\x06\xec\xf4\xc7\ +\x00\x0e\ +\x0f\xcb\xd5\xc7\ +\x00\x70\ +\x00\x6c\x00\x75\x00\x73\x00\x2d\x00\x72\x00\x6f\x00\x75\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x1c\ +\x04\x66\xe1\x67\ \x00\x63\ \x00\x68\x00\x65\x00\x76\x00\x72\x00\x6f\x00\x6e\x00\x2d\x00\x77\x00\x69\x00\x74\x00\x68\x00\x2d\x00\x63\x00\x69\x00\x72\x00\x63\ -\x00\x6c\x00\x65\x00\x2d\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\ -\x00\x0a\ -\x0a\x2d\x1b\xc7\ +\x00\x6c\x00\x65\x00\x2d\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x11\ +\x0c\xa7\xc7\x47\ \x00\x63\ -\x00\x69\x00\x72\x00\x63\x00\x6c\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x70\x00\x6f\x00\x6c\x00\x79\x00\x67\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\ +\ \x00\x08\ -\x08\xc8\x55\xe7\ -\x00\x73\ -\x00\x61\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x08\xf7\x57\x07\ +\x00\x67\ +\x00\x72\x00\x69\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\ \x00\x12\ -\x0c\x5e\xd4\xa7\ +\x04\xb2\x21\x47\ \x00\x61\ -\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x6c\x00\x6f\x00\x63\x00\x61\x00\x74\x00\x65\x00\x2e\x00\x73\x00\x76\ +\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x65\x00\x78\x00\x70\x00\x61\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\ \x00\x67\ +\x00\x0d\ +\x05\x20\xce\x87\ +\x00\x6f\ +\x00\x70\x00\x65\x00\x6e\x00\x63\x00\x75\x00\x72\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x0a\ +\x0a\xc8\x62\x67\ +\x00\x63\ +\x00\x65\x00\x6e\x00\x74\x00\x65\x00\x72\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x17\ +\x07\x87\x48\x27\ +\x00\x61\ +\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x66\x00\x6f\x00\x6c\x00\x64\x00\x65\x00\x72\x00\x2d\x00\x6f\x00\x70\ +\x00\x65\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x0f\ +\x04\xf2\xa7\x87\ +\x00\x63\ +\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x63\x00\x75\x00\x72\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\ \x00\x10\ \x08\x89\xfa\x47\ \x00\x63\ @@ -2510,109 +2517,102 @@ qt_resource_name = b"\ \x00\x73\ \x00\x6f\x00\x63\x00\x69\x00\x61\x00\x6c\x00\x2d\x00\x70\x00\x79\x00\x74\x00\x68\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\ \ +\x00\x09\ +\x0b\x9e\x89\x07\ +\x00\x63\ +\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x12\ +\x0c\x5e\xd4\xa7\ +\x00\x61\ +\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x6c\x00\x6f\x00\x63\x00\x61\x00\x74\x00\x65\x00\x2e\x00\x73\x00\x76\ +\x00\x67\ +\x00\x13\ +\x03\x24\x75\x47\ +\x00\x61\ +\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x72\x00\x65\x00\x66\x00\x72\x00\x65\x00\x73\x00\x68\x00\x2e\x00\x73\ +\x00\x76\x00\x67\ +\x00\x1d\ +\x06\xec\xf4\xc7\ +\x00\x63\ +\x00\x68\x00\x65\x00\x76\x00\x72\x00\x6f\x00\x6e\x00\x2d\x00\x77\x00\x69\x00\x74\x00\x68\x00\x2d\x00\x63\x00\x69\x00\x72\x00\x63\ +\x00\x6c\x00\x65\x00\x2d\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x07\ +\x0c\xf8\x5a\x07\ +\x00\x65\ +\x00\x79\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\ \x00\x15\ \x0f\xc4\x59\xe7\ \x00\x73\ \x00\x75\x00\x62\x00\x64\x00\x69\x00\x72\x00\x65\x00\x63\x00\x74\x00\x6f\x00\x72\x00\x79\x00\x2d\x00\x6c\x00\x65\x00\x66\x00\x74\ \x00\x2e\x00\x73\x00\x76\x00\x67\ -\x00\x07\ -\x0c\xf8\x5a\x07\ -\x00\x65\ -\x00\x79\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\ -\x00\x1c\ -\x08\x8a\x79\x07\ -\x00\x61\ -\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x72\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x2d\x00\x62\x00\x75\x00\x74\ -\x00\x74\x00\x6f\x00\x6e\x00\x2d\x00\x6f\x00\x66\x00\x66\x00\x2e\x00\x73\x00\x76\x00\x67\ -\x00\x0f\ -\x07\x0e\xc4\x87\ -\x00\x6f\ -\x00\x70\x00\x65\x00\x6e\x00\x70\x00\x6f\x00\x6c\x00\x79\x00\x67\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\ -\x00\x0d\ -\x05\x20\xce\x87\ -\x00\x6f\ -\x00\x70\x00\x65\x00\x6e\x00\x63\x00\x75\x00\x72\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\ \x00\x08\ -\x0c\xf7\x55\x87\ -\x00\x74\ -\x00\x65\x00\x78\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\ -\x00\x0f\ -\x09\x76\x60\xc7\ -\x00\x63\ -\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x2d\x00\x72\x00\x6f\x00\x75\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\ -\x00\x14\ -\x0f\xa5\xe0\xc7\ -\x00\x6d\ -\x00\x61\x00\x67\x00\x6e\x00\x69\x00\x66\x00\x79\x00\x69\x00\x6e\x00\x67\x00\x2d\x00\x67\x00\x6c\x00\x61\x00\x73\x00\x73\x00\x2e\ -\x00\x73\x00\x76\x00\x67\ +\x08\xc8\x55\xe7\ +\x00\x73\ +\x00\x61\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\ \x00\x10\ \x04\xa9\x22\xc7\ \x00\x66\ \x00\x69\x00\x6c\x00\x6c\x00\x65\x00\x64\x00\x62\x00\x75\x00\x63\x00\x6b\x00\x65\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\ -\x00\x13\ -\x03\x24\x75\x47\ +\x00\x17\ +\x06\xc6\x02\xa7\ +\x00\x74\ +\x00\x72\x00\x69\x00\x61\x00\x6e\x00\x67\x00\x6c\x00\x65\x00\x2d\x00\x73\x00\x74\x00\x72\x00\x6f\x00\x6b\x00\x65\x00\x64\x00\x2d\ +\x00\x31\x00\x35\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x10\ +\x0c\x57\x65\x47\ \x00\x61\ -\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x72\x00\x65\x00\x66\x00\x72\x00\x65\x00\x73\x00\x68\x00\x2e\x00\x73\ -\x00\x76\x00\x67\ -\x00\x09\ -\x0b\x9e\x89\x07\ -\x00\x63\ -\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x2e\x00\x73\x00\x76\x00\x67\ -\x00\x11\ -\x0c\xa7\xc7\x47\ -\x00\x63\ -\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x70\x00\x6f\x00\x6c\x00\x79\x00\x67\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\ -\ -\x00\x0e\ -\x0f\xcb\xd5\xc7\ -\x00\x70\ -\x00\x6c\x00\x75\x00\x73\x00\x2d\x00\x72\x00\x6f\x00\x75\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x72\x00\x65\x00\x73\x00\x69\x00\x7a\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\ +\x00\x16\ +\x01\xfb\x76\x27\ +\x00\x61\ +\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x61\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x62\x00\x61\x00\x63\ +\x00\x6b\x00\x2e\x00\x73\x00\x76\x00\x67\ " qt_resource_struct_v1 = b"\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x29\x00\x00\x00\x02\ -\x00\x00\x04\x42\x00\x00\x00\x00\x00\x01\x00\x00\x5e\xa0\ -\x00\x00\x00\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x0e\xf7\ -\x00\x00\x02\x80\x00\x00\x00\x00\x00\x01\x00\x00\x38\x63\ -\x00\x00\x05\xbe\x00\x00\x00\x00\x00\x01\x00\x00\x80\xc1\ -\x00\x00\x00\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x07\xae\ -\x00\x00\x05\x98\x00\x01\x00\x00\x00\x01\x00\x00\x7e\x9c\ -\x00\x00\x01\x66\x00\x00\x00\x00\x00\x01\x00\x00\x22\x06\ -\x00\x00\x01\xe4\x00\x00\x00\x00\x00\x01\x00\x00\x2b\x0c\ -\x00\x00\x05\x10\x00\x00\x00\x00\x00\x01\x00\x00\x71\xc4\ -\x00\x00\x01\x02\x00\x00\x00\x00\x00\x01\x00\x00\x14\xcf\ -\x00\x00\x03\x60\x00\x00\x00\x00\x00\x01\x00\x00\x49\xc6\ -\x00\x00\x02\xfc\x00\x00\x00\x00\x00\x01\x00\x00\x41\xaa\ -\x00\x00\x01\x40\x00\x00\x00\x00\x00\x01\x00\x00\x1c\x38\ -\x00\x00\x03\x82\x00\x00\x00\x00\x00\x01\x00\x00\x4c\x93\ -\x00\x00\x04\xec\x00\x00\x00\x00\x00\x01\x00\x00\x6d\x83\ -\x00\x00\x02\xb2\x00\x00\x00\x00\x00\x01\x00\x00\x3a\xe4\ -\x00\x00\x01\xba\x00\x00\x00\x00\x00\x01\x00\x00\x28\x66\ -\x00\x00\x01\x90\x00\x00\x00\x00\x00\x01\x00\x00\x25\x40\ -\x00\x00\x04\x1c\x00\x00\x00\x00\x00\x01\x00\x00\x5a\x80\ -\x00\x00\x04\xae\x00\x00\x00\x00\x00\x01\x00\x00\x6a\x83\ -\x00\x00\x03\xdc\x00\x00\x00\x00\x00\x01\x00\x00\x53\x73\ -\x00\x00\x02\x5a\x00\x00\x00\x00\x00\x01\x00\x00\x35\xe6\ -\x00\x00\x03\x30\x00\x01\x00\x00\x00\x01\x00\x00\x46\x78\ -\x00\x00\x05\x46\x00\x00\x00\x00\x00\x01\x00\x00\x77\x8a\ -\x00\x00\x03\xc2\x00\x00\x00\x00\x00\x01\x00\x00\x50\x7d\ -\x00\x00\x02\x08\x00\x00\x00\x00\x00\x01\x00\x00\x2f\xe5\ -\x00\x00\x02\x40\x00\x00\x00\x00\x00\x01\x00\x00\x32\x66\ -\x00\x00\x02\xe6\x00\x00\x00\x00\x00\x01\x00\x00\x3e\x3a\ -\x00\x00\x05\xea\x00\x00\x00\x00\x00\x01\x00\x00\x83\xeb\ +\x00\x00\x04\x6a\x00\x00\x00\x00\x00\x01\x00\x00\x65\x3d\ +\x00\x00\x01\xce\x00\x00\x00\x00\x00\x01\x00\x00\x29\x77\ +\x00\x00\x06\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x8b\xc7\ +\x00\x00\x04\xd4\x00\x00\x00\x00\x00\x01\x00\x00\x74\x39\ +\x00\x00\x03\x0c\x00\x00\x00\x00\x00\x01\x00\x00\x43\x62\ +\x00\x00\x05\x9a\x00\x01\x00\x00\x00\x01\x00\x00\x82\x51\ +\x00\x00\x03\x88\x00\x00\x00\x00\x00\x01\x00\x00\x4d\x8e\ +\x00\x00\x04\x20\x00\x00\x00\x00\x00\x01\x00\x00\x5c\x44\ +\x00\x00\x03\xb2\x00\x00\x00\x00\x00\x01\x00\x00\x50\xc8\ +\x00\x00\x01\x48\x00\x00\x00\x00\x00\x01\x00\x00\x1a\x83\ +\x00\x00\x02\xc8\x00\x00\x00\x00\x00\x01\x00\x00\x3d\x9a\ +\x00\x00\x05\xc0\x00\x00\x00\x00\x00\x01\x00\x00\x84\x76\ +\x00\x00\x00\x2a\x00\x00\x00\x00\x00\x01\x00\x00\x02\xf6\ +\x00\x00\x05\x00\x00\x00\x00\x00\x00\x01\x00\x00\x77\x63\ +\x00\x00\x01\x86\x00\x00\x00\x00\x00\x01\x00\x00\x21\xec\ +\x00\x00\x03\xec\x00\x00\x00\x00\x00\x01\x00\x00\x58\xee\ +\x00\x00\x00\x8e\x00\x00\x00\x00\x00\x01\x00\x00\x0b\xc4\ +\x00\x00\x01\x1e\x00\x00\x00\x00\x00\x01\x00\x00\x17\x5d\ +\x00\x00\x04\x44\x00\x00\x00\x00\x00\x01\x00\x00\x61\x1d\ +\x00\x00\x00\x50\x00\x00\x00\x00\x00\x01\x00\x00\x08\xc4\ +\x00\x00\x05\x84\x00\x00\x00\x00\x00\x01\x00\x00\x7f\xac\ +\x00\x00\x01\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x2f\x4f\ +\x00\x00\x03\x72\x00\x01\x00\x00\x00\x01\x00\x00\x4b\xad\ +\x00\x00\x01\xaa\x00\x00\x00\x00\x00\x01\x00\x00\x26\x2d\ \x00\x00\x00\x10\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x03\xf2\x00\x00\x00\x00\x00\x01\x00\x00\x56\x18\ -\x00\x00\x06\x02\x00\x00\x00\x00\x00\x01\x00\x00\x86\xfb\ -\x00\x00\x01\x18\x00\x00\x00\x00\x00\x01\x00\x00\x19\x7d\ -\x00\x00\x05\x30\x00\x00\x00\x00\x00\x01\x00\x00\x76\x6a\ -\x00\x00\x04\x9a\x00\x00\x00\x00\x00\x01\x00\x00\x66\x94\ -\x00\x00\x00\xac\x00\x00\x00\x00\x00\x01\x00\x00\x0b\xa7\ -\x00\x00\x03\x46\x00\x00\x00\x00\x00\x01\x00\x00\x48\x59\ -\x00\x00\x05\x6a\x00\x00\x00\x00\x00\x01\x00\x00\x7a\xd4\ -\x00\x00\x04\x6a\x00\x00\x00\x00\x00\x01\x00\x00\x66\x24\ -\x00\x00\x06\x2a\x00\x00\x00\x00\x00\x01\x00\x00\x8b\x4d\ -\x00\x00\x00\x36\x00\x00\x00\x00\x00\x01\x00\x00\x02\x83\ +\x00\x00\x02\x64\x00\x00\x00\x00\x00\x01\x00\x00\x36\x89\ +\x00\x00\x03\xd2\x00\x00\x00\x00\x00\x01\x00\x00\x55\x6e\ +\x00\x00\x02\x9c\x00\x00\x00\x00\x00\x01\x00\x00\x39\x0a\ +\x00\x00\x04\x92\x00\x00\x00\x00\x00\x01\x00\x00\x6c\xc1\ +\x00\x00\x05\xf4\x00\x00\x00\x00\x00\x01\x00\x00\x89\x44\ +\x00\x00\x04\xaa\x00\x00\x00\x00\x00\x01\x00\x00\x6f\xd1\ +\x00\x00\x03\x4a\x00\x00\x00\x00\x00\x01\x00\x00\x47\x5b\ +\x00\x00\x01\x5e\x00\x00\x00\x00\x00\x01\x00\x00\x1f\x31\ +\x00\x00\x02\xb2\x00\x00\x00\x00\x00\x01\x00\x00\x3c\x7a\ +\x00\x00\x05\x40\x00\x00\x00\x00\x00\x01\x00\x00\x7b\x4d\ +\x00\x00\x02\x0e\x00\x00\x00\x00\x00\x01\x00\x00\x31\xcc\ +\x00\x00\x02\x4a\x00\x00\x00\x00\x00\x01\x00\x00\x35\x1c\ +\x00\x00\x00\xb8\x00\x00\x00\x00\x00\x01\x00\x00\x0e\x6a\ +\x00\x00\x05\x54\x00\x00\x00\x00\x00\x01\x00\x00\x7f\x3c\ +\x00\x00\x02\xea\x00\x00\x00\x00\x00\x01\x00\x00\x40\x67\ +\x00\x00\x00\xe6\x00\x00\x00\x00\x00\x01\x00\x00\x12\x32\ " qt_resource_struct_v2 = b"\ @@ -2620,88 +2620,88 @@ qt_resource_struct_v2 = b"\ \x00\x00\x00\x00\x00\x00\x00\x00\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x29\x00\x00\x00\x02\ \x00\x00\x00\x00\x00\x00\x00\x00\ -\x00\x00\x04\x42\x00\x00\x00\x00\x00\x01\x00\x00\x5e\xa0\ -\x00\x00\x01\x73\x27\xf0\x83\x5a\ -\x00\x00\x00\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x0e\xf7\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x02\x80\x00\x00\x00\x00\x00\x01\x00\x00\x38\x63\ -\x00\x00\x01\x73\x27\xf0\x83\x58\ -\x00\x00\x05\xbe\x00\x00\x00\x00\x00\x01\x00\x00\x80\xc1\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x00\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x07\xae\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x05\x98\x00\x01\x00\x00\x00\x01\x00\x00\x7e\x9c\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x01\x66\x00\x00\x00\x00\x00\x01\x00\x00\x22\x06\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x01\xe4\x00\x00\x00\x00\x00\x01\x00\x00\x2b\x0c\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x05\x10\x00\x00\x00\x00\x00\x01\x00\x00\x71\xc4\ -\x00\x00\x01\x73\x27\xf0\x83\x5a\ -\x00\x00\x01\x02\x00\x00\x00\x00\x00\x01\x00\x00\x14\xcf\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x03\x60\x00\x00\x00\x00\x00\x01\x00\x00\x49\xc6\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x02\xfc\x00\x00\x00\x00\x00\x01\x00\x00\x41\xaa\ -\x00\x00\x01\x73\x27\xf0\x83\x5a\ -\x00\x00\x01\x40\x00\x00\x00\x00\x00\x01\x00\x00\x1c\x38\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x03\x82\x00\x00\x00\x00\x00\x01\x00\x00\x4c\x93\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x04\xec\x00\x00\x00\x00\x00\x01\x00\x00\x6d\x83\ -\x00\x00\x01\x73\x27\xf0\x83\x5a\ -\x00\x00\x02\xb2\x00\x00\x00\x00\x00\x01\x00\x00\x3a\xe4\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x01\xba\x00\x00\x00\x00\x00\x01\x00\x00\x28\x66\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x01\x90\x00\x00\x00\x00\x00\x01\x00\x00\x25\x40\ -\x00\x00\x01\x73\x27\xf0\x83\x58\ -\x00\x00\x04\x1c\x00\x00\x00\x00\x00\x01\x00\x00\x5a\x80\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x04\xae\x00\x00\x00\x00\x00\x01\x00\x00\x6a\x83\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x03\xdc\x00\x00\x00\x00\x00\x01\x00\x00\x53\x73\ -\x00\x00\x01\x73\x27\xf0\x83\x5a\ -\x00\x00\x02\x5a\x00\x00\x00\x00\x00\x01\x00\x00\x35\xe6\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x03\x30\x00\x01\x00\x00\x00\x01\x00\x00\x46\x78\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x05\x46\x00\x00\x00\x00\x00\x01\x00\x00\x77\x8a\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x03\xc2\x00\x00\x00\x00\x00\x01\x00\x00\x50\x7d\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x02\x08\x00\x00\x00\x00\x00\x01\x00\x00\x2f\xe5\ -\x00\x00\x01\x73\x27\xf0\x83\x58\ -\x00\x00\x02\x40\x00\x00\x00\x00\x00\x01\x00\x00\x32\x66\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x02\xe6\x00\x00\x00\x00\x00\x01\x00\x00\x3e\x3a\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x05\xea\x00\x00\x00\x00\x00\x01\x00\x00\x83\xeb\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ +\x00\x00\x04\x6a\x00\x00\x00\x00\x00\x01\x00\x00\x65\x3d\ +\x00\x00\x01\x73\xc1\x9d\x51\x38\ +\x00\x00\x01\xce\x00\x00\x00\x00\x00\x01\x00\x00\x29\x77\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x06\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x8b\xc7\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x04\xd4\x00\x00\x00\x00\x00\x01\x00\x00\x74\x39\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x03\x0c\x00\x00\x00\x00\x00\x01\x00\x00\x43\x62\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x05\x9a\x00\x01\x00\x00\x00\x01\x00\x00\x82\x51\ +\x00\x00\x01\x73\xc1\x9d\x51\x38\ +\x00\x00\x03\x88\x00\x00\x00\x00\x00\x01\x00\x00\x4d\x8e\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x04\x20\x00\x00\x00\x00\x00\x01\x00\x00\x5c\x44\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x03\xb2\x00\x00\x00\x00\x00\x01\x00\x00\x50\xc8\ +\x00\x00\x01\x73\xc1\x9d\x51\x38\ +\x00\x00\x01\x48\x00\x00\x00\x00\x00\x01\x00\x00\x1a\x83\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x02\xc8\x00\x00\x00\x00\x00\x01\x00\x00\x3d\x9a\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x05\xc0\x00\x00\x00\x00\x00\x01\x00\x00\x84\x76\ +\x00\x00\x01\x73\xc1\x9d\x51\x38\ +\x00\x00\x00\x2a\x00\x00\x00\x00\x00\x01\x00\x00\x02\xf6\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x05\x00\x00\x00\x00\x00\x00\x01\x00\x00\x77\x63\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x01\x86\x00\x00\x00\x00\x00\x01\x00\x00\x21\xec\ +\x00\x00\x01\x73\xc1\x9d\x51\x38\ +\x00\x00\x03\xec\x00\x00\x00\x00\x00\x01\x00\x00\x58\xee\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x00\x8e\x00\x00\x00\x00\x00\x01\x00\x00\x0b\xc4\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x01\x1e\x00\x00\x00\x00\x00\x01\x00\x00\x17\x5d\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x04\x44\x00\x00\x00\x00\x00\x01\x00\x00\x61\x1d\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x00\x50\x00\x00\x00\x00\x00\x01\x00\x00\x08\xc4\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x05\x84\x00\x00\x00\x00\x00\x01\x00\x00\x7f\xac\ +\x00\x00\x01\x73\xc1\x9d\x51\x38\ +\x00\x00\x01\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x2f\x4f\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x03\x72\x00\x01\x00\x00\x00\x01\x00\x00\x4b\xad\ +\x00\x00\x01\x73\xc1\x9d\x51\x38\ +\x00\x00\x01\xaa\x00\x00\x00\x00\x00\x01\x00\x00\x26\x2d\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ \x00\x00\x00\x10\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x03\xf2\x00\x00\x00\x00\x00\x01\x00\x00\x56\x18\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x06\x02\x00\x00\x00\x00\x00\x01\x00\x00\x86\xfb\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x01\x18\x00\x00\x00\x00\x00\x01\x00\x00\x19\x7d\ -\x00\x00\x01\x73\x27\xf0\x83\x58\ -\x00\x00\x05\x30\x00\x00\x00\x00\x00\x01\x00\x00\x76\x6a\ -\x00\x00\x01\x73\x27\xf0\x83\x5a\ -\x00\x00\x04\x9a\x00\x00\x00\x00\x00\x01\x00\x00\x66\x94\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x00\xac\x00\x00\x00\x00\x00\x01\x00\x00\x0b\xa7\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x03\x46\x00\x00\x00\x00\x00\x01\x00\x00\x48\x59\ -\x00\x00\x01\x73\x27\xf0\x83\x58\ -\x00\x00\x05\x6a\x00\x00\x00\x00\x00\x01\x00\x00\x7a\xd4\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ -\x00\x00\x04\x6a\x00\x00\x00\x00\x00\x01\x00\x00\x66\x24\ -\x00\x00\x01\x73\x27\xf0\x83\x5a\ -\x00\x00\x06\x2a\x00\x00\x00\x00\x00\x01\x00\x00\x8b\x4d\ -\x00\x00\x01\x73\x27\xf0\x83\x5a\ -\x00\x00\x00\x36\x00\x00\x00\x00\x00\x01\x00\x00\x02\x83\ -\x00\x00\x01\x73\x27\xf0\x83\x59\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x02\x64\x00\x00\x00\x00\x00\x01\x00\x00\x36\x89\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x03\xd2\x00\x00\x00\x00\x00\x01\x00\x00\x55\x6e\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x02\x9c\x00\x00\x00\x00\x00\x01\x00\x00\x39\x0a\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x04\x92\x00\x00\x00\x00\x00\x01\x00\x00\x6c\xc1\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x05\xf4\x00\x00\x00\x00\x00\x01\x00\x00\x89\x44\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x04\xaa\x00\x00\x00\x00\x00\x01\x00\x00\x6f\xd1\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x03\x4a\x00\x00\x00\x00\x00\x01\x00\x00\x47\x5b\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x01\x5e\x00\x00\x00\x00\x00\x01\x00\x00\x1f\x31\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x02\xb2\x00\x00\x00\x00\x00\x01\x00\x00\x3c\x7a\ +\x00\x00\x01\x73\xc1\x9d\x51\x38\ +\x00\x00\x05\x40\x00\x00\x00\x00\x00\x01\x00\x00\x7b\x4d\ +\x00\x00\x01\x73\xc1\x9d\x51\x38\ +\x00\x00\x02\x0e\x00\x00\x00\x00\x00\x01\x00\x00\x31\xcc\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x02\x4a\x00\x00\x00\x00\x00\x01\x00\x00\x35\x1c\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ +\x00\x00\x00\xb8\x00\x00\x00\x00\x00\x01\x00\x00\x0e\x6a\ +\x00\x00\x01\x73\xc1\x9d\x51\x38\ +\x00\x00\x05\x54\x00\x00\x00\x00\x00\x01\x00\x00\x7f\x3c\ +\x00\x00\x01\x73\xc1\x9d\x51\x38\ +\x00\x00\x02\xea\x00\x00\x00\x00\x00\x01\x00\x00\x40\x67\ +\x00\x00\x01\x73\xc1\x9d\x51\x38\ +\x00\x00\x00\xe6\x00\x00\x00\x00\x00\x01\x00\x00\x12\x32\ +\x00\x00\x01\x73\xc1\x9d\x51\x37\ " qt_version = [int(v) for v in QtCore.qVersion().split('.')] diff --git a/graphics/asymptote/GUI/xasy2asy.py b/graphics/asymptote/GUI/xasy2asy.py index b0486d07ad..12bccb453c 100644 --- a/graphics/asymptote/GUI/xasy2asy.py +++ b/graphics/asymptote/GUI/xasy2asy.py @@ -873,12 +873,15 @@ class xasyItem(Qc.QObject): n += 1 - if text == "Error\n": - self.imageHandleQueue.put(("ERROR", fin.readline())) - else: - render() + if raw_text != "Error\n": + if text == "Error\n": + self.imageHandleQueue.put(("ERROR", fin.readline())) + else: + render() - self.asy2psmap = asyTransform(xu.listize(fin.readline().rstrip(),float)) + self.asy2psmap = asyTransform(xu.listize(fin.readline().rstrip(),float)) + else: + self.asy2psmap = identity() self.imageHandleQueue.put((None,)) self.asyfied = True diff --git a/graphics/asymptote/Makefile.in b/graphics/asymptote/Makefile.in index c15dd791f1..f7afa261c3 100644 --- a/graphics/asymptote/Makefile.in +++ b/graphics/asymptote/Makefile.in @@ -13,7 +13,7 @@ GCPPLIB = @GCPPLIB@ GCLIBS = $(GCPPLIB) $(GCLIB) LFLAGS = @LDFLAGS@ LIBS = $(LFLAGS) @PTHREAD_LIBS@ @GLEW@ @LIBS@ $(GCLIBS) -DOSLIBS = $(subst -lncurses, -ltermcap, $(LIBS)) -lgdi32 -lwinmm -s -static +DOSLIBS = $(subst -lncurses, -ltermcap, $(LIBS)) -lwolfssl -lgdi32 -lwinmm -s -static PERL = perl @@ -60,7 +60,7 @@ CLEAN = camp.output base/version.asy doc/version.texi \ GUI/xasyVersion.py $(XNAME) doc/asy-latex.pdf $(SYMBOLSH) EXTRA = asy-mode.el asy-init.el asy.vim asy_filetype.vim asy-kate.sh \ asymptote.py reload.js nopapersize.ps -EXEXTRA = piicon.png *.views *.dat *.bib +EXEXTRA = piicon.png 100d.pdb1 *.views *.dat *.bib DOCEXTRA = *.asy *.csv *.dat latexusage.tex externalprc.tex pixel.pdf KEYWORDS = base $(ASYMPTOTE_SITEDIR) LATEXFILES = asymptote.sty asycolors.sty ocg.sty latexmkrc @@ -136,6 +136,7 @@ version: $(GCLIB) $(FILES:=.o) $(notdir $(UIFILES:.ui=.py)) GUI/icons_rc.py echo string VERSION=\"$(revision)\"\; > base/version.asy echo @set VERSION $(revision) > doc/version.texi echo @set Datadir @datadir@ >> doc/version.texi + echo @set Docdir @docdir@ >> doc/version.texi echo "#!/usr/bin/env python3" > GUI/xasyVersion.py echo xasyVersion = \"$(revision)\" >> GUI/xasyVersion.py diff --git a/graphics/asymptote/ReleaseNotes b/graphics/asymptote/ReleaseNotes index 27f1cc94b8..67e9d70bf7 100644 --- a/graphics/asymptote/ReleaseNotes +++ b/graphics/asymptote/ReleaseNotes @@ -1,3 +1,24 @@ +Release Notes for Version 2.67 + +Support was added for importing and inputting URLs. Compilation and 2D SVG +to HTML conversion no longer requires the GLM library; 2D html output is +fit to the canvas unless settings.absolute=true. Diagnostics for dvisvgm +were enabled; SVG clipping was fixed. A -globalread setting (default true) +was implemented. Files are opened using the search path, which now +includes the examples directory. An invalid array dimensions error was fixed. +A WebGL resize event listener was added; the + and - keys now zoom in and out, +rather than expanding and shrinking the viewport. Remeshing on export is +forced; unnecessary remeshing on zoom in AsyGL is avoided. +The triple dir(path3, path3) function was normalized. The repositioning of +OpenGL windows was fixed. The copy constructors for path and path3 were fixed. +Asymptote errors no longer cause Xasy to hang. A numerical precision issue +was fixed. A portable way of skipping whitespace was implemented; casts +from empty strings now yield uninitialized values. Interrupt handling under +MacOS X was fixed. A devicepixelratio setting was implemented. The error +location is displayed in the console. Segmentation faults were fixed. +The documentation was updated and the code was reformatted. A hang on exit +under MSWindows was fixed. Obsolete encoding modules were removed. + Release Notes for Version 2.66 A bug in the Bezier patch bounds was fixed. Vertex and material data are @@ -10,7 +31,8 @@ Problems with Xasy and interactive signals under MSWindows were fixed. A background color for both 2D and 3D images can be specified with currentlight.background. Offscreen rendering on headless machines has been reinstated; while the setting offscreen has been removed, one can again -configure asy for either onscreen or offscreen rendering. Clipping was removed from the slopefield module. Functions mapArray, mapTemplate, real abs2(pair), +configure asy for either onscreen or offscreen rendering. Clipping was removed +from the slopefield module. Functions mapArray, mapTemplate, real abs2(pair), and real abs2(triple) were implemented. The new Ghostscript transparency model requires Ghostscript 9.52 or later. The detection of TeX errors was improved. An array segmentation fault was fixed; array dimensions are checked. diff --git a/graphics/asymptote/access.cc b/graphics/asymptote/access.cc index f71dba71bf..c1e65f0bae 100644 --- a/graphics/asymptote/access.cc +++ b/graphics/asymptote/access.cc @@ -56,7 +56,7 @@ void bltinAccess::encode(action act, position pos, coder &e, frame *) e.encode(inst::pop); encode(act, pos, e); } - + /* callableAccess */ void callableAccess::encode(action act, position pos, coder &e) { @@ -79,7 +79,7 @@ void callableAccess::encode(action act, position pos, coder &e, frame *) e.encode(inst::pop); encode(act, pos, e); } - + /* frameAccess */ void frameAccess::encode(action act, position pos, coder &e) @@ -122,8 +122,8 @@ void localAccess::encode(action act, position pos, coder &e) offset); } else if (e.encode(level)) { - e.encode(act == WRITE ? inst::fieldsave : inst::fieldpush, - offset); + e.encode(act == WRITE ? inst::fieldsave : inst::fieldpush, + offset); } else { frameError(pos); @@ -159,5 +159,5 @@ void qualifiedAccess::encode(action act, position pos, coder &e, frame *top) field->encode(act, pos, e, qualifierLevel); } - + } // namespace trans diff --git a/graphics/asymptote/access.h b/graphics/asymptote/access.h index 08e0a48e3a..f1f82f9266 100644 --- a/graphics/asymptote/access.h +++ b/graphics/asymptote/access.h @@ -17,11 +17,11 @@ #include "vm.h" namespace vm { - struct callable; +struct callable; } namespace trans { - + class frame; class coder; @@ -32,7 +32,7 @@ enum action { }; // These serves as the base class for the accesses. -class access : public gc { +class access : public gc { protected: // Generic compiler access error - if the compiler functions properly, // none of these should be reachable by the user. @@ -44,7 +44,7 @@ protected: public: virtual ~access() = 0; - + // Encode a read/write/call of the access when nothing is on the stack. virtual void encode(action, position pos, coder &) { @@ -59,7 +59,7 @@ public: }; // This class represents identity conversions in casting. -class identAccess : public access +class identAccess : public access { virtual void encode(action act, position, coder&); }; @@ -95,7 +95,7 @@ class frameAccess : public access { public: frameAccess(frame *f) : f(f) {} - + void encode(action act, position pos, coder &e); void encode(action act, position pos, coder &e, frame *top); }; @@ -116,7 +116,7 @@ public: class qualifiedAccess : public access { // The location and frame of the record. access *qualifier; - frame *qualifierLevel; + frame *qualifierLevel; // The location of the field relative to the record. access *field; diff --git a/graphics/asymptote/align.h b/graphics/asymptote/align.h index f6f2e94f68..fe891deb05 100644 --- a/graphics/asymptote/align.h +++ b/graphics/asymptote/align.h @@ -18,8 +18,8 @@ #ifdef __Array_h__ namespace Array { -static const array1 NULL1; -static const array2 NULL2; +static const array1 NULL1; +static const array2 NULL2; static const array3 NULL3; } @@ -64,9 +64,9 @@ inline void newAlign(T *&v, size_t len, size_t align) const char *nomem="Memory limits exceeded"; #ifdef HAVE_POSIX_MEMALIGN int rc=posix_memalign(&mem,align,len*sizeof(T)); -#else +#else int rc=posix_memalign0(&mem,align,len*sizeof(T)); -#endif +#endif if(rc == EINVAL) std::cerr << invalid << std::endl; if(rc == ENOMEM) std::cerr << nomem << std::endl; v=(T *) mem; @@ -81,7 +81,7 @@ inline void deleteAlign(T *v, size_t len) free(v); #else free0(v); -#endif +#endif } } @@ -115,7 +115,7 @@ inline void deleteAlign(T *p) free(p); #else Array::free0(p); -#endif +#endif } } diff --git a/graphics/asymptote/angle.h b/graphics/asymptote/angle.h index 984b1546aa..686f5469d6 100644 --- a/graphics/asymptote/angle.h +++ b/graphics/asymptote/angle.h @@ -17,7 +17,7 @@ const double PI=acos(-1.0); const double Cpiby180=PI/180.0; const double C180bypi=180.0/PI; - + inline double radians(double theta) { return theta*Cpiby180; @@ -39,12 +39,12 @@ inline double angle(double x, double y, bool warn=true) } return atan2(y,x); } - + // Return an angle in the interval [0,360). inline double principalBranch(double deg) { deg=fmod(deg,360.0); - if(deg < 0) deg += 360.0; + if(deg < 0) deg += 360.0; return deg; } diff --git a/graphics/asymptote/application.cc b/graphics/asymptote/application.cc index 853896a9ea..0a3c0f1035 100644 --- a/graphics/asymptote/application.cc +++ b/graphics/asymptote/application.cc @@ -53,7 +53,7 @@ void restArg::trans(coenv &e, temp_vector &temps) if (rest) rest->trans(e, temps); - + transMaker(e, (Int)inits.size(), (bool)rest); } @@ -93,7 +93,7 @@ class maximizer { ++y; l.push_front(x); } - + // Tests if x is maximal. bool maximal(application *x) { for (app_list::iterator y=l.begin(); y!=l.end(); ++y) @@ -140,7 +140,7 @@ void application::initRest() { } } -//const Int REST=-1; +//const Int REST=-1; const Int NOMATCH=-2; Int application::find(symbol name) { @@ -185,7 +185,7 @@ bool application::matchAtSpot(size_t spot, env &e, formal &source, { formal &target=sig->getFormal(spot); if(target.t->kind == types::ty_error) return false; - + score s=castScore(e, target, source); if (s == FAIL) @@ -252,7 +252,7 @@ bool application::matchRest(env &e, formal &source, varinit *a, } return false; } - + // When the argument should be evaluated, possibly adjusting for a rest // argument which occurs before named arguments. size_t adjustIndex(size_t i, size_t ri) @@ -291,7 +291,7 @@ bool application::matchSignature(env &e, types::signature *source, // Fill in any remaining arguments with their defaults. return complete(); } - + bool application::matchOpen(env &e, signature *source, arglist &al) { assert(rest); @@ -316,8 +316,8 @@ application *application::match(env &e, function *t, signature *source, application *app=new application(t); bool success = t->getSignature()->isOpen ? - app->matchOpen(e, source, al) : - app->matchSignature(e, source, al); + app->matchOpen(e, source, al) : + app->matchSignature(e, source, al); //cout << "MATCH " << success << endl; @@ -428,7 +428,7 @@ bool exactMightMatch(signature *target, signature *source) if (source->hasRest()) { if (!target->hasRest()) return false; - + if (!equivalent(source->getRest().t, target->getRest().t)) return false; } @@ -454,42 +454,42 @@ app_list exactMultimatch(env &e, return l; /* empty */ for (ty_vector::iterator t=o->sub.begin(); t!=o->sub.end(); ++t) - { - if ((*t)->kind != ty_function) - continue; - - function *ft = (function *)*t; - - // First we run a test to see if all arguments could be exactly matched. - // If this returns false, no such match is possible. - // If it returns true, an exact match may or may not be possible. - if (!exactMightMatch(ft->getSignature(), source)) - continue; - - application *a=application::match(e, ft, source, al); - - // Consider calling - // void f(A a=new A, int y) - // with - // f(3) - // This matches exactly if there is no implicit cast from int to A. - // Otherwise, it does not match. - // Thus, there is no way to know if the - // match truly is exact without looking at the environment. - // In such a case, exactMightMatch() must return true, but there is no - // exact match. Such false positives are eliminated here. - // - // Consider calling - // void f(int x, real y=0.0, int z=0) - // with - // f(1,2) - // exactMightMatch() will return true, matching 1 to x and 2 to z, but the - // application::match will give an inexact match of 1 to x to 2 to y, due - // to the cast from int to real. Therefore, we must test for exactness - // even after matching. - if (a && a->exact()) - l.push_back(a); - } + { + if ((*t)->kind != ty_function) + continue; + + function *ft = (function *)*t; + + // First we run a test to see if all arguments could be exactly matched. + // If this returns false, no such match is possible. + // If it returns true, an exact match may or may not be possible. + if (!exactMightMatch(ft->getSignature(), source)) + continue; + + application *a=application::match(e, ft, source, al); + + // Consider calling + // void f(A a=new A, int y) + // with + // f(3) + // This matches exactly if there is no implicit cast from int to A. + // Otherwise, it does not match. + // Thus, there is no way to know if the + // match truly is exact without looking at the environment. + // In such a case, exactMightMatch() must return true, but there is no + // exact match. Such false positives are eliminated here. + // + // Consider calling + // void f(int x, real y=0.0, int z=0) + // with + // f(1,2) + // exactMightMatch() will return true, matching 1 to x and 2 to z, but the + // application::match will give an inexact match of 1 to x to 2 to y, due + // to the cast from int to real. Therefore, we must test for exactness + // even after matching. + if (a && a->exact()) + l.push_back(a); + } //cout << "EXACTMATCH " << (!l.empty()) << endl; return l; @@ -514,8 +514,8 @@ bool halfExactMightMatch(env &e, // application::match. It would be nice to avoid this somehow, but the // additional complexity is probably not worth the minor speed improvement. if (equivalent(formals[0].t, t1)) - return e.fastCastable(formals[1].t, t2); - else + return e.fastCastable(formals[1].t, t2); + else return equivalent(formals[1].t, t2) && e.fastCastable(formals[0].t, t1); } @@ -550,24 +550,24 @@ app_list halfExactMultimatch(env &e, assert(t1); assert(t2); for (ty_vector::iterator t=o->sub.begin(); t!=o->sub.end(); ++t) - { - if ((*t)->kind != ty_function) - continue; + { + if ((*t)->kind != ty_function) + continue; - function *ft = (function *)*t; + function *ft = (function *)*t; #if 1 - if (!halfExactMightMatch(e, ft->getSignature(), t1, t2)) - continue; + if (!halfExactMightMatch(e, ft->getSignature(), t1, t2)) + continue; #endif - application *a=application::match(e, ft, source, al); + application *a=application::match(e, ft, source, al); #if 1 - if (a && a->halfExact()) - l.push_back(a); + if (a && a->halfExact()) + l.push_back(a); #endif - } + } return l; } @@ -578,7 +578,7 @@ app_list halfExactMultimatch(env &e, // not give any speed-up. bool tooManyArgs(types::signature *target, types::signature *source) { return source->getNumFormals() > target->getNumFormals() && - !target->hasRest(); + !target->hasRest(); } // The full overloading resolution system, which handles casting of arguments, @@ -624,9 +624,9 @@ app_list inexactMultimatch(env &e, assert(a->exact() == exactlyMatchable(ft->getSignature(), source)); if (a->halfExact() && !namedFormals(source)) { assert(halfExactMightMatch(e, target, source->getFormal(0).t, - source->getFormal(1).t)); + source->getFormal(1).t)); } - + } if (a && a->exact()) exact = true; @@ -640,7 +640,7 @@ app_list inexactMultimatch(env &e, cout << (perfect ? "PERFECT" : exact ? "EXACT" : halfExact ? "HALFEXACT" : - "IMPERFECT") + "IMPERFECT") << endl; #endif diff --git a/graphics/asymptote/application.h b/graphics/asymptote/application.h index 8ca4296bd3..fcf3f8e511 100644 --- a/graphics/asymptote/application.h +++ b/graphics/asymptote/application.h @@ -18,7 +18,7 @@ // Defined in runtime.in: namespace run { - void pushDefault(vm::stack *Stack); +void pushDefault(vm::stack *Stack); } using absyntax::arglist; @@ -93,7 +93,7 @@ public: restArg() : rest(0) {} - virtual ~restArg() + virtual ~restArg() {} // Encodes the instructions to make an array from size elements on the stack. @@ -247,11 +247,11 @@ class application : public gc { // Matches the argument to a formal in the target signature (possibly causing // other formals in the target to be matched to default values), and updates - // the matchpoint accordingly. + // the matchpoint accordingly. bool matchArgument(env &e, types::formal& source, varinit *a, size_t evalIndex); - // Match an argument bound to a name, as in f(index=7). + // Match an argument bound to a name, as in f(index=7). bool matchNamedArgument(env &e, types::formal& source, varinit *a, size_t evalIndex); @@ -261,7 +261,7 @@ class application : public gc { // Match a rest argument in the calling expression. bool matchRest(env &e, types::formal& f, varinit *a, size_t evalIndex); - + // Match the argument represented in signature to the target signature. On // success, all of the arguments in args will be properly set up. bool matchSignature(env &e, types::signature *source, arglist &al); diff --git a/graphics/asymptote/array.cc b/graphics/asymptote/array.cc index 311e0cf822..c70f5e22f3 100644 --- a/graphics/asymptote/array.cc +++ b/graphics/asymptote/array.cc @@ -1,7 +1,7 @@ /***** * array.cc * Andy Hammerlindl 2008/01/26 - * + * * Array type used by virtual machine. *****/ diff --git a/graphics/asymptote/array.h b/graphics/asymptote/array.h index cc39141768..0fd353b2e1 100644 --- a/graphics/asymptote/array.h +++ b/graphics/asymptote/array.h @@ -1,7 +1,7 @@ /***** * array.h * Tom Prince 2005/06/18 - * + * * Array type used by virtual machine. *****/ @@ -18,13 +18,13 @@ extern const char *dereferenceNullArray; // Arrays are vectors with push and pop functions. class array : public mem::vector { - bool cycle; + bool cycle; void setNonBridgingSlice(size_t l, size_t r, mem::vector *a); void setBridgingSlice(size_t l, size_t r, mem::vector *a); public: array() : cycle(false) {} - + array(size_t n) : mem::vector(n), cycle(false) {} @@ -48,14 +48,14 @@ public: { return get((*this)[i]); } - + array *slice(Int left, Int right); void setSlice(Int left, Int right, array *a); void cyclic(bool b) { cycle=b; } - + bool cyclic() const { return cycle; } @@ -89,14 +89,14 @@ inline void checkEqual(size_t i, size_t j) { vm::error(buf); } -inline size_t checkArrays(const vm::array *a, const vm::array *b) +inline size_t checkArrays(const vm::array *a, const vm::array *b) { size_t asize=checkArray(a); size_t bsize=checkArray(b); checkEqual(asize,bsize); return asize; } - + // Copies an item to a depth d. If d == 0 then the item is just returned // without copying, otherwise, the array and its subarrays are copied to // depth d. diff --git a/graphics/asymptote/arrayop.h b/graphics/asymptote/arrayop.h index f63d8ae099..ee1310a914 100644 --- a/graphics/asymptote/arrayop.h +++ b/graphics/asymptote/arrayop.h @@ -24,7 +24,7 @@ using camp::tab; vm::array *copyArray(vm::array *a); vm::array *copyArray2(vm::array *a); - + template class op> void arrayOp(vm::stack *s) { @@ -73,7 +73,7 @@ void sumArray(vm::stack *s) } extern const char *arrayempty; - + template class op> void binopArray(vm::stack *s) { @@ -202,7 +202,7 @@ bool Array2Equals(vm::stack *s) if(n == 0) return true; size_t n0=checkArray(read(a,0)); if(n0 != checkArray(read(b,0))) return false; - + for(size_t i=0; i < n; ++i) { array *ai=read(a,i); array *bi=read(b,i); @@ -300,7 +300,7 @@ void searchArray(vm::stack *s) size_t u=size-1; if(key >= read(a,u)) {s->push((Int) u); return;} size_t l=0; - + while (l < u) { size_t i=(l+u)/2; if(key < read(a,i)) u=i; @@ -311,9 +311,9 @@ void searchArray(vm::stack *s) } extern string emptystring; - + void writestring(vm::stack *s); - + template void write(vm::stack *s) { @@ -325,7 +325,7 @@ void write(vm::stack *s) bool defaultfile=isdefault(it); camp::ofile *f=defaultfile ? &camp::Stdout : vm::get(it); if(!f->isOpen() || !f->enabled()) return; - + size_t size=checkArray(a); if(S != "") f->write(S); f->write(first); @@ -356,14 +356,14 @@ void writeArray(vm::stack *s) bool defaultfile=isdefault(it); camp::ofile *f=defaultfile ? &camp::Stdout : vm::get(it); if(!f->isOpen() || !f->enabled()) return; - + size_t asize=checkArray(a); size_t Asize=checkArray(A); if(f->Standard()) interact::lines=0; else if(!f->isOpen()) return; try { if(S != "") {f->write(S); f->writeline();} - + size_t i=0; bool cont=true; while(cont) { @@ -402,7 +402,7 @@ void writeArray(vm::stack *s) } f->flush(); } - + template void writeArray2(vm::stack *s) { @@ -411,10 +411,10 @@ void writeArray2(vm::stack *s) bool defaultfile=isdefault(it); camp::ofile *f=defaultfile ? &camp::Stdout : vm::get(it); if(!f->isOpen() || !f->enabled()) return; - + size_t size=checkArray(a); if(f->Standard()) interact::lines=0; - + try { for(size_t i=0; i < size; i++) { vm::item& I=(*a)[i]; @@ -443,10 +443,10 @@ void writeArray3(vm::stack *s) bool defaultfile=isdefault(it); camp::ofile *f=defaultfile ? &camp::Stdout : vm::get(it); if(!f->isOpen() || !f->enabled()) return; - + size_t size=checkArray(a); if(f->Standard()) interact::lines=0; - + try { for(size_t i=0; i < size;) { vm::item& I=(*a)[i]; @@ -477,7 +477,7 @@ void writeArray3(vm::stack *s) } template -void arrayFunc(vm::stack *s) +void arrayFunc(vm::stack *s) { array *a=pop(s); size_t size=checkArray(a); @@ -488,7 +488,7 @@ void arrayFunc(vm::stack *s) } template -void arrayFunc2(vm::stack *s) +void arrayFunc2(vm::stack *s) { array *a=pop(s); size_t size=checkArray(a); @@ -499,7 +499,7 @@ void arrayFunc2(vm::stack *s) array *ci=new array(aisize); (*c)[i]=ci; for(size_t j=0; j < aisize; j++) - (*ci)[j]=func(read(ai,j)); + (*ci)[j]=func(read(ai,j)); } s->push(c); } @@ -526,7 +526,7 @@ inline void copyArrayC(T* &dest, const vm::array *a, size_t dim=0, { size_t size=checkdimension(a,dim); dest=(placement == NoGC) ? new T[size] : new(placement) T[size]; - for(size_t i=0; i < size; i++) + for(size_t i=0; i < size; i++) dest[i]=vm::read(a,i); } @@ -536,7 +536,7 @@ inline void copyArrayC(T* &dest, const vm::array *a, T (*cast)(A), { size_t size=checkdimension(a,dim); dest=(placement == NoGC) ? new T[size] : new(placement) T[size]; - for(size_t i=0; i < size; i++) + for(size_t i=0; i < size; i++) dest[i]=cast(vm::read(a,i)); } @@ -559,17 +559,17 @@ inline void copyArray2C(T* &dest, const vm::array *a, bool square=true, buf << "second matrix dimension must be " << dim2; vm::error(buf); } - + dest=(placement == NoGC) ? new T[n*m] : new(placement) T[n*m]; for(size_t i=0; i < n; i++) { vm::array *ai=vm::read(a,i); size_t aisize=checkArray(ai); if(aisize == m) { T *desti=dest+i*m; - for(size_t j=0; j < m; j++) + for(size_t j=0; j < m; j++) desti[j]=vm::read(ai,j); } else - vm::error(square ? "matrix must be square" : + vm::error(square ? "matrix must be square" : "matrix must be rectangular"); } } @@ -581,7 +581,7 @@ inline vm::array* copyCArray2(const size_t n, const size_t m, const T* p) for(size_t i=0; i < n; ++i) { array *ai=new array(m); (*a)[i]=ai; - for(size_t j=0; j < m; ++j) + for(size_t j=0; j < m; ++j) (*ai)[j]=p[m*i+j]; } return a; diff --git a/graphics/asymptote/asy-keywords.el b/graphics/asymptote/asy-keywords.el index 5cbcecfc8a..2ab35e5d5d 100644 --- a/graphics/asymptote/asy-keywords.el +++ b/graphics/asymptote/asy-keywords.el @@ -2,7 +2,7 @@ ;; This file is automatically generated by asy-list.pl. ;; Changes will be overwritten. ;; -(defvar asy-keywords-version "2.66") +(defvar asy-keywords-version "2.67") (defvar asy-keyword-name '( and controls tension atleast curl if else while for do return break continue struct typedef new access import unravel from include quote static public private restricted this explicit true false null cycle newframe operator )) diff --git a/graphics/asymptote/asy.list b/graphics/asymptote/asy.list index 0e801ac600..08b1a1d7df 100644 --- a/graphics/asymptote/asy.list +++ b/graphics/asymptote/asy.list @@ -3401,9 +3401,9 @@ real stepfactor; RKTableau RK4; real[] newton(int iterations=, real[] f(real[]), real[][] jacobian(real[]), real[] t); real phi1(real x); -RKTableau RK3; solution integrate(real y, real c=, real f(real t, real y), real a, real b=, real h=, int n=, bool dynamic=, real tolmin=, real tolmax=, real dtmin=, real dtmax=, RKTableau tableau, bool verbose=); Solution integrate(real[] y, real[] f(real t, real[] y), real a, real b=, real h=, int n=, bool dynamic=, real tolmin=, real tolmax=, real dtmin=, real dtmax=, RKTableau tableau, bool verbose=); +RKTableau RK3; void expfactors(real x, coefficients a); real phi2(real x); void report(real old, real h, real t); @@ -3427,6 +3427,7 @@ real[] Coeff; RKTableau PC; RKTableau E_RK3BS; pen[] Grayscale(int NColors=); +bounds Range(picture pic, real min, real max)(bool automin=, real min=, bool automax=, real max=); pen[] Wheel(int NColors=); void image(frame f, real[][] data, pair initial, pair final, pen[] palette, bool transpose=, transform t=, bool copy=, bool antialias=); void image(frame f, pen[][] data, pair initial, pair final, bool transpose=, transform t=, bool copy=, bool antialias=); @@ -3437,7 +3438,6 @@ void image(picture pic=, pen f(int, int), int width, int height, pair i bounds image(picture pic=, pair[] z, real[] f, bounds range(picture pic, real min, real max)=, pen[] palette); bounds image(picture pic=, real[] x, real[] y, real[] f, bounds range(picture pic, real min, real max)=, pen[] palette); pen[] cmyk(pen[] Palette); -bounds Range(picture pic, real min, real max)(bool automin=, real min=, bool automax=, real max=); pen[] BWRainbow(int NColors, bool two); pen[] BWRainbow(int NColors=); pen[] BWRainbow2(int NColors=); @@ -3464,8 +3464,8 @@ void add(string name, picture pic, pair lb=, pair rt=); frame tiling(string name, picture pic, pair lb=, pair rt=); picture tile(real Hx=, real Hy=, pen p=, filltype filltype=); void grestore(picture pic=); -void gsave(picture pic=); pen textpen; +void gsave(picture pic=); pair align; rational[][] rationalidentity(int n); int gcd(int m, int n); @@ -3519,28 +3519,28 @@ void display(frame f, real margin=, pair align=, pen p=, string[] captions=, string caption=, pair align=, pen p=, pen figuremattpen=, bool final=); void display(string s, string caption=, pair align=, pen p=, pen figuremattpen=, bool final=); void multifigure(string[] slist, string options=, string caption=, pair align=, pen p=, pen figuremattpen=, bool step=); +int page; void subitem(string s, pen p=); pen pagenumberpen; pair pagenumberalign; pair pagenumberposition; void indexedfigure(string prefix, int first, int last, string options=, string caption=, pair align=, pen p=, pen figuremattpen=, bool step=); string texcolor(pen p); -int page; void color(string name, string color); pen foregroundcolor; void bibliography(string name); void bibliographystyle(string name); int[] lastnode; real aboveequationskip; +void nextpage(pen p=); void asyfigure(string s, string options=, string caption=, pair align=, pen p=, pen figuremattpen=, filltype filltype=, bool newslide=); void asyfilecode(bool center=, string s, string options=, string caption=, pair align=, pen p=, pen figuremattpen=, real indent=, real skip=, filltype filltype=, bool newslide=); bool itemstep; real itemskip; void remark(bool center=, string s, pair align=, pen p=, real indent=, bool minipage=, real skip=, filltype filltype=, bool step=); +void filecode(bool center=, string s, pen p=, real indent=, real skip=, filltype filltype=); void usersetting(); bool landscape; -void nextpage(pen p=); -void filecode(bool center=, string s, pen p=, real indent=, real skip=, filltype filltype=); real codeskip; void newslide(bool stepping=); pen itempen; @@ -3550,6 +3550,7 @@ void vbox(string s, pen p=); void asycode(bool center=, string s, string options=, string caption=, string preamble=, pair align=, pen p=, pen figuremattpen=, real indent=, real skip=, filltype filltype=, bool newslide=); void exitfunction(); bool havepagenumber; +void item(string s, pen p=, bool step=); real pageheight; real pagewidth; picture background; @@ -3560,31 +3561,30 @@ void title(string s, pair position=, pair align=, pen p=, string date=, string url=, bool newslide=); pair titlepageposition; pen codepen; void erasestep(int erasenode); -void item(string s, pen p=, bool step=); +string cropcode(string s); bool checkposition(); void setpens(pen red=, pen blue=, pen steppen=); void code(bool center=, string s, pen p=, real indent=, real skip=, filltype filltype=); transform tinv; pair urlskip; void numberpage(pen p=); -pen authorpen; +bool allowstepping; pen urlpen; +pair currentposition; int[] firstnode; bool firststep; -string cropcode(string s); string asywrite(string s, string preamble=); pair startposition; string oldbulletcolor; string newbulletcolor; pen datepen; -bool allowstepping; -pair currentposition; void incrementposition(pair z); pen institutionpen; void skip(real n=); @@ -3614,10 +3614,9 @@ path curve(pair c, real f(real, real), pair a, pair b); path curve(pair c, real f(real), pair a, pair b); picture slopefield(real f(real, real), pair a, pair b, int nx=, int ny=, real tickfactor=, pen p=, bool arrow(picture, path, pen, marginT(path, pen))=); picture slopefield(real f(real), pair a, pair b, int nx=, int ny=, pen p=, bool arrow(picture, path, pen, marginT(path, pen))=); -int NULL_VERTEX; +real B03(real t); patch[] maketriangle(path3 external, real f(triple), triple grad(triple), bool allowsubdivide=); real B23(real t); -real B03(real t); path3 pathinface(positionedvector v1, positionedvector v2, triple facenorm, triple edge1normout, triple edge2normout); path3 pathinface(positionedvector v1, positionedvector v2, int face, int edge1face, int edge2face); path3 bisector(path3 edgecycle, int[] savevertices); @@ -3637,6 +3636,9 @@ triple normalout(int face); patch[] quadpatches(path3 edgecycle, positionedvector[] corners, real f(triple), triple grad(triple), triple a, triple b, bool usetriangles); int[] makecircle(edge[] edges); real B13(real t); +bool check_fpt_zero(triple testpoint, real f(triple), triple grad(triple)); +bool checkptincube(triple pt, triple a, triple b); +bool checkpt(triple testpt, real f(triple), triple grad(triple), triple a, triple b); int XLOW; int YLOW; int ZLOW; @@ -3653,9 +3655,6 @@ string operator cast(positionedvector vv); triple operator cast(evaluatedpoint p); surface implicitsurface(real f(triple)=, real ff(real, real, real)=, triple a, triple b, int n=, bool keyword overlapedges=, int keyword nx=, int keyword ny=, int keyword nz=, int keyword maxdepth=, bool keyword usetriangles=); bool operator ==(edge a, edge b); -bool check_fpt_zero(triple testpoint, real f(triple), triple grad(triple)); -bool checkptincube(triple pt, triple a, triple b); -bool checkpt(triple testpt, real f(triple), triple grad(triple), triple a, triple b); patch[] triangletoquads(path3 external, real f(triple), triple grad(triple), triple a, triple b); patch trianglewithnormals(path3 external, triple n1, triple n2, triple n3); evaluatedpoint[][][] make3dgrid(triple a, triple b, int nx, int ny, int nz, real f(triple), bool allowzero=); @@ -3664,6 +3663,7 @@ evaluatedpoint[][] slice(evaluatedpoint[][] a, int start1, int end1, int start2, evaluatedpoint[][][] slice(evaluatedpoint[][][] a, int start1, int end1, int start2, int end2, int start3, int end3); positionedvector[][] slice(positionedvector[][] a, int start1, int end1, int start2, int end2); positionedvector[][][] slice(positionedvector[][][] a, int start1, int end1, int start2, int end2, int start3, int end3); +int NULL_VERTEX; revolution operator *(real[][] t, revolution r); skeleton operator init(); revolution operator init(); @@ -3682,9 +3682,9 @@ int[] frequency(real[] data, real a, real b, int n); int[][] frequency(real[] x, real[] y, real[] xbins, real[] ybins); int[][] frequency(real[] x, real[] y, pair a, pair b, int nx, int ny=); int[][] frequency(pair[] z, pair a, pair b, int nx, int ny=); -real mean(real[] A); void histogram(picture pic=, real[] bins, real[] count, real low=, pen fillpen=, pen drawpen=, bool bars=, Label legend=, real markersize=); void histogram(picture pic=, real[] data, real a, real b, int n, bool normalize=, real low=, pen fillpen=, pen drawpen=, bool bars=, Label legend=, real markersize=); +real mean(real[] A); int bins(real[] data, int max=); path topbox(pair a, pair b); path halfbox(pair a, pair b); @@ -3692,18 +3692,17 @@ real stdev(real[] A); real variance(real[] A); real legendmarkersize; real variancebiased(real[] A); -linefit operator init(); -real skewness(real[] A); -linefit leastsquares(real[] x, real[] y); real Gaussian(real x, real sigma); real Gaussian(real x); pair Gaussrandpair(); real Gaussrand(); +linefit operator init(); +real skewness(real[] A); +linefit leastsquares(real[] x, real[] y); real kurtosis(real[] A); real kurtosisexcess(real[] A); -pair[] endpoints(guide[] a); -real hwratio; Relation r4a; +pair[] endpoints(guide[] a); Relation r3; picture tableau(frame[] cards, bool number=); pair min(pair[] z); @@ -3711,31 +3710,31 @@ Component bp; Component phi; real gapfactor; Component bm; +Braid apply(Relation r, Braid b, int step, int place); Relation operator -(Relation r); Component operator init(); Braid operator init(); Relation operator init(); Syzygy operator init(); -Braid apply(Relation r, Braid b, int step, int place); Relation r4b; Component wye; pair max(pair[] z); +real hwratio; pen Orchid; -pen DarkOrchid; +pen WildStrawberry; pen Magenta; pen BrickRed; pen CadetBlue; pen CarnationPink; -pen WildStrawberry; pen SpringGreen; pen MidnightBlue; pen OliveGreen; pen Apricot; +pen Salmon; pen Cyan; pen Red; pen RawSienna; pen Mahogany; -pen Salmon; pen Gray; pen Plum; pen BlueGreen; @@ -3747,6 +3746,8 @@ pen Goldenrod; pen ForestGreen; pen BurntOrange; pen Tan; +pen Aquamarine; +pen Lavender; pen Brown; pen RubineRed; pen TealBlue; @@ -3756,34 +3757,33 @@ pen Bittersweet; pen Orange; pen OrangeRed; pen Fuchsia; -pen Aquamarine; +pen Peach; pen PineGreen; pen Dandelion; -pen Lavender; -pen Peach; pen Black; pen NavyBlue; pen Rhodamine; +pen YellowOrange; +pen Maroon; pen ProcessBlue; +pen YellowGreen; pen LimeGreen; pen Green; pen GreenYellow; -pen YellowOrange; -pen Maroon; -pen YellowGreen; +pen Sepia; pen Emerald; pen Mulberry; pen RedViolet; pen SkyBlue; pen SeaGreen; -pen Periwinkle; -pen Sepia; pen VioletRed; pen Violet; +pen Periwinkle; +pen Thistle; pen Yellow; pen JungleGreen; +pen DarkOrchid; pen CornflowerBlue; -pen Thistle; pen RoyalBlue; pen Melon; pen RoyalPurple; @@ -3816,19 +3816,21 @@ string VERSION; pen Orchid; pen Indigo; pen Beige; -pen DarkOrchid; pen SlateBlue; pen SlateGray; -pen Cornsilk; pen Magenta; pen CadetBlue; +pen LavenderBlush; pen DeepPink; +pen Wheat; pen SpringGreen; +pen PeachPuff; pen MidnightBlue; pen Olive; -pen Seashell; pen OliveDrab; -pen GhostWhite; +pen Salmon; +pen Lime; +pen SteelBlue; pen Chocolate; pen Cyan; pen Gainsboro; @@ -3838,9 +3840,8 @@ pen Red; pen Pink; pen MintCream; pen DarkTurquoise; -pen Salmon; +pen LemonChiffon; pen Gray; -pen LavenderBlush; pen MediumBlue; pen MediumOrchid; pen MediumPurple; @@ -3848,11 +3849,10 @@ pen MediumSeaGreen; pen MediumSlateBlue; pen MediumAquamarine; pen MediumSpringGreen; -pen Wheat; pen MediumTurquoise; pen MediumVioletRed; pen Plum; -pen PeachPuff; +pen Aqua; pen Blue; pen Gold; pen BlueViolet; @@ -3860,15 +3860,15 @@ pen Goldenrod; pen ForestGreen; pen Chartreuse; pen NavajoWhite; -pen Lime; -pen SteelBlue; pen Tan; pen DarkMagenta; pen AntiqueWhite; pen PaleTurquoise; +pen Aquamarine; pen IndianRed; pen Crimson; pen Azure; +pen Lavender; pen LawnGreen; pen Brown; pen BurlyWood; @@ -3877,56 +3877,55 @@ pen DarkBlue; pen Peru; pen White; pen Purple; -pen LemonChiffon; +pen Sienna; pen WhiteSmoke; pen DimGray; pen Orange; pen OrangeRed; pen Fuchsia; -pen Aquamarine; -pen Aqua; pen Honeydew; pen Bisque; -pen Lavender; pen RosyBrown; pen Black; pen Khaki; pen FireBrick; +pen DarkOliveGreen; +pen DarkOrange; pen Snow; +pen Maroon; +pen YellowGreen; pen LimeGreen; -pen Sienna; +pen Silver; pen OldLace; pen Green; pen GreenYellow; pen DarkCyan; -pen Maroon; pen FloralWhite; pen DarkRed; -pen YellowGreen; +pen SandyBrown; pen BlanchedAlmond; pen PowderBlue; pen DarkGray; +pen DeepSkyBlue; pen DarkGreen; pen DarkGoldenrod; -pen DarkOliveGreen; -pen DarkOrange; pen SkyBlue; pen SeaGreen; pen DarkViolet; pen Teal; +pen Violet; pen AliceBlue; pen HotPink; pen DodgerBlue; -pen Silver; pen SaddleBrown; pen Tomato; pen DarkKhaki; +pen Cornsilk; +pen Thistle; pen LightBlue; -pen Violet; pen LightCoral; pen Yellow; pen LightCyan; -pen SandyBrown; pen PaleGreen; pen Linen; pen LightGoldenrodYellow; @@ -3939,15 +3938,16 @@ pen LightSeaGreen; pen Navy; pen LightSkyBlue; pen PaleVioletRed; +pen Seashell; +pen DarkOrchid; pen CornflowerBlue; pen LightSlateGray; pen LightSteelBlue; pen rgbint(int r, int g, int b); pen LightYellow; pen Coral; -pen DeepSkyBlue; pen MistyRose; -pen Thistle; +pen GhostWhite; pen DarkSalmon; pen DarkSeaGreen; pen RoyalBlue; diff --git a/graphics/asymptote/asymptote.spec b/graphics/asymptote/asymptote.spec index 640de0e46c..348ca52546 100644 --- a/graphics/asymptote/asymptote.spec +++ b/graphics/asymptote/asymptote.spec @@ -3,7 +3,7 @@ %global __python %{__python3} Name: asymptote -Version: 2.66 +Version: 2.67 Release: 1%{?dist} Summary: Descriptive vector graphics language diff --git a/graphics/asymptote/base/animation.asy b/graphics/asymptote/base/animation.asy index f12ee75f2b..1ce89c60e6 100644 --- a/graphics/asymptote/base/animation.asy +++ b/graphics/asymptote/base/animation.asy @@ -30,14 +30,14 @@ struct animation { string prefix; bool global; // If true, use a global scaling for all frames; this requires // extra memory since the actual shipout is deferred until all frames have - // been generated. + // been generated. void operator init(string prefix="", bool global=true) { prefix=replace(stripdirectory(outprefix(prefix))," ","_"); this.prefix=prefix; this.global=global; } - + string basename(string prefix=stripextension(prefix)) { return "_"+prefix; } @@ -57,14 +57,14 @@ struct animation { plain.shipout(name,f,format=format,view=false); files.push(name+"."+format); } - + void add(picture pic=currentpicture, enclosure enclosure=NoBox) { if(global) { ++index; pictures.push(pic.copy()); } else this.shipout(enclosure(pic.fit())); } - + void purge(bool keep=settings.keep) { if(!keep) { for(int i=0; i < files.length; ++i) @@ -130,7 +130,7 @@ struct animation { return s; } - bool pdflatex() + bool pdflatex() { return latex() && pdf(); } @@ -143,13 +143,13 @@ struct animation { if(!pdflatex()) abort("inline pdf animations require -tex pdflatex or -tex xelatex"); if(settings.outformat != "") settings.outformat="pdf"; - + string filename=basename(); string pdfname=filename+".pdf"; if(global) export(filename,enclosure,multipage=multipage); - + if(!keep) { exitfcn currentexitfunction=atexit(); void exitfunction() { diff --git a/graphics/asymptote/base/babel.asy b/graphics/asymptote/base/babel.asy index e93dec2a5c..ada173c8a9 100644 --- a/graphics/asymptote/base/babel.asy +++ b/graphics/asymptote/base/babel.asy @@ -1,4 +1,4 @@ -void babel(string s) +void babel(string s) { usepackage("babel",s); } diff --git a/graphics/asymptote/base/bezulate.asy b/graphics/asymptote/base/bezulate.asy index 38d35718d4..756ee00ac3 100644 --- a/graphics/asymptote/base/bezulate.asy +++ b/graphics/asymptote/base/bezulate.asy @@ -106,29 +106,29 @@ void connect(path[] paths, path[] result, path[] patch) //if(direction == 0) // Try a random direction // direction=expi(2pi*unitrand()); //pair start=point(inners[curveIndex],0); - + // find shortest distance between a node on the inner curve and a node // on the outer curve - + real mindist = d; int inner_i = 0; int outer_i = 0; for(int ni = 0; ni < length(inners[curveIndex]); ++ni) - { + { for(int no = 0; no < length(outer); ++no) - { + { real dist = abs(point(inners[curveIndex],ni)-point(outer,no)); if(dist < mindist) - { + { inner_i = ni; outer_i = no; mindist = dist; - } - } - } + } + } + } pair start=point(inners[curveIndex],inner_i); - pair end = point(outer,outer_i); - + pair end = point(outer,outer_i); + // find first intersection of line segment with outer curve //real[][] ints=intersections(start,start+d*direction,outer); real[][] ints=intersections(start,end,outer); @@ -140,7 +140,7 @@ void connect(path[] paths, path[] result, path[] patch) real earliestTime=1; for(int j=0; j < inners.length; ++j) { real[][] ints=intersections(end,start,inners[j]); - + if(ints.length > 0 && ints[0][0] < earliestTime) { earliestTime=ints[0][0]; // time on end--start starttime=ints[0][1]; // time on inner curve @@ -148,8 +148,8 @@ void connect(path[] paths, path[] result, path[] patch) } } start=point(inners[curveIndex],starttime); - - + + bool found_forward = false; real timeoffset_forward = 2; path portion_forward; @@ -162,7 +162,7 @@ void connect(path[] paths, path[] result, path[] patch) point(outer,endtime+timeoffset_forward)) == 2) { portion_forward = subpath(outer,endtime,endtime+timeoffset_forward)--start--cycle; - + found_forward=true; // check if an inner curve is inside the portion for(int k = 0; found_forward && k < inners.length; ++k) @@ -173,7 +173,7 @@ void connect(path[] paths, path[] result, path[] patch) } } } - + bool found_backward = false; real timeoffset_backward = -2; path portion_backward; @@ -197,29 +197,29 @@ void connect(path[] paths, path[] result, path[] patch) real timeoffset; path portion; if(found_forward && !found_backward) - { - timeoffset = timeoffset_forward; - portion = portion_forward; - } - else if(found_backward && !found_forward) - { - timeoffset = timeoffset_backward; - portion = portion_backward; - } - else // assert handles case of neither found - { - if(timeoffset_forward > -timeoffset_backward) { timeoffset = timeoffset_forward; portion = portion_forward; } - else + else if(found_backward && !found_forward) { timeoffset = timeoffset_backward; portion = portion_backward; - } - } - + } + else // assert handles case of neither found + { + if(timeoffset_forward > -timeoffset_backward) + { + timeoffset = timeoffset_forward; + portion = portion_forward; + } + else + { + timeoffset = timeoffset_backward; + portion = portion_backward; + } + } + endtime=min(endtime,endtime+timeoffset); // or go from timeoffset+timeoffset_backward to timeoffset+timeoffset_forward? timeoffset=abs(timeoffset); diff --git a/graphics/asymptote/base/binarytree.asy b/graphics/asymptote/base/binarytree.asy index 31e0e3aab6..4906c6ee58 100644 --- a/graphics/asymptote/base/binarytree.asy +++ b/graphics/asymptote/base/binarytree.asy @@ -48,8 +48,8 @@ struct binarytreeNode { int right_span,total_right_span; void update_spans(); - // Get the horizontal span of the tree consisting of the current - // node plus the whole subtree that is rooted at the right child + // Get the horizontal span of the tree consisting of the current + // node plus the whole subtree that is rooted at the right child // (condensed mode) int getTotalRightSpan() { if(spans_calculated == false) { @@ -59,8 +59,8 @@ struct binarytreeNode { return total_right_span; } - // Get the horizontal span of the tree consisting of the current - // node plus the whole subtree that is rooted at the left child + // Get the horizontal span of the tree consisting of the current + // node plus the whole subtree that is rooted at the left child // (condensed mode) int getTotalLeftSpan() { if(spans_calculated == false) { @@ -87,27 +87,27 @@ struct binarytreeNode { return left_span; } - // Update all span figures for this node. + // Update all span figures for this node. // condensed mode) update_spans=new void() { - if(spans_calculated == true) - return; - - left_span=0; - total_left_span=0; - right_span=0; - total_right_span=0; - - if(left != null) { - left_span=left.getTotalRightSpan()+1; - total_left_span=left_span+left.getTotalLeftSpan(); - } - - if(right != null) { - right_span=right.getTotalLeftSpan()+1; - total_right_span=right_span+right.getTotalRightSpan(); - } - spans_calculated=true; + if(spans_calculated == true) + return; + + left_span=0; + total_left_span=0; + right_span=0; + total_right_span=0; + + if(left != null) { + left_span=left.getTotalRightSpan()+1; + total_left_span=left_span+left.getTotalLeftSpan(); + } + + if(right != null) { + right_span=right.getTotalLeftSpan()+1; + total_right_span=right_span+right.getTotalRightSpan(); + } + spans_calculated=true; }; // set the left child of this node @@ -134,20 +134,20 @@ struct binarytreeNode { else return parent.getLevel()+1; } - + // set the children of this binarytreeNode void setChildren(binarytreeNode left, binarytreeNode right) { setLeft(left); setRight(right); } - - // create a new binarytreeNode with key + + // create a new binarytreeNode with key static binarytreeNode binarytreeNode(int key) { binarytreeNode toReturn=new binarytreeNode; toReturn.key=key; return toReturn; } - + // returns the height of the subtree rooted at this node. int getHeight() { if(left == null && right == null) @@ -156,7 +156,7 @@ struct binarytreeNode { return right.getHeight()+1; if(right == null) return left.getHeight()+1; - + return max(left.getHeight(),right.getHeight())+1; } } @@ -175,12 +175,12 @@ object draw(picture pic=currentpicture, binarytreeNode node, pair pos, int height, real minDist, real levelDist, real nodeDiameter, pen p=currentpen, bool condensed=false) { Label label=Label(math((string) node.key),pos); - - binarytreeNode left=node.left; + + binarytreeNode left=node.left; binarytreeNode right=node.right; // return the distance for two nodes at the given when the - // containing tree has height + // containing tree has height // and the minimal distance between two nodes is . real getDistance(int level, int height, real minDist) { return(nodeDiameter+minDist)*2^(height-level); @@ -205,15 +205,15 @@ object draw(picture pic=currentpicture, binarytreeNode node, pair pos, // arrow. void deferredDrawNodeConnection(pair parentPos, pair childPos) { pic.add(new void(frame f, transform t) { - pair start,end; - // calculate connection path - transform T=shift(nodeDiameter/2*unit(t*childPos-t*parentPos)); - path arr=(T*t*parentPos)--(inverse(T)*t*childPos); - draw(f,PenMargin(arr,p).g,p,Arrow(5)); - }); + pair start,end; + // calculate connection path + transform T=shift(nodeDiameter/2*unit(t*childPos-t*parentPos)); + path arr=(T*t*parentPos)--(inverse(T)*t*childPos); + draw(f,PenMargin(arr,p).g,p,Arrow(5)); + }); pic.addPoint(parentPos); pic.addPoint(childPos); - } + } if(left != null) { pair childPos; @@ -238,13 +238,13 @@ object draw(picture pic=currentpicture, binarytreeNode node, pair pos, draw(pic,right,childPos,height,minDist,levelDist,nodeDiameter,p,condensed); deferredDrawNodeConnection(pos,childPos); } - + picture obj; draw(obj,circle((0,0),nodeDiameter/2),p); label(obj,label,(0,0),p); - + add(pic,obj,pos); - + return label; } @@ -270,18 +270,18 @@ key nil=key(0,false); struct binarytree { binarytreeNode root; int[] keys; - + // add the given to the tree by searching for its place and // inserting it there. void addKey(int key) { binarytreeNode newNode=binarytreeNode(key); - + if(root == null) { root=newNode; keys.push(key); - return; + return; } - + binarytreeNode n=root; while(n != null) { if(key < n.key) { @@ -303,7 +303,7 @@ struct binarytree { } } } - + // return the height of the tree int getHeight() { if(root == null) @@ -311,7 +311,7 @@ struct binarytree { else return root.getHeight(); } - + // add all given keys to the tree sequentially void addSearchKeys(int[] keys) { for(int i=0; i < keys.length; ++i) { @@ -321,7 +321,7 @@ struct binarytree { addKey(key); } } - + binarytreeNode build(key[] keys, int[] ind) { if(ind[0] >= keys.length) return null; key k=keys[ind[0]]; @@ -369,9 +369,9 @@ void draw(picture pic=currentpicture, binarytree tree, pen p=currentpen, bool condensed=false) { int[] keys=tree.getKeys(); - + // calculate the node diameter so that all keys fit into it - frame f; + frame f; for(int i=0; i < keys.length; ++i) label(f,math(string(keys[i])),p); diff --git a/graphics/asymptote/base/bsp.asy b/graphics/asymptote/base/bsp.asy index cf9d7e0781..526f264a77 100644 --- a/graphics/asymptote/base/bsp.asy +++ b/graphics/asymptote/base/bsp.asy @@ -33,13 +33,13 @@ struct face { picture operator cast(face f) {return f.pic;} face operator cast(path3 p) {return face(p);} - + struct line { triple point; triple dir; } -private line intersection(face a, face b) +private line intersection(face a, face b) { line L; L.point=intersectionpoint(a.normal,a.point,b.normal,b.point); @@ -49,12 +49,12 @@ private line intersection(face a, face b) struct half { pair[] left,right; - + // Sort the points in the pair array z according to whether they lie on the // left or right side of the line L in the direction dir passing through P. // Points exactly on L are considered to be on the right side. // Also push any points of intersection of L with the path operator --(... z) - // onto each of the arrays left and right. + // onto each of the arrays left and right. void operator init(pair dir, pair P ... pair[] z) { pair lastz; pair invdir=dir != 0 ? 1/dir : 0; @@ -73,7 +73,7 @@ struct half { } } } - + struct splitface { face back,front; } @@ -84,7 +84,7 @@ splitface split(face a, face cut, projection P) splitface S; void nointersection() { - if(abs(dot(a.point-P.camera,a.normal)) >= + if(abs(dot(a.point-P.camera,a.normal)) >= abs(dot(cut.point-P.camera,cut.normal))) { S.back=a; S.front=null; @@ -113,7 +113,7 @@ splitface split(face a, face cut, projection P) nointersection(); return S; } - + pair point=a.t*project(L.point,P); pair dir=a.t*project(L.point+L.dir,P)-point; pair invdir=dir != 0 ? 1/dir : 0; @@ -122,7 +122,7 @@ splitface split(face a, face cut, projection P) real t=intersect(apoint,P.camera,cut.normal,cut.point); bool rightfront=left ^ (t <= 0 || t >= 1); - + face back=a, front=a.copy(); pair max=max(a.fit); pair min=min(a.fit); @@ -151,7 +151,7 @@ struct bsp bsp back; bsp front; face node; - + // Construct the bsp. void operator init(face[] faces, projection P) { if(faces.length != 0) { @@ -166,7 +166,7 @@ struct bsp this.back=bsp(back,P); } } - + // Draw from back to front. void add(frame f) { if(back != null) back.add(f); @@ -183,22 +183,22 @@ void add(picture pic=currentpicture, face[] faces, face[] Faces=new face[n]; for(int i=0; i < n; ++i) Faces[i]=faces[i].copy(); - + pic.add(new void (frame f, transform t, transform T, - pair m, pair M) { - // Fit all of the pictures so we know their exact sizes. - face[] faces=new face[n]; - for(int i=0; i < n; ++i) { - faces[i]=Faces[i].copy(); - face F=faces[i]; - F.t=t*T*F.pic.T; - F.fit=F.pic.fit(t,T*F.pic.T,m,M); - } - - bsp bsp=bsp(faces,P); - if(bsp != null) bsp.add(f); + pair m, pair M) { + // Fit all of the pictures so we know their exact sizes. + face[] faces=new face[n]; + for(int i=0; i < n; ++i) { + faces[i]=Faces[i].copy(); + face F=faces[i]; + F.t=t*T*F.pic.T; + F.fit=F.pic.fit(t,T*F.pic.T,m,M); + } + + bsp bsp=bsp(faces,P); + if(bsp != null) bsp.add(f); }); - + for(int i=0; i < n; ++i) { picture F=Faces[i].pic; pic.userBox3(F.userMin3(), F.userMax3()); diff --git a/graphics/asymptote/base/colormap.asy b/graphics/asymptote/base/colormap.asy index 4b2242d661..8ab4e420d1 100644 --- a/graphics/asymptote/base/colormap.asy +++ b/graphics/asymptote/base/colormap.asy @@ -10,7 +10,7 @@ // pen[] Palette = wistia.palette() // // There are two types of palettes. For a complete list see below: -// +// // 1) The segmented palettes can be used as // .palette(int NColors=256, real gamma=1.) // NColors are the number of colors in the palette @@ -19,7 +19,7 @@ // 2) The listed palettes can only be used as // .palette() // -// Both functions return pen[] that can be used as a palette in the +// Both functions return pen[] that can be used as a palette in the // module palette. // list of palettes @@ -112,7 +112,7 @@ // SOURCE CODE // private real[] makeMappingArray(int N, triple[] data, real gamma=1.) { - real[] x; + real[] x; real[] y0; real[] y1; @@ -121,13 +121,13 @@ private real[] makeMappingArray(int N, triple[] data, real gamma=1.) { y0.push(data[i].y); y1.push(data[i].z); }; - + x = x*(N-1); - real[] lut = new real[N]; + real[] lut = new real[N]; real[] xind = (N - 1) * uniform(0, 1, N-1) ** gamma; int[] ind = map(new int(real xi) {return search(x, xi);}, xind); ind = ind[1:N-1]; // note that the index is shifted from python - + real[] dist = (xind[1:N-1] - x[ind])/(x[ind+1] - x[ind]); lut[1:N-1] = dist * (y0[ind+1] - y1[ind]) + y1[ind]; @@ -153,9 +153,9 @@ struct seg_data { real[] green = makeMappingArray(NColors, this.g, gamma); real[] blue = makeMappingArray(NColors, this.b, gamma); - pen[] pal = - sequence(new pen(int i) {return rgb(red[i], green[i], blue[i]);}, - NColors); + pen[] pal = + sequence(new pen(int i) {return rgb(red[i], green[i], blue[i]);}, + NColors); return pal; } @@ -174,3717 +174,3717 @@ struct list_data { // DATA // list_data Accent = list_data(new pen[] { - rgb (0.4980392156862745, 0.788235294117647, 0.4980392156862745) , - rgb (0.7450980392156863, 0.6823529411764706, 0.8313725490196079) , - rgb (0.9921568627450981, 0.7529411764705882, 0.5254901960784314) , - rgb (1.0, 1.0, 0.6) , - rgb (0.2196078431372549, 0.4235294117647059, 0.6901960784313725) , - rgb (0.9411764705882353, 0.00784313725490196, 0.4980392156862745) , - rgb (0.7490196078431373, 0.3568627450980392, 0.09019607843137253) , - rgb (0.4, 0.4, 0.4) -}); + rgb (0.4980392156862745, 0.788235294117647, 0.4980392156862745) , + rgb (0.7450980392156863, 0.6823529411764706, 0.8313725490196079) , + rgb (0.9921568627450981, 0.7529411764705882, 0.5254901960784314) , + rgb (1.0, 1.0, 0.6) , + rgb (0.2196078431372549, 0.4235294117647059, 0.6901960784313725) , + rgb (0.9411764705882353, 0.00784313725490196, 0.4980392156862745) , + rgb (0.7490196078431373, 0.3568627450980392, 0.09019607843137253) , + rgb (0.4, 0.4, 0.4) + }); list_data Blues = list_data(new pen[] { - rgb (0.9686274509803922, 0.984313725490196, 1.0) , - rgb (0.8705882352941177, 0.9215686274509803, 0.9686274509803922) , - rgb (0.7764705882352941, 0.8588235294117647, 0.9372549019607843) , - rgb (0.6196078431372549, 0.792156862745098, 0.8823529411764706) , - rgb (0.4196078431372549, 0.6823529411764706, 0.8392156862745098) , - rgb (0.25882352941176473, 0.5725490196078431, 0.7764705882352941) , - rgb (0.12941176470588237, 0.44313725490196076, 0.7098039215686275) , - rgb (0.03137254901960784, 0.3176470588235294, 0.611764705882353) , - rgb (0.03137254901960784, 0.18823529411764706, 0.4196078431372549) -}); + rgb (0.9686274509803922, 0.984313725490196, 1.0) , + rgb (0.8705882352941177, 0.9215686274509803, 0.9686274509803922) , + rgb (0.7764705882352941, 0.8588235294117647, 0.9372549019607843) , + rgb (0.6196078431372549, 0.792156862745098, 0.8823529411764706) , + rgb (0.4196078431372549, 0.6823529411764706, 0.8392156862745098) , + rgb (0.25882352941176473, 0.5725490196078431, 0.7764705882352941) , + rgb (0.12941176470588237, 0.44313725490196076, 0.7098039215686275) , + rgb (0.03137254901960784, 0.3176470588235294, 0.611764705882353) , + rgb (0.03137254901960784, 0.18823529411764706, 0.4196078431372549) + }); list_data BrBG = list_data(new pen[] { - rgb (0.32941176470588235, 0.18823529411764706, 0.0196078431372549) , - rgb (0.5490196078431373, 0.3176470588235294, 0.0392156862745098) , - rgb (0.7490196078431373, 0.5058823529411764, 0.17647058823529413) , - rgb (0.8745098039215686, 0.7607843137254902, 0.49019607843137253) , - rgb (0.9647058823529412, 0.9098039215686274, 0.7647058823529411) , - rgb (0.9607843137254902, 0.9607843137254902, 0.9607843137254902) , - rgb (0.7803921568627451, 0.9176470588235294, 0.8980392156862745) , - rgb (0.5019607843137255, 0.803921568627451, 0.7568627450980392) , - rgb (0.20784313725490197, 0.592156862745098, 0.5607843137254902) , - rgb (0.00392156862745098, 0.4, 0.3686274509803922) , - rgb (0.0, 0.23529411764705882, 0.18823529411764706) -}); + rgb (0.32941176470588235, 0.18823529411764706, 0.0196078431372549) , + rgb (0.5490196078431373, 0.3176470588235294, 0.0392156862745098) , + rgb (0.7490196078431373, 0.5058823529411764, 0.17647058823529413) , + rgb (0.8745098039215686, 0.7607843137254902, 0.49019607843137253) , + rgb (0.9647058823529412, 0.9098039215686274, 0.7647058823529411) , + rgb (0.9607843137254902, 0.9607843137254902, 0.9607843137254902) , + rgb (0.7803921568627451, 0.9176470588235294, 0.8980392156862745) , + rgb (0.5019607843137255, 0.803921568627451, 0.7568627450980392) , + rgb (0.20784313725490197, 0.592156862745098, 0.5607843137254902) , + rgb (0.00392156862745098, 0.4, 0.3686274509803922) , + rgb (0.0, 0.23529411764705882, 0.18823529411764706) + }); list_data BuGn = list_data(new pen[] { - rgb (0.9686274509803922, 0.9882352941176471, 0.9921568627450981) , - rgb (0.8980392156862745, 0.9607843137254902, 0.9764705882352941) , - rgb (0.8, 0.9254901960784314, 0.9019607843137255) , - rgb (0.6, 0.8470588235294118, 0.788235294117647) , - rgb (0.4, 0.7607843137254902, 0.6431372549019608) , - rgb (0.2549019607843137, 0.6823529411764706, 0.4627450980392157) , - rgb (0.13725490196078433, 0.5450980392156862, 0.27058823529411763) , - rgb (0.0, 0.42745098039215684, 0.17254901960784313) , - rgb (0.0, 0.26666666666666666, 0.10588235294117647) -}); + rgb (0.9686274509803922, 0.9882352941176471, 0.9921568627450981) , + rgb (0.8980392156862745, 0.9607843137254902, 0.9764705882352941) , + rgb (0.8, 0.9254901960784314, 0.9019607843137255) , + rgb (0.6, 0.8470588235294118, 0.788235294117647) , + rgb (0.4, 0.7607843137254902, 0.6431372549019608) , + rgb (0.2549019607843137, 0.6823529411764706, 0.4627450980392157) , + rgb (0.13725490196078433, 0.5450980392156862, 0.27058823529411763) , + rgb (0.0, 0.42745098039215684, 0.17254901960784313) , + rgb (0.0, 0.26666666666666666, 0.10588235294117647) + }); list_data BuPu = list_data(new pen[] { - rgb (0.9686274509803922, 0.9882352941176471, 0.9921568627450981) , - rgb (0.8784313725490196, 0.9254901960784314, 0.9568627450980393) , - rgb (0.7490196078431373, 0.8274509803921568, 0.9019607843137255) , - rgb (0.6196078431372549, 0.7372549019607844, 0.8549019607843137) , - rgb (0.5490196078431373, 0.5882352941176471, 0.7764705882352941) , - rgb (0.5490196078431373, 0.4196078431372549, 0.6941176470588235) , - rgb (0.5333333333333333, 0.2549019607843137, 0.615686274509804) , - rgb (0.5058823529411764, 0.05882352941176471, 0.48627450980392156) , - rgb (0.30196078431372547, 0.0, 0.29411764705882354) -}); + rgb (0.9686274509803922, 0.9882352941176471, 0.9921568627450981) , + rgb (0.8784313725490196, 0.9254901960784314, 0.9568627450980393) , + rgb (0.7490196078431373, 0.8274509803921568, 0.9019607843137255) , + rgb (0.6196078431372549, 0.7372549019607844, 0.8549019607843137) , + rgb (0.5490196078431373, 0.5882352941176471, 0.7764705882352941) , + rgb (0.5490196078431373, 0.4196078431372549, 0.6941176470588235) , + rgb (0.5333333333333333, 0.2549019607843137, 0.615686274509804) , + rgb (0.5058823529411764, 0.05882352941176471, 0.48627450980392156) , + rgb (0.30196078431372547, 0.0, 0.29411764705882354) + }); seg_data CMRmap = seg_data( - new triple[] { // red - (0.0, 0.0, 0.0) , - (0.125, 0.15, 0.15) , - (0.25, 0.3, 0.3) , - (0.375, 0.6, 0.6) , - (0.5, 1.0, 1.0) , - (0.625, 0.9, 0.9) , - (0.75, 0.9, 0.9) , - (0.875, 0.9, 0.9) , - (1.0, 1.0, 1.0) - }, - new triple[] { // green - (0.0, 0.0, 0.0) , - (0.125, 0.15, 0.15) , - (0.25, 0.15, 0.15) , - (0.375, 0.2, 0.2) , - (0.5, 0.25, 0.25) , - (0.625, 0.5, 0.5) , - (0.75, 0.75, 0.75) , - (0.875, 0.9, 0.9) , - (1.0, 1.0, 1.0) - }, - new triple[] { // blue - (0.0, 0.0, 0.0) , - (0.125, 0.5, 0.5) , - (0.25, 0.75, 0.75) , - (0.375, 0.5, 0.5) , - (0.5, 0.15, 0.15) , - (0.625, 0.0, 0.0) , - (0.75, 0.1, 0.1) , - (0.875, 0.5, 0.5) , - (1.0, 1.0, 1.0) - } -); + new triple[] { // red + (0.0, 0.0, 0.0) , + (0.125, 0.15, 0.15) , + (0.25, 0.3, 0.3) , + (0.375, 0.6, 0.6) , + (0.5, 1.0, 1.0) , + (0.625, 0.9, 0.9) , + (0.75, 0.9, 0.9) , + (0.875, 0.9, 0.9) , + (1.0, 1.0, 1.0) + }, + new triple[] { // green + (0.0, 0.0, 0.0) , + (0.125, 0.15, 0.15) , + (0.25, 0.15, 0.15) , + (0.375, 0.2, 0.2) , + (0.5, 0.25, 0.25) , + (0.625, 0.5, 0.5) , + (0.75, 0.75, 0.75) , + (0.875, 0.9, 0.9) , + (1.0, 1.0, 1.0) + }, + new triple[] { // blue + (0.0, 0.0, 0.0) , + (0.125, 0.5, 0.5) , + (0.25, 0.75, 0.75) , + (0.375, 0.5, 0.5) , + (0.5, 0.15, 0.15) , + (0.625, 0.0, 0.0) , + (0.75, 0.1, 0.1) , + (0.875, 0.5, 0.5) , + (1.0, 1.0, 1.0) + } + ); list_data Dark2 = list_data(new pen[] { - rgb (0.10588235294117647, 0.6196078431372549, 0.4666666666666667) , - rgb (0.8509803921568627, 0.37254901960784315, 0.00784313725490196) , - rgb (0.4588235294117647, 0.4392156862745098, 0.7019607843137254) , - rgb (0.9058823529411765, 0.1607843137254902, 0.5411764705882353) , - rgb (0.4, 0.6509803921568628, 0.11764705882352941) , - rgb (0.9019607843137255, 0.6705882352941176, 0.00784313725490196) , - rgb (0.6509803921568628, 0.4627450980392157, 0.11372549019607843) , - rgb (0.4, 0.4, 0.4) -}); + rgb (0.10588235294117647, 0.6196078431372549, 0.4666666666666667) , + rgb (0.8509803921568627, 0.37254901960784315, 0.00784313725490196) , + rgb (0.4588235294117647, 0.4392156862745098, 0.7019607843137254) , + rgb (0.9058823529411765, 0.1607843137254902, 0.5411764705882353) , + rgb (0.4, 0.6509803921568628, 0.11764705882352941) , + rgb (0.9019607843137255, 0.6705882352941176, 0.00784313725490196) , + rgb (0.6509803921568628, 0.4627450980392157, 0.11372549019607843) , + rgb (0.4, 0.4, 0.4) + }); list_data GnBu = list_data(new pen[] { - rgb (0.9686274509803922, 0.9882352941176471, 0.9411764705882353) , - rgb (0.8784313725490196, 0.9529411764705882, 0.8588235294117647) , - rgb (0.8, 0.9215686274509803, 0.7725490196078432) , - rgb (0.6588235294117647, 0.8666666666666667, 0.7098039215686275) , - rgb (0.4823529411764706, 0.8, 0.7686274509803922) , - rgb (0.3058823529411765, 0.7019607843137254, 0.8274509803921568) , - rgb (0.16862745098039217, 0.5490196078431373, 0.7450980392156863) , - rgb (0.03137254901960784, 0.40784313725490196, 0.6745098039215687) , - rgb (0.03137254901960784, 0.25098039215686274, 0.5058823529411764) -}); + rgb (0.9686274509803922, 0.9882352941176471, 0.9411764705882353) , + rgb (0.8784313725490196, 0.9529411764705882, 0.8588235294117647) , + rgb (0.8, 0.9215686274509803, 0.7725490196078432) , + rgb (0.6588235294117647, 0.8666666666666667, 0.7098039215686275) , + rgb (0.4823529411764706, 0.8, 0.7686274509803922) , + rgb (0.3058823529411765, 0.7019607843137254, 0.8274509803921568) , + rgb (0.16862745098039217, 0.5490196078431373, 0.7450980392156863) , + rgb (0.03137254901960784, 0.40784313725490196, 0.6745098039215687) , + rgb (0.03137254901960784, 0.25098039215686274, 0.5058823529411764) + }); list_data Greens = list_data(new pen[] { - rgb (0.9686274509803922, 0.9882352941176471, 0.9607843137254902) , - rgb (0.8980392156862745, 0.9607843137254902, 0.8784313725490196) , - rgb (0.7803921568627451, 0.9137254901960784, 0.7529411764705882) , - rgb (0.6313725490196078, 0.8509803921568627, 0.6078431372549019) , - rgb (0.4549019607843137, 0.7686274509803922, 0.4627450980392157) , - rgb (0.2549019607843137, 0.6705882352941176, 0.36470588235294116) , - rgb (0.13725490196078433, 0.5450980392156862, 0.27058823529411763) , - rgb (0.0, 0.42745098039215684, 0.17254901960784313) , - rgb (0.0, 0.26666666666666666, 0.10588235294117647) -}); + rgb (0.9686274509803922, 0.9882352941176471, 0.9607843137254902) , + rgb (0.8980392156862745, 0.9607843137254902, 0.8784313725490196) , + rgb (0.7803921568627451, 0.9137254901960784, 0.7529411764705882) , + rgb (0.6313725490196078, 0.8509803921568627, 0.6078431372549019) , + rgb (0.4549019607843137, 0.7686274509803922, 0.4627450980392157) , + rgb (0.2549019607843137, 0.6705882352941176, 0.36470588235294116) , + rgb (0.13725490196078433, 0.5450980392156862, 0.27058823529411763) , + rgb (0.0, 0.42745098039215684, 0.17254901960784313) , + rgb (0.0, 0.26666666666666666, 0.10588235294117647) + }); list_data Greys = list_data(new pen[] { - rgb (1.0, 1.0, 1.0) , - rgb (0.9411764705882353, 0.9411764705882353, 0.9411764705882353) , - rgb (0.8509803921568627, 0.8509803921568627, 0.8509803921568627) , - rgb (0.7411764705882353, 0.7411764705882353, 0.7411764705882353) , - rgb (0.5882352941176471, 0.5882352941176471, 0.5882352941176471) , - rgb (0.45098039215686275, 0.45098039215686275, 0.45098039215686275) , - rgb (0.3215686274509804, 0.3215686274509804, 0.3215686274509804) , - rgb (0.1450980392156863, 0.1450980392156863, 0.1450980392156863) , - rgb (0.0, 0.0, 0.0) -}); + rgb (1.0, 1.0, 1.0) , + rgb (0.9411764705882353, 0.9411764705882353, 0.9411764705882353) , + rgb (0.8509803921568627, 0.8509803921568627, 0.8509803921568627) , + rgb (0.7411764705882353, 0.7411764705882353, 0.7411764705882353) , + rgb (0.5882352941176471, 0.5882352941176471, 0.5882352941176471) , + rgb (0.45098039215686275, 0.45098039215686275, 0.45098039215686275) , + rgb (0.3215686274509804, 0.3215686274509804, 0.3215686274509804) , + rgb (0.1450980392156863, 0.1450980392156863, 0.1450980392156863) , + rgb (0.0, 0.0, 0.0) + }); list_data OrRd = list_data(new pen[] { - rgb (1.0, 0.9686274509803922, 0.9254901960784314) , - rgb (0.996078431372549, 0.9098039215686274, 0.7843137254901961) , - rgb (0.9921568627450981, 0.8313725490196079, 0.6196078431372549) , - rgb (0.9921568627450981, 0.7333333333333333, 0.5176470588235295) , - rgb (0.9882352941176471, 0.5529411764705883, 0.34901960784313724) , - rgb (0.9372549019607843, 0.396078431372549, 0.2823529411764706) , - rgb (0.8431372549019608, 0.18823529411764706, 0.12156862745098039) , - rgb (0.7019607843137254, 0.0, 0.0) , - rgb (0.4980392156862745, 0.0, 0.0) -}); + rgb (1.0, 0.9686274509803922, 0.9254901960784314) , + rgb (0.996078431372549, 0.9098039215686274, 0.7843137254901961) , + rgb (0.9921568627450981, 0.8313725490196079, 0.6196078431372549) , + rgb (0.9921568627450981, 0.7333333333333333, 0.5176470588235295) , + rgb (0.9882352941176471, 0.5529411764705883, 0.34901960784313724) , + rgb (0.9372549019607843, 0.396078431372549, 0.2823529411764706) , + rgb (0.8431372549019608, 0.18823529411764706, 0.12156862745098039) , + rgb (0.7019607843137254, 0.0, 0.0) , + rgb (0.4980392156862745, 0.0, 0.0) + }); list_data Oranges = list_data(new pen[] { - rgb (1.0, 0.9607843137254902, 0.9215686274509803) , - rgb (0.996078431372549, 0.9019607843137255, 0.807843137254902) , - rgb (0.9921568627450981, 0.8156862745098039, 0.6352941176470588) , - rgb (0.9921568627450981, 0.6823529411764706, 0.4196078431372549) , - rgb (0.9921568627450981, 0.5529411764705883, 0.23529411764705882) , - rgb (0.9450980392156862, 0.4117647058823529, 0.07450980392156863) , - rgb (0.8509803921568627, 0.2823529411764706, 0.00392156862745098) , - rgb (0.6509803921568628, 0.21176470588235294, 0.01176470588235294) , - rgb (0.4980392156862745, 0.15294117647058825, 0.01568627450980392) -}); + rgb (1.0, 0.9607843137254902, 0.9215686274509803) , + rgb (0.996078431372549, 0.9019607843137255, 0.807843137254902) , + rgb (0.9921568627450981, 0.8156862745098039, 0.6352941176470588) , + rgb (0.9921568627450981, 0.6823529411764706, 0.4196078431372549) , + rgb (0.9921568627450981, 0.5529411764705883, 0.23529411764705882) , + rgb (0.9450980392156862, 0.4117647058823529, 0.07450980392156863) , + rgb (0.8509803921568627, 0.2823529411764706, 0.00392156862745098) , + rgb (0.6509803921568628, 0.21176470588235294, 0.01176470588235294) , + rgb (0.4980392156862745, 0.15294117647058825, 0.01568627450980392) + }); list_data PRGn = list_data(new pen[] { - rgb (0.25098039215686274, 0.0, 0.29411764705882354) , - rgb (0.4627450980392157, 0.16470588235294117, 0.5137254901960784) , - rgb (0.6, 0.4392156862745098, 0.6705882352941176) , - rgb (0.7607843137254902, 0.6470588235294118, 0.8117647058823529) , - rgb (0.9058823529411765, 0.8313725490196079, 0.9098039215686274) , - rgb (0.9686274509803922, 0.9686274509803922, 0.9686274509803922) , - rgb (0.8509803921568627, 0.9411764705882353, 0.8274509803921568) , - rgb (0.6509803921568628, 0.8588235294117647, 0.6274509803921569) , - rgb (0.35294117647058826, 0.6823529411764706, 0.3803921568627451) , - rgb (0.10588235294117647, 0.47058823529411764, 0.21568627450980393) , - rgb (0.0, 0.26666666666666666, 0.10588235294117647) -}); + rgb (0.25098039215686274, 0.0, 0.29411764705882354) , + rgb (0.4627450980392157, 0.16470588235294117, 0.5137254901960784) , + rgb (0.6, 0.4392156862745098, 0.6705882352941176) , + rgb (0.7607843137254902, 0.6470588235294118, 0.8117647058823529) , + rgb (0.9058823529411765, 0.8313725490196079, 0.9098039215686274) , + rgb (0.9686274509803922, 0.9686274509803922, 0.9686274509803922) , + rgb (0.8509803921568627, 0.9411764705882353, 0.8274509803921568) , + rgb (0.6509803921568628, 0.8588235294117647, 0.6274509803921569) , + rgb (0.35294117647058826, 0.6823529411764706, 0.3803921568627451) , + rgb (0.10588235294117647, 0.47058823529411764, 0.21568627450980393) , + rgb (0.0, 0.26666666666666666, 0.10588235294117647) + }); list_data Paired = list_data(new pen[] { - rgb (0.6509803921568628, 0.807843137254902, 0.8901960784313725) , - rgb (0.12156862745098039, 0.47058823529411764, 0.7058823529411765) , - rgb (0.6980392156862745, 0.8745098039215686, 0.5411764705882353) , - rgb (0.2, 0.6274509803921569, 0.17254901960784313) , - rgb (0.984313725490196, 0.6039215686274509, 0.6) , - rgb (0.8901960784313725, 0.10196078431372549, 0.10980392156862745) , - rgb (0.9921568627450981, 0.7490196078431373, 0.43529411764705883) , - rgb (1.0, 0.4980392156862745, 0.0) , - rgb (0.792156862745098, 0.6980392156862745, 0.8392156862745098) , - rgb (0.41568627450980394, 0.23921568627450981, 0.6039215686274509) , - rgb (1.0, 1.0, 0.6) , - rgb (0.6941176470588235, 0.34901960784313724, 0.1568627450980392) -}); + rgb (0.6509803921568628, 0.807843137254902, 0.8901960784313725) , + rgb (0.12156862745098039, 0.47058823529411764, 0.7058823529411765) , + rgb (0.6980392156862745, 0.8745098039215686, 0.5411764705882353) , + rgb (0.2, 0.6274509803921569, 0.17254901960784313) , + rgb (0.984313725490196, 0.6039215686274509, 0.6) , + rgb (0.8901960784313725, 0.10196078431372549, 0.10980392156862745) , + rgb (0.9921568627450981, 0.7490196078431373, 0.43529411764705883) , + rgb (1.0, 0.4980392156862745, 0.0) , + rgb (0.792156862745098, 0.6980392156862745, 0.8392156862745098) , + rgb (0.41568627450980394, 0.23921568627450981, 0.6039215686274509) , + rgb (1.0, 1.0, 0.6) , + rgb (0.6941176470588235, 0.34901960784313724, 0.1568627450980392) + }); list_data Pastel1 = list_data(new pen[] { - rgb (0.984313725490196, 0.7058823529411765, 0.6823529411764706) , - rgb (0.7019607843137254, 0.803921568627451, 0.8901960784313725) , - rgb (0.8, 0.9215686274509803, 0.7725490196078432) , - rgb (0.8705882352941177, 0.796078431372549, 0.8941176470588236) , - rgb (0.996078431372549, 0.8509803921568627, 0.6509803921568628) , - rgb (1.0, 1.0, 0.8) , - rgb (0.8980392156862745, 0.8470588235294118, 0.7411764705882353) , - rgb (0.9921568627450981, 0.8549019607843137, 0.9254901960784314) , - rgb (0.9490196078431372, 0.9490196078431372, 0.9490196078431372) -}); + rgb (0.984313725490196, 0.7058823529411765, 0.6823529411764706) , + rgb (0.7019607843137254, 0.803921568627451, 0.8901960784313725) , + rgb (0.8, 0.9215686274509803, 0.7725490196078432) , + rgb (0.8705882352941177, 0.796078431372549, 0.8941176470588236) , + rgb (0.996078431372549, 0.8509803921568627, 0.6509803921568628) , + rgb (1.0, 1.0, 0.8) , + rgb (0.8980392156862745, 0.8470588235294118, 0.7411764705882353) , + rgb (0.9921568627450981, 0.8549019607843137, 0.9254901960784314) , + rgb (0.9490196078431372, 0.9490196078431372, 0.9490196078431372) + }); list_data Pastel2 = list_data(new pen[] { - rgb (0.7019607843137254, 0.8862745098039215, 0.803921568627451) , - rgb (0.9921568627450981, 0.803921568627451, 0.6745098039215687) , - rgb (0.796078431372549, 0.8352941176470589, 0.9098039215686274) , - rgb (0.9568627450980393, 0.792156862745098, 0.8941176470588236) , - rgb (0.9019607843137255, 0.9607843137254902, 0.788235294117647) , - rgb (1.0, 0.9490196078431372, 0.6823529411764706) , - rgb (0.9450980392156862, 0.8862745098039215, 0.8) , - rgb (0.8, 0.8, 0.8) -}); + rgb (0.7019607843137254, 0.8862745098039215, 0.803921568627451) , + rgb (0.9921568627450981, 0.803921568627451, 0.6745098039215687) , + rgb (0.796078431372549, 0.8352941176470589, 0.9098039215686274) , + rgb (0.9568627450980393, 0.792156862745098, 0.8941176470588236) , + rgb (0.9019607843137255, 0.9607843137254902, 0.788235294117647) , + rgb (1.0, 0.9490196078431372, 0.6823529411764706) , + rgb (0.9450980392156862, 0.8862745098039215, 0.8) , + rgb (0.8, 0.8, 0.8) + }); list_data PiYG = list_data(new pen[] { - rgb (0.5568627450980392, 0.00392156862745098, 0.3215686274509804) , - rgb (0.7725490196078432, 0.10588235294117647, 0.49019607843137253) , - rgb (0.8705882352941177, 0.4666666666666667, 0.6823529411764706) , - rgb (0.9450980392156862, 0.7137254901960784, 0.8549019607843137) , - rgb (0.9921568627450981, 0.8784313725490196, 0.9372549019607843) , - rgb (0.9686274509803922, 0.9686274509803922, 0.9686274509803922) , - rgb (0.9019607843137255, 0.9607843137254902, 0.8156862745098039) , - rgb (0.7215686274509804, 0.8823529411764706, 0.5254901960784314) , - rgb (0.4980392156862745, 0.7372549019607844, 0.2549019607843137) , - rgb (0.30196078431372547, 0.5725490196078431, 0.12941176470588237) , - rgb (0.15294117647058825, 0.39215686274509803, 0.09803921568627451) -}); + rgb (0.5568627450980392, 0.00392156862745098, 0.3215686274509804) , + rgb (0.7725490196078432, 0.10588235294117647, 0.49019607843137253) , + rgb (0.8705882352941177, 0.4666666666666667, 0.6823529411764706) , + rgb (0.9450980392156862, 0.7137254901960784, 0.8549019607843137) , + rgb (0.9921568627450981, 0.8784313725490196, 0.9372549019607843) , + rgb (0.9686274509803922, 0.9686274509803922, 0.9686274509803922) , + rgb (0.9019607843137255, 0.9607843137254902, 0.8156862745098039) , + rgb (0.7215686274509804, 0.8823529411764706, 0.5254901960784314) , + rgb (0.4980392156862745, 0.7372549019607844, 0.2549019607843137) , + rgb (0.30196078431372547, 0.5725490196078431, 0.12941176470588237) , + rgb (0.15294117647058825, 0.39215686274509803, 0.09803921568627451) + }); list_data PuBuGn = list_data(new pen[] { - rgb (1.0, 0.9686274509803922, 0.984313725490196) , - rgb (0.9254901960784314, 0.8862745098039215, 0.9411764705882353) , - rgb (0.8156862745098039, 0.8196078431372549, 0.9019607843137255) , - rgb (0.6509803921568628, 0.7411764705882353, 0.8588235294117647) , - rgb (0.403921568627451, 0.6627450980392157, 0.8117647058823529) , - rgb (0.21176470588235294, 0.5647058823529412, 0.7529411764705882) , - rgb (0.00784313725490196, 0.5058823529411764, 0.5411764705882353) , - rgb (0.00392156862745098, 0.4235294117647059, 0.34901960784313724) , - rgb (0.00392156862745098, 0.27450980392156865, 0.21176470588235294) -}); + rgb (1.0, 0.9686274509803922, 0.984313725490196) , + rgb (0.9254901960784314, 0.8862745098039215, 0.9411764705882353) , + rgb (0.8156862745098039, 0.8196078431372549, 0.9019607843137255) , + rgb (0.6509803921568628, 0.7411764705882353, 0.8588235294117647) , + rgb (0.403921568627451, 0.6627450980392157, 0.8117647058823529) , + rgb (0.21176470588235294, 0.5647058823529412, 0.7529411764705882) , + rgb (0.00784313725490196, 0.5058823529411764, 0.5411764705882353) , + rgb (0.00392156862745098, 0.4235294117647059, 0.34901960784313724) , + rgb (0.00392156862745098, 0.27450980392156865, 0.21176470588235294) + }); list_data PuBu = list_data(new pen[] { - rgb (1.0, 0.9686274509803922, 0.984313725490196) , - rgb (0.9254901960784314, 0.9058823529411765, 0.9490196078431372) , - rgb (0.8156862745098039, 0.8196078431372549, 0.9019607843137255) , - rgb (0.6509803921568628, 0.7411764705882353, 0.8588235294117647) , - rgb (0.4549019607843137, 0.6627450980392157, 0.8117647058823529) , - rgb (0.21176470588235294, 0.5647058823529412, 0.7529411764705882) , - rgb (0.0196078431372549, 0.4392156862745098, 0.6901960784313725) , - rgb (0.01568627450980392, 0.35294117647058826, 0.5529411764705883) , - rgb (0.00784313725490196, 0.2196078431372549, 0.34509803921568627) -}); + rgb (1.0, 0.9686274509803922, 0.984313725490196) , + rgb (0.9254901960784314, 0.9058823529411765, 0.9490196078431372) , + rgb (0.8156862745098039, 0.8196078431372549, 0.9019607843137255) , + rgb (0.6509803921568628, 0.7411764705882353, 0.8588235294117647) , + rgb (0.4549019607843137, 0.6627450980392157, 0.8117647058823529) , + rgb (0.21176470588235294, 0.5647058823529412, 0.7529411764705882) , + rgb (0.0196078431372549, 0.4392156862745098, 0.6901960784313725) , + rgb (0.01568627450980392, 0.35294117647058826, 0.5529411764705883) , + rgb (0.00784313725490196, 0.2196078431372549, 0.34509803921568627) + }); list_data PuOr = list_data(new pen[] { - rgb (0.4980392156862745, 0.23137254901960785, 0.03137254901960784) , - rgb (0.7019607843137254, 0.34509803921568627, 0.02352941176470588) , - rgb (0.8784313725490196, 0.5098039215686274, 0.0784313725490196) , - rgb (0.9921568627450981, 0.7215686274509804, 0.38823529411764707) , - rgb (0.996078431372549, 0.8784313725490196, 0.7137254901960784) , - rgb (0.9686274509803922, 0.9686274509803922, 0.9686274509803922) , - rgb (0.8470588235294118, 0.8549019607843137, 0.9215686274509803) , - rgb (0.6980392156862745, 0.6705882352941176, 0.8235294117647058) , - rgb (0.5019607843137255, 0.45098039215686275, 0.6745098039215687) , - rgb (0.32941176470588235, 0.15294117647058825, 0.5333333333333333) , - rgb (0.17647058823529413, 0.0, 0.29411764705882354) -}); + rgb (0.4980392156862745, 0.23137254901960785, 0.03137254901960784) , + rgb (0.7019607843137254, 0.34509803921568627, 0.02352941176470588) , + rgb (0.8784313725490196, 0.5098039215686274, 0.0784313725490196) , + rgb (0.9921568627450981, 0.7215686274509804, 0.38823529411764707) , + rgb (0.996078431372549, 0.8784313725490196, 0.7137254901960784) , + rgb (0.9686274509803922, 0.9686274509803922, 0.9686274509803922) , + rgb (0.8470588235294118, 0.8549019607843137, 0.9215686274509803) , + rgb (0.6980392156862745, 0.6705882352941176, 0.8235294117647058) , + rgb (0.5019607843137255, 0.45098039215686275, 0.6745098039215687) , + rgb (0.32941176470588235, 0.15294117647058825, 0.5333333333333333) , + rgb (0.17647058823529413, 0.0, 0.29411764705882354) + }); list_data PuRd = list_data(new pen[] { - rgb (0.9686274509803922, 0.9568627450980393, 0.9764705882352941) , - rgb (0.9058823529411765, 0.8823529411764706, 0.9372549019607843) , - rgb (0.8313725490196079, 0.7254901960784313, 0.8549019607843137) , - rgb (0.788235294117647, 0.5803921568627451, 0.7803921568627451) , - rgb (0.8745098039215686, 0.396078431372549, 0.6901960784313725) , - rgb (0.9058823529411765, 0.1607843137254902, 0.5411764705882353) , - rgb (0.807843137254902, 0.07058823529411765, 0.33725490196078434) , - rgb (0.596078431372549, 0.0, 0.2627450980392157) , - rgb (0.403921568627451, 0.0, 0.12156862745098039) -}); + rgb (0.9686274509803922, 0.9568627450980393, 0.9764705882352941) , + rgb (0.9058823529411765, 0.8823529411764706, 0.9372549019607843) , + rgb (0.8313725490196079, 0.7254901960784313, 0.8549019607843137) , + rgb (0.788235294117647, 0.5803921568627451, 0.7803921568627451) , + rgb (0.8745098039215686, 0.396078431372549, 0.6901960784313725) , + rgb (0.9058823529411765, 0.1607843137254902, 0.5411764705882353) , + rgb (0.807843137254902, 0.07058823529411765, 0.33725490196078434) , + rgb (0.596078431372549, 0.0, 0.2627450980392157) , + rgb (0.403921568627451, 0.0, 0.12156862745098039) + }); list_data Purples = list_data(new pen[] { - rgb (0.9882352941176471, 0.984313725490196, 0.9921568627450981) , - rgb (0.9372549019607843, 0.9294117647058824, 0.9607843137254902) , - rgb (0.8549019607843137, 0.8549019607843137, 0.9215686274509803) , - rgb (0.7372549019607844, 0.7411764705882353, 0.8627450980392157) , - rgb (0.6196078431372549, 0.6039215686274509, 0.7843137254901961) , - rgb (0.5019607843137255, 0.49019607843137253, 0.7294117647058823) , - rgb (0.41568627450980394, 0.3176470588235294, 0.6392156862745098) , - rgb (0.32941176470588235, 0.15294117647058825, 0.5607843137254902) , - rgb (0.24705882352941178, 0.0, 0.49019607843137253) -}); + rgb (0.9882352941176471, 0.984313725490196, 0.9921568627450981) , + rgb (0.9372549019607843, 0.9294117647058824, 0.9607843137254902) , + rgb (0.8549019607843137, 0.8549019607843137, 0.9215686274509803) , + rgb (0.7372549019607844, 0.7411764705882353, 0.8627450980392157) , + rgb (0.6196078431372549, 0.6039215686274509, 0.7843137254901961) , + rgb (0.5019607843137255, 0.49019607843137253, 0.7294117647058823) , + rgb (0.41568627450980394, 0.3176470588235294, 0.6392156862745098) , + rgb (0.32941176470588235, 0.15294117647058825, 0.5607843137254902) , + rgb (0.24705882352941178, 0.0, 0.49019607843137253) + }); list_data RdBu = list_data(new pen[] { - rgb (0.403921568627451, 0.0, 0.12156862745098039) , - rgb (0.6980392156862745, 0.09411764705882353, 0.16862745098039217) , - rgb (0.8392156862745098, 0.3764705882352941, 0.30196078431372547) , - rgb (0.9568627450980393, 0.6470588235294118, 0.5098039215686274) , - rgb (0.9921568627450981, 0.8588235294117647, 0.7803921568627451) , - rgb (0.9686274509803922, 0.9686274509803922, 0.9686274509803922) , - rgb (0.8196078431372549, 0.8980392156862745, 0.9411764705882353) , - rgb (0.5725490196078431, 0.7725490196078432, 0.8705882352941177) , - rgb (0.2627450980392157, 0.5764705882352941, 0.7647058823529411) , - rgb (0.12941176470588237, 0.4, 0.6745098039215687) , - rgb (0.0196078431372549, 0.18823529411764706, 0.3803921568627451) -}); + rgb (0.403921568627451, 0.0, 0.12156862745098039) , + rgb (0.6980392156862745, 0.09411764705882353, 0.16862745098039217) , + rgb (0.8392156862745098, 0.3764705882352941, 0.30196078431372547) , + rgb (0.9568627450980393, 0.6470588235294118, 0.5098039215686274) , + rgb (0.9921568627450981, 0.8588235294117647, 0.7803921568627451) , + rgb (0.9686274509803922, 0.9686274509803922, 0.9686274509803922) , + rgb (0.8196078431372549, 0.8980392156862745, 0.9411764705882353) , + rgb (0.5725490196078431, 0.7725490196078432, 0.8705882352941177) , + rgb (0.2627450980392157, 0.5764705882352941, 0.7647058823529411) , + rgb (0.12941176470588237, 0.4, 0.6745098039215687) , + rgb (0.0196078431372549, 0.18823529411764706, 0.3803921568627451) + }); list_data RdGy = list_data(new pen[] { - rgb (0.403921568627451, 0.0, 0.12156862745098039) , - rgb (0.6980392156862745, 0.09411764705882353, 0.16862745098039217) , - rgb (0.8392156862745098, 0.3764705882352941, 0.30196078431372547) , - rgb (0.9568627450980393, 0.6470588235294118, 0.5098039215686274) , - rgb (0.9921568627450981, 0.8588235294117647, 0.7803921568627451) , - rgb (1.0, 1.0, 1.0) , - rgb (0.8784313725490196, 0.8784313725490196, 0.8784313725490196) , - rgb (0.7294117647058823, 0.7294117647058823, 0.7294117647058823) , - rgb (0.5294117647058824, 0.5294117647058824, 0.5294117647058824) , - rgb (0.30196078431372547, 0.30196078431372547, 0.30196078431372547) , - rgb (0.10196078431372549, 0.10196078431372549, 0.10196078431372549) -}); + rgb (0.403921568627451, 0.0, 0.12156862745098039) , + rgb (0.6980392156862745, 0.09411764705882353, 0.16862745098039217) , + rgb (0.8392156862745098, 0.3764705882352941, 0.30196078431372547) , + rgb (0.9568627450980393, 0.6470588235294118, 0.5098039215686274) , + rgb (0.9921568627450981, 0.8588235294117647, 0.7803921568627451) , + rgb (1.0, 1.0, 1.0) , + rgb (0.8784313725490196, 0.8784313725490196, 0.8784313725490196) , + rgb (0.7294117647058823, 0.7294117647058823, 0.7294117647058823) , + rgb (0.5294117647058824, 0.5294117647058824, 0.5294117647058824) , + rgb (0.30196078431372547, 0.30196078431372547, 0.30196078431372547) , + rgb (0.10196078431372549, 0.10196078431372549, 0.10196078431372549) + }); list_data RdPu = list_data(new pen[] { - rgb (1.0, 0.9686274509803922, 0.9529411764705882) , - rgb (0.9921568627450981, 0.8784313725490196, 0.8666666666666667) , - rgb (0.9882352941176471, 0.7725490196078432, 0.7529411764705882) , - rgb (0.9803921568627451, 0.6235294117647059, 0.7098039215686275) , - rgb (0.9686274509803922, 0.40784313725490196, 0.6313725490196078) , - rgb (0.8666666666666667, 0.20392156862745098, 0.592156862745098) , - rgb (0.6823529411764706, 0.00392156862745098, 0.49411764705882355) , - rgb (0.47843137254901963, 0.00392156862745098, 0.4666666666666667) , - rgb (0.28627450980392155, 0.0, 0.41568627450980394) -}); + rgb (1.0, 0.9686274509803922, 0.9529411764705882) , + rgb (0.9921568627450981, 0.8784313725490196, 0.8666666666666667) , + rgb (0.9882352941176471, 0.7725490196078432, 0.7529411764705882) , + rgb (0.9803921568627451, 0.6235294117647059, 0.7098039215686275) , + rgb (0.9686274509803922, 0.40784313725490196, 0.6313725490196078) , + rgb (0.8666666666666667, 0.20392156862745098, 0.592156862745098) , + rgb (0.6823529411764706, 0.00392156862745098, 0.49411764705882355) , + rgb (0.47843137254901963, 0.00392156862745098, 0.4666666666666667) , + rgb (0.28627450980392155, 0.0, 0.41568627450980394) + }); list_data RdYlBu = list_data(new pen[] { - rgb (0.6470588235294118, 0.0, 0.14901960784313725) , - rgb (0.8431372549019608, 0.18823529411764706, 0.15294117647058825) , - rgb (0.9568627450980393, 0.42745098039215684, 0.2627450980392157) , - rgb (0.9921568627450981, 0.6823529411764706, 0.3803921568627451) , - rgb (0.996078431372549, 0.8784313725490196, 0.5647058823529412) , - rgb (1.0, 1.0, 0.7490196078431373) , - rgb (0.8784313725490196, 0.9529411764705882, 0.9725490196078431) , - rgb (0.6705882352941176, 0.8509803921568627, 0.9137254901960784) , - rgb (0.4549019607843137, 0.6784313725490196, 0.8196078431372549) , - rgb (0.27058823529411763, 0.4588235294117647, 0.7058823529411765) , - rgb (0.19215686274509805, 0.21176470588235294, 0.5843137254901961) -}); + rgb (0.6470588235294118, 0.0, 0.14901960784313725) , + rgb (0.8431372549019608, 0.18823529411764706, 0.15294117647058825) , + rgb (0.9568627450980393, 0.42745098039215684, 0.2627450980392157) , + rgb (0.9921568627450981, 0.6823529411764706, 0.3803921568627451) , + rgb (0.996078431372549, 0.8784313725490196, 0.5647058823529412) , + rgb (1.0, 1.0, 0.7490196078431373) , + rgb (0.8784313725490196, 0.9529411764705882, 0.9725490196078431) , + rgb (0.6705882352941176, 0.8509803921568627, 0.9137254901960784) , + rgb (0.4549019607843137, 0.6784313725490196, 0.8196078431372549) , + rgb (0.27058823529411763, 0.4588235294117647, 0.7058823529411765) , + rgb (0.19215686274509805, 0.21176470588235294, 0.5843137254901961) + }); list_data RdYlGn = list_data(new pen[] { - rgb (0.6470588235294118, 0.0, 0.14901960784313725) , - rgb (0.8431372549019608, 0.18823529411764706, 0.15294117647058825) , - rgb (0.9568627450980393, 0.42745098039215684, 0.2627450980392157) , - rgb (0.9921568627450981, 0.6823529411764706, 0.3803921568627451) , - rgb (0.996078431372549, 0.8784313725490196, 0.5450980392156862) , - rgb (1.0, 1.0, 0.7490196078431373) , - rgb (0.8509803921568627, 0.9372549019607843, 0.5450980392156862) , - rgb (0.6509803921568628, 0.8509803921568627, 0.41568627450980394) , - rgb (0.4, 0.7411764705882353, 0.38823529411764707) , - rgb (0.10196078431372549, 0.596078431372549, 0.3137254901960784) , - rgb (0.0, 0.40784313725490196, 0.21568627450980393) -}); + rgb (0.6470588235294118, 0.0, 0.14901960784313725) , + rgb (0.8431372549019608, 0.18823529411764706, 0.15294117647058825) , + rgb (0.9568627450980393, 0.42745098039215684, 0.2627450980392157) , + rgb (0.9921568627450981, 0.6823529411764706, 0.3803921568627451) , + rgb (0.996078431372549, 0.8784313725490196, 0.5450980392156862) , + rgb (1.0, 1.0, 0.7490196078431373) , + rgb (0.8509803921568627, 0.9372549019607843, 0.5450980392156862) , + rgb (0.6509803921568628, 0.8509803921568627, 0.41568627450980394) , + rgb (0.4, 0.7411764705882353, 0.38823529411764707) , + rgb (0.10196078431372549, 0.596078431372549, 0.3137254901960784) , + rgb (0.0, 0.40784313725490196, 0.21568627450980393) + }); list_data Reds = list_data(new pen[] { - rgb (1.0, 0.9607843137254902, 0.9411764705882353) , - rgb (0.996078431372549, 0.8784313725490196, 0.8235294117647058) , - rgb (0.9882352941176471, 0.7333333333333333, 0.6313725490196078) , - rgb (0.9882352941176471, 0.5725490196078431, 0.4470588235294118) , - rgb (0.984313725490196, 0.41568627450980394, 0.2901960784313726) , - rgb (0.9372549019607843, 0.23137254901960785, 0.17254901960784313) , - rgb (0.796078431372549, 0.09411764705882353, 0.11372549019607843) , - rgb (0.6470588235294118, 0.058823529411764705, 0.08235294117647057) , - rgb (0.403921568627451, 0.0, 0.05098039215686274) -}); + rgb (1.0, 0.9607843137254902, 0.9411764705882353) , + rgb (0.996078431372549, 0.8784313725490196, 0.8235294117647058) , + rgb (0.9882352941176471, 0.7333333333333333, 0.6313725490196078) , + rgb (0.9882352941176471, 0.5725490196078431, 0.4470588235294118) , + rgb (0.984313725490196, 0.41568627450980394, 0.2901960784313726) , + rgb (0.9372549019607843, 0.23137254901960785, 0.17254901960784313) , + rgb (0.796078431372549, 0.09411764705882353, 0.11372549019607843) , + rgb (0.6470588235294118, 0.058823529411764705, 0.08235294117647057) , + rgb (0.403921568627451, 0.0, 0.05098039215686274) + }); list_data Set1 = list_data(new pen[] { - rgb (0.8941176470588236, 0.10196078431372549, 0.10980392156862745) , - rgb (0.21568627450980393, 0.49411764705882355, 0.7215686274509804) , - rgb (0.30196078431372547, 0.6862745098039216, 0.2901960784313726) , - rgb (0.596078431372549, 0.3058823529411765, 0.6392156862745098) , - rgb (1.0, 0.4980392156862745, 0.0) , - rgb (1.0, 1.0, 0.2) , - rgb (0.6509803921568628, 0.33725490196078434, 0.1568627450980392) , - rgb (0.9686274509803922, 0.5058823529411764, 0.7490196078431373) , - rgb (0.6, 0.6, 0.6) -}); + rgb (0.8941176470588236, 0.10196078431372549, 0.10980392156862745) , + rgb (0.21568627450980393, 0.49411764705882355, 0.7215686274509804) , + rgb (0.30196078431372547, 0.6862745098039216, 0.2901960784313726) , + rgb (0.596078431372549, 0.3058823529411765, 0.6392156862745098) , + rgb (1.0, 0.4980392156862745, 0.0) , + rgb (1.0, 1.0, 0.2) , + rgb (0.6509803921568628, 0.33725490196078434, 0.1568627450980392) , + rgb (0.9686274509803922, 0.5058823529411764, 0.7490196078431373) , + rgb (0.6, 0.6, 0.6) + }); list_data Set2 = list_data(new pen[] { - rgb (0.4, 0.7607843137254902, 0.6470588235294118) , - rgb (0.9882352941176471, 0.5529411764705883, 0.3843137254901961) , - rgb (0.5529411764705883, 0.6274509803921569, 0.796078431372549) , - rgb (0.9058823529411765, 0.5411764705882353, 0.7647058823529411) , - rgb (0.6509803921568628, 0.8470588235294118, 0.32941176470588235) , - rgb (1.0, 0.8509803921568627, 0.1843137254901961) , - rgb (0.8980392156862745, 0.7686274509803922, 0.5803921568627451) , - rgb (0.7019607843137254, 0.7019607843137254, 0.7019607843137254) -}); + rgb (0.4, 0.7607843137254902, 0.6470588235294118) , + rgb (0.9882352941176471, 0.5529411764705883, 0.3843137254901961) , + rgb (0.5529411764705883, 0.6274509803921569, 0.796078431372549) , + rgb (0.9058823529411765, 0.5411764705882353, 0.7647058823529411) , + rgb (0.6509803921568628, 0.8470588235294118, 0.32941176470588235) , + rgb (1.0, 0.8509803921568627, 0.1843137254901961) , + rgb (0.8980392156862745, 0.7686274509803922, 0.5803921568627451) , + rgb (0.7019607843137254, 0.7019607843137254, 0.7019607843137254) + }); list_data Set3 = list_data(new pen[] { - rgb (0.5529411764705883, 0.8274509803921568, 0.7803921568627451) , - rgb (1.0, 1.0, 0.7019607843137254) , - rgb (0.7450980392156863, 0.7294117647058823, 0.8549019607843137) , - rgb (0.984313725490196, 0.5019607843137255, 0.4470588235294118) , - rgb (0.5019607843137255, 0.6941176470588235, 0.8274509803921568) , - rgb (0.9921568627450981, 0.7058823529411765, 0.3843137254901961) , - rgb (0.7019607843137254, 0.8705882352941177, 0.4117647058823529) , - rgb (0.9882352941176471, 0.803921568627451, 0.8980392156862745) , - rgb (0.8509803921568627, 0.8509803921568627, 0.8509803921568627) , - rgb (0.7372549019607844, 0.5019607843137255, 0.7411764705882353) , - rgb (0.8, 0.9215686274509803, 0.7725490196078432) , - rgb (1.0, 0.9294117647058824, 0.43529411764705883) -}); + rgb (0.5529411764705883, 0.8274509803921568, 0.7803921568627451) , + rgb (1.0, 1.0, 0.7019607843137254) , + rgb (0.7450980392156863, 0.7294117647058823, 0.8549019607843137) , + rgb (0.984313725490196, 0.5019607843137255, 0.4470588235294118) , + rgb (0.5019607843137255, 0.6941176470588235, 0.8274509803921568) , + rgb (0.9921568627450981, 0.7058823529411765, 0.3843137254901961) , + rgb (0.7019607843137254, 0.8705882352941177, 0.4117647058823529) , + rgb (0.9882352941176471, 0.803921568627451, 0.8980392156862745) , + rgb (0.8509803921568627, 0.8509803921568627, 0.8509803921568627) , + rgb (0.7372549019607844, 0.5019607843137255, 0.7411764705882353) , + rgb (0.8, 0.9215686274509803, 0.7725490196078432) , + rgb (1.0, 0.9294117647058824, 0.43529411764705883) + }); list_data Spectral = list_data(new pen[] { - rgb (0.6196078431372549, 0.00392156862745098, 0.25882352941176473) , - rgb (0.8352941176470589, 0.24313725490196078, 0.30980392156862746) , - rgb (0.9568627450980393, 0.42745098039215684, 0.2627450980392157) , - rgb (0.9921568627450981, 0.6823529411764706, 0.3803921568627451) , - rgb (0.996078431372549, 0.8784313725490196, 0.5450980392156862) , - rgb (1.0, 1.0, 0.7490196078431373) , - rgb (0.9019607843137255, 0.9607843137254902, 0.596078431372549) , - rgb (0.6705882352941176, 0.8666666666666667, 0.6431372549019608) , - rgb (0.4, 0.7607843137254902, 0.6470588235294118) , - rgb (0.19607843137254902, 0.5333333333333333, 0.7411764705882353) , - rgb (0.3686274509803922, 0.30980392156862746, 0.6352941176470588) -}); + rgb (0.6196078431372549, 0.00392156862745098, 0.25882352941176473) , + rgb (0.8352941176470589, 0.24313725490196078, 0.30980392156862746) , + rgb (0.9568627450980393, 0.42745098039215684, 0.2627450980392157) , + rgb (0.9921568627450981, 0.6823529411764706, 0.3803921568627451) , + rgb (0.996078431372549, 0.8784313725490196, 0.5450980392156862) , + rgb (1.0, 1.0, 0.7490196078431373) , + rgb (0.9019607843137255, 0.9607843137254902, 0.596078431372549) , + rgb (0.6705882352941176, 0.8666666666666667, 0.6431372549019608) , + rgb (0.4, 0.7607843137254902, 0.6470588235294118) , + rgb (0.19607843137254902, 0.5333333333333333, 0.7411764705882353) , + rgb (0.3686274509803922, 0.30980392156862746, 0.6352941176470588) + }); list_data YlGnBu = list_data(new pen[] { - rgb (1.0, 1.0, 0.8509803921568627) , - rgb (0.9294117647058824, 0.9725490196078431, 0.6941176470588235) , - rgb (0.7803921568627451, 0.9137254901960784, 0.7058823529411765) , - rgb (0.4980392156862745, 0.803921568627451, 0.7333333333333333) , - rgb (0.2549019607843137, 0.7137254901960784, 0.7686274509803922) , - rgb (0.11372549019607843, 0.5686274509803921, 0.7529411764705882) , - rgb (0.13333333333333333, 0.3686274509803922, 0.6588235294117647) , - rgb (0.1450980392156863, 0.20392156862745098, 0.5803921568627451) , - rgb (0.03137254901960784, 0.11372549019607843, 0.34509803921568627) -}); + rgb (1.0, 1.0, 0.8509803921568627) , + rgb (0.9294117647058824, 0.9725490196078431, 0.6941176470588235) , + rgb (0.7803921568627451, 0.9137254901960784, 0.7058823529411765) , + rgb (0.4980392156862745, 0.803921568627451, 0.7333333333333333) , + rgb (0.2549019607843137, 0.7137254901960784, 0.7686274509803922) , + rgb (0.11372549019607843, 0.5686274509803921, 0.7529411764705882) , + rgb (0.13333333333333333, 0.3686274509803922, 0.6588235294117647) , + rgb (0.1450980392156863, 0.20392156862745098, 0.5803921568627451) , + rgb (0.03137254901960784, 0.11372549019607843, 0.34509803921568627) + }); list_data YlGn = list_data(new pen[] { - rgb (1.0, 1.0, 0.8980392156862745) , - rgb (0.9686274509803922, 0.9882352941176471, 0.7254901960784313) , - rgb (0.8509803921568627, 0.9411764705882353, 0.6392156862745098) , - rgb (0.6784313725490196, 0.8666666666666667, 0.5568627450980392) , - rgb (0.47058823529411764, 0.7764705882352941, 0.4745098039215686) , - rgb (0.2549019607843137, 0.6705882352941176, 0.36470588235294116) , - rgb (0.13725490196078433, 0.5176470588235295, 0.2627450980392157) , - rgb (0.0, 0.40784313725490196, 0.21568627450980393) , - rgb (0.0, 0.27058823529411763, 0.1607843137254902) -}); + rgb (1.0, 1.0, 0.8980392156862745) , + rgb (0.9686274509803922, 0.9882352941176471, 0.7254901960784313) , + rgb (0.8509803921568627, 0.9411764705882353, 0.6392156862745098) , + rgb (0.6784313725490196, 0.8666666666666667, 0.5568627450980392) , + rgb (0.47058823529411764, 0.7764705882352941, 0.4745098039215686) , + rgb (0.2549019607843137, 0.6705882352941176, 0.36470588235294116) , + rgb (0.13725490196078433, 0.5176470588235295, 0.2627450980392157) , + rgb (0.0, 0.40784313725490196, 0.21568627450980393) , + rgb (0.0, 0.27058823529411763, 0.1607843137254902) + }); list_data YlOrBr = list_data(new pen[] { - rgb (1.0, 1.0, 0.8980392156862745) , - rgb (1.0, 0.9686274509803922, 0.7372549019607844) , - rgb (0.996078431372549, 0.8901960784313725, 0.5686274509803921) , - rgb (0.996078431372549, 0.7686274509803922, 0.30980392156862746) , - rgb (0.996078431372549, 0.6, 0.1607843137254902) , - rgb (0.9254901960784314, 0.4392156862745098, 0.0784313725490196) , - rgb (0.8, 0.2980392156862745, 0.00784313725490196) , - rgb (0.6, 0.20392156862745098, 0.01568627450980392) , - rgb (0.4, 0.1450980392156863, 0.02352941176470588) -}); + rgb (1.0, 1.0, 0.8980392156862745) , + rgb (1.0, 0.9686274509803922, 0.7372549019607844) , + rgb (0.996078431372549, 0.8901960784313725, 0.5686274509803921) , + rgb (0.996078431372549, 0.7686274509803922, 0.30980392156862746) , + rgb (0.996078431372549, 0.6, 0.1607843137254902) , + rgb (0.9254901960784314, 0.4392156862745098, 0.0784313725490196) , + rgb (0.8, 0.2980392156862745, 0.00784313725490196) , + rgb (0.6, 0.20392156862745098, 0.01568627450980392) , + rgb (0.4, 0.1450980392156863, 0.02352941176470588) + }); list_data YlOrRd = list_data(new pen[] { - rgb (1.0, 1.0, 0.8) , - rgb (1.0, 0.9294117647058824, 0.6274509803921569) , - rgb (0.996078431372549, 0.8509803921568627, 0.4627450980392157) , - rgb (0.996078431372549, 0.6980392156862745, 0.2980392156862745) , - rgb (0.9921568627450981, 0.5529411764705883, 0.23529411764705882) , - rgb (0.9882352941176471, 0.3058823529411765, 0.16470588235294117) , - rgb (0.8901960784313725, 0.10196078431372549, 0.10980392156862745) , - rgb (0.7411764705882353, 0.0, 0.14901960784313725) , - rgb (0.5019607843137255, 0.0, 0.14901960784313725) -}); + rgb (1.0, 1.0, 0.8) , + rgb (1.0, 0.9294117647058824, 0.6274509803921569) , + rgb (0.996078431372549, 0.8509803921568627, 0.4627450980392157) , + rgb (0.996078431372549, 0.6980392156862745, 0.2980392156862745) , + rgb (0.9921568627450981, 0.5529411764705883, 0.23529411764705882) , + rgb (0.9882352941176471, 0.3058823529411765, 0.16470588235294117) , + rgb (0.8901960784313725, 0.10196078431372549, 0.10980392156862745) , + rgb (0.7411764705882353, 0.0, 0.14901960784313725) , + rgb (0.5019607843137255, 0.0, 0.14901960784313725) + }); seg_data autumn = seg_data( - new triple[] { // red - (0.0, 1.0, 1.0) , - (1.0, 1.0, 1.0) - }, - new triple[] { // green - (0.0, 0.0, 0.0) , - (1.0, 1.0, 1.0) - }, - new triple[] { // blue - (0.0, 0.0, 0.0) , - (1.0, 0.0, 0.0) - } -); + new triple[] { // red + (0.0, 1.0, 1.0) , + (1.0, 1.0, 1.0) + }, + new triple[] { // green + (0.0, 0.0, 0.0) , + (1.0, 1.0, 1.0) + }, + new triple[] { // blue + (0.0, 0.0, 0.0) , + (1.0, 0.0, 0.0) + } + ); seg_data binary = seg_data( - new triple[] { // red - (0.0, 1.0, 1.0) , - (1.0, 0.0, 0.0) - }, - new triple[] { // green - (0.0, 1.0, 1.0) , - (1.0, 0.0, 0.0) - }, - new triple[] { // blue - (0.0, 1.0, 1.0) , - (1.0, 0.0, 0.0) - } -); + new triple[] { // red + (0.0, 1.0, 1.0) , + (1.0, 0.0, 0.0) + }, + new triple[] { // green + (0.0, 1.0, 1.0) , + (1.0, 0.0, 0.0) + }, + new triple[] { // blue + (0.0, 1.0, 1.0) , + (1.0, 0.0, 0.0) + } + ); seg_data bone = seg_data( - new triple[] { // red - (0.0, 0.0, 0.0) , - (0.746032, 0.652778, 0.652778) , - (1.0, 1.0, 1.0) - }, - new triple[] { // green - (0.0, 0.0, 0.0) , - (0.365079, 0.319444, 0.319444) , - (0.746032, 0.777778, 0.777778) , - (1.0, 1.0, 1.0) - }, - new triple[] { // blue - (0.0, 0.0, 0.0) , - (0.365079, 0.444444, 0.444444) , - (1.0, 1.0, 1.0) - } -); + new triple[] { // red + (0.0, 0.0, 0.0) , + (0.746032, 0.652778, 0.652778) , + (1.0, 1.0, 1.0) + }, + new triple[] { // green + (0.0, 0.0, 0.0) , + (0.365079, 0.319444, 0.319444) , + (0.746032, 0.777778, 0.777778) , + (1.0, 1.0, 1.0) + }, + new triple[] { // blue + (0.0, 0.0, 0.0) , + (0.365079, 0.444444, 0.444444) , + (1.0, 1.0, 1.0) + } + ); list_data brg = list_data(new pen[] { - rgb (0.0, 0.0, 1.0) , - rgb (1.0, 0.0, 0.0) , - rgb (0.0, 1.0, 0.0) -}); + rgb (0.0, 0.0, 1.0) , + rgb (1.0, 0.0, 0.0) , + rgb (0.0, 1.0, 0.0) + }); list_data bwr = list_data(new pen[] { - rgb (0.0, 0.0, 1.0) , - rgb (1.0, 1.0, 1.0) , - rgb (1.0, 0.0, 0.0) -}); + rgb (0.0, 0.0, 1.0) , + rgb (1.0, 1.0, 1.0) , + rgb (1.0, 0.0, 0.0) + }); seg_data cool = seg_data( - new triple[] { // red - (0.0, 0.0, 0.0) , - (1.0, 1.0, 1.0) - }, - new triple[] { // green - (0.0, 1.0, 1.0) , - (1.0, 0.0, 0.0) - }, - new triple[] { // blue - (0.0, 1.0, 1.0) , - (1.0, 1.0, 1.0) - } -); + new triple[] { // red + (0.0, 0.0, 0.0) , + (1.0, 1.0, 1.0) + }, + new triple[] { // green + (0.0, 1.0, 1.0) , + (1.0, 0.0, 0.0) + }, + new triple[] { // blue + (0.0, 1.0, 1.0) , + (1.0, 1.0, 1.0) + } + ); seg_data coolwarm = seg_data( - new triple[] { // red - (0.0, 0.2298057, 0.2298057) , - (0.03125, 0.26623388, 0.26623388) , - (0.0625, 0.30386891, 0.30386891) , - (0.09375, 0.342804478, 0.342804478) , - (0.125, 0.38301334, 0.38301334) , - (0.15625, 0.424369608, 0.424369608) , - (0.1875, 0.46666708, 0.46666708) , - (0.21875, 0.509635204, 0.509635204) , - (0.25, 0.552953156, 0.552953156) , - (0.28125, 0.596262162, 0.596262162) , - (0.3125, 0.639176211, 0.639176211) , - (0.34375, 0.681291281, 0.681291281) , - (0.375, 0.722193294, 0.722193294) , - (0.40625, 0.761464949, 0.761464949) , - (0.4375, 0.798691636, 0.798691636) , - (0.46875, 0.833466556, 0.833466556) , - (0.5, 0.865395197, 0.865395197) , - (0.53125, 0.897787179, 0.897787179) , - (0.5625, 0.924127593, 0.924127593) , - (0.59375, 0.944468518, 0.944468518) , - (0.625, 0.958852946, 0.958852946) , - (0.65625, 0.96732803, 0.96732803) , - (0.6875, 0.969954137, 0.969954137) , - (0.71875, 0.966811177, 0.966811177) , - (0.75, 0.958003065, 0.958003065) , - (0.78125, 0.943660866, 0.943660866) , - (0.8125, 0.923944917, 0.923944917) , - (0.84375, 0.89904617, 0.89904617) , - (0.875, 0.869186849, 0.869186849) , - (0.90625, 0.834620542, 0.834620542) , - (0.9375, 0.795631745, 0.795631745) , - (0.96875, 0.752534934, 0.752534934) , - (1.0, 0.705673158, 0.705673158) - }, - new triple[] { // green - (0.0, 0.298717966, 0.298717966) , - (0.03125, 0.353094838, 0.353094838) , - (0.0625, 0.406535296, 0.406535296) , - (0.09375, 0.458757618, 0.458757618) , - (0.125, 0.50941904, 0.50941904) , - (0.15625, 0.558148092, 0.558148092) , - (0.1875, 0.604562568, 0.604562568) , - (0.21875, 0.648280772, 0.648280772) , - (0.25, 0.688929332, 0.688929332) , - (0.28125, 0.726149107, 0.726149107) , - (0.3125, 0.759599947, 0.759599947) , - (0.34375, 0.788964712, 0.788964712) , - (0.375, 0.813952739, 0.813952739) , - (0.40625, 0.834302879, 0.834302879) , - (0.4375, 0.849786142, 0.849786142) , - (0.46875, 0.860207984, 0.860207984) , - (0.5, 0.86541021, 0.86541021) , - (0.53125, 0.848937047, 0.848937047) , - (0.5625, 0.827384882, 0.827384882) , - (0.59375, 0.800927443, 0.800927443) , - (0.625, 0.769767752, 0.769767752) , - (0.65625, 0.734132809, 0.734132809) , - (0.6875, 0.694266682, 0.694266682) , - (0.71875, 0.650421156, 0.650421156) , - (0.75, 0.602842431, 0.602842431) , - (0.78125, 0.551750968, 0.551750968) , - (0.8125, 0.49730856, 0.49730856) , - (0.84375, 0.439559467, 0.439559467) , - (0.875, 0.378313092, 0.378313092) , - (0.90625, 0.312874446, 0.312874446) , - (0.9375, 0.24128379, 0.24128379) , - (0.96875, 0.157246067, 0.157246067) , - (1.0, 0.01555616, 0.01555616) - }, - new triple[] { // blue - (0.0, 0.753683153, 0.753683153) , - (0.03125, 0.801466763, 0.801466763) , - (0.0625, 0.84495867, 0.84495867) , - (0.09375, 0.883725899, 0.883725899) , - (0.125, 0.917387822, 0.917387822) , - (0.15625, 0.945619588, 0.945619588) , - (0.1875, 0.968154911, 0.968154911) , - (0.21875, 0.98478814, 0.98478814) , - (0.25, 0.995375608, 0.995375608) , - (0.28125, 0.999836203, 0.999836203) , - (0.3125, 0.998151185, 0.998151185) , - (0.34375, 0.990363227, 0.990363227) , - (0.375, 0.976574709, 0.976574709) , - (0.40625, 0.956945269, 0.956945269) , - (0.4375, 0.931688648, 0.931688648) , - (0.46875, 0.901068838, 0.901068838) , - (0.5, 0.865395561, 0.865395561) , - (0.53125, 0.820880546, 0.820880546) , - (0.5625, 0.774508472, 0.774508472) , - (0.59375, 0.726736146, 0.726736146) , - (0.625, 0.678007945, 0.678007945) , - (0.65625, 0.628751763, 0.628751763) , - (0.6875, 0.579375448, 0.579375448) , - (0.71875, 0.530263762, 0.530263762) , - (0.75, 0.481775914, 0.481775914) , - (0.78125, 0.434243684, 0.434243684) , - (0.8125, 0.387970225, 0.387970225) , - (0.84375, 0.343229596, 0.343229596) , - (0.875, 0.300267182, 0.300267182) , - (0.90625, 0.259301199, 0.259301199) , - (0.9375, 0.220525627, 0.220525627) , - (0.96875, 0.184115123, 0.184115123) , - (1.0, 0.150232812, 0.150232812) - } -); + new triple[] { // red + (0.0, 0.2298057, 0.2298057) , + (0.03125, 0.26623388, 0.26623388) , + (0.0625, 0.30386891, 0.30386891) , + (0.09375, 0.342804478, 0.342804478) , + (0.125, 0.38301334, 0.38301334) , + (0.15625, 0.424369608, 0.424369608) , + (0.1875, 0.46666708, 0.46666708) , + (0.21875, 0.509635204, 0.509635204) , + (0.25, 0.552953156, 0.552953156) , + (0.28125, 0.596262162, 0.596262162) , + (0.3125, 0.639176211, 0.639176211) , + (0.34375, 0.681291281, 0.681291281) , + (0.375, 0.722193294, 0.722193294) , + (0.40625, 0.761464949, 0.761464949) , + (0.4375, 0.798691636, 0.798691636) , + (0.46875, 0.833466556, 0.833466556) , + (0.5, 0.865395197, 0.865395197) , + (0.53125, 0.897787179, 0.897787179) , + (0.5625, 0.924127593, 0.924127593) , + (0.59375, 0.944468518, 0.944468518) , + (0.625, 0.958852946, 0.958852946) , + (0.65625, 0.96732803, 0.96732803) , + (0.6875, 0.969954137, 0.969954137) , + (0.71875, 0.966811177, 0.966811177) , + (0.75, 0.958003065, 0.958003065) , + (0.78125, 0.943660866, 0.943660866) , + (0.8125, 0.923944917, 0.923944917) , + (0.84375, 0.89904617, 0.89904617) , + (0.875, 0.869186849, 0.869186849) , + (0.90625, 0.834620542, 0.834620542) , + (0.9375, 0.795631745, 0.795631745) , + (0.96875, 0.752534934, 0.752534934) , + (1.0, 0.705673158, 0.705673158) + }, + new triple[] { // green + (0.0, 0.298717966, 0.298717966) , + (0.03125, 0.353094838, 0.353094838) , + (0.0625, 0.406535296, 0.406535296) , + (0.09375, 0.458757618, 0.458757618) , + (0.125, 0.50941904, 0.50941904) , + (0.15625, 0.558148092, 0.558148092) , + (0.1875, 0.604562568, 0.604562568) , + (0.21875, 0.648280772, 0.648280772) , + (0.25, 0.688929332, 0.688929332) , + (0.28125, 0.726149107, 0.726149107) , + (0.3125, 0.759599947, 0.759599947) , + (0.34375, 0.788964712, 0.788964712) , + (0.375, 0.813952739, 0.813952739) , + (0.40625, 0.834302879, 0.834302879) , + (0.4375, 0.849786142, 0.849786142) , + (0.46875, 0.860207984, 0.860207984) , + (0.5, 0.86541021, 0.86541021) , + (0.53125, 0.848937047, 0.848937047) , + (0.5625, 0.827384882, 0.827384882) , + (0.59375, 0.800927443, 0.800927443) , + (0.625, 0.769767752, 0.769767752) , + (0.65625, 0.734132809, 0.734132809) , + (0.6875, 0.694266682, 0.694266682) , + (0.71875, 0.650421156, 0.650421156) , + (0.75, 0.602842431, 0.602842431) , + (0.78125, 0.551750968, 0.551750968) , + (0.8125, 0.49730856, 0.49730856) , + (0.84375, 0.439559467, 0.439559467) , + (0.875, 0.378313092, 0.378313092) , + (0.90625, 0.312874446, 0.312874446) , + (0.9375, 0.24128379, 0.24128379) , + (0.96875, 0.157246067, 0.157246067) , + (1.0, 0.01555616, 0.01555616) + }, + new triple[] { // blue + (0.0, 0.753683153, 0.753683153) , + (0.03125, 0.801466763, 0.801466763) , + (0.0625, 0.84495867, 0.84495867) , + (0.09375, 0.883725899, 0.883725899) , + (0.125, 0.917387822, 0.917387822) , + (0.15625, 0.945619588, 0.945619588) , + (0.1875, 0.968154911, 0.968154911) , + (0.21875, 0.98478814, 0.98478814) , + (0.25, 0.995375608, 0.995375608) , + (0.28125, 0.999836203, 0.999836203) , + (0.3125, 0.998151185, 0.998151185) , + (0.34375, 0.990363227, 0.990363227) , + (0.375, 0.976574709, 0.976574709) , + (0.40625, 0.956945269, 0.956945269) , + (0.4375, 0.931688648, 0.931688648) , + (0.46875, 0.901068838, 0.901068838) , + (0.5, 0.865395561, 0.865395561) , + (0.53125, 0.820880546, 0.820880546) , + (0.5625, 0.774508472, 0.774508472) , + (0.59375, 0.726736146, 0.726736146) , + (0.625, 0.678007945, 0.678007945) , + (0.65625, 0.628751763, 0.628751763) , + (0.6875, 0.579375448, 0.579375448) , + (0.71875, 0.530263762, 0.530263762) , + (0.75, 0.481775914, 0.481775914) , + (0.78125, 0.434243684, 0.434243684) , + (0.8125, 0.387970225, 0.387970225) , + (0.84375, 0.343229596, 0.343229596) , + (0.875, 0.300267182, 0.300267182) , + (0.90625, 0.259301199, 0.259301199) , + (0.9375, 0.220525627, 0.220525627) , + (0.96875, 0.184115123, 0.184115123) , + (1.0, 0.150232812, 0.150232812) + } + ); seg_data copper = seg_data( - new triple[] { // red - (0.0, 0.0, 0.0) , - (0.809524, 1.0, 1.0) , - (1.0, 1.0, 1.0) - }, - new triple[] { // green - (0.0, 0.0, 0.0) , - (1.0, 0.7812, 0.7812) - }, - new triple[] { // blue - (0.0, 0.0, 0.0) , - (1.0, 0.4975, 0.4975) - } -); + new triple[] { // red + (0.0, 0.0, 0.0) , + (0.809524, 1.0, 1.0) , + (1.0, 1.0, 1.0) + }, + new triple[] { // green + (0.0, 0.0, 0.0) , + (1.0, 0.7812, 0.7812) + }, + new triple[] { // blue + (0.0, 0.0, 0.0) , + (1.0, 0.4975, 0.4975) + } + ); seg_data gist_earth = seg_data( - new triple[] { // red - (0.0, 0.0, 0.0) , - (0.2824, 0.1882, 0.1882) , - (0.4588, 0.2714, 0.2714) , - (0.549, 0.4719, 0.4719) , - (0.698, 0.7176, 0.7176) , - (0.7882, 0.7553, 0.7553) , - (1.0, 0.9922, 0.9922) - }, - new triple[] { // green - (0.0, 0.0, 0.0) , - (0.0275, 0.0, 0.0) , - (0.1098, 0.1893, 0.1893) , - (0.1647, 0.3035, 0.3035) , - (0.2078, 0.3841, 0.3841) , - (0.2824, 0.502, 0.502) , - (0.5216, 0.6397, 0.6397) , - (0.698, 0.7171, 0.7171) , - (0.7882, 0.6392, 0.6392) , - (0.7922, 0.6413, 0.6413) , - (0.8, 0.6447, 0.6447) , - (0.8078, 0.6481, 0.6481) , - (0.8157, 0.6549, 0.6549) , - (0.8667, 0.6991, 0.6991) , - (0.8745, 0.7103, 0.7103) , - (0.8824, 0.7216, 0.7216) , - (0.8902, 0.7323, 0.7323) , - (0.898, 0.743, 0.743) , - (0.9412, 0.8275, 0.8275) , - (0.9569, 0.8635, 0.8635) , - (0.9647, 0.8816, 0.8816) , - (0.9961, 0.9733, 0.9733) , - (1.0, 0.9843, 0.9843) - }, - new triple[] { // blue - (0.0, 0.0, 0.0) , - (0.0039, 0.1684, 0.1684) , - (0.0078, 0.2212, 0.2212) , - (0.0275, 0.4329, 0.4329) , - (0.0314, 0.4549, 0.4549) , - (0.2824, 0.5004, 0.5004) , - (0.4667, 0.2748, 0.2748) , - (0.5451, 0.3205, 0.3205) , - (0.7843, 0.3961, 0.3961) , - (0.8941, 0.6651, 0.6651) , - (1.0, 0.9843, 0.9843) - } -); + new triple[] { // red + (0.0, 0.0, 0.0) , + (0.2824, 0.1882, 0.1882) , + (0.4588, 0.2714, 0.2714) , + (0.549, 0.4719, 0.4719) , + (0.698, 0.7176, 0.7176) , + (0.7882, 0.7553, 0.7553) , + (1.0, 0.9922, 0.9922) + }, + new triple[] { // green + (0.0, 0.0, 0.0) , + (0.0275, 0.0, 0.0) , + (0.1098, 0.1893, 0.1893) , + (0.1647, 0.3035, 0.3035) , + (0.2078, 0.3841, 0.3841) , + (0.2824, 0.502, 0.502) , + (0.5216, 0.6397, 0.6397) , + (0.698, 0.7171, 0.7171) , + (0.7882, 0.6392, 0.6392) , + (0.7922, 0.6413, 0.6413) , + (0.8, 0.6447, 0.6447) , + (0.8078, 0.6481, 0.6481) , + (0.8157, 0.6549, 0.6549) , + (0.8667, 0.6991, 0.6991) , + (0.8745, 0.7103, 0.7103) , + (0.8824, 0.7216, 0.7216) , + (0.8902, 0.7323, 0.7323) , + (0.898, 0.743, 0.743) , + (0.9412, 0.8275, 0.8275) , + (0.9569, 0.8635, 0.8635) , + (0.9647, 0.8816, 0.8816) , + (0.9961, 0.9733, 0.9733) , + (1.0, 0.9843, 0.9843) + }, + new triple[] { // blue + (0.0, 0.0, 0.0) , + (0.0039, 0.1684, 0.1684) , + (0.0078, 0.2212, 0.2212) , + (0.0275, 0.4329, 0.4329) , + (0.0314, 0.4549, 0.4549) , + (0.2824, 0.5004, 0.5004) , + (0.4667, 0.2748, 0.2748) , + (0.5451, 0.3205, 0.3205) , + (0.7843, 0.3961, 0.3961) , + (0.8941, 0.6651, 0.6651) , + (1.0, 0.9843, 0.9843) + } + ); seg_data gist_ncar = seg_data( - new triple[] { // red - (0.0, 0.0, 0.0) , - (0.3098, 0.0, 0.0) , - (0.3725, 0.3993, 0.3993) , - (0.4235, 0.5003, 0.5003) , - (0.5333, 1.0, 1.0) , - (0.7922, 1.0, 1.0) , - (0.8471, 0.6218, 0.6218) , - (0.898, 0.9235, 0.9235) , - (1.0, 0.9961, 0.9961) - }, - new triple[] { // green - (0.0, 0.0, 0.0) , - (0.051, 0.3722, 0.3722) , - (0.1059, 0.0, 0.0) , - (0.1569, 0.7202, 0.7202) , - (0.1608, 0.7537, 0.7537) , - (0.1647, 0.7752, 0.7752) , - (0.2157, 1.0, 1.0) , - (0.2588, 0.9804, 0.9804) , - (0.2706, 0.9804, 0.9804) , - (0.3176, 1.0, 1.0) , - (0.3686, 0.8081, 0.8081) , - (0.4275, 1.0, 1.0) , - (0.5216, 1.0, 1.0) , - (0.6314, 0.7292, 0.7292) , - (0.6863, 0.2796, 0.2796) , - (0.7451, 0.0, 0.0) , - (0.7922, 0.0, 0.0) , - (0.8431, 0.1753, 0.1753) , - (0.898, 0.5, 0.5) , - (1.0, 0.9725, 0.9725) - }, - new triple[] { // blue - (0.0, 0.502, 0.502) , - (0.051, 0.0222, 0.0222) , - (0.1098, 1.0, 1.0) , - (0.2039, 1.0, 1.0) , - (0.2627, 0.6145, 0.6145) , - (0.3216, 0.0, 0.0) , - (0.4157, 0.0, 0.0) , - (0.4745, 0.2342, 0.2342) , - (0.5333, 0.0, 0.0) , - (0.5804, 0.0, 0.0) , - (0.6314, 0.0549, 0.0549) , - (0.6902, 0.0, 0.0) , - (0.7373, 0.0, 0.0) , - (0.7922, 0.9738, 0.9738) , - (0.8, 1.0, 1.0) , - (0.8431, 1.0, 1.0) , - (0.898, 0.9341, 0.9341) , - (1.0, 0.9961, 0.9961) - } -); + new triple[] { // red + (0.0, 0.0, 0.0) , + (0.3098, 0.0, 0.0) , + (0.3725, 0.3993, 0.3993) , + (0.4235, 0.5003, 0.5003) , + (0.5333, 1.0, 1.0) , + (0.7922, 1.0, 1.0) , + (0.8471, 0.6218, 0.6218) , + (0.898, 0.9235, 0.9235) , + (1.0, 0.9961, 0.9961) + }, + new triple[] { // green + (0.0, 0.0, 0.0) , + (0.051, 0.3722, 0.3722) , + (0.1059, 0.0, 0.0) , + (0.1569, 0.7202, 0.7202) , + (0.1608, 0.7537, 0.7537) , + (0.1647, 0.7752, 0.7752) , + (0.2157, 1.0, 1.0) , + (0.2588, 0.9804, 0.9804) , + (0.2706, 0.9804, 0.9804) , + (0.3176, 1.0, 1.0) , + (0.3686, 0.8081, 0.8081) , + (0.4275, 1.0, 1.0) , + (0.5216, 1.0, 1.0) , + (0.6314, 0.7292, 0.7292) , + (0.6863, 0.2796, 0.2796) , + (0.7451, 0.0, 0.0) , + (0.7922, 0.0, 0.0) , + (0.8431, 0.1753, 0.1753) , + (0.898, 0.5, 0.5) , + (1.0, 0.9725, 0.9725) + }, + new triple[] { // blue + (0.0, 0.502, 0.502) , + (0.051, 0.0222, 0.0222) , + (0.1098, 1.0, 1.0) , + (0.2039, 1.0, 1.0) , + (0.2627, 0.6145, 0.6145) , + (0.3216, 0.0, 0.0) , + (0.4157, 0.0, 0.0) , + (0.4745, 0.2342, 0.2342) , + (0.5333, 0.0, 0.0) , + (0.5804, 0.0, 0.0) , + (0.6314, 0.0549, 0.0549) , + (0.6902, 0.0, 0.0) , + (0.7373, 0.0, 0.0) , + (0.7922, 0.9738, 0.9738) , + (0.8, 1.0, 1.0) , + (0.8431, 1.0, 1.0) , + (0.898, 0.9341, 0.9341) , + (1.0, 0.9961, 0.9961) + } + ); seg_data gist_stern = seg_data( - new triple[] { // red - (0.0, 0.0, 0.0) , - (0.0547, 1.0, 1.0) , - (0.25, 0.027, 0.25) , - (1.0, 1.0, 1.0) - }, - new triple[] { // green - (0, 0, 0) , - (1, 1, 1) - }, - new triple[] { // blue - (0.0, 0.0, 0.0) , - (0.5, 1.0, 1.0) , - (0.735, 0.0, 0.0) , - (1.0, 1.0, 1.0) - } -); + new triple[] { // red + (0.0, 0.0, 0.0) , + (0.0547, 1.0, 1.0) , + (0.25, 0.027, 0.25) , + (1.0, 1.0, 1.0) + }, + new triple[] { // green + (0, 0, 0) , + (1, 1, 1) + }, + new triple[] { // blue + (0.0, 0.0, 0.0) , + (0.5, 1.0, 1.0) , + (0.735, 0.0, 0.0) , + (1.0, 1.0, 1.0) + } + ); seg_data gray = seg_data( - new triple[] { // red - (0.0, 0, 0) , - (1.0, 1, 1) - }, - new triple[] { // green - (0.0, 0, 0) , - (1.0, 1, 1) - }, - new triple[] { // blue - (0.0, 0, 0) , - (1.0, 1, 1) - } -); + new triple[] { // red + (0.0, 0, 0) , + (1.0, 1, 1) + }, + new triple[] { // green + (0.0, 0, 0) , + (1.0, 1, 1) + }, + new triple[] { // blue + (0.0, 0, 0) , + (1.0, 1, 1) + } + ); seg_data hot = seg_data( - new triple[] { // red - (0.0, 0.0416, 0.0416) , - (0.365079, 1.0, 1.0) , - (1.0, 1.0, 1.0) - }, - new triple[] { // green - (0.0, 0.0, 0.0) , - (0.365079, 0.0, 0.0) , - (0.746032, 1.0, 1.0) , - (1.0, 1.0, 1.0) - }, - new triple[] { // blue - (0.0, 0.0, 0.0) , - (0.746032, 0.0, 0.0) , - (1.0, 1.0, 1.0) - } -); + new triple[] { // red + (0.0, 0.0416, 0.0416) , + (0.365079, 1.0, 1.0) , + (1.0, 1.0, 1.0) + }, + new triple[] { // green + (0.0, 0.0, 0.0) , + (0.365079, 0.0, 0.0) , + (0.746032, 1.0, 1.0) , + (1.0, 1.0, 1.0) + }, + new triple[] { // blue + (0.0, 0.0, 0.0) , + (0.746032, 0.0, 0.0) , + (1.0, 1.0, 1.0) + } + ); seg_data hsv = seg_data( - new triple[] { // red - (0.0, 1.0, 1.0) , - (0.15873, 1.0, 1.0) , - (0.174603, 0.96875, 0.96875) , - (0.333333, 0.03125, 0.03125) , - (0.349206, 0.0, 0.0) , - (0.666667, 0.0, 0.0) , - (0.68254, 0.03125, 0.03125) , - (0.84127, 0.96875, 0.96875) , - (0.857143, 1.0, 1.0) , - (1.0, 1.0, 1.0) - }, - new triple[] { // green - (0.0, 0.0, 0.0) , - (0.15873, 0.9375, 0.9375) , - (0.174603, 1.0, 1.0) , - (0.507937, 1.0, 1.0) , - (0.666667, 0.0625, 0.0625) , - (0.68254, 0.0, 0.0) , - (1.0, 0.0, 0.0) - }, - new triple[] { // blue - (0.0, 0.0, 0.0) , - (0.333333, 0.0, 0.0) , - (0.349206, 0.0625, 0.0625) , - (0.507937, 1.0, 1.0) , - (0.84127, 1.0, 1.0) , - (0.857143, 0.9375, 0.9375) , - (1.0, 0.09375, 0.09375) - } -); + new triple[] { // red + (0.0, 1.0, 1.0) , + (0.15873, 1.0, 1.0) , + (0.174603, 0.96875, 0.96875) , + (0.333333, 0.03125, 0.03125) , + (0.349206, 0.0, 0.0) , + (0.666667, 0.0, 0.0) , + (0.68254, 0.03125, 0.03125) , + (0.84127, 0.96875, 0.96875) , + (0.857143, 1.0, 1.0) , + (1.0, 1.0, 1.0) + }, + new triple[] { // green + (0.0, 0.0, 0.0) , + (0.15873, 0.9375, 0.9375) , + (0.174603, 1.0, 1.0) , + (0.507937, 1.0, 1.0) , + (0.666667, 0.0625, 0.0625) , + (0.68254, 0.0, 0.0) , + (1.0, 0.0, 0.0) + }, + new triple[] { // blue + (0.0, 0.0, 0.0) , + (0.333333, 0.0, 0.0) , + (0.349206, 0.0625, 0.0625) , + (0.507937, 1.0, 1.0) , + (0.84127, 1.0, 1.0) , + (0.857143, 0.9375, 0.9375) , + (1.0, 0.09375, 0.09375) + } + ); seg_data jet = seg_data( - new triple[] { // red - (0.0, 0, 0) , - (0.35, 0, 0) , - (0.66, 1, 1) , - (0.89, 1, 1) , - (1, 0.5, 0.5) - }, - new triple[] { // green - (0.0, 0, 0) , - (0.125, 0, 0) , - (0.375, 1, 1) , - (0.64, 1, 1) , - (0.91, 0, 0) , - (1, 0, 0) - }, - new triple[] { // blue - (0.0, 0.5, 0.5) , - (0.11, 1, 1) , - (0.34, 1, 1) , - (0.65, 0, 0) , - (1, 0, 0) - } -); + new triple[] { // red + (0.0, 0, 0) , + (0.35, 0, 0) , + (0.66, 1, 1) , + (0.89, 1, 1) , + (1, 0.5, 0.5) + }, + new triple[] { // green + (0.0, 0, 0) , + (0.125, 0, 0) , + (0.375, 1, 1) , + (0.64, 1, 1) , + (0.91, 0, 0) , + (1, 0, 0) + }, + new triple[] { // blue + (0.0, 0.5, 0.5) , + (0.11, 1, 1) , + (0.34, 1, 1) , + (0.65, 0, 0) , + (1, 0, 0) + } + ); seg_data nipy_spectral = seg_data( - new triple[] { // red - (0.0, 0.0, 0.0) , - (0.05, 0.4667, 0.4667) , - (0.1, 0.5333, 0.5333) , - (0.15, 0.0, 0.0) , - (0.2, 0.0, 0.0) , - (0.25, 0.0, 0.0) , - (0.3, 0.0, 0.0) , - (0.35, 0.0, 0.0) , - (0.4, 0.0, 0.0) , - (0.45, 0.0, 0.0) , - (0.5, 0.0, 0.0) , - (0.55, 0.0, 0.0) , - (0.6, 0.0, 0.0) , - (0.65, 0.7333, 0.7333) , - (0.7, 0.9333, 0.9333) , - (0.75, 1.0, 1.0) , - (0.8, 1.0, 1.0) , - (0.85, 1.0, 1.0) , - (0.9, 0.8667, 0.8667) , - (0.95, 0.8, 0.8) , - (1.0, 0.8, 0.8) - }, - new triple[] { // green - (0.0, 0.0, 0.0) , - (0.05, 0.0, 0.0) , - (0.1, 0.0, 0.0) , - (0.15, 0.0, 0.0) , - (0.2, 0.0, 0.0) , - (0.25, 0.4667, 0.4667) , - (0.3, 0.6, 0.6) , - (0.35, 0.6667, 0.6667) , - (0.4, 0.6667, 0.6667) , - (0.45, 0.6, 0.6) , - (0.5, 0.7333, 0.7333) , - (0.55, 0.8667, 0.8667) , - (0.6, 1.0, 1.0) , - (0.65, 1.0, 1.0) , - (0.7, 0.9333, 0.9333) , - (0.75, 0.8, 0.8) , - (0.8, 0.6, 0.6) , - (0.85, 0.0, 0.0) , - (0.9, 0.0, 0.0) , - (0.95, 0.0, 0.0) , - (1.0, 0.8, 0.8) - }, - new triple[] { // blue - (0.0, 0.0, 0.0) , - (0.05, 0.5333, 0.5333) , - (0.1, 0.6, 0.6) , - (0.15, 0.6667, 0.6667) , - (0.2, 0.8667, 0.8667) , - (0.25, 0.8667, 0.8667) , - (0.3, 0.8667, 0.8667) , - (0.35, 0.6667, 0.6667) , - (0.4, 0.5333, 0.5333) , - (0.45, 0.0, 0.0) , - (0.5, 0.0, 0.0) , - (0.55, 0.0, 0.0) , - (0.6, 0.0, 0.0) , - (0.65, 0.0, 0.0) , - (0.7, 0.0, 0.0) , - (0.75, 0.0, 0.0) , - (0.8, 0.0, 0.0) , - (0.85, 0.0, 0.0) , - (0.9, 0.0, 0.0) , - (0.95, 0.0, 0.0) , - (1.0, 0.8, 0.8) - } -); + new triple[] { // red + (0.0, 0.0, 0.0) , + (0.05, 0.4667, 0.4667) , + (0.1, 0.5333, 0.5333) , + (0.15, 0.0, 0.0) , + (0.2, 0.0, 0.0) , + (0.25, 0.0, 0.0) , + (0.3, 0.0, 0.0) , + (0.35, 0.0, 0.0) , + (0.4, 0.0, 0.0) , + (0.45, 0.0, 0.0) , + (0.5, 0.0, 0.0) , + (0.55, 0.0, 0.0) , + (0.6, 0.0, 0.0) , + (0.65, 0.7333, 0.7333) , + (0.7, 0.9333, 0.9333) , + (0.75, 1.0, 1.0) , + (0.8, 1.0, 1.0) , + (0.85, 1.0, 1.0) , + (0.9, 0.8667, 0.8667) , + (0.95, 0.8, 0.8) , + (1.0, 0.8, 0.8) + }, + new triple[] { // green + (0.0, 0.0, 0.0) , + (0.05, 0.0, 0.0) , + (0.1, 0.0, 0.0) , + (0.15, 0.0, 0.0) , + (0.2, 0.0, 0.0) , + (0.25, 0.4667, 0.4667) , + (0.3, 0.6, 0.6) , + (0.35, 0.6667, 0.6667) , + (0.4, 0.6667, 0.6667) , + (0.45, 0.6, 0.6) , + (0.5, 0.7333, 0.7333) , + (0.55, 0.8667, 0.8667) , + (0.6, 1.0, 1.0) , + (0.65, 1.0, 1.0) , + (0.7, 0.9333, 0.9333) , + (0.75, 0.8, 0.8) , + (0.8, 0.6, 0.6) , + (0.85, 0.0, 0.0) , + (0.9, 0.0, 0.0) , + (0.95, 0.0, 0.0) , + (1.0, 0.8, 0.8) + }, + new triple[] { // blue + (0.0, 0.0, 0.0) , + (0.05, 0.5333, 0.5333) , + (0.1, 0.6, 0.6) , + (0.15, 0.6667, 0.6667) , + (0.2, 0.8667, 0.8667) , + (0.25, 0.8667, 0.8667) , + (0.3, 0.8667, 0.8667) , + (0.35, 0.6667, 0.6667) , + (0.4, 0.5333, 0.5333) , + (0.45, 0.0, 0.0) , + (0.5, 0.0, 0.0) , + (0.55, 0.0, 0.0) , + (0.6, 0.0, 0.0) , + (0.65, 0.0, 0.0) , + (0.7, 0.0, 0.0) , + (0.75, 0.0, 0.0) , + (0.8, 0.0, 0.0) , + (0.85, 0.0, 0.0) , + (0.9, 0.0, 0.0) , + (0.95, 0.0, 0.0) , + (1.0, 0.8, 0.8) + } + ); seg_data pink = seg_data( - new triple[] { // red - (0.0, 0.1178, 0.1178) , - (0.015873, 0.195857, 0.195857) , - (0.031746, 0.250661, 0.250661) , - (0.047619, 0.295468, 0.295468) , - (0.063492, 0.334324, 0.334324) , - (0.079365, 0.369112, 0.369112) , - (0.095238, 0.400892, 0.400892) , - (0.111111, 0.430331, 0.430331) , - (0.126984, 0.457882, 0.457882) , - (0.142857, 0.483867, 0.483867) , - (0.15873, 0.508525, 0.508525) , - (0.174603, 0.532042, 0.532042) , - (0.190476, 0.554563, 0.554563) , - (0.206349, 0.576204, 0.576204) , - (0.222222, 0.597061, 0.597061) , - (0.238095, 0.617213, 0.617213) , - (0.253968, 0.636729, 0.636729) , - (0.269841, 0.655663, 0.655663) , - (0.285714, 0.674066, 0.674066) , - (0.301587, 0.69198, 0.69198) , - (0.31746, 0.709441, 0.709441) , - (0.333333, 0.726483, 0.726483) , - (0.349206, 0.743134, 0.743134) , - (0.365079, 0.759421, 0.759421) , - (0.380952, 0.766356, 0.766356) , - (0.396825, 0.773229, 0.773229) , - (0.412698, 0.780042, 0.780042) , - (0.428571, 0.786796, 0.786796) , - (0.444444, 0.793492, 0.793492) , - (0.460317, 0.800132, 0.800132) , - (0.47619, 0.806718, 0.806718) , - (0.492063, 0.81325, 0.81325) , - (0.507937, 0.81973, 0.81973) , - (0.52381, 0.82616, 0.82616) , - (0.539683, 0.832539, 0.832539) , - (0.555556, 0.83887, 0.83887) , - (0.571429, 0.845154, 0.845154) , - (0.587302, 0.851392, 0.851392) , - (0.603175, 0.857584, 0.857584) , - (0.619048, 0.863731, 0.863731) , - (0.634921, 0.869835, 0.869835) , - (0.650794, 0.875897, 0.875897) , - (0.666667, 0.881917, 0.881917) , - (0.68254, 0.887896, 0.887896) , - (0.698413, 0.893835, 0.893835) , - (0.714286, 0.899735, 0.899735) , - (0.730159, 0.905597, 0.905597) , - (0.746032, 0.911421, 0.911421) , - (0.761905, 0.917208, 0.917208) , - (0.777778, 0.922958, 0.922958) , - (0.793651, 0.928673, 0.928673) , - (0.809524, 0.934353, 0.934353) , - (0.825397, 0.939999, 0.939999) , - (0.84127, 0.945611, 0.945611) , - (0.857143, 0.95119, 0.95119) , - (0.873016, 0.956736, 0.956736) , - (0.888889, 0.96225, 0.96225) , - (0.904762, 0.967733, 0.967733) , - (0.920635, 0.973185, 0.973185) , - (0.936508, 0.978607, 0.978607) , - (0.952381, 0.983999, 0.983999) , - (0.968254, 0.989361, 0.989361) , - (0.984127, 0.994695, 0.994695) , - (1.0, 1.0, 1.0) - }, - new triple[] { // green - (0.0, 0.0, 0.0) , - (0.015873, 0.102869, 0.102869) , - (0.031746, 0.145479, 0.145479) , - (0.047619, 0.178174, 0.178174) , - (0.063492, 0.205738, 0.205738) , - (0.079365, 0.230022, 0.230022) , - (0.095238, 0.251976, 0.251976) , - (0.111111, 0.272166, 0.272166) , - (0.126984, 0.290957, 0.290957) , - (0.142857, 0.308607, 0.308607) , - (0.15873, 0.3253, 0.3253) , - (0.174603, 0.341178, 0.341178) , - (0.190476, 0.356348, 0.356348) , - (0.206349, 0.370899, 0.370899) , - (0.222222, 0.3849, 0.3849) , - (0.238095, 0.39841, 0.39841) , - (0.253968, 0.411476, 0.411476) , - (0.269841, 0.424139, 0.424139) , - (0.285714, 0.436436, 0.436436) , - (0.301587, 0.448395, 0.448395) , - (0.31746, 0.460044, 0.460044) , - (0.333333, 0.471405, 0.471405) , - (0.349206, 0.482498, 0.482498) , - (0.365079, 0.493342, 0.493342) , - (0.380952, 0.517549, 0.517549) , - (0.396825, 0.540674, 0.540674) , - (0.412698, 0.562849, 0.562849) , - (0.428571, 0.584183, 0.584183) , - (0.444444, 0.604765, 0.604765) , - (0.460317, 0.624669, 0.624669) , - (0.47619, 0.643958, 0.643958) , - (0.492063, 0.662687, 0.662687) , - (0.507937, 0.6809, 0.6809) , - (0.52381, 0.698638, 0.698638) , - (0.539683, 0.715937, 0.715937) , - (0.555556, 0.732828, 0.732828) , - (0.571429, 0.749338, 0.749338) , - (0.587302, 0.765493, 0.765493) , - (0.603175, 0.781313, 0.781313) , - (0.619048, 0.796819, 0.796819) , - (0.634921, 0.812029, 0.812029) , - (0.650794, 0.82696, 0.82696) , - (0.666667, 0.841625, 0.841625) , - (0.68254, 0.85604, 0.85604) , - (0.698413, 0.870216, 0.870216) , - (0.714286, 0.884164, 0.884164) , - (0.730159, 0.897896, 0.897896) , - (0.746032, 0.911421, 0.911421) , - (0.761905, 0.917208, 0.917208) , - (0.777778, 0.922958, 0.922958) , - (0.793651, 0.928673, 0.928673) , - (0.809524, 0.934353, 0.934353) , - (0.825397, 0.939999, 0.939999) , - (0.84127, 0.945611, 0.945611) , - (0.857143, 0.95119, 0.95119) , - (0.873016, 0.956736, 0.956736) , - (0.888889, 0.96225, 0.96225) , - (0.904762, 0.967733, 0.967733) , - (0.920635, 0.973185, 0.973185) , - (0.936508, 0.978607, 0.978607) , - (0.952381, 0.983999, 0.983999) , - (0.968254, 0.989361, 0.989361) , - (0.984127, 0.994695, 0.994695) , - (1.0, 1.0, 1.0) - }, - new triple[] { // blue - (0.0, 0.0, 0.0) , - (0.015873, 0.102869, 0.102869) , - (0.031746, 0.145479, 0.145479) , - (0.047619, 0.178174, 0.178174) , - (0.063492, 0.205738, 0.205738) , - (0.079365, 0.230022, 0.230022) , - (0.095238, 0.251976, 0.251976) , - (0.111111, 0.272166, 0.272166) , - (0.126984, 0.290957, 0.290957) , - (0.142857, 0.308607, 0.308607) , - (0.15873, 0.3253, 0.3253) , - (0.174603, 0.341178, 0.341178) , - (0.190476, 0.356348, 0.356348) , - (0.206349, 0.370899, 0.370899) , - (0.222222, 0.3849, 0.3849) , - (0.238095, 0.39841, 0.39841) , - (0.253968, 0.411476, 0.411476) , - (0.269841, 0.424139, 0.424139) , - (0.285714, 0.436436, 0.436436) , - (0.301587, 0.448395, 0.448395) , - (0.31746, 0.460044, 0.460044) , - (0.333333, 0.471405, 0.471405) , - (0.349206, 0.482498, 0.482498) , - (0.365079, 0.493342, 0.493342) , - (0.380952, 0.503953, 0.503953) , - (0.396825, 0.514344, 0.514344) , - (0.412698, 0.524531, 0.524531) , - (0.428571, 0.534522, 0.534522) , - (0.444444, 0.544331, 0.544331) , - (0.460317, 0.553966, 0.553966) , - (0.47619, 0.563436, 0.563436) , - (0.492063, 0.57275, 0.57275) , - (0.507937, 0.581914, 0.581914) , - (0.52381, 0.590937, 0.590937) , - (0.539683, 0.599824, 0.599824) , - (0.555556, 0.608581, 0.608581) , - (0.571429, 0.617213, 0.617213) , - (0.587302, 0.625727, 0.625727) , - (0.603175, 0.634126, 0.634126) , - (0.619048, 0.642416, 0.642416) , - (0.634921, 0.6506, 0.6506) , - (0.650794, 0.658682, 0.658682) , - (0.666667, 0.666667, 0.666667) , - (0.68254, 0.674556, 0.674556) , - (0.698413, 0.682355, 0.682355) , - (0.714286, 0.690066, 0.690066) , - (0.730159, 0.697691, 0.697691) , - (0.746032, 0.705234, 0.705234) , - (0.761905, 0.727166, 0.727166) , - (0.777778, 0.748455, 0.748455) , - (0.793651, 0.769156, 0.769156) , - (0.809524, 0.789314, 0.789314) , - (0.825397, 0.808969, 0.808969) , - (0.84127, 0.828159, 0.828159) , - (0.857143, 0.846913, 0.846913) , - (0.873016, 0.865261, 0.865261) , - (0.888889, 0.883229, 0.883229) , - (0.904762, 0.900837, 0.900837) , - (0.920635, 0.918109, 0.918109) , - (0.936508, 0.935061, 0.935061) , - (0.952381, 0.951711, 0.951711) , - (0.968254, 0.968075, 0.968075) , - (0.984127, 0.984167, 0.984167) , - (1.0, 1.0, 1.0) - } -); + new triple[] { // red + (0.0, 0.1178, 0.1178) , + (0.015873, 0.195857, 0.195857) , + (0.031746, 0.250661, 0.250661) , + (0.047619, 0.295468, 0.295468) , + (0.063492, 0.334324, 0.334324) , + (0.079365, 0.369112, 0.369112) , + (0.095238, 0.400892, 0.400892) , + (0.111111, 0.430331, 0.430331) , + (0.126984, 0.457882, 0.457882) , + (0.142857, 0.483867, 0.483867) , + (0.15873, 0.508525, 0.508525) , + (0.174603, 0.532042, 0.532042) , + (0.190476, 0.554563, 0.554563) , + (0.206349, 0.576204, 0.576204) , + (0.222222, 0.597061, 0.597061) , + (0.238095, 0.617213, 0.617213) , + (0.253968, 0.636729, 0.636729) , + (0.269841, 0.655663, 0.655663) , + (0.285714, 0.674066, 0.674066) , + (0.301587, 0.69198, 0.69198) , + (0.31746, 0.709441, 0.709441) , + (0.333333, 0.726483, 0.726483) , + (0.349206, 0.743134, 0.743134) , + (0.365079, 0.759421, 0.759421) , + (0.380952, 0.766356, 0.766356) , + (0.396825, 0.773229, 0.773229) , + (0.412698, 0.780042, 0.780042) , + (0.428571, 0.786796, 0.786796) , + (0.444444, 0.793492, 0.793492) , + (0.460317, 0.800132, 0.800132) , + (0.47619, 0.806718, 0.806718) , + (0.492063, 0.81325, 0.81325) , + (0.507937, 0.81973, 0.81973) , + (0.52381, 0.82616, 0.82616) , + (0.539683, 0.832539, 0.832539) , + (0.555556, 0.83887, 0.83887) , + (0.571429, 0.845154, 0.845154) , + (0.587302, 0.851392, 0.851392) , + (0.603175, 0.857584, 0.857584) , + (0.619048, 0.863731, 0.863731) , + (0.634921, 0.869835, 0.869835) , + (0.650794, 0.875897, 0.875897) , + (0.666667, 0.881917, 0.881917) , + (0.68254, 0.887896, 0.887896) , + (0.698413, 0.893835, 0.893835) , + (0.714286, 0.899735, 0.899735) , + (0.730159, 0.905597, 0.905597) , + (0.746032, 0.911421, 0.911421) , + (0.761905, 0.917208, 0.917208) , + (0.777778, 0.922958, 0.922958) , + (0.793651, 0.928673, 0.928673) , + (0.809524, 0.934353, 0.934353) , + (0.825397, 0.939999, 0.939999) , + (0.84127, 0.945611, 0.945611) , + (0.857143, 0.95119, 0.95119) , + (0.873016, 0.956736, 0.956736) , + (0.888889, 0.96225, 0.96225) , + (0.904762, 0.967733, 0.967733) , + (0.920635, 0.973185, 0.973185) , + (0.936508, 0.978607, 0.978607) , + (0.952381, 0.983999, 0.983999) , + (0.968254, 0.989361, 0.989361) , + (0.984127, 0.994695, 0.994695) , + (1.0, 1.0, 1.0) + }, + new triple[] { // green + (0.0, 0.0, 0.0) , + (0.015873, 0.102869, 0.102869) , + (0.031746, 0.145479, 0.145479) , + (0.047619, 0.178174, 0.178174) , + (0.063492, 0.205738, 0.205738) , + (0.079365, 0.230022, 0.230022) , + (0.095238, 0.251976, 0.251976) , + (0.111111, 0.272166, 0.272166) , + (0.126984, 0.290957, 0.290957) , + (0.142857, 0.308607, 0.308607) , + (0.15873, 0.3253, 0.3253) , + (0.174603, 0.341178, 0.341178) , + (0.190476, 0.356348, 0.356348) , + (0.206349, 0.370899, 0.370899) , + (0.222222, 0.3849, 0.3849) , + (0.238095, 0.39841, 0.39841) , + (0.253968, 0.411476, 0.411476) , + (0.269841, 0.424139, 0.424139) , + (0.285714, 0.436436, 0.436436) , + (0.301587, 0.448395, 0.448395) , + (0.31746, 0.460044, 0.460044) , + (0.333333, 0.471405, 0.471405) , + (0.349206, 0.482498, 0.482498) , + (0.365079, 0.493342, 0.493342) , + (0.380952, 0.517549, 0.517549) , + (0.396825, 0.540674, 0.540674) , + (0.412698, 0.562849, 0.562849) , + (0.428571, 0.584183, 0.584183) , + (0.444444, 0.604765, 0.604765) , + (0.460317, 0.624669, 0.624669) , + (0.47619, 0.643958, 0.643958) , + (0.492063, 0.662687, 0.662687) , + (0.507937, 0.6809, 0.6809) , + (0.52381, 0.698638, 0.698638) , + (0.539683, 0.715937, 0.715937) , + (0.555556, 0.732828, 0.732828) , + (0.571429, 0.749338, 0.749338) , + (0.587302, 0.765493, 0.765493) , + (0.603175, 0.781313, 0.781313) , + (0.619048, 0.796819, 0.796819) , + (0.634921, 0.812029, 0.812029) , + (0.650794, 0.82696, 0.82696) , + (0.666667, 0.841625, 0.841625) , + (0.68254, 0.85604, 0.85604) , + (0.698413, 0.870216, 0.870216) , + (0.714286, 0.884164, 0.884164) , + (0.730159, 0.897896, 0.897896) , + (0.746032, 0.911421, 0.911421) , + (0.761905, 0.917208, 0.917208) , + (0.777778, 0.922958, 0.922958) , + (0.793651, 0.928673, 0.928673) , + (0.809524, 0.934353, 0.934353) , + (0.825397, 0.939999, 0.939999) , + (0.84127, 0.945611, 0.945611) , + (0.857143, 0.95119, 0.95119) , + (0.873016, 0.956736, 0.956736) , + (0.888889, 0.96225, 0.96225) , + (0.904762, 0.967733, 0.967733) , + (0.920635, 0.973185, 0.973185) , + (0.936508, 0.978607, 0.978607) , + (0.952381, 0.983999, 0.983999) , + (0.968254, 0.989361, 0.989361) , + (0.984127, 0.994695, 0.994695) , + (1.0, 1.0, 1.0) + }, + new triple[] { // blue + (0.0, 0.0, 0.0) , + (0.015873, 0.102869, 0.102869) , + (0.031746, 0.145479, 0.145479) , + (0.047619, 0.178174, 0.178174) , + (0.063492, 0.205738, 0.205738) , + (0.079365, 0.230022, 0.230022) , + (0.095238, 0.251976, 0.251976) , + (0.111111, 0.272166, 0.272166) , + (0.126984, 0.290957, 0.290957) , + (0.142857, 0.308607, 0.308607) , + (0.15873, 0.3253, 0.3253) , + (0.174603, 0.341178, 0.341178) , + (0.190476, 0.356348, 0.356348) , + (0.206349, 0.370899, 0.370899) , + (0.222222, 0.3849, 0.3849) , + (0.238095, 0.39841, 0.39841) , + (0.253968, 0.411476, 0.411476) , + (0.269841, 0.424139, 0.424139) , + (0.285714, 0.436436, 0.436436) , + (0.301587, 0.448395, 0.448395) , + (0.31746, 0.460044, 0.460044) , + (0.333333, 0.471405, 0.471405) , + (0.349206, 0.482498, 0.482498) , + (0.365079, 0.493342, 0.493342) , + (0.380952, 0.503953, 0.503953) , + (0.396825, 0.514344, 0.514344) , + (0.412698, 0.524531, 0.524531) , + (0.428571, 0.534522, 0.534522) , + (0.444444, 0.544331, 0.544331) , + (0.460317, 0.553966, 0.553966) , + (0.47619, 0.563436, 0.563436) , + (0.492063, 0.57275, 0.57275) , + (0.507937, 0.581914, 0.581914) , + (0.52381, 0.590937, 0.590937) , + (0.539683, 0.599824, 0.599824) , + (0.555556, 0.608581, 0.608581) , + (0.571429, 0.617213, 0.617213) , + (0.587302, 0.625727, 0.625727) , + (0.603175, 0.634126, 0.634126) , + (0.619048, 0.642416, 0.642416) , + (0.634921, 0.6506, 0.6506) , + (0.650794, 0.658682, 0.658682) , + (0.666667, 0.666667, 0.666667) , + (0.68254, 0.674556, 0.674556) , + (0.698413, 0.682355, 0.682355) , + (0.714286, 0.690066, 0.690066) , + (0.730159, 0.697691, 0.697691) , + (0.746032, 0.705234, 0.705234) , + (0.761905, 0.727166, 0.727166) , + (0.777778, 0.748455, 0.748455) , + (0.793651, 0.769156, 0.769156) , + (0.809524, 0.789314, 0.789314) , + (0.825397, 0.808969, 0.808969) , + (0.84127, 0.828159, 0.828159) , + (0.857143, 0.846913, 0.846913) , + (0.873016, 0.865261, 0.865261) , + (0.888889, 0.883229, 0.883229) , + (0.904762, 0.900837, 0.900837) , + (0.920635, 0.918109, 0.918109) , + (0.936508, 0.935061, 0.935061) , + (0.952381, 0.951711, 0.951711) , + (0.968254, 0.968075, 0.968075) , + (0.984127, 0.984167, 0.984167) , + (1.0, 1.0, 1.0) + } + ); list_data seismic = list_data(new pen[] { - rgb (0.0, 0.0, 0.3) , - rgb (0.0, 0.0, 1.0) , - rgb (1.0, 1.0, 1.0) , - rgb (1.0, 0.0, 0.0) , - rgb (0.5, 0.0, 0.0) -}); + rgb (0.0, 0.0, 0.3) , + rgb (0.0, 0.0, 1.0) , + rgb (1.0, 1.0, 1.0) , + rgb (1.0, 0.0, 0.0) , + rgb (0.5, 0.0, 0.0) + }); seg_data spring = seg_data( - new triple[] { // red - (0.0, 1.0, 1.0) , - (1.0, 1.0, 1.0) - }, - new triple[] { // green - (0.0, 0.0, 0.0) , - (1.0, 1.0, 1.0) - }, - new triple[] { // blue - (0.0, 1.0, 1.0) , - (1.0, 0.0, 0.0) - } -); + new triple[] { // red + (0.0, 1.0, 1.0) , + (1.0, 1.0, 1.0) + }, + new triple[] { // green + (0.0, 0.0, 0.0) , + (1.0, 1.0, 1.0) + }, + new triple[] { // blue + (0.0, 1.0, 1.0) , + (1.0, 0.0, 0.0) + } + ); seg_data summer = seg_data( - new triple[] { // red - (0.0, 0.0, 0.0) , - (1.0, 1.0, 1.0) - }, - new triple[] { // green - (0.0, 0.5, 0.5) , - (1.0, 1.0, 1.0) - }, - new triple[] { // blue - (0.0, 0.4, 0.4) , - (1.0, 0.4, 0.4) - } -); + new triple[] { // red + (0.0, 0.0, 0.0) , + (1.0, 1.0, 1.0) + }, + new triple[] { // green + (0.0, 0.5, 0.5) , + (1.0, 1.0, 1.0) + }, + new triple[] { // blue + (0.0, 0.4, 0.4) , + (1.0, 0.4, 0.4) + } + ); list_data tab10 = list_data(new pen[] { - rgb (0.12156862745098039, 0.4666666666666667, 0.7058823529411765) , - rgb (1.0, 0.4980392156862745, 0.054901960784313725) , - rgb (0.17254901960784313, 0.6274509803921569, 0.17254901960784313) , - rgb (0.8392156862745098, 0.15294117647058825, 0.1568627450980392) , - rgb (0.5803921568627451, 0.403921568627451, 0.7411764705882353) , - rgb (0.5490196078431373, 0.33725490196078434, 0.29411764705882354) , - rgb (0.8901960784313725, 0.4666666666666667, 0.7607843137254902) , - rgb (0.4980392156862745, 0.4980392156862745, 0.4980392156862745) , - rgb (0.7372549019607844, 0.7411764705882353, 0.13333333333333333) , - rgb (0.09019607843137255, 0.7450980392156863, 0.8117647058823529) -}); + rgb (0.12156862745098039, 0.4666666666666667, 0.7058823529411765) , + rgb (1.0, 0.4980392156862745, 0.054901960784313725) , + rgb (0.17254901960784313, 0.6274509803921569, 0.17254901960784313) , + rgb (0.8392156862745098, 0.15294117647058825, 0.1568627450980392) , + rgb (0.5803921568627451, 0.403921568627451, 0.7411764705882353) , + rgb (0.5490196078431373, 0.33725490196078434, 0.29411764705882354) , + rgb (0.8901960784313725, 0.4666666666666667, 0.7607843137254902) , + rgb (0.4980392156862745, 0.4980392156862745, 0.4980392156862745) , + rgb (0.7372549019607844, 0.7411764705882353, 0.13333333333333333) , + rgb (0.09019607843137255, 0.7450980392156863, 0.8117647058823529) + }); list_data tab20 = list_data(new pen[] { - rgb (0.12156862745098039, 0.4666666666666667, 0.7058823529411765) , - rgb (0.6823529411764706, 0.7803921568627451, 0.9098039215686274) , - rgb (1.0, 0.4980392156862745, 0.054901960784313725) , - rgb (1.0, 0.7333333333333333, 0.47058823529411764) , - rgb (0.17254901960784313, 0.6274509803921569, 0.17254901960784313) , - rgb (0.596078431372549, 0.8745098039215686, 0.5411764705882353) , - rgb (0.8392156862745098, 0.15294117647058825, 0.1568627450980392) , - rgb (1.0, 0.596078431372549, 0.5882352941176471) , - rgb (0.5803921568627451, 0.403921568627451, 0.7411764705882353) , - rgb (0.7725490196078432, 0.6901960784313725, 0.8352941176470589) , - rgb (0.5490196078431373, 0.33725490196078434, 0.29411764705882354) , - rgb (0.7686274509803922, 0.611764705882353, 0.5803921568627451) , - rgb (0.8901960784313725, 0.4666666666666667, 0.7607843137254902) , - rgb (0.9686274509803922, 0.7137254901960784, 0.8235294117647058) , - rgb (0.4980392156862745, 0.4980392156862745, 0.4980392156862745) , - rgb (0.7803921568627451, 0.7803921568627451, 0.7803921568627451) , - rgb (0.7372549019607844, 0.7411764705882353, 0.13333333333333333) , - rgb (0.8588235294117647, 0.8588235294117647, 0.5529411764705883) , - rgb (0.09019607843137255, 0.7450980392156863, 0.8117647058823529) , - rgb (0.6196078431372549, 0.8549019607843137, 0.8980392156862745) -}); + rgb (0.12156862745098039, 0.4666666666666667, 0.7058823529411765) , + rgb (0.6823529411764706, 0.7803921568627451, 0.9098039215686274) , + rgb (1.0, 0.4980392156862745, 0.054901960784313725) , + rgb (1.0, 0.7333333333333333, 0.47058823529411764) , + rgb (0.17254901960784313, 0.6274509803921569, 0.17254901960784313) , + rgb (0.596078431372549, 0.8745098039215686, 0.5411764705882353) , + rgb (0.8392156862745098, 0.15294117647058825, 0.1568627450980392) , + rgb (1.0, 0.596078431372549, 0.5882352941176471) , + rgb (0.5803921568627451, 0.403921568627451, 0.7411764705882353) , + rgb (0.7725490196078432, 0.6901960784313725, 0.8352941176470589) , + rgb (0.5490196078431373, 0.33725490196078434, 0.29411764705882354) , + rgb (0.7686274509803922, 0.611764705882353, 0.5803921568627451) , + rgb (0.8901960784313725, 0.4666666666666667, 0.7607843137254902) , + rgb (0.9686274509803922, 0.7137254901960784, 0.8235294117647058) , + rgb (0.4980392156862745, 0.4980392156862745, 0.4980392156862745) , + rgb (0.7803921568627451, 0.7803921568627451, 0.7803921568627451) , + rgb (0.7372549019607844, 0.7411764705882353, 0.13333333333333333) , + rgb (0.8588235294117647, 0.8588235294117647, 0.5529411764705883) , + rgb (0.09019607843137255, 0.7450980392156863, 0.8117647058823529) , + rgb (0.6196078431372549, 0.8549019607843137, 0.8980392156862745) + }); list_data tab20b = list_data(new pen[] { - rgb (0.2235294117647059, 0.23137254901960785, 0.4745098039215686) , - rgb (0.3215686274509804, 0.32941176470588235, 0.6392156862745098) , - rgb (0.4196078431372549, 0.43137254901960786, 0.8117647058823529) , - rgb (0.611764705882353, 0.6196078431372549, 0.8705882352941177) , - rgb (0.38823529411764707, 0.4745098039215686, 0.2235294117647059) , - rgb (0.5490196078431373, 0.6352941176470588, 0.3215686274509804) , - rgb (0.7098039215686275, 0.8117647058823529, 0.4196078431372549) , - rgb (0.807843137254902, 0.8588235294117647, 0.611764705882353) , - rgb (0.5490196078431373, 0.42745098039215684, 0.19215686274509805) , - rgb (0.7411764705882353, 0.6196078431372549, 0.2235294117647059) , - rgb (0.9058823529411765, 0.7294117647058823, 0.3215686274509804) , - rgb (0.9058823529411765, 0.796078431372549, 0.5803921568627451) , - rgb (0.5176470588235295, 0.23529411764705882, 0.2235294117647059) , - rgb (0.6784313725490196, 0.28627450980392155, 0.2901960784313726) , - rgb (0.8392156862745098, 0.3803921568627451, 0.4196078431372549) , - rgb (0.9058823529411765, 0.5882352941176471, 0.611764705882353) , - rgb (0.4823529411764706, 0.2549019607843137, 0.45098039215686275) , - rgb (0.6470588235294118, 0.3176470588235294, 0.5803921568627451) , - rgb (0.807843137254902, 0.42745098039215684, 0.7411764705882353) , - rgb (0.8705882352941177, 0.6196078431372549, 0.8392156862745098) -}); + rgb (0.2235294117647059, 0.23137254901960785, 0.4745098039215686) , + rgb (0.3215686274509804, 0.32941176470588235, 0.6392156862745098) , + rgb (0.4196078431372549, 0.43137254901960786, 0.8117647058823529) , + rgb (0.611764705882353, 0.6196078431372549, 0.8705882352941177) , + rgb (0.38823529411764707, 0.4745098039215686, 0.2235294117647059) , + rgb (0.5490196078431373, 0.6352941176470588, 0.3215686274509804) , + rgb (0.7098039215686275, 0.8117647058823529, 0.4196078431372549) , + rgb (0.807843137254902, 0.8588235294117647, 0.611764705882353) , + rgb (0.5490196078431373, 0.42745098039215684, 0.19215686274509805) , + rgb (0.7411764705882353, 0.6196078431372549, 0.2235294117647059) , + rgb (0.9058823529411765, 0.7294117647058823, 0.3215686274509804) , + rgb (0.9058823529411765, 0.796078431372549, 0.5803921568627451) , + rgb (0.5176470588235295, 0.23529411764705882, 0.2235294117647059) , + rgb (0.6784313725490196, 0.28627450980392155, 0.2901960784313726) , + rgb (0.8392156862745098, 0.3803921568627451, 0.4196078431372549) , + rgb (0.9058823529411765, 0.5882352941176471, 0.611764705882353) , + rgb (0.4823529411764706, 0.2549019607843137, 0.45098039215686275) , + rgb (0.6470588235294118, 0.3176470588235294, 0.5803921568627451) , + rgb (0.807843137254902, 0.42745098039215684, 0.7411764705882353) , + rgb (0.8705882352941177, 0.6196078431372549, 0.8392156862745098) + }); list_data tab20c = list_data(new pen[] { - rgb (0.19215686274509805, 0.5098039215686274, 0.7411764705882353) , - rgb (0.4196078431372549, 0.6823529411764706, 0.8392156862745098) , - rgb (0.6196078431372549, 0.792156862745098, 0.8823529411764706) , - rgb (0.7764705882352941, 0.8588235294117647, 0.9372549019607843) , - rgb (0.9019607843137255, 0.3333333333333333, 0.050980392156862744) , - rgb (0.9921568627450981, 0.5529411764705883, 0.23529411764705882) , - rgb (0.9921568627450981, 0.6823529411764706, 0.4196078431372549) , - rgb (0.9921568627450981, 0.8156862745098039, 0.6352941176470588) , - rgb (0.19215686274509805, 0.6392156862745098, 0.32941176470588235) , - rgb (0.4549019607843137, 0.7686274509803922, 0.4627450980392157) , - rgb (0.6313725490196078, 0.8509803921568627, 0.6078431372549019) , - rgb (0.7803921568627451, 0.9137254901960784, 0.7529411764705882) , - rgb (0.4588235294117647, 0.4196078431372549, 0.6941176470588235) , - rgb (0.6196078431372549, 0.6039215686274509, 0.7843137254901961) , - rgb (0.7372549019607844, 0.7411764705882353, 0.8627450980392157) , - rgb (0.8549019607843137, 0.8549019607843137, 0.9215686274509803) , - rgb (0.38823529411764707, 0.38823529411764707, 0.38823529411764707) , - rgb (0.5882352941176471, 0.5882352941176471, 0.5882352941176471) , - rgb (0.7411764705882353, 0.7411764705882353, 0.7411764705882353) , - rgb (0.8509803921568627, 0.8509803921568627, 0.8509803921568627) -}); + rgb (0.19215686274509805, 0.5098039215686274, 0.7411764705882353) , + rgb (0.4196078431372549, 0.6823529411764706, 0.8392156862745098) , + rgb (0.6196078431372549, 0.792156862745098, 0.8823529411764706) , + rgb (0.7764705882352941, 0.8588235294117647, 0.9372549019607843) , + rgb (0.9019607843137255, 0.3333333333333333, 0.050980392156862744) , + rgb (0.9921568627450981, 0.5529411764705883, 0.23529411764705882) , + rgb (0.9921568627450981, 0.6823529411764706, 0.4196078431372549) , + rgb (0.9921568627450981, 0.8156862745098039, 0.6352941176470588) , + rgb (0.19215686274509805, 0.6392156862745098, 0.32941176470588235) , + rgb (0.4549019607843137, 0.7686274509803922, 0.4627450980392157) , + rgb (0.6313725490196078, 0.8509803921568627, 0.6078431372549019) , + rgb (0.7803921568627451, 0.9137254901960784, 0.7529411764705882) , + rgb (0.4588235294117647, 0.4196078431372549, 0.6941176470588235) , + rgb (0.6196078431372549, 0.6039215686274509, 0.7843137254901961) , + rgb (0.7372549019607844, 0.7411764705882353, 0.8627450980392157) , + rgb (0.8549019607843137, 0.8549019607843137, 0.9215686274509803) , + rgb (0.38823529411764707, 0.38823529411764707, 0.38823529411764707) , + rgb (0.5882352941176471, 0.5882352941176471, 0.5882352941176471) , + rgb (0.7411764705882353, 0.7411764705882353, 0.7411764705882353) , + rgb (0.8509803921568627, 0.8509803921568627, 0.8509803921568627) + }); seg_data winter = seg_data( - new triple[] { // red - (0.0, 0.0, 0.0) , - (1.0, 0.0, 0.0) - }, - new triple[] { // green - (0.0, 0.0, 0.0) , - (1.0, 1.0, 1.0) - }, - new triple[] { // blue - (0.0, 1.0, 1.0) , - (1.0, 0.5, 0.5) - } -); + new triple[] { // red + (0.0, 0.0, 0.0) , + (1.0, 0.0, 0.0) + }, + new triple[] { // green + (0.0, 0.0, 0.0) , + (1.0, 1.0, 1.0) + }, + new triple[] { // blue + (0.0, 1.0, 1.0) , + (1.0, 0.5, 0.5) + } + ); seg_data wistia = seg_data( - new triple[] { // red - (0.0, 0.8941176470588236, 0.8941176470588236) , - (0.25, 1.0, 1.0) , - (0.5, 1.0, 1.0) , - (0.75, 1.0, 1.0) , - (1.0, 0.9882352941176471, 0.9882352941176471) - }, - new triple[] { // green - (0.0, 1.0, 1.0) , - (0.25, 0.9098039215686274, 0.9098039215686274) , - (0.5, 0.7411764705882353, 0.7411764705882353) , - (0.75, 0.6274509803921569, 0.6274509803921569) , - (1.0, 0.4980392156862745, 0.4980392156862745) - }, - new triple[] { // blue - (0.0, 0.47843137254901963, 0.47843137254901963) , - (0.25, 0.10196078431372549, 0.10196078431372549) , - (0.5, 0.0, 0.0) , - (0.75, 0.0, 0.0) , - (1.0, 0.0, 0.0) - } -); + new triple[] { // red + (0.0, 0.8941176470588236, 0.8941176470588236) , + (0.25, 1.0, 1.0) , + (0.5, 1.0, 1.0) , + (0.75, 1.0, 1.0) , + (1.0, 0.9882352941176471, 0.9882352941176471) + }, + new triple[] { // green + (0.0, 1.0, 1.0) , + (0.25, 0.9098039215686274, 0.9098039215686274) , + (0.5, 0.7411764705882353, 0.7411764705882353) , + (0.75, 0.6274509803921569, 0.6274509803921569) , + (1.0, 0.4980392156862745, 0.4980392156862745) + }, + new triple[] { // blue + (0.0, 0.47843137254901963, 0.47843137254901963) , + (0.25, 0.10196078431372549, 0.10196078431372549) , + (0.5, 0.0, 0.0) , + (0.75, 0.0, 0.0) , + (1.0, 0.0, 0.0) + } + ); list_data cividis = list_data(new pen[] { - rgb (0.0, 0.135112, 0.304751) , - rgb (0.0, 0.138068, 0.311105) , - rgb (0.0, 0.141013, 0.317579) , - rgb (0.0, 0.143951, 0.323982) , - rgb (0.0, 0.146877, 0.330479) , - rgb (0.0, 0.149791, 0.337065) , - rgb (0.0, 0.152673, 0.343704) , - rgb (0.0, 0.155377, 0.3505) , - rgb (0.0, 0.157932, 0.357521) , - rgb (0.0, 0.160495, 0.364534) , - rgb (0.0, 0.163058, 0.371608) , - rgb (0.0, 0.165621, 0.378769) , - rgb (0.0, 0.168204, 0.385902) , - rgb (0.0, 0.1708, 0.3931) , - rgb (0.0, 0.17342, 0.400353) , - rgb (0.0, 0.176082, 0.407577) , - rgb (0.0, 0.178802, 0.414764) , - rgb (0.0, 0.18161, 0.421859) , - rgb (0.0, 0.18455, 0.428802) , - rgb (0.0, 0.186915, 0.435532) , - rgb (0.0, 0.188769, 0.439563) , - rgb (0.0, 0.19095, 0.441085) , - rgb (0.0, 0.193366, 0.441561) , - rgb (0.003602, 0.195911, 0.441564) , - rgb (0.017852, 0.198528, 0.441248) , - rgb (0.03211, 0.201199, 0.440785) , - rgb (0.046205, 0.203903, 0.440196) , - rgb (0.058378, 0.206629, 0.439531) , - rgb (0.068968, 0.209372, 0.438863) , - rgb (0.078624, 0.212122, 0.438105) , - rgb (0.087465, 0.214879, 0.437342) , - rgb (0.095645, 0.217643, 0.436593) , - rgb (0.103401, 0.220406, 0.43579) , - rgb (0.110658, 0.22317, 0.435067) , - rgb (0.117612, 0.225935, 0.434308) , - rgb (0.124291, 0.228697, 0.433547) , - rgb (0.130669, 0.231458, 0.43284) , - rgb (0.13683, 0.234216, 0.432148) , - rgb (0.142852, 0.236972, 0.431404) , - rgb (0.148638, 0.239724, 0.430752) , - rgb (0.154261, 0.242475, 0.43012) , - rgb (0.159733, 0.245221, 0.429528) , - rgb (0.165113, 0.247965, 0.428908) , - rgb (0.170362, 0.250707, 0.428325) , - rgb (0.17549, 0.253444, 0.42779) , - rgb (0.180503, 0.25618, 0.427299) , - rgb (0.185453, 0.258914, 0.426788) , - rgb (0.190303, 0.261644, 0.426329) , - rgb (0.195057, 0.264372, 0.425924) , - rgb (0.199764, 0.267099, 0.425497) , - rgb (0.204385, 0.269823, 0.425126) , - rgb (0.208926, 0.272546, 0.424809) , - rgb (0.213431, 0.275266, 0.42448) , - rgb (0.217863, 0.277985, 0.424206) , - rgb (0.222264, 0.280702, 0.423914) , - rgb (0.226598, 0.283419, 0.423678) , - rgb (0.230871, 0.286134, 0.423498) , - rgb (0.23512, 0.288848, 0.423304) , - rgb (0.239312, 0.291562, 0.423167) , - rgb (0.243485, 0.294274, 0.423014) , - rgb (0.247605, 0.296986, 0.422917) , - rgb (0.251675, 0.299698, 0.422873) , - rgb (0.255731, 0.302409, 0.422814) , - rgb (0.25974, 0.30512, 0.42281) , - rgb (0.263738, 0.307831, 0.422789) , - rgb (0.267693, 0.310542, 0.422821) , - rgb (0.271639, 0.313253, 0.422837) , - rgb (0.275513, 0.315965, 0.422979) , - rgb (0.279411, 0.318677, 0.423031) , - rgb (0.28324, 0.32139, 0.423211) , - rgb (0.287065, 0.324103, 0.423373) , - rgb (0.290884, 0.326816, 0.423517) , - rgb (0.294669, 0.329531, 0.423716) , - rgb (0.298421, 0.332247, 0.423973) , - rgb (0.302169, 0.334963, 0.424213) , - rgb (0.305886, 0.337681, 0.424512) , - rgb (0.309601, 0.340399, 0.42479) , - rgb (0.313287, 0.34312, 0.42512) , - rgb (0.316941, 0.345842, 0.425512) , - rgb (0.320595, 0.348565, 0.425889) , - rgb (0.32425, 0.351289, 0.42625) , - rgb (0.327875, 0.354016, 0.42667) , - rgb (0.331474, 0.356744, 0.427144) , - rgb (0.335073, 0.359474, 0.427605) , - rgb (0.338673, 0.362206, 0.428053) , - rgb (0.342246, 0.364939, 0.428559) , - rgb (0.345793, 0.367676, 0.429127) , - rgb (0.349341, 0.370414, 0.429685) , - rgb (0.352892, 0.373153, 0.430226) , - rgb (0.356418, 0.375896, 0.430823) , - rgb (0.359916, 0.378641, 0.431501) , - rgb (0.363446, 0.381388, 0.432075) , - rgb (0.366923, 0.384139, 0.432796) , - rgb (0.37043, 0.38689, 0.433428) , - rgb (0.373884, 0.389646, 0.434209) , - rgb (0.377371, 0.392404, 0.43489) , - rgb (0.38083, 0.395164, 0.435653) , - rgb (0.384268, 0.397928, 0.436475) , - rgb (0.387705, 0.400694, 0.437305) , - rgb (0.391151, 0.403464, 0.438096) , - rgb (0.394568, 0.406236, 0.438986) , - rgb (0.397991, 0.409011, 0.439848) , - rgb (0.401418, 0.41179, 0.440708) , - rgb (0.40482, 0.414572, 0.441642) , - rgb (0.408226, 0.417357, 0.44257) , - rgb (0.411607, 0.420145, 0.443577) , - rgb (0.414992, 0.422937, 0.444578) , - rgb (0.418383, 0.425733, 0.44556) , - rgb (0.421748, 0.428531, 0.44664) , - rgb (0.42512, 0.431334, 0.447692) , - rgb (0.428462, 0.43414, 0.448864) , - rgb (0.431817, 0.43695, 0.449982) , - rgb (0.435168, 0.439763, 0.451134) , - rgb (0.438504, 0.44258, 0.452341) , - rgb (0.44181, 0.445402, 0.453659) , - rgb (0.445148, 0.448226, 0.454885) , - rgb (0.448447, 0.451053, 0.456264) , - rgb (0.451759, 0.453887, 0.457582) , - rgb (0.455072, 0.456718, 0.458976) , - rgb (0.458366, 0.459552, 0.460457) , - rgb (0.461616, 0.462405, 0.461969) , - rgb (0.464947, 0.465241, 0.463395) , - rgb (0.468254, 0.468083, 0.464908) , - rgb (0.471501, 0.47096, 0.466357) , - rgb (0.474812, 0.473832, 0.467681) , - rgb (0.478186, 0.476699, 0.468845) , - rgb (0.481622, 0.479573, 0.469767) , - rgb (0.485141, 0.482451, 0.470384) , - rgb (0.488697, 0.485318, 0.471008) , - rgb (0.492278, 0.488198, 0.471453) , - rgb (0.495913, 0.491076, 0.471751) , - rgb (0.499552, 0.49396, 0.472032) , - rgb (0.503185, 0.496851, 0.472305) , - rgb (0.506866, 0.499743, 0.472432) , - rgb (0.51054, 0.502643, 0.47255) , - rgb (0.514226, 0.505546, 0.47264) , - rgb (0.51792, 0.508454, 0.472707) , - rgb (0.521643, 0.511367, 0.472639) , - rgb (0.525348, 0.514285, 0.47266) , - rgb (0.529086, 0.517207, 0.472543) , - rgb (0.532829, 0.520135, 0.472401) , - rgb (0.536553, 0.523067, 0.472352) , - rgb (0.540307, 0.526005, 0.472163) , - rgb (0.544069, 0.528948, 0.471947) , - rgb (0.54784, 0.531895, 0.471704) , - rgb (0.551612, 0.534849, 0.471439) , - rgb (0.555393, 0.537807, 0.471147) , - rgb (0.559181, 0.540771, 0.470829) , - rgb (0.562972, 0.543741, 0.470488) , - rgb (0.566802, 0.546715, 0.469988) , - rgb (0.570607, 0.549695, 0.469593) , - rgb (0.574417, 0.552682, 0.469172) , - rgb (0.578236, 0.555673, 0.468724) , - rgb (0.582087, 0.55867, 0.468118) , - rgb (0.585916, 0.561674, 0.467618) , - rgb (0.589753, 0.564682, 0.46709) , - rgb (0.593622, 0.567697, 0.466401) , - rgb (0.597469, 0.570718, 0.465821) , - rgb (0.601354, 0.573743, 0.465074) , - rgb (0.605211, 0.576777, 0.464441) , - rgb (0.609105, 0.579816, 0.463638) , - rgb (0.612977, 0.582861, 0.46295) , - rgb (0.616852, 0.585913, 0.462237) , - rgb (0.620765, 0.58897, 0.461351) , - rgb (0.624654, 0.592034, 0.460583) , - rgb (0.628576, 0.595104, 0.459641) , - rgb (0.632506, 0.59818, 0.458668) , - rgb (0.636412, 0.601264, 0.457818) , - rgb (0.640352, 0.604354, 0.456791) , - rgb (0.64427, 0.60745, 0.455886) , - rgb (0.648222, 0.610553, 0.454801) , - rgb (0.652178, 0.613664, 0.453689) , - rgb (0.656114, 0.61678, 0.452702) , - rgb (0.660082, 0.619904, 0.451534) , - rgb (0.664055, 0.623034, 0.450338) , - rgb (0.668008, 0.626171, 0.44927) , - rgb (0.671991, 0.629316, 0.448018) , - rgb (0.675981, 0.632468, 0.446736) , - rgb (0.679979, 0.635626, 0.445424) , - rgb (0.68395, 0.638793, 0.444251) , - rgb (0.687957, 0.641966, 0.442886) , - rgb (0.691971, 0.645145, 0.441491) , - rgb (0.695985, 0.648334, 0.440072) , - rgb (0.700008, 0.651529, 0.438624) , - rgb (0.704037, 0.654731, 0.437147) , - rgb (0.708067, 0.657942, 0.435647) , - rgb (0.712105, 0.66116, 0.434117) , - rgb (0.716177, 0.664384, 0.432386) , - rgb (0.720222, 0.667618, 0.430805) , - rgb (0.724274, 0.670859, 0.429194) , - rgb (0.728334, 0.674107, 0.427554) , - rgb (0.732422, 0.677364, 0.425717) , - rgb (0.736488, 0.680629, 0.424028) , - rgb (0.740589, 0.6839, 0.422131) , - rgb (0.744664, 0.687181, 0.420393) , - rgb (0.748772, 0.69047, 0.418448) , - rgb (0.752886, 0.693766, 0.416472) , - rgb (0.756975, 0.697071, 0.414659) , - rgb (0.761096, 0.700384, 0.412638) , - rgb (0.765223, 0.703705, 0.410587) , - rgb (0.769353, 0.707035, 0.408516) , - rgb (0.773486, 0.710373, 0.406422) , - rgb (0.777651, 0.713719, 0.404112) , - rgb (0.781795, 0.717074, 0.401966) , - rgb (0.785965, 0.720438, 0.399613) , - rgb (0.790116, 0.72381, 0.397423) , - rgb (0.794298, 0.72719, 0.395016) , - rgb (0.79848, 0.73058, 0.392597) , - rgb (0.802667, 0.733978, 0.390153) , - rgb (0.806859, 0.737385, 0.387684) , - rgb (0.811054, 0.740801, 0.385198) , - rgb (0.815274, 0.744226, 0.382504) , - rgb (0.819499, 0.747659, 0.379785) , - rgb (0.823729, 0.751101, 0.377043) , - rgb (0.827959, 0.754553, 0.374292) , - rgb (0.832192, 0.758014, 0.371529) , - rgb (0.836429, 0.761483, 0.368747) , - rgb (0.840693, 0.764962, 0.365746) , - rgb (0.844957, 0.76845, 0.362741) , - rgb (0.849223, 0.771947, 0.359729) , - rgb (0.853515, 0.775454, 0.3565) , - rgb (0.857809, 0.778969, 0.353259) , - rgb (0.862105, 0.782494, 0.350011) , - rgb (0.866421, 0.786028, 0.346571) , - rgb (0.870717, 0.789572, 0.343333) , - rgb (0.875057, 0.793125, 0.339685) , - rgb (0.879378, 0.796687, 0.336241) , - rgb (0.88372, 0.800258, 0.332599) , - rgb (0.888081, 0.803839, 0.32877) , - rgb (0.89244, 0.80743, 0.324968) , - rgb (0.896818, 0.81103, 0.320982) , - rgb (0.901195, 0.814639, 0.317021) , - rgb (0.905589, 0.818257, 0.312889) , - rgb (0.91, 0.821885, 0.308594) , - rgb (0.914407, 0.825522, 0.304348) , - rgb (0.918828, 0.829168, 0.29996) , - rgb (0.923279, 0.832822, 0.295244) , - rgb (0.927724, 0.836486, 0.290611) , - rgb (0.93218, 0.840159, 0.28588) , - rgb (0.93666, 0.843841, 0.280876) , - rgb (0.941147, 0.84753, 0.275815) , - rgb (0.945654, 0.851228, 0.270532) , - rgb (0.950178, 0.854933, 0.265085) , - rgb (0.954725, 0.858646, 0.259365) , - rgb (0.959284, 0.862365, 0.253563) , - rgb (0.963872, 0.866089, 0.247445) , - rgb (0.968469, 0.869819, 0.24131) , - rgb (0.973114, 0.87355, 0.234677) , - rgb (0.97778, 0.877281, 0.227954) , - rgb (0.982497, 0.881008, 0.220878) , - rgb (0.987293, 0.884718, 0.213336) , - rgb (0.992218, 0.888385, 0.205468) , - rgb (0.994847, 0.892954, 0.203445) , - rgb (0.995249, 0.898384, 0.207561) , - rgb (0.995503, 0.903866, 0.21237) , - rgb (0.995737, 0.909344, 0.217772) -}); + rgb (0.0, 0.135112, 0.304751) , + rgb (0.0, 0.138068, 0.311105) , + rgb (0.0, 0.141013, 0.317579) , + rgb (0.0, 0.143951, 0.323982) , + rgb (0.0, 0.146877, 0.330479) , + rgb (0.0, 0.149791, 0.337065) , + rgb (0.0, 0.152673, 0.343704) , + rgb (0.0, 0.155377, 0.3505) , + rgb (0.0, 0.157932, 0.357521) , + rgb (0.0, 0.160495, 0.364534) , + rgb (0.0, 0.163058, 0.371608) , + rgb (0.0, 0.165621, 0.378769) , + rgb (0.0, 0.168204, 0.385902) , + rgb (0.0, 0.1708, 0.3931) , + rgb (0.0, 0.17342, 0.400353) , + rgb (0.0, 0.176082, 0.407577) , + rgb (0.0, 0.178802, 0.414764) , + rgb (0.0, 0.18161, 0.421859) , + rgb (0.0, 0.18455, 0.428802) , + rgb (0.0, 0.186915, 0.435532) , + rgb (0.0, 0.188769, 0.439563) , + rgb (0.0, 0.19095, 0.441085) , + rgb (0.0, 0.193366, 0.441561) , + rgb (0.003602, 0.195911, 0.441564) , + rgb (0.017852, 0.198528, 0.441248) , + rgb (0.03211, 0.201199, 0.440785) , + rgb (0.046205, 0.203903, 0.440196) , + rgb (0.058378, 0.206629, 0.439531) , + rgb (0.068968, 0.209372, 0.438863) , + rgb (0.078624, 0.212122, 0.438105) , + rgb (0.087465, 0.214879, 0.437342) , + rgb (0.095645, 0.217643, 0.436593) , + rgb (0.103401, 0.220406, 0.43579) , + rgb (0.110658, 0.22317, 0.435067) , + rgb (0.117612, 0.225935, 0.434308) , + rgb (0.124291, 0.228697, 0.433547) , + rgb (0.130669, 0.231458, 0.43284) , + rgb (0.13683, 0.234216, 0.432148) , + rgb (0.142852, 0.236972, 0.431404) , + rgb (0.148638, 0.239724, 0.430752) , + rgb (0.154261, 0.242475, 0.43012) , + rgb (0.159733, 0.245221, 0.429528) , + rgb (0.165113, 0.247965, 0.428908) , + rgb (0.170362, 0.250707, 0.428325) , + rgb (0.17549, 0.253444, 0.42779) , + rgb (0.180503, 0.25618, 0.427299) , + rgb (0.185453, 0.258914, 0.426788) , + rgb (0.190303, 0.261644, 0.426329) , + rgb (0.195057, 0.264372, 0.425924) , + rgb (0.199764, 0.267099, 0.425497) , + rgb (0.204385, 0.269823, 0.425126) , + rgb (0.208926, 0.272546, 0.424809) , + rgb (0.213431, 0.275266, 0.42448) , + rgb (0.217863, 0.277985, 0.424206) , + rgb (0.222264, 0.280702, 0.423914) , + rgb (0.226598, 0.283419, 0.423678) , + rgb (0.230871, 0.286134, 0.423498) , + rgb (0.23512, 0.288848, 0.423304) , + rgb (0.239312, 0.291562, 0.423167) , + rgb (0.243485, 0.294274, 0.423014) , + rgb (0.247605, 0.296986, 0.422917) , + rgb (0.251675, 0.299698, 0.422873) , + rgb (0.255731, 0.302409, 0.422814) , + rgb (0.25974, 0.30512, 0.42281) , + rgb (0.263738, 0.307831, 0.422789) , + rgb (0.267693, 0.310542, 0.422821) , + rgb (0.271639, 0.313253, 0.422837) , + rgb (0.275513, 0.315965, 0.422979) , + rgb (0.279411, 0.318677, 0.423031) , + rgb (0.28324, 0.32139, 0.423211) , + rgb (0.287065, 0.324103, 0.423373) , + rgb (0.290884, 0.326816, 0.423517) , + rgb (0.294669, 0.329531, 0.423716) , + rgb (0.298421, 0.332247, 0.423973) , + rgb (0.302169, 0.334963, 0.424213) , + rgb (0.305886, 0.337681, 0.424512) , + rgb (0.309601, 0.340399, 0.42479) , + rgb (0.313287, 0.34312, 0.42512) , + rgb (0.316941, 0.345842, 0.425512) , + rgb (0.320595, 0.348565, 0.425889) , + rgb (0.32425, 0.351289, 0.42625) , + rgb (0.327875, 0.354016, 0.42667) , + rgb (0.331474, 0.356744, 0.427144) , + rgb (0.335073, 0.359474, 0.427605) , + rgb (0.338673, 0.362206, 0.428053) , + rgb (0.342246, 0.364939, 0.428559) , + rgb (0.345793, 0.367676, 0.429127) , + rgb (0.349341, 0.370414, 0.429685) , + rgb (0.352892, 0.373153, 0.430226) , + rgb (0.356418, 0.375896, 0.430823) , + rgb (0.359916, 0.378641, 0.431501) , + rgb (0.363446, 0.381388, 0.432075) , + rgb (0.366923, 0.384139, 0.432796) , + rgb (0.37043, 0.38689, 0.433428) , + rgb (0.373884, 0.389646, 0.434209) , + rgb (0.377371, 0.392404, 0.43489) , + rgb (0.38083, 0.395164, 0.435653) , + rgb (0.384268, 0.397928, 0.436475) , + rgb (0.387705, 0.400694, 0.437305) , + rgb (0.391151, 0.403464, 0.438096) , + rgb (0.394568, 0.406236, 0.438986) , + rgb (0.397991, 0.409011, 0.439848) , + rgb (0.401418, 0.41179, 0.440708) , + rgb (0.40482, 0.414572, 0.441642) , + rgb (0.408226, 0.417357, 0.44257) , + rgb (0.411607, 0.420145, 0.443577) , + rgb (0.414992, 0.422937, 0.444578) , + rgb (0.418383, 0.425733, 0.44556) , + rgb (0.421748, 0.428531, 0.44664) , + rgb (0.42512, 0.431334, 0.447692) , + rgb (0.428462, 0.43414, 0.448864) , + rgb (0.431817, 0.43695, 0.449982) , + rgb (0.435168, 0.439763, 0.451134) , + rgb (0.438504, 0.44258, 0.452341) , + rgb (0.44181, 0.445402, 0.453659) , + rgb (0.445148, 0.448226, 0.454885) , + rgb (0.448447, 0.451053, 0.456264) , + rgb (0.451759, 0.453887, 0.457582) , + rgb (0.455072, 0.456718, 0.458976) , + rgb (0.458366, 0.459552, 0.460457) , + rgb (0.461616, 0.462405, 0.461969) , + rgb (0.464947, 0.465241, 0.463395) , + rgb (0.468254, 0.468083, 0.464908) , + rgb (0.471501, 0.47096, 0.466357) , + rgb (0.474812, 0.473832, 0.467681) , + rgb (0.478186, 0.476699, 0.468845) , + rgb (0.481622, 0.479573, 0.469767) , + rgb (0.485141, 0.482451, 0.470384) , + rgb (0.488697, 0.485318, 0.471008) , + rgb (0.492278, 0.488198, 0.471453) , + rgb (0.495913, 0.491076, 0.471751) , + rgb (0.499552, 0.49396, 0.472032) , + rgb (0.503185, 0.496851, 0.472305) , + rgb (0.506866, 0.499743, 0.472432) , + rgb (0.51054, 0.502643, 0.47255) , + rgb (0.514226, 0.505546, 0.47264) , + rgb (0.51792, 0.508454, 0.472707) , + rgb (0.521643, 0.511367, 0.472639) , + rgb (0.525348, 0.514285, 0.47266) , + rgb (0.529086, 0.517207, 0.472543) , + rgb (0.532829, 0.520135, 0.472401) , + rgb (0.536553, 0.523067, 0.472352) , + rgb (0.540307, 0.526005, 0.472163) , + rgb (0.544069, 0.528948, 0.471947) , + rgb (0.54784, 0.531895, 0.471704) , + rgb (0.551612, 0.534849, 0.471439) , + rgb (0.555393, 0.537807, 0.471147) , + rgb (0.559181, 0.540771, 0.470829) , + rgb (0.562972, 0.543741, 0.470488) , + rgb (0.566802, 0.546715, 0.469988) , + rgb (0.570607, 0.549695, 0.469593) , + rgb (0.574417, 0.552682, 0.469172) , + rgb (0.578236, 0.555673, 0.468724) , + rgb (0.582087, 0.55867, 0.468118) , + rgb (0.585916, 0.561674, 0.467618) , + rgb (0.589753, 0.564682, 0.46709) , + rgb (0.593622, 0.567697, 0.466401) , + rgb (0.597469, 0.570718, 0.465821) , + rgb (0.601354, 0.573743, 0.465074) , + rgb (0.605211, 0.576777, 0.464441) , + rgb (0.609105, 0.579816, 0.463638) , + rgb (0.612977, 0.582861, 0.46295) , + rgb (0.616852, 0.585913, 0.462237) , + rgb (0.620765, 0.58897, 0.461351) , + rgb (0.624654, 0.592034, 0.460583) , + rgb (0.628576, 0.595104, 0.459641) , + rgb (0.632506, 0.59818, 0.458668) , + rgb (0.636412, 0.601264, 0.457818) , + rgb (0.640352, 0.604354, 0.456791) , + rgb (0.64427, 0.60745, 0.455886) , + rgb (0.648222, 0.610553, 0.454801) , + rgb (0.652178, 0.613664, 0.453689) , + rgb (0.656114, 0.61678, 0.452702) , + rgb (0.660082, 0.619904, 0.451534) , + rgb (0.664055, 0.623034, 0.450338) , + rgb (0.668008, 0.626171, 0.44927) , + rgb (0.671991, 0.629316, 0.448018) , + rgb (0.675981, 0.632468, 0.446736) , + rgb (0.679979, 0.635626, 0.445424) , + rgb (0.68395, 0.638793, 0.444251) , + rgb (0.687957, 0.641966, 0.442886) , + rgb (0.691971, 0.645145, 0.441491) , + rgb (0.695985, 0.648334, 0.440072) , + rgb (0.700008, 0.651529, 0.438624) , + rgb (0.704037, 0.654731, 0.437147) , + rgb (0.708067, 0.657942, 0.435647) , + rgb (0.712105, 0.66116, 0.434117) , + rgb (0.716177, 0.664384, 0.432386) , + rgb (0.720222, 0.667618, 0.430805) , + rgb (0.724274, 0.670859, 0.429194) , + rgb (0.728334, 0.674107, 0.427554) , + rgb (0.732422, 0.677364, 0.425717) , + rgb (0.736488, 0.680629, 0.424028) , + rgb (0.740589, 0.6839, 0.422131) , + rgb (0.744664, 0.687181, 0.420393) , + rgb (0.748772, 0.69047, 0.418448) , + rgb (0.752886, 0.693766, 0.416472) , + rgb (0.756975, 0.697071, 0.414659) , + rgb (0.761096, 0.700384, 0.412638) , + rgb (0.765223, 0.703705, 0.410587) , + rgb (0.769353, 0.707035, 0.408516) , + rgb (0.773486, 0.710373, 0.406422) , + rgb (0.777651, 0.713719, 0.404112) , + rgb (0.781795, 0.717074, 0.401966) , + rgb (0.785965, 0.720438, 0.399613) , + rgb (0.790116, 0.72381, 0.397423) , + rgb (0.794298, 0.72719, 0.395016) , + rgb (0.79848, 0.73058, 0.392597) , + rgb (0.802667, 0.733978, 0.390153) , + rgb (0.806859, 0.737385, 0.387684) , + rgb (0.811054, 0.740801, 0.385198) , + rgb (0.815274, 0.744226, 0.382504) , + rgb (0.819499, 0.747659, 0.379785) , + rgb (0.823729, 0.751101, 0.377043) , + rgb (0.827959, 0.754553, 0.374292) , + rgb (0.832192, 0.758014, 0.371529) , + rgb (0.836429, 0.761483, 0.368747) , + rgb (0.840693, 0.764962, 0.365746) , + rgb (0.844957, 0.76845, 0.362741) , + rgb (0.849223, 0.771947, 0.359729) , + rgb (0.853515, 0.775454, 0.3565) , + rgb (0.857809, 0.778969, 0.353259) , + rgb (0.862105, 0.782494, 0.350011) , + rgb (0.866421, 0.786028, 0.346571) , + rgb (0.870717, 0.789572, 0.343333) , + rgb (0.875057, 0.793125, 0.339685) , + rgb (0.879378, 0.796687, 0.336241) , + rgb (0.88372, 0.800258, 0.332599) , + rgb (0.888081, 0.803839, 0.32877) , + rgb (0.89244, 0.80743, 0.324968) , + rgb (0.896818, 0.81103, 0.320982) , + rgb (0.901195, 0.814639, 0.317021) , + rgb (0.905589, 0.818257, 0.312889) , + rgb (0.91, 0.821885, 0.308594) , + rgb (0.914407, 0.825522, 0.304348) , + rgb (0.918828, 0.829168, 0.29996) , + rgb (0.923279, 0.832822, 0.295244) , + rgb (0.927724, 0.836486, 0.290611) , + rgb (0.93218, 0.840159, 0.28588) , + rgb (0.93666, 0.843841, 0.280876) , + rgb (0.941147, 0.84753, 0.275815) , + rgb (0.945654, 0.851228, 0.270532) , + rgb (0.950178, 0.854933, 0.265085) , + rgb (0.954725, 0.858646, 0.259365) , + rgb (0.959284, 0.862365, 0.253563) , + rgb (0.963872, 0.866089, 0.247445) , + rgb (0.968469, 0.869819, 0.24131) , + rgb (0.973114, 0.87355, 0.234677) , + rgb (0.97778, 0.877281, 0.227954) , + rgb (0.982497, 0.881008, 0.220878) , + rgb (0.987293, 0.884718, 0.213336) , + rgb (0.992218, 0.888385, 0.205468) , + rgb (0.994847, 0.892954, 0.203445) , + rgb (0.995249, 0.898384, 0.207561) , + rgb (0.995503, 0.903866, 0.21237) , + rgb (0.995737, 0.909344, 0.217772) + }); list_data inferno = list_data(new pen[] { - rgb (0.001462, 0.000466, 0.013866) , - rgb (0.002267, 0.00127, 0.01857) , - rgb (0.003299, 0.002249, 0.024239) , - rgb (0.004547, 0.003392, 0.030909) , - rgb (0.006006, 0.004692, 0.038558) , - rgb (0.007676, 0.006136, 0.046836) , - rgb (0.009561, 0.007713, 0.055143) , - rgb (0.011663, 0.009417, 0.06346) , - rgb (0.013995, 0.011225, 0.071862) , - rgb (0.016561, 0.013136, 0.080282) , - rgb (0.019373, 0.015133, 0.088767) , - rgb (0.022447, 0.017199, 0.097327) , - rgb (0.025793, 0.019331, 0.10593) , - rgb (0.029432, 0.021503, 0.114621) , - rgb (0.033385, 0.023702, 0.123397) , - rgb (0.037668, 0.025921, 0.132232) , - rgb (0.042253, 0.028139, 0.141141) , - rgb (0.046915, 0.030324, 0.150164) , - rgb (0.051644, 0.032474, 0.159254) , - rgb (0.056449, 0.034569, 0.168414) , - rgb (0.06134, 0.03659, 0.177642) , - rgb (0.066331, 0.038504, 0.186962) , - rgb (0.071429, 0.040294, 0.196354) , - rgb (0.076637, 0.041905, 0.205799) , - rgb (0.081962, 0.043328, 0.215289) , - rgb (0.087411, 0.044556, 0.224813) , - rgb (0.09299, 0.045583, 0.234358) , - rgb (0.098702, 0.046402, 0.243904) , - rgb (0.104551, 0.047008, 0.25343) , - rgb (0.110536, 0.047399, 0.262912) , - rgb (0.116656, 0.047574, 0.272321) , - rgb (0.122908, 0.047536, 0.281624) , - rgb (0.129285, 0.047293, 0.290788) , - rgb (0.135778, 0.046856, 0.299776) , - rgb (0.142378, 0.046242, 0.308553) , - rgb (0.149073, 0.045468, 0.317085) , - rgb (0.15585, 0.044559, 0.325338) , - rgb (0.162689, 0.043554, 0.333277) , - rgb (0.169575, 0.042489, 0.340874) , - rgb (0.176493, 0.041402, 0.348111) , - rgb (0.183429, 0.040329, 0.354971) , - rgb (0.190367, 0.039309, 0.361447) , - rgb (0.197297, 0.0384, 0.367535) , - rgb (0.204209, 0.037632, 0.373238) , - rgb (0.211095, 0.03703, 0.378563) , - rgb (0.217949, 0.036615, 0.383522) , - rgb (0.224763, 0.036405, 0.388129) , - rgb (0.231538, 0.036405, 0.3924) , - rgb (0.238273, 0.036621, 0.396353) , - rgb (0.244967, 0.037055, 0.400007) , - rgb (0.25162, 0.037705, 0.403378) , - rgb (0.258234, 0.038571, 0.406485) , - rgb (0.26481, 0.039647, 0.409345) , - rgb (0.271347, 0.040922, 0.411976) , - rgb (0.27785, 0.042353, 0.414392) , - rgb (0.284321, 0.043933, 0.416608) , - rgb (0.290763, 0.045644, 0.418637) , - rgb (0.297178, 0.04747, 0.420491) , - rgb (0.303568, 0.049396, 0.422182) , - rgb (0.309935, 0.051407, 0.423721) , - rgb (0.316282, 0.05349, 0.425116) , - rgb (0.32261, 0.055634, 0.426377) , - rgb (0.328921, 0.057827, 0.427511) , - rgb (0.335217, 0.06006, 0.428524) , - rgb (0.3415, 0.062325, 0.429425) , - rgb (0.347771, 0.064616, 0.430217) , - rgb (0.354032, 0.066925, 0.430906) , - rgb (0.360284, 0.069247, 0.431497) , - rgb (0.366529, 0.071579, 0.431994) , - rgb (0.372768, 0.073915, 0.4324) , - rgb (0.379001, 0.076253, 0.432719) , - rgb (0.385228, 0.078591, 0.432955) , - rgb (0.391453, 0.080927, 0.433109) , - rgb (0.397674, 0.083257, 0.433183) , - rgb (0.403894, 0.08558, 0.433179) , - rgb (0.410113, 0.087896, 0.433098) , - rgb (0.416331, 0.090203, 0.432943) , - rgb (0.422549, 0.092501, 0.432714) , - rgb (0.428768, 0.09479, 0.432412) , - rgb (0.434987, 0.097069, 0.432039) , - rgb (0.441207, 0.099338, 0.431594) , - rgb (0.447428, 0.101597, 0.43108) , - rgb (0.453651, 0.103848, 0.430498) , - rgb (0.459875, 0.106089, 0.429846) , - rgb (0.4661, 0.108322, 0.429125) , - rgb (0.472328, 0.110547, 0.428334) , - rgb (0.478558, 0.112764, 0.427475) , - rgb (0.484789, 0.114974, 0.426548) , - rgb (0.491022, 0.117179, 0.425552) , - rgb (0.497257, 0.119379, 0.424488) , - rgb (0.503493, 0.121575, 0.423356) , - rgb (0.50973, 0.123769, 0.422156) , - rgb (0.515967, 0.12596, 0.420887) , - rgb (0.522206, 0.12815, 0.419549) , - rgb (0.528444, 0.130341, 0.418142) , - rgb (0.534683, 0.132534, 0.416667) , - rgb (0.54092, 0.134729, 0.415123) , - rgb (0.547157, 0.136929, 0.413511) , - rgb (0.553392, 0.139134, 0.411829) , - rgb (0.559624, 0.141346, 0.410078) , - rgb (0.565854, 0.143567, 0.408258) , - rgb (0.572081, 0.145797, 0.406369) , - rgb (0.578304, 0.148039, 0.404411) , - rgb (0.584521, 0.150294, 0.402385) , - rgb (0.590734, 0.152563, 0.40029) , - rgb (0.59694, 0.154848, 0.398125) , - rgb (0.603139, 0.157151, 0.395891) , - rgb (0.60933, 0.159474, 0.393589) , - rgb (0.615513, 0.161817, 0.391219) , - rgb (0.621685, 0.164184, 0.388781) , - rgb (0.627847, 0.166575, 0.386276) , - rgb (0.633998, 0.168992, 0.383704) , - rgb (0.640135, 0.171438, 0.381065) , - rgb (0.64626, 0.173914, 0.378359) , - rgb (0.652369, 0.176421, 0.375586) , - rgb (0.658463, 0.178962, 0.372748) , - rgb (0.66454, 0.181539, 0.369846) , - rgb (0.670599, 0.184153, 0.366879) , - rgb (0.676638, 0.186807, 0.363849) , - rgb (0.682656, 0.189501, 0.360757) , - rgb (0.688653, 0.192239, 0.357603) , - rgb (0.694627, 0.195021, 0.354388) , - rgb (0.700576, 0.197851, 0.351113) , - rgb (0.7065, 0.200728, 0.347777) , - rgb (0.712396, 0.203656, 0.344383) , - rgb (0.718264, 0.206636, 0.340931) , - rgb (0.724103, 0.20967, 0.337424) , - rgb (0.729909, 0.212759, 0.333861) , - rgb (0.735683, 0.215906, 0.330245) , - rgb (0.741423, 0.219112, 0.326576) , - rgb (0.747127, 0.222378, 0.322856) , - rgb (0.752794, 0.225706, 0.319085) , - rgb (0.758422, 0.229097, 0.315266) , - rgb (0.76401, 0.232554, 0.311399) , - rgb (0.769556, 0.236077, 0.307485) , - rgb (0.775059, 0.239667, 0.303526) , - rgb (0.780517, 0.243327, 0.299523) , - rgb (0.785929, 0.247056, 0.295477) , - rgb (0.791293, 0.250856, 0.29139) , - rgb (0.796607, 0.254728, 0.287264) , - rgb (0.801871, 0.258674, 0.283099) , - rgb (0.807082, 0.262692, 0.278898) , - rgb (0.812239, 0.266786, 0.274661) , - rgb (0.817341, 0.270954, 0.27039) , - rgb (0.822386, 0.275197, 0.266085) , - rgb (0.827372, 0.279517, 0.26175) , - rgb (0.832299, 0.283913, 0.257383) , - rgb (0.837165, 0.288385, 0.252988) , - rgb (0.841969, 0.292933, 0.248564) , - rgb (0.846709, 0.297559, 0.244113) , - rgb (0.851384, 0.30226, 0.239636) , - rgb (0.855992, 0.307038, 0.235133) , - rgb (0.860533, 0.311892, 0.230606) , - rgb (0.865006, 0.316822, 0.226055) , - rgb (0.869409, 0.321827, 0.221482) , - rgb (0.873741, 0.326906, 0.216886) , - rgb (0.878001, 0.33206, 0.212268) , - rgb (0.882188, 0.337287, 0.207628) , - rgb (0.886302, 0.342586, 0.202968) , - rgb (0.890341, 0.347957, 0.198286) , - rgb (0.894305, 0.353399, 0.193584) , - rgb (0.898192, 0.358911, 0.18886) , - rgb (0.902003, 0.364492, 0.184116) , - rgb (0.905735, 0.37014, 0.17935) , - rgb (0.90939, 0.375856, 0.174563) , - rgb (0.912966, 0.381636, 0.169755) , - rgb (0.916462, 0.387481, 0.164924) , - rgb (0.919879, 0.393389, 0.16007) , - rgb (0.923215, 0.399359, 0.155193) , - rgb (0.92647, 0.405389, 0.150292) , - rgb (0.929644, 0.411479, 0.145367) , - rgb (0.932737, 0.417627, 0.140417) , - rgb (0.935747, 0.423831, 0.13544) , - rgb (0.938675, 0.430091, 0.130438) , - rgb (0.941521, 0.436405, 0.125409) , - rgb (0.944285, 0.442772, 0.120354) , - rgb (0.946965, 0.449191, 0.115272) , - rgb (0.949562, 0.45566, 0.110164) , - rgb (0.952075, 0.462178, 0.105031) , - rgb (0.954506, 0.468744, 0.099874) , - rgb (0.956852, 0.475356, 0.094695) , - rgb (0.959114, 0.482014, 0.089499) , - rgb (0.961293, 0.488716, 0.084289) , - rgb (0.963387, 0.495462, 0.079073) , - rgb (0.965397, 0.502249, 0.073859) , - rgb (0.967322, 0.509078, 0.068659) , - rgb (0.969163, 0.515946, 0.063488) , - rgb (0.970919, 0.522853, 0.058367) , - rgb (0.97259, 0.529798, 0.053324) , - rgb (0.974176, 0.53678, 0.048392) , - rgb (0.975677, 0.543798, 0.043618) , - rgb (0.977092, 0.55085, 0.03905) , - rgb (0.978422, 0.557937, 0.034931) , - rgb (0.979666, 0.565057, 0.031409) , - rgb (0.980824, 0.572209, 0.028508) , - rgb (0.981895, 0.579392, 0.02625) , - rgb (0.982881, 0.586606, 0.024661) , - rgb (0.983779, 0.593849, 0.02377) , - rgb (0.984591, 0.601122, 0.023606) , - rgb (0.985315, 0.608422, 0.024202) , - rgb (0.985952, 0.61575, 0.025592) , - rgb (0.986502, 0.623105, 0.027814) , - rgb (0.986964, 0.630485, 0.030908) , - rgb (0.987337, 0.63789, 0.034916) , - rgb (0.987622, 0.64532, 0.039886) , - rgb (0.987819, 0.652773, 0.045581) , - rgb (0.987926, 0.66025, 0.05175) , - rgb (0.987945, 0.667748, 0.058329) , - rgb (0.987874, 0.675267, 0.065257) , - rgb (0.987714, 0.682807, 0.072489) , - rgb (0.987464, 0.690366, 0.07999) , - rgb (0.987124, 0.697944, 0.087731) , - rgb (0.986694, 0.70554, 0.095694) , - rgb (0.986175, 0.713153, 0.103863) , - rgb (0.985566, 0.720782, 0.112229) , - rgb (0.984865, 0.728427, 0.120785) , - rgb (0.984075, 0.736087, 0.129527) , - rgb (0.983196, 0.743758, 0.138453) , - rgb (0.982228, 0.751442, 0.147565) , - rgb (0.981173, 0.759135, 0.156863) , - rgb (0.980032, 0.766837, 0.166353) , - rgb (0.978806, 0.774545, 0.176037) , - rgb (0.977497, 0.782258, 0.185923) , - rgb (0.976108, 0.789974, 0.196018) , - rgb (0.974638, 0.797692, 0.206332) , - rgb (0.973088, 0.805409, 0.216877) , - rgb (0.971468, 0.813122, 0.227658) , - rgb (0.969783, 0.820825, 0.238686) , - rgb (0.968041, 0.828515, 0.249972) , - rgb (0.966243, 0.836191, 0.261534) , - rgb (0.964394, 0.843848, 0.273391) , - rgb (0.962517, 0.851476, 0.285546) , - rgb (0.960626, 0.859069, 0.29801) , - rgb (0.95872, 0.866624, 0.31082) , - rgb (0.956834, 0.874129, 0.323974) , - rgb (0.954997, 0.881569, 0.337475) , - rgb (0.953215, 0.888942, 0.351369) , - rgb (0.951546, 0.896226, 0.365627) , - rgb (0.950018, 0.903409, 0.380271) , - rgb (0.948683, 0.910473, 0.395289) , - rgb (0.947594, 0.917399, 0.410665) , - rgb (0.946809, 0.924168, 0.426373) , - rgb (0.946392, 0.930761, 0.442367) , - rgb (0.946403, 0.937159, 0.458592) , - rgb (0.946903, 0.943348, 0.47497) , - rgb (0.947937, 0.949318, 0.491426) , - rgb (0.949545, 0.955063, 0.50786) , - rgb (0.95174, 0.960587, 0.524203) , - rgb (0.954529, 0.965896, 0.540361) , - rgb (0.957896, 0.971003, 0.556275) , - rgb (0.961812, 0.975924, 0.571925) , - rgb (0.966249, 0.980678, 0.587206) , - rgb (0.971162, 0.985282, 0.602154) , - rgb (0.976511, 0.989753, 0.61676) , - rgb (0.982257, 0.994109, 0.631017) , - rgb (0.988362, 0.998364, 0.644924) -}); + rgb (0.001462, 0.000466, 0.013866) , + rgb (0.002267, 0.00127, 0.01857) , + rgb (0.003299, 0.002249, 0.024239) , + rgb (0.004547, 0.003392, 0.030909) , + rgb (0.006006, 0.004692, 0.038558) , + rgb (0.007676, 0.006136, 0.046836) , + rgb (0.009561, 0.007713, 0.055143) , + rgb (0.011663, 0.009417, 0.06346) , + rgb (0.013995, 0.011225, 0.071862) , + rgb (0.016561, 0.013136, 0.080282) , + rgb (0.019373, 0.015133, 0.088767) , + rgb (0.022447, 0.017199, 0.097327) , + rgb (0.025793, 0.019331, 0.10593) , + rgb (0.029432, 0.021503, 0.114621) , + rgb (0.033385, 0.023702, 0.123397) , + rgb (0.037668, 0.025921, 0.132232) , + rgb (0.042253, 0.028139, 0.141141) , + rgb (0.046915, 0.030324, 0.150164) , + rgb (0.051644, 0.032474, 0.159254) , + rgb (0.056449, 0.034569, 0.168414) , + rgb (0.06134, 0.03659, 0.177642) , + rgb (0.066331, 0.038504, 0.186962) , + rgb (0.071429, 0.040294, 0.196354) , + rgb (0.076637, 0.041905, 0.205799) , + rgb (0.081962, 0.043328, 0.215289) , + rgb (0.087411, 0.044556, 0.224813) , + rgb (0.09299, 0.045583, 0.234358) , + rgb (0.098702, 0.046402, 0.243904) , + rgb (0.104551, 0.047008, 0.25343) , + rgb (0.110536, 0.047399, 0.262912) , + rgb (0.116656, 0.047574, 0.272321) , + rgb (0.122908, 0.047536, 0.281624) , + rgb (0.129285, 0.047293, 0.290788) , + rgb (0.135778, 0.046856, 0.299776) , + rgb (0.142378, 0.046242, 0.308553) , + rgb (0.149073, 0.045468, 0.317085) , + rgb (0.15585, 0.044559, 0.325338) , + rgb (0.162689, 0.043554, 0.333277) , + rgb (0.169575, 0.042489, 0.340874) , + rgb (0.176493, 0.041402, 0.348111) , + rgb (0.183429, 0.040329, 0.354971) , + rgb (0.190367, 0.039309, 0.361447) , + rgb (0.197297, 0.0384, 0.367535) , + rgb (0.204209, 0.037632, 0.373238) , + rgb (0.211095, 0.03703, 0.378563) , + rgb (0.217949, 0.036615, 0.383522) , + rgb (0.224763, 0.036405, 0.388129) , + rgb (0.231538, 0.036405, 0.3924) , + rgb (0.238273, 0.036621, 0.396353) , + rgb (0.244967, 0.037055, 0.400007) , + rgb (0.25162, 0.037705, 0.403378) , + rgb (0.258234, 0.038571, 0.406485) , + rgb (0.26481, 0.039647, 0.409345) , + rgb (0.271347, 0.040922, 0.411976) , + rgb (0.27785, 0.042353, 0.414392) , + rgb (0.284321, 0.043933, 0.416608) , + rgb (0.290763, 0.045644, 0.418637) , + rgb (0.297178, 0.04747, 0.420491) , + rgb (0.303568, 0.049396, 0.422182) , + rgb (0.309935, 0.051407, 0.423721) , + rgb (0.316282, 0.05349, 0.425116) , + rgb (0.32261, 0.055634, 0.426377) , + rgb (0.328921, 0.057827, 0.427511) , + rgb (0.335217, 0.06006, 0.428524) , + rgb (0.3415, 0.062325, 0.429425) , + rgb (0.347771, 0.064616, 0.430217) , + rgb (0.354032, 0.066925, 0.430906) , + rgb (0.360284, 0.069247, 0.431497) , + rgb (0.366529, 0.071579, 0.431994) , + rgb (0.372768, 0.073915, 0.4324) , + rgb (0.379001, 0.076253, 0.432719) , + rgb (0.385228, 0.078591, 0.432955) , + rgb (0.391453, 0.080927, 0.433109) , + rgb (0.397674, 0.083257, 0.433183) , + rgb (0.403894, 0.08558, 0.433179) , + rgb (0.410113, 0.087896, 0.433098) , + rgb (0.416331, 0.090203, 0.432943) , + rgb (0.422549, 0.092501, 0.432714) , + rgb (0.428768, 0.09479, 0.432412) , + rgb (0.434987, 0.097069, 0.432039) , + rgb (0.441207, 0.099338, 0.431594) , + rgb (0.447428, 0.101597, 0.43108) , + rgb (0.453651, 0.103848, 0.430498) , + rgb (0.459875, 0.106089, 0.429846) , + rgb (0.4661, 0.108322, 0.429125) , + rgb (0.472328, 0.110547, 0.428334) , + rgb (0.478558, 0.112764, 0.427475) , + rgb (0.484789, 0.114974, 0.426548) , + rgb (0.491022, 0.117179, 0.425552) , + rgb (0.497257, 0.119379, 0.424488) , + rgb (0.503493, 0.121575, 0.423356) , + rgb (0.50973, 0.123769, 0.422156) , + rgb (0.515967, 0.12596, 0.420887) , + rgb (0.522206, 0.12815, 0.419549) , + rgb (0.528444, 0.130341, 0.418142) , + rgb (0.534683, 0.132534, 0.416667) , + rgb (0.54092, 0.134729, 0.415123) , + rgb (0.547157, 0.136929, 0.413511) , + rgb (0.553392, 0.139134, 0.411829) , + rgb (0.559624, 0.141346, 0.410078) , + rgb (0.565854, 0.143567, 0.408258) , + rgb (0.572081, 0.145797, 0.406369) , + rgb (0.578304, 0.148039, 0.404411) , + rgb (0.584521, 0.150294, 0.402385) , + rgb (0.590734, 0.152563, 0.40029) , + rgb (0.59694, 0.154848, 0.398125) , + rgb (0.603139, 0.157151, 0.395891) , + rgb (0.60933, 0.159474, 0.393589) , + rgb (0.615513, 0.161817, 0.391219) , + rgb (0.621685, 0.164184, 0.388781) , + rgb (0.627847, 0.166575, 0.386276) , + rgb (0.633998, 0.168992, 0.383704) , + rgb (0.640135, 0.171438, 0.381065) , + rgb (0.64626, 0.173914, 0.378359) , + rgb (0.652369, 0.176421, 0.375586) , + rgb (0.658463, 0.178962, 0.372748) , + rgb (0.66454, 0.181539, 0.369846) , + rgb (0.670599, 0.184153, 0.366879) , + rgb (0.676638, 0.186807, 0.363849) , + rgb (0.682656, 0.189501, 0.360757) , + rgb (0.688653, 0.192239, 0.357603) , + rgb (0.694627, 0.195021, 0.354388) , + rgb (0.700576, 0.197851, 0.351113) , + rgb (0.7065, 0.200728, 0.347777) , + rgb (0.712396, 0.203656, 0.344383) , + rgb (0.718264, 0.206636, 0.340931) , + rgb (0.724103, 0.20967, 0.337424) , + rgb (0.729909, 0.212759, 0.333861) , + rgb (0.735683, 0.215906, 0.330245) , + rgb (0.741423, 0.219112, 0.326576) , + rgb (0.747127, 0.222378, 0.322856) , + rgb (0.752794, 0.225706, 0.319085) , + rgb (0.758422, 0.229097, 0.315266) , + rgb (0.76401, 0.232554, 0.311399) , + rgb (0.769556, 0.236077, 0.307485) , + rgb (0.775059, 0.239667, 0.303526) , + rgb (0.780517, 0.243327, 0.299523) , + rgb (0.785929, 0.247056, 0.295477) , + rgb (0.791293, 0.250856, 0.29139) , + rgb (0.796607, 0.254728, 0.287264) , + rgb (0.801871, 0.258674, 0.283099) , + rgb (0.807082, 0.262692, 0.278898) , + rgb (0.812239, 0.266786, 0.274661) , + rgb (0.817341, 0.270954, 0.27039) , + rgb (0.822386, 0.275197, 0.266085) , + rgb (0.827372, 0.279517, 0.26175) , + rgb (0.832299, 0.283913, 0.257383) , + rgb (0.837165, 0.288385, 0.252988) , + rgb (0.841969, 0.292933, 0.248564) , + rgb (0.846709, 0.297559, 0.244113) , + rgb (0.851384, 0.30226, 0.239636) , + rgb (0.855992, 0.307038, 0.235133) , + rgb (0.860533, 0.311892, 0.230606) , + rgb (0.865006, 0.316822, 0.226055) , + rgb (0.869409, 0.321827, 0.221482) , + rgb (0.873741, 0.326906, 0.216886) , + rgb (0.878001, 0.33206, 0.212268) , + rgb (0.882188, 0.337287, 0.207628) , + rgb (0.886302, 0.342586, 0.202968) , + rgb (0.890341, 0.347957, 0.198286) , + rgb (0.894305, 0.353399, 0.193584) , + rgb (0.898192, 0.358911, 0.18886) , + rgb (0.902003, 0.364492, 0.184116) , + rgb (0.905735, 0.37014, 0.17935) , + rgb (0.90939, 0.375856, 0.174563) , + rgb (0.912966, 0.381636, 0.169755) , + rgb (0.916462, 0.387481, 0.164924) , + rgb (0.919879, 0.393389, 0.16007) , + rgb (0.923215, 0.399359, 0.155193) , + rgb (0.92647, 0.405389, 0.150292) , + rgb (0.929644, 0.411479, 0.145367) , + rgb (0.932737, 0.417627, 0.140417) , + rgb (0.935747, 0.423831, 0.13544) , + rgb (0.938675, 0.430091, 0.130438) , + rgb (0.941521, 0.436405, 0.125409) , + rgb (0.944285, 0.442772, 0.120354) , + rgb (0.946965, 0.449191, 0.115272) , + rgb (0.949562, 0.45566, 0.110164) , + rgb (0.952075, 0.462178, 0.105031) , + rgb (0.954506, 0.468744, 0.099874) , + rgb (0.956852, 0.475356, 0.094695) , + rgb (0.959114, 0.482014, 0.089499) , + rgb (0.961293, 0.488716, 0.084289) , + rgb (0.963387, 0.495462, 0.079073) , + rgb (0.965397, 0.502249, 0.073859) , + rgb (0.967322, 0.509078, 0.068659) , + rgb (0.969163, 0.515946, 0.063488) , + rgb (0.970919, 0.522853, 0.058367) , + rgb (0.97259, 0.529798, 0.053324) , + rgb (0.974176, 0.53678, 0.048392) , + rgb (0.975677, 0.543798, 0.043618) , + rgb (0.977092, 0.55085, 0.03905) , + rgb (0.978422, 0.557937, 0.034931) , + rgb (0.979666, 0.565057, 0.031409) , + rgb (0.980824, 0.572209, 0.028508) , + rgb (0.981895, 0.579392, 0.02625) , + rgb (0.982881, 0.586606, 0.024661) , + rgb (0.983779, 0.593849, 0.02377) , + rgb (0.984591, 0.601122, 0.023606) , + rgb (0.985315, 0.608422, 0.024202) , + rgb (0.985952, 0.61575, 0.025592) , + rgb (0.986502, 0.623105, 0.027814) , + rgb (0.986964, 0.630485, 0.030908) , + rgb (0.987337, 0.63789, 0.034916) , + rgb (0.987622, 0.64532, 0.039886) , + rgb (0.987819, 0.652773, 0.045581) , + rgb (0.987926, 0.66025, 0.05175) , + rgb (0.987945, 0.667748, 0.058329) , + rgb (0.987874, 0.675267, 0.065257) , + rgb (0.987714, 0.682807, 0.072489) , + rgb (0.987464, 0.690366, 0.07999) , + rgb (0.987124, 0.697944, 0.087731) , + rgb (0.986694, 0.70554, 0.095694) , + rgb (0.986175, 0.713153, 0.103863) , + rgb (0.985566, 0.720782, 0.112229) , + rgb (0.984865, 0.728427, 0.120785) , + rgb (0.984075, 0.736087, 0.129527) , + rgb (0.983196, 0.743758, 0.138453) , + rgb (0.982228, 0.751442, 0.147565) , + rgb (0.981173, 0.759135, 0.156863) , + rgb (0.980032, 0.766837, 0.166353) , + rgb (0.978806, 0.774545, 0.176037) , + rgb (0.977497, 0.782258, 0.185923) , + rgb (0.976108, 0.789974, 0.196018) , + rgb (0.974638, 0.797692, 0.206332) , + rgb (0.973088, 0.805409, 0.216877) , + rgb (0.971468, 0.813122, 0.227658) , + rgb (0.969783, 0.820825, 0.238686) , + rgb (0.968041, 0.828515, 0.249972) , + rgb (0.966243, 0.836191, 0.261534) , + rgb (0.964394, 0.843848, 0.273391) , + rgb (0.962517, 0.851476, 0.285546) , + rgb (0.960626, 0.859069, 0.29801) , + rgb (0.95872, 0.866624, 0.31082) , + rgb (0.956834, 0.874129, 0.323974) , + rgb (0.954997, 0.881569, 0.337475) , + rgb (0.953215, 0.888942, 0.351369) , + rgb (0.951546, 0.896226, 0.365627) , + rgb (0.950018, 0.903409, 0.380271) , + rgb (0.948683, 0.910473, 0.395289) , + rgb (0.947594, 0.917399, 0.410665) , + rgb (0.946809, 0.924168, 0.426373) , + rgb (0.946392, 0.930761, 0.442367) , + rgb (0.946403, 0.937159, 0.458592) , + rgb (0.946903, 0.943348, 0.47497) , + rgb (0.947937, 0.949318, 0.491426) , + rgb (0.949545, 0.955063, 0.50786) , + rgb (0.95174, 0.960587, 0.524203) , + rgb (0.954529, 0.965896, 0.540361) , + rgb (0.957896, 0.971003, 0.556275) , + rgb (0.961812, 0.975924, 0.571925) , + rgb (0.966249, 0.980678, 0.587206) , + rgb (0.971162, 0.985282, 0.602154) , + rgb (0.976511, 0.989753, 0.61676) , + rgb (0.982257, 0.994109, 0.631017) , + rgb (0.988362, 0.998364, 0.644924) + }); list_data magma = list_data(new pen[] { - rgb (0.001462, 0.000466, 0.013866) , - rgb (0.002258, 0.001295, 0.018331) , - rgb (0.003279, 0.002305, 0.023708) , - rgb (0.004512, 0.00349, 0.029965) , - rgb (0.00595, 0.004843, 0.03713) , - rgb (0.007588, 0.006356, 0.044973) , - rgb (0.009426, 0.008022, 0.052844) , - rgb (0.011465, 0.009828, 0.06075) , - rgb (0.013708, 0.011771, 0.068667) , - rgb (0.016156, 0.01384, 0.076603) , - rgb (0.018815, 0.016026, 0.084584) , - rgb (0.021692, 0.01832, 0.09261) , - rgb (0.024792, 0.020715, 0.100676) , - rgb (0.028123, 0.023201, 0.108787) , - rgb (0.031696, 0.025765, 0.116965) , - rgb (0.03552, 0.028397, 0.125209) , - rgb (0.039608, 0.03109, 0.133515) , - rgb (0.04383, 0.03383, 0.141886) , - rgb (0.048062, 0.036607, 0.150327) , - rgb (0.05232, 0.039407, 0.158841) , - rgb (0.056615, 0.04216, 0.167446) , - rgb (0.060949, 0.044794, 0.176129) , - rgb (0.06533, 0.047318, 0.184892) , - rgb (0.069764, 0.049726, 0.193735) , - rgb (0.074257, 0.052017, 0.20266) , - rgb (0.078815, 0.054184, 0.211667) , - rgb (0.083446, 0.056225, 0.220755) , - rgb (0.088155, 0.058133, 0.229922) , - rgb (0.092949, 0.059904, 0.239164) , - rgb (0.097833, 0.061531, 0.248477) , - rgb (0.102815, 0.06301, 0.257854) , - rgb (0.107899, 0.064335, 0.267289) , - rgb (0.113094, 0.065492, 0.276784) , - rgb (0.118405, 0.066479, 0.286321) , - rgb (0.123833, 0.067295, 0.295879) , - rgb (0.12938, 0.067935, 0.305443) , - rgb (0.135053, 0.068391, 0.315) , - rgb (0.140858, 0.068654, 0.324538) , - rgb (0.146785, 0.068738, 0.334011) , - rgb (0.152839, 0.068637, 0.343404) , - rgb (0.159018, 0.068354, 0.352688) , - rgb (0.165308, 0.067911, 0.361816) , - rgb (0.171713, 0.067305, 0.370771) , - rgb (0.178212, 0.066576, 0.379497) , - rgb (0.184801, 0.065732, 0.387973) , - rgb (0.19146, 0.064818, 0.396152) , - rgb (0.198177, 0.063862, 0.404009) , - rgb (0.204935, 0.062907, 0.411514) , - rgb (0.211718, 0.061992, 0.418647) , - rgb (0.218512, 0.061158, 0.425392) , - rgb (0.225302, 0.060445, 0.431742) , - rgb (0.232077, 0.059889, 0.437695) , - rgb (0.238826, 0.059517, 0.443256) , - rgb (0.245543, 0.059352, 0.448436) , - rgb (0.25222, 0.059415, 0.453248) , - rgb (0.258857, 0.059706, 0.45771) , - rgb (0.265447, 0.060237, 0.46184) , - rgb (0.271994, 0.060994, 0.46566) , - rgb (0.278493, 0.061978, 0.46919) , - rgb (0.284951, 0.063168, 0.472451) , - rgb (0.291366, 0.064553, 0.475462) , - rgb (0.29774, 0.066117, 0.478243) , - rgb (0.304081, 0.067835, 0.480812) , - rgb (0.310382, 0.069702, 0.483186) , - rgb (0.316654, 0.07169, 0.48538) , - rgb (0.322899, 0.073782, 0.487408) , - rgb (0.329114, 0.075972, 0.489287) , - rgb (0.335308, 0.078236, 0.491024) , - rgb (0.341482, 0.080564, 0.492631) , - rgb (0.347636, 0.082946, 0.494121) , - rgb (0.353773, 0.085373, 0.495501) , - rgb (0.359898, 0.087831, 0.496778) , - rgb (0.366012, 0.090314, 0.49796) , - rgb (0.372116, 0.092816, 0.499053) , - rgb (0.378211, 0.095332, 0.500067) , - rgb (0.384299, 0.097855, 0.501002) , - rgb (0.390384, 0.100379, 0.501864) , - rgb (0.396467, 0.102902, 0.502658) , - rgb (0.402548, 0.10542, 0.503386) , - rgb (0.408629, 0.10793, 0.504052) , - rgb (0.414709, 0.110431, 0.504662) , - rgb (0.420791, 0.11292, 0.505215) , - rgb (0.426877, 0.115395, 0.505714) , - rgb (0.432967, 0.117855, 0.50616) , - rgb (0.439062, 0.120298, 0.506555) , - rgb (0.445163, 0.122724, 0.506901) , - rgb (0.451271, 0.125132, 0.507198) , - rgb (0.457386, 0.127522, 0.507448) , - rgb (0.463508, 0.129893, 0.507652) , - rgb (0.46964, 0.132245, 0.507809) , - rgb (0.47578, 0.134577, 0.507921) , - rgb (0.481929, 0.136891, 0.507989) , - rgb (0.488088, 0.139186, 0.508011) , - rgb (0.494258, 0.141462, 0.507988) , - rgb (0.500438, 0.143719, 0.50792) , - rgb (0.506629, 0.145958, 0.507806) , - rgb (0.512831, 0.148179, 0.507648) , - rgb (0.519045, 0.150383, 0.507443) , - rgb (0.52527, 0.152569, 0.507192) , - rgb (0.531507, 0.154739, 0.506895) , - rgb (0.537755, 0.156894, 0.506551) , - rgb (0.544015, 0.159033, 0.506159) , - rgb (0.550287, 0.161158, 0.505719) , - rgb (0.556571, 0.163269, 0.50523) , - rgb (0.562866, 0.165368, 0.504692) , - rgb (0.569172, 0.167454, 0.504105) , - rgb (0.57549, 0.16953, 0.503466) , - rgb (0.581819, 0.171596, 0.502777) , - rgb (0.588158, 0.173652, 0.502035) , - rgb (0.594508, 0.175701, 0.501241) , - rgb (0.600868, 0.177743, 0.500394) , - rgb (0.607238, 0.179779, 0.499492) , - rgb (0.613617, 0.181811, 0.498536) , - rgb (0.620005, 0.18384, 0.497524) , - rgb (0.626401, 0.185867, 0.496456) , - rgb (0.632805, 0.187893, 0.495332) , - rgb (0.639216, 0.189921, 0.49415) , - rgb (0.645633, 0.191952, 0.49291) , - rgb (0.652056, 0.193986, 0.491611) , - rgb (0.658483, 0.196027, 0.490253) , - rgb (0.664915, 0.198075, 0.488836) , - rgb (0.671349, 0.200133, 0.487358) , - rgb (0.677786, 0.202203, 0.485819) , - rgb (0.684224, 0.204286, 0.484219) , - rgb (0.690661, 0.206384, 0.482558) , - rgb (0.697098, 0.208501, 0.480835) , - rgb (0.703532, 0.210638, 0.479049) , - rgb (0.709962, 0.212797, 0.477201) , - rgb (0.716387, 0.214982, 0.47529) , - rgb (0.722805, 0.217194, 0.473316) , - rgb (0.729216, 0.219437, 0.471279) , - rgb (0.735616, 0.221713, 0.46918) , - rgb (0.742004, 0.224025, 0.467018) , - rgb (0.748378, 0.226377, 0.464794) , - rgb (0.754737, 0.228772, 0.462509) , - rgb (0.761077, 0.231214, 0.460162) , - rgb (0.767398, 0.233705, 0.457755) , - rgb (0.773695, 0.236249, 0.455289) , - rgb (0.779968, 0.238851, 0.452765) , - rgb (0.786212, 0.241514, 0.450184) , - rgb (0.792427, 0.244242, 0.447543) , - rgb (0.798608, 0.24704, 0.444848) , - rgb (0.804752, 0.249911, 0.442102) , - rgb (0.810855, 0.252861, 0.439305) , - rgb (0.816914, 0.255895, 0.436461) , - rgb (0.822926, 0.259016, 0.433573) , - rgb (0.828886, 0.262229, 0.430644) , - rgb (0.834791, 0.26554, 0.427671) , - rgb (0.840636, 0.268953, 0.424666) , - rgb (0.846416, 0.272473, 0.421631) , - rgb (0.852126, 0.276106, 0.418573) , - rgb (0.857763, 0.279857, 0.415496) , - rgb (0.86332, 0.283729, 0.412403) , - rgb (0.868793, 0.287728, 0.409303) , - rgb (0.874176, 0.291859, 0.406205) , - rgb (0.879464, 0.296125, 0.403118) , - rgb (0.884651, 0.30053, 0.400047) , - rgb (0.889731, 0.305079, 0.397002) , - rgb (0.8947, 0.309773, 0.393995) , - rgb (0.899552, 0.314616, 0.391037) , - rgb (0.904281, 0.31961, 0.388137) , - rgb (0.908884, 0.324755, 0.385308) , - rgb (0.913354, 0.330052, 0.382563) , - rgb (0.917689, 0.3355, 0.379915) , - rgb (0.921884, 0.341098, 0.377376) , - rgb (0.925937, 0.346844, 0.374959) , - rgb (0.929845, 0.352734, 0.372677) , - rgb (0.933606, 0.358764, 0.370541) , - rgb (0.937221, 0.364929, 0.368567) , - rgb (0.940687, 0.371224, 0.366762) , - rgb (0.944006, 0.377643, 0.365136) , - rgb (0.94718, 0.384178, 0.363701) , - rgb (0.95021, 0.39082, 0.362468) , - rgb (0.953099, 0.397563, 0.361438) , - rgb (0.955849, 0.4044, 0.360619) , - rgb (0.958464, 0.411324, 0.360014) , - rgb (0.960949, 0.418323, 0.35963) , - rgb (0.96331, 0.42539, 0.359469) , - rgb (0.965549, 0.432519, 0.359529) , - rgb (0.967671, 0.439703, 0.35981) , - rgb (0.96968, 0.446936, 0.360311) , - rgb (0.971582, 0.45421, 0.36103) , - rgb (0.973381, 0.46152, 0.361965) , - rgb (0.975082, 0.468861, 0.363111) , - rgb (0.97669, 0.476226, 0.364466) , - rgb (0.97821, 0.483612, 0.366025) , - rgb (0.979645, 0.491014, 0.367783) , - rgb (0.981, 0.498428, 0.369734) , - rgb (0.982279, 0.505851, 0.371874) , - rgb (0.983485, 0.51328, 0.374198) , - rgb (0.984622, 0.520713, 0.376698) , - rgb (0.985693, 0.528148, 0.379371) , - rgb (0.9867, 0.535582, 0.38221) , - rgb (0.987646, 0.543015, 0.38521) , - rgb (0.988533, 0.550446, 0.388365) , - rgb (0.989363, 0.557873, 0.391671) , - rgb (0.990138, 0.565296, 0.395122) , - rgb (0.990871, 0.572706, 0.398714) , - rgb (0.991558, 0.580107, 0.402441) , - rgb (0.992196, 0.587502, 0.406299) , - rgb (0.992785, 0.594891, 0.410283) , - rgb (0.993326, 0.602275, 0.41439) , - rgb (0.993834, 0.609644, 0.418613) , - rgb (0.994309, 0.616999, 0.42295) , - rgb (0.994738, 0.62435, 0.427397) , - rgb (0.995122, 0.631696, 0.431951) , - rgb (0.99548, 0.639027, 0.436607) , - rgb (0.99581, 0.646344, 0.441361) , - rgb (0.996096, 0.653659, 0.446213) , - rgb (0.996341, 0.660969, 0.45116) , - rgb (0.99658, 0.668256, 0.456192) , - rgb (0.996775, 0.675541, 0.461314) , - rgb (0.996925, 0.682828, 0.466526) , - rgb (0.997077, 0.690088, 0.471811) , - rgb (0.997186, 0.697349, 0.477182) , - rgb (0.997254, 0.704611, 0.482635) , - rgb (0.997325, 0.711848, 0.488154) , - rgb (0.997351, 0.719089, 0.493755) , - rgb (0.997351, 0.726324, 0.499428) , - rgb (0.997341, 0.733545, 0.505167) , - rgb (0.997285, 0.740772, 0.510983) , - rgb (0.997228, 0.747981, 0.516859) , - rgb (0.997138, 0.75519, 0.522806) , - rgb (0.997019, 0.762398, 0.528821) , - rgb (0.996898, 0.769591, 0.534892) , - rgb (0.996727, 0.776795, 0.541039) , - rgb (0.996571, 0.783977, 0.547233) , - rgb (0.996369, 0.791167, 0.553499) , - rgb (0.996162, 0.798348, 0.55982) , - rgb (0.995932, 0.805527, 0.566202) , - rgb (0.99568, 0.812706, 0.572645) , - rgb (0.995424, 0.819875, 0.57914) , - rgb (0.995131, 0.827052, 0.585701) , - rgb (0.994851, 0.834213, 0.592307) , - rgb (0.994524, 0.841387, 0.598983) , - rgb (0.994222, 0.84854, 0.605696) , - rgb (0.993866, 0.855711, 0.612482) , - rgb (0.993545, 0.862859, 0.619299) , - rgb (0.99317, 0.870024, 0.626189) , - rgb (0.992831, 0.877168, 0.633109) , - rgb (0.99244, 0.88433, 0.640099) , - rgb (0.992089, 0.89147, 0.647116) , - rgb (0.991688, 0.898627, 0.654202) , - rgb (0.991332, 0.905763, 0.661309) , - rgb (0.99093, 0.912915, 0.668481) , - rgb (0.99057, 0.920049, 0.675675) , - rgb (0.990175, 0.927196, 0.682926) , - rgb (0.989815, 0.934329, 0.690198) , - rgb (0.989434, 0.94147, 0.697519) , - rgb (0.989077, 0.948604, 0.704863) , - rgb (0.988717, 0.955742, 0.712242) , - rgb (0.988367, 0.962878, 0.719649) , - rgb (0.988033, 0.970012, 0.727077) , - rgb (0.987691, 0.977154, 0.734536) , - rgb (0.987387, 0.984288, 0.742002) , - rgb (0.987053, 0.991438, 0.749504) -}); + rgb (0.001462, 0.000466, 0.013866) , + rgb (0.002258, 0.001295, 0.018331) , + rgb (0.003279, 0.002305, 0.023708) , + rgb (0.004512, 0.00349, 0.029965) , + rgb (0.00595, 0.004843, 0.03713) , + rgb (0.007588, 0.006356, 0.044973) , + rgb (0.009426, 0.008022, 0.052844) , + rgb (0.011465, 0.009828, 0.06075) , + rgb (0.013708, 0.011771, 0.068667) , + rgb (0.016156, 0.01384, 0.076603) , + rgb (0.018815, 0.016026, 0.084584) , + rgb (0.021692, 0.01832, 0.09261) , + rgb (0.024792, 0.020715, 0.100676) , + rgb (0.028123, 0.023201, 0.108787) , + rgb (0.031696, 0.025765, 0.116965) , + rgb (0.03552, 0.028397, 0.125209) , + rgb (0.039608, 0.03109, 0.133515) , + rgb (0.04383, 0.03383, 0.141886) , + rgb (0.048062, 0.036607, 0.150327) , + rgb (0.05232, 0.039407, 0.158841) , + rgb (0.056615, 0.04216, 0.167446) , + rgb (0.060949, 0.044794, 0.176129) , + rgb (0.06533, 0.047318, 0.184892) , + rgb (0.069764, 0.049726, 0.193735) , + rgb (0.074257, 0.052017, 0.20266) , + rgb (0.078815, 0.054184, 0.211667) , + rgb (0.083446, 0.056225, 0.220755) , + rgb (0.088155, 0.058133, 0.229922) , + rgb (0.092949, 0.059904, 0.239164) , + rgb (0.097833, 0.061531, 0.248477) , + rgb (0.102815, 0.06301, 0.257854) , + rgb (0.107899, 0.064335, 0.267289) , + rgb (0.113094, 0.065492, 0.276784) , + rgb (0.118405, 0.066479, 0.286321) , + rgb (0.123833, 0.067295, 0.295879) , + rgb (0.12938, 0.067935, 0.305443) , + rgb (0.135053, 0.068391, 0.315) , + rgb (0.140858, 0.068654, 0.324538) , + rgb (0.146785, 0.068738, 0.334011) , + rgb (0.152839, 0.068637, 0.343404) , + rgb (0.159018, 0.068354, 0.352688) , + rgb (0.165308, 0.067911, 0.361816) , + rgb (0.171713, 0.067305, 0.370771) , + rgb (0.178212, 0.066576, 0.379497) , + rgb (0.184801, 0.065732, 0.387973) , + rgb (0.19146, 0.064818, 0.396152) , + rgb (0.198177, 0.063862, 0.404009) , + rgb (0.204935, 0.062907, 0.411514) , + rgb (0.211718, 0.061992, 0.418647) , + rgb (0.218512, 0.061158, 0.425392) , + rgb (0.225302, 0.060445, 0.431742) , + rgb (0.232077, 0.059889, 0.437695) , + rgb (0.238826, 0.059517, 0.443256) , + rgb (0.245543, 0.059352, 0.448436) , + rgb (0.25222, 0.059415, 0.453248) , + rgb (0.258857, 0.059706, 0.45771) , + rgb (0.265447, 0.060237, 0.46184) , + rgb (0.271994, 0.060994, 0.46566) , + rgb (0.278493, 0.061978, 0.46919) , + rgb (0.284951, 0.063168, 0.472451) , + rgb (0.291366, 0.064553, 0.475462) , + rgb (0.29774, 0.066117, 0.478243) , + rgb (0.304081, 0.067835, 0.480812) , + rgb (0.310382, 0.069702, 0.483186) , + rgb (0.316654, 0.07169, 0.48538) , + rgb (0.322899, 0.073782, 0.487408) , + rgb (0.329114, 0.075972, 0.489287) , + rgb (0.335308, 0.078236, 0.491024) , + rgb (0.341482, 0.080564, 0.492631) , + rgb (0.347636, 0.082946, 0.494121) , + rgb (0.353773, 0.085373, 0.495501) , + rgb (0.359898, 0.087831, 0.496778) , + rgb (0.366012, 0.090314, 0.49796) , + rgb (0.372116, 0.092816, 0.499053) , + rgb (0.378211, 0.095332, 0.500067) , + rgb (0.384299, 0.097855, 0.501002) , + rgb (0.390384, 0.100379, 0.501864) , + rgb (0.396467, 0.102902, 0.502658) , + rgb (0.402548, 0.10542, 0.503386) , + rgb (0.408629, 0.10793, 0.504052) , + rgb (0.414709, 0.110431, 0.504662) , + rgb (0.420791, 0.11292, 0.505215) , + rgb (0.426877, 0.115395, 0.505714) , + rgb (0.432967, 0.117855, 0.50616) , + rgb (0.439062, 0.120298, 0.506555) , + rgb (0.445163, 0.122724, 0.506901) , + rgb (0.451271, 0.125132, 0.507198) , + rgb (0.457386, 0.127522, 0.507448) , + rgb (0.463508, 0.129893, 0.507652) , + rgb (0.46964, 0.132245, 0.507809) , + rgb (0.47578, 0.134577, 0.507921) , + rgb (0.481929, 0.136891, 0.507989) , + rgb (0.488088, 0.139186, 0.508011) , + rgb (0.494258, 0.141462, 0.507988) , + rgb (0.500438, 0.143719, 0.50792) , + rgb (0.506629, 0.145958, 0.507806) , + rgb (0.512831, 0.148179, 0.507648) , + rgb (0.519045, 0.150383, 0.507443) , + rgb (0.52527, 0.152569, 0.507192) , + rgb (0.531507, 0.154739, 0.506895) , + rgb (0.537755, 0.156894, 0.506551) , + rgb (0.544015, 0.159033, 0.506159) , + rgb (0.550287, 0.161158, 0.505719) , + rgb (0.556571, 0.163269, 0.50523) , + rgb (0.562866, 0.165368, 0.504692) , + rgb (0.569172, 0.167454, 0.504105) , + rgb (0.57549, 0.16953, 0.503466) , + rgb (0.581819, 0.171596, 0.502777) , + rgb (0.588158, 0.173652, 0.502035) , + rgb (0.594508, 0.175701, 0.501241) , + rgb (0.600868, 0.177743, 0.500394) , + rgb (0.607238, 0.179779, 0.499492) , + rgb (0.613617, 0.181811, 0.498536) , + rgb (0.620005, 0.18384, 0.497524) , + rgb (0.626401, 0.185867, 0.496456) , + rgb (0.632805, 0.187893, 0.495332) , + rgb (0.639216, 0.189921, 0.49415) , + rgb (0.645633, 0.191952, 0.49291) , + rgb (0.652056, 0.193986, 0.491611) , + rgb (0.658483, 0.196027, 0.490253) , + rgb (0.664915, 0.198075, 0.488836) , + rgb (0.671349, 0.200133, 0.487358) , + rgb (0.677786, 0.202203, 0.485819) , + rgb (0.684224, 0.204286, 0.484219) , + rgb (0.690661, 0.206384, 0.482558) , + rgb (0.697098, 0.208501, 0.480835) , + rgb (0.703532, 0.210638, 0.479049) , + rgb (0.709962, 0.212797, 0.477201) , + rgb (0.716387, 0.214982, 0.47529) , + rgb (0.722805, 0.217194, 0.473316) , + rgb (0.729216, 0.219437, 0.471279) , + rgb (0.735616, 0.221713, 0.46918) , + rgb (0.742004, 0.224025, 0.467018) , + rgb (0.748378, 0.226377, 0.464794) , + rgb (0.754737, 0.228772, 0.462509) , + rgb (0.761077, 0.231214, 0.460162) , + rgb (0.767398, 0.233705, 0.457755) , + rgb (0.773695, 0.236249, 0.455289) , + rgb (0.779968, 0.238851, 0.452765) , + rgb (0.786212, 0.241514, 0.450184) , + rgb (0.792427, 0.244242, 0.447543) , + rgb (0.798608, 0.24704, 0.444848) , + rgb (0.804752, 0.249911, 0.442102) , + rgb (0.810855, 0.252861, 0.439305) , + rgb (0.816914, 0.255895, 0.436461) , + rgb (0.822926, 0.259016, 0.433573) , + rgb (0.828886, 0.262229, 0.430644) , + rgb (0.834791, 0.26554, 0.427671) , + rgb (0.840636, 0.268953, 0.424666) , + rgb (0.846416, 0.272473, 0.421631) , + rgb (0.852126, 0.276106, 0.418573) , + rgb (0.857763, 0.279857, 0.415496) , + rgb (0.86332, 0.283729, 0.412403) , + rgb (0.868793, 0.287728, 0.409303) , + rgb (0.874176, 0.291859, 0.406205) , + rgb (0.879464, 0.296125, 0.403118) , + rgb (0.884651, 0.30053, 0.400047) , + rgb (0.889731, 0.305079, 0.397002) , + rgb (0.8947, 0.309773, 0.393995) , + rgb (0.899552, 0.314616, 0.391037) , + rgb (0.904281, 0.31961, 0.388137) , + rgb (0.908884, 0.324755, 0.385308) , + rgb (0.913354, 0.330052, 0.382563) , + rgb (0.917689, 0.3355, 0.379915) , + rgb (0.921884, 0.341098, 0.377376) , + rgb (0.925937, 0.346844, 0.374959) , + rgb (0.929845, 0.352734, 0.372677) , + rgb (0.933606, 0.358764, 0.370541) , + rgb (0.937221, 0.364929, 0.368567) , + rgb (0.940687, 0.371224, 0.366762) , + rgb (0.944006, 0.377643, 0.365136) , + rgb (0.94718, 0.384178, 0.363701) , + rgb (0.95021, 0.39082, 0.362468) , + rgb (0.953099, 0.397563, 0.361438) , + rgb (0.955849, 0.4044, 0.360619) , + rgb (0.958464, 0.411324, 0.360014) , + rgb (0.960949, 0.418323, 0.35963) , + rgb (0.96331, 0.42539, 0.359469) , + rgb (0.965549, 0.432519, 0.359529) , + rgb (0.967671, 0.439703, 0.35981) , + rgb (0.96968, 0.446936, 0.360311) , + rgb (0.971582, 0.45421, 0.36103) , + rgb (0.973381, 0.46152, 0.361965) , + rgb (0.975082, 0.468861, 0.363111) , + rgb (0.97669, 0.476226, 0.364466) , + rgb (0.97821, 0.483612, 0.366025) , + rgb (0.979645, 0.491014, 0.367783) , + rgb (0.981, 0.498428, 0.369734) , + rgb (0.982279, 0.505851, 0.371874) , + rgb (0.983485, 0.51328, 0.374198) , + rgb (0.984622, 0.520713, 0.376698) , + rgb (0.985693, 0.528148, 0.379371) , + rgb (0.9867, 0.535582, 0.38221) , + rgb (0.987646, 0.543015, 0.38521) , + rgb (0.988533, 0.550446, 0.388365) , + rgb (0.989363, 0.557873, 0.391671) , + rgb (0.990138, 0.565296, 0.395122) , + rgb (0.990871, 0.572706, 0.398714) , + rgb (0.991558, 0.580107, 0.402441) , + rgb (0.992196, 0.587502, 0.406299) , + rgb (0.992785, 0.594891, 0.410283) , + rgb (0.993326, 0.602275, 0.41439) , + rgb (0.993834, 0.609644, 0.418613) , + rgb (0.994309, 0.616999, 0.42295) , + rgb (0.994738, 0.62435, 0.427397) , + rgb (0.995122, 0.631696, 0.431951) , + rgb (0.99548, 0.639027, 0.436607) , + rgb (0.99581, 0.646344, 0.441361) , + rgb (0.996096, 0.653659, 0.446213) , + rgb (0.996341, 0.660969, 0.45116) , + rgb (0.99658, 0.668256, 0.456192) , + rgb (0.996775, 0.675541, 0.461314) , + rgb (0.996925, 0.682828, 0.466526) , + rgb (0.997077, 0.690088, 0.471811) , + rgb (0.997186, 0.697349, 0.477182) , + rgb (0.997254, 0.704611, 0.482635) , + rgb (0.997325, 0.711848, 0.488154) , + rgb (0.997351, 0.719089, 0.493755) , + rgb (0.997351, 0.726324, 0.499428) , + rgb (0.997341, 0.733545, 0.505167) , + rgb (0.997285, 0.740772, 0.510983) , + rgb (0.997228, 0.747981, 0.516859) , + rgb (0.997138, 0.75519, 0.522806) , + rgb (0.997019, 0.762398, 0.528821) , + rgb (0.996898, 0.769591, 0.534892) , + rgb (0.996727, 0.776795, 0.541039) , + rgb (0.996571, 0.783977, 0.547233) , + rgb (0.996369, 0.791167, 0.553499) , + rgb (0.996162, 0.798348, 0.55982) , + rgb (0.995932, 0.805527, 0.566202) , + rgb (0.99568, 0.812706, 0.572645) , + rgb (0.995424, 0.819875, 0.57914) , + rgb (0.995131, 0.827052, 0.585701) , + rgb (0.994851, 0.834213, 0.592307) , + rgb (0.994524, 0.841387, 0.598983) , + rgb (0.994222, 0.84854, 0.605696) , + rgb (0.993866, 0.855711, 0.612482) , + rgb (0.993545, 0.862859, 0.619299) , + rgb (0.99317, 0.870024, 0.626189) , + rgb (0.992831, 0.877168, 0.633109) , + rgb (0.99244, 0.88433, 0.640099) , + rgb (0.992089, 0.89147, 0.647116) , + rgb (0.991688, 0.898627, 0.654202) , + rgb (0.991332, 0.905763, 0.661309) , + rgb (0.99093, 0.912915, 0.668481) , + rgb (0.99057, 0.920049, 0.675675) , + rgb (0.990175, 0.927196, 0.682926) , + rgb (0.989815, 0.934329, 0.690198) , + rgb (0.989434, 0.94147, 0.697519) , + rgb (0.989077, 0.948604, 0.704863) , + rgb (0.988717, 0.955742, 0.712242) , + rgb (0.988367, 0.962878, 0.719649) , + rgb (0.988033, 0.970012, 0.727077) , + rgb (0.987691, 0.977154, 0.734536) , + rgb (0.987387, 0.984288, 0.742002) , + rgb (0.987053, 0.991438, 0.749504) + }); list_data plasma = list_data(new pen[] { - rgb (0.050383, 0.029803, 0.527975) , - rgb (0.063536, 0.028426, 0.533124) , - rgb (0.075353, 0.027206, 0.538007) , - rgb (0.086222, 0.026125, 0.542658) , - rgb (0.096379, 0.025165, 0.547103) , - rgb (0.10598, 0.024309, 0.551368) , - rgb (0.115124, 0.023556, 0.555468) , - rgb (0.123903, 0.022878, 0.559423) , - rgb (0.132381, 0.022258, 0.56325) , - rgb (0.140603, 0.021687, 0.566959) , - rgb (0.148607, 0.021154, 0.570562) , - rgb (0.156421, 0.020651, 0.574065) , - rgb (0.16407, 0.020171, 0.577478) , - rgb (0.171574, 0.019706, 0.580806) , - rgb (0.17895, 0.019252, 0.584054) , - rgb (0.186213, 0.018803, 0.587228) , - rgb (0.193374, 0.018354, 0.59033) , - rgb (0.200445, 0.017902, 0.593364) , - rgb (0.207435, 0.017442, 0.596333) , - rgb (0.21435, 0.016973, 0.599239) , - rgb (0.221197, 0.016497, 0.602083) , - rgb (0.227983, 0.016007, 0.604867) , - rgb (0.234715, 0.015502, 0.607592) , - rgb (0.241396, 0.014979, 0.610259) , - rgb (0.248032, 0.014439, 0.612868) , - rgb (0.254627, 0.013882, 0.615419) , - rgb (0.261183, 0.013308, 0.617911) , - rgb (0.267703, 0.012716, 0.620346) , - rgb (0.274191, 0.012109, 0.622722) , - rgb (0.280648, 0.011488, 0.625038) , - rgb (0.287076, 0.010855, 0.627295) , - rgb (0.293478, 0.010213, 0.62949) , - rgb (0.299855, 0.009561, 0.631624) , - rgb (0.30621, 0.008902, 0.633694) , - rgb (0.312543, 0.008239, 0.6357) , - rgb (0.318856, 0.007576, 0.63764) , - rgb (0.32515, 0.006915, 0.639512) , - rgb (0.331426, 0.006261, 0.641316) , - rgb (0.337683, 0.005618, 0.643049) , - rgb (0.343925, 0.004991, 0.64471) , - rgb (0.35015, 0.004382, 0.646298) , - rgb (0.356359, 0.003798, 0.64781) , - rgb (0.362553, 0.003243, 0.649245) , - rgb (0.368733, 0.002724, 0.650601) , - rgb (0.374897, 0.002245, 0.651876) , - rgb (0.381047, 0.001814, 0.653068) , - rgb (0.387183, 0.001434, 0.654177) , - rgb (0.393304, 0.001114, 0.655199) , - rgb (0.399411, 0.000859, 0.656133) , - rgb (0.405503, 0.000678, 0.656977) , - rgb (0.41158, 0.000577, 0.65773) , - rgb (0.417642, 0.000564, 0.65839) , - rgb (0.423689, 0.000646, 0.658956) , - rgb (0.429719, 0.000831, 0.659425) , - rgb (0.435734, 0.001127, 0.659797) , - rgb (0.441732, 0.00154, 0.660069) , - rgb (0.447714, 0.00208, 0.66024) , - rgb (0.453677, 0.002755, 0.66031) , - rgb (0.459623, 0.003574, 0.660277) , - rgb (0.46555, 0.004545, 0.660139) , - rgb (0.471457, 0.005678, 0.659897) , - rgb (0.477344, 0.00698, 0.659549) , - rgb (0.48321, 0.00846, 0.659095) , - rgb (0.489055, 0.010127, 0.658534) , - rgb (0.494877, 0.01199, 0.657865) , - rgb (0.500678, 0.014055, 0.657088) , - rgb (0.506454, 0.016333, 0.656202) , - rgb (0.512206, 0.018833, 0.655209) , - rgb (0.517933, 0.021563, 0.654109) , - rgb (0.523633, 0.024532, 0.652901) , - rgb (0.529306, 0.027747, 0.651586) , - rgb (0.534952, 0.031217, 0.650165) , - rgb (0.54057, 0.03495, 0.64864) , - rgb (0.546157, 0.038954, 0.64701) , - rgb (0.551715, 0.043136, 0.645277) , - rgb (0.557243, 0.047331, 0.643443) , - rgb (0.562738, 0.051545, 0.641509) , - rgb (0.568201, 0.055778, 0.639477) , - rgb (0.573632, 0.060028, 0.637349) , - rgb (0.579029, 0.064296, 0.635126) , - rgb (0.584391, 0.068579, 0.632812) , - rgb (0.589719, 0.072878, 0.630408) , - rgb (0.595011, 0.07719, 0.627917) , - rgb (0.600266, 0.081516, 0.625342) , - rgb (0.605485, 0.085854, 0.622686) , - rgb (0.610667, 0.090204, 0.619951) , - rgb (0.615812, 0.094564, 0.61714) , - rgb (0.620919, 0.098934, 0.614257) , - rgb (0.625987, 0.103312, 0.611305) , - rgb (0.631017, 0.107699, 0.608287) , - rgb (0.636008, 0.112092, 0.605205) , - rgb (0.640959, 0.116492, 0.602065) , - rgb (0.645872, 0.120898, 0.598867) , - rgb (0.650746, 0.125309, 0.595617) , - rgb (0.65558, 0.129725, 0.592317) , - rgb (0.660374, 0.134144, 0.588971) , - rgb (0.665129, 0.138566, 0.585582) , - rgb (0.669845, 0.142992, 0.582154) , - rgb (0.674522, 0.147419, 0.578688) , - rgb (0.67916, 0.151848, 0.575189) , - rgb (0.683758, 0.156278, 0.57166) , - rgb (0.688318, 0.160709, 0.568103) , - rgb (0.69284, 0.165141, 0.564522) , - rgb (0.697324, 0.169573, 0.560919) , - rgb (0.701769, 0.174005, 0.557296) , - rgb (0.706178, 0.178437, 0.553657) , - rgb (0.710549, 0.182868, 0.550004) , - rgb (0.714883, 0.187299, 0.546338) , - rgb (0.719181, 0.191729, 0.542663) , - rgb (0.723444, 0.196158, 0.538981) , - rgb (0.72767, 0.200586, 0.535293) , - rgb (0.731862, 0.205013, 0.531601) , - rgb (0.736019, 0.209439, 0.527908) , - rgb (0.740143, 0.213864, 0.524216) , - rgb (0.744232, 0.218288, 0.520524) , - rgb (0.748289, 0.222711, 0.516834) , - rgb (0.752312, 0.227133, 0.513149) , - rgb (0.756304, 0.231555, 0.509468) , - rgb (0.760264, 0.235976, 0.505794) , - rgb (0.764193, 0.240396, 0.502126) , - rgb (0.76809, 0.244817, 0.498465) , - rgb (0.771958, 0.249237, 0.494813) , - rgb (0.775796, 0.253658, 0.491171) , - rgb (0.779604, 0.258078, 0.487539) , - rgb (0.783383, 0.2625, 0.483918) , - rgb (0.787133, 0.266922, 0.480307) , - rgb (0.790855, 0.271345, 0.476706) , - rgb (0.794549, 0.27577, 0.473117) , - rgb (0.798216, 0.280197, 0.469538) , - rgb (0.801855, 0.284626, 0.465971) , - rgb (0.805467, 0.289057, 0.462415) , - rgb (0.809052, 0.293491, 0.45887) , - rgb (0.812612, 0.297928, 0.455338) , - rgb (0.816144, 0.302368, 0.451816) , - rgb (0.819651, 0.306812, 0.448306) , - rgb (0.823132, 0.311261, 0.444806) , - rgb (0.826588, 0.315714, 0.441316) , - rgb (0.830018, 0.320172, 0.437836) , - rgb (0.833422, 0.324635, 0.434366) , - rgb (0.836801, 0.329105, 0.430905) , - rgb (0.840155, 0.33358, 0.427455) , - rgb (0.843484, 0.338062, 0.424013) , - rgb (0.846788, 0.342551, 0.420579) , - rgb (0.850066, 0.347048, 0.417153) , - rgb (0.853319, 0.351553, 0.413734) , - rgb (0.856547, 0.356066, 0.410322) , - rgb (0.85975, 0.360588, 0.406917) , - rgb (0.862927, 0.365119, 0.403519) , - rgb (0.866078, 0.36966, 0.400126) , - rgb (0.869203, 0.374212, 0.396738) , - rgb (0.872303, 0.378774, 0.393355) , - rgb (0.875376, 0.383347, 0.389976) , - rgb (0.878423, 0.387932, 0.3866) , - rgb (0.881443, 0.392529, 0.383229) , - rgb (0.884436, 0.397139, 0.37986) , - rgb (0.887402, 0.401762, 0.376494) , - rgb (0.89034, 0.406398, 0.37313) , - rgb (0.89325, 0.411048, 0.369768) , - rgb (0.896131, 0.415712, 0.366407) , - rgb (0.898984, 0.420392, 0.363047) , - rgb (0.901807, 0.425087, 0.359688) , - rgb (0.904601, 0.429797, 0.356329) , - rgb (0.907365, 0.434524, 0.35297) , - rgb (0.910098, 0.439268, 0.34961) , - rgb (0.9128, 0.444029, 0.346251) , - rgb (0.915471, 0.448807, 0.34289) , - rgb (0.918109, 0.453603, 0.339529) , - rgb (0.920714, 0.458417, 0.336166) , - rgb (0.923287, 0.463251, 0.332801) , - rgb (0.925825, 0.468103, 0.329435) , - rgb (0.928329, 0.472975, 0.326067) , - rgb (0.930798, 0.477867, 0.322697) , - rgb (0.933232, 0.48278, 0.319325) , - rgb (0.93563, 0.487712, 0.315952) , - rgb (0.93799, 0.492667, 0.312575) , - rgb (0.940313, 0.497642, 0.309197) , - rgb (0.942598, 0.502639, 0.305816) , - rgb (0.944844, 0.507658, 0.302433) , - rgb (0.947051, 0.512699, 0.299049) , - rgb (0.949217, 0.517763, 0.295662) , - rgb (0.951344, 0.52285, 0.292275) , - rgb (0.953428, 0.52796, 0.288883) , - rgb (0.95547, 0.533093, 0.28549) , - rgb (0.957469, 0.53825, 0.282096) , - rgb (0.959424, 0.543431, 0.278701) , - rgb (0.961336, 0.548636, 0.275305) , - rgb (0.963203, 0.553865, 0.271909) , - rgb (0.965024, 0.559118, 0.268513) , - rgb (0.966798, 0.564396, 0.265118) , - rgb (0.968526, 0.5697, 0.261721) , - rgb (0.970205, 0.575028, 0.258325) , - rgb (0.971835, 0.580382, 0.254931) , - rgb (0.973416, 0.585761, 0.25154) , - rgb (0.974947, 0.591165, 0.248151) , - rgb (0.976428, 0.596595, 0.244767) , - rgb (0.977856, 0.602051, 0.241387) , - rgb (0.979233, 0.607532, 0.238013) , - rgb (0.980556, 0.613039, 0.234646) , - rgb (0.981826, 0.618572, 0.231287) , - rgb (0.983041, 0.624131, 0.227937) , - rgb (0.984199, 0.629718, 0.224595) , - rgb (0.985301, 0.63533, 0.221265) , - rgb (0.986345, 0.640969, 0.217948) , - rgb (0.987332, 0.646633, 0.214648) , - rgb (0.98826, 0.652325, 0.211364) , - rgb (0.989128, 0.658043, 0.2081) , - rgb (0.989935, 0.663787, 0.204859) , - rgb (0.990681, 0.669558, 0.201642) , - rgb (0.991365, 0.675355, 0.198453) , - rgb (0.991985, 0.681179, 0.195295) , - rgb (0.992541, 0.68703, 0.19217) , - rgb (0.993032, 0.692907, 0.189084) , - rgb (0.993456, 0.69881, 0.186041) , - rgb (0.993814, 0.704741, 0.183043) , - rgb (0.994103, 0.710698, 0.180097) , - rgb (0.994324, 0.716681, 0.177208) , - rgb (0.994474, 0.722691, 0.174381) , - rgb (0.994553, 0.728728, 0.171622) , - rgb (0.994561, 0.734791, 0.168938) , - rgb (0.994495, 0.74088, 0.166335) , - rgb (0.994355, 0.746995, 0.163821) , - rgb (0.994141, 0.753137, 0.161404) , - rgb (0.993851, 0.759304, 0.159092) , - rgb (0.993482, 0.765499, 0.156891) , - rgb (0.993033, 0.77172, 0.154808) , - rgb (0.992505, 0.777967, 0.152855) , - rgb (0.991897, 0.784239, 0.151042) , - rgb (0.991209, 0.790537, 0.149377) , - rgb (0.990439, 0.796859, 0.14787) , - rgb (0.989587, 0.803205, 0.146529) , - rgb (0.988648, 0.809579, 0.145357) , - rgb (0.987621, 0.815978, 0.144363) , - rgb (0.986509, 0.822401, 0.143557) , - rgb (0.985314, 0.828846, 0.142945) , - rgb (0.984031, 0.835315, 0.142528) , - rgb (0.982653, 0.841812, 0.142303) , - rgb (0.98119, 0.848329, 0.142279) , - rgb (0.979644, 0.854866, 0.142453) , - rgb (0.977995, 0.861432, 0.142808) , - rgb (0.976265, 0.868016, 0.143351) , - rgb (0.974443, 0.874622, 0.144061) , - rgb (0.97253, 0.88125, 0.144923) , - rgb (0.970533, 0.887896, 0.145919) , - rgb (0.968443, 0.894564, 0.147014) , - rgb (0.966271, 0.901249, 0.14818) , - rgb (0.964021, 0.90795, 0.14937) , - rgb (0.961681, 0.914672, 0.15052) , - rgb (0.959276, 0.921407, 0.151566) , - rgb (0.956808, 0.928152, 0.152409) , - rgb (0.954287, 0.934908, 0.152921) , - rgb (0.951726, 0.941671, 0.152925) , - rgb (0.949151, 0.948435, 0.152178) , - rgb (0.946602, 0.95519, 0.150328) , - rgb (0.944152, 0.961916, 0.146861) , - rgb (0.941896, 0.96859, 0.140956) , - rgb (0.940015, 0.975158, 0.131326) -}); + rgb (0.050383, 0.029803, 0.527975) , + rgb (0.063536, 0.028426, 0.533124) , + rgb (0.075353, 0.027206, 0.538007) , + rgb (0.086222, 0.026125, 0.542658) , + rgb (0.096379, 0.025165, 0.547103) , + rgb (0.10598, 0.024309, 0.551368) , + rgb (0.115124, 0.023556, 0.555468) , + rgb (0.123903, 0.022878, 0.559423) , + rgb (0.132381, 0.022258, 0.56325) , + rgb (0.140603, 0.021687, 0.566959) , + rgb (0.148607, 0.021154, 0.570562) , + rgb (0.156421, 0.020651, 0.574065) , + rgb (0.16407, 0.020171, 0.577478) , + rgb (0.171574, 0.019706, 0.580806) , + rgb (0.17895, 0.019252, 0.584054) , + rgb (0.186213, 0.018803, 0.587228) , + rgb (0.193374, 0.018354, 0.59033) , + rgb (0.200445, 0.017902, 0.593364) , + rgb (0.207435, 0.017442, 0.596333) , + rgb (0.21435, 0.016973, 0.599239) , + rgb (0.221197, 0.016497, 0.602083) , + rgb (0.227983, 0.016007, 0.604867) , + rgb (0.234715, 0.015502, 0.607592) , + rgb (0.241396, 0.014979, 0.610259) , + rgb (0.248032, 0.014439, 0.612868) , + rgb (0.254627, 0.013882, 0.615419) , + rgb (0.261183, 0.013308, 0.617911) , + rgb (0.267703, 0.012716, 0.620346) , + rgb (0.274191, 0.012109, 0.622722) , + rgb (0.280648, 0.011488, 0.625038) , + rgb (0.287076, 0.010855, 0.627295) , + rgb (0.293478, 0.010213, 0.62949) , + rgb (0.299855, 0.009561, 0.631624) , + rgb (0.30621, 0.008902, 0.633694) , + rgb (0.312543, 0.008239, 0.6357) , + rgb (0.318856, 0.007576, 0.63764) , + rgb (0.32515, 0.006915, 0.639512) , + rgb (0.331426, 0.006261, 0.641316) , + rgb (0.337683, 0.005618, 0.643049) , + rgb (0.343925, 0.004991, 0.64471) , + rgb (0.35015, 0.004382, 0.646298) , + rgb (0.356359, 0.003798, 0.64781) , + rgb (0.362553, 0.003243, 0.649245) , + rgb (0.368733, 0.002724, 0.650601) , + rgb (0.374897, 0.002245, 0.651876) , + rgb (0.381047, 0.001814, 0.653068) , + rgb (0.387183, 0.001434, 0.654177) , + rgb (0.393304, 0.001114, 0.655199) , + rgb (0.399411, 0.000859, 0.656133) , + rgb (0.405503, 0.000678, 0.656977) , + rgb (0.41158, 0.000577, 0.65773) , + rgb (0.417642, 0.000564, 0.65839) , + rgb (0.423689, 0.000646, 0.658956) , + rgb (0.429719, 0.000831, 0.659425) , + rgb (0.435734, 0.001127, 0.659797) , + rgb (0.441732, 0.00154, 0.660069) , + rgb (0.447714, 0.00208, 0.66024) , + rgb (0.453677, 0.002755, 0.66031) , + rgb (0.459623, 0.003574, 0.660277) , + rgb (0.46555, 0.004545, 0.660139) , + rgb (0.471457, 0.005678, 0.659897) , + rgb (0.477344, 0.00698, 0.659549) , + rgb (0.48321, 0.00846, 0.659095) , + rgb (0.489055, 0.010127, 0.658534) , + rgb (0.494877, 0.01199, 0.657865) , + rgb (0.500678, 0.014055, 0.657088) , + rgb (0.506454, 0.016333, 0.656202) , + rgb (0.512206, 0.018833, 0.655209) , + rgb (0.517933, 0.021563, 0.654109) , + rgb (0.523633, 0.024532, 0.652901) , + rgb (0.529306, 0.027747, 0.651586) , + rgb (0.534952, 0.031217, 0.650165) , + rgb (0.54057, 0.03495, 0.64864) , + rgb (0.546157, 0.038954, 0.64701) , + rgb (0.551715, 0.043136, 0.645277) , + rgb (0.557243, 0.047331, 0.643443) , + rgb (0.562738, 0.051545, 0.641509) , + rgb (0.568201, 0.055778, 0.639477) , + rgb (0.573632, 0.060028, 0.637349) , + rgb (0.579029, 0.064296, 0.635126) , + rgb (0.584391, 0.068579, 0.632812) , + rgb (0.589719, 0.072878, 0.630408) , + rgb (0.595011, 0.07719, 0.627917) , + rgb (0.600266, 0.081516, 0.625342) , + rgb (0.605485, 0.085854, 0.622686) , + rgb (0.610667, 0.090204, 0.619951) , + rgb (0.615812, 0.094564, 0.61714) , + rgb (0.620919, 0.098934, 0.614257) , + rgb (0.625987, 0.103312, 0.611305) , + rgb (0.631017, 0.107699, 0.608287) , + rgb (0.636008, 0.112092, 0.605205) , + rgb (0.640959, 0.116492, 0.602065) , + rgb (0.645872, 0.120898, 0.598867) , + rgb (0.650746, 0.125309, 0.595617) , + rgb (0.65558, 0.129725, 0.592317) , + rgb (0.660374, 0.134144, 0.588971) , + rgb (0.665129, 0.138566, 0.585582) , + rgb (0.669845, 0.142992, 0.582154) , + rgb (0.674522, 0.147419, 0.578688) , + rgb (0.67916, 0.151848, 0.575189) , + rgb (0.683758, 0.156278, 0.57166) , + rgb (0.688318, 0.160709, 0.568103) , + rgb (0.69284, 0.165141, 0.564522) , + rgb (0.697324, 0.169573, 0.560919) , + rgb (0.701769, 0.174005, 0.557296) , + rgb (0.706178, 0.178437, 0.553657) , + rgb (0.710549, 0.182868, 0.550004) , + rgb (0.714883, 0.187299, 0.546338) , + rgb (0.719181, 0.191729, 0.542663) , + rgb (0.723444, 0.196158, 0.538981) , + rgb (0.72767, 0.200586, 0.535293) , + rgb (0.731862, 0.205013, 0.531601) , + rgb (0.736019, 0.209439, 0.527908) , + rgb (0.740143, 0.213864, 0.524216) , + rgb (0.744232, 0.218288, 0.520524) , + rgb (0.748289, 0.222711, 0.516834) , + rgb (0.752312, 0.227133, 0.513149) , + rgb (0.756304, 0.231555, 0.509468) , + rgb (0.760264, 0.235976, 0.505794) , + rgb (0.764193, 0.240396, 0.502126) , + rgb (0.76809, 0.244817, 0.498465) , + rgb (0.771958, 0.249237, 0.494813) , + rgb (0.775796, 0.253658, 0.491171) , + rgb (0.779604, 0.258078, 0.487539) , + rgb (0.783383, 0.2625, 0.483918) , + rgb (0.787133, 0.266922, 0.480307) , + rgb (0.790855, 0.271345, 0.476706) , + rgb (0.794549, 0.27577, 0.473117) , + rgb (0.798216, 0.280197, 0.469538) , + rgb (0.801855, 0.284626, 0.465971) , + rgb (0.805467, 0.289057, 0.462415) , + rgb (0.809052, 0.293491, 0.45887) , + rgb (0.812612, 0.297928, 0.455338) , + rgb (0.816144, 0.302368, 0.451816) , + rgb (0.819651, 0.306812, 0.448306) , + rgb (0.823132, 0.311261, 0.444806) , + rgb (0.826588, 0.315714, 0.441316) , + rgb (0.830018, 0.320172, 0.437836) , + rgb (0.833422, 0.324635, 0.434366) , + rgb (0.836801, 0.329105, 0.430905) , + rgb (0.840155, 0.33358, 0.427455) , + rgb (0.843484, 0.338062, 0.424013) , + rgb (0.846788, 0.342551, 0.420579) , + rgb (0.850066, 0.347048, 0.417153) , + rgb (0.853319, 0.351553, 0.413734) , + rgb (0.856547, 0.356066, 0.410322) , + rgb (0.85975, 0.360588, 0.406917) , + rgb (0.862927, 0.365119, 0.403519) , + rgb (0.866078, 0.36966, 0.400126) , + rgb (0.869203, 0.374212, 0.396738) , + rgb (0.872303, 0.378774, 0.393355) , + rgb (0.875376, 0.383347, 0.389976) , + rgb (0.878423, 0.387932, 0.3866) , + rgb (0.881443, 0.392529, 0.383229) , + rgb (0.884436, 0.397139, 0.37986) , + rgb (0.887402, 0.401762, 0.376494) , + rgb (0.89034, 0.406398, 0.37313) , + rgb (0.89325, 0.411048, 0.369768) , + rgb (0.896131, 0.415712, 0.366407) , + rgb (0.898984, 0.420392, 0.363047) , + rgb (0.901807, 0.425087, 0.359688) , + rgb (0.904601, 0.429797, 0.356329) , + rgb (0.907365, 0.434524, 0.35297) , + rgb (0.910098, 0.439268, 0.34961) , + rgb (0.9128, 0.444029, 0.346251) , + rgb (0.915471, 0.448807, 0.34289) , + rgb (0.918109, 0.453603, 0.339529) , + rgb (0.920714, 0.458417, 0.336166) , + rgb (0.923287, 0.463251, 0.332801) , + rgb (0.925825, 0.468103, 0.329435) , + rgb (0.928329, 0.472975, 0.326067) , + rgb (0.930798, 0.477867, 0.322697) , + rgb (0.933232, 0.48278, 0.319325) , + rgb (0.93563, 0.487712, 0.315952) , + rgb (0.93799, 0.492667, 0.312575) , + rgb (0.940313, 0.497642, 0.309197) , + rgb (0.942598, 0.502639, 0.305816) , + rgb (0.944844, 0.507658, 0.302433) , + rgb (0.947051, 0.512699, 0.299049) , + rgb (0.949217, 0.517763, 0.295662) , + rgb (0.951344, 0.52285, 0.292275) , + rgb (0.953428, 0.52796, 0.288883) , + rgb (0.95547, 0.533093, 0.28549) , + rgb (0.957469, 0.53825, 0.282096) , + rgb (0.959424, 0.543431, 0.278701) , + rgb (0.961336, 0.548636, 0.275305) , + rgb (0.963203, 0.553865, 0.271909) , + rgb (0.965024, 0.559118, 0.268513) , + rgb (0.966798, 0.564396, 0.265118) , + rgb (0.968526, 0.5697, 0.261721) , + rgb (0.970205, 0.575028, 0.258325) , + rgb (0.971835, 0.580382, 0.254931) , + rgb (0.973416, 0.585761, 0.25154) , + rgb (0.974947, 0.591165, 0.248151) , + rgb (0.976428, 0.596595, 0.244767) , + rgb (0.977856, 0.602051, 0.241387) , + rgb (0.979233, 0.607532, 0.238013) , + rgb (0.980556, 0.613039, 0.234646) , + rgb (0.981826, 0.618572, 0.231287) , + rgb (0.983041, 0.624131, 0.227937) , + rgb (0.984199, 0.629718, 0.224595) , + rgb (0.985301, 0.63533, 0.221265) , + rgb (0.986345, 0.640969, 0.217948) , + rgb (0.987332, 0.646633, 0.214648) , + rgb (0.98826, 0.652325, 0.211364) , + rgb (0.989128, 0.658043, 0.2081) , + rgb (0.989935, 0.663787, 0.204859) , + rgb (0.990681, 0.669558, 0.201642) , + rgb (0.991365, 0.675355, 0.198453) , + rgb (0.991985, 0.681179, 0.195295) , + rgb (0.992541, 0.68703, 0.19217) , + rgb (0.993032, 0.692907, 0.189084) , + rgb (0.993456, 0.69881, 0.186041) , + rgb (0.993814, 0.704741, 0.183043) , + rgb (0.994103, 0.710698, 0.180097) , + rgb (0.994324, 0.716681, 0.177208) , + rgb (0.994474, 0.722691, 0.174381) , + rgb (0.994553, 0.728728, 0.171622) , + rgb (0.994561, 0.734791, 0.168938) , + rgb (0.994495, 0.74088, 0.166335) , + rgb (0.994355, 0.746995, 0.163821) , + rgb (0.994141, 0.753137, 0.161404) , + rgb (0.993851, 0.759304, 0.159092) , + rgb (0.993482, 0.765499, 0.156891) , + rgb (0.993033, 0.77172, 0.154808) , + rgb (0.992505, 0.777967, 0.152855) , + rgb (0.991897, 0.784239, 0.151042) , + rgb (0.991209, 0.790537, 0.149377) , + rgb (0.990439, 0.796859, 0.14787) , + rgb (0.989587, 0.803205, 0.146529) , + rgb (0.988648, 0.809579, 0.145357) , + rgb (0.987621, 0.815978, 0.144363) , + rgb (0.986509, 0.822401, 0.143557) , + rgb (0.985314, 0.828846, 0.142945) , + rgb (0.984031, 0.835315, 0.142528) , + rgb (0.982653, 0.841812, 0.142303) , + rgb (0.98119, 0.848329, 0.142279) , + rgb (0.979644, 0.854866, 0.142453) , + rgb (0.977995, 0.861432, 0.142808) , + rgb (0.976265, 0.868016, 0.143351) , + rgb (0.974443, 0.874622, 0.144061) , + rgb (0.97253, 0.88125, 0.144923) , + rgb (0.970533, 0.887896, 0.145919) , + rgb (0.968443, 0.894564, 0.147014) , + rgb (0.966271, 0.901249, 0.14818) , + rgb (0.964021, 0.90795, 0.14937) , + rgb (0.961681, 0.914672, 0.15052) , + rgb (0.959276, 0.921407, 0.151566) , + rgb (0.956808, 0.928152, 0.152409) , + rgb (0.954287, 0.934908, 0.152921) , + rgb (0.951726, 0.941671, 0.152925) , + rgb (0.949151, 0.948435, 0.152178) , + rgb (0.946602, 0.95519, 0.150328) , + rgb (0.944152, 0.961916, 0.146861) , + rgb (0.941896, 0.96859, 0.140956) , + rgb (0.940015, 0.975158, 0.131326) + }); list_data twilight = list_data(new pen[] { - rgb (0.8857501584075443, 0.8500092494306783, 0.8879736506427196) , - rgb (0.8837852019553906, 0.8507294054031063, 0.8872322209694989) , - rgb (0.8817223105928579, 0.8512759407765347, 0.8863805692551482) , - rgb (0.8795410528270573, 0.8516567540749572, 0.8854143767924102) , - rgb (0.8772488085896548, 0.8518702833887027, 0.8843412038131143) , - rgb (0.8748534750857597, 0.8519152612302319, 0.8831692696761383) , - rgb (0.8723313408512408, 0.8518016547808089, 0.8818970435500162) , - rgb (0.8697047485350982, 0.8515240300479789, 0.8805388339000336) , - rgb (0.8669601550533358, 0.8510896085314068, 0.8790976697717334) , - rgb (0.86408985081464, 0.8505039116750779, 0.8775792578489263) , - rgb (0.8611024543689985, 0.8497675485700126, 0.8759924292343957) , - rgb (0.8579825924567037, 0.8488893481028184, 0.8743403855344628) , - rgb (0.8547259318925698, 0.8478748812467282, 0.8726282980930582) , - rgb (0.8513371457085719, 0.8467273579611647, 0.8708608165735044) , - rgb (0.8478071070257792, 0.8454546229209523, 0.8690403678369444) , - rgb (0.8441261828674842, 0.8440648271103739, 0.8671697332269007) , - rgb (0.8403042080595778, 0.8425605950855084, 0.865250882410458) , - rgb (0.8363403180919118, 0.8409479651895194, 0.8632852800107016) , - rgb (0.8322270571293441, 0.8392349062775448, 0.8612756350042788) , - rgb (0.8279689431601354, 0.837426007513952, 0.8592239945130679) , - rgb (0.8235742968025285, 0.8355248776479544, 0.8571319132851495) , - rgb (0.8190465467793753, 0.8335364929949034, 0.855002062870101) , - rgb (0.8143898212114309, 0.8314655869419785, 0.8528375906214702) , - rgb (0.8095999819094809, 0.8293189667350546, 0.8506444160105037) , - rgb (0.8046916442981458, 0.8270983878056066, 0.8484244929697402) , - rgb (0.79967075421268, 0.8248078181208093, 0.8461821002957853) , - rgb (0.7945430508923111, 0.8224511622630462, 0.8439218478682798) , - rgb (0.7893144556460892, 0.8200321318870201, 0.8416486380471222) , - rgb (0.7839910104276492, 0.8175542640053343, 0.8393674746403673) , - rgb (0.7785789200822759, 0.8150208937874255, 0.8370834463093898) , - rgb (0.7730841659017094, 0.8124352473546601, 0.8348017295057968) , - rgb (0.7675110850441786, 0.8098007598713145, 0.8325281663805967) , - rgb (0.7618690793798029, 0.8071194938764749, 0.830266486168872) , - rgb (0.7561644358438198, 0.8043940873347794, 0.8280213899472) , - rgb (0.750403467654067, 0.8016269900896532, 0.8257973785108242) , - rgb (0.7445924777189017, 0.7988204771958325, 0.8235986758615652) , - rgb (0.7387377170049494, 0.7959766573503101, 0.8214292278043301) , - rgb (0.7328454364552346, 0.7930974646884407, 0.8192926338423038) , - rgb (0.726921775128297, 0.7901846863592763, 0.8171921746672638) , - rgb (0.7209728066553678, 0.7872399592345264, 0.8151307392087926) , - rgb (0.7150040307625213, 0.7842648709158119, 0.8131111655994991) , - rgb (0.709020781345393, 0.7812608871607091, 0.8111359185511793) , - rgb (0.7030297722540817, 0.7782290497335813, 0.8092061884805697) , - rgb (0.6970365443886174, 0.7751705000806606, 0.8073233538006345) , - rgb (0.691046410093091, 0.7720862946067809, 0.8054884169067907) , - rgb (0.6850644615439593, 0.7689774029354699, 0.8037020626717691) , - rgb (0.6790955449988215, 0.765844721313959, 0.8019646617300199) , - rgb (0.6731442255942621, 0.7626890873389048, 0.8002762854580953) , - rgb (0.6672147980375281, 0.7595112803730375, 0.7986367465453776) , - rgb (0.6613112930078745, 0.7563120270871903, 0.7970456043491897) , - rgb (0.6554369232645472, 0.7530920875676843, 0.7955027112903105) , - rgb (0.6495957300425348, 0.7498520122194177, 0.7940067402149911) , - rgb (0.6437910831099849, 0.7465923800833657, 0.7925565320130605) , - rgb (0.6380258682854598, 0.7433137671403319, 0.7911510045957317) , - rgb (0.6323027138710603, 0.740016721601314, 0.7897889276264043) , - rgb (0.6266240202260459, 0.7367017540369944, 0.7884690131633456) , - rgb (0.6209919306481755, 0.733369347989232, 0.7871899462469658) , - rgb (0.6154084641177048, 0.7300199523273969, 0.7859502270675048) , - rgb (0.6098754317609306, 0.7266539875975829, 0.7847483573269471) , - rgb (0.6043943420027486, 0.7232718614323369, 0.7835829559353559) , - rgb (0.5989665814482068, 0.7198739489224673, 0.7824525989934664) , - rgb (0.5935933569683722, 0.7164606049658685, 0.781355882376401) , - rgb (0.588275797805555, 0.7130321464645814, 0.7802914140563652) , - rgb (0.5830148703693241, 0.7095888767699747, 0.7792578182047659) , - rgb (0.5778116438998202, 0.7061310615715398, 0.7782534512102552) , - rgb (0.5726668948158774, 0.7026589535425779, 0.7772770268091199) , - rgb (0.5675811785386197, 0.6991727930264627, 0.776327485342753) , - rgb (0.5625551535721934, 0.6956727838162965, 0.7754035914230984) , - rgb (0.5575894041960517, 0.6921591145825405, 0.7745041337932782) , - rgb (0.5526845058934713, 0.6886319451516638, 0.7736279426902245) , - rgb (0.5478409815301863, 0.6850914221850988, 0.7727738647344087) , - rgb (0.5430593242401823, 0.6815376725306588, 0.7719407969783508) , - rgb (0.5383401557517628, 0.677970811290954, 0.7711273443905772) , - rgb (0.533683891477284, 0.6743909370521273, 0.7703325054879735) , - rgb (0.529090861832473, 0.6707981230280622, 0.7695555229231313) , - rgb (0.5245615147059358, 0.6671924299614223, 0.7687954171423095) , - rgb (0.5200962739223556, 0.6635739143403039, 0.768051194033441) , - rgb (0.5156955988596057, 0.65994260812898, 0.7673219148959617) , - rgb (0.5113599254160193, 0.6562985398183186, 0.7666066378064533) , - rgb (0.5070896957645166, 0.6526417240314645, 0.7659044566083585) , - rgb (0.5028853540415561, 0.6489721673409526, 0.7652144671817491) , - rgb (0.4987473366135607, 0.6452898684900934, 0.7645357873418008) , - rgb (0.4946761847863938, 0.6415948411950443, 0.7638671900213091) , - rgb (0.4906722493856122, 0.6378870485884708, 0.7632081276316384) , - rgb (0.4867359599430568, 0.6341664625110051, 0.7625578008592404) , - rgb (0.4828677867260272, 0.6304330455306234, 0.761915371498953) , - rgb (0.47906816236197386, 0.6266867625186013, 0.7612800037566242) , - rgb (0.47533752394906287, 0.6229275728383581, 0.7606508557181775) , - rgb (0.4716762951887709, 0.6191554324288464, 0.7600270922788305) , - rgb (0.46808490970531597, 0.6153702869579029, 0.7594078989109274) , - rgb (0.4645637671630393, 0.6115720882286415, 0.7587924262302581) , - rgb (0.4611132664702388, 0.607760777169989, 0.7581798643680714) , - rgb (0.45773377230160567, 0.6039363004658646, 0.7575693690185916) , - rgb (0.45442563977552913, 0.6000985950385866, 0.7569601366060649) , - rgb (0.45118918687617743, 0.5962476205135354, 0.7563512064324664) , - rgb (0.4480247093358917, 0.5923833145214658, 0.7557417647410792) , - rgb (0.4449324685421538, 0.5885055998308617, 0.7551311041857901) , - rgb (0.441912717666964, 0.5846144110017557, 0.7545183888441067) , - rgb (0.43896563958048396, 0.5807096924109849, 0.7539027620828594) , - rgb (0.4360913895835637, 0.5767913799818608, 0.7532834105961016) , - rgb (0.43329008867358393, 0.5728594162560667, 0.7526594653256667) , - rgb (0.4305617907305757, 0.5689137457245718, 0.752030080993127) , - rgb (0.42790652284925834, 0.5649543060909209, 0.7513944352191484) , - rgb (0.42532423665011354, 0.560981049599503, 0.7507516498900512) , - rgb (0.4228148567577266, 0.5569939212699658, 0.7501008698822764) , - rgb (0.42037822361396326, 0.5529928715810817, 0.7494412559451894) , - rgb (0.4180141407923363, 0.5489778542188889, 0.7487719316700112) , - rgb (0.4157223260454232, 0.544948827153504, 0.7480920445900052) , - rgb (0.4135024574331473, 0.5409057477109848, 0.7474007329754309) , - rgb (0.4113541469730457, 0.5368485776500593, 0.7466971285506578) , - rgb (0.4092768899914751, 0.5327773017713032, 0.7459803063570782) , - rgb (0.4072701869421907, 0.5286918801105741, 0.7452494263758127) , - rgb (0.4053334378930318, 0.5245922817498312, 0.7445036583670813) , - rgb (0.40346600333905397, 0.5204784765384003, 0.7437421522356709) , - rgb (0.40166714010896104, 0.5163504496968876, 0.7429640345324835) , - rgb (0.39993606933454834, 0.5122081814321852, 0.7421684457131799) , - rgb (0.3982719152586337, 0.5080516653927614, 0.7413545091809972) , - rgb (0.3966737490566561, 0.5038808905384797, 0.7405213858051674) , - rgb (0.3951405880820763, 0.4996958532637776, 0.7396682021171571) , - rgb (0.39367135736822567, 0.4954965577745118, 0.738794102296364) , - rgb (0.39226494876209317, 0.4912830033289926, 0.7378982478447508) , - rgb (0.390920175719949, 0.4870552025122304, 0.7369797713388125) , - rgb (0.38963580160340855, 0.48281316715123496, 0.7360378254693274) , - rgb (0.3884105330084243, 0.47855691131792805, 0.7350715764115726) , - rgb (0.3872430145933025, 0.4742864593363539, 0.7340801678785439) , - rgb (0.386131841788921, 0.4700018340988123, 0.7330627749243106) , - rgb (0.3850755679365139, 0.46570306719930193, 0.732018540336905) , - rgb (0.38407269378943537, 0.46139018782416635, 0.7309466543290268) , - rgb (0.3831216808440275, 0.457063235814072, 0.7298462679135326) , - rgb (0.38222094988570376, 0.45272225034283325, 0.7287165614400378) , - rgb (0.3813688793045416, 0.4483672766927786, 0.7275567131714135) , - rgb (0.3805638069656562, 0.4439983720863372, 0.7263658704513531) , - rgb (0.3798040374484875, 0.4396155882122263, 0.7251432377876109) , - rgb (0.3790878928311076, 0.43521897612544935, 0.7238879869132313) , - rgb (0.378413635091359, 0.43080859411413064, 0.7225993199306104) , - rgb (0.3777794975351373, 0.4263845142616835, 0.7212763999353023) , - rgb (0.3771837184425123, 0.4219468022345483, 0.7199184152447577) , - rgb (0.37662448930806297, 0.41749553747893614, 0.7185245473617611) , - rgb (0.37610001286385814, 0.4130307995247706, 0.7170939691992023) , - rgb (0.375608469194424, 0.40855267638072096, 0.7156258509158755) , - rgb (0.37514802505380473, 0.4040612609993941, 0.7141193695725726) , - rgb (0.3747168601930223, 0.3995566498711684, 0.7125736851650046) , - rgb (0.3743131319931234, 0.3950389482828331, 0.7109879652237746) , - rgb (0.3739349933047578, 0.3905082752937583, 0.7093613429347845) , - rgb (0.3735806215098284, 0.3859647438605754, 0.7076929760731058) , - rgb (0.37324816143326384, 0.38140848555753937, 0.7059820097480604) , - rgb (0.3729357864666503, 0.3768396383521984, 0.7042275578058994) , - rgb (0.37264166757849604, 0.3722583500483685, 0.7024287314570723) , - rgb (0.37236397858465387, 0.36766477862108266, 0.7005846349652077) , - rgb (0.3721008970244382, 0.3630590973698238, 0.6986943461507372) , - rgb (0.3718506155898596, 0.3584414828587522, 0.6967569581025654) , - rgb (0.3716113323440048, 0.3538121372967869, 0.6947714991938089) , - rgb (0.37138124223736607, 0.34917126878479027, 0.6927370347192883) , - rgb (0.37115856636209105, 0.3445191141023017, 0.6906525358646499) , - rgb (0.3709415155133733, 0.33985591488818123, 0.6885170337950512) , - rgb (0.3707283327942267, 0.33518193808489577, 0.6863294816960677) , - rgb (0.37051738634484427, 0.3304974124430785, 0.6840888878885721) , - rgb (0.37030682071842685, 0.32580269697872455, 0.6817941168448668) , - rgb (0.37009487130772695, 0.3210981375964933, 0.6794440539905685) , - rgb (0.3698798032902536, 0.31638410101153364, 0.6770375543809057) , - rgb (0.36965987626565955, 0.3116609876295197, 0.6745734474341955) , - rgb (0.3694333459127623, 0.3069292355186234, 0.6720505284912062) , - rgb (0.36919847837592484, 0.3021893217650707, 0.6694675433161452) , - rgb (0.3689535530659678, 0.29744175492366276, 0.6668232208982426) , - rgb (0.3686968223189527, 0.292687098561501, 0.6641162529823691) , - rgb (0.36842655638020444, 0.2879259643777846, 0.661345269109446) , - rgb (0.3681410147989972, 0.2831590122118299, 0.6585088880697231) , - rgb (0.3678384369653108, 0.2783869718129776, 0.655605668384537) , - rgb (0.36751707094367697, 0.2736106331709098, 0.6526341171161864) , - rgb (0.36717513650699446, 0.26883085667326956, 0.6495927229789225) , - rgb (0.3668108554010799, 0.26404857724525643, 0.6464799165290824) , - rgb (0.3664224325155063, 0.25926481158628106, 0.6432940914076554) , - rgb (0.36600853966739794, 0.25448043878086224, 0.6400336180336859) , - rgb (0.3655669837353898, 0.24969683475296395, 0.6366967518748858) , - rgb (0.3650957984588681, 0.24491536803550484, 0.6332817352005559) , - rgb (0.3645930889012501, 0.24013747024823828, 0.629786801550261) , - rgb (0.3640569302208851, 0.23536470386204195, 0.6262101345195302) , - rgb (0.36348537610385145, 0.2305987621839642, 0.6225498862239288) , - rgb (0.3628764356004103, 0.2258414929328703, 0.6188041741082302) , - rgb (0.36222809558295926, 0.22109488427338303, 0.6149711234609613) , - rgb (0.36153829010998356, 0.21636111429594002, 0.6110488067964093) , - rgb (0.36080493826624654, 0.21164251793458128, 0.6070353217206471) , - rgb (0.36002681809096376, 0.20694122817889948, 0.6029284543191687) , - rgb (0.35920088560930186, 0.20226037920758122, 0.5987265295935138) , - rgb (0.3583248996661781, 0.197602942459778, 0.5944276851750107) , - rgb (0.35739663292915563, 0.1929720819784246, 0.5900301125106313) , - rgb (0.35641381143126327, 0.18837119869242164, 0.5855320765920552) , - rgb (0.3553741530690672, 0.18380392577704466, 0.580931914318328) , - rgb (0.3542753496066376, 0.17927413271618647, 0.5762280966066872) , - rgb (0.35311574421123737, 0.17478570377561287, 0.5714187152355529) , - rgb (0.3518924860887379, 0.17034320478524959, 0.5665028491121665) , - rgb (0.3506030444193101, 0.1659512998472086, 0.5614796470399323) , - rgb (0.34924513554955644, 0.16161477763045118, 0.5563483747416378) , - rgb (0.3478165323877778, 0.1573386351115298, 0.5511085345270326) , - rgb (0.3463150717579309, 0.15312802296627787, 0.5457599924248665) , - rgb (0.34473901574536375, 0.1489882058982641, 0.5403024592040654) , - rgb (0.34308600291572294, 0.14492465359918028, 0.534737042820671) , - rgb (0.34135411074506483, 0.1409427920655632, 0.5290650094033675) , - rgb (0.33954168752669694, 0.1370480189671817, 0.5232879753508524) , - rgb (0.3376473209067111, 0.13324562282438077, 0.5174080757397947) , - rgb (0.33566978565015315, 0.12954074251271822, 0.5114280721516895) , - rgb (0.33360804901486, 0.1259381830100592, 0.505351647966549) , - rgb (0.33146154891145124, 0.12244245263391232, 0.4991827458843107) , - rgb (0.3292300520323141, 0.11905764321981127, 0.49292595612342666) , - rgb (0.3269137124539796, 0.1157873496841953, 0.4865864649569746) , - rgb (0.32451307931207785, 0.11263459791730848, 0.48017007211645196) , - rgb (0.3220288227606932, 0.10960114111258401, 0.4736849472572688) , - rgb (0.31946262395497965, 0.1066887988239266, 0.46713728801395243) , - rgb (0.316816480890235, 0.10389861387653518, 0.46053414662739794) , - rgb (0.3140927841475553, 0.10123077676403242, 0.45388335612058467) , - rgb (0.31129434479712365, 0.0986847719340522, 0.4471931371516162) , - rgb (0.30842444457210105, 0.09625938534057774, 0.44047194882050544) , - rgb (0.30548675819945936, 0.09395276484082374, 0.4337284999936111) , - rgb (0.3024853636457425, 0.0917611873973036, 0.42697404043749887) , - rgb (0.2994248396021477, 0.08968225371675004, 0.42021619665853854) , - rgb (0.2963100038890529, 0.08771325096046395, 0.41346259134143476) , - rgb (0.2931459309698525, 0.08585065688962071, 0.40672178082365834) , - rgb (0.2899379244517661, 0.08409078829085731, 0.40000214725256295) , - rgb (0.28669151388283165, 0.08242987384848069, 0.39331182532243375) , - rgb (0.28341239797185225, 0.08086415336549937, 0.38665868550105914) , - rgb (0.2801063857697547, 0.07938999480226153, 0.38005028528138707) , - rgb (0.2767793961581559, 0.07800394103378822, 0.37349382846504675) , - rgb (0.2734373934245081, 0.07670280023749607, 0.36699616136347685) , - rgb (0.2700863774911405, 0.07548367558427554, 0.36056376228111864) , - rgb (0.26673233211995284, 0.0743440180285462, 0.3542027606624096) , - rgb (0.26338121807151404, 0.07328165793989708, 0.34791888996380105) , - rgb (0.26003895187439957, 0.0722947810433622, 0.3417175669546984) , - rgb (0.256711916510839, 0.07138010624208224, 0.3356064898460009) , - rgb (0.25340685873736807, 0.07053358292685183, 0.3295945757321303) , - rgb (0.2501284530619938, 0.06975820642910699, 0.32368100685760637) , - rgb (0.24688226237959, 0.06905363944920445, 0.31786993834254956) , - rgb (0.24367372557466271, 0.06841985515092269, 0.3121652405088837) , - rgb (0.2405081333229594, 0.0678571038148556, 0.3065705449367832) , - rgb (0.23739062429054825, 0.06736588805055552, 0.3010892218406587) , - rgb (0.23433055727563878, 0.0669355996616394, 0.295740099298676) , - rgb (0.23132955273021344, 0.06657618693909059, 0.29051361067988485) , - rgb (0.2283917709422868, 0.06628997924139618, 0.28541074411068496) , - rgb (0.22552164337737857, 0.0660781731193956, 0.28043398847505197) , - rgb (0.22272706739121817, 0.06593379067565194, 0.275597146520537) , - rgb (0.22001251100779617, 0.0658579189189076, 0.2709027999432586) , - rgb (0.21737845072382705, 0.06585966123356204, 0.2663420934966951) , - rgb (0.21482843531473683, 0.06594038561377849, 0.26191675992376573) , - rgb (0.21237411048541005, 0.06608502466175845, 0.2576516509356954) , - rgb (0.21001214221188125, 0.06630857391894718, 0.2535289048041211) , - rgb (0.2077442377448806, 0.06661453200418091, 0.24954644291943817) , - rgb (0.20558051999470117, 0.06699046239786874, 0.24572497420147632) , - rgb (0.20352007949514977, 0.06744417961242422, 0.24205576625191821) , - rgb (0.2015613376412984, 0.06798327102620025, 0.23852974228695395) , - rgb (0.19971571438603364, 0.06859271055370472, 0.23517094067076993) , - rgb (0.19794834061899208, 0.06931406607166066, 0.23194647381302336) , - rgb (0.1960826032659409, 0.07032122724242362, 0.22874673279569585) , - rgb (0.19410351363791453, 0.07160830485689157, 0.22558727307410353) , - rgb (0.19199449184606268, 0.0731828306492733, 0.22243385243433622) , - rgb (0.18975853639094634, 0.07501986186214377, 0.2193005075652994) , - rgb (0.18739228342697645, 0.07710209689958833, 0.21618875376309582) , - rgb (0.18488035509396164, 0.07942573027972388, 0.21307651648984993) , - rgb (0.18774482037046955, 0.07725158846803931, 0.21387448578597812) , - rgb (0.19049578401722037, 0.07531127841678764, 0.2146562337112265) , - rgb (0.1931548636579131, 0.07360681904011795, 0.21542362939081539) , - rgb (0.19571853588267552, 0.07215778103960274, 0.21617499187076789) , - rgb (0.19819343656336558, 0.07097462525273879, 0.21690975060032436) , - rgb (0.20058760685133747, 0.07006457614998421, 0.21762721310371608) , - rgb (0.20290365333558247, 0.06943524858045896, 0.21833167885096033) , - rgb (0.20531725273301316, 0.06891959226639757, 0.21911516689288835) , - rgb (0.20785704662965598, 0.06848439879702528, 0.22000133917653536) , - rgb (0.21052882914958676, 0.06812195249816172, 0.22098759107715404) , - rgb (0.2133313859647627, 0.06783014842602667, 0.2220704321302429) , - rgb (0.21625279838647882, 0.06761633027051639, 0.22324568672294431) , - rgb (0.21930503925136402, 0.06746578636294004, 0.22451023616807558) , - rgb (0.22247308588973624, 0.06738821405309284, 0.22585960379408354) , - rgb (0.2257539681670791, 0.06738213230014747, 0.22728984778098055) , - rgb (0.2291562027859284, 0.06743473087115257, 0.22879681433956656) , - rgb (0.23266299920501882, 0.06755710438847978, 0.23037617493752832) , - rgb (0.23627495835774248, 0.06774359820987802, 0.23202360805926608) , - rgb (0.23999586188690308, 0.06798502996477995, 0.23373434258507808) , - rgb (0.2438114972024792, 0.06828985152901187, 0.23550427698321885) , - rgb (0.247720929905011, 0.06865333790948652, 0.2373288009471749) , - rgb (0.25172899728289466, 0.0690646308260355, 0.23920260612763083) , - rgb (0.2558213554748177, 0.06953231029187984, 0.24112190491594204) , - rgb (0.25999463887892144, 0.07005385560386188, 0.24308218808684579) , - rgb (0.2642551220706094, 0.07061659562299544, 0.24507758869355967) , - rgb (0.2685909594817286, 0.07122671627792246, 0.24710443563450618) , - rgb (0.272997015188973, 0.07188355544616351, 0.2491584709323293) , - rgb (0.277471508091428, 0.07258296989925478, 0.2512349399594277) , - rgb (0.2820174629736694, 0.07331569321404097, 0.25332800295084507) , - rgb (0.28662309235899847, 0.07408846082680887, 0.2554347867371703) , - rgb (0.29128515387578635, 0.0748990498474667, 0.25755101595750435) , - rgb (0.2960004726065818, 0.07574533600095842, 0.25967245030364566) , - rgb (0.3007727681291869, 0.07661782433616476, 0.2617929409781967) , - rgb (0.30559226007249934, 0.07752196310753731, 0.2639100669211966) , - rgb (0.31045520848595526, 0.07845687167618218, 0.2660200572779356) , - rgb (0.3153587000920581, 0.07942099731524319, 0.2681190407694196) , - rgb (0.3202998655799406, 0.08041299473755484, 0.2702032289303951) , - rgb (0.3252788886040126, 0.08142839007654609, 0.27226772884656186) , - rgb (0.3302917447118144, 0.08246763389003825, 0.27430929404579435) , - rgb (0.3353335322445545, 0.08353243411900396, 0.2763253435679004) , - rgb (0.34040164359597463, 0.08462223619170267, 0.27831254595259397) , - rgb (0.345493557138718, 0.08573665496512634, 0.28026769921081435) , - rgb (0.3506067824603248, 0.08687555176033529, 0.28218770540182386) , - rgb (0.35573889947341125, 0.08803897435024335, 0.2840695897279818) , - rgb (0.36088752387578377, 0.0892271943627452, 0.28591050458531014) , - rgb (0.36605031412464006, 0.0904406854276979, 0.2877077458811747) , - rgb (0.3712250843130934, 0.09167999748026273, 0.2894586539763317) , - rgb (0.3764103053221462, 0.09294519809377791, 0.2911602415731392) , - rgb (0.38160247377467543, 0.09423873126371218, 0.2928110750626949) , - rgb (0.3867993907954417, 0.09556181960083443, 0.29440901248173756) , - rgb (0.39199887556812907, 0.09691583650296684, 0.2959521200550908) , - rgb (0.39719876876325577, 0.09830232096827862, 0.2974385647628578) , - rgb (0.40239692379737496, 0.09972293031495055, 0.2988667436973397) , - rgb (0.4075912039268871, 0.10117945586419633, 0.300235195077286) , - rgb (0.41277985630360303, 0.1026734006932461, 0.3015422643746897) , - rgb (0.41796105205173684, 0.10420644885760968, 0.3027865203963184) , - rgb (0.42313214269556043, 0.10578120994917611, 0.3039675809469457) , - rgb (0.4282910131578975, 0.1073997763055258, 0.30508479060294547) , - rgb (0.4334355841041439, 0.1090642347484701, 0.3061376792828915) , - rgb (0.4385637818793154, 0.11077667828375456, 0.30712600062348083) , - rgb (0.44367358645071275, 0.11253912421257944, 0.3080497309546545) , - rgb (0.4487629917317482, 0.1143535557462255, 0.30890905921943196) , - rgb (0.4538300508699989, 0.11622183788331528, 0.3097044124984492) , - rgb (0.45887288947308297, 0.11814571137706886, 0.3104363697903881) , - rgb (0.46389102840284874, 0.12012561256850712, 0.31110343446582983) , - rgb (0.46888111384598413, 0.12216445576414045, 0.31170911458932665) , - rgb (0.473841437035254, 0.12426354237989065, 0.31225470169927194) , - rgb (0.47877034239726296, 0.12642401401409453, 0.3127417273582196) , - rgb (0.48366628618847957, 0.1286467902201389, 0.31317188565991266) , - rgb (0.48852847371852987, 0.13093210934893723, 0.31354553695453014) , - rgb (0.49335504375145617, 0.13328091630401023, 0.31386561956734976) , - rgb (0.4981443546207415, 0.13569380302451714, 0.314135190862664) , - rgb (0.5028952497497061, 0.13817086581280427, 0.3143566215383367) , - rgb (0.5076068118105369, 0.14071192654913128, 0.3145320012008257) , - rgb (0.5122783510532176, 0.14331656120063752, 0.3146630922831542) , - rgb (0.5169084880054446, 0.14598463068714407, 0.3147540759228004) , - rgb (0.5214965286322996, 0.14871544765633712, 0.3148076795453443) , - rgb (0.5260418962547748, 0.15150818660835483, 0.31482653406646727) , - rgb (0.5305442048985645, 0.15436183633886777, 0.3148129978918713) , - rgb (0.5350027976174474, 0.15727540775107324, 0.3147708520739653) , - rgb (0.5394173664919906, 0.16024769309971934, 0.31470295028655965) , - rgb (0.5437877131360856, 0.16327738551419116, 0.31461204226295625) , - rgb (0.5481137003346762, 0.1663630904279047, 0.3145010299091471) , - rgb (0.5523952157271191, 0.16950338809328983, 0.3143729155461537) , - rgb (0.5566322903496934, 0.17269677158182117, 0.31423043195101424) , - rgb (0.5608249903911717, 0.17594170887918095, 0.31407639883970623) , - rgb (0.564973435290177, 0.17923664950367169, 0.3139136046337036) , - rgb (0.5690778478401143, 0.18258004462335425, 0.3137444095679653) , - rgb (0.5731384575410787, 0.18597036007065024, 0.3135712686852) , - rgb (0.5771555081299204, 0.18940601489760422, 0.3133970433357208) , - rgb (0.5811293276158656, 0.19288548904692518, 0.3132239939418394) , - rgb (0.5850602439646688, 0.19640737049066315, 0.3130540116373273) , - rgb (0.5889486193554471, 0.19997020971775276, 0.31288922211590126) , - rgb (0.5927948053652026, 0.20357251410079796, 0.3127323483930494) , - rgb (0.5965991810912237, 0.207212956082026, 0.3125852303112123) , - rgb (0.6003621301041158, 0.21089030138947745, 0.3124493441041469) , - rgb (0.6040840169673274, 0.21460331490206347, 0.31232652641170694) , - rgb (0.6077652399481865, 0.21835070166659282, 0.312219032918702) , - rgb (0.6114062072731884, 0.22213124697023234, 0.3121288139643524) , - rgb (0.6150072323639137, 0.22594402043981826, 0.3120568068576574) , - rgb (0.6185686525887719, 0.2297879924917992, 0.3120046383872893) , - rgb (0.6220907982108261, 0.2336621873300741, 0.3119738327362739) , - rgb (0.6255741650043496, 0.23756535071152696, 0.3119669831491227) , - rgb (0.6290189201698587, 0.24149689191922535, 0.3119844719564572) , - rgb (0.6324253485421027, 0.24545598775548677, 0.3120276597462445) , - rgb (0.6357937104834237, 0.24944185818822678, 0.3120979395330059) , - rgb (0.6391243387840212, 0.2534536546198314, 0.3121968961206398) , - rgb (0.642417577481186, 0.257490519876798, 0.31232631707560987) , - rgb (0.6456734938264543, 0.2615520316161528, 0.31248673753935263) , - rgb (0.6488923016945825, 0.2656375533620908, 0.3126794181957019) , - rgb (0.652074172902773, 0.269746505252367, 0.3129056060581917) , - rgb (0.6552193260932713, 0.2738782665241015, 0.3131666792687211) , - rgb (0.6583280801134499, 0.2780321095766563, 0.3134643447952643) , - rgb (0.6614003753260178, 0.28220778870555907, 0.3137991292649849) , - rgb (0.6644363246987884, 0.2864048361425618, 0.31417223403606975) , - rgb (0.6674360376636913, 0.29062280081258873, 0.31458483752056837) , - rgb (0.670399595476762, 0.29486126309253047, 0.3150381395687221) , - rgb (0.6733272556481733, 0.29911962764489264, 0.3155337232398221) , - rgb (0.6762189792440975, 0.30339762792450425, 0.3160724937230589) , - rgb (0.6790747402815734, 0.30769497879760166, 0.31665545668946665) , - rgb (0.6818945715094452, 0.31201133280550686, 0.3172838048924495) , - rgb (0.6846785094249453, 0.3163463482122221, 0.31795870784057567) , - rgb (0.6874265643516962, 0.32069970535138104, 0.3186813762227769) , - rgb (0.6901389321505248, 0.32507091815606004, 0.319453323328983) , - rgb (0.6928154484676493, 0.32945984647042675, 0.3202754315314667) , - rgb (0.6954560834689112, 0.33386622163232865, 0.3211488430698579) , - rgb (0.6980608153581771, 0.3382897632604862, 0.3220747885521809) , - rgb (0.700629624772421, 0.34273019305341756, 0.32305449047765694) , - rgb (0.7031624945881415, 0.34718723719598, 0.32408913679491225) , - rgb (0.7056595112261009, 0.3516605297812094, 0.32518014084085567) , - rgb (0.7081205956842048, 0.356149855233803, 0.32632861885644465) , - rgb (0.7105456546582587, 0.36065500290840113, 0.3275357416278876) , - rgb (0.7129346683977347, 0.36517570519856757, 0.3288027427038317) , - rgb (0.7152876061484729, 0.3697117022522345, 0.3301308728723546) , - rgb (0.7176044490813385, 0.3742627271068619, 0.3315213862095893) , - rgb (0.7198852149054985, 0.37882848839337313, 0.332975552002454) , - rgb (0.7221299918421461, 0.3834086450896306, 0.33449469983585844) , - rgb (0.7243386564778159, 0.38800301593162145, 0.3360799596569183) , - rgb (0.7265112290022755, 0.3926113126792577, 0.3377325942005665) , - rgb (0.7286477385671655, 0.39723324476747235, 0.33945384341064017) , - rgb (0.7307482075484517, 0.401868526884681, 0.3412449533046818) , - rgb (0.7328127050626875, 0.4065168468778026, 0.3431071517341082) , - rgb (0.7348413359856494, 0.4111778700451951, 0.3450416947080907) , - rgb (0.7368342217358587, 0.4158512585029011, 0.347049785207584) , - rgb (0.7387914002459927, 0.4205367299231533, 0.34913260148542435) , - rgb (0.7407130161950609, 0.4252339389526239, 0.35129130890802607) , - rgb (0.7425992159973317, 0.42994254036133867, 0.3535270924537459) , - rgb (0.7444501867657067, 0.4346621718461711, 0.35584108091122535) , - rgb (0.7462661578916344, 0.439392450449735, 0.3582343914230064) , - rgb (0.7480473927555956, 0.44413297780351974, 0.36070813602540136) , - rgb (0.7497942054717047, 0.4488833348154881, 0.3632633755836028) , - rgb (0.7515068504589166, 0.45364314496866825, 0.36590112443835765) , - rgb (0.7531856636904657, 0.45841199172949604, 0.3686223664223477) , - rgb (0.7548310506695954, 0.46318942799460555, 0.3714280448394211) , - rgb (0.7564434157714071, 0.4679750143794846, 0.37431909037543515) , - rgb (0.7580232553845584, 0.4727682731566229, 0.3772963553109668) , - rgb (0.7595711110534006, 0.4775687122205708, 0.380360657784311) , - rgb (0.7610876378057071, 0.48237579130289127, 0.3835127572385229) , - rgb (0.7625733355405261, 0.48718906673415824, 0.38675335037837993) , - rgb (0.7640288560928866, 0.49200802533379656, 0.39008308392311997) , - rgb (0.7654549259333051, 0.4968321290972723, 0.3935025400011538) , - rgb (0.7668522895064389, 0.5016608471009063, 0.39701221751773474) , - rgb (0.768221765997353, 0.5064936237128791, 0.40061257089416885) , - rgb (0.7695642334401418, 0.5113298901696085, 0.4043039806968248) , - rgb (0.7708809196230247, 0.516168926434691, 0.40808667584648967) , - rgb (0.7721725722960555, 0.5210102658711383, 0.4119608998712287) , - rgb (0.7734402182988989, 0.5258533209345156, 0.41592679539764366) , - rgb (0.774684947460632, 0.5306974938477673, 0.4199844035696376) , - rgb (0.775907907306857, 0.5355421788246119, 0.42413367909988375) , - rgb (0.7771103295521099, 0.5403867491056124, 0.4283745037125848) , - rgb (0.7782934580763312, 0.545230594884266, 0.432706647838971) , - rgb (0.7794586273150664, 0.5500730841397727, 0.4371297985644476) , - rgb (0.7806077474948377, 0.5549133574489061, 0.4416433242636464) , - rgb (0.7817418047898184, 0.5597509805259486, 0.44624687186865436) , - rgb (0.7828622526444091, 0.5645853311116688, 0.45093985823706345) , - rgb (0.7839706083641448, 0.5694157832671042, 0.4557215474289206) , - rgb (0.7850684501960684, 0.5742417003617839, 0.46059116206904965) , - rgb (0.7861573713233296, 0.5790624629815756, 0.465547782819184) , - rgb (0.7872390410818835, 0.5838774374455721, 0.47059039582133383) , - rgb (0.7883151404562396, 0.5886860017356244, 0.4757179187907608) , - rgb (0.7893873776625194, 0.5934875421745599, 0.48092913815357724) , - rgb (0.7904577684772788, 0.5982813427706246, 0.48622257801969754) , - rgb (0.7915283284347561, 0.603066705931472, 0.49159667021646397) , - rgb (0.7926003430423745, 0.6078432208703702, 0.4970502062153201) , - rgb (0.7936755969866496, 0.6126102933407219, 0.5025816129126943) , - rgb (0.7947558597265404, 0.617367344002207, 0.5081892121310299) , - rgb (0.7958429237958377, 0.6221137880845115, 0.5138712409190979) , - rgb (0.7969385471995161, 0.626849056792967, 0.5196258425240281) , - rgb (0.7980444781513664, 0.6315725822508955, 0.5254510814483478) , - rgb (0.7991624518501963, 0.6362837937202919, 0.5313449594256143) , - rgb (0.8002941538975398, 0.6409821330674986, 0.5373053518514104) , - rgb (0.8014412429256005, 0.6456670345921877, 0.5433300863249918) , - rgb (0.8026053114611295, 0.6503379374810385, 0.5494169158460365) , - rgb (0.8037879253107763, 0.6549942654947263, 0.5555635086708381) , - rgb (0.804990547908103, 0.6596354502756416, 0.5617674511054698) , - rgb (0.8062146052692706, 0.6642608958528229, 0.5680262917864979) , - rgb (0.8074614045096935, 0.6688700095398864, 0.5743374637345958) , - rgb (0.8087321917008969, 0.6734621670219452, 0.5806983480557674) , - rgb (0.8100280946652069, 0.6780367267397182, 0.5871062690808275) , - rgb (0.8113501401176333, 0.6825930154624339, 0.5935584890905076) , - rgb (0.8126992203988149, 0.6871303371461888, 0.600052148204351) , - rgb (0.8140761104699334, 0.6916479479148213, 0.6065843782630862) , - rgb (0.8154814662727948, 0.6961450550830809, 0.6131522120932265) , - rgb (0.8169157577505589, 0.7006208301478398, 0.6197526063725792) , - rgb (0.8183793116449822, 0.705074381896351, 0.626382454789333) , - rgb (0.8198723065045529, 0.7095047497878748, 0.6330385704006711) , - rgb (0.8213947205565636, 0.7139109141951604, 0.6397176669767276) , - rgb (0.8229463511042843, 0.7182917733129006, 0.6464164243818421) , - rgb (0.8245268129450285, 0.7226461431208888, 0.653131379154226) , - rgb (0.8261354971058026, 0.7269727551823826, 0.659859001562165) , - rgb (0.8277716072353446, 0.7312702332407809, 0.6665957020468297) , - rgb (0.8294340781648147, 0.7355371221572935, 0.6733377200930191) , - rgb (0.8311216352909631, 0.7397718464763862, 0.6800812520363146) , - rgb (0.8328327718577798, 0.7439727181745988, 0.6868223587464855) , - rgb (0.8345656905566583, 0.7481379479992134, 0.6935569764986385) , - rgb (0.8363189884473793, 0.7522654895287526, 0.7002799902886496) , - rgb (0.8380912347613196, 0.7563531486080863, 0.7069856139021298) , - rgb (0.8398783988412087, 0.7603990719977968, 0.7136714781112923) , - rgb (0.8416775076684515, 0.7644010120098295, 0.7203329938728462) , - rgb (0.843485292229337, 0.7683566039987018, 0.7269653699897204) , - rgb (0.8452981073195511, 0.7722633860104472, 0.7335636824054149) , - rgb (0.847111955079651, 0.7761188023604716, 0.7401227576280706) , - rgb (0.8489224556311764, 0.7799202140765015, 0.7466371929366437) , - rgb (0.8507269702317879, 0.7836645734238389, 0.7530974636118285) , - rgb (0.8525190720770844, 0.7873493613354844, 0.7594994148789691) , - rgb (0.8542921961147046, 0.7909719677709199, 0.765838014779141) , - rgb (0.856040223147254, 0.7945296360155061, 0.7721061003767414) , - rgb (0.857756629435049, 0.7980196314271393, 0.778295716672475) , - rgb (0.8594346370300241, 0.8014392309950078, 0.7843978875138392) , - rgb (0.8610711702756552, 0.8047851790981223, 0.7903952966373629) , - rgb (0.8626560105112757, 0.8080552380426153, 0.796282666437655) , - rgb (0.8641834372394103, 0.8112464422465354, 0.8020461269686395) , - rgb (0.8656493432560532, 0.8143554406751491, 0.8076697232416455) , - rgb (0.867053149070485, 0.8173780404191124, 0.813134196269114) , - rgb (0.8683995469581863, 0.8203087551218152, 0.8184163896312899) , - rgb (0.8696913150261381, 0.8231415885956916, 0.8235047668317317) , - rgb (0.8709384671729751, 0.8258685788943851, 0.8283849726114961) , - rgb (0.8721533197845432, 0.8284805282370967, 0.8330486712880828) , - rgb (0.8733517136091627, 0.8309671525127262, 0.8374885100119709) , - rgb (0.8745379332026019, 0.8333197294864546, 0.8417192535806901) , - rgb (0.875714587099614, 0.8355302318472394, 0.8457553751902708) , - rgb (0.8768784845161469, 0.8375923807118654, 0.8496137354915025) , - rgb (0.8780229843664901, 0.8395016561854007, 0.8533064535245892) , - rgb (0.8791324424079277, 0.8412555488447591, 0.8568557229103964) , - rgb (0.8801929331569581, 0.8428522482477862, 0.8602739992715663) , - rgb (0.8811916987134195, 0.8442906671771735, 0.8635659516866988) , - rgb (0.8821154248940161, 0.8455700725455935, 0.8667376504623333) , - rgb (0.8829516859544853, 0.8466897027569927, 0.8697961704819097) , - rgb (0.8836912714589804, 0.8476489176151927, 0.8727414710144156) , - rgb (0.8843271305411354, 0.8484474157205542, 0.8755678522824297) , - rgb (0.8848513815990857, 0.849084264228938, 0.8782823528537247) , - rgb (0.8852589797263047, 0.8495589281098921, 0.8808841479402484) , - rgb (0.8855471481195238, 0.8498717428363158, 0.8833620612117095) , - rgb (0.8857115512284565, 0.8500218611585632, 0.8857253899008712) -}); + rgb (0.8857501584075443, 0.8500092494306783, 0.8879736506427196) , + rgb (0.8837852019553906, 0.8507294054031063, 0.8872322209694989) , + rgb (0.8817223105928579, 0.8512759407765347, 0.8863805692551482) , + rgb (0.8795410528270573, 0.8516567540749572, 0.8854143767924102) , + rgb (0.8772488085896548, 0.8518702833887027, 0.8843412038131143) , + rgb (0.8748534750857597, 0.8519152612302319, 0.8831692696761383) , + rgb (0.8723313408512408, 0.8518016547808089, 0.8818970435500162) , + rgb (0.8697047485350982, 0.8515240300479789, 0.8805388339000336) , + rgb (0.8669601550533358, 0.8510896085314068, 0.8790976697717334) , + rgb (0.86408985081464, 0.8505039116750779, 0.8775792578489263) , + rgb (0.8611024543689985, 0.8497675485700126, 0.8759924292343957) , + rgb (0.8579825924567037, 0.8488893481028184, 0.8743403855344628) , + rgb (0.8547259318925698, 0.8478748812467282, 0.8726282980930582) , + rgb (0.8513371457085719, 0.8467273579611647, 0.8708608165735044) , + rgb (0.8478071070257792, 0.8454546229209523, 0.8690403678369444) , + rgb (0.8441261828674842, 0.8440648271103739, 0.8671697332269007) , + rgb (0.8403042080595778, 0.8425605950855084, 0.865250882410458) , + rgb (0.8363403180919118, 0.8409479651895194, 0.8632852800107016) , + rgb (0.8322270571293441, 0.8392349062775448, 0.8612756350042788) , + rgb (0.8279689431601354, 0.837426007513952, 0.8592239945130679) , + rgb (0.8235742968025285, 0.8355248776479544, 0.8571319132851495) , + rgb (0.8190465467793753, 0.8335364929949034, 0.855002062870101) , + rgb (0.8143898212114309, 0.8314655869419785, 0.8528375906214702) , + rgb (0.8095999819094809, 0.8293189667350546, 0.8506444160105037) , + rgb (0.8046916442981458, 0.8270983878056066, 0.8484244929697402) , + rgb (0.79967075421268, 0.8248078181208093, 0.8461821002957853) , + rgb (0.7945430508923111, 0.8224511622630462, 0.8439218478682798) , + rgb (0.7893144556460892, 0.8200321318870201, 0.8416486380471222) , + rgb (0.7839910104276492, 0.8175542640053343, 0.8393674746403673) , + rgb (0.7785789200822759, 0.8150208937874255, 0.8370834463093898) , + rgb (0.7730841659017094, 0.8124352473546601, 0.8348017295057968) , + rgb (0.7675110850441786, 0.8098007598713145, 0.8325281663805967) , + rgb (0.7618690793798029, 0.8071194938764749, 0.830266486168872) , + rgb (0.7561644358438198, 0.8043940873347794, 0.8280213899472) , + rgb (0.750403467654067, 0.8016269900896532, 0.8257973785108242) , + rgb (0.7445924777189017, 0.7988204771958325, 0.8235986758615652) , + rgb (0.7387377170049494, 0.7959766573503101, 0.8214292278043301) , + rgb (0.7328454364552346, 0.7930974646884407, 0.8192926338423038) , + rgb (0.726921775128297, 0.7901846863592763, 0.8171921746672638) , + rgb (0.7209728066553678, 0.7872399592345264, 0.8151307392087926) , + rgb (0.7150040307625213, 0.7842648709158119, 0.8131111655994991) , + rgb (0.709020781345393, 0.7812608871607091, 0.8111359185511793) , + rgb (0.7030297722540817, 0.7782290497335813, 0.8092061884805697) , + rgb (0.6970365443886174, 0.7751705000806606, 0.8073233538006345) , + rgb (0.691046410093091, 0.7720862946067809, 0.8054884169067907) , + rgb (0.6850644615439593, 0.7689774029354699, 0.8037020626717691) , + rgb (0.6790955449988215, 0.765844721313959, 0.8019646617300199) , + rgb (0.6731442255942621, 0.7626890873389048, 0.8002762854580953) , + rgb (0.6672147980375281, 0.7595112803730375, 0.7986367465453776) , + rgb (0.6613112930078745, 0.7563120270871903, 0.7970456043491897) , + rgb (0.6554369232645472, 0.7530920875676843, 0.7955027112903105) , + rgb (0.6495957300425348, 0.7498520122194177, 0.7940067402149911) , + rgb (0.6437910831099849, 0.7465923800833657, 0.7925565320130605) , + rgb (0.6380258682854598, 0.7433137671403319, 0.7911510045957317) , + rgb (0.6323027138710603, 0.740016721601314, 0.7897889276264043) , + rgb (0.6266240202260459, 0.7367017540369944, 0.7884690131633456) , + rgb (0.6209919306481755, 0.733369347989232, 0.7871899462469658) , + rgb (0.6154084641177048, 0.7300199523273969, 0.7859502270675048) , + rgb (0.6098754317609306, 0.7266539875975829, 0.7847483573269471) , + rgb (0.6043943420027486, 0.7232718614323369, 0.7835829559353559) , + rgb (0.5989665814482068, 0.7198739489224673, 0.7824525989934664) , + rgb (0.5935933569683722, 0.7164606049658685, 0.781355882376401) , + rgb (0.588275797805555, 0.7130321464645814, 0.7802914140563652) , + rgb (0.5830148703693241, 0.7095888767699747, 0.7792578182047659) , + rgb (0.5778116438998202, 0.7061310615715398, 0.7782534512102552) , + rgb (0.5726668948158774, 0.7026589535425779, 0.7772770268091199) , + rgb (0.5675811785386197, 0.6991727930264627, 0.776327485342753) , + rgb (0.5625551535721934, 0.6956727838162965, 0.7754035914230984) , + rgb (0.5575894041960517, 0.6921591145825405, 0.7745041337932782) , + rgb (0.5526845058934713, 0.6886319451516638, 0.7736279426902245) , + rgb (0.5478409815301863, 0.6850914221850988, 0.7727738647344087) , + rgb (0.5430593242401823, 0.6815376725306588, 0.7719407969783508) , + rgb (0.5383401557517628, 0.677970811290954, 0.7711273443905772) , + rgb (0.533683891477284, 0.6743909370521273, 0.7703325054879735) , + rgb (0.529090861832473, 0.6707981230280622, 0.7695555229231313) , + rgb (0.5245615147059358, 0.6671924299614223, 0.7687954171423095) , + rgb (0.5200962739223556, 0.6635739143403039, 0.768051194033441) , + rgb (0.5156955988596057, 0.65994260812898, 0.7673219148959617) , + rgb (0.5113599254160193, 0.6562985398183186, 0.7666066378064533) , + rgb (0.5070896957645166, 0.6526417240314645, 0.7659044566083585) , + rgb (0.5028853540415561, 0.6489721673409526, 0.7652144671817491) , + rgb (0.4987473366135607, 0.6452898684900934, 0.7645357873418008) , + rgb (0.4946761847863938, 0.6415948411950443, 0.7638671900213091) , + rgb (0.4906722493856122, 0.6378870485884708, 0.7632081276316384) , + rgb (0.4867359599430568, 0.6341664625110051, 0.7625578008592404) , + rgb (0.4828677867260272, 0.6304330455306234, 0.761915371498953) , + rgb (0.47906816236197386, 0.6266867625186013, 0.7612800037566242) , + rgb (0.47533752394906287, 0.6229275728383581, 0.7606508557181775) , + rgb (0.4716762951887709, 0.6191554324288464, 0.7600270922788305) , + rgb (0.46808490970531597, 0.6153702869579029, 0.7594078989109274) , + rgb (0.4645637671630393, 0.6115720882286415, 0.7587924262302581) , + rgb (0.4611132664702388, 0.607760777169989, 0.7581798643680714) , + rgb (0.45773377230160567, 0.6039363004658646, 0.7575693690185916) , + rgb (0.45442563977552913, 0.6000985950385866, 0.7569601366060649) , + rgb (0.45118918687617743, 0.5962476205135354, 0.7563512064324664) , + rgb (0.4480247093358917, 0.5923833145214658, 0.7557417647410792) , + rgb (0.4449324685421538, 0.5885055998308617, 0.7551311041857901) , + rgb (0.441912717666964, 0.5846144110017557, 0.7545183888441067) , + rgb (0.43896563958048396, 0.5807096924109849, 0.7539027620828594) , + rgb (0.4360913895835637, 0.5767913799818608, 0.7532834105961016) , + rgb (0.43329008867358393, 0.5728594162560667, 0.7526594653256667) , + rgb (0.4305617907305757, 0.5689137457245718, 0.752030080993127) , + rgb (0.42790652284925834, 0.5649543060909209, 0.7513944352191484) , + rgb (0.42532423665011354, 0.560981049599503, 0.7507516498900512) , + rgb (0.4228148567577266, 0.5569939212699658, 0.7501008698822764) , + rgb (0.42037822361396326, 0.5529928715810817, 0.7494412559451894) , + rgb (0.4180141407923363, 0.5489778542188889, 0.7487719316700112) , + rgb (0.4157223260454232, 0.544948827153504, 0.7480920445900052) , + rgb (0.4135024574331473, 0.5409057477109848, 0.7474007329754309) , + rgb (0.4113541469730457, 0.5368485776500593, 0.7466971285506578) , + rgb (0.4092768899914751, 0.5327773017713032, 0.7459803063570782) , + rgb (0.4072701869421907, 0.5286918801105741, 0.7452494263758127) , + rgb (0.4053334378930318, 0.5245922817498312, 0.7445036583670813) , + rgb (0.40346600333905397, 0.5204784765384003, 0.7437421522356709) , + rgb (0.40166714010896104, 0.5163504496968876, 0.7429640345324835) , + rgb (0.39993606933454834, 0.5122081814321852, 0.7421684457131799) , + rgb (0.3982719152586337, 0.5080516653927614, 0.7413545091809972) , + rgb (0.3966737490566561, 0.5038808905384797, 0.7405213858051674) , + rgb (0.3951405880820763, 0.4996958532637776, 0.7396682021171571) , + rgb (0.39367135736822567, 0.4954965577745118, 0.738794102296364) , + rgb (0.39226494876209317, 0.4912830033289926, 0.7378982478447508) , + rgb (0.390920175719949, 0.4870552025122304, 0.7369797713388125) , + rgb (0.38963580160340855, 0.48281316715123496, 0.7360378254693274) , + rgb (0.3884105330084243, 0.47855691131792805, 0.7350715764115726) , + rgb (0.3872430145933025, 0.4742864593363539, 0.7340801678785439) , + rgb (0.386131841788921, 0.4700018340988123, 0.7330627749243106) , + rgb (0.3850755679365139, 0.46570306719930193, 0.732018540336905) , + rgb (0.38407269378943537, 0.46139018782416635, 0.7309466543290268) , + rgb (0.3831216808440275, 0.457063235814072, 0.7298462679135326) , + rgb (0.38222094988570376, 0.45272225034283325, 0.7287165614400378) , + rgb (0.3813688793045416, 0.4483672766927786, 0.7275567131714135) , + rgb (0.3805638069656562, 0.4439983720863372, 0.7263658704513531) , + rgb (0.3798040374484875, 0.4396155882122263, 0.7251432377876109) , + rgb (0.3790878928311076, 0.43521897612544935, 0.7238879869132313) , + rgb (0.378413635091359, 0.43080859411413064, 0.7225993199306104) , + rgb (0.3777794975351373, 0.4263845142616835, 0.7212763999353023) , + rgb (0.3771837184425123, 0.4219468022345483, 0.7199184152447577) , + rgb (0.37662448930806297, 0.41749553747893614, 0.7185245473617611) , + rgb (0.37610001286385814, 0.4130307995247706, 0.7170939691992023) , + rgb (0.375608469194424, 0.40855267638072096, 0.7156258509158755) , + rgb (0.37514802505380473, 0.4040612609993941, 0.7141193695725726) , + rgb (0.3747168601930223, 0.3995566498711684, 0.7125736851650046) , + rgb (0.3743131319931234, 0.3950389482828331, 0.7109879652237746) , + rgb (0.3739349933047578, 0.3905082752937583, 0.7093613429347845) , + rgb (0.3735806215098284, 0.3859647438605754, 0.7076929760731058) , + rgb (0.37324816143326384, 0.38140848555753937, 0.7059820097480604) , + rgb (0.3729357864666503, 0.3768396383521984, 0.7042275578058994) , + rgb (0.37264166757849604, 0.3722583500483685, 0.7024287314570723) , + rgb (0.37236397858465387, 0.36766477862108266, 0.7005846349652077) , + rgb (0.3721008970244382, 0.3630590973698238, 0.6986943461507372) , + rgb (0.3718506155898596, 0.3584414828587522, 0.6967569581025654) , + rgb (0.3716113323440048, 0.3538121372967869, 0.6947714991938089) , + rgb (0.37138124223736607, 0.34917126878479027, 0.6927370347192883) , + rgb (0.37115856636209105, 0.3445191141023017, 0.6906525358646499) , + rgb (0.3709415155133733, 0.33985591488818123, 0.6885170337950512) , + rgb (0.3707283327942267, 0.33518193808489577, 0.6863294816960677) , + rgb (0.37051738634484427, 0.3304974124430785, 0.6840888878885721) , + rgb (0.37030682071842685, 0.32580269697872455, 0.6817941168448668) , + rgb (0.37009487130772695, 0.3210981375964933, 0.6794440539905685) , + rgb (0.3698798032902536, 0.31638410101153364, 0.6770375543809057) , + rgb (0.36965987626565955, 0.3116609876295197, 0.6745734474341955) , + rgb (0.3694333459127623, 0.3069292355186234, 0.6720505284912062) , + rgb (0.36919847837592484, 0.3021893217650707, 0.6694675433161452) , + rgb (0.3689535530659678, 0.29744175492366276, 0.6668232208982426) , + rgb (0.3686968223189527, 0.292687098561501, 0.6641162529823691) , + rgb (0.36842655638020444, 0.2879259643777846, 0.661345269109446) , + rgb (0.3681410147989972, 0.2831590122118299, 0.6585088880697231) , + rgb (0.3678384369653108, 0.2783869718129776, 0.655605668384537) , + rgb (0.36751707094367697, 0.2736106331709098, 0.6526341171161864) , + rgb (0.36717513650699446, 0.26883085667326956, 0.6495927229789225) , + rgb (0.3668108554010799, 0.26404857724525643, 0.6464799165290824) , + rgb (0.3664224325155063, 0.25926481158628106, 0.6432940914076554) , + rgb (0.36600853966739794, 0.25448043878086224, 0.6400336180336859) , + rgb (0.3655669837353898, 0.24969683475296395, 0.6366967518748858) , + rgb (0.3650957984588681, 0.24491536803550484, 0.6332817352005559) , + rgb (0.3645930889012501, 0.24013747024823828, 0.629786801550261) , + rgb (0.3640569302208851, 0.23536470386204195, 0.6262101345195302) , + rgb (0.36348537610385145, 0.2305987621839642, 0.6225498862239288) , + rgb (0.3628764356004103, 0.2258414929328703, 0.6188041741082302) , + rgb (0.36222809558295926, 0.22109488427338303, 0.6149711234609613) , + rgb (0.36153829010998356, 0.21636111429594002, 0.6110488067964093) , + rgb (0.36080493826624654, 0.21164251793458128, 0.6070353217206471) , + rgb (0.36002681809096376, 0.20694122817889948, 0.6029284543191687) , + rgb (0.35920088560930186, 0.20226037920758122, 0.5987265295935138) , + rgb (0.3583248996661781, 0.197602942459778, 0.5944276851750107) , + rgb (0.35739663292915563, 0.1929720819784246, 0.5900301125106313) , + rgb (0.35641381143126327, 0.18837119869242164, 0.5855320765920552) , + rgb (0.3553741530690672, 0.18380392577704466, 0.580931914318328) , + rgb (0.3542753496066376, 0.17927413271618647, 0.5762280966066872) , + rgb (0.35311574421123737, 0.17478570377561287, 0.5714187152355529) , + rgb (0.3518924860887379, 0.17034320478524959, 0.5665028491121665) , + rgb (0.3506030444193101, 0.1659512998472086, 0.5614796470399323) , + rgb (0.34924513554955644, 0.16161477763045118, 0.5563483747416378) , + rgb (0.3478165323877778, 0.1573386351115298, 0.5511085345270326) , + rgb (0.3463150717579309, 0.15312802296627787, 0.5457599924248665) , + rgb (0.34473901574536375, 0.1489882058982641, 0.5403024592040654) , + rgb (0.34308600291572294, 0.14492465359918028, 0.534737042820671) , + rgb (0.34135411074506483, 0.1409427920655632, 0.5290650094033675) , + rgb (0.33954168752669694, 0.1370480189671817, 0.5232879753508524) , + rgb (0.3376473209067111, 0.13324562282438077, 0.5174080757397947) , + rgb (0.33566978565015315, 0.12954074251271822, 0.5114280721516895) , + rgb (0.33360804901486, 0.1259381830100592, 0.505351647966549) , + rgb (0.33146154891145124, 0.12244245263391232, 0.4991827458843107) , + rgb (0.3292300520323141, 0.11905764321981127, 0.49292595612342666) , + rgb (0.3269137124539796, 0.1157873496841953, 0.4865864649569746) , + rgb (0.32451307931207785, 0.11263459791730848, 0.48017007211645196) , + rgb (0.3220288227606932, 0.10960114111258401, 0.4736849472572688) , + rgb (0.31946262395497965, 0.1066887988239266, 0.46713728801395243) , + rgb (0.316816480890235, 0.10389861387653518, 0.46053414662739794) , + rgb (0.3140927841475553, 0.10123077676403242, 0.45388335612058467) , + rgb (0.31129434479712365, 0.0986847719340522, 0.4471931371516162) , + rgb (0.30842444457210105, 0.09625938534057774, 0.44047194882050544) , + rgb (0.30548675819945936, 0.09395276484082374, 0.4337284999936111) , + rgb (0.3024853636457425, 0.0917611873973036, 0.42697404043749887) , + rgb (0.2994248396021477, 0.08968225371675004, 0.42021619665853854) , + rgb (0.2963100038890529, 0.08771325096046395, 0.41346259134143476) , + rgb (0.2931459309698525, 0.08585065688962071, 0.40672178082365834) , + rgb (0.2899379244517661, 0.08409078829085731, 0.40000214725256295) , + rgb (0.28669151388283165, 0.08242987384848069, 0.39331182532243375) , + rgb (0.28341239797185225, 0.08086415336549937, 0.38665868550105914) , + rgb (0.2801063857697547, 0.07938999480226153, 0.38005028528138707) , + rgb (0.2767793961581559, 0.07800394103378822, 0.37349382846504675) , + rgb (0.2734373934245081, 0.07670280023749607, 0.36699616136347685) , + rgb (0.2700863774911405, 0.07548367558427554, 0.36056376228111864) , + rgb (0.26673233211995284, 0.0743440180285462, 0.3542027606624096) , + rgb (0.26338121807151404, 0.07328165793989708, 0.34791888996380105) , + rgb (0.26003895187439957, 0.0722947810433622, 0.3417175669546984) , + rgb (0.256711916510839, 0.07138010624208224, 0.3356064898460009) , + rgb (0.25340685873736807, 0.07053358292685183, 0.3295945757321303) , + rgb (0.2501284530619938, 0.06975820642910699, 0.32368100685760637) , + rgb (0.24688226237959, 0.06905363944920445, 0.31786993834254956) , + rgb (0.24367372557466271, 0.06841985515092269, 0.3121652405088837) , + rgb (0.2405081333229594, 0.0678571038148556, 0.3065705449367832) , + rgb (0.23739062429054825, 0.06736588805055552, 0.3010892218406587) , + rgb (0.23433055727563878, 0.0669355996616394, 0.295740099298676) , + rgb (0.23132955273021344, 0.06657618693909059, 0.29051361067988485) , + rgb (0.2283917709422868, 0.06628997924139618, 0.28541074411068496) , + rgb (0.22552164337737857, 0.0660781731193956, 0.28043398847505197) , + rgb (0.22272706739121817, 0.06593379067565194, 0.275597146520537) , + rgb (0.22001251100779617, 0.0658579189189076, 0.2709027999432586) , + rgb (0.21737845072382705, 0.06585966123356204, 0.2663420934966951) , + rgb (0.21482843531473683, 0.06594038561377849, 0.26191675992376573) , + rgb (0.21237411048541005, 0.06608502466175845, 0.2576516509356954) , + rgb (0.21001214221188125, 0.06630857391894718, 0.2535289048041211) , + rgb (0.2077442377448806, 0.06661453200418091, 0.24954644291943817) , + rgb (0.20558051999470117, 0.06699046239786874, 0.24572497420147632) , + rgb (0.20352007949514977, 0.06744417961242422, 0.24205576625191821) , + rgb (0.2015613376412984, 0.06798327102620025, 0.23852974228695395) , + rgb (0.19971571438603364, 0.06859271055370472, 0.23517094067076993) , + rgb (0.19794834061899208, 0.06931406607166066, 0.23194647381302336) , + rgb (0.1960826032659409, 0.07032122724242362, 0.22874673279569585) , + rgb (0.19410351363791453, 0.07160830485689157, 0.22558727307410353) , + rgb (0.19199449184606268, 0.0731828306492733, 0.22243385243433622) , + rgb (0.18975853639094634, 0.07501986186214377, 0.2193005075652994) , + rgb (0.18739228342697645, 0.07710209689958833, 0.21618875376309582) , + rgb (0.18488035509396164, 0.07942573027972388, 0.21307651648984993) , + rgb (0.18774482037046955, 0.07725158846803931, 0.21387448578597812) , + rgb (0.19049578401722037, 0.07531127841678764, 0.2146562337112265) , + rgb (0.1931548636579131, 0.07360681904011795, 0.21542362939081539) , + rgb (0.19571853588267552, 0.07215778103960274, 0.21617499187076789) , + rgb (0.19819343656336558, 0.07097462525273879, 0.21690975060032436) , + rgb (0.20058760685133747, 0.07006457614998421, 0.21762721310371608) , + rgb (0.20290365333558247, 0.06943524858045896, 0.21833167885096033) , + rgb (0.20531725273301316, 0.06891959226639757, 0.21911516689288835) , + rgb (0.20785704662965598, 0.06848439879702528, 0.22000133917653536) , + rgb (0.21052882914958676, 0.06812195249816172, 0.22098759107715404) , + rgb (0.2133313859647627, 0.06783014842602667, 0.2220704321302429) , + rgb (0.21625279838647882, 0.06761633027051639, 0.22324568672294431) , + rgb (0.21930503925136402, 0.06746578636294004, 0.22451023616807558) , + rgb (0.22247308588973624, 0.06738821405309284, 0.22585960379408354) , + rgb (0.2257539681670791, 0.06738213230014747, 0.22728984778098055) , + rgb (0.2291562027859284, 0.06743473087115257, 0.22879681433956656) , + rgb (0.23266299920501882, 0.06755710438847978, 0.23037617493752832) , + rgb (0.23627495835774248, 0.06774359820987802, 0.23202360805926608) , + rgb (0.23999586188690308, 0.06798502996477995, 0.23373434258507808) , + rgb (0.2438114972024792, 0.06828985152901187, 0.23550427698321885) , + rgb (0.247720929905011, 0.06865333790948652, 0.2373288009471749) , + rgb (0.25172899728289466, 0.0690646308260355, 0.23920260612763083) , + rgb (0.2558213554748177, 0.06953231029187984, 0.24112190491594204) , + rgb (0.25999463887892144, 0.07005385560386188, 0.24308218808684579) , + rgb (0.2642551220706094, 0.07061659562299544, 0.24507758869355967) , + rgb (0.2685909594817286, 0.07122671627792246, 0.24710443563450618) , + rgb (0.272997015188973, 0.07188355544616351, 0.2491584709323293) , + rgb (0.277471508091428, 0.07258296989925478, 0.2512349399594277) , + rgb (0.2820174629736694, 0.07331569321404097, 0.25332800295084507) , + rgb (0.28662309235899847, 0.07408846082680887, 0.2554347867371703) , + rgb (0.29128515387578635, 0.0748990498474667, 0.25755101595750435) , + rgb (0.2960004726065818, 0.07574533600095842, 0.25967245030364566) , + rgb (0.3007727681291869, 0.07661782433616476, 0.2617929409781967) , + rgb (0.30559226007249934, 0.07752196310753731, 0.2639100669211966) , + rgb (0.31045520848595526, 0.07845687167618218, 0.2660200572779356) , + rgb (0.3153587000920581, 0.07942099731524319, 0.2681190407694196) , + rgb (0.3202998655799406, 0.08041299473755484, 0.2702032289303951) , + rgb (0.3252788886040126, 0.08142839007654609, 0.27226772884656186) , + rgb (0.3302917447118144, 0.08246763389003825, 0.27430929404579435) , + rgb (0.3353335322445545, 0.08353243411900396, 0.2763253435679004) , + rgb (0.34040164359597463, 0.08462223619170267, 0.27831254595259397) , + rgb (0.345493557138718, 0.08573665496512634, 0.28026769921081435) , + rgb (0.3506067824603248, 0.08687555176033529, 0.28218770540182386) , + rgb (0.35573889947341125, 0.08803897435024335, 0.2840695897279818) , + rgb (0.36088752387578377, 0.0892271943627452, 0.28591050458531014) , + rgb (0.36605031412464006, 0.0904406854276979, 0.2877077458811747) , + rgb (0.3712250843130934, 0.09167999748026273, 0.2894586539763317) , + rgb (0.3764103053221462, 0.09294519809377791, 0.2911602415731392) , + rgb (0.38160247377467543, 0.09423873126371218, 0.2928110750626949) , + rgb (0.3867993907954417, 0.09556181960083443, 0.29440901248173756) , + rgb (0.39199887556812907, 0.09691583650296684, 0.2959521200550908) , + rgb (0.39719876876325577, 0.09830232096827862, 0.2974385647628578) , + rgb (0.40239692379737496, 0.09972293031495055, 0.2988667436973397) , + rgb (0.4075912039268871, 0.10117945586419633, 0.300235195077286) , + rgb (0.41277985630360303, 0.1026734006932461, 0.3015422643746897) , + rgb (0.41796105205173684, 0.10420644885760968, 0.3027865203963184) , + rgb (0.42313214269556043, 0.10578120994917611, 0.3039675809469457) , + rgb (0.4282910131578975, 0.1073997763055258, 0.30508479060294547) , + rgb (0.4334355841041439, 0.1090642347484701, 0.3061376792828915) , + rgb (0.4385637818793154, 0.11077667828375456, 0.30712600062348083) , + rgb (0.44367358645071275, 0.11253912421257944, 0.3080497309546545) , + rgb (0.4487629917317482, 0.1143535557462255, 0.30890905921943196) , + rgb (0.4538300508699989, 0.11622183788331528, 0.3097044124984492) , + rgb (0.45887288947308297, 0.11814571137706886, 0.3104363697903881) , + rgb (0.46389102840284874, 0.12012561256850712, 0.31110343446582983) , + rgb (0.46888111384598413, 0.12216445576414045, 0.31170911458932665) , + rgb (0.473841437035254, 0.12426354237989065, 0.31225470169927194) , + rgb (0.47877034239726296, 0.12642401401409453, 0.3127417273582196) , + rgb (0.48366628618847957, 0.1286467902201389, 0.31317188565991266) , + rgb (0.48852847371852987, 0.13093210934893723, 0.31354553695453014) , + rgb (0.49335504375145617, 0.13328091630401023, 0.31386561956734976) , + rgb (0.4981443546207415, 0.13569380302451714, 0.314135190862664) , + rgb (0.5028952497497061, 0.13817086581280427, 0.3143566215383367) , + rgb (0.5076068118105369, 0.14071192654913128, 0.3145320012008257) , + rgb (0.5122783510532176, 0.14331656120063752, 0.3146630922831542) , + rgb (0.5169084880054446, 0.14598463068714407, 0.3147540759228004) , + rgb (0.5214965286322996, 0.14871544765633712, 0.3148076795453443) , + rgb (0.5260418962547748, 0.15150818660835483, 0.31482653406646727) , + rgb (0.5305442048985645, 0.15436183633886777, 0.3148129978918713) , + rgb (0.5350027976174474, 0.15727540775107324, 0.3147708520739653) , + rgb (0.5394173664919906, 0.16024769309971934, 0.31470295028655965) , + rgb (0.5437877131360856, 0.16327738551419116, 0.31461204226295625) , + rgb (0.5481137003346762, 0.1663630904279047, 0.3145010299091471) , + rgb (0.5523952157271191, 0.16950338809328983, 0.3143729155461537) , + rgb (0.5566322903496934, 0.17269677158182117, 0.31423043195101424) , + rgb (0.5608249903911717, 0.17594170887918095, 0.31407639883970623) , + rgb (0.564973435290177, 0.17923664950367169, 0.3139136046337036) , + rgb (0.5690778478401143, 0.18258004462335425, 0.3137444095679653) , + rgb (0.5731384575410787, 0.18597036007065024, 0.3135712686852) , + rgb (0.5771555081299204, 0.18940601489760422, 0.3133970433357208) , + rgb (0.5811293276158656, 0.19288548904692518, 0.3132239939418394) , + rgb (0.5850602439646688, 0.19640737049066315, 0.3130540116373273) , + rgb (0.5889486193554471, 0.19997020971775276, 0.31288922211590126) , + rgb (0.5927948053652026, 0.20357251410079796, 0.3127323483930494) , + rgb (0.5965991810912237, 0.207212956082026, 0.3125852303112123) , + rgb (0.6003621301041158, 0.21089030138947745, 0.3124493441041469) , + rgb (0.6040840169673274, 0.21460331490206347, 0.31232652641170694) , + rgb (0.6077652399481865, 0.21835070166659282, 0.312219032918702) , + rgb (0.6114062072731884, 0.22213124697023234, 0.3121288139643524) , + rgb (0.6150072323639137, 0.22594402043981826, 0.3120568068576574) , + rgb (0.6185686525887719, 0.2297879924917992, 0.3120046383872893) , + rgb (0.6220907982108261, 0.2336621873300741, 0.3119738327362739) , + rgb (0.6255741650043496, 0.23756535071152696, 0.3119669831491227) , + rgb (0.6290189201698587, 0.24149689191922535, 0.3119844719564572) , + rgb (0.6324253485421027, 0.24545598775548677, 0.3120276597462445) , + rgb (0.6357937104834237, 0.24944185818822678, 0.3120979395330059) , + rgb (0.6391243387840212, 0.2534536546198314, 0.3121968961206398) , + rgb (0.642417577481186, 0.257490519876798, 0.31232631707560987) , + rgb (0.6456734938264543, 0.2615520316161528, 0.31248673753935263) , + rgb (0.6488923016945825, 0.2656375533620908, 0.3126794181957019) , + rgb (0.652074172902773, 0.269746505252367, 0.3129056060581917) , + rgb (0.6552193260932713, 0.2738782665241015, 0.3131666792687211) , + rgb (0.6583280801134499, 0.2780321095766563, 0.3134643447952643) , + rgb (0.6614003753260178, 0.28220778870555907, 0.3137991292649849) , + rgb (0.6644363246987884, 0.2864048361425618, 0.31417223403606975) , + rgb (0.6674360376636913, 0.29062280081258873, 0.31458483752056837) , + rgb (0.670399595476762, 0.29486126309253047, 0.3150381395687221) , + rgb (0.6733272556481733, 0.29911962764489264, 0.3155337232398221) , + rgb (0.6762189792440975, 0.30339762792450425, 0.3160724937230589) , + rgb (0.6790747402815734, 0.30769497879760166, 0.31665545668946665) , + rgb (0.6818945715094452, 0.31201133280550686, 0.3172838048924495) , + rgb (0.6846785094249453, 0.3163463482122221, 0.31795870784057567) , + rgb (0.6874265643516962, 0.32069970535138104, 0.3186813762227769) , + rgb (0.6901389321505248, 0.32507091815606004, 0.319453323328983) , + rgb (0.6928154484676493, 0.32945984647042675, 0.3202754315314667) , + rgb (0.6954560834689112, 0.33386622163232865, 0.3211488430698579) , + rgb (0.6980608153581771, 0.3382897632604862, 0.3220747885521809) , + rgb (0.700629624772421, 0.34273019305341756, 0.32305449047765694) , + rgb (0.7031624945881415, 0.34718723719598, 0.32408913679491225) , + rgb (0.7056595112261009, 0.3516605297812094, 0.32518014084085567) , + rgb (0.7081205956842048, 0.356149855233803, 0.32632861885644465) , + rgb (0.7105456546582587, 0.36065500290840113, 0.3275357416278876) , + rgb (0.7129346683977347, 0.36517570519856757, 0.3288027427038317) , + rgb (0.7152876061484729, 0.3697117022522345, 0.3301308728723546) , + rgb (0.7176044490813385, 0.3742627271068619, 0.3315213862095893) , + rgb (0.7198852149054985, 0.37882848839337313, 0.332975552002454) , + rgb (0.7221299918421461, 0.3834086450896306, 0.33449469983585844) , + rgb (0.7243386564778159, 0.38800301593162145, 0.3360799596569183) , + rgb (0.7265112290022755, 0.3926113126792577, 0.3377325942005665) , + rgb (0.7286477385671655, 0.39723324476747235, 0.33945384341064017) , + rgb (0.7307482075484517, 0.401868526884681, 0.3412449533046818) , + rgb (0.7328127050626875, 0.4065168468778026, 0.3431071517341082) , + rgb (0.7348413359856494, 0.4111778700451951, 0.3450416947080907) , + rgb (0.7368342217358587, 0.4158512585029011, 0.347049785207584) , + rgb (0.7387914002459927, 0.4205367299231533, 0.34913260148542435) , + rgb (0.7407130161950609, 0.4252339389526239, 0.35129130890802607) , + rgb (0.7425992159973317, 0.42994254036133867, 0.3535270924537459) , + rgb (0.7444501867657067, 0.4346621718461711, 0.35584108091122535) , + rgb (0.7462661578916344, 0.439392450449735, 0.3582343914230064) , + rgb (0.7480473927555956, 0.44413297780351974, 0.36070813602540136) , + rgb (0.7497942054717047, 0.4488833348154881, 0.3632633755836028) , + rgb (0.7515068504589166, 0.45364314496866825, 0.36590112443835765) , + rgb (0.7531856636904657, 0.45841199172949604, 0.3686223664223477) , + rgb (0.7548310506695954, 0.46318942799460555, 0.3714280448394211) , + rgb (0.7564434157714071, 0.4679750143794846, 0.37431909037543515) , + rgb (0.7580232553845584, 0.4727682731566229, 0.3772963553109668) , + rgb (0.7595711110534006, 0.4775687122205708, 0.380360657784311) , + rgb (0.7610876378057071, 0.48237579130289127, 0.3835127572385229) , + rgb (0.7625733355405261, 0.48718906673415824, 0.38675335037837993) , + rgb (0.7640288560928866, 0.49200802533379656, 0.39008308392311997) , + rgb (0.7654549259333051, 0.4968321290972723, 0.3935025400011538) , + rgb (0.7668522895064389, 0.5016608471009063, 0.39701221751773474) , + rgb (0.768221765997353, 0.5064936237128791, 0.40061257089416885) , + rgb (0.7695642334401418, 0.5113298901696085, 0.4043039806968248) , + rgb (0.7708809196230247, 0.516168926434691, 0.40808667584648967) , + rgb (0.7721725722960555, 0.5210102658711383, 0.4119608998712287) , + rgb (0.7734402182988989, 0.5258533209345156, 0.41592679539764366) , + rgb (0.774684947460632, 0.5306974938477673, 0.4199844035696376) , + rgb (0.775907907306857, 0.5355421788246119, 0.42413367909988375) , + rgb (0.7771103295521099, 0.5403867491056124, 0.4283745037125848) , + rgb (0.7782934580763312, 0.545230594884266, 0.432706647838971) , + rgb (0.7794586273150664, 0.5500730841397727, 0.4371297985644476) , + rgb (0.7806077474948377, 0.5549133574489061, 0.4416433242636464) , + rgb (0.7817418047898184, 0.5597509805259486, 0.44624687186865436) , + rgb (0.7828622526444091, 0.5645853311116688, 0.45093985823706345) , + rgb (0.7839706083641448, 0.5694157832671042, 0.4557215474289206) , + rgb (0.7850684501960684, 0.5742417003617839, 0.46059116206904965) , + rgb (0.7861573713233296, 0.5790624629815756, 0.465547782819184) , + rgb (0.7872390410818835, 0.5838774374455721, 0.47059039582133383) , + rgb (0.7883151404562396, 0.5886860017356244, 0.4757179187907608) , + rgb (0.7893873776625194, 0.5934875421745599, 0.48092913815357724) , + rgb (0.7904577684772788, 0.5982813427706246, 0.48622257801969754) , + rgb (0.7915283284347561, 0.603066705931472, 0.49159667021646397) , + rgb (0.7926003430423745, 0.6078432208703702, 0.4970502062153201) , + rgb (0.7936755969866496, 0.6126102933407219, 0.5025816129126943) , + rgb (0.7947558597265404, 0.617367344002207, 0.5081892121310299) , + rgb (0.7958429237958377, 0.6221137880845115, 0.5138712409190979) , + rgb (0.7969385471995161, 0.626849056792967, 0.5196258425240281) , + rgb (0.7980444781513664, 0.6315725822508955, 0.5254510814483478) , + rgb (0.7991624518501963, 0.6362837937202919, 0.5313449594256143) , + rgb (0.8002941538975398, 0.6409821330674986, 0.5373053518514104) , + rgb (0.8014412429256005, 0.6456670345921877, 0.5433300863249918) , + rgb (0.8026053114611295, 0.6503379374810385, 0.5494169158460365) , + rgb (0.8037879253107763, 0.6549942654947263, 0.5555635086708381) , + rgb (0.804990547908103, 0.6596354502756416, 0.5617674511054698) , + rgb (0.8062146052692706, 0.6642608958528229, 0.5680262917864979) , + rgb (0.8074614045096935, 0.6688700095398864, 0.5743374637345958) , + rgb (0.8087321917008969, 0.6734621670219452, 0.5806983480557674) , + rgb (0.8100280946652069, 0.6780367267397182, 0.5871062690808275) , + rgb (0.8113501401176333, 0.6825930154624339, 0.5935584890905076) , + rgb (0.8126992203988149, 0.6871303371461888, 0.600052148204351) , + rgb (0.8140761104699334, 0.6916479479148213, 0.6065843782630862) , + rgb (0.8154814662727948, 0.6961450550830809, 0.6131522120932265) , + rgb (0.8169157577505589, 0.7006208301478398, 0.6197526063725792) , + rgb (0.8183793116449822, 0.705074381896351, 0.626382454789333) , + rgb (0.8198723065045529, 0.7095047497878748, 0.6330385704006711) , + rgb (0.8213947205565636, 0.7139109141951604, 0.6397176669767276) , + rgb (0.8229463511042843, 0.7182917733129006, 0.6464164243818421) , + rgb (0.8245268129450285, 0.7226461431208888, 0.653131379154226) , + rgb (0.8261354971058026, 0.7269727551823826, 0.659859001562165) , + rgb (0.8277716072353446, 0.7312702332407809, 0.6665957020468297) , + rgb (0.8294340781648147, 0.7355371221572935, 0.6733377200930191) , + rgb (0.8311216352909631, 0.7397718464763862, 0.6800812520363146) , + rgb (0.8328327718577798, 0.7439727181745988, 0.6868223587464855) , + rgb (0.8345656905566583, 0.7481379479992134, 0.6935569764986385) , + rgb (0.8363189884473793, 0.7522654895287526, 0.7002799902886496) , + rgb (0.8380912347613196, 0.7563531486080863, 0.7069856139021298) , + rgb (0.8398783988412087, 0.7603990719977968, 0.7136714781112923) , + rgb (0.8416775076684515, 0.7644010120098295, 0.7203329938728462) , + rgb (0.843485292229337, 0.7683566039987018, 0.7269653699897204) , + rgb (0.8452981073195511, 0.7722633860104472, 0.7335636824054149) , + rgb (0.847111955079651, 0.7761188023604716, 0.7401227576280706) , + rgb (0.8489224556311764, 0.7799202140765015, 0.7466371929366437) , + rgb (0.8507269702317879, 0.7836645734238389, 0.7530974636118285) , + rgb (0.8525190720770844, 0.7873493613354844, 0.7594994148789691) , + rgb (0.8542921961147046, 0.7909719677709199, 0.765838014779141) , + rgb (0.856040223147254, 0.7945296360155061, 0.7721061003767414) , + rgb (0.857756629435049, 0.7980196314271393, 0.778295716672475) , + rgb (0.8594346370300241, 0.8014392309950078, 0.7843978875138392) , + rgb (0.8610711702756552, 0.8047851790981223, 0.7903952966373629) , + rgb (0.8626560105112757, 0.8080552380426153, 0.796282666437655) , + rgb (0.8641834372394103, 0.8112464422465354, 0.8020461269686395) , + rgb (0.8656493432560532, 0.8143554406751491, 0.8076697232416455) , + rgb (0.867053149070485, 0.8173780404191124, 0.813134196269114) , + rgb (0.8683995469581863, 0.8203087551218152, 0.8184163896312899) , + rgb (0.8696913150261381, 0.8231415885956916, 0.8235047668317317) , + rgb (0.8709384671729751, 0.8258685788943851, 0.8283849726114961) , + rgb (0.8721533197845432, 0.8284805282370967, 0.8330486712880828) , + rgb (0.8733517136091627, 0.8309671525127262, 0.8374885100119709) , + rgb (0.8745379332026019, 0.8333197294864546, 0.8417192535806901) , + rgb (0.875714587099614, 0.8355302318472394, 0.8457553751902708) , + rgb (0.8768784845161469, 0.8375923807118654, 0.8496137354915025) , + rgb (0.8780229843664901, 0.8395016561854007, 0.8533064535245892) , + rgb (0.8791324424079277, 0.8412555488447591, 0.8568557229103964) , + rgb (0.8801929331569581, 0.8428522482477862, 0.8602739992715663) , + rgb (0.8811916987134195, 0.8442906671771735, 0.8635659516866988) , + rgb (0.8821154248940161, 0.8455700725455935, 0.8667376504623333) , + rgb (0.8829516859544853, 0.8466897027569927, 0.8697961704819097) , + rgb (0.8836912714589804, 0.8476489176151927, 0.8727414710144156) , + rgb (0.8843271305411354, 0.8484474157205542, 0.8755678522824297) , + rgb (0.8848513815990857, 0.849084264228938, 0.8782823528537247) , + rgb (0.8852589797263047, 0.8495589281098921, 0.8808841479402484) , + rgb (0.8855471481195238, 0.8498717428363158, 0.8833620612117095) , + rgb (0.8857115512284565, 0.8500218611585632, 0.8857253899008712) + }); list_data twilight_shifted = list_data(new pen[] { - rgb (0.18739228342697645, 0.07710209689958833, 0.21618875376309582) , - rgb (0.18975853639094634, 0.07501986186214377, 0.2193005075652994) , - rgb (0.19199449184606268, 0.0731828306492733, 0.22243385243433622) , - rgb (0.19410351363791453, 0.07160830485689157, 0.22558727307410353) , - rgb (0.1960826032659409, 0.07032122724242362, 0.22874673279569585) , - rgb (0.19794834061899208, 0.06931406607166066, 0.23194647381302336) , - rgb (0.19971571438603364, 0.06859271055370472, 0.23517094067076993) , - rgb (0.2015613376412984, 0.06798327102620025, 0.23852974228695395) , - rgb (0.20352007949514977, 0.06744417961242422, 0.24205576625191821) , - rgb (0.20558051999470117, 0.06699046239786874, 0.24572497420147632) , - rgb (0.2077442377448806, 0.06661453200418091, 0.24954644291943817) , - rgb (0.21001214221188125, 0.06630857391894718, 0.2535289048041211) , - rgb (0.21237411048541005, 0.06608502466175845, 0.2576516509356954) , - rgb (0.21482843531473683, 0.06594038561377849, 0.26191675992376573) , - rgb (0.21737845072382705, 0.06585966123356204, 0.2663420934966951) , - rgb (0.22001251100779617, 0.0658579189189076, 0.2709027999432586) , - rgb (0.22272706739121817, 0.06593379067565194, 0.275597146520537) , - rgb (0.22552164337737857, 0.0660781731193956, 0.28043398847505197) , - rgb (0.2283917709422868, 0.06628997924139618, 0.28541074411068496) , - rgb (0.23132955273021344, 0.06657618693909059, 0.29051361067988485) , - rgb (0.23433055727563878, 0.0669355996616394, 0.295740099298676) , - rgb (0.23739062429054825, 0.06736588805055552, 0.3010892218406587) , - rgb (0.2405081333229594, 0.0678571038148556, 0.3065705449367832) , - rgb (0.24367372557466271, 0.06841985515092269, 0.3121652405088837) , - rgb (0.24688226237959, 0.06905363944920445, 0.31786993834254956) , - rgb (0.2501284530619938, 0.06975820642910699, 0.32368100685760637) , - rgb (0.25340685873736807, 0.07053358292685183, 0.3295945757321303) , - rgb (0.256711916510839, 0.07138010624208224, 0.3356064898460009) , - rgb (0.26003895187439957, 0.0722947810433622, 0.3417175669546984) , - rgb (0.26338121807151404, 0.07328165793989708, 0.34791888996380105) , - rgb (0.26673233211995284, 0.0743440180285462, 0.3542027606624096) , - rgb (0.2700863774911405, 0.07548367558427554, 0.36056376228111864) , - rgb (0.2734373934245081, 0.07670280023749607, 0.36699616136347685) , - rgb (0.2767793961581559, 0.07800394103378822, 0.37349382846504675) , - rgb (0.2801063857697547, 0.07938999480226153, 0.38005028528138707) , - rgb (0.28341239797185225, 0.08086415336549937, 0.38665868550105914) , - rgb (0.28669151388283165, 0.08242987384848069, 0.39331182532243375) , - rgb (0.2899379244517661, 0.08409078829085731, 0.40000214725256295) , - rgb (0.2931459309698525, 0.08585065688962071, 0.40672178082365834) , - rgb (0.2963100038890529, 0.08771325096046395, 0.41346259134143476) , - rgb (0.2994248396021477, 0.08968225371675004, 0.42021619665853854) , - rgb (0.3024853636457425, 0.0917611873973036, 0.42697404043749887) , - rgb (0.30548675819945936, 0.09395276484082374, 0.4337284999936111) , - rgb (0.30842444457210105, 0.09625938534057774, 0.44047194882050544) , - rgb (0.31129434479712365, 0.0986847719340522, 0.4471931371516162) , - rgb (0.3140927841475553, 0.10123077676403242, 0.45388335612058467) , - rgb (0.316816480890235, 0.10389861387653518, 0.46053414662739794) , - rgb (0.31946262395497965, 0.1066887988239266, 0.46713728801395243) , - rgb (0.3220288227606932, 0.10960114111258401, 0.4736849472572688) , - rgb (0.32451307931207785, 0.11263459791730848, 0.48017007211645196) , - rgb (0.3269137124539796, 0.1157873496841953, 0.4865864649569746) , - rgb (0.3292300520323141, 0.11905764321981127, 0.49292595612342666) , - rgb (0.33146154891145124, 0.12244245263391232, 0.4991827458843107) , - rgb (0.33360804901486, 0.1259381830100592, 0.505351647966549) , - rgb (0.33566978565015315, 0.12954074251271822, 0.5114280721516895) , - rgb (0.3376473209067111, 0.13324562282438077, 0.5174080757397947) , - rgb (0.33954168752669694, 0.1370480189671817, 0.5232879753508524) , - rgb (0.34135411074506483, 0.1409427920655632, 0.5290650094033675) , - rgb (0.34308600291572294, 0.14492465359918028, 0.534737042820671) , - rgb (0.34473901574536375, 0.1489882058982641, 0.5403024592040654) , - rgb (0.3463150717579309, 0.15312802296627787, 0.5457599924248665) , - rgb (0.3478165323877778, 0.1573386351115298, 0.5511085345270326) , - rgb (0.34924513554955644, 0.16161477763045118, 0.5563483747416378) , - rgb (0.3506030444193101, 0.1659512998472086, 0.5614796470399323) , - rgb (0.3518924860887379, 0.17034320478524959, 0.5665028491121665) , - rgb (0.35311574421123737, 0.17478570377561287, 0.5714187152355529) , - rgb (0.3542753496066376, 0.17927413271618647, 0.5762280966066872) , - rgb (0.3553741530690672, 0.18380392577704466, 0.580931914318328) , - rgb (0.35641381143126327, 0.18837119869242164, 0.5855320765920552) , - rgb (0.35739663292915563, 0.1929720819784246, 0.5900301125106313) , - rgb (0.3583248996661781, 0.197602942459778, 0.5944276851750107) , - rgb (0.35920088560930186, 0.20226037920758122, 0.5987265295935138) , - rgb (0.36002681809096376, 0.20694122817889948, 0.6029284543191687) , - rgb (0.36080493826624654, 0.21164251793458128, 0.6070353217206471) , - rgb (0.36153829010998356, 0.21636111429594002, 0.6110488067964093) , - rgb (0.36222809558295926, 0.22109488427338303, 0.6149711234609613) , - rgb (0.3628764356004103, 0.2258414929328703, 0.6188041741082302) , - rgb (0.36348537610385145, 0.2305987621839642, 0.6225498862239288) , - rgb (0.3640569302208851, 0.23536470386204195, 0.6262101345195302) , - rgb (0.3645930889012501, 0.24013747024823828, 0.629786801550261) , - rgb (0.3650957984588681, 0.24491536803550484, 0.6332817352005559) , - rgb (0.3655669837353898, 0.24969683475296395, 0.6366967518748858) , - rgb (0.36600853966739794, 0.25448043878086224, 0.6400336180336859) , - rgb (0.3664224325155063, 0.25926481158628106, 0.6432940914076554) , - rgb (0.3668108554010799, 0.26404857724525643, 0.6464799165290824) , - rgb (0.36717513650699446, 0.26883085667326956, 0.6495927229789225) , - rgb (0.36751707094367697, 0.2736106331709098, 0.6526341171161864) , - rgb (0.3678384369653108, 0.2783869718129776, 0.655605668384537) , - rgb (0.3681410147989972, 0.2831590122118299, 0.6585088880697231) , - rgb (0.36842655638020444, 0.2879259643777846, 0.661345269109446) , - rgb (0.3686968223189527, 0.292687098561501, 0.6641162529823691) , - rgb (0.3689535530659678, 0.29744175492366276, 0.6668232208982426) , - rgb (0.36919847837592484, 0.3021893217650707, 0.6694675433161452) , - rgb (0.3694333459127623, 0.3069292355186234, 0.6720505284912062) , - rgb (0.36965987626565955, 0.3116609876295197, 0.6745734474341955) , - rgb (0.3698798032902536, 0.31638410101153364, 0.6770375543809057) , - rgb (0.37009487130772695, 0.3210981375964933, 0.6794440539905685) , - rgb (0.37030682071842685, 0.32580269697872455, 0.6817941168448668) , - rgb (0.37051738634484427, 0.3304974124430785, 0.6840888878885721) , - rgb (0.3707283327942267, 0.33518193808489577, 0.6863294816960677) , - rgb (0.3709415155133733, 0.33985591488818123, 0.6885170337950512) , - rgb (0.37115856636209105, 0.3445191141023017, 0.6906525358646499) , - rgb (0.37138124223736607, 0.34917126878479027, 0.6927370347192883) , - rgb (0.3716113323440048, 0.3538121372967869, 0.6947714991938089) , - rgb (0.3718506155898596, 0.3584414828587522, 0.6967569581025654) , - rgb (0.3721008970244382, 0.3630590973698238, 0.6986943461507372) , - rgb (0.37236397858465387, 0.36766477862108266, 0.7005846349652077) , - rgb (0.37264166757849604, 0.3722583500483685, 0.7024287314570723) , - rgb (0.3729357864666503, 0.3768396383521984, 0.7042275578058994) , - rgb (0.37324816143326384, 0.38140848555753937, 0.7059820097480604) , - rgb (0.3735806215098284, 0.3859647438605754, 0.7076929760731058) , - rgb (0.3739349933047578, 0.3905082752937583, 0.7093613429347845) , - rgb (0.3743131319931234, 0.3950389482828331, 0.7109879652237746) , - rgb (0.3747168601930223, 0.3995566498711684, 0.7125736851650046) , - rgb (0.37514802505380473, 0.4040612609993941, 0.7141193695725726) , - rgb (0.375608469194424, 0.40855267638072096, 0.7156258509158755) , - rgb (0.37610001286385814, 0.4130307995247706, 0.7170939691992023) , - rgb (0.37662448930806297, 0.41749553747893614, 0.7185245473617611) , - rgb (0.3771837184425123, 0.4219468022345483, 0.7199184152447577) , - rgb (0.3777794975351373, 0.4263845142616835, 0.7212763999353023) , - rgb (0.378413635091359, 0.43080859411413064, 0.7225993199306104) , - rgb (0.3790878928311076, 0.43521897612544935, 0.7238879869132313) , - rgb (0.3798040374484875, 0.4396155882122263, 0.7251432377876109) , - rgb (0.3805638069656562, 0.4439983720863372, 0.7263658704513531) , - rgb (0.3813688793045416, 0.4483672766927786, 0.7275567131714135) , - rgb (0.38222094988570376, 0.45272225034283325, 0.7287165614400378) , - rgb (0.3831216808440275, 0.457063235814072, 0.7298462679135326) , - rgb (0.38407269378943537, 0.46139018782416635, 0.7309466543290268) , - rgb (0.3850755679365139, 0.46570306719930193, 0.732018540336905) , - rgb (0.386131841788921, 0.4700018340988123, 0.7330627749243106) , - rgb (0.3872430145933025, 0.4742864593363539, 0.7340801678785439) , - rgb (0.3884105330084243, 0.47855691131792805, 0.7350715764115726) , - rgb (0.38963580160340855, 0.48281316715123496, 0.7360378254693274) , - rgb (0.390920175719949, 0.4870552025122304, 0.7369797713388125) , - rgb (0.39226494876209317, 0.4912830033289926, 0.7378982478447508) , - rgb (0.39367135736822567, 0.4954965577745118, 0.738794102296364) , - rgb (0.3951405880820763, 0.4996958532637776, 0.7396682021171571) , - rgb (0.3966737490566561, 0.5038808905384797, 0.7405213858051674) , - rgb (0.3982719152586337, 0.5080516653927614, 0.7413545091809972) , - rgb (0.39993606933454834, 0.5122081814321852, 0.7421684457131799) , - rgb (0.40166714010896104, 0.5163504496968876, 0.7429640345324835) , - rgb (0.40346600333905397, 0.5204784765384003, 0.7437421522356709) , - rgb (0.4053334378930318, 0.5245922817498312, 0.7445036583670813) , - rgb (0.4072701869421907, 0.5286918801105741, 0.7452494263758127) , - rgb (0.4092768899914751, 0.5327773017713032, 0.7459803063570782) , - rgb (0.4113541469730457, 0.5368485776500593, 0.7466971285506578) , - rgb (0.4135024574331473, 0.5409057477109848, 0.7474007329754309) , - rgb (0.4157223260454232, 0.544948827153504, 0.7480920445900052) , - rgb (0.4180141407923363, 0.5489778542188889, 0.7487719316700112) , - rgb (0.42037822361396326, 0.5529928715810817, 0.7494412559451894) , - rgb (0.4228148567577266, 0.5569939212699658, 0.7501008698822764) , - rgb (0.42532423665011354, 0.560981049599503, 0.7507516498900512) , - rgb (0.42790652284925834, 0.5649543060909209, 0.7513944352191484) , - rgb (0.4305617907305757, 0.5689137457245718, 0.752030080993127) , - rgb (0.43329008867358393, 0.5728594162560667, 0.7526594653256667) , - rgb (0.4360913895835637, 0.5767913799818608, 0.7532834105961016) , - rgb (0.43896563958048396, 0.5807096924109849, 0.7539027620828594) , - rgb (0.441912717666964, 0.5846144110017557, 0.7545183888441067) , - rgb (0.4449324685421538, 0.5885055998308617, 0.7551311041857901) , - rgb (0.4480247093358917, 0.5923833145214658, 0.7557417647410792) , - rgb (0.45118918687617743, 0.5962476205135354, 0.7563512064324664) , - rgb (0.45442563977552913, 0.6000985950385866, 0.7569601366060649) , - rgb (0.45773377230160567, 0.6039363004658646, 0.7575693690185916) , - rgb (0.4611132664702388, 0.607760777169989, 0.7581798643680714) , - rgb (0.4645637671630393, 0.6115720882286415, 0.7587924262302581) , - rgb (0.46808490970531597, 0.6153702869579029, 0.7594078989109274) , - rgb (0.4716762951887709, 0.6191554324288464, 0.7600270922788305) , - rgb (0.47533752394906287, 0.6229275728383581, 0.7606508557181775) , - rgb (0.47906816236197386, 0.6266867625186013, 0.7612800037566242) , - rgb (0.4828677867260272, 0.6304330455306234, 0.761915371498953) , - rgb (0.4867359599430568, 0.6341664625110051, 0.7625578008592404) , - rgb (0.4906722493856122, 0.6378870485884708, 0.7632081276316384) , - rgb (0.4946761847863938, 0.6415948411950443, 0.7638671900213091) , - rgb (0.4987473366135607, 0.6452898684900934, 0.7645357873418008) , - rgb (0.5028853540415561, 0.6489721673409526, 0.7652144671817491) , - rgb (0.5070896957645166, 0.6526417240314645, 0.7659044566083585) , - rgb (0.5113599254160193, 0.6562985398183186, 0.7666066378064533) , - rgb (0.5156955988596057, 0.65994260812898, 0.7673219148959617) , - rgb (0.5200962739223556, 0.6635739143403039, 0.768051194033441) , - rgb (0.5245615147059358, 0.6671924299614223, 0.7687954171423095) , - rgb (0.529090861832473, 0.6707981230280622, 0.7695555229231313) , - rgb (0.533683891477284, 0.6743909370521273, 0.7703325054879735) , - rgb (0.5383401557517628, 0.677970811290954, 0.7711273443905772) , - rgb (0.5430593242401823, 0.6815376725306588, 0.7719407969783508) , - rgb (0.5478409815301863, 0.6850914221850988, 0.7727738647344087) , - rgb (0.5526845058934713, 0.6886319451516638, 0.7736279426902245) , - rgb (0.5575894041960517, 0.6921591145825405, 0.7745041337932782) , - rgb (0.5625551535721934, 0.6956727838162965, 0.7754035914230984) , - rgb (0.5675811785386197, 0.6991727930264627, 0.776327485342753) , - rgb (0.5726668948158774, 0.7026589535425779, 0.7772770268091199) , - rgb (0.5778116438998202, 0.7061310615715398, 0.7782534512102552) , - rgb (0.5830148703693241, 0.7095888767699747, 0.7792578182047659) , - rgb (0.588275797805555, 0.7130321464645814, 0.7802914140563652) , - rgb (0.5935933569683722, 0.7164606049658685, 0.781355882376401) , - rgb (0.5989665814482068, 0.7198739489224673, 0.7824525989934664) , - rgb (0.6043943420027486, 0.7232718614323369, 0.7835829559353559) , - rgb (0.6098754317609306, 0.7266539875975829, 0.7847483573269471) , - rgb (0.6154084641177048, 0.7300199523273969, 0.7859502270675048) , - rgb (0.6209919306481755, 0.733369347989232, 0.7871899462469658) , - rgb (0.6266240202260459, 0.7367017540369944, 0.7884690131633456) , - rgb (0.6323027138710603, 0.740016721601314, 0.7897889276264043) , - rgb (0.6380258682854598, 0.7433137671403319, 0.7911510045957317) , - rgb (0.6437910831099849, 0.7465923800833657, 0.7925565320130605) , - rgb (0.6495957300425348, 0.7498520122194177, 0.7940067402149911) , - rgb (0.6554369232645472, 0.7530920875676843, 0.7955027112903105) , - rgb (0.6613112930078745, 0.7563120270871903, 0.7970456043491897) , - rgb (0.6672147980375281, 0.7595112803730375, 0.7986367465453776) , - rgb (0.6731442255942621, 0.7626890873389048, 0.8002762854580953) , - rgb (0.6790955449988215, 0.765844721313959, 0.8019646617300199) , - rgb (0.6850644615439593, 0.7689774029354699, 0.8037020626717691) , - rgb (0.691046410093091, 0.7720862946067809, 0.8054884169067907) , - rgb (0.6970365443886174, 0.7751705000806606, 0.8073233538006345) , - rgb (0.7030297722540817, 0.7782290497335813, 0.8092061884805697) , - rgb (0.709020781345393, 0.7812608871607091, 0.8111359185511793) , - rgb (0.7150040307625213, 0.7842648709158119, 0.8131111655994991) , - rgb (0.7209728066553678, 0.7872399592345264, 0.8151307392087926) , - rgb (0.726921775128297, 0.7901846863592763, 0.8171921746672638) , - rgb (0.7328454364552346, 0.7930974646884407, 0.8192926338423038) , - rgb (0.7387377170049494, 0.7959766573503101, 0.8214292278043301) , - rgb (0.7445924777189017, 0.7988204771958325, 0.8235986758615652) , - rgb (0.750403467654067, 0.8016269900896532, 0.8257973785108242) , - rgb (0.7561644358438198, 0.8043940873347794, 0.8280213899472) , - rgb (0.7618690793798029, 0.8071194938764749, 0.830266486168872) , - rgb (0.7675110850441786, 0.8098007598713145, 0.8325281663805967) , - rgb (0.7730841659017094, 0.8124352473546601, 0.8348017295057968) , - rgb (0.7785789200822759, 0.8150208937874255, 0.8370834463093898) , - rgb (0.7839910104276492, 0.8175542640053343, 0.8393674746403673) , - rgb (0.7893144556460892, 0.8200321318870201, 0.8416486380471222) , - rgb (0.7945430508923111, 0.8224511622630462, 0.8439218478682798) , - rgb (0.79967075421268, 0.8248078181208093, 0.8461821002957853) , - rgb (0.8046916442981458, 0.8270983878056066, 0.8484244929697402) , - rgb (0.8095999819094809, 0.8293189667350546, 0.8506444160105037) , - rgb (0.8143898212114309, 0.8314655869419785, 0.8528375906214702) , - rgb (0.8190465467793753, 0.8335364929949034, 0.855002062870101) , - rgb (0.8235742968025285, 0.8355248776479544, 0.8571319132851495) , - rgb (0.8279689431601354, 0.837426007513952, 0.8592239945130679) , - rgb (0.8322270571293441, 0.8392349062775448, 0.8612756350042788) , - rgb (0.8363403180919118, 0.8409479651895194, 0.8632852800107016) , - rgb (0.8403042080595778, 0.8425605950855084, 0.865250882410458) , - rgb (0.8441261828674842, 0.8440648271103739, 0.8671697332269007) , - rgb (0.8478071070257792, 0.8454546229209523, 0.8690403678369444) , - rgb (0.8513371457085719, 0.8467273579611647, 0.8708608165735044) , - rgb (0.8547259318925698, 0.8478748812467282, 0.8726282980930582) , - rgb (0.8579825924567037, 0.8488893481028184, 0.8743403855344628) , - rgb (0.8611024543689985, 0.8497675485700126, 0.8759924292343957) , - rgb (0.86408985081464, 0.8505039116750779, 0.8775792578489263) , - rgb (0.8669601550533358, 0.8510896085314068, 0.8790976697717334) , - rgb (0.8697047485350982, 0.8515240300479789, 0.8805388339000336) , - rgb (0.8723313408512408, 0.8518016547808089, 0.8818970435500162) , - rgb (0.8748534750857597, 0.8519152612302319, 0.8831692696761383) , - rgb (0.8772488085896548, 0.8518702833887027, 0.8843412038131143) , - rgb (0.8795410528270573, 0.8516567540749572, 0.8854143767924102) , - rgb (0.8817223105928579, 0.8512759407765347, 0.8863805692551482) , - rgb (0.8837852019553906, 0.8507294054031063, 0.8872322209694989) , - rgb (0.8857501584075443, 0.8500092494306783, 0.8879736506427196) , - rgb (0.8857115512284565, 0.8500218611585632, 0.8857253899008712) , - rgb (0.8855471481195238, 0.8498717428363158, 0.8833620612117095) , - rgb (0.8852589797263047, 0.8495589281098921, 0.8808841479402484) , - rgb (0.8848513815990857, 0.849084264228938, 0.8782823528537247) , - rgb (0.8843271305411354, 0.8484474157205542, 0.8755678522824297) , - rgb (0.8836912714589804, 0.8476489176151927, 0.8727414710144156) , - rgb (0.8829516859544853, 0.8466897027569927, 0.8697961704819097) , - rgb (0.8821154248940161, 0.8455700725455935, 0.8667376504623333) , - rgb (0.8811916987134195, 0.8442906671771735, 0.8635659516866988) , - rgb (0.8801929331569581, 0.8428522482477862, 0.8602739992715663) , - rgb (0.8791324424079277, 0.8412555488447591, 0.8568557229103964) , - rgb (0.8780229843664901, 0.8395016561854007, 0.8533064535245892) , - rgb (0.8768784845161469, 0.8375923807118654, 0.8496137354915025) , - rgb (0.875714587099614, 0.8355302318472394, 0.8457553751902708) , - rgb (0.8745379332026019, 0.8333197294864546, 0.8417192535806901) , - rgb (0.8733517136091627, 0.8309671525127262, 0.8374885100119709) , - rgb (0.8721533197845432, 0.8284805282370967, 0.8330486712880828) , - rgb (0.8709384671729751, 0.8258685788943851, 0.8283849726114961) , - rgb (0.8696913150261381, 0.8231415885956916, 0.8235047668317317) , - rgb (0.8683995469581863, 0.8203087551218152, 0.8184163896312899) , - rgb (0.867053149070485, 0.8173780404191124, 0.813134196269114) , - rgb (0.8656493432560532, 0.8143554406751491, 0.8076697232416455) , - rgb (0.8641834372394103, 0.8112464422465354, 0.8020461269686395) , - rgb (0.8626560105112757, 0.8080552380426153, 0.796282666437655) , - rgb (0.8610711702756552, 0.8047851790981223, 0.7903952966373629) , - rgb (0.8594346370300241, 0.8014392309950078, 0.7843978875138392) , - rgb (0.857756629435049, 0.7980196314271393, 0.778295716672475) , - rgb (0.856040223147254, 0.7945296360155061, 0.7721061003767414) , - rgb (0.8542921961147046, 0.7909719677709199, 0.765838014779141) , - rgb (0.8525190720770844, 0.7873493613354844, 0.7594994148789691) , - rgb (0.8507269702317879, 0.7836645734238389, 0.7530974636118285) , - rgb (0.8489224556311764, 0.7799202140765015, 0.7466371929366437) , - rgb (0.847111955079651, 0.7761188023604716, 0.7401227576280706) , - rgb (0.8452981073195511, 0.7722633860104472, 0.7335636824054149) , - rgb (0.843485292229337, 0.7683566039987018, 0.7269653699897204) , - rgb (0.8416775076684515, 0.7644010120098295, 0.7203329938728462) , - rgb (0.8398783988412087, 0.7603990719977968, 0.7136714781112923) , - rgb (0.8380912347613196, 0.7563531486080863, 0.7069856139021298) , - rgb (0.8363189884473793, 0.7522654895287526, 0.7002799902886496) , - rgb (0.8345656905566583, 0.7481379479992134, 0.6935569764986385) , - rgb (0.8328327718577798, 0.7439727181745988, 0.6868223587464855) , - rgb (0.8311216352909631, 0.7397718464763862, 0.6800812520363146) , - rgb (0.8294340781648147, 0.7355371221572935, 0.6733377200930191) , - rgb (0.8277716072353446, 0.7312702332407809, 0.6665957020468297) , - rgb (0.8261354971058026, 0.7269727551823826, 0.659859001562165) , - rgb (0.8245268129450285, 0.7226461431208888, 0.653131379154226) , - rgb (0.8229463511042843, 0.7182917733129006, 0.6464164243818421) , - rgb (0.8213947205565636, 0.7139109141951604, 0.6397176669767276) , - rgb (0.8198723065045529, 0.7095047497878748, 0.6330385704006711) , - rgb (0.8183793116449822, 0.705074381896351, 0.626382454789333) , - rgb (0.8169157577505589, 0.7006208301478398, 0.6197526063725792) , - rgb (0.8154814662727948, 0.6961450550830809, 0.6131522120932265) , - rgb (0.8140761104699334, 0.6916479479148213, 0.6065843782630862) , - rgb (0.8126992203988149, 0.6871303371461888, 0.600052148204351) , - rgb (0.8113501401176333, 0.6825930154624339, 0.5935584890905076) , - rgb (0.8100280946652069, 0.6780367267397182, 0.5871062690808275) , - rgb (0.8087321917008969, 0.6734621670219452, 0.5806983480557674) , - rgb (0.8074614045096935, 0.6688700095398864, 0.5743374637345958) , - rgb (0.8062146052692706, 0.6642608958528229, 0.5680262917864979) , - rgb (0.804990547908103, 0.6596354502756416, 0.5617674511054698) , - rgb (0.8037879253107763, 0.6549942654947263, 0.5555635086708381) , - rgb (0.8026053114611295, 0.6503379374810385, 0.5494169158460365) , - rgb (0.8014412429256005, 0.6456670345921877, 0.5433300863249918) , - rgb (0.8002941538975398, 0.6409821330674986, 0.5373053518514104) , - rgb (0.7991624518501963, 0.6362837937202919, 0.5313449594256143) , - rgb (0.7980444781513664, 0.6315725822508955, 0.5254510814483478) , - rgb (0.7969385471995161, 0.626849056792967, 0.5196258425240281) , - rgb (0.7958429237958377, 0.6221137880845115, 0.5138712409190979) , - rgb (0.7947558597265404, 0.617367344002207, 0.5081892121310299) , - rgb (0.7936755969866496, 0.6126102933407219, 0.5025816129126943) , - rgb (0.7926003430423745, 0.6078432208703702, 0.4970502062153201) , - rgb (0.7915283284347561, 0.603066705931472, 0.49159667021646397) , - rgb (0.7904577684772788, 0.5982813427706246, 0.48622257801969754) , - rgb (0.7893873776625194, 0.5934875421745599, 0.48092913815357724) , - rgb (0.7883151404562396, 0.5886860017356244, 0.4757179187907608) , - rgb (0.7872390410818835, 0.5838774374455721, 0.47059039582133383) , - rgb (0.7861573713233296, 0.5790624629815756, 0.465547782819184) , - rgb (0.7850684501960684, 0.5742417003617839, 0.46059116206904965) , - rgb (0.7839706083641448, 0.5694157832671042, 0.4557215474289206) , - rgb (0.7828622526444091, 0.5645853311116688, 0.45093985823706345) , - rgb (0.7817418047898184, 0.5597509805259486, 0.44624687186865436) , - rgb (0.7806077474948377, 0.5549133574489061, 0.4416433242636464) , - rgb (0.7794586273150664, 0.5500730841397727, 0.4371297985644476) , - rgb (0.7782934580763312, 0.545230594884266, 0.432706647838971) , - rgb (0.7771103295521099, 0.5403867491056124, 0.4283745037125848) , - rgb (0.775907907306857, 0.5355421788246119, 0.42413367909988375) , - rgb (0.774684947460632, 0.5306974938477673, 0.4199844035696376) , - rgb (0.7734402182988989, 0.5258533209345156, 0.41592679539764366) , - rgb (0.7721725722960555, 0.5210102658711383, 0.4119608998712287) , - rgb (0.7708809196230247, 0.516168926434691, 0.40808667584648967) , - rgb (0.7695642334401418, 0.5113298901696085, 0.4043039806968248) , - rgb (0.768221765997353, 0.5064936237128791, 0.40061257089416885) , - rgb (0.7668522895064389, 0.5016608471009063, 0.39701221751773474) , - rgb (0.7654549259333051, 0.4968321290972723, 0.3935025400011538) , - rgb (0.7640288560928866, 0.49200802533379656, 0.39008308392311997) , - rgb (0.7625733355405261, 0.48718906673415824, 0.38675335037837993) , - rgb (0.7610876378057071, 0.48237579130289127, 0.3835127572385229) , - rgb (0.7595711110534006, 0.4775687122205708, 0.380360657784311) , - rgb (0.7580232553845584, 0.4727682731566229, 0.3772963553109668) , - rgb (0.7564434157714071, 0.4679750143794846, 0.37431909037543515) , - rgb (0.7548310506695954, 0.46318942799460555, 0.3714280448394211) , - rgb (0.7531856636904657, 0.45841199172949604, 0.3686223664223477) , - rgb (0.7515068504589166, 0.45364314496866825, 0.36590112443835765) , - rgb (0.7497942054717047, 0.4488833348154881, 0.3632633755836028) , - rgb (0.7480473927555956, 0.44413297780351974, 0.36070813602540136) , - rgb (0.7462661578916344, 0.439392450449735, 0.3582343914230064) , - rgb (0.7444501867657067, 0.4346621718461711, 0.35584108091122535) , - rgb (0.7425992159973317, 0.42994254036133867, 0.3535270924537459) , - rgb (0.7407130161950609, 0.4252339389526239, 0.35129130890802607) , - rgb (0.7387914002459927, 0.4205367299231533, 0.34913260148542435) , - rgb (0.7368342217358587, 0.4158512585029011, 0.347049785207584) , - rgb (0.7348413359856494, 0.4111778700451951, 0.3450416947080907) , - rgb (0.7328127050626875, 0.4065168468778026, 0.3431071517341082) , - rgb (0.7307482075484517, 0.401868526884681, 0.3412449533046818) , - rgb (0.7286477385671655, 0.39723324476747235, 0.33945384341064017) , - rgb (0.7265112290022755, 0.3926113126792577, 0.3377325942005665) , - rgb (0.7243386564778159, 0.38800301593162145, 0.3360799596569183) , - rgb (0.7221299918421461, 0.3834086450896306, 0.33449469983585844) , - rgb (0.7198852149054985, 0.37882848839337313, 0.332975552002454) , - rgb (0.7176044490813385, 0.3742627271068619, 0.3315213862095893) , - rgb (0.7152876061484729, 0.3697117022522345, 0.3301308728723546) , - rgb (0.7129346683977347, 0.36517570519856757, 0.3288027427038317) , - rgb (0.7105456546582587, 0.36065500290840113, 0.3275357416278876) , - rgb (0.7081205956842048, 0.356149855233803, 0.32632861885644465) , - rgb (0.7056595112261009, 0.3516605297812094, 0.32518014084085567) , - rgb (0.7031624945881415, 0.34718723719598, 0.32408913679491225) , - rgb (0.700629624772421, 0.34273019305341756, 0.32305449047765694) , - rgb (0.6980608153581771, 0.3382897632604862, 0.3220747885521809) , - rgb (0.6954560834689112, 0.33386622163232865, 0.3211488430698579) , - rgb (0.6928154484676493, 0.32945984647042675, 0.3202754315314667) , - rgb (0.6901389321505248, 0.32507091815606004, 0.319453323328983) , - rgb (0.6874265643516962, 0.32069970535138104, 0.3186813762227769) , - rgb (0.6846785094249453, 0.3163463482122221, 0.31795870784057567) , - rgb (0.6818945715094452, 0.31201133280550686, 0.3172838048924495) , - rgb (0.6790747402815734, 0.30769497879760166, 0.31665545668946665) , - rgb (0.6762189792440975, 0.30339762792450425, 0.3160724937230589) , - rgb (0.6733272556481733, 0.29911962764489264, 0.3155337232398221) , - rgb (0.670399595476762, 0.29486126309253047, 0.3150381395687221) , - rgb (0.6674360376636913, 0.29062280081258873, 0.31458483752056837) , - rgb (0.6644363246987884, 0.2864048361425618, 0.31417223403606975) , - rgb (0.6614003753260178, 0.28220778870555907, 0.3137991292649849) , - rgb (0.6583280801134499, 0.2780321095766563, 0.3134643447952643) , - rgb (0.6552193260932713, 0.2738782665241015, 0.3131666792687211) , - rgb (0.652074172902773, 0.269746505252367, 0.3129056060581917) , - rgb (0.6488923016945825, 0.2656375533620908, 0.3126794181957019) , - rgb (0.6456734938264543, 0.2615520316161528, 0.31248673753935263) , - rgb (0.642417577481186, 0.257490519876798, 0.31232631707560987) , - rgb (0.6391243387840212, 0.2534536546198314, 0.3121968961206398) , - rgb (0.6357937104834237, 0.24944185818822678, 0.3120979395330059) , - rgb (0.6324253485421027, 0.24545598775548677, 0.3120276597462445) , - rgb (0.6290189201698587, 0.24149689191922535, 0.3119844719564572) , - rgb (0.6255741650043496, 0.23756535071152696, 0.3119669831491227) , - rgb (0.6220907982108261, 0.2336621873300741, 0.3119738327362739) , - rgb (0.6185686525887719, 0.2297879924917992, 0.3120046383872893) , - rgb (0.6150072323639137, 0.22594402043981826, 0.3120568068576574) , - rgb (0.6114062072731884, 0.22213124697023234, 0.3121288139643524) , - rgb (0.6077652399481865, 0.21835070166659282, 0.312219032918702) , - rgb (0.6040840169673274, 0.21460331490206347, 0.31232652641170694) , - rgb (0.6003621301041158, 0.21089030138947745, 0.3124493441041469) , - rgb (0.5965991810912237, 0.207212956082026, 0.3125852303112123) , - rgb (0.5927948053652026, 0.20357251410079796, 0.3127323483930494) , - rgb (0.5889486193554471, 0.19997020971775276, 0.31288922211590126) , - rgb (0.5850602439646688, 0.19640737049066315, 0.3130540116373273) , - rgb (0.5811293276158656, 0.19288548904692518, 0.3132239939418394) , - rgb (0.5771555081299204, 0.18940601489760422, 0.3133970433357208) , - rgb (0.5731384575410787, 0.18597036007065024, 0.3135712686852) , - rgb (0.5690778478401143, 0.18258004462335425, 0.3137444095679653) , - rgb (0.564973435290177, 0.17923664950367169, 0.3139136046337036) , - rgb (0.5608249903911717, 0.17594170887918095, 0.31407639883970623) , - rgb (0.5566322903496934, 0.17269677158182117, 0.31423043195101424) , - rgb (0.5523952157271191, 0.16950338809328983, 0.3143729155461537) , - rgb (0.5481137003346762, 0.1663630904279047, 0.3145010299091471) , - rgb (0.5437877131360856, 0.16327738551419116, 0.31461204226295625) , - rgb (0.5394173664919906, 0.16024769309971934, 0.31470295028655965) , - rgb (0.5350027976174474, 0.15727540775107324, 0.3147708520739653) , - rgb (0.5305442048985645, 0.15436183633886777, 0.3148129978918713) , - rgb (0.5260418962547748, 0.15150818660835483, 0.31482653406646727) , - rgb (0.5214965286322996, 0.14871544765633712, 0.3148076795453443) , - rgb (0.5169084880054446, 0.14598463068714407, 0.3147540759228004) , - rgb (0.5122783510532176, 0.14331656120063752, 0.3146630922831542) , - rgb (0.5076068118105369, 0.14071192654913128, 0.3145320012008257) , - rgb (0.5028952497497061, 0.13817086581280427, 0.3143566215383367) , - rgb (0.4981443546207415, 0.13569380302451714, 0.314135190862664) , - rgb (0.49335504375145617, 0.13328091630401023, 0.31386561956734976) , - rgb (0.48852847371852987, 0.13093210934893723, 0.31354553695453014) , - rgb (0.48366628618847957, 0.1286467902201389, 0.31317188565991266) , - rgb (0.47877034239726296, 0.12642401401409453, 0.3127417273582196) , - rgb (0.473841437035254, 0.12426354237989065, 0.31225470169927194) , - rgb (0.46888111384598413, 0.12216445576414045, 0.31170911458932665) , - rgb (0.46389102840284874, 0.12012561256850712, 0.31110343446582983) , - rgb (0.45887288947308297, 0.11814571137706886, 0.3104363697903881) , - rgb (0.4538300508699989, 0.11622183788331528, 0.3097044124984492) , - rgb (0.4487629917317482, 0.1143535557462255, 0.30890905921943196) , - rgb (0.44367358645071275, 0.11253912421257944, 0.3080497309546545) , - rgb (0.4385637818793154, 0.11077667828375456, 0.30712600062348083) , - rgb (0.4334355841041439, 0.1090642347484701, 0.3061376792828915) , - rgb (0.4282910131578975, 0.1073997763055258, 0.30508479060294547) , - rgb (0.42313214269556043, 0.10578120994917611, 0.3039675809469457) , - rgb (0.41796105205173684, 0.10420644885760968, 0.3027865203963184) , - rgb (0.41277985630360303, 0.1026734006932461, 0.3015422643746897) , - rgb (0.4075912039268871, 0.10117945586419633, 0.300235195077286) , - rgb (0.40239692379737496, 0.09972293031495055, 0.2988667436973397) , - rgb (0.39719876876325577, 0.09830232096827862, 0.2974385647628578) , - rgb (0.39199887556812907, 0.09691583650296684, 0.2959521200550908) , - rgb (0.3867993907954417, 0.09556181960083443, 0.29440901248173756) , - rgb (0.38160247377467543, 0.09423873126371218, 0.2928110750626949) , - rgb (0.3764103053221462, 0.09294519809377791, 0.2911602415731392) , - rgb (0.3712250843130934, 0.09167999748026273, 0.2894586539763317) , - rgb (0.36605031412464006, 0.0904406854276979, 0.2877077458811747) , - rgb (0.36088752387578377, 0.0892271943627452, 0.28591050458531014) , - rgb (0.35573889947341125, 0.08803897435024335, 0.2840695897279818) , - rgb (0.3506067824603248, 0.08687555176033529, 0.28218770540182386) , - rgb (0.345493557138718, 0.08573665496512634, 0.28026769921081435) , - rgb (0.34040164359597463, 0.08462223619170267, 0.27831254595259397) , - rgb (0.3353335322445545, 0.08353243411900396, 0.2763253435679004) , - rgb (0.3302917447118144, 0.08246763389003825, 0.27430929404579435) , - rgb (0.3252788886040126, 0.08142839007654609, 0.27226772884656186) , - rgb (0.3202998655799406, 0.08041299473755484, 0.2702032289303951) , - rgb (0.3153587000920581, 0.07942099731524319, 0.2681190407694196) , - rgb (0.31045520848595526, 0.07845687167618218, 0.2660200572779356) , - rgb (0.30559226007249934, 0.07752196310753731, 0.2639100669211966) , - rgb (0.3007727681291869, 0.07661782433616476, 0.2617929409781967) , - rgb (0.2960004726065818, 0.07574533600095842, 0.25967245030364566) , - rgb (0.29128515387578635, 0.0748990498474667, 0.25755101595750435) , - rgb (0.28662309235899847, 0.07408846082680887, 0.2554347867371703) , - rgb (0.2820174629736694, 0.07331569321404097, 0.25332800295084507) , - rgb (0.277471508091428, 0.07258296989925478, 0.2512349399594277) , - rgb (0.272997015188973, 0.07188355544616351, 0.2491584709323293) , - rgb (0.2685909594817286, 0.07122671627792246, 0.24710443563450618) , - rgb (0.2642551220706094, 0.07061659562299544, 0.24507758869355967) , - rgb (0.25999463887892144, 0.07005385560386188, 0.24308218808684579) , - rgb (0.2558213554748177, 0.06953231029187984, 0.24112190491594204) , - rgb (0.25172899728289466, 0.0690646308260355, 0.23920260612763083) , - rgb (0.247720929905011, 0.06865333790948652, 0.2373288009471749) , - rgb (0.2438114972024792, 0.06828985152901187, 0.23550427698321885) , - rgb (0.23999586188690308, 0.06798502996477995, 0.23373434258507808) , - rgb (0.23627495835774248, 0.06774359820987802, 0.23202360805926608) , - rgb (0.23266299920501882, 0.06755710438847978, 0.23037617493752832) , - rgb (0.2291562027859284, 0.06743473087115257, 0.22879681433956656) , - rgb (0.2257539681670791, 0.06738213230014747, 0.22728984778098055) , - rgb (0.22247308588973624, 0.06738821405309284, 0.22585960379408354) , - rgb (0.21930503925136402, 0.06746578636294004, 0.22451023616807558) , - rgb (0.21625279838647882, 0.06761633027051639, 0.22324568672294431) , - rgb (0.2133313859647627, 0.06783014842602667, 0.2220704321302429) , - rgb (0.21052882914958676, 0.06812195249816172, 0.22098759107715404) , - rgb (0.20785704662965598, 0.06848439879702528, 0.22000133917653536) , - rgb (0.20531725273301316, 0.06891959226639757, 0.21911516689288835) , - rgb (0.20290365333558247, 0.06943524858045896, 0.21833167885096033) , - rgb (0.20058760685133747, 0.07006457614998421, 0.21762721310371608) , - rgb (0.19819343656336558, 0.07097462525273879, 0.21690975060032436) , - rgb (0.19571853588267552, 0.07215778103960274, 0.21617499187076789) , - rgb (0.1931548636579131, 0.07360681904011795, 0.21542362939081539) , - rgb (0.19049578401722037, 0.07531127841678764, 0.2146562337112265) , - rgb (0.18774482037046955, 0.07725158846803931, 0.21387448578597812) , - rgb (0.18488035509396164, 0.07942573027972388, 0.21307651648984993) -}); + rgb (0.18739228342697645, 0.07710209689958833, 0.21618875376309582) , + rgb (0.18975853639094634, 0.07501986186214377, 0.2193005075652994) , + rgb (0.19199449184606268, 0.0731828306492733, 0.22243385243433622) , + rgb (0.19410351363791453, 0.07160830485689157, 0.22558727307410353) , + rgb (0.1960826032659409, 0.07032122724242362, 0.22874673279569585) , + rgb (0.19794834061899208, 0.06931406607166066, 0.23194647381302336) , + rgb (0.19971571438603364, 0.06859271055370472, 0.23517094067076993) , + rgb (0.2015613376412984, 0.06798327102620025, 0.23852974228695395) , + rgb (0.20352007949514977, 0.06744417961242422, 0.24205576625191821) , + rgb (0.20558051999470117, 0.06699046239786874, 0.24572497420147632) , + rgb (0.2077442377448806, 0.06661453200418091, 0.24954644291943817) , + rgb (0.21001214221188125, 0.06630857391894718, 0.2535289048041211) , + rgb (0.21237411048541005, 0.06608502466175845, 0.2576516509356954) , + rgb (0.21482843531473683, 0.06594038561377849, 0.26191675992376573) , + rgb (0.21737845072382705, 0.06585966123356204, 0.2663420934966951) , + rgb (0.22001251100779617, 0.0658579189189076, 0.2709027999432586) , + rgb (0.22272706739121817, 0.06593379067565194, 0.275597146520537) , + rgb (0.22552164337737857, 0.0660781731193956, 0.28043398847505197) , + rgb (0.2283917709422868, 0.06628997924139618, 0.28541074411068496) , + rgb (0.23132955273021344, 0.06657618693909059, 0.29051361067988485) , + rgb (0.23433055727563878, 0.0669355996616394, 0.295740099298676) , + rgb (0.23739062429054825, 0.06736588805055552, 0.3010892218406587) , + rgb (0.2405081333229594, 0.0678571038148556, 0.3065705449367832) , + rgb (0.24367372557466271, 0.06841985515092269, 0.3121652405088837) , + rgb (0.24688226237959, 0.06905363944920445, 0.31786993834254956) , + rgb (0.2501284530619938, 0.06975820642910699, 0.32368100685760637) , + rgb (0.25340685873736807, 0.07053358292685183, 0.3295945757321303) , + rgb (0.256711916510839, 0.07138010624208224, 0.3356064898460009) , + rgb (0.26003895187439957, 0.0722947810433622, 0.3417175669546984) , + rgb (0.26338121807151404, 0.07328165793989708, 0.34791888996380105) , + rgb (0.26673233211995284, 0.0743440180285462, 0.3542027606624096) , + rgb (0.2700863774911405, 0.07548367558427554, 0.36056376228111864) , + rgb (0.2734373934245081, 0.07670280023749607, 0.36699616136347685) , + rgb (0.2767793961581559, 0.07800394103378822, 0.37349382846504675) , + rgb (0.2801063857697547, 0.07938999480226153, 0.38005028528138707) , + rgb (0.28341239797185225, 0.08086415336549937, 0.38665868550105914) , + rgb (0.28669151388283165, 0.08242987384848069, 0.39331182532243375) , + rgb (0.2899379244517661, 0.08409078829085731, 0.40000214725256295) , + rgb (0.2931459309698525, 0.08585065688962071, 0.40672178082365834) , + rgb (0.2963100038890529, 0.08771325096046395, 0.41346259134143476) , + rgb (0.2994248396021477, 0.08968225371675004, 0.42021619665853854) , + rgb (0.3024853636457425, 0.0917611873973036, 0.42697404043749887) , + rgb (0.30548675819945936, 0.09395276484082374, 0.4337284999936111) , + rgb (0.30842444457210105, 0.09625938534057774, 0.44047194882050544) , + rgb (0.31129434479712365, 0.0986847719340522, 0.4471931371516162) , + rgb (0.3140927841475553, 0.10123077676403242, 0.45388335612058467) , + rgb (0.316816480890235, 0.10389861387653518, 0.46053414662739794) , + rgb (0.31946262395497965, 0.1066887988239266, 0.46713728801395243) , + rgb (0.3220288227606932, 0.10960114111258401, 0.4736849472572688) , + rgb (0.32451307931207785, 0.11263459791730848, 0.48017007211645196) , + rgb (0.3269137124539796, 0.1157873496841953, 0.4865864649569746) , + rgb (0.3292300520323141, 0.11905764321981127, 0.49292595612342666) , + rgb (0.33146154891145124, 0.12244245263391232, 0.4991827458843107) , + rgb (0.33360804901486, 0.1259381830100592, 0.505351647966549) , + rgb (0.33566978565015315, 0.12954074251271822, 0.5114280721516895) , + rgb (0.3376473209067111, 0.13324562282438077, 0.5174080757397947) , + rgb (0.33954168752669694, 0.1370480189671817, 0.5232879753508524) , + rgb (0.34135411074506483, 0.1409427920655632, 0.5290650094033675) , + rgb (0.34308600291572294, 0.14492465359918028, 0.534737042820671) , + rgb (0.34473901574536375, 0.1489882058982641, 0.5403024592040654) , + rgb (0.3463150717579309, 0.15312802296627787, 0.5457599924248665) , + rgb (0.3478165323877778, 0.1573386351115298, 0.5511085345270326) , + rgb (0.34924513554955644, 0.16161477763045118, 0.5563483747416378) , + rgb (0.3506030444193101, 0.1659512998472086, 0.5614796470399323) , + rgb (0.3518924860887379, 0.17034320478524959, 0.5665028491121665) , + rgb (0.35311574421123737, 0.17478570377561287, 0.5714187152355529) , + rgb (0.3542753496066376, 0.17927413271618647, 0.5762280966066872) , + rgb (0.3553741530690672, 0.18380392577704466, 0.580931914318328) , + rgb (0.35641381143126327, 0.18837119869242164, 0.5855320765920552) , + rgb (0.35739663292915563, 0.1929720819784246, 0.5900301125106313) , + rgb (0.3583248996661781, 0.197602942459778, 0.5944276851750107) , + rgb (0.35920088560930186, 0.20226037920758122, 0.5987265295935138) , + rgb (0.36002681809096376, 0.20694122817889948, 0.6029284543191687) , + rgb (0.36080493826624654, 0.21164251793458128, 0.6070353217206471) , + rgb (0.36153829010998356, 0.21636111429594002, 0.6110488067964093) , + rgb (0.36222809558295926, 0.22109488427338303, 0.6149711234609613) , + rgb (0.3628764356004103, 0.2258414929328703, 0.6188041741082302) , + rgb (0.36348537610385145, 0.2305987621839642, 0.6225498862239288) , + rgb (0.3640569302208851, 0.23536470386204195, 0.6262101345195302) , + rgb (0.3645930889012501, 0.24013747024823828, 0.629786801550261) , + rgb (0.3650957984588681, 0.24491536803550484, 0.6332817352005559) , + rgb (0.3655669837353898, 0.24969683475296395, 0.6366967518748858) , + rgb (0.36600853966739794, 0.25448043878086224, 0.6400336180336859) , + rgb (0.3664224325155063, 0.25926481158628106, 0.6432940914076554) , + rgb (0.3668108554010799, 0.26404857724525643, 0.6464799165290824) , + rgb (0.36717513650699446, 0.26883085667326956, 0.6495927229789225) , + rgb (0.36751707094367697, 0.2736106331709098, 0.6526341171161864) , + rgb (0.3678384369653108, 0.2783869718129776, 0.655605668384537) , + rgb (0.3681410147989972, 0.2831590122118299, 0.6585088880697231) , + rgb (0.36842655638020444, 0.2879259643777846, 0.661345269109446) , + rgb (0.3686968223189527, 0.292687098561501, 0.6641162529823691) , + rgb (0.3689535530659678, 0.29744175492366276, 0.6668232208982426) , + rgb (0.36919847837592484, 0.3021893217650707, 0.6694675433161452) , + rgb (0.3694333459127623, 0.3069292355186234, 0.6720505284912062) , + rgb (0.36965987626565955, 0.3116609876295197, 0.6745734474341955) , + rgb (0.3698798032902536, 0.31638410101153364, 0.6770375543809057) , + rgb (0.37009487130772695, 0.3210981375964933, 0.6794440539905685) , + rgb (0.37030682071842685, 0.32580269697872455, 0.6817941168448668) , + rgb (0.37051738634484427, 0.3304974124430785, 0.6840888878885721) , + rgb (0.3707283327942267, 0.33518193808489577, 0.6863294816960677) , + rgb (0.3709415155133733, 0.33985591488818123, 0.6885170337950512) , + rgb (0.37115856636209105, 0.3445191141023017, 0.6906525358646499) , + rgb (0.37138124223736607, 0.34917126878479027, 0.6927370347192883) , + rgb (0.3716113323440048, 0.3538121372967869, 0.6947714991938089) , + rgb (0.3718506155898596, 0.3584414828587522, 0.6967569581025654) , + rgb (0.3721008970244382, 0.3630590973698238, 0.6986943461507372) , + rgb (0.37236397858465387, 0.36766477862108266, 0.7005846349652077) , + rgb (0.37264166757849604, 0.3722583500483685, 0.7024287314570723) , + rgb (0.3729357864666503, 0.3768396383521984, 0.7042275578058994) , + rgb (0.37324816143326384, 0.38140848555753937, 0.7059820097480604) , + rgb (0.3735806215098284, 0.3859647438605754, 0.7076929760731058) , + rgb (0.3739349933047578, 0.3905082752937583, 0.7093613429347845) , + rgb (0.3743131319931234, 0.3950389482828331, 0.7109879652237746) , + rgb (0.3747168601930223, 0.3995566498711684, 0.7125736851650046) , + rgb (0.37514802505380473, 0.4040612609993941, 0.7141193695725726) , + rgb (0.375608469194424, 0.40855267638072096, 0.7156258509158755) , + rgb (0.37610001286385814, 0.4130307995247706, 0.7170939691992023) , + rgb (0.37662448930806297, 0.41749553747893614, 0.7185245473617611) , + rgb (0.3771837184425123, 0.4219468022345483, 0.7199184152447577) , + rgb (0.3777794975351373, 0.4263845142616835, 0.7212763999353023) , + rgb (0.378413635091359, 0.43080859411413064, 0.7225993199306104) , + rgb (0.3790878928311076, 0.43521897612544935, 0.7238879869132313) , + rgb (0.3798040374484875, 0.4396155882122263, 0.7251432377876109) , + rgb (0.3805638069656562, 0.4439983720863372, 0.7263658704513531) , + rgb (0.3813688793045416, 0.4483672766927786, 0.7275567131714135) , + rgb (0.38222094988570376, 0.45272225034283325, 0.7287165614400378) , + rgb (0.3831216808440275, 0.457063235814072, 0.7298462679135326) , + rgb (0.38407269378943537, 0.46139018782416635, 0.7309466543290268) , + rgb (0.3850755679365139, 0.46570306719930193, 0.732018540336905) , + rgb (0.386131841788921, 0.4700018340988123, 0.7330627749243106) , + rgb (0.3872430145933025, 0.4742864593363539, 0.7340801678785439) , + rgb (0.3884105330084243, 0.47855691131792805, 0.7350715764115726) , + rgb (0.38963580160340855, 0.48281316715123496, 0.7360378254693274) , + rgb (0.390920175719949, 0.4870552025122304, 0.7369797713388125) , + rgb (0.39226494876209317, 0.4912830033289926, 0.7378982478447508) , + rgb (0.39367135736822567, 0.4954965577745118, 0.738794102296364) , + rgb (0.3951405880820763, 0.4996958532637776, 0.7396682021171571) , + rgb (0.3966737490566561, 0.5038808905384797, 0.7405213858051674) , + rgb (0.3982719152586337, 0.5080516653927614, 0.7413545091809972) , + rgb (0.39993606933454834, 0.5122081814321852, 0.7421684457131799) , + rgb (0.40166714010896104, 0.5163504496968876, 0.7429640345324835) , + rgb (0.40346600333905397, 0.5204784765384003, 0.7437421522356709) , + rgb (0.4053334378930318, 0.5245922817498312, 0.7445036583670813) , + rgb (0.4072701869421907, 0.5286918801105741, 0.7452494263758127) , + rgb (0.4092768899914751, 0.5327773017713032, 0.7459803063570782) , + rgb (0.4113541469730457, 0.5368485776500593, 0.7466971285506578) , + rgb (0.4135024574331473, 0.5409057477109848, 0.7474007329754309) , + rgb (0.4157223260454232, 0.544948827153504, 0.7480920445900052) , + rgb (0.4180141407923363, 0.5489778542188889, 0.7487719316700112) , + rgb (0.42037822361396326, 0.5529928715810817, 0.7494412559451894) , + rgb (0.4228148567577266, 0.5569939212699658, 0.7501008698822764) , + rgb (0.42532423665011354, 0.560981049599503, 0.7507516498900512) , + rgb (0.42790652284925834, 0.5649543060909209, 0.7513944352191484) , + rgb (0.4305617907305757, 0.5689137457245718, 0.752030080993127) , + rgb (0.43329008867358393, 0.5728594162560667, 0.7526594653256667) , + rgb (0.4360913895835637, 0.5767913799818608, 0.7532834105961016) , + rgb (0.43896563958048396, 0.5807096924109849, 0.7539027620828594) , + rgb (0.441912717666964, 0.5846144110017557, 0.7545183888441067) , + rgb (0.4449324685421538, 0.5885055998308617, 0.7551311041857901) , + rgb (0.4480247093358917, 0.5923833145214658, 0.7557417647410792) , + rgb (0.45118918687617743, 0.5962476205135354, 0.7563512064324664) , + rgb (0.45442563977552913, 0.6000985950385866, 0.7569601366060649) , + rgb (0.45773377230160567, 0.6039363004658646, 0.7575693690185916) , + rgb (0.4611132664702388, 0.607760777169989, 0.7581798643680714) , + rgb (0.4645637671630393, 0.6115720882286415, 0.7587924262302581) , + rgb (0.46808490970531597, 0.6153702869579029, 0.7594078989109274) , + rgb (0.4716762951887709, 0.6191554324288464, 0.7600270922788305) , + rgb (0.47533752394906287, 0.6229275728383581, 0.7606508557181775) , + rgb (0.47906816236197386, 0.6266867625186013, 0.7612800037566242) , + rgb (0.4828677867260272, 0.6304330455306234, 0.761915371498953) , + rgb (0.4867359599430568, 0.6341664625110051, 0.7625578008592404) , + rgb (0.4906722493856122, 0.6378870485884708, 0.7632081276316384) , + rgb (0.4946761847863938, 0.6415948411950443, 0.7638671900213091) , + rgb (0.4987473366135607, 0.6452898684900934, 0.7645357873418008) , + rgb (0.5028853540415561, 0.6489721673409526, 0.7652144671817491) , + rgb (0.5070896957645166, 0.6526417240314645, 0.7659044566083585) , + rgb (0.5113599254160193, 0.6562985398183186, 0.7666066378064533) , + rgb (0.5156955988596057, 0.65994260812898, 0.7673219148959617) , + rgb (0.5200962739223556, 0.6635739143403039, 0.768051194033441) , + rgb (0.5245615147059358, 0.6671924299614223, 0.7687954171423095) , + rgb (0.529090861832473, 0.6707981230280622, 0.7695555229231313) , + rgb (0.533683891477284, 0.6743909370521273, 0.7703325054879735) , + rgb (0.5383401557517628, 0.677970811290954, 0.7711273443905772) , + rgb (0.5430593242401823, 0.6815376725306588, 0.7719407969783508) , + rgb (0.5478409815301863, 0.6850914221850988, 0.7727738647344087) , + rgb (0.5526845058934713, 0.6886319451516638, 0.7736279426902245) , + rgb (0.5575894041960517, 0.6921591145825405, 0.7745041337932782) , + rgb (0.5625551535721934, 0.6956727838162965, 0.7754035914230984) , + rgb (0.5675811785386197, 0.6991727930264627, 0.776327485342753) , + rgb (0.5726668948158774, 0.7026589535425779, 0.7772770268091199) , + rgb (0.5778116438998202, 0.7061310615715398, 0.7782534512102552) , + rgb (0.5830148703693241, 0.7095888767699747, 0.7792578182047659) , + rgb (0.588275797805555, 0.7130321464645814, 0.7802914140563652) , + rgb (0.5935933569683722, 0.7164606049658685, 0.781355882376401) , + rgb (0.5989665814482068, 0.7198739489224673, 0.7824525989934664) , + rgb (0.6043943420027486, 0.7232718614323369, 0.7835829559353559) , + rgb (0.6098754317609306, 0.7266539875975829, 0.7847483573269471) , + rgb (0.6154084641177048, 0.7300199523273969, 0.7859502270675048) , + rgb (0.6209919306481755, 0.733369347989232, 0.7871899462469658) , + rgb (0.6266240202260459, 0.7367017540369944, 0.7884690131633456) , + rgb (0.6323027138710603, 0.740016721601314, 0.7897889276264043) , + rgb (0.6380258682854598, 0.7433137671403319, 0.7911510045957317) , + rgb (0.6437910831099849, 0.7465923800833657, 0.7925565320130605) , + rgb (0.6495957300425348, 0.7498520122194177, 0.7940067402149911) , + rgb (0.6554369232645472, 0.7530920875676843, 0.7955027112903105) , + rgb (0.6613112930078745, 0.7563120270871903, 0.7970456043491897) , + rgb (0.6672147980375281, 0.7595112803730375, 0.7986367465453776) , + rgb (0.6731442255942621, 0.7626890873389048, 0.8002762854580953) , + rgb (0.6790955449988215, 0.765844721313959, 0.8019646617300199) , + rgb (0.6850644615439593, 0.7689774029354699, 0.8037020626717691) , + rgb (0.691046410093091, 0.7720862946067809, 0.8054884169067907) , + rgb (0.6970365443886174, 0.7751705000806606, 0.8073233538006345) , + rgb (0.7030297722540817, 0.7782290497335813, 0.8092061884805697) , + rgb (0.709020781345393, 0.7812608871607091, 0.8111359185511793) , + rgb (0.7150040307625213, 0.7842648709158119, 0.8131111655994991) , + rgb (0.7209728066553678, 0.7872399592345264, 0.8151307392087926) , + rgb (0.726921775128297, 0.7901846863592763, 0.8171921746672638) , + rgb (0.7328454364552346, 0.7930974646884407, 0.8192926338423038) , + rgb (0.7387377170049494, 0.7959766573503101, 0.8214292278043301) , + rgb (0.7445924777189017, 0.7988204771958325, 0.8235986758615652) , + rgb (0.750403467654067, 0.8016269900896532, 0.8257973785108242) , + rgb (0.7561644358438198, 0.8043940873347794, 0.8280213899472) , + rgb (0.7618690793798029, 0.8071194938764749, 0.830266486168872) , + rgb (0.7675110850441786, 0.8098007598713145, 0.8325281663805967) , + rgb (0.7730841659017094, 0.8124352473546601, 0.8348017295057968) , + rgb (0.7785789200822759, 0.8150208937874255, 0.8370834463093898) , + rgb (0.7839910104276492, 0.8175542640053343, 0.8393674746403673) , + rgb (0.7893144556460892, 0.8200321318870201, 0.8416486380471222) , + rgb (0.7945430508923111, 0.8224511622630462, 0.8439218478682798) , + rgb (0.79967075421268, 0.8248078181208093, 0.8461821002957853) , + rgb (0.8046916442981458, 0.8270983878056066, 0.8484244929697402) , + rgb (0.8095999819094809, 0.8293189667350546, 0.8506444160105037) , + rgb (0.8143898212114309, 0.8314655869419785, 0.8528375906214702) , + rgb (0.8190465467793753, 0.8335364929949034, 0.855002062870101) , + rgb (0.8235742968025285, 0.8355248776479544, 0.8571319132851495) , + rgb (0.8279689431601354, 0.837426007513952, 0.8592239945130679) , + rgb (0.8322270571293441, 0.8392349062775448, 0.8612756350042788) , + rgb (0.8363403180919118, 0.8409479651895194, 0.8632852800107016) , + rgb (0.8403042080595778, 0.8425605950855084, 0.865250882410458) , + rgb (0.8441261828674842, 0.8440648271103739, 0.8671697332269007) , + rgb (0.8478071070257792, 0.8454546229209523, 0.8690403678369444) , + rgb (0.8513371457085719, 0.8467273579611647, 0.8708608165735044) , + rgb (0.8547259318925698, 0.8478748812467282, 0.8726282980930582) , + rgb (0.8579825924567037, 0.8488893481028184, 0.8743403855344628) , + rgb (0.8611024543689985, 0.8497675485700126, 0.8759924292343957) , + rgb (0.86408985081464, 0.8505039116750779, 0.8775792578489263) , + rgb (0.8669601550533358, 0.8510896085314068, 0.8790976697717334) , + rgb (0.8697047485350982, 0.8515240300479789, 0.8805388339000336) , + rgb (0.8723313408512408, 0.8518016547808089, 0.8818970435500162) , + rgb (0.8748534750857597, 0.8519152612302319, 0.8831692696761383) , + rgb (0.8772488085896548, 0.8518702833887027, 0.8843412038131143) , + rgb (0.8795410528270573, 0.8516567540749572, 0.8854143767924102) , + rgb (0.8817223105928579, 0.8512759407765347, 0.8863805692551482) , + rgb (0.8837852019553906, 0.8507294054031063, 0.8872322209694989) , + rgb (0.8857501584075443, 0.8500092494306783, 0.8879736506427196) , + rgb (0.8857115512284565, 0.8500218611585632, 0.8857253899008712) , + rgb (0.8855471481195238, 0.8498717428363158, 0.8833620612117095) , + rgb (0.8852589797263047, 0.8495589281098921, 0.8808841479402484) , + rgb (0.8848513815990857, 0.849084264228938, 0.8782823528537247) , + rgb (0.8843271305411354, 0.8484474157205542, 0.8755678522824297) , + rgb (0.8836912714589804, 0.8476489176151927, 0.8727414710144156) , + rgb (0.8829516859544853, 0.8466897027569927, 0.8697961704819097) , + rgb (0.8821154248940161, 0.8455700725455935, 0.8667376504623333) , + rgb (0.8811916987134195, 0.8442906671771735, 0.8635659516866988) , + rgb (0.8801929331569581, 0.8428522482477862, 0.8602739992715663) , + rgb (0.8791324424079277, 0.8412555488447591, 0.8568557229103964) , + rgb (0.8780229843664901, 0.8395016561854007, 0.8533064535245892) , + rgb (0.8768784845161469, 0.8375923807118654, 0.8496137354915025) , + rgb (0.875714587099614, 0.8355302318472394, 0.8457553751902708) , + rgb (0.8745379332026019, 0.8333197294864546, 0.8417192535806901) , + rgb (0.8733517136091627, 0.8309671525127262, 0.8374885100119709) , + rgb (0.8721533197845432, 0.8284805282370967, 0.8330486712880828) , + rgb (0.8709384671729751, 0.8258685788943851, 0.8283849726114961) , + rgb (0.8696913150261381, 0.8231415885956916, 0.8235047668317317) , + rgb (0.8683995469581863, 0.8203087551218152, 0.8184163896312899) , + rgb (0.867053149070485, 0.8173780404191124, 0.813134196269114) , + rgb (0.8656493432560532, 0.8143554406751491, 0.8076697232416455) , + rgb (0.8641834372394103, 0.8112464422465354, 0.8020461269686395) , + rgb (0.8626560105112757, 0.8080552380426153, 0.796282666437655) , + rgb (0.8610711702756552, 0.8047851790981223, 0.7903952966373629) , + rgb (0.8594346370300241, 0.8014392309950078, 0.7843978875138392) , + rgb (0.857756629435049, 0.7980196314271393, 0.778295716672475) , + rgb (0.856040223147254, 0.7945296360155061, 0.7721061003767414) , + rgb (0.8542921961147046, 0.7909719677709199, 0.765838014779141) , + rgb (0.8525190720770844, 0.7873493613354844, 0.7594994148789691) , + rgb (0.8507269702317879, 0.7836645734238389, 0.7530974636118285) , + rgb (0.8489224556311764, 0.7799202140765015, 0.7466371929366437) , + rgb (0.847111955079651, 0.7761188023604716, 0.7401227576280706) , + rgb (0.8452981073195511, 0.7722633860104472, 0.7335636824054149) , + rgb (0.843485292229337, 0.7683566039987018, 0.7269653699897204) , + rgb (0.8416775076684515, 0.7644010120098295, 0.7203329938728462) , + rgb (0.8398783988412087, 0.7603990719977968, 0.7136714781112923) , + rgb (0.8380912347613196, 0.7563531486080863, 0.7069856139021298) , + rgb (0.8363189884473793, 0.7522654895287526, 0.7002799902886496) , + rgb (0.8345656905566583, 0.7481379479992134, 0.6935569764986385) , + rgb (0.8328327718577798, 0.7439727181745988, 0.6868223587464855) , + rgb (0.8311216352909631, 0.7397718464763862, 0.6800812520363146) , + rgb (0.8294340781648147, 0.7355371221572935, 0.6733377200930191) , + rgb (0.8277716072353446, 0.7312702332407809, 0.6665957020468297) , + rgb (0.8261354971058026, 0.7269727551823826, 0.659859001562165) , + rgb (0.8245268129450285, 0.7226461431208888, 0.653131379154226) , + rgb (0.8229463511042843, 0.7182917733129006, 0.6464164243818421) , + rgb (0.8213947205565636, 0.7139109141951604, 0.6397176669767276) , + rgb (0.8198723065045529, 0.7095047497878748, 0.6330385704006711) , + rgb (0.8183793116449822, 0.705074381896351, 0.626382454789333) , + rgb (0.8169157577505589, 0.7006208301478398, 0.6197526063725792) , + rgb (0.8154814662727948, 0.6961450550830809, 0.6131522120932265) , + rgb (0.8140761104699334, 0.6916479479148213, 0.6065843782630862) , + rgb (0.8126992203988149, 0.6871303371461888, 0.600052148204351) , + rgb (0.8113501401176333, 0.6825930154624339, 0.5935584890905076) , + rgb (0.8100280946652069, 0.6780367267397182, 0.5871062690808275) , + rgb (0.8087321917008969, 0.6734621670219452, 0.5806983480557674) , + rgb (0.8074614045096935, 0.6688700095398864, 0.5743374637345958) , + rgb (0.8062146052692706, 0.6642608958528229, 0.5680262917864979) , + rgb (0.804990547908103, 0.6596354502756416, 0.5617674511054698) , + rgb (0.8037879253107763, 0.6549942654947263, 0.5555635086708381) , + rgb (0.8026053114611295, 0.6503379374810385, 0.5494169158460365) , + rgb (0.8014412429256005, 0.6456670345921877, 0.5433300863249918) , + rgb (0.8002941538975398, 0.6409821330674986, 0.5373053518514104) , + rgb (0.7991624518501963, 0.6362837937202919, 0.5313449594256143) , + rgb (0.7980444781513664, 0.6315725822508955, 0.5254510814483478) , + rgb (0.7969385471995161, 0.626849056792967, 0.5196258425240281) , + rgb (0.7958429237958377, 0.6221137880845115, 0.5138712409190979) , + rgb (0.7947558597265404, 0.617367344002207, 0.5081892121310299) , + rgb (0.7936755969866496, 0.6126102933407219, 0.5025816129126943) , + rgb (0.7926003430423745, 0.6078432208703702, 0.4970502062153201) , + rgb (0.7915283284347561, 0.603066705931472, 0.49159667021646397) , + rgb (0.7904577684772788, 0.5982813427706246, 0.48622257801969754) , + rgb (0.7893873776625194, 0.5934875421745599, 0.48092913815357724) , + rgb (0.7883151404562396, 0.5886860017356244, 0.4757179187907608) , + rgb (0.7872390410818835, 0.5838774374455721, 0.47059039582133383) , + rgb (0.7861573713233296, 0.5790624629815756, 0.465547782819184) , + rgb (0.7850684501960684, 0.5742417003617839, 0.46059116206904965) , + rgb (0.7839706083641448, 0.5694157832671042, 0.4557215474289206) , + rgb (0.7828622526444091, 0.5645853311116688, 0.45093985823706345) , + rgb (0.7817418047898184, 0.5597509805259486, 0.44624687186865436) , + rgb (0.7806077474948377, 0.5549133574489061, 0.4416433242636464) , + rgb (0.7794586273150664, 0.5500730841397727, 0.4371297985644476) , + rgb (0.7782934580763312, 0.545230594884266, 0.432706647838971) , + rgb (0.7771103295521099, 0.5403867491056124, 0.4283745037125848) , + rgb (0.775907907306857, 0.5355421788246119, 0.42413367909988375) , + rgb (0.774684947460632, 0.5306974938477673, 0.4199844035696376) , + rgb (0.7734402182988989, 0.5258533209345156, 0.41592679539764366) , + rgb (0.7721725722960555, 0.5210102658711383, 0.4119608998712287) , + rgb (0.7708809196230247, 0.516168926434691, 0.40808667584648967) , + rgb (0.7695642334401418, 0.5113298901696085, 0.4043039806968248) , + rgb (0.768221765997353, 0.5064936237128791, 0.40061257089416885) , + rgb (0.7668522895064389, 0.5016608471009063, 0.39701221751773474) , + rgb (0.7654549259333051, 0.4968321290972723, 0.3935025400011538) , + rgb (0.7640288560928866, 0.49200802533379656, 0.39008308392311997) , + rgb (0.7625733355405261, 0.48718906673415824, 0.38675335037837993) , + rgb (0.7610876378057071, 0.48237579130289127, 0.3835127572385229) , + rgb (0.7595711110534006, 0.4775687122205708, 0.380360657784311) , + rgb (0.7580232553845584, 0.4727682731566229, 0.3772963553109668) , + rgb (0.7564434157714071, 0.4679750143794846, 0.37431909037543515) , + rgb (0.7548310506695954, 0.46318942799460555, 0.3714280448394211) , + rgb (0.7531856636904657, 0.45841199172949604, 0.3686223664223477) , + rgb (0.7515068504589166, 0.45364314496866825, 0.36590112443835765) , + rgb (0.7497942054717047, 0.4488833348154881, 0.3632633755836028) , + rgb (0.7480473927555956, 0.44413297780351974, 0.36070813602540136) , + rgb (0.7462661578916344, 0.439392450449735, 0.3582343914230064) , + rgb (0.7444501867657067, 0.4346621718461711, 0.35584108091122535) , + rgb (0.7425992159973317, 0.42994254036133867, 0.3535270924537459) , + rgb (0.7407130161950609, 0.4252339389526239, 0.35129130890802607) , + rgb (0.7387914002459927, 0.4205367299231533, 0.34913260148542435) , + rgb (0.7368342217358587, 0.4158512585029011, 0.347049785207584) , + rgb (0.7348413359856494, 0.4111778700451951, 0.3450416947080907) , + rgb (0.7328127050626875, 0.4065168468778026, 0.3431071517341082) , + rgb (0.7307482075484517, 0.401868526884681, 0.3412449533046818) , + rgb (0.7286477385671655, 0.39723324476747235, 0.33945384341064017) , + rgb (0.7265112290022755, 0.3926113126792577, 0.3377325942005665) , + rgb (0.7243386564778159, 0.38800301593162145, 0.3360799596569183) , + rgb (0.7221299918421461, 0.3834086450896306, 0.33449469983585844) , + rgb (0.7198852149054985, 0.37882848839337313, 0.332975552002454) , + rgb (0.7176044490813385, 0.3742627271068619, 0.3315213862095893) , + rgb (0.7152876061484729, 0.3697117022522345, 0.3301308728723546) , + rgb (0.7129346683977347, 0.36517570519856757, 0.3288027427038317) , + rgb (0.7105456546582587, 0.36065500290840113, 0.3275357416278876) , + rgb (0.7081205956842048, 0.356149855233803, 0.32632861885644465) , + rgb (0.7056595112261009, 0.3516605297812094, 0.32518014084085567) , + rgb (0.7031624945881415, 0.34718723719598, 0.32408913679491225) , + rgb (0.700629624772421, 0.34273019305341756, 0.32305449047765694) , + rgb (0.6980608153581771, 0.3382897632604862, 0.3220747885521809) , + rgb (0.6954560834689112, 0.33386622163232865, 0.3211488430698579) , + rgb (0.6928154484676493, 0.32945984647042675, 0.3202754315314667) , + rgb (0.6901389321505248, 0.32507091815606004, 0.319453323328983) , + rgb (0.6874265643516962, 0.32069970535138104, 0.3186813762227769) , + rgb (0.6846785094249453, 0.3163463482122221, 0.31795870784057567) , + rgb (0.6818945715094452, 0.31201133280550686, 0.3172838048924495) , + rgb (0.6790747402815734, 0.30769497879760166, 0.31665545668946665) , + rgb (0.6762189792440975, 0.30339762792450425, 0.3160724937230589) , + rgb (0.6733272556481733, 0.29911962764489264, 0.3155337232398221) , + rgb (0.670399595476762, 0.29486126309253047, 0.3150381395687221) , + rgb (0.6674360376636913, 0.29062280081258873, 0.31458483752056837) , + rgb (0.6644363246987884, 0.2864048361425618, 0.31417223403606975) , + rgb (0.6614003753260178, 0.28220778870555907, 0.3137991292649849) , + rgb (0.6583280801134499, 0.2780321095766563, 0.3134643447952643) , + rgb (0.6552193260932713, 0.2738782665241015, 0.3131666792687211) , + rgb (0.652074172902773, 0.269746505252367, 0.3129056060581917) , + rgb (0.6488923016945825, 0.2656375533620908, 0.3126794181957019) , + rgb (0.6456734938264543, 0.2615520316161528, 0.31248673753935263) , + rgb (0.642417577481186, 0.257490519876798, 0.31232631707560987) , + rgb (0.6391243387840212, 0.2534536546198314, 0.3121968961206398) , + rgb (0.6357937104834237, 0.24944185818822678, 0.3120979395330059) , + rgb (0.6324253485421027, 0.24545598775548677, 0.3120276597462445) , + rgb (0.6290189201698587, 0.24149689191922535, 0.3119844719564572) , + rgb (0.6255741650043496, 0.23756535071152696, 0.3119669831491227) , + rgb (0.6220907982108261, 0.2336621873300741, 0.3119738327362739) , + rgb (0.6185686525887719, 0.2297879924917992, 0.3120046383872893) , + rgb (0.6150072323639137, 0.22594402043981826, 0.3120568068576574) , + rgb (0.6114062072731884, 0.22213124697023234, 0.3121288139643524) , + rgb (0.6077652399481865, 0.21835070166659282, 0.312219032918702) , + rgb (0.6040840169673274, 0.21460331490206347, 0.31232652641170694) , + rgb (0.6003621301041158, 0.21089030138947745, 0.3124493441041469) , + rgb (0.5965991810912237, 0.207212956082026, 0.3125852303112123) , + rgb (0.5927948053652026, 0.20357251410079796, 0.3127323483930494) , + rgb (0.5889486193554471, 0.19997020971775276, 0.31288922211590126) , + rgb (0.5850602439646688, 0.19640737049066315, 0.3130540116373273) , + rgb (0.5811293276158656, 0.19288548904692518, 0.3132239939418394) , + rgb (0.5771555081299204, 0.18940601489760422, 0.3133970433357208) , + rgb (0.5731384575410787, 0.18597036007065024, 0.3135712686852) , + rgb (0.5690778478401143, 0.18258004462335425, 0.3137444095679653) , + rgb (0.564973435290177, 0.17923664950367169, 0.3139136046337036) , + rgb (0.5608249903911717, 0.17594170887918095, 0.31407639883970623) , + rgb (0.5566322903496934, 0.17269677158182117, 0.31423043195101424) , + rgb (0.5523952157271191, 0.16950338809328983, 0.3143729155461537) , + rgb (0.5481137003346762, 0.1663630904279047, 0.3145010299091471) , + rgb (0.5437877131360856, 0.16327738551419116, 0.31461204226295625) , + rgb (0.5394173664919906, 0.16024769309971934, 0.31470295028655965) , + rgb (0.5350027976174474, 0.15727540775107324, 0.3147708520739653) , + rgb (0.5305442048985645, 0.15436183633886777, 0.3148129978918713) , + rgb (0.5260418962547748, 0.15150818660835483, 0.31482653406646727) , + rgb (0.5214965286322996, 0.14871544765633712, 0.3148076795453443) , + rgb (0.5169084880054446, 0.14598463068714407, 0.3147540759228004) , + rgb (0.5122783510532176, 0.14331656120063752, 0.3146630922831542) , + rgb (0.5076068118105369, 0.14071192654913128, 0.3145320012008257) , + rgb (0.5028952497497061, 0.13817086581280427, 0.3143566215383367) , + rgb (0.4981443546207415, 0.13569380302451714, 0.314135190862664) , + rgb (0.49335504375145617, 0.13328091630401023, 0.31386561956734976) , + rgb (0.48852847371852987, 0.13093210934893723, 0.31354553695453014) , + rgb (0.48366628618847957, 0.1286467902201389, 0.31317188565991266) , + rgb (0.47877034239726296, 0.12642401401409453, 0.3127417273582196) , + rgb (0.473841437035254, 0.12426354237989065, 0.31225470169927194) , + rgb (0.46888111384598413, 0.12216445576414045, 0.31170911458932665) , + rgb (0.46389102840284874, 0.12012561256850712, 0.31110343446582983) , + rgb (0.45887288947308297, 0.11814571137706886, 0.3104363697903881) , + rgb (0.4538300508699989, 0.11622183788331528, 0.3097044124984492) , + rgb (0.4487629917317482, 0.1143535557462255, 0.30890905921943196) , + rgb (0.44367358645071275, 0.11253912421257944, 0.3080497309546545) , + rgb (0.4385637818793154, 0.11077667828375456, 0.30712600062348083) , + rgb (0.4334355841041439, 0.1090642347484701, 0.3061376792828915) , + rgb (0.4282910131578975, 0.1073997763055258, 0.30508479060294547) , + rgb (0.42313214269556043, 0.10578120994917611, 0.3039675809469457) , + rgb (0.41796105205173684, 0.10420644885760968, 0.3027865203963184) , + rgb (0.41277985630360303, 0.1026734006932461, 0.3015422643746897) , + rgb (0.4075912039268871, 0.10117945586419633, 0.300235195077286) , + rgb (0.40239692379737496, 0.09972293031495055, 0.2988667436973397) , + rgb (0.39719876876325577, 0.09830232096827862, 0.2974385647628578) , + rgb (0.39199887556812907, 0.09691583650296684, 0.2959521200550908) , + rgb (0.3867993907954417, 0.09556181960083443, 0.29440901248173756) , + rgb (0.38160247377467543, 0.09423873126371218, 0.2928110750626949) , + rgb (0.3764103053221462, 0.09294519809377791, 0.2911602415731392) , + rgb (0.3712250843130934, 0.09167999748026273, 0.2894586539763317) , + rgb (0.36605031412464006, 0.0904406854276979, 0.2877077458811747) , + rgb (0.36088752387578377, 0.0892271943627452, 0.28591050458531014) , + rgb (0.35573889947341125, 0.08803897435024335, 0.2840695897279818) , + rgb (0.3506067824603248, 0.08687555176033529, 0.28218770540182386) , + rgb (0.345493557138718, 0.08573665496512634, 0.28026769921081435) , + rgb (0.34040164359597463, 0.08462223619170267, 0.27831254595259397) , + rgb (0.3353335322445545, 0.08353243411900396, 0.2763253435679004) , + rgb (0.3302917447118144, 0.08246763389003825, 0.27430929404579435) , + rgb (0.3252788886040126, 0.08142839007654609, 0.27226772884656186) , + rgb (0.3202998655799406, 0.08041299473755484, 0.2702032289303951) , + rgb (0.3153587000920581, 0.07942099731524319, 0.2681190407694196) , + rgb (0.31045520848595526, 0.07845687167618218, 0.2660200572779356) , + rgb (0.30559226007249934, 0.07752196310753731, 0.2639100669211966) , + rgb (0.3007727681291869, 0.07661782433616476, 0.2617929409781967) , + rgb (0.2960004726065818, 0.07574533600095842, 0.25967245030364566) , + rgb (0.29128515387578635, 0.0748990498474667, 0.25755101595750435) , + rgb (0.28662309235899847, 0.07408846082680887, 0.2554347867371703) , + rgb (0.2820174629736694, 0.07331569321404097, 0.25332800295084507) , + rgb (0.277471508091428, 0.07258296989925478, 0.2512349399594277) , + rgb (0.272997015188973, 0.07188355544616351, 0.2491584709323293) , + rgb (0.2685909594817286, 0.07122671627792246, 0.24710443563450618) , + rgb (0.2642551220706094, 0.07061659562299544, 0.24507758869355967) , + rgb (0.25999463887892144, 0.07005385560386188, 0.24308218808684579) , + rgb (0.2558213554748177, 0.06953231029187984, 0.24112190491594204) , + rgb (0.25172899728289466, 0.0690646308260355, 0.23920260612763083) , + rgb (0.247720929905011, 0.06865333790948652, 0.2373288009471749) , + rgb (0.2438114972024792, 0.06828985152901187, 0.23550427698321885) , + rgb (0.23999586188690308, 0.06798502996477995, 0.23373434258507808) , + rgb (0.23627495835774248, 0.06774359820987802, 0.23202360805926608) , + rgb (0.23266299920501882, 0.06755710438847978, 0.23037617493752832) , + rgb (0.2291562027859284, 0.06743473087115257, 0.22879681433956656) , + rgb (0.2257539681670791, 0.06738213230014747, 0.22728984778098055) , + rgb (0.22247308588973624, 0.06738821405309284, 0.22585960379408354) , + rgb (0.21930503925136402, 0.06746578636294004, 0.22451023616807558) , + rgb (0.21625279838647882, 0.06761633027051639, 0.22324568672294431) , + rgb (0.2133313859647627, 0.06783014842602667, 0.2220704321302429) , + rgb (0.21052882914958676, 0.06812195249816172, 0.22098759107715404) , + rgb (0.20785704662965598, 0.06848439879702528, 0.22000133917653536) , + rgb (0.20531725273301316, 0.06891959226639757, 0.21911516689288835) , + rgb (0.20290365333558247, 0.06943524858045896, 0.21833167885096033) , + rgb (0.20058760685133747, 0.07006457614998421, 0.21762721310371608) , + rgb (0.19819343656336558, 0.07097462525273879, 0.21690975060032436) , + rgb (0.19571853588267552, 0.07215778103960274, 0.21617499187076789) , + rgb (0.1931548636579131, 0.07360681904011795, 0.21542362939081539) , + rgb (0.19049578401722037, 0.07531127841678764, 0.2146562337112265) , + rgb (0.18774482037046955, 0.07725158846803931, 0.21387448578597812) , + rgb (0.18488035509396164, 0.07942573027972388, 0.21307651648984993) + }); list_data viridis = list_data(new pen[] { - rgb (0.267004, 0.004874, 0.329415) , - rgb (0.26851, 0.009605, 0.335427) , - rgb (0.269944, 0.014625, 0.341379) , - rgb (0.271305, 0.019942, 0.347269) , - rgb (0.272594, 0.025563, 0.353093) , - rgb (0.273809, 0.031497, 0.358853) , - rgb (0.274952, 0.037752, 0.364543) , - rgb (0.276022, 0.044167, 0.370164) , - rgb (0.277018, 0.050344, 0.375715) , - rgb (0.277941, 0.056324, 0.381191) , - rgb (0.278791, 0.062145, 0.386592) , - rgb (0.279566, 0.067836, 0.391917) , - rgb (0.280267, 0.073417, 0.397163) , - rgb (0.280894, 0.078907, 0.402329) , - rgb (0.281446, 0.08432, 0.407414) , - rgb (0.281924, 0.089666, 0.412415) , - rgb (0.282327, 0.094955, 0.417331) , - rgb (0.282656, 0.100196, 0.42216) , - rgb (0.28291, 0.105393, 0.426902) , - rgb (0.283091, 0.110553, 0.431554) , - rgb (0.283197, 0.11568, 0.436115) , - rgb (0.283229, 0.120777, 0.440584) , - rgb (0.283187, 0.125848, 0.44496) , - rgb (0.283072, 0.130895, 0.449241) , - rgb (0.282884, 0.13592, 0.453427) , - rgb (0.282623, 0.140926, 0.457517) , - rgb (0.28229, 0.145912, 0.46151) , - rgb (0.281887, 0.150881, 0.465405) , - rgb (0.281412, 0.155834, 0.469201) , - rgb (0.280868, 0.160771, 0.472899) , - rgb (0.280255, 0.165693, 0.476498) , - rgb (0.279574, 0.170599, 0.479997) , - rgb (0.278826, 0.17549, 0.483397) , - rgb (0.278012, 0.180367, 0.486697) , - rgb (0.277134, 0.185228, 0.489898) , - rgb (0.276194, 0.190074, 0.493001) , - rgb (0.275191, 0.194905, 0.496005) , - rgb (0.274128, 0.199721, 0.498911) , - rgb (0.273006, 0.20452, 0.501721) , - rgb (0.271828, 0.209303, 0.504434) , - rgb (0.270595, 0.214069, 0.507052) , - rgb (0.269308, 0.218818, 0.509577) , - rgb (0.267968, 0.223549, 0.512008) , - rgb (0.26658, 0.228262, 0.514349) , - rgb (0.265145, 0.232956, 0.516599) , - rgb (0.263663, 0.237631, 0.518762) , - rgb (0.262138, 0.242286, 0.520837) , - rgb (0.260571, 0.246922, 0.522828) , - rgb (0.258965, 0.251537, 0.524736) , - rgb (0.257322, 0.25613, 0.526563) , - rgb (0.255645, 0.260703, 0.528312) , - rgb (0.253935, 0.265254, 0.529983) , - rgb (0.252194, 0.269783, 0.531579) , - rgb (0.250425, 0.27429, 0.533103) , - rgb (0.248629, 0.278775, 0.534556) , - rgb (0.246811, 0.283237, 0.535941) , - rgb (0.244972, 0.287675, 0.53726) , - rgb (0.243113, 0.292092, 0.538516) , - rgb (0.241237, 0.296485, 0.539709) , - rgb (0.239346, 0.300855, 0.540844) , - rgb (0.237441, 0.305202, 0.541921) , - rgb (0.235526, 0.309527, 0.542944) , - rgb (0.233603, 0.313828, 0.543914) , - rgb (0.231674, 0.318106, 0.544834) , - rgb (0.229739, 0.322361, 0.545706) , - rgb (0.227802, 0.326594, 0.546532) , - rgb (0.225863, 0.330805, 0.547314) , - rgb (0.223925, 0.334994, 0.548053) , - rgb (0.221989, 0.339161, 0.548752) , - rgb (0.220057, 0.343307, 0.549413) , - rgb (0.21813, 0.347432, 0.550038) , - rgb (0.21621, 0.351535, 0.550627) , - rgb (0.214298, 0.355619, 0.551184) , - rgb (0.212395, 0.359683, 0.55171) , - rgb (0.210503, 0.363727, 0.552206) , - rgb (0.208623, 0.367752, 0.552675) , - rgb (0.206756, 0.371758, 0.553117) , - rgb (0.204903, 0.375746, 0.553533) , - rgb (0.203063, 0.379716, 0.553925) , - rgb (0.201239, 0.38367, 0.554294) , - rgb (0.19943, 0.387607, 0.554642) , - rgb (0.197636, 0.391528, 0.554969) , - rgb (0.19586, 0.395433, 0.555276) , - rgb (0.1941, 0.399323, 0.555565) , - rgb (0.192357, 0.403199, 0.555836) , - rgb (0.190631, 0.407061, 0.556089) , - rgb (0.188923, 0.41091, 0.556326) , - rgb (0.187231, 0.414746, 0.556547) , - rgb (0.185556, 0.41857, 0.556753) , - rgb (0.183898, 0.422383, 0.556944) , - rgb (0.182256, 0.426184, 0.55712) , - rgb (0.180629, 0.429975, 0.557282) , - rgb (0.179019, 0.433756, 0.55743) , - rgb (0.177423, 0.437527, 0.557565) , - rgb (0.175841, 0.44129, 0.557685) , - rgb (0.174274, 0.445044, 0.557792) , - rgb (0.172719, 0.448791, 0.557885) , - rgb (0.171176, 0.45253, 0.557965) , - rgb (0.169646, 0.456262, 0.55803) , - rgb (0.168126, 0.459988, 0.558082) , - rgb (0.166617, 0.463708, 0.558119) , - rgb (0.165117, 0.467423, 0.558141) , - rgb (0.163625, 0.471133, 0.558148) , - rgb (0.162142, 0.474838, 0.55814) , - rgb (0.160665, 0.47854, 0.558115) , - rgb (0.159194, 0.482237, 0.558073) , - rgb (0.157729, 0.485932, 0.558013) , - rgb (0.15627, 0.489624, 0.557936) , - rgb (0.154815, 0.493313, 0.55784) , - rgb (0.153364, 0.497, 0.557724) , - rgb (0.151918, 0.500685, 0.557587) , - rgb (0.150476, 0.504369, 0.55743) , - rgb (0.149039, 0.508051, 0.55725) , - rgb (0.147607, 0.511733, 0.557049) , - rgb (0.14618, 0.515413, 0.556823) , - rgb (0.144759, 0.519093, 0.556572) , - rgb (0.143343, 0.522773, 0.556295) , - rgb (0.141935, 0.526453, 0.555991) , - rgb (0.140536, 0.530132, 0.555659) , - rgb (0.139147, 0.533812, 0.555298) , - rgb (0.13777, 0.537492, 0.554906) , - rgb (0.136408, 0.541173, 0.554483) , - rgb (0.135066, 0.544853, 0.554029) , - rgb (0.133743, 0.548535, 0.553541) , - rgb (0.132444, 0.552216, 0.553018) , - rgb (0.131172, 0.555899, 0.552459) , - rgb (0.129933, 0.559582, 0.551864) , - rgb (0.128729, 0.563265, 0.551229) , - rgb (0.127568, 0.566949, 0.550556) , - rgb (0.126453, 0.570633, 0.549841) , - rgb (0.125394, 0.574318, 0.549086) , - rgb (0.124395, 0.578002, 0.548287) , - rgb (0.123463, 0.581687, 0.547445) , - rgb (0.122606, 0.585371, 0.546557) , - rgb (0.121831, 0.589055, 0.545623) , - rgb (0.121148, 0.592739, 0.544641) , - rgb (0.120565, 0.596422, 0.543611) , - rgb (0.120092, 0.600104, 0.54253) , - rgb (0.119738, 0.603785, 0.5414) , - rgb (0.119512, 0.607464, 0.540218) , - rgb (0.119423, 0.611141, 0.538982) , - rgb (0.119483, 0.614817, 0.537692) , - rgb (0.119699, 0.61849, 0.536347) , - rgb (0.120081, 0.622161, 0.534946) , - rgb (0.120638, 0.625828, 0.533488) , - rgb (0.12138, 0.629492, 0.531973) , - rgb (0.122312, 0.633153, 0.530398) , - rgb (0.123444, 0.636809, 0.528763) , - rgb (0.12478, 0.640461, 0.527068) , - rgb (0.126326, 0.644107, 0.525311) , - rgb (0.128087, 0.647749, 0.523491) , - rgb (0.130067, 0.651384, 0.521608) , - rgb (0.132268, 0.655014, 0.519661) , - rgb (0.134692, 0.658636, 0.517649) , - rgb (0.137339, 0.662252, 0.515571) , - rgb (0.14021, 0.665859, 0.513427) , - rgb (0.143303, 0.669459, 0.511215) , - rgb (0.146616, 0.67305, 0.508936) , - rgb (0.150148, 0.676631, 0.506589) , - rgb (0.153894, 0.680203, 0.504172) , - rgb (0.157851, 0.683765, 0.501686) , - rgb (0.162016, 0.687316, 0.499129) , - rgb (0.166383, 0.690856, 0.496502) , - rgb (0.170948, 0.694384, 0.493803) , - rgb (0.175707, 0.6979, 0.491033) , - rgb (0.180653, 0.701402, 0.488189) , - rgb (0.185783, 0.704891, 0.485273) , - rgb (0.19109, 0.708366, 0.482284) , - rgb (0.196571, 0.711827, 0.479221) , - rgb (0.202219, 0.715272, 0.476084) , - rgb (0.20803, 0.718701, 0.472873) , - rgb (0.214, 0.722114, 0.469588) , - rgb (0.220124, 0.725509, 0.466226) , - rgb (0.226397, 0.728888, 0.462789) , - rgb (0.232815, 0.732247, 0.459277) , - rgb (0.239374, 0.735588, 0.455688) , - rgb (0.24607, 0.73891, 0.452024) , - rgb (0.252899, 0.742211, 0.448284) , - rgb (0.259857, 0.745492, 0.444467) , - rgb (0.266941, 0.748751, 0.440573) , - rgb (0.274149, 0.751988, 0.436601) , - rgb (0.281477, 0.755203, 0.432552) , - rgb (0.288921, 0.758394, 0.428426) , - rgb (0.296479, 0.761561, 0.424223) , - rgb (0.304148, 0.764704, 0.419943) , - rgb (0.311925, 0.767822, 0.415586) , - rgb (0.319809, 0.770914, 0.411152) , - rgb (0.327796, 0.77398, 0.40664) , - rgb (0.335885, 0.777018, 0.402049) , - rgb (0.344074, 0.780029, 0.397381) , - rgb (0.35236, 0.783011, 0.392636) , - rgb (0.360741, 0.785964, 0.387814) , - rgb (0.369214, 0.788888, 0.382914) , - rgb (0.377779, 0.791781, 0.377939) , - rgb (0.386433, 0.794644, 0.372886) , - rgb (0.395174, 0.797475, 0.367757) , - rgb (0.404001, 0.800275, 0.362552) , - rgb (0.412913, 0.803041, 0.357269) , - rgb (0.421908, 0.805774, 0.35191) , - rgb (0.430983, 0.808473, 0.346476) , - rgb (0.440137, 0.811138, 0.340967) , - rgb (0.449368, 0.813768, 0.335384) , - rgb (0.458674, 0.816363, 0.329727) , - rgb (0.468053, 0.818921, 0.323998) , - rgb (0.477504, 0.821444, 0.318195) , - rgb (0.487026, 0.823929, 0.312321) , - rgb (0.496615, 0.826376, 0.306377) , - rgb (0.506271, 0.828786, 0.300362) , - rgb (0.515992, 0.831158, 0.294279) , - rgb (0.525776, 0.833491, 0.288127) , - rgb (0.535621, 0.835785, 0.281908) , - rgb (0.545524, 0.838039, 0.275626) , - rgb (0.555484, 0.840254, 0.269281) , - rgb (0.565498, 0.84243, 0.262877) , - rgb (0.575563, 0.844566, 0.256415) , - rgb (0.585678, 0.846661, 0.249897) , - rgb (0.595839, 0.848717, 0.243329) , - rgb (0.606045, 0.850733, 0.236712) , - rgb (0.616293, 0.852709, 0.230052) , - rgb (0.626579, 0.854645, 0.223353) , - rgb (0.636902, 0.856542, 0.21662) , - rgb (0.647257, 0.8584, 0.209861) , - rgb (0.657642, 0.860219, 0.203082) , - rgb (0.668054, 0.861999, 0.196293) , - rgb (0.678489, 0.863742, 0.189503) , - rgb (0.688944, 0.865448, 0.182725) , - rgb (0.699415, 0.867117, 0.175971) , - rgb (0.709898, 0.868751, 0.169257) , - rgb (0.720391, 0.87035, 0.162603) , - rgb (0.730889, 0.871916, 0.156029) , - rgb (0.741388, 0.873449, 0.149561) , - rgb (0.751884, 0.874951, 0.143228) , - rgb (0.762373, 0.876424, 0.137064) , - rgb (0.772852, 0.877868, 0.131109) , - rgb (0.783315, 0.879285, 0.125405) , - rgb (0.79376, 0.880678, 0.120005) , - rgb (0.804182, 0.882046, 0.114965) , - rgb (0.814576, 0.883393, 0.110347) , - rgb (0.82494, 0.88472, 0.106217) , - rgb (0.83527, 0.886029, 0.102646) , - rgb (0.845561, 0.887322, 0.099702) , - rgb (0.85581, 0.888601, 0.097452) , - rgb (0.866013, 0.889868, 0.095953) , - rgb (0.876168, 0.891125, 0.09525) , - rgb (0.886271, 0.892374, 0.095374) , - rgb (0.89632, 0.893616, 0.096335) , - rgb (0.906311, 0.894855, 0.098125) , - rgb (0.916242, 0.896091, 0.100717) , - rgb (0.926106, 0.89733, 0.104071) , - rgb (0.935904, 0.89857, 0.108131) , - rgb (0.945636, 0.899815, 0.112838) , - rgb (0.9553, 0.901065, 0.118128) , - rgb (0.964894, 0.902323, 0.123941) , - rgb (0.974417, 0.90359, 0.130215) , - rgb (0.983868, 0.904867, 0.136897) , - rgb (0.993248, 0.906157, 0.143936) -}); + rgb (0.267004, 0.004874, 0.329415) , + rgb (0.26851, 0.009605, 0.335427) , + rgb (0.269944, 0.014625, 0.341379) , + rgb (0.271305, 0.019942, 0.347269) , + rgb (0.272594, 0.025563, 0.353093) , + rgb (0.273809, 0.031497, 0.358853) , + rgb (0.274952, 0.037752, 0.364543) , + rgb (0.276022, 0.044167, 0.370164) , + rgb (0.277018, 0.050344, 0.375715) , + rgb (0.277941, 0.056324, 0.381191) , + rgb (0.278791, 0.062145, 0.386592) , + rgb (0.279566, 0.067836, 0.391917) , + rgb (0.280267, 0.073417, 0.397163) , + rgb (0.280894, 0.078907, 0.402329) , + rgb (0.281446, 0.08432, 0.407414) , + rgb (0.281924, 0.089666, 0.412415) , + rgb (0.282327, 0.094955, 0.417331) , + rgb (0.282656, 0.100196, 0.42216) , + rgb (0.28291, 0.105393, 0.426902) , + rgb (0.283091, 0.110553, 0.431554) , + rgb (0.283197, 0.11568, 0.436115) , + rgb (0.283229, 0.120777, 0.440584) , + rgb (0.283187, 0.125848, 0.44496) , + rgb (0.283072, 0.130895, 0.449241) , + rgb (0.282884, 0.13592, 0.453427) , + rgb (0.282623, 0.140926, 0.457517) , + rgb (0.28229, 0.145912, 0.46151) , + rgb (0.281887, 0.150881, 0.465405) , + rgb (0.281412, 0.155834, 0.469201) , + rgb (0.280868, 0.160771, 0.472899) , + rgb (0.280255, 0.165693, 0.476498) , + rgb (0.279574, 0.170599, 0.479997) , + rgb (0.278826, 0.17549, 0.483397) , + rgb (0.278012, 0.180367, 0.486697) , + rgb (0.277134, 0.185228, 0.489898) , + rgb (0.276194, 0.190074, 0.493001) , + rgb (0.275191, 0.194905, 0.496005) , + rgb (0.274128, 0.199721, 0.498911) , + rgb (0.273006, 0.20452, 0.501721) , + rgb (0.271828, 0.209303, 0.504434) , + rgb (0.270595, 0.214069, 0.507052) , + rgb (0.269308, 0.218818, 0.509577) , + rgb (0.267968, 0.223549, 0.512008) , + rgb (0.26658, 0.228262, 0.514349) , + rgb (0.265145, 0.232956, 0.516599) , + rgb (0.263663, 0.237631, 0.518762) , + rgb (0.262138, 0.242286, 0.520837) , + rgb (0.260571, 0.246922, 0.522828) , + rgb (0.258965, 0.251537, 0.524736) , + rgb (0.257322, 0.25613, 0.526563) , + rgb (0.255645, 0.260703, 0.528312) , + rgb (0.253935, 0.265254, 0.529983) , + rgb (0.252194, 0.269783, 0.531579) , + rgb (0.250425, 0.27429, 0.533103) , + rgb (0.248629, 0.278775, 0.534556) , + rgb (0.246811, 0.283237, 0.535941) , + rgb (0.244972, 0.287675, 0.53726) , + rgb (0.243113, 0.292092, 0.538516) , + rgb (0.241237, 0.296485, 0.539709) , + rgb (0.239346, 0.300855, 0.540844) , + rgb (0.237441, 0.305202, 0.541921) , + rgb (0.235526, 0.309527, 0.542944) , + rgb (0.233603, 0.313828, 0.543914) , + rgb (0.231674, 0.318106, 0.544834) , + rgb (0.229739, 0.322361, 0.545706) , + rgb (0.227802, 0.326594, 0.546532) , + rgb (0.225863, 0.330805, 0.547314) , + rgb (0.223925, 0.334994, 0.548053) , + rgb (0.221989, 0.339161, 0.548752) , + rgb (0.220057, 0.343307, 0.549413) , + rgb (0.21813, 0.347432, 0.550038) , + rgb (0.21621, 0.351535, 0.550627) , + rgb (0.214298, 0.355619, 0.551184) , + rgb (0.212395, 0.359683, 0.55171) , + rgb (0.210503, 0.363727, 0.552206) , + rgb (0.208623, 0.367752, 0.552675) , + rgb (0.206756, 0.371758, 0.553117) , + rgb (0.204903, 0.375746, 0.553533) , + rgb (0.203063, 0.379716, 0.553925) , + rgb (0.201239, 0.38367, 0.554294) , + rgb (0.19943, 0.387607, 0.554642) , + rgb (0.197636, 0.391528, 0.554969) , + rgb (0.19586, 0.395433, 0.555276) , + rgb (0.1941, 0.399323, 0.555565) , + rgb (0.192357, 0.403199, 0.555836) , + rgb (0.190631, 0.407061, 0.556089) , + rgb (0.188923, 0.41091, 0.556326) , + rgb (0.187231, 0.414746, 0.556547) , + rgb (0.185556, 0.41857, 0.556753) , + rgb (0.183898, 0.422383, 0.556944) , + rgb (0.182256, 0.426184, 0.55712) , + rgb (0.180629, 0.429975, 0.557282) , + rgb (0.179019, 0.433756, 0.55743) , + rgb (0.177423, 0.437527, 0.557565) , + rgb (0.175841, 0.44129, 0.557685) , + rgb (0.174274, 0.445044, 0.557792) , + rgb (0.172719, 0.448791, 0.557885) , + rgb (0.171176, 0.45253, 0.557965) , + rgb (0.169646, 0.456262, 0.55803) , + rgb (0.168126, 0.459988, 0.558082) , + rgb (0.166617, 0.463708, 0.558119) , + rgb (0.165117, 0.467423, 0.558141) , + rgb (0.163625, 0.471133, 0.558148) , + rgb (0.162142, 0.474838, 0.55814) , + rgb (0.160665, 0.47854, 0.558115) , + rgb (0.159194, 0.482237, 0.558073) , + rgb (0.157729, 0.485932, 0.558013) , + rgb (0.15627, 0.489624, 0.557936) , + rgb (0.154815, 0.493313, 0.55784) , + rgb (0.153364, 0.497, 0.557724) , + rgb (0.151918, 0.500685, 0.557587) , + rgb (0.150476, 0.504369, 0.55743) , + rgb (0.149039, 0.508051, 0.55725) , + rgb (0.147607, 0.511733, 0.557049) , + rgb (0.14618, 0.515413, 0.556823) , + rgb (0.144759, 0.519093, 0.556572) , + rgb (0.143343, 0.522773, 0.556295) , + rgb (0.141935, 0.526453, 0.555991) , + rgb (0.140536, 0.530132, 0.555659) , + rgb (0.139147, 0.533812, 0.555298) , + rgb (0.13777, 0.537492, 0.554906) , + rgb (0.136408, 0.541173, 0.554483) , + rgb (0.135066, 0.544853, 0.554029) , + rgb (0.133743, 0.548535, 0.553541) , + rgb (0.132444, 0.552216, 0.553018) , + rgb (0.131172, 0.555899, 0.552459) , + rgb (0.129933, 0.559582, 0.551864) , + rgb (0.128729, 0.563265, 0.551229) , + rgb (0.127568, 0.566949, 0.550556) , + rgb (0.126453, 0.570633, 0.549841) , + rgb (0.125394, 0.574318, 0.549086) , + rgb (0.124395, 0.578002, 0.548287) , + rgb (0.123463, 0.581687, 0.547445) , + rgb (0.122606, 0.585371, 0.546557) , + rgb (0.121831, 0.589055, 0.545623) , + rgb (0.121148, 0.592739, 0.544641) , + rgb (0.120565, 0.596422, 0.543611) , + rgb (0.120092, 0.600104, 0.54253) , + rgb (0.119738, 0.603785, 0.5414) , + rgb (0.119512, 0.607464, 0.540218) , + rgb (0.119423, 0.611141, 0.538982) , + rgb (0.119483, 0.614817, 0.537692) , + rgb (0.119699, 0.61849, 0.536347) , + rgb (0.120081, 0.622161, 0.534946) , + rgb (0.120638, 0.625828, 0.533488) , + rgb (0.12138, 0.629492, 0.531973) , + rgb (0.122312, 0.633153, 0.530398) , + rgb (0.123444, 0.636809, 0.528763) , + rgb (0.12478, 0.640461, 0.527068) , + rgb (0.126326, 0.644107, 0.525311) , + rgb (0.128087, 0.647749, 0.523491) , + rgb (0.130067, 0.651384, 0.521608) , + rgb (0.132268, 0.655014, 0.519661) , + rgb (0.134692, 0.658636, 0.517649) , + rgb (0.137339, 0.662252, 0.515571) , + rgb (0.14021, 0.665859, 0.513427) , + rgb (0.143303, 0.669459, 0.511215) , + rgb (0.146616, 0.67305, 0.508936) , + rgb (0.150148, 0.676631, 0.506589) , + rgb (0.153894, 0.680203, 0.504172) , + rgb (0.157851, 0.683765, 0.501686) , + rgb (0.162016, 0.687316, 0.499129) , + rgb (0.166383, 0.690856, 0.496502) , + rgb (0.170948, 0.694384, 0.493803) , + rgb (0.175707, 0.6979, 0.491033) , + rgb (0.180653, 0.701402, 0.488189) , + rgb (0.185783, 0.704891, 0.485273) , + rgb (0.19109, 0.708366, 0.482284) , + rgb (0.196571, 0.711827, 0.479221) , + rgb (0.202219, 0.715272, 0.476084) , + rgb (0.20803, 0.718701, 0.472873) , + rgb (0.214, 0.722114, 0.469588) , + rgb (0.220124, 0.725509, 0.466226) , + rgb (0.226397, 0.728888, 0.462789) , + rgb (0.232815, 0.732247, 0.459277) , + rgb (0.239374, 0.735588, 0.455688) , + rgb (0.24607, 0.73891, 0.452024) , + rgb (0.252899, 0.742211, 0.448284) , + rgb (0.259857, 0.745492, 0.444467) , + rgb (0.266941, 0.748751, 0.440573) , + rgb (0.274149, 0.751988, 0.436601) , + rgb (0.281477, 0.755203, 0.432552) , + rgb (0.288921, 0.758394, 0.428426) , + rgb (0.296479, 0.761561, 0.424223) , + rgb (0.304148, 0.764704, 0.419943) , + rgb (0.311925, 0.767822, 0.415586) , + rgb (0.319809, 0.770914, 0.411152) , + rgb (0.327796, 0.77398, 0.40664) , + rgb (0.335885, 0.777018, 0.402049) , + rgb (0.344074, 0.780029, 0.397381) , + rgb (0.35236, 0.783011, 0.392636) , + rgb (0.360741, 0.785964, 0.387814) , + rgb (0.369214, 0.788888, 0.382914) , + rgb (0.377779, 0.791781, 0.377939) , + rgb (0.386433, 0.794644, 0.372886) , + rgb (0.395174, 0.797475, 0.367757) , + rgb (0.404001, 0.800275, 0.362552) , + rgb (0.412913, 0.803041, 0.357269) , + rgb (0.421908, 0.805774, 0.35191) , + rgb (0.430983, 0.808473, 0.346476) , + rgb (0.440137, 0.811138, 0.340967) , + rgb (0.449368, 0.813768, 0.335384) , + rgb (0.458674, 0.816363, 0.329727) , + rgb (0.468053, 0.818921, 0.323998) , + rgb (0.477504, 0.821444, 0.318195) , + rgb (0.487026, 0.823929, 0.312321) , + rgb (0.496615, 0.826376, 0.306377) , + rgb (0.506271, 0.828786, 0.300362) , + rgb (0.515992, 0.831158, 0.294279) , + rgb (0.525776, 0.833491, 0.288127) , + rgb (0.535621, 0.835785, 0.281908) , + rgb (0.545524, 0.838039, 0.275626) , + rgb (0.555484, 0.840254, 0.269281) , + rgb (0.565498, 0.84243, 0.262877) , + rgb (0.575563, 0.844566, 0.256415) , + rgb (0.585678, 0.846661, 0.249897) , + rgb (0.595839, 0.848717, 0.243329) , + rgb (0.606045, 0.850733, 0.236712) , + rgb (0.616293, 0.852709, 0.230052) , + rgb (0.626579, 0.854645, 0.223353) , + rgb (0.636902, 0.856542, 0.21662) , + rgb (0.647257, 0.8584, 0.209861) , + rgb (0.657642, 0.860219, 0.203082) , + rgb (0.668054, 0.861999, 0.196293) , + rgb (0.678489, 0.863742, 0.189503) , + rgb (0.688944, 0.865448, 0.182725) , + rgb (0.699415, 0.867117, 0.175971) , + rgb (0.709898, 0.868751, 0.169257) , + rgb (0.720391, 0.87035, 0.162603) , + rgb (0.730889, 0.871916, 0.156029) , + rgb (0.741388, 0.873449, 0.149561) , + rgb (0.751884, 0.874951, 0.143228) , + rgb (0.762373, 0.876424, 0.137064) , + rgb (0.772852, 0.877868, 0.131109) , + rgb (0.783315, 0.879285, 0.125405) , + rgb (0.79376, 0.880678, 0.120005) , + rgb (0.804182, 0.882046, 0.114965) , + rgb (0.814576, 0.883393, 0.110347) , + rgb (0.82494, 0.88472, 0.106217) , + rgb (0.83527, 0.886029, 0.102646) , + rgb (0.845561, 0.887322, 0.099702) , + rgb (0.85581, 0.888601, 0.097452) , + rgb (0.866013, 0.889868, 0.095953) , + rgb (0.876168, 0.891125, 0.09525) , + rgb (0.886271, 0.892374, 0.095374) , + rgb (0.89632, 0.893616, 0.096335) , + rgb (0.906311, 0.894855, 0.098125) , + rgb (0.916242, 0.896091, 0.100717) , + rgb (0.926106, 0.89733, 0.104071) , + rgb (0.935904, 0.89857, 0.108131) , + rgb (0.945636, 0.899815, 0.112838) , + rgb (0.9553, 0.901065, 0.118128) , + rgb (0.964894, 0.902323, 0.123941) , + rgb (0.974417, 0.90359, 0.130215) , + rgb (0.983868, 0.904867, 0.136897) , + rgb (0.993248, 0.906157, 0.143936) + }); diff --git a/graphics/asymptote/base/contour.asy b/graphics/asymptote/base/contour.asy index fbb4cd1c71..f2ee0e78fe 100644 --- a/graphics/asymptote/base/contour.asy +++ b/graphics/asymptote/base/contour.asy @@ -1,10 +1,10 @@ // Contour routines written by Radoslav Marinov and John Bowman. - + import graph_settings; real eps=10000*realEpsilon; -// 1 +// 1 // 6 +-------------------+ 5 // | \ / | // | \ / | @@ -16,7 +16,7 @@ real eps=10000*realEpsilon; // | / \ | // | / \ | // 7 +-------------------+ 4 or 8 -// 3 +// 3 private struct segment { @@ -76,11 +76,11 @@ private segment case3(pair p0, pair p1, pair p2, private segment checktriangle(pair p0, pair p1, pair p2, real v0, real v1, real v2, int edge=-1) { - // default null return + // default null return static segment dflt; real eps=eps*max(abs(v0),abs(v1),abs(v2)); - + if(v0 < -eps) { if(v1 < -eps) { if(v2 < -eps) return dflt; // nothing to do @@ -92,10 +92,10 @@ private segment checktriangle(pair p0, pair p1, pair p2, else return case2(p1,p0,p2,v1,v0,v2,5+edge); } else { if(v2 < -eps) return case3(p0,p1,p2,v0,v1,v2,edge); - else if(v2 <= eps) + else if(v2 <= eps) return case2(p2,p0,p1,v2,v0,v1,edge); else return case3(p1,p0,p2,v1,v0,v2,edge); - } + } } else if(v0 <= eps) { if(v1 < -eps) { if(v2 < -eps) return dflt; // nothing to do @@ -109,7 +109,7 @@ private segment checktriangle(pair p0, pair p1, pair p2, if(v2 < -eps) return case2(p0,p1,p2,v0,v1,v2,4+edge); else if(v2 <= eps) return case1(p0,p2,4+edge); else return dflt; // nothing to do - } + } } else { if(v1 < -eps) { if(v2 < -eps) return case3(p1,p0,p2,v1,v0,v2,edge); @@ -124,8 +124,8 @@ private segment checktriangle(pair p0, pair p1, pair p2, if(v2 < -eps) return case3(p0,p2,p1,v0,v2,v1); else if(v2 <= eps) return dflt; // nothing to do else return dflt; // nothing to do - } - } + } + } } // Collect connecting path segments. @@ -135,7 +135,7 @@ private void collect(pair[][][] points, real[] c) int[] reverseF(int n) {return sequence(new int(int x){return n-1-x;},n-1);} // use to reverse an array, omitting the last point int[] reverseL(int n) {return sequence(new int(int x){return n-2-x;},n-1);} - + for(int cnt=0; cnt < c.length; ++cnt) { pair[][] gdscnt=points[cnt]; for(int i=0; i < gdscnt.length; ++i) { @@ -144,11 +144,11 @@ private void collect(pair[][][] points, real[] c) for(int j=i+1; j < gdscnt.length; ++j) { pair[] gjg=gdscnt[j]; int Lj=gjg.length; - if(abs(gig[0]-gjg[0]) < eps) { + if(abs(gig[0]-gjg[0]) < eps) { gdscnt[j]=gjg[reverseF(Lj)]; gdscnt[j].append(gig); - gdscnt.delete(i); - --i; + gdscnt.delete(i); + --i; break; } else if(abs(gig[0]-gjg[Lj-1]) < eps) { gig.delete(0); @@ -169,7 +169,7 @@ private void collect(pair[][][] points, real[] c) gdscnt.delete(i); --i; break; - } + } } } } @@ -224,7 +224,7 @@ guide[][] contour(pair[][] z, real[][] f, c=sort(c); bool midpoints=midpoint.length > 0; - + segment segments[][][]=new segment[nx][ny][]; // go over region a rectangle at a time @@ -238,7 +238,7 @@ guide[][] contour(pair[][] z, real[][] f, segment[][] segmentsi=segments[i]; for(int j=0; j < ny; ++j) { segment[] segmentsij=segmentsi[j]; - + // define points pair bleft=zi[j]; pair bright=zp[j]; @@ -264,26 +264,26 @@ guide[][] contour(pair[][] z, real[][] f, int countm=0; int countz=0; int countp=0; - + void check(real vertdat) { if(vertdat < -eps) ++countm; else { - if(vertdat <= eps) ++countz; + if(vertdat <= eps) ++countz; else ++countp; } } - + check(vertdat0); check(vertdat1); check(vertdat2); check(vertdat3); - if(countm == 4) return 1; // nothing to do - if(countp == 4) return -1; // nothing to do + if(countm == 4) return 1; // nothing to do + if(countp == 4) return -1; // nothing to do if((countm == 3 || countp == 3) && countz == 1) return 0; // go through the triangles - + void addseg(segment seg) { if(seg.active) { seg.c=cnt; @@ -301,7 +301,7 @@ guide[][] contour(pair[][] z, real[][] f, vertdat0,vertdat1,vertdat4,3)); return 0; } - + void process(int l, int u) { if(l >= u) return; int i=quotient(l+u,2); @@ -313,7 +313,7 @@ guide[][] contour(pair[][] z, real[][] f, process(i+1,u); } } - + process(0,c.length); } } @@ -356,7 +356,7 @@ guide[][] contour(pair[][] z, real[][] f, } return -1; } - + int backward(int I, int J, bool first=true) { if(I >= 0 && I < nx && J >= 0 && J < ny) { segment[] segmentsIJ=segments[I][J]; @@ -380,7 +380,7 @@ guide[][] contour(pair[][] z, real[][] f, } return -1; } - + void follow(int f(int, int, bool first=true), int edge) { int I=i; int J=j; @@ -489,7 +489,7 @@ guide[][] contour(real f(real, real), pair a, pair b, // evaluate function at points and midpoints real[][] dat=new real[nx+1][ny+1]; real[][] midpoint=new real[nx+1][ny+1]; - + for(int i=0; i <= nx; ++i) { real x=interp(a.x,b.x,i/nx); real x2=interp(a.x,b.x,(i+0.5)/nx); @@ -503,7 +503,7 @@ guide[][] contour(real f(real, real), pair a, pair b, return contour(dat,midpoint,a,b,c,join); } - + void draw(picture pic=currentpicture, Label[] L=new Label[], guide[][] g, pen[] p) { @@ -576,7 +576,7 @@ pen[][] interior(picture pic=currentpicture, guide[][] g, pen[] palette) index=i; } } - } + } fillpalettei[j]=palette[index]; } fillpalette[i]=fillpalettei; @@ -620,7 +620,7 @@ void fill(picture pic=currentpicture, guide[][] g, pen[][] palette) // check existing guides and adds new segment to them if possible, // or otherwise store segment as a new guide private void addseg(pair[][] gds, segment seg) -{ +{ if(!seg.active) return; // search for a path to extend for(int i=0; i < gds.length; ++i) { @@ -629,22 +629,22 @@ private void addseg(pair[][] gds, segment seg) gd.insert(0,seg.a); return; } else if(abs(gd[gd.length-1]-seg.b) < eps) { - gd.push(seg.a); + gd.push(seg.a); return; } else if(abs(gd[0]-seg.a) < eps) { gd.insert(0,seg.b); return; - } else if(abs(gd[gd.length-1]-seg.a) < eps) { + } else if(abs(gd[gd.length-1]-seg.a) < eps) { gd.push(seg.b); return; } } - + // in case nothing is found pair[] segm; - segm=new pair[] {seg.a,seg.b}; + segm=new pair[] {seg.a,seg.b}; gds.push(segm); - + return; } @@ -664,7 +664,7 @@ guide[][] contour(pair[] z, real[] f, real[] c, interpolate join=operator --) // array to store guides found so far pair[][][] points=new pair[c.length][][]; - + for(int cnt=0; cnt < c.length; ++cnt) { pair[][] pointscnt=points[cnt]; real C=c[cnt]; diff --git a/graphics/asymptote/base/contour3.asy b/graphics/asymptote/base/contour3.asy index 4977a351bf..a15a6663b2 100644 --- a/graphics/asymptote/base/contour3.asy +++ b/graphics/asymptote/base/contour3.asy @@ -81,7 +81,7 @@ vertex[][] contour3(triple[][][] v, real[][][] f, int j2=2j; int j2p1=j2+1; int j2p2=j2+2; - + for(int k=0; k < nz; ++k) { // vertex values real vdat0=fij[k]; @@ -108,21 +108,21 @@ vertex[][] contour3(triple[][][] v, real[][][] f, triple m3=0.25*(p100+p000+p001+p101); triple m4=0.25*(p000+p010+p011+p001); triple m5=0.25*(p001+p011+p111+p101); - triple mc=0.5*(m0+m5); + triple mc=0.5*(m0+m5); // optimization: we make sure we don't work with empty rectangles int countm=0; int countz=0; int countp=0; - + void check(real vdat) { if(vdat < -eps) ++countm; else { - if(vdat <= eps) ++countz; + if(vdat <= eps) ++countz; else ++countp; } } - + check(vdat0); check(vdat1); check(vdat2); @@ -132,32 +132,32 @@ vertex[][] contour3(triple[][][] v, real[][][] f, check(vdat6); check(vdat7); - if(countm == 8 || countp == 8 || + if(countm == 8 || countp == 8 || ((countm == 7 || countp == 7) && countz == 1)) continue; int k2=2k; int k2p1=k2+1; int k2p2=k2+2; - + // Evaluate midpoints of cube sides. // Then evaluate midpoint of cube. real vdat8=midpoints ? midpoint[i2p1][j2p1][k2] : 0.25*(vdat0+vdat2+vdat6+vdat4); - real vdat9=midpoints ? midpoint[i2p1][j2p2][k2p1] : + real vdat9=midpoints ? midpoint[i2p1][j2p2][k2p1] : 0.25*(vdat2+vdat6+vdat7+vdat3); - real vdat10=midpoints ? midpoint[i2p2][j2p1][k2p1] : + real vdat10=midpoints ? midpoint[i2p2][j2p1][k2p1] : 0.25*(vdat7+vdat6+vdat4+vdat5); - real vdat11=midpoints ? midpoint[i2p1][j2][k2p1] : + real vdat11=midpoints ? midpoint[i2p1][j2][k2p1] : 0.25*(vdat0+vdat4+vdat5+vdat1); - real vdat12=midpoints ? midpoint[i2][j2p1][k2p1] : + real vdat12=midpoints ? midpoint[i2][j2p1][k2p1] : 0.25*(vdat0+vdat2+vdat3+vdat1); - real vdat13=midpoints ? midpoint[i2p1][j2p1][k2p2] : + real vdat13=midpoints ? midpoint[i2p1][j2p1][k2p2] : 0.25*(vdat1+vdat3+vdat7+vdat5); - real vdat14=midpoints ? midpoint[i2p1][j2p1][k2p1] : + real vdat14=midpoints ? midpoint[i2p1][j2p1][k2p1] : 0.125*(vdat0+vdat1+vdat2+vdat3+vdat4+vdat5+vdat6+vdat7); - + // Go through the 24 pyramids, 4 for each side. - + void addval(int kp0, int kp1, int kp2, triple add, triple v) { bucket[] cur=kps[kp0][kp1][kp2]; for(int q=0; q < cur.length; ++q) { @@ -192,8 +192,14 @@ vertex[][] contour3(triple[][][] v, real[][][] f, vec0=unit(vec0); triple normal=cross(vec2,vec1); normal *= sgn(dot(normal,dir)); - real angle0=acos(-dot(vec1,vec2)); - real angle1=acos(-dot(vec2,vec0)); + + real angle(triple u, triple v) { + real Dot=-dot(u,v); + return Dot > 1 ? 0 : Dot < -1 ? pi : acos(Dot); + } + + real angle0=angle(vec1,vec2); + real angle1=angle(vec2,vec0); pts[0].normal=normal*angle0; pts[1].normal=normal*angle1; pts[2].normal=normal*(pi-angle0-angle1); @@ -206,7 +212,7 @@ vertex[][] contour3(triple[][][] v, real[][][] f, weighted[] points=obj.pts; object obj1; object obj2; - obj1.active=true; + obj1.active=true; obj2.active=true; obj1.pts=new weighted[] {points[0],points[1],points[2]}; obj2.pts=new weighted[] {points[1],points[2],points[3]}; @@ -220,7 +226,7 @@ vertex[][] contour3(triple[][][] v, real[][][] f, } } - weighted setupweighted(triple va, triple vb, real da, real db, + weighted setupweighted(triple va, triple vb, real da, real db, int[] kpa, int[] kpb) { weighted w; real ratio=abs(da/(db-da)); @@ -318,7 +324,7 @@ vertex[][] contour3(triple[][][] v, real[][][] f, static int[] pm4={0,1,1}; static int[] pm5={1,1,2}; static int[] pmc={1,1,1}; - + check4pyr(p000,p010,p110,p100,mc,m0, vdat0,vdat2,vdat6,vdat4,vdat14,vdat8, pp000,pp010,pp110,pp100,pmc,pm0); @@ -378,14 +384,14 @@ vertex[][] contour3(triple[][][] v, real[][][] f, ret.normal=normal*2/count; return ret; } - + // Prepare return value. vertex[][] g; - + for(int q=0; q < objects.length; ++q) { object p=objects[q]; g.push(new vertex[] {preparevertex(p.pts[0]),preparevertex(p.pts[1]), - preparevertex(p.pts[2])}); + preparevertex(p.pts[2])}); } return g; } @@ -454,7 +460,7 @@ vertex[][] contour3(real f(real, real, real), triple a, triple b, datij[k]=f(x,y,z); if(i == nx || j == ny || k == nz) continue; int k2p1=2k+1; - midpointi2p1j2p1[2k]=f(x2,y2,z); + midpointi2p1j2p1[2k]=f(x2,y2,z); midpointi2p1j2p1[k2p1]=f(x2,y2,z2); midpointi2p1j2[k2p1]=f(x2,y,z2); midpointi2j2p1[k2p1]=f(x,y2,z2); diff --git a/graphics/asymptote/base/embed.asy b/graphics/asymptote/base/embed.asy index 88495f1212..30848c10f4 100644 --- a/graphics/asymptote/base/embed.asy +++ b/graphics/asymptote/base/embed.asy @@ -7,23 +7,23 @@ if(latex()) { // For documentation of the options see // http://mirror.ctan.org/macros/latex/contrib/media9/doc/media9.pdf -// Embed PRC or SWF content in pdf file +// Embed PRC or SWF content in pdf file string embedplayer(string name, string text="", string options="", real width=0, real height=0) { - if(width != 0) options += ",width="+(string) (width/pt)+"pt"; - if(height != 0) options += ",height="+(string) (height/pt)+"pt"; + if(width != 0) options += ",width="+(string) (width/pt)+"pt"; + if(height != 0) options += ",height="+(string) (height/pt)+"pt"; return "% \includemedia[noplaybutton,"+options+"]{"+text+"}{"+name+"}"; } -// Embed media in pdf file +// Embed media in pdf file string embed(string name, string text="", string options="", real width=0, real height=0) { return embedplayer("VPlayer.swf",text,"label="+name+ ",activate=pageopen,addresource="+name+ - ",flashvars={source="+name+"&scaleMode=letterbox},"+ + ",flashvars={source="+name+"&scaleMode=letterbox},"+ options,width,height); } diff --git a/graphics/asymptote/base/external.asy b/graphics/asymptote/base/external.asy index f9ab5365ae..9e12610c4b 100644 --- a/graphics/asymptote/base/external.asy +++ b/graphics/asymptote/base/external.asy @@ -20,8 +20,8 @@ string embed(string name, string text="", string options="", atexit(exitfunction); } } - if(width != 0) options += ", width="+(string) (width/pt)+"pt"; - if(height != 0) options +=", height="+(string) (height/pt)+"pt"; + if(width != 0) options += ", width="+(string) (width/pt)+"pt"; + if(height != 0) options +=", height="+(string) (height/pt)+"pt"; return "\href{run:"+name+"}{"+graphic(image,options)+"}"; } diff --git a/graphics/asymptote/base/feynman.asy b/graphics/asymptote/base/feynman.asy index 4360ee9f52..4182d98928 100644 --- a/graphics/asymptote/base/feynman.asy +++ b/graphics/asymptote/base/feynman.asy @@ -10,12 +10,12 @@ // default ratio of width (distance between two loops) to amplitude for a gluon // line. The gluon function uses this ratio, if the width parameter is -// negative. +// negative. real gluonratio; // default ratio of width (distance between two crests) to amplitude for a // photon line. The photon function uses this ratio, if the width parameter is -// negative. +// negative. real photonratio; // default gluon amplitude @@ -337,7 +337,7 @@ void drawGhost(picture pic = currentpicture, real vertexangle = minvertexangle, real margin = linemargin) { - if(erasebg) do_overpaint(pic, p, bgpen, + if(erasebg) do_overpaint(pic, p, bgpen, linewidth(fgpen)+margin, vertexangle); draw(pic, p, fgpen, arrow); } @@ -358,7 +358,7 @@ void drawDoubleLine(picture pic = currentpicture, real vertexangle = minvertexangle, real margin = linemargin) { - if(erasebg) do_overpaint(pic, p, bgpen, + if(erasebg) do_overpaint(pic, p, bgpen, linewidth(fgpen)+margin, vertexangle); real htw = linewidth(fgpen)+dlspacing/2; @@ -466,7 +466,7 @@ void drawVertexX(picture pic = currentpicture, pen fgpen = vertexpen) { draw(pic, shift(xy)*scale(r)*((-1,-1)--(1,1)), fgpen); - draw(pic, shift(xy)*scale(r)*((1,-1)--(-1,1)), fgpen); + draw(pic, shift(xy)*scale(r)*((1,-1)--(-1,1)), fgpen); } // draw a circle with an X in the middle on picture pic, at position xy with @@ -508,7 +508,7 @@ void drawVertexBoxX(picture pic = currentpicture, } // draw a momentum arrow on picture pic, along path p, at position position -// (use one of the predefined pairs left or right), with an offset offset +// (use one of the predefined pairs left or right), with an offset offset // from the path, a length length, a pen fgpen and an arrowhead arrow. Making // adjust nonzero shifts the momentum arrow along the path. If erasebg is true, // the background is erased inside a margin margin around the momentum arrow. @@ -527,7 +527,7 @@ void drawMomArrow(picture pic = currentpicture, real margin = momarrowmargin) { path momarrow = momArrowPath(p, align, pos, offset, length); - if(erasebg) do_overpaint(pic, momarrow, bgpen, + if(erasebg) do_overpaint(pic, momarrow, bgpen, linewidth(fgpen)+margin, 90); draw(pic, momarrow, fgpen, arrow); } @@ -540,7 +540,7 @@ void drawMomArrow(picture pic = currentpicture, // (essentially, currentpen, arrowfactor and dotfactor). After customising the // default parameters of plain.asy, you may call fmdefaults to adjust the // parameters of feynman.asy. -void fmdefaults() +void fmdefaults() { real arrowsize=arrowsize(currentpen); real linewidth=linewidth(currentpen); diff --git a/graphics/asymptote/base/flowchart.asy b/graphics/asymptote/base/flowchart.asy index 3db6617375..d1d87b7887 100644 --- a/graphics/asymptote/base/flowchart.asy +++ b/graphics/asymptote/base/flowchart.asy @@ -57,29 +57,29 @@ struct block { // in absolute coordinates. pair top(transform t=identity()) { return shift(t)+f_top; - } + } pair bottom(transform t=identity()) { return shift(t)+f_bottom; - } + } pair left(transform t=identity()) { return shift(t)+f_left; - } + } pair right(transform t=identity()) { return shift(t)+f_right; - } + } pair topleft(transform t=identity()) { return shift(t)+f_topleft; - } + } pair topright(transform t=identity()) { return shift(t)+f_topright; - } + } pair bottomleft(transform t=identity()) { return shift(t)+f_bottomleft; - } + } pair bottomright(transform t=identity()) { return shift(t)+f_bottomright; - } - + } + // Return a frame representing the block. frame draw(pen p=currentpen); @@ -118,25 +118,25 @@ block rectangle(object header, object body, pair center=(0,0), block block; block.draw=new frame(pen p) { - frame block; - filldraw(block,shift(0,z1.y)*box((0,0),z0),headerpen,drawpen); - add(block,shift(-0.5*(Mheader+mheader))*fheader,(0,z1.y)+0.5z0); - filldraw(block,box((0,0),z1),bodypen,drawpen); - add(block,shift(-0.5*(Mbody+mbody))*fbody,0.5z1); - return block; + frame block; + filldraw(block,shift(0,z1.y)*box((0,0),z0),headerpen,drawpen); + add(block,shift(-0.5*(Mheader+mheader))*fheader,(0,z1.y)+0.5z0); + filldraw(block,box((0,0),z1),bodypen,drawpen); + add(block,shift(-0.5*(Mbody+mbody))*fbody,0.5z1); + return block; }; block.f_position=new pair(real x) { - return point(shape,x); + return point(shape,x); }; block.f_center=interp(point(shape,0),point(shape,3),0.5); - block.f_bottomleft=point(shape,0); - block.f_bottom=point(shape,5.5); - block.f_bottomright=point(shape,5); - block.f_right=point(shape,4.5); - block.f_topright=point(shape,3); - block.f_top=point(shape,2.5); - block.f_topleft=point(shape,2); - block.f_left=point(shape,0.5); + block.f_bottomleft=point(shape,0); + block.f_bottom=point(shape,5.5); + block.f_bottomright=point(shape,5); + block.f_right=point(shape,4.5); + block.f_topright=point(shape,3); + block.f_top=point(shape,2.5); + block.f_topleft=point(shape,2); + block.f_left=point(shape,0.5); block.center=center; block.size=point(shape,3); return block; @@ -156,25 +156,25 @@ block rectangle(object body, pair center=(0,0), block block; block.draw=new frame(pen p) { - frame block; - filldraw(block,shape,fillpen,drawpen); - add(block,shift(-0.5*(M+m))*f,0.5z); - return block; + frame block; + filldraw(block,shape,fillpen,drawpen); + add(block,shift(-0.5*(M+m))*f,0.5z); + return block; }; block.f_position=new pair(real x) { - return point(shape,x); + return point(shape,x); }; block.f_center=0.5*z; block.center=center; block.size=z; block.f_bottomleft=point(shape,0); - block.f_bottom=point(shape,0.5); - block.f_bottomright=point(shape,1); - block.f_right=point(shape,1.5); - block.f_topright=point(shape,2); - block.f_top=point(shape,2.5); - block.f_topleft=point(shape,3); - block.f_left=point(shape,3.5); + block.f_bottom=point(shape,0.5); + block.f_bottomright=point(shape,1); + block.f_right=point(shape,1.5); + block.f_topright=point(shape,2); + block.f_top=point(shape,2.5); + block.f_topleft=point(shape,3); + block.f_left=point(shape,3.5); return block; } @@ -197,13 +197,13 @@ block parallelogram(object body, pair center=(0,0), block block; block.draw=new frame(pen p) { - frame block; - filldraw(block,shape,fillpen,drawpen); - add(block,shift(-0.5*(M+m))*f,((a+skew)/2,b/2)); - return block; + frame block; + filldraw(block,shape,fillpen,drawpen); + add(block,shift(-0.5*(M+m))*f,((a+skew)/2,b/2)); + return block; }; block.f_position=new pair(real x) { - return point(shape,x); + return point(shape,x); }; block.f_center=((a+skew)/2,b/2); block.center=center; @@ -229,7 +229,7 @@ block diamond(object body, pair center=(0,0), pair m=min(f); pair M=max(f); pair bound=maxbound(M-m,(minwidth,minheight)); - + real e=ds; real a=0.5bound.x-dw; real b=0.5bound.y; @@ -244,25 +244,25 @@ block diamond(object body, pair center=(0,0), block block; block.draw=new frame(pen p) { - frame block; - filldraw(block,shape,fillpen,drawpen); - add(block,shift(-0.5*(M+m))*f,(d,c)); - return block; + frame block; + filldraw(block,shape,fillpen,drawpen); + add(block,shift(-0.5*(M+m))*f,(d,c)); + return block; }; block.f_position=new pair(real x) { - return point(shape,x); + return point(shape,x); }; block.f_center=(point(shape,1).x,point(shape,0).y); block.center=center; block.size=(point(shape,0).x,point(shape,1).y); - block.f_bottomleft=point(shape,2.5); - block.f_bottom=point(shape,3); - block.f_bottomright=point(shape,3.5); - block.f_right=point(shape,0); - block.f_topright=point(shape,0.5); - block.f_top=point(shape,1); - block.f_topleft=point(shape,1.5); - block.f_left=point(shape,2); + block.f_bottomleft=point(shape,2.5); + block.f_bottom=point(shape,3); + block.f_bottomright=point(shape,3.5); + block.f_right=point(shape,0); + block.f_topright=point(shape,0.5); + block.f_top=point(shape,1); + block.f_topleft=point(shape,1.5); + block.f_left=point(shape,2); return block; } @@ -274,30 +274,30 @@ block circle(object body, pair center=(0,0), pen fillpen=invisible, pair m=min(f); pair M=max(f); real r=max(0.5length(M-m)+dr,0.5mindiameter); - + path shape=(0,r)..(r,2r)..(2r,r)..(r,0)..cycle; - + block block; block.draw=new frame(pen p) { - frame block; - filldraw(block,shape,fillpen,drawpen); - add(block,shift(-0.5*(M+m))*f,(r,r)); - return block; + frame block; + filldraw(block,shape,fillpen,drawpen); + add(block,shift(-0.5*(M+m))*f,(r,r)); + return block; }; block.f_position=new pair(real x) { - return point(shape,x); + return point(shape,x); }; block.f_center=(r,r); block.center=center; block.size=(2r,2r); block.f_left=point(shape,0); - block.f_topleft=point(shape,0.5); - block.f_top=point(shape,1); - block.f_topright=point(shape,1.5); - block.f_right=point(shape,2); - block.f_bottomright=point(shape,2.5); - block.f_bottom=point(shape,3); - block.f_bottomleft=point(shape,3.5); + block.f_topleft=point(shape,0.5); + block.f_top=point(shape,1); + block.f_topright=point(shape,1.5); + block.f_right=point(shape,2); + block.f_bottomright=point(shape,2.5); + block.f_bottom=point(shape,3); + block.f_bottomleft=point(shape,3.5); return block; } @@ -313,33 +313,33 @@ block roundrectangle(object body, pair center=(0,0), real a=bound.x; real b=bound.y; - + path shape=(0,ds+dw)--(0,ds+b-dw){up}..{right} (ds+dw,2ds+b)--(ds+a-dw,2ds+b){right}..{down} (2ds+a,ds+b-dw)--(2ds+a,ds+dw){down}..{left} (ds+a-dw,0)--(ds+dw,0){left}..{up}cycle; - + block block; block.draw=new frame(pen p) { - frame block; - filldraw(block,shape,fillpen,drawpen); - add(block,shift(-0.5*(M+m))*f,(ds,ds)+0.5bound); - return block; + frame block; + filldraw(block,shape,fillpen,drawpen); + add(block,shift(-0.5*(M+m))*f,(ds,ds)+0.5bound); + return block; }; block.f_position=new pair(real x) { - return point(shape,x); + return point(shape,x); }; block.f_center=(ds+0.5a,ds+0.5b); block.center=center; block.size=(2ds+a,2ds+b); - block.f_bottomleft=point(shape,7.5); - block.f_bottom=point(shape,6.5); - block.f_bottomright=point(shape,5.5); - block.f_right=point(shape,4.5); - block.f_topright=point(shape,3.5); - block.f_top=point(shape,2.5); - block.f_topleft=point(shape,1.5); - block.f_left=point(shape,0.5); + block.f_bottomleft=point(shape,7.5); + block.f_bottom=point(shape,6.5); + block.f_bottomright=point(shape,5.5); + block.f_right=point(shape,4.5); + block.f_topright=point(shape,3.5); + block.f_top=point(shape,2.5); + block.f_topleft=point(shape,1.5); + block.f_left=point(shape,0.5); return block; } @@ -359,25 +359,25 @@ block bevel(object body, pair center=(0,0), pen fillpen=invisible, (dw+a,0)--cycle; block block; block.draw=new frame(pen p) { - frame block; - filldraw(block,shape,fillpen,drawpen); - add(block,shift(-0.5*(M+m))*f,(0.5bound+(dw,dh))); - return block; + frame block; + filldraw(block,shape,fillpen,drawpen); + add(block,shift(-0.5*(M+m))*f,(0.5bound+(dw,dh))); + return block; }; block.f_position=new pair(real x) { - return point(shape,x); + return point(shape,x); }; block.f_center=(dw+0.5a,dh+b); block.center=center; block.size=(2dw+a,2dh+2b); - block.f_bottomleft=point(shape,4); - block.f_bottom=point(shape,4.5); - block.f_bottomright=point(shape,5); - block.f_right=point(shape,0); - block.f_topright=point(shape,1); - block.f_top=point(shape,1.5); - block.f_topleft=point(shape,2); - block.f_left=point(shape,3); + block.f_bottomleft=point(shape,4); + block.f_bottom=point(shape,4.5); + block.f_bottomright=point(shape,5); + block.f_right=point(shape,0); + block.f_topright=point(shape,1); + block.f_top=point(shape,1.5); + block.f_topleft=point(shape,2); + block.f_left=point(shape,3); return block; } @@ -388,14 +388,14 @@ path path(pair point[] ... flowdir dir[]) for(int i=1; i < point.length; ++i) { if(i-1 >= dir.length || dir[i-1] == Horizontal) current=(point[i].x,point[i-1].y); - else + else current=(point[i-1].x,point[i].y); - + if(current != prev) { line=line--current; prev=current; } - + current=point[i]; if(current != prev) { line=line--current; diff --git a/graphics/asymptote/base/geometry.asy b/graphics/asymptote/base/geometry.asy index 1c8a95063f..2f9d12538b 100644 --- a/graphics/asymptote/base/geometry.asy +++ b/graphics/asymptote/base/geometry.asy @@ -40,7 +40,7 @@ private transform rotate(explicit pair dir) real angle=degrees(dir); if(angle > 90 && angle < 270) angle -= 180; return rotate(angle); -} +} // *=======================================================* // *........................HEADER.........................* @@ -165,7 +165,7 @@ real rd(real x, real y, real z) ed = ea - 6 * eb; ee = ed + ec + ec; return 3 * sum + fac * (1.0 + ed * (-C1 + C5 * ed - C6 * delz * ee) - +delz * (C2 * ee + delz * (-C3 * ec + delz * C4 * ea)))/(ave * sqrt(ave)); + +delz * (C2 * ee + delz * (-C3 * ec + delz * C4 * ea)))/(ave * sqrt(ave)); } /**/ @@ -258,10 +258,10 @@ struct coordsys {/*This structure represents a coordinate system in the plane.*/ /**/ restricted convert relativetodefault = new pair(pair m){return m;};/*Convert a pair given relatively to this coordinate system to - the pair relatively to the default coordinate system.*/ + the pair relatively to the default coordinate system.*/ /**/ restricted convert defaulttorelative = new pair(pair m){return m;};/*Convert a pair given relatively to the default coordinate system to - the pair relatively to this coordinate system.*/ + the pair relatively to this coordinate system.*/ /**/ restricted dot dot = new real(pair m, pair n){return dot(m, n);};/*Return the dot product of this coordinate system.*/ /**/ @@ -287,50 +287,50 @@ struct coordsys /**/ bool operator ==(coordsys c1, coordsys c2) -{/*Return true iff the coordinate system have the same origin and units vector.*/ - return c1.O == c2.O && c1.i == c2.i && c1.j == c2.j; -} + {/*Return true iff the coordinate system have the same origin and units vector.*/ + return c1.O == c2.O && c1.i == c2.i && c1.j == c2.j; + } /**/ coordsys cartesiansystem(pair O = (0, 0), pair i, pair j) {/*Return the Cartesian coordinate system (O, i, j).*/ - coordsys R; - real[][] P = {{0, 0}, {0, 0}}; - real[][] iP; - P[0][0] = i.x; - P[0][1] = j.x; - P[1][0] = i.y; - P[1][1] = j.y; - iP = inverse(P); - real ni = abs(i); - real nj = abs(j); - real ij = angle(j) - angle(i); - - pair rtd(pair m) - { - return O + (P[0][0] * m.x + P[0][1] * m.y, P[1][0] * m.x + P[1][1] * m.y); - } - - pair dtr(pair m) - { - m-=O; - return (iP[0][0] * m.x + iP[0][1] * m.y, iP[1][0] * m.x + iP[1][1] * m.y); - } - - pair polar(real r, real a) - { - real ca = sin(ij - a)/(ni * sin(ij)); - real sa = sin(a)/(nj * sin(ij)); - return r * (ca, sa); - } - - real tdot(pair m, pair n) - { - return m.x * n.x * ni^2 + m.y * n.y * nj^2 + (m.x * n.y + n.x * m.y) * dot(i, j); - } - - R.init(rtd, dtr, polar, tdot); - return R; + coordsys R; + real[][] P = {{0, 0}, {0, 0}}; + real[][] iP; + P[0][0] = i.x; + P[0][1] = j.x; + P[1][0] = i.y; + P[1][1] = j.y; + iP = inverse(P); + real ni = abs(i); + real nj = abs(j); + real ij = angle(j) - angle(i); + + pair rtd(pair m) + { + return O + (P[0][0] * m.x + P[0][1] * m.y, P[1][0] * m.x + P[1][1] * m.y); + } + + pair dtr(pair m) + { + m-=O; + return (iP[0][0] * m.x + iP[0][1] * m.y, iP[1][0] * m.x + iP[1][1] * m.y); + } + + pair polar(real r, real a) + { + real ca = sin(ij - a)/(ni * sin(ij)); + real sa = sin(a)/(nj * sin(ij)); + return r * (ca, sa); + } + + real tdot(pair m, pair n) + { + return m.x * n.x * ni^2 + m.y * n.y * nj^2 + (m.x * n.y + n.x * m.y) * dot(i, j); + } + + R.init(rtd, dtr, polar, tdot); + return R; } @@ -344,19 +344,19 @@ void show(picture pic = currentpicture, Label lo = "$O$", pen jpen = ipen, arrowbar arrow = Arrow) {/*Draw the components (O, i, j, x - axis, y - axis) of 'R'.*/ - unravel R; - dot(pic, O, dotpen); - drawline(pic, O, O + i, xpen); - drawline(pic, O, O + j, ypen); - draw(pic, li, O--(O + i), ipen, arrow); - Label lj = lj.copy(); - lj.align(lj.align, unit(I * j)); - draw(pic, lj, O--(O + j), jpen, arrow); - draw(pic, lj, O--(O + j), jpen, arrow); - Label lo = lo.copy(); - lo.align(lo.align, -2 * dir(O--O + i, O--O + j)); - lo.p(dotpen); - label(pic, lo, O); + unravel R; + dot(pic, O, dotpen); + drawline(pic, O, O + i, xpen); + drawline(pic, O, O + j, ypen); + draw(pic, li, O--(O + i), ipen, arrow); + Label lj = lj.copy(); + lj.align(lj.align, unit(I * j)); + draw(pic, lj, O--(O + j), jpen, arrow); + draw(pic, lj, O--(O + j), jpen, arrow); + Label lo = lo.copy(); + lo.align(lo.align, -2 * dir(O--O + i, O--O + j)); + lo.p(dotpen); + label(pic, lo, O); } /**/ @@ -364,7 +364,7 @@ pair operator /(pair p, coordsys R) {/*Return the xy - coordinates of 'p' relatively to the coordinate system 'R'. For example, if R = cartesiansystem((1, 2), (1, 0), (0, 1)), (0, 0)/R is (-1, -2).*/ - return R.defaulttorelative(p); + return R.defaulttorelative(p); } /**/ @@ -372,34 +372,34 @@ pair operator *(coordsys R, pair p) {/*Return the coordinates of 'p' given in the xy - coordinates 'R'. For example, if R = cartesiansystem((1, 2), (1, 0), (0, 1)), R * (0, 0) is (1, 2).*/ - return R.relativetodefault(p); + return R.relativetodefault(p); } /**/ path operator *(coordsys R, path g) {/*Return the reconstructed path applying R * pair to each node, pre and post control point of 'g'.*/ - guide og = R * point(g, 0); - real l = length(g); - for(int i = 1; i <= l; ++i) - { - pair P = R * point(g, i); - pair post = R * postcontrol(g, i - 1); - pair pre = R * precontrol(g, i); - if(i == l && (cyclic(g))) - og = og..controls post and pre..cycle; - else - og = og..controls post and pre..P; - } - return og; + guide og = R * point(g, 0); + real l = length(g); + for(int i = 1; i <= l; ++i) + { + pair P = R * point(g, i); + pair post = R * postcontrol(g, i - 1); + pair pre = R * precontrol(g, i); + if(i == l && (cyclic(g))) + og = og..controls post and pre..cycle; + else + og = og..controls post and pre..P; + } + return og; } /**/ coordsys operator *(transform t,coordsys R) {/*Provide transform * coordsys. Note that shiftless(t) is applied to R.i and R.j.*/ - coordsys oc; - oc = cartesiansystem(t * R.O, shiftless(t) * R.i, shiftless(t) * R.j); - return oc; + coordsys oc; + oc = cartesiansystem(t * R.O, shiftless(t) * R.i, shiftless(t) * R.j); + return oc; } /**/ @@ -651,26 +651,26 @@ point operator *(explicit pair p1, explicit point p2) /**/ bool operator ==(explicit point M, explicit point N) -{/*Provide the test 'M == N' wish returns true iff MN < EPS*/ - return abs(locate(M) - locate(N)) < EPS; -} + {/*Provide the test 'M == N' wish returns true iff MN < EPS*/ + return abs(locate(M) - locate(N)) < EPS; + } /**/ bool operator !=(explicit point M, explicit point N) {/*Provide the test 'M != N' wish return true iff MN >= EPS*/ - return !(M == N); + return !(M == N); } /**/ guide operator cast(point p) {/*Cast point to guide.*/ - return locate(p); + return locate(p); } /**/ path operator cast(point p) {/*Cast point to path.*/ - return locate(p); + return locate(p); } /**/ @@ -678,103 +678,103 @@ void dot(picture pic = currentpicture, Label L, explicit point Z, align align = NoAlign, string format = defaultformat, pen p = currentpen) {/**/ - Label L = L.copy(); - L.position(locate(Z)); - if(L.s == "") { - if(format == "") format = defaultformat; - L.s = "("+format(format, Z.x)+", "+format(format, Z.y)+")"; - } - L.align(align, E); - L.p(p); - dot(pic, locate(Z), p); - add(pic, L); + Label L = L.copy(); + L.position(locate(Z)); + if(L.s == "") { + if(format == "") format = defaultformat; + L.s = "("+format(format, Z.x)+", "+format(format, Z.y)+")"; + } + L.align(align, E); + L.p(p); + dot(pic, locate(Z), p); + add(pic, L); } /**/ real abs(coordsys R, pair m) {/*Return the modulus |m| in the coordinate system 'R'.*/ - return R.abs(m); + return R.abs(m); } /**/ real abs(explicit point M) {/*Return the modulus |M| in its coordinate system.*/ - return M.coordsys.abs(M.coordinates); + return M.coordsys.abs(M.coordinates); } /**/ real length(explicit point M) {/*Return the modulus |M| in its coordinate system (same as 'abs').*/ - return M.coordsys.abs(M.coordinates); + return M.coordsys.abs(M.coordinates); } /**/ point conj(explicit point M) {/*Conjugate.*/ - return point(M.coordsys, conj(M.coordinates), M.m); + return point(M.coordsys, conj(M.coordinates), M.m); } /**/ real degrees(explicit point M, coordsys R = M.coordsys, bool warn = true) {/*Return the angle of M (in degrees) relatively to 'R'.*/ - return (degrees(locate(M) - R.O, warn) - degrees(R.i))%360; + return (degrees(locate(M) - R.O, warn) - degrees(R.i))%360; } /**/ real angle(explicit point M, coordsys R = M.coordsys, bool warn = true) {/*Return the angle of M (in radians) relatively to 'R'.*/ - return radians(degrees(M, R, warn)); + return radians(degrees(M, R, warn)); } bool Finite(explicit point z) { - return abs(z.x) < Infinity && abs(z.y) < Infinity; + return abs(z.x) < Infinity && abs(z.y) < Infinity; } /**/ bool finite(explicit point p) {/*Avoid to compute 'finite((pair)(infinite_point))'.*/ - return finite(p.coordinates); + return finite(p.coordinates); } /**/ real dot(point A, point B) {/*Return the dot product in the coordinate system of 'A'.*/ - point[] P = standardizecoordsys(A.coordsys, A, B); - return P[0].coordsys.dot(P[0].coordinates, P[1].coordinates); + point[] P = standardizecoordsys(A.coordsys, A, B); + return P[0].coordsys.dot(P[0].coordinates, P[1].coordinates); } /**/ real dot(point A, explicit pair B) {/*Return the dot product in the default coordinate system. dot(explicit pair, point) is also defined.*/ - return dot(locate(A), B); + return dot(locate(A), B); } real dot(explicit pair A, point B) { - return dot(A, locate(B)); + return dot(A, locate(B)); } /**/ transform rotateO(real a) {/*Rotation around the origin of the current coordinate system.*/ - return rotate(a, currentcoordsys.O); + return rotate(a, currentcoordsys.O); } /**/ transform projection(point A, point B) {/*Return the orthogonal projection on the line (AB).*/ - pair dir = unit(locate(A) - locate(B)); - pair a = locate(A); - real cof = dir.x * a.x + dir.y * a.y; - real tx = a.x - dir.x * cof; - real txx = dir.x^2; - real txy = dir.x * dir.y; - real ty = a.y - dir.y * cof; - real tyx = txy; - real tyy = dir.y^2; - transform t = (tx, ty, txx, txy, tyx, tyy); - return t; + pair dir = unit(locate(A) - locate(B)); + pair a = locate(A); + real cof = dir.x * a.x + dir.y * a.y; + real tx = a.x - dir.x * cof; + real txx = dir.x^2; + real txy = dir.x * dir.y; + real ty = a.y - dir.y * cof; + real tyx = txy; + real tyy = dir.y^2; + transform t = (tx, ty, txx, txy, tyx, tyy); + return t; } /**/ @@ -782,45 +782,45 @@ transform projection(point A, point B, point C, point D, bool safe = false) {/*Return the (CD) parallel projection on (AB). If 'safe = true' and (AB)//(CD) return the identity. If 'safe = false' and (AB)//(CD) return an infinity scaling.*/ - pair a = locate(A); - pair u = unit(locate(B) - locate(A)); - pair v = unit(locate(D) - locate(C)); - real c = u.x * a.y - u.y * a.x; - real d = (conj(u) * v).y; - if (abs(d) < epsgeo) { - return safe ? identity() : scale(infinity); - } - real tx = c * v.x/d; - real ty = c * v.y/d; - real txx = u.x * v.y/d; - real txy = -u.x * v.x/d; - real tyx = u.y * v.y/d; - real tyy = -u.y * v.x/d; - transform t = (tx, ty, txx, txy, tyx, tyy); - return t; + pair a = locate(A); + pair u = unit(locate(B) - locate(A)); + pair v = unit(locate(D) - locate(C)); + real c = u.x * a.y - u.y * a.x; + real d = (conj(u) * v).y; + if (abs(d) < epsgeo) { + return safe ? identity() : scale(infinity); + } + real tx = c * v.x/d; + real ty = c * v.y/d; + real txx = u.x * v.y/d; + real txy = -u.x * v.x/d; + real tyx = u.y * v.y/d; + real tyy = -u.y * v.x/d; + transform t = (tx, ty, txx, txy, tyx, tyy); + return t; } /**/ transform scale(real k, point M) {/*Homothety.*/ - pair P = locate(M); - return shift(P) * scale(k) * shift(-P); + pair P = locate(M); + return shift(P) * scale(k) * shift(-P); } /**/ transform xscale(real k, point M) {/*xscale from 'M' relatively to the x - axis of the coordinate system of 'M'.*/ - pair P = locate(M); - real a = degrees(M.coordsys.i); - return (shift(P) * rotate(a)) * xscale(k) * (rotate(-a) * shift(-P)); + pair P = locate(M); + real a = degrees(M.coordsys.i); + return (shift(P) * rotate(a)) * xscale(k) * (rotate(-a) * shift(-P)); } /**/ transform yscale(real k, point M) {/*yscale from 'M' relatively to the y - axis of the coordinate system of 'M'.*/ - pair P = locate(M); - real a = degrees(M.coordsys.j) - 90; - return (shift(P) * rotate(a)) * yscale(k) * (rotate(-a) * shift(-P)); + pair P = locate(M); + real a = degrees(M.coordsys.j) - 90; + return (shift(P) * rotate(a)) * yscale(k) * (rotate(-a) * shift(-P)); } /**/ @@ -829,41 +829,41 @@ transform scale(real k, point A, point B, point C, point D, bool safe = false) (help me for English translation...) If 'safe = true' and (AB)//(CD) return the identity. If 'safe = false' and (AB)//(CD) return a infinity scaling.*/ - pair a = locate(A); - pair u = unit(locate(B) - locate(A)); - pair v = unit(locate(D) - locate(C)); - real c = u.x * a.y - u.y * a.x; - real d = (conj(u) * v).y; - real d = (conj(u) * v).y; - if (abs(d) < epsgeo) { - return safe ? identity() : scale(infinity); - } - real tx = (1 - k) * c * v.x/d; - real ty = (1 - k) * c * v.y/d; - real txx = (1 - k) * u.x * v.y/d + k; - real txy = (k - 1) * u.x * v.x/d; - real tyx = (1 - k) * u.y * v.y/d; - real tyy = (k - 1) * u.y * v.x/d + k; - transform t = (tx, ty, txx, txy, tyx, tyy); - return t; + pair a = locate(A); + pair u = unit(locate(B) - locate(A)); + pair v = unit(locate(D) - locate(C)); + real c = u.x * a.y - u.y * a.x; + real d = (conj(u) * v).y; + real d = (conj(u) * v).y; + if (abs(d) < epsgeo) { + return safe ? identity() : scale(infinity); + } + real tx = (1 - k) * c * v.x/d; + real ty = (1 - k) * c * v.y/d; + real txx = (1 - k) * u.x * v.y/d + k; + real txy = (k - 1) * u.x * v.x/d; + real tyx = (1 - k) * u.y * v.y/d; + real tyy = (k - 1) * u.y * v.x/d + k; + transform t = (tx, ty, txx, txy, tyx, tyy); + return t; } /**/ transform scaleO(real x) {/*Homothety from the origin of the current coordinate system.*/ - return scale(x, (0, 0)); + return scale(x, (0, 0)); } /**/ transform xscaleO(real x) {/*xscale from the origin and relatively to the current coordinate system.*/ - return scale(x, (0, 0), (0, 1), (0, 0), (1, 0)); + return scale(x, (0, 0), (0, 1), (0, 0), (1, 0)); } /**/ transform yscaleO(real x) {/*yscale from the origin and relatively to the current coordinate system.*/ - return scale(x, (0, 0), (1, 0), (0, 0), (0, 1)); + return scale(x, (0, 0), (1, 0), (0, 0), (0, 1)); } /**/ @@ -876,121 +876,121 @@ struct vector /**/ point operator cast(vector v) {/*Cast vector 'v' to point 'M' so that OM = v.*/ - return v.v; + return v.v; } /**/ vector operator cast(pair v) {/*Cast pair to vector relatively to the current coordinate system 'currentcoordsys'.*/ - vector ov; - ov.v = point(currentcoordsys, v); - return ov; + vector ov; + ov.v = point(currentcoordsys, v); + return ov; } /**/ vector operator cast(explicit point v) {/*A point can be interpreted like a vector using the code '(vector)a_point'.*/ - vector ov; - ov.v = v; - return ov; + vector ov; + ov.v = v; + return ov; } /**/ pair operator cast(explicit vector v) {/*Cast vector to pair (the coordinates of 'v' in the default coordinate system).*/ - return locate(v.v) - v.v.coordsys.O; + return locate(v.v) - v.v.coordsys.O; } /**/ align operator cast(vector v) {/*Cast vector to align.*/ - return (pair)v; + return (pair)v; } /**/ vector vector(coordsys R = currentcoordsys, pair v) {/*Return the vector of 'R' which has the coordinates 'v'.*/ - vector ov; - ov.v = point(R, v); - return ov; + vector ov; + ov.v = point(R, v); + return ov; } /**/ vector vector(point M) {/*Return the vector OM, where O is the origin of the coordinate system of 'M'. Useful to write 'vector(P - M);' instead of '(vector)(P - M)'.*/ - return M; + return M; } /**/ point point(explicit vector u) {/*Return the point M so that OM = u, where O is the origin of the coordinate system of 'u'.*/ - return u.v; + return u.v; } /**/ pair locate(explicit vector v) {/*Return the coordinates of 'v' in the default coordinate system (like casting vector to pair).*/ - return (pair)v; + return (pair)v; } /**/ void show(Label L, vector v, pen p = currentpen, arrowbar arrow = Arrow) {/*Draw the vector v (from the origin of its coordinate system).*/ - coordsys R = v.v.coordsys; - draw(L, R.O--v.v, p, arrow); + coordsys R = v.v.coordsys; + draw(L, R.O--v.v, p, arrow); } /**/ vector changecoordsys(coordsys R, vector v) {/*Return the vector 'v' relatively to coordinate system 'R'.*/ - vector ov; - ov.v = point(R, (locate(v) + R.O)/R); - return ov; + vector ov; + ov.v = point(R, (locate(v) + R.O)/R); + return ov; } /**/ vector operator *(real x, explicit vector v) {/*Provide real * vector.*/ - return x * v.v; + return x * v.v; } /**/ vector operator /(explicit vector v, real x) {/*Provide vector/real*/ - return v.v/x; + return v.v/x; } /**/ vector operator *(transform t, explicit vector v) {/*Provide transform * vector.*/ - return t * v.v; + return t * v.v; } /**/ vector operator *(explicit point M, explicit vector v) {/*Provide point * vector*/ - return M * v.v; + return M * v.v; } /**/ point operator +(point M, explicit vector v) {/*Return 'M' shifted by 'v'.*/ - return shift(locate(v)) * M; + return shift(locate(v)) * M; } /**/ point operator -(point M, explicit vector v) {/*Return 'M' shifted by '-v'.*/ - return shift(-locate(v)) * M; + return shift(-locate(v)) * M; } /**/ vector operator -(explicit vector v) {/*Provide -v.*/ - return -v.v; + return -v.v; } /**/ @@ -998,7 +998,7 @@ point operator +(explicit pair m, explicit vector v) {/*The pair 'm' is supposed to be the coordinates of a point in the current coordinates system 'currentcoordsys'. Return this point shifted by the vector 'v'.*/ - return locate(m) + v; + return locate(m) + v; } /**/ @@ -1006,7 +1006,7 @@ point operator -(explicit pair m, explicit vector v) {/*The pair 'm' is supposed to be the coordinates of a point in the current coordinates system 'currentcoordsys'. Return this point shifted by the vector '-v'.*/ - return m + (-v); + return m + (-v); } /**/ @@ -1014,9 +1014,9 @@ vector operator +(explicit vector v1, explicit vector v2) {/*Provide vector + vector. If the two vector haven't the same coordinate system, the returned vector is relative to the default coordinate system (without warning).*/ - coordsys R = v1.v.coordsys; - if(samecoordsys(false, v1, v2)){R = defaultcoordsys;} - return vector(R, (locate(v1) + locate(v2))/R); + coordsys R = v1.v.coordsys; + if(samecoordsys(false, v1, v2)){R = defaultcoordsys;} + return vector(R, (locate(v1) + locate(v2))/R); } /**/ @@ -1024,31 +1024,31 @@ vector operator -(explicit vector v1, explicit vector v2) {/*Provide vector - vector. If the two vector haven't the same coordinate system, the returned vector is relative to the default coordinate system (without warning).*/ - return v1 + (-v2); + return v1 + (-v2); } /**/ bool operator ==(explicit vector u, explicit vector v) -{/*Return true iff |u - v|*/ - return abs(u - v) < EPS; -} + {/*Return true iff |u - v|*/ + return abs(u - v) < EPS; + } /**/ bool collinear(vector u, vector v) {/*Return 'true' iff the vectors 'u' and 'v' are collinear.*/ - return abs(ypart((conj((pair)u) * (pair)v))) < EPS; + return abs(ypart((conj((pair)u) * (pair)v))) < EPS; } /**/ vector unit(point M) {/*Return the unit vector according to the modulus of its coordinate system.*/ - return M/abs(M); + return M/abs(M); } /**/ vector unit(vector u) {/*Return the unit vector according to the modulus of its coordinate system.*/ - return u.v/abs(u.v); + return u.v/abs(u.v); } /**/ @@ -1056,7 +1056,7 @@ real degrees(vector v, coordsys R = v.v.coordsys, bool warn = true) {/*Return the angle of 'v' (in degrees) relatively to 'R'.*/ - return (degrees(locate(v), warn) - degrees(R.i))%360; + return (degrees(locate(v), warn) - degrees(R.i))%360; } /**/ @@ -1064,13 +1064,13 @@ real angle(explicit vector v, coordsys R = v.v.coordsys, bool warn = true) {/*Return the angle of 'v' (in radians) relatively to 'R'.*/ - return radians(degrees(v, R, warn)); + return radians(degrees(v, R, warn)); } /**/ vector conj(explicit vector u) {/*Conjugate.*/ - return conj(u.v); + return conj(u.v); } /**/ @@ -1079,7 +1079,7 @@ transform rotate(explicit vector dir) This is useful for rotating text along a line in the direction dir. rotate(explicit point dir) is also defined. */ - return rotate(locate(dir)); + return rotate(locate(dir)); } transform rotate(explicit point dir){return rotate(locate(vector(dir)));} // *......................COORDINATES......................* @@ -1311,7 +1311,7 @@ void perpendicularmark(picture pic = currentpicture, point z, g = margin(g, p).g; draw(apic, g, p); if(filltype != NoFill) filltype.fill(apic, (relpoint(g, 0) - relpoint(g, 0.5)+ - relpoint(g, 1))--g--cycle, p + solid); + relpoint(g, 1))--g--cycle, p + solid); add(pic, apic, locate(z)); } @@ -1360,7 +1360,7 @@ void markrightangle(picture pic = currentpicture, point A, point O, pair Ap = A, Bp = B, Op = O; pair dir = Ap - Op; real a1 = degrees(dir); - pair align = rotate(-a1) * unit(dir(Op--Ap, Op--Bp)); + pair align = rotate(-a1) * dir(Op--Ap, Op--Bp); perpendicularmark(pic = pic, z = O, align = align, dir = dir, size = size, p = p, margin = margin, filltype = filltype); @@ -1700,80 +1700,80 @@ void write(explicit segment s) /**/ bool operator ==(line l1, line l2) -{/*Provide the test 'line == line'.*/ - return (collinear(l1.u, l2.u) && - abs(ypart((locate(l1.A) - locate(l1.B))/(locate(l1.A) - locate(l2.B)))) < epsgeo && - l1.extendA == l2.extendA && l1.extendB == l2.extendB); -} + {/*Provide the test 'line == line'.*/ + return (collinear(l1.u, l2.u) && + abs(ypart((locate(l1.A) - locate(l1.B))/(locate(l1.A) - locate(l2.B)))) < epsgeo && + l1.extendA == l2.extendA && l1.extendB == l2.extendB); + } /**/ bool operator !=(line l1, line l2) {/*Provide the test 'line != line'.*/ - return !(l1 == l2); + return !(l1 == l2); } /**/ bool operator @(point m, line l) {/*Provide the test 'point @ line'. Return true iff 'm' is on the 'l'.*/ - point M = changecoordsys(l.A.coordsys, m); - if (abs(l.a * M.x + l.b * M.y + l.c) >= epsgeo) return false; - if (l.extendA && l.extendB) return true; - if (!l.extendA && !l.extendB) return between(l.A, M, l.B); - if (l.extendA) return sameside(M, l.A, l.B); - return sameside(M, l.B, l.A); + point M = changecoordsys(l.A.coordsys, m); + if (abs(l.a * M.x + l.b * M.y + l.c) >= epsgeo) return false; + if (l.extendA && l.extendB) return true; + if (!l.extendA && !l.extendB) return between(l.A, M, l.B); + if (l.extendA) return sameside(M, l.A, l.B); + return sameside(M, l.B, l.A); } /**/ coordsys coordsys(line l) {/*Return the coordinate system in which 'l' is defined.*/ - return l.A.coordsys; + return l.A.coordsys; } /**/ line reverse(line l) {/*Permute the points 'A' and 'B' of 'l' and so its orientation.*/ - return line(l.B, l.extendB, l.A, l.extendA); + return line(l.B, l.extendB, l.A, l.extendA); } /**/ line extend(line l) {/*Return the infinite line passing through 'l.A' and 'l.B'.*/ - line ol = l.copy(); - ol.extendA = true; - ol.extendB = true; - return ol; + line ol = l.copy(); + ol.extendA = true; + ol.extendB = true; + return ol; } /**/ line complementary(explicit line l) {/*Return the complementary of a half-line with respect of the full line 'l'.*/ - if (l.extendA && l.extendB) - abort("complementary: the parameter is not a half-line."); - point origin = l.extendA ? l.B : l.A; - point ptdir = l.extendA ? - rotate(180, l.B) * l.A : rotate(180, l.A) * l.B; - return line(origin, false, ptdir); + if (l.extendA && l.extendB) + abort("complementary: the parameter is not a half-line."); + point origin = l.extendA ? l.B : l.A; + point ptdir = l.extendA ? + rotate(180, l.B) * l.A : rotate(180, l.A) * l.B; + return line(origin, false, ptdir); } /**/ line[] complementary(explicit segment s) {/*Return the two half-lines of origin 's.A' and 's.B' respectively.*/ - line[] ol = new line[2]; - ol[0] = complementary(line(s.A, false, s.B)); - ol[1] = complementary(line(s.A, s.B, false)); - return ol; + line[] ol = new line[2]; + ol[0] = complementary(line(s.A, false, s.B)); + ol[1] = complementary(line(s.A, s.B, false)); + return ol; } /**/ line Ox(coordsys R = currentcoordsys) {/*Return the x-axis of 'R'.*/ - return line(point(R, (0, 0)), point(R, E)); + return line(point(R, (0, 0)), point(R, E)); } /**/ restricted line Ox = Ox();/*the x-axis of - the default coordinate system.*/ + the default coordinate system.*/ /**/ line Oy(coordsys R = currentcoordsys) @@ -1782,7 +1782,7 @@ line Oy(coordsys R = currentcoordsys) } /**/ restricted line Oy = Oy();/*the y-axis of - the default coordinate system.*/ + the default coordinate system.*/ /**/ line line(real a, point A = point(currentcoordsys, (0, 0))) @@ -1826,7 +1826,7 @@ line vline(coordsys R = currentcoordsys) } /**/ restricted line vline = vline();/*The vertical line in the current coordinate system passing - through the origin of this system.*/ + through the origin of this system.*/ /**/ line hline(coordsys R = currentcoordsys) @@ -1837,7 +1837,7 @@ line hline(coordsys R = currentcoordsys) } /**/ line hline = hline();/*The horizontal line in the current coordinate system passing - through the origin of this system.*/ + through the origin of this system.*/ /**/ line changecoordsys(coordsys R, line l) @@ -2358,11 +2358,11 @@ bqe bqe(coordsys R = currentcoordsys, bqe changecoordsys(coordsys R, bqe bqe) {/*Returns the bivariate quadratic equation relatively to 'R'.*/ pair i = coordinates(changecoordsys(R, vector(defaultcoordsys, - bqe.coordsys.i))); + bqe.coordsys.i))); pair j = coordinates(changecoordsys(R, vector(defaultcoordsys, - bqe.coordsys.j))); + bqe.coordsys.j))); pair O = coordinates(changecoordsys(R, point(defaultcoordsys, - bqe.coordsys.O))); + bqe.coordsys.O))); real a = bqe.a[0], b = bqe.a[1], c = bqe.a[2], d = bqe.a[3], f = bqe.a[4], g = bqe.a[5]; real ux = i.x, uy = i.y; real vx = j.x, vy = j.y; @@ -2372,14 +2372,14 @@ bqe changecoordsys(coordsys R, bqe bqe) real bpp = (-2 * a * vx * vy + b * ux * vy + b * uy * vx - 2 * c * ux * uy)/D^2; real cp = (a * vx^2 - b * ux * vx + c * ux^2)/D^2; real dp = (-2a * ox * vy^2 + 2a * oy * vx * vy + 2b * ox * uy * vy- - b * oy * ux * vy - b * oy * uy * vx - 2c * ox * uy^2 + 2c * oy * uy * ux)/D^2+ + b * oy * ux * vy - b * oy * uy * vx - 2c * ox * uy^2 + 2c * oy * uy * ux)/D^2+ (d * vy - f * uy)/D; real fp = (2a * ox * vx * vy - b * ox * ux * vy - 2a * oy * vx^2- - b * ox * uy * vx + 2 * b * oy * ux * vx + 2c * ox * ux * uy - 2c * oy * ux^2)/D^2+ + b * ox * uy * vx + 2 * b * oy * ux * vx + 2c * ox * ux * uy - 2c * oy * ux^2)/D^2+ (f * ux - d * vx)/D; g = (a * ox^2 * vy^2 - 2a * ox * oy * vx * vy - b * ox^2 * uy * vy + b * ox * oy * ux * vy+ - a * oy^2 * vx^2 + b * ox * oy * uy * vx - b * oy^2 * ux * vx + c * ox^2 * uy^2- - 2 * c * ox * oy * ux * uy + c * oy^2 * ux^2)/D^2+ + a * oy^2 * vx^2 + b * ox * oy * uy * vx - b * oy^2 * ux * vx + c * ox^2 * uy^2- + 2 * c * ox * oy * ux * uy + c * oy^2 * ux^2)/D^2+ (d * oy * vx + f * ox * uy - d * ox * vy - f * oy * ux)/D + g; bqe obqe; obqe.a = approximate(new real[] {ap, bpp, cp, dp, fp, g}); @@ -3073,8 +3073,8 @@ parabola parabola(point M1, point M2, point M3, line l) real gle = degrees(l); coordsys Rp = cartesiansystem(R.O, rotate(gle) * R.i, rotate(gle) * R.j); pts = new pair[] {coordinates(changecoordsys(Rp, M1)), - coordinates(changecoordsys(Rp, M2)), - coordinates(changecoordsys(Rp, M3))}; + coordinates(changecoordsys(Rp, M2)), + coordinates(changecoordsys(Rp, M3))}; real[][] M; real[] x; for (int i = 0; i < 3; ++i) { @@ -3560,10 +3560,10 @@ path arcfromcenter(explicit conic co, real angle1, real angle2, path g; if(co.e < 1) g = arcfromcenter((ellipse)co, angle1, - angle2, direction, n); + angle2, direction, n); else if(co.e > 1) g = arcfromcenter((hyperbola)co, angle1, - angle2, n, direction); + angle2, n, direction); else abort("arcfromcenter: does not exist for a parabola."); return g; } @@ -3590,8 +3590,8 @@ bqe equation(ellipse el) } real[] coef = solve(M, x); bqe bqe = changecoordsys(coordsys(el), - bqe(defaultcoordsys, - 1, coef[0], coef[1], coef[2], coef[3], coef[4])); + bqe(defaultcoordsys, + 1, coef[0], coef[1], coef[2], coef[3], coef[4])); bqe.a = approximate(bqe.a); return bqe; } @@ -4038,8 +4038,8 @@ real arclength(ellipse el, real angle1, real angle2, // given form the center of the ellipse. real gle = atan(el.a * tan(radians(a))/el.b)+ pi * (((a%90 == 0 && a != 0) ? floor(a/90) - 1 : floor(a/90)) - - ((a%180 == 0) ? 0 : floor(a/180)) - - (a%360 == 0 ? floor(a/(360)) : 0)); + ((a%180 == 0) ? 0 : floor(a/180)) - + (a%360 == 0 ? floor(a/(360)) : 0)); /* // Uncomment to visualize the used branches unitsize(2cm, 1cm); import graph; @@ -4076,7 +4076,7 @@ real arclength(parabola p, real angle) {/*Return the arclength from 180 to 'angle' given from focus in the canonical coordinate system of 'p'.*/ real a = p.a; /* In canonicalcartesiansystem(p) the equation of p - is x = y^2/(4a) */ + is x = y^2/(4a) */ // integrate(sqrt(1 + (x/(2 * a))^2), x); real S(real t){return 0.5 * t * sqrt(1 + t^2/(4 * a^2)) + a * asinh(t/(2 * a));} real R(real gle){return 2 * a/(1 - Cos(gle));} @@ -4110,7 +4110,7 @@ struct abscissa real x;/*The abscissa value.*/ int system;/*0 = relativesystem; 1 = curvilinearsystem; 2 = angularsystem; 3 = nodesystem*/ polarconicroutine polarconicroutine = fromCenter;/*The routine used with angular system and two foci conic section. - Possible values are 'formCenter' and 'formFocus'.*/ + Possible values are 'formCenter' and 'formFocus'.*/ /**/ abscissa copy() {/*Return a copy of this abscissa.*/ @@ -4800,7 +4800,7 @@ struct arc { restricted real angle1, angle2;/*Values (in degrees) in ]-360, 360[.*/ bool direction = CCW;/*The arc will be drawn from 'angle1' to 'angle2' rotating in the direction 'direction'.*/ polarconicroutine polarconicroutine = currentpolarconicroutine;/*The routine to which the angles refer. - If 'el' is a circle 'fromCenter' is always used.*/ + If 'el' is a circle 'fromCenter' is always used.*/ /**/ void setangles(real a0, real a1, real a2) @@ -6478,7 +6478,7 @@ point[] intersectionpoints(line l, circle c) coordsys Rc = cartesiansystem(c.C, (1, 0), (0, 1)); line ll = changecoordsys(Rc, l); pair[] P = intersectionpoints(ll.A.coordinates, ll.B.coordinates, - 1, 0, 1, 0, 0, -c.r^2); + 1, 0, 1, 0, 0, -c.r^2); for (int i = 0; i < P.length; ++i) { point inter = changecoordsys(R, point(Rc, P[i])); if(inter @ l) op.push(inter); @@ -6518,7 +6518,7 @@ point[] intersectionpoints(line l, ellipse el) coordsys Rc = canonicalcartesiansystem(el); line ll = changecoordsys(Rc, l); pair[] P = intersectionpoints(ll.A.coordinates, ll.B.coordinates, - 1/el.a^2, 0, 1/el.b^2, 0, 0, -1); + 1/el.a^2, 0, 1/el.b^2, 0, 0, -1); for (int i = 0; i < P.length; ++i) { point inter = changecoordsys(R, point(Rc, P[i])); if(inter @ l) op.push(inter); @@ -6644,7 +6644,7 @@ point[] intersectionpoints(bqe bqe1, bqe bqe2) if(abs(b[4]) > e) { real D=b[4]^2; c=new real[] {(a[0]*b[4]^2+a[2]*b[3]^2+ - (-2*a[2]*a[3])*b[3]+a[2]*a[3]^2)/D, + (-2*a[2]*a[3])*b[3]+a[2]*a[3]^2)/D, -((-2*a[2]*b[3]+2*a[2]*a[3])*b[5]-a[3]*b[4]^2+ (2*a[2]*a[5])*b[3])/D,a[2]*(a[5]-b[5])^2/D+a[5]}; x=quadraticroots(c[0],c[1],c[2]); diff --git a/graphics/asymptote/base/graph.asy b/graphics/asymptote/base/graph.asy index 7498ce8bfd..46a5d7d064 100644 --- a/graphics/asymptote/base/graph.asy +++ b/graphics/asymptote/base/graph.asy @@ -42,14 +42,14 @@ scaleT Broken(real a, real b, bool automin=false, bool automax=automin) return x-skip; } real Tinv(real x) { - if(x <= a) return x; - return x+skip; + if(x <= a) return x; + return x+skip; } return scaleT(T,Tinv,logarithmic=false,automin,automax); } // A "broken" logarithmic axis omitting the segment [a,b], where a and b are -// automatically rounded to the nearest integral power of the base. +// automatically rounded to the nearest integral power of the base. scaleT BrokenLog(real a, real b, bool automin=false, bool automax=automin) { real A=round(Log.T(a)); @@ -92,7 +92,7 @@ void scale(picture pic=currentpicture, bool xautoscale=false, Linear(zautoscale,zautoscale)); } -struct scientific +struct scientific { int sign; real mantissa; @@ -108,7 +108,7 @@ struct scientific } // Convert x to scientific notation -scientific scientific(real x) +scientific scientific(real x) { scientific s; s.sign=sgn(x); @@ -154,7 +154,7 @@ int[] divisors(int a, int b) real upscale(real b, real a) { - if(b <= 5) b=5; + if(b <= 5) b=5; else if (b > 10 && a >= 0 && b <= 12) b=12; else if (b > 10 && (a >= 0 || 15 % -a == 0) && b <= 15) b=15; else b=ceil(b/10)*10; @@ -182,7 +182,7 @@ bounds autoscale(real Min, real Max, scaleT scale=Linear) if(Min > 0) {Min=0; Max *= 2;} else {Min *= 2; Max=0;} } - + int sign; if(Min < 0 && Max <= 0) {real temp=-Min; Min=-Max; Max=temp; sign=-1;} else sign=1; @@ -203,7 +203,7 @@ bounds autoscale(real Min, real Max, scaleT scale=Linear) while((b-a)*10.0^exp > 10*(Max-Min)) zoom(); - + real bsave=b; if(b-a > (a >= 0 ? 8 : 6)) { b=upscale(b,a); @@ -211,11 +211,11 @@ bounds autoscale(real Min, real Max, scaleT scale=Linear) if(a <= 5) a=0; else a=floor(a/10)*10; } else a=-upscale(-a,-1); } - + // Redo b in case the value of a has changed if(bsave-a > (a >= 0 ? 8 : 6)) b=upscale(bsave,a); - + if(sign == -1) {real temp=-a; a=-b; b=temp;} real Scale=10.0^exp; m.min=scale.T(a*Scale); @@ -266,7 +266,7 @@ ticklabel LogFormat(int base) { ticklabel LogFormat=LogFormat(10); ticklabel DefaultLogFormat=DefaultLogFormat(10); - + // The default direction specifier. pair zero(real) {return 0;} @@ -275,7 +275,7 @@ struct ticklocate { autoscaleT S; // Autoscaling transformation. pair dir(real t); // Absolute 2D tick direction. triple dir3(real t); // Absolute 3D tick direction. - real time(real v); // Returns the time corresponding to the value v. + real time(real v); // Returns the time corresponding to the value v. ticklocate copy() { ticklocate T=new ticklocate; T.a=a; @@ -289,7 +289,7 @@ struct ticklocate { } autoscaleT defaultS; - + typedef real valuetime(real); valuetime linear(scalefcn S=identity, real Min, real Max) @@ -300,7 +300,7 @@ valuetime linear(scalefcn S=identity, real Min, real Max) ticklocate ticklocate(real a, real b, autoscaleT S=defaultS, real tickmin=-infinity, real tickmax=infinity, - real time(real)=null, pair dir(real)=zero) + real time(real)=null, pair dir(real)=zero) { if((valuetime) time == null) time=linear(S.T(),a,b); ticklocate locate; @@ -313,13 +313,13 @@ ticklocate ticklocate(real a, real b, autoscaleT S=defaultS, locate.dir=dir; return locate; } - + private struct locateT { real t; // tick location time pair Z; // tick location in frame coordinates pair pathdir; // path direction in frame coordinates pair dir; // tick direction in frame coordinates - + void dir(transform T, path g, ticklocate locate, real t) { pathdir=unit(shiftless(T)*dir(g,t)); pair Dir=locate.dir(t); @@ -333,7 +333,7 @@ private struct locateT { } } -pair ticklabelshift(pair align, pen p=currentpen) +pair ticklabelshift(pair align, pen p=currentpen) { return 0.25*unit(align)*labelmargin(p); } @@ -347,7 +347,7 @@ void drawtick(frame f, transform T, path g, path g2, ticklocate locate, locate2.calc(T,g2,locate,val); draw(f,locate1.Z--locate2.Z,p); } else - if(sign == 0) + if(sign == 0) draw(f,locate1.Z-Size*locate1.dir--locate1.Z+Size*locate1.dir,p); else draw(f,locate1.Z--locate1.Z+Size*sign*locate1.dir,p); @@ -388,10 +388,10 @@ pair labeltick(frame d, transform T, path g, ticklocate locate, real val, label(d,F.T*baseline(s,baselinetemplate),locate1.Z+shift,align,F.p, F.filltype); return locate1.pathdir; -} +} // Add axis label L to frame f. -void labelaxis(frame f, transform T, Label L, path g, +void labelaxis(frame f, transform T, Label L, path g, ticklocate locate=null, int sign=1, bool ticklabels=false) { Label L0=L.copy(); @@ -403,7 +403,7 @@ void labelaxis(frame f, transform T, Label L, path g, locateT locate1; locate1.dir(T,g,locate,t); L0.align(L0.align,unit(-sgn(dot(sign*locate1.dir,perp))*perp)); - } + } pair align=L0.align.dir; if(L0.align.relative) align *= -perp; pair alignperp=dot(align,perp)*perp; @@ -477,7 +477,7 @@ bool axiscoverage(int N, transform T, path g, ticklocate locate, real Step, // Check the tick coverage of a logarithmic axis. bool logaxiscoverage(int N, transform T, path g, ticklocate locate, pair side, - int sign, real Size, Label F, ticklabel ticklabel, + int sign, real Size, Label F, ticklabel ticklabel, real limit, int first, int last) { bool loop=cyclic(g); @@ -525,7 +525,7 @@ string autoformat(string format="", real norm ... real[] a) int n=0; bool Fixed=find(a >= 1e4-epsilon | (a > 0 & a <= 1e-4-epsilon)) < 0; - + string Format=defaultformat(4,fixed=Fixed); if(Fixed && n < 4) { @@ -576,13 +576,13 @@ tickvalues generateticks(int sign, Label F="", ticklabel ticklabel=null, if(size == 0) size=ticksize; F=F.copy(); F.p(p); - + if(F.align.dir != 0) side=F.align.dir; else if(side == 0) side=((sign == 1) ? left : right); - + bool ticklabels=false; path G=T*g; - + if(!locate.S.scale.logarithmic) { real a=locate.S.Tinv(locate.a); real b=locate.S.Tinv(locate.b); @@ -594,15 +594,15 @@ tickvalues generateticks(int sign, Label F="", ticklabel ticklabel=null, if(a > b) {real temp=a; a=b; b=temp;} if(b-a < 100.0*epsilon*norm) b=a; - + bool autotick=Step == 0 && N == 0; - - real tickmin=finite(locate.S.tickMin) && (autotick || locate.S.automin) ? + + real tickmin=finite(locate.S.tickMin) && (autotick || locate.S.automin) ? locate.S.Tinv(locate.S.tickMin) : a; real tickmax=finite(locate.S.tickMax) && (autotick || locate.S.automax) ? locate.S.Tinv(locate.S.tickMax) : b; if(tickmin > tickmax) {real temp=tickmin; tickmin=tickmax; tickmax=temp;} - + real inStep=Step; bool calcStep=true; @@ -630,7 +630,7 @@ tickvalues generateticks(int sign, Label F="", ticklabel ticklabel=null, // Try using 2 ticks (otherwise 1); int div=divisor[d+1]; Step=quotient(div,2)*len/div; - calcStep=false; + calcStep=false; if(axiscoverage(2,T,g,locate,Step,side,sign,Size,F,ticklabel, norm,limit)) N=2; else Step=len; @@ -650,7 +650,7 @@ tickvalues generateticks(int sign, Label F="", ticklabel ticklabel=null, } } } - + if(inStep != 0 && !locate.S.automin) { tickmin=floor(tickmin/Step)*Step; len=tickmax-tickmin; @@ -661,13 +661,13 @@ tickvalues generateticks(int sign, Label F="", ticklabel ticklabel=null, if(N == 0) N=(int) (len/Step); else Step=len/N; } - + if(n == 0) { if(step != 0) n=ceil(Step/step); } else step=Step/n; - + b += epsilon*norm; - + if(Size > 0) { for(int i=0; i <= N; ++i) { real val=tickmin+i*Step; @@ -684,22 +684,22 @@ tickvalues generateticks(int sign, Label F="", ticklabel ticklabel=null, } } } - + } else { // Logarithmic string format=F.s; if(F.s == "%") F.s=""; int base=round(locate.S.scale.Tinv(1)); - if(ticklabel == null) + if(ticklabel == null) ticklabel=format == "%" ? Format("") : DefaultLogFormat(base); real a=locate.S.postscale.Tinv(locate.a); real b=locate.S.postscale.Tinv(locate.b); if(a > b) {real temp=a; a=b; b=temp;} - + int first=floor(a-epsilon); int last=ceil(b+epsilon); - + if(N == 0) { N=1; while(N <= last-first) { @@ -708,10 +708,10 @@ tickvalues generateticks(int sign, Label F="", ticklabel ticklabel=null, ++N; } } - + if(N <= 2 && n == 0) n=base; tickvalues.N=N; - + if(N > 0) { for(int i=first-1; i <= last+1; ++i) { if(i >= a && i <= b) @@ -725,14 +725,14 @@ tickvalues generateticks(int sign, Label F="", ticklabel ticklabel=null, } } } - } + } return tickvalues; } // Signature of routines that draw labelled paths with ticks and tick labels. typedef void ticks(frame, transform, Label, pair, path, path, pen, arrowbar, margin, ticklocate, int[], bool opposite=false); - + // Tick construction routine for a user-specified array of tick values. ticks Ticks(int sign, Label F="", ticklabel ticklabel=null, bool beginlabel=true, bool endlabel=true, @@ -741,7 +741,7 @@ ticks Ticks(int sign, Label F="", ticklabel ticklabel=null, real Size=0, real size=0, bool extend=false, pen pTick=nullpen, pen ptick=nullpen) { - return new void(frame f, transform t, Label L, pair side, path g, path g2, + return new void(frame f, transform t, Label L, pair side, path g, path g2, pen p, arrowbar arrow, margin margin, ticklocate locate, int[] divisor, bool opposite) { // Use local copy of context variables: @@ -749,28 +749,28 @@ ticks Ticks(int sign, Label F="", ticklabel ticklabel=null, pen pTick=pTick; pen ptick=ptick; ticklabel ticklabel=ticklabel; - + real Size=Size; real size=size; if(Size == 0) Size=Ticksize; if(size == 0) size=ticksize; - + Label L=L.copy(); Label F=F.copy(); L.p(p); F.p(p); if(pTick == nullpen) pTick=p; if(ptick == nullpen) ptick=pTick; - + if(F.align.dir != 0) side=F.align.dir; else if(side == 0) side=F.T*((sign == 1) ? left : right); - + bool ticklabels=false; path G=t*g; path G2=t*g2; - + scalefcn T; - + real a,b; if(locate.S.scale.logarithmic) { a=locate.S.postscale.Tinv(locate.a); @@ -781,11 +781,11 @@ ticks Ticks(int sign, Label F="", ticklabel ticklabel=null, b=locate.S.Tinv(locate.b); T=identity; } - + if(a > b) {real temp=a; a=b; b=temp;} real norm=max(abs(a),abs(b)); - + string format=autoformat(F.s,norm...Ticks); if(F.s == "%") F.s=""; if(ticklabel == null) { @@ -809,7 +809,7 @@ ticks Ticks(int sign, Label F="", ticklabel ticklabel=null, drawtick(f,t,g,g2,locate,val,size,sign,ptick,extend); } endgroup(f); - + if(N == 0) N=1; if(Size > 0 && !opposite) { for(int i=(beginlabel ? 0 : 1); @@ -821,7 +821,7 @@ ticks Ticks(int sign, Label F="", ticklabel ticklabel=null, } } } - if(L.s != "" && !opposite) + if(L.s != "" && !opposite) labelaxis(f,t,L,G,locate,sign,ticklabels); }; } @@ -832,7 +832,7 @@ tickvalues None(tickvalues v) {return v;} // Tickmodifier that removes all ticks in the intervals [a[i],b[i]]. tickmodifier OmitTickIntervals(real[] a, real[] b) { - return new tickvalues(tickvalues v) { + return new tickvalues(tickvalues v) { if(a.length != b.length) abort(differentlengths); void omit(real[] A) { if(A.length != 0) { @@ -939,8 +939,8 @@ ticks Ticks(Label format="", ticklabel ticklabel=null, begin,end,modify,Size,size,extend,pTick,ptick); } -ticks LeftTicks(Label format="", ticklabel ticklabel=null, - bool beginlabel=true, bool endlabel=true, +ticks LeftTicks(Label format="", ticklabel ticklabel=null, + bool beginlabel=true, bool endlabel=true, real[] Ticks, real[] ticks=new real[], real Size=0, real size=0, bool extend=false, pen pTick=nullpen, pen ptick=nullpen) @@ -949,8 +949,8 @@ ticks LeftTicks(Label format="", ticklabel ticklabel=null, Ticks,ticks,Size,size,extend,pTick,ptick); } -ticks RightTicks(Label format="", ticklabel ticklabel=null, - bool beginlabel=true, bool endlabel=true, +ticks RightTicks(Label format="", ticklabel ticklabel=null, + bool beginlabel=true, bool endlabel=true, real[] Ticks, real[] ticks=new real[], real Size=0, real size=0, bool extend=false, pen pTick=nullpen, pen ptick=nullpen) @@ -959,8 +959,8 @@ ticks RightTicks(Label format="", ticklabel ticklabel=null, Ticks,ticks,Size,size,extend,pTick,ptick); } -ticks Ticks(Label format="", ticklabel ticklabel=null, - bool beginlabel=true, bool endlabel=true, +ticks Ticks(Label format="", ticklabel ticklabel=null, + bool beginlabel=true, bool endlabel=true, real[] Ticks, real[] ticks=new real[], real Size=0, real size=0, bool extend=false, pen pTick=nullpen, pen ptick=nullpen) @@ -978,18 +978,18 @@ pair tickMin(picture pic) { return minbound(pic.userMin(),(pic.scale.x.tickMin,pic.scale.y.tickMin)); } - + pair tickMax(picture pic) { return maxbound(pic.userMax(),(pic.scale.x.tickMax,pic.scale.y.tickMax)); } - + int Min=-1; int Value=0; int Max=1; int Both=2; -// Structure used to communicate axis and autoscale settings to tick routines. +// Structure used to communicate axis and autoscale settings to tick routines. struct axisT { int type; // -1 = min, 0 = given value, 1 = max, 2 = min/max int type2; // for 3D axis @@ -1062,7 +1062,7 @@ axis Right(bool extend=false) }; } -axis LeftRight(bool extend=false) +axis LeftRight(bool extend=false) { return new void(picture pic, axisT axis) { axis.type=Both; @@ -1134,7 +1134,7 @@ YZero=YZero(); void axis(picture pic=currentpicture, Label L="", path g, path g2=nullpath, pen p=currentpen, ticks ticks, ticklocate locate, arrowbar arrow=None, margin margin=NoMargin, - int[] divisor=new int[], bool above=false, bool opposite=false) + int[] divisor=new int[], bool above=false, bool opposite=false) { Label L=L.copy(); real t=reltime(g,0.5); @@ -1146,9 +1146,9 @@ void axis(picture pic=currentpicture, Label L="", path g, path g2=nullpath, ticks(d,t,L,0,g,g2,p,arrow,margin,locate,divisor,opposite); (above ? add : prepend)(f,t*T*inverse(t)*d); }); - + pic.addPath(g,p); - + if(L.s != "") { frame f; Label L0=L.copy(); @@ -1195,7 +1195,7 @@ void xaxisAt(picture pic=currentpicture, Label L="", axis axis, pic.scale.x.tickMax=mx.max; divisor=mx.divisor; } - + real fuzz=epsilon*max(abs(a.x),abs(b.x)); a -= (fuzz,0); b += (fuzz,0); @@ -1211,8 +1211,8 @@ void xaxisAt(picture pic=currentpicture, Label L="", axis axis, y2=pic.scale.y.automax() ? tickMax(pic).y : pic.userMax().y; y=opposite ? y2 : (pic.scale.y.automin() ? tickMin(pic).y : pic.userMin().y); - } - else if(type == Min) + } + else if(type == Min) y=pic.scale.y.automin() ? tickMin(pic).y : pic.userMin().y; else if(type == Max) y=pic.scale.y.automax() ? tickMax(pic).y : pic.userMax().y; @@ -1229,7 +1229,7 @@ void xaxisAt(picture pic=currentpicture, Label L="", axis axis, pic.addPoint(a,min(p)); pic.addPoint(a,max(p)); } - + if(finite(b)) { pic.addPoint(b,min(p)); pic.addPoint(b,max(p)); @@ -1299,13 +1299,13 @@ void yaxisAt(picture pic=currentpicture, Label L="", axis axis, ticklocate(a.y,b.y,pic.scale.y),divisor,opposite); (above ? add : prepend)(f,t*T*tinv*d); }); - + void bounds() { if(type == Both) { x2=pic.scale.x.automax() ? tickMax(pic).x : pic.userMax().x; - x=opposite ? x2 : + x=opposite ? x2 : (pic.scale.x.automin() ? tickMin(pic).x : pic.userMin().x); - } else if(type == Min) + } else if(type == Min) x=pic.scale.x.automin() ? tickMin(pic).x : pic.userMin().x; else if(type == Max) x=pic.scale.x.automax() ? tickMax(pic).x : pic.userMax().x; @@ -1317,17 +1317,17 @@ void yaxisAt(picture pic=currentpicture, Label L="", axis axis, pair b=(x,Ymax); pair a2=(x2,Ymin); pair b2=(x2,Ymax); - + if(finite(a)) { pic.addPoint(a,min(p)); pic.addPoint(a,max(p)); } - + if(finite(b)) { pic.addPoint(b,min(p)); pic.addPoint(b,max(p)); } - + if(finite(a) && finite(b)) { frame d; ticks(d,pic.scaling(warn=false),L,side, @@ -1361,32 +1361,32 @@ void xlimits(picture pic=currentpicture, real min=-infinity, real max=infinity, bool crop=NoCrop) { if(min > max) return; - + pic.scale.x.automin=min <= -infinity; pic.scale.x.automax=max >= infinity; - + bounds mx; if(pic.scale.x.automin() || pic.scale.x.automax()) mx=autoscale(pic.userMin().x,pic.userMax().x,pic.scale.x.scale); - + if(pic.scale.x.automin) { if(pic.scale.x.automin()) pic.userMinx(mx.min); } else pic.userMinx(min(pic.scale.x.T(min),pic.scale.x.T(max))); - + if(pic.scale.x.automax) { if(pic.scale.x.automax()) pic.userMaxx(mx.max); } else pic.userMaxx(max(pic.scale.x.T(min),pic.scale.x.T(max))); - + if(crop) { pair userMin=pic.userMin(); pair userMax=pic.userMax(); pic.bounds.xclip(userMin.x,userMax.x); pic.clip(userMin, userMax, - new void (frame f, transform t, transform T, pair, pair) { - frame Tinvf=T == identity() ? f : t*inverse(T)*inverse(t)*f; - clip(f,T*box(((t*userMin).x,(min(Tinvf)).y), - ((t*userMax).x,(max(Tinvf)).y))); - }); + new void (frame f, transform t, transform T, pair, pair) { + frame Tinvf=T == identity() ? f : t*inverse(T)*inverse(t)*f; + clip(f,T*box(((t*userMin).x,(min(Tinvf)).y), + ((t*userMax).x,(max(Tinvf)).y))); + }); } } @@ -1395,37 +1395,37 @@ void ylimits(picture pic=currentpicture, real min=-infinity, real max=infinity, bool crop=NoCrop) { if(min > max) return; - + pic.scale.y.automin=min <= -infinity; pic.scale.y.automax=max >= infinity; - + bounds my; if(pic.scale.y.automin() || pic.scale.y.automax()) my=autoscale(pic.userMin().y,pic.userMax().y,pic.scale.y.scale); - + if(pic.scale.y.automin) { if(pic.scale.y.automin()) pic.userMiny(my.min); } else pic.userMiny(min(pic.scale.y.T(min),pic.scale.y.T(max))); - + if(pic.scale.y.automax) { if(pic.scale.y.automax()) pic.userMaxy(my.max); } else pic.userMaxy(max(pic.scale.y.T(min),pic.scale.y.T(max))); - + if(crop) { pair userMin=pic.userMin(); pair userMax=pic.userMax(); pic.bounds.yclip(userMin.y,userMax.y); - pic.clip(userMin, userMax, - new void (frame f, transform t, transform T, pair, pair) { - frame Tinvf=T == identity() ? f : t*inverse(T)*inverse(t)*f; - clip(f,T*box(((min(Tinvf)).x,(t*userMin).y), - ((max(Tinvf)).x,(t*userMax).y))); - }); + pic.clip(userMin, userMax, + new void (frame f, transform t, transform T, pair, pair) { + frame Tinvf=T == identity() ? f : t*inverse(T)*inverse(t)*f; + clip(f,T*box(((min(Tinvf)).x,(t*userMin).y), + ((max(Tinvf)).x,(t*userMax).y))); + }); } } // Crop a picture to the current user-space picture limits. -void crop(picture pic=currentpicture) +void crop(picture pic=currentpicture) { xlimits(pic,false); ylimits(pic,false); @@ -1441,14 +1441,14 @@ void limits(picture pic=currentpicture, pair min, pair max, bool crop=NoCrop) if(crop && pic.userSetx() && pic.userSety()) clip(pic,box(pic.userMin(),pic.userMax())); } - + // Internal routine to autoscale the user limits of a picture. void autoscale(picture pic=currentpicture, axis axis) { if(!pic.scale.set) { bounds mx,my; pic.scale.set=true; - + if(pic.userSetx()) { mx=autoscale(pic.userMin().x,pic.userMax().x,pic.scale.x.scale); if(pic.scale.x.scale.logarithmic && @@ -1459,7 +1459,7 @@ void autoscale(picture pic=currentpicture, axis axis) pic.userMaxx2(ceil(pic.userMax().x)); } } else {mx.min=mx.max=0; pic.scale.set=false;} - + if(pic.userSety()) { my=autoscale(pic.userMin().y,pic.userMax().y,pic.scale.y.scale); if(pic.scale.y.scale.logarithmic && @@ -1470,7 +1470,7 @@ void autoscale(picture pic=currentpicture, axis axis) pic.userMaxy2(ceil(pic.userMax().y)); } } else {my.min=my.max=0; pic.scale.set=false;} - + pic.scale.x.tickMin=mx.min; pic.scale.x.tickMax=mx.max; pic.scale.y.tickMin=my.min; @@ -1487,7 +1487,7 @@ void xaxis(picture pic=currentpicture, Label L="", axis axis=YZero, bool above=false) { if(xmin > xmax) return; - + if(pic.scale.x.automin && xmin > -infinity) pic.scale.x.automin=false; if(pic.scale.x.automax && xmax < infinity) pic.scale.x.automax=false; @@ -1495,20 +1495,20 @@ void xaxis(picture pic=currentpicture, Label L="", axis axis=YZero, axis(pic,axis); autoscale(pic,axis); } - + Label L=L.copy(); bool newticks=false; - + if(xmin != -infinity) { xmin=pic.scale.x.T(xmin); newticks=true; } - + if(xmax != infinity) { xmax=pic.scale.x.T(xmax); newticks=true; } - + if(newticks && pic.userSetx() && ticks != NoTicks) { if(xmin == -infinity) xmin=pic.userMin().x; if(xmax == infinity) xmax=pic.userMax().x; @@ -1517,16 +1517,16 @@ void xaxis(picture pic=currentpicture, Label L="", axis axis=YZero, pic.scale.x.tickMax=mx.max; axis.xdivisor=mx.divisor; } - + axis(pic,axis); - + if(xmin == -infinity && !axis.extend) { if(pic.scale.set) xmin=pic.scale.x.automin() ? pic.scale.x.tickMin : max(pic.scale.x.tickMin,pic.userMin().x); else xmin=pic.userMin().x; } - + if(xmax == infinity && !axis.extend) { if(pic.scale.set) xmax=pic.scale.x.automax() ? pic.scale.x.tickMax : @@ -1536,7 +1536,7 @@ void xaxis(picture pic=currentpicture, Label L="", axis axis=YZero, if(L.defaultposition) L.position(axis.position); L.align(L.align,axis.align); - + xaxisAt(pic,L,axis,xmin,xmax,p,ticks,arrow,margin,above); if(axis.type == Both) xaxisAt(pic,L,axis,xmin,xmax,p,ticks,arrow,margin,above,true); @@ -1552,25 +1552,25 @@ void yaxis(picture pic=currentpicture, Label L="", axis axis=XZero, if(pic.scale.y.automin && ymin > -infinity) pic.scale.y.automin=false; if(pic.scale.y.automax && ymax < infinity) pic.scale.y.automax=false; - + if(!pic.scale.set) { axis(pic,axis); autoscale(pic,axis); } - + Label L=L.copy(); bool newticks=false; - + if(ymin != -infinity) { ymin=pic.scale.y.T(ymin); newticks=true; } - + if(ymax != infinity) { ymax=pic.scale.y.T(ymax); newticks=true; } - + if(newticks && pic.userSety() && ticks != NoTicks) { if(ymin == -infinity) ymin=pic.userMin().y; if(ymax == infinity) ymax=pic.userMax().y; @@ -1579,17 +1579,17 @@ void yaxis(picture pic=currentpicture, Label L="", axis axis=XZero, pic.scale.y.tickMax=my.max; axis.ydivisor=my.divisor; } - + axis(pic,axis); - + if(ymin == -infinity && !axis.extend) { if(pic.scale.set) ymin=pic.scale.y.automin() ? pic.scale.y.tickMin : max(pic.scale.y.tickMin,pic.userMin().y); else ymin=pic.userMin().y; } - - + + if(ymax == infinity && !axis.extend) { if(pic.scale.set) ymax=pic.scale.y.automax() ? pic.scale.y.tickMax : @@ -1599,14 +1599,14 @@ void yaxis(picture pic=currentpicture, Label L="", axis axis=XZero, if(L.defaultposition) L.position(axis.position); L.align(L.align,axis.align); - + if(autorotate && L.defaulttransform) { frame f; add(f,Label(L.s,(0,0),L.p)); - if(length(max(f)-min(f)) > ylabelwidth*fontsize(L.p)) + if(length(max(f)-min(f)) > ylabelwidth*fontsize(L.p)) L.transform(rotate(90)); } - + yaxisAt(pic,L,axis,ymin,ymax,p,ticks,arrow,margin,above); if(axis.type == Both) yaxisAt(pic,L,axis,ymin,ymax,p,ticks,arrow,margin,above,true); @@ -1627,7 +1627,7 @@ void axes(picture pic=currentpicture, Label xlabel="", Label ylabel="", void xequals(picture pic=currentpicture, Label L="", real x, bool extend=false, real ymin=-infinity, real ymax=infinity, pen p=currentpen, ticks ticks=NoTicks, - arrowbar arrow=None, margin margin=NoMargin, bool above=true) + arrowbar arrow=None, margin margin=NoMargin, bool above=true) { yaxis(pic,L,XEquals(x,extend),ymin,ymax,p,ticks,arrow,margin,above); } @@ -1682,7 +1682,7 @@ void xtick(picture pic=currentpicture, real x, pair dir=N, } void ytick(picture pic=currentpicture, explicit pair z, pair dir=E, - real size=Ticksize, pen p=currentpen) + real size=Ticksize, pen p=currentpen) { tick(pic,z,dir,size,p); } @@ -1799,7 +1799,7 @@ picture secondaryX(picture primary=currentpicture, void f(picture)) bounds a=autoscale(pic.userMin().x,pic.userMax().x,pic.scale.x.scale); real bmin=pic.scale.x.automin() ? a.min : pic.userMin().x; real bmax=pic.scale.x.automax() ? a.max : pic.userMax().x; - + real denom=bmax-bmin; if(denom != 0) { pic.erase(); @@ -1849,7 +1849,7 @@ picture secondaryY(picture primary=currentpicture, void f(picture)) typedef guide graph(pair f(real), real, real, int); typedef guide[] multigraph(pair f(real), real, real, int); - + graph graph(interpolate join) { return new guide(pair f(real), real a, real b, int n) { @@ -2055,7 +2055,7 @@ guide[] graph(picture pic=currentpicture, real[] x, real[] y, bool3[] cond, } // Connect points in z into segments corresponding to consecutive true elements -// of b using interpolation operator join. +// of b using interpolation operator join. path[] segment(pair[] z, bool[] cond, interpolate join=operator --) { checkconditionlength(cond.length,z.length); @@ -2102,7 +2102,7 @@ void errorbar(picture pic, pair z, pair dp, pair dm, pen p=currentpen, if(dmy != dpy) draw(pic,Scale(pic,z+(0,dmy))--Scale(pic,z+(0,dpy)),p, Bars(size)); } - + void errorbars(picture pic=currentpicture, pair[] z, pair[] dp, pair[] dm={}, bool[] cond={}, pen p=currentpen, real size=0) { @@ -2157,13 +2157,13 @@ picture vectorfield(path vector(real), path g, int n, bool truesize=false, real x=(n == 1) ? 0.5 : i/(n-1); if(truesize) draw(relpoint(g,x),pic,vector(x),p,arrow); - else + else draw(pic,shift(relpoint(g,x))*vector(x),p,arrow,margin); } return pic; } -real maxlength(pair a, pair b, int nx, int ny) +real maxlength(pair a, pair b, int nx, int ny) { return min((b.x-a.x)/nx,(b.y-a.y)/ny); } diff --git a/graphics/asymptote/base/graph3.asy b/graphics/asymptote/base/graph3.asy index 1fe63490c9..80ca1ec3a5 100644 --- a/graphics/asymptote/base/graph3.asy +++ b/graphics/asymptote/base/graph3.asy @@ -9,7 +9,7 @@ direction3 Dir(triple dir) {return new triple(real) {return dir;};} ticklocate ticklocate(real a, real b, autoscaleT S=defaultS, real tickmin=-infinity, real tickmax=infinity, - real time(real)=null, direction3 dir) + real time(real)=null, direction3 dir) { if((valuetime) time == null) time=linear(S.T(),a,b); ticklocate locate; @@ -23,13 +23,13 @@ ticklocate ticklocate(real a, real b, autoscaleT S=defaultS, locate.dir3=dir; return locate; } - + private struct locateT { real t; // tick location time triple V; // tick location in frame coordinates triple pathdir; // path direction in frame coordinates triple dir; // tick direction in frame coordinates - + void dir(transform3 T, path3 g, ticklocate locate, real t) { pathdir=unit(shiftless(T)*dir(g,t)); triple Dir=locate.dir3(t); @@ -60,7 +60,7 @@ void drawtick(picture pic, transform3 T, path3 g, path3 g2, draw(pic,G,p,name="tick"); } -triple ticklabelshift(triple align, pen p=currentpen) +triple ticklabelshift(triple align, pen p=currentpen) { return 0.25*unit(align)*labelmargin(p); } @@ -100,10 +100,10 @@ void labeltick(picture pic, transform3 T, path3 g, if(s != "") label(pic,F.defaulttransform3 ? baseline(s,baselinetemplate) : F.T3*s,v, align,F.p); -} +} // Add axis label L to frame f. -void labelaxis(picture pic, transform3 T, Label L, path3 g, +void labelaxis(picture pic, transform3 T, Label L, path3 g, ticklocate locate=null, int sign=1, bool ticklabels=false) { triple m=pic.min(identity4); @@ -118,7 +118,7 @@ void labelaxis(picture pic, transform3 T, Label L, path3 g, picture F; if(L.align.dir3 == O) align=unit(invert(L.align.dir,v,P))*abs(L.align.dir); - + if(ticklabels && locate != null && piecewisestraight(g)) { locateT locate1; locate1.dir(T,g,locate,t); @@ -171,25 +171,25 @@ ticks3 Ticks3(int sign, Label F="", ticklabel ticklabel=null, pen pTick=pTick; pen ptick=ptick; ticklabel ticklabel=ticklabel; - + real Size=Size; real size=size; if(Size == 0) Size=Ticksize; if(size == 0) size=ticksize; - + Label L=L.copy(); Label F=F.copy(); L.p(p); F.p(p); if(pTick == nullpen) pTick=p; if(ptick == nullpen) ptick=pTick; - + bool ticklabels=false; path3 G=t*g; path3 G2=t*g2; - + scalefcn T; - + real a,b; if(locate.S.scale.logarithmic) { a=locate.S.postscale.Tinv(locate.a); @@ -200,11 +200,11 @@ ticks3 Ticks3(int sign, Label F="", ticklabel ticklabel=null, b=locate.S.Tinv(locate.b); T=identity; } - + if(a > b) {real temp=a; a=b; b=temp;} real norm=max(abs(a),abs(b)); - + string format=autoformat(F.s,norm...Ticks); if(F.s == "%") F.s=""; if(ticklabel == null) { @@ -324,8 +324,8 @@ ticks3 InOutTicks(Label format="", ticklabel ticklabel=null, begin,end,modify,Size,size,extend,pTick,ptick); } -ticks3 InTicks(Label format="", ticklabel ticklabel=null, - bool beginlabel=true, bool endlabel=true, +ticks3 InTicks(Label format="", ticklabel ticklabel=null, + bool beginlabel=true, bool endlabel=true, real[] Ticks, real[] ticks=new real[], real Size=0, real size=0, bool extend=false, pen pTick=nullpen, pen ptick=nullpen) @@ -334,8 +334,8 @@ ticks3 InTicks(Label format="", ticklabel ticklabel=null, Ticks,ticks,Size,size,extend,pTick,ptick); } -ticks3 OutTicks(Label format="", ticklabel ticklabel=null, - bool beginlabel=true, bool endlabel=true, +ticks3 OutTicks(Label format="", ticklabel ticklabel=null, + bool beginlabel=true, bool endlabel=true, real[] Ticks, real[] ticks=new real[], real Size=0, real size=0, bool extend=false, pen pTick=nullpen, pen ptick=nullpen) @@ -344,8 +344,8 @@ ticks3 OutTicks(Label format="", ticklabel ticklabel=null, Ticks,ticks,Size,size,extend,pTick,ptick); } -ticks3 InOutTicks(Label format="", ticklabel ticklabel=null, - bool beginlabel=true, bool endlabel=true, +ticks3 InOutTicks(Label format="", ticklabel ticklabel=null, + bool beginlabel=true, bool endlabel=true, real[] Ticks, real[] ticks=new real[], real Size=0, real size=0, bool extend=false, pen pTick=nullpen, pen ptick=nullpen) @@ -362,15 +362,15 @@ InOutTicks=InOutTicks(); triple tickMin3(picture pic) { return minbound(pic.userMin(),(pic.scale.x.tickMin,pic.scale.y.tickMin, - pic.scale.z.tickMin)); + pic.scale.z.tickMin)); } - + triple tickMax3(picture pic) { return maxbound(pic.userMax(),(pic.scale.x.tickMax,pic.scale.y.tickMax, - pic.scale.z.tickMax)); + pic.scale.z.tickMax)); } - + axis Bounds(int type=Both, int type2=Both, triple align=O, bool extend=false) { return new void(picture pic, axisT axis) { @@ -470,22 +470,22 @@ XYZero=XYZero(); void axis(picture pic=currentpicture, Label L="", path3 g, path3 g2=nullpath3, pen p=currentpen, ticks3 ticks, ticklocate locate, arrowbar3 arrow=None, margin3 margin=NoMargin3, - int[] divisor=new int[], bool above=false, bool opposite=false) + int[] divisor=new int[], bool above=false, bool opposite=false) { Label L=L.copy(); real t=reltime(g,0.5); if(L.defaultposition) L.position(t); divisor=copy(divisor); locate=locate.copy(); - + pic.add(new void (picture f, transform3 t, transform3 T, triple, triple) { picture d; ticks(d,t,L,g,g2,p,arrow,margin,locate,divisor,opposite,true); add(f,t*T*inverse(t)*d); },above=above); - + addPath(pic,g,p); - + if(L.s != "") { frame f; Label L0=L.copy(); @@ -552,7 +552,7 @@ void xaxis3At(picture pic=currentpicture, Label L="", axis axis, y0=y2; z0=z; } - + triple a2=xmin == -infinity ? tinv*(lb.x-min3(p).x,ytrans(t,y0), ztrans(t,z0)) : (xmin,y0,z0); triple b2=xmax == infinity ? tinv*(rt.x-max3(p).x,ytrans(t,y0), @@ -564,7 +564,7 @@ void xaxis3At(picture pic=currentpicture, Label L="", axis axis, pic.scale.x.tickMax=mx.max; divisor=mx.divisor; } - + triple fuzz=X*epsilon*max(abs(a.x),abs(b.x)); a -= fuzz; b += fuzz; @@ -584,7 +584,7 @@ void xaxis3At(picture pic=currentpicture, Label L="", axis axis, y=pic.scale.y.automax() ? tickMax3(pic).y : pic.userMax().y; else if(type == Both) { y2=pic.scale.y.automax() ? tickMax3(pic).y : pic.userMax().y; - y=opposite ? y2 : + y=opposite ? y2 : (pic.scale.y.automin() ? tickMin3(pic).y : pic.userMin().y); } @@ -594,7 +594,7 @@ void xaxis3At(picture pic=currentpicture, Label L="", axis axis, z=pic.scale.z.automax() ? tickMax3(pic).z : pic.userMax().z; else if(type2 == Both) { z2=pic.scale.z.automax() ? tickMax3(pic).z : pic.userMax().z; - z=opposite2 ? z2 : + z=opposite2 ? z2 : (pic.scale.z.automin() ? tickMin3(pic).z : pic.userMin().z); } @@ -610,7 +610,7 @@ void xaxis3At(picture pic=currentpicture, Label L="", axis axis, pic.addPoint(a,min3(p)); pic.addPoint(a,max3(p)); } - + if(finite(b)) { pic.addPoint(b,min3(p)); pic.addPoint(b,max3(p)); @@ -685,19 +685,19 @@ void yaxis3At(picture pic=currentpicture, Label L="", axis axis, x0=x2; z0=z; } - + triple a2=ymin == -infinity ? tinv*(xtrans(t,x0),lb.y-min3(p).y, ztrans(t,z0)) : (x0,ymin,z0); triple b2=ymax == infinity ? tinv*(xtrans(t,x0),rt.y-max3(p).y, ztrans(t,z0)) : (x0,ymax,z0); - + if(ymin == -infinity || ymax == infinity) { bounds my=autoscale(a.y,b.y,pic.scale.y.scale); pic.scale.y.tickMin=my.min; pic.scale.y.tickMax=my.max; divisor=my.divisor; } - + triple fuzz=Y*epsilon*max(abs(a.y),abs(b.y)); a -= fuzz; b += fuzz; @@ -717,7 +717,7 @@ void yaxis3At(picture pic=currentpicture, Label L="", axis axis, x=pic.scale.x.automax() ? tickMax3(pic).x : pic.userMax().x; else if(type == Both) { x2=pic.scale.x.automax() ? tickMax3(pic).x : pic.userMax().x; - x=opposite ? x2 : + x=opposite ? x2 : (pic.scale.x.automin() ? tickMin3(pic).x : pic.userMin().x); } @@ -727,7 +727,7 @@ void yaxis3At(picture pic=currentpicture, Label L="", axis axis, z=pic.scale.z.automax() ? tickMax3(pic).z : pic.userMax().z; else if(type2 == Both) { z2=pic.scale.z.automax() ? tickMax3(pic).z : pic.userMax().z; - z=opposite2 ? z2 : + z=opposite2 ? z2 : (pic.scale.z.automin() ? tickMin3(pic).z : pic.userMin().z); } @@ -743,7 +743,7 @@ void yaxis3At(picture pic=currentpicture, Label L="", axis axis, pic.addPoint(a,min3(p)); pic.addPoint(a,max3(p)); } - + if(finite(b)) { pic.addPoint(b,min3(p)); pic.addPoint(b,max3(p)); @@ -818,7 +818,7 @@ void zaxis3At(picture pic=currentpicture, Label L="", axis axis, x0=x2; y0=y; } - + triple a2=zmin == -infinity ? tinv*(xtrans(t,x0),ytrans(t,y0), lb.z-min3(p).z) : (x0,y0,zmin); triple b2=zmax == infinity ? tinv*(xtrans(t,x0),ytrans(t,y0), @@ -830,7 +830,7 @@ void zaxis3At(picture pic=currentpicture, Label L="", axis axis, pic.scale.z.tickMax=mz.max; divisor=mz.divisor; } - + triple fuzz=Z*epsilon*max(abs(a.z),abs(b.z)); a -= fuzz; b += fuzz; @@ -850,7 +850,7 @@ void zaxis3At(picture pic=currentpicture, Label L="", axis axis, x=pic.scale.x.automax() ? tickMax3(pic).x : pic.userMax().x; else if(type == Both) { x2=pic.scale.x.automax() ? tickMax3(pic).x : pic.userMax().x; - x=opposite ? x2 : + x=opposite ? x2 : (pic.scale.x.automin() ? tickMin3(pic).x : pic.userMin().x); } @@ -860,7 +860,7 @@ void zaxis3At(picture pic=currentpicture, Label L="", axis axis, y=pic.scale.y.automax() ? tickMax3(pic).y : pic.userMax().y; else if(type2 == Both) { y2=pic.scale.y.automax() ? tickMax3(pic).y : pic.userMax().y; - y=opposite2 ? y2 : + y=opposite2 ? y2 : (pic.scale.y.automin() ? tickMin3(pic).y : pic.userMin().y); } @@ -876,7 +876,7 @@ void zaxis3At(picture pic=currentpicture, Label L="", axis axis, pic.addPoint(a,min3(p)); pic.addPoint(a,max3(p)); } - + if(finite(b)) { pic.addPoint(b,min3(p)); pic.addPoint(b,max3(p)); @@ -934,7 +934,7 @@ void autoscale3(picture pic=currentpicture, axis axis) pic.userMaxz3(ceil(pic.userMax().z)); } } else {mz.min=mz.max=0; pic.scale.set=false;} - + pic.scale.z.tickMin=mz.min; pic.scale.z.tickMax=mz.max; axis.zdivisor=mz.divisor; @@ -948,7 +948,7 @@ void xaxis3(picture pic=currentpicture, Label L="", axis axis=YZZero, arrowbar3 arrow=None, margin3 margin=NoMargin3, bool above=false) { if(xmin > xmax) return; - + if(pic.scale.x.automin && xmin > -infinity) pic.scale.x.automin=false; if(pic.scale.x.automax && xmax < infinity) pic.scale.x.automax=false; @@ -956,19 +956,19 @@ void xaxis3(picture pic=currentpicture, Label L="", axis axis=YZZero, axis(pic,axis); autoscale3(pic,axis); } - + bool newticks=false; - + if(xmin != -infinity) { xmin=pic.scale.x.T(xmin); newticks=true; } - + if(xmax != infinity) { xmax=pic.scale.x.T(xmax); newticks=true; } - + if(newticks && pic.userSetx() && ticks != NoTicks3) { if(xmin == -infinity) xmin=pic.userMin().x; if(xmax == infinity) xmax=pic.userMax().x; @@ -977,16 +977,16 @@ void xaxis3(picture pic=currentpicture, Label L="", axis axis=YZZero, pic.scale.x.tickMax=mx.max; axis.xdivisor=mx.divisor; } - + axis(pic,axis); - + if(xmin == -infinity && !axis.extend) { if(pic.scale.set) xmin=pic.scale.x.automin() ? pic.scale.x.tickMin : max(pic.scale.x.tickMin,pic.userMin().x); else xmin=pic.userMin().x; } - + if(xmax == infinity && !axis.extend) { if(pic.scale.set) xmax=pic.scale.x.automax() ? pic.scale.x.tickMax : @@ -998,7 +998,7 @@ void xaxis3(picture pic=currentpicture, Label L="", axis axis=YZZero, L=L.copy(); L.position(axis.position); } - + bool back=false; if(axis.type == Both) { triple v=currentprojection.normal; @@ -1025,24 +1025,24 @@ void yaxis3(picture pic=currentpicture, Label L="", axis axis=XZZero, if(pic.scale.y.automin && ymin > -infinity) pic.scale.y.automin=false; if(pic.scale.y.automax && ymax < infinity) pic.scale.y.automax=false; - + if(!pic.scale.set) { axis(pic,axis); autoscale3(pic,axis); } - + bool newticks=false; - + if(ymin != -infinity) { ymin=pic.scale.y.T(ymin); newticks=true; } - + if(ymax != infinity) { ymax=pic.scale.y.T(ymax); newticks=true; } - + if(newticks && pic.userSety() && ticks != NoTicks3) { if(ymin == -infinity) ymin=pic.userMin().y; if(ymax == infinity) ymax=pic.userMax().y; @@ -1051,17 +1051,17 @@ void yaxis3(picture pic=currentpicture, Label L="", axis axis=XZZero, pic.scale.y.tickMax=my.max; axis.ydivisor=my.divisor; } - + axis(pic,axis); - + if(ymin == -infinity && !axis.extend) { if(pic.scale.set) ymin=pic.scale.y.automin() ? pic.scale.y.tickMin : max(pic.scale.y.tickMin,pic.userMin().y); else ymin=pic.userMin().y; } - - + + if(ymax == infinity && !axis.extend) { if(pic.scale.set) ymax=pic.scale.y.automax() ? pic.scale.y.tickMax : @@ -1073,7 +1073,7 @@ void yaxis3(picture pic=currentpicture, Label L="", axis axis=XZZero, L=L.copy(); L.position(axis.position); } - + bool back=false; if(axis.type == Both) { triple v=currentprojection.normal; @@ -1100,24 +1100,24 @@ void zaxis3(picture pic=currentpicture, Label L="", axis axis=XYZero, if(pic.scale.z.automin && zmin > -infinity) pic.scale.z.automin=false; if(pic.scale.z.automax && zmax < infinity) pic.scale.z.automax=false; - + if(!pic.scale.set) { axis(pic,axis); autoscale3(pic,axis); } - + bool newticks=false; - + if(zmin != -infinity) { zmin=pic.scale.z.T(zmin); newticks=true; } - + if(zmax != infinity) { zmax=pic.scale.z.T(zmax); newticks=true; } - + if(newticks && pic.userSetz() && ticks != NoTicks3) { if(zmin == -infinity) zmin=pic.userMin().z; if(zmax == infinity) zmax=pic.userMax().z; @@ -1126,16 +1126,16 @@ void zaxis3(picture pic=currentpicture, Label L="", axis axis=XYZero, pic.scale.z.tickMax=mz.max; axis.zdivisor=mz.divisor; } - + axis(pic,axis); - + if(zmin == -infinity && !axis.extend) { if(pic.scale.set) zmin=pic.scale.z.automin() ? pic.scale.z.tickMin : max(pic.scale.z.tickMin,pic.userMin().z); else zmin=pic.userMin().z; } - + if(zmax == infinity && !axis.extend) { if(pic.scale.set) zmax=pic.scale.z.automax() ? pic.scale.z.tickMax : @@ -1147,7 +1147,7 @@ void zaxis3(picture pic=currentpicture, Label L="", axis axis=XYZero, L=L.copy(); L.position(axis.position); } - + bool back=false; if(axis.type == Both) { triple v=currentprojection.vector(); @@ -1169,18 +1169,18 @@ void zlimits(picture pic=currentpicture, real min=-infinity, real max=infinity, bool crop=NoCrop) { if(min > max) return; - + pic.scale.z.automin=min <= -infinity; pic.scale.z.automax=max >= infinity; - + bounds mz; if(pic.scale.z.automin() || pic.scale.z.automax()) mz=autoscale(pic.userMin().z,pic.userMax().z,pic.scale.z.scale); - + if(pic.scale.z.automin) { if(pic.scale.z.automin()) pic.userMinz(mz.min); } else pic.userMinz(min(pic.scale.z.T(min),pic.scale.z.T(max))); - + if(pic.scale.z.automax) { if(pic.scale.z.automax()) pic.userMaxz(mz.max); } else pic.userMaxz(max(pic.scale.z.T(min),pic.scale.z.T(max))); @@ -1193,10 +1193,10 @@ void limits(picture pic=currentpicture, triple min, triple max) ylimits(pic,min.y,max.y); zlimits(pic,min.z,max.z); } - + // Draw x, y and z axes. void axes3(picture pic=currentpicture, - Label xlabel="", Label ylabel="", Label zlabel="", + Label xlabel="", Label ylabel="", Label zlabel="", bool extend=false, triple min=(-infinity,-infinity,-infinity), triple max=(infinity,infinity,infinity), @@ -1240,11 +1240,11 @@ void xtick3(picture pic=currentpicture, real x, triple dir=Y, real size=Ticksize, pen p=currentpen) { tick(pic,(x,pic.scale.y.scale.logarithmic ? 1 : 0, - pic.scale.z.scale.logarithmic ? 1 : 0),dir,size,p); + pic.scale.z.scale.logarithmic ? 1 : 0),dir,size,p); } void ytick(picture pic=currentpicture, triple v, triple dir=X, - real size=Ticksize, pen p=currentpen) + real size=Ticksize, pen p=currentpen) { tick(pic,v,dir,size,p); } @@ -1257,7 +1257,7 @@ void ytick3(picture pic=currentpicture, real y, triple dir=X, } void ztick(picture pic=currentpicture, triple v, triple dir=X, - real size=Ticksize, pen p=currentpen) + real size=Ticksize, pen p=currentpen) { xtick(pic,v,dir,size,p); } @@ -1294,7 +1294,7 @@ void xtick3(picture pic=currentpicture, Label L, real x, triple dir=Y, string format="", real size=Ticksize, pen p=currentpen) { xtick(pic,L,(x,pic.scale.y.scale.logarithmic ? 1 : 0, - pic.scale.z.scale.logarithmic ? 1 : 0),dir,size,p); + pic.scale.z.scale.logarithmic ? 1 : 0),dir,size,p); } void ytick(picture pic=currentpicture, Label L, triple v, triple dir=X, @@ -1307,7 +1307,7 @@ void ytick3(picture pic=currentpicture, Label L, real y, triple dir=X, string format="", real size=Ticksize, pen p=currentpen) { xtick(pic,L,(pic.scale.x.scale.logarithmic ? 1 : 0,y, - pic.scale.z.scale.logarithmic ? 1 : 0),dir,format,size,p); + pic.scale.z.scale.logarithmic ? 1 : 0),dir,format,size,p); } void ztick(picture pic=currentpicture, Label L, triple v, triple dir=X, @@ -1320,7 +1320,7 @@ void ztick3(picture pic=currentpicture, Label L, real z, triple dir=X, string format="", real size=Ticksize, pen p=currentpen) { xtick(pic,L,(pic.scale.x.scale.logarithmic ? 1 : 0, - pic.scale.z.scale.logarithmic ? 1 : 0,z),dir,format,size,p); + pic.scale.z.scale.logarithmic ? 1 : 0,z),dir,format,size,p); } private void label(picture pic, Label L, triple v, real x, align align, @@ -1416,7 +1416,7 @@ multigraph graph(interpolate3 join, bool3 cond(real)) guide3 Straight(... guide3[])=operator --; guide3 Spline(... guide3[])=operator ..; - + guide3 graph(picture pic=currentpicture, real x(real), real y(real), real z(real), real a, real b, int n=ngraph, interpolate3 join=operator --) @@ -1519,12 +1519,12 @@ guide3 graph(triple F(path, real), path p, int n=1, guide3 graph(triple F(pair), path p, int n=1, interpolate3 join=operator --) { - return graph(new triple(path p, real position) + return graph(new triple(path p, real position) {return F(point(p,position));},p,n,join); } guide3 graph(picture pic=currentpicture, real f(pair), path p, int n=1, - interpolate3 join=operator --) + interpolate3 join=operator --) { return graph(new triple(pair z) {return Scale(pic,(z.x,z.y,f(z)));},p,n, join); @@ -1538,7 +1538,7 @@ guide3 graph(real f(pair), path p, int n=1, real T(pair), } // Connect points in v into segments corresponding to consecutive true elements -// of b using interpolation operator join. +// of b using interpolation operator join. path3[] segment(triple[] v, bool[] cond, interpolate3 join=operator --) { checkconditionlength(cond.length,v.length); @@ -1599,10 +1599,10 @@ bool vperiodic(triple[][] a) { surface surface(triple[][] f, bool[][] cond={}) { if(!rectangular(f)) abort("matrix is not rectangular"); - + int nx=f.length-1; int ny=nx > 0 ? f[0].length-1 : 0; - + bool all=cond.length == 0; int count; @@ -1708,14 +1708,14 @@ surface bispline(real[][] z, real[][] p, real[][] q, real[][] r, real zppmppp=zpp-hx*pp[jp]; real zijqij=zij+hy*qi[j]; real zpjqpj=zpj+hy*qp[j]; - + s.s[k]=patch(new triple[][] { - {(xi,yj,zij),(xi,y1,zijqij),(xi,y2,zip-qip),(xi,yp,zip)}, - {(x1,yj,zij+pij),(x1,y1,zijqij+pij+hxy*ri[j]), - (x1,y2,zippip-qip-hxy*ri[jp]),(x1,yp,zippip)}, - {(x2,yj,zpj-ppj),(x2,y1,zpjqpj-ppj-hxy*rp[j]), - (x2,y2,zppmppp-qpp+hxy*rp[jp]),(x2,yp,zppmppp)}, - {(xp,yj,zpj),(xp,y1,zpjqpj),(xp,y2,zpp-qpp),(xp,yp,zpp)}},copy=false); + {(xi,yj,zij),(xi,y1,zijqij),(xi,y2,zip-qip),(xi,yp,zip)}, + {(x1,yj,zij+pij),(x1,y1,zijqij+pij+hxy*ri[j]), + (x1,y2,zippip-qip-hxy*ri[jp]),(x1,yp,zippip)}, + {(x2,yj,zpj-ppj),(x2,y1,zpjqpj-ppj-hxy*rp[j]), + (x2,y2,zppmppp-qpp+hxy*rp[jp]),(x2,yp,zppmppp)}, + {(xp,yj,zpj),(xp,y1,zpjqpj),(xp,y2,zpp-qpp),(xp,yp,zpp)}},copy=false); indexi[j]=k; ++k; } @@ -1932,7 +1932,7 @@ surface surface(triple f(pair z), pair a, pair b, int nu=nmesh, int nv=nu, } return surface(v,active); } - + // return the surface described by a parametric function f evaluated at u and v // and interpolated with usplinetype and vsplinetype. surface surface(triple f(pair z), real[] u, real[] v, @@ -2128,7 +2128,7 @@ void draw(picture pic=currentpicture, Label[] L=new Label[], render,interaction); } -real maxlength(triple f(pair z), pair a, pair b, int nu, int nv) +real maxlength(triple f(pair z), pair a, pair b, int nu, int nv) { return min(abs(f((b.x,a.y))-f(a))/nu,abs(f((a.x,b.y))-f(a))/nv); } diff --git a/graphics/asymptote/base/graph_splinetype.asy b/graphics/asymptote/base/graph_splinetype.asy index 02f780ca02..77e459d47e 100644 --- a/graphics/asymptote/base/graph_splinetype.asy +++ b/graphics/asymptote/base/graph_splinetype.asy @@ -13,7 +13,7 @@ void checklengths(int x, int y, string text=differentlengths) abort(text+": "+string(x)+" != "+string(y)); } -void checkincreasing(real[] x) +void checkincreasing(real[] x) { if(!increasing(x,true)) abort("strictly increasing array expected"); @@ -114,7 +114,7 @@ real[] periodic(real[] x, real[] y) // Standard cubic spline interpolation with the natural condition // s''(a)=s''(b)=0. // if n=2, linear interpolation is returned -// Don't use the natural type unless the underlying function +// Don't use the natural type unless the underlying function // has zero second end points derivatives. real[] natural(real[] x, real[] y) { @@ -186,25 +186,25 @@ splinetype clamped(real slopea, real slopeb) // Piecewise Cubic Hermite Interpolating Polynomial (PCHIP) // Modified MATLAB code -// [1] Fritsch, F. N. and R. E. Carlson, -// "Monotone Piecewise Cubic Interpolation," +// [1] Fritsch, F. N. and R. E. Carlson, +// "Monotone Piecewise Cubic Interpolation," // SIAM J. Numerical Analysis, Vol. 17, 1980, pp.238-246. -// [2] Kahaner, David, Cleve Moler, Stephen Nash, +// [2] Kahaner, David, Cleve Moler, Stephen Nash, // Numerical Methods and Software, Prentice Hall, 1988. -real[] monotonic(real[] x, real[] y) +real[] monotonic(real[] x, real[] y) { - int n=x.length; + int n=x.length; checklengths(n,y.length); checkincreasing(x); - real[] d=new real[n]; + real[] d=new real[n]; if(n > 2) { real[] h=new real[n-1]; real[] del=new real[n-1]; for(int i=0; i < n-1; ++i) { - h[i]=x[i+1]-x[i]; - del[i]=(y[i+1]-y[i])/h[i]; - } - int j=0; + h[i]=x[i+1]-x[i]; + del[i]=(y[i+1]-y[i])/h[i]; + } + int j=0; int k[]=new int[]; for(int i=0; i < n-2; ++i) if((sgn(del[i])*sgn(del[i+1])) > 0) {k[j]=i; j=j+1;} @@ -220,10 +220,10 @@ real[] monotonic(real[] x, real[] y) w2[i]=(h[k[i]+1]+hs[i])/(3*hs[i]); dmax[i]=max(abs(del[k[i]]),abs(del[k[i]+1])); dmin[i]=min(abs(del[k[i]]),abs(del[k[i]+1])); - } + } for(int i=0; i < n; ++i) d[i]=0; for(int i=0; i < j; ++i) - d[k[i]+1]=dmin[i]/(w1[i]*(del[k[i]]/dmax[i])+w2[i]*(del[k[i]+1]/dmax[i])); + d[k[i]+1]=dmin[i]/(w1[i]*(del[k[i]]/dmax[i])+w2[i]*(del[k[i]+1]/dmax[i])); d[0]=((2*h[0]+h[1])*del[0]-h[0]*del[1])/(h[0]+h[1]); if(sgn(d[0]) != sgn(del[0])) {d[0]=0;} else if((sgn(del[0]) != sgn(del[1])) && (abs(d[0]) > abs(3*del[0]))) @@ -238,7 +238,7 @@ real[] monotonic(real[] x, real[] y) d[0]=d[1]=(y[1]-y[0])/(x[1]-x[0]); } else abort(morepoints); return d; -} +} // Return standard cubic spline interpolation as a guide guide hermite(real[] x, real[] y, splinetype splinetype=null) diff --git a/graphics/asymptote/base/grid3.asy b/graphics/asymptote/base/grid3.asy index 98e043a71d..62807847ae 100644 --- a/graphics/asymptote/base/grid3.asy +++ b/graphics/asymptote/base/grid3.asy @@ -259,7 +259,7 @@ ticksgrid InOutTicks(Label F="", ticklabel ticklabel=null, N,n,Step,step,begin,end, Size,size,false,pTick,ptick); otg.grid3=new void(picture pic, bool above) { - grid3(pic,gridroutine,N,n,Step,step,begin,end,pGrid,pgrid,above); + grid3(pic,gridroutine,N,n,Step,step,begin,end,pGrid,pgrid,above); }; return otg; }; @@ -280,7 +280,7 @@ ticksgrid InTicks(Label F="", ticklabel ticklabel=null, otg.ticks=Ticks3(-1,F,ticklabel,beginlabel,endlabel,N,n,Step,step, begin,end,Size,size,false,pTick,ptick); otg.grid3=new void(picture pic, bool above) { - grid3(pic,gridroutine,N,n,Step,step,begin,end,pGrid,pgrid,above); + grid3(pic,gridroutine,N,n,Step,step,begin,end,pGrid,pgrid,above); }; return otg; }; @@ -301,7 +301,7 @@ ticksgrid OutTicks(Label F="", ticklabel ticklabel=null, otg.ticks=Ticks3(1,F,ticklabel,beginlabel,endlabel,N,n,Step,step, begin,end,Size,size,false,pTick,ptick); otg.grid3=new void(picture pic, bool above) { - grid3(pic,gridroutine,N,n,Step,step,begin,end,pGrid,pgrid,above); + grid3(pic,gridroutine,N,n,Step,step,begin,end,pGrid,pgrid,above); }; return otg; }; diff --git a/graphics/asymptote/base/interpolate.asy b/graphics/asymptote/base/interpolate.asy index a600c94c12..d66f227fcc 100644 --- a/graphics/asymptote/base/interpolate.asy +++ b/graphics/asymptote/base/interpolate.asy @@ -7,8 +7,8 @@ // and values y_0,...,y_n in the array y, // hdiffdiv(x,y,dyp) computes Newton's Divided Difference for -// Hermite interpolation where dyp={dy_0,...,dy_n}. -// +// Hermite interpolation where dyp={dy_0,...,dy_n}. +// // fhorner(x,coeff) uses Horner's rule to compute the polynomial // a_0+a_1(x-x_0)+a_2(x-x_0)(x-x_1)+...+a_n(x-x_0)..(x-x_{n-1}), // where coeff={a_0,a_1,...,a_n}. @@ -54,7 +54,7 @@ fhorner fhorner(horner sh) return s; }; } - + // Newton's Divided Difference method: n(n-1)/2 divisions, n(n-1) additions. horner diffdiv(real[] x, real[] y) { @@ -136,5 +136,5 @@ realfunction fspline(real[] x, real[] y, splinetype splinetype=notaknot) real[] dy=splinetype(x,y); return new real(real t) { return pwhermite(x,y,dy)(t); - }; + }; } diff --git a/graphics/asymptote/base/labelpath3.asy b/graphics/asymptote/base/labelpath3.asy index 63b2290f1f..2c9529dc7e 100644 --- a/graphics/asymptote/base/labelpath3.asy +++ b/graphics/asymptote/base/labelpath3.asy @@ -21,7 +21,7 @@ triple[] firstframe(path3 p, triple optional=O) } // Modification of the bishop frame construction contained in -// space_tube.asy (from Philippe Ivaldi's modules). +// space_tube.asy (from Philippe Ivaldi's modules). // For noncyclic path3s only triple[] nextframe(path3 p, real reltimestart, triple[] start, real reltimeend, int subdiv=20) @@ -40,7 +40,7 @@ triple[] nextframe(path3 p, real reltimestart, triple[] start, real } return bf[subdiv]; } - + surface labelpath(string s, path3 p, real angle=90, triple optional=O) { real Cos=Cos(angle); @@ -48,10 +48,10 @@ surface labelpath(string s, path3 p, real angle=90, triple optional=O) path[] text=texpath(Label(s,(0,0),Align,basealign)); text=scale(1/(max(text).x-min(text).x))*text; path[][] decompose=containmentTree(text); - + real[][] xpos=new real[decompose.length][2]; surface sf; - for(int i=0; i < decompose.length; ++i) {// Identify positions along x-axis + for(int i=0; i < decompose.length; ++i) {// Identify positions along x-axis xpos[i][1]=i; real pos0=0.5(max(decompose[i]).x+min(decompose[i]).x); xpos[i][0]=pos0; diff --git a/graphics/asymptote/base/latin1.asy b/graphics/asymptote/base/latin1.asy deleted file mode 100644 index 3d76925be2..0000000000 --- a/graphics/asymptote/base/latin1.asy +++ /dev/null @@ -1,2 +0,0 @@ -usepackage("fontenc","T1"); -usepackage("inputenc","latin1"); diff --git a/graphics/asymptote/base/lmfit.asy b/graphics/asymptote/base/lmfit.asy index c3dfddce06..63e0d7e238 100644 --- a/graphics/asymptote/base/lmfit.asy +++ b/graphics/asymptote/base/lmfit.asy @@ -58,31 +58,31 @@ private real LM_SQRT_GIANT = sqrt(realMax); private real LM_USERTOL = 30 * LM_MACHEP; restricted string lm_infmsg[] = { - "improper input parameters", - "the relative error in the sum of squares is at most tol", - "the relative error between x and the solution is at most tol", - "both errors are at most tol", - "fvec is orthogonal to the columns of the jacobian to machine precision", - "number of calls to fcn has reached or exceeded maxcall*(n+1)", - "ftol is too small: no further reduction in the sum of squares is possible", - "xtol too small: no further improvement in approximate solution x possible", - "gtol too small: no further improvement in approximate solution x possible", - "not enough memory", - "break requested within function evaluation" + "improper input parameters", + "the relative error in the sum of squares is at most tol", + "the relative error between x and the solution is at most tol", + "both errors are at most tol", + "fvec is orthogonal to the columns of the jacobian to machine precision", + "number of calls to fcn has reached or exceeded maxcall*(n+1)", + "ftol is too small: no further reduction in the sum of squares is possible", + "xtol too small: no further improvement in approximate solution x possible", + "gtol too small: no further improvement in approximate solution x possible", + "not enough memory", + "break requested within function evaluation" }; restricted string lm_shortmsg[] = { - "invalid input", - "success (f)", - "success (p)", - "success (f,p)", - "degenerate", - "call limit", - "failed (f)", - "failed (p)", - "failed (o)", - "no memory", - "user break" + "invalid input", + "success (f)", + "success (p)", + "success (f,p)", + "degenerate", + "call limit", + "failed (f)", + "failed (p)", + "failed (o)", + "no memory", + "user break" }; @@ -91,7 +91,7 @@ struct lm_data_type { real[] user_t; real[] user_y; real[] user_w; - real user_func(real user_t_point, real[] par); + real user_func(real user_t_point, real[] par); }; @@ -99,7 +99,7 @@ struct lm_data_type { // the int and real types struct lm_int_type { int val; - + void operator init(int val) { this.val = val; } @@ -108,7 +108,7 @@ struct lm_int_type { struct lm_real_type { real val; - + void operator init(real val) { this.val = val; } @@ -402,7 +402,7 @@ private void lm_qrsolv(int n, real[] r, int ldr, int[] ipvt, real[] diag, real[] } break; } - + sdiag[j] = r[j * ldr + j]; r[j * ldr + j] = x[j]; } @@ -508,10 +508,10 @@ private void lm_lmpar(int n, real[] r, int ldr, int[] ipvt, real[] diag, real[] dxnorm = lm_enorm(n, wa2); fp_old = fp; fp = dxnorm - delta; - + if (fabs(fp) <= p1 * delta || (parl == 0.0 && fp <= fp_old && fp_old < 0.0) || iter == 10) break; - + for (j = 0; j < n; ++j) wa1[j] = diag[ipvt[j]] * wa2[ipvt[j]] / dxnorm; @@ -522,12 +522,12 @@ private void lm_lmpar(int n, real[] r, int ldr, int[] ipvt, real[] diag, real[] } temp = lm_enorm(n, wa1); parc = fp / delta / temp / temp; - + if (fp > 0) parl = max(parl, par.val); else if (fp < 0) paru = min(paru, par.val); - + par.val = max(parl, par.val + parc); } } @@ -540,7 +540,7 @@ void lm_lmdif(int m, int n, real[] x, real[] fvec, real ftol, real xtol, real gt static real p25 = 0.25; static real p75 = 0.75; static real p0001 = 1.0e-4; - + nfev.val = 0; int iter = 1; lm_real_type par = lm_real_type(0); @@ -563,7 +563,7 @@ void lm_lmdif(int m, int n, real[] x, real[] fvec, real ftol, real xtol, real gt } } } - + info.val = 0; evaluate(x, m, fvec, data, info); if(printout != null) printout(n, x, m, fvec, data, 0, 0, ++nfev.val); @@ -587,7 +587,7 @@ void lm_lmdif(int m, int n, real[] x, real[] fvec, real ftol, real xtol, real gt fjac[j * m + i] = (wa4[i] - fvec[i]) / (x[j] - temp); x[j] = temp; } - + lm_qrfac(m, n, fjac, true, ipvt, wa1, wa2, wa3); if (iter == 1) { @@ -695,7 +695,7 @@ void lm_lmdif(int m, int n, real[] x, real[] fvec, real ftol, real xtol, real gt delta = pnorm / p5; par.val *= p5; } - + if (ratio >= p0001) { for (j = 0; j < n; ++j) { x[j] = wa2[j]; @@ -735,7 +735,7 @@ void lm_lmdif(int m, int n, real[] x, real[] fvec, real ftol, real xtol, real gt void lm_minimize(int m_dat, int n_par, real[] par, lm_evaluate_ftype evaluate, lm_print_ftype printout, lm_data_type data, lm_control_type control) { int n = n_par; int m = m_dat; - + real[] fvec = new real[m]; real[] diag = new real[n]; real[] qtf = new real[n]; @@ -838,13 +838,13 @@ FitResult fit(real[] xdata, real[] ydata, real[] errors, real function(real[], r int n_par = parameters.length; lm_evaluate_ftype evaluate = lm_evaluate_default; lm_print_ftype printout = control.verbose ? lm_print_default : lm_print_quiet; - + lm_data_type data; data.user_t = xdata; data.user_y = ydata; data.user_w = 1 / errors; data.user_func = new real(real x, real[] params) { - return function(params, x); + return function(params, x); }; lm_control_type ctrl; @@ -856,7 +856,7 @@ FitResult fit(real[] xdata, real[] ydata, real[] errors, real function(real[], r ctrl.maxcall = control.maxIterations; lm_minimize(m_dat, n_par, parameters, evaluate, printout, data, ctrl); - + return FitResult(ctrl.fnorm, ctrl.nfev.val, ctrl.info.val); } diff --git a/graphics/asymptote/base/math.asy b/graphics/asymptote/base/math.asy index 9d10e2b779..3dde1b9dd4 100644 --- a/graphics/asymptote/base/math.asy +++ b/graphics/asymptote/base/math.asy @@ -30,7 +30,7 @@ picture grid(int Nx, int Ny, pen p=currentpen) picture pic; for(int i=0; i <= Nx; ++i) draw(pic,(i,0)--(i,Ny),p); for(int j=0; j <= Ny; ++j) draw(pic,(0,j)--(Nx,j),p); - return pic; + return pic; } bool polygon(path p) @@ -55,7 +55,7 @@ real intersect(triple P, triple Q, triple n, triple Z) real denom=n.x*(Q.x-P.x)+n.y*(Q.y-P.y)+n.z*(Q.z-P.z); return denom == 0 ? infinity : (d-n.x*P.x-n.y*P.y-n.z*P.z)/denom; } - + // Return any point on the intersection of the two planes with normals // n0 and n1 passing through points P0 and P1, respectively. // If the planes are parallel return (infinity,infinity,infinity). @@ -293,7 +293,7 @@ void drawline(picture pic=currentpicture, pair P, pair Q, pen p=currentpen) },true); } -real interpolate(real[] x, real[] y, real x0, int i) +real interpolate(real[] x, real[] y, real x0, int i) { int n=x.length; if(n == 0) abort("Zero data points in interpolate"); @@ -317,7 +317,7 @@ real interpolate(real[] x, real[] y, real x0, int i) // real[] x are listed in ascending order and return y0. Values outside the // available data range are linearly extrapolated using the first derivative // at the nearest endpoint. -real interpolate(real[] x, real[] y, real x0) +real interpolate(real[] x, real[] y, real x0) { return interpolate(x,y,x0,search(x,x0)); } @@ -378,7 +378,7 @@ pair[] quarticroots(real a, real b, real c, real d, real e) // Remove roots at numerical infinity. if(abs(a) <= Fuzz*(abs(b)+Fuzz*(abs(c)+Fuzz*(abs(d)+Fuzz*abs(e))))) return cubicroots(b,c,d,e); - + // Detect roots at numerical zero. if(abs(e) <= Fuzz*(abs(d)+Fuzz*(abs(c)+Fuzz*(abs(b)+Fuzz*abs(a))))) return cubicroots(a,b,c,d); @@ -388,7 +388,7 @@ pair[] quarticroots(real a, real b, real c, real d, real e) c *= ainv; d *= ainv; e *= ainv; - + pair[] roots; real[] T=cubicroots(1,-2c,c^2+b*d-4e,d^2+b^2*e-b*c*d); if(T.length == 0) return roots; @@ -434,13 +434,13 @@ real[] leastsquares(real[][] A, real[] b, bool warn=true) real[] solution=solve(AtA(A),b*A,warn=false); if (solution.length == 0 && warn) abort("Cannot compute least-squares approximation for " + - "a matrix with linearly dependent columns."); + "a matrix with linearly dependent columns."); return solution; } // Namespace struct rootfinder_settings { - static real roottolerance = 1e-4; + static real roottolerance=1e-4; } real findroot(real f(real), real a, real b, diff --git a/graphics/asymptote/base/metapost.asy b/graphics/asymptote/base/metapost.asy index 525ffe755e..6908fd750d 100644 --- a/graphics/asymptote/base/metapost.asy +++ b/graphics/asymptote/base/metapost.asy @@ -2,14 +2,14 @@ path cuttings; -path cutbefore(path p, path q) +path cutbefore(path p, path q) { slice s=firstcut(p,q); cuttings=s.before; return s.after; } -path cutafter(path p, path q) +path cutafter(path p, path q) { slice s=lastcut(p,q); cuttings=s.after; diff --git a/graphics/asymptote/base/obj.asy b/graphics/asymptote/base/obj.asy index 8dde9341c4..5b6f14e90d 100644 --- a/graphics/asymptote/base/obj.asy +++ b/graphics/asymptote/base/obj.asy @@ -1,7 +1,7 @@ // A module for reading simple obj files with groups. // Authors: Jens Schwaiger and John Bowman // -// Here simple means that : +// Here simple means that : // // 1) all vertex statements should come before the face statements; // diff --git a/graphics/asymptote/base/ode.asy b/graphics/asymptote/base/ode.asy index 7104a8d153..99f8505cec 100644 --- a/graphics/asymptote/base/ode.asy +++ b/graphics/asymptote/base/ode.asy @@ -14,7 +14,7 @@ struct RKTableau int order; coefficients a; void stepDependence(real h, real c, coefficients a) {} - + real pgrow; real pshrink; bool exponential; @@ -54,7 +54,7 @@ real phi2(real x) if(fabs(x) > 1) return (exp(x)-x-1)/x2; real x3=x2*x; real x5=x2*x3; - if(fabs(x) < 0.1) + if(fabs(x) < 0.1) return Coeff[1]+x*Coeff[2]+x2*Coeff[3]+x3*Coeff[4]+x2*x2*Coeff[5] +x5*Coeff[6]+x3*x3*Coeff[7]+x5*x2*Coeff[8]+x5*x3*Coeff[9]; else { @@ -73,7 +73,7 @@ real phi3(real x) real x3=x2*x; if(fabs(x) > 1.6) return (exp(x)-0.5*x2-x-1)/x3; real x5=x2*x3; - if(fabs(x) < 0.1) + if(fabs(x) < 0.1) return Coeff[2]+x*Coeff[3]+x2*Coeff[4]+x3*Coeff[5] +x2*x2*Coeff[6]+x5*Coeff[7]+x3*x3*Coeff[8]+x5*x2*Coeff[9] +x5*x3*Coeff[10]; @@ -90,13 +90,13 @@ real phi3(real x) } } -void expfactors(real x, coefficients a) +void expfactors(real x, coefficients a) { for(int i=0; i < a.steps.length; ++i) a.factors[i]=exp(x*a.steps[i]); a.factors[a.steps.length]=exp(x); } - + // First-Order Euler RKTableau Euler=RKTableau(1,new real[][], new real[] {1}); @@ -185,40 +185,40 @@ RKTableau RK4=RKTableau(4,new real[][] {{1/2},{0,1/2},{0,0,1}}, // Fifth-Order Cash-Karp Runge-Kutta RKTableau RK5=RKTableau(5,new real[][] {{1/5}, - {3/40,9/40}, - {3/10,-9/10,6/5}, - {-11/54,5/2,-70/27,35/27}, - {1631/55296,175/512,575/13824, - 44275/110592,253/4096}}, + {3/40,9/40}, + {3/10,-9/10,6/5}, + {-11/54,5/2,-70/27,35/27}, + {1631/55296,175/512,575/13824, + 44275/110592,253/4096}}, new real[] {37/378,0,250/621,125/594, - 0,512/1771}, // 5th order + 0,512/1771}, // 5th order new real[] {2825/27648,0,18575/48384,13525/55296, - 277/14336,1/4}); // 4th order + 277/14336,1/4}); // 4th order // Fifth-Order Fehlberg Runge-Kutta RKTableau RK5F=RKTableau(5,new real[][] {{1/4}, - {3/32,9/32}, - {1932/2197,-7200/2197,7296/2197}, - {439/216,-8,3680/513,-845/4104}, - {-8/27,2,-3544/2565,1859/4104, - -11/40}}, + {3/32,9/32}, + {1932/2197,-7200/2197,7296/2197}, + {439/216,-8,3680/513,-845/4104}, + {-8/27,2,-3544/2565,1859/4104, + -11/40}}, new real[] {16/135,0,6656/12825,28561/56430,-9/50,2/55}, // 5th order new real[] {25/216,0,1408/2565,2197/4104,-1/5,0}); // 4th order // Fifth-Order Dormand-Prince Runge-Kutta RKTableau RK5DP=RKTableau(5,new real[][] {{1/5}, - {3/40,9/40}, - {44/45,-56/15,32/9}, - {19372/6561,-25360/2187,64448/6561, - -212/729}, - {9017/3168,-355/33,46732/5247,49/176, - -5103/18656}}, + {3/40,9/40}, + {44/45,-56/15,32/9}, + {19372/6561,-25360/2187,64448/6561, + -212/729}, + {9017/3168,-355/33,46732/5247,49/176, + -5103/18656}}, new real[] {35/384,0,500/1113,125/192,-2187/6784, - 11/84}, // 5th order + 11/84}, // 5th order new real[] {5179/57600,0,7571/16695,393/640, - -92097/339200,187/2100,1/40}); // 4th order + -92097/339200,187/2100,1/40}); // 4th order -real error(real error, real initial, real lowOrder, real norm, real diff) +real error(real error, real initial, real lowOrder, real norm, real diff) { if(initial != 0 && lowOrder != initial) { static real epsilon=realMin/realEpsilon; @@ -249,7 +249,7 @@ struct solution real[] y; } -void write(solution S) +void write(solution S) { for(int i=0; i < S.t.length; ++i) write(S.t[i],S.y[i]); @@ -276,7 +276,7 @@ solution integrate(real y, real c=0, real f(real t, real y), real a, real b=a, new real(real t, real y) {return f(t,y)-c*y;}; tableau.stepDependence(h,c,tableau.a); - + real t=a; real f0; if(tableau.a.lowOrderWeights.length == 0) dynamic=false; @@ -293,7 +293,7 @@ solution integrate(real y, real c=0, real f(real t, real y), real a, real b=a, tableau.stepDependence(h,c,tableau.a); dt=h; } - + real[] predictions={fsal ? f0 : F(t,y)}; for(int i=0; i < tableau.a.steps.length; ++i) predictions.push(F(t+h*tableau.a.steps[i], @@ -336,7 +336,7 @@ struct Solution real[][] y; } -void write(Solution S) +void write(Solution S) { for(int i=0; i < S.t.length; ++i) { write(S.t[i],tab); @@ -356,7 +356,7 @@ Solution integrate(real[] y, real[] f(real t, real[] y), real a, real b=a, Solution S; S.t=new real[] {a}; S.y=new real[][] {copy(y)}; - + if(h == 0) { if(b == a) return S; if(n == 0) abort("Either n or h must be specified"); diff --git a/graphics/asymptote/base/palette.asy b/graphics/asymptote/base/palette.asy index e77fa946e6..e3d6218312 100644 --- a/graphics/asymptote/base/palette.asy +++ b/graphics/asymptote/base/palette.asy @@ -5,7 +5,7 @@ private transform swap=(0,0,0,1,1,0); typedef bounds range(picture pic, real min, real max); range Range(bool automin=false, real min=-infinity, - bool automax=false, real max=infinity) + bool automax=false, real max=infinity) { return new bounds(picture pic, real dmin, real dmax) { // autoscale routine finds reasonable limits @@ -45,7 +45,7 @@ void image(frame f, pen[][] data, pair initial, pair final, // Reduce color palette to approximate range of data relative to "display" // range => errors of 1/palette.length in resulting color space. pen[] adjust(picture pic, real min, real max, real rmin, real rmax, - pen[] palette) + pen[] palette) { real dmin=pic.scale.z.T(min); real dmax=pic.scale.z.T(max); @@ -100,7 +100,7 @@ bounds image(picture pic=currentpicture, real[][] f, range range=Full, initial=T*initial; final=T*final; } - + pic.add(new void(frame F, transform t) { _image(F,f,initial,final,palette,t*T,copy=false,antialias=antialias); },true); @@ -146,7 +146,7 @@ void image(picture pic=currentpicture, pen[][] data, pair initial, pair final, initial=T*initial; final=T*final; } - + pic.add(new void(frame F, transform t) { _image(F,data,initial,final,t*T,copy=false,antialias=antialias); },true); @@ -171,7 +171,7 @@ void image(picture pic=currentpicture, pen f(int, int), int width, int height, initial=T*initial; final=T*final; } - + pic.add(new void(frame F, transform t) { _image(F,f,width,height,initial,final,t*T,antialias=antialias); },true); @@ -267,20 +267,20 @@ paletteticks PaletteTicks(Label format="", ticklabel ticklabel=null, return Ticks(sign,format,ticklabel,beginlabel,endlabel,N,n,Step,step, true,true,extend=true,pTick,ptick); }; -} +} paletteticks PaletteTicks=PaletteTicks(); paletteticks NoTicks=new ticks(int sign=-1) {return NoTicks;}; -void palette(picture pic=currentpicture, Label L="", bounds bounds, - pair initial, pair final, axis axis=Right, pen[] palette, +void palette(picture pic=currentpicture, Label L="", bounds bounds, + pair initial, pair final, axis axis=Right, pen[] palette, pen p=currentpen, paletteticks ticks=PaletteTicks, bool copy=true, bool antialias=false) { real initialz=pic.scale.z.T(bounds.min); real finalz=pic.scale.z.T(bounds.max); bounds mz=autoscale(initialz,finalz,pic.scale.z.scale); - + axisT axis; axis(pic,axis); real angle=degrees(axis.align.dir); @@ -311,11 +311,11 @@ void palette(picture pic=currentpicture, Label L="", bounds bounds, if(vertical && L.defaulttransform) { frame f; add(f,Label(L.s,(0,0),L.p)); - if(length(max(f)-min(f)) > ylabelwidth*fontsize(L.p)) + if(length(max(f)-min(f)) > ylabelwidth*fontsize(L.p)) L.transform(rotate(90)); } real[][] pdata={sequence(palette.length)}; - + transform T; pair Tinitial,Tfinal; if(vertical) { @@ -326,12 +326,12 @@ void palette(picture pic=currentpicture, Label L="", bounds bounds, Tinitial=initial; Tfinal=final; } - + pic.add(new void(frame f, transform t) { _image(f,pdata,Tinitial,Tfinal,palette,t*T,copy=false, antialias=antialias); },true); - + ticklocate locate=ticklocate(initialz,finalz,pic.scale.z,mz.min,mz.max); axis(pic,L,g,g2,p,ticks(sgn(axis.side.x*dot(lambda,par))),locate,mz.divisor, true); @@ -356,13 +356,13 @@ pen[] Grayscale(int NColors=256) pen[] Wheel(int NColors=32766) { if(settings.gray) return Grayscale(NColors); - + int nintervals=6; if(NColors <= nintervals) NColors=nintervals+1; int n=-quotient(NColors,-nintervals); - + pen[] Palette; - + Palette=new pen[n*nintervals]; real ninv=1.0/n; @@ -373,7 +373,7 @@ pen[] Wheel(int NColors=32766) Palette[n+i]=rgb(ininv1,0.0,1.0); Palette[2n+i]=rgb(0.0,ininv,1.0); Palette[3n+i]=rgb(0.0,1.0,ininv1); - Palette[4n+i]=rgb(ininv,1.0,0.0); + Palette[4n+i]=rgb(ininv,1.0,0.0); Palette[5n+i]=rgb(1.0,ininv1,0.0); } return Palette; @@ -383,14 +383,14 @@ pen[] Wheel(int NColors=32766) pen[] Rainbow(int NColors=32766) { if(settings.gray) return Grayscale(NColors); - + int offset=1; int nintervals=5; if(NColors <= nintervals) NColors=nintervals+1; int n=-quotient(NColors-1,-nintervals); - + pen[] Palette; - + Palette=new pen[n*nintervals+offset]; real ninv=1.0/n; @@ -400,37 +400,37 @@ pen[] Rainbow(int NColors=32766) Palette[i]=rgb(ininv1,0.0,1.0); Palette[n+i]=rgb(0.0,ininv,1.0); Palette[2n+i]=rgb(0.0,1.0,ininv1); - Palette[3n+i]=rgb(ininv,1.0,0.0); + Palette[3n+i]=rgb(ininv,1.0,0.0); Palette[4n+i]=rgb(1.0,ininv1,0.0); } Palette[4n+n]=rgb(1.0,0.0,0.0); - + return Palette; } private pen[] BWRainbow(int NColors, bool two) { if(settings.gray) return Grayscale(NColors); - + int offset=1; int nintervals=6; int divisor=3; - + if(two) nintervals += 6; - + int Nintervals=nintervals*divisor; if(NColors <= Nintervals) NColors=Nintervals+1; int num=NColors-offset; int n=-quotient(num,-Nintervals)*divisor; NColors=n*nintervals+offset; - + pen[] Palette; - + Palette=new pen[NColors]; real ninv=1.0/n; int k=0; - + if(two) { for(int i=0; i < n; ++i) { real ininv=i*ninv; @@ -444,9 +444,9 @@ private pen[] BWRainbow(int NColors, bool two) } k += 6n; } - + if(two) - for(int i=0; i < n; ++i) + for(int i=0; i < n; ++i) Palette[k+i]=rgb(1.0-i*ninv,0.0,1.0); else { int n3=-quotient(n,-3); @@ -467,12 +467,12 @@ private pen[] BWRainbow(int NColors, bool two) real ininv1=1.0-ininv; Palette[k+i]=rgb(0.0,ininv,1.0); Palette[k+n+i]=rgb(0.0,1.0,ininv1); - Palette[k+2n+i]=rgb(ininv,1.0,0.0); + Palette[k+2n+i]=rgb(ininv,1.0,0.0); Palette[k+3n+i]=rgb(1.0,ininv1,0.0); Palette[k+4n+i]=rgb(1.0,ininv,ininv); } Palette[k+5n]=rgb(1.0,1.0,1.0); - + return Palette; } @@ -484,7 +484,7 @@ pen[] quantize(pen[] Palette, int n) real step=(Palette.length-1)/(n-1); return sequence(new pen(int i) { return Palette[round(i*step)]; - },n); + },n); } // A rainbow palette tapering off to black/white at the spectrum ends, @@ -507,7 +507,7 @@ pen[] BWRainbow2(int NColors=32761) //A palette varying linearly over the specified array of pens, using // NColors in each interpolation interval. -pen[] Gradient(int NColors=256 ... pen[] p) +pen[] Gradient(int NColors=256 ... pen[] p) { pen[] P; if(p.length < 2) abort("at least 2 colors must be specified"); @@ -522,7 +522,7 @@ pen[] Gradient(int NColors=256 ... pen[] p) return P; } -pen[] cmyk(pen[] Palette) +pen[] cmyk(pen[] Palette) { int n=Palette.length; for(int i=0; i < n; ++i) diff --git a/graphics/asymptote/base/patterns.asy b/graphics/asymptote/base/patterns.asy index 56fa3bf4a2..559e36cec1 100644 --- a/graphics/asymptote/base/patterns.asy +++ b/graphics/asymptote/base/patterns.asy @@ -7,7 +7,7 @@ frame tiling(string name, picture pic, pair lb=0, pair rt=0) pair pmin=min(f)-lb; pair pmax=max(f)+rt; string s="%.6f"; - postscript(tiling,"<< /PaintType 1 /PatternType 1 /TilingType 1 + postscript(tiling,"<< /PaintType 1 /PatternType 1 /TilingType 1 /BBox ["+format(s,pmin.x,"C")+" "+format(s,pmin.y,"C")+" "+ format(s,pmax.x,"C")+" "+format(s,pmax.y,"C")+"] /XStep "+format(s,pmax.x-pmin.x,"C")+" @@ -64,7 +64,7 @@ picture brick(real Hx=5mm, real Hy=0, pen p=currentpen) } real hatchepsilon=1e-4; -picture hatch(real H=5mm, pair dir=NE, pen p=currentpen) +picture hatch(real H=5mm, pair dir=NE, pen p=currentpen) { picture tiling; real theta=angle(dir); diff --git a/graphics/asymptote/base/plain.asy b/graphics/asymptote/base/plain.asy index 141ccb8d13..57bdb411a9 100644 --- a/graphics/asymptote/base/plain.asy +++ b/graphics/asymptote/base/plain.asy @@ -18,13 +18,13 @@ if(settings.command != "") { include plain_constants; -access version; +access version; if(version.VERSION != VERSION) { warning("version","using possibly incompatible version "+ version.VERSION+" of plain.asy"+'\n'); nowarn("version"); } - + include plain_strings; include plain_pens; include plain_paths; @@ -106,7 +106,7 @@ addSaveFunction(new restoreThunk () { }); // Save the current state, so that restore will put things back in that state. -restoreThunk save() +restoreThunk save() { return restore=buildRestoreThunk(); } @@ -132,7 +132,7 @@ restoreThunk buildRestoreDefaults() } // Save the current state, so that restore will put things back in that state. -restoreThunk savedefaults() +restoreThunk savedefaults() { return restoredefaults=buildRestoreDefaults(); } @@ -199,7 +199,7 @@ void usersetting() eval(settings.user,true); } -string stripsuffix(string f, string suffix=".asy") +string stripsuffix(string f, string suffix=".asy") { int n=rfind(f,suffix); if(n != -1) f=erase(f,n,-1); @@ -252,7 +252,7 @@ struct cputime { processtime change; } -cputime cputime() +cputime cputime() { static processtime last; real [] a=_cputime(); diff --git a/graphics/asymptote/base/plain_Label.asy b/graphics/asymptote/base/plain_Label.asy index c50ce003be..0a2c270d68 100644 --- a/graphics/asymptote/base/plain_Label.asy +++ b/graphics/asymptote/base/plain_Label.asy @@ -15,10 +15,10 @@ transform scaleless(transform t) real a=t.xx, b=t.xy, c=t.yx, d=t.yy; real arg=(a-d)^2+4b*c; pair delta=arg >= 0 ? sqrt(arg) : I*sqrt(-arg); - real trace=a+d; + real trace=a+d; pair l1=0.5(trace+delta); pair l2=0.5(trace-delta); - + if(abs(delta) < sqrtEpsilon*max(abs(l1),abs(l2))) { real s=abs(0.5trace); return (s != 0) ? scale(1/s)*t : t; @@ -51,7 +51,7 @@ transform scaleless(transform t) } } return c; - } + } pair[][] conj(pair[][] a) { pair[][] c=new pair[2][2]; @@ -61,7 +61,7 @@ transform scaleless(transform t) } } return c; - } + } A=conj(U)*A*U; @@ -70,7 +70,7 @@ transform scaleless(transform t) A[0][0] /= D; A[0][1] /= D; } - + D=abs(A[1][1]); if(D != 0) { A[1][0] /= D; @@ -155,13 +155,13 @@ side Relative(explicit pair align) s.align=align; return s; } - + restricted side NoSide; restricted side LeftSide=Relative(W); restricted side Center=Relative((0,0)); restricted side RightSide=Relative(E); -side operator * (real x, side s) +side operator * (real x, side s) { side S; S.align=x*s.align; @@ -190,7 +190,7 @@ position Relative(real position) p.relative=true; return p; } - + restricted position BeginPoint=Relative(0); restricted position MidPoint=Relative(0.5); restricted position EndPoint=Relative(1); @@ -227,8 +227,8 @@ struct Label { bool defaulttransform3=true; embed embed=Rotate; // Shift, Rotate, Slant, or Scale with embedded picture filltype filltype=NoFill; - - void init(string s="", string size="", position position=0, + + void init(string s="", string size="", position position=0, bool defaultposition=true, align align=NoAlign, pen p=nullpen, transform T=identity(), transform3 T3=identity4, bool defaulttransform=true, bool defaulttransform3=true, @@ -246,17 +246,17 @@ struct Label { this.embed=embed; this.filltype=filltype; } - + void initalign(string s="", string size="", align align, pen p=nullpen, embed embed=Rotate, filltype filltype=NoFill) { init(s,size,align,p,embed,filltype); } - + void transform(transform T) { this.T=T; defaulttransform=false; } - + void transform3(transform3 T) { this.T3=copy(T); defaulttransform3=false; @@ -268,27 +268,27 @@ struct Label { defaulttransform3,embed,filltype); return L; } - + void position(position pos) { this.position=pos; defaultposition=false; } - + void align(align a) { align.align(a); } void align(align a, align default) { align.align(a,default); } - + void p(pen p0) { if(this.p == nullpen) this.p=p0; } - + void filltype(filltype filltype0) { if(this.filltype == NoFill) this.filltype=filltype0; } - + void label(frame f, transform t=identity(), pair position, pair align) { pen p0=p == nullpen ? currentpen : p; align=length(align)*unit(rotation(t)*align); @@ -309,7 +309,7 @@ struct Label { add(f,d,filltype); } } - + void label(picture pic=currentpicture, pair position, pair align) { if(s == "") return; pic.add(new void (frame f, transform t) { @@ -324,7 +324,7 @@ struct Label { void out(picture pic=currentpicture) { label(pic,position.position,align.dir); } - + void out(picture pic=currentpicture, path g) { bool relative=position.relative; real position=position.position.x; @@ -349,7 +349,7 @@ struct Label { pair position=point(g,position); pic.addBox(position,position,min(f),max(f)); } - + void write(file file=stdout, suffix suffix=endl) { write(file,"\""+s+"\""); if(!defaultposition) write(file,", position=",position.position); @@ -364,11 +364,11 @@ struct Label { } write(file,"",suffix); } - + real relative() { return defaultposition ? 0.5 : position.position.x; }; - + real relative(path g) { return position.relative ? reltime(g,relative()) : relative(); }; @@ -380,12 +380,12 @@ void add(frame f, transform t=identity(), Label L) { L.out(f,t); } - + void add(picture pic=currentpicture, Label L) { L.out(pic); } - + Label operator * (transform t, Label L) { Label tL=L.copy(); @@ -466,20 +466,20 @@ void label(frame f, Label L, pair position, align align=NoAlign, { add(f,Label(L,position,align,p,filltype)); } - + void label(frame f, Label L, align align=NoAlign, pen p=currentpen, filltype filltype=NoFill) { add(f,Label(L,L.position,align,p,filltype)); } - + void label(picture pic=currentpicture, Label L, pair position, align align=NoAlign, pen p=currentpen, filltype filltype=NoFill) { Label L=Label(L,position,align,p,filltype); add(pic,L); } - + void label(picture pic=currentpicture, Label L, align align=NoAlign, pen p=currentpen, filltype filltype=NoFill) { @@ -494,7 +494,7 @@ void label(pair origin, picture pic=currentpicture, Label L, align align=NoAlign label(opic,L,L.position,align,p,filltype); add(pic,opic,origin); } - + void label(picture pic=currentpicture, Label L, explicit path g, align align=NoAlign, pen p=currentpen, filltype filltype=NoFill) { @@ -532,12 +532,12 @@ object operator cast(frame f) { return object(f); } -object operator cast(Label L) +object operator cast(Label L) { return object(L); } -object operator cast(string s) +object operator cast(string s) { return object(s); } @@ -562,7 +562,7 @@ object operator * (transform t, explicit object F) } // Returns a copy of object F aligned in the direction align -object align(object F, pair align) +object align(object F, pair align) { return shift(F.f,align)*F; } @@ -594,7 +594,7 @@ path[] texpath(Label L, bool tex=settings.tex != "none", bool bbox=false) real fontsize; string font; - void operator init(Label L) + void operator init(Label L) { s=replace(L.s,'\n',' '); fontsize=fontsize(L.p); @@ -603,7 +603,7 @@ path[] texpath(Label L, bool tex=settings.tex != "none", bool bbox=false) pen pen() {return fontsize(fontsize)+fontcommand(font);} } - + bool lexorder(stringfont a, stringfont b) { return a.s < b.s || (a.s == b.s && (a.fontsize < b.fontsize || (a.fontsize == b.fontsize && @@ -615,7 +615,7 @@ path[] texpath(Label L, bool tex=settings.tex != "none", bool bbox=false) static stringfont[] stringlist; static bool adjust[]; - + path[] G; stringfont s=stringfont(L); @@ -649,7 +649,7 @@ path[] texpath(Label L, bool tex=settings.tex != "none", bool bbox=false) label(f,L); return transform(box(min(f),max(f)),L); } - + if(stringlist.length > 0) { path[][] g; int n=stringlist.length; @@ -660,9 +660,9 @@ path[] texpath(Label L, bool tex=settings.tex != "none", bool bbox=false) s[i]=adjust[i] ? "."+S.s : S.s; p[i]=adjust[i] ? S.pen()+basealign : S.pen(); } - + g=tex ? _texpath(s,p) : textpath(s,p); - + if(tex) for(int i=0; i < n; ++i) if(adjust[i]) { @@ -670,8 +670,8 @@ path[] texpath(Label L, bool tex=settings.tex != "none", bool bbox=false) g[i].delete(0); g[i]=shift(0,-y)*g[i]; } - - + + for(int i=0; i < stringlist.length; ++i) { stringfont s=stringlist[i]; int j=search(stringcache,s,lexorder)+1; @@ -686,6 +686,6 @@ path[] texpath(Label L, bool tex=settings.tex != "none", bool bbox=false) } texpath=new path[](string s, pen p, bool tex=settings.tex != "none", bool bbox=false) -{ - return texpath(Label(s,p)); -}; + { + return texpath(Label(s,p)); + }; diff --git a/graphics/asymptote/base/plain_arcs.asy b/graphics/asymptote/base/plain_arcs.asy index 140bc3cff1..11c603b615 100644 --- a/graphics/asymptote/base/plain_arcs.asy +++ b/graphics/asymptote/base/plain_arcs.asy @@ -1,5 +1,5 @@ bool CCW=true; -bool CW=false; +bool CW=false; path circle(pair c, real r) { @@ -35,7 +35,7 @@ path arc(pair c, real r, real angle1, real angle2, bool direction) { return arc(c,c+r*dir(angle1),c+r*dir(angle2),direction); } - + // return an arc centered at c with radius r > 0 from angle1 to angle2 in // degrees, drawing counterclockwise if angle2 >= angle1 (otherwise clockwise). path arc(pair c, real r, real angle1, real angle2) diff --git a/graphics/asymptote/base/plain_arrows.asy b/graphics/asymptote/base/plain_arrows.asy index 96a33dd5a4..79ee403af3 100644 --- a/graphics/asymptote/base/plain_arrows.asy +++ b/graphics/asymptote/base/plain_arrows.asy @@ -12,7 +12,7 @@ real arrowtexfactor=1; real barfactor=arrowfactor; -real arrowsize(pen p=currentpen) +real arrowsize(pen p=currentpen) { return arrowfactor*linewidth(p); } @@ -53,39 +53,39 @@ path arrowbase(path r, pair y, real t, real size) arrowhead DefaultHead; DefaultHead.head=new path(path g, position position=EndPoint, pen p=currentpen, real size=0, real angle=arrowangle) { - if(size == 0) size=DefaultHead.size(p); - bool relative=position.relative; - real position=position.position.x; - if(relative) position=reltime(g,position); - path r=subpath(g,position,0); - pair x=point(r,0); - real t=arctime(r,size); - pair y=point(r,t); - path base=arrowbase(r,y,t,size); - path left=rotate(-angle,x)*r; - path right=rotate(angle,x)*r; - real[] T=arrowbasepoints(base,left,right); - pair denom=point(right,T[1])-y; - real factor=denom != 0 ? length((point(left,T[0])-y)/denom) : 1; - path left=rotate(-angle*factor,x)*r; - path right=rotate(angle*factor,x)*r; - real[] T=arrowbasepoints(base,left,right); - return subpath(left,0,T[0])--subpath(right,T[1],0)&cycle; + if(size == 0) size=DefaultHead.size(p); + bool relative=position.relative; + real position=position.position.x; + if(relative) position=reltime(g,position); + path r=subpath(g,position,0); + pair x=point(r,0); + real t=arctime(r,size); + pair y=point(r,t); + path base=arrowbase(r,y,t,size); + path left=rotate(-angle,x)*r; + path right=rotate(angle,x)*r; + real[] T=arrowbasepoints(base,left,right); + pair denom=point(right,T[1])-y; + real factor=denom != 0 ? length((point(left,T[0])-y)/denom) : 1; + path left=rotate(-angle*factor,x)*r; + path right=rotate(angle*factor,x)*r; + real[] T=arrowbasepoints(base,left,right); + return subpath(left,0,T[0])--subpath(right,T[1],0)&cycle; }; arrowhead SimpleHead; SimpleHead.head=new path(path g, position position=EndPoint, pen p=currentpen, real size=0, real angle=arrowangle) { - if(size == 0) size=SimpleHead.size(p); - bool relative=position.relative; - real position=position.position.x; - if(relative) position=reltime(g,position); - path r=subpath(g,position,0); - pair x=point(r,0); - real t=arctime(r,size); - path left=rotate(-angle,x)*r; - path right=rotate(angle,x)*r; - return subpath(left,t,0)--subpath(right,0,t); + if(size == 0) size=SimpleHead.size(p); + bool relative=position.relative; + real position=position.position.x; + if(relative) position=reltime(g,position); + path r=subpath(g,position,0); + pair x=point(r,0); + real t=arctime(r,size); + path left=rotate(-angle,x)*r; + path right=rotate(angle,x)*r; + return subpath(left,t,0)--subpath(right,0,t); }; arrowhead HookHead(real dir=arrowdir, real barb=arrowbarb) @@ -94,34 +94,34 @@ arrowhead HookHead(real dir=arrowdir, real barb=arrowbarb) a.head=new path(path g, position position=EndPoint, pen p=currentpen, real size=0, real angle=arrowangle) { - if(size == 0) size=a.size(p); - angle=min(angle*arrowhookfactor,45); - bool relative=position.relative; - real position=position.position.x; - if(relative) position=reltime(g,position); - path r=subpath(g,position,0); - pair x=point(r,0); - real t=arctime(r,size); - pair y=point(r,t); - path base=arrowbase(r,y,t,size); - path left=rotate(-angle,x)*r; - path right=rotate(angle,x)*r; - real[] T=arrowbasepoints(base,left,right,1); - pair denom=point(right,T[1])-y; - real factor=denom != 0 ? length((point(left,T[0])-y)/denom) : 1; - path left=rotate(-angle*factor,x)*r; - path right=rotate(angle*factor,x)*r; - real[] T=arrowbasepoints(base,left,right,1); - left=subpath(left,0,T[0]); - right=subpath(right,T[1],0); - pair pl0=point(left,0), pl1=relpoint(left,1); - pair pr0=relpoint(right,0), pr1=relpoint(right,1); - pair M=(pl1+pr0)/2; - pair v=barb*unit(M-pl0); - pl1=pl1+v; pr0=pr0+v; - left=pl0{dir(-dir+degrees(M-pl0,false))}..pl1--M; - right=M--pr0..pr1{dir(dir+degrees(pr1-M,false))}; - return left--right&cycle; + if(size == 0) size=a.size(p); + angle=min(angle*arrowhookfactor,45); + bool relative=position.relative; + real position=position.position.x; + if(relative) position=reltime(g,position); + path r=subpath(g,position,0); + pair x=point(r,0); + real t=arctime(r,size); + pair y=point(r,t); + path base=arrowbase(r,y,t,size); + path left=rotate(-angle,x)*r; + path right=rotate(angle,x)*r; + real[] T=arrowbasepoints(base,left,right,1); + pair denom=point(right,T[1])-y; + real factor=denom != 0 ? length((point(left,T[0])-y)/denom) : 1; + path left=rotate(-angle*factor,x)*r; + path right=rotate(angle*factor,x)*r; + real[] T=arrowbasepoints(base,left,right,1); + left=subpath(left,0,T[0]); + right=subpath(right,T[1],0); + pair pl0=point(left,0), pl1=relpoint(left,1); + pair pr0=relpoint(right,0), pr1=relpoint(right,1); + pair M=(pl1+pr0)/2; + pair v=barb*unit(M-pl0); + pl1=pl1+v; pr0=pr0+v; + left=pl0{dir(-dir+degrees(M-pl0,false))}..pl1--M; + right=M--pr0..pr1{dir(dir+degrees(pr1-M,false))}; + return left--right&cycle; }; return a; } @@ -129,35 +129,35 @@ arrowhead HookHead=HookHead(); arrowhead TeXHead; TeXHead.size=new real(pen p) -{ - static real hcoef=2.1; // 84/40=abs(base-hint)/base_height - return hcoef*arrowtexfactor*linewidth(p); -}; + { + static real hcoef=2.1; // 84/40=abs(base-hint)/base_height + return hcoef*arrowtexfactor*linewidth(p); + }; TeXHead.arcsize=TeXHead.size; TeXHead.head=new path(path g, position position=EndPoint, pen p=currentpen, real size=0, real angle=arrowangle) { - static real wcoef=1/84; // 1/abs(base-hint) - static path texhead=scale(wcoef)* - ((0,20) .. controls (-75,75) and (-108,158) .. - (-108,166) .. controls (-108,175) and (-100,178) .. - (-93,178) .. controls (-82,178) and (-80,173) .. - (-77,168) .. controls (-62,134) and (-30,61) .. - (70,14) .. controls (82,8) and (84,7) .. - (84,0) .. controls (84,-7) and (82,-8) .. - (70,-14) .. controls (-30,-61) and (-62,-134) .. - (-77,-168) .. controls (-80,-173) and (-82,-178) .. - (-93,-178) .. controls (-100,-178) and (-108,-175).. - (-108,-166).. controls (-108,-158) and (-75,-75) .. - (0,-20)--cycle); - if(size == 0) size=TeXHead.size(p); - path gp=scale(size)*texhead; - bool relative=position.relative; - real position=position.position.x; - if(relative) position=reltime(g,position); - path r=subpath(g,position,0); - pair y=point(r,arctime(r,size)); - return shift(y)*rotate(degrees(-dir(r,arctime(r,0.5*size))))*gp; + static real wcoef=1/84; // 1/abs(base-hint) + static path texhead=scale(wcoef)* + ((0,20) .. controls (-75,75) and (-108,158) .. + (-108,166) .. controls (-108,175) and (-100,178) .. + (-93,178) .. controls (-82,178) and (-80,173) .. + (-77,168) .. controls (-62,134) and (-30,61) .. + (70,14) .. controls (82,8) and (84,7) .. + (84,0) .. controls (84,-7) and (82,-8) .. + (70,-14) .. controls (-30,-61) and (-62,-134) .. + (-77,-168) .. controls (-80,-173) and (-82,-178) .. + (-93,-178) .. controls (-100,-178) and (-108,-175).. + (-108,-166).. controls (-108,-158) and (-75,-75) .. + (0,-20)--cycle); + if(size == 0) size=TeXHead.size(p); + path gp=scale(size)*texhead; + bool relative=position.relative; + real position=position.position.x; + if(relative) position=reltime(g,position); + path r=subpath(g,position,0); + pair y=point(r,arctime(r,size)); + return shift(y)*rotate(degrees(-dir(r,arctime(r,0.5*size))))*gp; }; TeXHead.defaultfilltype=new filltype(pen p) {return Fill(p);}; @@ -169,7 +169,7 @@ private real position(position position, real size, path g, bool center) position *= arclength(g); if(center) position += 0.5*size; position=arctime(g,position); - } else if(center) + } else if(center) position=arctime(g,arclength(subpath(g,0,position))+0.5*size); return position; } @@ -251,7 +251,7 @@ picture arrow(arrowhead arrowhead=DefaultHead, drawarrow(f,arrowhead,t*g,p,size,angle,filltype,position,forwards,margin, center); }); - + pic.addPath(g,p); real position=position(position,size,g,center); @@ -275,7 +275,7 @@ picture arrow2(arrowhead arrowhead=DefaultHead, pic.add(new void(frame f, transform t) { drawarrow2(f,arrowhead,t*g,p,size,angle,filltype,margin); }); - + pic.addPath(g,p); int L=length(g); @@ -291,7 +291,7 @@ void bar(picture pic, pair a, pair d, pen p=currentpen) Draw(opic,-0.5d--0.5d,p+solid); add(pic,opic,a); } - + picture bar(pair a, pair d, pen p=currentpen) { picture pic; @@ -345,7 +345,7 @@ arrowbar MidArrow(arrowhead arrowhead=DefaultHead, return false; }; } - + arrowbar Arrows(arrowhead arrowhead=DefaultHead, real size=0, real angle=arrowangle, filltype filltype=null) @@ -383,7 +383,7 @@ arrowbar EndArcArrow(arrowhead arrowhead=DefaultHead, real size=0, real angle=arcarrowangle, filltype filltype=null, position position=EndPoint)=ArcArrow; - + arrowbar MidArcArrow(arrowhead arrowhead=DefaultHead, real size=0, real angle=arcarrowangle, filltype filltype=null) @@ -395,7 +395,7 @@ arrowbar MidArcArrow(arrowhead arrowhead=DefaultHead, return false; }; } - + arrowbar ArcArrows(arrowhead arrowhead=DefaultHead, real size=0, real angle=arcarrowangle, filltype filltype=null) @@ -406,8 +406,8 @@ arrowbar ArcArrows(arrowhead arrowhead=DefaultHead, return false; }; } - -arrowbar BeginBar(real size=0) + +arrowbar BeginBar(real size=0) { return new bool(picture pic, path g, pen p, margin margin) { real size=size == 0 ? barsize(p) : size; @@ -416,7 +416,7 @@ arrowbar BeginBar(real size=0) }; } -arrowbar Bar(real size=0) +arrowbar Bar(real size=0) { return new bool(picture pic, path g, pen p, margin margin) { int L=length(g); @@ -426,9 +426,9 @@ arrowbar Bar(real size=0) }; } -arrowbar EndBar(real size=0)=Bar; +arrowbar EndBar(real size=0)=Bar; -arrowbar Bars(real size=0) +arrowbar Bars(real size=0) { return new bool(picture pic, path g, pen p, margin margin) { real size=size == 0 ? barsize(p) : size; @@ -469,73 +469,73 @@ void draw(picture pic=currentpicture, Label L=null, path g, // These if statements are ordered in such a way that the most common case // (with just a path and a pen) executes the least bytecode. if (marker == nomarker) - { - if (arrow == None && bar == None) { - if (margin == NoMargin && size(nib(p)) == 0) - { - pic.addExactAbove( - new void(frame f, transform t, transform T, pair, pair) { - _draw(f,t*T*g,p); - }); - pic.addPath(g,p); - - // Jumping over else clauses takes time, so test if we can return - // here. - if (L == null && legend == null) - return; + if (arrow == None && bar == None) + { + if (margin == NoMargin && size(nib(p)) == 0) + { + pic.addExactAbove( + new void(frame f, transform t, transform T, pair, pair) { + _draw(f,t*T*g,p); + }); + pic.addPath(g,p); + + // Jumping over else clauses takes time, so test if we can return + // here. + if (L == null && legend == null) + return; + } + else // With margin or polygonal pen. + { + _draw(pic, g, p, margin); + } + } + else /* arrow or bar */ + { + // Note we are using & instead of && as both arrow and bar need to be + // called. + if (arrow(pic, g, p, margin) & bar(pic, g, p, margin)) + _draw(pic, g, p, margin); + } + + if(L != null && L.s != "") { + L=L.copy(); + L.align(align); + L.p(p); + L.out(pic,g); } - else // With margin or polygonal pen. - { - _draw(pic, g, p, margin); + + if(legend != null && legend.s != "") { + legend.p(p); + pic.legend.push(Legend(legend.s,legend.p,p,marker.f,marker.above)); } } - else /* arrow or bar */ + else /* marker != nomarker */ { + if(marker != nomarker && !marker.above) marker.mark(pic,g); + // Note we are using & instead of && as both arrow and bar need to be // called. - if (arrow(pic, g, p, margin) & bar(pic, g, p, margin)) - _draw(pic, g, p, margin); - } - - if(L != null && L.s != "") { - L=L.copy(); - L.align(align); - L.p(p); - L.out(pic,g); - } - - if(legend != null && legend.s != "") { - legend.p(p); - pic.legend.push(Legend(legend.s,legend.p,p,marker.f,marker.above)); - } - } - else /* marker != nomarker */ - { - if(marker != nomarker && !marker.above) marker.mark(pic,g); - - // Note we are using & instead of && as both arrow and bar need to be - // called. - if ((arrow == None || arrow(pic, g, p, margin)) & - (bar == None || bar(pic, g, p, margin))) - { - _draw(pic, g, p, margin); + if ((arrow == None || arrow(pic, g, p, margin)) & + (bar == None || bar(pic, g, p, margin))) + { + _draw(pic, g, p, margin); + } + + if(L != null && L.s != "") { + L=L.copy(); + L.align(align); + L.p(p); + L.out(pic,g); } - if(L != null && L.s != "") { - L=L.copy(); - L.align(align); - L.p(p); - L.out(pic,g); - } + if(legend != null && legend.s != "") { + legend.p(p); + pic.legend.push(Legend(legend.s,legend.p,p,marker.f,marker.above)); + } - if(legend != null && legend.s != "") { - legend.p(p); - pic.legend.push(Legend(legend.s,legend.p,p,marker.f,marker.above)); + if(marker != nomarker && marker.above) marker.mark(pic,g); } - - if(marker != nomarker && marker.above) marker.mark(pic,g); - } } // Draw a fixed-size line about the user-coordinate 'origin'. @@ -551,12 +551,12 @@ void draw(pair origin, picture pic=currentpicture, Label L=null, path g, void draw(picture pic=currentpicture, explicit path[] g, pen p=currentpen, Label legend=null, marker marker=nomarker) -{ +{ // This could be optimized to size and draw the entire array as a batch. - for(int i=0; i < g.length-1; ++i) + for(int i=0; i < g.length-1; ++i) draw(pic,g[i],p,marker); if(g.length > 0) draw(pic,g[g.length-1],p,legend,marker); -} +} void draw(picture pic=currentpicture, guide[] g, pen p=currentpen, Label legend=null, marker marker=nomarker) @@ -621,7 +621,7 @@ frame[] fit(string prefix="", picture[] pictures, string format="", { if(pictures.length == 0) return new frame[]; - + picture all; size(all,pictures[0]); for(picture pic : pictures) diff --git a/graphics/asymptote/base/plain_bounds.asy b/graphics/asymptote/base/plain_bounds.asy index b74a6ceee6..c4e2472177 100644 --- a/graphics/asymptote/base/plain_bounds.asy +++ b/graphics/asymptote/base/plain_bounds.asy @@ -4,7 +4,7 @@ include plain_scaling; // have been added, this is only an approximation since it takes the bounds of // their transformed bounding box. private void addTransformedCoords(coords2 dest, transform t, - coords2 point, coords2 min, coords2 max) + coords2 point, coords2 min, coords2 max) { dest.push(t, point, point); @@ -47,7 +47,7 @@ private void addIfMaximal(coord[] dest, coord[] src) for (coord c : src) addIfMaximal(dest, c.user, c.truesize); } - + // Same as addIfMaximal, but testing for minimal coords. private void addIfMinimal(coord[] coords, real user, real truesize) { for (coord c : coords) @@ -130,7 +130,7 @@ private struct freezableBounds { void operator init(coord[] left, coord[] bottom, coord[] right, coord[] top) { this.left = left; - this.bottom = bottom; + this.bottom = bottom; this.right = right; this.top = top; } @@ -197,7 +197,7 @@ private struct freezableBounds { void addBox(pair userMin, pair userMax, pair trueMin, pair trueMax) { assert(!frozen); - this.min.push(userMin, trueMin); + this.min.push(userMin, trueMin); this.max.push(userMax, trueMax); } @@ -334,7 +334,7 @@ private struct freezableBounds { addLocalsToExtremes(t, e); } - + private void addLocalsToExtremes(extremes e) { addMinToExtremes(e, point); addMaxToExtremes(e, point); @@ -466,7 +466,7 @@ private struct freezableBounds { acc.pushUserCoords(min, max); if (pathBounds.length > 0) acc.push(min(pathBounds), max(pathBounds)); - for (var pp : pathpenBounds) + for (var pp : pathpenBounds) if(size(pp.g) > 0) acc.push(min(pp.g), max(pp.g)); for (var link : links) @@ -623,13 +623,13 @@ private struct freezableBounds { // Get the extremal coordinates. extremes e = extremes(); - + real sx; if(xunitsize == 0) { if(xsize != 0) sx=calculateScaling("x",e.left,e.right,xsize,warn); } else sx=xunitsize; - /* Possible alternative code : + /* Possible alternative code : real sx = xunitsize != 0 ? xunitsize : xsize != 0 ? calculateScaling("x", Coords.x, xsize, warn) : 0; */ @@ -697,7 +697,7 @@ struct bounds { makeMutable(); base.append(b.base); } - + void append(transform t, bounds b) { // makeMutable will be called by append. if (t == identity()) @@ -760,7 +760,7 @@ struct bounds { makeMutable(); base.yclip(Min,Max); } - + void clip(pair Min, pair Max) { // TODO: If the user bounds have been manually altered, they may be // incorrect after the clip. diff --git a/graphics/asymptote/base/three.asy b/graphics/asymptote/base/three.asy index 7a2b7ece06..de03d7c5ec 100644 --- a/graphics/asymptote/base/three.asy +++ b/graphics/asymptote/base/three.asy @@ -1065,7 +1065,7 @@ triple dir(path3 p) triple dir(path3 p, path3 h) { - return 0.5*(dir(p)+dir(h)); + return unit(dir(p)+dir(h)); } // return the point on path3 p at arclength L diff --git a/graphics/asymptote/base/unicode.asy b/graphics/asymptote/base/unicode.asy deleted file mode 100644 index 33571e8341..0000000000 --- a/graphics/asymptote/base/unicode.asy +++ /dev/null @@ -1,2 +0,0 @@ -usepackage("ucs"); -usepackage("inputenc","utf8x"); diff --git a/graphics/asymptote/base/webgl/asygl.js b/graphics/asymptote/base/webgl/asygl.js index 7944fbf1cd..db8810f260 100644 --- a/graphics/asymptote/base/webgl/asygl.js +++ b/graphics/asymptote/base/webgl/asygl.js @@ -1,6 +1,6 @@ /*@license AsyGL: Render Bezier patches and triangles via subdivision with WebGL. - Copyright 2019: John C. Bowman and Supakorn "Jamie" Rassameemasmuang + Copyright 2019-2020: John C. Bowman and Supakorn "Jamie" Rassameemasmuang University of Alberta This program is free software; you can redistribute it and/or modify @@ -36,4 +36,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.*/ -let vertex="\nattribute vec3 position;\n#ifdef WIDTH\nattribute float width;\n#endif\n#ifdef NORMAL\nattribute vec3 normal;\n#endif\nattribute float materialIndex;\n#ifdef COLOR\nattribute vec4 color;\n#endif\n\nuniform mat3 normMat;\nuniform mat4 viewMat;\nuniform mat4 projViewMat;\n\n#ifdef NORMAL\n#ifndef ORTHOGRAPHIC\nvarying vec3 ViewPosition;\n#endif\nvarying vec3 Normal;\n#endif\nvarying vec4 diffuse;\nvarying vec3 specular;\nvarying float roughness,metallic,fresnel0;\nvarying vec4 emissive;\n\nstruct Material {\n vec4 diffuse,emissive,specular;\n vec4 parameters;\n};\n\nuniform Material Materials[Nmaterials];\n\nvoid main(void)\n{\n vec4 v=vec4(position,1.0);\n gl_Position=projViewMat*v;\n#ifdef NORMAL\n#ifndef ORTHOGRAPHIC\n ViewPosition=(viewMat*v).xyz;\n#endif \n Normal=normalize(normal*normMat);\n \n Material m;\n#ifdef TRANSPARENT\n m=Materials[int(abs(materialIndex))-1];\n emissive=m.emissive;\n if(materialIndex >= 0.0) {\n diffuse=m.diffuse;\n } else {\n diffuse=color;\n#if nlights == 0\n emissive += color;\n#endif\n }\n#else\n m=Materials[int(materialIndex)];\n emissive=m.emissive;\n#ifdef COLOR\n diffuse=color;\n#if nlights == 0\n emissive += color;\n#endif\n#else\n diffuse=m.diffuse;\n#endif\n#endif\n specular=m.specular.rgb;\n vec4 parameters=m.parameters;\n roughness=1.0-parameters[0];\n metallic=parameters[1];\n fresnel0=parameters[2];\n#else\n emissive=Materials[int(materialIndex)].emissive;\n#endif\n#ifdef WIDTH\n gl_PointSize=width;\n#endif\n}\n",fragment="\n#ifdef NORMAL\n#ifndef ORTHOGRAPHIC\nvarying vec3 ViewPosition;\n#endif\nvarying vec3 Normal;\nvarying vec4 diffuse;\nvarying vec3 specular;\nvarying float roughness,metallic,fresnel0;\n\nfloat Roughness2;\nvec3 normal;\n\nstruct Light {\n vec3 direction;\n vec3 color;\n};\n\nuniform Light Lights[Nlights];\n\nfloat NDF_TRG(vec3 h)\n{\n float ndoth=max(dot(normal,h),0.0);\n float alpha2=Roughness2*Roughness2;\n float denom=ndoth*ndoth*(alpha2-1.0)+1.0;\n return denom != 0.0 ? alpha2/(denom*denom) : 0.0;\n}\n \nfloat GGX_Geom(vec3 v)\n{\n float ndotv=max(dot(v,normal),0.0);\n float ap=1.0+Roughness2;\n float k=0.125*ap*ap;\n return ndotv/((ndotv*(1.0-k))+k);\n}\n \nfloat Geom(vec3 v, vec3 l)\n{\n return GGX_Geom(v)*GGX_Geom(l);\n}\n \nfloat Fresnel(vec3 h, vec3 v, float fresnel0)\n{\n float a=1.0-max(dot(h,v),0.0);\n float b=a*a;\n return fresnel0+(1.0-fresnel0)*b*b*a;\n}\n \n// physical based shading using UE4 model.\nvec3 BRDF(vec3 viewDirection, vec3 lightDirection)\n{\n vec3 lambertian=diffuse.rgb;\n vec3 h=normalize(lightDirection+viewDirection);\n \n float omegain=max(dot(viewDirection,normal),0.0);\n float omegali=max(dot(lightDirection,normal),0.0);\n \n float D=NDF_TRG(h);\n float G=Geom(viewDirection,lightDirection);\n float F=Fresnel(h,viewDirection,fresnel0);\n \n float denom=4.0*omegain*omegali;\n float rawReflectance=denom > 0.0 ? (D*G)/denom : 0.0;\n \n vec3 dielectric=mix(lambertian,rawReflectance*specular,F);\n vec3 metal=rawReflectance*diffuse.rgb;\n \n return mix(dielectric,metal,metallic);\n}\n#endif\nvarying vec4 emissive;\n \nvoid main(void)\n{\n#if defined(NORMAL) && nlights > 0\n normal=normalize(Normal);\n normal=gl_FrontFacing ? normal : -normal;\n#ifdef ORTHOGRAPHIC\n vec3 viewDir=vec3(0.0,0.0,1.0);\n#else\n vec3 viewDir=-normalize(ViewPosition);\n#endif\n Roughness2=roughness*roughness;\n vec3 color=emissive.rgb;\n for(int i=0; i < nlights; ++i) {\n Light Li=Lights[i];\n vec3 L=Li.direction;\n float cosTheta=max(dot(normal,L),0.0);\n vec3 radiance=cosTheta*Li.color;\n color += BRDF(viewDir,L)*radiance;\n }\n gl_FragColor=vec4(color,diffuse.a);\n#else\n gl_FragColor=emissive;\n#endif\n}\n";!function(t,e){if("object"==typeof exports&&"object"==typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var i=e();for(var a in i)("object"==typeof exports?exports:t)[a]=i[a]}}("undefined"!=typeof self?self:this,function(){return function(t){var e={};function i(a){if(e[a])return e[a].exports;var r=e[a]={i:a,l:!1,exports:{}};return t[a].call(r.exports,r,r.exports,i),r.l=!0,r.exports}return i.m=t,i.c=e,i.d=function(t,e,a){i.o(t,e)||Object.defineProperty(t,e,{configurable:!1,enumerable:!0,get:a})},i.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return i.d(e,"a",e),e},i.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},i.p="",i(i.s=1)}([function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.setMatrixArrayType=function(t){e.ARRAY_TYPE=t},e.toRadian=function(t){return t*r},e.equals=function(t,e){return Math.abs(t-e)<=a*Math.max(1,Math.abs(t),Math.abs(e))};var a=e.EPSILON=1e-6;e.ARRAY_TYPE="undefined"!=typeof Float32Array?Float32Array:Array,e.RANDOM=Math.random;var r=Math.PI/180},function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.mat4=e.mat3=void 0;var a=n(i(2)),r=n(i(3));function n(t){if(t&&t.__esModule)return t;var e={};if(null!=t)for(var i in t)Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e.default=t,e}e.mat3=a,e.mat4=r},function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.create=function(){var t=new a.ARRAY_TYPE(9);return t[0]=1,t[1]=0,t[2]=0,t[3]=0,t[4]=1,t[5]=0,t[6]=0,t[7]=0,t[8]=1,t},e.fromMat4=function(t,e){return t[0]=e[0],t[1]=e[1],t[2]=e[2],t[3]=e[4],t[4]=e[5],t[5]=e[6],t[6]=e[8],t[7]=e[9],t[8]=e[10],t},e.invert=function(t,e){var i=e[0],a=e[1],r=e[2],n=e[3],s=e[4],o=e[5],h=e[6],l=e[7],d=e[8],c=d*s-o*l,m=-d*n+o*h,f=l*n-s*h,u=i*c+a*m+r*f;if(!u)return null;return u=1/u,t[0]=c*u,t[1]=(-d*a+r*l)*u,t[2]=(o*a-r*s)*u,t[3]=m*u,t[4]=(d*i-r*h)*u,t[5]=(-o*i+r*n)*u,t[6]=f*u,t[7]=(-l*i+a*h)*u,t[8]=(s*i-a*n)*u,t};var a=function(t){if(t&&t.__esModule)return t;var e={};if(null!=t)for(var i in t)Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e.default=t,e}(i(0))},function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.create=function(){var t=new a.ARRAY_TYPE(16);return t[0]=1,t[1]=0,t[2]=0,t[3]=0,t[4]=0,t[5]=1,t[6]=0,t[7]=0,t[8]=0,t[9]=0,t[10]=1,t[11]=0,t[12]=0,t[13]=0,t[14]=0,t[15]=1,t},e.identity=function(t){return t[0]=1,t[1]=0,t[2]=0,t[3]=0,t[4]=0,t[5]=1,t[6]=0,t[7]=0,t[8]=0,t[9]=0,t[10]=1,t[11]=0,t[12]=0,t[13]=0,t[14]=0,t[15]=1,t},e.invert=function(t,e){var i=e[0],a=e[1],r=e[2],n=e[3],s=e[4],o=e[5],h=e[6],l=e[7],d=e[8],c=e[9],m=e[10],f=e[11],u=e[12],p=e[13],v=e[14],g=e[15],x=i*o-a*s,w=i*h-r*s,M=i*l-n*s,b=a*h-r*o,S=a*l-n*o,A=r*l-n*h,P=d*p-c*u,T=d*v-m*u,D=d*g-f*u,y=c*v-m*p,R=c*g-f*p,I=m*g-f*v,z=x*I-w*R+M*y+b*D-S*T+A*P;if(!z)return null;return z=1/z,t[0]=(o*I-h*R+l*y)*z,t[1]=(r*R-a*I-n*y)*z,t[2]=(p*A-v*S+g*b)*z,t[3]=(m*S-c*A-f*b)*z,t[4]=(h*D-s*I-l*T)*z,t[5]=(i*I-r*D+n*T)*z,t[6]=(v*M-u*A-g*w)*z,t[7]=(d*A-m*M+f*w)*z,t[8]=(s*R-o*D+l*P)*z,t[9]=(a*D-i*R-n*P)*z,t[10]=(u*S-p*M+g*x)*z,t[11]=(c*M-d*S-f*x)*z,t[12]=(o*T-s*y-h*P)*z,t[13]=(i*y-a*T+r*P)*z,t[14]=(p*w-u*b-v*x)*z,t[15]=(d*b-c*w+m*x)*z,t},e.multiply=r,e.translate=function(t,e,i){var a=i[0],r=i[1],n=i[2],s=void 0,o=void 0,h=void 0,l=void 0,d=void 0,c=void 0,m=void 0,f=void 0,u=void 0,p=void 0,v=void 0,g=void 0;e===t?(t[12]=e[0]*a+e[4]*r+e[8]*n+e[12],t[13]=e[1]*a+e[5]*r+e[9]*n+e[13],t[14]=e[2]*a+e[6]*r+e[10]*n+e[14],t[15]=e[3]*a+e[7]*r+e[11]*n+e[15]):(s=e[0],o=e[1],h=e[2],l=e[3],d=e[4],c=e[5],m=e[6],f=e[7],u=e[8],p=e[9],v=e[10],g=e[11],t[0]=s,t[1]=o,t[2]=h,t[3]=l,t[4]=d,t[5]=c,t[6]=m,t[7]=f,t[8]=u,t[9]=p,t[10]=v,t[11]=g,t[12]=s*a+d*r+u*n+e[12],t[13]=o*a+c*r+p*n+e[13],t[14]=h*a+m*r+v*n+e[14],t[15]=l*a+f*r+g*n+e[15]);return t},e.rotate=function(t,e,i,r){var n=r[0],s=r[1],o=r[2],h=Math.sqrt(n*n+s*s+o*o),l=void 0,d=void 0,c=void 0,m=void 0,f=void 0,u=void 0,p=void 0,v=void 0,g=void 0,x=void 0,w=void 0,M=void 0,b=void 0,S=void 0,A=void 0,P=void 0,T=void 0,D=void 0,y=void 0,R=void 0,I=void 0,z=void 0,O=void 0,E=void 0;if(Math.abs(h)gl.getUniformLocation(t,"Materials["+e+"]."+i);gl.uniform4fv(i("diffuse"),new Float32Array(this.diffuse)),gl.uniform4fv(i("emissive"),new Float32Array(this.emissive)),gl.uniform4fv(i("specular"),new Float32Array(this.specular)),gl.uniform4f(i("parameters"),this.shininess,this.metallic,this.fresnel0,0)}}let indexExt,TRIANGLES,material0Data,material1Data,materialData,colorData,transparentData,triangleData,materialIndex,enumPointLight=1,enumDirectionalLight=2;class Light{constructor(t,e){this.direction=t,this.color=e}setUniform(t,e){let i=i=>gl.getUniformLocation(t,"Lights["+e+"]."+i);gl.uniform3fv(i("direction"),new Float32Array(this.direction)),gl.uniform3fv(i("color"),new Float32Array(this.color))}}function initShaders(){let t=gl.getParameter(gl.MAX_VERTEX_UNIFORM_VECTORS);maxMaterials=Math.floor((t-14)/4),Nmaterials=Math.min(Math.max(Nmaterials,Materials.length),maxMaterials),pixelShader=initShader(["WIDTH"]),materialShader=initShader(["NORMAL"]),colorShader=initShader(["NORMAL","COLOR"]),transparentShader=initShader(["NORMAL","COLOR","TRANSPARENT"])}function deleteShaders(){gl.deleteProgram(transparentShader),gl.deleteProgram(colorShader),gl.deleteProgram(materialShader),gl.deleteProgram(pixelShader)}function noGL(){gl||alert("Could not initialize WebGL")}function saveAttributes(){let t=window.top.document.asygl[alpha];t.gl=gl,t.nlights=Lights.length,t.Nmaterials=Nmaterials,t.maxMaterials=maxMaterials,t.pixelShader=pixelShader,t.materialShader=materialShader,t.colorShader=colorShader,t.transparentShader=transparentShader}function restoreAttributes(){let t=window.top.document.asygl[alpha];gl=t.gl,nlights=t.nlights,Nmaterials=t.Nmaterials,maxMaterials=t.maxMaterials,pixelShader=t.pixelShader,materialShader=t.materialShader,colorShader=t.colorShader,transparentShader=t.transparentShader}function initGL(){if(alpha=Background[3]<1,embedded){let t=window.top.document;null==t.asygl&&(t.asygl=Array(2)),context=canvas.getContext("2d"),(offscreen=t.offscreen)||(offscreen=t.createElement("canvas"),t.offscreen=offscreen),t.asygl[alpha]&&t.asygl[alpha].gl?(restoreAttributes(),(Lights.length!=nlights||Math.min(Materials.length,maxMaterials)>Nmaterials)&&(initShaders(),saveAttributes())):((gl=offscreen.getContext("webgl",{alpha:alpha}))||noGL(),initShaders(),t.asygl[alpha]={},saveAttributes())}else(gl=canvas.getContext("webgl",{alpha:alpha}))||noGL(),initShaders();indexExt=gl.getExtension("OES_element_index_uint"),TRIANGLES=gl.TRIANGLES,material0Data=new vertexBuffer(gl.POINTS),material1Data=new vertexBuffer(gl.LINES),materialData=new vertexBuffer,colorData=new vertexBuffer,transparentData=new vertexBuffer,triangleData=new vertexBuffer}function getShader(t,e,i,a=[]){let r=`#version 100\n#ifdef GL_FRAGMENT_PRECISION_HIGH\n precision highp float;\n#else\n precision mediump float;\n#endif\n #define nlights ${0==wireframe?Lights.length:0}\n\n const int Nlights=${Math.max(Lights.length,1)};\n\n #define Nmaterials ${Nmaterials}\n`;orthographic&&(r+="#define ORTHOGRAPHIC\n"),a.forEach(t=>r+="#define "+t+"\n");let n=t.createShader(i);return t.shaderSource(n,r+e),t.compileShader(n),t.getShaderParameter(n,t.COMPILE_STATUS)?n:(alert(t.getShaderInfoLog(n)),null)}function registerBuffer(t,e,i,a=gl.ARRAY_BUFFER){return t.length>0&&(0==e&&(e=gl.createBuffer(),i=!0),gl.bindBuffer(a,e),i&&gl.bufferData(a,t,gl.STATIC_DRAW)),e}function drawBuffer(t,e,i=t.indices){if(0==t.indices.length)return;let a=e!=pixelShader;setUniforms(t,e);let r=remesh||t.partial||!t.rendered;t.verticesBuffer=registerBuffer(new Float32Array(t.vertices),t.verticesBuffer,r),gl.vertexAttribPointer(positionAttribute,3,gl.FLOAT,!1,a?24:16,0),a&&Lights.length>0?gl.vertexAttribPointer(normalAttribute,3,gl.FLOAT,!1,24,12):pixel&&gl.vertexAttribPointer(widthAttribute,1,gl.FLOAT,!1,16,12),t.materialsBuffer=registerBuffer(new Int16Array(t.materialIndices),t.materialsBuffer,r),gl.vertexAttribPointer(materialAttribute,1,gl.SHORT,!1,2,0),e!=colorShader&&e!=transparentShader||(t.colorsBuffer=registerBuffer(new Uint8Array(t.colors),t.colorsBuffer,r),gl.vertexAttribPointer(colorAttribute,4,gl.UNSIGNED_BYTE,!0,0,0)),t.indicesBuffer=registerBuffer(indexExt?new Uint32Array(i):new Uint16Array(i),t.indicesBuffer,r,gl.ELEMENT_ARRAY_BUFFER),t.rendered=!0,gl.drawElements(a?wireframe?gl.LINES:t.type:gl.POINTS,i.length,indexExt?gl.UNSIGNED_INT:gl.UNSIGNED_SHORT,0)}class vertexBuffer{constructor(t){this.type=t||TRIANGLES,this.verticesBuffer=0,this.materialsBuffer=0,this.colorsBuffer=0,this.indicesBuffer=0,this.rendered=!1,this.partial=!1,this.clear()}clear(){this.vertices=[],this.materialIndices=[],this.colors=[],this.indices=[],this.nvertices=0,this.materials=[],this.materialTable=[]}vertex(t,e){return this.vertices.push(t[0]),this.vertices.push(t[1]),this.vertices.push(t[2]),this.vertices.push(e[0]),this.vertices.push(e[1]),this.vertices.push(e[2]),this.materialIndices.push(materialIndex),this.nvertices++}Vertex(t,e,i=[0,0,0,0]){return this.vertices.push(t[0]),this.vertices.push(t[1]),this.vertices.push(t[2]),this.vertices.push(e[0]),this.vertices.push(e[1]),this.vertices.push(e[2]),this.materialIndices.push(materialIndex),this.colors.push(i[0]),this.colors.push(i[1]),this.colors.push(i[2]),this.colors.push(i[3]),this.nvertices++}vertex0(t,e){return this.vertices.push(t[0]),this.vertices.push(t[1]),this.vertices.push(t[2]),this.vertices.push(e),this.materialIndices.push(materialIndex),this.nvertices++}iVertex(t,e,i,a=[0,0,0,0]){let r=6*t;this.vertices[r]=e[0],this.vertices[r+1]=e[1],this.vertices[r+2]=e[2],this.vertices[r+3]=i[0],this.vertices[r+4]=i[1],this.vertices[r+5]=i[2],this.materialIndices[t]=materialIndex;let n=4*t;this.colors[n]=a[0],this.colors[n+1]=a[1],this.colors[n+2]=a[2],this.colors[n+3]=a[3],this.indices.push(t)}append(t){append(this.vertices,t.vertices),append(this.materialIndices,t.materialIndices),append(this.colors,t.colors),appendOffset(this.indices,t.indices,this.nvertices),this.nvertices+=t.nvertices}}function append(t,e){let i=t.length,a=e.length;t.length+=a;for(let r=0;rthis.X&&(this.X=h),lthis.Y&&(this.Y=l)}return(this.X<-1.01||this.x>1.01||this.Y<-1.01||this.y>1.01)&&(this.Onscreen=!1,!0)}T(t){let e=this.c[0],i=this.c[1],a=this.c[2],r=t[0]-e,n=t[1]-i,s=t[2]-a;return[r*normMat[0]+n*normMat[3]+s*normMat[6]+e,r*normMat[1]+n*normMat[4]+s*normMat[7]+i,r*normMat[2]+n*normMat[5]+s*normMat[8]+a]}Tcorners(t,e){return[this.T(t),this.T([t[0],t[1],e[2]]),this.T([t[0],e[1],t[2]]),this.T([t[0],e[1],e[2]]),this.T([e[0],t[1],t[2]]),this.T([e[0],t[1],e[2]]),this.T([e[0],e[1],t[2]]),this.T(e)]}setMaterial(t,e){null==t.materialTable[this.MaterialIndex]&&(t.materials.length>=Nmaterials&&(t.partial=!0,e()),t.materialTable[this.MaterialIndex]=t.materials.length,t.materials.push(Materials[this.MaterialIndex])),materialIndex=t.materialTable[this.MaterialIndex]}render(){let t;if(this.setMaterialIndex(),0==this.CenterIndex?t=corners(this.Min,this.Max):(this.c=Centers[this.CenterIndex-1],t=this.Tcorners(this.Min,this.Max)),this.offscreen(t))return this.data.clear(),void this.notRendered();let e,i=this.controlpoints;if(0==this.CenterIndex){if(!remesh&&this.Onscreen)return void this.append();e=i}else{let t=i.length;e=Array(t);for(let a=0;a0&&this.append()}append(){this.transparent?transparentData.append(this.data):this.color?colorData.append(this.data):materialData.append(this.data)}notRendered(){this.transparent?transparentData.rendered=!1:this.color?colorData.rendered=!1:materialData.rendered=!1}Render(t,e,i,a,r,n,s,o,h,l,d,c,m,f,u,p,v){let g=this.Distance(t);if(g[0]0&&this.append()}Render3(t,e,i,a,r,n,s,o,h,l,d,c,m){if(this.Distance3(t)this.epsilon?r:abs2(r=bezierPP(t,e,i))>this.epsilon?r:bezierPPP(t,e,i,a)}sumdifferential(t,e,i,a,r,n,s){let o=this.differential(t,e,i,a),h=this.differential(t,r,n,s);return[o[0]+h[0],o[1]+h[1],o[2]+h[2]]}normal(t,e,i,a,r,n,s){let o=3*(r[0]-a[0]),h=3*(r[1]-a[1]),l=3*(r[2]-a[2]),d=3*(i[0]-a[0]),c=3*(i[1]-a[1]),m=3*(i[2]-a[2]),f=[h*m-l*c,l*d-o*m,o*c-h*d];if(abs2(f)>this.epsilon)return f;let u=[d,c,m],p=[o,h,l],v=bezierPP(a,i,e),g=bezierPP(a,r,n),x=cross(g,u),w=cross(p,v);if(abs2(f=[x[0]+w[0],x[1]+w[1],x[2]+w[2]])>this.epsilon)return f;let M=bezierPPP(a,i,e,t),b=bezierPPP(a,r,n,s);x=cross(p,M),w=cross(b,u);let S=cross(g,v);return abs2(f=[x[0]+w[0]+S[0],x[1]+w[1]+S[1],x[2]+w[2]+S[2]])>this.epsilon?f:(x=cross(b,v),w=cross(g,M),abs2(f=[x[0]+w[0],x[1]+w[1],x[2]+w[2]])>this.epsilon?f:cross(b,M))}}class BezierCurve extends Geometry{constructor(t,e,i,a,r){super(),this.controlpoints=t,this.Min=a,this.Max=r,this.CenterIndex=e,this.MaterialIndex=i}setMaterialIndex(){this.setMaterial(material1Data,drawMaterial1)}processLine(t){let e=t[0],i=t[1];if(!this.offscreen([e,i])){let t=[0,0,1];this.data.indices.push(this.data.vertex(e,t)),this.data.indices.push(this.data.vertex(i,t)),this.append()}}process(t){if(2==t.length)return this.processLine(t);let e=t[0],i=t[1],a=t[2],r=t[3],n=this.normal(bezierP(e,i),bezierPP(e,i,a)),s=this.normal(bezierP(a,r),bezierPP(r,a,i)),o=this.data.vertex(e,n),h=this.data.vertex(r,s);this.Render(t,o,h),this.data.indices.length>0&&this.append()}append(){material1Data.append(this.data)}notRendered(){material1Data.rendered=!1}Render(t,e,i){let a=t[0],r=t[1],n=t[2],s=t[3];if(Straightness(a,r,n,s)0?-1-materialIndex:1+materialIndex;for(let t=0,e=this.Indices.length;t1?e[1]:i;if(t&&0!=t.length||(t=i),this.Colors.length>0){let s=e.length>2?e[2]:i;s&&0!=s.length||(s=i);let o=this.Colors[s[0]],h=this.Colors[s[1]],l=this.Colors[s[2]];this.transparent|=o[3]+h[3]+l[3]<765,0==wireframe?(this.data.iVertex(i[0],a,this.Normals[t[0]],o),this.data.iVertex(i[1],r,this.Normals[t[1]],h),this.data.iVertex(i[2],n,this.Normals[t[2]],l)):(this.data.iVertex(i[0],a,this.Normals[t[0]],o),this.data.iVertex(i[1],r,this.Normals[t[1]],h),this.data.iVertex(i[1],r,this.Normals[t[1]],h),this.data.iVertex(i[2],n,this.Normals[t[2]],l),this.data.iVertex(i[2],n,this.Normals[t[2]],l),this.data.iVertex(i[0],a,this.Normals[t[0]],o))}else 0==wireframe?(this.data.iVertex(i[0],a,this.Normals[t[0]]),this.data.iVertex(i[1],r,this.Normals[t[1]]),this.data.iVertex(i[2],n,this.Normals[t[2]])):(this.data.iVertex(i[0],a,this.Normals[t[0]]),this.data.iVertex(i[1],r,this.Normals[t[1]]),this.data.iVertex(i[1],r,this.Normals[t[1]]),this.data.iVertex(i[2],n,this.Normals[t[2]]),this.data.iVertex(i[2],n,this.Normals[t[2]]),this.data.iVertex(i[0],a,this.Normals[t[0]]))}}this.data.nvertices=this.Positions.length,this.data.indices.length>0&&this.append()}append(){this.transparent?transparentData.append(this.data):triangleData.append(this.data)}notRendered(){this.transparent?transparentData.rendered=!1:triangleData.rendered=!1}}function home(){mat4.identity(rotMat),initProjection(),setProjection(),remesh=!0,draw()}let positionAttribute=0,normalAttribute=1,materialAttribute=2,colorAttribute=3,widthAttribute=4;function initShader(t=[]){let e=getShader(gl,vertex,gl.VERTEX_SHADER,t),i=getShader(gl,fragment,gl.FRAGMENT_SHADER,t),a=gl.createProgram();return gl.attachShader(a,e),gl.attachShader(a,i),gl.bindAttribLocation(a,positionAttribute,"position"),gl.bindAttribLocation(a,normalAttribute,"normal"),gl.bindAttribLocation(a,materialAttribute,"materialIndex"),gl.bindAttribLocation(a,colorAttribute,"color"),gl.bindAttribLocation(a,widthAttribute,"width"),gl.linkProgram(a),gl.getProgramParameter(a,gl.LINK_STATUS)||alert("Could not initialize shaders"),a}class Split3{constructor(t,e,i,a){this.m0=[.5*(t[0]+e[0]),.5*(t[1]+e[1]),.5*(t[2]+e[2])];let r=.5*(e[0]+i[0]),n=.5*(e[1]+i[1]),s=.5*(e[2]+i[2]);this.m2=[.5*(i[0]+a[0]),.5*(i[1]+a[1]),.5*(i[2]+a[2])],this.m3=[.5*(this.m0[0]+r),.5*(this.m0[1]+n),.5*(this.m0[2]+s)],this.m4=[.5*(r+this.m2[0]),.5*(n+this.m2[1]),.5*(s+this.m2[2])],this.m5=[.5*(this.m3[0]+this.m4[0]),.5*(this.m3[1]+this.m4[1]),.5*(this.m3[2]+this.m4[2])]}}function unit(t){let e=1/(Math.sqrt(t[0]*t[0]+t[1]*t[1]+t[2]*t[2])||1);return[t[0]*e,t[1]*e,t[2]*e]}function abs2(t){return t[0]*t[0]+t[1]*t[1]+t[2]*t[2]}function dot(t,e){return t[0]*e[0]+t[1]*e[1]+t[2]*e[2]}function cross(t,e){return[t[1]*e[2]-t[2]*e[1],t[2]*e[0]-t[0]*e[2],t[0]*e[1]-t[1]*e[0]]}function bezierP(t,e){return[e[0]-t[0],e[1]-t[1],e[2]-t[2]]}function bezierPP(t,e,i){return[3*(t[0]+i[0])-6*e[0],3*(t[1]+i[1])-6*e[1],3*(t[2]+i[2])-6*e[2]]}function bezierPPP(t,e,i,a){return[a[0]-t[0]+3*(e[0]-i[0]),a[1]-t[1]+3*(e[1]-i[1]),a[2]-t[2]+3*(e[2]-i[2])]}function bezierPh(t,e,i,a){return[i[0]+a[0]-t[0]-e[0],i[1]+a[1]-t[1]-e[1],i[2]+a[2]-t[2]-e[2]]}function bezierPPh(t,e,i,a){return[3*t[0]-5*e[0]+i[0]+a[0],3*t[1]-5*e[1]+i[1]+a[1],3*t[2]-5*e[2]+i[2]+a[2]]}function Straightness(t,e,i,a){let r=[third*(a[0]-t[0]),third*(a[1]-t[1]),third*(a[2]-t[2])];return Math.max(abs2([e[0]-r[0]-t[0],e[1]-r[1]-t[1],e[2]-r[2]-t[2]]),abs2([a[0]-r[0]-i[0],a[1]-r[1]-i[1],a[2]-r[2]-i[2]]))}function Flatness(t,e,i,a){let r=[e[0]-t[0],e[1]-t[1],e[2]-t[2]],n=[a[0]-i[0],a[1]-i[1],a[2]-i[2]];return Math.max(abs2(cross(r,unit(n))),abs2(cross(n,unit(r))))/9}function corners(t,e){return[t,[t[0],t[1],e[2]],[t[0],e[1],t[2]],[t[0],e[1],e[2]],[e[0],t[1],t[2]],[e[0],t[1],e[2]],[e[0],e[1],t[2]],e]}function minbound(t){return[Math.min(t[0][0],t[1][0],t[2][0],t[3][0],t[4][0],t[5][0],t[6][0],t[7][0]),Math.min(t[0][1],t[1][1],t[2][1],t[3][1],t[4][1],t[5][1],t[6][1],t[7][1]),Math.min(t[0][2],t[1][2],t[2][2],t[3][2],t[4][2],t[5][2],t[6][2],t[7][2])]}function maxbound(t){return[Math.max(t[0][0],t[1][0],t[2][0],t[3][0],t[4][0],t[5][0],t[6][0],t[7][0]),Math.max(t[0][1],t[1][1],t[2][1],t[3][1],t[4][1],t[5][1],t[6][1],t[7][1]),Math.max(t[0][2],t[1][2],t[2][2],t[3][2],t[4][2],t[5][2],t[6][2],t[7][2])]}function COBTarget(t,e){mat4.fromTranslation(T,[center.x,center.y,center.z]),mat4.invert(cjMatInv,T),mat4.multiply(t,e,cjMatInv),mat4.multiply(t,T,t)}function setUniforms(t,e){let i=e==pixelShader;gl.useProgram(e),gl.enableVertexAttribArray(positionAttribute),i&&gl.enableVertexAttribArray(widthAttribute);let a=!i&&Lights.length>0;if(a&&gl.enableVertexAttribArray(normalAttribute),gl.enableVertexAttribArray(materialAttribute),e.projViewMatUniform=gl.getUniformLocation(e,"projViewMat"),e.viewMatUniform=gl.getUniformLocation(e,"viewMat"),e.normMatUniform=gl.getUniformLocation(e,"normMat"),e!=colorShader&&e!=transparentShader||gl.enableVertexAttribArray(colorAttribute),a)for(let t=0;t=t&&(Zoom=t),Zoom!=lastzoom&&(remesh=!0),lastzoom=Zoom}function zoomImage(t){let e=zoomStep*halfCanvasHeight*t;const i=Math.log(.1*Number.MAX_VALUE)/Math.log(zoomFactor);Math.abs(e)1&&(denom=1/a,e*=denom,i*=denom),[e,i,Math.sqrt(Math.max(1-i*i-e*e,0))]}function arcball(t,e){let i=normMouse(t),a=normMouse(e),r=dot(i,a);return r>1?r=1:r<-1&&(r=-1),[Math.acos(r),unit(cross(i,a))]}function zoomScene(t,e,i,a){zoomImage(e-a)}const DRAGMODE_ROTATE=1,DRAGMODE_SHIFT=2,DRAGMODE_ZOOM=3,DRAGMODE_PAN=4;function processDrag(t,e,i,a=1){let r;switch(i){case DRAGMODE_ROTATE:r=rotateScene;break;case DRAGMODE_SHIFT:r=shiftScene;break;case DRAGMODE_ZOOM:r=zoomScene;break;case DRAGMODE_PAN:r=panScene;break;default:r=((t,e,i,a)=>{})}r((lastMouseX-halfCanvasWidth)/halfCanvasWidth,(lastMouseY-halfCanvasHeight)/halfCanvasHeight,(t-halfCanvasWidth)/halfCanvasWidth,(e-halfCanvasHeight)/halfCanvasHeight,a),lastMouseX=t,lastMouseY=e,setProjection(),draw()}let zoomEnabled=0;function enableZoom(){zoomEnabled=1,canvas.addEventListener("wheel",handleMouseWheel,!1)}function disableZoom(){zoomEnabled=0,canvas.removeEventListener("wheel",handleMouseWheel,!1)}function handleKey(t){if(zoomEnabled||enableZoom(),embedded&&zoomEnabled&&27==t.keyCode)return void disableZoom();let e=[];switch(t.key){case"x":e=[1,0,0];break;case"y":e=[0,1,0];break;case"z":e=[0,0,1];break;case"h":home();break;case"m":3==++wireframe&&(wireframe=0),2!=wireframe&&(embedded||deleteShaders(),initShaders()),remesh=!0,draw();break;case"+":case"=":case">":expand();break;case"-":case"_":case"<":shrink()}e.length>0&&(mat4.rotate(rotMat,rotMat,.1,e),updateViewMatrix(),draw())}function handleMouseWheel(t){t.preventDefault(),t.deltaY<0?Zoom*=zoomFactor:Zoom/=zoomFactor,capzoom(),setProjection(),draw()}function handleMouseMove(t){if(!mouseDownOrTouchActive)return;let e;processDrag(t.clientX,t.clientY,e=t.getModifierState("Control")?DRAGMODE_SHIFT:t.getModifierState("Shift")?DRAGMODE_ZOOM:t.getModifierState("Alt")?DRAGMODE_PAN:DRAGMODE_ROTATE)}let zooming=!1,swipe=!1,rotate=!1;function handleTouchMove(t){if(t.preventDefault(),zooming)return;let e=t.targetTouches;if(!pinch&&1==e.length&&touchId==e[0].identifier){let t=e[0].pageX,i=e[0].pageY,a=t-lastMouseX,r=i-lastMouseY,n=a*a+r*r<=shiftHoldDistance*shiftHoldDistance;if(n&&!swipe&&!rotate&&(new Date).getTime()-touchStartTime>shiftWaitTime&&(navigator.vibrate&&window.navigator.vibrate(vibrateTime),swipe=!0),swipe)processDrag(t,i,DRAGMODE_SHIFT);else if(!n){rotate=!0,processDrag(e[0].pageX,e[0].pageY,DRAGMODE_ROTATE,.5)}}if(pinch&&!swipe&&2==e.length&&touchId==e[0].identifier){let t=pinchDistance(e),i=t-pinchStart;zooming=!0,(i*=zoomPinchFactor)>zoomPinchCap&&(i=zoomPinchCap),i<-zoomPinchCap&&(i=-zoomPinchCap),zoomImage(i/size2),pinchStart=t,swipe=rotate=zooming=!1,setProjection(),draw()}}let pixelShader,materialShader,colorShader,transparentShader,zbuffer=[];function transformVertices(t){let e=viewMat[2],i=viewMat[6],a=viewMat[10];zbuffer.length=t.length;for(let r=0;r0)return drawBuffer(transparentData,transparentShader,t),void transparentData.clear();if(t.length>0){transformVertices(transparentData.vertices);let e=t.length/3,i=Array(e).fill().map((t,e)=>e);i.sort(function(e,i){let a=3*e;Ia=t[a],Ib=t[a+1],Ic=t[a+2];let r=3*i;return IA=t[r],IB=t[r+1],IC=t[r+2],zbuffer[Ia]+zbuffer[Ib]+zbuffer[Ic]maxViewportWidth&&(t=maxViewportWidth),e>maxViewportHeight&&(e=maxViewportHeight),shift.x*=t/canvasWidth,shift.y*=e/canvasHeight,canvasWidth=t,canvasHeight=e,setCanvas(),setViewport(),home()}function expand(){setsize(canvasWidth*resizeStep+.5,canvasHeight*resizeStep+.5)}function shrink(){setsize(Math.max(canvasWidth/resizeStep+.5,1),Math.max(canvasHeight/resizeStep+.5,1))}function webGLInit(){if(canvas=document.getElementById("Asymptote"),embedded=window.top.document!=document,initGL(),absolute&&!embedded)canvasWidth*=window.devicePixelRatio,canvasHeight*=window.devicePixelRatio;else{let t=canvasWidth/canvasHeight;canvasWidth=Math.max(window.innerWidth-windowTrim,windowTrim),canvasHeight=Math.max(window.innerHeight-windowTrim,windowTrim),!orthographic&&canvasWidths?unit(r):abs2(r=[2*i[0]-e[0]-a[0],2*i[1]-e[1]-a[1],2*i[2]-e[2]-a[2]])>s?unit(r):[a[0]-t[0]+3*(e[0]-i[0]),a[1]-t[1]+3*(e[1]-i[1]),a[2]-t[2]+3*(e[2]-i[2])]}let n=[a[0]-t[0]+3*(e[0]-i[0]),a[1]-t[1]+3*(e[1]-i[1]),a[2]-t[2]+3*(e[2]-i[2])],o=[2*(t[0]+i[0])-4*e[0],2*(t[1]+i[1])-4*e[1],2*(t[2]+i[2])-4*e[2]],h=[e[0]-t[0],e[1]-t[1],e[2]-t[2]],l=r*r,d=[n[0]*l+o[0]*r+h[0],n[1]*l+o[1]*r+h[1],n[2]*l+o[2]*r+h[2]];return abs2(d)>s?unit(d):abs2(d=[n[0]*(l=2*r)+o[0],n[1]*l+o[1],n[2]*l+o[2]])>s?unit(d):unit(n)}let h=Array(r.length),l=[e[0]-t[0],e[1]-t[1],e[2]-t[2]];abs2(l)i?unit(e):abs2(e=cross(t,[0,0,1]))>i?unit(e):[1,0,0]}(l=unit(l));h[0]=new n(t,d,l);for(let s=1;sgl.getUniformLocation(t,"Materials["+e+"]."+i);gl.uniform4fv(i("diffuse"),new Float32Array(this.diffuse)),gl.uniform4fv(i("emissive"),new Float32Array(this.emissive)),gl.uniform4fv(i("specular"),new Float32Array(this.specular)),gl.uniform4f(i("parameters"),this.shininess,this.metallic,this.fresnel0,0)}}let indexExt,TRIANGLES,material0Data,material1Data,materialData,colorData,transparentData,triangleData,materialIndex,enumPointLight=1,enumDirectionalLight=2;class Light{constructor(t,e){this.direction=t,this.color=e}setUniform(t,e){let i=i=>gl.getUniformLocation(t,"Lights["+e+"]."+i);gl.uniform3fv(i("direction"),new Float32Array(this.direction)),gl.uniform3fv(i("color"),new Float32Array(this.color))}}function initShaders(){let t=gl.getParameter(gl.MAX_VERTEX_UNIFORM_VECTORS);maxMaterials=Math.floor((t-14)/4),Nmaterials=Math.min(Math.max(Nmaterials,Materials.length),maxMaterials),pixelShader=initShader(["WIDTH"]),materialShader=initShader(["NORMAL"]),colorShader=initShader(["NORMAL","COLOR"]),transparentShader=initShader(["NORMAL","COLOR","TRANSPARENT"])}function deleteShaders(){gl.deleteProgram(transparentShader),gl.deleteProgram(colorShader),gl.deleteProgram(materialShader),gl.deleteProgram(pixelShader)}function noGL(){gl||alert("Could not initialize WebGL")}function saveAttributes(){let t=window.top.document.asygl[alpha];t.gl=gl,t.nlights=Lights.length,t.Nmaterials=Nmaterials,t.maxMaterials=maxMaterials,t.pixelShader=pixelShader,t.materialShader=materialShader,t.colorShader=colorShader,t.transparentShader=transparentShader}function restoreAttributes(){let t=window.top.document.asygl[alpha];gl=t.gl,nlights=t.nlights,Nmaterials=t.Nmaterials,maxMaterials=t.maxMaterials,pixelShader=t.pixelShader,materialShader=t.materialShader,colorShader=t.colorShader,transparentShader=t.transparentShader}function initGL(){if(alpha=Background[3]<1,embedded){let t=window.top.document;null==t.asygl&&(t.asygl=Array(2)),context=canvas.getContext("2d"),offscreen=t.offscreen,offscreen||(offscreen=t.createElement("canvas"),t.offscreen=offscreen),t.asygl[alpha]&&t.asygl[alpha].gl?(restoreAttributes(),(Lights.length!=nlights||Math.min(Materials.length,maxMaterials)>Nmaterials)&&(initShaders(),saveAttributes())):(gl=offscreen.getContext("webgl",{alpha:alpha}),gl||noGL(),initShaders(),t.asygl[alpha]={},saveAttributes())}else gl=canvas.getContext("webgl",{alpha:alpha}),gl||noGL(),initShaders();indexExt=gl.getExtension("OES_element_index_uint"),TRIANGLES=gl.TRIANGLES,material0Data=new vertexBuffer(gl.POINTS),material1Data=new vertexBuffer(gl.LINES),materialData=new vertexBuffer,colorData=new vertexBuffer,transparentData=new vertexBuffer,triangleData=new vertexBuffer}function getShader(t,e,i,a=[]){let r=`#version 100\n#ifdef GL_FRAGMENT_PRECISION_HIGH\n precision highp float;\n#else\n precision mediump float;\n#endif\n #define nlights ${0==wireframe?Lights.length:0}\n\n const int Nlights=${Math.max(Lights.length,1)};\n\n #define Nmaterials ${Nmaterials}\n`;orthographic&&(r+="#define ORTHOGRAPHIC\n"),a.forEach(t=>r+="#define "+t+"\n");let n=t.createShader(i);return t.shaderSource(n,r+e),t.compileShader(n),t.getShaderParameter(n,t.COMPILE_STATUS)?n:(alert(t.getShaderInfoLog(n)),null)}function registerBuffer(t,e,i,a=gl.ARRAY_BUFFER){return t.length>0&&(0==e&&(e=gl.createBuffer(),i=!0),gl.bindBuffer(a,e),i&&gl.bufferData(a,t,gl.STATIC_DRAW)),e}function drawBuffer(t,e,i=t.indices){if(0==t.indices.length)return;let a=e!=pixelShader;setUniforms(t,e);let r=remesh||t.partial||!t.rendered;t.verticesBuffer=registerBuffer(new Float32Array(t.vertices),t.verticesBuffer,r),gl.vertexAttribPointer(positionAttribute,3,gl.FLOAT,!1,a?24:16,0),a&&Lights.length>0?gl.vertexAttribPointer(normalAttribute,3,gl.FLOAT,!1,24,12):pixel&&gl.vertexAttribPointer(widthAttribute,1,gl.FLOAT,!1,16,12),t.materialsBuffer=registerBuffer(new Int16Array(t.materialIndices),t.materialsBuffer,r),gl.vertexAttribPointer(materialAttribute,1,gl.SHORT,!1,2,0),e!=colorShader&&e!=transparentShader||(t.colorsBuffer=registerBuffer(new Uint8Array(t.colors),t.colorsBuffer,r),gl.vertexAttribPointer(colorAttribute,4,gl.UNSIGNED_BYTE,!0,0,0)),t.indicesBuffer=registerBuffer(indexExt?new Uint32Array(i):new Uint16Array(i),t.indicesBuffer,r,gl.ELEMENT_ARRAY_BUFFER),t.rendered=!0,gl.drawElements(a?wireframe?gl.LINES:t.type:gl.POINTS,i.length,indexExt?gl.UNSIGNED_INT:gl.UNSIGNED_SHORT,0)}class vertexBuffer{constructor(t){this.type=t||TRIANGLES,this.verticesBuffer=0,this.materialsBuffer=0,this.colorsBuffer=0,this.indicesBuffer=0,this.rendered=!1,this.partial=!1,this.clear()}clear(){this.vertices=[],this.materialIndices=[],this.colors=[],this.indices=[],this.nvertices=0,this.materials=[],this.materialTable=[]}vertex(t,e){return this.vertices.push(t[0]),this.vertices.push(t[1]),this.vertices.push(t[2]),this.vertices.push(e[0]),this.vertices.push(e[1]),this.vertices.push(e[2]),this.materialIndices.push(materialIndex),this.nvertices++}Vertex(t,e,i=[0,0,0,0]){return this.vertices.push(t[0]),this.vertices.push(t[1]),this.vertices.push(t[2]),this.vertices.push(e[0]),this.vertices.push(e[1]),this.vertices.push(e[2]),this.materialIndices.push(materialIndex),this.colors.push(i[0]),this.colors.push(i[1]),this.colors.push(i[2]),this.colors.push(i[3]),this.nvertices++}vertex0(t,e){return this.vertices.push(t[0]),this.vertices.push(t[1]),this.vertices.push(t[2]),this.vertices.push(e),this.materialIndices.push(materialIndex),this.nvertices++}iVertex(t,e,i,a=[0,0,0,0]){let r=6*t;this.vertices[r]=e[0],this.vertices[r+1]=e[1],this.vertices[r+2]=e[2],this.vertices[r+3]=i[0],this.vertices[r+4]=i[1],this.vertices[r+5]=i[2],this.materialIndices[t]=materialIndex;let n=4*t;this.colors[n]=a[0],this.colors[n+1]=a[1],this.colors[n+2]=a[2],this.colors[n+3]=a[3],this.indices.push(t)}append(t){append(this.vertices,t.vertices),append(this.materialIndices,t.materialIndices),append(this.colors,t.colors),appendOffset(this.indices,t.indices,this.nvertices),this.nvertices+=t.nvertices}}function append(t,e){let i=t.length,a=e.length;t.length+=a;for(let r=0;rthis.X&&(this.X=h),lthis.Y&&(this.Y=l)}return(this.X<-1.01||this.x>1.01||this.Y<-1.01||this.y>1.01)&&(this.Onscreen=!1,!0)}T(t){let e=this.c[0],i=this.c[1],a=this.c[2],r=t[0]-e,n=t[1]-i,s=t[2]-a;return[r*normMat[0]+n*normMat[3]+s*normMat[6]+e,r*normMat[1]+n*normMat[4]+s*normMat[7]+i,r*normMat[2]+n*normMat[5]+s*normMat[8]+a]}Tcorners(t,e){return[this.T(t),this.T([t[0],t[1],e[2]]),this.T([t[0],e[1],t[2]]),this.T([t[0],e[1],e[2]]),this.T([e[0],t[1],t[2]]),this.T([e[0],t[1],e[2]]),this.T([e[0],e[1],t[2]]),this.T(e)]}setMaterial(t,e){null==t.materialTable[this.MaterialIndex]&&(t.materials.length>=Nmaterials&&(t.partial=!0,e()),t.materialTable[this.MaterialIndex]=t.materials.length,t.materials.push(Materials[this.MaterialIndex])),materialIndex=t.materialTable[this.MaterialIndex]}render(){let t;if(this.setMaterialIndex(),0==this.CenterIndex?t=corners(this.Min,this.Max):(this.c=Centers[this.CenterIndex-1],t=this.Tcorners(this.Min,this.Max)),this.offscreen(t))return this.data.clear(),void this.notRendered();let e,i=this.controlpoints;if(0==this.CenterIndex){if(!remesh&&this.Onscreen)return void this.append();e=i}else{let t=i.length;e=Array(t);for(let a=0;a0&&this.append()}append(){this.transparent?transparentData.append(this.data):this.color?colorData.append(this.data):materialData.append(this.data)}notRendered(){this.transparent?transparentData.rendered=!1:this.color?colorData.rendered=!1:materialData.rendered=!1}Render(t,e,i,a,r,n,s,o,h,l,c,d,m,f,u,p,v){let g=this.Distance(t);if(g[0]0&&this.append()}Render3(t,e,i,a,r,n,s,o,h,l,c,d,m){if(this.Distance3(t)this.epsilon?r:(r=bezierPP(t,e,i),abs2(r)>this.epsilon?r:bezierPPP(t,e,i,a))}sumdifferential(t,e,i,a,r,n,s){let o=this.differential(t,e,i,a),h=this.differential(t,r,n,s);return[o[0]+h[0],o[1]+h[1],o[2]+h[2]]}normal(t,e,i,a,r,n,s){let o=3*(r[0]-a[0]),h=3*(r[1]-a[1]),l=3*(r[2]-a[2]),c=3*(i[0]-a[0]),d=3*(i[1]-a[1]),m=3*(i[2]-a[2]),f=[h*m-l*d,l*c-o*m,o*d-h*c];if(abs2(f)>this.epsilon)return f;let u=[c,d,m],p=[o,h,l],v=bezierPP(a,i,e),g=bezierPP(a,r,n),x=cross(g,u),w=cross(p,v);if(f=[x[0]+w[0],x[1]+w[1],x[2]+w[2]],abs2(f)>this.epsilon)return f;let M=bezierPPP(a,i,e,t),b=bezierPPP(a,r,n,s);x=cross(p,M),w=cross(b,u);let S=cross(g,v);return f=[x[0]+w[0]+S[0],x[1]+w[1]+S[1],x[2]+w[2]+S[2]],abs2(f)>this.epsilon?f:(x=cross(b,v),w=cross(g,M),f=[x[0]+w[0],x[1]+w[1],x[2]+w[2]],abs2(f)>this.epsilon?f:cross(b,M))}}class BezierCurve extends Geometry{constructor(t,e,i,a,r){super(),this.controlpoints=t,this.Min=a,this.Max=r,this.CenterIndex=e,this.MaterialIndex=i}setMaterialIndex(){this.setMaterial(material1Data,drawMaterial1)}processLine(t){let e=t[0],i=t[1];if(!this.offscreen([e,i])){let t=[0,0,1];this.data.indices.push(this.data.vertex(e,t)),this.data.indices.push(this.data.vertex(i,t)),this.append()}}process(t){if(2==t.length)return this.processLine(t);let e=t[0],i=t[1],a=t[2],r=t[3],n=this.normal(bezierP(e,i),bezierPP(e,i,a)),s=this.normal(bezierP(a,r),bezierPP(r,a,i)),o=this.data.vertex(e,n),h=this.data.vertex(r,s);this.Render(t,o,h),this.data.indices.length>0&&this.append()}append(){material1Data.append(this.data)}notRendered(){material1Data.rendered=!1}Render(t,e,i){let a=t[0],r=t[1],n=t[2],s=t[3];if(Straightness(a,r,n,s)0?-1-materialIndex:1+materialIndex;for(let t=0,e=this.Indices.length;t1?e[1]:i;if(t&&0!=t.length||(t=i),this.Colors.length>0){let s=e.length>2?e[2]:i;s&&0!=s.length||(s=i);let o=this.Colors[s[0]],h=this.Colors[s[1]],l=this.Colors[s[2]];this.transparent|=o[3]+h[3]+l[3]<765,0==wireframe?(this.data.iVertex(i[0],a,this.Normals[t[0]],o),this.data.iVertex(i[1],r,this.Normals[t[1]],h),this.data.iVertex(i[2],n,this.Normals[t[2]],l)):(this.data.iVertex(i[0],a,this.Normals[t[0]],o),this.data.iVertex(i[1],r,this.Normals[t[1]],h),this.data.iVertex(i[1],r,this.Normals[t[1]],h),this.data.iVertex(i[2],n,this.Normals[t[2]],l),this.data.iVertex(i[2],n,this.Normals[t[2]],l),this.data.iVertex(i[0],a,this.Normals[t[0]],o))}else 0==wireframe?(this.data.iVertex(i[0],a,this.Normals[t[0]]),this.data.iVertex(i[1],r,this.Normals[t[1]]),this.data.iVertex(i[2],n,this.Normals[t[2]])):(this.data.iVertex(i[0],a,this.Normals[t[0]]),this.data.iVertex(i[1],r,this.Normals[t[1]]),this.data.iVertex(i[1],r,this.Normals[t[1]]),this.data.iVertex(i[2],n,this.Normals[t[2]]),this.data.iVertex(i[2],n,this.Normals[t[2]]),this.data.iVertex(i[0],a,this.Normals[t[0]]))}}this.data.nvertices=this.Positions.length,this.data.indices.length>0&&this.append()}append(){this.transparent?transparentData.append(this.data):triangleData.append(this.data)}notRendered(){this.transparent?transparentData.rendered=!1:triangleData.rendered=!1}}function redraw(){initProjection(),setProjection(),remesh=!0,draw()}function home(){mat4.identity(rotMat),redraw()}let positionAttribute=0,normalAttribute=1,materialAttribute=2,colorAttribute=3,widthAttribute=4;function initShader(t=[]){let e=getShader(gl,vertex,gl.VERTEX_SHADER,t),i=getShader(gl,fragment,gl.FRAGMENT_SHADER,t),a=gl.createProgram();return gl.attachShader(a,e),gl.attachShader(a,i),gl.bindAttribLocation(a,positionAttribute,"position"),gl.bindAttribLocation(a,normalAttribute,"normal"),gl.bindAttribLocation(a,materialAttribute,"materialIndex"),gl.bindAttribLocation(a,colorAttribute,"color"),gl.bindAttribLocation(a,widthAttribute,"width"),gl.linkProgram(a),gl.getProgramParameter(a,gl.LINK_STATUS)||alert("Could not initialize shaders"),a}class Split3{constructor(t,e,i,a){this.m0=[.5*(t[0]+e[0]),.5*(t[1]+e[1]),.5*(t[2]+e[2])];let r=.5*(e[0]+i[0]),n=.5*(e[1]+i[1]),s=.5*(e[2]+i[2]);this.m2=[.5*(i[0]+a[0]),.5*(i[1]+a[1]),.5*(i[2]+a[2])],this.m3=[.5*(this.m0[0]+r),.5*(this.m0[1]+n),.5*(this.m0[2]+s)],this.m4=[.5*(r+this.m2[0]),.5*(n+this.m2[1]),.5*(s+this.m2[2])],this.m5=[.5*(this.m3[0]+this.m4[0]),.5*(this.m3[1]+this.m4[1]),.5*(this.m3[2]+this.m4[2])]}}function unit(t){let e=1/(Math.sqrt(t[0]*t[0]+t[1]*t[1]+t[2]*t[2])||1);return[t[0]*e,t[1]*e,t[2]*e]}function abs2(t){return t[0]*t[0]+t[1]*t[1]+t[2]*t[2]}function dot(t,e){return t[0]*e[0]+t[1]*e[1]+t[2]*e[2]}function cross(t,e){return[t[1]*e[2]-t[2]*e[1],t[2]*e[0]-t[0]*e[2],t[0]*e[1]-t[1]*e[0]]}function bezierP(t,e){return[e[0]-t[0],e[1]-t[1],e[2]-t[2]]}function bezierPP(t,e,i){return[3*(t[0]+i[0])-6*e[0],3*(t[1]+i[1])-6*e[1],3*(t[2]+i[2])-6*e[2]]}function bezierPPP(t,e,i,a){return[a[0]-t[0]+3*(e[0]-i[0]),a[1]-t[1]+3*(e[1]-i[1]),a[2]-t[2]+3*(e[2]-i[2])]}function bezierPh(t,e,i,a){return[i[0]+a[0]-t[0]-e[0],i[1]+a[1]-t[1]-e[1],i[2]+a[2]-t[2]-e[2]]}function bezierPPh(t,e,i,a){return[3*t[0]-5*e[0]+i[0]+a[0],3*t[1]-5*e[1]+i[1]+a[1],3*t[2]-5*e[2]+i[2]+a[2]]}function Straightness(t,e,i,a){let r=[third*(a[0]-t[0]),third*(a[1]-t[1]),third*(a[2]-t[2])];return Math.max(abs2([e[0]-r[0]-t[0],e[1]-r[1]-t[1],e[2]-r[2]-t[2]]),abs2([a[0]-r[0]-i[0],a[1]-r[1]-i[1],a[2]-r[2]-i[2]]))}function Flatness(t,e,i,a){let r=[e[0]-t[0],e[1]-t[1],e[2]-t[2]],n=[a[0]-i[0],a[1]-i[1],a[2]-i[2]];return Math.max(abs2(cross(r,unit(n))),abs2(cross(n,unit(r))))/9}function corners(t,e){return[t,[t[0],t[1],e[2]],[t[0],e[1],t[2]],[t[0],e[1],e[2]],[e[0],t[1],t[2]],[e[0],t[1],e[2]],[e[0],e[1],t[2]],e]}function minbound(t){return[Math.min(t[0][0],t[1][0],t[2][0],t[3][0],t[4][0],t[5][0],t[6][0],t[7][0]),Math.min(t[0][1],t[1][1],t[2][1],t[3][1],t[4][1],t[5][1],t[6][1],t[7][1]),Math.min(t[0][2],t[1][2],t[2][2],t[3][2],t[4][2],t[5][2],t[6][2],t[7][2])]}function maxbound(t){return[Math.max(t[0][0],t[1][0],t[2][0],t[3][0],t[4][0],t[5][0],t[6][0],t[7][0]),Math.max(t[0][1],t[1][1],t[2][1],t[3][1],t[4][1],t[5][1],t[6][1],t[7][1]),Math.max(t[0][2],t[1][2],t[2][2],t[3][2],t[4][2],t[5][2],t[6][2],t[7][2])]}function COBTarget(t,e){mat4.fromTranslation(T,[center.x,center.y,center.z]),mat4.invert(cjMatInv,T),mat4.multiply(t,e,cjMatInv),mat4.multiply(t,T,t)}function setUniforms(t,e){let i=e==pixelShader;gl.useProgram(e),gl.enableVertexAttribArray(positionAttribute),i&&gl.enableVertexAttribArray(widthAttribute);let a=!i&&Lights.length>0;if(a&&gl.enableVertexAttribArray(normalAttribute),gl.enableVertexAttribArray(materialAttribute),e.projViewMatUniform=gl.getUniformLocation(e,"projViewMat"),e.viewMatUniform=gl.getUniformLocation(e,"viewMat"),e.normMatUniform=gl.getUniformLocation(e,"normMat"),e!=colorShader&&e!=transparentShader||gl.enableVertexAttribArray(colorAttribute),a)for(let t=0;t=t&&(Zoom=t),(zoomRemeshFactor*ZoomzoomRemeshFactor*lastZoom)&&(remesh=!0,lastZoom=Zoom)}function zoomImage(t){let e=zoomStep*halfCanvasHeight*t;const i=Math.log(.1*Number.MAX_VALUE)/Math.log(zoomFactor);Math.abs(e)1&&(denom=1/a,e*=denom,i*=denom),[e,i,Math.sqrt(Math.max(1-i*i-e*e,0))]}function arcball(t,e){let i=normMouse(t),a=normMouse(e),r=dot(i,a);return[r>1?0:r<-1?pi:Math.acos(r),unit(cross(i,a))]}function zoomScene(t,e,i,a){zoomImage(e-a)}const DRAGMODE_ROTATE=1,DRAGMODE_SHIFT=2,DRAGMODE_ZOOM=3,DRAGMODE_PAN=4;function processDrag(t,e,i,a=1){let r;switch(i){case 1:r=rotateScene;break;case 2:r=shiftScene;break;case 3:r=zoomScene;break;case 4:r=panScene;break;default:r=(t,e,i,a)=>{}}r((lastMouseX-halfCanvasWidth)/halfCanvasWidth,(lastMouseY-halfCanvasHeight)/halfCanvasHeight,(t-halfCanvasWidth)/halfCanvasWidth,(e-halfCanvasHeight)/halfCanvasHeight,a),lastMouseX=t,lastMouseY=e,setProjection(),draw()}let zoomEnabled=0;function enableZoom(){zoomEnabled=1,canvas.addEventListener("wheel",handleMouseWheel,!1)}function disableZoom(){zoomEnabled=0,canvas.removeEventListener("wheel",handleMouseWheel,!1)}function handleKey(t){if(zoomEnabled||enableZoom(),embedded&&zoomEnabled&&27==t.keyCode)return void disableZoom();let e=[];switch(t.key){case"x":e=[1,0,0];break;case"y":e=[0,1,0];break;case"z":e=[0,0,1];break;case"h":home();break;case"m":++wireframe,3==wireframe&&(wireframe=0),2!=wireframe&&(embedded||deleteShaders(),initShaders()),remesh=!0,draw();break;case"+":case"=":case">":expand();break;case"-":case"_":case"<":shrink()}e.length>0&&(mat4.rotate(rotMat,rotMat,.1,e),updateViewMatrix(),draw())}function setZoom(){capzoom(),setProjection(),draw()}function handleMouseWheel(t){t.preventDefault(),t.deltaY<0?Zoom*=zoomFactor:Zoom/=zoomFactor,setZoom()}function handleMouseMove(t){if(!mouseDownOrTouchActive)return;let e,i=t.clientX,a=t.clientY;e=t.getModifierState("Control")?2:t.getModifierState("Shift")?3:t.getModifierState("Alt")?4:1,processDrag(i,a,e)}let zooming=!1,swipe=!1,rotate=!1;function handleTouchMove(t){if(t.preventDefault(),zooming)return;let e=t.targetTouches;if(!pinch&&1==e.length&&touchId==e[0].identifier){let t=e[0].pageX,i=e[0].pageY,a=t-lastMouseX,r=i-lastMouseY,n=a*a+r*r<=shiftHoldDistance*shiftHoldDistance;if(n&&!swipe&&!rotate&&(new Date).getTime()-touchStartTime>shiftWaitTime&&(navigator.vibrate&&window.navigator.vibrate(vibrateTime),swipe=!0),swipe)processDrag(t,i,2);else if(!n){rotate=!0,processDrag(e[0].pageX,e[0].pageY,1,.5)}}if(pinch&&!swipe&&2==e.length&&touchId==e[0].identifier){let t=pinchDistance(e),i=t-pinchStart;zooming=!0,i*=zoomPinchFactor,i>zoomPinchCap&&(i=zoomPinchCap),i<-zoomPinchCap&&(i=-zoomPinchCap),zoomImage(i/size2),pinchStart=t,swipe=rotate=zooming=!1,setProjection(),draw()}}let pixelShader,materialShader,colorShader,transparentShader,zbuffer=[];function transformVertices(t){let e=viewMat[2],i=viewMat[6],a=viewMat[10];zbuffer.length=t.length;for(let r=0;r0)return drawBuffer(transparentData,transparentShader,t),void transparentData.clear();if(t.length>0){transformVertices(transparentData.vertices);let e=t.length/3,i=Array(e).fill().map((t,e)=>e);i.sort((function(e,i){let a=3*e;Ia=t[a],Ib=t[a+1],Ic=t[a+2];let r=3*i;return IA=t[r],IB=t[r+1],IC=t[r+2],zbuffer[Ia]+zbuffer[Ib]+zbuffer[Ic]maxViewportWidth&&(t=maxViewportWidth),e>maxViewportHeight&&(e=maxViewportHeight),shift.x*=t/canvasWidth,shift.y*=e/canvasHeight,canvasWidth=t,canvasHeight=e,setCanvas(),setViewport(),setProjection(),remesh=!0}function resize(){if(zoom0=Zoom0,absolute&&!embedded)canvasWidth=canvasWidth0*window.devicePixelRatio,canvasHeight=canvasHeight0*window.devicePixelRatio;else{let t=canvasWidth0/canvasHeight0;canvasWidth=Math.max(window.innerWidth-10,10),canvasHeight=Math.max(window.innerHeight-10,10),!orthographic&&canvasWidths?unit(r):(r=[2*i[0]-e[0]-a[0],2*i[1]-e[1]-a[1],2*i[2]-e[2]-a[2]],abs2(r)>s?unit(r):[a[0]-t[0]+3*(e[0]-i[0]),a[1]-t[1]+3*(e[1]-i[1]),a[2]-t[2]+3*(e[2]-i[2])])}let n=[a[0]-t[0]+3*(e[0]-i[0]),a[1]-t[1]+3*(e[1]-i[1]),a[2]-t[2]+3*(e[2]-i[2])],o=[2*(t[0]+i[0])-4*e[0],2*(t[1]+i[1])-4*e[1],2*(t[2]+i[2])-4*e[2]],h=[e[0]-t[0],e[1]-t[1],e[2]-t[2]],l=r*r,c=[n[0]*l+o[0]*r+h[0],n[1]*l+o[1]*r+h[1],n[2]*l+o[2]*r+h[2]];return abs2(c)>s?unit(c):(l=2*r,c=[n[0]*l+o[0],n[1]*l+o[1],n[2]*l+o[2]],abs2(c)>s?unit(c):unit(n))}let h=Array(r.length),l=[e[0]-t[0],e[1]-t[1],e[2]-t[2]];abs2(l)i?unit(e):(e=cross(t,[0,0,1]),abs2(e)>i?unit(e):[1,0,0])}(l);h[0]=new n(t,c,l);for(let s=1;s +template inline T max(T a, T b) { return (a > b) ? a : b; @@ -32,7 +32,7 @@ struct bbox { double bottom; double right; double top; - + // Start bbox about the origin bbox() : empty(true), left(0.0), bottom(0.0), right(0.0), top(0.0) @@ -54,7 +54,7 @@ struct bbox { bool nonempty() const { return !empty; } - + // Add a point to a bbox bbox add(const pair& z) { @@ -67,9 +67,9 @@ struct bbox { } else { if (x < left) - left = x; + left = x; else if (x > right) - right = x; + right = x; if (y < bottom) bottom = y; else if (y > top) @@ -84,9 +84,9 @@ struct bbox { { double x = z.getx(), y = z.gety(); if (x < left) - left = x; + left = x; else if (x > right) - right = x; + right = x; if (y < bottom) bottom = y; else if (y > top) @@ -99,11 +99,11 @@ struct bbox { double x = z.getx(), y = z.gety(); if (x < left) { - left = x; + left = x; times.left = t; } else if (x > right) { - right = x; + right = x; times.right = t; } if (y < bottom) { @@ -170,34 +170,34 @@ struct bbox { right = min(right, b.right); bottom = max(bottom, b.bottom); top = min(top, b.top); - if(left > right || bottom > top) + if(left > right || bottom > top) *this=bbox(); } - + void shift(const pair& p) { left += p.getx(); right += p.getx(); bottom += p.gety(); top += p.gety(); } - + pair Min() const { return pair(left,bottom); } - + pair Max() const { return pair(right,top); } - + double diameter() { return (Max()-Min()).length(); } - + bbox LowRes() const { return bbox(floor(left),floor(bottom),ceil(right),ceil(top)); } - + friend ostream& operator<< (ostream& out, const bbox& b) { out << b.left << " " << b.bottom << " " << b.right << " " << b.top; diff --git a/graphics/asymptote/bbox3.h b/graphics/asymptote/bbox3.h index aa50251637..e2428f8c00 100644 --- a/graphics/asymptote/bbox3.h +++ b/graphics/asymptote/bbox3.h @@ -25,7 +25,7 @@ struct bbox3 { double right; double top; double far; - + // Start bbox3 about the origin bbox3() : empty(true), left(0.0), bottom(0.0), near(0.0), @@ -60,7 +60,7 @@ struct bbox3 { right(M.getx()), top(M.gety()), far(M.getz()) { } - + // Add a point to a bbox3 void add(const triple& v) { @@ -77,9 +77,9 @@ struct bbox3 { } else { if(x < left) - left = x; + left = x; else if(x > right) - right = x; + right = x; if(y < bottom) bottom = y; else if(y > top) @@ -95,9 +95,9 @@ struct bbox3 { void addnonempty(double x, double y, double z) { if(x < left) - left = x; + left = x; else if(x > right) - right = x; + right = x; if(y < bottom) bottom = y; else if(y > top) @@ -113,9 +113,9 @@ struct bbox3 { { double x=v.getx(); if(x < left) - left = x; + left = x; else if(x > right) - right = x; + right = x; double y=v.gety(); if(y < bottom) bottom = y; @@ -135,11 +135,11 @@ struct bbox3 { double x = v.getx(), y = v.gety(), z = v.getz(); if(x < left) { - left = x; + left = x; times.left = t; } else if(x > right) { - right = x; + right = x; times.right = t; } if(y < bottom) { @@ -169,25 +169,25 @@ struct bbox3 { triple Min() const { return triple(left,bottom,near); } - + triple Max() const { return triple(right,top,far); } - + pair Min2() const { return pair(left,bottom); } - + pair Max2() const { return pair(right,top); } - + friend ostream& operator << (ostream& out, const bbox3& b) { out << "Min " << b.Min() << " Max " << b.Max(); return out; } - + }; } // namespace camp diff --git a/graphics/asymptote/beziercurve.cc b/graphics/asymptote/beziercurve.cc index 9a5eee79f2..f3a675ce9c 100644 --- a/graphics/asymptote/beziercurve.cc +++ b/graphics/asymptote/beziercurve.cc @@ -16,7 +16,7 @@ void BezierCurve::init(double res) { this->res=res; res2=res*res; - + MaterialIndex=materialIndex; } @@ -25,7 +25,7 @@ inline triple normal(triple bP, triple bPP) return dot(bP,bP)*bPP-dot(bP,bPP)*bP; } -void BezierCurve::render(const triple *p, bool straight) +void BezierCurve::render(const triple *p, bool straight) { triple p0=p[0]; triple p3=p[3]; @@ -52,7 +52,7 @@ void BezierCurve::render(const triple *p, bool straight) render(p,i0,i3); append(); } - + // Use a uniform partition to draw a Bezier curve. // p is an array of 4 triples representing the control points. // Ii are the vertex indices. @@ -77,13 +77,13 @@ void BezierCurve::render(const triple *p, GLuint I0, GLuint I1) triple m3=0.5*(m0+m1); triple m4=0.5*(m1+m2); triple m5=0.5*(m3+m4); - + triple s0[]={p0,m0,m3,m5}; triple s1[]={m5,m4,m2,p3}; - + triple n0=normal(bezierPh(p0,p1,p2,p3),bezierPPh(p0,p1,p2,p3)); GLuint i0=data.vertex(m5,n0); - + render(s0,I0,i0); render(s1,i0,I1); } diff --git a/graphics/asymptote/beziercurve.h b/graphics/asymptote/beziercurve.h index c05e939346..833da4db27 100644 --- a/graphics/asymptote/beziercurve.h +++ b/graphics/asymptote/beziercurve.h @@ -22,9 +22,9 @@ struct BezierCurve vertexBuffer data; double res,res2; bool Onscreen; - + void init(double res); - + // Approximate bounds by bounding box of control polyhedron. bool offscreen(size_t n, const triple *v) { if(bbox2(n,v).offscreen()) { @@ -36,11 +36,11 @@ struct BezierCurve void render(const triple *p, bool straight); void render(const triple *p, GLuint I0, GLuint I1); - + void append() { material1Data.append(data); } - + void notRendered() { material1Data.rendered=false; } @@ -52,24 +52,24 @@ struct BezierCurve init(pixel*ratio); render(g,straight); } - + }; struct Pixel { vertexBuffer data; - + void append() { material0Data.append0(data); } - + void queue(const triple& p, double width) { data.clear(); MaterialIndex=materialIndex; data.indices.push_back(data.vertex0(p,width)); append(); } - + void draw(); }; diff --git a/graphics/asymptote/bezierpatch.cc b/graphics/asymptote/bezierpatch.cc index ca16b9b765..aeea79f77e 100644 --- a/graphics/asymptote/bezierpatch.cc +++ b/graphics/asymptote/bezierpatch.cc @@ -54,12 +54,12 @@ std::vector IZ; const double FillFactor=0.1; -inline int sgn1(double x) +inline int sgn1(double x) { return x >= 0.0 ? 1 : -1; } -inline int sgn(double x) +inline int sgn(double x) { return (x > 0.0 ? 1 : (x < 0.0 ? -1 : 0)); } @@ -94,7 +94,7 @@ bool pierce(const double *a, const double *b, const double *c, const double *A, int sa=sgn(orient3d(A,b,c,B)); int sb=sgn(orient3d(A,c,a,B)); int sc=sgn(orient3d(A,a,b,B)); - return sa == sb && sb == sc; + return sa == sb && sb == sc; } // returns true iff triangle abc is pierced by an edge of triangle ABC @@ -114,7 +114,7 @@ bool intersect0(const double *a, const double *b, const double *c, if(pierce(a,b,c,C,A)) return true; } return false; -} +} // returns true iff triangle abc intersects triangle ABC bool intersect3D(const double *a, const double *b, const double *c, @@ -142,7 +142,7 @@ inline double intersect(const double *P, const double *Q, const double *n, double denom=n[0]*(Q[0]-P[0])+n[1]*(Q[1]-P[1])+n[2]*(Q[2]-P[2]); return denom == 0 ? DBL_MAX : (d-n[0]*P[0]-n[1]*P[1]-n[2]*P[2])/denom; } - + inline triple interp(const double *a, const double *b, double t) { return triple(a[0]+t*(b[0]-a[0]),a[1]+t*(b[1]-a[1]),a[2]+t*(b[2]-a[2])); @@ -163,7 +163,7 @@ inline triple interp(const triple& a, const triple& b, double t) unsigned n; unsigned int count; - + // Sort nonintersecting triangles by depth. int compare(const void *p, const void *P) { @@ -174,29 +174,29 @@ int compare(const void *p, const void *P) unsigned IA=((GLuint *) P)[0]; unsigned IB=((GLuint *) P)[1]; unsigned IC=((GLuint *) P)[2]; - - return zbuffer[Ia]+zbuffer[Ib]+zbuffer[Ic] < + + return zbuffer[Ia]+zbuffer[Ib]+zbuffer[Ic] < zbuffer[IA]+zbuffer[IB]+zbuffer[IC] ? -1 : 1; - + /* - double a[]={xbuffer[Ia],ybuffer[Ia],zbuffer[Ia]}; - double b[]={xbuffer[Ib],ybuffer[Ib],zbuffer[Ib]}; - double c[]={xbuffer[Ic],ybuffer[Ic],zbuffer[Ic]}; - - double A[]={xbuffer[IA],ybuffer[IA],zbuffer[IA]}; - double B[]={xbuffer[IB],ybuffer[IB],zbuffer[IB]}; - double C[]={xbuffer[IC],ybuffer[IC],zbuffer[IC]}; - - double viewpoint[]={0,0,100000}; - - double sa=-orient3d(A,B,C,a); - double sb=-orient3d(A,B,C,b); - double sc=-orient3d(A,B,C,c); - double s=min(sa,sb,sc); - double S=max(sa,sb,sc); - double eps=1000; - - if(s < -eps && S > eps) { //swap + double a[]={xbuffer[Ia],ybuffer[Ia],zbuffer[Ia]}; + double b[]={xbuffer[Ib],ybuffer[Ib],zbuffer[Ib]}; + double c[]={xbuffer[Ic],ybuffer[Ic],zbuffer[Ic]}; + + double A[]={xbuffer[IA],ybuffer[IA],zbuffer[IA]}; + double B[]={xbuffer[IB],ybuffer[IB],zbuffer[IB]}; + double C[]={xbuffer[IC],ybuffer[IC],zbuffer[IC]}; + + double viewpoint[]={0,0,100000}; + + double sa=-orient3d(A,B,C,a); + double sb=-orient3d(A,B,C,b); + double sc=-orient3d(A,B,C,c); + double s=min(sa,sb,sc); + double S=max(sa,sb,sc); + double eps=1000; + + if(s < -eps && S > eps) { //swap double sA=-orient3d(a,b,c,A); double sB=-orient3d(a,b,c,B); double sC=-orient3d(a,b,c,C); @@ -206,12 +206,12 @@ int compare(const void *p, const void *P) int sz=sgn1(orient3d(a,b,c,viewpoint)); if(S < -eps) return -sz; if(S > eps) return sz; - } - if(S < -s) S=s; - int sz=sgn1(orient3d(A,B,C,viewpoint)); - if(S < -eps) return sz; - if(S > eps) return -sz; - return a[2]+b[2]+c[2] < A[2]+B[2]+C[2] ? -1 : 1; + } + if(S < -s) S=s; + int sz=sgn1(orient3d(A,B,C,viewpoint)); + if(S < -eps) return sz; + if(S > eps) return -sz; + return a[2]+b[2]+c[2] < A[2]+B[2]+C[2] ? -1 : 1; */ } @@ -220,47 +220,47 @@ void split(unsigned i3, GLuint ia, GLuint ib, GLuint ic, double *a, double *b, double *c, double *N, double *A) { double td=intersect(a,b,N,A); double te=intersect(a,c,N,A); - + triple d=interp(a,b,td); triple e=interp(a,c,te); - + GLuint Ia=tstride*ia; GLuint Ib=tstride*ib; GLuint Ic=tstride*ic; - + triple na=triple(V[Ia+3],V[Ia+4],V[Ia+5]); triple nb=triple(V[Ib+3],V[Ib+4],V[Ib+5]); triple nc=triple(V[Ic+3],V[Ic+4],V[Ic+5]); - + triple nd=interp(na,nb,td); triple ne=interp(na,nc,te); - + GLuint id,ie; - + if(colors) { GLfloat *ca=&V[Ia+6]; GLfloat *cb=&V[Ib+6]; GLfloat *cc=&V[Ic+6]; - + GLfloat cd[4],ce[4]; interp(cd,ca,cb,td); interp(ce,ca,cc,te); - + id=data.Vertex(d,nd,cd); ie=data.Vertex(e,ne,ce); } else { id=data.Vertex(d,nd); ie=data.Vertex(e,ne); } - + I[i3]=ia; I[i3+1]=id; I[i3+2]=ie; - + I.push_back(id); I.push_back(ib); I.push_back(ie); - + I.push_back(ie); I.push_back(ib); I.push_back(ic); @@ -274,10 +274,10 @@ void BezierPatch::init(double res) MaterialIndex=transparent ? (color ? -1-materialIndex : 1+materialIndex) : materialIndex; - + pvertex=transparent ? &vertexBuffer::tvertex : &vertexBuffer::vertex; } - + void BezierPatch::render(const triple *p, bool straight, GLfloat *c0) { triple p0=p[0]; @@ -285,7 +285,7 @@ void BezierPatch::render(const triple *p, bool straight, GLfloat *c0) for(unsigned i=1; i < 16; ++i) epsilon=max(epsilon,abs2(p[i]-p0)); epsilon *= DBL_EPSILON; - + triple p3=p[3]; triple p12=p[12]; triple p15=p[15]; @@ -295,36 +295,36 @@ void BezierPatch::render(const triple *p, bool straight, GLfloat *c0) n0=normal(p3,p[2],p[1],p0,p[13],p[14],p15); if(abs2(n0) <= epsilon) n0=normal(p15,p[11],p[7],p3,p[4],p[8],p12); } - + triple n1=normal(p0,p[4],p[8],p12,p[13],p[14],p15); if(abs2(n1) <= epsilon) { n1=normal(p0,p[4],p[8],p12,p[11],p[7],p3); if(abs2(n1) <= epsilon) n1=normal(p3,p[2],p[1],p0,p[13],p[14],p15); } - + triple n2=normal(p12,p[13],p[14],p15,p[11],p[7],p3); if(abs2(n2) <= epsilon) { n2=normal(p12,p[13],p[14],p15,p[2],p[1],p0); if(abs2(n2) <= epsilon) n2=normal(p0,p[4],p[8],p12,p[11],p[7],p3); } - + triple n3=normal(p15,p[11],p[7],p3,p[2],p[1],p0); if(abs2(n3) <= epsilon) { n3=normal(p15,p[11],p[7],p3,p[4],p[8],p12); if(abs2(n3) <= epsilon) n3=normal(p12,p[13],p[14],p15,p[2],p[1],p0); } - + GLuint i0,i1,i2,i3; if(color) { GLfloat *c1=c0+4; GLfloat *c2=c0+8; GLfloat *c3=c0+12; - + i0=data.Vertex(p0,n0,c0); i1=data.Vertex(p12,n1,c1); i2=data.Vertex(p15,n2,c2); i3=data.Vertex(p3,n3,c3); - + if(!straight) render(p,i0,i1,i2,i3,p0,p12,p15,p3,false,false,false,false, c0,c1,c2,c3); @@ -333,11 +333,11 @@ void BezierPatch::render(const triple *p, bool straight, GLfloat *c0) i1=(data.*pvertex)(p12,n1); i2=(data.*pvertex)(p15,n2); i3=(data.*pvertex)(p3,n3); - + if(!straight) render(p,i0,i1,i2,i3,p0,p12,p15,p3,false,false,false,false); } - + if(straight) { std::vector &q=data.indices; triple Pa[]={p0,p12,p15}; @@ -382,14 +382,14 @@ void BezierPatch::render(const triple *p, q.push_back(I3); } } else { // Patch is not flat - if(offscreen(16,p)) return; + if(offscreen(16,p)) return; - /* Control points are indexed as follows: + /* Control points are indexed as follows: - Coordinate + Coordinate +----- Index - + 03 13 23 33 +-----+-----+-----+ |3 |7 |11 |15 @@ -406,216 +406,215 @@ void BezierPatch::render(const triple *p, +-----+-----+-----+ 0 4 8 12 - */ + */ triple p0=p[0]; triple p3=p[3]; triple p12=p[12]; triple p15=p[15]; - if(d.getx() < res2) { // flat in horizontal direction; split vertically - /* - P refers to a corner - m refers to a midpoint - s refers to a subpatch - - +--------+--------+ - |P3 P2| - | | - | s1 | - | | - | | - m1 +-----------------+ m0 - | | - | | - | s0 | - | | - |P0 P1| - +-----------------+ - - */ - - Split3 c0(p0,p[1],p[2],p3); - Split3 c1(p[4],p[5],p[6],p[7]); - Split3 c2(p[8],p[9],p[10],p[11]); - Split3 c3(p12,p[13],p[14],p15); - - triple s0[]={p0 ,c0.m0,c0.m3,c0.m5, - p[4],c1.m0,c1.m3,c1.m5, - p[8],c2.m0,c2.m3,c2.m5, - p12 ,c3.m0,c3.m3,c3.m5}; - - triple s1[]={c0.m5,c0.m4,c0.m2,p3, - c1.m5,c1.m4,c1.m2,p[7], - c2.m5,c2.m4,c2.m2,p[11], - c3.m5,c3.m4,c3.m2,p15}; - - triple n0=normal(s0[12],s0[13],s0[14],s0[15],s0[11],s0[7],s0[3]); - if(abs2(n0) <= epsilon) { - n0=normal(s0[12],s0[13],s0[14],s0[15],s0[2],s0[1],s0[0]); - if(abs2(n0) <= epsilon) - n0=normal(s0[0],s0[4],s0[8],s0[12],s0[11],s0[7],s0[3]); - } - - triple n1=normal(s1[3],s1[2],s1[1],s1[0],s1[4],s1[8],s1[12]); - if(abs2(n1) <= epsilon) { - n1=normal(s1[3],s1[2],s1[1],s1[0],s1[13],s1[14],s1[15]); - if(abs2(n1) <= epsilon) - n1=normal(s1[15],s1[11],s1[7],s1[3],s1[4],s1[8],s1[12]); - } - - // A kludge to remove subdivision cracks, only applied the first time - // an edge is found to be flat before the rest of the subpatch is. - - triple m0=0.5*(P1+P2); - if(!flat1) { - if((flat1=Straightness(p12,p[13],p[14],p15) < res2)) - m0 -= Epsilon*unit(differential(s1[12],s1[8],s1[4],s1[0])); - else m0=s0[15]; - } - - triple m1=0.5*(P3+P0); - if(!flat3) { - if((flat3=Straightness(p0,p[1],p[2],p3) < res2)) - m1 -= Epsilon*unit(differential(s0[3],s0[7],s0[11],s0[15])); - else m1=s1[0]; - } - - if(color) { - GLfloat c0[4],c1[4]; - for(size_t i=0; i < 4; ++i) { - c0[i]=0.5*(C1[i]+C2[i]); - c1[i]=0.5*(C3[i]+C0[i]); - } - - GLuint i0=data.Vertex(m0,n0,c0); - GLuint i1=data.Vertex(m1,n1,c1); - - render(s0,I0,I1,i0,i1,P0,P1,m0,m1,flat0,flat1,false,flat3,C0,C1,c0,c1); - render(s1,i1,i0,I2,I3,m1,m0,P2,P3,false,flat1,flat2,flat3,c1,c0,C2,C3); - } else { - GLuint i0=(data.*pvertex)(m0,n0); - GLuint i1=(data.*pvertex)(m1,n1); - - render(s0,I0,I1,i0,i1,P0,P1,m0,m1,flat0,flat1,false,flat3); - render(s1,i1,i0,I2,I3,m1,m0,P2,P3,false,flat1,flat2,flat3); - } - return; - } - if(d.gety() < res2) { // flat in vertical direction; split horizontally - /* - P refers to a corner - m refers to a midpoint - s refers to a subpatch - - m1 - +--------+--------+ - |P3 | P2| - | | | - | | | - | | | - | | | - | s0 | s1 | - | | | - | | | - | | | - | | | - |P0 | P1| - +--------+--------+ - m0 - - */ - - Split3 c0(p0,p[4],p[8],p12); - Split3 c1(p[1],p[5],p[9],p[13]); - Split3 c2(p[2],p[6],p[10],p[14]); - Split3 c3(p3,p[7],p[11],p15); - - triple s0[]={p0,p[1],p[2],p3, - c0.m0,c1.m0,c2.m0,c3.m0, - c0.m3,c1.m3,c2.m3,c3.m3, - c0.m5,c1.m5,c2.m5,c3.m5}; - - triple s1[]={c0.m5,c1.m5,c2.m5,c3.m5, - c0.m4,c1.m4,c2.m4,c3.m4, - c0.m2,c1.m2,c2.m2,c3.m2, - p12,p[13],p[14],p15}; - - triple n0=normal(s0[0],s0[4],s0[8],s0[12],s0[13],s0[14],s0[15]); - if(abs2(n0) <= epsilon) { - n0=normal(s0[0],s0[4],s0[8],s0[12],s0[11],s0[7],s0[3]); - if(abs2(n0) <= epsilon) - n0=normal(s0[3],s0[2],s0[1],s0[0],s0[13],s0[14],s0[15]); - } - - triple n1=normal(s1[15],s1[11],s1[7],s1[3],s1[2],s1[1],s1[0]); - if(abs2(n1) <= epsilon) { - n1=normal(s1[15],s1[11],s1[7],s1[3],s1[4],s1[8],s1[12]); - if(abs2(n1) <= epsilon) - n1=normal(s1[12],s1[13],s1[14],s1[15],s1[2],s1[1],s1[0]); - } - - // A kludge to remove subdivision cracks, only applied the first time - // an edge is found to be flat before the rest of the subpatch is. - - triple m0=0.5*(P0+P1); - if(!flat0) { - if((flat0=Straightness(p0,p[4],p[8],p12) < res2)) - m0 -= Epsilon*unit(differential(s1[0],s1[1],s1[2],s1[3])); - else m0=s0[12]; - } - - triple m1=0.5*(P2+P3); - if(!flat2) { - if((flat2=Straightness(p15,p[11],p[7],p3) < res2)) - m1 -= Epsilon*unit(differential(s0[15],s0[14],s0[13],s0[12])); - else m1=s1[3]; - } - - if(color) { - GLfloat c0[4],c1[4]; - for(size_t i=0; i < 4; ++i) { - c0[i]=0.5*(C0[i]+C1[i]); - c1[i]=0.5*(C2[i]+C3[i]); - } - - GLuint i0=data.Vertex(m0,n0,c0); - GLuint i1=data.Vertex(m1,n1,c1); - - render(s0,I0,i0,i1,I3,P0,m0,m1,P3,flat0,false,flat2,flat3,C0,c0,c1,C3); - render(s1,i0,I1,I2,i1,m0,P1,P2,m1,flat0,flat1,flat2,false,c0,C1,C2,c1); - } else { - GLuint i0=(data.*pvertex)(m0,n0); - GLuint i1=(data.*pvertex)(m1,n1); - - render(s0,I0,i0,i1,I3,P0,m0,m1,P3,flat0,false,flat2,flat3); - render(s1,i0,I1,I2,i1,m0,P1,P2,m1,flat0,flat1,flat2,false); - } - return; - } - /* - Horizontal and vertical subdivision: - P refers to a corner - m refers to a midpoint - s refers to a subpatch - - m2 - +--------+--------+ - |P3 | P2| - | | | - | s3 | s2 | - | | | - | | m4 | - m3 +--------+--------+ m1 - | | | - | | | - | s0 | s1 | - | | | - |P0 | P1| - +--------+--------+ - m0 + if(d.getx() < res2) { // flat in horizontal direction; split vertically + /* + P refers to a corner + m refers to a midpoint + s refers to a subpatch + + +--------+--------+ + |P3 P2| + | | + | s1 | + | | + | | + m1 +-----------------+ m0 + | | + | | + | s0 | + | | + |P0 P1| + +-----------------+ + + */ + + Split3 c0(p0,p[1],p[2],p3); + Split3 c1(p[4],p[5],p[6],p[7]); + Split3 c2(p[8],p[9],p[10],p[11]); + Split3 c3(p12,p[13],p[14],p15); + + triple s0[]={p0 ,c0.m0,c0.m3,c0.m5, + p[4],c1.m0,c1.m3,c1.m5, + p[8],c2.m0,c2.m3,c2.m5, + p12 ,c3.m0,c3.m3,c3.m5}; + + triple s1[]={c0.m5,c0.m4,c0.m2,p3, + c1.m5,c1.m4,c1.m2,p[7], + c2.m5,c2.m4,c2.m2,p[11], + c3.m5,c3.m4,c3.m2,p15}; + + triple n0=normal(s0[12],s0[13],s0[14],s0[15],s0[11],s0[7],s0[3]); + if(abs2(n0) <= epsilon) { + n0=normal(s0[12],s0[13],s0[14],s0[15],s0[2],s0[1],s0[0]); + if(abs2(n0) <= epsilon) + n0=normal(s0[0],s0[4],s0[8],s0[12],s0[11],s0[7],s0[3]); + } + + triple n1=normal(s1[3],s1[2],s1[1],s1[0],s1[4],s1[8],s1[12]); + if(abs2(n1) <= epsilon) { + n1=normal(s1[3],s1[2],s1[1],s1[0],s1[13],s1[14],s1[15]); + if(abs2(n1) <= epsilon) + n1=normal(s1[15],s1[11],s1[7],s1[3],s1[4],s1[8],s1[12]); + } + + // A kludge to remove subdivision cracks, only applied the first time + // an edge is found to be flat before the rest of the subpatch is. + + triple m0=0.5*(P1+P2); + if(!flat1) { + if((flat1=Straightness(p12,p[13],p[14],p15) < res2)) + m0 -= Epsilon*unit(differential(s1[12],s1[8],s1[4],s1[0])); + else m0=s0[15]; + } + + triple m1=0.5*(P3+P0); + if(!flat3) { + if((flat3=Straightness(p0,p[1],p[2],p3) < res2)) + m1 -= Epsilon*unit(differential(s0[3],s0[7],s0[11],s0[15])); + else m1=s1[0]; + } + + if(color) { + GLfloat c0[4],c1[4]; + for(size_t i=0; i < 4; ++i) { + c0[i]=0.5*(C1[i]+C2[i]); + c1[i]=0.5*(C3[i]+C0[i]); + } + + GLuint i0=data.Vertex(m0,n0,c0); + GLuint i1=data.Vertex(m1,n1,c1); + + render(s0,I0,I1,i0,i1,P0,P1,m0,m1,flat0,flat1,false,flat3,C0,C1,c0,c1); + render(s1,i1,i0,I2,I3,m1,m0,P2,P3,false,flat1,flat2,flat3,c1,c0,C2,C3); + } else { + GLuint i0=(data.*pvertex)(m0,n0); + GLuint i1=(data.*pvertex)(m1,n1); + + render(s0,I0,I1,i0,i1,P0,P1,m0,m1,flat0,flat1,false,flat3); + render(s1,i1,i0,I2,I3,m1,m0,P2,P3,false,flat1,flat2,flat3); + } + return; + } + if(d.gety() < res2) { // flat in vertical direction; split horizontally + /* + P refers to a corner + m refers to a midpoint + s refers to a subpatch + + m1 + +--------+--------+ + |P3 | P2| + | | | + | | | + | | | + | | | + | s0 | s1 | + | | | + | | | + | | | + | | | + |P0 | P1| + +--------+--------+ + m0 + */ + + Split3 c0(p0,p[4],p[8],p12); + Split3 c1(p[1],p[5],p[9],p[13]); + Split3 c2(p[2],p[6],p[10],p[14]); + Split3 c3(p3,p[7],p[11],p15); + + triple s0[]={p0,p[1],p[2],p3, + c0.m0,c1.m0,c2.m0,c3.m0, + c0.m3,c1.m3,c2.m3,c3.m3, + c0.m5,c1.m5,c2.m5,c3.m5}; + + triple s1[]={c0.m5,c1.m5,c2.m5,c3.m5, + c0.m4,c1.m4,c2.m4,c3.m4, + c0.m2,c1.m2,c2.m2,c3.m2, + p12,p[13],p[14],p15}; + + triple n0=normal(s0[0],s0[4],s0[8],s0[12],s0[13],s0[14],s0[15]); + if(abs2(n0) <= epsilon) { + n0=normal(s0[0],s0[4],s0[8],s0[12],s0[11],s0[7],s0[3]); + if(abs2(n0) <= epsilon) + n0=normal(s0[3],s0[2],s0[1],s0[0],s0[13],s0[14],s0[15]); + } + + triple n1=normal(s1[15],s1[11],s1[7],s1[3],s1[2],s1[1],s1[0]); + if(abs2(n1) <= epsilon) { + n1=normal(s1[15],s1[11],s1[7],s1[3],s1[4],s1[8],s1[12]); + if(abs2(n1) <= epsilon) + n1=normal(s1[12],s1[13],s1[14],s1[15],s1[2],s1[1],s1[0]); + } + + // A kludge to remove subdivision cracks, only applied the first time + // an edge is found to be flat before the rest of the subpatch is. + + triple m0=0.5*(P0+P1); + if(!flat0) { + if((flat0=Straightness(p0,p[4],p[8],p12) < res2)) + m0 -= Epsilon*unit(differential(s1[0],s1[1],s1[2],s1[3])); + else m0=s0[12]; + } + + triple m1=0.5*(P2+P3); + if(!flat2) { + if((flat2=Straightness(p15,p[11],p[7],p3) < res2)) + m1 -= Epsilon*unit(differential(s0[15],s0[14],s0[13],s0[12])); + else m1=s1[3]; + } + + if(color) { + GLfloat c0[4],c1[4]; + for(size_t i=0; i < 4; ++i) { + c0[i]=0.5*(C0[i]+C1[i]); + c1[i]=0.5*(C2[i]+C3[i]); + } + + GLuint i0=data.Vertex(m0,n0,c0); + GLuint i1=data.Vertex(m1,n1,c1); + + render(s0,I0,i0,i1,I3,P0,m0,m1,P3,flat0,false,flat2,flat3,C0,c0,c1,C3); + render(s1,i0,I1,I2,i1,m0,P1,P2,m1,flat0,flat1,flat2,false,c0,C1,C2,c1); + } else { + GLuint i0=(data.*pvertex)(m0,n0); + GLuint i1=(data.*pvertex)(m1,n1); + + render(s0,I0,i0,i1,I3,P0,m0,m1,P3,flat0,false,flat2,flat3); + render(s1,i0,I1,I2,i1,m0,P1,P2,m1,flat0,flat1,flat2,false); + } + return; + } + /* + Horizontal and vertical subdivision: + P refers to a corner + m refers to a midpoint + s refers to a subpatch + + m2 + +--------+--------+ + |P3 | P2| + | | | + | s3 | s2 | + | | | + | | m4 | + m3 +--------+--------+ m1 + | | | + | | | + | s0 | s1 | + | | | + |P0 | P1| + +--------+--------+ + m0 */ - + // Subdivide patch: Split3 c0(p0,p[1],p[2],p3); Split3 c1(p[4],p[5],p[6],p[7]); @@ -638,70 +637,70 @@ void BezierPatch::render(const triple *p, c7.m2,c8.m2,c9.m2,c10.m2,c3.m5,c3.m4,c3.m2,p15}; triple s3[]={c0.m5,c0.m4,c0.m2,p3,c7.m0,c8.m0,c9.m0,c10.m0, c7.m3,c8.m3,c9.m3,c10.m3,c7.m5,c8.m5,c9.m5,c10.m5}; - + triple m4=s0[15]; - + triple n0=normal(s0[0],s0[4],s0[8],s0[12],s0[13],s0[14],s0[15]); if(abs2(n0) <= epsilon) { n0=normal(s0[0],s0[4],s0[8],s0[12],s0[11],s0[7],s0[3]); if(abs2(n0) <= epsilon) n0=normal(s0[3],s0[2],s0[1],s0[0],s0[13],s0[14],s0[15]); } - + triple n1=normal(s1[12],s1[13],s1[14],s1[15],s1[11],s1[7],s1[3]); if(abs2(n1) <= epsilon) { n1=normal(s1[12],s1[13],s1[14],s1[15],s1[2],s1[1],s1[0]); if(abs2(n1) <= epsilon) n1=normal(s1[0],s1[4],s1[8],s1[12],s1[11],s1[7],s1[3]); } - + triple n2=normal(s2[15],s2[11],s2[7],s2[3],s2[2],s2[1],s2[0]); if(abs2(n2) <= epsilon) { n2=normal(s2[15],s2[11],s2[7],s2[3],s2[4],s2[8],s2[12]); if(abs2(n2) <= epsilon) n2=normal(s2[12],s2[13],s2[14],s2[15],s2[2],s2[1],s2[0]); } - + triple n3=normal(s3[3],s3[2],s3[1],s3[0],s3[4],s3[8],s3[12]); if(abs2(n3) <= epsilon) { n3=normal(s3[3],s3[2],s3[1],s3[0],s3[13],s3[14],s3[15]); if(abs2(n3) <= epsilon) n3=normal(s3[15],s3[11],s3[7],s3[3],s3[4],s3[8],s3[12]); } - + triple n4=normal(s2[3],s2[2],s2[1],m4,s2[4],s2[8],s2[12]); - + // A kludge to remove subdivision cracks, only applied the first time // an edge is found to be flat before the rest of the subpatch is. - + triple m0=0.5*(P0+P1); if(!flat0) { if((flat0=Straightness(p0,p[4],p[8],p12) < res2)) m0 -= Epsilon*unit(differential(s1[0],s1[1],s1[2],s1[3])); else m0=s0[12]; } - + triple m1=0.5*(P1+P2); if(!flat1) { if((flat1=Straightness(p12,p[13],p[14],p15) < res2)) m1 -= Epsilon*unit(differential(s2[12],s2[8],s2[4],s2[0])); else m1=s1[15]; } - + triple m2=0.5*(P2+P3); if(!flat2) { if((flat2=Straightness(p15,p[11],p[7],p3) < res2)) m2 -= Epsilon*unit(differential(s3[15],s3[14],s3[13],s3[12])); else m2=s2[3]; } - + triple m3=0.5*(P3+P0); if(!flat3) { if((flat3=Straightness(p0,p[1],p[2],p3) < res2)) m3 -= Epsilon*unit(differential(s0[3],s0[7],s0[11],s0[15])); else m3=s3[0]; } - + if(color) { GLfloat c0[4],c1[4],c2[4],c3[4],c4[4]; for(size_t i=0; i < 4; ++i) { @@ -711,13 +710,13 @@ void BezierPatch::render(const triple *p, c3[i]=0.5*(C3[i]+C0[i]); c4[i]=0.5*(c0[i]+c2[i]); } - + GLuint i0=data.Vertex(m0,n0,c0); GLuint i1=data.Vertex(m1,n1,c1); GLuint i2=data.Vertex(m2,n2,c2); GLuint i3=data.Vertex(m3,n3,c3); GLuint i4=data.Vertex(m4,n4,c4); - + render(s0,I0,i0,i4,i3,P0,m0,m4,m3,flat0,false,false,flat3,C0,c0,c4,c3); render(s1,i0,I1,i1,i4,m0,P1,m1,m4,flat0,flat1,false,false,c0,C1,c1,c4); render(s2,i4,i1,I2,i2,m4,m1,P2,m2,false,flat1,flat2,false,c4,c1,C2,c2); @@ -728,7 +727,7 @@ void BezierPatch::render(const triple *p, GLuint i2=(data.*pvertex)(m2,n2); GLuint i3=(data.*pvertex)(m3,n3); GLuint i4=(data.*pvertex)(m4,n4); - + render(s0,I0,i0,i4,i3,P0,m0,m4,m3,flat0,false,false,flat3); render(s1,i0,I1,i1,i4,m0,P1,m1,m4,flat0,flat1,false,false); render(s2,i4,i1,I2,i2,m4,m1,P2,m2,false,flat1,flat2,false); @@ -743,36 +742,36 @@ void BezierTriangle::render(const triple *p, bool straight, GLfloat *c0) epsilon=0; for(int i=1; i < 10; ++i) epsilon=max(epsilon,abs2(p[i]-p0)); - + epsilon *= DBL_EPSILON; - + triple p6=p[6]; triple p9=p[9]; - + triple n0=normal(p9,p[5],p[2],p0,p[1],p[3],p6); - triple n1=normal(p0,p[1],p[3],p6,p[7],p[8],p9); + triple n1=normal(p0,p[1],p[3],p6,p[7],p[8],p9); triple n2=normal(p6,p[7],p[8],p9,p[5],p[2],p0); - + GLuint i0,i1,i2; if(color) { GLfloat *c1=c0+4; GLfloat *c2=c0+8; - + i0=data.Vertex(p0,n0,c0); i1=data.Vertex(p6,n1,c1); i2=data.Vertex(p9,n2,c2); - + if(!straight) render(p,i0,i1,i2,p0,p6,p9,false,false,false,c0,c1,c2); } else { i0=(data.*pvertex)(p0,n0); i1=(data.*pvertex)(p6,n1); i2=(data.*pvertex)(p9,n2); - + if(!straight) render(p,i0,i1,i2,p0,p6,p9,false,false,false); } - + if(straight) { triple P[]={p0,p6,p9}; if(!offscreen(3,P)) { @@ -923,10 +922,10 @@ void BezierTriangle::render(const triple *p, triple n0=normal(l300,r012,r021,r030,u201,u102,l030); triple n1=normal(r030,u201,u102,l030,l120,l210,l300); triple n2=normal(l030,l120,l210,l300,r012,r021,r030); - + // A kludge to remove subdivision cracks, only applied the first time // an edge is found to be flat before the rest of the subpatch is. - + triple m0=0.5*(P1+P2); if(!flat0) { if((flat0=Straightness(r300,p210,p120,u030) < res2)) @@ -958,11 +957,11 @@ void BezierTriangle::render(const triple *p, c1[i]=0.5*(C2[i]+C0[i]); c2[i]=0.5*(C0[i]+C1[i]); } - + GLuint i0=data.Vertex(m0,n0,c0); GLuint i1=data.Vertex(m1,n1,c1); GLuint i2=data.Vertex(m2,n2,c2); - + render(l,I0,i2,i1,P0,m2,m1,false,flat1,flat2,C0,c2,c1); render(r,i2,I1,i0,m2,P1,m0,flat0,false,flat2,c2,C1,c0); render(u,i1,i0,I2,m1,m0,P2,flat0,flat1,false,c1,c0,C2); @@ -971,7 +970,7 @@ void BezierTriangle::render(const triple *p, GLuint i0=(data.*pvertex)(m0,n0); GLuint i1=(data.*pvertex)(m1,n1); GLuint i2=(data.*pvertex)(m2,n2); - + render(l,I0,i2,i1,P0,m2,m1,false,flat1,flat2); render(r,i2,I1,i0,m2,P1,m0,flat0,false,flat2); render(u,i1,i0,I2,m1,m0,P2,flat0,flat1,false); @@ -986,7 +985,7 @@ void transform(const std::vector& b) // xbuffer.resize(n); // ybuffer.resize(n); zbuffer.resize(n); - + double Tz0=gl::dView[2]; double Tz1=gl::dView[6]; double Tz2=gl::dView[10]; @@ -1001,51 +1000,51 @@ void transform(const std::vector& b) void bounds(const std::vector& I) { unsigned n=I.size()/3; -/* +/* xmin.resize(n); xmax.resize(n); ymin.resize(n); ymax.resize(n); */ - + zmin.resize(n); zmax.resize(n); - + for(unsigned i=0; i < n; ++i) { unsigned i3=3*i; unsigned Ia=I[i3]; unsigned Ib=I[i3+1]; unsigned Ic=I[i3+2]; - - + + /* - double xa=xbuffer[Ia]; - double xb=xbuffer[Ib]; - double xc=xbuffer[Ic]; - - double ya=ybuffer[Ia]; - double yb=ybuffer[Ib]; - double yc=ybuffer[Ic]; + double xa=xbuffer[Ia]; + double xb=xbuffer[Ib]; + double xc=xbuffer[Ic]; + + double ya=ybuffer[Ia]; + double yb=ybuffer[Ib]; + double yc=ybuffer[Ic]; */ - + double za=zbuffer[Ia]; double zb=zbuffer[Ib]; double zc=zbuffer[Ic]; - + /* - xmin[i]=min(xa,xb,xc); - xmax[i]=max(xa,xb,xc); - - ymin[i]=min(ya,yb,yc); - ymax[i]=max(ya,yb,yc); + xmin[i]=min(xa,xb,xc); + xmax[i]=max(xa,xb,xc); + + ymin[i]=min(ya,yb,yc); + ymax[i]=max(ya,yb,yc); */ - + zmin[i]=min(za,zb,zc); zmax[i]=max(za,zb,zc); } } #endif - + void sortTriangles() { if(!transparentData.indices.empty()) { @@ -1062,17 +1061,17 @@ void Triangles::queue(size_t nP, const triple* P, size_t nN, const triple* N, const uint32_t (*CC)[3], bool Transparent) { if(!nN) return; - + data.clear(); notRendered(); Onscreen=true; transparent=Transparent; - + data.Vertices.resize(nP); data.indices.resize(3*nI); - - MaterialIndex=nC ? -1-materialIndex : 1+materialIndex; - + + MaterialIndex=nC ? -1-materialIndex : 1+materialIndex; + for(size_t i=0; i < nI; ++i) { const uint32_t *PI=PP[i]; uint32_t PI0=PI[0]; @@ -1112,7 +1111,7 @@ void Triangles::queue(size_t nP, const triple* P, size_t nN, const triple* N, } append(); } - + #endif } //namespace camp diff --git a/graphics/asymptote/bezierpatch.h b/graphics/asymptote/bezierpatch.h index 2af678f9f8..75ba7a66f9 100644 --- a/graphics/asymptote/bezierpatch.h +++ b/graphics/asymptote/bezierpatch.h @@ -30,7 +30,7 @@ struct BezierPatch bool Onscreen; void init(double res); - + triple normal(triple left3, triple left2, triple left1, triple middle, triple right1, triple right2, triple right3) { triple lp=3.0*(left1-middle); @@ -66,11 +66,11 @@ struct BezierPatch triple p=p1-p0; if(abs2(p) > epsilon) return p; - + p=bezierPP(p0,p1,p2); if(abs2(p) > epsilon) return p; - + return bezierPPP(p0,p1,p2,p3); } @@ -96,10 +96,10 @@ struct BezierPatch v=max(v,Straightness(p[4],p[5],p[6],p[7])); v=max(v,Straightness(p[8],p[9],p[10],p[11])); v=max(v,Straightness(p12,p[13],p[14],p15)); - + return pair(h,v); } - + struct Split3 { triple m0,m2,m3,m4,m5; Split3() {} @@ -112,7 +112,7 @@ struct BezierPatch m5=0.5*(m3+m4); } }; - + // Approximate bounds by bounding box of control polyhedron. bool offscreen(size_t n, const triple *v) { if(bbox2(n,v).offscreen()) { @@ -129,7 +129,7 @@ struct BezierPatch bool flat0, bool flat1, bool flat2, bool flat3, GLfloat *C0=NULL, GLfloat *C1=NULL, GLfloat *C2=NULL, GLfloat *C3=NULL); - + void append() { if(transparent) transparentData.Append(data); @@ -140,7 +140,7 @@ struct BezierPatch materialData.append(data); } } - + virtual void notRendered() { if(transparent) transparentData.rendered=false; @@ -162,18 +162,18 @@ struct BezierPatch init(pixel*ratio); render(g,straight,colors); } - + }; struct BezierTriangle : public BezierPatch { public: BezierTriangle() : BezierPatch() {} - + double Distance(const triple *p) { triple p0=p[0]; triple p6=p[6]; triple p9=p[9]; - + // Check how far the internal point is from the centroid of the vertices. double d=abs2((p0+p6+p9)*third-p[4]); @@ -182,7 +182,7 @@ public: d=max(d,Straightness(p0,p[2],p[5],p9)); return max(d,Straightness(p6,p[7],p[8],p9)); } - + void render(const triple *p, bool straight, GLfloat *c0=NULL); void render(const triple *p, GLuint I0, GLuint I1, GLuint I2, @@ -199,7 +199,7 @@ public: size_t nC, const prc::RGBAColour* C, size_t nI, const uint32_t (*PI)[3], const uint32_t (*NI)[3], const uint32_t (*CI)[3], bool transparent); - + void append() { if(transparent) transparentData.Append(data); diff --git a/graphics/asymptote/binaries/i386-windows/texlive/README b/graphics/asymptote/binaries/i386-windows/texlive/README index 8e4192121d..41576b36f4 100644 --- a/graphics/asymptote/binaries/i386-windows/texlive/README +++ b/graphics/asymptote/binaries/i386-windows/texlive/README @@ -1,5 +1,5 @@ The Asymptote executable for MSWindows can only be released under the GNU General Public License (GPL) as it is linked against the GNU Scientific -Library, GNU Readline library, and other GPL libraries. The Asymptote +Library, GNU Readline library, WolfSSL, and other GPL libraries. The Asymptote source itself is released under the GNU Lesser General Public License. diff --git a/graphics/asymptote/binaries/x86_64-windows/cygwin1.dll b/graphics/asymptote/binaries/x86_64-windows/cygwin1.dll index e8577981dc..85e3847f02 100644 Binary files a/graphics/asymptote/binaries/x86_64-windows/cygwin1.dll and b/graphics/asymptote/binaries/x86_64-windows/cygwin1.dll differ diff --git a/graphics/asymptote/binaries/x86_64-windows/texlive/README b/graphics/asymptote/binaries/x86_64-windows/texlive/README index 8e4192121d..41576b36f4 100644 --- a/graphics/asymptote/binaries/x86_64-windows/texlive/README +++ b/graphics/asymptote/binaries/x86_64-windows/texlive/README @@ -1,5 +1,5 @@ The Asymptote executable for MSWindows can only be released under the GNU General Public License (GPL) as it is linked against the GNU Scientific -Library, GNU Readline library, and other GPL libraries. The Asymptote +Library, GNU Readline library, WolfSSL, and other GPL libraries. The Asymptote source itself is released under the GNU Lesser General Public License. diff --git a/graphics/asymptote/build-scripts/HOWTO-MSWindows b/graphics/asymptote/build-scripts/HOWTO-MSWindows index 977501d658..9a39e4b174 100644 --- a/graphics/asymptote/build-scripts/HOWTO-MSWindows +++ b/graphics/asymptote/build-scripts/HOWTO-MSWindows @@ -8,9 +8,11 @@ Install TeXLive and required Cygwin packages: setup-x86_64.exe -q -P git,wget,make,patch,gcc-g++,autoconf2.5,bison,flex,w32api-headers,w32api-runtime,zlib-devel,glm-devel,automake1.15,libtool -setup-x86_64.exe -q -I -P libtirpc-devel,libreadline-devel,libfftw3-devel,libgsl-devel +setup-x86_64.exe -q -I -P libtirpc-devel,libreadline-devel,libfftw3-devel,libgsl-devel,libcurl-devel -Build and install static libraries from /usr/local/src: +Download wolfssl GPLV3 source code from www.wolfssl.com + +Build and install static libraries from /usr/src: gsl-devel: ./configure --prefix=/usr @@ -21,7 +23,7 @@ readline-devel: make install fftw3-devel: -./configure --prefix=/usr --enable-shared +./configure --prefix=/usr --disable-shared make install tirpc-devel: @@ -35,6 +37,14 @@ termcap-1.3.1: ./configure --prefix=/usr make install +wolfssl-4.4.0-gplv3-fips-ready: +./configure --prefix=/usr --enable-static +make install + +curl-7.71.1: +./configure --prefix=/usr --disable-shared --without-brotli --without-ssl --with-wolfssl +make install + git clone http://github.com/vectorgraphics/asymptote freeglut-3.0.0: @@ -62,4 +72,4 @@ cd gc-$GCVERSION ./configure --disable-shared make check -~/asymptote/build-scripts/build-asymptote.dos 2.48 +~/asymptote/build-scripts/build-asymptote.dos diff --git a/graphics/asymptote/build-scripts/README-binaries b/graphics/asymptote/build-scripts/README-binaries index 8e4192121d..41576b36f4 100644 --- a/graphics/asymptote/build-scripts/README-binaries +++ b/graphics/asymptote/build-scripts/README-binaries @@ -1,5 +1,5 @@ The Asymptote executable for MSWindows can only be released under the GNU General Public License (GPL) as it is linked against the GNU Scientific -Library, GNU Readline library, and other GPL libraries. The Asymptote +Library, GNU Readline library, WolfSSL, and other GPL libraries. The Asymptote source itself is released under the GNU Lesser General Public License. diff --git a/graphics/asymptote/build-scripts/asy-format.el b/graphics/asymptote/build-scripts/asy-format.el new file mode 100644 index 0000000000..fc66032653 --- /dev/null +++ b/graphics/asymptote/build-scripts/asy-format.el @@ -0,0 +1,52 @@ +(defun change (old-pat new-pat) "Replace all occurences of old-pat to new-pat in current buffer." +(interactive "r") +(goto-char (point-min)) +(replace-string old-pat new-pat)) + +(defun changereg (old-regexp new-regexp) "Replace all occurences of old-regexp to new-regexp in current buffer." +(interactive "r") +(goto-char (point-min)) +(replace-regexp old-regexp new-regexp)) + +(defun querychangereg (old-regexp new-regexp) "Replace all occurences of old-regexp to new-regexp in current buffer, with query." +(interactive "r") +(goto-char (point-min)) +(query-replace-regexp old-regexp new-regexp)) + +(set-variable 'case-fold-search nil) +(change " + " "+") +(change " - " "-") +;;(change " * " "*") +(change " / " "/") +(change " = " "=") +(change " --" "--") +(change "-- " "--") +(change " ++" "++") +(change "++ " "++") +(change " .. " "..") +(change " ^^ " "^^") +(change " & " "&") +(change " :: " "::") +(change ";--" "; --") +(change " (" "(") +(change " )" ")") +(change " }" "}") +(changereg "( \\([^/]\\)" "(\\1") +(changereg "{ \\([^/]\\)" "{\\1") +(changereg "\\([^ ]\\)\\?" "\\1 ?") +(changereg "\\?\\([^ ]\\)" "? \\1") +(changereg ";\\([^ \\} +]\\)" "; \\1") +;;(changereg "\\([^ ]\\):" "\\1 :") +(changereg ":\\([^ ]\\)" ": \\1") +(changereg "\\([+-*/=!<>]\\)=\\([^ ]\\)" "\\1= \\2") +(changereg "\\([^ ]\\)\\([+-*/=!<>]\\)=" "\\1 \\2=") +(changereg "\\([<>]\\)\\([^ =]\\)" "\\1 \\2") +(changereg "\\([^ ]\\)\\([<>]\\)" "\\1 \\2") +(changereg "&&\\([^ ]\\)" "&& \\1") +(changereg "||\\([^ ]\\)" "|| \\1") +(changereg "\\[\\]\\([^ []\\)" "[] \\1") +(indent-region (point-min) (point-max)) + +(querychangereg ", " ",") + diff --git a/graphics/asymptote/build-scripts/asy-indent.el b/graphics/asymptote/build-scripts/asy-indent.el new file mode 100644 index 0000000000..06189e5e60 --- /dev/null +++ b/graphics/asymptote/build-scripts/asy-indent.el @@ -0,0 +1,6 @@ +(load-file "/usr/local/share/asymptote/asy-mode.el") +(asy-mode) +(indent-region (point-min) (point-max) nil) +(untabify (point-min) (point-max)) +(delete-trailing-whitespace (point-min) (point-max)) +(save-buffer) diff --git a/graphics/asymptote/build-scripts/build-asygl b/graphics/asymptote/build-scripts/build-asygl index f1d75a6f80..559b08c08b 100755 --- a/graphics/asymptote/build-scripts/build-asygl +++ b/graphics/asymptote/build-scripts/build-asygl @@ -7,7 +7,7 @@ if [ $# -eq 1 ]; then \ UGLIFY=cat; \ UGLIFYOPT=""; \ else \ -UGLIFY=uglifyjs; \ +UGLIFY=terser; \ UGLIFYOPTIONS="-m -c --comments"; \ fi diff --git a/graphics/asymptote/build-scripts/build-asymptote.dos b/graphics/asymptote/build-scripts/build-asymptote.dos index b8755c7591..5bb6777cc2 100755 --- a/graphics/asymptote/build-scripts/build-asymptote.dos +++ b/graphics/asymptote/build-scripts/build-asymptote.dos @@ -35,6 +35,7 @@ make -n MSDOS=1 >& /dev/null || ./configure OSTYPE=msdos --enable-gc=$GC --with- rm -rf $BUILD mkdir -p $BUILD cp -a $HOME/dll/cygwin/*.dll $BUILD +cp /etc/pki/tls/certs/ca-bundle.crt $BUILD chmod 0644 $BUILD/*.dll cp -a $BUILD/*.dll ~/CTAN/asymptote-$VERSION/binaries/$BINDIR/ make MSDOS=1 DESTDIR="$BUILD/" docdir="$BUILD/" @@ -55,6 +56,7 @@ ls -p1 $BUILD \ | awk '{ if(index($0,"/")==length($0)) print "RMDir /r $INSTDIR\\" substr($0,0,length($0)-1); else print "Delete $INSTDIR\\" $0 }' \ > AsymptoteUninstallList.nsi +rm $BUILD/xasy if [ $MACHINE == i686 ]; then sed asymptote.nsi -e 's/$PROGRAMFILES64/$PROGRAMFILES/g' > asymptote32.nsi /cygdrive/c/Program\ Files\ \(x86\)/NSIS/makensis.exe asymptote32.nsi diff --git a/graphics/asymptote/build-scripts/cc-format.el b/graphics/asymptote/build-scripts/cc-format.el new file mode 100644 index 0000000000..fa36f6dd6a --- /dev/null +++ b/graphics/asymptote/build-scripts/cc-format.el @@ -0,0 +1,52 @@ +(defun change (old-pat new-pat) "Replace all occurences of old-pat to new-pat in current buffer." +(interactive "r") +(goto-char (point-min)) +(replace-string old-pat new-pat)) + +(defun changereg (old-regexp new-regexp) "Replace all occurences of old-regexp to new-regexp in current buffer." +(interactive "r") +(goto-char (point-min)) +(replace-regexp old-regexp new-regexp)) + +(defun querychangereg (old-regexp new-regexp) "Replace all occurences of old-regexp to new-regexp in current buffer, with query." +(interactive "r") +(goto-char (point-min)) +(query-replace-regexp old-regexp new-regexp)) + +(set-variable 'case-fold-search nil) +(change " + " "+") +(change " - " "-") +(change " * " "*") +(change " / " "/") +(change " = " "=") +(change " --" "--") +(change "-- " "--") +(change " ++" "++") +(change "++ " "++") +(change " .. " "..") +(change " ^^ " "^^") +(change " & " "&") +(change " :: " "::") +(change ";--" "; --") +(change " (" "(") +(change " )" ")") +(change " }" "}") +(changereg "( \\([^/]\\)" "(\\1") +(changereg "{ \\([^/]\\)" "{\\1") +(changereg "\\([^ ]\\)\\?" "\\1 ?") +(changereg "\\?\\([^ ]\\)" "? \\1") +(changereg ";\\([^ \\} +]\\)" "; \\1") +;;(changereg "\\([^ ]\\):" "\\1 :") +(changereg ":\\([^ ]\\)" ": \\1") +(changereg "\\([+-*/=!]\\)=\\([^ ]\\)" "\\1= \\2") +(changereg "\\([^ ]\\)\\([+-*/=!]\\)=" "\\1 \\2=") +(changereg "\\([]\\)\\([^ =]\\)" "\\1 \\2") +(changereg "\\([^ ]\\)\\([]\\)" "\\1 \\2") +(changereg "&&\\([^ ]\\)" "&& \\1") +(changereg "||\\([^ ]\\)" "|| \\1") +(changereg "\\[\\]\\([^ []\\)" "[] \\1") +(indent-region (point-min) (point-max)) + +(querychangereg ", " ",") + diff --git a/graphics/asymptote/build-scripts/cc-indent.el b/graphics/asymptote/build-scripts/cc-indent.el new file mode 100644 index 0000000000..58c1ac9ea8 --- /dev/null +++ b/graphics/asymptote/build-scripts/cc-indent.el @@ -0,0 +1,6 @@ +(load-file "cc-mode2.el") +(c++-mode) +(indent-region (point-min) (point-max) nil) +(untabify (point-min) (point-max)) +(delete-trailing-whitespace (point-min) (point-max)) +(save-buffer) diff --git a/graphics/asymptote/build-scripts/run-in-indent.el b/graphics/asymptote/build-scripts/run-in-indent.el new file mode 100644 index 0000000000..9a4567dcb8 --- /dev/null +++ b/graphics/asymptote/build-scripts/run-in-indent.el @@ -0,0 +1,6 @@ +(load-file "cc-mode2.el") +(c++-mode) +(indent-region (search-forward " " nil nil 2) (point-max) nil) +(untabify (point-min) (point-max)) +(delete-trailing-whitespace (point-min) (point-max)) +(save-buffer) diff --git a/graphics/asymptote/builtin.cc b/graphics/asymptote/builtin.cc index ee0c323894..36af37d4d5 100644 --- a/graphics/asymptote/builtin.cc +++ b/graphics/asymptote/builtin.cc @@ -43,13 +43,13 @@ #endif namespace vm { - // Defined in stack.cc - extern vm::frame *make_dummyframe(string name); +// Defined in stack.cc +extern vm::frame *make_dummyframe(string name); } using namespace types; using namespace camp; -using namespace vm; +using namespace vm; namespace trans { using camp::transform; @@ -61,8 +61,8 @@ using run::greater; using run::plus; using run::minus; -using namespace run; - +using namespace run; + void gen_runtime_venv(venv &ve); void gen_runbacktrace_venv(venv &ve); void gen_runpicture_venv(venv &ve); @@ -87,21 +87,21 @@ void addType(tenv &te, symbol name, ty *t) // The base environments for built-in types and functions void base_tenv(tenv &te) { -#define PRIMITIVE(name,Name,asyName) \ - addType(te, symbol::trans(#asyName), prim##Name()); +#define PRIMITIVE(name,Name,asyName) \ + addType(te, symbol::trans(#asyName), prim##Name()); #include "primitives.h" #undef PRIMITIVE } -const formal noformal(0); +const formal noformal(0); function *functionFromFormals(ty *result, - formal f1=noformal, formal f2=noformal, formal f3=noformal, - formal f4=noformal, formal f5=noformal, formal f6=noformal, - formal f7=noformal, formal f8=noformal, formal f9=noformal, - formal fA=noformal, formal fB=noformal, formal fC=noformal, - formal fD=noformal, formal fE=noformal, formal fF=noformal, - formal fG=noformal, formal fH=noformal, formal fI=noformal) + formal f1=noformal, formal f2=noformal, formal f3=noformal, + formal f4=noformal, formal f5=noformal, formal f6=noformal, + formal f7=noformal, formal f8=noformal, formal f9=noformal, + formal fA=noformal, formal fB=noformal, formal fC=noformal, + formal fD=noformal, formal fE=noformal, formal fF=noformal, + formal fG=noformal, formal fH=noformal, formal fI=noformal) { function *fun = new function(result); @@ -136,17 +136,17 @@ void addFunc(venv &ve, access *a, ty *result, symbol id, formal fG=noformal, formal fH=noformal, formal fI=noformal) { function *fun = functionFromFormals(result,f1,f2,f3,f4,f5,f6,f7,f8,f9, - fA,fB,fC,fD,fE,fF,fG,fH,fI); + fA,fB,fC,fD,fE,fF,fG,fH,fI); // NOTE: If the function is a field, we should encode the defining record in // the entry varEntry *ent = new varEntry(fun, a, 0, position()); - + ve.enter(id, ent); } // Add a function with one or more default arguments. -void addFunc(venv &ve, bltin f, ty *result, symbol name, +void addFunc(venv &ve, bltin f, ty *result, symbol name, formal f1, formal f2, formal f3, formal f4, formal f5, formal f6, formal f7, formal f8, formal f9, formal fA, formal fB, formal fC, formal fD, formal fE, formal fF, formal fG, formal fH, formal fI) @@ -157,14 +157,14 @@ void addFunc(venv &ve, bltin f, ty *result, symbol name, // overloaded, so we check for them too. Many builtin functions have so // many arguments that it is noise to print out their full signatures. string s = name; - if (s.find("operator ", 0) == 0 || s == "min" || s == "max") - { - function *fun = functionFromFormals(result,f1,f2,f3,f4,f5,f6,f7,f8,f9, - fA,fB,fC,fD,fE,fF,fG,fH,fI); - ostringstream out; - fun->printVar(out, name); - REGISTER_BLTIN(f, out.str()); - } + if (s.find("operator ", 0) == 0 || s == "min" || s == "max") + { + function *fun = functionFromFormals(result,f1,f2,f3,f4,f5,f6,f7,f8,f9, + fA,fB,fC,fD,fE,fF,fG,fH,fI); + ostringstream out; + fun->printVar(out, name); + REGISTER_BLTIN(f, out.str()); + } else { REGISTER_BLTIN(f, name); } @@ -172,7 +172,7 @@ void addFunc(venv &ve, bltin f, ty *result, symbol name, access *a = new bltinAccess(f); addFunc(ve,a,result,name,f1,f2,f3,f4,f5,f6,f7,f8,f9, - fA,fB,fC,fD,fE,fF,fG,fH,fI); + fA,fB,fC,fD,fE,fF,fG,fH,fI); } void addOpenFunc(venv &ve, bltin f, ty *result, symbol name) @@ -183,7 +183,7 @@ void addOpenFunc(venv &ve, bltin f, ty *result, symbol name) access *a= new bltinAccess(f); varEntry *ent = new varEntry(fun, a, 0, position()); - + ve.enter(name, ent); } @@ -229,7 +229,7 @@ void addRealFunc(venv &ve, symbol name) } #define addRealFunc(fcn, sym) addRealFunc(ve, sym); - + void addRealFunc2(venv &ve, bltin fcn, symbol name) { addFunc(ve,fcn,primReal(),name,formal(primReal(),SYM(a)), @@ -249,7 +249,7 @@ void addRealIntFunc(venv& ve, symbol name, symbol arg1, addFunc(ve, realRealInt, primReal(), name, formal(primReal(), arg1), formal(primInt(), arg2)); } - + void addInitializer(venv &ve, ty *t, access *a) { addFunc(ve, a, t, symbol::initsym); @@ -375,21 +375,21 @@ void addCasts(venv &ve) addCast(ve, primReal(), primInt(), cast); addCast(ve, primPair(), primInt(), cast); addCast(ve, primPair(), primReal(), cast); - + addCast(ve, primPath(), primPair(), cast); addCast(ve, primGuide(), primPair(), pairToGuide); addCast(ve, primGuide(), primPath(), pathToGuide); addCast(ve, primPath(), primGuide(), guideToPath); addCast(ve, primFile(), primNull(), nullFile); - + // Vectorized casts. addExplicitCast(ve, IntArray(), realArray(), arrayToArray); - + addCast(ve, realArray(), IntArray(), arrayToArray); addCast(ve, pairArray(), IntArray(), arrayToArray); addCast(ve, pairArray(), realArray(), arrayToArray); - + addCast(ve, realArray2(), IntArray2(), array2ToArray2); addCast(ve, pairArray2(), IntArray2(), array2ToArray2); addCast(ve, pairArray2(), realArray2(), array2ToArray2); @@ -463,9 +463,9 @@ void addBooleanOps(venv &ve, ty *t1, symbol name, ty *t2) { addBooleanOperator(ve,binaryOp,t1,name); addFunc(ve,opArray, - booleanArray(),name,formal(t1,SYM(a)),formal(t2,SYM(b))); + booleanArray(),name,formal(t1,SYM(a)),formal(t2,SYM(b))); addFunc(ve,arrayOp, - booleanArray(),name,formal(t2,SYM(a)),formal(t1,SYM(b))); + booleanArray(),name,formal(t2,SYM(a)),formal(t1,SYM(b))); addFunc(ve,arrayArrayOp,booleanArray(),name,formal(t2,SYM(a)), formal(t2,SYM(b))); } @@ -483,18 +483,18 @@ void addUnorderedOps(venv &ve, ty *t1, ty *t2, ty *t3, ty *t4) { addBooleanOps(ve,t1,SYM_EQ,t2); addBooleanOps(ve,t1,SYM_NEQ,t2); - + addFunc(ve, run::array2Equals, primBoolean(), SYM_EQ, formal(t3, SYM(a)), formal(t3, SYM(b))); addFunc(ve, run::array2NotEquals, primBoolean(), SYM_NEQ, formal(t3, SYM(a)), formal(t3, SYM(b))); - + addCast(ve,t1,primFile(),read); addCast(ve,t2,primFile(),readArray1); addCast(ve,t3,primFile(),readArray2); addCast(ve,t4,primFile(),readArray3); - + addWrite(ve,write,t1,t2); addRestFunc(ve,writeArray,primVoid(),SYM(write),t3, formal(primFile(),SYM(file),true), @@ -538,15 +538,15 @@ void addOrderedOps(venv &ve, ty *t1, ty *t2, ty *t3, ty *t4) addBooleanOps(ve,t1,SYM_LE,t2); addBooleanOps(ve,t1,SYM_GE,t2); addBooleanOps(ve,t1,SYM_GT,t2); - + addOps(ve,t1,SYM(min),t2); addOps(ve,t1,SYM(max),t2); addBinOps(ve,t1,t2,t3,t4,SYM(min)); addBinOps(ve,t1,t2,t3,t4,SYM(max)); - + addFunc(ve,sortArray,t2,SYM(sort),formal(t2,SYM(a))); addFunc(ve,sortArray2,t3,SYM(sort),formal(t3,SYM(a))); - + addFunc(ve,searchArray,primInt(),SYM(search),formal(t2,SYM(a)), formal(t1,SYM(key))); } @@ -558,7 +558,7 @@ void addBasicOps(venv &ve, ty *t1, ty *t2, ty *t3, ty *t4, bool integer=false, addOps(ve,t1,SYM_PLUS,t2); addOps(ve,t1,SYM_MINUS,t2); addFunc(ve,initialized,primBoolean(),SYM(initialized),formal(t1,SYM(a))); - + addArray2Array2Op(ve,t3,SYM_PLUS); addArray2Array2Op(ve,t3,SYM_MINUS); @@ -571,7 +571,7 @@ void addBasicOps(venv &ve, ty *t1, ty *t2, ty *t3, ty *t4, bool integer=false, formal(t1,SYM(a),false,Explicit), formal(t1,SYM(b),false,Explicit), formal(primReal(),SYM(t))); - + addFunc(ve,sumArray,t1,SYM(sum),formal(t2,SYM(a))); addUnorderedOps(ve,t1,t2,t3,t4); } @@ -581,16 +581,16 @@ void addOps(venv &ve, ty *t1, ty *t2, ty *t3, ty *t4, bool integer=false, bool Explicit=false) { addBasicOps(ve,t1,t2,t3,t4,integer,Explicit); - + addOps(ve,t1,SYM_TIMES,t2); addOpArray2(ve,t1,SYM_TIMES,t3); addArray2Op(ve,t1,SYM_TIMES,t3); - + if(!integer) { addOps(ve,t1,SYM_DIVIDE,t2); addArray2Op(ve,t1,SYM_DIVIDE,t3); } - + addOps(ve,t1,SYM_CARET,t2); } @@ -608,7 +608,7 @@ void addArrayOps(venv &ve, types::array *t) if (ve.lookByType(SYM(alias), &aliasType)) return; - + addFunc(ve, run::arrayAlias, primBoolean(), SYM(alias), formal(t, SYM(a)), formal(t, SYM(b))); @@ -623,23 +623,23 @@ void addArrayOps(venv &ve, types::array *t) t, SYM(array), formal(primInt(), SYM(n)), formal(ct, SYM(value)), formal(primInt(), SYM(depth), true)); - + callable *copyFunc = new thunk(new vm::bfunc(run::copyArray),(Int) depth); addFunc(ve, new callableAccess(copyFunc), t, SYM(copy), formal(t, SYM(a)), formal(primInt(), SYM(depth), true)); addFunc(ve, run::arrayFunction, t, SYM(map), formal(new function(ct, ct), SYM(f)), formal(t, SYM(a))); - + addFunc(ve, run::arraySequence, t, SYM(sequence), formal(new function(ct, primInt()), SYM(f)), formal(primInt(), SYM(n))); - + addFunc(ve, run::arraySort, t, SYM(sort), formal(t, SYM(a)), formal(new function(primBoolean(), ct, ct), SYM(less)), formal(primBoolean(), SYM(stable), true)); - + switch (depth) { case 1: addRestFunc(ve, run::arrayConcat, t, SYM(concat), new types::array(t)); @@ -675,14 +675,14 @@ void addFunctionOps(venv &ve, function *f) } -void addOperators(venv &ve) +void addOperators(venv &ve) { addSimpleOperator(ve,binaryOp,primString(),SYM_PLUS); - + addBooleanOps(ve,primBoolean(),SYM_AMPERSAND,booleanArray()); addBooleanOps(ve,primBoolean(),SYM_BAR,booleanArray()); addBooleanOps(ve,primBoolean(),SYM_CARET,booleanArray()); - + addUnorderedOps(ve,primBoolean(),booleanArray(),booleanArray2(), booleanArray3()); addOps(ve,primInt(),IntArray(),IntArray2(),IntArray3(),true); @@ -703,7 +703,7 @@ void addOperators(venv &ve) addUnorderedOps(ve,primString(),stringArray(),stringArray2(), stringArray3()); - + addSimpleOperator(ve,binaryOp,primPair(),SYM(minbound)); addSimpleOperator(ve,binaryOp,primPair(),SYM(maxbound)); addSimpleOperator(ve,binaryOp,primTriple(),SYM(minbound)); @@ -716,17 +716,17 @@ void addOperators(venv &ve) tripleArray3(),SYM(minbound)); addBinOps(ve,primTriple(),tripleArray(),tripleArray2(), tripleArray3(),SYM(maxbound)); - + addFunc(ve,arrayFunc,realArray(),SYM(abs), formal(pairArray(),SYM(a))); addFunc(ve,arrayFunc,realArray(),SYM(abs), formal(tripleArray(),SYM(a))); - + addFunc(ve,arrayFunc,pairArray(),SYM(conj), formal(pairArray(),SYM(a))); addFunc(ve,arrayFunc2,pairArray2(),SYM(conj), formal(pairArray2(),SYM(a))); - + addFunc(ve,binaryOp,primReal(),SYM_DIVIDE, formal(primInt(),SYM(a)),formal(primInt(),SYM(b))); addFunc(ve,arrayOp,realArray(),SYM_DIVIDE, @@ -735,16 +735,16 @@ void addOperators(venv &ve) formal(primInt(),SYM(a)),formal(IntArray(),SYM(b))); addFunc(ve,arrayArrayOp,realArray(),SYM_DIVIDE, formal(IntArray(),SYM(a)),formal(IntArray(),SYM(b))); - + addOrderedOps(ve,primInt(),IntArray(),IntArray2(),IntArray3()); addOrderedOps(ve,primReal(),realArray(),realArray2(),realArray3()); addOrderedOps(ve,primString(),stringArray(),stringArray2(), stringArray3()); - + addOps(ve,primInt(),SYM_MOD,IntArray()); addOps(ve,primInt(),SYM_QUOTIENT,IntArray()); addOps(ve,primReal(),SYM_MOD,realArray()); - + addRestFunc(ve,diagonal,IntArray2(),SYM(diagonal),IntArray()); addRestFunc(ve,diagonal,realArray2(),SYM(diagonal),realArray()); addRestFunc(ve,diagonal,pairArray2(),SYM(diagonal),pairArray()); @@ -770,7 +770,7 @@ void openFunc(stack *Stack) size_t numArgs=checkArray(a); for (size_t k=0; kpush((Int)numArgs); } #endif @@ -779,7 +779,7 @@ void openFunc(stack *Stack) void printBytecode(stack *Stack) { // As arbitrary addresses can be sent to printBytecode, it should not be run - // in safe mode. + // in safe mode. if (settings::safe) { cerr << "use -nosafe flag to enable printBytecode" << endl; return; @@ -815,7 +815,7 @@ void base_venv(venv &ve) addOperators(ve); addTupleOperators(ve); addGuideOperators(ve); - + addRealFunc(sin,SYM(sin)); addRealFunc(cos,SYM(cos)); addRealFunc(tan,SYM(tan)); @@ -841,18 +841,18 @@ void base_venv(venv &ve) addRealFunc(pow10,SYM(pow10)); addRealFunc(identity,SYM(identity)); - + #ifdef STRUCTEXAMPLE dummyRecord *fun=createDummyRecord(ve, SYM(test)); addFunc(fun->e.ve,realReal,primReal(),SYM(f),formal(primReal(),SYM(x))); addVariable(fun->e.ve,1,primInt(),SYM(x)); #endif - + addFunc(ve,writestring,primVoid(),SYM(write), formal(primFile(),SYM(file),true), formal(primString(),SYM(s)), formal(voidFileFunction(),SYM(suffix),true)); - + addWrite(ve,write,primTransform(),transformArray()); addWrite(ve,write,primGuide(),guideArray()); addWrite(ve,write,primPen(),penArray()); @@ -867,7 +867,7 @@ void base_venv(venv &ve) addFunc(ve,arrayFunction,IntArray(),SYM(map), formal(IntRealFunction(),SYM(f)), formal(realArray(),SYM(a))); - + addConstant(ve, Int_MAX, primInt(), SYM(intMax)); addConstant(ve, Int_MIN, primInt(), SYM(intMin)); addConstant(ve, HUGE_VAL, primReal(), SYM(inf)); @@ -903,7 +903,7 @@ void base_venv(venv &ve) gen_runpath_venv(ve); gen_runpath3d_venv(ve); gen_runmath_venv(ve); - + #ifdef HAVE_LIBGSL gen_rungsl_venv(ve); #endif @@ -924,8 +924,8 @@ void arrayDeleteHelper(stack *Stack) Int i,j; if(isdefault(iti)) { if(jdefault) { - (*a).clear(); - return; + (*a).clear(); + return; } else i=j=get(itj); } else { i=get(iti); @@ -940,7 +940,7 @@ void arrayDeleteHelper(stack *Stack) } i=imod(i,asize); j=imod(j,asize); - if(j >= i) + if(j >= i) (*a).erase((*a).begin()+i,(*a).begin()+j+1); else { (*a).erase((*a).begin()+i,(*a).end()); @@ -948,10 +948,10 @@ void arrayDeleteHelper(stack *Stack) } return; } - + if(i < 0 || i >= (Int) asize || i > j || j >= (Int) asize) { ostringstream buf; - buf << "delete called on array of length " << (Int) asize + buf << "delete called on array of length " << (Int) asize << " with out-of-bounds index range [" << i << "," << j << "]"; error(buf); } diff --git a/graphics/asymptote/builtin.h b/graphics/asymptote/builtin.h index f29a97ccd4..d59c5aa8c8 100644 --- a/graphics/asymptote/builtin.h +++ b/graphics/asymptote/builtin.h @@ -21,9 +21,9 @@ void base_tenv(tenv &); void base_venv(venv &); extern const types::formal noformal; - + // Add a function with one or more default arguments. -void addFunc(venv &ve, vm::bltin f, types::ty *result, symbol name, +void addFunc(venv &ve, vm::bltin f, types::ty *result, symbol name, types::formal f1=noformal, types::formal f2=noformal, types::formal f3=noformal, types::formal f4=noformal, types::formal f5=noformal, types::formal f6=noformal, @@ -33,7 +33,7 @@ void addFunc(venv &ve, vm::bltin f, types::ty *result, symbol name, types::formal fD=noformal, types::formal fE=noformal, types::formal fF=noformal, types::formal fG=noformal, types::formal fH=noformal, types::formal fI=noformal); - + // Adds standard functions for a newly added types. void addArrayOps(venv &ve, types::array *t); void addRecordOps(venv &ve, types::record *r); @@ -43,7 +43,7 @@ void addFunctionOps(venv &ve, types::function *f); types::record *getGSLModule(); void GSLrngFree(); #endif - + } //namespace trans namespace run { diff --git a/graphics/asymptote/callable.h b/graphics/asymptote/callable.h index 851ccb4623..f870d48d97 100644 --- a/graphics/asymptote/callable.h +++ b/graphics/asymptote/callable.h @@ -1,7 +1,7 @@ /***** * callable.h * Tom Prince 2005/06/19 - * + * * Runtime representation of functions. *****/ @@ -51,7 +51,7 @@ struct func : public callable { void print(ostream& out); }; -class bfunc : public callable +class bfunc : public callable { public: bfunc(bltin b) : func(b) {} diff --git a/graphics/asymptote/camperror.cc b/graphics/asymptote/camperror.cc index 8fb782b415..8b36310a47 100644 --- a/graphics/asymptote/camperror.cc +++ b/graphics/asymptote/camperror.cc @@ -23,7 +23,7 @@ void reportError(const string& desc) em.runtime(vm::getPos()); em << desc; em.sync(); - throw handled_error(); + throw handled_error(); } // Used internally to report a warning in an operation. @@ -41,7 +41,7 @@ void reportFatal(const string& desc) em.sync(); em.statusError(); try { - throw quit(); + throw quit(); } catch(handled_error) { } } @@ -50,15 +50,15 @@ void reportError(const ostringstream& desc) { reportError(desc.str()); } - + void reportWarning(const ostringstream& desc) { reportWarning(desc.str()); } - + void reportFatal(const ostringstream& desc) { reportFatal(desc.str()); } - + } // namespace camp diff --git a/graphics/asymptote/camperror.h b/graphics/asymptote/camperror.h index b6adaaf63f..cf00d56e0b 100644 --- a/graphics/asymptote/camperror.h +++ b/graphics/asymptote/camperror.h @@ -20,10 +20,10 @@ namespace camp { // Used internally to report an error in an operation. void reportError(const string& desc); void reportError(const ostringstream& desc); - + void reportWarning(const string& desc); void reportWarning(const ostringstream& desc); - + void reportFatal(const string& desc); void reportFatal(const ostringstream& desc); diff --git a/graphics/asymptote/castop.h b/graphics/asymptote/castop.h index 1c788687ab..cfabf94eed 100644 --- a/graphics/asymptote/castop.h +++ b/graphics/asymptote/castop.h @@ -48,15 +48,10 @@ template void castString(vm::stack *s) { string *S=pop(s); - if(S->empty()) { - T x=0; - s->push(x); - } else { - try { - s->push(lexical::cast(*S)); - } catch (lexical::bad_cast&) { - s->push(vm::Default); - } + try { + s->push(lexical::cast(*S)); + } catch (lexical::bad_cast&) { + s->push(vm::Default); } } @@ -107,7 +102,7 @@ void read(vm::stack *s) } inline Int Limit(Int nx) {return nx == 0 ? Int_MAX : nx;} -inline void reportEof(camp::file *f, Int count) +inline void reportEof(camp::file *f, Int count) { if(count > 0) { ostringstream buf; @@ -195,19 +190,19 @@ void readArray(vm::stack *s, Int nx=-1, Int ny=-1, Int nz=-1) template void readArray1(vm::stack *s) { - readArray(s,0); + readArray(s,0); } template void readArray2(vm::stack *s) { - readArray(s,0,0); + readArray(s,0,0); } template void readArray3(vm::stack *s) { - readArray(s,0,0,0); + readArray(s,0,0,0); } } // namespace run diff --git a/graphics/asymptote/cc-mode2.el b/graphics/asymptote/cc-mode2.el new file mode 100644 index 0000000000..e3eb041d6a --- /dev/null +++ b/graphics/asymptote/cc-mode2.el @@ -0,0 +1,38 @@ +(when (require 'cc-mode nil t) + (require 'asy-mode nil t) + + (defvar my-c-style '((c-basic-offset . 2) + (c-tab-always-indent . nil) + (c-offsets-alist . ((innamespace nil) + (inline-open nil) + (case-label +) + )) + (c-cleanup-list . (brace-else-brace + brace-else-if-brace + brace-catch-brace + empty-defun-braces + defun-close-semi)) + (c-hanging-braces-alist . ((brace-list-open) + (brace-entry-open) + (statement-cont) + (substatement-open after) + (block-close . c-snug-do-while) + (extern-lang-open after) + (inline-open) + (inline-close) + (namespace-open after))) + (c-hanging-semi&comma-criteria . (c-semi&comma-no-newlines-for-oneline-inliners + c-semi&comma-no-newlines-before-nonblanks + c-semi&comma-inside-parenlist)) + )) + + (setq c-mode-hook 'c++-mode) + + (defun c-mode-common-addn() "Additions to c-and-c++-mode." + (c-add-style "jcb" my-c-style t) +;; (c-toggle-auto-hungry-state 1) + (auto-fill-mode) + ) + + (setq c-mode-common-hook 'c-mode-common-addn) + ) diff --git a/graphics/asymptote/coder.cc b/graphics/asymptote/coder.cc index 02bb27599f..1beb3b5860 100644 --- a/graphics/asymptote/coder.cc +++ b/graphics/asymptote/coder.cc @@ -41,7 +41,7 @@ coder::coder(position pos, string name, modifier sord) #if SIMPLE_FRAME : level(frame::indirect_frame(name)), #else - : level(new frame(name, 0, 0)), + : level(new frame(name, 0, 0)), #endif recordLevel(0), recordType(0), @@ -63,7 +63,7 @@ coder::coder(position pos, string name, function *t, coder *parent, : level(reframe ? new frame(name, parent->getFrame(), t->sig.getNumFormals()) : - parent->getFrame()), + parent->getFrame()), recordLevel(parent->recordLevel), recordType(parent->recordType), isCodelet(!reframe), @@ -112,7 +112,7 @@ record *coder::newRecord(symbol id) frame *underlevel = getFrame(); frame *level = new frame(id, underlevel, 0); - + record *r = new record(id, level); return r; @@ -165,7 +165,7 @@ void coder::encodePop() bool coder::encode(frame *f) { frame *toplevel = getFrame(); - + if (f == 0) { encode(inst::constpush,(item)0); return true; @@ -225,7 +225,7 @@ label coder::defNewLabel() { if (isStatic()) return parent->defNewLabel(); - + label l = new label_t(); assert(!l->location.defined()); assert(!l->firstUse.defined()); @@ -266,7 +266,7 @@ void coder::useLabel(inst::opcode op, label label) { if (isStatic()) return parent->useLabel(op,label); - + if (label->location.defined()) { encode(op, label->location); } else { @@ -287,7 +287,7 @@ label coder::fwdLabel() { if (isStatic()) return parent->fwdLabel(); - + // Create a new label without specifying its position. label l = new label_t(); assert(!l->location.defined()); diff --git a/graphics/asymptote/coder.h b/graphics/asymptote/coder.h index df44b0310e..e07aa11e63 100644 --- a/graphics/asymptote/coder.h +++ b/graphics/asymptote/coder.h @@ -62,12 +62,12 @@ class coder { frame *level; // The frame of the enclosing record that the "this" expression yields. ie. - // the highest frame that is a record, not a function. + // the highest frame that is a record, not a function. frame *recordLevel; // The type of the enclosing record. Also needed for the "this" expression. record *recordType; - + // Are we translating a codelet? bool isCodelet; @@ -94,7 +94,7 @@ class coder { // TODO: Ensure private fields don't show up calling lookup for a // record. permission perm; - + // The function code as its being written. Code points to next place in // array to write. vm::program *program; @@ -139,9 +139,9 @@ public: coder(position pos, string name, modifier sord = DEFAULT_DYNAMIC); - + coder(const coder&); - + /* Add a static or dynamic modifier. */ void pushModifier(modifier s) { @@ -195,7 +195,7 @@ public: { perm = DEFAULT_PERM; } - + // Says what the return type of the function is. ty *getReturnType() { @@ -203,7 +203,7 @@ public: } bool isRecord(); - + // Creates a new coder to handle the translation of a new function. coder newFunction(position pos, string name, function *t, modifier sord=DEFAULT_DYNAMIC); @@ -345,7 +345,7 @@ public: // If an address has to be used for a jump instruction before it is // actually encoded, a handle can be given to it by this function. // When that handle's label is later defined, the proper address will - // be inserted into the code where the handle was used. + // be inserted into the code where the handle was used. label fwdLabel(); void pushLoop(label c, label b) { diff --git a/graphics/asymptote/common.h b/graphics/asymptote/common.h index 8b45967d1f..80dfef8ac3 100644 --- a/graphics/asymptote/common.h +++ b/graphics/asymptote/common.h @@ -16,7 +16,7 @@ #include "config.h" #endif -#if !defined(FOR_SHARED) && \ +#if !defined(FOR_SHARED) && \ ((defined(HAVE_LIBGL) && defined(HAVE_LIBGLUT) && defined(HAVE_LIBGLM)) || \ defined(HAVE_LIBOSMESA)) #define HAVE_GL @@ -88,4 +88,13 @@ using mem::istringstream; using mem::ostringstream; using mem::stringbuf; -#endif +static const struct ws_t {} ws={}; + +// Portable way of skipping whitespace +inline std::istream &operator >> (std::istream & s, const ws_t &ws) { + if(!s.eof()) + s >> std::ws; + return s; +} + +#endif diff --git a/graphics/asymptote/config.h.in b/graphics/asymptote/config.h.in index 1bc91cc1ce..c6b6c524e7 100644 --- a/graphics/asymptote/config.h.in +++ b/graphics/asymptote/config.h.in @@ -45,6 +45,9 @@ /* Define to 1 if you have the `lgamma' function. */ #undef HAVE_LGAMMA +/* Define to 1 if you have the `curl' library (-lcurl). */ +#undef HAVE_LIBCURL + /* Define to 1 if you have the `ncurses' library (-lncurses). */ #undef HAVE_LIBCURSES diff --git a/graphics/asymptote/configure b/graphics/asymptote/configure index f1ee0bf823..d29ed0cf4a 100755 --- a/graphics/asymptote/configure +++ b/graphics/asymptote/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Asymptote 2.66. +# Generated by GNU Autoconf 2.69 for Asymptote 2.67. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Asymptote' PACKAGE_TARNAME='asymptote' -PACKAGE_VERSION='2.66' -PACKAGE_STRING='Asymptote 2.66' +PACKAGE_VERSION='2.67' +PACKAGE_STRING='Asymptote 2.67' PACKAGE_BUGREPORT='http://sourceforge.net/projects/asymptote' PACKAGE_URL='' @@ -1287,7 +1287,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Asymptote 2.66 to adapt to many kinds of systems. +\`configure' configures Asymptote 2.67 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1352,7 +1352,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Asymptote 2.66:";; + short | recursive ) echo "Configuration of Asymptote 2.67:";; esac cat <<\_ACEOF @@ -1468,7 +1468,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Asymptote configure 2.66 +Asymptote configure 2.67 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2054,7 +2054,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Asymptote $as_me 2.66, which was +It was created by Asymptote $as_me 2.67, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -6661,6 +6661,55 @@ _ACEOF fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_init in -lcurl" >&5 +$as_echo_n "checking for curl_easy_init in -lcurl... " >&6; } +if ${ac_cv_lib_curl_curl_easy_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcurl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char curl_easy_init (); +int +main () +{ +return curl_easy_init (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_curl_curl_easy_init=yes +else + ac_cv_lib_curl_curl_easy_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_init" >&5 +$as_echo "$ac_cv_lib_curl_curl_easy_init" >&6; } +if test "x$ac_cv_lib_curl_curl_easy_init" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBCURL 1 +_ACEOF + + LIBS="-lcurl $LIBS" + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libcurl: will compile without optional URL support. ***" >&5 +$as_echo "$as_me: *** Could not find libcurl: will compile without optional URL support. ***" >&6;} +fi + + # Check whether --enable-readline was given. if test "${enable_readline+set}" = set; then : enableval=$enable_readline; @@ -9266,7 +9315,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Asymptote $as_me 2.66, which was +This file was extended by Asymptote $as_me 2.67, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9328,7 +9377,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Asymptote config.status 2.66 +Asymptote config.status 2.67 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/graphics/asymptote/configure.ac b/graphics/asymptote/configure.ac index 24b6268d5f..fd61d7974d 100644 --- a/graphics/asymptote/configure.ac +++ b/graphics/asymptote/configure.ac @@ -3,7 +3,7 @@ # this file. AC_PREREQ(2) -AC_INIT([Asymptote],[2.66],[http://sourceforge.net/projects/asymptote]) +AC_INIT([Asymptote],[2.67],[http://sourceforge.net/projects/asymptote]) VERSION=$PACKAGE_VERSION AC_SUBST(VERSION) m4_include([ax_pthread.m4]) @@ -265,6 +265,9 @@ fi AC_CHECK_LIB([rt], [sched_yield]) +AC_CHECK_LIB([curl],[curl_easy_init],, +AC_MSG_NOTICE([*** Could not find libcurl: will compile without optional URL support. ***])) + AC_ARG_ENABLE(readline, [AS_HELP_STRING(--enable-readline[[[=yes]]],enable GNU Readline Library)]) diff --git a/graphics/asymptote/constructor.cc b/graphics/asymptote/constructor.cc index 87960f1842..68e9b803d5 100644 --- a/graphics/asymptote/constructor.cc +++ b/graphics/asymptote/constructor.cc @@ -46,7 +46,7 @@ bool definesImplicitConstructor(coenv &e, record *r, varEntry *v, symbol id) if (ft->getResult()->kind == ty_void) return true; } - + return false; } @@ -91,7 +91,7 @@ varEntry *constructorFromInitializer(position pos, coenv &e, record *r, assert(r); types::function *ft=new types::function(r, init->getSignature()); - + ostringstream out; ft->printVar(out, symbol::trans("")); @@ -101,7 +101,7 @@ varEntry *constructorFromInitializer(position pos, coenv &e, record *r, // Translate the function. fe.e.beginScope(); - + transConstructorBody(pos, fe, r, init); fe.e.endScope(); diff --git a/graphics/asymptote/dec.cc b/graphics/asymptote/dec.cc index c2b691a258..bcf842b40d 100644 --- a/graphics/asymptote/dec.cc +++ b/graphics/asymptote/dec.cc @@ -94,7 +94,7 @@ void arrayTy::addOps(coenv &e, record *r) r->e.addArrayOps(at); } } - + types::ty *arrayTy::trans(coenv &e, bool tacit) { types::ty *ct = cell->trans(e, tacit); @@ -106,7 +106,7 @@ types::ty *arrayTy::trans(coenv &e, bool tacit) types::array *t = dims->truetype(ct); assert(t); - + return t; } @@ -188,7 +188,7 @@ record *block::transAsFile(genv& ge, symbol id) } transAsRecordBody(ce, r); em.sync(); - + return r; } @@ -208,22 +208,22 @@ vardec *block::asVardec() for (list::iterator p=stms.begin(); p != stms.end(); ++p) - { - vardec *v = dynamic_cast(*p); - if (v) { - if (var) - // Multiple vardecs. + { + vardec *v = dynamic_cast(*p); + if (v) { + if (var) + // Multiple vardecs. + return 0; + var = v; + } + else if (!dynamic_cast(*p)) + // Failure due to another runnable in the block. return 0; - var = v; } - else if (!dynamic_cast(*p)) - // Failure due to another runnable in the block. - return 0; - } return var; } - + void dec::prettyprint(ostream &out, Int indent) { @@ -235,7 +235,7 @@ void modifierList::prettyprint(ostream &out, Int indent) { prettyindent(out,indent); out << "modifierList ("; - + for (list::iterator p = mods.begin(); p != mods.end(); ++p) { if (p != mods.begin()) out << ", "; @@ -243,16 +243,16 @@ void modifierList::prettyprint(ostream &out, Int indent) case EXPLICIT_STATIC: out << "static"; break; -#if 0 +#if 0 case EXPLICIT_DYNAMIC: out << "dynamic"; break; -#endif +#endif default: out << "invalid code"; } } - + for (list::iterator p = perms.begin(); p != perms.end(); ++p) { if (p != perms.begin() || !mods.empty()) out << ", "; @@ -317,12 +317,12 @@ void modifiedRunnable::transAsField(coenv &e, record *r) } permission p = mods->getPermission(); -#if 0 // This is innocuous +#if 0 // This is innocuous if (p != DEFAULT_PERM && (!r || !body->allowPermissions())) { em.warning(pos); em << "permission modifier is meaningless"; } -#endif +#endif e.c.setPermission(p); body->transAsField(e,r); @@ -464,7 +464,7 @@ void initializeVar(position pos, coenv &e, varEntry *v, varinit *init) definit d(pos); d.transToType(e, t); } - + v->getLocation()->encode(WRITE, pos, e.c); e.c.encodePop(); } @@ -550,7 +550,7 @@ void decid::transAsTypedefField(coenv &e, trans::tyEntry *base, record *r) em.error(getPos()); em << "type definition cannot have initializer"; } - + start->addOps(base->t, e, r); addTypeWithPermission(e, r, ent, start->getName()); @@ -872,7 +872,7 @@ void recorddec::transAsField(coenv &e, record *parent) { record *r = parent ? parent->newRecord(id, e.c.isStatic()) : e.c.newRecord(id); - + addTypeWithPermission(e, parent, new trans::tyEntry(r,0,parent,getPos()), id); e.e.addRecordOps(r); if (parent) @@ -881,7 +881,7 @@ void recorddec::transAsField(coenv &e, record *parent) // Start translating the initializer. coder c=e.c.newRecordInit(getPos(), r); coenv re(c,e.e); - + body->transAsRecordBody(re, r); // After the record is translated, add a default initializer so that a @@ -893,7 +893,7 @@ void recorddec::transAsField(coenv &e, record *parent) // the enclosing environment. These are the implicit constructors defined by // "operator init". addPostRecordEnvironment(e, r, parent); -} +} runnable *autoplainRunnable() { // Abstract syntax for the code: diff --git a/graphics/asymptote/dec.h b/graphics/asymptote/dec.h index 5b7f0756cc..1aae5a8fb6 100644 --- a/graphics/asymptote/dec.h +++ b/graphics/asymptote/dec.h @@ -53,7 +53,7 @@ public: virtual void prettyprint(ostream &out, Int indent) = 0; // If we introduced a new type, automatically add corresponding functions for - // that type. + // that type. virtual void addOps(coenv &, record *) {} // Returns the internal representation of the type. This method can @@ -90,7 +90,7 @@ public: void increase() { depth++; } - + size_t size() { return depth; } @@ -142,13 +142,13 @@ public: : absyn(pos) {} virtual void prettyprint(ostream &out, Int indent) = 0; - + void markTrans(coenv &e) { markPos(e); trans(e); } - + /* Translates the stm or dec as if it were in a function definition. */ virtual void trans(coenv &e) { transAsField(e, 0); @@ -182,10 +182,10 @@ public: { return false; } // Returns true if it is syntatically allowable to modify this - // runnable by a PUBLIC or PRIVATE modifier. + // runnable by a PUBLIC or PRIVATE modifier. virtual bool allowPermissions() { return false; } -}; +}; class block : public runnable { public: @@ -356,7 +356,7 @@ public: virtual void transAsField(coenv &e, record *r, types::ty *base); - // Translate, but add the names in as types rather than variables. + // Translate, but add the names in as types rather than variables. virtual void transAsTypedefField(coenv &e, trans::tyEntry *base, record *r); decidstart *getStart() { return start; } @@ -370,7 +370,7 @@ public: : absyn(pos) {} virtual ~decidlist() {} - + void add(decid *p) { decs.push_back(p); } @@ -379,9 +379,9 @@ public: virtual void transAsField(coenv &e, record *r, types::ty *base); - // Translate, but add the names in as types rather than variables. + // Translate, but add the names in as types rather than variables. virtual void transAsTypedefField(coenv &e, trans::tyEntry *base, record *r); - + // If the list consists of a single entry, return it. decid *singleEntry() { @@ -428,7 +428,7 @@ public: decs->transAsField(e, r, base->trans(e)); } - // Translate, but add the names in as types rather than variables. + // Translate, but add the names in as types rather than variables. virtual void transAsTypedefField(coenv &e, record *r); // If the vardec encodes a single declaration, return the name of that @@ -466,7 +466,7 @@ struct idpair : public absyn { // Translates as: access src as dest; void transAsAccess(coenv &e, record *r); - + // Translates as: from _ unravel src as dest; // where _ is the qualifier record with source as its fields and types. void transAsUnravel(coenv &e, record *r, @@ -594,7 +594,7 @@ public: void transAsField(coenv &e, record *r) { base.transAsField(e, r); } - + void prettyprint(ostream &out, Int indent); }; @@ -655,7 +655,7 @@ public: runnable *autoplainRunnable(); void addVar(coenv &e, record *r, varEntry *v, symbol id); - + } // namespace absyntax #endif diff --git a/graphics/asymptote/doc/CAD.pdf b/graphics/asymptote/doc/CAD.pdf index 5e30ef61c7..735ca54509 100644 Binary files a/graphics/asymptote/doc/CAD.pdf and b/graphics/asymptote/doc/CAD.pdf differ diff --git a/graphics/asymptote/doc/CDlabel.asy b/graphics/asymptote/doc/CDlabel.asy index 2ac1272c9f..51d8c89110 100644 --- a/graphics/asymptote/doc/CDlabel.asy +++ b/graphics/asymptote/doc/CDlabel.asy @@ -5,7 +5,7 @@ asy(nativeformat(),"logo"); fill(unitcircle^^(scale(2/11.7)*unitcircle), evenodd+rgb(124/255,205/255,124/255)); label(scale(1.1)*minipage( -"\centering\scriptsize \textbf{\LARGE {\tt Asymptote}\\ + "\centering\scriptsize \textbf{\LARGE {\tt Asymptote}\\ \smallskip \small The Vector Graphics Language}\\ \smallskip diff --git a/graphics/asymptote/doc/FAQ/asy-faq.bfnn b/graphics/asymptote/doc/FAQ/asy-faq.bfnn index 2d3955af07..927d4c753d 100644 --- a/graphics/asymptote/doc/FAQ/asy-faq.bfnn +++ b/graphics/asymptote/doc/FAQ/asy-faq.bfnn @@ -5,7 +5,7 @@ \comment The format and scripts come from the Linux FAQ, by \comment Ian Jackson. \set brieftitle Asymptote FAQ -\set author Asymptote +\set author Asymptote \set title Asymptote Frequently Asked Questions \copyto ASCII ASYMPTOTE FREQUENTLY ASKED QUESTIONS @@ -49,7 +49,7 @@ C++-like syntax. Unlike MetaPost, it natively supports multiple-segment paths Binary releases are available for Linux, MacOS X, and Microsoft Windows platforms, in addition to full source code, from the website -\docref{http://asymptote.sourceforge.net/\}. Many Linux distributions +\docref{https://asymptote.sourceforge.io/\}. Many Linux distributions (such as RedHat and Debian) now include an Asymptote package (check your distribution's documentation for further information about this). @@ -57,7 +57,7 @@ distribution's documentation for further information about this). If you have a question, please try to find an answer in this FAQ, in the extensive Asymptote documentation at -\docref{http://asymptote.sourceforge.net/doc/\}, or search the forum: +\docref{https://asymptote.sourceforge.io/doc/\}, or search the forum: \docref{http://sourceforge.net/forum/forum.php?forum_id=409349\}. \question 02sep:whyasy Why was the name Asymptote chosen? @@ -97,7 +97,7 @@ official source: \question 04nov:brokenpdftex What do I do if I get the error: \courier{Error: pdfetex (file pdftex.cfg): cannot open config file...texinfo.tex appears to be broken\}? -Simply put \docref{http://asymptote.sourceforge.net/asymptote.pdf\} +Simply put \docref{https://asymptote.sourceforge.io/asymptote.pdf\} in the directory \courier{doc\} and repeat the command \courier{make all\}. Or, if you don't want to build a local copy of the documentation, simply proceed with \courier{make install-asy\}. @@ -113,7 +113,7 @@ guide on the topic. You can download it from \docref{http://dario.dse.nl/projects/asylatex/\}. Philippe Ivaldi has contributed an Asymptote mode for Emacs users -\docref{http://asymptote.sourceforge.net/doc/Editing-modes.html\}, +\docref{https://asymptote.sourceforge.io/doc/Editing-modes.html\}, which includes a \courier{lasy-mode\} that allows one to compile and view the output of one \\begin{asy}...\\end{asy} section at a time. @@ -279,7 +279,7 @@ defaultpen(TimesRoman()); \question 28jun:internatfonts How can I use international fonts in Asymptote labels? -See \docref{http://asymptote.sourceforge.net/doc/unicode.html\}. +See \docref{https://asymptote.sourceforge.io/doc/Pens.html\}. \question 10jul:Fourier How can I use Fourier fonts? @@ -321,7 +321,7 @@ draw(rotate(90,project(Z))*"A",O--X); \question 02sep:fixedsize How can I draw some squares and circles of a fixed size and put a label in the middle of them? Fixed-size objects should be drawn on a separate picture and then added to -currentpicture. Here is one way (see also \docref{http://asymptote.sourceforge.net/gallery/subpictures.asy\} and \docref{http://asymptote.sourceforge.net/gallery/mosquito.asy\}): +currentpicture. Here is one way (see also \docref{https://asymptote.sourceforge.io/gallery/subpictures.asy\} and \docref{https://asymptote.sourceforge.io/gallery/mosquito.asy\}): \verbatim real u=2cm; @@ -594,7 +594,7 @@ label. Other possible overwrite arguments are Allow (allows overlapping labels; the default), Suppress (an overlapping label will not be written at all), SuppressQuiet, and MoveQuiet. The last two achieve the same result as the non-quiet types, but will not notify you which labels are overlapping. See: -\docref{http://asymptote.sourceforge.net/doc/Pens.html\}. +\docref{https://asymptote.sourceforge.io/doc/Pens.html\}. In the case of a user-specified tick array, you can change which labels get suppressed/moved by changing the order of array entries. @@ -645,7 +645,7 @@ have the same scaling and same resulting figure size (just ensure the two coordinates given to \courier{fixedscaling()\} leaves room for any labels). See also -\docref{http://asymptote.sourceforge.net/doc/Frames-and-pictures.html\}. +\docref{https://asymptote.sourceforge.io/doc/Frames-and-pictures.html\}. \question 26jun:graphlimits How can I plot a function f(x) within [0,1]x[0,2] without explicitly calculating the x values for which f(x) hits the boundary? @@ -663,7 +663,7 @@ xaxis("$x$",BottomTop,LeftTicks); yaxis("$y$",LeftRight,RightTicks); \endverbatim -See also \docref{http://asymptote.sourceforge.net/doc/graph.html\}. +See also \docref{https://asymptote.sourceforge.io/doc/graph.html\}. \question 26jun:custompalettes Is it possible to define customized palettes? @@ -745,12 +745,12 @@ distance(A,B,"$\ell$",1); \question 26jun:log2 How can I make the y axis display base-2 logarithmic values? -See the example \docref{http://asymptote.sourceforge.net/gallery/2D graphs/log2graph.asy\}. +See the example \docref{https://asymptote.sourceforge.io/gallery/2D graphs/log2graph.asy\}. \question 27jun:align How can I align the x axes of two graphs on the same figure? An easy way to do this, if the axes to be aligned have the same scaling -and size, is illustrated in the example \docref{http://asymptote.sourceforge.net/gallery/2D graphs/alignedaxis.asy\}. +and size, is illustrated in the example \docref{https://asymptote.sourceforge.io/gallery/2D graphs/alignedaxis.asy\}. Here is a more general solution to the problem of aligning two arbitrary axes. One fits the second picture to a frame based on the horizontal scaling for @@ -813,7 +813,7 @@ add(shift(0,-height)*(shift(shift)*pic2).fit(T)); \question 27jun:changeaxis How can I change the direction of the y-axis, such that negatives values are on the upper y-axis? -Here is a simple example (see also the example \docref{http://asymptote.sourceforge.net/gallery/2D graphs/diatom.asy\} or the discussion +Here is a simple example (see also the example \docref{https://asymptote.sourceforge.io/gallery/2D graphs/diatom.asy\} or the discussion of Linear(-1) in the documentation): \verbatim @@ -847,7 +847,7 @@ y=t x=(t-2)^2+1 \endverbatim -See the example \docref{http://asymptote.sourceforge.net/gallery/2D graphs/parametricgraph.asy\}. +See the example \docref{https://asymptote.sourceforge.io/gallery/2D graphs/parametricgraph.asy\}. \question 27jun:scalesecondaryaxis Is it possible to reverse or stretch an axis? @@ -1037,7 +1037,7 @@ at least until the end of the file or prompt's run. Yes, Asymptote includes a line-based debugger: -\docref{http://asymptote.sourceforge.net/doc/Debugger.html\} +\docref{https://asymptote.sourceforge.io/doc/Debugger.html\} \question 27jun:patches Do you accept patches for Asymptote? @@ -1065,7 +1065,7 @@ distinguishes between true-size objects and objects that should scale with the picture size. The resulting linear programming problem is solved via the Simplex method. -See the \docref{http://asymptote.sourceforge.net/gallery/dimension.asy\} example for an example of how deferred drawing is +See the \docref{https://asymptote.sourceforge.io/gallery/dimension.asy\} example for an example of how deferred drawing is used to accomodate both user and true-size (PostScript) coordinates. \question 02sep:manualscaling How can I avoid automatic scaling of a picture? @@ -1116,7 +1116,7 @@ this returns the intersection point of the extensions of the line segments could be persuaded to add something similar if someone can justify the need. In the meantime, one can always use the explicit built-in linear solver \courier{solve\} (see -\docref{http://asymptote.sourceforge.net/doc/solve.html\}), which uses LU +\docref{https://asymptote.sourceforge.io/doc/solve.html\}), which uses LU decomposition. \question 23jun:lray What is the equivalent for the MetaPost command for \courier{lray - horiz*v - verti*u = whatever*(LightSource - R)\}, a system of three linear equations for three unknowns: \courier{horiz, verti, whatever\}? @@ -1212,7 +1212,7 @@ clip(100,100); \endverbatim See also the discussion of tilings in the documentation: -\docref{http://asymptote.sourceforge.net/doc/Pens.html\}. +\docref{https://asymptote.sourceforge.io/doc/Pens.html\}. \comment ###################################################################### @@ -1232,7 +1232,7 @@ batchView=false; \endverbatim in their \courier{config.asy\} file. See -\docref{http://asymptote.sourceforge.net/doc/Options.html\}. +\docref{https://asymptote.sourceforge.io/doc/Options.html\}. \question 26jun:jpeg How do I output jpeg images? @@ -1251,8 +1251,8 @@ Label: label(graphic("file"),(0,0)); \endverbatim -See the example \docref{http://asymptote.sourceforge.net/gallery/orthocenter.asy\} and -\docref{http://asymptote.sourceforge.net/doc/label.html\}. +See the example \docref{https://asymptote.sourceforge.io/gallery/orthocenter.asy\} and +\docref{https://asymptote.sourceforge.io/doc/label.html\}. \question 28jun:directpdf Does Asymptote support direct PDF output? diff --git a/graphics/asymptote/doc/FAQ/asy-faq.info b/graphics/asymptote/doc/FAQ/asy-faq.info index d9a97cf406..c39a3a8263 100644 --- a/graphics/asymptote/doc/FAQ/asy-faq.info +++ b/graphics/asymptote/doc/FAQ/asy-faq.info @@ -10,7 +10,7 @@ END-INFO-DIR-ENTRY File: asy-faq.info, Node: Top, Next: Question 1.1, Up: (dir) ASYMPTOTE FREQUENTLY ASKED QUESTIONS - 07 Jul 2020 + 05 Aug 2020 This is the list of Frequently Asked Questions about Asymptote (asy). @@ -223,7 +223,7 @@ Question 1.2. How do I obtain Asymptote? Binary releases are available for Linux, MacOS X, and Microsoft Windows platforms, in addition to full source code, from the website -http://asymptote.sourceforge.net/. Many Linux distributions (such as +https://asymptote.sourceforge.io/. Many Linux distributions (such as RedHat and Debian) now include an Asymptote package (check your distribution's documentation for further information about this). @@ -234,7 +234,7 @@ Question 1.3. Where can I ask questions about Asymptote? If you have a question, please try to find an answer in this FAQ, in the extensive Asymptote documentation at -http://asymptote.sourceforge.net/doc/, or search the forum: +https://asymptote.sourceforge.io/doc/, or search the forum: http://sourceforge.net/forum/forum.php?forum_id=409349.  @@ -316,7 +316,7 @@ File: asy-faq.info, Node: Question 2.3, Next: Question 2.4, Previous: Question 2 Question 2.3. What do I do if I get the error: Error: pdfetex (file pdftex.cfg): cannot open config file...texinfo.tex appears to be broken? -Simply put http://asymptote.sourceforge.net/asymptote.pdf in the directory +Simply put https://asymptote.sourceforge.io/asymptote.pdf in the directory doc and repeat the command make all. Or, if you don't want to build a local copy of the documentation, simply proceed with make install-asy. @@ -340,7 +340,7 @@ detailed guide on the topic. You can download it from http://dario.dse.nl/projects/asylatex/. Philippe Ivaldi has contributed an Asymptote mode for Emacs users -http://asymptote.sourceforge.net/doc/Editing-modes.html, which includes a +https://asymptote.sourceforge.io/doc/Editing-modes.html, which includes a lasy-mode that allows one to compile and view the output of one \begin{asy}...\end{asy} section at a time. @@ -541,7 +541,7 @@ File: asy-faq.info, Node: Question 4.4, Next: Question 4.5, Previous: Question 4 Question 4.4. How can I use international fonts in Asymptote labels? -See http://asymptote.sourceforge.net/doc/unicode.html. +See https://asymptote.sourceforge.io/doc/Pens.html.  File: asy-faq.info, Node: Question 4.5, Next: Question 4.6, Previous: Question 4.4, Up: Section 4 @@ -586,8 +586,8 @@ Question 4.9. How can I draw some squares and circles of a fixed size and put a Fixed-size objects should be drawn on a separate picture and then added to currentpicture. Here is one way (see also -http://asymptote.sourceforge.net/gallery/subpictures.asy and -http://asymptote.sourceforge.net/gallery/mosquito.asy): +https://asymptote.sourceforge.io/gallery/subpictures.asy and +https://asymptote.sourceforge.io/gallery/mosquito.asy): real u=2cm; @@ -904,7 +904,7 @@ label. Other possible overwrite arguments are Allow (allows overlapping labels; the default), Suppress (an overlapping label will not be written at all), SuppressQuiet, and MoveQuiet. The last two achieve the same result as the non-quiet types, but will not notify you which labels are -overlapping. See: http://asymptote.sourceforge.net/doc/Pens.html. +overlapping. See: https://asymptote.sourceforge.io/doc/Pens.html. In the case of a user-specified tick array, you can change which labels get suppressed/moved by changing the order of array entries. @@ -948,7 +948,7 @@ corner. You can use this option to ensure multiple figures have the same scaling and same resulting figure size (just ensure the two coordinates given to fixedscaling() leaves room for any labels). -See also http://asymptote.sourceforge.net/doc/Frames-and-pictures.html. +See also https://asymptote.sourceforge.io/doc/Frames-and-pictures.html.  File: asy-faq.info, Node: Question 6.9, Next: Question 6.10, Previous: Question 6.8, Up: Section 6 @@ -966,7 +966,7 @@ limits((0,0),(1,2),Crop); xaxis("$x$",BottomTop,LeftTicks); yaxis("$y$",LeftRight,RightTicks); -See also http://asymptote.sourceforge.net/doc/graph.html. +See also https://asymptote.sourceforge.io/doc/graph.html.  File: asy-faq.info, Node: Question 6.10, Next: Question 6.11, Previous: Question 6.9, Up: Section 6 @@ -1051,7 +1051,7 @@ File: asy-faq.info, Node: Question 6.13, Next: Question 6.14, Previous: Question Question 6.13. How can I make the y axis display base-2 logarithmic values? -See the example http://asymptote.sourceforge.net/gallery/2D +See the example https://asymptote.sourceforge.io/gallery/2D graphs/log2graph.asy.  @@ -1061,7 +1061,7 @@ Question 6.14. How can I align the x axes of two graphs on the same figure? An easy way to do this, if the axes to be aligned have the same scaling and size, is illustrated in the example -http://asymptote.sourceforge.net/gallery/2D graphs/alignedaxis.asy. +https://asymptote.sourceforge.io/gallery/2D graphs/alignedaxis.asy. Here is a more general solution to the problem of aligning two arbitrary axes. One fits the second picture to a frame based on the horizontal @@ -1125,7 +1125,7 @@ File: asy-faq.info, Node: Question 6.15, Next: Question 6.16, Previous: Question Question 6.15. How can I change the direction of the y-axis, such that negatives values are on the upper y-axis? Here is a simple example (see also the example -http://asymptote.sourceforge.net/gallery/2D graphs/diatom.asy or the +https://asymptote.sourceforge.io/gallery/2D graphs/diatom.asy or the discussion of Linear(-1) in the documentation): import graph; @@ -1159,7 +1159,7 @@ Yes, use the parametric form y=t x=(t-2)^2+1 -See the example http://asymptote.sourceforge.net/gallery/2D +See the example https://asymptote.sourceforge.io/gallery/2D graphs/parametricgraph.asy.  @@ -1382,7 +1382,7 @@ Question 7.8. Is there a debugger for asy? Yes, Asymptote includes a line-based debugger: -http://asymptote.sourceforge.net/doc/Debugger.html +https://asymptote.sourceforge.io/doc/Debugger.html  File: asy-faq.info, Node: Question 7.9, Next: Question 8.1, Previous: Question 7.8, Up: Section 7 @@ -1441,7 +1441,7 @@ pictures and distinguishes between true-size objects and objects that should scale with the picture size. The resulting linear programming problem is solved via the Simplex method. -See the http://asymptote.sourceforge.net/gallery/dimension.asy example for +See the https://asymptote.sourceforge.io/gallery/dimension.asy example for an example of how deferred drawing is used to accomodate both user and true-size (PostScript) coordinates. @@ -1495,7 +1495,7 @@ PQ and pq. We find using routines like extension more explicit and less confusing to new users. But we could be persuaded to add something similar if someone can justify the need. In the meantime, one can always use the explicit built-in linear solver solve (see -http://asymptote.sourceforge.net/doc/solve.html), which uses LU +https://asymptote.sourceforge.io/doc/solve.html), which uses LU decomposition.  @@ -1578,7 +1578,7 @@ void clip(picture pic=currentpicture, real width, real height) clip(100,100); See also the discussion of tilings in the documentation: -http://asymptote.sourceforge.net/doc/Pens.html. +https://asymptote.sourceforge.io/doc/Pens.html.  File: asy-faq.info, Node: Section 9, Previous: Section 8, Up: Top @@ -1612,7 +1612,7 @@ import settings; interactiveView=false; batchView=false; in their config.asy file. See -http://asymptote.sourceforge.net/doc/Options.html. +https://asymptote.sourceforge.io/doc/Options.html.  File: asy-faq.info, Node: Question 9.2, Next: Question 9.3, Previous: Question 9.1, Up: Section 9 @@ -1631,8 +1631,8 @@ Convert them to eps format and use the graphic(string) function just like a Label: label(graphic("file"),(0,0)); -See the example http://asymptote.sourceforge.net/gallery/orthocenter.asy -and http://asymptote.sourceforge.net/doc/label.html. +See the example https://asymptote.sourceforge.io/gallery/orthocenter.asy +and https://asymptote.sourceforge.io/doc/label.html.  File: asy-faq.info, Node: Question 9.4, Next: Question 9.5, Previous: Question 9.3, Up: Section 9 diff --git a/graphics/asymptote/doc/HermiteSpline.asy b/graphics/asymptote/doc/HermiteSpline.asy index 7f4cbbebb2..86e66f9edd 100644 --- a/graphics/asymptote/doc/HermiteSpline.asy +++ b/graphics/asymptote/doc/HermiteSpline.asy @@ -1,14 +1,14 @@ import graph; -size(140mm,70mm,IgnoreAspect); -scale(false); +size(140mm,70mm,IgnoreAspect); +scale(false); real[] x={1,3,4,5,6}; -real[] y={1,5,2,0,4}; +real[] y={1,5,2,0,4}; -marker mark=marker(scale(1mm)*cross(6,false,r=0.35),red,Fill); +marker mark=marker(scale(1mm)*cross(6,false,r=0.35),red,Fill); draw(graph(x,y,Hermite),"Hermite Spline",mark); -xaxis("$x$",Bottom,LeftTicks(x)); -yaxis("$y$",Left,LeftTicks); +xaxis("$x$",Bottom,LeftTicks(x)); +yaxis("$y$",Left,LeftTicks); attach(legend(),point(NW),40S+30E,UnFill); diff --git a/graphics/asymptote/doc/TeXShopAndAsymptote.pdf b/graphics/asymptote/doc/TeXShopAndAsymptote.pdf index 164f74c5bd..339adf81fd 100644 Binary files a/graphics/asymptote/doc/TeXShopAndAsymptote.pdf and b/graphics/asymptote/doc/TeXShopAndAsymptote.pdf differ diff --git a/graphics/asymptote/doc/asy-latex.pdf b/graphics/asymptote/doc/asy-latex.pdf index 73b71efbac..bc0b5debdc 100644 Binary files a/graphics/asymptote/doc/asy-latex.pdf and b/graphics/asymptote/doc/asy-latex.pdf differ diff --git a/graphics/asymptote/doc/asy.1 b/graphics/asymptote/doc/asy.1 index 9005b3c66c..a2ff046508 100644 --- a/graphics/asymptote/doc/asy.1 +++ b/graphics/asymptote/doc/asy.1 @@ -91,6 +91,9 @@ Conserve memory at the expense of speed [false]. .B \-d,\-debug Enable debugging messages [false]. .TP +.B \-devicepixelratio n +Ratio of physical to logical pixels [1]. +.TP .B \-digits n Default output file precision [7]. .TP @@ -115,6 +118,9 @@ Additional frame delay [0]. .B \-framerate frames/s Animation speed [30]. .TP +.B \-globalread +Allow read from other directory [true]. +.TP .B \-globalwrite Allow write to other directory [false]. .TP diff --git a/graphics/asymptote/doc/asyRefCard.pdf b/graphics/asymptote/doc/asyRefCard.pdf index dbf6c0620a..b092139c23 100644 Binary files a/graphics/asymptote/doc/asyRefCard.pdf and b/graphics/asymptote/doc/asyRefCard.pdf differ diff --git a/graphics/asymptote/doc/asymptote.pdf b/graphics/asymptote/doc/asymptote.pdf index 485ce996c4..c49b44adb1 100644 Binary files a/graphics/asymptote/doc/asymptote.pdf and b/graphics/asymptote/doc/asymptote.pdf differ diff --git a/graphics/asymptote/doc/asymptote.texi b/graphics/asymptote/doc/asymptote.texi index 2d25ff6fe9..643eaaf00a 100644 --- a/graphics/asymptote/doc/asymptote.texi +++ b/graphics/asymptote/doc/asymptote.texi @@ -153,8 +153,6 @@ Base modules * embed:: Embedding movies, sounds, and 3D objects * slide:: Making presentations with @code{Asymptote} * MetaPost:: @code{MetaPost} compatibility routines -* unicode:: Accept @code{unicode} (UTF-8) characters -* latin1:: Accept @code{ISO 8859-1} characters * babel:: Interface to @code{LaTeX} @code{babel} package * labelpath:: Drawing curved labels * labelpath3:: Drawing curved labels in 3D @@ -335,11 +333,11 @@ texhash @noindent The @code{texhash} command, which installs LaTeX style files, is optional. The executable file will be @code{/usr/local/bin/asy}) and example code -will be installed by default in @code{@value{Datadir}/doc/asymptote/examples}. +will be installed by default in @code{@value{Docdir}/examples}. @noindent @cindex Fedora -Fedora users can easily install the most recent version of @code{Asymptote} +Fedora users can easily install a recent version of @code{Asymptote} with the command @verbatim dnf --enablerepo=rawhide install asymptote @@ -394,8 +392,8 @@ The @code{ImageMagick} package from @noindent is required to support output formats other than @acronym{HTML}, @acronym{PDF}, @acronym{SVG}, and @acronym{PNG} (@pxref{convert}). -The @code{Python 3} interpreter from @url{https://www.python.org} is only required -if you wish to try out the graphical user interface (@pxref{GUI}). +The @code{Python 3} interpreter from @url{https://www.python.org} is only +required if you wish to try out the graphical user interface (@pxref{GUI}). @noindent Example code will be installed by default in the @code{examples} @@ -418,7 +416,7 @@ signal). Version @code{gv-3.6.3} or later (from @url{https://ftp.gnu.org/gnu/gv/}) is required for interactive mode to work properly. Users of @code{ggv} will need to enable @code{Watch file} under -@code{Edit/Postscript Viewer Preferences}. +@code{Edit/PostScript Viewer Preferences}. Users of @code{gsview} will need to enable @code{Options/Auto Redisplay} (however, under @code{MSDOS} it is still necessary to click on the @code{gsview} window; under @code{UNIX} one must manually redisplay by @@ -465,13 +463,17 @@ Windows} registry. The @code{gs} setting specifies the location of the @noindent @cindex @code{htmlviewer} +@cindex @code{absolute} The configuration variable @code{htmlviewer} specifies the browser to use to display 3D @code{WebGL} output. The default setting is @code{google-chrome} under @code{UNIX} and @code{cmd} under @code{Microsoft Windows}. Note that @code{Internet Explorer} does not support @code{WebGL}; @code{Microsoft Windows} users should set their default html browser to @code{chrome} or @code{microsoft-edge}. - +By default, 2D and 3D @code{HTML} images expand to the enclosing canvas; +this can be disabled by setting the configuation variable @code{absolute} +to @code{true}. + On @code{UNIX} systems, to support automatic document reloading of @code{PDF} files in @code{Adobe Reader}, we recommend copying the file @code{reload.js} from the @code{Asymptote} system @@ -564,8 +566,8 @@ under @code{Microsoft Windows XP}: @section Search paths @cindex search paths -In looking for @code{Asymptote} system -files, @code{asy} will search the following paths, in the order listed: +In looking for @code{Asymptote} files, @code{asy} will search the +following paths, in the order listed: @enumerate @item The current directory; @@ -585,6 +587,10 @@ the directory @code{.asy} in the user's home directory The @code{Asymptote} system directory (by default, @code{@value{Datadir}/asymptote} under @code{UNIX} and @code{C:\Program Files\Asymptote} under @code{MSDOS}). +@item +The @code{Asymptote} examples directory (by default, +@code{@value{Docdir}/examples} under @code{UNIX} and +@code{C:\Program Files\Asymptote\examples} under @code{MSDOS}). @end enumerate @node Compiling from UNIX source, Editing modes, Search paths, Installation @@ -654,12 +660,15 @@ done as the root user. To install without root privileges, change the @verbatim ./configure --prefix=$HOME/asymptote @end verbatim +@cindex @code{MacOS X} configuration +@cindex @code{clang} One can disable use of the Boehm garbage collector by configuring with @code{./configure --disable-gc}. For a list of other configuration -options, say @code{./configure --help}. For example, one can tell -configure to look for header files and libraries in nonstandard locations: +options, say @code{./configure --help}. For example, under +@code{MacOS X}, one can tell configure to use the @code{clang} compilers and +look for header files and libraries in nonstandard locations: @verbatim -./configure CPPFLAGS=-I/opt/local/include LDFLAGS=-L/opt/local/lib +./configure CC=clang CXX=clang++ CPPFLAGS=-I/opt/local/include LDFLAGS=-L/opt/local/lib @end verbatim If you are compiling @code{Asymptote} with @code{gcc}, you will need a @@ -773,6 +782,12 @@ make install @noindent To compile without optimization, use the command @code{make CFLAGS=-g}. +On @code{Ubuntu} systems, you may need to first install the required +dependencies: +@verbatim +apt-get build-dep asymptote +@end verbatim +@noindent @node Uninstall, , Git, Installation @section Uninstall @@ -807,7 +822,7 @@ A concise introduction to @code{Asymptote} is given here. For a more thorough introduction, see the excellent @code{Asymptote} tutorial written by Charles Staats: -@url{https://asymptote.sourceforge.io/asymptote.pdf} +@url{https://asymptote.sourceforge.io/asymptote_tutorial.pdf} Another @code{Asymptote} tutorial is available as a wiki, with images rendered by an online Asymptote engine: @@ -993,7 +1008,7 @@ path unitcircle=E..N..W..S..cycle; @cindex superpath @noindent An @code{Asymptote} path, being connected, is equivalent to a -@code{Postscript subpath}. The @code{^^} binary operator, which +@code{PostScript subpath}. The @code{^^} binary operator, which requests that the pen be moved (without drawing or affecting endpoint curvatures) from the final point of the left-hand path to the initial point of the right-hand path, may be used to group several @@ -1059,6 +1074,12 @@ layer appearing on top. Within each layer, labels, images, and verbatim @code{tex} commands are always drawn after the @code{PostScript} objects in that layer. +@cindex @code{newpage} +A page break can be generated with the command +@verbatim +void newpage(picture pic=currentpicture); +@end verbatim + While some of these drawing commands take many options, they all have sensible default values (for example, the picture argument defaults to currentpicture). @@ -1451,8 +1472,10 @@ Clip the current contents of picture @code{pic} to the region bounded by the path @code{g}, using fill rule @code{fillrule} (@pxref{fillrule}). If @code{stroke=true}, the clipped portion is the same as the region that would be drawn with @code{draw(pic,g,zerowinding)}; in -this case the path @code{g} need not be cyclic. For an illustration of -picture clipping, see the first example in @ref{LaTeX usage}. +this case the path @code{g} need not be cyclic. While clipping has no notion +of depth (it transcends layers and even pages), one can localize clipping +to a temporary picture, which can then be added to @code{pic}. +For an illustration of picture clipping, see the first example in @ref{LaTeX usage}. @node label, , clip, Drawing commands @section label @@ -1905,13 +1928,15 @@ returns the conjugate of @code{z}; @item real length(pair z) @cindex @code{length} @cindex @code{abs} -returns the complex modulus @code{|z|} of its argument @code{z}. +@cindex @code{abs2} +returns the complex modulus @math{|@code{z}|} of its argument @code{z}. For example, @example pair z=(3,4); length(z); @end example -returns the result 5. A synonym for @code{length(pair)} is @code{abs(pair)}; +returns the result 5. A synonym for @code{length(pair)} is @code{abs(pair)}. +The function @code{abs2(pair z)} returns @math{|@code{z}|^2}; @item real angle(pair z, bool warn=true) @cindex @code{angle} @@ -2006,8 +2031,11 @@ Here are the built-in functions for triples: @table @code @item real length(triple v) @cindex @code{length} -returns the length @code{|v|} of the vector @code{v}. -A synonym for @code{length(triple)} is @code{abs(triple)}; +@cindex @code{abs} +@cindex @code{abs2} +returns the length @math{|@code{v}|} of its argument @code{v}. +A synonym for @code{length(triple)} is @code{abs(triple)}. +The function @code{abs2(triple v)} returns @math{|@code{v}|^2}; @item real polar(triple v, bool warn=true) @cindex @code{polar} @@ -3097,21 +3125,18 @@ skip of a pen can be examined with the routines @code{real fontsize(pen p=currentpen)} and @code{real lineskip(pen p=currentpen)}, respectively. +@cindex font +@cindex @LaTeX{} NFSS fonts @cindex @code{font} -@cindex @code{LaTeX fonts} -@cindex @code{NFSS} -@cindex @code{font command} -@item A pen using a specific @code{LaTeX} @code{NFSS} font is returned +@item A pen using a specific @LaTeX{} NFSS font is returned by calling the function @code{pen font(string encoding, string family, string series, string shape)}. The default setting, @code{font("OT1","cmr","m","n")}, corresponds to 12pt Computer Modern Roman; this may be changed with @code{defaultpen(pen)}. The font setting of a pen is returned by @code{string font(pen p=currentpen)}. -Support for standardized international characters is provided by the -@code{unicode} module (@pxref{unicode}). -@cindex @code{TeX fonts} +@cindex @TeX{} fonts Alternatively, one may select a fixed-size @TeX{} font (on which @code{fontsize} has no effect) like @code{"cmr12"} (12pt Computer Modern Roman) or @code{"pcrr"} (Courier) using the function @code{pen font(string @@ -3122,7 +3147,7 @@ to the requested size: @code{pen font(string name, real size)}. A nonstandard font command can be generated with @code{pen fontcommand(string)}. -@cindex @code{PostScript fonts} +@cindex @code{PostScript} fonts A convenient interface to the following standard @code{PostScript} fonts is also provided: @verbatim @@ -3138,6 +3163,45 @@ pen Symbol(string series="m", string shape="n"); pen ZapfDingbats(string series="m", string shape="n"); @end verbatim +@cindex font +@cindex font encoding +@cindex input encoding +@cindex language context +@item Starting with the 2018/04/01 release, @LaTeX{} takes UTF-8 as +the new default input encoding. However, you can still set different input +encoding (so as the font, font encoding or even language context). +@noindent +@cindex Cyrillic +@cindex Russian +Here is an example for @code{cp1251} and Russian language in Cyrillic script +(font encoding @code{T2A}): +@verbatim +texpreamble("\usepackage[math]{anttor}"); +texpreamble("\usepackage[T2A]{fontenc}"); +texpreamble("\usepackage[cp1251]{inputenc}"); +texpreamble("\usepackage[russian]{babel}"); +@end verbatim +@noindent +@cindex Chinese +@cindex Japanese +@cindex Korean +@cindex CJK +Support for Chinese, Japanese, and Korean fonts is provided by the +CJK package: +@quotation +@url{https://ctan.org/pkg/cjk} +@end quotation +@noindent +The following commands enable the CJK song family (within a label, you +can also temporarily switch to another family, say kai, by prepending +@code{"\CJKfamily@{kai@}"} to the label string): +@verbatim +texpreamble("\usepackage{CJK} +\AtBeginDocument{\begin{CJK*}{GBK}{song}} +\AtEndDocument{\clearpage\end{CJK*}}"); +@end verbatim + + @anchor{transparency} @cindex transparency @cindex @code{opacity} @@ -3807,12 +3871,16 @@ The first character of the string @code{comment} specifies a comment character. If this character is encountered in a data file, the remainder of the line is ignored. When reading strings, a comment character followed immediately by another comment character is treated -as a single literal comment character. +as a single literal comment character. If @code{Asymptote} is compiled with +support for @code{libcurl}, @code{name} can be a @acronym{URL}. + @anchor{cd} @cindex @code{cd} +@cindex @code{noglobalread} @cindex directory -One can change the current working directory for read operations to +Unless the @code{-noglobalread} command-line option is specified, +one can change the current working directory for read operations to the contents of the string @code{s} with the function @code{string cd(string s)}, which returns the new working directory. If @code{string s} is empty, the path is reset to the value it had at @@ -3833,6 +3901,8 @@ A file named @code{name} can be open for output with file output(string name="", bool update=false, string comment="#", string mode=""); @end verbatim @noindent +@cindex @code{noglobalread} +@cindex @code{globalwrite} If @code{update=false}, any existing data in the file will be erased and only write operations can be used on the file. If @code{update=true}, any existing data will be preserved, the position @@ -3840,6 +3910,8 @@ will be set to the end-of-file, and both reading and writing operations will be enabled. For security reasons, writing to files in directories other than the current directory is allowed only if the @code{-globalwrite} (or @code{-nosafe}) command-line option is specified. +Reading from files in other directories is allowed unless the +@code{-noglobalread} command-line option is specified. @cindex @code{mktemp} The function @code{string mktemp(string s)} may be used to create and return the name of a unique temporary file in the current directory @@ -4014,6 +4086,7 @@ write(output("transcript.asy"),history()); outputs the interactive history to the file @code{transcript.asy}. @cindex @code{delete} +@cindex @code{globalwrite} The function @code{int delete(string s)} deletes the file named by the string @code{s}. Unless the @code{-globalwrite} (or @code{-nosafe}) option is enabled, the file must reside in the current directory. @@ -5319,8 +5392,9 @@ element of the array @code{a}. This is equivalent to @cindex @code{map} @item T2[] map(T2 f(T1), T1[] a) -constructed by calling mapArray("T1","T2"), returns the array obtained by -applying the function @code{f} to each element of the array @code{a}; +constructed by calling @code{mapArray("T1","T2")}, returns the array +obtained by applying the function @code{f} to each element of the +array @code{a}; @cindex @code{reverse} @item int[] reverse(int n) @@ -5906,6 +5980,7 @@ real det(matrix m) { @end verbatim @cindex @code{import} +@cindex @code{access} The command @verbatim import graph; @@ -5969,6 +6044,13 @@ nonalphanumeric characters, enclose it with quotation marks: @noindent @code{import "@value{Datadir}/asymptote/graph.asy" as graph;} +@cindex @acronym{URL} +@cindex @acronym{libcurl} +If @code{Asymptote} is compiled with support for @code{libcurl}, +the file name can even be a @acronym{URL}: +@noindent +@code{import "https://raw.githubusercontent.com/vectorgraphics/asymptote/HEAD/doc/axis3.asy" as axis3;} + It is an error if modules import themselves (or each other in a cycle). The module name to be imported must be known at compile time. @@ -6303,8 +6385,6 @@ Here now is @code{latexusage.tex}: * embed:: Embedding movies, sounds, and 3D objects * slide:: Making presentations with @code{Asymptote} * MetaPost:: @code{MetaPost} compatibility routines -* unicode:: Accept @code{unicode} (UTF-8) characters -* latin1:: Accept @code{ISO 8859-1} characters * babel:: Interface to @code{LaTeX} @code{babel} package * labelpath:: Drawing curved labels * labelpath3:: Drawing curved labels in 3D @@ -6479,7 +6559,7 @@ and @code{leastsquares}. @node patterns, markers, stats, Base modules @section @code{patterns} @cindex @code{patterns} -This module implements @code{Postscript} tiling patterns and includes +This module implements @code{PostScript} tiling patterns and includes several convenient pattern generation routines. @node markers, tree, patterns, Base modules @@ -6688,7 +6768,7 @@ presentation slides, including portable embedded @acronym{PDF} animations (see the file @code{@uref{https://asymptote.sourceforge.io/gallery/animations/slidemovies.pdf,,slidemovies}@uref{https://asymptote.sourceforge.io/gallery/animations/slidemovies.asy,,.asy}}). A simple example is provided in @code{slidedemo.asy}. -@node MetaPost, unicode, slide, Base modules +@node MetaPost, babel, slide, Base modules @section @code{MetaPost} @cindex @code{MetaPost} This module provides some useful routines to help @code{MetaPost} users @@ -6706,51 +6786,7 @@ intersection point of the lines through @code{P}, @code{Q} and @code{p}, @code{q}. For less common occurrences of @code{whatever}, one can use the built-in explicit linear equation solver @code{solve} instead. -@node unicode, latin1, MetaPost, Base modules -@section @code{unicode} -@cindex @code{unicode} -@cindex international characters -Import this module at the beginning of the file to instruct -@code{LaTeX} to accept @code{unicode} (UTF-8) standardized international -characters. -@noindent -@cindex Cyrillic -@cindex Russian -To use Cyrillic fonts, you will need to change the font encoding: -@verbatim -import unicode; -texpreamble("\usepackage{mathtext}\usepackage[russian]{babel}"); -defaultpen(font("T2A","cmr","m","n")); -@end verbatim -@noindent -@cindex Chinese -@cindex Japanese -@cindex Korean -@cindex CJK -Support for Chinese, Japanese, and Korean fonts is provided by the -CJK package: -@quotation -@url{http://mirror.ctan.org/languages/chinese/CJK/} -@end quotation -@noindent -The following commands enable the CJK song family (within a label, you -can also temporarily switch to another family, say kai, by prepending -@code{"\CJKfamily@{kai@}"} to the label string): -@verbatim -texpreamble("\usepackage{CJK} -\AtBeginDocument{\begin{CJK*}{GBK}{song}} -\AtEndDocument{\clearpage\end{CJK*}}"); -@end verbatim - -@node latin1, babel, unicode, Base modules -@section @code{latin1} -@cindex @code{latin1} -If you don't have @code{LaTeX} support for @code{unicode} installed, -you can enable support for Western European languages (ISO 8859-1) by -importing the module @code{latin1}. This module can be used as a -template for providing support for other ISO 8859 alphabets. - -@node babel, labelpath, latin1, Base modules +@node babel, labelpath, MetaPost, Base modules @section @code{babel} @cindex @code{babel} This module implements the @code{LaTeX} @code{babel} package in @@ -8026,14 +8062,16 @@ There are five choices for viewing 3D @code{Asymptote} output: @cindex @code{render} @cindex @code{outformat} @cindex @code{multisample} +@cindex @code{devicepixelratio} +@cindex @code{position} @item Use the native @code{Asymptote} adaptive @code{OpenGL}-based renderer (with the command-line option @code{-V} and the default settings @code{outformat=""} and @code{render=-1}). On @code{UNIX} systems with graphics support for multisampling, the sample width can be -controlled with the setting @code{multisample}. An initial screen -position can be specified with the pair setting @code{position}, where -negative values are interpreted as relative to the corresponding -maximum screen dimension. The default settings +controlled with the setting @code{multisample}. The ratio of physical to +logical screen pixels can be specified with the setting @code{devicepixelratio}. An initial screen position can be specified with the pair setting +@code{position}, where negative values are interpreted as relative to the +corresponding maximum screen dimension. The default settings @cindex mouse bindings @verbatim import settings; @@ -9673,7 +9711,7 @@ Pictures are deconstructed into the @acronym{SVG} image format. Since @code{Qt5} does not support @code{SVG} clipping, you will need the @code{rsvg-convert} utility, which is part of the @code{librsvg2-tools} package on @code{UNIX} systems -and the @code{librsvg} package on @code{MacOS}; under +and the @code{librsvg} package on @code{MacOS X}; under @code{Microsoft Windows}, it is available as @url{https://sourceforge.net/projects/tumagcc/files/rsvg-convert-2.40.20.7z} @@ -9938,7 +9976,7 @@ Pedram Emami developed the @code{Asymptote Web Application} at @c LocalWords: RightTicks BottomTop LeftRight Ticksize UTF BufNewFile BufRead @c LocalWords: ticksize subintervals xlimits filetype plugin setlocal makeprg @c LocalWords: ylimits uncommented automin automax cp uninstall reals ecast -@c LocalWords: scaleT unicode RightSide yx yy NoAlign legendmargin opic CCW +@c LocalWords: scaleT RightSide yx yy NoAlign legendmargin opic CCW @c LocalWords: arrowbar LeftSide EndBar BeginArrow lly feynman isi showtarget @c LocalWords: EndArrow BeginArcArrow EndArcArrow ArcArrow ArcArrows NoFill @c LocalWords: filldraw fillpen drawpen errorformat bigsquare bezier darkblue @@ -10036,7 +10074,7 @@ Pedram Emami developed the @code{Asymptote Web Application} at @c LocalWords: nonoverlapping texengine maxtimes maxheight pdb TEXMFCONFIG Jn @c LocalWords: piecewisestraight unitrand graphmarkers antialias nolight newl @c LocalWords: Delaunay Shewchuk convertOptions APPDATA pdfreload tempFile Yn -@c LocalWords: pdfreloadOptions deferred OpenGL renderer unitbox +@c LocalWords: pdfreloadOptions deferred OpenGL renderer unitbox 's @c LocalWords: bezulate Shardt's rasterized viewport unitdisk unitplane devel @c LocalWords: unitcylinder unitcone solidcone unitfrustum unitsphere nslices @c LocalWords: DPostScript YZZero externalprc nonrendered nosafe KDE @@ -10071,13 +10109,13 @@ Pedram Emami developed the @code{Asymptote Web Application} at @c LocalWords: ascii piecewise arcpoint spacings tilings sncndn resizing @c LocalWords: differentiable vectorization vectorized asydir normals quartic @c LocalWords: wavepacket kerned parametrized specular hyperboloid Bourke's -@c LocalWords: Michail 0pt 1filll 's 3D latin1 labelpath3 2D graph3 +@c LocalWords: Michail 0pt 1filll 's 3D labelpath3 2D graph3 0pt 3D @c LocalWords: grid3 contour3 x86_64 psv a4 gsview32 freeglut 'load ' @c LocalWords: 'asy 'lasy 'auto 5bp 1cm sqrtx01 4g extenda extendb @c LocalWords: bb llx 2S 100pt 3t bezier2 bool3 x0 angle1 angle2 z1 @c LocalWords: z2 before' struct X11 x11colors type1cm 12pt OT1 5mm @c LocalWords: cmr12 x' y' xsize ysize 25cm s1 s2 neighbourhood u'' -@c LocalWords: s'' 3x 5x 3y 602e 2x 2y 3sin 10cm 204e addby7 10x Ai +@c LocalWords: s'' 3x 5x 3y 602e 2x 2y 3sin 10cm 204e addby7 10x @c LocalWords: only'' pow10 log10 expm1 log1p atan2 0pt 1filll 's ' @c LocalWords: x1 x2 graph2d attachfile2 n0 P0 n1 P1 markers1 3D 2D @c LocalWords: interpolate1 markers2 inlinemovie3 media9 U3D T2A 5E @@ -10100,31 +10138,39 @@ Pedram Emami developed the @code{Asymptote Web Application} at @c LocalWords: slopefield1 144x144 1filll 'load 'asy 'lasy 'auto 4g @c LocalWords: libgs 'load 'asy 'lasy 'auto 5bp 1cm 2S 100pt 3t 5mm @c LocalWords: bracedefaultratio incircle 12pt 25cm 3x 5x 3y 602e ' -@c LocalWords: 2x 2y 3sin 10cm 204e 10x Ai 5E offaxis 'load 'lasy ' +@c LocalWords: 2x 2y 3sin 10cm 204e 10x 5E offaxis 'load 'lasy ' @c LocalWords: 5cm 2N 2E 2n 100d 5z 5y 5unit dvisvgmOptions 144x144 @c LocalWords: 4g texengines coplanar 0pt 1filll 's 3D 2D 'load 5bp @c LocalWords: insphere cospherical 5unit luatex lualatex 'asy 1cm @c LocalWords: 'lasy 'auto 4g 2S 100pt 3t 12pt 5mm 25cm 3x 5x 3y 2x -@c LocalWords: 602e 2y 3sin 10cm 204e 10x Ai Ai Ai Ai Ai Ai Ai Ai ' -@c LocalWords: unnormalized 5E 5cm 2N 2E 2n 100d 5z 5y 0pt 1filll ' +@c LocalWords: 602e 2y 3sin 10cm 204e 10x +@c LocalWords: unnormalized 5E 5cm 2N 2E 2n 100d 5z 5y 0pt 1filll @c LocalWords: 5unit 144x144 aligndir smoothcontour3 's 3D 2D cmake @c LocalWords: 'load 'asy 'lasy 'auto 5bp 1cm 4g 2S 100pt 3t nan 3x -@c LocalWords: 12pt 5mm 25cm 5x 3y 602e 2x 2y 3sin 10cm 204e 10x Ai -@c LocalWords: Ai Ai Ai Ai Ai Ai Ai 5E 5cm 2N 2E 2n 100d 5z 5y nz ' -@c LocalWords: 5unit Staats implicitsurface overlapedges maxdepth +@c LocalWords: 12pt 5mm 25cm 5x 3y 602e 2x 2y 3sin 10cm 204e 10x +@c LocalWords: 5E 5cm 2N 2E 2n 100d 5z 5y nz +@c LocalWords: 5unit Staats implicitsurface overlapedges maxdepth ' @c LocalWords: through'' genustwo 144x144 0pt 1filll 's 3D 2D 'load @c LocalWords: 'asy 'lasy 'auto 5bp 1cm 4g 2S 100pt 3t 12pt 5mm 3x -@c LocalWords: 25cm 5x 3y 602e 2x 2y 3sin 10cm 204e 10x Ai Ai Ai Ai -@c LocalWords: Ai Ai Ai Ai 5E 5cm 2N 2E 2n 100d 5z 5y 5unit 144x144 +@c LocalWords: 25cm 5x 3y 602e 2x 2y 3sin 10cm 204e 10x +@c LocalWords: 5E 5cm 2N 2E 2n 100d 5z 5y 5unit 144x144 @c LocalWords: Frohlich codequoteundirected center 0pt 1filll 's 3D @c LocalWords: acknowledgments Colors 2D Color WebGL uref x86 dnf @c LocalWords: htmlviewer asygl CPPFLAGS 'load 'asy 'lasy 'auto 5bp @c LocalWords: 1cm labeling dotfilltype 4g color colors centered 2S @c LocalWords: 100pt 3t forcemath gray colorless miter 12pt 5mm 3x @c LocalWords: zeroTransform 25cm Python3 popcount bitreverse 5x 3y -@c LocalWords: 602e 2x 2y 3sin 10cm 204e 10x Ai Ai Ai Ai Ai Ai Ai -@c LocalWords: Ai findall ax 5a centers 5E 5cm 2N 2E 2n HTML5 html +@c LocalWords: 602e 2x 2y 3sin 10cm 204e 10x +@c LocalWords: findall ax 5a centers 5E 5cm 2N 2E 2n HTML5 html @c LocalWords: logo3 remeshed css 42kB 100d 5z 5y 5unit colored Qt5 @c LocalWords: behavior beveled usetriangles htmlviewerOptions cson -@c LocalWords: 144x144 pyqt5 numpy pip3 PyQt5 rsvg librsvg2 -@c LocalWords: librsvg Supakorn Jamie'' Rassameemasmuang +@c LocalWords: 144x144 pyqt5 numpy pip3 PyQt5 rsvg librsvg2 1filll +@c LocalWords: librsvg Supakorn Jamie'' Rassameemasmuang 2D Docdir +@c LocalWords: microsoft configuation 'load 'asy 'lasy 'auto dep 4g +@c LocalWords: 5bp 1cm BezierPatch 2S 100pt 3t abs2 12pt cp1251 5mm +@c LocalWords: anttor fontenc inputenc 25cm noglobalread 3x +@c LocalWords: 5x 3y 602e 2x 2y 3sin 10cm 204e 10x +@c LocalWords: mapArray 5a parameterized mapTemplate 5E 2N +@c LocalWords: 5cm freshnel0 fresnel0 PBR prethree specularfactor +@c LocalWords: renderers 2E ESC AsyGL 48kB 2n 100d 5z 5y 5unit +@c LocalWords: unicode 144x144 Pedram Emami diff --git a/graphics/asymptote/doc/diatom.asy b/graphics/asymptote/doc/diatom.asy index 23673dcadf..0d571e2c9c 100644 --- a/graphics/asymptote/doc/diatom.asy +++ b/graphics/asymptote/doc/diatom.asy @@ -40,7 +40,7 @@ for(int taxon=0; taxon < n; ++taxon) { real[] P=percentage[taxon]; if(max(P) < ignorebelow) continue; final=taxon; -} +} real angle=45; real L=3cm; @@ -100,10 +100,10 @@ for(int taxon=0; taxon < n; ++taxon) { pair z1=t*z+v; pair w1=z1+Ldir; draw[i]=new void(frame f) { - path g=z0--(z0.x+(ymax-z0.y)/Tan(angle),ymax)-- - (z1.x+(ymax-z1.y)/Tan(angle),ymax)--z1; - draw(f,g); - label(f,group[i],point(g,1.5),align); + path g=z0--(z0.x+(ymax-z0.y)/Tan(angle),ymax)-- + (z1.x+(ymax-z1.y)/Tan(angle),ymax)--z1; + draw(f,g); + label(f,group[i],point(g,1.5),align); }; }); } @@ -113,7 +113,7 @@ for(int taxon=0; taxon < n; ++taxon) { if(taxon == 0) yaxis(pic,depthlabel,Left,RightTicks(0,10),above=true); if(taxon == final) yaxis(pic,Right,LeftTicks("%",0,10),above=true); - + add(shift(location,0)*pic); location += pic.userMax().x; } diff --git a/graphics/asymptote/doc/elliptic.asy b/graphics/asymptote/doc/elliptic.asy index 728508f011..71fb80db6d 100644 --- a/graphics/asymptote/doc/elliptic.asy +++ b/graphics/asymptote/doc/elliptic.asy @@ -74,7 +74,7 @@ size(0,200); curve c; c.a=-1; c.b=4; -pair oncurve(real x) +pair oncurve(real x) { return (x,sqrt(c.y2(x))); } @@ -111,5 +111,5 @@ dot("$2P$", PP, SW); add(output,currentpicture.fit(),(0.5cm,0),E); shipout(output); - + restore(); diff --git a/graphics/asymptote/doc/flowchartdemo.asy b/graphics/asymptote/doc/flowchartdemo.asy index 796e357a5f..77c78c0e2c 100644 --- a/graphics/asymptote/doc/flowchartdemo.asy +++ b/graphics/asymptote/doc/flowchartdemo.asy @@ -3,8 +3,8 @@ size(0,300); import flowchart; block block1=rectangle(Label("Example",magenta), - pack(Label("Start:",heavygreen),"",Label("$A:=0$",blue), - "$B:=1$"),(-0.5,3),palegreen,paleblue,red); + pack(Label("Start:",heavygreen),"",Label("$A:=0$",blue), + "$B:=1$"),(-0.5,3),palegreen,paleblue,red); block block2=diamond(Label("Choice?",blue),(0,2),palegreen,red); block block3=roundrectangle("Do something",(-1,1)); block block4=bevel("Don't do something",(1,1)); diff --git a/graphics/asymptote/doc/icon.asy b/graphics/asymptote/doc/icon.asy index 1701fe0f32..0170f2605c 100644 --- a/graphics/asymptote/doc/icon.asy +++ b/graphics/asymptote/doc/icon.asy @@ -4,7 +4,7 @@ size(30,30,IgnoreAspect); real f(real t) {return t < 0 ? -1/t : -0.5/t;} -picture logo(pair s=0, pen q) +picture logo(pair s=0, pen q) { picture pic; pen p=linewidth(3)+q; @@ -17,6 +17,6 @@ picture logo(pair s=0, pen q) draw(pic,z+c+eps--z,p); yaxis(pic,p); return shift(s)*pic; -} +} add(logo(red)); diff --git a/graphics/asymptote/doc/imagecontour.asy b/graphics/asymptote/doc/imagecontour.asy index 6b5eb455ca..d61b6148c5 100644 --- a/graphics/asymptote/doc/imagecontour.asy +++ b/graphics/asymptote/doc/imagecontour.asy @@ -19,7 +19,7 @@ pen tickpen=gray+0.5*linewidth(currentpen); pen[] Palette=BWRainbow(); bounds range=image(f,Automatic,a,b,N,Palette); - + // Major contours real[] Cvals=uniform(range.min,range.max,Divs); diff --git a/graphics/asymptote/doc/leastsquares.asy b/graphics/asymptote/doc/leastsquares.asy index 37477d5885..6362e8323e 100644 --- a/graphics/asymptote/doc/leastsquares.asy +++ b/graphics/asymptote/doc/leastsquares.asy @@ -22,7 +22,7 @@ real last=700; // Remove negative or zero values of rho: t=rho > 0 ? t : null; rho=rho > 0 ? rho : null; - + scale(Log(true),Linear(true)); int n=step > 0 ? ceil((last-first)/step) : 0; @@ -33,17 +33,17 @@ for(int i=0; i <= n; ++i) { real first=first+i*step; real[] logrho=(t >= first & t <= last) ? log(rho) : null; real[] logt=(t >= first & t <= last) ? -log(t) : null; - + if(logt.length < 2) break; - + // Fit to the line logt=L.m*logrho+L.b: linefit L=leastsquares(logt,logrho); - + T.push(first); xi.push(L.m); dxi.push(L.dm); -} - +} + draw(graph(T,xi),blue); errorbars(T,xi,dxi,red); diff --git a/graphics/asymptote/doc/legend.asy b/graphics/asymptote/doc/legend.asy index 09a31868ae..b00cdd14e6 100644 --- a/graphics/asymptote/doc/legend.asy +++ b/graphics/asymptote/doc/legend.asy @@ -1,15 +1,15 @@ -import graph; -size(8cm,6cm,IgnoreAspect); - -typedef real realfcn(real); -realfcn F(real p) { - return new real(real x) {return sin(p*x);}; -}; - +import graph; +size(8cm,6cm,IgnoreAspect); + +typedef real realfcn(real); +realfcn F(real p) { + return new real(real x) {return sin(p*x);}; +}; + for(int i=1; i < 5; ++i) draw(graph(F(i*pi),0,1),Pen(i), - "$\sin("+(i == 1 ? "" : (string) i)+"\pi x)$"); -xaxis("$x$",BottomTop,LeftTicks); -yaxis("$y$",LeftRight,RightTicks(trailingzero)); - -attach(legend(2),(point(S).x,truepoint(S).y),10S,UnFill); + "$\sin("+(i == 1 ? "" : (string) i)+"\pi x)$"); +xaxis("$x$",BottomTop,LeftTicks); +yaxis("$y$",LeftRight,RightTicks(trailingzero)); + +attach(legend(2),(point(S).x,truepoint(S).y),10S,UnFill); diff --git a/graphics/asymptote/doc/linetype.asy b/graphics/asymptote/doc/linetype.asy index dc4762c247..477ada1e14 100644 --- a/graphics/asymptote/doc/linetype.asy +++ b/graphics/asymptote/doc/linetype.asy @@ -6,7 +6,7 @@ void testline(real y) { draw((0,y-40)--(100,y-40),currentpen+dashdotted); draw((0,y-50)--(100,y-50),currentpen+longdashdotted); draw((0,y-60)--(100,y-60),currentpen+Dotted); -} +} currentpen=linewidth(0.5); testline(100); diff --git a/graphics/asymptote/doc/logo.asy b/graphics/asymptote/doc/logo.asy index d180558ad3..3cd42079ed 100644 --- a/graphics/asymptote/doc/logo.asy +++ b/graphics/asymptote/doc/logo.asy @@ -1,6 +1,6 @@ size(140,80,IgnoreAspect); -picture logo(pair s=0, pen q) +picture logo(pair s=0, pen q) { picture pic; pen p=linewidth(2)+fontsize(24pt)+q; @@ -19,7 +19,7 @@ picture logo(pair s=0, pen q) draw(pic,(0,y1)--(0,y2),p); draw(pic,(a,0)--(b,0),p); return shift(s)*pic; -} +} pair z=(-0.015,0.08); for(int x=0; x < 10; ++x) diff --git a/graphics/asymptote/doc/markers1.asy b/graphics/asymptote/doc/markers1.asy index a3af424616..7db56315f9 100644 --- a/graphics/asymptote/doc/markers1.asy +++ b/graphics/asymptote/doc/markers1.asy @@ -64,7 +64,7 @@ label("$10$",point(p,0),3W); p=T*p; draw(p,CircleBarIntervalMarker(n=3,angle=30,barsize=8mm,radius=2mm, FillDraw(.8red),circleabove=true,dotframe, - above=false)); + above=false)); label("$11$",point(p,0),3W); //line 12 ********** diff --git a/graphics/asymptote/doc/png/asymptote.info b/graphics/asymptote/doc/png/asymptote.info index 1625bec493..4e3bd0ed3e 100644 --- a/graphics/asymptote/doc/png/asymptote.info +++ b/graphics/asymptote/doc/png/asymptote.info @@ -1,7 +1,7 @@ This is asymptote.info, produced by makeinfo version 6.6 from asymptote.texi. -This file documents 'Asymptote', version 2.66. +This file documents 'Asymptote', version 2.67. @@ -22,7 +22,7 @@ File: asymptote.info, Node: Top, Next: Description, Prev: (dir), Up: (dir) Asymptote ********* -This file documents 'Asymptote', version 2.66. +This file documents 'Asymptote', version 2.67. @@ -137,8 +137,6 @@ Base modules * embed:: Embedding movies, sounds, and 3D objects * slide:: Making presentations with 'Asymptote' * MetaPost:: 'MetaPost' compatibility routines -* unicode:: Accept 'unicode' (UTF-8) characters -* latin1:: Accept 'ISO 8859-1' characters * babel:: Interface to 'LaTeX' 'babel' package * labelpath:: Drawing curved labels * labelpath3:: Drawing curved labels in 3D @@ -297,8 +295,8 @@ The 'texhash' command, which installs LaTeX style files, is optional. The executable file will be '/usr/local/bin/asy') and example code will be installed by default in '/usr/local/share/doc/asymptote/examples'. -Fedora users can easily install the most recent version of 'Asymptote' -with the command +Fedora users can easily install a recent version of 'Asymptote' with the +command dnf --enablerepo=rawhide install asymptote To install the latest version of 'Asymptote' on a Debian-based @@ -370,7 +368,7 @@ file is updated. The default 'UNIX' 'PostScript' viewer 'gv' supports this (via a 'SIGHUP' signal). Version 'gv-3.6.3' or later (from ) is required for interactive mode to work properly. Users of 'ggv' will need to enable 'Watch file' under -'Edit/Postscript Viewer Preferences'. Users of 'gsview' will need to +'Edit/PostScript Viewer Preferences'. Users of 'gsview' will need to enable 'Options/Auto Redisplay' (however, under 'MSDOS' it is still necessary to click on the 'gsview' window; under 'UNIX' one must manually redisplay by pressing the 'r' key). @@ -402,7 +400,9 @@ The configuration variable 'htmlviewer' specifies the browser to use to display 3D 'WebGL' output. The default setting is 'google-chrome' under 'UNIX' and 'cmd' under 'Microsoft Windows'. Note that 'Internet Explorer' does not support 'WebGL'; 'Microsoft Windows' users should set -their default html browser to 'chrome' or 'microsoft-edge'. +their default html browser to 'chrome' or 'microsoft-edge'. By default, +2D and 3D 'HTML' images expand to the enclosing canvas; this can be +disabled by setting the configuation variable 'absolute' to 'true'. On 'UNIX' systems, to support automatic document reloading of 'PDF' files in 'Adobe Reader', we recommend copying the file 'reload.js' from @@ -467,8 +467,8 @@ File: asymptote.info, Node: Search paths, Next: Compiling from UNIX source, P 2.5 Search paths ================ -In looking for 'Asymptote' system files, 'asy' will search the following -paths, in the order listed: +In looking for 'Asymptote' files, 'asy' will search the following paths, +in the order listed: 1. The current directory; 2. A list of one or more directories specified by the configuration variable 'dir' or environment variable 'ASYMPTOTE_DIR' (separated @@ -480,6 +480,9 @@ paths, in the order listed: 4. The 'Asymptote' system directory (by default, '/usr/local/share/asymptote' under 'UNIX' and 'C:\Program Files\Asymptote' under 'MSDOS'). + 5. The 'Asymptote' examples directory (by default, + '/usr/local/share/doc/asymptote/examples' under 'UNIX' and + 'C:\Program Files\Asymptote\examples' under 'MSDOS').  File: asymptote.info, Node: Compiling from UNIX source, Next: Editing modes, Prev: Search paths, Up: Installation @@ -533,9 +536,10 @@ done as the root user. To install without root privileges, change the ./configure --prefix=$HOME/asymptote One can disable use of the Boehm garbage collector by configuring with './configure --disable-gc'. For a list of other configuration -options, say './configure --help'. For example, one can tell configure -to look for header files and libraries in nonstandard locations: -./configure CPPFLAGS=-I/opt/local/include LDFLAGS=-L/opt/local/lib +options, say './configure --help'. For example, under 'MacOS X', one +can tell configure to use the 'clang' compilers and look for header +files and libraries in nonstandard locations: +./configure CC=clang CXX=clang++ CPPFLAGS=-I/opt/local/include LDFLAGS=-L/opt/local/lib If you are compiling 'Asymptote' with 'gcc', you will need a relatively recent version (e.g. 3.4.4 or later). For full interactive @@ -623,7 +627,10 @@ cd asymptote make all make install -To compile without optimization, use the command 'make CFLAGS=-g'. +To compile without optimization, use the command 'make CFLAGS=-g'. On +'Ubuntu' systems, you may need to first install the required +dependencies: +apt-get build-dep asymptote  File: asymptote.info, Node: Uninstall, Prev: Git, Up: Installation @@ -657,7 +664,7 @@ A concise introduction to 'Asymptote' is given here. For a more thorough introduction, see the excellent 'Asymptote' tutorial written by Charles Staats: - + Another 'Asymptote' tutorial is available as a wiki, with images rendered by an online Asymptote engine: @@ -803,7 +810,7 @@ the initial node, as in this approximation (accurate to within 0.06%) of a unit circle: path unitcircle=E..N..W..S..cycle; -An 'Asymptote' path, being connected, is equivalent to a 'Postscript +An 'Asymptote' path, being connected, is equivalent to a 'PostScript subpath'. The '^^' binary operator, which requests that the pen be moved (without drawing or affecting endpoint curvatures) from the final point of the left-hand path to the initial point of the right-hand path, @@ -878,6 +885,9 @@ layer appearing on top. Within each layer, labels, images, and verbatim 'tex' commands are always drawn after the 'PostScript' objects in that layer. + A page break can be generated with the command +void newpage(picture pic=currentpicture); + While some of these drawing commands take many options, they all have sensible default values (for example, the picture argument defaults to currentpicture). @@ -1135,8 +1145,10 @@ void clip(picture pic=currentpicture, path g, stroke=false, the path 'g', using fill rule 'fillrule' (*note fillrule::). If 'stroke=true', the clipped portion is the same as the region that would be drawn with 'draw(pic,g,zerowinding)'; in this case the path 'g' need -not be cyclic. For an illustration of picture clipping, see the first -example in *note LaTeX usage::. +not be cyclic. While clipping has no notion of depth (it transcends +layers and even pages), one can localize clipping to a temporary +picture, which can then be added to 'pic'. For an illustration of +picture clipping, see the first example in *note LaTeX usage::.  File: asymptote.info, Node: label, Prev: clip, Up: Drawing commands @@ -1266,7 +1278,7 @@ asy(nativeformat(),"logo"); fill(unitcircle^^(scale(2/11.7)*unitcircle), evenodd+rgb(124/255,205/255,124/255)); label(scale(1.1)*minipage( -"\centering\scriptsize \textbf{\LARGE {\tt Asymptote}\\ + "\centering\scriptsize \textbf{\LARGE {\tt Asymptote}\\ \smallskip \small The Vector Graphics Language}\\ \smallskip @@ -1490,12 +1502,12 @@ user-defined types): returns the conjugate of 'z'; 'real length(pair z)' - returns the complex modulus '|z|' of its argument 'z'. For + returns the complex modulus |'z'| of its argument 'z'. For example, pair z=(3,4); length(z); returns the result 5. A synonym for 'length(pair)' is - 'abs(pair)'; + 'abs(pair)'. The function 'abs2(pair z)' returns |'z'|^2; 'real angle(pair z, bool warn=true)' returns the angle of 'z' in radians in the interval @@ -1569,8 +1581,9 @@ user-defined types): Here are the built-in functions for triples: 'real length(triple v)' - returns the length '|v|' of the vector 'v'. A synonym for - 'length(triple)' is 'abs(triple)'; + returns the length |'v'| of its argument 'v'. A synonym for + 'length(triple)' is 'abs(triple)'. The function 'abs2(triple + v)' returns |'v'|^2; 'real polar(triple v, bool warn=true)' returns the colatitude of 'v' measured from the z axis in @@ -2441,14 +2454,12 @@ with one or more color components equal to 1. fontsize(pen p=currentpen)' and 'real lineskip(pen p=currentpen)', respectively. - * A pen using a specific 'LaTeX' 'NFSS' font is returned by calling - the function 'pen font(string encoding, string family, string - series, string shape)'. The default setting, - 'font("OT1","cmr","m","n")', corresponds to 12pt Computer Modern - Roman; this may be changed with 'defaultpen(pen)'. The font - setting of a pen is returned by 'string font(pen p=currentpen)'. - Support for standardized international characters is provided by - the 'unicode' module (*note unicode::). + * A pen using a specific LaTeX NFSS font is returned by calling the + function 'pen font(string encoding, string family, string series, + string shape)'. The default setting, 'font("OT1","cmr","m","n")', + corresponds to 12pt Computer Modern Roman; this may be changed with + 'defaultpen(pen)'. The font setting of a pen is returned by + 'string font(pen p=currentpen)'. Alternatively, one may select a fixed-size TeX font (on which 'fontsize' has no effect) like '"cmr12"' (12pt Computer Modern @@ -2472,6 +2483,25 @@ with one or more color components equal to 1. pen Symbol(string series="m", string shape="n"); pen ZapfDingbats(string series="m", string shape="n"); + * Starting with the 2018/04/01 release, LaTeX takes UTF-8 as the new + default input encoding. However, you can still set different input + encoding (so as the font, font encoding or even language context). + Here is an example for 'cp1251' and Russian language in Cyrillic + script (font encoding 'T2A'): + texpreamble("\usepackage[math]{anttor}"); + texpreamble("\usepackage[T2A]{fontenc}"); + texpreamble("\usepackage[cp1251]{inputenc}"); + texpreamble("\usepackage[russian]{babel}"); + Support for Chinese, Japanese, and Korean fonts is provided by the + CJK package: + + The following commands enable the CJK song family (within a label, + you can also temporarily switch to another family, say kai, by + prepending '"\CJKfamily{kai}"' to the label string): + texpreamble("\usepackage{CJK} + \AtBeginDocument{\begin{CJK*}{GBK}{song}} + \AtEndDocument{\clearpage\end{CJK*}}"); + * The transparency of a pen can be changed with the command: pen opacity(real opacity=1, string blend="Compatible"); The opacity can be varied from '0' (fully transparent) to the @@ -3010,12 +3040,14 @@ character of the string 'comment' specifies a comment character. If this character is encountered in a data file, the remainder of the line is ignored. When reading strings, a comment character followed immediately by another comment character is treated as a single literal -comment character. +comment character. If 'Asymptote' is compiled with support for +'libcurl', 'name' can be a URL. - One can change the current working directory for read operations to -the contents of the string 's' with the function 'string cd(string s)', -which returns the new working directory. If 'string s' is empty, the -path is reset to the value it had at program startup. + Unless the '-noglobalread' command-line option is specified, one can +change the current working directory for read operations to the contents +of the string 's' with the function 'string cd(string s)', which returns +the new working directory. If 'string s' is empty, the path is reset to +the value it had at program startup. When reading pairs, the enclosing parenthesis are optional. Strings are also read by assignment, by reading characters up to but not @@ -3031,9 +3063,11 @@ existing data will be preserved, the position will be set to the end-of-file, and both reading and writing operations will be enabled. For security reasons, writing to files in directories other than the current directory is allowed only if the '-globalwrite' (or '-nosafe') -command-line option is specified. The function 'string mktemp(string -s)' may be used to create and return the name of a unique temporary file -in the current directory based on the string 's'. +command-line option is specified. Reading from files in other +directories is allowed unless the '-noglobalread' command-line option is +specified. The function 'string mktemp(string s)' may be used to create +and return the name of a unique temporary file in the current directory +based on the string 's'. There are two special files: 'stdin', which reads from the keyboard, and 'stdout', which writes to the terminal. The implicit initializer @@ -4117,7 +4151,7 @@ of type 'T[]'. T(int i) {return f(a[i]);},a.length)'; 'T2[] map(T2 f(T1), T1[] a)' - constructed by calling mapArray("T1","T2"), returns the array + constructed by calling 'mapArray("T1","T2")', returns the array obtained by applying the function 'f' to each element of the array 'a'; @@ -4630,6 +4664,11 @@ quotation marks: 'import "/usr/local/share/asymptote/graph.asy" as graph;' + If 'Asymptote' is compiled with support for 'libcurl', the file name +can even be a URL: 'import +"https://raw.githubusercontent.com/vectorgraphics/asymptote/HEAD/doc/axis3.asy" +as axis3;' + It is an error if modules import themselves (or each other in a cycle). The module name to be imported must be known at compile time. @@ -5010,8 +5049,6 @@ File: asymptote.info, Node: Base modules, Next: Options, Prev: LaTeX usage, * embed:: Embedding movies, sounds, and 3D objects * slide:: Making presentations with 'Asymptote' * MetaPost:: 'MetaPost' compatibility routines -* unicode:: Accept 'unicode' (UTF-8) characters -* latin1:: Accept 'ISO 8859-1' characters * babel:: Interface to 'LaTeX' 'babel' package * labelpath:: Drawing curved labels * labelpath3:: Drawing curved labels in 3D @@ -5177,7 +5214,7 @@ File: asymptote.info, Node: patterns, Next: markers, Prev: stats, Up: Base m 8.8 'patterns' ============== -This module implements 'Postscript' tiling patterns and includes several +This module implements 'PostScript' tiling patterns and includes several convenient pattern generation routines.  @@ -5387,7 +5424,7 @@ file 'slidemovies.asy'). A simple example is provided in 'slidedemo.asy'.  -File: asymptote.info, Node: MetaPost, Next: unicode, Prev: slide, Up: Base modules +File: asymptote.info, Node: MetaPost, Next: babel, Prev: slide, Up: Base modules 8.20 'MetaPost' =============== @@ -5405,42 +5442,9 @@ occurrences of 'whatever', one can use the built-in explicit linear equation solver 'solve' instead.  -File: asymptote.info, Node: unicode, Next: latin1, Prev: MetaPost, Up: Base modules - -8.21 'unicode' -============== - -Import this module at the beginning of the file to instruct 'LaTeX' to -accept 'unicode' (UTF-8) standardized international characters. To use -Cyrillic fonts, you will need to change the font encoding: -import unicode; -texpreamble("\usepackage{mathtext}\usepackage[russian]{babel}"); -defaultpen(font("T2A","cmr","m","n")); -Support for Chinese, Japanese, and Korean fonts is provided by the CJK -package: - -The following commands enable the CJK song family (within a label, you -can also temporarily switch to another family, say kai, by prepending -'"\CJKfamily{kai}"' to the label string): -texpreamble("\usepackage{CJK} -\AtBeginDocument{\begin{CJK*}{GBK}{song}} -\AtEndDocument{\clearpage\end{CJK*}}"); - - -File: asymptote.info, Node: latin1, Next: babel, Prev: unicode, Up: Base modules - -8.22 'latin1' -============= - -If you don't have 'LaTeX' support for 'unicode' installed, you can -enable support for Western European languages (ISO 8859-1) by importing -the module 'latin1'. This module can be used as a template for -providing support for other ISO 8859 alphabets. - - -File: asymptote.info, Node: babel, Next: labelpath, Prev: latin1, Up: Base modules +File: asymptote.info, Node: babel, Next: labelpath, Prev: MetaPost, Up: Base modules -8.23 'babel' +8.21 'babel' ============ This module implements the 'LaTeX' 'babel' package in 'Asymptote'. For @@ -5451,7 +5455,7 @@ babel("german");  File: asymptote.info, Node: labelpath, Next: labelpath3, Prev: babel, Up: Base modules -8.24 'labelpath' +8.22 'labelpath' ================ This module uses the 'PSTricks' 'pstextpath' macro to fit labels along a @@ -5469,7 +5473,7 @@ inherits the limitations of the 'PSTricks' '\pstextpath' macro.  File: asymptote.info, Node: labelpath3, Next: annotate, Prev: labelpath, Up: Base modules -8.25 'labelpath3' +8.23 'labelpath3' ================= This module, contributed by Jens Schwaiger, implements a 3D version of @@ -5479,7 +5483,7 @@ provided in 'curvedlabel3.asy'.  File: asymptote.info, Node: annotate, Next: CAD, Prev: labelpath3, Up: Base modules -8.26 'annotate' +8.24 'annotate' =============== This module supports PDF annotations for viewing with 'Adobe Reader', @@ -5493,7 +5497,7 @@ and 'tex' TeX engines.  File: asymptote.info, Node: CAD, Next: graph, Prev: annotate, Up: Base modules -8.27 'CAD' +8.25 'CAD' ========== This module, contributed by Mark Henning, provides basic pen definitions @@ -5503,7 +5507,7 @@ and measurement functions for simple 2D CAD drawings according to DIN  File: asymptote.info, Node: graph, Next: palette, Prev: CAD, Up: Base modules -8.28 'graph' +8.26 'graph' ============ This module implements two-dimensional linear and logarithmic graphs, @@ -5925,21 +5929,21 @@ following routines: attach(legend(),truepoint(E),20E,UnFill); A legend can have multiple entries per line: - import graph; - size(8cm,6cm,IgnoreAspect); - - typedef real realfcn(real); - realfcn F(real p) { - return new real(real x) {return sin(p*x);}; - }; - + import graph; + size(8cm,6cm,IgnoreAspect); + + typedef real realfcn(real); + realfcn F(real p) { + return new real(real x) {return sin(p*x);}; + }; + for(int i=1; i < 5; ++i) draw(graph(F(i*pi),0,1),Pen(i), - "$\sin("+(i == 1 ? "" : (string) i)+"\pi x)$"); - xaxis("$x$",BottomTop,LeftTicks); - yaxis("$y$",LeftRight,RightTicks(trailingzero)); - - attach(legend(2),(point(S).x,truepoint(S).y),10S,UnFill); + "$\sin("+(i == 1 ? "" : (string) i)+"\pi x)$"); + xaxis("$x$",BottomTop,LeftTicks); + yaxis("$y$",LeftRight,RightTicks(trailingzero)); + + attach(legend(2),(point(S).x,truepoint(S).y),10S,UnFill); [./legend] @@ -6398,7 +6402,7 @@ following routines: draw(pic,graph(pic,t,infectious,t >= 10 & t <= 15),red); yaxis(pic,Right,red,LeftTicks(begin=false,end=false)); }); - + add(secondary); label(shift(5mm*N)*"Proportion of crows",point(NW),E); @@ -6454,7 +6458,7 @@ following routines: // Remove negative or zero values of rho: t=rho > 0 ? t : null; rho=rho > 0 ? rho : null; - + scale(Log(true),Linear(true)); int n=step > 0 ? ceil((last-first)/step) : 0; @@ -6465,17 +6469,17 @@ following routines: real first=first+i*step; real[] logrho=(t >= first & t <= last) ? log(rho) : null; real[] logt=(t >= first & t <= last) ? -log(t) : null; - + if(logt.length < 2) break; - + // Fit to the line logt=L.m*logrho+L.b: linefit L=leastsquares(logt,logrho); - + T.push(first); xi.push(L.m); dxi.push(L.dm); - } - + } + draw(graph(T,xi),blue); errorbars(T,xi,dxi,red); @@ -6575,7 +6579,7 @@ following routines:  File: asymptote.info, Node: palette, Next: three, Prev: graph, Up: Base modules -8.29 'palette' +8.27 'palette' ============== 'Asymptote' can also generate color density images and palettes. The @@ -6785,7 +6789,7 @@ pen[][] palette(real[][] f, pen[] palette);  File: asymptote.info, Node: three, Next: obj, Prev: palette, Up: Base modules -8.30 'three' +8.28 'three' ============ This module fully extends the notion of guides and paths in 'Asymptote' @@ -6960,10 +6964,11 @@ There are five choices for viewing 3D 'Asymptote' output: the command-line option '-V' and the default settings 'outformat=""' and 'render=-1'). On 'UNIX' systems with graphics support for multisampling, the sample width can be controlled with - the setting 'multisample'. An initial screen position can be - specified with the pair setting 'position', where negative values - are interpreted as relative to the corresponding maximum screen - dimension. The default settings + the setting 'multisample'. The ratio of physical to logical screen + pixels can be specified with the setting 'devicepixelratio'. An + initial screen position can be specified with the pair setting + 'position', where negative values are interpreted as relative to + the corresponding maximum screen dimension. The default settings import settings; leftbutton=new string[] {"rotate","zoom","shift","pan"}; middlebutton=new string[] {""}; @@ -7468,7 +7473,7 @@ add(faces);  File: asymptote.info, Node: obj, Next: graph3, Prev: three, Up: Base modules -8.31 'obj' +8.29 'obj' ========== This module allows one to construct surfaces from simple obj files, as @@ -7477,7 +7482,7 @@ illustrated in the example files 'galleon.asy' and 'triceratops.asy'.  File: asymptote.info, Node: graph3, Next: grid3, Prev: obj, Up: Base modules -8.32 'graph3' +8.30 'graph3' ============= This module implements three-dimensional versions of the functions in @@ -7643,7 +7648,7 @@ picture vectorfield(path3 vector(pair v), triple f(pair z), pair a, pair b,  File: asymptote.info, Node: grid3, Next: solids, Prev: graph3, Up: Base modules -8.33 'grid3' +8.31 'grid3' ============ This module, contributed by Philippe Ivaldi, can be used for drawing 3D @@ -7672,7 +7677,7 @@ zaxis3(Label("$z$",position=EndPoint,align=(-1,0.5)),Bounds(Min,Min),  File: asymptote.info, Node: solids, Next: tube, Prev: grid3, Up: Base modules -8.34 'solids' +8.32 'solids' ============= This solid geometry module defines a structure 'revolution' that can be @@ -7707,7 +7712,7 @@ struct skeleton {  File: asymptote.info, Node: tube, Next: flowchart, Prev: solids, Up: Base modules -8.35 'tube' +8.33 'tube' =========== This module extends the 'tube' surfaces constructed in @@ -7758,7 +7763,7 @@ Further examples can be found at  File: asymptote.info, Node: flowchart, Next: contour, Prev: tube, Up: Base modules -8.36 'flowchart' +8.34 'flowchart' ================ This module provides routines for drawing flowcharts. The primary @@ -7846,8 +7851,8 @@ size(0,300); import flowchart; block block1=rectangle(Label("Example",magenta), - pack(Label("Start:",heavygreen),"",Label("$A:=0$",blue), - "$B:=1$"),(-0.5,3),palegreen,paleblue,red); + pack(Label("Start:",heavygreen),"",Label("$A:=0$",blue), + "$B:=1$"),(-0.5,3),palegreen,paleblue,red); block block2=diamond(Label("Choice?",blue),(0,2),palegreen,red); block block3=roundrectangle("Do something",(-1,1)); block block4=bevel("Don't do something",(1,1)); @@ -7874,7 +7879,7 @@ add(new void(picture pic, transform t) {  File: asymptote.info, Node: contour, Next: contour3, Prev: flowchart, Up: Base modules -8.37 'contour' +8.35 'contour' ============== This module draws contour lines. To construct contours corresponding to @@ -7970,7 +7975,7 @@ pen tickpen=gray+0.5*linewidth(currentpen); pen[] Palette=BWRainbow(); bounds range=image(f,Automatic,a,b,N,Palette); - + // Major contours real[] Cvals=uniform(range.min,range.max,Divs); @@ -8053,7 +8058,7 @@ Shewchuk.  File: asymptote.info, Node: contour3, Next: smoothcontour3, Prev: contour, Up: Base modules -8.38 'contour3' +8.36 'contour3' =============== This module draws surfaces described as the null space of real-valued @@ -8063,7 +8068,7 @@ in the example file 'magnetic.asy'.  File: asymptote.info, Node: smoothcontour3, Next: slopefield, Prev: contour3, Up: Base modules -8.39 'smoothcontour3' +8.37 'smoothcontour3' ===================== This module, written by Charles Staats, draws implicitly defined @@ -8099,7 +8104,7 @@ explanation of the module's usage and pitfalls, are available at  File: asymptote.info, Node: slopefield, Next: ode, Prev: smoothcontour3, Up: Base modules -8.40 'slopefield' +8.38 'slopefield' ================= To draw a slope field for the differential equation dy/dx=f(x,y) (or @@ -8141,7 +8146,7 @@ draw(curve((0,0),func,(-3,-3),(3,3)),red);  File: asymptote.info, Node: ode, Prev: slopefield, Up: Base modules -8.41 'ode' +8.39 'ode' ========== The 'ode' module, illustrated in the example 'odetest.asy', implements a @@ -8180,6 +8185,7 @@ Options (negate by replacing - with -no): -c,-command string Command to autoexecute -compact Conserve memory at the expense of speed [false] -d,-debug Enable debugging messages [false] +-devicepixelratio n Ratio of physical to logical pixels [1] -digits n Default output file precision [7] -divisor n Garbage collect using purge(divisor=n) [2] -embed Embed rendered preview image [true] @@ -8188,6 +8194,7 @@ Options (negate by replacing - with -no): -fitscreen Fit rendered image to screen [true] -framedelay ms Additional frame delay [0] -framerate frames/s Animation speed [30] +-globalread Allow read from other directory [true] -globalwrite Allow write to other directory [false] -gray Convert all colors to grayscale [false] -h,-help Show summary of options; command-line only @@ -8493,7 +8500,7 @@ pip3 install cson numpy pyqt5 PyQt5.sip Pictures are deconstructed into the SVG image format. Since 'Qt5' does not support 'SVG' clipping, you will need the 'rsvg-convert' utility, which is part of the 'librsvg2-tools' package on 'UNIX' systems -and the 'librsvg' package on 'MacOS'; under 'Microsoft Windows', it is +and the 'librsvg' package on 'MacOS X'; under 'Microsoft Windows', it is available as @@ -8714,9 +8721,9 @@ Index * ---: Bezier curves. (line 84) * -=: Self & prefix operators. (line 6) -* -c: Options. (line 192) -* -l: Options. (line 211) -* -u: Options. (line 202) +* -c: Options. (line 194) +* -l: Options. (line 213) +* -u: Options. (line 204) * -V: Configuring. (line 6) * -V <1>: Drawing in batch mode. (line 16) @@ -8729,7 +8736,7 @@ Index * 2D graphs: graph. (line 6) * 3D graphs: graph3. (line 6) * 3D grids: grid3. (line 6) -* 3D PostScript: three. (line 638) +* 3D PostScript: three. (line 639) * :: Arithmetic & logical. (line 61) * ::: Bezier curves. (line 70) @@ -8757,15 +8764,20 @@ Index (line 53) * ||: Arithmetic & logical. (line 51) -* a4: Configuring. (line 66) -* abort: Data types. (line 363) +* a4: Configuring. (line 68) +* abort: Data types. (line 364) * abs: Data types. (line 65) -* abs <1>: Mathematical functions. +* abs <1>: Data types. (line 144) +* abs <2>: Mathematical functions. (line 35) +* abs2: Data types. (line 65) +* abs2 <1>: Data types. (line 144) +* absolute: Configuring. (line 43) * accel: Paths and guides. (line 126) * accel <1>: Paths and guides. (line 132) -* accel <2>: three. (line 539) +* accel <2>: three. (line 540) * access: Import. (line 6) +* access <1>: Import. (line 45) * acknowledgments: Credits. (line 6) * acos: Mathematical functions. (line 6) @@ -8777,8 +8789,8 @@ Index (line 217) * add <1>: Frames and pictures. (line 231) -* add <2>: three. (line 311) -* addViews: three. (line 432) +* add <2>: three. (line 312) +* addViews: three. (line 433) * adjust: Pens. (line 123) * Ai: Mathematical functions. (line 48) @@ -8789,55 +8801,55 @@ Index * alias: Structures. (line 62) * alias <1>: Arrays. (line 179) * Align: label. (line 12) -* aligndir: Options. (line 184) +* aligndir: Options. (line 186) * all: Arrays. (line 338) -* Allow: Pens. (line 346) +* Allow: Pens. (line 363) * and: Bezier curves. (line 56) * AND: Arithmetic & logical. (line 68) * angle: Data types. (line 73) * animate: Configuring. (line 20) -* animate <1>: Files. (line 155) +* animate <1>: Files. (line 159) * animate <2>: animation. (line 12) * animation: animation. (line 6) * animation <1>: animation. (line 6) * annotate: annotate. (line 6) -* antialias: three. (line 253) -* antialias <1>: Options. (line 154) -* append: Files. (line 36) +* antialias: three. (line 254) +* antialias <1>: Options. (line 156) +* append: Files. (line 38) * append <1>: Arrays. (line 39) * arc: Paths and guides. (line 24) * Arc: Paths and guides. (line 37) -* arc <1>: three. (line 322) +* arc <1>: three. (line 323) * ArcArrow: draw. (line 26) -* ArcArrow3: three. (line 605) +* ArcArrow3: three. (line 606) * ArcArrows: draw. (line 26) -* ArcArrows3: three. (line 605) +* ArcArrows3: three. (line 606) * arclength: Paths and guides. (line 153) -* arclength <1>: three. (line 539) +* arclength <1>: three. (line 540) * arcpoint: Paths and guides. (line 163) * arctime: Paths and guides. (line 157) -* arctime <1>: three. (line 539) +* arctime <1>: three. (line 540) * arguments: Default arguments. (line 6) * arithmetic operators: Arithmetic & logical. (line 6) -* array: Data types. (line 283) +* array: Data types. (line 284) * array <1>: Arrays. (line 112) * array iteration: Programming. (line 52) * arrays: Arrays. (line 6) -* arrow: Drawing commands. (line 31) +* arrow: Drawing commands. (line 34) * Arrow: draw. (line 26) * arrow <1>: label. (line 70) * arrow keys: Drawing in interactive mode. (line 11) * arrow keys <1>: GUI usage. (line 6) -* Arrow3: three. (line 605) +* Arrow3: three. (line 606) * arrows: draw. (line 26) * Arrows: draw. (line 26) -* Arrows3: three. (line 605) +* Arrows3: three. (line 606) * as: Import. (line 67) -* ascii: Data types. (line 308) -* ascii <1>: Data types. (line 308) +* ascii: Data types. (line 309) +* ascii <1>: Data types. (line 309) * asin: Mathematical functions. (line 6) * aSin: Mathematical functions. @@ -8846,18 +8858,18 @@ Index (line 6) * Aspect: Frames and pictures. (line 59) -* assert: Data types. (line 368) +* assert: Data types. (line 369) * assignment: Programming. (line 26) -* asy: Data types. (line 358) -* asy <1>: Import. (line 101) +* asy: Data types. (line 359) +* asy <1>: Import. (line 106) * asy-mode: Editing modes. (line 6) * asy.vim: Editing modes. (line 32) -* asygl: Configuring. (line 72) +* asygl: Configuring. (line 74) * asyinclude: LaTeX usage. (line 45) * Asymptote Web Application: Description. (line 6) * asymptote.sty: LaTeX usage. (line 6) * asymptote.xml: Editing modes. (line 48) -* ASYMPTOTE_CONFIG: Options. (line 125) +* ASYMPTOTE_CONFIG: Options. (line 127) * atan: Mathematical functions. (line 6) * aTan: Mathematical functions. @@ -8871,8 +8883,8 @@ Index (line 276) * attach <1>: LaTeX usage. (line 50) * attach <2>: graph. (line 406) -* autoadjust: three. (line 397) -* autoimport: Options. (line 121) +* autoadjust: three. (line 398) +* autoimport: Options. (line 123) * automatic scaling: graph. (line 690) * automatic scaling <1>: graph. (line 690) * axialshade: fill. (line 43) @@ -8880,37 +8892,37 @@ Index * axis <1>: graph. (line 988) * axis <2>: graph3. (line 66) * axis <3>: graph3. (line 82) -* azimuth: Data types. (line 153) +* azimuth: Data types. (line 154) * babel: babel. (line 6) * background: three. (line 76) * background <1>: three. (line 97) * background color: Frames and pictures. (line 180) -* BackView: three. (line 425) +* BackView: three. (line 426) * Bar: draw. (line 19) -* Bar3: three. (line 605) +* Bar3: three. (line 606) * Bars: draw. (line 19) -* Bars3: three. (line 605) +* Bars3: three. (line 606) * barsize: draw. (line 19) * base modules: Base modules. (line 6) * basealign: Pens. (line 181) * baseline: label. (line 90) * batch mode: Drawing in batch mode. (line 6) -* beep: Data types. (line 381) +* beep: Data types. (line 382) * BeginArcArrow: draw. (line 26) -* BeginArcArrow3: three. (line 605) +* BeginArcArrow3: three. (line 606) * BeginArrow: draw. (line 26) -* BeginArrow3: three. (line 605) +* BeginArrow3: three. (line 606) * BeginBar: draw. (line 19) -* BeginBar3: three. (line 605) +* BeginBar3: three. (line 606) * BeginDotMargin: draw. (line 42) -* BeginDotMargin3: three. (line 621) +* BeginDotMargin3: three. (line 622) * BeginMargin: draw. (line 42) -* BeginMargin3: three. (line 621) +* BeginMargin3: three. (line 622) * BeginPenMargin: draw. (line 42) -* BeginPenMargin2: three. (line 621) -* BeginPenMargin3: three. (line 621) +* BeginPenMargin2: three. (line 622) +* BeginPenMargin3: three. (line 622) * BeginPoint: label. (line 55) * Bessel: Mathematical functions. (line 48) @@ -8922,15 +8934,15 @@ Index * bezulate: three. (line 136) * Bi: Mathematical functions. (line 48) -* Billboard: three. (line 509) -* binary: Files. (line 76) -* binary format: Files. (line 76) +* Billboard: three. (line 510) +* binary: Files. (line 80) +* binary format: Files. (line 80) * binary operators: Arithmetic & logical. (line 6) * binarytree: binarytree. (line 6) * Bi_deriv: Mathematical functions. (line 48) -* black stripes: three. (line 253) +* black stripes: three. (line 254) * Blank: draw. (line 26) * block.bottom: flowchart. (line 19) * block.bottomleft: flowchart. (line 19) @@ -8949,7 +8961,7 @@ Index (line 6) * Bottom: graph. (line 132) * BottomTop: graph. (line 138) -* BottomView: three. (line 425) +* BottomView: three. (line 426) * bounding box: Frames and pictures. (line 180) * Bounds: graph3. (line 21) @@ -8957,14 +8969,14 @@ Index (line 25) * box <1>: Frames and pictures. (line 130) -* box <2>: three. (line 344) -* box <3>: three. (line 346) +* box <2>: three. (line 345) +* box <3>: three. (line 347) * bp: Drawing in batch mode. (line 23) * brace: Paths and guides. (line 51) * break: Programming. (line 48) * breakpoints: Debugger. (line 21) -* brick: Pens. (line 268) +* brick: Pens. (line 285) * broken axis: graph. (line 801) * bug reports: Help. (line 19) * buildcycle: Paths and guides. (line 270) @@ -8972,33 +8984,35 @@ Index * Button-2: GUI. (line 6) * BWRainbow: palette. (line 15) * BWRainbow2: palette. (line 18) -* C string: Data types. (line 216) +* C string: Data types. (line 217) * CAD: CAD. (line 6) * calculateTransform: Frames and pictures. (line 118) -* camera: three. (line 391) +* camera: three. (line 392) * casts: Casts. (line 6) * cbrt: Mathematical functions. (line 6) -* cd: Files. (line 25) +* cd: Files. (line 26) * ceil: Mathematical functions. (line 26) * Center: label. (line 60) -* center: three. (line 374) -* checker: Pens. (line 268) -* Chinese: unicode. (line 12) +* center: three. (line 375) +* checker: Pens. (line 285) +* Chinese: Pens. (line 244) * choose: Mathematical functions. (line 39) * Ci: Mathematical functions. (line 48) * circle: Paths and guides. (line 10) * Circle: Paths and guides. (line 18) -* circle <1>: three. (line 318) +* circle <1>: three. (line 319) * circle <2>: flowchart. (line 61) * circlebarframe: markers. (line 18) -* CJK: unicode. (line 12) +* CJK: Pens. (line 244) * clamped: graph. (line 36) -* clear: Files. (line 93) +* clang: Compiling from UNIX source. + (line 50) +* clear: Files. (line 97) * clear <1>: Debugger. (line 23) * clip: clip. (line 6) * CLZ: Arithmetic & logical. @@ -9006,16 +9020,16 @@ Index * cm: Figure size. (line 18) * cmd: Configuring. (line 35) * cmyk: Pens. (line 38) -* colatitude: Data types. (line 158) +* colatitude: Data types. (line 159) * color: Pens. (line 23) * coloredNodes: tube. (line 25) * coloredpath: tube. (line 18) * coloredSegments: tube. (line 25) * colorless: Pens. (line 57) * colors: Pens. (line 54) -* comma: Files. (line 61) +* comma: Files. (line 65) * comma-separated-value mode: Arrays. (line 370) -* command-line options: Configuring. (line 89) +* command-line options: Configuring. (line 91) * command-line options <1>: Options. (line 6) * comment character: Files. (line 16) * compass directions: Labels. (line 18) @@ -9026,14 +9040,14 @@ Index * conditional: Programming. (line 26) * conditional <1>: Arithmetic & logical. (line 61) -* config: Configuring. (line 72) -* config <1>: Options. (line 125) +* config: Configuring. (line 74) +* config <1>: Options. (line 127) * configuration file: Configuring. (line 20) -* configuration file <1>: Options. (line 125) +* configuration file <1>: Options. (line 127) * configuring: Configuring. (line 6) * conj: Data types. (line 62) * constructors: Structures. (line 91) -* context: Options. (line 154) +* context: Options. (line 156) * continue: Programming. (line 48) * continue <1>: Debugger. (line 31) * contour: contour. (line 6) @@ -9041,11 +9055,11 @@ Index * controls: Bezier curves. (line 45) * controls <1>: three. (line 6) * controlSpecifier: Paths and guides. (line 396) -* convert: Configuring. (line 72) -* convert <1>: Files. (line 155) +* convert: Configuring. (line 74) +* convert <1>: Files. (line 159) * convert <2>: animation. (line 6) -* convert <3>: Options. (line 154) -* convertOptions: Options. (line 140) +* convert <3>: Options. (line 156) +* convertOptions: Options. (line 142) * Coons shading: fill. (line 78) * copy: Arrays. (line 172) * cos: Mathematical functions. @@ -9058,10 +9072,10 @@ Index * crop: graph. (line 639) * cropping graphs: graph. (line 639) * cross: Data types. (line 106) -* cross <1>: Data types. (line 196) +* cross <1>: Data types. (line 197) * cross <2>: graph. (line 480) * crossframe: markers. (line 22) -* crosshatch: Pens. (line 285) +* crosshatch: Pens. (line 302) * csv: Arrays. (line 370) * CTZ: Arithmetic & logical. (line 68) @@ -9071,7 +9085,7 @@ Index * curlSpecifier: Paths and guides. (line 408) * currentlight: three. (line 76) * currentpen: Pens. (line 6) -* currentprojection: three. (line 422) +* currentprojection: three. (line 423) * curve: slopefield. (line 20) * custom axis types: graph. (line 141) * custom mark routine: graph. (line 577) @@ -9083,12 +9097,12 @@ Index * cyclic: Paths and guides. (line 85) * cyclic <1>: Paths and guides. (line 376) * cyclic <2>: Arrays. (line 39) -* cyclic <3>: three. (line 539) -* Cyrillic: unicode. (line 7) +* cyclic <3>: three. (line 540) +* Cyrillic: Pens. (line 237) * dashdotted: Pens. (line 102) * dashed: Pens. (line 102) * data types: Data types. (line 6) -* date: Data types. (line 320) +* date: Data types. (line 321) * Debian: UNIX binary distributions. (line 19) * debugger: Debugger. (line 6) @@ -9097,14 +9111,14 @@ Index * default arguments: Default arguments. (line 6) * defaultformat: graph. (line 175) * DefaultHead: draw. (line 26) -* DefaultHead3: three. (line 605) +* DefaultHead3: three. (line 606) * defaultpen: Pens. (line 49) * defaultpen <1>: Pens. (line 122) * defaultpen <2>: Pens. (line 127) * defaultpen <3>: Pens. (line 139) * defaultpen <4>: Pens. (line 192) -* defaultpen <5>: Pens. (line 346) -* defaultpen <6>: Pens. (line 370) +* defaultpen <5>: Pens. (line 363) +* defaultpen <6>: Pens. (line 387) * defaultrender: three. (line 46) * deferred drawing: simplex. (line 6) * degrees: Data types. (line 78) @@ -9112,9 +9126,10 @@ Index (line 17) * Degrees: Mathematical functions. (line 17) -* delete: Files. (line 150) +* delete: Files. (line 154) * delete <1>: Arrays. (line 39) * description: Description. (line 6) +* devicepixelratio: three. (line 174) * diagonal: Arrays. (line 312) * diamond: flowchart. (line 54) * diffuse: three. (line 76) @@ -9122,30 +9137,30 @@ Index * dimension: Arrays. (line 375) * dir: Search paths. (line 9) * dir <1>: Data types. (line 90) -* dir <2>: Data types. (line 180) +* dir <2>: Data types. (line 181) * dir <3>: Paths and guides. (line 109) -* dir <4>: three. (line 539) +* dir <4>: three. (line 540) * direction specifier: Bezier curves. (line 6) -* directory: Files. (line 25) +* directory: Files. (line 26) * dirSpecifier: Paths and guides. (line 390) * dirtime: Paths and guides. (line 166) * display: Configuring. (line 20) * do: Programming. (line 48) -* DOSendl: Files. (line 61) -* DOSnewl: Files. (line 61) +* DOSendl: Files. (line 65) +* DOSnewl: Files. (line 65) * dot: draw. (line 82) * dot <1>: Data types. (line 103) -* dot <2>: Data types. (line 193) +* dot <2>: Data types. (line 194) * dot <3>: Arrays. (line 267) * dot <4>: Arrays. (line 270) * DotMargin: draw. (line 42) -* DotMargin3: three. (line 621) +* DotMargin3: three. (line 622) * DotMargins: draw. (line 42) -* DotMargins3: three. (line 621) +* DotMargins3: three. (line 622) * dotted: Pens. (line 102) -* double deferred drawing: three. (line 296) -* double precision: Files. (line 76) -* draw: Drawing commands. (line 31) +* double deferred drawing: three. (line 297) +* double precision: Files. (line 80) +* draw: Drawing commands. (line 34) * draw <1>: draw. (line 6) * Draw: draw. (line 26) * draw <2>: draw. (line 112) @@ -9155,11 +9170,11 @@ Index * drawing commands: Drawing commands. (line 6) * drawline: math. (line 9) * drawtree: drawtree. (line 6) -* dvips: Configuring. (line 72) -* dvipsOptions: Options. (line 140) -* dvisvgm: Configuring. (line 72) -* dvisvgm <1>: Options. (line 159) -* dvisvgmOptions: Options. (line 140) +* dvips: Configuring. (line 74) +* dvipsOptions: Options. (line 142) +* dvisvgm: Configuring. (line 74) +* dvisvgm <1>: Options. (line 161) +* dvisvgmOptions: Options. (line 142) * E: Labels. (line 18) * E <1>: Mathematical functions. (line 48) @@ -9174,37 +9189,37 @@ Index * else: Programming. (line 26) * emacs: Editing modes. (line 6) * embed: embed. (line 6) -* Embedded: three. (line 509) +* Embedded: three. (line 510) * emissivepen: three. (line 66) * empty: Frames and pictures. (line 7) * EndArcArrow: draw. (line 26) -* EndArcArrow3: three. (line 605) +* EndArcArrow3: three. (line 606) * EndArrow: draw. (line 26) -* EndArrow3: three. (line 605) +* EndArrow3: three. (line 606) * EndBar: draw. (line 19) -* EndBar3: three. (line 605) +* EndBar3: three. (line 606) * EndDotMargin: draw. (line 42) -* EndDotMargin3: three. (line 621) -* endl: Files. (line 61) +* EndDotMargin3: three. (line 622) +* endl: Files. (line 65) * EndMargin: draw. (line 42) -* EndMargin3: three. (line 621) +* EndMargin3: three. (line 622) * EndPenMargin: draw. (line 42) -* EndPenMargin2: three. (line 621) -* EndPenMargin3: three. (line 621) +* EndPenMargin2: three. (line 622) +* EndPenMargin3: three. (line 622) * EndPoint: label. (line 55) * envelope: Frames and pictures. (line 25) -* environment variables: Configuring. (line 93) -* eof: Files. (line 93) +* environment variables: Configuring. (line 95) +* eof: Files. (line 97) * eof <1>: Arrays. (line 352) -* eol: Files. (line 93) +* eol: Files. (line 97) * eol <1>: Arrays. (line 352) * EPS: label. (line 78) -* EPS <1>: Options. (line 154) +* EPS <1>: Options. (line 156) * erase: Drawing in interactive mode. (line 11) -* erase <1>: Data types. (line 256) +* erase <1>: Data types. (line 257) * erase <2>: Frames and pictures. (line 7) * erase <3>: Frames and pictures. @@ -9214,20 +9229,20 @@ Index * erfc: Mathematical functions. (line 6) * error: Files. (line 16) -* error <1>: Files. (line 93) +* error <1>: Files. (line 97) * error bars: graph. (line 531) * errorbars: graph. (line 480) -* eval: Import. (line 97) -* eval <1>: Import. (line 107) +* eval: Import. (line 102) +* eval <1>: Import. (line 112) * evenodd: Paths. (line 37) * evenodd <1>: Pens. (line 164) -* exit: Data types. (line 372) +* exit: Data types. (line 373) * exit <1>: Interactive mode. (line 54) * exit <2>: Debugger. (line 56) * exp: Mathematical functions. (line 6) * expi: Data types. (line 86) -* expi <1>: Data types. (line 176) +* expi <1>: Data types. (line 177) * explicit: Casts. (line 6) * explicit casts: Casts. (line 21) * expm1: Mathematical functions. @@ -9238,12 +9253,12 @@ Index * extension: Paths and guides. (line 246) * extension <1>: MetaPost. (line 10) * external: embed. (line 11) -* extrude: three. (line 533) +* extrude: three. (line 534) * F: Mathematical functions. (line 48) * fabs: Mathematical functions. (line 6) -* face: three. (line 645) +* face: three. (line 646) * factorial: Mathematical functions. (line 39) * Fedora: UNIX binary distributions. @@ -9253,7 +9268,7 @@ Index * fft <1>: Arrays. (line 259) * fft <2>: Arrays. (line 263) * FFTW: Compiling from UNIX source. - (line 63) + (line 64) * file: Files. (line 6) * file <1>: Debugger. (line 44) * Fill: draw. (line 26) @@ -9268,35 +9283,37 @@ Index (line 136) * filloutside: fill. (line 27) * fillrule: Pens. (line 164) -* find: Data types. (line 241) +* find: Data types. (line 242) * find <1>: Arrays. (line 154) * findall: Arrays. (line 159) * firstcut: Paths and guides. (line 262) * fit: Frames and pictures. (line 113) -* fit3: three. (line 309) +* fit3: three. (line 310) * fixedscaling: Frames and pictures. (line 81) * floor: Mathematical functions. (line 26) * flowchart: flowchart. (line 6) -* flush: Files. (line 61) -* flush <1>: Files. (line 93) +* flush: Files. (line 65) +* flush <1>: Files. (line 97) * fmod: Mathematical functions. (line 6) * font: Pens. (line 206) -* font command: Pens. (line 206) -* fontcommand: Pens. (line 221) +* font <1>: Pens. (line 206) +* font <2>: Pens. (line 235) +* font encoding: Pens. (line 235) +* fontcommand: Pens. (line 219) * fontsize: Pens. (line 192) * for: Programming. (line 26) -* format: Data types. (line 289) -* format <1>: Options. (line 154) +* format: Data types. (line 290) +* format <1>: Options. (line 156) * forum: Help. (line 6) * frame: Frames and pictures. (line 7) * freshnel0: three. (line 66) * from: Import. (line 16) -* FrontView: three. (line 425) +* FrontView: three. (line 426) * function declarations: Functions. (line 79) * Function shading: fill. (line 100) * function shading: fill. (line 100) @@ -9309,14 +9326,16 @@ Index * Gaussrand: Mathematical functions. (line 39) * geometry: geometry. (line 6) -* getc: Files. (line 30) -* getpair: Files. (line 118) -* getreal: Files. (line 118) -* getstring: Files. (line 118) -* gettriple: Files. (line 118) +* getc: Files. (line 32) +* getpair: Files. (line 122) +* getreal: Files. (line 122) +* getstring: Files. (line 122) +* gettriple: Files. (line 122) * git: Git. (line 6) -* glOptions: three. (line 253) -* glOptions <1>: Options. (line 140) +* globalwrite: Files. (line 40) +* globalwrite <1>: Files. (line 154) +* glOptions: three. (line 254) +* glOptions <1>: Options. (line 142) * GNU Scientific Library: Mathematical functions. (line 48) * gouraudshade: fill. (line 63) @@ -9325,26 +9344,26 @@ Index * graph: graph. (line 6) * graph3: graph3. (line 6) * graphic: label. (line 78) -* graphic <1>: Options. (line 159) +* graphic <1>: Options. (line 161) * graphical user interface: GUI. (line 6) * gray: Pens. (line 25) * grayscale: Pens. (line 25) * Grayscale: palette. (line 9) -* grid: Pens. (line 268) +* grid: Pens. (line 285) * grid <1>: graph. (line 746) * grid3: grid3. (line 6) * gs: Configuring. (line 20) * GSL: Compiling from UNIX source. - (line 63) + (line 64) * gsl: Mathematical functions. (line 48) -* gsOptions: Options. (line 140) +* gsOptions: Options. (line 142) * GUI: GUI. (line 6) * GUI installation: GUI installation. (line 6) * GUI usage: GUI usage. (line 6) * guide: Paths and guides. (line 314) * guide3: three. (line 6) -* hatch: Pens. (line 285) +* hatch: Pens. (line 302) * Headlamp: three. (line 76) * height: LaTeX usage. (line 50) * help: Interactive mode. (line 42) @@ -9352,42 +9371,42 @@ Index * help <2>: Debugger. (line 30) * Hermite: graph. (line 36) * Hermite(splinetype splinetype: graph. (line 36) -* hex: Data types. (line 305) +* hex: Data types. (line 306) * hex <1>: Pens. (line 64) -* hexadecimal: Data types. (line 305) +* hexadecimal: Data types. (line 306) * hexadecimal <1>: Pens. (line 62) -* hidden surface removal: three. (line 645) +* hidden surface removal: three. (line 646) * histogram: Mathematical functions. (line 39) -* history: Files. (line 143) +* history: Files. (line 147) * history <1>: Interactive mode. (line 54) * historylines: Interactive mode. (line 57) * HookHead: draw. (line 26) -* HookHead3: three. (line 605) +* HookHead3: three. (line 606) * Horizontal: flowchart. (line 77) -* HTML5: three. (line 222) +* HTML5: three. (line 223) * htmlviewer: Configuring. (line 20) * htmlviewer <1>: Configuring. (line 43) -* htmlviewerOptions: Options. (line 140) -* hyperrefOptions: Options. (line 140) +* htmlviewerOptions: Options. (line 142) +* hyperrefOptions: Options. (line 142) * hypot: Mathematical functions. (line 6) * I: Mathematical functions. (line 48) -* iconify: three. (line 253) +* iconify: three. (line 254) * identity: Transforms. (line 24) * identity <1>: Mathematical functions. (line 6) * identity <2>: Arrays. (line 309) -* identity4: three. (line 477) +* identity4: three. (line 478) * if: Programming. (line 26) * IgnoreAspect: Frames and pictures. (line 63) * image: palette. (line 33) * image <1>: palette. (line 58) -* ImageMagick: Configuring. (line 72) +* ImageMagick: Configuring. (line 74) * ImageMagick <1>: animation. (line 6) -* ImageMagick <2>: Options. (line 154) +* ImageMagick <2>: Options. (line 156) * images: palette. (line 6) * implicit casts: Casts. (line 6) * implicit linear solver: MetaPost. (line 10) @@ -9396,7 +9415,7 @@ Index * import: Import. (line 45) * inches: Figure size. (line 18) * incircle: Data types. (line 120) -* include: Import. (line 129) +* include: Import. (line 134) * including images: label. (line 78) * increasing: math. (line 55) * inf: Data types. (line 35) @@ -9410,12 +9429,13 @@ Index * input <1>: Files. (line 12) * input <2>: Interactive mode. (line 45) * input <3>: Interactive mode. (line 49) -* insert: Data types. (line 252) +* input encoding: Pens. (line 235) +* insert: Data types. (line 253) * insert <1>: Arrays. (line 39) * inside: Paths and guides. (line 294) * inside <1>: Paths and guides. (line 299) * inside <2>: Paths and guides. (line 305) -* insphere: three. (line 568) +* insphere: three. (line 569) * inst: Debugger. (line 35) * installation: Installation. (line 6) * int: Data types. (line 30) @@ -9429,29 +9449,28 @@ Index (line 6) * interactive mode <1>: Interactive mode. (line 6) * interior: Paths and guides. (line 290) -* international characters: unicode. (line 6) * interp: Arithmetic & logical. (line 64) * interpolate: interpolate. (line 6) * intersect: Paths and guides. (line 195) * intersect <1>: math. (line 13) -* intersect <2>: three. (line 539) +* intersect <2>: three. (line 540) * intersectionpoint: Paths and guides. (line 238) * intersectionpoint <1>: math. (line 17) -* intersectionpoint <2>: three. (line 539) +* intersectionpoint <2>: three. (line 540) * intersectionpoints: Paths and guides. (line 242) -* intersectionpoints <1>: three. (line 539) -* intersectionpoints <2>: three. (line 552) +* intersectionpoints <1>: three. (line 540) +* intersectionpoints <2>: three. (line 553) * intersections: Paths and guides. (line 206) * intersections <1>: Paths and guides. (line 213) -* intersections <2>: three. (line 539) -* intersections <3>: three. (line 545) +* intersections <2>: three. (line 540) +* intersections <3>: three. (line 546) * InTicks: graph3. (line 35) * intMax: Data types. (line 30) * intMin: Data types. (line 30) * inverse: Transforms. (line 16) * inverse <1>: Arrays. (line 315) -* invert: three. (line 467) +* invert: three. (line 468) * invisible: Pens. (line 43) * isnan: Data types. (line 35) * i_scaled: Mathematical functions. @@ -9460,7 +9479,7 @@ Index (line 6) * J <1>: Mathematical functions. (line 48) -* Japanese: unicode. (line 12) +* Japanese: Pens. (line 244) * K: Mathematical functions. (line 48) * Kate: Editing modes. (line 48) @@ -9470,12 +9489,12 @@ Index * keepAspect <1>: Frames and pictures. (line 63) * keepAspect <2>: LaTeX usage. (line 50) -* keyboard bindings:: three. (line 200) +* keyboard bindings:: three. (line 201) * keys: Arrays. (line 39) * keyword: Named arguments. (line 37) * keyword-only: Named arguments. (line 37) * keywords: Named arguments. (line 6) -* Korean: unicode. (line 12) +* Korean: Pens. (line 244) * k_scaled: Mathematical functions. (line 48) * label: Labels. (line 6) @@ -9483,21 +9502,21 @@ Index * label <1>: label. (line 6) * Label <1>: label. (line 14) * Label <2>: graph. (line 330) -* label <2>: three. (line 503) +* label <2>: three. (line 504) * labelpath: labelpath. (line 6) * labelpath3: labelpath3. (line 6) * labelx: graph. (line 330) * labely: graph. (line 330) * Landscape: Frames and pictures. (line 104) +* language context: Pens. (line 235) * lastcut: Paths and guides. (line 266) * lasy-mode: Editing modes. (line 6) -* latex: Options. (line 154) -* LaTeX fonts: Pens. (line 206) +* latex: Options. (line 156) +* LaTeX NFSS fonts: Pens. (line 206) * LaTeX usage: LaTeX usage. (line 6) * latexmk: LaTeX usage. (line 30) -* latin1: latin1. (line 6) -* latitude: Data types. (line 163) +* latitude: Data types. (line 164) * latticeshade: fill. (line 32) * layer: Drawing commands. (line 16) * leastsquares: stats. (line 6) @@ -9507,23 +9526,24 @@ Index * LeftSide: label. (line 60) * LeftTicks: graph. (line 160) * LeftTicks <1>: graph. (line 233) -* LeftView: three. (line 425) -* legend: Drawing commands. (line 31) +* LeftView: three. (line 426) +* legend: Drawing commands. (line 34) * legend <1>: draw. (line 64) * legend <2>: graph. (line 424) * Legendre: Mathematical functions. (line 48) * length: Data types. (line 65) * length <1>: Data types. (line 144) -* length <2>: Data types. (line 238) +* length <2>: Data types. (line 239) * length <3>: Paths and guides. (line 76) * length <4>: Paths and guides. (line 373) * length <5>: Arrays. (line 39) -* length <6>: three. (line 539) -* letter: Configuring. (line 66) +* length <6>: three. (line 540) +* letter: Configuring. (line 68) * lexorder: math. (line 63) * lexorder <1>: math. (line 66) -* libgs: Options. (line 159) +* libcurl: Import. (line 94) +* libgs: Options. (line 161) * libm routines: Mathematical functions. (line 6) * libsigsegv: Functions. (line 100) @@ -9539,7 +9559,7 @@ Index * lineskip: Pens. (line 192) * linetype: Pens. (line 123) * linewidth: Pens. (line 127) -* locale: Data types. (line 315) +* locale: Data types. (line 316) * log: Mathematical functions. (line 6) * Log: graph. (line 690) @@ -9554,23 +9574,25 @@ Index (line 6) * longdashdotted: Pens. (line 102) * longdashed: Pens. (line 102) -* longitude: Data types. (line 168) +* longitude: Data types. (line 169) * loop: Programming. (line 26) -* lualatex: Options. (line 154) -* luatex: Options. (line 154) +* lualatex: Options. (line 156) +* luatex: Options. (line 156) * MacOS X binary distributions: MacOS X binary distributions. (line 6) -* makepen: Pens. (line 321) +* MacOS X configuration: Compiling from UNIX source. + (line 50) +* makepen: Pens. (line 338) * map: Arrays. (line 131) * map <1>: Arrays. (line 136) * map <2>: map. (line 6) * Margin: draw. (line 42) * Margin <1>: draw. (line 42) -* Margin3: three. (line 621) -* Margin3 <1>: three. (line 621) +* Margin3: three. (line 622) +* Margin3 <1>: three. (line 622) * Margins: draw. (line 42) -* margins: three. (line 302) -* Margins3: three. (line 621) +* margins: three. (line 303) +* Margins3: three. (line 622) * mark: graph. (line 480) * markangle: markers. (line 35) * marker: graph. (line 480) @@ -9587,12 +9609,12 @@ Index (line 7) * max <2>: Arrays. (line 226) * max <3>: Arrays. (line 236) -* max <4>: three. (line 539) +* max <4>: three. (line 540) * maxbound: Data types. (line 134) -* maxbound <1>: Data types. (line 204) -* maxtile: three. (line 253) +* maxbound <1>: Data types. (line 205) +* maxtile: three. (line 254) * maxtimes: Paths and guides. (line 233) -* maxviewport: three. (line 253) +* maxviewport: three. (line 254) * metallic: three. (line 66) * MetaPost: MetaPost. (line 6) * MetaPost ... : Bezier curves. (line 70) @@ -9602,9 +9624,9 @@ Index * MetaPost whatever: MetaPost. (line 10) * Microsoft Windows: Microsoft Windows. (line 6) * MidArcArrow: draw. (line 26) -* MidArcArrow3: three. (line 605) +* MidArcArrow3: three. (line 606) * MidArrow: draw. (line 26) -* MidArrow3: three. (line 605) +* MidArrow3: three. (line 606) * MidPoint: label. (line 55) * midpoint: Paths and guides. (line 180) * min: Paths and guides. (line 275) @@ -9612,27 +9634,27 @@ Index (line 7) * min <2>: Arrays. (line 221) * min <3>: Arrays. (line 231) -* min <4>: three. (line 539) +* min <4>: three. (line 540) * minbound: Data types. (line 131) -* minbound <1>: Data types. (line 201) +* minbound <1>: Data types. (line 202) * minipage: label. (line 116) * mintimes: Paths and guides. (line 228) * miterjoin: Pens. (line 149) * miterlimit: Pens. (line 159) -* mktemp: Files. (line 44) +* mktemp: Files. (line 48) * mm: Figure size. (line 18) -* mobile browser: three. (line 222) -* mode: Files. (line 76) -* mode <1>: Files. (line 89) +* mobile browser: three. (line 223) +* mode: Files. (line 80) +* mode <1>: Files. (line 93) * monotonic: graph. (line 36) * mouse: GUI. (line 6) -* mouse bindings: three. (line 181) +* mouse bindings: three. (line 182) * mouse wheel: GUI usage. (line 6) -* Move: Pens. (line 358) -* MoveQuiet: Pens. (line 364) +* Move: Pens. (line 375) +* MoveQuiet: Pens. (line 381) * multisample: three. (line 174) * N: Labels. (line 18) -* name: Files. (line 89) +* name: Files. (line 93) * named arguments: Named arguments. (line 6) * nan: Data types. (line 35) * natural: graph. (line 36) @@ -9641,25 +9663,27 @@ Index * new <2>: Arrays. (line 103) * newframe: Frames and pictures. (line 7) -* newl: Files. (line 61) +* newl: Files. (line 65) +* newpage: Drawing commands. (line 27) * newton: Mathematical functions. (line 66) * newton <1>: Mathematical functions. (line 73) * next: Debugger. (line 41) -* NFSS: Pens. (line 206) * nobasealign: Pens. (line 181) * NoFill: draw. (line 26) * NoFill <1>: Frames and pictures. (line 154) +* noglobalread: Files. (line 26) +* noglobalread <1>: Files. (line 40) * nolight: three. (line 76) * NoMargin: draw. (line 42) -* NoMargin3: three. (line 621) +* NoMargin3: three. (line 622) * None: draw. (line 19) * None <1>: draw. (line 26) -* none: Files. (line 61) -* normal: three. (line 525) -* nosafe: Options. (line 179) +* none: Files. (line 65) +* normal: three. (line 526) +* nosafe: Options. (line 181) * NOT: Arithmetic & logical. (line 68) * notaknot: graph. (line 36) @@ -9671,26 +9695,26 @@ Index (line 140) * nullpen <2>: Frames and pictures. (line 149) -* NURBS: three. (line 401) -* O: three. (line 314) +* NURBS: three. (line 402) +* O: three. (line 315) * obj: obj. (line 6) -* oblique: three. (line 357) -* obliqueX: three. (line 364) -* obliqueY: three. (line 370) -* obliqueZ: three. (line 357) +* oblique: three. (line 358) +* obliqueX: three. (line 365) +* obliqueY: three. (line 371) +* obliqueZ: three. (line 358) * ode: ode. (line 6) * offset: Pens. (line 123) -* offset <1>: Options. (line 184) +* offset <1>: Options. (line 186) * OmitTick: graph. (line 223) * OmitTickInterval: graph. (line 223) * OmitTickIntervals: graph. (line 223) -* opacity: Pens. (line 237) +* opacity: Pens. (line 254) * opacity <1>: three. (line 66) * open: Files. (line 12) * OpenGL: three. (line 174) * operator: User-defined operators. (line 6) -* operator +(...string[] a).: Data types. (line 283) +* operator +(...string[] a).: Data types. (line 284) * operator --: graph. (line 30) * operator ..: graph. (line 33) * operator answer: Interactive mode. (line 35) @@ -9704,18 +9728,18 @@ Index * OR: Arithmetic & logical. (line 68) * orient: Data types. (line 108) -* orient <1>: three. (line 556) +* orient <1>: three. (line 557) * orientation: Frames and pictures. (line 104) -* orthographic: three. (line 374) +* orthographic: three. (line 375) * outformat: three. (line 174) * outprefix: Frames and pictures. (line 91) -* output: Files. (line 36) -* output <1>: Options. (line 154) +* output: Files. (line 38) +* output <1>: Options. (line 156) * OutTicks: graph3. (line 35) * overloading functions: Functions. (line 55) -* overwrite: Pens. (line 343) +* overwrite: Pens. (line 360) * P: Mathematical functions. (line 48) * pack: label. (line 100) @@ -9725,9 +9749,9 @@ Index * pair: Figure size. (line 6) * pair <1>: Data types. (line 46) * pairs: Arrays. (line 241) -* paperheight: Configuring. (line 66) -* papertype: Configuring. (line 66) -* paperwidth: Configuring. (line 66) +* paperheight: Configuring. (line 68) +* papertype: Configuring. (line 68) +* paperwidth: Configuring. (line 68) * parallelogram: flowchart. (line 47) * parametric surface: graph3. (line 99) * parametrized curve: graph. (line 639) @@ -9742,62 +9766,63 @@ Index * path3: three. (line 6) * path3 <1>: three. (line 42) * path[]: Paths. (line 23) -* patterns: Pens. (line 254) +* patterns: Pens. (line 271) * patterns <1>: patterns. (line 6) * PBR: three. (line 74) -* PDF: Options. (line 154) -* pdflatex: Options. (line 154) -* pdfreloadOptions: Options. (line 140) +* PDF: Options. (line 156) +* pdflatex: Options. (line 156) +* pdfreloadOptions: Options. (line 142) * pdfviewer: Configuring. (line 20) -* pdfviewerOptions: Options. (line 140) +* pdfviewerOptions: Options. (line 142) * pen: Pens. (line 6) * PenMargin: draw. (line 42) -* PenMargin2: three. (line 621) -* PenMargin3: three. (line 621) +* PenMargin2: three. (line 622) +* PenMargin3: three. (line 622) * PenMargins: draw. (line 42) -* PenMargins2: three. (line 621) -* PenMargins3: three. (line 621) +* PenMargins2: three. (line 622) +* PenMargins3: three. (line 622) * periodic: graph. (line 36) * perl: LaTeX usage. (line 30) * perpendicular: geometry. (line 6) -* perspective: three. (line 401) +* perspective: three. (line 402) * physically based rendering: three. (line 74) * picture: Frames and pictures. (line 39) * picture alignment: Frames and pictures. (line 231) * piecewisestraight: Paths and guides. (line 92) -* pixel: three. (line 628) +* pixel: three. (line 629) * Pl: Mathematical functions. (line 48) * plain: plain. (line 6) * planar: three. (line 118) -* plane: three. (line 340) -* planeproject: three. (line 522) +* plane: three. (line 341) +* planeproject: three. (line 523) * point: Paths and guides. (line 95) * point <1>: Paths and guides. (line 379) -* point <2>: three. (line 539) -* polar: Data types. (line 148) +* point <2>: three. (line 540) +* polar: Data types. (line 149) * polargraph: graph. (line 88) * polygon: graph. (line 480) * pop: Arrays. (line 39) * Portrait: Frames and pictures. (line 104) * position: three. (line 76) +* position <1>: three. (line 174) * postcontrol: Paths and guides. (line 146) -* postcontrol <1>: three. (line 539) +* postcontrol <1>: three. (line 540) * postfix operators: Self & prefix operators. (line 19) * postscript: Frames and pictures. (line 297) -* PostScript fonts: Pens. (line 224) +* PostScript fonts: Pens. (line 222) * PostScript subpath: Paths. (line 23) * pow10: Mathematical functions. (line 6) -* prc: three. (line 271) -* precision: Files. (line 93) +* prc: three. (line 272) +* precision: Files. (line 97) * precontrol: Paths and guides. (line 139) -* precontrol <1>: three. (line 539) +* precontrol <1>: three. (line 540) * prefix operators: Self & prefix operators. (line 6) * private: Structures. (line 6) @@ -9805,7 +9830,7 @@ Index * pstoedit: PostScript to Asymptote. (line 6) * psviewer: Configuring. (line 20) -* psviewerOptions: Options. (line 140) +* psviewerOptions: Options. (line 142) * pt: Figure size. (line 18) * public: Structures. (line 6) * push: Arrays. (line 39) @@ -9818,7 +9843,7 @@ Index (line 11) * quit <1>: Interactive mode. (line 54) * quit <2>: Debugger. (line 53) -* quote: Import. (line 115) +* quote: Import. (line 120) * quotient: Arithmetic & logical. (line 6) * radialshade: fill. (line 52) @@ -9829,7 +9854,7 @@ Index * radians: Mathematical functions. (line 17) * radius: Paths and guides. (line 135) -* radius <1>: three. (line 539) +* radius <1>: three. (line 540) * Rainbow: palette. (line 12) * rand: Mathematical functions. (line 39) @@ -9838,7 +9863,7 @@ Index * read: Arrays. (line 392) * reading: Files. (line 12) * reading string arrays: Arrays. (line 362) -* readline: Files. (line 135) +* readline: Files. (line 139) * real: Data types. (line 35) * realDigits: Data types. (line 35) * realEpsilon: Data types. (line 35) @@ -9855,24 +9880,24 @@ Index * reltime: Paths and guides. (line 172) * remainder: Mathematical functions. (line 6) -* rename: Files. (line 152) +* rename: Files. (line 156) * render: three. (line 46) * render <1>: three. (line 174) -* render <2>: Options. (line 154) -* replace: Data types. (line 269) -* resetdefaultpen: Pens. (line 370) +* render <2>: Options. (line 156) +* replace: Data types. (line 270) +* resetdefaultpen: Pens. (line 387) * rest arguments: Rest arguments. (line 6) * restore: Frames and pictures. (line 291) * restricted: Structures. (line 6) * return: Debugger. (line 47) -* reverse: Data types. (line 265) +* reverse: Data types. (line 266) * reverse <1>: Paths and guides. (line 183) * reverse <2>: Paths and guides. (line 382) * reverse <3>: Arrays. (line 141) -* reverse <4>: three. (line 539) -* rewind: Files. (line 93) -* rfind: Data types. (line 246) +* reverse <4>: three. (line 540) +* rewind: Files. (line 97) +* rfind: Data types. (line 247) * rgb: Pens. (line 30) * rgb <1>: Pens. (line 34) * rgb <2>: Pens. (line 62) @@ -9882,9 +9907,9 @@ Index * RightSide: label. (line 60) * RightTicks: graph. (line 160) * RightTicks <1>: graph. (line 233) -* RightView: three. (line 425) +* RightView: three. (line 426) * Rotate: label. (line 36) -* rotate: three. (line 493) +* rotate: three. (line 494) * Rotate(pair z): label. (line 39) * round: Mathematical functions. (line 26) @@ -9894,24 +9919,24 @@ Index * roundrectangle: flowchart. (line 66) * RPM: UNIX binary distributions. (line 6) -* runtime imports: Import. (line 97) -* Russian: unicode. (line 7) +* runtime imports: Import. (line 102) +* Russian: Pens. (line 237) * S: Labels. (line 18) -* safe: Options. (line 179) +* safe: Options. (line 181) * save: Frames and pictures. (line 288) -* saveline: Files. (line 135) +* saveline: Files. (line 139) * Scale: label. (line 45) * scale: Pens. (line 123) * scale <1>: Transforms. (line 34) * scale <2>: Transforms. (line 36) * scale <3>: graph. (line 690) * Scale <1>: graph. (line 707) -* scale <4>: three. (line 492) -* scale3: three. (line 490) +* scale <4>: three. (line 493) +* scale3: three. (line 491) * scaled graph: graph. (line 670) * scientific graph: graph. (line 387) -* scroll: Files. (line 109) +* scroll: Files. (line 113) * search: Arrays. (line 162) * search <1>: Arrays. (line 168) * search paths: Search paths. (line 6) @@ -9920,16 +9945,16 @@ Index * secondary axis: graph. (line 833) * secondaryX: graph. (line 833) * secondaryY: graph. (line 833) -* seconds: Data types. (line 329) -* seek: Files. (line 93) -* seekeof: Files. (line 93) +* seconds: Data types. (line 330) +* seek: Files. (line 97) +* seekeof: Files. (line 97) * segment: math. (line 46) * segmentation fault: Help. (line 27) * self operators: Self & prefix operators. (line 6) * sequence: Arrays. (line 118) * settings: Configuring. (line 20) -* settings <1>: Options. (line 125) +* settings <1>: Options. (line 127) * sgn: Mathematical functions. (line 26) * shading: fill. (line 32) @@ -9937,16 +9962,16 @@ Index * shift: Transforms. (line 26) * shift <1>: Transforms. (line 28) * shift <2>: Transforms. (line 46) -* shift <3>: three. (line 482) +* shift <3>: three. (line 483) * shiftless: Transforms. (line 46) * shininess: three. (line 66) * shipout: Frames and pictures. (line 91) -* showtarget: three. (line 374) +* showtarget: three. (line 375) * Si: Mathematical functions. (line 48) -* signedint: Files. (line 76) -* signedint <1>: Files. (line 89) +* signedint: Files. (line 80) +* signedint <1>: Files. (line 93) * SimpleHead: draw. (line 26) * simplex: simplex. (line 6) * simpson: Mathematical functions. @@ -9955,16 +9980,16 @@ Index (line 6) * Sin: Mathematical functions. (line 20) -* single precision: Files. (line 76) -* singleint: Files. (line 76) -* singleint <1>: Files. (line 89) -* singlereal: Files. (line 76) -* singlereal <1>: Files. (line 89) +* single precision: Files. (line 80) +* singleint: Files. (line 80) +* singleint <1>: Files. (line 93) +* singlereal: Files. (line 80) +* singlereal <1>: Files. (line 93) * sinh: Mathematical functions. (line 6) -* SixViews: three. (line 440) -* SixViewsFR: three. (line 440) -* SixViewsUS: three. (line 440) +* SixViews: three. (line 441) +* SixViewsFR: three. (line 441) +* SixViewsUS: three. (line 441) * size: Figure size. (line 6) * size <1>: Paths and guides. (line 81) * size <2>: Paths and guides. (line 370) @@ -9972,12 +9997,12 @@ Index (line 48) * size <4>: Frames and pictures. (line 74) -* size <5>: three. (line 539) -* size <6>: Options. (line 154) -* size3: three. (line 299) +* size <5>: three. (line 540) +* size <6>: Options. (line 156) +* size3: three. (line 300) * Slant: label. (line 42) * slant: Transforms. (line 38) -* sleep: Data types. (line 375) +* sleep: Data types. (line 376) * slice: Paths and guides. (line 251) * slice <1>: Paths and guides. (line 262) * slices: Slices. (line 6) @@ -10000,7 +10025,7 @@ Index * specularpen: three. (line 66) * Spline: graph. (line 33) * Spline <1>: graph3. (line 99) -* split: Data types. (line 278) +* split: Data types. (line 279) * sqrt: Mathematical functions. (line 6) * squarecap: Pens. (line 139) @@ -10011,42 +10036,42 @@ Index * stack overflow <2>: Help. (line 27) * static: Static. (line 6) * stats: stats. (line 6) -* stdin: Files. (line 48) -* stdout: Files. (line 48) +* stdin: Files. (line 52) +* stdout: Files. (line 52) * step: Debugger. (line 38) * stickframe: markers. (line 16) * stop: Debugger. (line 10) * straight: Paths and guides. (line 88) * Straight: graph. (line 30) -* straight <1>: three. (line 539) -* strftime: Data types. (line 320) -* strftime <1>: Data types. (line 345) -* string: Data types. (line 207) -* string <1>: Data types. (line 311) +* straight <1>: three. (line 540) +* strftime: Data types. (line 321) +* strftime <1>: Data types. (line 346) +* string: Data types. (line 208) +* string <1>: Data types. (line 312) * stroke: fill. (line 36) * stroke <1>: clip. (line 6) * strokepath: Paths and guides. (line 309) -* strptime: Data types. (line 329) +* strptime: Data types. (line 330) * struct: Structures. (line 6) * structures: Structures. (line 6) * subpath: Paths and guides. (line 186) -* subpath <1>: three. (line 539) +* subpath <1>: three. (line 540) * subpictures: Frames and pictures. (line 113) -* substr: Data types. (line 261) +* substr: Data types. (line 262) * sum: Arrays. (line 216) * superpath: Paths. (line 23) -* Suppress: Pens. (line 350) -* SuppressQuiet: Pens. (line 354) +* Suppress: Pens. (line 367) +* SuppressQuiet: Pens. (line 371) * surface: three. (line 46) * surface <1>: three. (line 118) * surface <2>: three. (line 132) * surface <3>: graph3. (line 99) -* SVG: Options. (line 159) -* system: Data types. (line 353) -* system <1>: Options. (line 179) +* SVG: Options. (line 161) +* system: Data types. (line 354) +* system <1>: Options. (line 181) * syzygy: syzygy. (line 6) -* tab: Files. (line 61) +* tab: Files. (line 65) * tab completion: Drawing in interactive mode. (line 11) * tan: Mathematical functions. @@ -10055,8 +10080,8 @@ Index (line 20) * tanh: Mathematical functions. (line 6) -* target: three. (line 374) -* tell: Files. (line 93) +* target: three. (line 375) +* tell: Files. (line 97) * tension: Bezier curves. (line 56) * tension <1>: three. (line 6) * tensionSpecifier: Paths and guides. (line 402) @@ -10065,13 +10090,13 @@ Index * tessellation: three. (line 144) * tex: Frames and pictures. (line 305) -* tex <1>: Options. (line 154) -* TeX fonts: Pens. (line 215) -* TeX string: Data types. (line 207) -* texcommand: Configuring. (line 72) +* tex <1>: Options. (line 156) +* TeX fonts: Pens. (line 213) +* TeX string: Data types. (line 208) +* texcommand: Configuring. (line 74) * TeXHead: draw. (line 26) -* TeXHead3: three. (line 605) -* texpath: Configuring. (line 72) +* TeXHead3: three. (line 606) +* texpath: Configuring. (line 74) * texpath <1>: label. (line 113) * texpreamble: Frames and pictures. (line 314) @@ -10084,30 +10109,30 @@ Index * thin: three. (line 156) * this: Structures. (line 6) * three: three. (line 6) -* ThreeViews: three. (line 440) -* ThreeViewsFR: three. (line 440) -* ThreeViewsUS: three. (line 440) +* ThreeViews: three. (line 441) +* ThreeViewsFR: three. (line 441) +* ThreeViewsUS: three. (line 441) * tick: graph. (line 330) * ticks: graph. (line 160) * Ticks: graph. (line 160) * Ticks <1>: graph. (line 233) * tildeframe: markers. (line 24) -* tile: Pens. (line 268) -* tilings: Pens. (line 254) -* time: Data types. (line 320) -* time <1>: Data types. (line 345) +* tile: Pens. (line 285) +* tilings: Pens. (line 271) +* time: Data types. (line 321) +* time <1>: Data types. (line 346) * time <2>: math. (line 26) * time <3>: math. (line 30) * times: Paths and guides. (line 220) * times <1>: Paths and guides. (line 224) * Top: graph. (line 135) -* TopView: three. (line 425) +* TopView: three. (line 426) * trace: Debugger. (line 50) * trailingzero: graph. (line 175) * transform: Transforms. (line 6) -* transform <1>: three. (line 514) -* transform3: three. (line 477) -* transparency: Pens. (line 237) +* transform <1>: three. (line 515) +* transform3: three. (line 478) +* transparency: Pens. (line 254) * transparent: three. (line 97) * transpose: Arrays. (line 208) * transpose <1>: Arrays. (line 211) @@ -10121,12 +10146,12 @@ Index (line 48) * triple: Data types. (line 137) * TrueMargin: draw. (line 42) -* TrueMargin3: three. (line 621) +* TrueMargin3: three. (line 622) * tube: three. (line 156) * tube <1>: tube. (line 6) * tutorial: Tutorial. (line 6) * type1cm: Pens. (line 192) -* typedef: Data types. (line 384) +* typedef: Data types. (line 385) * typedef <1>: Functions. (line 46) * U3D: embed. (line 22) * undefined: Paths and guides. (line 283) @@ -10136,17 +10161,16 @@ Index (line 165) * UnFill <2>: Frames and pictures. (line 168) -* unicode: unicode. (line 6) * uniform: Arrays. (line 150) * uninstall: Uninstall. (line 6) * unique: math. (line 59) * unit: Data types. (line 83) -* unit <1>: Data types. (line 173) +* unit <1>: Data types. (line 174) * unitbox: Paths. (line 44) -* unitbox <1>: three. (line 346) +* unitbox <1>: three. (line 347) * unitcircle: Paths. (line 17) * unitcircle <1>: Paths. (line 17) -* unitcircle <2>: three. (line 314) +* unitcircle <2>: three. (line 315) * unitrand: Mathematical functions. (line 39) * unitsize: Figure size. (line 39) @@ -10156,18 +10180,19 @@ Index (line 6) * unpacking: Rest arguments. (line 39) * unravel: Import. (line 29) -* up: three. (line 374) -* update: Files. (line 36) +* up: three. (line 375) +* update: Files. (line 38) * UpsideDown: Frames and pictures. (line 104) * UpsideDown <1>: Frames and pictures. (line 110) +* URL: Import. (line 94) * usepackage: Frames and pictures. (line 321) * user coordinates: Figure size. (line 39) * user-defined operators: User-defined operators. (line 6) -* usleep: Data types. (line 378) +* usleep: Data types. (line 379) * value: math. (line 34) * value <1>: math. (line 37) * var: Variable initializers. @@ -10184,15 +10209,15 @@ Index * Vertical: flowchart. (line 77) * Viewport: three. (line 76) * viewportheight: LaTeX usage. (line 50) -* viewportmargin: three. (line 302) -* viewportsize: three. (line 302) +* viewportmargin: three. (line 303) +* viewportsize: three. (line 303) * viewportwidth: LaTeX usage. (line 50) -* views: three. (line 271) +* views: three. (line 272) * vim: Editing modes. (line 32) * virtual functions: Structures. (line 181) * void: Data types. (line 10) * W: Labels. (line 18) -* WebGL: three. (line 222) +* WebGL: three. (line 223) * whatever: Paths and guides. (line 246) * Wheel: palette. (line 22) * wheel mouse: GUI. (line 6) @@ -10202,25 +10227,25 @@ Index * width: LaTeX usage. (line 50) * windingnumber: Paths and guides. (line 283) * word: Arrays. (line 362) -* write: Files. (line 53) +* write: Files. (line 57) * write <1>: Arrays. (line 401) -* X: three. (line 314) +* X: three. (line 315) * xasy: GUI. (line 6) * xaxis3: graph3. (line 7) -* xdr: Files. (line 76) -* xelatex: Options. (line 154) +* xdr: Files. (line 80) +* xelatex: Options. (line 156) * XEquals: graph. (line 265) * xequals: graph. (line 278) * xlimits: graph. (line 639) * XOR: Arithmetic & logical. (line 68) * xpart: Data types. (line 94) -* xpart <1>: Data types. (line 184) +* xpart <1>: Data types. (line 185) * xscale: Transforms. (line 30) -* xscale3: three. (line 484) +* xscale3: three. (line 485) * xtick: graph. (line 330) -* XY: three. (line 499) -* XY <1>: three. (line 514) +* XY: three. (line 500) +* XY <1>: three. (line 515) * XYEquals: graph3. (line 21) * XYZero: graph3. (line 21) * XZEquals: graph3. (line 21) @@ -10230,22 +10255,22 @@ Index (line 6) * Y <1>: Mathematical functions. (line 48) -* Y <2>: three. (line 314) +* Y <2>: three. (line 315) * yaxis3: graph3. (line 7) * YEquals: graph. (line 128) * yequals: graph. (line 278) * ylimits: graph. (line 639) * ypart: Data types. (line 97) -* ypart <1>: Data types. (line 187) +* ypart <1>: Data types. (line 188) * yscale: Transforms. (line 32) -* yscale3: three. (line 486) +* yscale3: three. (line 487) * ytick: graph. (line 330) -* YX: three. (line 514) -* YZ: three. (line 514) +* YX: three. (line 515) +* YZ: three. (line 515) * YZEquals: graph3. (line 21) * YZero: graph. (line 123) * YZZero: graph3. (line 21) -* Z: three. (line 314) +* Z: three. (line 315) * zaxis3: graph3. (line 7) * zeroTransform: Transforms. (line 44) * zerowinding: Pens. (line 164) @@ -10261,161 +10286,159 @@ Index (line 48) * zeta: Mathematical functions. (line 48) -* zpart: Data types. (line 190) -* zscale3: three. (line 488) -* ZX: three. (line 514) -* ZX <1>: three. (line 514) -* ZY: three. (line 514) +* zpart: Data types. (line 191) +* zscale3: three. (line 489) +* ZX: three. (line 515) +* ZX <1>: three. (line 515) +* ZY: three. (line 515)  Tag Table: Node: Top570 -Node: Description7331 -Node: Installation11417 -Node: UNIX binary distributions12463 -Node: MacOS X binary distributions13593 -Node: Microsoft Windows14148 -Node: Configuring15355 -Node: Search paths19818 -Node: Compiling from UNIX source20657 -Node: Editing modes23719 -Node: Git26141 -Node: Uninstall26541 -Node: Tutorial26887 -Node: Drawing in batch mode27725 -Node: Drawing in interactive mode28601 -Node: Figure size29633 -Node: Labels31228 -Node: Paths32056 -Ref: unitcircle32672 -Node: Drawing commands34570 -Node: draw36285 -Ref: arrows37467 -Node: fill42965 -Ref: gradient shading44011 -Node: clip48625 -Node: label49212 -Ref: Label49812 -Node: Bezier curves55644 -Node: Programming59544 -Ref: array iteration61297 -Node: Data types61464 -Ref: format72126 -Node: Paths and guides76572 -Ref: circle76826 -Ref: extension86526 -Node: Pens93336 -Ref: fillrule101027 -Ref: basealign101931 -Ref: transparency104764 -Ref: makepen108358 -Ref: overwrite109242 -Node: Transforms110456 -Node: Frames and pictures112288 -Ref: envelope113446 -Ref: size114539 -Ref: unitsize115526 -Ref: shipout116599 -Ref: filltype118950 -Ref: add122363 -Ref: add about123305 -Ref: tex126335 -Node: Files127231 -Ref: cd128218 -Ref: scroll132903 -Node: Variable initializers135821 -Node: Structures138538 -Node: Operators146040 -Node: Arithmetic & logical146354 -Node: Self & prefix operators148724 -Node: User-defined operators149518 -Node: Implicit scaling150431 -Node: Functions150994 -Ref: stack overflow154136 -Node: Default arguments154418 -Node: Named arguments155174 -Node: Rest arguments157744 -Node: Mathematical functions160866 -Node: Arrays165523 -Ref: sort172810 -Ref: tridiagonal175721 -Ref: solve176952 -Node: Slices181092 -Node: Casts185000 -Node: Import187270 -Node: Static192660 -Node: LaTeX usage195546 -Node: Base modules202041 -Node: plain204649 -Node: simplex205323 -Node: math205596 -Node: interpolate208179 -Node: geometry208458 -Node: trembling209052 -Node: stats209321 -Node: patterns209580 -Node: markers209815 -Node: map211674 -Node: tree212098 -Node: binarytree212282 -Node: drawtree212949 -Node: syzygy213150 -Node: feynman213424 -Node: roundedpath213698 -Node: animation213980 -Ref: animate214401 -Node: embed215513 -Node: slide216467 -Node: MetaPost216798 -Node: unicode217516 -Node: latin1218389 -Node: babel218758 -Node: labelpath218988 -Node: labelpath3219808 -Node: annotate220119 -Node: CAD220589 -Node: graph220899 -Ref: ticks228059 -Ref: pathmarkers241797 -Ref: marker242268 -Ref: markuniform242622 -Ref: errorbars244430 -Ref: automatic scaling248909 -Node: palette260670 -Ref: images260788 -Ref: image264962 -Ref: logimage265483 -Ref: penimage266589 -Ref: penfunctionimage266852 -Node: three267624 -Ref: PostScript3D297044 -Node: obj298782 -Node: graph3299031 -Ref: GaussianSurface304314 -Node: grid3305464 -Node: solids306249 -Node: tube307241 -Node: flowchart309471 -Node: contour314079 -Node: contour3319398 -Node: smoothcontour3319710 -Node: slopefield321431 -Node: ode322921 -Node: Options323178 -Ref: configuration file329901 -Ref: settings329901 -Ref: texengines331165 -Ref: convert331165 -Node: Interactive mode334599 -Ref: history336749 -Node: GUI338052 -Node: GUI installation338603 -Node: GUI usage339334 -Node: PostScript to Asymptote340397 -Node: Help341156 -Node: Debugger342830 -Node: Credits344586 -Node: Index345694 +Node: Description7200 +Node: Installation11286 +Node: UNIX binary distributions12332 +Node: MacOS X binary distributions13455 +Node: Microsoft Windows14010 +Node: Configuring15217 +Node: Search paths19829 +Node: Compiling from UNIX source20837 +Node: Editing modes23967 +Node: Git26389 +Node: Uninstall26896 +Node: Tutorial27242 +Node: Drawing in batch mode28089 +Node: Drawing in interactive mode28965 +Node: Figure size29997 +Node: Labels31592 +Node: Paths32420 +Ref: unitcircle33036 +Node: Drawing commands34934 +Node: draw36742 +Ref: arrows37924 +Node: fill43422 +Ref: gradient shading44468 +Node: clip49082 +Node: label49831 +Ref: Label50431 +Node: Bezier curves56289 +Node: Programming60189 +Ref: array iteration61942 +Node: Data types62109 +Ref: format72877 +Node: Paths and guides77323 +Ref: circle77577 +Ref: extension87277 +Node: Pens94087 +Ref: fillrule101778 +Ref: basealign102682 +Ref: transparency106365 +Ref: makepen109959 +Ref: overwrite110843 +Node: Transforms112057 +Node: Frames and pictures113889 +Ref: envelope115047 +Ref: size116140 +Ref: unitsize117127 +Ref: shipout118200 +Ref: filltype120551 +Ref: add123964 +Ref: add about124906 +Ref: tex127936 +Node: Files128832 +Ref: cd129896 +Ref: scroll134755 +Node: Variable initializers137673 +Node: Structures140390 +Node: Operators147892 +Node: Arithmetic & logical148206 +Node: Self & prefix operators150576 +Node: User-defined operators151370 +Node: Implicit scaling152283 +Node: Functions152846 +Ref: stack overflow155988 +Node: Default arguments156270 +Node: Named arguments157026 +Node: Rest arguments159596 +Node: Mathematical functions162718 +Node: Arrays167375 +Ref: sort174664 +Ref: tridiagonal177575 +Ref: solve178806 +Node: Slices182946 +Node: Casts186854 +Node: Import189124 +Node: Static194705 +Node: LaTeX usage197591 +Node: Base modules204086 +Node: plain206563 +Node: simplex207237 +Node: math207510 +Node: interpolate210093 +Node: geometry210372 +Node: trembling210966 +Node: stats211235 +Node: patterns211494 +Node: markers211729 +Node: map213588 +Node: tree214012 +Node: binarytree214196 +Node: drawtree214863 +Node: syzygy215064 +Node: feynman215338 +Node: roundedpath215612 +Node: animation215894 +Ref: animate216315 +Node: embed217427 +Node: slide218381 +Node: MetaPost218712 +Node: babel219428 +Node: labelpath219660 +Node: labelpath3220480 +Node: annotate220791 +Node: CAD221261 +Node: graph221571 +Ref: ticks228731 +Ref: pathmarkers242456 +Ref: marker242927 +Ref: markuniform243281 +Ref: errorbars245089 +Ref: automatic scaling249568 +Node: palette261283 +Ref: images261401 +Ref: image265575 +Ref: logimage266096 +Ref: penimage267202 +Ref: penfunctionimage267465 +Node: three268237 +Ref: PostScript3D297764 +Node: obj299502 +Node: graph3299751 +Ref: GaussianSurface305034 +Node: grid3306184 +Node: solids306969 +Node: tube307961 +Node: flowchart310191 +Node: contour314834 +Node: contour3320149 +Node: smoothcontour3320461 +Node: slopefield322182 +Node: ode323672 +Node: Options323929 +Ref: configuration file330777 +Ref: settings330777 +Ref: texengines332041 +Ref: convert332041 +Node: Interactive mode335475 +Ref: history337625 +Node: GUI338928 +Node: GUI installation339479 +Node: GUI usage340212 +Node: PostScript to Asymptote341275 +Node: Help342034 +Node: Debugger343708 +Node: Credits345464 +Node: Index346572  End Tag Table diff --git a/graphics/asymptote/doc/secondaryaxis.asy b/graphics/asymptote/doc/secondaryaxis.asy index 27b89b9c38..85143f7ace 100644 --- a/graphics/asymptote/doc/secondaryaxis.asy +++ b/graphics/asymptote/doc/secondaryaxis.asy @@ -26,7 +26,7 @@ picture secondary=secondaryY(new void(picture pic) { draw(pic,graph(pic,t,infectious,t >= 10 & t <= 15),red); yaxis(pic,Right,red,LeftTicks(begin=false,end=false)); }); - + add(secondary); label(shift(5mm*N)*"Proportion of crows",point(NW),E); diff --git a/graphics/asymptote/drawclipbegin.h b/graphics/asymptote/drawclipbegin.h index 58b4ac5794..8bf8e30ffc 100644 --- a/graphics/asymptote/drawclipbegin.h +++ b/graphics/asymptote/drawclipbegin.h @@ -21,7 +21,7 @@ public: void noncyclic() { reportError("cannot clip to non-cyclic path"); } - + drawClipBegin(const vm::array& src, bool stroke, pen pentype, bool gsave=true, const string& key="") : drawElement(key), drawSuperPathPenBase(src,pentype), gsave(gsave), @@ -32,7 +32,7 @@ public: virtual ~drawClipBegin() {} bool beginclip() {return true;} - + void bounds(bbox& b, iopipestream& iopipe, boxvector& vbox, bboxlist& bboxstack) { bboxstack.push_back(b); @@ -43,13 +43,13 @@ public: } bool begingroup() {return true;} - + bool svg() {return true;} - + void save(bool b) { gsave=b; } - + bool draw(psfile *out) { if(gsave) out->gsave(); if(empty()) return true; @@ -63,10 +63,10 @@ public: bool write(texfile *out, const bbox& bpath) { if(gsave) out->gsave(); if(empty()) return true; - - if(out->toplevel()) + + if(out->toplevel()) out->beginpicture(bpath); - + out->begingroup(); out->beginspecial(); @@ -76,10 +76,10 @@ public: out->endclip(pentype); out->endraw(); out->endspecial(); - + return true; } - + drawElement *transformed(const transform& t) { return new drawClipBegin(transpath(t),stroke,transpen(t),gsave,KEY); diff --git a/graphics/asymptote/drawclipend.h b/graphics/asymptote/drawclipend.h index e86842d3d1..48c8d2de5a 100644 --- a/graphics/asymptote/drawclipend.h +++ b/graphics/asymptote/drawclipend.h @@ -14,16 +14,16 @@ namespace camp { class drawClipEnd : public drawElement { - bool grestore; + bool grestore; drawClipBegin *partner; public: - drawClipEnd(bool grestore=true, drawClipBegin *partner=NULL) : + drawClipEnd(bool grestore=true, drawClipBegin *partner=NULL) : grestore(grestore), partner(partner) {} virtual ~drawClipEnd() {} bool endclip() {return true;} - + void bounds(bbox& b, iopipestream&, boxvector&, bboxlist& bboxstack) { if(bboxstack.size() < 2) reportError("endclip without matching beginclip"); @@ -34,14 +34,14 @@ public: } bool endgroup() {return true;} - + bool svg() {return true;} - + void save(bool b) { grestore=b; if(partner) partner->save(b); } - + bool draw(psfile *out) { if(grestore) out->grestore(); return true; @@ -49,8 +49,8 @@ public: bool write(texfile *out, const bbox& bpath) { out->endgroup(); - - if(out->toplevel()) + + if(out->toplevel()) out->endpicture(bpath); if(grestore) out->grestore(); diff --git a/graphics/asymptote/drawelement.h b/graphics/asymptote/drawelement.h index 7dbd1c42b0..f561d2786d 100644 --- a/graphics/asymptote/drawelement.h +++ b/graphics/asymptote/drawelement.h @@ -29,16 +29,16 @@ static const double pixel=1.0; // Adaptive rendering constant. enum Interaction {EMBEDDED=0,BILLBOARD}; void copyArray4x4C(double*& dest, const vm::array *a); - + class box { pair p[4]; public: - + box() {} box(const pair& a, const pair& b, const pair& c, const pair& d) { p[0]=a; p[1]=b; p[2]=c; p[3]=d; } - + // Returns true if the line a--b intersects box b. bool intersect(const pair& a, const pair& b) const { @@ -55,9 +55,9 @@ public: } return false; } - + pair operator [] (Int i) const {return p[i];} - + bool intersect(const box& b) const { for(Int i=0; i < 4; ++i) { pair A=b[i]; @@ -66,25 +66,25 @@ public: } return false; } - + double xmax() { return max(max(max(p[0].x,p[1].x),p[2].x),p[3].x); } - + double ymax() { return max(max(max(p[0].y,p[1].y),p[2].y),p[3].y); } - + double xmin() { return min(min(min(p[0].x,p[1].x),p[2].x),p[3].x); } - + double ymin() { return min(min(min(p[0].y,p[1].y),p[2].y),p[3].y); } - + }; - + class bbox2 { public: double x,y,X,Y; @@ -93,7 +93,7 @@ public: for(size_t i=1; i < n; ++i) bounds(v[i]); } - + bbox2(const triple& m, const triple& M) { Bounds(m); bounds(triple(m.getx(),m.gety(),M.getz())); @@ -104,7 +104,7 @@ public: bounds(triple(M.getx(),M.gety(),m.getz())); bounds(M); } - + bbox2(const triple& m, const triple& M, const Billboard& BB) { Bounds(BB.transform(m)); bounds(BB.transform(triple(m.getx(),m.gety(),M.getz()))); @@ -115,7 +115,7 @@ public: bounds(BB.transform(triple(M.getx(),M.gety(),m.getz()))); bounds(BB.transform(M)); } - + // Is 2D bounding box formed by projecting 3d points in vector v offscreen? bool offscreen() { double eps=1.0e-2; @@ -123,13 +123,13 @@ public: double max=1.0+eps; return X < min || x > max || Y < min || y > max; } - + void Bounds(const triple& v) { pair V=Transform2T(gl::dprojView,v); x=X=V.getx(); y=Y=V.gety(); } - + void bounds(const triple& v) { pair V=Transform2T(gl::dprojView,v); double a=V.getx(); @@ -142,9 +142,9 @@ public: }; typedef mem::vector boxvector; - + typedef mem::list bboxlist; - + typedef mem::map groupmap; typedef mem::vector groupsmap; @@ -152,20 +152,20 @@ class drawElement : public gc { public: string KEY; - + drawElement(const string& key="") : KEY(key == "" ? processData().KEY : key) - {} - + {} + virtual ~drawElement() {} - + static mem::vector center; static size_t centerIndex; static triple lastcenter; static size_t lastcenterIndex; - - static pen lastpen; + + static pen lastpen; static const triple zero; - + // Adjust the bbox of the picture based on the addition of this // element. The iopipestream is needed for determining label sizes. virtual void bounds(bbox&, iopipestream&, boxvector&, bboxlist&) {} @@ -175,15 +175,15 @@ public: // Compute bounds on ratio (x,y)/z for 3d picture (not cached). virtual void ratio(const double *t, pair &b, double (*m)(double, double), double fuzz, bool &first) {} - + virtual void minratio(const double *t, pair &b, double fuzz, bool &first) { ratio(t,b,camp::min,fuzz,first); } - + virtual void maxratio(const double *t,pair &b, double fuzz, bool &first) { ratio(t,b,camp::max,fuzz,first); } - + virtual void ratio(pair &b, double (*m)(double, double), double fuzz, bool &first) { ratio(NULL,b,m,fuzz,first); @@ -200,20 +200,20 @@ public: virtual bool islabel() {return false;} virtual bool isnewpage() {return false;} - + virtual bool islayer() {return false;} virtual bool is3D() {return false;} // Implement element as raw SVG code? virtual bool svg() {return false;} - + // Implement SVG element as png image? virtual bool svgpng() {return false;} - + virtual bool beginclip() {return false;} virtual bool endclip() {return false;} - + virtual bool begingroup() {return false;} virtual bool begingroup3() {return false;} @@ -223,7 +223,7 @@ public: virtual const double* transf3() {return NULL;} virtual void save(bool b) {} - + // Output to a PostScript file virtual bool draw(psfile *) { return false; @@ -239,22 +239,22 @@ public: groupsmap& groups) { return false; } - + // Output to a JS file virtual bool write(jsfile *out) { return false; } - + // Used to compute deviation of a surface from a quadrilateral. virtual void displacement() {} // Render with OpenGL virtual void render(double size2, const triple& Min, const triple& Max, - double perspective, bool remesh) + double perspective, bool remesh) {} virtual void meshinit() {} - + size_t centerindex(const triple& center) { if(drawElement::center.empty() || center != drawElement::lastcenter) { drawElement::lastcenter=center; @@ -268,7 +268,7 @@ public: virtual drawElement *transformed(const transform&) { return this; } - + virtual drawElement *transformed(const double* t) { return this; } @@ -279,9 +279,9 @@ public: class drawElementLC : public virtual drawElement { public: double *T; // Keep track of accumulative picture transform - + drawElementLC() : T(NULL) {} - + drawElementLC(const double *t) : T(NULL) { copyTransform3(T,t); } @@ -290,7 +290,7 @@ public: copyArray4x4C(T,&t); } - drawElementLC(const double* t, const drawElementLC *s) : + drawElementLC(const double* t, const drawElementLC *s) : drawElement(s->KEY), T(NULL) { multiplyTransform3(T,t,s->T); } @@ -324,19 +324,19 @@ public: virtual void bounds(bbox& b, iopipestream&, boxvector&, bboxlist&) { b += p.bounds(); } - + virtual void writepath(psfile *out,bool) { out->write(p); } - + virtual void writeclippath(psfile *out, bool newpath=true) { out->writeclip(p,newpath); } - + virtual void writeshiftedpath(texfile *out) { out->writeshifted(p); } -}; +}; // Base class for drawElements that involve paths and pens. class drawPathPenBase : public drawPathBase { @@ -348,28 +348,28 @@ protected: } public: - drawPathPenBase(path p, pen pentype) : + drawPathPenBase(path p, pen pentype) : drawPathBase(p), pentype(pentype) {} - + drawPathPenBase(pen pentype) : pentype(pentype) {} - + virtual bool empty() { return p.empty(); } - + virtual bool cyclic() { return p.cyclic(); } - + void strokebounds(bbox& b, const path& p); - + virtual void penSave(psfile *out) { if (!pentype.getTransform().isIdentity()) out->gsave(); } - + virtual void penTranslate(psfile *out) { out->translate(shiftpair(pentype.getTransform())); @@ -386,7 +386,7 @@ public: out->grestore(); } }; - + // Base class for drawElements that involve superpaths and pens. class drawSuperPathPenBase : public drawPathPenBase { protected: @@ -400,57 +400,57 @@ protected: (*Pt)[i]=vm::read(P,i).transformed(t); return *Pt; } - + public: drawSuperPathPenBase(const vm::array& P, pen pentype) : drawPathPenBase(pentype), P(P), size(P.size()) {} bool empty() { - for(size_t i=0; i < size; i++) + for(size_t i=0; i < size; i++) if(vm::read(P,i).size() != 0) return false; return true; } - + bool cyclic() { - for(size_t i=0; i < size; i++) + for(size_t i=0; i < size; i++) if(!vm::read(P,i).cyclic()) return false; return true; } - + void bounds(bbox& b, iopipestream&, boxvector&, bboxlist&) { for(size_t i=0; i < size; i++) bpath += vm::read(P,i).bounds(); b += bpath; } - + void strokepath(psfile *out) { out->strokepath(); } - + void strokebounds(bbox& b) { for(size_t i=0; i < size; i++) drawPathPenBase::strokebounds(bpath,vm::read(P,i)); b += bpath; } - + void writepath(psfile *out, bool newpath=true) { if(size > 0) out->write(vm::read(P,0),newpath); for(size_t i=1; i < size; i++) out->write(vm::read(P,i),false); } - + void writeclippath(psfile *out, bool newpath=true) { if(size > 0) out->writeclip(vm::read(P,0),newpath); for(size_t i=1; i < size; i++) out->writeclip(vm::read(P,i),false); } - + void writeshiftedpath(texfile *out) { - for(size_t i=0; i < size; i++) + for(size_t i=0; i < size; i++) out->writeshifted(vm::read(P,i),i == 0); } }; - + #ifdef HAVE_LIBGLM void setcolors(bool colors, const prc::RGBAColour& diffuse, @@ -459,7 +459,7 @@ void setcolors(bool colors, double metallic, double fresnel0, jsfile *out=NULL); #endif - + } diff --git a/graphics/asymptote/drawfill.cc b/graphics/asymptote/drawfill.cc index 443a7775d4..551b75cb0d 100644 --- a/graphics/asymptote/drawfill.cc +++ b/graphics/asymptote/drawfill.cc @@ -16,9 +16,9 @@ void drawAxialShade::palette(psfile *out) { pentype.convert(); penb.convert(); - + colorspace=(ColorSpace) max(pentype.colorspace(),penb.colorspace()); - + switch(colorspace) { case RGB: { @@ -26,12 +26,12 @@ void drawAxialShade::palette(psfile *out) else if (penb.grayscale()) penb.greytorgb(); break; } - + case CMYK: { if (pentype.grayscale()) pentype.greytocmyk(); else if (penb.grayscale()) penb.greytocmyk(); - + if (pentype.rgb()) pentype.rgbtocmyk(); else if (penb.rgb()) penb.rgbtocmyk(); break; @@ -39,25 +39,25 @@ void drawAxialShade::palette(psfile *out) default: break; } - + out->gsave(); -} - +} + bool drawFill::draw(psfile *out) { if(pentype.invisible() || empty()) return true; - + palette(out); writepath(out); fill(out); return true; } - + drawElement *drawFill::transformed(const transform& t) { return new drawFill(transpath(t),stroke,transpen(t),KEY); } - + drawElement *drawLatticeShade::transformed(const transform& t) { return new drawLatticeShade(transpath(t),stroke,pentype,pens,t*T,KEY); @@ -69,7 +69,7 @@ drawElement *drawAxialShade::transformed(const transform& t) return new drawAxialShade(transpath(t),stroke,pentype,A,extenda,penb,B, extendb,KEY); } - + drawElement *drawRadialShade::transformed(const transform& t) { pair A=t*a, B=t*b; @@ -96,10 +96,10 @@ drawElement *drawTensorShade::transformed(const transform& t) size_t zsize=z.size(); vm::array *Boundaries=new vm::array(size); vm::array *Z=new vm::array(zsize); - + for(size_t i=0; i < size; i++) (*Boundaries)[i]=vm::read(boundaries,i).transformed(t); - + for(size_t i=0; i < zsize; i++) { vm::array *zi=vm::read(z,i); size_t zisize=checkArray(zi); @@ -110,16 +110,16 @@ drawElement *drawTensorShade::transformed(const transform& t) } return new drawTensorShade(transpath(t),stroke,pentype,pens,*Boundaries,*Z, - KEY); + KEY); } bool drawFunctionShade::write(texfile *out, const bbox& box) { if(empty()) return true; - + ColorSpace colorspace=pentype.colorspace(); size_t ncomponents=ColorComponents[colorspace]; - + out->verbatim("\\pdfobj stream attr {/FunctionType 4"); out->verbatim("/Domain [0 1 0 1]"); out->verbatim("/Range ["); @@ -129,7 +129,7 @@ bool drawFunctionShade::write(texfile *out, const bbox& box) out->verbatimline(shader); out->verbatimline("}}%"); out->verbatimline("\\edef\\lastobj{\\the\\pdflastobj}\\pdfrefobj\\lastobj"); - + out->verbatim("\\setbox\\ASYbox=\\hbox to "); double Hoffset=out->hoffset(); double hoffset=(bpath.Max().getx()-Hoffset)*ps2tex; @@ -149,7 +149,7 @@ bool drawFunctionShade::write(texfile *out, const bbox& box) out->endspecial(); out->grestore(); out->verbatimline("}\\hfil}%"); - + out->verbatimline("\\pdfxform resources {"); out->verbatimline("/Shading << /Sh << /ShadingType 1"); out->verbatim("/Matrix ["); @@ -160,7 +160,7 @@ bool drawFunctionShade::write(texfile *out, const bbox& box) out->verbatim("/ColorSpace /Device"); out->verbatimline(ColorDeviceSuffix[colorspace]); out->verbatimline("/Function \\lastobj\\space 0 R >> >>}\\ASYbox"); - + out->verbatimline("\\pdfrefxform\\the\\pdflastxform"); out->verbatim("\\kern"); out->write(-hoffset); diff --git a/graphics/asymptote/drawfill.h b/graphics/asymptote/drawfill.h index c634ff6c07..360959d08f 100644 --- a/graphics/asymptote/drawfill.h +++ b/graphics/asymptote/drawfill.h @@ -14,28 +14,28 @@ namespace camp { class drawFill : public drawSuperPathPenBase { -protected: +protected: bool stroke; public: void noncyclic() { reportError("non-cyclic path cannot be filled"); } - + drawFill(const vm::array& src, bool stroke, pen pentype, - const string& key="") : + const string& key="") : drawElement(key), drawSuperPathPenBase(src,pentype), stroke(stroke) { if(!stroke && !cyclic()) noncyclic(); } bool svg() {return true;} - + // dvisvgm doesn't yet support SVG patterns. bool svgpng() {return pentype.fillpattern() != "";} - + virtual ~drawFill() {} virtual bool draw(psfile *out); - + virtual void palette(psfile *out) { penSave(out); penTranslate(out); @@ -49,7 +49,7 @@ public: drawElement *transformed(const transform& t); }; - + class drawShade : public drawFill { public: drawShade(const vm::array& src, bool stroke, pen pentype, @@ -61,20 +61,20 @@ public: if(stroke) strokebounds(b); else drawSuperPathPenBase::bounds(b,iopipe,vbox,bboxstack); } - + bool pdf() { return settings::pdf(settings::getSetting("tex")); } // Shading in SVG is incomplete and not supported at all by dvisvgm --pdf. bool svgpng() {return true;} - + virtual void beginshade(psfile *out)=0; virtual void shade(psfile *out)=0; - + bool draw(psfile *out) { if(pentype.invisible() || empty()) return true; - + palette(out); beginshade(out); writeclippath(out); @@ -85,40 +85,40 @@ public: return true; } }; - + class drawLatticeShade : public drawShade { protected: vm::array pens; const transform T; -public: +public: drawLatticeShade(const vm::array& src, bool stroke, pen pentype, const vm::array& pens, const camp::transform& T=identity, const string& key="") : drawShade(src,stroke,pentype,key), pens(pens), T(T) {} - + void palette(psfile *out) { out->gsave(); } - + void beginshade(psfile *out) { out->beginlatticeshade(pens,bpath); } - + void shade(psfile *out) { bbox b; for(size_t i=0; i < size; i++) { path p=vm::read(P,i).transformed(inverse(T)); if(stroke) drawPathPenBase::strokebounds(b,p); - else + else b += p.bounds(); } out->latticeshade(pens,T*matrix(b.Min(),b.Max())); } - + drawElement *transformed(const transform& t); }; - + class drawAxialShade : public drawShade { protected: pair a; @@ -127,28 +127,28 @@ protected: pair b; bool extendb; ColorSpace colorspace; -public: +public: drawAxialShade(const vm::array& src, bool stroke, pen pentype, pair a, bool extenda, pen penb, pair b, - bool extendb, const string& key="") + bool extendb, const string& key="") : drawShade(src,stroke,pentype,key), a(a), extenda(extenda), penb(penb), b(b), extendb(extendb) {} - + bool svgpng() {return !extenda || !extendb || pdf();} void palette(psfile *out); - + void beginshade(psfile *out) { out->begingradientshade(true,colorspace,pentype,a,0,penb,b,0); } - + void shade(psfile *out) { out->gradientshade(true,colorspace,pentype,a,0,extenda,penb,b,0,extendb); } - + drawElement *transformed(const transform& t); }; - + class drawRadialShade : public drawAxialShade { protected: double ra; @@ -159,75 +159,75 @@ public: pair b, double rb, bool extendb, const string& key="") : drawAxialShade(src,stroke,pentype,a,extenda,penb,b, extendb,key), ra(ra), rb(rb) {} - + bool svgpng() {return a != b || ra > 0.0 || !extenda || !extendb || pdf();} - + void beginshade(psfile *out) { out->begingradientshade(false,colorspace,pentype,a,ra,penb,b,rb); } - + void shade(psfile *out) { out->gradientshade(false,colorspace,pentype,a,ra,extenda,penb,b,rb,extendb); } - + drawElement *transformed(const transform& t); }; - + class drawGouraudShade : public drawShade { protected: vm::array pens,vertices,edges; -public: +public: drawGouraudShade(const vm::array& src, bool stroke, pen pentype, const vm::array& pens, const vm::array& vertices, const vm::array& edges, const string& key="") : drawElement(key), drawShade(src,stroke,pentype,key), pens(pens), vertices(vertices), edges(edges) {} - + bool svgpng() {return settings::getSetting("xasy") || !settings::getSetting("svgemulation") || pdf();} - + void palette(psfile *out) { out->gsave(); } - + void beginshade(psfile *out) { out->begingouraudshade(pens,vertices,edges); } - + void shade(psfile *out) { out->gouraudshade(pentype,pens,vertices,edges); } - + drawElement *transformed(const transform& t); }; - + class drawTensorShade : public drawShade { protected: vm::array pens,boundaries,z; -public: +public: drawTensorShade(const vm::array& src, bool stroke, pen pentype, const vm::array& pens, const vm::array& boundaries, const vm::array& z, - const string& key="") : + const string& key="") : drawShade(src,stroke,pentype,key), pens(pens), boundaries(boundaries), z(z) { } - + void palette(psfile *out) { out->gsave(); } - + void beginshade(psfile *out) {} - + void shade(psfile *out) { out->tensorshade(pentype,pens,boundaries,z); } - + drawElement *transformed(const transform& t); }; - + class drawFunctionShade : public drawFill { -protected: +protected: string shader; public: drawFunctionShade(const vm::array& src, bool stroke, @@ -242,14 +242,14 @@ public: virtual ~drawFunctionShade() {} bool draw(psfile *out) {return false;} - + bool write(texfile *, const bbox&); - + bool islabel() {return true;} - + drawElement *transformed(const transform& t); }; - + } #endif diff --git a/graphics/asymptote/drawgrestore.h b/graphics/asymptote/drawgrestore.h index 7f1b62fe63..b1b80a8081 100644 --- a/graphics/asymptote/drawgrestore.h +++ b/graphics/asymptote/drawgrestore.h @@ -21,7 +21,7 @@ public: out->grestore(); return true; } - + bool write(texfile *out, const bbox&) { out->grestore(); return true; diff --git a/graphics/asymptote/drawgroup.h b/graphics/asymptote/drawgroup.h index e8149f118b..22aa858a96 100644 --- a/graphics/asymptote/drawgroup.h +++ b/graphics/asymptote/drawgroup.h @@ -15,16 +15,16 @@ namespace camp { class drawBegin : public drawElement { public: drawBegin() {} - + virtual ~drawBegin() {} bool begingroup() {return true;} }; - + class drawEnd : public drawElement { public: drawEnd() {} - + virtual ~drawEnd() {} bool endgroup() {return true;} @@ -34,11 +34,11 @@ class drawBegin3 : public drawElementLC { string name; double compression; double granularity; - bool closed; // render the surface as one-sided; may yield faster rendering + bool closed; // render the surface as one-sided; may yield faster rendering bool tessellate; // use tessellated mesh to store straight patches bool dobreak; // force breaking bool nobreak; // force grouping for transparent patches - + triple center; int interaction; public: @@ -48,45 +48,45 @@ public: name(name), compression(compression), granularity(granularity), closed(closed), tessellate(tessellate), dobreak(dobreak), nobreak(nobreak), center(center), interaction(interaction) {} - + virtual ~drawBegin3() {} bool begingroup() {return true;} bool begingroup3() {return true;} - + bool write(prcfile *out, unsigned int *count, double compressionlimit, groupsmap& groups) { groupmap& group=groups.back(); if(name.empty()) name="group"; groupmap::const_iterator p=group.find(name); - + unsigned c=(p != group.end()) ? p->second+1 : 0; group[name]=c; - + ostringstream buf; buf << name; if(c > 0) buf << "-" << (c+1); - + if(interaction == BILLBOARD) buf << "-" << (*count)++ << "\001"; - - prc::PRCoptions options(compression > 0.0 ? + + prc::PRCoptions options(compression > 0.0 ? max(compression,compressionlimit) : 0.0, granularity,closed,tessellate,dobreak,nobreak); - + groups.push_back(groupmap()); const string& s=buf.str(); out->begingroup(s.c_str(),&options,T); return true; } - + drawBegin3(const double* t, const drawBegin3 *s) : drawElementLC(t, s), name(s->name), compression(s->compression), granularity(s->granularity), closed(s->closed), tessellate(s->tessellate), dobreak(s->dobreak), nobreak(s->nobreak), interaction(s->interaction) { center=t*s->center; } - + drawElement *transformed(const double* t) { return new drawBegin3(t,this); } @@ -95,12 +95,12 @@ public: class drawEnd3 : public drawElement { public: drawEnd3() {} - + virtual ~drawEnd3() {} bool endgroup() {return true;} bool endgroup3() {return true;} - + bool write(prcfile *out, unsigned int *, double, groupsmap& groups) { groups.pop_back(); out->endgroup(); diff --git a/graphics/asymptote/drawgsave.h b/graphics/asymptote/drawgsave.h index bddc3a1dba..58ef9715b5 100644 --- a/graphics/asymptote/drawgsave.h +++ b/graphics/asymptote/drawgsave.h @@ -21,7 +21,7 @@ public: out->gsave(); return true; } - + bool write(texfile *out, const bbox&) { out->gsave(); return true; diff --git a/graphics/asymptote/drawimage.h b/graphics/asymptote/drawimage.h index a3c5971dc4..97c15a7c85 100644 --- a/graphics/asymptote/drawimage.h +++ b/graphics/asymptote/drawimage.h @@ -20,7 +20,7 @@ protected: public: drawImage(const transform& t, bool antialias, const string& key="") : drawElement(key), t(t), antialias(antialias) {} - + virtual ~drawImage() {} void bounds(bbox& b, iopipestream&, boxvector&, bboxlist&) { @@ -39,16 +39,16 @@ public: drawPaletteImage(const vm::array& image, const vm::array& palette, const transform& t, bool antialias, const string& key="") : drawImage(t,antialias,key), image(image), palette(palette) {} - + virtual ~drawPaletteImage() {} bool draw(psfile *out) { out->gsave(); out->concat(t); out->image(image,palette,antialias); - + out->grestore(); - + return true; } @@ -63,7 +63,7 @@ public: drawNoPaletteImage(const vm::array& image, const transform& t, bool antialias, const string& key="") : drawImage(t,antialias,key), image(image) {} - + virtual ~drawNoPaletteImage() {} bool draw(psfile *out) { @@ -88,7 +88,7 @@ public: const transform& t, bool antialias, const string& key="") : drawImage(t,antialias,key), Stack(Stack), f(f), width(width), height(height) {} - + virtual ~drawFunctionImage() {} bool draw(psfile *out) { @@ -111,7 +111,7 @@ public: drawRawImage(unsigned char *raw, size_t width, size_t height, const transform& t, bool antialias, const string& key="") : drawImage(t,antialias,key), raw(raw), width(width), height(height) {} - + virtual ~drawRawImage() {} bool draw(psfile *out) { diff --git a/graphics/asymptote/drawlabel.cc b/graphics/asymptote/drawlabel.cc index 7f749989c4..afeeeb5673 100644 --- a/graphics/asymptote/drawlabel.cc +++ b/graphics/asymptote/drawlabel.cc @@ -15,15 +15,15 @@ using namespace settings; namespace camp { - + string texready=string("(Please type a command or say `\\end')\n*"); -void drawLabel::labelwarning(const char *action) +void drawLabel::labelwarning(const char *action) { - cerr << "warning: label \"" << label + cerr << "warning: label \"" << label << "\" " << action << " to avoid overwriting" << endl; } - + // Reads one of the dimensions from the pipe. void texdim(iopipestream& tex, double& dest, const string command, const string name) @@ -62,18 +62,18 @@ void texbounds(double& width, double& height, double& depth, texdim(tex,width,"wd","width"); texdim(tex,height,"ht","height"); texdim(tex,depth,"dp","depth"); -} +} inline double urand() -{ +{ static const double factor=2.0/RANDOM_MAX; return random()*factor-1.0; } -void setpen(iopipestream& tex, const string& texengine, const pen& pentype) +void setpen(iopipestream& tex, const string& texengine, const pen& pentype) { bool Latex=latex(texengine); - + if(Latex && setlatexfont(tex,pentype,drawElement::lastpen)) { tex << "\n"; tex.wait(texready.c_str()); @@ -82,7 +82,7 @@ void setpen(iopipestream& tex, const string& texengine, const pen& pentype) tex << "\n"; tex.wait(texready.c_str()); } - + drawElement::lastpen=pentype; } @@ -90,20 +90,20 @@ void drawLabel::getbounds(iopipestream& tex, const string& texengine) { if(havebounds) return; havebounds=true; - + setpen(tex,texengine,pentype); texbounds(width,height,depth,tex,label); - + if(width == 0.0 && height == 0.0 && depth == 0.0 && !size.empty()) texbounds(width,height,depth,tex,size); enabled=true; - + Align=inverse(T)*align; double scale0=max(fabs(Align.getx()),fabs(Align.gety())); if(scale0) Align *= 0.5/scale0; Align -= pair(0.5,0.5); - double Depth=(pentype.Baseline() == NOBASEALIGN) ? depth : + double Depth=(pentype.Baseline() == NOBASEALIGN) ? depth : -depth*Align.gety(); texAlign=Align; const double vertical=height+depth; @@ -118,9 +118,9 @@ void drawLabel::bounds(bbox& b, iopipestream& tex, boxvector& labelbounds, { string texengine=getSetting("tex"); if(texengine == "none") {b += position; return;} - + getbounds(tex,texengine); - + // alignment point pair p=position+Align; const double vertical=height+depth; @@ -129,7 +129,7 @@ void drawLabel::bounds(bbox& b, iopipestream& tex, boxvector& labelbounds, pair B=p+T*pair(-fuzz,vertical+fuzz); pair C=p+T*pair(width+fuzz,vertical+fuzz); pair D=p+T*pair(width+fuzz,-fuzz); - + if(pentype.Overwrite() != ALLOW && label != "") { size_t n=labelbounds.size(); box Box=box(A,B,C,D); @@ -139,7 +139,7 @@ void drawLabel::bounds(bbox& b, iopipestream& tex, boxvector& labelbounds, case SUPPRESS: labelwarning("suppressed"); case SUPPRESSQUIET: - suppress=true; + suppress=true; return; case MOVE: labelwarning("moved"); @@ -168,13 +168,13 @@ void drawLabel::bounds(bbox& b, iopipestream& tex, boxvector& labelbounds, labelbounds.resize(n+1); labelbounds[n]=Box; } - + Box=bbox(); Box += A; Box += B; Box += C; Box += D; - + b += Box; } @@ -203,10 +203,10 @@ void drawLabelPath::bounds(bbox& b, iopipestream& tex, boxvector&, bboxlist&) { string texengine=getSetting("tex"); if(texengine == "none") {b += position; return;} - + getbounds(tex,texengine); double L=p.arclength(); - + double s1,s2; if(justify == "l") { s1=0.0; @@ -220,30 +220,30 @@ void drawLabelPath::bounds(bbox& b, iopipestream& tex, boxvector&, bboxlist&) s1=s-h; s2=s+h; } - + double Sx=shift.getx(); double Sy=shift.gety(); s1 += Sx; s2 += Sx; - + if(width > L || (!p.cyclic() && (s1 < 0 || s2 > L))) { ostringstream buf; buf << "Cannot fit label \"" << label << "\" to path"; reportError(buf); } - + path q=p.subpath(p.arctime(s1),p.arctime(s2)); - + b += q.bounds(Sy,Sy+height); Box=b; } - + bool drawLabelPath::write(texfile *out, const bbox&) { bbox b=Box; double Hoffset=getSetting("inlinetex") ? b.right : b.left; b.shift(pair(-Hoffset,-b.bottom)); - + checkbounds(); if(drawLabel::pentype.invisible()) return true; out->setpen(drawLabel::pentype); diff --git a/graphics/asymptote/drawlabel.h b/graphics/asymptote/drawlabel.h index c16209bc51..e631f04a55 100644 --- a/graphics/asymptote/drawlabel.h +++ b/graphics/asymptote/drawlabel.h @@ -14,7 +14,7 @@ #include "transform.h" namespace camp { - + class drawLabel : public virtual drawElement { protected: string label,size; @@ -30,23 +30,23 @@ protected: pair texAlign; bbox Box; bool enabled; - + public: drawLabel(string label, string size, transform T, pair position, pair align, pen pentype, const string& key="") : drawElement(key), label(label), size(size), T(shiftless(T)), position(position), align(align), pentype(pentype), width(0.0), height(0.0), depth(0.0), havebounds(false), suppress(false), - enabled(false) {} - + enabled(false) {} + virtual ~drawLabel() {} void getbounds(iopipestream& tex, const string& texengine); - + void checkbounds(); - + void bounds(bbox& b, iopipestream&, boxvector&, bboxlist&); - + bool islabel() { return true; } @@ -54,30 +54,30 @@ public: bool write(texfile *out, const bbox&); drawElement *transformed(const transform& t); - - void labelwarning(const char *action); + + void labelwarning(const char *action); }; class drawLabelPath : public drawLabel, public drawPathPenBase { -private: +private: string justify; pair shift; public: drawLabelPath(string label, string size, path src, string justify, pair shift, pen pentype, - const string& key="") : + const string& key="") : drawLabel(label,size,identity,pair(0.0,0.0),pair(0.0,0.0),pentype,key), drawPathPenBase(src,pentype), justify(justify), shift(shift) {} - + virtual ~drawLabelPath() {} bool svg() {return true;} bool svgpng() {return true;} - + void bounds(bbox& b, iopipestream& tex, boxvector&, bboxlist&); - + bool write(texfile *out, const bbox&); - + drawElement *transformed(const transform& t); }; diff --git a/graphics/asymptote/drawlayer.h b/graphics/asymptote/drawlayer.h index 1f4500dac2..3b5b3ddeb2 100644 --- a/graphics/asymptote/drawlayer.h +++ b/graphics/asymptote/drawlayer.h @@ -29,9 +29,9 @@ public: bool islabel() {return true;} bool isnewpage() {return true;} - + bool write(texfile *out, const bbox&) { - out->verbatimline(settings::latex(out->texengine) ? "\\newpage" : + out->verbatimline(settings::latex(out->texengine) ? "\\newpage" : settings::context(out->texengine) ? "}\\page\\hbox{%" : "\\eject"); return true; diff --git a/graphics/asymptote/drawpath.cc b/graphics/asymptote/drawpath.cc index bb6dc393bd..02e7d11a28 100644 --- a/graphics/asymptote/drawpath.cc +++ b/graphics/asymptote/drawpath.cc @@ -22,24 +22,24 @@ double PatternLength(double arclength, const array& pat, bool cyclic, double penwidth) { double sum=0.0; - + size_t n=pat.size(); for(unsigned i=0; i < n; i ++) sum += read(pat,i)*penwidth; - + if(sum == 0.0) return 0.0; - + if(n % 2 == 1) sum *= 2.0; // On/off pattern repeats after 2 cycles. - + double pat0=read(pat,0); // Fix bounding box resolution problem. Example: // asy -f pdf testlinetype; gv -scale -2 testlinetype.pdf if(!cyclic && pat0 == 0) sum += 1.0e-3*penwidth; - + double terminator=(cyclic && arclength >= 0.5*sum) ? 0.0 : pat0*penwidth; int ncycle=(int)((arclength-terminator)/sum+0.5); - return (ncycle >= 1 || terminator >= 0.75*arclength) ? + return (ncycle >= 1 || terminator >= 0.75*arclength) ? ncycle*sum+terminator : 0.0; } @@ -55,26 +55,26 @@ pen adjustdash(pen& p, double arclength, bool cyclic) // Adjust dash sizes to fit arclength; also compensate for linewidth. const LineType *linetype=q.linetype(); size_t n=linetype->pattern.size(); - + if(n > 0) { double penwidth=linetype->scale ? q.width() : 1.0; double factor=penwidth; - + if(linetype->adjust && arclength) { double denom=PatternLength(arclength,linetype->pattern,cyclic,penwidth); if(denom != 0.0) factor *= arclength/denom; } - + if(factor != 1.0) q.adjust(max(factor,0.1)); } return q; } - + // Account for square or extended pen cap contributions to bounding box. void cap(bbox& b, double t, path p, pen pentype) { - transform T=pentype.getTransform(); - + transform T=pentype.getTransform(); + double h=0.5*pentype.width(); pair v=p.dir(t); transform S=rotate(conj(v))*shiftless(T); @@ -85,7 +85,7 @@ void cap(bbox& b, double t, path p, pen pentype) { double numer=xx*yx+xy*yy; double x=numer/y; pair z=shift(T)*p.point(t); - + switch(pentype.cap()) { case 0: { @@ -113,16 +113,16 @@ void drawPathPenBase::strokebounds(bbox& b, const path& p) { Int l=p.length(); if(l < 0) return; - + bbox penbounds=pentype.bounds(); - + if(cyclic() || pentype.cap() == 1) { b += pad(p.bounds(),penbounds); return; } - + b += p.internalbounds(penbounds); - + cap(b,0,p,pentype); cap(b,l,p,pentype); } @@ -147,17 +147,17 @@ bool drawPath::draw(psfile *out) out->dot(p,q); penConcat(out); - + out->setpen(q); - + out->stroke(q,n == 1); - + penRestore(out); return true; } -drawElement *drawPath::transformed(const transform& t) +drawElement *drawPath::transformed(const transform& t) { return new drawPath(transpath(t),transpen(t),KEY); } diff --git a/graphics/asymptote/drawpath.h b/graphics/asymptote/drawpath.h index 93ec38eb69..2903bdcc3b 100644 --- a/graphics/asymptote/drawpath.h +++ b/graphics/asymptote/drawpath.h @@ -15,9 +15,9 @@ namespace camp { class drawPath : public drawPathPenBase { public: - drawPath(path src, pen pentype, const string& key="") : + drawPath(path src, pen pentype, const string& key="") : drawElement(key), drawPathPenBase(src,pentype) {} - + virtual ~drawPath() {} void bounds(bbox& b, iopipestream&, boxvector&, bboxlist&) { @@ -25,7 +25,7 @@ public: } bool svg() {return true;} - + bool draw(psfile *out); drawElement *transformed(const transform& t); diff --git a/graphics/asymptote/drawpath3.cc b/graphics/asymptote/drawpath3.cc index 7a6cf4513e..088d2705db 100644 --- a/graphics/asymptote/drawpath3.cc +++ b/graphics/asymptote/drawpath3.cc @@ -18,7 +18,7 @@ namespace camp { using vm::array; using namespace prc; - + bool drawPath3::write(prcfile *out, unsigned int *, double, groupsmap&) { if(invisible) @@ -32,7 +32,7 @@ bool drawPath3::write(prcfile *out, unsigned int *, double, groupsmap&) g.precontrol((Int) 1),g.point((Int) 1)}; out->addBezierCurve(4,controls,diffuse); } - + return true; } @@ -46,15 +46,15 @@ bool drawPath3::write(jsfile *out) meshinit(); drawElement::centerIndex=centerIndex; } else drawElement::centerIndex=0; - + setcolors(false,diffuse,emissive,specular,shininess,metallic,fresnel0,out); - + if(straight) out->addCurve(g.point((Int) 0),g.point((Int) 1),Min,Max); else out->addCurve(g.point((Int) 0),g.postcontrol((Int) 0), g.precontrol((Int) 1),g.point((Int) 1),Min,Max); -#endif +#endif return true; } @@ -67,7 +67,7 @@ void drawPath3::render(double size2, const triple& b, const triple& B, setcolors(false,diffuse,emissive,specular,shininess,metallic,fresnel0); setMaterial(material1Data,drawMaterial1); - + bool offscreen; if(billboard) { drawElement::centerIndex=centerIndex; @@ -75,7 +75,7 @@ void drawPath3::render(double size2, const triple& b, const triple& B, offscreen=bbox2(Min,Max,BB).offscreen(); } else offscreen=bbox2(Min,Max).offscreen(); - + if(offscreen) { // Fully offscreen R.Onscreen=false; R.data.clear(); @@ -100,9 +100,9 @@ void drawPath3::render(double size2, const triple& b, const triple& B, } double s=perspective ? Min.getz()*perspective : 1.0; // Move to glrender - + const pair size3(s*(B.getx()-b.getx()),s*(B.gety()-b.gety())); - + R.queue(controls,straight,size3.length()/size2); #endif } @@ -111,14 +111,14 @@ drawElement *drawPath3::transformed(const double* t) { return new drawPath3(t,this); } - + bool drawNurbsPath3::write(prcfile *out, unsigned int *, double, groupsmap&) { if(invisible) return true; out->addCurve(degree,n,controls,knots,color,weights); - + return true; } @@ -127,7 +127,7 @@ void drawNurbsPath3::bounds(const double* t, bbox3& b) { double x,y,z; double X,Y,Z; - + triple* Controls; if(t == NULL) Controls=controls; else { @@ -135,12 +135,12 @@ void drawNurbsPath3::bounds(const double* t, bbox3& b) for(size_t i=0; i < n; i++) Controls[i]=t*controls[i]; } - + boundstriples(x,y,z,X,Y,Z,n,Controls); - + b.add(x,y,z); b.add(X,Y,Z); - + if(t == NULL) { Min=triple(x,y,z); Max=triple(X,Y,Z); @@ -162,13 +162,13 @@ void drawNurbsPath3::ratio(const double* t, pair &b, double (*m)(double, double) for(size_t i=0; i < n; i++) Controls[i]=t*controls[i]; } - + if(first) { first=false; triple v=Controls[0]; b=pair(xratio(v),yratio(v)); } - + double x=b.getx(); double y=b.gety(); for(size_t i=0; i < n; ++i) { @@ -177,7 +177,7 @@ void drawNurbsPath3::ratio(const double* t, pair &b, double (*m)(double, double) y=m(y,yratio(v)); } b=pair(x,y); - + if(t != NULL) delete[] Controls; } @@ -196,10 +196,10 @@ void drawNurbsPath3::displacement() else for(size_t i=0; i < n; ++i) store(Controls+3*i,controls[i]); - + for(size_t i=0; i < nknots; ++i) Knots[i]=knots[i]; -#endif +#endif } void drawNurbsPath3::render(double, const triple&, const triple&, @@ -207,7 +207,7 @@ void drawNurbsPath3::render(double, const triple&, const triple&, { #ifdef HAVE_GL if(invisible) return; - + // TODO: implement NURBS renderer #endif } @@ -218,10 +218,10 @@ bool drawPixel::write(prcfile *out, unsigned int *, double, groupsmap&) return true; out->addPoint(v,color,width); - + return true; } - + bool drawPixel::write(jsfile *out) { #ifdef HAVE_LIBGLM @@ -230,18 +230,18 @@ bool drawPixel::write(jsfile *out) RGBAColour Black(0.0,0.0,0.0,color.A); setcolors(false,color,color,Black,1.0,0.0,0.04,out); - + out->addPixel(v,width,Min,Max); -#endif +#endif return true; } void drawPixel::render(double size2, const triple& b, const triple& B, - double perspective, bool remesh) + double perspective, bool remesh) { #ifdef HAVE_GL if(invisible) return; - + RGBAColour Black(0.0,0.0,0.0,color.A); setcolors(false,color,color,Black,1.0,0.0,0.04); @@ -260,5 +260,5 @@ drawElement *drawPixel::transformed(const double* t) { return new drawPixel(t*v,p,width,KEY); } - + } //namespace camp diff --git a/graphics/asymptote/drawpath3.h b/graphics/asymptote/drawpath3.h index 84456ad6f5..3209493bf2 100644 --- a/graphics/asymptote/drawpath3.h +++ b/graphics/asymptote/drawpath3.h @@ -29,11 +29,11 @@ protected: Interaction interaction; triple Min,Max; bool billboard; - size_t centerIndex; + size_t centerIndex; public: #ifdef HAVE_GL BezierCurve R; -#endif +#endif void init() { #ifdef HAVE_LIBOSMESA billboard=false; @@ -42,7 +42,7 @@ public: #endif centerIndex=0; } - + drawPath3(path3 g, triple center, const vm::array& p, double opacity, double shininess, double metallic, double fresnel0, Interaction interaction, const string& key="") : @@ -58,7 +58,7 @@ public: emissive=rgba(vm::read(p,1)); specular=rgba(vm::read(p,2)); } - + drawPath3(const double* t, const drawPath3 *s) : drawElement(s->KEY), g(camp::transformed(t,s->g)), straight(s->straight), diffuse(s->diffuse), emissive(s->emissive), specular(s->specular), @@ -69,11 +69,11 @@ public: init(); center=t*s->center; } - + virtual ~drawPath3() {} bool is3D() {return true;} - + void bounds(const double* t, bbox3& B) { if(t != NULL) { const path3 tg(camp::transformed(t,g)); @@ -84,7 +84,7 @@ public: B.add(Max); } } - + void ratio(const double* t, pair &b, double (*m)(double, double), double, bool &first) { pair z; @@ -98,15 +98,15 @@ public: first=false; } else b=pair(m(b.getx(),z.getx()),m(b.gety(),z.gety())); } - + void meshinit() { if(billboard) centerIndex=centerindex(center); } - + bool write(prcfile *out, unsigned int *, double, groupsmap&); bool write(jsfile *out); - + void render(double, const triple&, const triple&, double, bool remesh); @@ -123,78 +123,78 @@ protected: prc::RGBAColour color; bool invisible; triple Min,Max; - + #ifdef HAVE_LIBGLM GLfloat *Controls; GLfloat *Knots; -#endif - +#endif + public: drawNurbsPath3(const vm::array& g, const vm::array* knot, const vm::array* weight, const pen& p, const string& key="") : drawElement(key), color(rgba(p)), invisible(p.invisible()) { size_t weightsize=checkArray(weight); - + string wrongsize="Inconsistent NURBS data"; n=checkArray(&g); - + if(n == 0 || (weightsize != 0 && weightsize != n)) reportError(wrongsize); - + controls=new(UseGC) triple[n]; - + size_t k=0; for(size_t i=0; i < n; ++i) controls[k++]=vm::read(g,i); - + if(weightsize > 0) { size_t k=0; weights=new(UseGC) double[n]; for(size_t i=0; i < n; ++i) weights[k++]=vm::read(weight,i); } else weights=NULL; - + size_t nknots=checkArray(knot); - + if(nknots <= n+1 || nknots > 2*n) reportError(wrongsize); degree=nknots-n-1; - + run::copyArrayC(knots,knot,0,NoGC); - + #ifdef HAVE_LIBGLM Controls=NULL; -#endif +#endif } - + drawNurbsPath3(const double* t, const drawNurbsPath3 *s) : drawElement(s->KEY), degree(s->degree), n(s->n), weights(s->weights), knots(s->knots), color(s->color), invisible(s->invisible) { controls=new(UseGC) triple[n]; for(unsigned int i=0; i < n; ++i) controls[i]=t*s->controls[i]; - + #ifdef HAVE_LIBGLM Controls=NULL; -#endif +#endif } - + bool is3D() {return true;} - + void bounds(const double* t, bbox3& b); - + virtual ~drawNurbsPath3() {} bool write(prcfile *out, unsigned int *, double, groupsmap&); - + void displacement(); void ratio(const double* t, pair &b, double (*m)(double, double), double fuzz, bool &first); - + void render(double size2, const triple& Min, const triple& Max, double perspective, bool remesh); - + drawElement *transformed(const double* t); }; @@ -209,7 +209,7 @@ class drawPixel : public drawElement { public: #ifdef HAVE_GL Pixel R; -#endif +#endif drawPixel(const triple& v, const pen& p, double width, const string& key="") : drawElement(key), v(v), p(p), color(rgba(p)), width(width), invisible(p.invisible()) {} @@ -218,24 +218,24 @@ public: Min=Max=(t != NULL) ? t*v : v; B.add(Min); } - + void ratio(const double* t, pair &b, double (*m)(double, double), double, bool &first) { triple V=(t != NULL) ? t*v : v; pair z=pair(xratio(V),yratio(V)); - + if(first) { b=z; first=false; } else b=pair(m(b.getx(),z.getx()),m(b.gety(),z.gety())); } - + void render(double size2, const triple& b, const triple& B, double perspective, bool remesh); - + bool write(prcfile *out, unsigned int *, double, groupsmap&); bool write(jsfile *out); - + drawElement *transformed(const double* t); }; diff --git a/graphics/asymptote/drawsurface.cc b/graphics/asymptote/drawsurface.cc index a1cd5e7b07..ccb34cb970 100644 --- a/graphics/asymptote/drawsurface.cc +++ b/graphics/asymptote/drawsurface.cc @@ -63,7 +63,7 @@ void setcolors(bool colors, glm::vec4(emissive.R,emissive.G,emissive.B,emissive.A), glm::vec4(specular.R,specular.G,specular.B,specular.A), shininess,metallic,fresnel0); - + MaterialMap::iterator p=materialMap.find(m); if(p != materialMap.end()) materialIndex=p->second; else { @@ -77,7 +77,7 @@ void setcolors(bool colors, } } -#endif +#endif void drawBezierPatch::bounds(const double* t, bbox3& b) { @@ -146,7 +146,7 @@ void drawBezierPatch::bounds(const double* t, bbox3& b) } void drawBezierPatch::ratio(const double* t, pair &b, double (*m)(double, double), - double fuzz, bool &first) + double fuzz, bool &first) { triple buf[16]; triple* Controls; @@ -159,7 +159,7 @@ void drawBezierPatch::ratio(const double* t, pair &b, double (*m)(double, double Controls[12]=t*controls[12]; Controls[15]=t*controls[15]; } - + triple v=Controls[0]; double x=xratio(v); double y=yratio(v); @@ -193,7 +193,7 @@ void drawBezierPatch::ratio(const double* t, pair &b, double (*m)(double, double b=pair(xratio(v),yratio(v)); first=false; } - + b=pair(bound(Controls,m,xratio,b.getx(),fuzz,maxdepth), bound(Controls,m,yratio,b.gety(),fuzz,maxdepth)); } @@ -216,7 +216,7 @@ bool drawBezierPatch::write(prcfile *out, unsigned int *, double, groupsmap&) out->addRectangle(vertices,m); } else out->addPatch(controls,m); - + return true; } @@ -230,9 +230,9 @@ bool drawBezierPatch::write(jsfile *out) meshinit(); drawElement::centerIndex=centerIndex; } else drawElement::centerIndex=0; - + setcolors(colors,diffuse,emissive,specular,shininess,metallic,fresnel0,out); - + out->precision(digits); if(straight) { triple Controls[]={controls[0],controls[12],controls[15],controls[3]}; @@ -240,8 +240,8 @@ bool drawBezierPatch::write(jsfile *out) } else out->addPatch(controls,16,Min,Max,colors,4); out->precision(getSetting("digits")); - -#endif + +#endif return true; } @@ -249,12 +249,12 @@ void drawBezierPatch::render(double size2, const triple& b, const triple& B, double perspective, bool remesh) { #ifdef HAVE_GL - if(invisible) return; + if(invisible) return; transparent=colors ? colors[0].A+colors[1].A+colors[2].A+colors[3].A < 4.0 : diffuse.A < 1.0; - + setcolors(colors,diffuse,emissive,specular,shininess,metallic,fresnel0); - + if(transparent) setMaterial(transparentData,drawTransparent); else { @@ -263,7 +263,7 @@ void drawBezierPatch::render(double size2, const triple& b, const triple& B, else setMaterial(materialData,drawMaterial); } - + bool offscreen; if(billboard) { drawElement::centerIndex=centerIndex; @@ -271,7 +271,7 @@ void drawBezierPatch::render(double size2, const triple& b, const triple& B, offscreen=bbox2(Min,Max,BB).offscreen(); } else offscreen=bbox2(Min,Max).offscreen(); - + if(offscreen) { // Fully offscreen S.Onscreen=false; S.data.clear(); @@ -284,7 +284,7 @@ void drawBezierPatch::render(double size2, const triple& b, const triple& B, if(billboard) { Controls=Controls0; for(size_t i=0; i < 16; i++) { - Controls[i]=BB.transform(controls[i]); + Controls[i]=BB.transform(controls[i]); } } else { Controls=controls; @@ -295,7 +295,7 @@ void drawBezierPatch::render(double size2, const triple& b, const triple& B, } double s=perspective ? Min.getz()*perspective : 1.0; // Move to glrender - + const pair size3(s*(B.getx()-b.getx()),s*(B.gety()-b.gety())); if(gl::outlinemode) { @@ -324,7 +324,7 @@ drawElement *drawBezierPatch::transformed(const double* t) { return new drawBezierPatch(t,this); } - + void drawBezierTriangle::bounds(const double* t, bbox3& b) { double x,y,z; @@ -341,13 +341,13 @@ void drawBezierTriangle::bounds(const double* t, bbox3& b) Vertices[1]=t*controls[6]; Vertices[2]=t*controls[9]; } - + boundstriples(x,y,z,X,Y,Z,3,Vertices); - } else { + } else { double cx[10]; double cy[10]; double cz[10]; - + if(t == NULL) { for(unsigned int i=0; i < 10; ++i) { triple v=controls[i]; @@ -368,18 +368,18 @@ void drawBezierTriangle::bounds(const double* t, bbox3& b) double fuzz=Fuzz*run::norm(cx,10); x=boundtri(cx,min,b.empty ? c0 : min(c0,b.left),fuzz,maxdepth); X=boundtri(cx,max,b.empty ? c0 : max(c0,b.right),fuzz,maxdepth); - + c0=cy[0]; fuzz=Fuzz*run::norm(cy,10); y=boundtri(cy,min,b.empty ? c0 : min(c0,b.bottom),fuzz,maxdepth); Y=boundtri(cy,max,b.empty ? c0 : max(c0,b.top),fuzz,maxdepth); - + c0=cz[0]; fuzz=Fuzz*run::norm(cz,10); z=boundtri(cz,min,b.empty ? c0 : min(c0,b.near),fuzz,maxdepth); Z=boundtri(cz,max,b.empty ? c0 : max(c0,b.far),fuzz,maxdepth); } - + b.add(x,y,z); b.add(X,Y,Z); @@ -403,7 +403,7 @@ void drawBezierTriangle::ratio(const double* t, pair &b, Controls[6]=t*controls[6]; Controls[9]=t*controls[9]; } - + triple v=Controls[0]; double x=xratio(v); double y=yratio(v); @@ -434,13 +434,13 @@ void drawBezierTriangle::ratio(const double* t, pair &b, b=pair(xratio(v),yratio(v)); first=false; } - + b=pair(boundtri(Controls,m,xratio,b.getx(),fuzz,maxdepth), boundtri(Controls,m,yratio,b.gety(),fuzz,maxdepth)); } } -bool drawBezierTriangle::write(prcfile *out, unsigned int *, double, +bool drawBezierTriangle::write(prcfile *out, unsigned int *, double, groupsmap&) { if(invisible || primitive) @@ -448,7 +448,7 @@ bool drawBezierTriangle::write(prcfile *out, unsigned int *, double, RGBAColour Black(0.0,0.0,0.0,diffuse.A); PRCmaterial m(Black,diffuse,emissive,specular,opacity,shininess); - + static const double third=1.0/3.0; static const double third2=2.0/3.0; triple Controls[]={controls[0],controls[0],controls[0],controls[0], @@ -460,7 +460,7 @@ bool drawBezierTriangle::write(prcfile *out, unsigned int *, double, controls[5],controls[6],controls[7], controls[8],controls[9]}; out->addPatch(Controls,m); - + return true; } @@ -474,9 +474,9 @@ bool drawBezierTriangle::write(jsfile *out) meshinit(); drawElement::centerIndex=centerIndex; } else drawElement::centerIndex=0; - + setcolors(colors,diffuse,emissive,specular,shininess,metallic,fresnel0,out); - + out->precision(digits); if(straight) { triple Controls[]={controls[0],controls[6],controls[9]}; @@ -484,8 +484,8 @@ bool drawBezierTriangle::write(jsfile *out) } else out->addPatch(controls,10,Min,Max,colors,3); out->precision(getSetting("digits")); - -#endif + +#endif return true; } @@ -496,9 +496,9 @@ void drawBezierTriangle::render(double size2, const triple& b, const triple& B, if(invisible) return; transparent=colors ? colors[0].A+colors[1].A+colors[2].A < 3.0 : diffuse.A < 1.0; - + setcolors(colors,diffuse,emissive,specular,shininess,metallic,fresnel0); - + if(transparent) setMaterial(transparentData,drawTransparent); else { @@ -515,7 +515,7 @@ void drawBezierTriangle::render(double size2, const triple& b, const triple& B, offscreen=bbox2(Min,Max,BB).offscreen(); } else offscreen=bbox2(Min,Max).offscreen(); - + if(offscreen) { // Fully offscreen S.Onscreen=false; S.data.clear(); @@ -528,7 +528,7 @@ void drawBezierTriangle::render(double size2, const triple& b, const triple& B, if(billboard) { Controls=Controls0; for(size_t i=0; i < 10; i++) { - Controls[i]=BB.transform(controls[i]); + Controls[i]=BB.transform(controls[i]); } } else { Controls=controls; @@ -539,7 +539,7 @@ void drawBezierTriangle::render(double size2, const triple& b, const triple& B, } double s=perspective ? Min.getz()*perspective : 1.0; // Move to glrender - + const pair size3(s*(B.getx()-b.getx()),s*(B.gety()-b.gety())); if(gl::outlinemode) { @@ -566,7 +566,7 @@ drawElement *drawBezierTriangle::transformed(const double* t) { return new drawBezierTriangle(t,this); } - + bool drawNurbs::write(prcfile *out, unsigned int *, double, groupsmap&) { if(invisible) @@ -575,7 +575,7 @@ bool drawNurbs::write(prcfile *out, unsigned int *, double, groupsmap&) RGBAColour Black(0.0,0.0,0.0,diffuse.A); PRCmaterial m(Black,diffuse,emissive,specular,opacity,shininess); out->addSurface(udegree,vdegree,nu,nv,controls,uknots,vknots,m,weights); - + return true; } @@ -584,7 +584,7 @@ void drawNurbs::bounds(const double* t, bbox3& b) { double x,y,z; double X,Y,Z; - + const size_t n=nu*nv; triple* Controls; if(t == NULL) Controls=controls; @@ -595,10 +595,10 @@ void drawNurbs::bounds(const double* t, bbox3& b) } boundstriples(x,y,z,X,Y,Z,n,Controls); - + b.add(x,y,z); b.add(X,Y,Z); - + if(t == NULL) { Min=triple(x,y,z); Max=triple(X,Y,Z); @@ -614,7 +614,7 @@ void drawNurbs::ratio(const double *t, pair &b, double (*m)(double, double), double, bool &first) { const size_t n=nu*nv; - + triple* Controls; if(t == NULL) Controls=controls; else { @@ -628,7 +628,7 @@ void drawNurbs::ratio(const double *t, pair &b, double (*m)(double, double), triple v=Controls[0]; b=pair(xratio(v),yratio(v)); } - + double x=b.getx(); double y=b.gety(); for(size_t i=0; i < n; ++i) { @@ -637,7 +637,7 @@ void drawNurbs::ratio(const double *t, pair &b, double (*m)(double, double), y=m(y,yratio(v)); } b=pair(x,y); - + if(t != NULL) delete[] Controls; } @@ -649,25 +649,25 @@ void drawNurbs::displacement() size_t n=nu*nv; size_t nuknots=udegree+nu+1; size_t nvknots=vdegree+nv+1; - + if(Controls == NULL) { Controls=new(UseGC) GLfloat[(weights ? 4 : 3)*n]; uKnots=new(UseGC) GLfloat[nuknots]; vKnots=new(UseGC) GLfloat[nvknots]; } - + if(weights) for(size_t i=0; i < n; ++i) store(Controls+4*i,controls[i],weights[i]); else for(size_t i=0; i < n; ++i) store(Controls+3*i,controls[i]); - + for(size_t i=0; i < nuknots; ++i) uKnots[i]=uknots[i]; for(size_t i=0; i < nvknots; ++i) vKnots[i]=vknots[i]; -#endif +#endif } void drawNurbs::render(double size2, const triple& b, const triple& B, @@ -686,7 +686,7 @@ void drawPRC::P(triple& t, double x, double y, double z) double f=T[12]*x+T[13]*y+T[14]*z+T[15]; if(f == 0.0) run::dividebyzero(); f=1.0/f; - + t=triple((T[0]*x+T[1]*y+T[2]*z+T[3])*f,(T[4]*x+T[5]*y+T[6]*z+T[7])*f, (T[8]*x+T[9]*y+T[10]*z+T[11])*f); } @@ -706,11 +706,11 @@ bool drawSphere::write(prcfile *out, unsigned int *, double, groupsmap&) RGBAColour Black(0.0,0.0,0.0,diffuse.A); PRCmaterial m(Black,diffuse,emissive,specular,opacity,shininess); - + switch(type) { case 0: // PRCsphere { - if(half) + if(half) out->addHemisphere(1.0,m,NULL,NULL,NULL,1.0,T); else out->addSphere(1.0,m,NULL,NULL,NULL,1.0,T); @@ -726,9 +726,9 @@ bool drawSphere::write(prcfile *out, unsigned int *, double, groupsmap&) // NURBS representation of a sphere using 10 distinct control points // K. Qin, J. Comp. Sci. and Tech. 12, 210-216 (1997). - + triple N,S,P1,P2,P3,P4,P5,P6,P7,P8; - + P(N,0.0,0.0,1.0); P(P1,-2.0,-2.0,1.0); P(P2,-2.0,-2.0,-1.0); @@ -739,27 +739,27 @@ bool drawSphere::write(prcfile *out, unsigned int *, double, groupsmap&) P(P6,2.0,2.0,-1.0); P(P7,-2.0,2.0,1.0); P(P8,-2.0,2.0,-1.0); - + triple p0[]={N,P1,P2,S, N,P3,P4,S, N,P5,P6,S, N,P7,P8,S, N,P1,P2,S, N,P3,P4,S}; - + out->addSurface(2,3,3,4,p0,uknot,vknot,m,Weights); out->addSurface(2,3,3,4,p0+4,uknot,vknot,m,Weights); if(!half) { out->addSurface(2,3,3,4,p0+8,uknot,vknot,m,Weights); out->addSurface(2,3,3,4,p0+12,uknot,vknot,m,Weights); } - + break; } default: reportError("Invalid sphere type"); } - + return true; } @@ -784,7 +784,7 @@ bool drawSphere::write(jsfile *out) else out->addSphere(O,r); -#endif +#endif return true; } @@ -795,12 +795,12 @@ bool drawCylinder::write(prcfile *out, unsigned int *, double, groupsmap&) RGBAColour Black(0.0,0.0,0.0,diffuse.A); PRCmaterial m(Black,diffuse,emissive,specular,opacity,shininess); - + out->addCylinder(1.0,1.0,m,NULL,NULL,NULL,1.0,T); - + return true; } - + bool drawCylinder::write(jsfile *out) { #ifdef HAVE_LIBGLM @@ -808,7 +808,7 @@ bool drawCylinder::write(jsfile *out) return true; drawElement::centerIndex=0; - + setcolors(false,diffuse,emissive,specular,shininess,metallic,fresnel0,out); triple E,H,O; @@ -819,13 +819,13 @@ bool drawCylinder::write(jsfile *out) triple Z=H-O; double r=length(X); double h=length(Z); - + out->addCylinder(O,r,h,Z.polar(false),Z.azimuth(false),core); -#endif +#endif return true; } - + bool drawDisk::write(prcfile *out, unsigned int *, double, groupsmap&) { if(invisible) @@ -833,12 +833,12 @@ bool drawDisk::write(prcfile *out, unsigned int *, double, groupsmap&) RGBAColour Black(0.0,0.0,0.0,diffuse.A); PRCmaterial m(Black,diffuse,emissive,specular,opacity,shininess); - + out->addDisk(1.0,m,NULL,NULL,NULL,1.0,T); - + return true; } - + bool drawDisk::write(jsfile *out) { #ifdef HAVE_LIBGLM @@ -846,9 +846,9 @@ bool drawDisk::write(jsfile *out) return true; drawElement::centerIndex=0; - + setcolors(false,diffuse,emissive,specular,shininess,metallic,fresnel0,out); - + triple E,H,O; P(E,1.0,0.0,0.0); P(H,0.0,0.0,1.0); @@ -856,13 +856,13 @@ bool drawDisk::write(jsfile *out) triple X=E-O; triple Z=H-O; double r=length(X); - + out->addDisk(O,r,Z.polar(false),Z.azimuth(false)); #endif return true; } - + bool drawTube::write(jsfile *out) { #ifdef HAVE_LIBGLM @@ -931,7 +931,7 @@ void drawBaseTriangles::ratio(const double* t, pair &b, } ratiotriples(b,m,first,nP,tP); - + if(t != NULL) delete[] tP; } @@ -940,7 +940,7 @@ bool drawTriangles::write(prcfile *out, unsigned int *, double, groupsmap&) { if(invisible) return true; - + if(nC) { const RGBAColour white(1,1,1,opacity); const RGBAColour black(0,0,0,opacity); @@ -960,11 +960,11 @@ bool drawTriangles::write(jsfile *out) #ifdef HAVE_LIBGLM if(invisible) return true; - + setcolors(nC,diffuse,emissive,specular,shininess,metallic,fresnel0,out); - + out->addTriangles(nP,P,nN,N,nC,C,nI,PI,NI,CI,Min,Max); -#endif +#endif return true; } @@ -974,7 +974,7 @@ void drawTriangles::render(double size2, const triple& b, { #ifdef HAVE_GL if(invisible) return; - + transparent=diffuse.A < 1.0; if(bbox2(Min,Max).offscreen()) { // Fully offscreen @@ -995,7 +995,7 @@ void drawTriangles::render(double size2, const triple& b, R.append(); return; } - + R.queue(nP,P,nN,N,nC,C,nI,PI,NI,CI,transparent); #endif } diff --git a/graphics/asymptote/drawsurface.h b/graphics/asymptote/drawsurface.h index 3b0ba2de83..9a8010a8d0 100644 --- a/graphics/asymptote/drawsurface.h +++ b/graphics/asymptote/drawsurface.h @@ -23,7 +23,7 @@ namespace camp { #ifdef HAVE_LIBGLM void storecolor(GLfloat *colors, int i, const vm::array &pens, int j); -#endif +#endif class drawSurface : public drawElement { protected: @@ -42,23 +42,23 @@ protected: bool invisible; Interaction interaction; bool billboard; - size_t centerIndex; - + size_t centerIndex; + triple Min,Max; int digits; bool primitive; - + public: #ifdef HAVE_GL BezierCurve C; bool transparent; -#endif - +#endif + string wrongsize() { return (ncontrols == 16 ? "4x4" : "triangular")+ string(" array of triples and array of 4 pens required"); } - + void init() { #ifdef HAVE_LIBOSMESA billboard=false; @@ -67,7 +67,7 @@ public: #endif centerIndex=0; } - + drawSurface(const vm::array& g, size_t ncontrols, triple center, bool straight, const vm::array&p, double opacity, double shininess, double metallic, double fresnel0, @@ -80,7 +80,7 @@ public: init(); if(checkArray(&g) != 4 || checkArray(&p) != 3) reportError(wrongsize()); - + size_t k=0; controls=new(UseGC) triple[ncontrols]; for(unsigned int i=0; i < 4; ++i) { @@ -91,24 +91,24 @@ public: for(unsigned int j=0; j < n; ++j) controls[k++]=vm::read(gi,j); } - + pen surfacepen=vm::read(p,0); invisible=surfacepen.invisible(); - + diffuse=rgba(surfacepen); emissive=rgba(vm::read(p,1)); specular=rgba(vm::read(p,2)); - + size_t nodes=(ncontrols == 16 ? 4 : 3); size_t size=checkArray(&pens); if(size > 0) { if(size != nodes) reportError("one vertex pen required per node"); colors=new(UseGC) prc::RGBAColour[nodes]; for(size_t i=0; i < nodes; ++i) - colors[i]=rgba(vm::read(pens,i)); + colors[i]=rgba(vm::read(pens,i)); } else colors=NULL; } - + drawSurface(const double* t, const drawSurface *s) : drawElement(s->KEY), ncontrols(s->ncontrols), straight(s->straight), diffuse(s->diffuse), emissive(s->emissive), specular(s->specular), @@ -121,83 +121,83 @@ public: for(unsigned int i=0; i < ncontrols; ++i) controls[i]=t*s->controls[i]; } else controls=NULL; - + center=t*s->center; } - + virtual ~drawSurface() {} bool is3D() {return true;} }; - + class drawBezierPatch : public drawSurface { -public: +public: #ifdef HAVE_GL BezierPatch S; -#endif - +#endif + drawBezierPatch(const vm::array& g, triple center, bool straight, - const vm::array&p, double opacity, double shininess, - double metallic, double fresnel0, const vm::array &pens, + const vm::array&p, double opacity, double shininess, + double metallic, double fresnel0, const vm::array &pens, Interaction interaction, int digits, bool primitive) : drawSurface(g,16,center,straight,p,opacity,shininess,metallic,fresnel0, pens,interaction,digits,primitive) {} drawBezierPatch(const double* t, const drawBezierPatch *s) : drawSurface(t,s) {} - + void bounds(const double* t, bbox3& b); - + void ratio(const double* t, pair &b, double (*m)(double, double), double fuzz, bool &first); - + void meshinit() { if(billboard) centerIndex=centerindex(center); } - + bool write(prcfile *out, unsigned int *, double, groupsmap&); bool write(jsfile *out); - + void render(double, const triple& b, const triple& B, double perspective, bool remesh); drawElement *transformed(const double* t); }; - + class drawBezierTriangle : public drawSurface { public: #ifdef HAVE_GL BezierTriangle S; -#endif - +#endif + drawBezierTriangle(const vm::array& g, triple center, bool straight, const vm::array&p, double opacity, double shininess, double metallic, double fresnel0, const vm::array &pens, Interaction interaction, int digits, bool primitive) : drawSurface(g,10,center,straight,p,opacity,shininess,metallic,fresnel0, pens,interaction,digits,primitive) {} - + drawBezierTriangle(const double* t, const drawBezierTriangle *s) : drawSurface(t,s) {} - + void bounds(const double* t, bbox3& b); - + void ratio(const double* t, pair &b, double (*m)(double, double), double fuzz, bool &first); - + void meshinit() { if(billboard) centerIndex=centerindex(center); } - + bool write(prcfile *out, unsigned int *, double, groupsmap&); bool write(jsfile *out); - + void render(double, const triple& b, const triple& B, double perspective, bool remesh); drawElement *transformed(const double* t); }; - + class drawNurbs : public drawElement { protected: size_t udegree,vdegree; @@ -214,16 +214,16 @@ protected: double fresnel0; triple normal; bool invisible; - + triple Min,Max; - + #ifdef HAVE_LIBGLM GLfloat *colors; GLfloat *Controls; GLfloat *uKnots; GLfloat *vKnots; -#endif - +#endif + public: drawNurbs(const vm::array& g, const vm::array* uknot, const vm::array* vknot, const vm::array* weight, const vm::array&p, double opacity, @@ -232,59 +232,59 @@ public: : drawElement(key), opacity(opacity), shininess(shininess), metallic(metallic), fresnel0(fresnel0) { size_t weightsize=checkArray(weight); - + const string wrongsize="Inconsistent NURBS data"; nu=checkArray(&g); - + if(nu == 0 || (weightsize != 0 && weightsize != nu) || checkArray(&p) != 3) reportError(wrongsize); - + vm::array *g0=vm::read(g,0); nv=checkArray(g0); - + size_t n=nu*nv; controls=new(UseGC) triple[n]; - + size_t k=0; for(size_t i=0; i < nu; ++i) { vm::array *gi=vm::read(g,i); - if(checkArray(gi) != nv) + if(checkArray(gi) != nv) reportError(wrongsize); for(size_t j=0; j < nv; ++j) controls[k++]=vm::read(gi,j); } - + if(weightsize > 0) { size_t k=0; weights=new(UseGC) double[n]; for(size_t i=0; i < nu; ++i) { vm::array *weighti=vm::read(weight,i); - if(checkArray(weighti) != nv) + if(checkArray(weighti) != nv) reportError(wrongsize); for(size_t j=0; j < nv; ++j) weights[k++]=vm::read(weighti,j); } } else weights=NULL; - + size_t nuknots=checkArray(uknot); size_t nvknots=checkArray(vknot); - + if(nuknots <= nu+1 || nuknots > 2*nu || nvknots <= nv+1 || nvknots > 2*nv) reportError(wrongsize); udegree=nuknots-nu-1; vdegree=nvknots-nv-1; - + run::copyArrayC(uknots,uknot,0,UseGC); run::copyArrayC(vknots,vknot,0,UseGC); - + pen surfacepen=vm::read(p,0); invisible=surfacepen.invisible(); - + diffuse=rgba(surfacepen); emissive=rgba(vm::read(p,1)); specular=rgba(vm::read(p,2)); - + #ifdef HAVE_LIBGLM Controls=NULL; int size=checkArray(&pens); @@ -296,45 +296,45 @@ public: storecolor(colors,12,pens,2); storecolor(colors,4,pens,3); } else colors=NULL; -#endif +#endif } - + drawNurbs(const double* t, const drawNurbs *s) : drawElement(s->KEY), udegree(s->udegree), vdegree(s->vdegree), nu(s->nu), nv(s->nv), weights(s->weights), uknots(s->uknots), vknots(s->vknots), diffuse(s->diffuse), emissive(s->emissive), specular(s->specular), opacity(s->opacity), shininess(s->shininess), invisible(s->invisible) { - + const size_t n=nu*nv; controls=new(UseGC) triple[n]; for(unsigned int i=0; i < n; ++i) controls[i]=t*s->controls[i]; - + #ifdef HAVE_LIBGLM Controls=NULL; colors=s->colors; -#endif +#endif } - + bool is3D() {return true;} - + void bounds(const double* t, bbox3& b); - + virtual ~drawNurbs() {} bool write(prcfile *out, unsigned int *, double, groupsmap&); - + void displacement(); void ratio(const double* t, pair &b, double (*m)(double, double), double, bool &first); void render(double size2, const triple& b, const triple& B, double perspective, bool remesh); - + drawElement *transformed(const double* t); }; - + // Draw a transformed PRC object. class drawPRC : public drawElementLC { protected: @@ -350,36 +350,36 @@ public: void init(const vm::array&p) { if(checkArray(&p) != 3) reportError(need3pens); - + pen surfacepen=vm::read(p,0); invisible=surfacepen.invisible(); - + diffuse=rgba(surfacepen); emissive=rgba(vm::read(p,1)); specular=rgba(vm::read(p,2)); } - + drawPRC(const vm::array& t, const vm::array&p, double opacity, double shininess, double metallic, double fresnel0) : drawElementLC(t), opacity(opacity), shininess(shininess), metallic(metallic), fresnel0(fresnel0) { init(p); } - + drawPRC(const vm::array&p, double opacity, double shininess, double metallic, double fresnel0) : drawElementLC(NULL), opacity(opacity), shininess(shininess), metallic(metallic), fresnel0(fresnel0) { init(p); } - + drawPRC(const double* t, const drawPRC *s) : drawElementLC(t,s), diffuse(s->diffuse), emissive(s->emissive), specular(s->specular), opacity(s->opacity), shininess(s->shininess), metallic(s->metallic), fresnel0(s->fresnel0), invisible(s->invisible) { } - + virtual void P(triple& t, double x, double y, double z); virtual bool write(prcfile *out, unsigned int *, double, groupsmap&) { @@ -393,7 +393,7 @@ public: double (*)(double, double), double, bool&) {} }; - + // Output a unit sphere primitive. class drawSphere : public drawPRC { bool half; @@ -405,17 +405,17 @@ public: drawSphere(const double* t, const drawSphere *s) : drawElement(s->KEY), drawPRC(t,s), half(s->half), type(s->type) {} - + void P(triple& t, double x, double y, double z); - + bool write(prcfile *out, unsigned int *, double, groupsmap&); bool write(jsfile *out); - + drawElement *transformed(const double* t) { return new drawSphere(t,this); } }; - + // Output a unit cylinder primitive. class drawCylinder : public drawPRC { bool core; @@ -427,15 +427,15 @@ public: drawCylinder(const double* t, const drawCylinder *s) : drawPRC(t,s), core(s->core) {} - + bool write(prcfile *out, unsigned int *, double, groupsmap&); bool write(jsfile *out); - + drawElement *transformed(const double* t) { return new drawCylinder(t,this); } }; - + // Draw a unit disk. class drawDisk : public drawPRC { public: @@ -445,15 +445,15 @@ public: drawDisk(const double* t, const drawDisk *s) : drawPRC(t,s) {} - + bool write(prcfile *out, unsigned int *, double, groupsmap&); bool write(jsfile *out); - + drawElement *transformed(const double* t) { return new drawDisk(t,this); } }; - + // Draw a tube. class drawTube : public drawPRC { protected: @@ -474,7 +474,7 @@ public: for(size_t i=0; i < 4; ++i) g[i]=vm::read(G,i); } - + drawTube(const double* t, const drawTube *s) : drawElement(s->KEY), drawPRC(t,s), width(s->width), m(s->m), M(s->M), core(s->core) { @@ -482,7 +482,7 @@ public: for(size_t i=0; i < 4; ++i) g[i]=t*s->g[i]; } - + bool write(jsfile *out); drawElement *transformed(const double* t) { @@ -490,14 +490,14 @@ public: } }; - + class drawBaseTriangles : public drawElement { protected: #ifdef HAVE_GL Triangles R; bool transparent; -#endif - +#endif + size_t nP; triple* P; size_t nN; @@ -506,12 +506,12 @@ protected: size_t Ni; uint32_t (*PI)[3]; uint32_t (*NI)[3]; - + triple Min,Max; static const string wrongsize; static const string outofrange; - + public: drawBaseTriangles(const vm::array& v, const vm::array& vi, const vm::array& n, const vm::array& ni) { @@ -519,7 +519,7 @@ public: P=new(UseGC) triple[nP]; for(size_t i=0; i < nP; ++i) P[i]=vm::read(v,i); - + nI=checkArray(&vi); PI=new(UseGC) uint32_t[nI][3]; for(size_t i=0; i < nI; ++i) { @@ -532,13 +532,13 @@ public: PIi[j]=index; } } - + nN=checkArray(&n); if(nN) { N=new(UseGC) triple[nN]; for(size_t i=0; i < nN; ++i) N[i]=vm::read(n,i); - + Ni=checkArray(&ni); if(Ni == 0 && nN == nP) NI=PI; @@ -565,7 +565,7 @@ public: P=new(UseGC) triple[nP]; for(size_t i=0; i < nP; i++) P[i]=t*s->P[i]; - + PI=new(UseGC) uint32_t[nI][3]; for(size_t i=0; i < nI; ++i) { uint32_t *PIi=PI[i]; @@ -601,27 +601,27 @@ public: } } } - + bool is3D() {return true;} - + void bounds(const double* t, bbox3& b); - + void ratio(const double* t, pair &b, double (*m)(double, double), double fuzz, bool &first); - + virtual ~drawBaseTriangles() {} - + drawElement *transformed(const double* t) { return new drawBaseTriangles(t,this); } }; - + class drawTriangles : public drawBaseTriangles { size_t nC; prc::RGBAColour*C; uint32_t (*CI)[3]; size_t Ci; - + // Asymptote material data prc::RGBAColour diffuse; prc::RGBAColour emissive; @@ -631,7 +631,7 @@ class drawTriangles : public drawBaseTriangles { double metallic; double fresnel0; bool invisible; - + public: drawTriangles(const vm::array& v, const vm::array& vi, const vm::array& n, const vm::array& ni, @@ -643,19 +643,19 @@ public: if(checkArray(&p) != 3) reportError(need3pens); - + const pen surfacepen=vm::read(p,0); invisible=surfacepen.invisible(); diffuse=rgba(surfacepen); - + nC=checkArray(&c); if(nC) { C=new(UseGC) prc::RGBAColour[nC]; for(size_t i=0; i < nC; ++i) C[i]=rgba(vm::read(c,i)); - + size_t nI=checkArray(&vi); - + Ci=checkArray(&ci); if(Ci == 0 && nC == nP) CI=PI; @@ -679,18 +679,18 @@ public: } specular=rgba(vm::read(p,2)); } - + drawTriangles(const double* t, const drawTriangles *s) : drawBaseTriangles(t,s), nC(s->nC), diffuse(s->diffuse), emissive(s->emissive), - specular(s->specular), opacity(s->opacity), shininess(s->shininess), + specular(s->specular), opacity(s->opacity), shininess(s->shininess), metallic(s->metallic), fresnel0(s->fresnel0), invisible(s->invisible) { - + if(nC) { C=new(UseGC) prc::RGBAColour[nC]; for(size_t i=0; i < nC; ++i) C[i]=s->C[i]; - + CI=new(UseGC) uint32_t[nI][3]; for(size_t i=0; i < nI; ++i) { uint32_t *CIi=CI[i]; @@ -700,15 +700,15 @@ public: } } } - + virtual ~drawTriangles() {} - + void render(double size2, const triple& b, const triple& B, double perspective, bool remesh); - + bool write(prcfile *out, unsigned int *, double, groupsmap&); bool write(jsfile *out); - + drawElement *transformed(const double* t) { return new drawTriangles(t,this); } diff --git a/graphics/asymptote/drawverbatim.h b/graphics/asymptote/drawverbatim.h index 186dc54442..454d22a300 100644 --- a/graphics/asymptote/drawverbatim.h +++ b/graphics/asymptote/drawverbatim.h @@ -13,7 +13,7 @@ namespace camp { enum Language {PostScript,TeX}; - + class drawVerbatim : public drawElement { private: Language language; @@ -22,31 +22,31 @@ private: pair min,max; bool havebounds; public: - drawVerbatim(Language language, const string& text) : + drawVerbatim(Language language, const string& text) : language(language), text(text), userbounds(false), havebounds(false) {} - + drawVerbatim(Language language, const string& text, pair min, - pair max) : + pair max) : language(language), text(text), userbounds(true), min(min), max(max), havebounds(false) {} - + virtual ~drawVerbatim() {} void bounds(bbox& b, iopipestream& tex, boxvector&, bboxlist&) { if(havebounds) return; havebounds=true; - if(language == TeX) + if(language == TeX) tex << text << "%" << newl; if(userbounds) { b += min; b += max; } } - + bool islabel() { return language == TeX; } - + bool draw(psfile *out) { if(language == PostScript) out->verbatimline(text); return true; diff --git a/graphics/asymptote/entry.cc b/graphics/asymptote/entry.cc index e2c27681c3..7a780fdd56 100644 --- a/graphics/asymptote/entry.cc +++ b/graphics/asymptote/entry.cc @@ -123,90 +123,6 @@ bool tenv::add(symbol src, symbol dest, return false; } -#if 0 //{{{ -/*NOHASH*/ void venv::add(venv& source, varEntry *qualifier, coder &c) -/*NOHASH*/ { -/*NOHASH*/ // Enter each distinct (unshadowed) name,type pair. -/*NOHASH*/ for(names_t::iterator p = source.names.begin(); -/*NOHASH*/ p != source.names.end(); -/*NOHASH*/ ++p) -/*NOHASH*/ add(p->first, p->first, source, qualifier, c); -/*NOHASH*/ } -/*NOHASH*/ -/*NOHASH*/ bool venv::add(symbol src, symbol dest, -/*NOHASH*/ venv& source, varEntry *qualifier, coder &c) -/*NOHASH*/ { -/*NOHASH*/ bool added=false; -/*NOHASH*/ name_t &list=source.names[src]; -/*NOHASH*/ types::overloaded set; // To keep track of what is shadowed. -/*NOHASH*/ bool special = src.special(); -/*NOHASH*/ -/*NOHASH*/ for(name_iterator p = list.begin(); -/*NOHASH*/ p != list.end(); -/*NOHASH*/ ++p) { -/*NOHASH*/ varEntry *v=*p; -/*NOHASH*/ if (!equivalent(v->getType(), &set)) { -/*NOHASH*/ set.addDistinct(v->getType(), special); -/*NOHASH*/ if (v->checkPerm(READ, c)) { -/*NOHASH*/ enter(dest, qualifyVarEntry(qualifier, v)); -/*NOHASH*/ added=true; -/*NOHASH*/ } -/*NOHASH*/ } -/*NOHASH*/ } -/*NOHASH*/ -/*NOHASH*/ return added; -/*NOHASH*/ } -/*NOHASH*/ -/*NOHASH*/ varEntry *venv::lookByType(symbol name, ty *t) -/*NOHASH*/ { -/*NOHASH*/ // Find first applicable function. -/*NOHASH*/ name_t &list = names[name]; -/*NOHASH*/ for(name_iterator p = list.begin(); -/*NOHASH*/ p != list.end(); -/*NOHASH*/ ++p) { -/*NOHASH*/ if (equivalent((*p)->getType(), t)) -/*NOHASH*/ return *p; -/*NOHASH*/ } -/*NOHASH*/ return 0; -/*NOHASH*/ } -/*NOHASH*/ -/*NOHASH*/ void venv::list(record *module) -/*NOHASH*/ { -/*NOHASH*/ bool where=settings::getSetting("where"); -/*NOHASH*/ // List all functions and variables. -/*NOHASH*/ for(names_t::iterator N = names.begin(); N != names.end(); ++N) { -/*NOHASH*/ symbol s=N->first; -/*NOHASH*/ name_t &list=names[s]; -/*NOHASH*/ for(name_iterator p = list.begin(); p != list.end(); ++p) { -/*NOHASH*/ if(!module || (*p)->whereDefined() == module) { -/*NOHASH*/ if(where) cout << (*p)->getPos(); -/*NOHASH*/ (*p)->getType()->printVar(cout, s); -/*NOHASH*/ cout << ";\n"; -/*NOHASH*/ } -/*NOHASH*/ } -/*NOHASH*/ } -/*NOHASH*/ flush(cout); -/*NOHASH*/ } -/*NOHASH*/ -/*NOHASH*/ ty *venv::getType(symbol name) -/*NOHASH*/ { -/*NOHASH*/ types::overloaded set; -/*NOHASH*/ -/*NOHASH*/ // Find all applicable functions in scope. -/*NOHASH*/ name_t &list = names[name]; -/*NOHASH*/ bool special = name.special(); -/*NOHASH*/ -/*NOHASH*/ for(name_iterator p = list.begin(); -/*NOHASH*/ p != list.end(); -/*NOHASH*/ ++p) { -/*NOHASH*/ set.addDistinct((*p)->getType(), special); -/*NOHASH*/ } -/*NOHASH*/ -/*NOHASH*/ return set.simplify(); -/*NOHASH*/ } -// }}} -#else - // To avoid writing qualifiers everywhere. typedef core_venv::cell cell; @@ -304,15 +220,15 @@ varEntry *core_venv::storeNonSpecialAfterTomb(size_t tombIndex, signature *sig = ent->getSignature(); for (size_t i = tombIndex+1; ; ++i) - { - cell& b = cellByIndex(i); + { + cell& b = cellByIndex(i); - if (b.empty()) - return storeNew(cellByIndex(tombIndex), name, ent); + if (b.empty()) + return storeNew(cellByIndex(tombIndex), name, ent); - if (b.matches(name, sig)) - return b.replaceWith(name, ent); - } + if (b.matches(name, sig)) + return b.replaceWith(name, ent); + } } varEntry *core_venv::storeSpecialAfterTomb(size_t tombIndex, @@ -324,15 +240,15 @@ varEntry *core_venv::storeSpecialAfterTomb(size_t tombIndex, ty *t = ent->getType(); for (size_t i = tombIndex+1; ; ++i) - { - cell& b = cellByIndex(i); + { + cell& b = cellByIndex(i); - if (b.empty()) - return storeNew(cellByIndex(tombIndex), name, ent); + if (b.empty()) + return storeNew(cellByIndex(tombIndex), name, ent); - if (b.matches(name, t)) - return b.replaceWith(name, ent); - } + if (b.matches(name, t)) + return b.replaceWith(name, ent); + } } size_t hashSig(const signature *sig) { @@ -358,18 +274,18 @@ varEntry *core_venv::storeNonSpecial(symbol name, varEntry *ent) { signature *sig = ent->getSignature(); for (size_t i = nonSpecialHash(name, sig); ; ++i) - { - cell& b = cellByIndex(i); + { + cell& b = cellByIndex(i); - if (b.empty()) - return storeNew(b, name, ent); + if (b.empty()) + return storeNew(b, name, ent); - if (b.matches(name, sig)) - return b.replaceWith(name, ent); + if (b.matches(name, sig)) + return b.replaceWith(name, ent); - if (b.isATomb()) - return storeNonSpecialAfterTomb(i, name, ent); - } + if (b.isATomb()) + return storeNonSpecialAfterTomb(i, name, ent); + } } varEntry *core_venv::storeSpecial(symbol name, varEntry *ent) { @@ -380,18 +296,18 @@ varEntry *core_venv::storeSpecial(symbol name, varEntry *ent) { ty *t = ent->getType(); for (size_t i = specialHash(name, t); ; ++i) - { - cell& b = cellByIndex(i); + { + cell& b = cellByIndex(i); - if (b.empty()) - return storeNew(b, name, ent); + if (b.empty()) + return storeNew(b, name, ent); - if (b.matches(name, t)) - return b.replaceWith(name, ent); + if (b.matches(name, t)) + return b.replaceWith(name, ent); - if (b.isATomb()) - return storeSpecialAfterTomb(i, name, ent); - } + if (b.isATomb()) + return storeSpecialAfterTomb(i, name, ent); + } } varEntry *core_venv::store(symbol name, varEntry *ent) { @@ -399,7 +315,7 @@ varEntry *core_venv::store(symbol name, varEntry *ent) { DEBUG_CACHE_ASSERT(ent->getType()); return name.special() ? storeSpecial(name, ent) : - storeNonSpecial(name, ent); + storeNonSpecial(name, ent); } varEntry *core_venv::lookupSpecial(symbol name, const ty *t) { @@ -407,54 +323,54 @@ varEntry *core_venv::lookupSpecial(symbol name, const ty *t) { DEBUG_CACHE_ASSERT(t); for (size_t i = specialHash(name, t); ; ++i) - { - cell& b = cellByIndex(i); + { + cell& b = cellByIndex(i); - if (b.matches(name, t)) - return b.ent; + if (b.matches(name, t)) + return b.ent; - if (b.empty()) - return 0; - } + if (b.empty()) + return 0; + } } varEntry *core_venv::lookupNonSpecial(symbol name, const signature *sig) { DEBUG_CACHE_ASSERT(name.notSpecial()); for (size_t i = nonSpecialHash(name, sig); ; ++i) - { - cell& b = cellByIndex(i); + { + cell& b = cellByIndex(i); - if (b.matches(name, sig)) - return b.ent; + if (b.matches(name, sig)) + return b.ent; - if (b.empty()) - return 0; - } + if (b.empty()) + return 0; + } } varEntry *core_venv::lookup(symbol name, const ty *t) { DEBUG_CACHE_ASSERT(t); return name.special() ? lookupSpecial(name, t) : - lookupNonSpecial(name, t->getSignature()); + lookupNonSpecial(name, t->getSignature()); } void core_venv::removeNonSpecial(symbol name, const signature *sig) { DEBUG_CACHE_ASSERT(name.notSpecial()); for (size_t i = nonSpecialHash(name, sig); ; ++i) - { - cell& b = cellByIndex(i); + { + cell& b = cellByIndex(i); - if (b.matches(name, sig)) { - b.remove(); - --size; - return; - } + if (b.matches(name, sig)) { + b.remove(); + --size; + return; + } - DEBUG_CACHE_ASSERT(!b.empty()); - } + DEBUG_CACHE_ASSERT(!b.empty()); + } } void core_venv::removeSpecial(symbol name, const ty *t) { @@ -462,17 +378,17 @@ void core_venv::removeSpecial(symbol name, const ty *t) { DEBUG_CACHE_ASSERT(t); for (size_t i = specialHash(name, t); ; ++i) - { - cell& b = cellByIndex(i); + { + cell& b = cellByIndex(i); - if (b.matches(name, t)) { - b.remove(); - --size; - return; - } + if (b.matches(name, t)) { + b.remove(); + --size; + return; + } - DEBUG_CACHE_ASSERT(!b.empty()); - } + DEBUG_CACHE_ASSERT(!b.empty()); + } } void core_venv::remove(symbol name, const ty *t) { @@ -532,7 +448,7 @@ void venv::checkName(symbol name) } assert(matches == size); } - + void rightKind(ty *t) { if (t && t->isOverloaded()) { ty_vector& set=((overloaded *)t)->sub; @@ -584,7 +500,7 @@ void venv::namevalue::replaceType(ty *new_t, ty *old_t) { #endif // TODO: Test for equivalence. - + if (t->isOverloaded()) { for (ty_iterator i = t->begin(); i != t->end(); ++i) { if (equivalent(old_t, *i)) { @@ -612,7 +528,7 @@ void venv::namevalue::replaceType(ty *new_t, ty *old_t) { #ifdef DEBUG_CACHE void venv::namevalue::popType(ty *s) #else -void venv::namevalue::popType() + void venv::namevalue::popType() #endif { #ifdef DEBUG_CACHE @@ -645,7 +561,7 @@ void venv::namevalue::popType() RIGHTKIND(t); // Don't try to reduce numFormals as I doubt it is worth the cost of - // recalculating. + // recalculating. } void venv::remove(const addition& a) { @@ -764,7 +680,7 @@ varEntry *venv::lookBySignature(symbol name, signature *sig) { // See if this exactly matches a function in the table. varEntry *ve = core.lookupNonSpecial(name, sig); - + if (!ve) return 0; @@ -782,14 +698,14 @@ void venv::add(venv& source, varEntry *qualifier, coder &c) { core_venv::const_iterator end = source.core.end(); for (core_venv::const_iterator p = source.core.begin(); p != end; ++p) - { - DEBUG_CACHE_ASSERT(p->filled()); + { + DEBUG_CACHE_ASSERT(p->filled()); - varEntry *v=p->ent; - if (v->checkPerm(READ, c)) { - enter(p->name, qualifyVarEntry(qualifier, v)); + varEntry *v=p->ent; + if (v->checkPerm(READ, c)) { + enter(p->name, qualifyVarEntry(qualifier, v)); + } } - } } bool venv::add(symbol src, symbol dest, @@ -803,13 +719,13 @@ bool venv::add(symbol src, symbol dest, if (t->isOverloaded()) { bool added=false; for (ty_iterator i = t->begin(); i != t->end(); ++i) - { - varEntry *v=source.lookByType(src, *i); - if (v->checkPerm(READ, c)) { - enter(dest, qualifyVarEntry(qualifier, v)); - added=true; + { + varEntry *v=source.lookByType(src, *i); + if (v->checkPerm(READ, c)) { + enter(dest, qualifyVarEntry(qualifier, v)); + added=true; + } } - } return added; } else { @@ -831,14 +747,14 @@ ty *venv::getType(symbol name) void listValue(symbol name, varEntry *v, record *module) { if (!module || v->whereDefined() == module) - { - if (settings::getSetting("where")) - cout << v->getPos(); + { + if (settings::getSetting("where")) + cout << v->getPos(); - v->getType()->printVar(cout, name); + v->getType()->printVar(cout, name); - cout << ";\n"; - } + cout << ";\n"; + } } void venv::listValues(symbol name, record *module) @@ -868,6 +784,4 @@ void venv::completions(mem::list& l, string start) l.push_back(N->first); } -#endif /* not NOHASH */ - } // namespace trans diff --git a/graphics/asymptote/entry.h b/graphics/asymptote/entry.h index 0c1441c6a0..e11ad59940 100644 --- a/graphics/asymptote/entry.h +++ b/graphics/asymptote/entry.h @@ -47,7 +47,7 @@ class entry : public gc { // Reports an error if permission is not allowed. void report(action act, position pos, coder &c); }; - + mem::list perms; void addPerm(permission perm, record *r) { @@ -62,7 +62,7 @@ class entry : public gc { // The location (file and line number) where the entry was defined. position pos; - + public: entry(record *where, position pos) : where(where), pos(pos) {} entry(permission perm, record *r, record *where, position pos) @@ -73,7 +73,7 @@ public: // (Non-destructively) merges two entries, appending permission lists. // The 'where' member is taken from the second entry. entry(entry &e1, entry &e2); - + // Create an entry with one more permission in the list. entry(entry &base, permission perm, record *r); @@ -83,12 +83,12 @@ public: record *whereDefined() { return where; } - + position getPos() { return pos; } }; - + class varEntry : public entry { ty *t; access *location; @@ -179,40 +179,6 @@ public: tenv& source, varEntry *qualifier, coder &c); }; -#if 0 //{{{ - /* This version of venv is provided for compiling on systems which do not - * have some form of STL hash table. It will eventually be removed. - * See the hash version below for documentation on the functions. - */ -/*NOHASH*/ class venv : public sym::table { -/*NOHASH*/ public: -/*NOHASH*/ venv() {} -/*NOHASH*/ -/*NOHASH*/ struct file_env_tag {}; -/*NOHASH*/ venv(file_env_tag) {} -/*NOHASH*/ -/*NOHASH*/ void add(venv& source, varEntry *qualifier, coder &c); -/*NOHASH*/ -/*NOHASH*/ bool add(symbol src, symbol dest, -/*NOHASH*/ venv& source, varEntry *qualifier, coder &c); -/*NOHASH*/ -/*NOHASH*/ varEntry *lookByType(symbol name, ty *t); -/*NOHASH*/ -/*NOHASH*/ varEntry *lookBySignature(symbol name, signature *sig) { -/*NOHASH*/ // This optimization is not implemented for the NOHASH version. -/*NOHASH*/ return 0; -/*NOHASH*/ } -/*NOHASH*/ -/*NOHASH*/ ty *getType(symbol name); -/*NOHASH*/ -/*NOHASH*/ friend std::ostream& operator<< (std::ostream& out, -/*NOHASH*/ const venv& ve); -/*NOHASH*/ -/*NOHASH*/ void list(record *module=0); -/*NOHASH*/ }; - -//}}} -#else // For speed reasons, many asserts are only tested when DEBUG_CACHE is set. #ifdef DEBUG_CACHE @@ -425,7 +391,7 @@ class venv { namevalue() : maxFormals(0), t(0) {} void addType(ty *s); - + void replaceType(ty *new_t, ty *old_t); #if DEBUG_CACHE @@ -475,9 +441,9 @@ public: venv(file_env_tag) : core(fileCoreSize), #ifndef NOHASH - names(fileNamesSize), + names(fileNamesSize), #endif - empty_scopes(0) {} + empty_scopes(0) {} // Add a new variable definition. void enter(symbol name, varEntry *v); @@ -518,7 +484,7 @@ public: void beginScope(); void endScope(); - + // Merges the top-level scope with the level immediately underneath it. void collapseScope(); @@ -528,7 +494,6 @@ public: // Adds to l, all names prefixed by start. void completions(mem::list& l, string start); }; -#endif } // namespace trans diff --git a/graphics/asymptote/env.cc b/graphics/asymptote/env.cc index 09d16f21a0..3b0a59b7a3 100644 --- a/graphics/asymptote/env.cc +++ b/graphics/asymptote/env.cc @@ -32,7 +32,7 @@ public: return e.castable(target, source, name); } }; - + access *protoenv::baseLookupCast(ty *target, ty *source, symbol name) { static identAccess id; @@ -159,10 +159,10 @@ ty *protoenv::castTarget(ty *target, ty *source, symbol name) { return e.castable(target, source, name) ? target : 0; } }; - + resolver r(*this, name); return r.collect(target, source); -} +} ty *protoenv::castSource(ty *target, ty *source, symbol name) { struct resolver : public collector { @@ -176,10 +176,10 @@ ty *protoenv::castSource(ty *target, ty *source, symbol name) { return e.castable(target, source, name) ? source : 0; } }; - + resolver r(*this, name); return r.collect(target, source); -} +} void protoenv::addArrayOps(array *a) { diff --git a/graphics/asymptote/env.h b/graphics/asymptote/env.h index 7fd7a003e5..0f97902620 100644 --- a/graphics/asymptote/env.h +++ b/graphics/asymptote/env.h @@ -47,7 +47,7 @@ public: : ve(tag) {} protoenv(const protoenv&); - + void beginScope() { te.beginScope(); ve.beginScope(); @@ -120,7 +120,7 @@ public: { te.enter(name, desc); } - + void addVar(symbol name, varEntry *desc) { // Don't check for multiple variables, as this makes adding casts @@ -140,7 +140,7 @@ public: bool add(symbol src, symbol dest, protoenv &source, varEntry *qualifier, coder &c) { - return te.add(src, dest, source.te, qualifier, c) | + return te.add(src, dest, source.te, qualifier, c) | ve.add(src, dest, source.ve, qualifier, c); } diff --git a/graphics/asymptote/errormsg.cc b/graphics/asymptote/errormsg.cc index a2b62c7fad..afa307283b 100644 --- a/graphics/asymptote/errormsg.cc +++ b/graphics/asymptote/errormsg.cc @@ -9,6 +9,8 @@ #include #include "errormsg.h" +#include "interact.h" +#include "fileio.h" errorstream em; @@ -22,8 +24,30 @@ ostream& operator<< (ostream& out, const position& pos) if (!pos) return out; - out << pos.file->name() << ": "; + string filename=pos.file->name(); + + if(filename != "-" && !settings::getSetting("quiet")) { + std::ifstream fin(pos.file->name().c_str()); + string s; + size_t count=pos.line; + while(count > 0 && getline(fin,s)) { + count--; + } + out << s << endl; + for(size_t i=1; i < pos.column; ++i) + out << " "; + out << "^" << endl; + } + + out << filename << ": "; out << pos.line << "." << pos.column << ": "; + + if(settings::getSetting("xasy")) { + camp::openpipeout(); + fprintf(camp::pipeout,"Error\n"); + fflush(camp::pipeout); + } + return out; } @@ -85,7 +109,7 @@ void errorstream::fatal(position pos) void errorstream::trace(position pos) { static position lastpos; - if(!pos || (pos.match(lastpos.filename()) && pos.match(lastpos.Line()))) + if(!pos || (pos.match(lastpos.filename()) && pos.match(lastpos.Line()))) return; lastpos=pos; message(pos,""); @@ -103,7 +127,7 @@ void errorstream::sync() floating = false; } -void outOfMemory() +void outOfMemory() { cerr << "error: out of memory" << endl; exit(1); diff --git a/graphics/asymptote/errormsg.h b/graphics/asymptote/errormsg.h index 22e7f79f1f..180c2309f7 100644 --- a/graphics/asymptote/errormsg.h +++ b/graphics/asymptote/errormsg.h @@ -31,7 +31,7 @@ public: { return lineNum; } - + string name() const { return filename; } @@ -52,12 +52,12 @@ public: return filename.substr(start, end-start); } - + // Specifies a newline symbol at the character position given. void newline() { ++lineNum; } - + }; inline bool operator == (const fileinfo& a, const fileinfo& b) @@ -85,17 +85,17 @@ public: { return file ? file->name() : ""; } - + size_t Line() const { return line; } - + size_t Column() const { return column; } - + std::pairLineColumn() const { return std::pair(line,column); } @@ -103,20 +103,20 @@ public: bool match(const string& s) { return file && file->name() == s; } - + bool match(size_t l) { return line == l; } - + bool matchColumn(size_t c) { return column == c; } - + bool operator! () const { return (file == 0); } - + friend ostream& operator << (ostream& out, const position& pos); // Write out just the module name and line number. @@ -133,27 +133,27 @@ extern position nullPos; struct nullPosInitializer { nullPosInitializer() {nullPos.init(NULL,0);} }; - + inline bool operator == (const position& a, const position& b) { - return a.Line() == b.Line() && a.Column() == b.Column() && - a.filename() == b.filename(); + return a.Line() == b.Line() && a.Column() == b.Column() && + a.filename() == b.filename(); } string warning(string s); - + class errorstream { ostream& out; bool anyErrors; bool anyWarnings; bool floating; // Was a message output without a terminating newline? - + // Is there an error that warrants the asy process to return 1 instead of 0? bool anyStatusErrors; public: static bool interrupt; // Is there a pending interrupt? - + errorstream(ostream& out = cerr) : out(out), anyErrors(false), anyWarnings(false), floating(false), anyStatusErrors(false) {} @@ -162,11 +162,11 @@ public: void clear(); void message(position pos, const string& s); - + void Interrupt(bool b) { interrupt=b; } - + // An error is encountered, not in the user's code, but in the way the // compiler works! This may be augmented in the future with a message // to contact the compiler writers. @@ -184,13 +184,13 @@ public: // Indicate potential problems in the code, but the code is still usable. void warning(position pos); void warning(position pos, string s); - + // Single a fatal error and execute the main process. void fatal(position pos); - + // Print out position in code to aid debugging. void trace(position pos); - + // Sends stuff to out to print. // NOTE: May later make it do automatic line breaking for long messages. template @@ -205,11 +205,11 @@ public: void sync(); void cont(); - + bool errors() const { return anyErrors; } - + bool warnings() const { return anyWarnings || errors(); } diff --git a/graphics/asymptote/examples/100d.pdb1 b/graphics/asymptote/examples/100d.pdb1 new file mode 100644 index 0000000000..d9143c1173 --- /dev/null +++ b/graphics/asymptote/examples/100d.pdb1 @@ -0,0 +1,535 @@ +HEADER DNA/RNA 05-DEC-94 XXXX +TITLE CRYSTAL STRUCTURE OF THE HIGHLY DISTORTED CHIMERIC DECAMER +TITLE 2 R(C)D(CGGCGCCG)R(G)-SPERMINE COMPLEX-SPERMINE BINDING TO +TITLE 3 PHOSPHATE ONLY AND MINOR GROOVE TERTIARY BASE-PAIRING +COMPND 5'-R(*CP*)-D(*CP*GP*GP*CP*GP*CP*CP*GP*)-R(*G)-3' +KEYWDS A-DNA/RNA, DOUBLE HELIX +EXPDTA X-RAY DIFFRACTION +AUTHOR C.BAN, B.RAMAKRISHNAN, M.SUNDARALINGAM +JRNL AUTH C.BAN, B.RAMAKRISHNAN, M.SUNDARALINGAM +JRNL TITL CRYSTAL STRUCTURE OF THE HIGHLY DISTORTED CHIMERIC +JRNL TITL 2 DECAMER R(C)D(CGGCGCCG)R(G).SPERMINE +JRNL TITL 3 COMPLEX--SPERMINE BINDING TO PHOSPHATE ONLY AND +JRNL TITL 4 MINOR GROOVE TERTIARY BASE-PAIRING. +JRNL REF NUCLEIC ACIDS RES. V. 22 5466 1994 +JRNL REFN ASTM NARHAD UK ISSN 0305-1048 +REMARK 1 +SEQRES 1 A 10 C DC DG DG DC DG DC DC DG G +SEQRES 1 B 10 C DC DG DG DC DG DC DC DG G +HETNAM SPM SPERMINE +FORMUL 3 SPM C10 H26 N4 +FORMUL 4 HOH *67(H2 O) +CRYST1 23.980 40.770 44.840 90.00 90.00 90.00 P 21 21 21 8 +ORIGX1 1.000000 0.000000 0.000000 0.00000 +ORIGX2 0.000000 1.000000 0.000000 0.00000 +ORIGX3 0.000000 0.000000 1.000000 0.00000 +SCALE1 0.041701 0.000000 0.000000 0.00000 +SCALE2 0.000000 0.024528 0.000000 0.00000 +SCALE3 0.000000 0.000000 0.022302 0.00000 +ATOM 1 N1 C A 1 -4.931 6.902 7.826 1.00 19.25 N +ATOM 2 C2 C A 1 -4.838 7.263 9.158 1.00 16.72 C +ATOM 3 O2 C A 1 -4.287 8.308 9.505 1.00 15.49 O +ATOM 4 N3 C A 1 -5.367 6.448 10.085 1.00 15.96 N +ATOM 5 C4 C A 1 -5.978 5.310 9.736 1.00 16.84 C +ATOM 6 N4 C A 1 -6.592 4.588 10.676 1.00 19.14 N +ATOM 7 C5 C A 1 -6.059 4.907 8.376 1.00 17.68 C +ATOM 8 C6 C A 1 -5.522 5.732 7.461 1.00 17.68 C +ATOM 9 O5' C A 1 -4.549 5.095 4.262 1.00 28.71 O +ATOM 10 C5' C A 1 -4.176 6.323 3.646 1.00 27.35 C +ATOM 11 C4' C A 1 -3.853 7.410 4.672 1.00 24.41 C +ATOM 12 O4' C A 1 -4.992 7.650 5.512 1.00 22.53 O +ATOM 13 C3' C A 1 -2.713 7.010 5.605 1.00 23.56 C +ATOM 14 O3' C A 1 -1.379 7.127 5.060 1.00 21.02 O +ATOM 15 C2' C A 1 -2.950 7.949 6.756 1.00 23.73 C +ATOM 16 O2' C A 1 -2.407 9.267 6.554 1.00 23.93 O +ATOM 17 C1' C A 1 -4.489 7.917 6.825 1.00 20.60 C +ATOM 18 P DC A 2 -0.178 6.220 5.647 1.00 24.85 P +ATOM 19 N1 DC A 2 -1.070 6.635 10.823 1.00 14.48 N +ATOM 20 C2 DC A 2 -1.417 6.355 12.130 1.00 13.03 C +ATOM 21 O2 DC A 2 -1.007 7.022 13.094 1.00 11.15 O +ATOM 22 N3 DC A 2 -2.233 5.297 12.333 1.00 11.95 N +ATOM 23 C4 DC A 2 -2.681 4.542 11.344 1.00 11.37 C +ATOM 24 N4 DC A 2 -3.532 3.569 11.652 1.00 11.93 N +ATOM 25 C5 DC A 2 -2.314 4.796 9.986 1.00 11.95 C +ATOM 26 C6 DC A 2 -1.510 5.853 9.776 1.00 11.94 C +ATOM 27 OP1 DC A 2 0.915 6.451 4.671 1.00 25.96 O +ATOM 28 OP2 DC A 2 -0.948 4.954 5.664 1.00 24.57 O +ATOM 29 O5' DC A 2 0.435 6.502 7.097 1.00 24.10 O +ATOM 30 C5' DC A 2 1.020 7.793 7.281 1.00 19.66 C +ATOM 31 C4' DC A 2 1.034 8.184 8.738 1.00 17.99 C +ATOM 32 O4' DC A 2 -0.290 8.244 9.222 1.00 17.23 O +ATOM 33 C3' DC A 2 1.724 7.167 9.617 1.00 18.98 C +ATOM 34 O3' DC A 2 3.130 7.395 9.564 1.00 18.39 O +ATOM 35 C2' DC A 2 1.152 7.607 10.934 1.00 17.33 C +ATOM 36 C1' DC A 2 -0.273 7.853 10.599 1.00 15.44 C +ATOM 37 P DG A 3 4.177 6.440 10.285 1.00 21.10 P +ATOM 38 N9 DG A 3 1.615 4.437 14.168 1.00 11.63 N +ATOM 39 C8 DG A 3 1.389 4.110 12.865 1.00 10.83 C +ATOM 40 N7 DG A 3 0.474 3.204 12.690 1.00 12.03 N +ATOM 41 C5 DG A 3 0.093 2.891 13.972 1.00 9.28 C +ATOM 42 C6 DG A 3 -0.792 1.917 14.408 1.00 6.67 C +ATOM 43 O6 DG A 3 -1.528 1.253 13.693 1.00 11.90 O +ATOM 44 N1 DG A 3 -0.833 1.822 15.808 1.00 7.48 N +ATOM 45 C2 DG A 3 -0.098 2.583 16.686 1.00 7.12 C +ATOM 46 N2 DG A 3 -0.228 2.346 17.999 1.00 2.92 N +ATOM 47 N3 DG A 3 0.745 3.531 16.259 1.00 7.08 N +ATOM 48 C4 DG A 3 0.788 3.626 14.894 1.00 12.36 C +ATOM 49 OP1 DG A 3 5.469 7.004 9.830 1.00 21.52 O +ATOM 50 OP2 DG A 3 3.681 5.183 9.686 1.00 14.50 O +ATOM 51 O5' DG A 3 4.378 6.142 11.832 1.00 19.95 O +ATOM 52 C5' DG A 3 4.654 7.213 12.730 1.00 17.61 C +ATOM 53 C4' DG A 3 4.016 6.885 14.035 1.00 17.62 C +ATOM 54 O4' DG A 3 2.614 6.626 13.799 1.00 16.77 O +ATOM 55 C3' DG A 3 4.595 5.586 14.598 1.00 16.31 C +ATOM 56 O3' DG A 3 5.774 5.836 15.353 1.00 18.86 O +ATOM 57 C2' DG A 3 3.484 5.274 15.528 1.00 17.71 C +ATOM 58 C1' DG A 3 2.243 5.627 14.740 1.00 16.27 C +ATOM 59 P DG A 4 6.647 4.633 15.976 1.00 19.10 P +ATOM 60 N9 DG A 4 3.496 1.232 18.319 1.00 11.82 N +ATOM 61 C8 DG A 4 3.617 1.742 17.054 1.00 8.09 C +ATOM 62 N7 DG A 4 2.902 1.118 16.167 1.00 11.07 N +ATOM 63 C5 DG A 4 2.252 0.091 16.894 1.00 11.16 C +ATOM 64 C6 DG A 4 1.310 -0.920 16.456 1.00 9.75 C +ATOM 65 O6 DG A 4 0.888 -1.151 15.321 1.00 9.97 O +ATOM 66 N1 DG A 4 0.906 -1.749 17.502 1.00 8.27 N +ATOM 67 C2 DG A 4 1.340 -1.630 18.818 1.00 8.31 C +ATOM 68 N2 DG A 4 0.852 -2.494 19.717 1.00 6.42 N +ATOM 69 N3 DG A 4 2.218 -0.681 19.223 1.00 9.10 N +ATOM 70 C4 DG A 4 2.629 0.144 18.209 1.00 10.34 C +ATOM 71 OP1 DG A 4 7.834 5.387 16.410 1.00 21.78 O +ATOM 72 OP2 DG A 4 6.811 3.466 15.083 1.00 20.41 O +ATOM 73 O5' DG A 4 5.837 4.160 17.304 1.00 19.69 O +ATOM 74 C5' DG A 4 5.832 4.777 18.613 1.00 14.70 C +ATOM 75 C4' DG A 4 5.349 3.746 19.615 1.00 15.74 C +ATOM 76 O4' DG A 4 4.014 3.339 19.320 1.00 15.71 O +ATOM 77 C3' DG A 4 6.144 2.446 19.549 1.00 14.86 C +ATOM 78 O3' DG A 4 7.442 2.553 20.185 1.00 20.22 O +ATOM 79 C2' DG A 4 5.194 1.467 20.191 1.00 13.42 C +ATOM 80 C1' DG A 4 3.886 1.904 19.582 1.00 13.10 C +ATOM 81 P DC A 5 8.623 1.481 19.918 1.00 16.11 P +ATOM 82 N1 DC A 5 5.142 -2.576 17.527 1.00 12.08 N +ATOM 83 C2 DC A 5 4.179 -3.389 16.962 1.00 12.60 C +ATOM 84 O2 DC A 5 3.695 -4.327 17.591 1.00 10.69 O +ATOM 85 N3 DC A 5 3.792 -3.162 15.680 1.00 10.73 N +ATOM 86 C4 DC A 5 4.335 -2.176 14.967 1.00 10.86 C +ATOM 87 N4 DC A 5 3.833 -1.904 13.765 1.00 7.57 N +ATOM 88 C5 DC A 5 5.346 -1.339 15.528 1.00 12.31 C +ATOM 89 C6 DC A 5 5.709 -1.571 16.800 1.00 10.26 C +ATOM 90 OP1 DC A 5 9.474 2.225 20.879 1.00 21.84 O +ATOM 91 OP2 DC A 5 8.908 1.639 18.468 1.00 19.79 O +ATOM 92 O5' DC A 5 8.728 -0.072 20.325 1.00 19.47 O +ATOM 93 C5' DC A 5 8.554 -1.158 19.407 1.00 15.29 C +ATOM 94 C4' DC A 5 7.470 -2.178 19.802 1.00 12.49 C +ATOM 95 O4' DC A 5 6.161 -1.717 19.496 1.00 12.55 O +ATOM 96 C3' DC A 5 7.697 -3.468 19.046 1.00 11.96 C +ATOM 97 O3' DC A 5 8.775 -4.194 19.666 1.00 14.17 O +ATOM 98 C2' DC A 5 6.342 -4.056 19.192 1.00 10.58 C +ATOM 99 C1' DC A 5 5.464 -2.822 18.946 1.00 10.97 C +ATOM 100 P DG A 6 9.797 -5.058 18.800 1.00 14.87 P +ATOM 101 N9 DG A 6 5.801 -7.550 16.290 1.00 13.78 N +ATOM 102 C8 DG A 6 6.477 -6.339 16.189 1.00 11.32 C +ATOM 103 N7 DG A 6 6.114 -5.628 15.161 1.00 11.53 N +ATOM 104 C5 DG A 6 5.137 -6.431 14.528 1.00 15.14 C +ATOM 105 C6 DG A 6 4.442 -6.239 13.291 1.00 14.51 C +ATOM 106 O6 DG A 6 4.382 -5.224 12.595 1.00 15.52 O +ATOM 107 N1 DG A 6 3.678 -7.348 12.942 1.00 15.78 N +ATOM 108 C2 DG A 6 3.558 -8.503 13.679 1.00 16.04 C +ATOM 109 N2 DG A 6 2.732 -9.421 13.210 1.00 15.11 N +ATOM 110 N3 DG A 6 4.187 -8.691 14.842 1.00 14.81 N +ATOM 111 C4 DG A 6 4.959 -7.617 15.206 1.00 13.90 C +ATOM 112 OP1 DG A 6 10.851 -5.532 19.718 1.00 14.32 O +ATOM 113 OP2 DG A 6 10.144 -4.575 17.432 1.00 10.67 O +ATOM 114 O5' DG A 6 8.762 -6.277 18.626 1.00 15.18 O +ATOM 115 C5' DG A 6 8.679 -7.438 19.428 1.00 15.40 C +ATOM 116 C4' DG A 6 7.717 -8.446 18.789 1.00 15.34 C +ATOM 117 O4' DG A 6 6.431 -7.834 18.520 1.00 16.46 O +ATOM 118 C3' DG A 6 8.150 -9.052 17.449 1.00 16.54 C +ATOM 119 O3' DG A 6 9.172 -10.043 17.595 1.00 18.58 O +ATOM 120 C2' DG A 6 6.796 -9.650 17.066 1.00 17.79 C +ATOM 121 C1' DG A 6 5.804 -8.517 17.397 1.00 13.96 C +ATOM 122 P DC A 7 10.498 -10.100 16.665 1.00 17.81 P +ATOM 123 N1 DC A 7 7.217 -9.334 12.285 1.00 7.65 N +ATOM 124 C2 DC A 7 6.458 -8.793 11.230 1.00 10.22 C +ATOM 125 O2 DC A 7 5.771 -9.507 10.500 1.00 15.05 O +ATOM 126 N3 DC A 7 6.567 -7.461 10.942 1.00 6.65 N +ATOM 127 C4 DC A 7 7.403 -6.694 11.658 1.00 5.07 C +ATOM 128 N4 DC A 7 7.447 -5.391 11.420 1.00 4.65 N +ATOM 129 C5 DC A 7 8.188 -7.242 12.730 1.00 4.20 C +ATOM 130 C6 DC A 7 8.053 -8.558 13.000 1.00 6.45 C +ATOM 131 OP1 DC A 7 11.307 -11.102 17.394 1.00 17.82 O +ATOM 132 OP2 DC A 7 11.084 -8.759 16.374 1.00 20.08 O +ATOM 133 O5' DC A 7 9.986 -10.722 15.264 1.00 17.30 O +ATOM 134 C5' DC A 7 9.312 -11.986 15.170 1.00 16.36 C +ATOM 135 C4' DC A 7 8.436 -12.095 13.916 1.00 15.85 C +ATOM 136 O4' DC A 7 7.361 -11.148 13.955 1.00 16.34 O +ATOM 137 C3' DC A 7 9.165 -11.823 12.595 1.00 14.83 C +ATOM 138 O3' DC A 7 10.003 -12.907 12.161 1.00 16.25 O +ATOM 139 C2' DC A 7 7.973 -11.600 11.717 1.00 11.20 C +ATOM 140 C1' DC A 7 7.076 -10.772 12.582 1.00 10.61 C +ATOM 141 P DC A 8 11.175 -12.651 11.083 1.00 18.77 P +ATOM 142 N1 DC A 8 8.297 -9.310 7.883 1.00 6.87 N +ATOM 143 C2 DC A 8 7.867 -8.224 7.123 1.00 9.10 C +ATOM 144 O2 DC A 8 7.226 -8.387 6.080 1.00 7.86 O +ATOM 145 N3 DC A 8 8.296 -6.966 7.459 1.00 7.75 N +ATOM 146 C4 DC A 8 9.147 -6.784 8.485 1.00 9.21 C +ATOM 147 N4 DC A 8 9.589 -5.560 8.779 1.00 7.67 N +ATOM 148 C5 DC A 8 9.609 -7.891 9.258 1.00 7.40 C +ATOM 149 C6 DC A 8 9.156 -9.121 8.923 1.00 9.24 C +ATOM 150 OP1 DC A 8 11.871 -13.952 10.908 1.00 20.04 O +ATOM 151 OP2 DC A 8 12.020 -11.472 11.376 1.00 20.24 O +ATOM 152 O5' DC A 8 10.469 -12.357 9.649 1.00 18.79 O +ATOM 153 C5' DC A 8 9.733 -13.334 8.924 1.00 12.85 C +ATOM 154 C4' DC A 8 8.867 -12.647 7.941 1.00 14.40 C +ATOM 155 O4' DC A 8 8.156 -11.587 8.589 1.00 10.91 O +ATOM 156 C3' DC A 8 9.598 -11.936 6.845 1.00 14.90 C +ATOM 157 O3' DC A 8 10.249 -12.831 5.936 1.00 15.23 O +ATOM 158 C2' DC A 8 8.377 -11.232 6.304 1.00 9.34 C +ATOM 159 C1' DC A 8 7.789 -10.648 7.568 1.00 8.80 C +ATOM 160 P DG A 9 11.518 -12.329 5.128 1.00 14.64 P +ATOM 161 N9 DG A 9 9.338 -8.006 2.891 1.00 5.76 N +ATOM 162 C8 DG A 9 10.079 -8.162 4.036 1.00 7.27 C +ATOM 163 N7 DG A 9 10.578 -7.077 4.541 1.00 5.05 N +ATOM 164 C5 DG A 9 10.143 -6.100 3.664 1.00 6.30 C +ATOM 165 C6 DG A 9 10.387 -4.694 3.690 1.00 6.32 C +ATOM 166 O6 DG A 9 10.988 -4.056 4.538 1.00 8.77 O +ATOM 167 N1 DG A 9 9.805 -4.022 2.632 1.00 5.02 N +ATOM 168 C2 DG A 9 9.072 -4.651 1.658 1.00 7.22 C +ATOM 169 N2 DG A 9 8.590 -3.921 0.680 1.00 5.13 N +ATOM 170 N3 DG A 9 8.837 -5.970 1.631 1.00 8.90 N +ATOM 171 C4 DG A 9 9.395 -6.649 2.656 1.00 5.39 C +ATOM 172 OP1 DG A 9 11.889 -13.707 4.763 1.00 17.77 O +ATOM 173 OP2 DG A 9 12.558 -11.435 5.714 1.00 16.33 O +ATOM 174 O5' DG A 9 10.890 -11.645 3.793 1.00 13.73 O +ATOM 175 C5' DG A 9 10.098 -12.334 2.826 1.00 10.04 C +ATOM 176 C4' DG A 9 9.322 -11.365 2.036 1.00 8.60 C +ATOM 177 O4' DG A 9 8.636 -10.420 2.864 1.00 9.95 O +ATOM 178 C3' DG A 9 10.183 -10.481 1.201 1.00 11.49 C +ATOM 179 O3' DG A 9 10.786 -11.138 0.073 1.00 12.29 O +ATOM 180 C2' DG A 9 9.103 -9.503 0.858 1.00 7.88 C +ATOM 181 C1' DG A 9 8.570 -9.111 2.181 1.00 8.58 C +ATOM 182 P G A 10 12.244 -10.723 -0.414 1.00 18.00 P +ATOM 183 N9 G A 10 11.582 -5.303 -1.017 1.00 15.40 N +ATOM 184 C8 G A 10 12.179 -6.115 -0.061 1.00 15.00 C +ATOM 185 N7 G A 10 12.826 -5.480 0.870 1.00 12.61 N +ATOM 186 C5 G A 10 12.635 -4.148 0.522 1.00 13.15 C +ATOM 187 C6 G A 10 13.133 -2.991 1.159 1.00 11.89 C +ATOM 188 O6 G A 10 13.713 -2.965 2.241 1.00 12.64 O +ATOM 189 N1 G A 10 12.806 -1.814 0.462 1.00 9.10 N +ATOM 190 C2 G A 10 12.079 -1.777 -0.689 1.00 10.96 C +ATOM 191 N2 G A 10 11.851 -0.582 -1.197 1.00 11.87 N +ATOM 192 N3 G A 10 11.588 -2.874 -1.294 1.00 12.41 N +ATOM 193 C4 G A 10 11.899 -4.020 -0.633 1.00 13.44 C +ATOM 194 OP1 G A 10 12.221 -11.870 -1.354 1.00 19.65 O +ATOM 195 OP2 G A 10 13.525 -10.237 0.168 1.00 21.55 O +ATOM 196 O5' G A 10 11.507 -9.424 -1.092 1.00 18.23 O +ATOM 197 C5' G A 10 10.721 -9.357 -2.288 1.00 18.20 C +ATOM 198 C4' G A 10 10.589 -7.934 -2.878 1.00 17.37 C +ATOM 199 O4' G A 10 10.102 -6.968 -1.936 1.00 15.12 O +ATOM 200 C3' G A 10 11.859 -7.317 -3.471 1.00 17.88 C +ATOM 201 O3' G A 10 12.164 -7.754 -4.846 1.00 16.65 O +ATOM 202 C2' G A 10 11.470 -5.841 -3.464 1.00 16.83 C +ATOM 203 O2' G A 10 10.607 -5.618 -4.583 1.00 18.75 O +ATOM 204 C1' G A 10 10.721 -5.691 -2.168 1.00 15.79 C +TER 205 G A 10 +ATOM 206 N1 C B 11 13.988 2.735 1.589 1.00 16.99 N +ATOM 207 C2 C B 11 13.552 1.541 1.023 1.00 15.65 C +ATOM 208 O2 C B 11 12.869 1.532 0.006 1.00 14.94 O +ATOM 209 N3 C B 11 13.773 0.359 1.678 1.00 16.15 N +ATOM 210 C4 C B 11 14.386 0.347 2.865 1.00 16.53 C +ATOM 211 N4 C B 11 14.619 -0.822 3.476 1.00 18.43 N +ATOM 212 C5 C B 11 14.816 1.571 3.473 1.00 16.78 C +ATOM 213 C6 C B 11 14.597 2.724 2.804 1.00 15.01 C +ATOM 214 O5' C B 11 14.526 5.793 4.007 1.00 18.48 O +ATOM 215 C5' C B 11 14.531 6.777 2.948 1.00 17.64 C +ATOM 216 C4' C B 11 14.028 6.161 1.616 1.00 17.23 C +ATOM 217 O4' C B 11 14.808 4.991 1.256 1.00 16.55 O +ATOM 218 C3' C B 11 12.611 5.611 1.737 1.00 17.97 C +ATOM 219 O3' C B 11 11.508 6.538 1.711 1.00 18.76 O +ATOM 220 C2' C B 11 12.546 4.594 0.654 1.00 14.10 C +ATOM 221 O2' C B 11 12.366 5.290 -0.579 1.00 13.63 O +ATOM 222 C1' C B 11 13.918 3.977 0.766 1.00 14.14 C +ATOM 223 P DC B 12 10.233 6.143 2.644 1.00 21.42 P +ATOM 224 N1 DC B 12 9.527 0.825 1.326 1.00 15.29 N +ATOM 225 C2 DC B 12 9.472 -0.563 1.382 1.00 14.49 C +ATOM 226 O2 DC B 12 8.922 -1.257 0.518 1.00 17.30 O +ATOM 227 N3 DC B 12 10.055 -1.190 2.418 1.00 11.60 N +ATOM 228 C4 DC B 12 10.676 -0.500 3.383 1.00 15.58 C +ATOM 229 N4 DC B 12 11.164 -1.186 4.430 1.00 14.28 N +ATOM 230 C5 DC B 12 10.760 0.927 3.341 1.00 15.60 C +ATOM 231 C6 DC B 12 10.166 1.544 2.298 1.00 15.73 C +ATOM 232 OP1 DC B 12 9.634 7.406 2.139 1.00 21.29 O +ATOM 233 OP2 DC B 12 10.077 5.869 4.079 1.00 22.13 O +ATOM 234 O5' DC B 12 9.636 4.841 1.804 1.00 20.84 O +ATOM 235 C5' DC B 12 8.999 5.040 0.519 1.00 19.83 C +ATOM 236 C4' DC B 12 8.512 3.757 -0.108 1.00 18.55 C +ATOM 237 O4' DC B 12 9.529 2.733 -0.171 1.00 19.79 O +ATOM 238 C3' DC B 12 7.498 3.211 0.801 1.00 18.00 C +ATOM 239 O3' DC B 12 6.305 3.969 0.629 1.00 19.14 O +ATOM 240 C2' DC B 12 7.475 1.788 0.344 1.00 15.87 C +ATOM 241 C1' DC B 12 8.913 1.473 0.156 1.00 15.45 C +ATOM 242 P DG B 13 4.970 3.543 1.371 1.00 21.52 P +ATOM 243 N9 DG B 13 6.185 -2.069 3.050 1.00 9.23 N +ATOM 244 C8 DG B 13 6.745 -1.032 3.745 1.00 8.94 C +ATOM 245 N7 DG B 13 7.370 -1.389 4.833 1.00 7.30 N +ATOM 246 C5 DG B 13 7.209 -2.767 4.877 1.00 8.43 C +ATOM 247 C6 DG B 13 7.692 -3.719 5.823 1.00 9.75 C +ATOM 248 O6 DG B 13 8.258 -3.536 6.903 1.00 14.29 O +ATOM 249 N1 DG B 13 7.361 -5.014 5.443 1.00 5.73 N +ATOM 250 C2 DG B 13 6.655 -5.359 4.323 1.00 2.65 C +ATOM 251 N2 DG B 13 6.506 -6.654 4.079 1.00 2.15 N +ATOM 252 N3 DG B 13 6.190 -4.477 3.470 1.00 2.55 N +ATOM 253 C4 DG B 13 6.497 -3.198 3.793 1.00 6.08 C +ATOM 254 OP1 DG B 13 4.172 4.637 0.743 1.00 22.41 O +ATOM 255 OP2 DG B 13 5.322 3.646 2.816 1.00 21.67 O +ATOM 256 O5' DG B 13 4.263 2.118 1.102 1.00 18.28 O +ATOM 257 C5' DG B 13 3.977 1.214 2.153 1.00 12.90 C +ATOM 258 C4' DG B 13 3.997 -0.166 1.554 1.00 15.74 C +ATOM 259 O4' DG B 13 5.326 -0.638 1.288 1.00 15.41 O +ATOM 260 C3' DG B 13 3.328 -1.110 2.479 1.00 14.99 C +ATOM 261 O3' DG B 13 1.948 -0.901 2.181 1.00 18.56 O +ATOM 262 C2' DG B 13 3.943 -2.416 1.990 1.00 14.49 C +ATOM 263 C1' DG B 13 5.414 -2.020 1.777 1.00 12.61 C +ATOM 264 P DG B 14 0.784 -1.093 3.255 1.00 15.78 P +ATOM 265 N9 DG B 14 3.152 -5.336 5.518 1.00 6.83 N +ATOM 266 C8 DG B 14 3.420 -4.010 5.692 1.00 4.36 C +ATOM 267 N7 DG B 14 4.172 -3.751 6.719 1.00 5.76 N +ATOM 268 C5 DG B 14 4.412 -5.012 7.281 1.00 8.36 C +ATOM 269 C6 DG B 14 5.175 -5.383 8.425 1.00 10.81 C +ATOM 270 O6 DG B 14 5.939 -4.687 9.102 1.00 10.46 O +ATOM 271 N1 DG B 14 5.100 -6.738 8.655 1.00 7.70 N +ATOM 272 C2 DG B 14 4.415 -7.650 7.890 1.00 6.88 C +ATOM 273 N2 DG B 14 4.444 -8.925 8.254 1.00 4.21 N +ATOM 274 N3 DG B 14 3.730 -7.316 6.805 1.00 7.97 N +ATOM 275 C4 DG B 14 3.774 -5.982 6.566 1.00 7.79 C +ATOM 276 OP1 DG B 14 -0.388 -0.771 2.418 1.00 12.44 O +ATOM 277 OP2 DG B 14 0.951 -0.425 4.562 1.00 16.99 O +ATOM 278 O5' DG B 14 0.825 -2.666 3.590 1.00 12.34 O +ATOM 279 C5' DG B 14 0.518 -3.657 2.618 1.00 15.26 C +ATOM 280 C4' DG B 14 0.962 -5.042 3.026 1.00 11.81 C +ATOM 281 O4' DG B 14 2.388 -5.092 3.261 1.00 14.56 O +ATOM 282 C3' DG B 14 0.298 -5.494 4.281 1.00 10.90 C +ATOM 283 O3' DG B 14 -1.014 -5.933 3.977 1.00 16.35 O +ATOM 284 C2' DG B 14 1.223 -6.607 4.600 1.00 8.75 C +ATOM 285 C1' DG B 14 2.583 -6.029 4.341 1.00 8.31 C +ATOM 286 P DC B 15 -2.108 -5.846 5.127 1.00 18.17 P +ATOM 287 N1 DC B 15 0.594 -8.193 8.784 1.00 10.36 N +ATOM 288 C2 DC B 15 1.420 -8.271 9.913 1.00 13.07 C +ATOM 289 O2 DC B 15 1.626 -9.323 10.519 1.00 11.62 O +ATOM 290 N3 DC B 15 1.985 -7.143 10.391 1.00 9.60 N +ATOM 291 C4 DC B 15 1.755 -5.962 9.810 1.00 9.75 C +ATOM 292 N4 DC B 15 2.507 -4.945 10.242 1.00 10.36 N +ATOM 293 C5 DC B 15 0.883 -5.835 8.681 1.00 8.80 C +ATOM 294 C6 DC B 15 0.336 -6.973 8.201 1.00 11.04 C +ATOM 295 OP1 DC B 15 -3.198 -6.237 4.195 1.00 23.53 O +ATOM 296 OP2 DC B 15 -2.242 -4.630 5.951 1.00 23.09 O +ATOM 297 O5' DC B 15 -1.783 -7.100 6.053 1.00 20.88 O +ATOM 298 C5' DC B 15 -2.023 -8.439 5.585 1.00 16.99 C +ATOM 299 C4' DC B 15 -1.560 -9.527 6.542 1.00 16.47 C +ATOM 300 O4' DC B 15 -0.145 -9.414 6.793 1.00 14.34 O +ATOM 301 C3' DC B 15 -2.235 -9.419 7.903 1.00 17.63 C +ATOM 302 O3' DC B 15 -3.580 -9.983 8.004 1.00 16.81 O +ATOM 303 C2' DC B 15 -1.174 -10.022 8.803 1.00 12.88 C +ATOM 304 C1' DC B 15 0.116 -9.496 8.210 1.00 14.19 C +ATOM 305 P DG B 16 -4.447 -9.204 9.118 1.00 23.27 P +ATOM 306 N9 DG B 16 -0.792 -7.342 13.150 1.00 14.23 N +ATOM 307 C8 DG B 16 -1.064 -6.617 12.000 1.00 13.86 C +ATOM 308 N7 DG B 16 -0.426 -5.487 11.941 1.00 10.67 N +ATOM 309 C5 DG B 16 0.313 -5.477 13.124 1.00 13.65 C +ATOM 310 C6 DG B 16 1.184 -4.501 13.652 1.00 10.61 C +ATOM 311 O6 DG B 16 1.552 -3.475 13.129 1.00 10.52 O +ATOM 312 N1 DG B 16 1.683 -4.846 14.894 1.00 14.28 N +ATOM 313 C2 DG B 16 1.388 -6.009 15.567 1.00 12.13 C +ATOM 314 N2 DG B 16 1.910 -6.217 16.766 1.00 10.28 N +ATOM 315 N3 DG B 16 0.578 -6.929 15.063 1.00 15.53 N +ATOM 316 C4 DG B 16 0.082 -6.603 13.853 1.00 12.03 C +ATOM 317 OP1 DG B 16 -5.486 -10.240 8.913 1.00 22.76 O +ATOM 318 OP2 DG B 16 -4.614 -7.887 8.455 1.00 24.12 O +ATOM 319 O5' DG B 16 -4.232 -8.798 10.672 1.00 18.16 O +ATOM 320 C5' DG B 16 -4.091 -9.850 11.581 1.00 18.35 C +ATOM 321 C4' DG B 16 -3.224 -9.555 12.771 1.00 17.50 C +ATOM 322 O4' DG B 16 -1.873 -9.267 12.423 1.00 15.59 O +ATOM 323 C3' DG B 16 -3.673 -8.498 13.727 1.00 17.67 C +ATOM 324 O3' DG B 16 -4.857 -8.945 14.432 1.00 23.53 O +ATOM 325 C2' DG B 16 -2.423 -8.573 14.568 1.00 16.53 C +ATOM 326 C1' DG B 16 -1.278 -8.659 13.568 1.00 15.43 C +ATOM 327 P DC B 17 -6.006 -7.956 15.048 1.00 19.94 P +ATOM 328 N1 DC B 17 -2.194 -5.587 17.570 1.00 12.74 N +ATOM 329 C2 DC B 17 -1.248 -4.622 17.829 1.00 13.09 C +ATOM 330 O2 DC B 17 -0.698 -4.517 18.933 1.00 12.24 O +ATOM 331 N3 DC B 17 -0.984 -3.712 16.852 1.00 14.35 N +ATOM 332 C4 DC B 17 -1.639 -3.762 15.686 1.00 13.79 C +ATOM 333 N4 DC B 17 -1.297 -2.921 14.711 1.00 16.68 N +ATOM 334 C5 DC B 17 -2.631 -4.748 15.430 1.00 11.59 C +ATOM 335 C6 DC B 17 -2.858 -5.633 16.400 1.00 8.53 C +ATOM 336 OP1 DC B 17 -6.749 -9.243 15.142 1.00 18.85 O +ATOM 337 OP2 DC B 17 -6.441 -6.892 14.132 1.00 21.49 O +ATOM 338 O5' DC B 17 -5.598 -7.385 16.536 1.00 17.70 O +ATOM 339 C5' DC B 17 -5.483 -8.267 17.659 1.00 17.29 C +ATOM 340 C4' DC B 17 -4.462 -7.850 18.701 1.00 19.19 C +ATOM 341 O4' DC B 17 -3.142 -7.783 18.121 1.00 20.08 O +ATOM 342 C3' DC B 17 -4.754 -6.460 19.204 1.00 21.26 C +ATOM 343 O3' DC B 17 -5.866 -6.375 20.121 1.00 23.03 O +ATOM 344 C2' DC B 17 -3.399 -6.104 19.736 1.00 18.88 C +ATOM 345 C1' DC B 17 -2.472 -6.604 18.629 1.00 18.39 C +ATOM 346 P DC B 18 -7.007 -5.260 19.781 1.00 28.77 P +ATOM 347 N1 DC B 18 -3.297 -1.380 18.786 1.00 18.17 N +ATOM 348 C2 DC B 18 -2.446 -0.458 18.171 1.00 16.98 C +ATOM 349 O2 DC B 18 -1.573 0.166 18.774 1.00 20.32 O +ATOM 350 N3 DC B 18 -2.583 -0.258 16.848 1.00 16.82 N +ATOM 351 C4 DC B 18 -3.505 -0.931 16.149 1.00 15.76 C +ATOM 352 N4 DC B 18 -3.636 -0.665 14.860 1.00 13.34 N +ATOM 353 C5 DC B 18 -4.372 -1.893 16.748 1.00 12.67 C +ATOM 354 C6 DC B 18 -4.237 -2.080 18.066 1.00 14.81 C +ATOM 355 OP1 DC B 18 -8.010 -5.697 20.796 1.00 27.91 O +ATOM 356 OP2 DC B 18 -7.417 -4.926 18.375 1.00 24.48 O +ATOM 357 O5' DC B 18 -6.346 -3.878 20.355 1.00 26.69 O +ATOM 358 C5' DC B 18 -5.876 -3.663 21.675 1.00 22.45 C +ATOM 359 C4' DC B 18 -4.868 -2.527 21.660 1.00 20.14 C +ATOM 360 O4' DC B 18 -3.898 -2.791 20.621 1.00 17.95 O +ATOM 361 C3' DC B 18 -5.383 -1.139 21.350 1.00 20.46 C +ATOM 362 O3' DC B 18 -6.122 -0.495 22.422 1.00 22.52 O +ATOM 363 C2' DC B 18 -4.069 -0.456 20.977 1.00 18.70 C +ATOM 364 C1' DC B 18 -3.245 -1.549 20.252 1.00 18.68 C +ATOM 365 P DG B 19 -7.015 0.794 21.992 1.00 18.68 P +ATOM 366 N9 DG B 19 -3.670 3.314 18.697 1.00 8.91 N +ATOM 367 C8 DG B 19 -4.569 2.317 18.417 1.00 7.23 C +ATOM 368 N7 DG B 19 -4.814 2.192 17.179 1.00 8.80 N +ATOM 369 C5 DG B 19 -4.038 3.182 16.585 1.00 8.99 C +ATOM 370 C6 DG B 19 -3.831 3.450 15.217 1.00 9.86 C +ATOM 371 O6 DG B 19 -4.361 2.871 14.270 1.00 14.98 O +ATOM 372 N1 DG B 19 -2.868 4.446 14.998 1.00 8.65 N +ATOM 373 C2 DG B 19 -2.192 5.116 15.998 1.00 8.58 C +ATOM 374 N2 DG B 19 -1.417 6.149 15.640 1.00 8.82 N +ATOM 375 N3 DG B 19 -2.387 4.836 17.299 1.00 9.44 N +ATOM 376 C4 DG B 19 -3.324 3.871 17.515 1.00 8.64 C +ATOM 377 OP1 DG B 19 -7.592 0.740 23.355 1.00 20.58 O +ATOM 378 OP2 DG B 19 -7.881 0.644 20.808 1.00 18.98 O +ATOM 379 O5' DG B 19 -6.137 2.085 21.765 1.00 14.67 O +ATOM 380 C5' DG B 19 -5.282 2.635 22.743 1.00 14.92 C +ATOM 381 C4' DG B 19 -4.265 3.471 22.044 1.00 11.67 C +ATOM 382 O4' DG B 19 -3.668 2.725 20.993 1.00 13.34 O +ATOM 383 C3' DG B 19 -4.831 4.632 21.315 1.00 12.46 C +ATOM 384 O3' DG B 19 -5.233 5.692 22.194 1.00 12.97 O +ATOM 385 C2' DG B 19 -3.646 4.994 20.460 1.00 10.60 C +ATOM 386 C1' DG B 19 -3.149 3.663 20.010 1.00 11.00 C +ATOM 387 P G B 20 -6.156 6.845 21.578 1.00 16.17 P +ATOM 388 N9 G B 20 -4.621 7.966 16.781 1.00 8.70 N +ATOM 389 C8 G B 20 -5.409 6.982 17.305 1.00 8.15 C +ATOM 390 N7 G B 20 -5.951 6.226 16.408 1.00 9.88 N +ATOM 391 C5 G B 20 -5.496 6.753 15.190 1.00 10.42 C +ATOM 392 C6 G B 20 -5.780 6.342 13.855 1.00 11.50 C +ATOM 393 O6 G B 20 -6.476 5.399 13.485 1.00 13.46 O +ATOM 394 N1 G B 20 -5.138 7.125 12.924 1.00 8.26 N +ATOM 395 C2 G B 20 -4.310 8.187 13.214 1.00 7.88 C +ATOM 396 N2 G B 20 -3.735 8.801 12.170 1.00 6.62 N +ATOM 397 N3 G B 20 -4.043 8.594 14.477 1.00 8.59 N +ATOM 398 C4 G B 20 -4.676 7.821 15.410 1.00 7.98 C +ATOM 399 OP1 G B 20 -6.346 7.569 22.839 1.00 11.59 O +ATOM 400 OP2 G B 20 -7.348 6.334 20.882 1.00 19.70 O +ATOM 401 O5' G B 20 -5.304 7.716 20.550 1.00 15.64 O +ATOM 402 C5' G B 20 -4.166 8.497 20.960 1.00 13.60 C +ATOM 403 C4' G B 20 -3.731 9.295 19.780 1.00 11.64 C +ATOM 404 O4' G B 20 -3.346 8.405 18.762 1.00 12.78 O +ATOM 405 C3' G B 20 -4.937 10.017 19.154 1.00 9.26 C +ATOM 406 O3' G B 20 -5.162 11.232 19.849 1.00 8.82 O +ATOM 407 C2' G B 20 -4.515 10.231 17.738 1.00 10.28 C +ATOM 408 O2' G B 20 -3.496 11.210 17.640 1.00 14.06 O +ATOM 409 C1' G B 20 -3.782 8.924 17.491 1.00 11.06 C +TER 410 G B 20 +HETATM 411 N1 SPM 21 10.683 -8.783 22.839 1.00 40.13 N +HETATM 412 C2 SPM 21 11.531 -7.621 23.379 1.00 38.06 C +HETATM 413 C3 SPM 21 10.826 -6.312 23.033 1.00 36.69 C +HETATM 414 C4 SPM 21 11.754 -5.116 22.994 1.00 35.02 C +HETATM 415 N5 SPM 21 10.958 -3.909 22.549 1.00 32.86 N +HETATM 416 C6 SPM 21 12.018 -2.878 22.231 1.00 32.94 C +HETATM 417 C7 SPM 21 11.419 -1.515 22.220 1.00 31.05 C +HETATM 418 C8 SPM 21 12.460 -0.586 21.671 1.00 30.79 C +HETATM 419 C9 SPM 21 12.057 0.847 21.888 1.00 28.48 C +HETATM 420 N10 SPM 21 13.064 1.749 21.221 1.00 28.45 N +HETATM 421 C11 SPM 21 13.493 2.749 22.270 1.00 30.71 C +HETATM 422 C12 SPM 21 14.237 3.946 21.699 1.00 31.37 C +HETATM 423 C13 SPM 21 14.691 4.712 22.920 1.00 32.44 C +HETATM 424 N14 SPM 21 14.460 6.175 22.642 1.00 34.72 N +HETATM 425 O HOH 22 -2.974 -2.437 11.925 1.00 16.09 O +HETATM 426 O HOH 23 4.908 -5.520 0.996 1.00 18.38 O +HETATM 427 O HOH 24 -7.781 4.610 18.814 1.00 18.46 O +HETATM 428 O HOH 25 -0.410 11.047 5.984 1.00 21.92 O +HETATM 429 O HOH 26 -8.768 2.303 25.439 1.00 63.34 O +HETATM 430 O HOH 27 2.982 -6.730 19.716 1.00 59.88 O +HETATM 431 O HOH 28 14.965 -12.628 -1.536 1.00 20.30 O +HETATM 432 O HOH 29 11.946 -14.326 0.320 1.00 19.82 O +HETATM 433 O HOH 30 10.067 -5.986 15.026 1.00 53.92 O +HETATM 434 O HOH 31 12.687 -7.091 6.513 1.00 22.27 O +HETATM 435 O HOH 32 12.609 -9.474 8.227 1.00 37.71 O +HETATM 436 O HOH 33 -2.941 -7.858 2.063 1.00 27.19 O +HETATM 437 O HOH 34 7.529 -3.577 14.088 1.00 21.79 O +HETATM 438 O HOH 35 1.254 -0.882 12.378 1.00 24.27 O +HETATM 439 O HOH 36 3.423 0.963 13.195 1.00 29.99 O +HETATM 440 O HOH 37 7.112 -6.175 -0.485 1.00 27.77 O +HETATM 441 O HOH 38 -0.686 -3.219 10.199 1.00 34.51 O +HETATM 442 O HOH 39 9.580 7.535 14.458 1.00 36.42 O +HETATM 443 O HOH 40 13.715 -4.726 5.032 1.00 69.56 O +HETATM 444 O HOH 41 5.720 -2.345 11.434 1.00 31.09 O +HETATM 445 O HOH 42 3.591 6.788 4.471 1.00 54.80 O +HETATM 446 O HOH 43 10.402 4.780 14.504 1.00 68.31 O +HETATM 447 O HOH 44 14.574 -10.275 18.466 1.00 49.77 O +HETATM 448 O HOH 45 9.740 9.480 0.051 1.00 32.13 O +HETATM 449 O HOH 46 0.657 2.761 2.939 1.00 32.50 O +HETATM 450 O HOH 47 -4.337 -5.705 11.632 1.00 61.29 O +HETATM 451 O HOH 48 8.511 0.032 6.773 1.00 19.39 O +HETATM 452 O HOH 49 4.696 -1.081 7.336 1.00 33.58 O +HETATM 453 O HOH 50 15.251 -12.102 2.108 1.00 32.25 O +HETATM 454 O HOH 51 -6.031 -4.587 15.810 1.00 44.75 O +HETATM 455 O HOH 52 3.985 7.860 0.750 1.00 43.33 O +HETATM 456 O HOH 53 -9.947 -8.411 16.066 1.00 42.79 O +HETATM 457 O HOH 54 14.022 -9.173 2.574 1.00 61.84 O +HETATM 458 O HOH 55 8.927 4.925 21.552 1.00 21.30 O +HETATM 459 O HOH 56 12.080 -9.656 20.565 1.00 39.11 O +HETATM 460 O HOH 57 10.264 3.453 5.213 1.00 32.36 O +HETATM 461 O HOH 58 7.585 8.903 10.458 1.00 55.81 O +HETATM 462 O HOH 59 -6.958 -12.129 15.577 1.00 25.61 O +HETATM 463 O HOH 60 7.487 1.041 16.040 1.00 46.35 O +HETATM 464 O HOH 61 -0.194 -3.247 7.396 1.00 35.93 O +HETATM 465 O HOH 62 8.225 6.727 12.206 1.00 60.91 O +HETATM 466 O HOH 63 -7.060 4.463 4.604 1.00 46.27 O +HETATM 467 O HOH 64 7.946 3.533 12.709 1.00 28.03 O +HETATM 468 O HOH 65 6.779 -1.926 8.904 1.00 41.06 O +HETATM 469 O HOH 66 -4.616 1.948 8.938 1.00 36.90 O +HETATM 470 O HOH 67 2.587 3.984 4.922 1.00 71.03 O +HETATM 471 O HOH 68 -2.870 3.373 6.568 1.00 35.34 O +HETATM 472 O HOH 69 -2.641 -4.676 8.852 1.00 65.95 O +HETATM 473 O HOH 70 7.896 2.158 5.060 1.00 37.59 O +HETATM 474 O HOH 71 -10.031 -4.027 18.622 1.00 67.65 O +HETATM 475 O HOH 72 -8.176 -1.645 24.639 1.00 49.61 O +HETATM 476 O HOH 73 17.116 0.579 15.466 1.00 47.99 O +HETATM 477 O HOH 74 -2.555 0.759 5.884 1.00 40.81 O +HETATM 478 O HOH 75 5.250 1.995 7.543 1.00 70.98 O +HETATM 479 O HOH 76 -10.113 -6.723 18.202 1.00 59.20 O +HETATM 480 O HOH 77 1.829 -2.266 9.724 1.00 75.20 O +HETATM 481 O HOH 78 -8.873 -3.504 22.680 1.00 79.41 O +HETATM 482 O HOH 79 -9.310 -1.446 19.391 1.00 71.79 O +HETATM 483 O HOH 80 -6.613 0.677 10.598 1.00 80.35 O +HETATM 484 O HOH 81 -7.134 2.452 7.202 1.00 72.90 O +HETATM 485 O HOH 82 13.359 4.222 15.085 1.00 55.82 O +HETATM 486 O HOH 83 -1.981 3.230 3.724 1.00 91.06 O +HETATM 487 O HOH 84 8.014 -16.765 6.352 1.00 97.71 O +HETATM 488 O HOH 85 13.277 -1.574 6.340 1.00 80.86 O +HETATM 489 O HOH 86 4.216 1.820 10.481 1.00 76.69 O +HETATM 490 O HOH 87 10.662 -11.389 23.778 1.00 49.18 O +HETATM 491 O HOH 88 -2.029 -10.316 17.858 1.00 83.02 O +CONECT 411 412 +CONECT 412 411 413 +CONECT 413 412 414 +CONECT 414 413 415 +CONECT 415 414 416 +CONECT 416 415 417 +CONECT 417 416 418 +CONECT 418 417 419 +CONECT 419 418 420 +CONECT 420 419 421 +CONECT 421 420 422 +CONECT 422 421 423 +CONECT 423 422 424 +CONECT 424 423 +MASTER 0 0 0 0 0 0 0 6 489 2 14 2 +END diff --git a/graphics/asymptote/examples/1overx.asy b/graphics/asymptote/examples/1overx.asy index 5d9775d44d..9bbbf282ac 100644 --- a/graphics/asymptote/examples/1overx.asy +++ b/graphics/asymptote/examples/1overx.asy @@ -8,7 +8,7 @@ bool3 branch(real x) static int lastsign=0; if(x == 0) return false; int sign=sgn(x); - bool b=lastsign == 0 || sign == lastsign; + bool b=lastsign == 0 || sign == lastsign; lastsign=sign; return b ? true : default; } diff --git a/graphics/asymptote/examples/BezierPatch.asy b/graphics/asymptote/examples/BezierPatch.asy index 4e3e55cb40..1091ae2250 100644 --- a/graphics/asymptote/examples/BezierPatch.asy +++ b/graphics/asymptote/examples/BezierPatch.asy @@ -5,9 +5,9 @@ currentlight=Headlamp; surface s=surface(patch(new triple[][] { {(0,0,0),(1,0,0),(1,0,0),(2,0,0)}, - {(0,1,0),(1,0,1),(1,0,1),(2,1,0)}, - {(0,1,0),(1,0,-1),(1,0,-1),(2,1,0)}, - {(0,2,0),(1,2,0),(1,2,0),(2,2,0)}})); + {(0,1,0),(1,0,1),(1,0,1),(2,1,0)}, + {(0,1,0),(1,0,-1),(1,0,-1),(2,1,0)}, + {(0,2,0),(1,2,0),(1,2,0),(2,2,0)}})); draw(s,yellow); draw(s.s[0].vequals(0.5),squarecap+2bp+blue,currentlight); diff --git a/graphics/asymptote/examples/BezierSurface.asy b/graphics/asymptote/examples/BezierSurface.asy index 62c01a5571..1055fbb151 100644 --- a/graphics/asymptote/examples/BezierSurface.asy +++ b/graphics/asymptote/examples/BezierSurface.asy @@ -10,29 +10,33 @@ ROLL=17.39344555165265 // viewpoint=getstring("viewpoint",viewpoint); currentprojection=perspective(viewpoint); -triple[][][] P={ +triple[][][] P= { + { {(-1.6,0,1.875),(-2.3,0,1.875),(-2.7,0,1.875),(-2.7,0,1.65),}, {(-1.6,-0.3,1.875),(-2.3,-0.3,1.875),(-2.7,-0.3,1.875),(-2.7,-0.3,1.65),}, {(-1.5,-0.3,2.1),(-2.5,-0.3,2.1),(-3,-0.3,2.1),(-3,-0.3,1.65),}, {(-1.5,0,2.1),(-2.5,0,2.1),(-3,0,2.1),(-3,0,1.65),} - },{ + }, + { {(-2.7,0,1.65),(-2.7,0,1.425),(-2.5,0,0.975),(-2,0,0.75),}, {(-2.7,-0.3,1.65),(-2.7,-0.3,1.425),(-2.5,-0.3,0.975),(-2,-0.3,0.75),}, {(-3,-0.3,1.65),(-3,-0.3,1.2),(-2.65,-0.3,0.7275),(-1.9,-0.3,0.45),}, {(-3,0,1.65),(-3,0,1.2),(-2.65,0,0.7275),(-1.9,0,0.45),} - },{ + }, + { {(-2.7,0,1.65),(-2.7,0,1.875),(-2.3,0,1.875),(-1.6,0,1.875),}, {(-2.7,0.3,1.65),(-2.7,0.3,1.875),(-2.3,0.3,1.875),(-1.6,0.3,1.875),}, {(-3,0.3,1.65),(-3,0.3,2.1),(-2.5,0.3,2.1),(-1.5,0.3,2.1),}, {(-3,0,1.65),(-3,0,2.1),(-2.5,0,2.1),(-1.5,0,2.1),} - },{ + }, + { {(-2,0,0.75),(-2.5,0,0.975),(-2.7,0,1.425),(-2.7,0,1.65),}, {(-2,0.3,0.75),(-2.5,0.3,0.975),(-2.7,0.3,1.425),(-2.7,0.3,1.65),}, {(-1.9,0.3,0.45),(-2.65,0.3,0.7275),(-3,0.3,1.2),(-3,0.3,1.65),}, {(-1.9,0,0.45),(-2.65,0,0.7275),(-3,0,1.2),(-3,0,1.65),} - } -}; + } + }; picture pic; size(pic,15cm); diff --git a/graphics/asymptote/examples/Klein.asy b/graphics/asymptote/examples/Klein.asy index a5e7418fe6..ae46b1b2a1 100644 --- a/graphics/asymptote/examples/Klein.asy +++ b/graphics/asymptote/examples/Klein.asy @@ -2,12 +2,11 @@ import graph3; size(469pt); -currentprojection=perspective( -camera=(25.0851928432063,-30.3337528952473,19.3728775115443), -up=Z, -target=(-0.590622314050054,0.692357205025578,-0.627122488455679), -zoom=1, -autoadjust=false); +currentprojection= + perspective(camera=(25.0851928432063,-30.3337528952473,19.3728775115443), + up=Z, + target=(-0.590622314050054,0.692357205025578,-0.627122488455679), + zoom=1,autoadjust=false); triple f(pair t) { real u=t.x; diff --git a/graphics/asymptote/examples/NURBScurve.asy b/graphics/asymptote/examples/NURBScurve.asy index c4da5c2ff5..9ad121ecc6 100644 --- a/graphics/asymptote/examples/NURBScurve.asy +++ b/graphics/asymptote/examples/NURBScurve.asy @@ -8,13 +8,14 @@ currentprojection=perspective(50,80,50); // udegree=3, nu=6; real[] knot={0,0,0,0,0.4,0.6,1,1,1,1}; -triple[] P={ - (-31.2061,12.001,6.45082), - (-31.3952,14.7353,6.53707), - (-31.5909,21.277,6.70051), - (-31.4284,25.4933,6.76745), - (-31.5413,30.3485,6.68777), - (-31.4896,32.2839,6.58385) +triple[] P= + { + (-31.2061,12.001,6.45082), + (-31.3952,14.7353,6.53707), + (-31.5909,21.277,6.70051), + (-31.4284,25.4933,6.76745), + (-31.5413,30.3485,6.68777), + (-31.4896,32.2839,6.58385) }; draw(P,knot,green); diff --git a/graphics/asymptote/examples/NURBSsphere.asy b/graphics/asymptote/examples/NURBSsphere.asy index 5258c9986d..484e8c4cd1 100644 --- a/graphics/asymptote/examples/NURBSsphere.asy +++ b/graphics/asymptote/examples/NURBSsphere.asy @@ -1,16 +1,16 @@ import three; /* Reference: -@article{Qin97, - title={{Representing quadric surfaces using NURBS surfaces}}, - author={Qin, K.}, - journal={Journal of Computer Science and Technology}, - volume={12}, - number={3}, - pages={210--216}, - year={1997}, - publisher={Springer} -} + @article{Qin97, + title={{Representing quadric surfaces using NURBS surfaces}}, + author={Qin, K.}, + journal={Journal of Computer Science and Technology}, + volume={12}, + number={3}, + pages={210--216}, + year={1997}, + publisher={Springer} + } */ size(10cm); @@ -31,8 +31,8 @@ P.cyclic=true; real[][] weights=new real[3][4]; for(int i=0; i < 3; ++i) -for(int j=0; j < 4; ++j) - weights[i][j]=W[i]*w[j]; + for(int j=0; j < 4; ++j) + weights[i][j]=W[i]*w[j]; real[] uknot={0,0,1/3,1/2,1,1}; real[] vknot={0,0,0,0,1,1,1,1}; @@ -40,7 +40,7 @@ real[] vknot={0,0,0,0,1,1,1,1}; int N=1; for(int k=0; k < N; ++k) -for(int i=0; i < 4; ++i) - draw(shift(k*Z)*P[i:i+3],uknot,vknot,weights,blue); + for(int i=0; i < 4; ++i) + draw(shift(k*Z)*P[i:i+3],uknot,vknot,weights,blue); // draw(unitsphere,red+opacity(0.1)); diff --git a/graphics/asymptote/examples/NURBSsurface.asy b/graphics/asymptote/examples/NURBSsurface.asy index 32df6ff98e..4bfafefbc3 100644 --- a/graphics/asymptote/examples/NURBSsurface.asy +++ b/graphics/asymptote/examples/NURBSsurface.asy @@ -9,43 +9,49 @@ currentprojection=perspective(50,80,50); real[] uknot={0,0,0,0,0.5,1,1,1,1}; real[] vknot={0,0,0,0,0.4,0.6,1,1,1,1}; -triple[][] P={{ - (-31.2061,12.001,6.45082), - (-31.3952,14.7353,6.53707), - (-31.5909,21.277,6.70051), - (-31.4284,25.4933,6.76745), - (-31.5413,30.3485,6.68777), - (-31.4896,32.2839,6.58385) - },{ - (-28.279,12.001,7.89625), - (-28.4187,14.7353,8.00954), - (-28.5633,21.277,8.22422), - (-28.4433,25.4933,8.31214), - (-28.5266,30.3485,8.20749), - (-28.4885,32.2839,8.07099) - },{ - (-20,12.001,10.0379), - (-20,14.7353,10.2001), - (-20,21.277,10.5076), - (-20,25.4933,10.6335), - (-20,30.3485,10.4836), - (-20,32.2839,10.2881) - },{ - (-11.721,12.001,7.84024), - (-11.5813,14.7353,7.95269), - (-11.4367,21.277,8.16575), - (-11.5567,25.4933,8.25302), - (-11.4734,30.3485,8.14915), - (-11.5115,32.2839,8.01367) - },{ - (-8.79391,12.001,6.39481), - (-8.60483,14.7353,6.48022), - (-8.40905,21.277,6.64204), - (-8.57158,25.4933,6.70832), - (-8.45874,30.3485,6.62943), - (-8.51041,32.2839,6.52653) - } -}; +triple[][] P= + { + { + (-31.2061,12.001,6.45082), + (-31.3952,14.7353,6.53707), + (-31.5909,21.277,6.70051), + (-31.4284,25.4933,6.76745), + (-31.5413,30.3485,6.68777), + (-31.4896,32.2839,6.58385) + }, + { + (-28.279,12.001,7.89625), + (-28.4187,14.7353,8.00954), + (-28.5633,21.277,8.22422), + (-28.4433,25.4933,8.31214), + (-28.5266,30.3485,8.20749), + (-28.4885,32.2839,8.07099) + }, + { + (-20,12.001,10.0379), + (-20,14.7353,10.2001), + (-20,21.277,10.5076), + (-20,25.4933,10.6335), + (-20,30.3485,10.4836), + (-20,32.2839,10.2881) + }, + { + (-11.721,12.001,7.84024), + (-11.5813,14.7353,7.95269), + (-11.4367,21.277,8.16575), + (-11.5567,25.4933,8.25302), + (-11.4734,30.3485,8.14915), + (-11.5115,32.2839,8.01367) + }, + { + (-8.79391,12.001,6.39481), + (-8.60483,14.7353,6.48022), + (-8.40905,21.277,6.64204), + (-8.57158,25.4933,6.70832), + (-8.45874,30.3485,6.62943), + (-8.51041,32.2839,6.52653) + } + }; draw(P,uknot,vknot,new pen[] {red,green,blue,magenta}); diff --git a/graphics/asymptote/examples/RiemannSphere.asy b/graphics/asymptote/examples/RiemannSphere.asy index ec1ab7586a..40f9d065a3 100644 --- a/graphics/asymptote/examples/RiemannSphere.asy +++ b/graphics/asymptote/examples/RiemannSphere.asy @@ -33,9 +33,9 @@ draw(p,1bp+heavyred); draw(q,1bp+heavyblue); triple - A=(0,0,1), - B=(u(40),v(40),w(40)), - C=(x(40),y(40),z(40)); +A=(0,0,1), +B=(u(40),v(40),w(40)), +C=(x(40),y(40),z(40)); path3 L=A--C; draw(L,1bp+black); diff --git a/graphics/asymptote/examples/RiemannSurface.asy b/graphics/asymptote/examples/RiemannSurface.asy index a1f1b66508..92f94bdc72 100644 --- a/graphics/asymptote/examples/RiemannSurface.asy +++ b/graphics/asymptote/examples/RiemannSurface.asy @@ -1,13 +1,13 @@ import graph3; import palette; - + size(200,300,keepAspect=false); //settings.nothin=true; - + currentprojection=orthographic(10,10,30); currentlight=(10,10,5); triple f(pair t) {return (exp(t.x)*cos(t.y),exp(t.x)*sin(t.y),t.y);} - + surface s=surface(f,(-4,-2pi),(0,4pi),8,16,Spline); s.colors(palette(s.map(zpart),Rainbow())); draw(s,render(merge=true)); diff --git a/graphics/asymptote/examples/RiemannSurfaceRoot.asy b/graphics/asymptote/examples/RiemannSurfaceRoot.asy index 8cb3af2cfa..65098ac935 100644 --- a/graphics/asymptote/examples/RiemannSurfaceRoot.asy +++ b/graphics/asymptote/examples/RiemannSurfaceRoot.asy @@ -5,11 +5,11 @@ import palette; int n=3; size(200,300,keepAspect=false); - + currentprojection=orthographic(10,10,30); currentlight=(10,10,5); triple f(pair t) {return (t.x*cos(t.y),t.x*sin(t.y),t.x^(1/n)*sin(t.y/n));} - + surface s=surface(f,(0,0),(1,2pi*n),8,16,Spline); s.colors(palette(s.map(zpart),Rainbow())); diff --git a/graphics/asymptote/examples/SierpinskiGasket.asy b/graphics/asymptote/examples/SierpinskiGasket.asy index 2e0d4facd6..5936000fd3 100644 --- a/graphics/asymptote/examples/SierpinskiGasket.asy +++ b/graphics/asymptote/examples/SierpinskiGasket.asy @@ -2,15 +2,15 @@ size(200); import palette; import three; currentprojection=perspective(8,2,1); - + triple[] M={(0,0,1),1/3*(sqrt(8),0,-1), 1/3*((sqrt(8))*Cos(120),(sqrt(8))*Sin(120),-1), 1/3*((sqrt(8))*Cos(240),(sqrt(8))*Sin(240),-1)}; - + int level=5; - + surface s; - + void recur(triple p, real u, int l) { if(l < level) for(triple V : M) @@ -23,9 +23,9 @@ void recur(triple p, real u, int l) { s.append(surface((p+u*(V+M[3]))--(p+u*(V+M[2]))--(p+u*(V+M[1]))--cycle)); } } - + recur(O,0.5,1); - + s.colors(palette(s.map(zpart),Rainbow())); - + draw(s,render(merge=true)); diff --git a/graphics/asymptote/examples/SierpinskiSponge.asy b/graphics/asymptote/examples/SierpinskiSponge.asy index deaf7c1dec..f26db20ff6 100644 --- a/graphics/asymptote/examples/SierpinskiSponge.asy +++ b/graphics/asymptote/examples/SierpinskiSponge.asy @@ -4,36 +4,40 @@ import three; currentprojection=orthographic(1,1,1); -triple[] M={ - (-1,-1,-1),(0,-1,-1),(1,-1,-1),(1,0,-1), - (1,1,-1),(0,1,-1),(-1,1,-1),(-1,0,-1), - (-1,-1,0),(1,-1,0),(1,1,0),(-1,1,0), - (-1,-1,1),(0,-1,1),(1,-1,1),(1,0,1),(1,1,1),(0,1,1),(-1,1,1),(-1,0,1) -}; +triple[] M= + { + (-1,-1,-1),(0,-1,-1),(1,-1,-1),(1,0,-1), + (1,1,-1),(0,1,-1),(-1,1,-1),(-1,0,-1), + (-1,-1,0),(1,-1,0),(1,1,0),(-1,1,0), + (-1,-1,1),(0,-1,1),(1,-1,1),(1,0,1),(1,1,1),(0,1,1),(-1,1,1),(-1,0,1) + }; -surface[] Squares={ - surface((1,-1,-1)--(1,1,-1)--(1,1,1)--(1,-1,1)--cycle), - surface((-1,-1,-1)--(-1,1,-1)--(-1,1,1)--(-1,-1,1)--cycle), - surface((1,1,-1)--(-1,1,-1)--(-1,1,1)--(1,1,1)--cycle), - surface((1,-1,-1)--(-1,-1,-1)--(-1,-1,1)--(1,-1,1)--cycle), - surface((1,-1,1)--(1,1,1)--(-1,1,1)--(-1,-1,1)--cycle), - surface((1,-1,-1)--(1,1,-1)--(-1,1,-1)--(-1,-1,-1)--cycle), +surface[] Squares= + { + surface((1,-1,-1)--(1,1,-1)--(1,1,1)--(1,-1,1)--cycle), + surface((-1,-1,-1)--(-1,1,-1)--(-1,1,1)--(-1,-1,1)--cycle), + surface((1,1,-1)--(-1,1,-1)--(-1,1,1)--(1,1,1)--cycle), + surface((1,-1,-1)--(-1,-1,-1)--(-1,-1,1)--(1,-1,1)--cycle), + surface((1,-1,1)--(1,1,1)--(-1,1,1)--(-1,-1,1)--cycle), + surface((1,-1,-1)--(1,1,-1)--(-1,1,-1)--(-1,-1,-1)--cycle), }; -int[][] SquaresPoints={ - {2,3,4,10,16,15,14,9}, - {0,7,6,11,18,19,12,8}, - {4,5,6,11,18,17,16,10}, - {2,1,0,8,12,13,14,9}, - {12,13,14,15,16,17,18,19}, - {0,1,2,3,4,5,6,7} -}; +int[][] SquaresPoints= + { + {2,3,4,10,16,15,14,9}, + {0,7,6,11,18,19,12,8}, + {4,5,6,11,18,17,16,10}, + {2,1,0,8,12,13,14,9}, + {12,13,14,15,16,17,18,19}, + {0,1,2,3,4,5,6,7} + }; -int[][] index={ - {0,2,4},{0,1},{1,2,4},{2,3},{1,3,4},{0,1},{0,3,4},{2,3}, - {4,5},{4,5},{4,5},{4,5}, - {0,2,5},{0,1},{1,2,5},{2,3},{1,3,5},{0,1},{0,3,5},{2,3} -}; +int[][] index= + { + {0,2,4},{0,1},{1,2,4},{2,3},{1,3,4},{0,1},{0,3,4},{2,3}, + {4,5},{4,5},{4,5},{4,5}, + {0,2,5},{0,1},{1,2,5},{2,3},{1,3,5},{0,1},{0,3,5},{2,3} + }; int[] Sponge0=array(n=6,value=1); diff --git a/graphics/asymptote/examples/bars3.asy b/graphics/asymptote/examples/bars3.asy index 4205d46f37..58adcfb99f 100644 --- a/graphics/asymptote/examples/bars3.asy +++ b/graphics/asymptote/examples/bars3.asy @@ -1,5 +1,5 @@ import three; -import palette; +import palette; import graph3; size(300); diff --git a/graphics/asymptote/examples/centroidfg.asy b/graphics/asymptote/examples/centroidfg.asy index 2e26454cdb..278274fb40 100644 --- a/graphics/asymptote/examples/centroidfg.asy +++ b/graphics/asymptote/examples/centroidfg.asy @@ -8,8 +8,8 @@ real g(real x) {return x^2;} draw(graph(f,a,b,operator ..),red); draw(graph(g,a,b,operator ..),blue); - -xaxis(); + +xaxis(); int n=5; @@ -18,7 +18,7 @@ for(int i=0; i <= n; ++i) { real x=a+width*i; draw((x,g(x))--(x,f(x))); } - + labelx("$a$",a); labelx("$b$",b); draw((a,0)--(a,g(a)),dotted); diff --git a/graphics/asymptote/examples/colorpatch.asy b/graphics/asymptote/examples/colorpatch.asy index e0f6b5b427..fccb03f8c6 100644 --- a/graphics/asymptote/examples/colorpatch.asy +++ b/graphics/asymptote/examples/colorpatch.asy @@ -5,9 +5,9 @@ size(10cm); surface s=surface(patch(new triple[][] { {(0,0,0),(1,0,0),(1,0,0),(2,0,0)}, - {(0,1,0),(1,0,1),(1,0,1),(2,1,0)}, - {(0,1,0),(1,0,-1),(1,0,-1),(2,1,0)}, - {(0,2,0),(1,2,0),(1,2,0),(2,2,0)}})); + {(0,1,0),(1,0,1),(1,0,1),(2,1,0)}, + {(0,1,0),(1,0,-1),(1,0,-1),(2,1,0)}, + {(0,2,0),(1,2,0),(1,2,0),(2,2,0)}})); s.s[0].colors=new pen[] {red,green,blue,black}; draw(s,nolight); diff --git a/graphics/asymptote/examples/colorplanes.asy b/graphics/asymptote/examples/colorplanes.asy index 16bef25b54..805b081993 100644 --- a/graphics/asymptote/examples/colorplanes.asy +++ b/graphics/asymptote/examples/colorplanes.asy @@ -16,7 +16,7 @@ int[] edges={0,0,0,2}; gouraudshade(faces.push(y),project(y),p,edges); gouraudshade(faces.push(l),project(l),p,edges); gouraudshade(faces.push(g),project(g),new pen[]{cyan,magenta,yellow,black}, - edges); + edges); add(faces); diff --git a/graphics/asymptote/examples/conicurv.asy b/graphics/asymptote/examples/conicurv.asy index cb678710c1..8170bb1b7c 100644 --- a/graphics/asymptote/examples/conicurv.asy +++ b/graphics/asymptote/examples/conicurv.asy @@ -1,4 +1,4 @@ -// Original name : conicurv.mp +// Original name : conicurv.mp // Author : L. Nobre G. // Translators : J. Pienaar (2004) and John Bowman (2005) @@ -7,7 +7,7 @@ texpreamble("\usepackage{bm}"); size(300,0); -currentprojection=perspective(10,-5,5.44); +currentprojection=perspective(10,-5,5.44); real theta=30, width=3, shortradius=2, bord=2, refsize=1, vecsize=2; real height=0.3, anglar=1.75, totup=3; diff --git a/graphics/asymptote/examples/contextfonts.asy b/graphics/asymptote/examples/contextfonts.asy index 39177abdba..9e7811d960 100644 --- a/graphics/asymptote/examples/contextfonts.asy +++ b/graphics/asymptote/examples/contextfonts.asy @@ -1,6 +1,6 @@ settings.tex="context"; // Work around ConTeXT bug for font sizes less than 12pt: -texpreamble("\setupbodyfont[8pt]"); +texpreamble("\setupbodyfont[8pt]"); usetypescript("iwona"); usetypescript("antykwa-torunska"); diff --git a/graphics/asymptote/examples/controlsystem.asy b/graphics/asymptote/examples/controlsystem.asy index bfd8336f1f..af7906ecad 100644 --- a/graphics/asymptote/examples/controlsystem.asy +++ b/graphics/asymptote/examples/controlsystem.asy @@ -4,7 +4,7 @@ import flowchart; block delay=roundrectangle("$e^{-sT_t}$",(0.33,0)); block system=roundrectangle("$\frac{s+3}{s^2+0.3s+1}$",(0.6,0)); block controller=roundrectangle("$0.06\left( 1 + \frac{1}{s}\right)$", - (0.45,-0.25)); + (0.45,-0.25)); block sum1=circle("",(0.15,0),mindiameter=0.3cm); block junction1=circle("",(0.75,0),fillpen=currentpen); @@ -16,7 +16,7 @@ draw(junction1); add(new void(picture pic, transform t) { blockconnector operator --=blockconnector(pic,t); - + block(0,0)--Label("$u$",align=N)--Arrow--sum1--Arrow--delay--Arrow-- system--junction1--Label("$y$",align=N)--Arrow--block(1,0); diff --git a/graphics/asymptote/examples/cosaddition.asy b/graphics/asymptote/examples/cosaddition.asy index f6ce8de62a..c996367d1c 100644 --- a/graphics/asymptote/examples/cosaddition.asy +++ b/graphics/asymptote/examples/cosaddition.asy @@ -4,7 +4,7 @@ import geometry; real A=130; real B=40; -pair O=(0,0); +pair O=(0,0); pair R=(1,0); pair P=dir(A); pair Q=dir(B); diff --git a/graphics/asymptote/examples/cpkcolors.asy b/graphics/asymptote/examples/cpkcolors.asy index ddc7e286d5..8487449c99 100644 --- a/graphics/asymptote/examples/cpkcolors.asy +++ b/graphics/asymptote/examples/cpkcolors.asy @@ -17,243 +17,245 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. */ -string[] Element={ - "Xx", // 0 - "H", // 1 - "He", // 2 - "Li", // 3 - "Be", // 4 - "B", // 5 - "C", // 6 - "N", // 7 - "O", // 8 - "F", // 9 - "Ne", // 10 - "Na", // 11 - "Mg", // 12 - "Al", // 13 - "Si", // 14 - "P", // 15 - "S", // 16 - "Cl", // 17 - "Ar", // 18 - "K", // 19 - "Ca", // 20 - "Sc", // 21 - "Ti", // 22 - "V", // 23 - "Cr", // 24 - "Mn", // 25 - "Fe", // 26 - "Co", // 27 - "Ni", // 28 - "Cu", // 29 - "Zn", // 30 - "Ga", // 31 - "Ge", // 32 - "As", // 33 - "Se", // 34 - "Br", // 35 - "Kr", // 36 - "Rb", // 37 - "Sr", // 38 - "Y", // 39 - "Zr", // 40 - "Nb", // 41 - "Mo", // 42 - "Tc", // 43 - "Ru", // 44 - "Rh", // 45 - "Pd", // 46 - "Ag", // 47 - "Cd", // 48 - "In", // 49 - "Sn", // 50 - "Sb", // 51 - "Te", // 52 - "I", // 53 - "Xe", // 54 - "Cs", // 55 - "Ba", // 56 - "La", // 57 - "Ce", // 58 - "Pr", // 59 - "Nd", // 60 - "Pm", // 61 - "Sm", // 62 - "Eu", // 63 - "Gd", // 64 - "Tb", // 65 - "Dy", // 66 - "Ho", // 67 - "Er", // 68 - "Tm", // 69 - "Yb", // 70 - "Lu", // 71 - "Hf", // 72 - "Ta", // 73 - "W", // 74 - "Re", // 75 - "Os", // 76 - "Ir", // 77 - "Pt", // 78 - "Au", // 79 - "Hg", // 80 - "Tl", // 81 - "Pb", // 82 - "Bi", // 83 - "Po", // 84 - "At", // 85 - "Rn", // 86 - "Fr", // 87 - "Ra", // 88 - "Ac", // 89 - "Th", // 90 - "Pa", // 91 - "U", // 92 - "Np", // 93 - "Pu", // 94 - "Am", // 95 - "Cm", // 96 - "Bk", // 97 - "Cf", // 98 - "Es", // 99 - "Fm", // 100 - "Md", // 101 - "No", // 102 - "Lr", // 103 - "Rf", // 104 - "Db", // 105 - "Sg", // 106 - "Bh", // 107 - "Hs", // 108 - "Mt", // 109 - /* - "Ds", // 110 - "Uuu",// 111 - "Uub",// 112 - "Uut",// 113 - "Uuq",// 114 - "Uup",// 115 - "Uuh",// 116 - "Uus",// 117 - "Uuo",// 118 - */ -}; +string[] Element= + { + "Xx", // 0 + "H", // 1 + "He", // 2 + "Li", // 3 + "Be", // 4 + "B", // 5 + "C", // 6 + "N", // 7 + "O", // 8 + "F", // 9 + "Ne", // 10 + "Na", // 11 + "Mg", // 12 + "Al", // 13 + "Si", // 14 + "P", // 15 + "S", // 16 + "Cl", // 17 + "Ar", // 18 + "K", // 19 + "Ca", // 20 + "Sc", // 21 + "Ti", // 22 + "V", // 23 + "Cr", // 24 + "Mn", // 25 + "Fe", // 26 + "Co", // 27 + "Ni", // 28 + "Cu", // 29 + "Zn", // 30 + "Ga", // 31 + "Ge", // 32 + "As", // 33 + "Se", // 34 + "Br", // 35 + "Kr", // 36 + "Rb", // 37 + "Sr", // 38 + "Y", // 39 + "Zr", // 40 + "Nb", // 41 + "Mo", // 42 + "Tc", // 43 + "Ru", // 44 + "Rh", // 45 + "Pd", // 46 + "Ag", // 47 + "Cd", // 48 + "In", // 49 + "Sn", // 50 + "Sb", // 51 + "Te", // 52 + "I", // 53 + "Xe", // 54 + "Cs", // 55 + "Ba", // 56 + "La", // 57 + "Ce", // 58 + "Pr", // 59 + "Nd", // 60 + "Pm", // 61 + "Sm", // 62 + "Eu", // 63 + "Gd", // 64 + "Tb", // 65 + "Dy", // 66 + "Ho", // 67 + "Er", // 68 + "Tm", // 69 + "Yb", // 70 + "Lu", // 71 + "Hf", // 72 + "Ta", // 73 + "W", // 74 + "Re", // 75 + "Os", // 76 + "Ir", // 77 + "Pt", // 78 + "Au", // 79 + "Hg", // 80 + "Tl", // 81 + "Pb", // 82 + "Bi", // 83 + "Po", // 84 + "At", // 85 + "Rn", // 86 + "Fr", // 87 + "Ra", // 88 + "Ac", // 89 + "Th", // 90 + "Pa", // 91 + "U", // 92 + "Np", // 93 + "Pu", // 94 + "Am", // 95 + "Cm", // 96 + "Bk", // 97 + "Cf", // 98 + "Es", // 99 + "Fm", // 100 + "Md", // 101 + "No", // 102 + "Lr", // 103 + "Rf", // 104 + "Db", // 105 + "Sg", // 106 + "Bh", // 107 + "Hs", // 108 + "Mt", // 109 + /* + "Ds", // 110 + "Uuu",// 111 + "Uub",// 112 + "Uut",// 113 + "Uuq",// 114 + "Uup",// 115 + "Uuh",// 116 + "Uus",// 117 + "Uuo",// 118 + */ + }; // Default table of CPK atom colors // (ghemical colors with a few proposed modifications). -string[] Hexcolor={ - "FF1493", // Xx 0 - "FFFFFF", // H 1 - "D9FFFF", // He 2 - "CC80FF", // Li 3 - "C2FF00", // Be 4 - "FFB5B5", // B 5 - "909090", // C 6 - changed from ghemical - "3050F8", // N 7 - changed from ghemical - "FF0D0D", // O 8 - "90E050", // F 9 - changed from ghemical - "B3E3F5", // Ne 10 - "AB5CF2", // Na 11 - "8AFF00", // Mg 12 - "BFA6A6", // Al 13 - "F0C8A0", // Si 14 - changed from ghemical - "FF8000", // P 15 - "FFFF30", // S 16 - "1FF01F", // Cl 17 - "80D1E3", // Ar 18 - "8F40D4", // K 19 - "3DFF00", // Ca 20 - "E6E6E6", // Sc 21 - "BFC2C7", // Ti 22 - "A6A6AB", // V 23 - "8A99C7", // Cr 24 - "9C7AC7", // Mn 25 - "E06633", // Fe 26 - changed from ghemical - "F090A0", // Co 27 - changed from ghemical - "50D050", // Ni 28 - changed from ghemical - "C88033", // Cu 29 - changed from ghemical - "7D80B0", // Zn 30 - "C28F8F", // Ga 31 - "668F8F", // Ge 32 - "BD80E3", // As 33 - "FFA100", // Se 34 - "A62929", // Br 35 - "5CB8D1", // Kr 36 - "702EB0", // Rb 37 - "00FF00", // Sr 38 - "94FFFF", // Y 39 - "94E0E0", // Zr 40 - "73C2C9", // Nb 41 - "54B5B5", // Mo 42 - "3B9E9E", // Tc 43 - "248F8F", // Ru 44 - "0A7D8C", // Rh 45 - "006985", // Pd 46 - "C0C0C0", // Ag 47 - changed from ghemical - "FFD98F", // Cd 48 - "A67573", // In 49 - "668080", // Sn 50 - "9E63B5", // Sb 51 - "D47A00", // Te 52 - "940094", // I 53 - "429EB0", // Xe 54 - "57178F", // Cs 55 - "00C900", // Ba 56 - "70D4FF", // La 57 - "FFFFC7", // Ce 58 - "D9FFC7", // Pr 59 - "C7FFC7", // Nd 60 - "A3FFC7", // Pm 61 - "8FFFC7", // Sm 62 - "61FFC7", // Eu 63 - "45FFC7", // Gd 64 - "30FFC7", // Tb 65 - "1FFFC7", // Dy 66 - "00FF9C", // Ho 67 - "00E675", // Er 68 - "00D452", // Tm 69 - "00BF38", // Yb 70 - "00AB24", // Lu 71 - "4DC2FF", // Hf 72 - "4DA6FF", // Ta 73 - "2194D6", // W 74 - "267DAB", // Re 75 - "266696", // Os 76 - "175487", // Ir 77 - "D0D0E0", // Pt 78 - changed from ghemical - "FFD123", // Au 79 - changed from ghemical - "B8B8D0", // Hg 80 - changed from ghemical - "A6544D", // Tl 81 - "575961", // Pb 82 - "9E4FB5", // Bi 83 - "AB5C00", // Po 84 - "754F45", // At 85 - "428296", // Rn 86 - "420066", // Fr 87 - "007D00", // Ra 88 - "70ABFA", // Ac 89 - "00BAFF", // Th 90 - "00A1FF", // Pa 91 - "008FFF", // U 92 - "0080FF", // Np 93 - "006BFF", // Pu 94 - "545CF2", // Am 95 - "785CE3", // Cm 96 - "8A4FE3", // Bk 97 - "A136D4", // Cf 98 - "B31FD4", // Es 99 - "B31FBA", // Fm 100 - "B30DA6", // Md 101 - "BD0D87", // No 102 - "C70066", // Lr 103 - "CC0059", // Rf 104 - "D1004F", // Db 105 - "D90045", // Sg 106 - "E00038", // Bh 107 - "E6002E", // Hs 108 - "EB0026" // Mt 109 -}; +string[] Hexcolor= + { + "FF1493", // Xx 0 + "FFFFFF", // H 1 + "D9FFFF", // He 2 + "CC80FF", // Li 3 + "C2FF00", // Be 4 + "FFB5B5", // B 5 + "909090", // C 6 - changed from ghemical + "3050F8", // N 7 - changed from ghemical + "FF0D0D", // O 8 + "90E050", // F 9 - changed from ghemical + "B3E3F5", // Ne 10 + "AB5CF2", // Na 11 + "8AFF00", // Mg 12 + "BFA6A6", // Al 13 + "F0C8A0", // Si 14 - changed from ghemical + "FF8000", // P 15 + "FFFF30", // S 16 + "1FF01F", // Cl 17 + "80D1E3", // Ar 18 + "8F40D4", // K 19 + "3DFF00", // Ca 20 + "E6E6E6", // Sc 21 + "BFC2C7", // Ti 22 + "A6A6AB", // V 23 + "8A99C7", // Cr 24 + "9C7AC7", // Mn 25 + "E06633", // Fe 26 - changed from ghemical + "F090A0", // Co 27 - changed from ghemical + "50D050", // Ni 28 - changed from ghemical + "C88033", // Cu 29 - changed from ghemical + "7D80B0", // Zn 30 + "C28F8F", // Ga 31 + "668F8F", // Ge 32 + "BD80E3", // As 33 + "FFA100", // Se 34 + "A62929", // Br 35 + "5CB8D1", // Kr 36 + "702EB0", // Rb 37 + "00FF00", // Sr 38 + "94FFFF", // Y 39 + "94E0E0", // Zr 40 + "73C2C9", // Nb 41 + "54B5B5", // Mo 42 + "3B9E9E", // Tc 43 + "248F8F", // Ru 44 + "0A7D8C", // Rh 45 + "006985", // Pd 46 + "C0C0C0", // Ag 47 - changed from ghemical + "FFD98F", // Cd 48 + "A67573", // In 49 + "668080", // Sn 50 + "9E63B5", // Sb 51 + "D47A00", // Te 52 + "940094", // I 53 + "429EB0", // Xe 54 + "57178F", // Cs 55 + "00C900", // Ba 56 + "70D4FF", // La 57 + "FFFFC7", // Ce 58 + "D9FFC7", // Pr 59 + "C7FFC7", // Nd 60 + "A3FFC7", // Pm 61 + "8FFFC7", // Sm 62 + "61FFC7", // Eu 63 + "45FFC7", // Gd 64 + "30FFC7", // Tb 65 + "1FFFC7", // Dy 66 + "00FF9C", // Ho 67 + "00E675", // Er 68 + "00D452", // Tm 69 + "00BF38", // Yb 70 + "00AB24", // Lu 71 + "4DC2FF", // Hf 72 + "4DA6FF", // Ta 73 + "2194D6", // W 74 + "267DAB", // Re 75 + "266696", // Os 76 + "175487", // Ir 77 + "D0D0E0", // Pt 78 - changed from ghemical + "FFD123", // Au 79 - changed from ghemical + "B8B8D0", // Hg 80 - changed from ghemical + "A6544D", // Tl 81 + "575961", // Pb 82 + "9E4FB5", // Bi 83 + "AB5C00", // Po 84 + "754F45", // At 85 + "428296", // Rn 86 + "420066", // Fr 87 + "007D00", // Ra 88 + "70ABFA", // Ac 89 + "00BAFF", // Th 90 + "00A1FF", // Pa 91 + "008FFF", // U 92 + "0080FF", // Np 93 + "006BFF", // Pu 94 + "545CF2", // Am 95 + "785CE3", // Cm 96 + "8A4FE3", // Bk 97 + "A136D4", // Cf 98 + "B31FD4", // Es 99 + "B31FBA", // Fm 100 + "B30DA6", // Md 101 + "BD0D87", // No 102 + "C70066", // Lr 103 + "CC0059", // Rf 104 + "D1004F", // Db 105 + "D90045", // Sg 106 + "E00038", // Bh 107 + "E6002E", // Hs 108 + "EB0026" // Mt 109 + }; diff --git a/graphics/asymptote/examples/curvedlabel3.asy b/graphics/asymptote/examples/curvedlabel3.asy index 5bee2342d8..bdb0566d56 100644 --- a/graphics/asymptote/examples/curvedlabel3.asy +++ b/graphics/asymptote/examples/curvedlabel3.asy @@ -8,7 +8,7 @@ string txt1="\hbox{This is a test of \emph{curved} 3D labels in \textbf{Asymptote} (implemented with {\tt texpath}).}"; string txt2="This is a test of curved labels in Asymptote\\(implemented -without the {\tt PSTricks pstextpath} macro)."; +without the {\tt PSTricks pstextpath} macro)."; draw(surface(g),paleblue+opacity(0.5)); draw(labelpath(txt1,subpath(g,0,reltime(g,0.95)),angle=-90),orange); diff --git a/graphics/asymptote/examples/dimension.asy b/graphics/asymptote/examples/dimension.asy index 1244ba84e6..c22110aa5e 100644 --- a/graphics/asymptote/examples/dimension.asy +++ b/graphics/asymptote/examples/dimension.asy @@ -1,7 +1,7 @@ -size(12cm,0); - +size(12cm,0); + void distance(picture pic=currentpicture, pair A, pair B, Label L="", real n=0, - pen p=currentpen) + pen p=currentpen) { real d=3mm; path g=A--B; @@ -9,15 +9,15 @@ void distance(picture pic=currentpicture, pair A, pair B, Label L="", real n=0, pic.add(new void(frame f, transform t) { picture opic; path G=T*t*g; - draw(opic,Label(L,Center,UnFill(1)),G,p,Arrows(NoFill),Bars,PenMargins); + draw(opic,Label(L,Center,UnFill(1)),G,p,Arrows(NoFill),Bars,PenMargins); add(f,opic.fit()); }); pic.addBox(min(g),max(g),T*min(p),T*max(p)); -} - -pair A=(0,0), B=(3,3); - -dot(A); -dot(B); - -distance(A,B,"$\ell$",1); +} + +pair A=(0,0), B=(3,3); + +dot(A); +dot(B); + +distance(A,B,"$\ell$",1); diff --git a/graphics/asymptote/examples/electromagnetic.asy b/graphics/asymptote/examples/electromagnetic.asy index d229f76b74..d6484ada99 100644 --- a/graphics/asymptote/examples/electromagnetic.asy +++ b/graphics/asymptote/examples/electromagnetic.asy @@ -1,47 +1,47 @@ -import graph; +import graph; import palette; -texpreamble("\usepackage[amssymb,thinqspace,thinspace]{SIunits}"); - -size(800,200); - +texpreamble("\usepackage[amssymb,thinqspace,thinspace]{SIunits}"); + +size(800,200); + real c=3e8; real nm=1e-9; -real freq(real lambda) {return c/(lambda*nm);} -real lambda(real f) {return c/(f*nm);} - -real fmin=10; -real fmax=1e23; - -scale(Log(true),Linear(true)); -xlimits(fmin,fmax); -ylimits(0,1); - +real freq(real lambda) {return c/(lambda*nm);} +real lambda(real f) {return c/(f*nm);} + +real fmin=10; +real fmax=1e23; + +scale(Log(true),Linear(true)); +xlimits(fmin,fmax); +ylimits(0,1); + real uv=freq(400); real ir=freq(700); - + bounds visible=bounds(Scale(uv).x,Scale(ir).x); palette(visible,uv,ir+(0,2),Bottom,Rainbow(),invisible); -xaxis(Label("\hertz",1),Bottom,RightTicks,above=true); - +xaxis(Label("\hertz",1),Bottom,RightTicks,above=true); + real log10Left(real x) {return -log10(x);} real pow10Left(real x) {return pow10(-x);} scaleT LogLeft=scaleT(log10Left,pow10Left,logarithmic=true); -picture q=secondaryX(new void(picture p) { - scale(p,LogLeft,Linear); +picture q=secondaryX(new void(picture p) { + scale(p,LogLeft,Linear); xlimits(p,lambda(fmax),lambda(fmin)); - ylimits(p,0,1); - xaxis(p,Label("\nano\metre",1,0.01N),Top,LeftTicks(DefaultLogFormat,n=10)); - }); - -add(q,above=true); + ylimits(p,0,1); + xaxis(p,Label("\nano\metre",1,0.01N),Top,LeftTicks(DefaultLogFormat,n=10)); + }); + +add(q,above=true); margin margin=PenMargin(0,0); -draw("radio",Scale((10,1))--Scale((5e12,1)),S,Arrow); +draw("radio",Scale((10,1))--Scale((5e12,1)),S,Arrow); draw("infrared",Scale((1e12,1.75))--Scale(shift(0,1.75)*ir),LeftSide,Arrows,margin); draw("UV",Scale(shift(0,1.75)*uv)--Scale((1e17,1.76)),LeftSide,Arrows,margin); -draw("x-rays",Scale((1e16,1))--Scale((1e21,1)),RightSide,Arrows); -draw("$\gamma$-rays",Scale((fmax,1.75))--Scale((2e18,1.75)),Arrow); +draw("x-rays",Scale((1e16,1))--Scale((1e21,1)),RightSide,Arrows); +draw("$\gamma$-rays",Scale((fmax,1.75))--Scale((2e18,1.75)),Arrow); diff --git a/graphics/asymptote/examples/equilchord.asy b/graphics/asymptote/examples/equilchord.asy index b93da942d0..b7ed365d3b 100644 --- a/graphics/asymptote/examples/equilchord.asy +++ b/graphics/asymptote/examples/equilchord.asy @@ -6,7 +6,7 @@ currentlight=(-1,-1,2); real t=0.5; real F(pair z) { - return (z.x^2+z.y^2 <= 1) ? sqrt(3)*(sqrt(1-z.x^2)-abs(z.y)) : 0; + return (z.x^2+z.y^2 <= 1) ? sqrt(3)*(sqrt(1-z.x^2)-abs(z.y)) : 0; } real a=1.5; diff --git a/graphics/asymptote/examples/fequlogo.asy b/graphics/asymptote/examples/fequlogo.asy index 0f9fb0212d..e896911994 100644 --- a/graphics/asymptote/examples/fequlogo.asy +++ b/graphics/asymptote/examples/fequlogo.asy @@ -4,7 +4,7 @@ import obj; size(200,0); size3(200); -if(settings.render < 0) settings.render=8; +if(settings.render < 0) settings.render=8; texpreamble("\usepackage[T1]{fontenc}"); texpreamble("\usepackage{ccfonts,eulervm}"); @@ -34,4 +34,4 @@ add(new void(frame f, transform3 t, picture pic, projection P) { draw(f,surface(invert(box(min(f,P),max(f,P)),min3(f),P), new pen[] {orange,red,yellow,brown}+opacity(0.9))); } -); + ); diff --git a/graphics/asymptote/examples/filesurface.asy b/graphics/asymptote/examples/filesurface.asy index b4817a0586..2202554876 100644 --- a/graphics/asymptote/examples/filesurface.asy +++ b/graphics/asymptote/examples/filesurface.asy @@ -19,7 +19,7 @@ surface s=surface(f,(0,0),(x.length-1,y.length-1),x.length-1,y.length-1); real[] level=uniform(min(f)*(1-sqrtEpsilon),max(f)*(1+sqrtEpsilon),4); s.colors(palette(s.map(new real(triple v) {return find(level >= v.z);}), - Rainbow())); + Rainbow())); draw(s,meshpen=thick(),render(merge=true)); @@ -32,11 +32,11 @@ yaxis3("$y$",Bounds,InTicks(Step=1,step=0.1)); zaxis3("$z$",Bounds,InTicks); /* -picture palette; -size3(palette,1cm); -draw(palette,unitcube,red); -frame F=palette.fit3(); -add(F,(M.x,m.y,m.z)); + picture palette; + size3(palette,1cm); + draw(palette,unitcube,red); + frame F=palette.fit3(); + add(F,(M.x,m.y,m.z)); */ currentprojection=perspective(camera=target+realmult(dir(68,225),M-m), diff --git a/graphics/asymptote/examples/fillcontour.asy b/graphics/asymptote/examples/fillcontour.asy index 311192fb7f..0197386670 100644 --- a/graphics/asymptote/examples/fillcontour.asy +++ b/graphics/asymptote/examples/fillcontour.asy @@ -15,7 +15,7 @@ int Divs=10; defaultpen(1bp); bounds range=bounds(-1,1); - + real[] Cvals=uniform(range.min,range.max,Divs); guide[][] g=contour(f,a,b,Cvals,N,operator --); diff --git a/graphics/asymptote/examples/fin.asy b/graphics/asymptote/examples/fin.asy index 8fe88f3dc0..f1b7e20182 100644 --- a/graphics/asymptote/examples/fin.asy +++ b/graphics/asymptote/examples/fin.asy @@ -2,7 +2,7 @@ import three; import palette; int N = 26; -real[] C = array(N,0); +real[] C = array(N,0); real[][] A = new real[N][N]; for(int i = 0; i < N; ++i) for(int j = 0; j < N; ++j) @@ -46,23 +46,23 @@ A[i][indexof(1,2)] = 1; C[i] = Tb; // interior nodes for(int m = 2; m<13; ++m) -{ - A[i][indexof(m,2)] = -4; - A[i][indexof(m-1,2)] = A[i][indexof(m+1,2)] = 1; - A[i][indexof(m,1)] = 2; - C[i] = 0; - ++i; -} + { + A[i][indexof(m,2)] = -4; + A[i][indexof(m-1,2)] = A[i][indexof(m+1,2)] = 1; + A[i][indexof(m,1)] = 2; + C[i] = 0; + ++i; + } // convective bottom side nodes for(int m = 2; m<13; ++m) -{ - A[i][indexof(m,1)] = -(2+h*delta/k); - A[i][indexof(m-1,1)] = A[i][indexof(m+1,1)] = 0.5; - A[i][indexof(m,2)] = 1; - C[i] = -h*delta*Tinf/k; - ++i; -} + { + A[i][indexof(m,1)] = -(2+h*delta/k); + A[i][indexof(m-1,1)] = A[i][indexof(m+1,1)] = 0.5; + A[i][indexof(m,2)] = 1; + C[i] = -h*delta*Tinf/k; + ++i; + } // convective bottom right corner node A[i][indexof(13,2)] = A[i][indexof(12,1)] = 0.5; @@ -115,18 +115,18 @@ material lookupColour(int m,int n) draw(shift(0,1,0)*rightsquare,lookupColour(1,2)); for(int i = 2; i < 13; ++i) -{ - draw(shift(i-1,1,0)*square,lookupColour(i,2)); -} + { + draw(shift(i-1,1,0)*square,lookupColour(i,2)); + } draw(shift(12,1,0)*leftsquare,lookupColour(13,2)); draw(shift(0,2,0)*SEcorner,lookupColour(1,3)); draw(shift(0,0,0)*NEcorner,lookupColour(1,1)); for(int i = 2; i < 13; ++i) -{ - draw(shift(i-1,0,0)*topsquare,lookupColour(i,1)); - draw(shift(i-1,2,0)*bottomsquare,lookupColour(i,3)); -} + { + draw(shift(i-1,0,0)*topsquare,lookupColour(i,1)); + draw(shift(i-1,2,0)*bottomsquare,lookupColour(i,3)); + } draw(shift(12,2,0)*SWcorner,lookupColour(13,3)); draw(shift(12,0,0)*NWcorner,lookupColour(13,1)); diff --git a/graphics/asymptote/examples/floatingdisk.asy b/graphics/asymptote/examples/floatingdisk.asy index 88eae565a3..68c4944042 100644 --- a/graphics/asymptote/examples/floatingdisk.asy +++ b/graphics/asymptote/examples/floatingdisk.asy @@ -1,28 +1,28 @@ -import trembling; -if(settings.outformat == "") - settings.outformat="pdf"; - -size(6cm,0); - -real R=1/5; -real h=0.5; -real d=1/12; -real l=.7; - -pair pA=(-l,0); -pair pB=(l,0); +import trembling; +if(settings.outformat == "") + settings.outformat="pdf"; + +size(6cm,0); + +real R=1/5; +real h=0.5; +real d=1/12; +real l=.7; + +pair pA=(-l,0); +pair pB=(l,0); tremble tr=tremble(angle=10,frequency=0.1,random=50,fuzz=1); -path waterline=tr.deform(pA..pB); - -path disk=shift(0,-d)*scale(R)*unitcircle; -path water=waterline--(l,-h)--(-l,-h)--(-l,0)--cycle; -path container=(l,1/7)--(l,-h)--(-l,-h)--(-l,1/7); - -filldraw(disk,red,linewidth(.3)); -fill(water,mediumgrey+opacity(0.5)); -draw(waterline); - -draw(container,linewidth(1.5)); - +path waterline=tr.deform(pA..pB); + +path disk=shift(0,-d)*scale(R)*unitcircle; +path water=waterline--(l,-h)--(-l,-h)--(-l,0)--cycle; +path container=(l,1/7)--(l,-h)--(-l,-h)--(-l,1/7); + +filldraw(disk,red,linewidth(.3)); +fill(water,mediumgrey+opacity(0.5)); +draw(waterline); + +draw(container,linewidth(1.5)); + shipout(bbox(2mm)); diff --git a/graphics/asymptote/examples/floor.asy b/graphics/asymptote/examples/floor.asy index 02c2446abe..ed61c0e873 100644 --- a/graphics/asymptote/examples/floor.asy +++ b/graphics/asymptote/examples/floor.asy @@ -10,7 +10,7 @@ bool3 branch(real x) { static real lasty; static bool first=true; real y=floor(x); - bool samebranch=first || lasty == y; + bool samebranch=first || lasty == y; first=false; if(samebranch) lasty=x; else { @@ -21,7 +21,7 @@ bool3 branch(real x) { return samebranch ? true : default; }; -draw(graph(Floor,-5.5,5.5,500,branch)); +draw(graph(Floor,-5.5,5.5,500,branch)); axes("$x$",rotate(0)*"$\lfloor x\rfloor$",red); dot(Close); diff --git a/graphics/asymptote/examples/gamma.asy b/graphics/asymptote/examples/gamma.asy index f92dd775ab..136ec01401 100644 --- a/graphics/asymptote/examples/gamma.asy +++ b/graphics/asymptote/examples/gamma.asy @@ -12,7 +12,7 @@ bool3 branch(real x) } draw(graph(gamma,-4,4,n=2000,branch),red); - + scale(false); xlimits(-4,4); ylimits(-6,6); diff --git a/graphics/asymptote/examples/gamma3.asy b/graphics/asymptote/examples/gamma3.asy index e522dad4e7..6fc56065cb 100644 --- a/graphics/asymptote/examples/gamma3.asy +++ b/graphics/asymptote/examples/gamma3.asy @@ -7,7 +7,7 @@ currentprojection=orthographic(1,-2,1); real X=4.5; real M=abs(gamma((X,0))); -pair Gamma(pair z) +pair Gamma(pair z) { return (z.x > 0 || z != floor(z.x)) ? gamma(z) : M; } diff --git a/graphics/asymptote/examples/genustwo.asy b/graphics/asymptote/examples/genustwo.asy index 0d346481d0..79e07e2268 100644 --- a/graphics/asymptote/examples/genustwo.asy +++ b/graphics/asymptote/examples/genustwo.asy @@ -12,9 +12,9 @@ real toruscontour(real x, real y, real z) { return (r-2)^2 + z^2 - tuberadius^2; } -// Take the union of the two tangent tori (by taking +// Take the union of the two tangent tori (by taking // the product of the functions defining them). Then -// add (or subtract) a bit of noise to smooth things +// add (or subtract) a bit of noise to smooth things // out. real f(real x, real y, real z) { real f1 = toruscontour(x - 2 - tuberadius, y, z); @@ -22,15 +22,15 @@ real f(real x, real y, real z) { return f1 * f2 - 0.1; } -// The noisy function extends a bit farther than the union of +// The noisy function extends a bit farther than the union of // the two tori, so include a bit of extra space in the box. triple max = (2*(2+tuberadius), 2+tuberadius, tuberadius) - + (0.1, 0.1, 0.1); + + (0.1, 0.1, 0.1); triple min = -max; // Draw the implicit surface. -draw(implicitsurface(f, min, max, overlapedges=true, +draw(implicitsurface(f, min, max, overlapedges=true, nx=20, nz=5), surfacepen=material(diffusepen=gray(0.6), - emissivepen=gray(0.3), - specularpen=gray(0.1))); + emissivepen=gray(0.3), + specularpen=gray(0.1))); diff --git a/graphics/asymptote/examples/imagehistogram.asy b/graphics/asymptote/examples/imagehistogram.asy index d3bdc78375..302d69194d 100644 --- a/graphics/asymptote/examples/imagehistogram.asy +++ b/graphics/asymptote/examples/imagehistogram.asy @@ -1,47 +1,47 @@ import stats; -import graph; -import palette; -import contour; - +import graph; +import palette; +import contour; + size(20cm); scale(false); pair[] data=new pair[50000]; for(int i=0; i < data.length; ++i) - data[i]=Gaussrandpair(); - -// Histogram limits and number of bins -pair datamin=(-0.15,-0.15); -pair datamax=(0.15,0.15); -int Nx=30; -int Ny=30; + data[i]=Gaussrandpair(); + +// Histogram limits and number of bins +pair datamin=(-0.15,-0.15); +pair datamax=(0.15,0.15); +int Nx=30; +int Ny=30; int[][] bins=frequency(data,datamin,datamax,Nx,Ny); - -real[] values=new real[Nx*Ny]; + +real[] values=new real[Nx*Ny]; pair[] points=new pair[Nx*Ny]; -int k=0; +int k=0; real dx=(datamax.x-datamin.x)/Nx; real dy=(datamax.y-datamin.y)/Ny; for(int i=0; i < Nx; ++i) { for(int j=0; j < Ny; ++j) { - values[k]=bins[i][j]; - points[k]=(datamin.x+(i+0.5)*dx,datamin.y+(j+0.5)*dy); - ++k; + values[k]=bins[i][j]; + points[k]=(datamin.x+(i+0.5)*dx,datamin.y+(j+0.5)*dy); + ++k; } -} - -// Create a color palette +} + +// Create a color palette pen[] InvGrayscale(int NColors=256) { - real ninv=1.0/(NColors-1.0); - return sequence(new pen(int i) {return gray(1-17*i*ninv);},NColors); -} - -// Draw the histogram, with axes -bounds range=image(points,values,Range(0,40),InvGrayscale()); + real ninv=1.0/(NColors-1.0); + return sequence(new pen(int i) {return gray(1-17*i*ninv);},NColors); +} + +// Draw the histogram, with axes +bounds range=image(points,values,Range(0,40),InvGrayscale()); draw(contour(points,values,new real[] {1,2,3,4,8,12,16,20,24,28,32,36,40}, - operator--),blue); -xaxis("$x$",BottomTop,LeftTicks,above=true); -yaxis("$y$",LeftRight,RightTicks,above=true); + operator--),blue); +xaxis("$x$",BottomTop,LeftTicks,above=true); +yaxis("$y$",LeftRight,RightTicks,above=true); diff --git a/graphics/asymptote/examples/integraltest.asy b/graphics/asymptote/examples/integraltest.asy index c45b1eb8f1..4bcd3737d0 100644 --- a/graphics/asymptote/examples/integraltest.asy +++ b/graphics/asymptote/examples/integraltest.asy @@ -9,17 +9,17 @@ dotfactor=7; void subinterval(real a, real b) { path g=box((a,0),(b,f(b))); - filldraw(g,lightgray); + filldraw(g,lightgray); draw(box((a,f(a)),(b,0))); } int a=1, b=9; - -xaxis("$x$",0,b); -yaxis("$y$",0); - + +xaxis("$x$",0,b); +yaxis("$y$",0); + draw(graph(f,a,b,operator ..),red); - + int n=2; for(int i=a; i <= b; ++i) { diff --git a/graphics/asymptote/examples/interpolate1.asy b/graphics/asymptote/examples/interpolate1.asy index 8845c8dd2f..19d77449ab 100644 --- a/graphics/asymptote/examples/interpolate1.asy +++ b/graphics/asymptote/examples/interpolate1.asy @@ -127,9 +127,9 @@ attach(legend(),point(10S),30S); shipout("runge4"); -erase(); +erase(); -// Test 5: The situation is much better using Tchebychev points. +// Test 5: The situation is much better using Tchebychev points. unitsize(2cm); @@ -194,7 +194,7 @@ attach(legend(),point(10S),30S); shipout("runge6"); -erase(); +erase(); // Test 7: Another Tchebychev example. diff --git a/graphics/asymptote/examples/jump.asy b/graphics/asymptote/examples/jump.asy index 7ae19be388..d2fdb41c64 100644 --- a/graphics/asymptote/examples/jump.asy +++ b/graphics/asymptote/examples/jump.asy @@ -1,13 +1,13 @@ import graph; size(4inches,0); -real f1(real x) {return (1+x^2);} +real f1(real x) {return (1+x^2);} real f2(real x) {return (4-x);} xaxis("$x$",LeftTicks,Arrow); yaxis("$y$",RightTicks,Arrow); -draw("$y=1+x^2$",graph(f1,-2,1)); +draw("$y=1+x^2$",graph(f1,-2,1)); dot((1,f1(1)),UnFill); draw("$y=4-x$",graph(f2,1,5),LeftSide,red,Arrow); diff --git a/graphics/asymptote/examples/label3zoom.asy b/graphics/asymptote/examples/label3zoom.asy index cba4f98cb5..022a09a32d 100644 --- a/graphics/asymptote/examples/label3zoom.asy +++ b/graphics/asymptote/examples/label3zoom.asy @@ -3,14 +3,14 @@ import three; currentlight=Headlamp; size(469.75499pt,0); -currentprojection=perspective( -camera=(160.119024441391,136.348802919248,253.822628496226), -up=(-0.188035408976828,0.910392236102215,-0.368549401594584), -target=(25.5462739598034,1.77605243766079,-9.93996244768584), -zoom=5.59734733413271, -angle=5.14449021168139, -viewportshift=(0.813449720559684,-0.604674743165144), -autoadjust=false); +currentprojection= + perspective(camera=(160.119024441391,136.348802919248,253.822628496226), + up=(-0.188035408976828,0.910392236102215,-0.368549401594584), + target=(25.5462739598034,1.77605243766079,-9.93996244768584), + zoom=5.59734733413271, + angle=5.14449021168139, + viewportshift=(0.813449720559684,-0.604674743165144), + autoadjust=false); draw(scale3(4)*extrude("$\displaystyle\int\limits_{-\infty}^{+\infty}\!\! e^{-\alpha x^2}\!\!=\sqrt{\frac{\pi}{\alpha}}$",2Z), material(blue)); diff --git a/graphics/asymptote/examples/linearregression.asy b/graphics/asymptote/examples/linearregression.asy index a1cc6ff6bc..7ec50d8fb0 100644 --- a/graphics/asymptote/examples/linearregression.asy +++ b/graphics/asymptote/examples/linearregression.asy @@ -28,13 +28,13 @@ while (!eof(duncan)) { real[] coeffs = leastsquares(independentvars, dependentvars, warn=false); if (coeffs.length == 0) { abort("Unable to find regression: independent variables are " - + "linearly dependent."); + + "linearly dependent."); } real f(pair xy) { return coeffs[0] * xy.x // income - + coeffs[1] * xy.y // education - + coeffs[2]; // residue + + coeffs[1] * xy.y // education + + coeffs[2]; // residue } real xmin = infinity, xmax = -infinity, ymin = infinity, ymax = -infinity; @@ -52,7 +52,7 @@ draw(surface(f, (xmin, ymin), (xmax, ymax)), for (int ii = 0; ii < independentvars.length; ++ii) { triple pt = (independentvars[ii][0], independentvars[ii][1], - dependentvars[ii]); + dependentvars[ii]); draw(shift(pt) * unitsphere, material(yellow, emissivepen=0.2*yellow)); real z = f((pt.x, pt.y)); if (pt.z > z) draw (pt -- (pt.x, pt.y, z), green); diff --git a/graphics/asymptote/examples/lmfit1.asy b/graphics/asymptote/examples/lmfit1.asy index c25a7c4b4b..36ac3f173f 100644 --- a/graphics/asymptote/examples/lmfit1.asy +++ b/graphics/asymptote/examples/lmfit1.asy @@ -4,10 +4,10 @@ import graph; size(10cm, 7cm, IgnoreAspect); real[] date = { 1790, 1800, 1810, 1820, 1830, 1840, 1850, 1860, 1870, 1880, -1890, 1900, 1910, 1920, 1930, 1940, 1950, 1960, 1970, 1980, 1990 }; + 1890, 1900, 1910, 1920, 1930, 1940, 1950, 1960, 1970, 1980, 1990 }; real[] population = { 3.929, 5.308, 7.240, 9.638, 12.866, 17.069, 23.192, 31.443, -38.558, 50.156, 62.948, 75.996, 91.972, 105.711, 122.775, 131.669, 150.697, -179.323, 203.185, 226.546, 248.710 }; + 38.558, 50.156, 62.948, 75.996, 91.972, 105.711, 122.775, 131.669, 150.697, + 179.323, 203.185, 226.546, 248.710 }; real t0 = 1776; diff --git a/graphics/asymptote/examples/logo3.asy b/graphics/asymptote/examples/logo3.asy index d510e9afb7..363305ede5 100644 --- a/graphics/asymptote/examples/logo3.asy +++ b/graphics/asymptote/examples/logo3.asy @@ -1,11 +1,15 @@ import three; -//size(105,50,IgnoreAspect); -size(560,320,IgnoreAspect); // Fullsize +size(560,320,IgnoreAspect); size3(140,80,15); -currentprojection=perspective(-2,30,10,up=Y); -currentlight=White; -viewportmargin=(0,10); + +currentprojection= + perspective(camera=(-0.7387428806982,-50.4754947040394,10.1433958227456), + up=(0.0023,0.158056646909439,0.000753078712035578), + target=(0.275794537878997,1.26294757366264,-0.0498743055531516), + zoom=1, + angle=3.26228798100531, + autoadjust=false); real a=-0.4; real b=0.95; @@ -32,12 +36,11 @@ g.push(point(A,0)--shift(-f*hy,f*h)*A--point(A,1)--shift(f*hy,-f*h)*reverse(A)-- g.push(point(B,0)--shift(f*hy,-f*h)*B--point(B,1)--shift(-f*hy,f*h)*reverse(B)--cycle); triple H=-0.1Z; -material m=material(lightgray,shininess=1.0); +material m=material(0.5*red+0.125*purple,shininess=1.0); for(path p : g) - draw(extrude(p,H),m); + draw(extrude(p,H),m,nolight); surface s=surface(g); draw(s,red,nolight); -draw(shift(H)*s,m); - +draw(shift(H)*s,m,nolight); diff --git a/graphics/asymptote/examples/lowupint.asy b/graphics/asymptote/examples/lowupint.asy index 3a14cd9110..1c3a0cd948 100644 --- a/graphics/asymptote/examples/lowupint.asy +++ b/graphics/asymptote/examples/lowupint.asy @@ -8,8 +8,8 @@ void rectangle(real a, real b, real c, real h(real,real)) real height=(a < c && c < b) ? f(c) : h(f(a),f(b)); pair p=(a,0), q=(b,height); path g=box(p,q); - fill(g,lightgray); - draw(g); + fill(g,lightgray); + draw(g); } void partition(real a, real b, real c, real h(real,real)) diff --git a/graphics/asymptote/examples/markregular.asy b/graphics/asymptote/examples/markregular.asy index 716599fbcf..ea08b95223 100644 --- a/graphics/asymptote/examples/markregular.asy +++ b/graphics/asymptote/examples/markregular.asy @@ -8,8 +8,8 @@ real ymin=-2,ymax=10; real f(real x) {return x^2;} marker cross=marker(scale(4)*rotate(45)*cross(4), - markuniform(new pair(real t) {return Scale((t,f(t)));}, - xmin,xmax,round(2*(xmax-xmin))),1bp+red); + markuniform(new pair(real t) {return Scale((t,f(t)));}, + xmin,xmax,round(2*(xmax-xmin))),1bp+red); draw(graph(f,xmin,xmax,n=400),linewidth(1bp),cross); @@ -17,10 +17,10 @@ ylimits(-2.5,10,Crop); xaxis(Label("$x$",position=EndPoint, align=NE),xmin=xmin,xmax=xmax, Ticks(scale(.7)*Label(align=E),NoZero,begin=false,beginlabel=false, - end=false,endlabel=false,Step=1,step=.25, - Size=1mm, size=.5mm,pTick=black,ptick=gray),Arrow); + end=false,endlabel=false,Step=1,step=.25, + Size=1mm, size=.5mm,pTick=black,ptick=gray),Arrow); yaxis(Label("$y$",position=EndPoint, align=NE),ymin=ymin,ymax=ymax, Ticks(scale(.7)*Label(),NoZero,begin=false,beginlabel=false, - end=false,endlabel=false,Step=1,step=.25,Size=1mm,size=.5mm, + end=false,endlabel=false,Step=1,step=.25,Size=1mm,size=.5mm, pTick=black,ptick=gray),Arrow); diff --git a/graphics/asymptote/examples/mergeExample.asy b/graphics/asymptote/examples/mergeExample.asy index e0fdcd0f6c..9f331c7a13 100644 --- a/graphics/asymptote/examples/mergeExample.asy +++ b/graphics/asymptote/examples/mergeExample.asy @@ -20,11 +20,11 @@ draw(p); path l = point(p[1],2)--point(p[0],4); draw(l,red); for(int i = 0; i < p.length; ++i) -{ - real[][] ts = intersections(l,p[i]); - for(real[] t:ts) - dot(point(l,t[0])); -} + { + real[][] ts = intersections(l,p[i]); + for(real[] t:ts) + dot(point(l,t[0])); + } path l2 = point(l,intersections(l,p[0])[0][0])--point(l,intersections(l,p[2])[1][0]); real to = intersections(l,p[0])[0][1]; real ti = intersections(l,p[2])[1][1]; @@ -71,7 +71,7 @@ filldraw(shift(w)*q,lightgrey); real x = min(p).x - 4.5w; string l = "abcdef"; for(int i = 0; i < 6; ++i) -{ - label("("+substr(l,i,1)+")",(x,min(p).y),3S,fontsize(10pt)); - x += w; -} + { + label("("+substr(l,i,1)+")",(x,min(p).y),3S,fontsize(10pt)); + x += w; + } diff --git a/graphics/asymptote/examples/mosaic.asy b/graphics/asymptote/examples/mosaic.asy index 0f19117c4b..0a59ca5691 100644 --- a/graphics/asymptote/examples/mosaic.asy +++ b/graphics/asymptote/examples/mosaic.asy @@ -19,7 +19,7 @@ path c_line(path p) { // returns the path obtained by adding to p a copy rotated // around the endpoint of p by 180 degrees // works only if the initial point and the endpoint of p are different - // a c_line is symetric with respect to the center of + // a c_line is symetric with respect to the center of // the straight line between its endpoints // return p..rotate(180,point(p,length(p)))*reverse(p); @@ -41,7 +41,7 @@ path tounitcircle(path p, int n=300) { } void centershade(picture pic=currentpicture, path p, pen in, pen out, - pen drawpen=currentpen) { + pen drawpen=currentpen) { pair center=0.5(max(p)+min(p)); real radius=0.5abs(max(p)-min(p)); radialshade(pic,p,in,center,0,out,center,radius); @@ -86,7 +86,7 @@ for(int i=0; i < entry.length; ++i) { } for(int j=0; j < 7; ++j) { - tage[j]=shift((j,yc)+diff)*kasten; + tage[j]=shift((j,yc)+diff)*kasten; filldraw(tage[j],farbe(j),black+2bp); label(wochentag[j],zentrum(tage[j]),Palatino()); for(int i=0; i < 6; ++i) {bx[i][j]=shift((j,-yc*i)+diff)*kasten; @@ -94,10 +94,10 @@ for(int j=0; j < 7; ++j) { if(holiday[i][j]) {filldraw(bx[i][j],farbe(6),black+2bp);}; }; }; -filldraw(Gkasten,0.3white,black+2bp); +filldraw(Gkasten,0.3white,black+2bp); for(int j=0; j < 7; ++j) for(int i=0; i < 6 ; ++i) {label(entry[i][j],zentrum(bx[i][j]),Palatino());} -label("\Huge Februar 2006",zentrum(Gkasten),Palatino()+white); +label("\Huge Februar 2006",zentrum(Gkasten),Palatino()+white); // Zentrum=center; Februar=february add(kalender,currentpicture); erase(); @@ -139,9 +139,9 @@ for(int j=-4; j < 4; ++j) (1-i/10)*chartreuse,black+2bp); } } - -// Now we produce the bijective images inside -// a suitably scaled unitcircle + +// Now we produce the bijective images inside +// a suitably scaled unitcircle for(int k=-1; k < 2; ++k) for(int l=-1; l < 2; ++l) { transform tr=shift(k*tri+l*trii); @@ -149,11 +149,11 @@ for(int k=-1; k < 2; ++k) centershade(temppic,scale(2.5)*tounitcircle(tr*kontur[i],380), (1-i/10)*white,(1-i/10)*orange,black+2bp); } - } - -add(temppic); + } + +add(temppic); -// We clip the picture to a suitable box +// We clip the picture to a suitable box pair piccenter=0.5*(temppic.min()+temppic.max()); pair picbox=temppic.max()-temppic.min(); real picwidth=picbox.x; @@ -162,4 +162,4 @@ transform trialtrans=shift(0,-1.5)*shift(piccenter)*yscale(scalefactor)* clip(trialtrans*unitsquare); // add the calendar at a suitable position -add(kalender.fit(0.75*outputwidth),interp(point(S),point(N),1/13)); +add(kalender.fit(0.75*outputwidth),interp(point(S),point(N),1/13)); diff --git a/graphics/asymptote/examples/mosquito.asy b/graphics/asymptote/examples/mosquito.asy index 7e299d264d..7b113eabb7 100644 --- a/graphics/asymptote/examples/mosquito.asy +++ b/graphics/asymptote/examples/mosquito.asy @@ -49,7 +49,7 @@ draw(minipage("\flushright{viral incubation rate ($k$)}",40pt),ei, RightSide,Arrow,PenMargin); path ise=point(infectious,E)--point(se,0.5); - + draw("$(ac)$",ise,LeftSide,dashed,Arrow,PenMargin); label(minipage("\flushleft{biting rate $\times$ transmission probability}",50pt),point(infectious,SE),dir(-60)+S); @@ -58,7 +58,7 @@ path isi=point(infectiousM,W)--point(si,2.0/3); draw("$(ab)$",isi,LeftSide,dashed,Arrow,PenMargin); draw(se,LeftSide,Arrow,PenMargin); - + real t=2.0; draw("$\beta_M$", point(susceptibleM,E){right}..tension t..{left}point(larval,E), diff --git a/graphics/asymptote/examples/near_earth.asy b/graphics/asymptote/examples/near_earth.asy index afdf64c6b5..faff012030 100644 --- a/graphics/asymptote/examples/near_earth.asy +++ b/graphics/asymptote/examples/near_earth.asy @@ -7,7 +7,7 @@ size(300,0); pen thickp=linewidth(0.5mm); real radius=0.8, lambda=37, aux=60; -currentprojection=perspective(4,1,2); +currentprojection=perspective(4,1,2); // Planes pen bg=gray(0.9)+opacity(0.5); @@ -21,7 +21,7 @@ draw(Label("$x$",1),O--r*X,p,Arrow3); draw(Label("$y$",1),O--r*Y,p,Arrow3); draw(Label("$z$",1),O--r*Z,p,Arrow3); label("$\rm O$",(0,0,0),W); - + // Point Q triple pQ=radius*dir(lambda,aux); draw(O--radius*dir(90,aux),dashed); diff --git a/graphics/asymptote/examples/oneoverx.asy b/graphics/asymptote/examples/oneoverx.asy index 5d9775d44d..9bbbf282ac 100644 --- a/graphics/asymptote/examples/oneoverx.asy +++ b/graphics/asymptote/examples/oneoverx.asy @@ -8,7 +8,7 @@ bool3 branch(real x) static int lastsign=0; if(x == 0) return false; int sign=sgn(x); - bool b=lastsign == 0 || sign == lastsign; + bool b=lastsign == 0 || sign == lastsign; lastsign=sign; return b ? true : default; } diff --git a/graphics/asymptote/examples/p-orbital.asy b/graphics/asymptote/examples/p-orbital.asy deleted file mode 100644 index 4638aa21a2..0000000000 --- a/graphics/asymptote/examples/p-orbital.asy +++ /dev/null @@ -1,31 +0,0 @@ -import graph3; -import palette; -size(200); -currentprojection=orthographic(6,8,2); -viewportmargin=(1cm,0); - -real c0=0.1; - -real f(real r) {return r*(1-r/6)*exp(-r/3);} - -triple f(pair t) { - real r=t.x; - real phi=t.y; - real f=f(r); - real s=max(min(f != 0 ? c0/f : 1,1),-1); - real R=r*sqrt(1-s^2); - return (R*cos(phi),R*sin(phi),r*s); -} - -bool cond(pair t) {return f(t.x) != 0;} - -real R=abs((20,20,20)); -surface s=surface(f,(0,0),(R,2pi),100,8,Spline,cond); - -s.colors(palette(s.map(abs),Gradient(palegreen,heavyblue))); - -render render=render(compression=Low,merge=true); -draw(s,render); -draw(zscale3(-1)*s); - -axes3("$x$","$y$","$z$",Arrow3); diff --git a/graphics/asymptote/examples/pOrbital.asy b/graphics/asymptote/examples/pOrbital.asy new file mode 100644 index 0000000000..fc8e96e7fe --- /dev/null +++ b/graphics/asymptote/examples/pOrbital.asy @@ -0,0 +1,31 @@ +import graph3; +import palette; +size(200); +currentprojection=orthographic(6,8,2); +viewportmargin=(1cm,0); + +real c0=0.1; + +real f(real r) {return r*(1-r/6)*exp(-r/3);} + +triple f(pair t) { + real r=t.x; + real phi=t.y; + real f=f(r); + real s=max(min(f != 0 ? c0/f : 1,1),-1); + real R=r*sqrt(1-s^2); + return (R*cos(phi),R*sin(phi),r*s); +} + +bool cond(pair t) {return f(t.x) != 0;} + +real R=abs((20,20,20)); +surface s=surface(f,(0,0),(R,2pi),100,8,Spline,cond); + +s.colors(palette(s.map(abs),Gradient(palegreen,heavyblue))); + +render render=render(compression=Low,merge=true); +draw(s,render); +draw(zscale3(-1)*s); + +axes3("$x$","$y$","$z$",Arrow3); diff --git a/graphics/asymptote/examples/pathintersectsurface.asy b/graphics/asymptote/examples/pathintersectsurface.asy index 73a78460e0..ef8cf94b89 100644 --- a/graphics/asymptote/examples/pathintersectsurface.asy +++ b/graphics/asymptote/examples/pathintersectsurface.asy @@ -7,11 +7,12 @@ path3 g=randompath3(10); draw(g,red); -triple[][] P={ - {(0,0,0),(1,0,0),(1,0,0),(2,0,0)}, - {(0,4/3,0),(2/3,4/3,2),(4/3,4/3,2),(2,4/3,0)}, - {(0,2/3,0),(2/3,2/3,0),(4/3,2/3,0),(2,2/3,0)}, - {(0,2,0),(2/3,2,0),(4/3,2,0),(2,2,0)}}; +triple[][] P= + { + {(0,0,0),(1,0,0),(1,0,0),(2,0,0)}, + {(0,4/3,0),(2/3,4/3,2),(4/3,4/3,2),(2,4/3,0)}, + {(0,2/3,0),(2/3,2/3,0),(4/3,2/3,0),(2,2/3,0)}, + {(0,2,0),(2/3,2,0),(4/3,2,0),(2,2,0)}}; surface s=surface(patch(P)); s.append(unitplane); diff --git a/graphics/asymptote/examples/pdb.asy b/graphics/asymptote/examples/pdb.asy index 43b771fdd0..68cec9e367 100644 --- a/graphics/asymptote/examples/pdb.asy +++ b/graphics/asymptote/examples/pdb.asy @@ -24,7 +24,7 @@ string filename="100d.pdb1"; string prefix=stripextension(filename); file data=input(filename); -pen color(string e) +pen color(string e) { e=replace(e," ",""); int n=length(e); @@ -33,7 +33,7 @@ pen color(string e) int index=find(Element == e); if(index < 0) return currentpen; return rgb(Hexcolor[index]); -} +} // ATOM string[] name,altLoc,resName,chainID,iCode,element,charge; @@ -42,7 +42,7 @@ real[][] occupancy,tempFactor; bool newchain=true; -struct bond +struct bond { int i,j; void operator init(int i, int j) { @@ -53,7 +53,7 @@ struct bond bond[] bonds; -struct atom +struct atom { string name; triple v; @@ -87,8 +87,8 @@ while(true) { serial=(int) substr(line,6,5); a.name=substr(line,76,2); a.v=((real) substr(line,30,8), - (real) substr(line,38,8), - (real) substr(line,46,8)); + (real) substr(line,38,8), + (real) substr(line,46,8)); } if(ATOM) { if(newchain) { @@ -109,12 +109,12 @@ while(true) { int i=(int) substr(line,6,5); while(true) { string s=replace(substr(line,11+k,5)," ",""); - if(s == "") break; + if(s == "") break; k += 5; int j=(int) s; if(j <= i) continue; bonds.push(bond(i,j)); - } + } } } @@ -158,7 +158,6 @@ string options; string viewfilename=prefix+".views"; if(!error(input(viewfilename,check=false))) - options="3Dviews="+viewfilename; + options="3Dviews="+locatefile(viewfilename); -shipout(prefix,options=options); -currentpicture.erase(); +shipout(options=options); diff --git a/graphics/asymptote/examples/pipes.asy b/graphics/asymptote/examples/pipes.asy index 383fda80fd..83c9ec609d 100644 --- a/graphics/asymptote/examples/pipes.asy +++ b/graphics/asymptote/examples/pipes.asy @@ -4,14 +4,14 @@ import graph3; import palette; size(8cm); -currentprojection=perspective( -camera=(13.3596389245356,8.01038090435314,14.4864483364785), -up=(-0.0207054323419367,-0.00472438375047319,0.0236460907598947), -target=(-1.06042550499095,2.68154529985845,0.795007562120261)); +currentprojection= + perspective(camera=(13.3596389245356,8.01038090435314,14.4864483364785), + up=(-0.0207054323419367,-0.00472438375047319,0.0236460907598947), + target=(-1.06042550499095,2.68154529985845,0.795007562120261)); defaultpen(fontsize(6pt)); -// draw coordinates and frames +// draw coordinates and frames // axis1 is defined by z axis of TBase // axis2 is defined by z axis of TEnd void DrawFrame(transform3 TBase, transform3 TEnd, string s) @@ -25,57 +25,57 @@ void DrawFrame(transform3 TBase, transform3 TEnd, string s) real[][] A= { - {v1.x,-v2.x,-n.x}, - {v1.y,-v2.y,-n.y}, - {v1.z,-v2.z,-n.z} + {v1.x,-v2.x,-n.x}, + {v1.y,-v2.y,-n.y}, + {v1.z,-v2.z,-n.z} }; triple vb=p2-p1; real[] b={vb.x,vb.y,vb.z}; - - // Get the extention along vector v1 and v2, + + // Get the extention along vector v1 and v2, // so, we can get the common normal between two axis real[] x=solve(A,b); real s1=x[0]; real s2=x[1]; - + // get foot of a perpendicular on both axies triple foot1=p1+s1*v1; triple foot2=p2+s2*v2; - + // draw two axis triple axis_a,axis_b; axis_a=p1+s1*v1*1.5; axis_b=p1-s1*v1*1.5; draw(axis_a--axis_b); - + axis_a=p2+s2*v2*1.5; axis_b=p2-s2*v2*1.5; draw(axis_a--axis_b); - - // draw "a"(common normal) - draw(Label("$a_{"+s+"}$"),foot1--foot2,linewidth(1pt)); + + // draw "a"(common normal) + draw(Label("$a_{"+s+"}$"),foot1--foot2,linewidth(1pt)); // draw the coordinates frame triple dx,dy,dz,org; real length=0.8; - + org=foot1; dx =length*unit(foot2-foot1); // define the x axis of the frame on "a" dz =length*unit(v1); // define the z axis which is along axis1 dy =length*unit(cross(dz,dx)); - + draw(Label("$X_{"+s+"}$",1,align=-dy-dz),org--(org+dx),red+linewidth(1.5pt), Arrow3(8)); - draw(Label("$Y_{"+s+"}$",1,align=2dy-dz-dx),org--(org+dy), - green+linewidth(1.5pt), Arrow3(8)); + draw(Label("$Y_{"+s+"}$",1,align=2dy-dz-dx),org--(org+dy), + green+linewidth(1.5pt), Arrow3(8)); draw(Label("$Z_{"+s+"}$",1,align=-2dx-dy),org--(org+dz), - blue+linewidth(1.5pt), Arrow3(8)); - + blue+linewidth(1.5pt), Arrow3(8)); + dot(Label("$O_{"+s+"}$",align =-dx-dz,black),org,black); // origin - + } void DrawLink(transform3 TBase, transform3 TEnd, pen objStyle,string s) @@ -85,27 +85,27 @@ void DrawLink(transform3 TBase, transform3 TEnd, pen objStyle,string s) path3 generator=(0.5*r,0,h)--(r,0,h)--(r,0,0)--(0.5*r,0,0); revolution vase=revolution(O,generator,0,360); surface objSurface=surface(vase); - + render render=render(merge=true); // draw two cylinders draw(TBase*objSurface,objStyle,render); draw(TEnd*shift((0,0,-h+1e-5))*objSurface,objStyle,render); - + // draw the link between two cylinders triple pStart=TBase*(0.5*h*Z); triple pEnd =TEnd*(-0.5*h*Z); triple pControl1=0.25*(pEnd-pStart)+TBase*(0,0,h); triple pControl2=-0.25*(pEnd-pStart)+TEnd*(0,0,-h); path3 p=pStart..controls pControl1 and pControl2..pEnd; - draw(tube(p,scale(0.2)*unitsquare),objStyle,render); + draw(tube(p,scale(0.2)*unitsquare),objStyle,render); } // t1 and t2 define the starting frame and ending frame of the first link(i-1) transform3 t1=shift((0,0,1)); transform3 t2=shift((0,0,-1))*rotate(-20,Y)*shift((0,3,2)); // as, the two links were connected, so t2 is also the starting frame of link(i) -// t3 defines the ending frame of link(i) +// t3 defines the ending frame of link(i) transform3 t3=t2*rotate(40,Z)*shift((0,3,1.5))*rotate(-15,Y)*shift(-1.5*Z); // draw link(i-1) @@ -137,4 +137,4 @@ draw("$\theta_{i}$",arc(p0,p1a,p2),ArcArrow3(3)); // draw d_{i-1} triple org_i =t2*shift((0,0,1.5))*O; -draw(Label("$d_{i}$",0.13),p0--org_i,linewidth(1pt)); +draw(Label("$d_{i}$",0.13),p0--org_i,linewidth(1pt)); diff --git a/graphics/asymptote/examples/poster.asy b/graphics/asymptote/examples/poster.asy index cbcefc4bf6..b49d064d84 100644 --- a/graphics/asymptote/examples/poster.asy +++ b/graphics/asymptote/examples/poster.asy @@ -16,7 +16,7 @@ label(background,"$x\sin\frac{1}{x}$",F(0.92/pi),3SE,grey+fontsize(14pt)); frame f=background.fit(); box(f,RadialShade(yellow,0.6*yellow+red),above=false); background.erase(); -add(background,f); +add(background,f); title("Young Researchers' Conference",align=3S,fontsize(48pt)); center("University of Alberta, Edmonton, April 1--2, 2006"); diff --git a/graphics/asymptote/examples/projectrevolution.asy b/graphics/asymptote/examples/projectrevolution.asy index 8bbe7f38c3..a6755af209 100644 --- a/graphics/asymptote/examples/projectrevolution.asy +++ b/graphics/asymptote/examples/projectrevolution.asy @@ -1,17 +1,17 @@ -import solids; -import palette; - -currentprojection=orthographic(20,0,3); - -size(400,300,IgnoreAspect); - +import solids; +import palette; + +currentprojection=orthographic(20,0,3); + +size(400,300,IgnoreAspect); + revolution r=revolution(graph(new triple(real x) { - return (x,0,sin(x)*exp(-x/2));},0,2pi,operator ..),axis=Z); -surface s=surface(r); - + return (x,0,sin(x)*exp(-x/2));},0,2pi,operator ..),axis=Z); +surface s=surface(r); + surface S=planeproject(shift(-Z)*unitsquare3)*s; S.colors(palette(s.map(zpart),Rainbow())); render render=render(compression=Low,merge=true); draw(S,render); -draw(s,lightgray,render); +draw(s,lightgray,render); diff --git a/graphics/asymptote/examples/rainbow.asy b/graphics/asymptote/examples/rainbow.asy index c85282a87b..1da0e07ae7 100644 --- a/graphics/asymptote/examples/rainbow.asy +++ b/graphics/asymptote/examples/rainbow.asy @@ -4,7 +4,7 @@ pen indigo=rgb(102/255,0,238/255); void rainbow(path g) { draw(new path[] {scale(1.3)*g,scale(1.2)*g,scale(1.1)*g,g, - scale(0.9)*g,scale(0.8)*g,scale(0.7)*g}, + scale(0.9)*g,scale(0.8)*g,scale(0.7)*g}, new pen[] {red,orange,yellow,green,blue,indigo,purple}); } diff --git a/graphics/asymptote/examples/roll.asy b/graphics/asymptote/examples/roll.asy index 4d15ac0feb..52b34b0ca2 100644 --- a/graphics/asymptote/examples/roll.asy +++ b/graphics/asymptote/examples/roll.asy @@ -3,7 +3,7 @@ import graph3; size(200,0); triple f(pair t) { -return(t.x+t.y/4+sin(t.y),cos(t.y),sin(t.y)); + return(t.x+t.y/4+sin(t.y),cos(t.y),sin(t.y)); } surface s=surface(f,(0,0),(2pi,2pi),7,20,Spline); diff --git a/graphics/asymptote/examples/roundpath.asy b/graphics/asymptote/examples/roundpath.asy index e6d31c6bc9..58fa17e826 100644 --- a/graphics/asymptote/examples/roundpath.asy +++ b/graphics/asymptote/examples/roundpath.asy @@ -22,7 +22,7 @@ draw(shift(-30,-30)*roundedpath(B,1), red); for (int i = 1; i < 20; ++i) // only round edges draw(shift(0,-30)*roundedpath(B,i/4), rgb(0.5, i*0.049,0) + linewidth(0.5)); -for (int i = 1; i < 20; ++i) // round edged and scale +for (int i = 1; i < 20; ++i) // round edged and scale draw(shift(0,-60)*roundedpath(B,i/4,1-i/50), rgb(1, 1 - i*0.049,i*0.049) + linewidth(0.5)); for (int i = 1; i < 50; ++i) // shift (round edged und scaled shifted version) diff --git a/graphics/asymptote/examples/shadestroke.asy b/graphics/asymptote/examples/shadestroke.asy index 44f0b6e8a3..b4ee872aa1 100644 --- a/graphics/asymptote/examples/shadestroke.asy +++ b/graphics/asymptote/examples/shadestroke.asy @@ -1,5 +1,5 @@ size(100); radialshade(W..N..E--(0,0),stroke=true, - red+linewidth(30),(0,0),0.25,yellow,(0,0),1); + red+linewidth(30),(0,0),0.25,yellow,(0,0),1); diff --git a/graphics/asymptote/examples/sinxlex.asy b/graphics/asymptote/examples/sinxlex.asy index 912fa3c889..051411699f 100644 --- a/graphics/asymptote/examples/sinxlex.asy +++ b/graphics/asymptote/examples/sinxlex.asy @@ -3,7 +3,7 @@ import geometry; size(0,100); real theta=30; -pair A=(0,0); +pair A=(0,0); pair B=dir(theta); pair C=(1,0); pair D=(1,Tan(theta)); @@ -21,4 +21,4 @@ dot("$C$",C); dot("$D$",D); dot(("$E$"),E,S); label("$1$",A--B,LeftSide); - + diff --git a/graphics/asymptote/examples/slope.asy b/graphics/asymptote/examples/slope.asy index ae7fb45daf..832f8c13fc 100644 --- a/graphics/asymptote/examples/slope.asy +++ b/graphics/asymptote/examples/slope.asy @@ -20,8 +20,8 @@ real Y0[]=new real[] {-1,2}; real[] F(real t, real[] y) { return sequence(new real(int m) {return f(t,y[M-m-1]);},M); - // return new real[] {exp((L[1]-1)*t)*y[1], - // -exp(-(L[1]-1)*t)*y[0]}; + // return new real[] {exp((L[1]-1)*t)*y[1], + // -exp(-(L[1]-1)*t)*y[0]}; // return new real[]{-y[0]^2}; } @@ -46,23 +46,23 @@ for(int i=0; i < n-1; ++i) { // real[] exact=new real[] {exp(-b)*sin(b),exp(-L[1]*b)*cos(b)}; for(int m=0; m < M; ++m) maxnorm=max(maxnorm,abs(S.y[S.y.length-1][m]-exact[m])); - if(maxnorm != 0) { - tau.push(dt); - // error.push(dt^-(order+1)*maxnorm); - error.push(maxnorm); - } + if(maxnorm != 0) { + tau.push(dt); + // error.push(dt^-(order+1)*maxnorm); + error.push(maxnorm); + } } /* -for(int i=0; i < n-1; ++i) { + for(int i=0; i < n-1; ++i) { real dt=(b-a)*lambda^(n-i); real maxnorm=0; for(int m=0; m < M; ++m) { - solution S=integrate(Y0[m],L[m],f,a,b,dt,dynamic=false,0.000,1000,RK4_375,verbose=false); - maxnorm=max(maxnorm,abs(S.y[S.y.length-1]-exact[m])); + solution S=integrate(Y0[m],L[m],f,a,b,dt,dynamic=false,0.000,1000,RK4_375,verbose=false); + maxnorm=max(maxnorm,abs(S.y[S.y.length-1]-exact[m])); } error2.push(dt^-order*maxnorm); -} + } */ //scale(Log,Log); diff --git a/graphics/asymptote/examples/soccerball.asy b/graphics/asymptote/examples/soccerball.asy index 4612769833..68a95edbdc 100644 --- a/graphics/asymptote/examples/soccerball.asy +++ b/graphics/asymptote/examples/soccerball.asy @@ -6,39 +6,40 @@ settings.digits=15; defaultrender=render(compression=Zero,merge=true); real c=(1+sqrt(5))/2; - + triple[] z={(c,1,0),(-c,1,0),(-c,-1,0),(c,-1,0)}; triple[] x={(0,c,1),(0,-c,1),(0,-c,-1),(0,c,-1)}; triple[] y={(1,0,c),(1,0,-c),(-1,0,-c),(-1,0,c)}; - -triple[][] Q={ - {z[0],y[1],x[3],x[0],y[0],z[3]}, - {z[1],x[0],x[3],y[2],z[2],y[3]}, - {z[2],z[1],y[2],x[2],x[1],y[3]}, - {z[3],z[0],y[0],x[1],x[2],y[1]}, - {x[0],x[3],z[1],y[3],y[0],z[0]}, - {x[1],x[2],z[2],y[3],y[0],z[3]}, - {x[2],x[1],z[3],y[1],y[2],z[2]}, - {x[3],x[0],z[0],y[1],y[2],z[1]}, - {y[0],y[3],x[1],z[3],z[0],x[0]}, - {y[1],y[2],x[2],z[3],z[0],x[3]}, - {y[2],y[1],x[3],z[1],z[2],x[2]}, - {y[3],y[0],x[0],z[1],z[2],x[1]} -}; - + +triple[][] Q= + { + {z[0],y[1],x[3],x[0],y[0],z[3]}, + {z[1],x[0],x[3],y[2],z[2],y[3]}, + {z[2],z[1],y[2],x[2],x[1],y[3]}, + {z[3],z[0],y[0],x[1],x[2],y[1]}, + {x[0],x[3],z[1],y[3],y[0],z[0]}, + {x[1],x[2],z[2],y[3],y[0],z[3]}, + {x[2],x[1],z[3],y[1],y[2],z[2]}, + {x[3],x[0],z[0],y[1],y[2],z[1]}, + {y[0],y[3],x[1],z[3],z[0],x[0]}, + {y[1],y[2],x[2],z[3],z[0],x[3]}, + {y[2],y[1],x[3],z[1],z[2],x[2]}, + {y[3],y[0],x[0],z[1],z[2],x[1]} + }; + int nArc=4; path3 p=Arc(O,Q[0][0],Q[0][1],nArc); real R=abs(point(p,reltime(p,1/3))); - + triple[][] P; for(int i=0;i < Q.length;++i){ P[i]=new triple[] ; for(int j=0;j < Q[i].length;++j){ P[i][j]=Q[i][j]/R; - } -} - + } +} + // FIXME: Use a baryicentric coordinate mesh surface sphericaltriangle(triple center, triple A, triple B, triple C, int nu=3, int nv=nu) { @@ -49,10 +50,10 @@ surface sphericaltriangle(triple center, triple A, triple B, triple C, path3 cr=Arc(O,relpoint(tri2,p.x),relpoint(tri3,p.x),nArc); return relpoint(cr,p.y); }; - + return surface(tri,(0,0),(1-sqrtEpsilon,1),nu,nv,Spline); -} - +} + for(int i=0;i < P.length;++i){ triple[] pentagon=sequence(new triple(int k) { path3 p=Arc(O,P[i][0],P[i][k+1],nArc); @@ -65,8 +66,8 @@ for(int i=0;i < P.length;++i){ for(int i=0;i < 5;++i){ surface sf=sphericaltriangle(O,pentagon[i],M,pentagon[i+1]); draw(sf,black); - } -} + } +} for(int i=0;i < P.length;++i) { for(int j=1;j <= 5;++j) { @@ -86,6 +87,6 @@ for(int i=0;i < P.length;++i) { for(int i=0;i < 6;++i) { surface sf=sphericaltriangle(O,hexagon[i],M,hexagon[i+1]); draw(sf,white); - } - } + } + } } diff --git a/graphics/asymptote/examples/spectrum.asy b/graphics/asymptote/examples/spectrum.asy index a5d576921c..95c5f8a0d1 100644 --- a/graphics/asymptote/examples/spectrum.asy +++ b/graphics/asymptote/examples/spectrum.asy @@ -11,7 +11,7 @@ pen nm2rgb(real wl, real gamma=0.8, bool intensity=true) { if(wl > 510 && wl <= 580) {rgb=((wl-510)/70,1,0);} if(wl > 580 && wl <= 645) {rgb=(1,(645-wl)/65,0);} if(wl > 645 && wl <= 780) {rgb=(1,0,0);} - + real Intensity=1; if(intensity) { if(wl >= 700) {Intensity=0.3+0.7*(780-wl)/80;} diff --git a/graphics/asymptote/examples/sphereskeleton.asy b/graphics/asymptote/examples/sphereskeleton.asy index ca8b8c3d58..6585f7c203 100644 --- a/graphics/asymptote/examples/sphereskeleton.asy +++ b/graphics/asymptote/examples/sphereskeleton.asy @@ -1,9 +1,9 @@ -size(100); -import solids; +size(100); +import solids; currentprojection=orthographic(5,4,2); -revolution sphere=sphere(1); +revolution sphere=sphere(1); draw(surface(sphere),green+opacity(0.2)); draw(sphere,m=7,blue); diff --git a/graphics/asymptote/examples/spiral3.asy b/graphics/asymptote/examples/spiral3.asy index 727ca3f6d3..79a15a52c4 100644 --- a/graphics/asymptote/examples/spiral3.asy +++ b/graphics/asymptote/examples/spiral3.asy @@ -1,8 +1,8 @@ import graph3; import palette; - + size3(10cm); - + currentprojection=orthographic(5,4,2); viewportmargin=(2cm,0); diff --git a/graphics/asymptote/examples/spline.asy b/graphics/asymptote/examples/spline.asy index 9d79ef3a96..f01ba3306e 100644 --- a/graphics/asymptote/examples/spline.asy +++ b/graphics/asymptote/examples/spline.asy @@ -1,15 +1,15 @@ -import graph; -import interpolate; - -size(15cm,15cm,IgnoreAspect); - -real a=1997, b=2002; -int n=5; -real[] xpt=a+sequence(n+1)*(b-a)/n; -real[] ypt={31,36,26,22,21,24}; +import graph; +import interpolate; + +size(15cm,15cm,IgnoreAspect); + +real a=1997, b=2002; +int n=5; +real[] xpt=a+sequence(n+1)*(b-a)/n; +real[] ypt={31,36,26,22,21,24}; horner h=diffdiv(xpt,ypt); fhorner L=fhorner(h); - + scale(false,true); pen p=linewidth(1); diff --git a/graphics/asymptote/examples/splitpatch.asy b/graphics/asymptote/examples/splitpatch.asy index f8578bbbcc..1fa9325f4c 100644 --- a/graphics/asymptote/examples/splitpatch.asy +++ b/graphics/asymptote/examples/splitpatch.asy @@ -33,10 +33,10 @@ struct split if(depth > 0) write(pt.tree[i],qt.tree[j],Pi,Qj,depth); } - } + } } } - + // Output the subpatches of p from subdivision. void read(surface[] S, tree t, triple[][] p, int depth=n) { --depth; @@ -44,7 +44,7 @@ struct split triple[][][] P=Split(p); for(int i=0; i < 2; ++i) { - if(t.tree.initialized(i)) + if(t.tree.initialized(i)) read(S,t.tree[i],P[i],depth); else { S[0].push(patch(P[i])); @@ -62,19 +62,21 @@ struct split currentprojection=orthographic(0,0,1); -triple[][] A={ - {(0,0,0),(1,0,0),(1,0,0),(2,0,0)}, - {(0,4/3,0),(2/3,4/3,2),(4/3,4/3,2),(2,4/3,0)}, - {(0,2/3,0),(2/3,2/3,0),(4/3,2/3,0),(2,2/3,0)}, - {(0,2,0),(2/3,2,0),(4/3,2,0),(2,2,0)} -}; +triple[][] A= + { + {(0,0,0),(1,0,0),(1,0,0),(2,0,0)}, + {(0,4/3,0),(2/3,4/3,2),(4/3,4/3,2),(2,4/3,0)}, + {(0,2/3,0),(2/3,2/3,0),(4/3,2/3,0),(2,2/3,0)}, + {(0,2,0),(2/3,2,0),(4/3,2,0),(2,2,0)} + }; -triple[][] B={ - {(0.5,0,-1),(0.5,1,-1),(0.5,2,-1),(0.5,3,-1)}, - {(0.5,0,0),(0.5,1,0),(0.5,2,0),(0.5,3,0)}, - {(0.5,0,1),(0.5,1,1),(0.5,2,1),(0.5,3,1)}, - {(0.5,0,2),(0.5,1,2),(0.5,2,2),(0.5,3,2)} -}; +triple[][] B= + { + {(0.5,0,-1),(0.5,1,-1),(0.5,2,-1),(0.5,3,-1)}, + {(0.5,0,0),(0.5,1,0),(0.5,2,0),(0.5,3,0)}, + {(0.5,0,1),(0.5,1,1),(0.5,2,1),(0.5,3,1)}, + {(0.5,0,2),(0.5,1,2),(0.5,2,2),(0.5,3,2)} + }; split S=split(B,A); diff --git a/graphics/asymptote/examples/spring.asy b/graphics/asymptote/examples/spring.asy index cbfb256eee..4427d3a0f8 100644 --- a/graphics/asymptote/examples/spring.asy +++ b/graphics/asymptote/examples/spring.asy @@ -2,7 +2,7 @@ pair coilpoint(real lambda, real r, real t) { return (2.0*lambda*t+r*cos(t),r*sin(t)); } - + guide coil(guide g=nullpath, real lambda, real r, real a, real b, int n) { real width=(b-a)/n; @@ -15,14 +15,14 @@ guide coil(guide g=nullpath, real lambda, real r, real a, real b, int n) void drawspring(real x, string label) { real r=8; - real t1=-pi; + real t1=-pi; real t2=10*pi; real lambda=(t2-t1+x)/(t2-t1); pair b=coilpoint(lambda,r,t1); pair c=coilpoint(lambda,r,t2); pair a=b-20; pair d=c+20; - + draw(a--b,BeginBar(2*barsize())); draw(c--d); draw(coil(lambda,r,t1,t2,100)); diff --git a/graphics/asymptote/examples/stereoscopic.asy b/graphics/asymptote/examples/stereoscopic.asy index 639333ec47..6cf847e9c0 100644 --- a/graphics/asymptote/examples/stereoscopic.asy +++ b/graphics/asymptote/examples/stereoscopic.asy @@ -1,11 +1,11 @@ import three; - + currentprojection=perspective(50*dir(70,15)); picture pic; unitsize(pic,1cm); draw(pic,xscale3(10)*unitcube,yellow,blue); - + addStereoViews(pic); diff --git a/graphics/asymptote/examples/strokeshade.asy b/graphics/asymptote/examples/strokeshade.asy index f9413091d1..2e0a3b0f4d 100644 --- a/graphics/asymptote/examples/strokeshade.asy +++ b/graphics/asymptote/examples/strokeshade.asy @@ -1,4 +1,4 @@ size(100); guide g=(0,0)..controls(70,30) and (-40,30)..(30,0); latticeshade(g,stroke=true,linewidth(10), - new pen[][] {{red,orange,yellow},{green,blue,purple}}); + new pen[][] {{red,orange,yellow},{green,blue,purple}}); diff --git a/graphics/asymptote/examples/teapot.asy b/graphics/asymptote/examples/teapot.asy index bff93ace19..f3328151fd 100644 --- a/graphics/asymptote/examples/teapot.asy +++ b/graphics/asymptote/examples/teapot.asy @@ -5,168 +5,200 @@ size(20cm); currentprojection=perspective(250,-250,250); currentlight=Viewport; -triple[][][] Q={ +triple[][][] Q= { + { {(39.68504,0,68.0315),(37.91339,0,71.75197),(40.74803,0,71.75197),(42.51969,0,68.0315)}, {(39.68504,-22.22362,68.0315),(37.91339,-21.2315,71.75197),(40.74803,-22.8189,71.75197),(42.51969,-23.81102,68.0315)}, {(22.22362,-39.68504,68.0315),(21.2315,-37.91339,71.75197),(22.8189,-40.74803,71.75197),(23.81102,-42.51969,68.0315)}, {(0,-39.68504,68.0315),(0,-37.91339,71.75197),(0,-40.74803,71.75197),(0,-42.51969,68.0315)} - },{ + }, + { {(0,-39.68504,68.0315),(0,-37.91339,71.75197),(0,-40.74803,71.75197),(0,-42.51969,68.0315)}, {(-22.22362,-39.68504,68.0315),(-21.2315,-37.91339,71.75197),(-22.8189,-40.74803,71.75197),(-23.81102,-42.51969,68.0315)}, {(-39.68504,-22.22362,68.0315),(-37.91339,-21.2315,71.75197),(-40.74803,-22.8189,71.75197),(-42.51969,-23.81102,68.0315)}, {(-39.68504,0,68.0315),(-37.91339,0,71.75197),(-40.74803,0,71.75197),(-42.51969,0,68.0315)} - },{ + }, + { {(-39.68504,0,68.0315),(-37.91339,0,71.75197),(-40.74803,0,71.75197),(-42.51969,0,68.0315)}, {(-39.68504,22.22362,68.0315),(-37.91339,21.2315,71.75197),(-40.74803,22.8189,71.75197),(-42.51969,23.81102,68.0315)}, {(-22.22362,39.68504,68.0315),(-21.2315,37.91339,71.75197),(-22.8189,40.74803,71.75197),(-23.81102,42.51969,68.0315)}, {(0,39.68504,68.0315),(0,37.91339,71.75197),(0,40.74803,71.75197),(0,42.51969,68.0315)} - },{ + }, + { {(0,39.68504,68.0315),(0,37.91339,71.75197),(0,40.74803,71.75197),(0,42.51969,68.0315)}, {(22.22362,39.68504,68.0315),(21.2315,37.91339,71.75197),(22.8189,40.74803,71.75197),(23.81102,42.51969,68.0315)}, {(39.68504,22.22362,68.0315),(37.91339,21.2315,71.75197),(40.74803,22.8189,71.75197),(42.51969,23.81102,68.0315)}, {(39.68504,0,68.0315),(37.91339,0,71.75197),(40.74803,0,71.75197),(42.51969,0,68.0315)} - },{ + }, + { {(42.51969,0,68.0315),(49.60629,0,53.1496),(56.69291,0,38.26771),(56.69291,0,25.51181)}, {(42.51969,-23.81102,68.0315),(49.60629,-27.77952,53.1496),(56.69291,-31.74803,38.26771),(56.69291,-31.74803,25.51181)}, {(23.81102,-42.51969,68.0315),(27.77952,-49.60629,53.1496),(31.74803,-56.69291,38.26771),(31.74803,-56.69291,25.51181)}, {(0,-42.51969,68.0315),(0,-49.60629,53.1496),(0,-56.69291,38.26771),(0,-56.69291,25.51181)} - },{ + }, + { {(0,-42.51969,68.0315),(0,-49.60629,53.1496),(0,-56.69291,38.26771),(0,-56.69291,25.51181)}, {(-23.81102,-42.51969,68.0315),(-27.77952,-49.60629,53.1496),(-31.74803,-56.69291,38.26771),(-31.74803,-56.69291,25.51181)}, {(-42.51969,-23.81102,68.0315),(-49.60629,-27.77952,53.1496),(-56.69291,-31.74803,38.26771),(-56.69291,-31.74803,25.51181)}, {(-42.51969,0,68.0315),(-49.60629,0,53.1496),(-56.69291,0,38.26771),(-56.69291,0,25.51181)} - },{ + }, + { {(-42.51969,0,68.0315),(-49.60629,0,53.1496),(-56.69291,0,38.26771),(-56.69291,0,25.51181)}, {(-42.51969,23.81102,68.0315),(-49.60629,27.77952,53.1496),(-56.69291,31.74803,38.26771),(-56.69291,31.74803,25.51181)}, {(-23.81102,42.51969,68.0315),(-27.77952,49.60629,53.1496),(-31.74803,56.69291,38.26771),(-31.74803,56.69291,25.51181)}, {(0,42.51969,68.0315),(0,49.60629,53.1496),(0,56.69291,38.26771),(0,56.69291,25.51181)} - },{ + }, + { {(0,42.51969,68.0315),(0,49.60629,53.1496),(0,56.69291,38.26771),(0,56.69291,25.51181)}, {(23.81102,42.51969,68.0315),(27.77952,49.60629,53.1496),(31.74803,56.69291,38.26771),(31.74803,56.69291,25.51181)}, {(42.51969,23.81102,68.0315),(49.60629,27.77952,53.1496),(56.69291,31.74803,38.26771),(56.69291,31.74803,25.51181)}, {(42.51969,0,68.0315),(49.60629,0,53.1496),(56.69291,0,38.26771),(56.69291,0,25.51181)} - },{ + }, + { {(56.69291,0,25.51181),(56.69291,0,12.7559),(42.51969,0,6.377957),(42.51969,0,4.251961)}, {(56.69291,-31.74803,25.51181),(56.69291,-31.74803,12.7559),(42.51969,-23.81102,6.377957),(42.51969,-23.81102,4.251961)}, {(31.74803,-56.69291,25.51181),(31.74803,-56.69291,12.7559),(23.81102,-42.51969,6.377957),(23.81102,-42.51969,4.251961)}, {(0,-56.69291,25.51181),(0,-56.69291,12.7559),(0,-42.51969,6.377957),(0,-42.51969,4.251961)} - },{ + }, + { {(0,-56.69291,25.51181),(0,-56.69291,12.7559),(0,-42.51969,6.377957),(0,-42.51969,4.251961)}, {(-31.74803,-56.69291,25.51181),(-31.74803,-56.69291,12.7559),(-23.81102,-42.51969,6.377957),(-23.81102,-42.51969,4.251961)}, {(-56.69291,-31.74803,25.51181),(-56.69291,-31.74803,12.7559),(-42.51969,-23.81102,6.377957),(-42.51969,-23.81102,4.251961)}, {(-56.69291,0,25.51181),(-56.69291,0,12.7559),(-42.51969,0,6.377957),(-42.51969,0,4.251961)} - },{ + }, + { {(-56.69291,0,25.51181),(-56.69291,0,12.7559),(-42.51969,0,6.377957),(-42.51969,0,4.251961)}, {(-56.69291,31.74803,25.51181),(-56.69291,31.74803,12.7559),(-42.51969,23.81102,6.377957),(-42.51969,23.81102,4.251961)}, {(-31.74803,56.69291,25.51181),(-31.74803,56.69291,12.7559),(-23.81102,42.51969,6.377957),(-23.81102,42.51969,4.251961)}, {(0,56.69291,25.51181),(0,56.69291,12.7559),(0,42.51969,6.377957),(0,42.51969,4.251961)} - },{ + }, + { {(0,56.69291,25.51181),(0,56.69291,12.7559),(0,42.51969,6.377957),(0,42.51969,4.251961)}, {(31.74803,56.69291,25.51181),(31.74803,56.69291,12.7559),(23.81102,42.51969,6.377957),(23.81102,42.51969,4.251961)}, {(56.69291,31.74803,25.51181),(56.69291,31.74803,12.7559),(42.51969,23.81102,6.377957),(42.51969,23.81102,4.251961)}, {(56.69291,0,25.51181),(56.69291,0,12.7559),(42.51969,0,6.377957),(42.51969,0,4.251961)} - },{ + }, + { {(-45.35433,0,57.40157),(-65.19685,0,57.40157),(-76.53543,0,57.40157),(-76.53543,0,51.02362)}, {(-45.35433,-8.503932,57.40157),(-65.19685,-8.503932,57.40157),(-76.53543,-8.503932,57.40157),(-76.53543,-8.503932,51.02362)}, {(-42.51969,-8.503932,63.77952),(-70.86614,-8.503932,63.77952),(-85.03937,-8.503932,63.77952),(-85.03937,-8.503932,51.02362)}, {(-42.51969,0,63.77952),(-70.86614,0,63.77952),(-85.03937,0,63.77952),(-85.03937,0,51.02362)} - },{ + }, + { {(-42.51969,0,63.77952),(-70.86614,0,63.77952),(-85.03937,0,63.77952),(-85.03937,0,51.02362)}, {(-42.51969,8.503932,63.77952),(-70.86614,8.503932,63.77952),(-85.03937,8.503932,63.77952),(-85.03937,8.503932,51.02362)}, {(-45.35433,8.503932,57.40157),(-65.19685,8.503932,57.40157),(-76.53543,8.503932,57.40157),(-76.53543,8.503932,51.02362)}, {(-45.35433,0,57.40157),(-65.19685,0,57.40157),(-76.53543,0,57.40157),(-76.53543,0,51.02362)} - },{ + }, + { {(-76.53543,0,51.02362),(-76.53543,0,44.64566),(-70.86614,0,31.88976),(-56.69291,0,25.51181)}, {(-76.53543,-8.503932,51.02362),(-76.53543,-8.503932,44.64566),(-70.86614,-8.503932,31.88976),(-56.69291,-8.503932,25.51181)}, {(-85.03937,-8.503932,51.02362),(-85.03937,-8.503932,38.26771),(-75.11811,-8.503932,26.5748),(-53.85826,-8.503932,17.00787)}, {(-85.03937,0,51.02362),(-85.03937,0,38.26771),(-75.11811,0,26.5748),(-53.85826,0,17.00787)} - },{ + }, + { {(-85.03937,0,51.02362),(-85.03937,0,38.26771),(-75.11811,0,26.5748),(-53.85826,0,17.00787)}, {(-85.03937,8.503932,51.02362),(-85.03937,8.503932,38.26771),(-75.11811,8.503932,26.5748),(-53.85826,8.503932,17.00787)}, {(-76.53543,8.503932,51.02362),(-76.53543,8.503932,44.64566),(-70.86614,8.503932,31.88976),(-56.69291,8.503932,25.51181)}, {(-76.53543,0,51.02362),(-76.53543,0,44.64566),(-70.86614,0,31.88976),(-56.69291,0,25.51181)} - },{ + }, + { {(48.18897,0,40.3937),(73.70078,0,40.3937),(65.19685,0,59.52755),(76.53543,0,68.0315)}, {(48.18897,-18.70866,40.3937),(73.70078,-18.70866,40.3937),(65.19685,-7.086619,59.52755),(76.53543,-7.086619,68.0315)}, {(48.18897,-18.70866,17.00787),(87.87401,-18.70866,23.38582),(68.0315,-7.086619,57.40157),(93.5433,-7.086619,68.0315)}, {(48.18897,0,17.00787),(87.87401,0,23.38582),(68.0315,0,57.40157),(93.5433,0,68.0315)} - },{ + }, + { {(48.18897,0,17.00787),(87.87401,0,23.38582),(68.0315,0,57.40157),(93.5433,0,68.0315)}, {(48.18897,18.70866,17.00787),(87.87401,18.70866,23.38582),(68.0315,7.086619,57.40157),(93.5433,7.086619,68.0315)}, {(48.18897,18.70866,40.3937),(73.70078,18.70866,40.3937),(65.19685,7.086619,59.52755),(76.53543,7.086619,68.0315)}, {(48.18897,0,40.3937),(73.70078,0,40.3937),(65.19685,0,59.52755),(76.53543,0,68.0315)} - },{ + }, + { {(76.53543,0,68.0315),(79.37007,0,70.15748),(82.20472,0,70.15748),(79.37007,0,68.0315)}, {(76.53543,-7.086619,68.0315),(79.37007,-7.086619,70.15748),(82.20472,-4.251961,70.15748),(79.37007,-4.251961,68.0315)}, {(93.5433,-7.086619,68.0315),(99.92125,-7.086619,70.68897),(97.79527,-4.251961,71.22047),(90.70866,-4.251961,68.0315)}, {(93.5433,0,68.0315),(99.92125,0,70.68897),(97.79527,0,71.22047),(90.70866,0,68.0315)} - },{ + }, + { {(93.5433,0,68.0315),(99.92125,0,70.68897),(97.79527,0,71.22047),(90.70866,0,68.0315)}, {(93.5433,7.086619,68.0315),(99.92125,7.086619,70.68897),(97.79527,4.251961,71.22047),(90.70866,4.251961,68.0315)}, {(76.53543,7.086619,68.0315),(79.37007,7.086619,70.15748),(82.20472,4.251961,70.15748),(79.37007,4.251961,68.0315)}, {(76.53543,0,68.0315),(79.37007,0,70.15748),(82.20472,0,70.15748),(79.37007,0,68.0315)} - },{ + }, + { {(0,0,89.29133),(22.67716,0,89.29133),(0,0,80.7874),(5.669294,0,76.53543)}, {(0,0,89.29133),(22.67716,-12.7559,89.29133),(0,0,80.7874),(5.669294,-3.174809,76.53543)}, {(0,0,89.29133),(12.7559,-22.67716,89.29133),(0,0,80.7874),(3.174809,-5.669294,76.53543)}, {(0,0,89.29133),(0,-22.67716,89.29133),(0,0,80.7874),(0,-5.669294,76.53543)} - },{ + }, + { {(0,0,89.29133),(0,-22.67716,89.29133),(0,0,80.7874),(0,-5.669294,76.53543)}, {(0,0,89.29133),(-12.7559,-22.67716,89.29133),(0,0,80.7874),(-3.174809,-5.669294,76.53543)}, {(0,0,89.29133),(-22.67716,-12.7559,89.29133),(0,0,80.7874),(-5.669294,-3.174809,76.53543)}, {(0,0,89.29133),(-22.67716,0,89.29133),(0,0,80.7874),(-5.669294,0,76.53543)} - },{ + }, + { {(0,0,89.29133),(-22.67716,0,89.29133),(0,0,80.7874),(-5.669294,0,76.53543)}, {(0,0,89.29133),(-22.67716,12.7559,89.29133),(0,0,80.7874),(-5.669294,3.174809,76.53543)}, {(0,0,89.29133),(-12.7559,22.67716,89.29133),(0,0,80.7874),(-3.174809,5.669294,76.53543)}, {(0,0,89.29133),(0,22.67716,89.29133),(0,0,80.7874),(0,5.669294,76.53543)} - },{ + }, + { {(0,0,89.29133),(0,22.67716,89.29133),(0,0,80.7874),(0,5.669294,76.53543)}, {(0,0,89.29133),(12.7559,22.67716,89.29133),(0,0,80.7874),(3.174809,5.669294,76.53543)}, {(0,0,89.29133),(22.67716,12.7559,89.29133),(0,0,80.7874),(5.669294,3.174809,76.53543)}, {(0,0,89.29133),(22.67716,0,89.29133),(0,0,80.7874),(5.669294,0,76.53543)} - },{ + }, + { {(5.669294,0,76.53543),(11.33858,0,72.28346),(36.85039,0,72.28346),(36.85039,0,68.0315)}, {(5.669294,-3.174809,76.53543),(11.33858,-6.349609,72.28346),(36.85039,-20.63622,72.28346),(36.85039,-20.63622,68.0315)}, {(3.174809,-5.669294,76.53543),(6.349609,-11.33858,72.28346),(20.63622,-36.85039,72.28346),(20.63622,-36.85039,68.0315)}, {(0,-5.669294,76.53543),(0,-11.33858,72.28346),(0,-36.85039,72.28346),(0,-36.85039,68.0315)} - },{ + }, + { {(0,-5.669294,76.53543),(0,-11.33858,72.28346),(0,-36.85039,72.28346),(0,-36.85039,68.0315)}, {(-3.174809,-5.669294,76.53543),(-6.349609,-11.33858,72.28346),(-20.63622,-36.85039,72.28346),(-20.63622,-36.85039,68.0315)}, {(-5.669294,-3.174809,76.53543),(-11.33858,-6.349609,72.28346),(-36.85039,-20.63622,72.28346),(-36.85039,-20.63622,68.0315)}, {(-5.669294,0,76.53543),(-11.33858,0,72.28346),(-36.85039,0,72.28346),(-36.85039,0,68.0315)}, - },{ + }, + { {(-5.669294,0,76.53543),(-11.33858,0,72.28346),(-36.85039,0,72.28346),(-36.85039,0,68.0315)}, {(-5.669294,3.174809,76.53543),(-11.33858,6.349609,72.28346),(-36.85039,20.63622,72.28346),(-36.85039,20.63622,68.0315)}, {(-3.174809,5.669294,76.53543),(-6.349609,11.33858,72.28346),(-20.63622,36.85039,72.28346),(-20.63622,36.85039,68.0315)}, {(0,5.669294,76.53543),(0,11.33858,72.28346),(0,36.85039,72.28346),(0,36.85039,68.0315)} - },{ + }, + { {(0,5.669294,76.53543),(0,11.33858,72.28346),(0,36.85039,72.28346),(0,36.85039,68.0315)}, {(3.174809,5.669294,76.53543),(6.349609,11.33858,72.28346),(20.63622,36.85039,72.28346),(20.63622,36.85039,68.0315)}, {(5.669294,3.174809,76.53543),(11.33858,6.349609,72.28346),(36.85039,20.63622,72.28346),(36.85039,20.63622,68.0315)}, {(5.669294,0,76.53543),(11.33858,0,72.28346),(36.85039,0,72.28346),(36.85039,0,68.0315)}, - },{ + }, + { {(0,0,0),(40.3937,0,0),(42.51969,0,2.12598),(42.51969,0,4.251961)}, {(0,0,0),(40.3937,22.62047,0),(42.51969,23.81102,2.12598),(42.51969,23.81102,4.251961)}, {(0,0,0),(22.62047,40.3937,0),(23.81102,42.51969,2.12598),(23.81102,42.51969,4.251961)}, {(0,0,0),(0,40.3937,0),(0,42.51969,2.12598),(0,42.51969,4.251961)} - },{ + }, + { {(0,0,0),(0,40.3937,0),(0,42.51969,2.12598),(0,42.51969,4.251961)}, {(0,0,0),(-22.62047,40.3937,0),(-23.81102,42.51969,2.12598),(-23.81102,42.51969,4.251961)}, {(0,0,0),(-40.3937,22.62047,0),(-42.51969,23.81102,2.12598),(-42.51969,23.81102,4.251961)}, {(0,0,0),(-40.3937,0,0),(-42.51969,0,2.12598),(-42.51969,0,4.251961)} - },{ + }, + { {(0,0,0),(-40.3937,0,0),(-42.51969,0,2.12598),(-42.51969,0,4.251961)}, {(0,0,0),(-40.3937,-22.62047,0),(-42.51969,-23.81102,2.12598),(-42.51969,-23.81102,4.251961)}, {(0,0,0),(-22.62047,-40.3937,0),(-23.81102,-42.51969,2.12598),(-23.81102,-42.51969,4.251961)}, {(0,0,0),(0,-40.3937,0),(0,-42.51969,2.12598),(0,-42.51969,4.251961)} - },{ + }, + { {(0,0,0),(0,-40.3937,0),(0,-42.51969,2.12598),(0,-42.51969,4.251961)}, {(0,0,0),(22.62047,-40.3937,0),(23.81102,-42.51969,2.12598),(23.81102,-42.51969,4.251961)}, {(0,0,0),(40.3937,-22.62047,0),(42.51969,-23.81102,2.12598),(42.51969,-23.81102,4.251961)}, {(0,0,0),(40.3937,0,0),(42.51969,0,2.12598),(42.51969,0,4.251961)} - } -}; + } + }; draw(surface(Q),material(blue, shininess=0.85, metallic=0),render(compression=Low)); diff --git a/graphics/asymptote/examples/thermodynamics.asy b/graphics/asymptote/examples/thermodynamics.asy index cfcc3d0e98..e096502897 100644 --- a/graphics/asymptote/examples/thermodynamics.asy +++ b/graphics/asymptote/examples/thermodynamics.asy @@ -14,7 +14,7 @@ picture CreateKOOS(real Scale, string legend) // draw labeled coor draw(ReturnPic, ((0,-S)--(0,S)), bar = EndArrow); // y axis label(ReturnPic, "$\varepsilon$", (S,0), SW); // x axis label label(ReturnPic, "$\sigma$", (0,S), SW); // y axis label - label(ReturnPic, legend, (0.7S, -S), NW); // add label 'legend' + label(ReturnPic, legend, (0.7S, -S), NW); // add label 'legend' return ReturnPic; // return picture } @@ -32,69 +32,69 @@ picture T[]; // vector of all four diagrams real inc = 2.8; // increment-offset for combining pictures //////////////////////////////////////// 1st diagram -T[1] = CreateKOOS(S, "$T_1$"); // initialise T[1] as empty diagram with label $T_1$ -graph = A; // # pointwise definition of current path 'graph' -graph = graph -- (A.x + grad*1.6, A.y + 1.6); // # -graph = graph -- (E.x - grad*0.4, E.y - 0.4); // # +T[1] = CreateKOOS(S, "$T_1$"); // initialise T[1] as empty diagram with label $T_1$ +graph = A; // # pointwise definition of current path 'graph' +graph = graph -- (A.x + grad*1.6, A.y + 1.6); // # +graph = graph -- (E.x - grad*0.4, E.y - 0.4); // # graph = graph -- E; // # -graph = roundedpath(graph, radius, S); // round edges of 'graph' using roundedpath() in roundedpath.asy -ActPen = rgb(0,0,0.6) + linewidth(lw); // define pen for drawing in 1st diagram -draw(T[1], graph, ActPen); // draw 'graph' with 'ActPen' into 'T[1]' (1st hysteresis branch) -draw(T[1], rotate(180,(0,0))*graph, ActPen); // draw rotated 'graph' (2nd hysteresis branch) +graph = roundedpath(graph, radius, S); // round edges of 'graph' using roundedpath() in roundedpath.asy +ActPen = rgb(0,0,0.6) + linewidth(lw); // define pen for drawing in 1st diagram +draw(T[1], graph, ActPen); // draw 'graph' with 'ActPen' into 'T[1]' (1st hysteresis branch) +draw(T[1], rotate(180,(0,0))*graph, ActPen); // draw rotated 'graph' (2nd hysteresis branch) graph = (0,0) -- (grad*0.6, 0.6) -- ( (grad*0.6, 0.6) + (0.1, 0) ); // define branch from origin to hysteresis -graph = roundedpath(graph, radius, S); // round this path -draw(T[1], graph, ActPen); // draw this path into 'T[1]' +graph = roundedpath(graph, radius, S); // round this path +draw(T[1], graph, ActPen); // draw this path into 'T[1]' //////////////////////////////////////// 2nd diagram -T[2] = CreateKOOS(S, "$T_2$"); // initialise T[2] as empty diagram with label $T_2$ -graph = A; // # pointwise definition of current path 'graph' -graph = graph -- (A.x + grad*1.3, A.y + 1.3); // # -graph = graph -- (E.x - grad*0.7 , E.y - 0.7); // # +T[2] = CreateKOOS(S, "$T_2$"); // initialise T[2] as empty diagram with label $T_2$ +graph = A; // # pointwise definition of current path 'graph' +graph = graph -- (A.x + grad*1.3, A.y + 1.3); // # +graph = graph -- (E.x - grad*0.7 , E.y - 0.7); // # graph = graph -- E; // # - -graph = roundedpath(graph, radius, S); // round edges of 'graph' using roundedpath() in roundedpath.asy -ActPen = rgb(0.2,0,0.4) + linewidth(lw); // define pen for drawing in 2nd diagram -draw(T[2], graph, ActPen); // draw 'graph' with 'ActPen' into 'T[2]' (1st hysteresis branch) -draw(T[2], rotate(180,(0,0))*graph, ActPen); // draw rotated 'graph' (2nd hysteresis branch) + +graph = roundedpath(graph, radius, S); // round edges of 'graph' using roundedpath() in roundedpath.asy +ActPen = rgb(0.2,0,0.4) + linewidth(lw); // define pen for drawing in 2nd diagram +draw(T[2], graph, ActPen); // draw 'graph' with 'ActPen' into 'T[2]' (1st hysteresis branch) +draw(T[2], rotate(180,(0,0))*graph, ActPen); // draw rotated 'graph' (2nd hysteresis branch) graph = (0,0) -- (grad*0.3, 0.3) -- ( (grad*0.3, 0.3) + (0.1, 0) ); // define branch from origin to hysteresis -graph = roundedpath(graph, radius, S); // round this path -draw(T[2], graph, ActPen); // draw this path into 'T[2]' +graph = roundedpath(graph, radius, S); // round this path +draw(T[2], graph, ActPen); // draw this path into 'T[2]' //////////////////////////////////////// 3rd diagram -T[3] = CreateKOOS(S, "$T_3$"); // initialise T[3] as empty diagram with label $T_3$ -graph = A; // # pointwise definition of current path 'graph' -graph = graph -- (A.x + grad*0.7, A.y + 0.7); // # -graph = graph -- ( - grad*0.3 , - 0.3); // # -graph = graph -- (0,0); // # -graph = graph -- (grad*0.6, 0.6); // # -graph = graph -- (E.x - grad*0.4, E.y - 0.4); // # -graph = graph -- E; // # - -graph = roundedpath(graph, radius, S); // round edges of 'graph' using roundedpath() in roundedpath.asy -ActPen = rgb(0.6,0,0.2) + linewidth(lw); // define pen for drawing in 3rd diagram -draw(T[3], graph, ActPen); // draw 'graph' with 'ActPen' into 'T[3]' (1st hysteresis branch) -draw(T[3], rotate(180,(0,0))*graph, ActPen); // draw rotated 'graph' (2nd hysteresis branch) +T[3] = CreateKOOS(S, "$T_3$"); // initialise T[3] as empty diagram with label $T_3$ +graph = A; // # pointwise definition of current path 'graph' +graph = graph -- (A.x + grad*0.7, A.y + 0.7); // # +graph = graph -- ( - grad*0.3 , - 0.3); // # +graph = graph -- (0,0); // # +graph = graph -- (grad*0.6, 0.6); // # +graph = graph -- (E.x - grad*0.4, E.y - 0.4); // # +graph = graph -- E; // # + +graph = roundedpath(graph, radius, S); // round edges of 'graph' using roundedpath() in roundedpath.asy +ActPen = rgb(0.6,0,0.2) + linewidth(lw); // define pen for drawing in 3rd diagram +draw(T[3], graph, ActPen); // draw 'graph' with 'ActPen' into 'T[3]' (1st hysteresis branch) +draw(T[3], rotate(180,(0,0))*graph, ActPen); // draw rotated 'graph' (2nd hysteresis branch) //////////////////////////////////////// 4th diagram -T[4] = CreateKOOS(S, "$T_4$"); // initialise T[4] as empty diagram with label $T_4$ -graph = A; // # pointwise definition of current path 'graph' -graph = graph -- (A.x + grad*0.4, A.y + 0.4); // # -graph = graph -- ( - grad*0.6 , - 0.6); // # -graph = graph -- (0,0); // # -graph = graph -- (grad*0.9, 0.9); // # -graph = graph -- (E.x - grad*0.1, E.y - 0.1); // # -graph = graph -- E; // # - -graph = roundedpath(graph, radius, S); // round edges of 'graph' using roundedpath() in roundedpath.asy -ActPen = rgb(0.6,0,0) + linewidth(lw); // define pen for drawing in 4th diagram -draw(T[4], graph, ActPen); // draw 'graph' with 'ActPen' into 'T[4]' (1st hysteresis branch) -draw(T[4], rotate(180,(0,0))*graph, ActPen); // draw rotated 'graph' (3nd hysteresis branch) +T[4] = CreateKOOS(S, "$T_4$"); // initialise T[4] as empty diagram with label $T_4$ +graph = A; // # pointwise definition of current path 'graph' +graph = graph -- (A.x + grad*0.4, A.y + 0.4); // # +graph = graph -- ( - grad*0.6 , - 0.6); // # +graph = graph -- (0,0); // # +graph = graph -- (grad*0.9, 0.9); // # +graph = graph -- (E.x - grad*0.1, E.y - 0.1); // # +graph = graph -- E; // # + +graph = roundedpath(graph, radius, S); // round edges of 'graph' using roundedpath() in roundedpath.asy +ActPen = rgb(0.6,0,0) + linewidth(lw); // define pen for drawing in 4th diagram +draw(T[4], graph, ActPen); // draw 'graph' with 'ActPen' into 'T[4]' (1st hysteresis branch) +draw(T[4], rotate(180,(0,0))*graph, ActPen); // draw rotated 'graph' (3nd hysteresis branch) // add some labels and black dots to the first two pictures @@ -126,6 +126,6 @@ ActPen = linewidth(1) + gray(0.5); // define draw(shift(( 1 - grad*0.55 + 0*inc)*S, 0.45*S)*mark, ActPen); // # draw all intersections draw(shift((-1 + grad*1.45 + 0*inc)*S, 0.45*S)*mark, ActPen); // # draw(shift(( 1 - grad*0.55 + 1*inc)*S, 0.45*S)*mark, ActPen); // # -draw(shift(( 1 - grad*0.55 + 2*inc)*S, 0.45*S)*mark, ActPen); // # -draw(shift(( grad*0.45 + 2*inc)*S, 0.45*S)*mark, ActPen); // # +draw(shift(( 1 - grad*0.55 + 2*inc)*S, 0.45*S)*mark, ActPen); // # +draw(shift(( grad*0.45 + 2*inc)*S, 0.45*S)*mark, ActPen); // # draw(shift(( grad*0.45 + 3*inc)*S, 0.45*S)*mark, ActPen); // # diff --git a/graphics/asymptote/examples/torus.asy b/graphics/asymptote/examples/torus.asy index d0b8673d73..c5bda1e687 100644 --- a/graphics/asymptote/examples/torus.asy +++ b/graphics/asymptote/examples/torus.asy @@ -7,9 +7,9 @@ real R=3; real a=1; /* -import solids; -revolution torus=revolution(reverse(Circle(R*X,a,Y,32)),Z,90,345); -surface s=surface(torus); + import solids; + revolution torus=revolution(reverse(Circle(R*X,a,Y,32)),Z,90,345); + surface s=surface(torus); */ triple f(pair t) { diff --git a/graphics/asymptote/examples/triads.asy b/graphics/asymptote/examples/triads.asy index 77806b1ad4..6cecc55fa4 100644 --- a/graphics/asymptote/examples/triads.asy +++ b/graphics/asymptote/examples/triads.asy @@ -12,18 +12,18 @@ pair o=(m.x,0.5(m.x+l.y)); pen d=c+darkgreen; void drawarrow(string s="", pair p, pair q, side side=RightSide, - bool upscale=false, pen c) + bool upscale=false, pen c) { path g=p{dir(-5)}..{dir(-85)}q; - if(upscale) g=reverse(g); + if(upscale) g=reverse(g); draw(s,g,side,c,Arrow(Fill,0.65)); -} +} void spectrum(pair l,pair m, pair s) { draw(p,c); - + d += 4.0; - dot("$p$",l,SW,d); + dot("$p$",l,SW,d); dot("$q$",m,SW,d); dot("$k$",s,SW,d); diff --git a/graphics/asymptote/examples/triangle.asy b/graphics/asymptote/examples/triangle.asy index 60388a7851..e3f9c1f588 100644 --- a/graphics/asymptote/examples/triangle.asy +++ b/graphics/asymptote/examples/triangle.asy @@ -2,7 +2,7 @@ size(0,100); import geometry; triangle t=triangle(b=3,alpha=90,c=4); - + dot((0,0)); draw(t); diff --git a/graphics/asymptote/examples/truncatedIcosahedron.asy b/graphics/asymptote/examples/truncatedIcosahedron.asy index e4d07a49e5..092f96a4e6 100644 --- a/graphics/asymptote/examples/truncatedIcosahedron.asy +++ b/graphics/asymptote/examples/truncatedIcosahedron.asy @@ -10,20 +10,21 @@ triple[] z={(c,1,0),(-c,1,0),(-c,-1,0),(c,-1,0)}; triple[] x={(0,c,1),(0,-c,1),(0,-c,-1),(0,c,-1)}; triple[] y={(1,0,c),(1,0,-c),(-1,0,-c),(-1,0,c)}; -triple[][] Q={ - {(c,1,0),(1,0,-c),(0,c,-1),(0,c,1),(1,0,c),(c,-1,0)}, - {(-c,1,0),(0,c,1),(0,c,-1),(-1,0,-c),(-c,-1,0),(-1,0,c)}, - {(-c,-1,0),(-c,1,0),(-1,0,-c),(0,-c,-1),(0,-c,1),(-1,0,c)}, - {(c,-1,0),(c,1,0),(1,0,c),(0,-c,1),(0,-c,-1),(1,0,-c)}, - {(0,c,1),(0,c,-1),(-c,1,0),(-1,0,c),(1,0,c),(c,1,0)}, - {(0,-c,1),(0,-c,-1),(-c,-1,0),(-1,0,c),(1,0,c),(c,-1,0)}, - {(0,-c,-1),(0,-c,1),(c,-1,0),(1,0,-c),(-1,0,-c),(-c,-1,0)}, - {(0,c,-1),(0,c,1),(c,1,0),(1,0,-c),(-1,0,-c),(-c,1,0)}, - {(1,0,c),(-1,0,c),(0,-c,1),(c,-1,0),(c,1,0),(0,c,1)}, - {(1,0,-c),(-1,0,-c),(0,-c,-1),(c,-1,0),(c,1,0),(0,c,-1)}, - {(-1,0,-c),(1,0,-c),(0,c,-1),(-c,1,0),(-c,-1,0),(0,-c,-1)}, - {(-1,0,c),(1,0,c),(0,c,1),(-c,1,0),(-c,-1,0),(0,-c,1)} -}; +triple[][] Q= + { + {(c,1,0),(1,0,-c),(0,c,-1),(0,c,1),(1,0,c),(c,-1,0)}, + {(-c,1,0),(0,c,1),(0,c,-1),(-1,0,-c),(-c,-1,0),(-1,0,c)}, + {(-c,-1,0),(-c,1,0),(-1,0,-c),(0,-c,-1),(0,-c,1),(-1,0,c)}, + {(c,-1,0),(c,1,0),(1,0,c),(0,-c,1),(0,-c,-1),(1,0,-c)}, + {(0,c,1),(0,c,-1),(-c,1,0),(-1,0,c),(1,0,c),(c,1,0)}, + {(0,-c,1),(0,-c,-1),(-c,-1,0),(-1,0,c),(1,0,c),(c,-1,0)}, + {(0,-c,-1),(0,-c,1),(c,-1,0),(1,0,-c),(-1,0,-c),(-c,-1,0)}, + {(0,c,-1),(0,c,1),(c,1,0),(1,0,-c),(-1,0,-c),(-c,1,0)}, + {(1,0,c),(-1,0,c),(0,-c,1),(c,-1,0),(c,1,0),(0,c,1)}, + {(1,0,-c),(-1,0,-c),(0,-c,-1),(c,-1,0),(c,1,0),(0,c,-1)}, + {(-1,0,-c),(1,0,-c),(0,c,-1),(-c,1,0),(-c,-1,0),(0,-c,-1)}, + {(-1,0,c),(1,0,c),(0,c,1),(-c,1,0),(-c,-1,0),(0,-c,1)} + }; real R=abs(interp(Q[0][0],Q[0][1],1/3)); diff --git a/graphics/asymptote/examples/tvgen.asy b/graphics/asymptote/examples/tvgen.asy index c7898fe712..0ea7ce3eb6 100644 --- a/graphics/asymptote/examples/tvgen.asy +++ b/graphics/asymptote/examples/tvgen.asy @@ -17,40 +17,40 @@ * Boston, MA 02110-1301, USA. * * tvgen-1.2/tvgen.asy http://picaros.org/ftp/soft/tvgen-1.2.tgz - * This asy script generates pm5544-like television test cards. The image - * parameters were derived from a 1990 recording. The basic parameters - * conform to itu-r bt.470, bt.601, and bt.709. There is no unique image - * since local variants exist and parameters have varied over time. + * This asy script generates pm5544-like television test cards. The image + * parameters were derived from a 1990 recording. The basic parameters + * conform to itu-r bt.470, bt.601, and bt.709. There is no unique image + * since local variants exist and parameters have varied over time. */ //papertype="a4"; import plain; int verbose=settings.verbose/*+2*/; /* uncomment for debug info */ /* tv dot coordinates --> PS points */ -pair tvps(real col, real row, real xd, real yd, int Nv) { - real psx, psy; - psx=col*xd; psy=(Nv-row)*yd; - return (psx,psy); +pair tvps(real col, real row, real xd, real yd, int Nv) { + real psx, psy; + psx=col*xd; psy=(Nv-row)*yd; + return (psx,psy); } path tvrect(int lc, int tr, int rc, int br, real xd, real yd, int Nv) { - real lx, ty, rx, by; - pair[] z; - - lx=lc*xd; ty=(Nv-tr)*yd; - rx=rc*xd; by=(Nv-br)*yd; + real lx, ty, rx, by; + pair[] z; + + lx=lc*xd; ty=(Nv-tr)*yd; + rx=rc*xd; by=(Nv-br)*yd; /* bl br tr tl */ z[0]=(lx, by); - z[1]=(rx, by); - z[2]=(rx, ty); - z[3]=(lx, ty); - - return z[0]--z[1]--z[2]--z[3]--cycle; + z[1]=(rx, by); + z[2]=(rx, ty); + z[3]=(lx, ty); + + return z[0]--z[1]--z[2]--z[3]--cycle; } /********************* horizontal castellations ********************/ /* Draw a horizontal red line in the top left and the bottom right * castellation. These testlines disappear if the monitor is not set - * in a dot-exact mode. An example is image crop due to overscan. + * in a dot-exact mode. An example is image crop due to overscan. * * For 625 line systems any analog-compatible processing removes * these red testlines since the first halfline of the odd field and @@ -58,8 +58,8 @@ path tvrect(int lc, int tr, int rc, int br, real xd, real yd, int Nv) { * visible line frame often results via a final copy paste operation. */ void castelhor(int colortv, int[] rccoll, int[] rccolr, int cmaxi, int Nh, - int topdist, int botdist, - pen pdef, real xd, real yd, int Nv) { + int topdist, int botdist, + pen pdef, real xd, real yd, int Nv) { pen pblack, pwhite, pred; int i; @@ -113,26 +113,26 @@ void castelhor(int colortv, int[] rccoll, int[] rccolr, int cmaxi, int Nh, zzc = tvrect(lc,botdist, rc,br, xd,yd,Nv); fill(zzc, p=pcast); } - + return; } /********************* vertical castellations ********************/ -/* The bottom right red rectangle tests for a non causal color FIR - * filter in the receiver. The last 2..4 dots then typically appear - * colorless, green, or cyan. +/* The bottom right red rectangle tests for a non causal color FIR + * filter in the receiver. The last 2..4 dots then typically appear + * colorless, green, or cyan. * - * This stems from the fact that the chroma subcarrier is of lower - * bandwidth than luma and thus continues after the last active sample. - * These trailing (y,u,v) samples result from an abrupt signal to zero - * transition and depend on the transmit and receive filters. Samples - * from VHS, system B/G/D/K, system I, or a DVD player output are - * different. Nevertheless, a sharpening filter uses this data and so - * adds false color to the last dots. + * This stems from the fact that the chroma subcarrier is of lower + * bandwidth than luma and thus continues after the last active sample. + * These trailing (y,u,v) samples result from an abrupt signal to zero + * transition and depend on the transmit and receive filters. Samples + * from VHS, system B/G/D/K, system I, or a DVD player output are + * different. Nevertheless, a sharpening filter uses this data and so + * adds false color to the last dots. */ void castelver(int colortv, int leftdist, int rightdist, int Nh, - int[] rcrowb, int[] rcrowt, int rmaxi, - pen pdef, real xd, real yd, int Nv) { + int[] rcrowb, int[] rcrowt, int rmaxi, + pen pdef, real xd, real yd, int Nv) { pen pblack, pwhite; int i; @@ -144,7 +144,7 @@ void castelver(int colortv, int leftdist, int rightdist, int Nh, pen pcastl, pcastr; int tr, br; path zzc; - + if (inext%2 == 0) { pcastl = pwhite; } else { @@ -157,17 +157,17 @@ void castelver(int colortv, int leftdist, int rightdist, int Nh, } tr=rcrowb[i]; - br=rcrowt[i+1]; + br=rcrowt[i+1]; zzc=tvrect( 0,tr, leftdist,br, xd,yd,Nv); fill(zzc, p=pcastl); - zzc=tvrect(rightdist,tr, Nh,br, xd,yd,Nv); + zzc=tvrect(rightdist,tr, Nh,br, xd,yd,Nv); fill(zzc, p=pcastr); } return; } /********************* image aspect ratio markers ********************/ void rimarkers(real rimage, int Nh, int Nhc, int os, int Nvc, int Nsy, - pen pdef, real xd, real yd, int Nv) { + pen pdef, real xd, real yd, int Nv) { int[] ridefN={ 4, 16 }; int[] ridefD={ 3, 9 }; int i; @@ -187,11 +187,11 @@ void rimarkers(real rimage, int Nh, int Nhc, int os, int Nvc, int Nsy, if (2*offa return y>=0 +/* x on circle -> return y>=0 * in: * x x-coordinate relative to origin * crad circle radius in y units, true size=crad*yd @@ -418,9 +418,9 @@ real testcircy(real y, real crad, real xd, real yd) { } /* brow>trow && xb>xt */ -void testtone(real Tt, int trow, int brow, - real ccol, real crow, real crad, - pen pdef, real xd, real yd, int Nv) { +void testtone(real Tt, int trow, int brow, + real ccol, real crow, real crad, + pen pdef, real xd, real yd, int Nv) { int blocks, i; real yt, xt, yb, xb, Ttt=Tt/2; pair ccenter; @@ -488,7 +488,7 @@ void testtone(real Tt, int trow, int brow, z[2]=tvps(ccol+tl,brow, xd,yd,Nv); z[3]=tvps(ccol+tr,brow, xd,yd,Nv); zz=z[0]--z[1]--z[2]--z[3]--cycle; - } + } if (tl1) { thetaret=0; } else { @@ -595,10 +595,10 @@ real addphase(real theta, real freq, real step) { cycles-=coverflow*sgn(cycles); thetaret=theta+cycles*dpi; /* cycles=(-1 .. 1) */ - if (thetaret>pi) { - thetaret-=dpi; - } else if (thetaret<-pi) { - thetaret-=dpi; + if (thetaret>pi) { + thetaret-=dpi; + } else if (thetaret<-pi) { + thetaret-=dpi; } } @@ -606,9 +606,9 @@ real addphase(real theta, real freq, real step) { return thetaret; } -void testfreqs(real[] ftones, int[] coff, int Nhc, int trow,int crow,int brow, - pair ccenter, pair rclt, pair rclb, pair rcrt, pair rcrb, - pen pdef, real xd, real yd, int Nv) { +void testfreqs(real[] ftones, int[] coff, int Nhc, int trow,int crow,int brow, + pair ccenter, pair rclt, pair rclb, pair rcrt, pair rcrb, + pen pdef, real xd, real yd, int Nv) { int[] divc; real[] divfl, divfr; int i, divs, coffmax, off, divnext; @@ -649,7 +649,7 @@ void testfreqs(real[] ftones, int[] coff, int Nhc, int trow,int crow,int brow, tr=trow; } - if (off == divc[divnext]) { + if (off == divc[divnext]) { /* switch frequency: cycles=0.5*fcur+0.5*fnext */ thl=addphase(thl, fl, -0.5); thr=addphase(thr, fr, 0.5); @@ -672,10 +672,10 @@ void testfreqs(real[] ftones, int[] coff, int Nhc, int trow,int crow,int brow, //write(off, thr, ampr); col=Nhc-off-1; - zz=tvrect(col,tr, col+1,brow, xd,yd,Nv); + zz=tvrect(col,tr, col+1,brow, xd,yd,Nv); fill(zz, p=pdef+gray(ampl)); col=Nhc+off; - zz=tvrect(col,tr, col+1,brow, xd,yd,Nv); + zz=tvrect(col,tr, col+1,brow, xd,yd,Nv); fill(zz, p=pdef+gray(ampr)); } @@ -690,9 +690,9 @@ void testfreqs(real[] ftones, int[] coff, int Nhc, int trow,int crow,int brow, } /************************ gray bars **************************************/ -void graybars(int[] coff, int Nhc, int trow, int brow, - pair ccenter, pair rclt, pair rclb, pair rcrt, pair rcrb, - pen pdef, real xd, real yd, int Nv) { +void graybars(int[] coff, int Nhc, int trow, int brow, + pair ccenter, pair rclt, pair rclb, pair rcrt, pair rcrb, + pen pdef, real xd, real yd, int Nv) { int[] gs={0, 20, 40, 60, 80, 100}; int cmax=2, poff, i; @@ -701,11 +701,11 @@ void graybars(int[] coff, int Nhc, int trow, int brow, int off; int ii=2*i, il=cmax-i, ir=i+cmax+1; path zzl, zzr; - + off=ceil((coff[1+ii]+coff[2+ii])/2); if (i=0) { if (ph<0) - ph=ph+pi; + ph=ph+pi; } else { if (ph>0) - ph=ph-pi; + ph=ph-pi; } if (A>0) { u=u/A*cI; @@ -918,14 +918,14 @@ void palears(int[] coff, int[] coffa, int[] coffb, int Nhc, /****************************** NTSC bars ***********************************/ /* amplitude equals color burst smpte (pm: -V +U) - * y campl sat R G B + * y campl sat R G B * left 0.5 0.21 70% -I? * right 0.5 0.17 60% +Q? */ -void ntscbars(int[] rccoll, int[] rccolr, int divsx, - int[] rcrowt, int[] rcrowb, int divsy, int dright, - pen pdef, real xd, real yd, int Nv) { - /* The amplitude of (i,q) as seen on a vectorscope, +void ntscbars(int[] rccoll, int[] rccolr, int divsx, + int[] rcrowt, int[] rcrowb, int divsy, int dright, + pen pdef, real xd, real yd, int Nv) { + /* The amplitude of (i,q) as seen on a vectorscope, * max 0.292 Vn for 100% saturation in I==0 ears. * burst: 0.143 Vcvbs, 20 IRE or 0.200 V normalized. * pedestal: (yp,up,vp)=(p,0,0)+(1-p)*(y,u,v), p=0.075. @@ -943,7 +943,7 @@ void ntscbars(int[] rccoll, int[] rccolr, int divsx, real[] cil={ 0, 0, 0, -1, 1 }; real[] cql={ -1, 1, 0, 0, 0 }; int[] indl={ -7, -8, 0, 8, 7 }; - + real cy, ci, cq; int rmaxi, dri, ind, ibase, lcol, rcol, i; @@ -979,17 +979,17 @@ void ntscbars(int[] rccoll, int[] rccolr, int divsx, B=By+cy; if (verbose > 1) write(ind, cy*1000, round(ci*1000), round(cq*1000), - round(R*1000), round(G*1000), round(B*1000)); + round(R*1000), round(G*1000), round(B*1000)); for (i=0; i0) { trow=rcrowb[i]; } else { trow=floor((rcrowb[i]+rcrowt[inext])/2); - } + } if (inext 3 dots * bottom 2.9us red -> 39.15 dots * - * resolution DPI from image aspect ratio + * resolution DPI from image aspect ratio * Rv=Nv/ly, ly=4in * ri=Ni/Di, Ni={ 4, 15, 16} Di={ 3, 11, 9} * lx=ri*ly @@ -1107,7 +1107,7 @@ int[] bNsh= * Ni=15 ri=15/Di => Nh=k*60 * Ni=16 ri=16/Di => Nh=k*64 * - * resolution DPI from dot aspect ratio, general algorithm, + * resolution DPI from dot aspect ratio, general algorithm, * * rd=Nd/Dd=ldx/ldy * @@ -1119,7 +1119,7 @@ int[] bNsh= * * ldx=1/(m*Dd), ldy=1/(m*Nd), Rh=m*Dd, Rv=m*Nd * - * and + * and * * lx=Nh*ldx=Nh/(m*Dd), ly=Nv*ldy=Nv/(m*Nd) * @@ -1154,8 +1154,8 @@ if (verbose > 1) { //size(xsize, ysize, Aspect); // should not have any effect Nsy=bNsy[bsys]; // grating size in lines 42,43 or 34,35 -Nshift=bNsh[bsys]; // shift image up: pre 1997 =3, 2007 =0 -fs=1e6*bfs[bsys]*os; +Nshift=bNsh[bsys]; // shift image up: pre 1997 =3, 2007 =0 +fs=1e6*bfs[bsys]*os; Na=0; // add 1,0,-1 to height of hor center squares for even Na+Nsy Ttone=fs/250e3; // period of ft=250 kHz, fs/ft=54 @@ -1185,8 +1185,8 @@ if (verbose > 1) { } rmaxi=2*divsy+1; -/* Nsyc: center square height - * line pairing test: verify distance of center to top and bot +/* Nsyc: center square height + * line pairing test: verify distance of center to top and bot * distance is odd ==> top=even/odd, cent=odd/even, bot=even/odd * * Nsyc odd: not possible @@ -1215,7 +1215,7 @@ if (Nsyc%2 != 0) { } else if (Nsyc%4 == 0) { Nyst=1; /* stagger */ } -for (i=0; i<=divsy; ++i) { +for (i=0; i<=divsy; ++i) { int iu, id, ou, od, ru, rd; iu=divsy-i; @@ -1228,7 +1228,7 @@ for (i=0; i<=divsy; ++i) { } rcrowc[iu]=Nvc-ou; rcrowc[id]=Nvc-od; - + ru=Nvc-(ou+Nyst); rd=Nvc-(od+Nyst); @@ -1253,7 +1253,7 @@ int divsx, Nhc, Nl, Nr, cmaxi; lsq=Nsy*yd; Nsx=lsq/xd; /* floating point */ -divsx=floor(((Nh-10*os)/Nsx-1)/2); +divsx=floor(((Nh-10*os)/Nsx-1)/2); Nhc=round(Nh/2); rdistx=(1+2*divsx)*Nsx; Nl=Nhc-round(rdistx/2); @@ -1264,10 +1264,10 @@ cmaxi=2*divsx+1; int[] coff, coffl, coffr; int[] rccoll, rccolc, rccolr; -for (i=0; i<=divsx; ++i) { +for (i=0; i<=divsx; ++i) { int off, offl, offr, il, ir; real cdist; - + cdist=Nsx*(1+2*i); /* horizontal distance 2 symmetrical vert lines */ off=round(cdist/2); // write(cdist, off); @@ -1277,7 +1277,7 @@ for (i=0; i<=divsx; ++i) { coff[i]=off; coffl[i]=offl; coffr[i]=offr; - + if (verbose > 1) { write(cdist, off); } @@ -1290,7 +1290,7 @@ for (i=0; i<=divsx; ++i) { rccoll[ir]=Nhc+offl; rccolc[ir]=Nhc+off; - rccolr[ir]=Nhc+offr; + rccolr[ir]=Nhc+offr; } Nl=rccolc[0]; Nr=Nh-rccolc[cmaxi]; @@ -1299,9 +1299,9 @@ if (verbose > 1) { } /**** draw gray background ****/ -{ +{ path zz; - + //zz=tvrect(0,0, Nh,Nv, xd,yd,Nv); /* keep white canvas for castellations */ zz=tvrect(rccoll[0],rcrowt[0], rccolr[cmaxi],rcrowb[rmaxi], xd,yd,Nv); @@ -1355,16 +1355,16 @@ for (i=0; i<=rmaxi; ++i) { /**** draw 2*divsx+2 vertical gridlines ****/ for (i=0; i<=cmaxi; ++i) { path zzv; - zzv=tvrect(rccoll[i],0, rccolr[i],Nv, xd,yd,Nv); - fill(zzv, p=pwhite); + zzv=tvrect(rccoll[i],0, rccolr[i],Nv, xd,yd,Nv); + fill(zzv, p=pwhite); } /**** castellations ****/ castelhor(colortv, rccoll, rccolr, cmaxi, Nh, rcrowt[0], rcrowb[rmaxi], - pdefault, xd, yd, Nv); + pdefault, xd, yd, Nv); castelver(colortv, rccoll[0], rccolr[cmaxi], Nh, rcrowb, rcrowt, rmaxi, - pdefault, xd, yd, Nv); + pdefault, xd, yd, Nv); /****** markers for 4/3 aspect ratio ******/ if (rimage>4/3) { @@ -1373,59 +1373,59 @@ if (rimage>4/3) { /****** line pairing center ******/ centerline(colortv, rccoll, rccolc, rccolr, divsx, Nhc, os, - rcrowt, rcrowc, rcrowb, divsy, Nvc, - ccenter, rcoff, rcright, rcleft, pdefault, xd, yd, Nv); + rcrowt, rcrowc, rcrowb, divsy, Nvc, + ccenter, rcoff, rcright, rcleft, pdefault, xd, yd, Nv); if (colortv>0) { /* topbw structure */ - topbw(coff, Nhc, os, rcrowc[divsy-5], rcrowc[divsy-4], rcrowc[divsy-3], - ccenter, rcleft[divsy-4], rcleft[divsy-3], rcright[divsy-4], - rcright[divsy-3], pdefault, xd, yd, Nv); + topbw(coff, Nhc, os, rcrowc[divsy-5], rcrowc[divsy-4], rcrowc[divsy-3], + ccenter, rcleft[divsy-4], rcleft[divsy-3], rcright[divsy-4], + rcright[divsy-3], pdefault, xd, yd, Nv); /* 250 kHz */ - testtone(Ttone, rcrowc[divsy-3], rcrowc[divsy-2], + testtone(Ttone, rcrowc[divsy-3], rcrowc[divsy-2], cx, cy, crad, pdefault, xd, yd, Nv); - /* color bars */ - colorbars(coff, Nhc, rcrowc[divsy-2], rcrowc[divsy-1], rcrowc[divsy], - ccenter, rcleft[divsy-2], rcleft[divsy], rcright[divsy-2], - rcright[divsy], pdefault, xd, yd, Nv); + /* color bars */ + colorbars(coff, Nhc, rcrowc[divsy-2], rcrowc[divsy-1], rcrowc[divsy], + ccenter, rcleft[divsy-2], rcleft[divsy], rcright[divsy-2], + rcright[divsy], pdefault, xd, yd, Nv); /* test frequencies */ testfreqs(ftones, coff, Nhc, rcrowc[divsy+1], rcrowc[divsy+2], - rcrowc[divsy+3], ccenter, rcleft[divsy+1], rcleft[divsy+3], - rcright[divsy+1],rcright[divsy+3], pdefault, xd, yd, Nv); + rcrowc[divsy+3], ccenter, rcleft[divsy+1], rcleft[divsy+3], + rcright[divsy+1],rcright[divsy+3], pdefault, xd, yd, Nv); /* gray bars */ graybars(coff, Nhc, rcrowc[divsy+3], rcrowc[divsy+4], ccenter, - rcleft[divsy+3], rcleft[divsy+4], - rcright[divsy+3], rcright[divsy+4], pdefault, xd,yd,Nv); + rcleft[divsy+3], rcleft[divsy+4], + rcright[divsy+3], rcright[divsy+4], pdefault, xd,yd,Nv); /* PAL ears */ if (colortv == 1) { - palears(coff,coffr,coffl, Nhc, rcrowt, rcrowb, Nvc, divsy, -1, + palears(coff,coffr,coffl, Nhc, rcrowt, rcrowb, Nvc, divsy, -1, pdefault, xd, yd, Nv); - palears(coff,coffr,coffl, Nhc, rcrowt, rcrowb, Nvc, divsy, 1, + palears(coff,coffr,coffl, Nhc, rcrowt, rcrowb, Nvc, divsy, 1, pdefault, xd, yd, Nv); } else if (colortv == 2) { - ntscbars(rccoll, rccolr, divsx, rcrowt, rcrowb, divsy, -1, + ntscbars(rccoll, rccolr, divsx, rcrowt, rcrowb, divsy, -1, pdefault, xd, yd, Nv); - ntscbars(rccoll, rccolr, divsx, rcrowt, rcrowb, divsy, 1, + ntscbars(rccoll, rccolr, divsx, rcrowt, rcrowb, divsy, 1, pdefault, xd, yd, Nv); - ntscbars(rccoll, rccolr, divsx, rcrowt, rcrowb, divsy, -2, + ntscbars(rccoll, rccolr, divsx, rcrowt, rcrowb, divsy, -2, pdefault, xd, yd, Nv); - ntscbars(rccoll, rccolr, divsx, rcrowt, rcrowb, divsy, 2, + ntscbars(rccoll, rccolr, divsx, rcrowt, rcrowb, divsy, 2, pdefault, xd, yd, Nv); } /* bottom wh - black - wh */ - bottombw(round((coff[2]+coff[3])/2), Nhc, rcrowc[divsy+4], rcrowc[divsy+5], - ccenter, rcleft[divsy+4], rcleft[divsy+5], - rcright[divsy+4], rcright[divsy+5], pdefault, xd, yd, Nv); + bottombw(round((coff[2]+coff[3])/2), Nhc, rcrowc[divsy+4], rcrowc[divsy+5], + ccenter, rcleft[divsy+4], rcleft[divsy+5], + rcright[divsy+4], rcright[divsy+5], pdefault, xd, yd, Nv); /* bottom yellow red circle */ - bottomcirc(coff[0], Nhc, rcrowc[divsy+5], cx, cy, crad, - ccenter, rcleft[divsy+5], rcright[divsy+5], pdefault, xd, yd, Nv); + bottomcirc(coff[0], Nhc, rcrowc[divsy+5], cx, cy, crad, + ccenter, rcleft[divsy+5], rcright[divsy+5], pdefault, xd, yd, Nv); } /********************** set id *********************/ @@ -1466,10 +1466,10 @@ if (colortv>0) { colNsy = round((rccolc[divsx+5]+rccolc[divsx+6])/2); Npos = tvps(colNsy,rowNsy, xd,yd,Nv); iNsy = format("%i", Nsy); - - if (colortv>0) { + + if (colortv>0) { pbw=pdefault+gray(1.0); - } else { + } else { pbw=pdefault+gray(0.0); } label(ires, rpos, p=pbw); diff --git a/graphics/asymptote/examples/twistedtubes.asy b/graphics/asymptote/examples/twistedtubes.asy index 9121ad6444..ee25cd0bd3 100644 --- a/graphics/asymptote/examples/twistedtubes.asy +++ b/graphics/asymptote/examples/twistedtubes.asy @@ -1,30 +1,30 @@ -import graph3; -import palette; - -size(300,300,keepAspect=true); - +import graph3; +import palette; + +size(300,300,keepAspect=true); + real w=0.4; -real f(triple t) {return sin(t.x);} +real f(triple t) {return sin(t.x);} triple f1(pair t) {return (cos(t.x)-2cos(w*t.y),sin(t.x)-2sin(w*t.y),t.y);} triple f2(pair t) {return (cos(t.x)+2cos(w*t.y),sin(t.x)+2sin(w*t.y),t.y);} triple f3(pair t) {return (cos(t.x)+2sin(w*t.y),sin(t.x)-2cos(w*t.y),t.y);} triple f4(pair t) {return (cos(t.x)-2sin(w*t.y),sin(t.x)+2cos(w*t.y),t.y);} -surface s1=surface(f1,(0,0),(2pi,10),8,8,Spline); -surface s2=surface(f2,(0,0),(2pi,10),8,8,Spline); -surface s3=surface(f3,(0,0),(2pi,10),8,8,Spline); -surface s4=surface(f4,(0,0),(2pi,10),8,8,Spline); +surface s1=surface(f1,(0,0),(2pi,10),8,8,Spline); +surface s2=surface(f2,(0,0),(2pi,10),8,8,Spline); +surface s3=surface(f3,(0,0),(2pi,10),8,8,Spline); +surface s4=surface(f4,(0,0),(2pi,10),8,8,Spline); pen[] Rainbow=Rainbow(); -s1.colors(palette(s1.map(f),Rainbow)); -s2.colors(palette(s2.map(f),Rainbow)); -s3.colors(palette(s3.map(f),Rainbow)); -s4.colors(palette(s4.map(f),Rainbow)); +s1.colors(palette(s1.map(f),Rainbow)); +s2.colors(palette(s2.map(f),Rainbow)); +s3.colors(palette(s3.map(f),Rainbow)); +s4.colors(palette(s4.map(f),Rainbow)); defaultrender.merge=true; -draw(s1); +draw(s1); draw(s2); draw(s3); draw(s4); diff --git a/graphics/asymptote/examples/vertexshading.asy b/graphics/asymptote/examples/vertexshading.asy index 4a35e09559..00baab085e 100644 --- a/graphics/asymptote/examples/vertexshading.asy +++ b/graphics/asymptote/examples/vertexshading.asy @@ -14,7 +14,7 @@ draw(surface(shift(Z)*unitsquare3, new pen[] {red,green+opacity(0.5),blue,black}), prc() ? nolight : currentlight); draw(surface(shift(X)*((0,0,0)..controls (1,0,0) and (2,0,0)..(3,0,0).. - controls (2.5,sqrt(3)/2,0) and (2,sqrt(3),0).. - (1.5,3*sqrt(3)/2,0).. - controls (1,sqrt(3),0) and (0.5,sqrt(3)/2,0)..cycle), + controls (2.5,sqrt(3)/2,0) and (2,sqrt(3),0).. + (1.5,3*sqrt(3)/2,0).. + controls (1,sqrt(3),0) and (0.5,sqrt(3)/2,0)..cycle), new triple[] {(1.5,sqrt(3)/2,2)},new pen[] {red,green,blue})); diff --git a/graphics/asymptote/examples/worldmap.asy b/graphics/asymptote/examples/worldmap.asy index 23a80c69be..4d03587b31 100644 --- a/graphics/asymptote/examples/worldmap.asy +++ b/graphics/asymptote/examples/worldmap.asy @@ -3,7 +3,7 @@ size(20cm); // The required data file is available here: // http://www.uni-graz.at/~schwaige/asymptote/worldmap.dat // This data was originally obtained from -// http://www.ngdc.noaa.gov/mgg_coastline/mapit.jsp +// http://www.ngdc.noaa.gov/mgg_coastline/mapit.jsp real findtheta(real phi, real epsilon=realEpsilon) { // Determine for given phi the unique solution -pi/2 <= theta <= pi/2 off @@ -23,12 +23,12 @@ real findtheta(real phi, real epsilon=realEpsilon) { pair mollweide(real lambda, real phi, real lambda0=0){ // calculate the Mollweide projection centered at lambda0 for the point - // with coordinates(phi,lambda) + // with coordinates(phi,lambda) static real c1=2*sqrt(2)/pi; static real c2=sqrt(2); real theta=findtheta(phi); return(c1*(lambda-lambda0)*cos(theta), c2*sin(theta)); -} +} guide gfrompairs(pair[] data){ guide gtmp; @@ -54,7 +54,7 @@ while(true) { if(spstr[0] == "#") {++cnt; arrarrpair[cnt]=new pair[] ; newseg=true;} if(spstr[0] != "#" && newseg) { string[] spstr1=split(str,'\t'); // separator is TAB not SPACE - pair tmp=((real) spstr1[1],(real) spstr1[0]); + pair tmp=((real) spstr1[1],(real) spstr1[0]); arrarrpair[cnt].push(tmp); } } @@ -78,7 +78,7 @@ pair[] constlat(real phi, int np=100) { for(int j=1; j <= 5; ++j) draw(gfrompairs(constlong(-180+j/6*360)),white); draw(gfrompairs(constlong(-180)),1.5bp+white); draw(gfrompairs(constlong(180)),1.5bp+white); -for(int j=0; j <= 12; ++j) draw(gfrompairs(constlat(-90+j/6*180)),white); +for(int j=0; j <= 12; ++j) draw(gfrompairs(constlat(-90+j/6*180)),white); //draw(gfrompairs(constlong(10)),dotted); close(in); diff --git a/graphics/asymptote/examples/xstitch.asy b/graphics/asymptote/examples/xstitch.asy index 5f33288173..b2300ee9ea 100644 --- a/graphics/asymptote/examples/xstitch.asy +++ b/graphics/asymptote/examples/xstitch.asy @@ -42,22 +42,22 @@ write(histogram); pen linepen(int i, int max) { - real w=i == -1 || i == max+1 ? 2.0 : - i % 10 == 0 || i == max ? 1.0 : - i % 5 == 0 ? 0.8 : + real w=i == -1 || i == max+1 ? 2.0 : + i % 10 == 0 || i == max ? 1.0 : + i % 5 == 0 ? 0.8 : 0.25; return linewidth(w); } pen xpen(int i) { - return linepen(i,width)+(i == width/2 ? red : - i == 75 || i == width-75 ? dashed : + return linepen(i,width)+(i == width/2 ? red : + i == 75 || i == width-75 ? dashed : black); } pen ypen(int i) { - return linepen(i,height)+(i == height/2 ? red : - i == 75 || i == height-75 ? dashed : + return linepen(i,height)+(i == height/2 ? red : + i == 75 || i == height-75 ? dashed : black); } diff --git a/graphics/asymptote/examples/xxsq01x-1.asy b/graphics/asymptote/examples/xxsq01x-1.asy index 6d645a4966..eac387247e 100644 --- a/graphics/asymptote/examples/xxsq01x-1.asy +++ b/graphics/asymptote/examples/xxsq01x-1.asy @@ -28,8 +28,8 @@ xaxis3(Label("$x$",1),Arrow3); yaxis3(Label("$y$",1),Arrow3); dot(Label("$(1,1)$"),(1,1,0)); dot(Label("$(-1,1)$"),(-1,1,0),W); -arrow("$y=x^{2}$",F3(0.7),X,1cm,red); -arrow("$y=x$",(0.3,0.3,0),X,1.5cm,red); +arrow("$y=x^{2}$",F3(0.7),X,1cm,red); +arrow("$y=x$",(0.3,0.3,0),X,1.5cm,red); draw(circle((-1,1,0),2,Y),dashed); draw((-1,1,0)--(1,1,0),dashed); draw(shift(-X)*arc(0.02Y,0.3,90,0,0,0,CW),Arrow3); diff --git a/graphics/asymptote/examples/xxsq01y.asy b/graphics/asymptote/examples/xxsq01y.asy index 770f4fc22c..9424a1b47d 100644 --- a/graphics/asymptote/examples/xxsq01y.asy +++ b/graphics/asymptote/examples/xxsq01y.asy @@ -25,8 +25,8 @@ xaxis3(Label("$x$",1),Arrow3); yaxis3(Label("$y$",1),ymax=1.25,dashed,Arrow3); dot("$(1,1)$",(1,1,0),X); -arrow("$y=x^{2}$",F3(0.7),X,0.75cm,red); -arrow("$y=x$",(0.8,0.8,0),Y,1cm,red); +arrow("$y=x^{2}$",F3(0.7),X,0.75cm,red); +arrow("$y=x$",(0.8,0.8,0),Y,1cm,red); real r=0.4; draw((r,f(r),0)--(r,r,0),red); diff --git a/graphics/asymptote/examples/yingyang.asy b/graphics/asymptote/examples/yingyang.asy index 68b0d0eea7..10a08ec98d 100644 --- a/graphics/asymptote/examples/yingyang.asy +++ b/graphics/asymptote/examples/yingyang.asy @@ -1,5 +1,5 @@ size(0,25cm); -guide center=(0,1){W}..tension 0.8..(0,0){(1,-.5)}..tension 0.8..{W}(0,-1); +guide center=(0,1){W}..tension 0.8..(0,0){(1,-.5)}..tension 0.8..{W}(0,-1); draw((0,1)..(-1,0)..(0,-1)); filldraw(center{E}..{N}(1,0)..{W}cycle); diff --git a/graphics/asymptote/exp.cc b/graphics/asymptote/exp.cc index 4dacff72ec..dbf6886ecb 100644 --- a/graphics/asymptote/exp.cc +++ b/graphics/asymptote/exp.cc @@ -25,7 +25,7 @@ #include "process.h" //void runCode(absyntax::block *code); - + namespace absyntax { using namespace types; @@ -100,7 +100,7 @@ void exp::testCachedType(coenv &e) { types::ty *t = getType(e); if (!equivalent(t, ct)) { em.compiler(getPos()); - em << "cached type '" << *ct + em << "cached type '" << *ct << "' doesn't match actual type '" << *t << "'"; em.sync(); } @@ -305,7 +305,7 @@ types::ty *subscriptExp::getType(coenv &e) return a ? (isAnArray(e, index) ? a : a->celltype) : primError(); } - + void subscriptExp::transWrite(coenv &e, types::ty *t, exp *value) { // Put array, index, and value on the stack in that order, then call @@ -315,14 +315,14 @@ void subscriptExp::transWrite(coenv &e, types::ty *t, exp *value) return; if (!equivalent(a->celltype, t)) - { - em.error(getPos()); - em << "array expression cannot be used as an address"; + { + em.error(getPos()); + em << "array expression cannot be used as an address"; - // Translate the value for errors. - value->transToType(e, t); - return; - } + // Translate the value for errors. + value->transToType(e, t); + return; + } index->transToType(e, types::primInt()); @@ -447,17 +447,17 @@ types::ty *uniqueFunction(types::ty *t) { if (t->isOverloaded()) { types::ty *ft = 0; for (ty_iterator i = t->begin(); i != t->end(); ++i) - { - if ((*i)->kind != types::ty_function) - continue; + { + if ((*i)->kind != types::ty_function) + continue; - if (ft) { - // Multiple function types. - return 0; - } + if (ft) { + // Multiple function types. + return 0; + } - ft = *i; - } + ft = *i; + } return ft; } @@ -475,20 +475,20 @@ types::ty *uniqueFunction(types::ty *t1, types::ty *t2) { if (t1->isOverloaded()) { types::ty *ft = 0; for (ty_iterator i = t1->begin(); i != t1->end(); ++i) - { - if ((*i)->kind != types::ty_function) - continue; + { + if ((*i)->kind != types::ty_function) + continue; - if (!equivalent(*i, t2)) - continue; + if (!equivalent(*i, t2)) + continue; - if (ft) { - // Multiple function types. - return 0; - } + if (ft) { + // Multiple function types. + return 0; + } - ft = *i; - } + ft = *i; + } return ft; } @@ -588,8 +588,8 @@ void intExp::prettyprint(ostream &out, Int indent) types::ty *intExp::trans(coenv &e) { e.c.encode(inst::intpush,value); - - return types::primInt(); + + return types::primInt(); } @@ -602,8 +602,8 @@ void realExp::prettyprint(ostream &out, Int indent) types::ty *realExp::trans(coenv &e) { e.c.encode(inst::constpush,(item)value); - - return types::primReal(); + + return types::primReal(); } void stringExp::prettyprint(ostream &out, Int indent) @@ -615,8 +615,8 @@ void stringExp::prettyprint(ostream &out, Int indent) types::ty *stringExp::trans(coenv &e) { e.c.encode(inst::constpush,(item) string(str)); - - return types::primString(); + + return types::primString(); } @@ -629,8 +629,8 @@ void booleanExp::prettyprint(ostream &out, Int indent) types::ty *booleanExp::trans(coenv &e) { e.c.encode(inst::constpush,(item)value); - - return types::primBoolean(); + + return types::primBoolean(); } void newPictureExp::prettyprint(ostream &out, Int indent) @@ -641,8 +641,8 @@ void newPictureExp::prettyprint(ostream &out, Int indent) types::ty *newPictureExp::trans(coenv &e) { e.c.encode(inst::builtin, run::newPicture); - - return types::primPicture(); + + return types::primPicture(); } void cycleExp::prettyprint(ostream &out, Int indent) @@ -653,8 +653,8 @@ void cycleExp::prettyprint(ostream &out, Int indent) types::ty *cycleExp::trans(coenv &e) { e.c.encode(inst::builtin, run::newCycleToken); - - return types::primCycleToken(); + + return types::primCycleToken(); } void nullPathExp::prettyprint(ostream &out, Int indent) @@ -665,8 +665,8 @@ void nullPathExp::prettyprint(ostream &out, Int indent) types::ty *nullPathExp::trans(coenv &e) { e.c.encode(inst::builtin, run::nullPath); - - return types::primPath(); + + return types::primPath(); } void nullExp::prettyprint(ostream &out, Int indent) @@ -678,7 +678,7 @@ types::ty *nullExp::trans(coenv &) { // Things get put on the stack when ty_null // is cast to an appropriate type - return types::primNull(); + return types::primNull(); } @@ -691,8 +691,8 @@ void quoteExp::prettyprint(ostream &out, Int indent) types::ty *quoteExp::trans(coenv &e) { e.c.encode(inst::constpush,(item)value); - - return types::primCode(); + + return types::primCode(); } void explist::prettyprint(ostream &out, Int indent) @@ -740,7 +740,7 @@ signature *callExp::argTypes(coenv &e, bool *searchable) *searchable = true; size_t n = args->size(); - + for (size_t i = 0; i < n; i++) { if(string(args->args[i].name) == "KEY") { stringExp *s=dynamic_cast(args->args[i].val); @@ -851,7 +851,7 @@ void callExp::reportMismatch(function *ft, signature *source) void callExp::reportArgErrors(coenv &e) { // Cycle through the parameters to report all errors. - // NOTE: This may report inappropriate ambiguity errors. + // NOTE: This may report inappropriate ambiguity errors. for (size_t i = 0; i < args->size(); i++) { (*args)[i].val->trans(e); } @@ -860,12 +860,12 @@ void callExp::reportArgErrors(coenv &e) } void callExp::reportNonFunction() { - em.error(getPos()); - symbol s = callee->getName(); - if (s) - em << "\'" << s << "\' is not a function"; - else - em << "called expression is not a function"; + em.error(getPos()); + symbol s = callee->getName(); + if (s) + em << "\'" << s << "\' is not a function"; + else + em << "called expression is not a function"; } types::ty *callExp::cacheAppOrVarEntry(coenv &e, bool tacit) @@ -880,7 +880,7 @@ types::ty *callExp::cacheAppOrVarEntry(coenv &e, bool tacit) cout << "getApp for "; if (callee->getName()) cout << *callee->getName(); - else + else cout << "unnamed"; cout << " at " << getPos() << endl; cout << "searchable: " << searchable << endl; @@ -916,7 +916,7 @@ types::ty *callExp::cacheAppOrVarEntry(coenv &e, bool tacit) #ifdef DEBUG_GETAPP string name = callee->getName() ? string(*callee->getName()) : - string("unnamed"); + string("unnamed"); if (!callee->getName()) cout << getPos() << endl; #endif @@ -1035,8 +1035,8 @@ bool callExp::resolved(coenv &e) { cacheAppOrVarEntry(e, true); return cachedApp || cachedVarEntry; } - - + + void pairExp::prettyprint(ostream &out, Int indent) { prettyname(out, "pairExp",indent); @@ -1217,7 +1217,7 @@ types::ty *promote(coenv &e, types::ty *x, types::ty *y) bool castToFirst=e.castable(x, y, symbol::castsym); bool castToSecond=e.castable(y, x, symbol::castsym); - return (castToFirst && castToSecond) ? both(x,y) : + return (castToFirst && castToSecond) ? both(x,y) : castToFirst ? x : castToSecond ? y : 0; @@ -1265,7 +1265,7 @@ types::ty *conditionalExp::getType(coenv &e) types::ty *t = promote(e, tt, ft); return t ? t : primError(); } - + void orExp::prettyprint(ostream &out, Int indent) { @@ -1350,7 +1350,7 @@ void joinExp::prettyprint(ostream &out, Int indent) void specExp::prettyprint(ostream &out, Int indent) { prettyindent(out,indent); - out << "specExp '" << op << "' " + out << "specExp '" << op << "' " << (s==camp::OUT ? "out" : s==camp::IN ? "in" : "invalid side") << '\n'; @@ -1453,7 +1453,7 @@ void prefixExp::prettyprint(ostream &out, Int indent) { prettyindent(out, indent); out << "prefixExp '" << op << "'\n"; - + dest->prettyprint(out, indent+1); } diff --git a/graphics/asymptote/exp.h b/graphics/asymptote/exp.h index af24523b6d..562e229965 100644 --- a/graphics/asymptote/exp.h +++ b/graphics/asymptote/exp.h @@ -60,7 +60,7 @@ public: // expression. ie. 3sin(x) // If a "non-scalable" expression is scaled a warning is issued. virtual bool scalable() { return true; } - + // Specifies if the value of the expression should be written to interactive // prompt if typed as a stand-alone expression. For example: // > 2+3; @@ -177,7 +177,7 @@ public: // be called with the same target type as the original call to evaluate. // When evaluate() is called during the translation of a function, that // function must still be in translation when the evaluation is translated. - // + // // The base implementation uses a tempExp (see below). This is // sufficient for most expressions. virtual exp *evaluate(coenv &e, types::ty *target); @@ -207,7 +207,7 @@ public: class varEntryExp : public exp { trans::varEntry *v; public: - varEntryExp(position pos, trans::varEntry *v) + varEntryExp(position pos, trans::varEntry *v) : exp(pos), v(v) {} varEntryExp(position pos, types::ty *t, access *a); varEntryExp(position pos, types::ty *t, vm::bltin f); @@ -217,7 +217,7 @@ public: types::ty *getType(coenv &); types::ty *trans(coenv &e); trans::varEntry *getCallee(coenv &e, types::signature *sig); - + void transAct(action act, coenv &e, types::ty *target); void transAsType(coenv &e, types::ty *target); void transWrite(coenv &e, types::ty *t, exp *value); @@ -246,7 +246,7 @@ public: void transAsType(coenv &e, types::ty *target) { value->varTrans(trans::READ, e, target); - + // After translation, the cached type is no longer needed and should be // garbage collected. This could presumably be done in every class derived // from exp, but here it is most important as nameExp can have heavily @@ -290,7 +290,7 @@ public: ct=0; // See note in transAsType. } - + void transCall(coenv &e, types::ty *target) { value->varTrans(trans::CALL, e, target); @@ -401,7 +401,7 @@ protected: array *transArray(coenv &e); public: - arrayExp(position pos, exp *set) + arrayExp(position pos, exp *set) : exp(pos), set(set) {} }; @@ -629,7 +629,7 @@ public: : absyn(pos) {} virtual ~explist() {} - + virtual void add(exp *e) { exps.push_back(e); } @@ -639,7 +639,7 @@ public: virtual size_t size() { return exps.size(); } - + virtual exp * operator[] (size_t index) { return exps[index]; } @@ -675,7 +675,7 @@ public: : args(), rest(), restPosition(DUMMY_REST_POSITION) {} virtual ~arglist() {} - + virtual void addFront(argument a) { args.insert(args.begin(), a); } @@ -717,7 +717,7 @@ public: virtual size_t size() { return args.size(); } - + virtual argument& operator[] (size_t index) { return args[index]; } @@ -943,9 +943,9 @@ public: void transToType(coenv &e, types::ty *target); types::ty *trans(coenv &e); types::ty *getType(coenv &e); - + }; - + class andOrExp : public exp { protected: exp *left; @@ -1095,7 +1095,7 @@ public: types::ty *trans(coenv &e); types::ty *getType(coenv &) { return types::primError(); } }; - + } // namespace absyntax #endif diff --git a/graphics/asymptote/fftw++.h b/graphics/asymptote/fftw++.h index 01e1f55152..467387d34f 100644 --- a/graphics/asymptote/fftw++.h +++ b/graphics/asymptote/fftw++.h @@ -2,7 +2,7 @@ Copyright (C) 2004-16 John C. Bowman, University of Alberta Malcolm Roberts, University of Strasbourg - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 3 of the License, or @@ -39,22 +39,22 @@ #include #endif -inline int get_thread_num() +inline int get_thread_num() { #ifdef FFTWPP_SINGLE_THREAD return 0; #else return omp_get_thread_num(); -#endif +#endif } -inline int get_max_threads() +inline int get_max_threads() { #ifdef FFTWPP_SINGLE_THREAD return 1; #else return omp_get_max_threads(); -#endif +#endif } #ifndef FFTWPP_SINGLE_THREAD @@ -69,7 +69,7 @@ inline int get_max_threads() #define PARALLEL(code) \ { \ code \ - } + } #endif #ifndef __Complex_h__ @@ -117,12 +117,12 @@ class ThreadBase protected: unsigned int threads; unsigned int innerthreads; -public: +public: ThreadBase(); ThreadBase(unsigned int threads) : threads(threads) {} void Threads(unsigned int nthreads) {threads=nthreads;} unsigned int Threads() {return threads;} - + void multithread(unsigned int nx) { if(nx >= threads) { innerthreads=1; @@ -137,17 +137,17 @@ inline unsigned int realsize(unsigned int n, Complex *in, Complex *out=NULL) { return (!out || in == out) ? 2*(n/2+1) : n; } - + inline unsigned int realsize(unsigned int n, Complex *in, double *out) { - return realsize(n,in,(Complex *) out); + return realsize(n,in,(Complex *) out); } - + inline unsigned int realsize(unsigned int n, double *in, Complex *out) { - return realsize(n,(Complex *) in,out); + return realsize(n,(Complex *) in,out); } - + // Base clase for fft routines // class fftw : public ThreadBase { @@ -159,24 +159,24 @@ protected: fftw_plan plan; bool inplace; - + unsigned int Dist(unsigned int n, size_t stride, size_t dist) { return dist ? dist : ((stride == 1) ? n : 1); } - + static const double twopi; - + public: static unsigned int effort; static unsigned int maxthreads; static double testseconds; static const char *WisdomName; static fftw_plan (*planner)(fftw *f, Complex *in, Complex *out); - + virtual unsigned int Threads() {return threads;} - + static const char *oddshift; - + // Inplace shift of Fourier origin to (nx/2,0) for even nx. static void Shift(Complex *data, unsigned int nx, unsigned int ny, unsigned int threads) { @@ -260,41 +260,41 @@ public: exit(1); } } - + fftw() : plan(NULL) {} fftw(unsigned int doubles, int sign, unsigned int threads, unsigned int n=0) : - doubles(doubles), sign(sign), threads(threads), + doubles(doubles), sign(sign), threads(threads), norm(1.0/(n ? n : doubles/2)), plan(NULL) { #ifndef FFTWPP_SINGLE_THREAD fftw_init_threads(); -#endif +#endif } - + virtual ~fftw() { if(plan) fftw_destroy_plan(plan); } - + virtual fftw_plan Plan(Complex *in, Complex *out) {return NULL;}; - + inline void CheckAlign(Complex *p, const char *s) { if((size_t) p % sizeof(Complex) == 0) return; - std::cerr << "WARNING: " << s << " array is not " << sizeof(Complex) + std::cerr << "WARNING: " << s << " array is not " << sizeof(Complex) << "-byte aligned: address " << p << std::endl; } - + void noplan() { std::cerr << "Unable to construct FFTW plan" << std::endl; exit(1); } - + static void planThreads(unsigned int threads) { #ifndef FFTWPP_SINGLE_THREAD omp_set_num_threads(threads); fftw_plan_with_nthreads(threads); -#endif +#endif } - + threaddata time(fftw_plan plan1, fftw_plan planT, Complex *in, Complex *out, unsigned int Threads) { utils::statistics S,ST; @@ -339,30 +339,30 @@ public: } return threaddata(threads,S.mean(),S.stdev()); } - + virtual threaddata lookup(bool inplace, unsigned int threads) { return threaddata(); } virtual void store(bool inplace, const threaddata& data) {} - + inline Complex *CheckAlign(Complex *in, Complex *out, bool constructor=true) { -#ifndef NO_CHECK_ALIGN +#ifndef NO_CHECK_ALIGN CheckAlign(in,constructor ? "constructor input" : "input"); if(out) CheckAlign(out,constructor ? "constructor output" : "output"); else out=in; #else if(!out) out=in; -#endif +#endif return out; } - + threaddata Setup(Complex *in, Complex *out=NULL) { bool alloc=!in; if(alloc) in=utils::ComplexAlign((doubles+1)/2); out=CheckAlign(in,out); inplace=(out==in); - + threaddata data; unsigned int Threads=threads; if(threads > 1) data=lookup(inplace,threads); @@ -370,13 +370,13 @@ public: planThreads(threads); plan=(*planner)(this,in,out); if(!plan) noplan(); - + fftw_plan planT; if(fftw::maxthreads > 1) { threads=Threads; planThreads(threads); planT=(*planner)(this,in,out); - + if(data.threads == 0) { if(planT) data=time(plan,planT,in,out,threads); @@ -384,11 +384,11 @@ public: store(inplace,threaddata(threads,data.mean,data.stdev)); } } - + if(alloc) Array::deleteAlign(in,(doubles+1)/2); return data; } - + threaddata Setup(Complex *in, double *out) { return Setup(in,(Complex *) out); } @@ -396,11 +396,11 @@ public: threaddata Setup(double *in, Complex *out=NULL) { return Setup((Complex *) in,out); } - + virtual void Execute(Complex *in, Complex *out, bool=false) { fftw_execute_dft(plan,(fftw_complex *) in,(fftw_complex *) out); } - + Complex *Setout(Complex *in, Complex *out) { out=CheckAlign(in,out,false); if(inplace ^ (out == in)) { @@ -409,33 +409,33 @@ public: } return out; } - + void fft(Complex *in, Complex *out=NULL) { out=Setout(in,out); Execute(in,out); } - + void fft(double *in, Complex *out=NULL) { fft((Complex *) in,out); } - + void fft(Complex *in, double *out) { fft(in,(Complex *) out); } - + void fft0(Complex *in, Complex *out=NULL) { out=Setout(in,out); Execute(in,out,true); } - + void fft0(double *in, Complex *out=NULL) { fft0((Complex *) in,out); } - + void fft0(Complex *in, double *out) { fft0(in,(Complex *) out); } - + void Normalize(Complex *out) { unsigned int stop=doubles/2; #ifndef FFTWPP_SINGLE_THREAD @@ -450,29 +450,29 @@ public: #endif for(unsigned int i=0; i < doubles; i++) out[i] *= norm; } - - virtual void fftNormalized(Complex *in, Complex *out=NULL, bool shift=false) + + virtual void fftNormalized(Complex *in, Complex *out=NULL, bool shift=false) { out=Setout(in,out); Execute(in,out,shift); Normalize(out); } - + virtual void fftNormalized(Complex *in, double *out, bool shift=false) { out=(double *) Setout(in,(Complex *) out); Execute(in,(Complex *) out,shift); Normalize(out); } - + virtual void fftNormalized(double *in, Complex *out, bool shift=false) { fftNormalized((Complex *) in,out,shift); } - + template void fft0Normalized(I in, O out) { fftNormalized(in,out,true); } - + template void Normalize(unsigned int nx, unsigned int M, size_t ostride, size_t odist, O *out) { @@ -488,7 +488,7 @@ public: } } } - + template void fftNormalized(unsigned int nx, unsigned int M, size_t ostride, size_t odist, I *in, O *out=NULL, bool shift=false) { @@ -508,7 +508,7 @@ public: T *in, T *out=NULL, unsigned int threads=fftw::maxthreads) { unsigned int size=sizeof(T); if(size % sizeof(double) != 0) { - std::cerr << "ERROR: Transpose is not implemented for type of size " + std::cerr << "ERROR: Transpose is not implemented for type of size " << size; exit(1); } @@ -520,14 +520,14 @@ public: if(!out) out=in; inplace=(out==in); fftw::planThreads(threads); - + fftw_iodim dims[3]; - dims[0].n=rows; + dims[0].n=rows; dims[0].is=cols*length; dims[0].os=length; - - dims[1].n=cols; + + dims[1].n=cols; dims[1].is=length; dims[1].os=rows*length; @@ -543,7 +543,7 @@ public: ~Transpose() { if(plan) fftw_destroy_plan(plan); } - + template void transpose(T *in, T *out=NULL) { if(!plan) return; @@ -565,7 +565,7 @@ public: typename Table::iterator p=table.find(key); return p == table.end() ? threaddata() : p->second; } - + void Store(Table& threadtable, T key, const threaddata& data) { threadtable[key]=data; } @@ -575,10 +575,10 @@ struct keytype1 { unsigned int nx; unsigned int threads; bool inplace; - keytype1(unsigned int nx, unsigned int threads, bool inplace) : + keytype1(unsigned int nx, unsigned int threads, bool inplace) : nx(nx), threads(threads), inplace(inplace) {} }; - + struct keyless1 { bool operator()(const keytype1& a, const keytype1& b) const { return a.nx < b.nx || (a.nx == b.nx && @@ -593,10 +593,10 @@ struct keytype2 { unsigned int threads; bool inplace; keytype2(unsigned int nx, unsigned int ny, unsigned int threads, - bool inplace) : + bool inplace) : nx(nx), ny(ny), threads(threads), inplace(inplace) {} }; - + struct keyless2 { bool operator()(const keytype2& a, const keytype2& b) const { return a.nx < b.nx || (a.nx == b.nx && @@ -614,13 +614,13 @@ struct keytype3 { unsigned int threads; bool inplace; keytype3(unsigned int nx, unsigned int ny, unsigned int nz, - unsigned int threads, bool inplace) : + unsigned int threads, bool inplace) : nx(nx), ny(ny), nz(nz), threads(threads), inplace(inplace) {} }; - + struct keyless3 { bool operator()(const keytype3& a, const keytype3& b) const { - return a.nx < b.nx || (a.nx == b.nx && + return a.nx < b.nx || (a.nx == b.nx && (a.ny < b.ny || (a.ny == b.ny && (a.nz < b.nz || (a.nz == b.nz && @@ -634,7 +634,7 @@ struct keyless3 { // Before calling fft(), the arrays in and out (which may coincide) must be // allocated as Complex[n]. // -// Out-of-place usage: +// Out-of-place usage: // // fft1d Forward(n,-1,in,out); // Forward.fft(in,out); @@ -656,31 +656,31 @@ struct keyless3 { class fft1d : public fftw, public Threadtable { unsigned int nx; static Table threadtable; -public: +public: fft1d(unsigned int nx, int sign, Complex *in=NULL, Complex *out=NULL, unsigned int threads=maxthreads) - : fftw(2*nx,sign,threads), nx(nx) {Setup(in,out);} - + : fftw(2*nx,sign,threads), nx(nx) {Setup(in,out);} + #ifdef __Array_h__ fft1d(int sign, const Array::array1& in, const Array::array1& out=Array::NULL1, - unsigned int threads=maxthreads) - : fftw(2*in.Nx(),sign,threads), nx(in.Nx()) {Setup(in,out);} -#endif - + unsigned int threads=maxthreads) + : fftw(2*in.Nx(),sign,threads), nx(in.Nx()) {Setup(in,out);} +#endif + threaddata lookup(bool inplace, unsigned int threads) { return this->Lookup(threadtable,keytype1(nx,threads,inplace)); } void store(bool inplace, const threaddata& data) { this->Store(threadtable,keytype1(nx,data.threads,inplace),data); } - + fftw_plan Plan(Complex *in, Complex *out) { return fftw_plan_dft_1d(nx,(fftw_complex *) in,(fftw_complex *) out, sign,effort); } }; - + template class fftwblock : public virtual fftw { public: @@ -699,19 +699,19 @@ public: T=1; Q=M; R=0; - + threaddata S1=Setup(in,out); fftw_plan planT1=plan; - + if(fftw::maxthreads > 1) { if(Threads > 1) { T=std::min(M,Threads); Q=T > 0 ? M/T : 0; R=M-Q*T; - + threads=Threads; threaddata ST=Setup(in,out); - + if(R > 0 && threads == 1 && plan1 != plan2) { fftw_destroy_plan(plan2); plan2=plan1; @@ -735,23 +735,23 @@ public: } else Setup(in,out); // Synchronize wisdom } - } - + } + fftw_plan Plan(int Q, fftw_complex *in, fftw_complex *out) { return fftw_plan_many_dft(1,&nx,Q,in,NULL,istride,idist, out,NULL,ostride,odist,sign,effort); } - + fftw_plan Plan(int Q, double *in, fftw_complex *out) { return fftw_plan_many_dft_r2c(1,&nx,Q,in,NULL,istride,idist, out,NULL,ostride,odist,effort); } - + fftw_plan Plan(int Q, fftw_complex *in, double *out) { return fftw_plan_many_dft_c2r(1,&nx,Q,in,NULL,istride,idist, out,NULL,ostride,odist,effort); } - + fftw_plan Plan(Complex *in, Complex *out) { if(R > 0) { plan2=Plan(Q+1,(I *) in,(O *) out); @@ -760,11 +760,11 @@ public: } return Plan(Q,(I *) in,(O *) out); } - + void Execute(fftw_plan plan, fftw_complex *in, fftw_complex *out) { fftw_execute_dft(plan,in,out); } - + void Execute(fftw_plan plan, double *in, fftw_complex *out) { fftw_execute_dft_r2c(plan,in,out); } @@ -792,20 +792,20 @@ public: } } } - + unsigned int Threads() {return std::max(T,threads);} - + ~fftwblock() { if(plan2) fftw_destroy_plan(plan2); } }; - + // Compute the complex Fourier transform of M complex vectors, each of // length n. // Before calling fft(), the arrays in and out (which may coincide) must be // allocated as Complex[M*n]. // -// Out-of-place usage: +// Out-of-place usage: // // mfft1d Forward(n,-1,M,stride,dist,in,out); // Forward.fft(in,out); @@ -823,14 +823,14 @@ public: class mfft1d : public fftwblock, public Threadtable { static Table threadtable; -public: +public: mfft1d(unsigned int nx, int sign, unsigned int M=1, size_t stride=1, size_t dist=0, Complex *in=NULL, Complex *out=NULL, unsigned int threads=maxthreads) : fftw(2*((nx-1)*stride+(M-1)*Dist(nx,stride,dist)+1),sign,threads,nx), fftwblock - (nx,M,stride,stride,dist,dist,in,out,threads) {} - + (nx,M,stride,stride,dist,dist,in,out,threads) {} + mfft1d(unsigned int nx, int sign, unsigned int M, size_t istride, size_t ostride, size_t idist, size_t odist, Complex *in=NULL, Complex *out=NULL, unsigned int threads=maxthreads): @@ -838,8 +838,8 @@ public: 2*((nx-1)*ostride+(M-1)*Dist(nx,ostride,odist)+1)),sign, threads, nx), fftwblock(nx,M,istride,ostride,idist,odist,in, - out,threads) {} - + out,threads) {} + threaddata lookup(bool inplace, unsigned int threads) { return Lookup(threadtable,keytype3(nx,Q,R,threads,inplace)); } @@ -847,13 +847,13 @@ public: Store(threadtable,keytype3(nx,Q,R,data.threads,inplace),data); } }; - + // Compute the complex Fourier transform of n real values, using phase sign -1. // Before calling fft(), the array in must be allocated as double[n] and // the array out must be allocated as Complex[n/2+1]. The arrays in and out // may coincide, allocated as Complex[n/2+1]. // -// Out-of-place usage: +// Out-of-place usage: // // rcfft1d Forward(n,in,out); // Forward.fft(in,out); @@ -862,7 +862,7 @@ public: // // rcfft1d Forward(n); // Forward.fft(out); -// +// // Notes: // in contains the n real values stored as a Complex array; // out contains the first n/2+1 Complex Fourier values. @@ -870,36 +870,36 @@ public: class rcfft1d : public fftw, public Threadtable { unsigned int nx; static Table threadtable; -public: - rcfft1d(unsigned int nx, Complex *out=NULL, unsigned int threads=maxthreads) +public: + rcfft1d(unsigned int nx, Complex *out=NULL, unsigned int threads=maxthreads) : fftw(2*(nx/2+1),-1,threads,nx), nx(nx) {Setup(out,(double*) NULL);} - + rcfft1d(unsigned int nx, double *in, Complex *out=NULL, - unsigned int threads=maxthreads) + unsigned int threads=maxthreads) : fftw(2*(nx/2+1),-1,threads,nx), nx(nx) {Setup(in,out);} - + threaddata lookup(bool inplace, unsigned int threads) { return Lookup(threadtable,keytype1(nx,threads,inplace)); } void store(bool inplace, const threaddata& data) { Store(threadtable,keytype1(nx,data.threads,inplace),data); } - + fftw_plan Plan(Complex *in, Complex *out) { return fftw_plan_dft_r2c_1d(nx,(double *) in,(fftw_complex *) out, effort); } - + void Execute(Complex *in, Complex *out, bool=false) { fftw_execute_dft_r2c(plan,(double *) in,(fftw_complex *) out); } }; - + // Compute the real inverse Fourier transform of the n/2+1 Complex values // corresponding to the non-negative part of the frequency spectrum, using // phase sign +1. // Before calling fft(), the array in must be allocated as Complex[n/2+1] // and the array out must be allocated as double[n]. The arrays in and out -// may coincide, allocated as Complex[n/2+1]. +// may coincide, allocated as Complex[n/2+1]. // // Out-of-place usage (input destroyed): // @@ -910,7 +910,7 @@ public: // // crfft1d Backward(n); // Backward.fft(in); -// +// // Notes: // in contains the first n/2+1 Complex Fourier values. // out contains the n real values stored as a Complex array; @@ -918,25 +918,25 @@ public: class crfft1d : public fftw, public Threadtable { unsigned int nx; static Table threadtable; -public: - crfft1d(unsigned int nx, double *out=NULL, unsigned int threads=maxthreads) - : fftw(2*(nx/2+1),1,threads,nx), nx(nx) {Setup(out);} - - crfft1d(unsigned int nx, Complex *in, double *out=NULL, +public: + crfft1d(unsigned int nx, double *out=NULL, unsigned int threads=maxthreads) + : fftw(2*(nx/2+1),1,threads,nx), nx(nx) {Setup(out);} + + crfft1d(unsigned int nx, Complex *in, double *out=NULL, unsigned int threads=maxthreads) - : fftw(realsize(nx,in,out),1,threads,nx), nx(nx) {Setup(in,out);} - + : fftw(realsize(nx,in,out),1,threads,nx), nx(nx) {Setup(in,out);} + threaddata lookup(bool inplace, unsigned int threads) { return Lookup(threadtable,keytype1(nx,threads,inplace)); } void store(bool inplace, const threaddata& data) { Store(threadtable,keytype1(nx,data.threads,inplace),data); } - + fftw_plan Plan(Complex *in, Complex *out) { return fftw_plan_dft_c2r_1d(nx,(fftw_complex *) in,(double *) out,effort); } - + void Execute(Complex *in, Complex *out, bool=false) { fftw_execute_dft_c2r(plan,(fftw_complex *) in,(double *) out); } @@ -948,7 +948,7 @@ public: // Complex[M*(n/2+1)]. The arrays in and out may coincide, // allocated as Complex[M*(n/2+1)]. // -// Out-of-place usage: +// Out-of-place usage: // // mrcfft1d Forward(n,M,istride,ostride,idist,odist,in,out); // Forward.fft(in,out); @@ -957,7 +957,7 @@ public: // // mrcfft1d Forward(n,M,istride,ostride,idist,odist); // Forward.fft(out); -// +// // Notes: // istride is the spacing between the elements of each real vector; // ostride is the spacing between the elements of each Complex vector; @@ -974,28 +974,28 @@ public: size_t istride, size_t ostride, size_t idist, size_t odist, double *in=NULL, Complex *out=NULL, - unsigned int threads=maxthreads) + unsigned int threads=maxthreads) : fftw(std::max((realsize(nx,in,out)-2)*istride+(M-1)*idist+2, 2*(nx/2*ostride+(M-1)*odist+1)),-1,threads,nx), fftwblock (nx,M,istride,ostride,idist,odist,(Complex *) in,out,threads) {} - + threaddata lookup(bool inplace, unsigned int threads) { return Lookup(threadtable,keytype3(nx,Q,R,threads,inplace)); } - + void store(bool inplace, const threaddata& data) { Store(threadtable,keytype3(nx,Q,R,data.threads,inplace),data); } - + void Normalize(Complex *out) { fftw::Normalize(nx/2+1,M,ostride,odist,out); } - + void fftNormalized(double *in, Complex *out=NULL, bool shift=false) { fftw::fftNormalized(nx/2+1,M,ostride,odist,in,out,false); } - + void fft0Normalized(double *in, Complex *out=NULL) { fftw::fftNormalized(nx/2+1,M,ostride,odist,in,out,true); } @@ -1006,7 +1006,7 @@ public: // spectra, using phase sign +1. Before calling fft(), the array in must be // allocated as Complex[M*(n/2+1)] and the array out must be allocated as // double[M*n]. The arrays in and out may coincide, -// allocated as Complex[M*(n/2+1)]. +// allocated as Complex[M*(n/2+1)]. // // Out-of-place usage (input destroyed): // @@ -1017,7 +1017,7 @@ public: // // mcrfft1d Backward(n,M,istride,ostride,idist,odist); // Backward.fft(out); -// +// // Notes: // stride is the spacing between the elements of each Complex vector; // dist is the spacing between the first elements of the vectors; @@ -1030,38 +1030,38 @@ class mcrfft1d : public fftwblock, public: mcrfft1d(unsigned int nx, unsigned int M, size_t istride, size_t ostride, size_t idist, size_t odist, Complex *in=NULL, double *out=NULL, - unsigned int threads=maxthreads) + unsigned int threads=maxthreads) : fftw(std::max(2*(nx/2*istride+(M-1)*idist+1), (realsize(nx,in,out)-2)*ostride+(M-1)*odist+2),1,threads,nx), fftwblock (nx,M,istride,ostride,idist,odist,in,(Complex *) out,threads) {} - + threaddata lookup(bool inplace, unsigned int threads) { return Lookup(threadtable,keytype3(nx,Q,R,threads,inplace)); } - + void store(bool inplace, const threaddata& data) { Store(threadtable,keytype3(nx,Q,R,data.threads,inplace),data); } - + void Normalize(double *out) { fftw::Normalize(nx,M,ostride,odist,out); } - + void fftNormalized(Complex *in, double *out=NULL, bool shift=false) { fftw::fftNormalized(nx,M,ostride,odist,in,out,false); } - + void fft0Normalized(Complex *in, double *out=NULL) { fftw::fftNormalized(nx,M,ostride,odist,in,out,true); } }; - + // Compute the complex two-dimensional Fourier transform of nx times ny // complex values. Before calling fft(), the arrays in and out (which may // coincide) must be allocated as Complex[nx*ny]. // -// Out-of-place usage: +// Out-of-place usage: // // fft2d Forward(nx,ny,-1,in,out); // Forward.fft(in,out); @@ -1087,32 +1087,32 @@ class fft2d : public fftw, public Threadtable { unsigned int nx; unsigned int ny; static Table threadtable; -public: +public: fft2d(unsigned int nx, unsigned int ny, int sign, Complex *in=NULL, - Complex *out=NULL, unsigned int threads=maxthreads) - : fftw(2*nx*ny,sign,threads), nx(nx), ny(ny) {Setup(in,out);} - + Complex *out=NULL, unsigned int threads=maxthreads) + : fftw(2*nx*ny,sign,threads), nx(nx), ny(ny) {Setup(in,out);} + #ifdef __Array_h__ fft2d(int sign, const Array::array2& in, - const Array::array2& out=Array::NULL2, - unsigned int threads=maxthreads) + const Array::array2& out=Array::NULL2, + unsigned int threads=maxthreads) : fftw(2*in.Size(),sign,threads), nx(in.Nx()), ny(in.Ny()) { Setup(in,out); } -#endif - +#endif + threaddata lookup(bool inplace, unsigned int threads) { return this->Lookup(threadtable,keytype2(nx,ny,threads,inplace)); } void store(bool inplace, const threaddata& data) { this->Store(threadtable,keytype2(nx,ny,data.threads,inplace),data); } - + fftw_plan Plan(Complex *in, Complex *out) { return fftw_plan_dft_2d(nx,ny,(fftw_complex *) in,(fftw_complex *) out, sign,effort); } - + void Execute(Complex *in, Complex *out, bool=false) { fftw_execute_dft(plan,(fftw_complex *) in,(fftw_complex *) out); } @@ -1122,9 +1122,9 @@ public: // values, using phase sign -1. // Before calling fft(), the array in must be allocated as double[nx*ny] and // the array out must be allocated as Complex[nx*(ny/2+1)]. The arrays in -// and out may coincide, allocated as Complex[nx*(ny/2+1)]. +// and out may coincide, allocated as Complex[nx*(ny/2+1)]. // -// Out-of-place usage: +// Out-of-place usage: // // rcfft2d Forward(nx,ny,in,out); // Forward.fft(in,out); // Origin of Fourier domain at (0,0) @@ -1136,7 +1136,7 @@ public: // rcfft2d Forward(nx,ny); // Forward.fft(in); // Origin of Fourier domain at (0,0) // Forward.fft0(in); // Origin of Fourier domain at (nx/2,0) -// +// // Notes: // in contains the nx*ny real values stored as a Complex array; // out contains the upper-half portion (ky >= 0) of the Complex transform. @@ -1144,22 +1144,22 @@ public: class rcfft2d : public fftw { unsigned int nx; unsigned int ny; -public: +public: rcfft2d(unsigned int nx, unsigned int ny, Complex *out=NULL, - unsigned int threads=maxthreads) - : fftw(2*nx*(ny/2+1),-1,threads,nx*ny), nx(nx), ny(ny) {Setup(out);} - + unsigned int threads=maxthreads) + : fftw(2*nx*(ny/2+1),-1,threads,nx*ny), nx(nx), ny(ny) {Setup(out);} + rcfft2d(unsigned int nx, unsigned int ny, double *in, Complex *out=NULL, - unsigned int threads=maxthreads) + unsigned int threads=maxthreads) : fftw(2*nx*(ny/2+1),-1,threads,nx*ny), nx(nx), ny(ny) { Setup(in,out); - } - + } + fftw_plan Plan(Complex *in, Complex *out) { return fftw_plan_dft_r2c_2d(nx,ny,(double *) in,(fftw_complex *) out, effort); } - + void Execute(Complex *in, Complex *out, bool shift=false) { if(shift) { if(inplace) Shift(in,nx,ny,threads); @@ -1167,7 +1167,7 @@ public: } fftw_execute_dft_r2c(plan,(double *) in,(fftw_complex *) out); } - + // Set Nyquist modes of even shifted transforms to zero. void deNyquist(Complex *f) { unsigned int nyp=ny/2+1; @@ -1185,14 +1185,14 @@ public: f[(i+1)*nyp-1]=0.0; } }; - + // Compute the real two-dimensional inverse Fourier transform of the // nx*(ny/2+1) Complex values corresponding to the spectral values in the // half-plane ky >= 0, using phase sign +1. // Before calling fft(), the array in must be allocated as // Complex[nx*(ny/2+1)] and the array out must be allocated as // double[nx*ny]. The arrays in and out may coincide, -// allocated as Complex[nx*(ny/2+1)]. +// allocated as Complex[nx*(ny/2+1)]. // // Out-of-place usage (input destroyed): // @@ -1205,7 +1205,7 @@ public: // crfft2d Backward(nx,ny); // Backward.fft(in); // Origin of Fourier domain at (0,0) // Backward.fft0(in); // Origin of Fourier domain at (nx/2,0) -// +// // Notes: // in contains the upper-half portion (ky >= 0) of the Complex transform; // out contains the nx*ny real values stored as a Complex array. @@ -1213,22 +1213,22 @@ public: class crfft2d : public fftw { unsigned int nx; unsigned int ny; -public: +public: crfft2d(unsigned int nx, unsigned int ny, double *out=NULL, unsigned int threads=maxthreads) : - fftw(2*nx*(ny/2+1),1,threads,nx*ny), nx(nx), ny(ny) {Setup(out);} - + fftw(2*nx*(ny/2+1),1,threads,nx*ny), nx(nx), ny(ny) {Setup(out);} + crfft2d(unsigned int nx, unsigned int ny, Complex *in, double *out=NULL, unsigned int threads=maxthreads) : fftw(nx*realsize(ny,in,out),1,threads,nx*ny), nx(nx), ny(ny) { Setup(in,out); - } - + } + fftw_plan Plan(Complex *in, Complex *out) { return fftw_plan_dft_c2r_2d(nx,ny,(fftw_complex *) in,(double *) out, effort); } - + void Execute(Complex *in, Complex *out, bool shift=false) { fftw_execute_dft_c2r(plan,(fftw_complex *) in,(double *) out); if(shift) { @@ -1236,7 +1236,7 @@ public: else Shift((double *) out,nx,ny,threads); } } - + // Set Nyquist modes of even shifted transforms to zero. void deNyquist(Complex *f) { unsigned int nyp=ny/2+1; @@ -1255,11 +1255,11 @@ public: } }; -// Compute the complex three-dimensional Fourier transform of +// Compute the complex three-dimensional Fourier transform of // nx times ny times nz complex values. Before calling fft(), the arrays in // and out (which may coincide) must be allocated as Complex[nx*ny*nz]. // -// Out-of-place usage: +// Out-of-place usage: // // fft3d Forward(nx,ny,nz,-1,in,out); // Forward.fft(in,out); @@ -1286,20 +1286,20 @@ class fft3d : public fftw { unsigned int nx; unsigned int ny; unsigned int nz; -public: +public: fft3d(unsigned int nx, unsigned int ny, unsigned int nz, int sign, Complex *in=NULL, Complex *out=NULL, - unsigned int threads=maxthreads) - : fftw(2*nx*ny*nz,sign,threads), nx(nx), ny(ny), nz(nz) {Setup(in,out);} - + unsigned int threads=maxthreads) + : fftw(2*nx*ny*nz,sign,threads), nx(nx), ny(ny), nz(nz) {Setup(in,out);} + #ifdef __Array_h__ fft3d(int sign, const Array::array3& in, const Array::array3& out=Array::NULL3, - unsigned int threads=maxthreads) - : fftw(2*in.Size(),sign,threads), nx(in.Nx()), ny(in.Ny()), nz(in.Nz()) + unsigned int threads=maxthreads) + : fftw(2*in.Size(),sign,threads), nx(in.Nx()), ny(in.Ny()), nz(in.Nz()) {Setup(in,out);} -#endif - +#endif + fftw_plan Plan(Complex *in, Complex *out) { return fftw_plan_dft_3d(nx,ny,nz,(fftw_complex *) in, (fftw_complex *) out, sign, effort); @@ -1310,9 +1310,9 @@ public: // nx times ny times nz real values, using phase sign -1. // Before calling fft(), the array in must be allocated as double[nx*ny*nz] // and the array out must be allocated as Complex[nx*ny*(nz/2+1)]. The -// arrays in and out may coincide, allocated as Complex[nx*ny*(nz/2+1)]. +// arrays in and out may coincide, allocated as Complex[nx*ny*(nz/2+1)]. // -// Out-of-place usage: +// Out-of-place usage: // // rcfft3d Forward(nx,ny,nz,in,out); // Forward.fft(in,out); // Origin of Fourier domain at (0,0) @@ -1323,7 +1323,7 @@ public: // rcfft3d Forward(nx,ny,nz); // Forward.fft(in); // Origin of Fourier domain at (0,0) // Forward.fft0(in); // Origin of Fourier domain at (nx/2,ny/2,0) -// +// // Notes: // in contains the nx*ny*nz real values stored as a Complex array; // out contains the upper-half portion (kz >= 0) of the Complex transform. @@ -1332,23 +1332,23 @@ class rcfft3d : public fftw { unsigned int nx; unsigned int ny; unsigned int nz; -public: +public: rcfft3d(unsigned int nx, unsigned int ny, unsigned int nz, Complex *out=NULL, unsigned int threads=maxthreads) : fftw(2*nx*ny*(nz/2+1),-1,threads,nx*ny*nz), nx(nx), ny(ny), nz(nz) { Setup(out); - } - + } + rcfft3d(unsigned int nx, unsigned int ny, unsigned int nz, double *in, - Complex *out=NULL, unsigned int threads=maxthreads) + Complex *out=NULL, unsigned int threads=maxthreads) : fftw(2*nx*ny*(nz/2+1),-1,threads,nx*ny*nz), - nx(nx), ny(ny), nz(nz) {Setup(in,out);} - + nx(nx), ny(ny), nz(nz) {Setup(in,out);} + fftw_plan Plan(Complex *in, Complex *out) { return fftw_plan_dft_r2c_3d(nx,ny,nz,(double *) in,(fftw_complex *) out, effort); } - + void Execute(Complex *in, Complex *out, bool shift=false) { if(shift) { if(inplace) Shift(in,nx,ny,nz,threads); @@ -1356,7 +1356,7 @@ public: } fftw_execute_dft_r2c(plan,(double *) in,(fftw_complex *) out); } - + // Set Nyquist modes of even shifted transforms to zero. void deNyquist(Complex *f) { unsigned int nzp=nz/2+1; @@ -1368,7 +1368,7 @@ public: for(unsigned int k=0; k < yz; ++k) f[k]=0.0; } - + if(ny % 2 == 0) { #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) @@ -1379,7 +1379,7 @@ public: f[iyz+k]=0.0; } } - + if(nz % 2 == 0) #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) @@ -1389,14 +1389,14 @@ public: f[i*yz+(j+1)*nzp-1]=0.0; } }; - + // Compute the real two-dimensional inverse Fourier transform of the // nx*ny*(nz/2+1) Complex values corresponding to the spectral values in the // half-plane kz >= 0, using phase sign +1. // Before calling fft(), the array in must be allocated as // Complex[nx*ny*(nz+1)/2] and the array out must be allocated as // double[nx*ny*nz]. The arrays in and out may coincide, -// allocated as Complex[nx*ny*(nz/2+1)]. +// allocated as Complex[nx*ny*(nz/2+1)]. // // Out-of-place usage (input destroyed): // @@ -1409,7 +1409,7 @@ public: // crfft3d Backward(nx,ny,nz); // Backward.fft(in); // Origin of Fourier domain at (0,0) // Backward.fft0(in); // Origin of Fourier domain at (nx/2,ny/2,0) -// +// // Notes: // in contains the upper-half portion (kz >= 0) of the Complex transform; // out contains the nx*ny*nz real values stored as a Complex array. @@ -1418,22 +1418,22 @@ class crfft3d : public fftw { unsigned int nx; unsigned int ny; unsigned int nz; -public: +public: crfft3d(unsigned int nx, unsigned int ny, unsigned int nz, double *out=NULL, - unsigned int threads=maxthreads) + unsigned int threads=maxthreads) : fftw(2*nx*ny*(nz/2+1),1,threads,nx*ny*nz), nx(nx), ny(ny), nz(nz) - {Setup(out);} - + {Setup(out);} + crfft3d(unsigned int nx, unsigned int ny, unsigned int nz, Complex *in, - double *out=NULL, unsigned int threads=maxthreads) + double *out=NULL, unsigned int threads=maxthreads) : fftw(nx*ny*(realsize(nz,in,out)),1,threads,nx*ny*nz), nx(nx), ny(ny), - nz(nz) {Setup(in,out);} - + nz(nz) {Setup(in,out);} + fftw_plan Plan(Complex *in, Complex *out) { return fftw_plan_dft_c2r_3d(nx,ny,nz,(fftw_complex *) in,(double *) out, effort); } - + void Execute(Complex *in, Complex *out, bool shift=false) { fftw_execute_dft_c2r(plan,(fftw_complex *) in,(double *) out); if(shift) { @@ -1441,7 +1441,7 @@ public: else Shift((double *) out,nx,ny,nz,threads); } } - + // Set Nyquist modes of even shifted transforms to zero. void deNyquist(Complex *f) { unsigned int nzp=nz/2+1; @@ -1453,7 +1453,7 @@ public: for(unsigned int k=0; k < yz; ++k) f[k]=0.0; } - + if(ny % 2 == 0) { #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) @@ -1464,7 +1464,7 @@ public: f[iyz+k]=0.0; } } - + if(nz % 2 == 0) #ifndef FFTWPP_SINGLE_THREAD #pragma omp parallel for num_threads(threads) diff --git a/graphics/asymptote/fileio.cc b/graphics/asymptote/fileio.cc index d738438820..524e653e12 100644 --- a/graphics/asymptote/fileio.cc +++ b/graphics/asymptote/fileio.cc @@ -18,6 +18,41 @@ string newline="\n"; ofile Stdout(""); file nullfile("",false,NOMODE,false,true); +void ifile::open() +{ + if(standard) { + if(mode & std::ios::binary) + reportError("Cannot open standard input in binary mode"); + stream=&cin; + } else { + if(mode & std::ios::out) + name=outpath(name); + else { +#ifdef HAVE_LIBCURL + if(parser::isURL(name)) { + parser::readURL(buf,name); + stream=&buf; + } else +#endif + { + name=locatefile(inpath(name)); + stream=fstream=new std::fstream(name.c_str(),mode); + } + } + + if(mode & std::ios::out) { + if(error()) { + delete fstream; + std::ofstream f(name.c_str()); + f.close(); + stream=fstream=new std::fstream(name.c_str(),mode); + } + } + index=processData().ifile.add(fstream); + if(check) Check(); + } +} + void ifile::ignoreComment() { if(comment == 0) return; @@ -38,7 +73,7 @@ void ifile::ignoreComment() } else {if(c != EOF && eol) stream->unget(); return;} } } - + bool ifile::eol() { int c; @@ -51,7 +86,7 @@ bool ifile::eol() } return false; } - + bool ifile::nexteol() { int c; @@ -59,7 +94,7 @@ bool ifile::nexteol() nullfield=false; return true; } - + while(isspace(c=stream->peek())) { if(c == '\n' && comma) { nullfield=true; @@ -80,7 +115,7 @@ bool ifile::nexteol() } return false; } - + void ifile::csv() { comma=false; @@ -96,7 +131,7 @@ void ifile::csv() } else stream->clear(rdstate); if(c == ',') comma=true; } - + void ifile::Read(string& val) { string s; @@ -132,7 +167,7 @@ void ifile::Read(string& val) } } else getline(*stream,s); - + if(comment) { size_t p=0; while((p=s.find(comment,p)) < string::npos) { @@ -140,7 +175,7 @@ void ifile::Read(string& val) s.erase(p,1); ++p; } else { - s.erase(p); + s.erase(p); break; } } @@ -152,8 +187,8 @@ void ifile::Read(string& val) } val=whitespace+s; } - -void ofile::writeline() + +void ofile::writeline() { if(standard && interact::query && !vm::indebugger) { Int scroll=settings::getScroll(); @@ -176,5 +211,5 @@ void ofile::writeline() } else *stream << newline; if(errorstream::interrupt) {interact::lines=0; throw interrupted();} } - + } // namespace camp diff --git a/graphics/asymptote/fileio.h b/graphics/asymptote/fileio.h index 762e541ad9..b68ba0431b 100644 --- a/graphics/asymptote/fileio.h +++ b/graphics/asymptote/fileio.h @@ -28,16 +28,18 @@ #include "errormsg.h" #include "util.h" #include "process.h" +#include "locate.h" +#include "parser.h" namespace vm { -extern bool indebugger; +extern bool indebugger; } namespace camp { extern string tab; extern string newline; - + enum Mode {NOMODE,INPUT,OUTPUT,UPDATE,BINPUT,BOUTPUT,BUPDATE,XINPUT,XOUTPUT, XUPDATE,OPIPE}; @@ -48,7 +50,7 @@ static const string FileModes[]= extern FILE *pipeout; -inline void openpipeout() +inline void openpipeout() { int fd=intcast(settings::getSetting("outpipe")); if(!pipeout && fd >= 0) pipeout=fdopen(fd,"w"); @@ -59,12 +61,17 @@ inline void openpipeout() } } +inline string locatefile(string name) { + string s=settings::locateFile(name); + return s.empty() ? name : s; +} + class file : public gc { -protected: +protected: string name; bool check; // Check whether input file exists. Mode type; - + Int nx,ny,nz; // Array dimensions bool linemode; // Array reads will stop at eol instead of eof. bool csvmode; // Read comma-separated values. @@ -72,25 +79,25 @@ protected: bool singlereal; // Read/write single-precision XDR/binary reals. bool singleint; // Read/write single-precision XDR/binary ints. bool signedint; // Read/write signed XDR/binary ints. - + bool closed; // File has been closed. bool standard; // Standard input/output bool binary; // Read in binary mode. - + bool nullfield; // Used to detect a final null field in csv+line mode. string whitespace; size_t index; // Terminator index. -public: +public: bool Standard() {return standard;} - + void standardEOF() { #if defined(HAVE_LIBREADLINE) && defined(HAVE_LIBCURSES) cout << endl; -#endif +#endif } - + template void purgeStandard(T&) { if(standard) { @@ -106,14 +113,14 @@ public: } } } - + void purgeStandard(string&) { if(cin.eof()) standardEOF(); } - + void dimension(Int Nx=-1, Int Ny=-1, Int Nz=-1) { - if(Nx < -1 || Ny < -1 || Nz < -1) { + if(Nx < -2 || Ny < -2 || Nz < -2) { ostringstream buf; buf << "Invalid array dimensions: " << Nx << ", " << Ny << ", " << Nz; reportError(buf); @@ -122,15 +129,15 @@ public: nx=Nx; ny=Ny; nz=Nz; } - file(const string& name, bool check=true, Mode type=NOMODE, bool binary=false, - bool closed=false) : + file(const string& name, bool check=true, Mode type=NOMODE, + bool binary=false, bool closed=false) : name(name), check(check), type(type), linemode(false), csvmode(false), wordmode(false), singlereal(false), singleint(true), signedint(true), - closed(closed), standard(name.empty()), - binary(binary), nullfield(false), whitespace("") {dimension();} - + closed(closed), standard(name.empty()), binary(binary), nullfield(false), + whitespace("") {dimension();} + virtual void open() {} - + void Check() { if(error()) { ostringstream buf; @@ -138,7 +145,7 @@ public: reportError(buf); } } - + virtual ~file() {} bool isOpen() { @@ -151,7 +158,7 @@ public: } return true; } - + string filename() {return name;} virtual bool eol() {return false;} virtual bool nexteol() {return false;} @@ -164,19 +171,19 @@ public: virtual void flush() {} virtual size_t tell() {return 0;} virtual void seek(Int, bool=true) {} - + string FileMode() {return FileModes[type];} - + void unsupported(const char *rw, const char *type) { ostringstream buf; buf << rw << " of type " << type << " not supported in " << FileMode() << " mode"; reportError(buf); } - + void noread(const char *type) {unsupported("Read",type);} void nowrite(const char *type) {unsupported("Write",type);} - + virtual void Read(bool&) {noread("bool");} virtual void Read(Int&) {noread("int");} virtual void Read(double&) {noread("real");} @@ -186,7 +193,7 @@ public: virtual void Read(char&) {noread("char");} virtual void Read(string&) {noread("string");} virtual void readwhite(string&) {noread("string");} - + virtual void write(bool) {nowrite("bool");} virtual void write(Int) {nowrite("int");} virtual void write(double) {nowrite("real");} @@ -197,18 +204,18 @@ public: virtual void write(guide *) {nowrite("guide");} virtual void write(const transform&) {nowrite("transform");} virtual void writeline() {nowrite("string");} - + virtual void ignoreComment() {}; virtual void csv() {}; - + template void ignoreComment(T&) { ignoreComment(); } - + void ignoreComment(string&) {} void ignoreComment(char&) {} - + template void read(T& val) { if(binary) Read(val); @@ -225,30 +232,30 @@ public: } } } - + Int Nx() {return nx;} Int Ny() {return ny;} Int Nz() {return nz;} - + void Nx(Int n) {nx=n;} void Ny(Int n) {ny=n;} void Nz(Int n) {nz=n;} - + void LineMode(bool b) {linemode=b;} bool LineMode() {return linemode;} - + void CSVMode(bool b) {csvmode=b; if(b) wordmode=false;} bool CSVMode() {return csvmode;} - + void WordMode(bool b) {wordmode=b; if(b) csvmode=false;} bool WordMode() {return wordmode;} - + void SingleReal(bool b) {singlereal=b;} bool SingleReal() {return singlereal;} - + void SingleInt(bool b) {singleint=b;} bool SingleInt() {return singleint;} - + void SignedInt(bool b) {signedint=b;} bool SignedInt() {return signedint;} }; @@ -260,34 +267,34 @@ public: void open() { openpipeout(); } - + bool text() {return true;} bool eof() {return pipeout ? feof(pipeout) : true;} bool error() {return pipeout ? ferror(pipeout) : true;} void clear() {if(pipeout) clearerr(pipeout);} void flush() {if(pipeout) fflush(pipeout);} - + void seek(Int pos, bool begin=true) { if(!standard && pipeout) { clear(); fseek(pipeout,pos,begin ? SEEK_SET : SEEK_END); } } - + size_t tell() { return pipeout ? ftell(pipeout) : 0; } - + void write(const string& val) { fprintf(pipeout,"%s",val.c_str()); } - + void write(bool val) { ostringstream s; s << val; write(s.str()); } - + void write(Int val) { ostringstream s; s << val; @@ -314,19 +321,19 @@ public: s << val; write(s.str()); } - + void write(guide *val) { ostringstream s; s << *val; write(s.str()); } - + void write(const transform& val) { ostringstream s; s << val; write(s.str()); } - + void writeline() { fprintf(pipeout,"\n"); if(errorstream::interrupt) throw interrupted(); @@ -334,55 +341,35 @@ public: }; class ifile : public file { -protected: +protected: istream *stream; std::fstream *fstream; + stringstream buf; char comment; std::ios::openmode mode; bool comma; - + public: - ifile(const string& name, char comment, bool check=true, Mode type=INPUT, + ifile(const string& name, char comment, bool check=true, Mode type=INPUT, std::ios::openmode mode=std::ios::in) : - file(name,check,type), stream(&cin), fstream(NULL), comment(comment), - mode(mode), comma(false) {} - + file(name,check,type), stream(&cin), fstream(NULL), + comment(comment), mode(mode), comma(false) {} + // Binary file ifile(const string& name, bool check=true, Mode type=BINPUT, std::ios::openmode mode=std::ios::in) : file(name,check,type,true), mode(mode) {} - + ~ifile() {close();} - - void open() { - if(standard) { - if(mode & std::ios::binary) - reportError("Cannot open standard input in binary mode"); - stream=&cin; - } else { - if(mode & std::ios::out) - name=outpath(name); - stream=fstream=new std::fstream(name.c_str(),mode); - if(mode & std::ios::out) { - if(error()) { - delete fstream; - std::ofstream f(name.c_str()); - f.close(); - stream=fstream=new std::fstream(name.c_str(),mode); - } - } - index=processData().ifile.add(fstream); - if(check) Check(); - } - } - + + void open(); bool eol(); bool nexteol(); - + bool text() {return true;} bool eof() {return stream->eof();} bool error() {return stream->fail();} - + void close() { if(!standard && fstream) { fstream->close(); @@ -392,30 +379,30 @@ public: processData().ifile.remove(index); } } - + void clear() {stream->clear();} - + void seek(Int pos, bool begin=true) { if(!standard && fstream) { clear(); fstream->seekg(pos,begin ? std::ios::beg : std::ios::end); } } - + size_t tell() { - if(fstream) + if(fstream) return fstream->tellg(); else return 0; } - + void csv(); - + virtual void ignoreComment(); - + // Skip over white space void readwhite(string& val) {val=string(); *stream >> val;} - + void Read(bool &val) {string t; readwhite(t); val=(t == "true");} void Read(Int& val) {*stream >> val;} void Read(double& val) {*stream >> val;} @@ -424,10 +411,10 @@ public: void Read(char& val) {stream->get(val);} void Read(string& val); }; - + class iofile : public ifile { public: - iofile(const string& name, char comment=0) : + iofile(const string& name, char comment=0) : ifile(name,comment,true,UPDATE,std::ios::in | std::ios::out) {} Int precision(Int p) { @@ -435,7 +422,7 @@ public: stream->precision(p); } void flush() {if(fstream) fstream->flush();} - + void write(bool val) {*fstream << (val ? "true " : "false ");} void write(Int val) {*fstream << val;} void write(double val) {*fstream << val;} @@ -445,13 +432,13 @@ public: void write(const pen& val) {*fstream << val;} void write(guide *val) {*fstream << *val;} void write(const transform& val) {*fstream << val;} - + void writeline() { *fstream << newline; if(errorstream::interrupt) throw interrupted(); } }; - + class ofile : public file { protected: ostream *stream; @@ -459,14 +446,14 @@ protected: std::ios::openmode mode; public: ofile(const string& name, Mode type=OUTPUT, - std::ios::openmode mode=std::ios::trunc) : + std::ios::openmode mode=std::ios::trunc) : file(name,true,type), stream(&cout), fstream(NULL), mode(mode) {} - + ~ofile() {close();} - + void open() { if(standard) { - if(mode & std::ios::binary) + if(mode & std::ios::binary) reportError("Cannot open standard output in binary mode"); stream=&cout; } else { @@ -477,11 +464,11 @@ public: Check(); } } - + bool text() {return true;} bool eof() {return stream->eof();} bool error() {return stream->fail();} - + void close() { if(!standard && fstream) { fstream->close(); @@ -497,24 +484,24 @@ public: stream->precision(p); } void flush() {stream->flush();} - + void seek(Int pos, bool begin=true) { if(!standard && fstream) { clear(); fstream->seekp(pos,begin ? std::ios::beg : std::ios::end); } } - + size_t tell() { - if(fstream) + if(fstream) return fstream->tellp(); else return 0; } - - bool enabled() {return !standard || settings::verbose > 1 || + + bool enabled() {return !standard || settings::verbose > 1 || interact::interactive || !settings::getSetting("quiet");} - + void write(bool val) {*stream << (val ? "true " : "false ");} void write(Int val) {*stream << val;} void write(double val) {*stream << val;} @@ -524,21 +511,21 @@ public: void write(const pen& val) {*stream << val;} void write(guide *val) {*stream << *val;} void write(const transform& val) {*stream << val;} - + void writeline(); }; class ibfile : public ifile { public: ibfile(const string& name, bool check=true, Mode type=BINPUT, - std::ios::openmode mode=std::ios::in) : + std::ios::openmode mode=std::ios::in) : ifile(name,check,type,mode | std::ios::binary) {} template void iread(T& val) { val=T(); if(fstream) fstream->read((char *) &val,sizeof(T)); } - + void Read(bool& val) {iread(val);} void Read(Int& val) { if(signedint) { @@ -551,25 +538,25 @@ public: } void Read(char& val) {iread(val);} void Read(string& val) {char c; iread(c); val=c;} - + void Read(double& val) { if(singlereal) {float fval; iread(fval); val=fval;} else iread(val); } }; - + class iobfile : public ibfile { public: - iobfile(const string& name) : + iobfile(const string& name) : ibfile(name,true,BUPDATE,std::ios::in | std::ios::out) {} void flush() {if(fstream) fstream->flush();} - + template void iwrite(T val) { if(fstream) fstream->write((char *) &val,sizeof(T)); } - + void write(bool val) {iwrite(val);} void write(Int val) { if(signedint) { @@ -599,7 +586,7 @@ public: } void writeline() {} }; - + class obfile : public ofile { public: obfile(const string& name) : ofile(name,BOUTPUT,std::ios::binary) {} @@ -608,7 +595,7 @@ public: void iwrite(T val) { if(fstream) fstream->write((char *) &val,sizeof(T)); } - + void write(bool val) {iwrite(val);} void write(Int val) { if(signedint) { @@ -636,14 +623,14 @@ public: write(val.gety()); write(val.getz()); } - + void writeline() {} }; - + #ifdef HAVE_RPC_RPC_H class ixfile : public file { -protected: +protected: xdr::ioxstream *fstream; xdr::xios::open_mode mode; public: @@ -652,11 +639,12 @@ public: file(name,check,type,true), fstream(NULL), mode(mode) {} void open() { + name=locatefile(inpath(name)); fstream=new xdr::ioxstream(name.c_str(),mode); index=processData().ixfile.add(fstream); if(check) Check(); } - + void close() { if(fstream) { fstream->close(); @@ -666,28 +654,28 @@ public: processData().ixfile.remove(index); } } - + ~ixfile() {close();} - + bool eof() {return fstream ? fstream->eof() : true;} bool error() {return fstream ? fstream->fail() : true;} void clear() {if(fstream) fstream->clear();} - + void seek(Int pos, bool begin=true) { if(!standard && fstream) { clear(); fstream->seek(pos,begin ? xdr::xios::beg : xdr::xios::end); } } - + size_t tell() { - if(fstream) + if(fstream) return fstream->tell(); else return 0; } - + void Read(Int& val) { if(signedint) { if(singleint) {int ival=0; *fstream >> ival; val=ival;} @@ -721,10 +709,11 @@ public: class ioxfile : public ixfile { public: - ioxfile(const string& name) : ixfile(name,true,XUPDATE,xdr::xios::out) {} + ioxfile(const string& name) : ixfile(outpath(name),true,XUPDATE, + xdr::xios::out) {} void flush() {if(fstream) fstream->flush();} - + void write(Int val) { if(signedint) { if(singleint) *fstream << intcast(val); @@ -748,7 +737,7 @@ public: write(val.getz()); } }; - + class oxfile : public file { xdr::oxstream *fstream; public: @@ -759,7 +748,7 @@ public: index=processData().oxfile.add(fstream); Check(); } - + void close() { if(fstream) { fstream->close(); @@ -769,28 +758,28 @@ public: processData().oxfile.remove(index); } } - + ~oxfile() {close();} - + bool eof() {return fstream ? fstream->eof() : true;} bool error() {return fstream ? fstream->fail() : true;} void clear() {if(fstream) fstream->clear();} void flush() {if(fstream) fstream->flush();} - + void seek(Int pos, bool begin=true) { if(!standard && fstream) { clear(); fstream->seek(pos,begin ? xdr::xios::beg : xdr::xios::end); } } - + size_t tell() { - if(fstream) + if(fstream) return fstream->tell(); else return 0; } - + void write(Int val) { if(signedint) { if(singleint) *fstream << intcast(val); diff --git a/graphics/asymptote/flatguide.h b/graphics/asymptote/flatguide.h index c4d5c9bce6..e960f1f868 100644 --- a/graphics/asymptote/flatguide.h +++ b/graphics/asymptote/flatguide.h @@ -26,11 +26,11 @@ class flatguide // into a path again. In the (usual) case that a cycle ends a path, the // cached path avoids this second pass. bool solved; - + // Used by reverse(guide) to indicate the presence of an unresolved // interior cycle. bool precycle; - + path p; cvector nodes; @@ -97,7 +97,7 @@ class flatguide clearPath(); } } - + public: flatguide() : solved(true), precycle(false), p(), out(&open), in(&open) {} @@ -105,11 +105,11 @@ public: Int size() const { return (Int) nodes.size(); } - + knot Nodes(Int i) const { return nodes[i]; } - + void setTension(tension t, side s) { update(); tref(s)=t; @@ -152,20 +152,20 @@ public: nodes.front().tin=tin; } } - + void resolvecycle() { if(!nodes.empty()) nodes.push_back(nodes.front()); } - + void precyclic(bool b) { precycle=b; } - + bool precyclic() { return precycle; } - + // Once all information has been added, release the flat result. simpleknotlist list(bool cycles=false) { if(cycles && !nodes.empty()) close(); diff --git a/graphics/asymptote/fpu.h b/graphics/asymptote/fpu.h index bf60a21dac..7ca8df0c34 100644 --- a/graphics/asymptote/fpu.h +++ b/graphics/asymptote/fpu.h @@ -13,15 +13,15 @@ inline int fpu_exceptions() { int excepts=0; -#ifdef FE_INVALID +#ifdef FE_INVALID excepts |= FE_INVALID; -#endif +#endif #ifdef FE_DIVBYZERO excepts |= FE_DIVBYZERO; -#endif +#endif #ifdef FE_OVERFLOW excepts |= FE_OVERFLOW; -#endif +#endif return excepts; } diff --git a/graphics/asymptote/frame.h b/graphics/asymptote/frame.h index 804e89baea..9afa4c51ec 100644 --- a/graphics/asymptote/frame.h +++ b/graphics/asymptote/frame.h @@ -37,7 +37,7 @@ class frame : public gc { : parent(new frame("", 0, 0)), numFormals(0), numLocals(1), style(INDIRECT_FRAME) #ifdef DEBUG_FRAME - , name(name) + , name(name) #endif {} @@ -46,7 +46,7 @@ public: : parent(parent), numFormals(numFormals), numLocals(0), style(DIRECT_FRAME) #ifdef DEBUG_FRAME - , name(name) + , name(name) #endif {} @@ -95,4 +95,4 @@ inline void print(ostream& out, frame *f) { } // namespace trans #endif - + diff --git a/graphics/asymptote/fundec.cc b/graphics/asymptote/fundec.cc index c83dd4b234..706e83c48e 100644 --- a/graphics/asymptote/fundec.cc +++ b/graphics/asymptote/fundec.cc @@ -19,11 +19,11 @@ using namespace types; using mem::list; varinit *Default=new definit(nullPos); - + void formal::prettyprint(ostream &out, Int indent) { prettyname(out, keywordOnly ? "formal (keyword only)" : "formal", indent); - + base->prettyprint(out, indent+1); if (start) start->prettyprint(out, indent+1); if (defval) defval->prettyprint(out, indent+1); @@ -47,12 +47,12 @@ types::ty *formal::getType(coenv &e, bool tacit) { return t; } - + void formal::addOps(coenv &e, record *r) { base->addOps(e, r); if (start) start->addOps(base->trans(e, true), e, r); -} +} void formals::prettyprint(ostream &out, Int indent) { @@ -121,7 +121,7 @@ class basicAssignExp : public exp { varEntry *dest; varinit *value; public: - basicAssignExp(position pos, varEntry *dest, varinit *value) + basicAssignExp(position pos, varEntry *dest, varinit *value) : exp(pos), dest(dest), value(value) {} void prettyprint(ostream &out, Int indent) { @@ -139,7 +139,7 @@ public: return getType(e); } }; - + void transDefault(coenv &e, position pos, varEntry *v, varinit *init) { // This roughly translates into the statement // if (isDefault(x)) @@ -250,7 +250,7 @@ void fundef::baseTrans(coenv &e, types::function *ft) // Translate the function. fe.e.beginScope(); params->trans(fe); - + body->trans(fe); types::ty *rt = ft->result; @@ -279,7 +279,7 @@ types::ty *fundef::trans(coenv &e) { // operator cannot be added before translation. (getType() is not allowed to // manipulate the environment.) // A new function expression is assigned to a variable, given as a return - // value, or used as an argument to a function. In any of these + // value, or used as an argument to a function. In any of these // // We must still addOps though, for the return type and formals. ex: // @@ -288,7 +288,7 @@ types::ty *fundef::trans(coenv &e) { // }; function *ft=transTypeAndAddOps(e, (record *)0, false); assert(ft); - + baseTrans(e, ft); return ft; @@ -313,6 +313,6 @@ void fundec::transAsField(coenv &e, record *r) assert(ft); createVar(getPos(), e, r, id, ft, fun.makeVarInit(ft)); -} +} } // namespace absyntax diff --git a/graphics/asymptote/fundec.h b/graphics/asymptote/fundec.h index 5dd0dab85b..ab6e3fec50 100644 --- a/graphics/asymptote/fundec.h +++ b/graphics/asymptote/fundec.h @@ -31,7 +31,7 @@ public: // Build the corresponding types::formal to put into a signature. types::formal trans(coenv &e, bool encodeDefVal, bool tacit=false); - + // Add the formal parameter to the environment to prepare for the // function body's translation. virtual void transAsVar(coenv &e, Int index); @@ -134,7 +134,7 @@ class fundef : public exp { symbol id; friend class fundec; - + public: fundef(position pos, ty *result, formals *params, stm *body) : exp(pos), result(result), params(params), body(body), id() {} @@ -167,7 +167,7 @@ public: void transAsField(coenv &e, record *r); }; - + } // namespace absyntax #endif diff --git a/graphics/asymptote/genv.cc b/graphics/asymptote/genv.cc index 2f3a030822..a191d525db 100644 --- a/graphics/asymptote/genv.cc +++ b/graphics/asymptote/genv.cc @@ -54,9 +54,9 @@ genv::genv() Setting("autoplain")=true; } -#ifdef HAVE_LIBGSL +#ifdef HAVE_LIBGSL imap["gsl"]=trans::getGSLModule(); -#endif +#endif } bool endswith(string suffix, string str) @@ -80,7 +80,7 @@ record *genv::loadModule(symbol id, string filename) { em.sync(); record *r=ast->transAsFile(*this, id); - + inTranslation.remove(filename); return r; @@ -127,7 +127,7 @@ importInitMap *genv::getInitMap() return r ? r->getInit() : 0; } }; - + return new initMap(*this); } diff --git a/graphics/asymptote/glrender.cc b/graphics/asymptote/glrender.cc index 9e9fb70629..d995fd6f8a 100644 --- a/graphics/asymptote/glrender.cc +++ b/graphics/asymptote/glrender.cc @@ -104,7 +104,7 @@ size_t nmaterials=48; extern void exitHandler(int); namespace gl { - + bool outlinemode=false; bool glthread=false; bool glupdate=false; @@ -172,7 +172,7 @@ double *Background; size_t Nlights=1; // Maximum number of lights compiled in shader size_t nlights; // Actual number of lights size_t nlights0; -triple *Lights; +triple *Lights; double *Diffuse; double *Specular; bool antialias; @@ -200,7 +200,7 @@ mat4 viewMat; dmat4 dprojMat; dmat4 dprojViewMat; dmat4 dviewMat; -dmat4 drotateMat; +dmat4 drotateMat; const double *dprojView; const double *dView; @@ -312,17 +312,17 @@ bool Step; #ifdef HAVE_GL -void idle() +void idle() { glutIdleFunc(NULL); Xspin=Yspin=Zspin=Animate=Step=false; } #endif -void home(bool webgl=false) +void home(bool webgl=false) { X=Y=cx=cy=0.0; -#ifdef HAVE_GL +#ifdef HAVE_GL #ifdef HAVE_LIBGLUT #ifndef HAVE_LIBOSMESA if(!webgl) @@ -333,9 +333,9 @@ void home(bool webgl=false) dviewMat=dmat4(1.0); dView=value_ptr(dviewMat); viewMat=mat4(dviewMat); - - drotateMat=dmat4(1.0); - + + drotateMat=dmat4(1.0); + updateModelViewData(); remesh=true; @@ -383,8 +383,8 @@ GLuint initHDR() { std::vector pixels(imspec.width*imspec.height*3); imagein->read_image(pixels.data()); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, imspec.width, imspec.height, 0, - GL_RGB, GL_FLOAT, pixels.data()); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, imspec.width, imspec.height, 0, + GL_RGB, GL_FLOAT, pixels.data()); glGenerateMipmap(GL_TEXTURE_2D); imagein->close(); @@ -430,7 +430,7 @@ void initShaders() { Nlights=nlights == 0 ? 0 : max(Nlights,nlights); Nmaterials=max(Nmaterials,nmaterials); - + shaderProg=glCreateProgram(); string vs=locateFile("shaders/vertex.glsl"); string fs=locateFile("shaders/fragment.glsl"); @@ -453,7 +453,7 @@ void initShaders() shaders.push_back(ShaderfileModePair(fs.c_str(),GL_FRAGMENT_SHADER)); if(orthographic) shaderParams.push_back("ORTHOGRAPHIC"); - + shaderParams.push_back("WIDTH"); camp::pixelShader=compileAndLinkShader(shaders,Nlights,Nmaterials, shaderParams); @@ -470,7 +470,7 @@ void initShaders() shaderParams); } -void deleteShaders() +void deleteShaders() { glDeleteProgram(camp::transparentShader); glDeleteProgram(camp::colorShader); @@ -502,7 +502,7 @@ void drawscene(int Width, int Height) } #endif - if((nlights == 0 && Nlights > 0) || nlights > Nlights || + if((nlights == 0 && Nlights > 0) || nlights > Nlights || nmaterials > Nmaterials) { deleteShaders(); initShaders(); @@ -514,19 +514,19 @@ void drawscene(int Width, int Height) triple m(xmin,ymin,zmin); triple M(xmax,ymax,zmax); double perspective=orthographic ? 0.0 : 1.0/zmax; - + double size2=hypot(Width,Height); - + if(remesh) camp::drawElement::center.clear(); - + Picture->render(size2,m,M,perspective,remesh); - + if(!outlinemode) remesh=false; } // Return x divided by y rounded up to the nearest integer. -int Quotient(int x, int y) +int Quotient(int x, int y) { return (x+y-1)/y; } @@ -544,8 +544,8 @@ void Export() int width=Quotient(fullWidth,Quotient(fullWidth,min(maxTileWidth,Width))); int height=Quotient(fullHeight,Quotient(fullHeight, min(maxTileHeight,Height))); - if(settings::verbose > 1) - cout << "Exporting " << Prefix << " as " << fullWidth << "x" + if(settings::verbose > 1) + cout << "Exporting " << Prefix << " as " << fullWidth << "x" << fullHeight << " image" << " using tiles of size " << width << "x" << height << endl; @@ -556,11 +556,12 @@ void Export() setDimensions(fullWidth,fullHeight,X/Width*fullWidth,Y/Width*fullWidth); (orthographic ? trOrtho : trFrustum)(tr,xmin,xmax,ymin,ymax,-zmax,-zmin); - + size_t count=0; do { trBeginTile(tr); fpu_trap(false); // Work around FE_INVALID in OSMesa. + remesh=true; drawscene(fullWidth,fullHeight); fpu_trap(settings::trap()); ++count; @@ -583,21 +584,22 @@ void Export() pic.shipout(NULL,Prefix,Format,false,View); delete Image; delete[] data; - } + } } catch(handled_error) { } catch(std::bad_alloc&) { outOfMemory(); } + remesh=true; setProjection(); #ifndef HAVE_LIBOSMESA #ifdef HAVE_LIBGLUT - glutPostRedisplay(); + glutPostRedisplay(); #endif #ifdef HAVE_PTHREAD if(glthread && readyAfterExport) { - readyAfterExport=false; + readyAfterExport=false; endwait(readySignal,readyLock); } #endif @@ -624,12 +626,12 @@ inline unsigned int floorpow2(unsigned int n) return n-(n >> 1); } -void quit() +void quit() { #ifdef HAVE_LIBOSMESA - if(osmesa_buffer) delete[] osmesa_buffer; - if(ctx) OSMesaDestroyContext(ctx); - exit(0); + if(osmesa_buffer) delete[] osmesa_buffer; + if(ctx) OSMesaDestroyContext(ctx); + exit(0); #endif #ifdef HAVE_LIBGLUT if(glthread) { @@ -653,8 +655,8 @@ void quit() } #endif } - -void mode() + +void mode() { remesh=true; switch(Mode) { @@ -678,14 +680,14 @@ void mode() } #ifdef HAVE_LIBGLUT #ifndef HAVE_LIBOSMESA - glutPostRedisplay(); + glutPostRedisplay(); #endif #endif } // GUI-related functions #ifdef HAVE_LIBGLUT -bool capsize(int& width, int& height) +bool capsize(int& width, int& height) { bool resize=false; if(width > screenWidth) { @@ -703,14 +705,14 @@ void reshape0(int width, int height) { X=(X/Width)*width; Y=(Y/Height)*height; - + Width=width; Height=height; - + setProjection(); glViewport(0,0,Width,Height); } - + void windowposition(int& x, int& y, int width=Width, int height=Height) { pair z=getSetting("position"); @@ -729,12 +731,15 @@ void windowposition(int& x, int& y, int width=Width, int height=Height) void setsize(int w, int h, bool reposition=true) { int x,y; - + capsize(w,h); if(reposition) { windowposition(x,y,w,h); glutPositionWindow(x,y); - } + } else + glutPositionWindow(max(glutGet(GLUT_WINDOW_X)-2,0), + max(glutGet(GLUT_WINDOW_Y)-2,0)); + glutReshapeWindow(w,h); reshape0(w,h); glutPostRedisplay(); @@ -751,7 +756,7 @@ void capzoom() lastzoom=Zoom; } -void fullscreen(bool reposition=true) +void fullscreen(bool reposition=true) { Width=screenWidth; Height=screenHeight; @@ -771,18 +776,19 @@ void fullscreen(bool reposition=true) glutPostRedisplay(); } -void fitscreen(bool reposition=true) +void fitscreen(bool reposition=true) { if(Animate && Fitscreen == 2) Fitscreen=0; switch(Fitscreen) { case 0: // Original size { Xfactor=Yfactor=1.0; - setsize(oldWidth,oldHeight,reposition); + double pixelRatio=getSetting("devicepixelratio"); + setsize(oldWidth*pixelRatio,oldHeight*pixelRatio,reposition); break; } case 1: // Fit to screen in one dimension - { + { oldWidth=Width; oldHeight=Height; int w=screenWidth; @@ -802,14 +808,14 @@ void fitscreen(bool reposition=true) } } -void togglefitscreen() +void togglefitscreen() { ++Fitscreen; if(Fitscreen > 2) Fitscreen=0; fitscreen(); } -void initTimer() +void initTimer() { gettimeofday(&lasttime,NULL); gettimeofday(&lastframetime,NULL); @@ -827,7 +833,7 @@ void screen() fitscreen(false); } -void nextframe(int) +void nextframe(int) { #ifdef HAVE_PTHREAD endwait(readySignal,readyLock); @@ -845,7 +851,7 @@ void display() queueScreen=false; } - bool fps=settings::verbose > 2; + bool fps=settings::verbose > 2; drawscene(Width,Height); if(fps) { if(framecount < 10) // Measure steady-state framerate @@ -855,7 +861,7 @@ void display() if(s > 0.0) { double rate=1.0/s; S.add(rate); - cout << "FPS=" << rate << "\t" << S.mean() << " +/- " << S.stdev() + cout << "FPS=" << rate << "\t" << S.mean() << " +/- " << S.stdev() << endl; } } @@ -883,7 +889,7 @@ void display() if(queueExport) { Export(); queueExport=false; - } + } if(!glthread) { if(Oldpid != 0 && waitpid(Oldpid,NULL,WNOHANG) != Oldpid) { kill(Oldpid,SIGHUP); @@ -892,7 +898,7 @@ void display() } } -void update() +void update() { glutDisplayFunc(display); Animate=getSetting("autoplay"); @@ -901,7 +907,7 @@ void update() lastzoom=Zoom; double cz=0.5*(zmin+zmax); - + dviewMat=translate(translate(dmat4(1.0),dvec3(cx,cy,cz))*drotateMat, dvec3(0,0,-cz)); dView=value_ptr(dviewMat); @@ -909,7 +915,7 @@ void update() setProjection(); updateModelViewData(); - + glutPostRedisplay(); } @@ -936,7 +942,7 @@ void poll(int) glutTimerFunc(100.0,poll,0); } -void animate() +void animate() { Animate=!Animate; if(Animate) { @@ -957,14 +963,14 @@ void reshape(int width, int height) Signal(SIGUSR1,updateHandler); } } - + if(capsize(width,height)) glutReshapeWindow(width,height); - + reshape0(width,height); remesh=true; } - + void shift(int x, int y) { double Zoominv=1.0/Zoom; @@ -973,7 +979,7 @@ void shift(int x, int y) x0=x; y0=y; update(); } - + void pan(int x, int y) { if(orthographic) { @@ -987,7 +993,7 @@ void pan(int x, int y) x0=x; y0=y; update(); } - + void zoom(int x, int y) { if(ignorezoom) {ignorezoom=false; y0=y; return;} @@ -1005,8 +1011,8 @@ void zoom(int x, int y) } } } - -void mousewheel(int wheel, int direction, int x, int y) + +void mousewheel(int wheel, int direction, int x, int y) { double zoomFactor=getSetting("zoomfactor"); if(zoomFactor > 0.0) { @@ -1023,17 +1029,15 @@ void mousewheel(int wheel, int direction, int x, int y) struct arcball { double angle; triple axis; - + arcball(double x0, double y0, double x, double y) { triple v0=norm(x0,y0); triple v1=norm(x,y); double Dot=dot(v0,v1); - if(Dot > 1.0) Dot=1.0; - else if(Dot < -1.0) Dot=-1.0; - angle=acos(Dot); + angle=Dot > 1.0 ? 0.0 : Dot < -1.0 ? pi : acos(Dot); axis=unit(cross(v0,v1)); } - + triple norm(double x, double y) { double norm=hypot(x,y); if(norm > 1.0) { @@ -1065,13 +1069,13 @@ void rotate(int x, int y) update(); } } - -double Degrees(int x, int y) + +double Degrees(int x, int y) { return atan2(0.5*Height-y-Y,x-0.5*Width-X)*degrees; } -void rotateX(double step) +void rotateX(double step) { dmat4 tmpRot(1.0); tmpRot=glm::rotate(tmpRot,glm::radians(step),dvec3(1,0,0)); @@ -1079,7 +1083,7 @@ void rotateX(double step) update(); } -void rotateY(double step) +void rotateY(double step) { dmat4 tmpRot(1.0); tmpRot=glm::rotate(tmpRot,glm::radians(step),dvec3(0,1,0)); @@ -1087,7 +1091,7 @@ void rotateY(double step) update(); } -void rotateZ(double step) +void rotateZ(double step) { dmat4 tmpRot(1.0); tmpRot=glm::rotate(tmpRot,glm::radians(step),dvec3(0,0,1)); @@ -1124,7 +1128,7 @@ void rotateZ(int x, int y) #define GLUT_WHEEL_DOWN 4 #endif -string action(int button, int mod) +string action(int button, int mod) { size_t Button; size_t nButtons=5; @@ -1147,7 +1151,7 @@ string action(int button, int mod) default: Button=nButtons; } - + size_t Mod; size_t nMods=4; switch(mod) { @@ -1166,7 +1170,7 @@ string action(int button, int mod) default: Mod=nMods; } - + if(Button < nButtons) { array *left=getSetting("leftbutton"); array *middle=getSetting("middlebutton"); @@ -1195,13 +1199,13 @@ void mouse(int button, int state, int x, int y) glutMotionFunc(NULL); mousewheel(0,1,x,y); return; - } + } if(Action == "zoomout") { glutMotionFunc(NULL); mousewheel(0,-1,x,y); return; - } - + } + if(state == GLUT_DOWN) { if(Action == "rotate") { x0=x; y0=y; @@ -1226,11 +1230,11 @@ void mouse(int button, int state, int x, int y) glutMotionFunc(rotateZ); } } else { - glutMotionFunc(NULL); + glutMotionFunc(NULL); } } -double spinstep() +double spinstep() { timeval tv; gettimeofday(&tv,NULL); @@ -1256,14 +1260,14 @@ void zspin() rotateZ(spinstep()); } -void expand() +void expand() { double resizeStep=getSetting("resizestep"); if(resizeStep > 0.0) setsize((int) (Width*resizeStep+0.5),(int) (Height*resizeStep+0.5)); } -void shrink() +void shrink() { double resizeStep=getSetting("resizestep"); if(resizeStep > 0.0) @@ -1271,7 +1275,7 @@ void shrink() max((int) (Height/resizeStep+0.5),1)); } -void spinx() +void spinx() { if(Xspin) idle(); @@ -1307,19 +1311,20 @@ void spinz() void showCamera() { projection P=camera(); + string projection=P.orthographic ? "orthographic(" : "perspective("; + string indent(2+projection.length(),' '); cout << endl - << "currentprojection=" - << (P.orthographic ? "orthographic(" : "perspective(") << endl - << "camera=" << P.camera << "," << endl - << "up=" << P.up << "," << endl - << "target=" << P.target << "," << endl - << "zoom=" << P.zoom; + << "currentprojection=" << endl << " " + << projection << "camera=" << P.camera << "," << endl + << indent << "up=" << P.up << "," << endl + << indent << "target=" << P.target << "," << endl + << indent << "zoom=" << P.zoom; if(!orthographic) - cout << "," << endl << "angle=" << P.angle; + cout << "," << endl << indent << "angle=" << P.angle; if(P.viewportshift != pair(0.0,0.0)) - cout << "," << endl << "viewportshift=" << P.viewportshift*Zoom; + cout << "," << endl << indent << "viewportshift=" << P.viewportshift*Zoom; if(!orthographic) - cout << "," << endl << "autoadjust=false"; + cout << "," << endl << indent << "autoadjust=false"; cout << ");" << endl; } @@ -1386,7 +1391,7 @@ void keyboard(unsigned char key, int x, int y) break; } } - + void setosize() { oldWidth=(int) ceil(oWidth); @@ -1397,7 +1402,7 @@ void setosize() void exportHandler(int=0) { -#ifdef HAVE_LIBGLUT +#ifdef HAVE_LIBGLUT #ifndef HAVE_LIBOSMESA if(!Iconify) glutShowWindow(); @@ -1406,7 +1411,7 @@ void exportHandler(int=0) readyAfterExport=true; Export(); -#ifdef HAVE_LIBGLUT +#ifdef HAVE_LIBGLUT #ifndef HAVE_LIBOSMESA if(!Iconify) glutHideWindow(); @@ -1420,9 +1425,9 @@ static bool glinitialize=true; projection camera(bool user) { if(glinitialize) return projection(); - + camp::Triple vCamera,vUp,vTarget; - + double cz=0.5*(zmin+zmax); double *Rotate=value_ptr(drotateMat); @@ -1458,14 +1463,14 @@ projection camera(bool user) vTarget[i]=R3-cx*R0-cy*R1; } } - + return projection(orthographic,vCamera,vUp,vTarget,Zoom, 2.0*atan(tan(0.5*Angle)/Zoom)/radians, pair(X/Width+Shift.getx(), Y/Height+Shift.gety())); } -void init() +void init() { #ifdef HAVE_LIBGLUT mem::vector cmd; @@ -1490,7 +1495,7 @@ void init_osmesa() { #ifdef HAVE_LIBOSMESA // create context and buffer - if(settings::verbose > 1) + if(settings::verbose > 1) cout << "Allocating osmesa_buffer of size " << screenWidth << "x" << screenHeight << "x4x" << sizeof(GLubyte) << endl; osmesa_buffer=new unsigned char[screenWidth*screenHeight*4*sizeof(GLubyte)]; @@ -1504,7 +1509,7 @@ void init_osmesa() cerr << "OSMesaCreateContext failed." << endl; exit(-1); } - + if(!OSMesaMakeCurrent(ctx,osmesa_buffer,GL_UNSIGNED_BYTE, screenWidth,screenHeight )) { cerr << "OSMesaMakeCurrent failed." << endl; @@ -1515,10 +1520,10 @@ void init_osmesa() glGetIntegerv(GL_DEPTH_BITS,&z); glGetIntegerv(GL_STENCIL_BITS,&s); glGetIntegerv(GL_ACCUM_RED_BITS,&a); - if(settings::verbose > 1) - cout << "Offscreen context settings: Depth=" << z << " Stencil=" << s + if(settings::verbose > 1) + cout << "Offscreen context settings: Depth=" << z << " Stencil=" << s << " Accum=" << a << endl; - + if(z <= 0) { cerr << "Error initializing offscreen context: Depth=" << z << endl; exit(-1); @@ -1538,17 +1543,14 @@ void glrender(const string& prefix, const picture *pic, const string& format, { Iconify=getSetting("iconify"); - width=max(width,1.0); - height=max(height,1.0); - if(zoom == 0.0) zoom=1.0; - + Prefix=prefix; Picture=pic; Format=format; - + nlights0=nlights=nlightsin; - + Lights=lights; Diffuse=diffuse; Specular=specular; @@ -1559,21 +1561,21 @@ void glrender(const string& prefix, const picture *pic, const string& format, Shift=shift/zoom; Margin=margin; Background=background; - + Xmin=m.getx(); Xmax=M.getx(); Ymin=m.gety(); Ymax=M.gety(); zmin=m.getz(); zmax=M.getz(); - + orthographic=Angle == 0.0; H=orthographic ? 0.0 : -tan(0.5*Angle)*zmax; - + ignorezoom=false; Mode=0; Xfactor=Yfactor=1.0; - + pair maxtile=getSetting("maxtile"); maxTileWidth=(int) maxtile.getx(); maxTileHeight=(int) maxtile.gety(); @@ -1581,12 +1583,12 @@ void glrender(const string& prefix, const picture *pic, const string& format, if(maxTileHeight <= 0) maxTileHeight=768; bool webgl=Format == "html"; - -#ifdef HAVE_GL + +#ifdef HAVE_GL #ifdef HAVE_PTHREAD static bool initializedView=false; #endif - + #ifdef HAVE_LIBOSMESA if(!webgl) { screenWidth=maxTileWidth; @@ -1610,7 +1612,7 @@ void glrender(const string& prefix, const picture *pic, const string& format, static bool initialized=false; - if(!(initialized && (interact::interactive || + if(!(initialized && (interact::interactive || getSetting("animating")))) { antialias=getSetting("antialias") > 1; double expand; @@ -1622,11 +1624,11 @@ void glrender(const string& prefix, const picture *pic, const string& format, expand *= (Format.empty() || Format == "eps" || Format == "pdf") ? -2.0 : -1.0; if(antialias) expand *= 2.0; } - + oWidth=width; oHeight=height; Aspect=width/height; - + // Force a hard viewport limit to work around direct rendering bugs. // Alternatively, one can use -glOptions=-indirect (with a performance // penalty). @@ -1637,11 +1639,11 @@ void glrender(const string& prefix, const picture *pic, const string& format, screenHeight; if(maxWidth <= 0) maxWidth=max(maxHeight,2); if(maxHeight <= 0) maxHeight=max(maxWidth,2); - + if(screenWidth <= 0) screenWidth=maxWidth; else screenWidth=min(screenWidth,maxWidth); if(screenHeight <= 0) screenHeight=maxHeight; - else screenHeight=min(screenHeight,maxHeight); + else screenHeight=min(screenHeight,maxHeight); fullWidth=(int) ceil(expand*width); fullHeight=(int) ceil(expand*height); @@ -1652,126 +1654,126 @@ void glrender(const string& prefix, const picture *pic, const string& format, } else { Width=min(fullWidth,screenWidth); Height=min(fullHeight,screenHeight); - - if(Width > Height*Aspect) + + if(Width > Height*Aspect) Width=min((int) (ceil(Height*Aspect)),screenWidth); - else + else Height=min((int) (ceil(Width/Aspect)),screenHeight); } - + home(webgl); setProjection(); if(webgl) return; - + ArcballFactor=1+8.0*hypot(Margin.getx(),Margin.gety())/hypot(Width,Height); -#ifdef HAVE_GL +#ifdef HAVE_GL for(int i=0; i < 16; ++i) T[i]=t[i]; - + Aspect=((double) Width)/Height; if(maxTileWidth <= 0) maxTileWidth=screenWidth; if(maxTileHeight <= 0) maxTileHeight=screenHeight; -#ifdef HAVE_LIBGLUT +#ifdef HAVE_LIBGLUT setosize(); #endif - + if(View && settings::verbose > 1) cout << "Rendering " << stripDir(prefix) << " as " << Width << "x" << Height << " image" << endl; #endif } -#ifdef HAVE_GL +#ifdef HAVE_GL bool havewindow=initialized && glthread; - + #ifndef HAVE_LIBOSMESA -#ifdef HAVE_LIBGLUT +#ifdef HAVE_LIBGLUT unsigned int displaymode=GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH; #endif - + #ifdef __APPLE__ displaymode |= GLUT_3_2_CORE_PROFILE; #endif #endif - + camp::clearMaterialBuffer(); - + #ifndef HAVE_LIBOSMESA #ifdef HAVE_PTHREAD if(glthread && initializedView) { if(View) { #ifdef __MSDOS__ // Signals are unreliable in MSWindows - glupdate=true; + glupdate=true; #else - pthread_kill(mainthread,SIGUSR1); + pthread_kill(mainthread,SIGUSR1); #endif } else readyAfterExport=queueExport=true; return; } #endif - + #ifdef HAVE_LIBGLUT - if(View) { - int x,y; - if(havewindow) - glutDestroyWindow(window); - - windowposition(x,y); - glutInitWindowPosition(x,y); - glutInitWindowSize(1,1); - Int multisample=getSetting("multisample"); - if(multisample <= 1) multisample=0; - if(multisample) - displaymode |= GLUT_MULTISAMPLE; - glutInitDisplayMode(displaymode); - - int samples; + if(View) { + int x,y; + if(havewindow) + glutDestroyWindow(window); + + windowposition(x,y); + glutInitWindowPosition(x,y); + glutInitWindowSize(1,1); + Int multisample=getSetting("multisample"); + if(multisample <= 1) multisample=0; + if(multisample) + displaymode |= GLUT_MULTISAMPLE; + glutInitDisplayMode(displaymode); + + int samples; #ifdef FREEGLUT #ifdef GLUT_INIT_MAJOR_VERSION - while(true) { - if(multisample > 0) - glutSetOption(GLUT_MULTISAMPLE,multisample); + while(true) { + if(multisample > 0) + glutSetOption(GLUT_MULTISAMPLE,multisample); #endif #endif - string title=string(settings::PROGRAM)+": "+prefix; - window=glutCreateWindow(title.c_str()); + string title=string(settings::PROGRAM)+": "+prefix; + window=glutCreateWindow(title.c_str()); - GLint samplebuf[1]; - glGetIntegerv(GL_SAMPLES,samplebuf); - samples=samplebuf[0]; + GLint samplebuf[1]; + glGetIntegerv(GL_SAMPLES,samplebuf); + samples=samplebuf[0]; #ifdef FREEGLUT #ifdef GLUT_INIT_MAJOR_VERSION - if(samples < multisample) { - multisample=floorpow2(multisample-1); - if(multisample > 1) { - glutReshapeWindow(1,1); - glutDisplayFunc(destroywindow); - glutShowWindow(); - glutMainLoopEvent(); - continue; - } + if(samples < multisample) { + multisample=floorpow2(multisample-1); + if(multisample > 1) { + glutReshapeWindow(1,1); + glutDisplayFunc(destroywindow); + glutShowWindow(); + glutMainLoopEvent(); + continue; } - break; } + break; + } #endif #endif - if(settings::verbose > 1 && samples > 1) - cout << "Multisampling enabled with sample width " << samples - << endl; - glutDisplayFunc(display); - glutShowWindow(); - } else if(!havewindow) { - glutInitWindowSize(maxTileWidth,maxTileHeight); - glutInitDisplayMode(displaymode); - fpu_trap(false); // Work around FE_INVALID in Gallium - window=glutCreateWindow(""); - fpu_trap(settings::trap()); - glutHideWindow(); - } + if(settings::verbose > 1 && samples > 1) + cout << "Multisampling enabled with sample width " << samples + << endl; + glutDisplayFunc(display); + glutShowWindow(); + } else if(!havewindow) { + glutInitWindowSize(maxTileWidth,maxTileHeight); + glutInitDisplayMode(displaymode); + fpu_trap(false); // Work around FE_INVALID in Gallium + window=glutCreateWindow(""); + fpu_trap(settings::trap()); + glutHideWindow(); + } #endif // HAVE_LIBGLUT #endif // HAVE_LIBOSMESA @@ -1790,17 +1792,17 @@ void glrender(const string& prefix, const picture *pic, const string& format, cerr << "GLEW initialization error." << endl; exit(-1); } - + initShaders(); setBuffers(); } - + glClearColor(Background[0],Background[1],Background[2],Background[3]); - + #ifdef HAVE_LIBGLUT #ifndef HAVE_LIBOSMESA Animate=getSetting("autoplay") && glthread; - + if(View) { if(!getSetting("fitscreen")) Fitscreen=0; @@ -1817,7 +1819,7 @@ void glrender(const string& prefix, const picture *pic, const string& format, glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); mode(); - + #ifdef HAVE_LIBOSMESA View=false; #endif @@ -1857,8 +1859,8 @@ void glrender(const string& prefix, const picture *pic, const string& format, quit(); } } - -#endif /* HAVE_GL */ + +#endif /* HAVE_GL */ } } // namespace gl @@ -1873,13 +1875,13 @@ string getLightIndex(size_t const& index, string const& fieldName) { ostringstream buf; buf << "lights[" << index << "]." << fieldName; return Strdup(buf.str()); -} +} string getCenterIndex(size_t const& index) { ostringstream buf; buf << "Centers[" << index << "]"; return Strdup(buf.str()); -} +} template void registerBuffer(const std::vector& buffervector, GLuint& bufferIndex, @@ -1899,13 +1901,13 @@ void registerBuffer(const std::vector& buffervector, GLuint& bufferIndex, void setUniforms(vertexBuffer& data, GLint shader) { bool normal=shader != pixelShader; - + if(shader != gl::lastshader) { glUseProgram(shader); gl::lastshader=shader; - + glUniform1i(glGetUniformLocation(shader,"nlights"),gl::nlights); - + for(size_t i=0; i < gl::nlights; ++i) { triple Lighti=gl::Lights[i]; size_t i4=4*i; @@ -1922,7 +1924,7 @@ void setUniforms(vertexBuffer& data, GLint shader) #if HAVE_LIBOPENIMAGEIO // textures - if (settings::getSetting("envmap")) { + if (settings::getSetting("envmap")) { glActiveTexture(GL_TEXTURE1); glBindBuffer(GL_TEXTURE_2D, gl::envMapBuf); glUniform1i(glGetUniformLocation(shader, "environmentMap"), 1); @@ -1930,17 +1932,17 @@ void setUniforms(vertexBuffer& data, GLint shader) } #endif } - + GLuint binding=0; GLint blockindex=glGetUniformBlockIndex(shader,"MaterialBuffer"); glUniformBlockBinding(shader,blockindex,binding); bool copy=gl::remesh || data.partial || !data.rendered; registerBuffer(data.materials,data.materialsBuffer,copy,GL_UNIFORM_BUFFER); glBindBufferBase(GL_UNIFORM_BUFFER,binding,data.materialsBuffer); - + glUniformMatrix4fv(glGetUniformLocation(shader,"projViewMat"),1,GL_FALSE, value_ptr(gl::projViewMat)); - + glUniformMatrix4fv(glGetUniformLocation(shader,"viewMat"),1,GL_FALSE, value_ptr(gl::viewMat)); if(normal) @@ -1951,10 +1953,10 @@ void setUniforms(vertexBuffer& data, GLint shader) void drawBuffer(vertexBuffer& data, GLint shader) { if(data.indices.empty()) return; - + bool normal=shader != pixelShader; bool color=shader == colorShader || shader == transparentShader; - + const size_t size=sizeof(GLfloat); const size_t intsize=sizeof(GLint); const size_t bytestride=color ? sizeof(VertexData) : @@ -1964,9 +1966,9 @@ void drawBuffer(vertexBuffer& data, GLint shader) if(color) registerBuffer(data.Vertices,data.VerticesBuffer,copy); else if(normal) registerBuffer(data.vertices,data.verticesBuffer,copy); else registerBuffer(data.vertices0,data.vertices0Buffer,copy); - + registerBuffer(data.indices,data.indicesBuffer,copy,GL_ELEMENT_ARRAY_BUFFER); - + camp::setUniforms(data,shader); data.rendered=true; @@ -1974,7 +1976,7 @@ void drawBuffer(vertexBuffer& data, GLint shader) glVertexAttribPointer(positionAttrib,3,GL_FLOAT,GL_FALSE,bytestride, (void *) 0); glEnableVertexAttribArray(positionAttrib); - + if(normal && gl::Nlights > 0) { glVertexAttribPointer(normalAttrib,3,GL_FLOAT,GL_FALSE,bytestride, (void *) (3*size)); @@ -1984,8 +1986,8 @@ void drawBuffer(vertexBuffer& data, GLint shader) (void *) (3*size)); glEnableVertexAttribArray(widthAttrib); } - - glVertexAttribIPointer(materialAttrib,1,GL_INT,bytestride, + + glVertexAttribIPointer(materialAttrib,1,GL_INT,bytestride, (void *) ((normal ? 6 : 4)*size)); glEnableVertexAttribArray(materialAttrib); @@ -1994,20 +1996,20 @@ void drawBuffer(vertexBuffer& data, GLint shader) (void *) (6*size+intsize)); glEnableVertexAttribArray(colorAttrib); } - + glDrawElements(data.type,data.indices.size(),GL_UNSIGNED_INT,(void *) 0); glDisableVertexAttribArray(positionAttrib); if(normal && gl::Nlights > 0) glDisableVertexAttribArray(normalAttrib); if(!normal) - glDisableVertexAttribArray(widthAttrib); + glDisableVertexAttribArray(widthAttrib); glDisableVertexAttribArray(materialAttrib); if(color) glDisableVertexAttribArray(colorAttrib); - + glBindBuffer(GL_UNIFORM_BUFFER,0); - + glBindBuffer(GL_ARRAY_BUFFER,0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,0); } @@ -2069,7 +2071,7 @@ void clearMaterialBuffer() material.reserve(nmaterials); materialMap.clear(); materialIndex=0; - + material0Data.partial=false; material1Data.partial=false; materialData.partial=false; diff --git a/graphics/asymptote/glrender.h b/graphics/asymptote/glrender.h index 0fd2e6bdbd..44da4fe612 100644 --- a/graphics/asymptote/glrender.h +++ b/graphics/asymptote/glrender.h @@ -119,12 +119,12 @@ extern double Angle; extern camp::pair Shift; extern camp::pair Margin; -extern camp::triple *Lights; +extern camp::triple *Lights; extern size_t nlights; extern double *Diffuse; extern double *Background; -struct projection +struct projection { public: bool orthographic; @@ -134,11 +134,11 @@ public: double zoom; double angle; camp::pair viewportshift; - + projection(bool orthographic=false, camp::triple camera=0.0, camp::triple up=0.0, camp::triple target=0.0, double zoom=0.0, double angle=0.0, - camp::pair viewportshift=0.0) : + camp::pair viewportshift=0.0) : orthographic(orthographic), camera(camera), up(up), target(target), zoom(zoom), angle(angle), viewportshift(viewportshift) {} }; @@ -168,18 +168,18 @@ namespace camp { struct Billboard { double cx,cy,cz; - + void init(const triple& center) { cx=center.getx(); cy=center.gety(); cz=center.getz(); } - + triple transform(const triple& v) const { double x=v.getx()-cx; double y=v.gety()-cy; double z=v.getz()-cz; - + return triple(x*gl::BBT[0]+y*gl::BBT[3]+z*gl::BBT[6]+cx, x*gl::BBT[1]+y*gl::BBT[4]+z*gl::BBT[7]+cy, x*gl::BBT[2]+y*gl::BBT[5]+z*gl::BBT[8]+cz); @@ -202,7 +202,7 @@ extern int MaterialIndex; extern const size_t Nbuffer; // Initial size of 2D dynamic buffers extern const size_t nbuffer; // Initial size of 0D & 1D dynamic buffers -class vertexData +class vertexData { public: GLfloat position[3]; @@ -267,7 +267,7 @@ public: }; class vertexBuffer { -public: +public: GLenum type; GLuint verticesBuffer; @@ -295,7 +295,7 @@ public: materialsBuffer(0), rendered(false), partial(false) - {} + {} void clear() { vertices.clear(); @@ -310,22 +310,22 @@ public: vertices0.reserve(nbuffer); } - void reserve() { + void reserve() { vertices.reserve(Nbuffer); indices.reserve(Nbuffer); - } + } - void Reserve() { + void Reserve() { Vertices.reserve(Nbuffer); indices.reserve(Nbuffer); - } - + } + // Store the vertex v and its normal vector n. GLuint vertex(const triple &v, const triple& n) { size_t nvertices=vertices.size(); vertices.push_back(vertexData(v,n)); return nvertices; - } + } // Store the vertex v and its normal vector n, without an explicit color. GLuint tvertex(const triple &v, const triple& n) { @@ -339,14 +339,14 @@ public: size_t nvertices=Vertices.size(); Vertices.push_back(VertexData(v,n,c)); return nvertices; - } + } // Store the pixel v and its width. GLuint vertex0(const triple &v, double width) { size_t nvertices=vertices0.size(); vertices0.push_back(vertexData0(v,width)); return nvertices; - } + } // append array b onto array a with offset void appendOffset(std::vector& a, diff --git a/graphics/asymptote/gsl.cc b/graphics/asymptote/gsl.cc index 0f81dc6034..f058773624 100644 --- a/graphics/asymptote/gsl.cc +++ b/graphics/asymptote/gsl.cc @@ -708,14 +708,14 @@ void addGSLrngRealUIntFuncInt(symbol name, symbol arg1, symbol arg2) template void intUIntUIntUIntGSLrng(stack *s) - { - unsigned int t = unsignedcast(pop(s)); - unsigned int n2 = unsignedcast(pop(s)); - unsigned int n1 = unsignedcast(pop(s)); - checkGSLrng(); - s->push(func(GSLrng,n1,n2,t)); - checkGSLerror(); - } +{ + unsigned int t = unsignedcast(pop(s)); + unsigned int n2 = unsignedcast(pop(s)); + unsigned int n1 = unsignedcast(pop(s)); + checkGSLrng(); + s->push(func(GSLrng,n1,n2,t)); + checkGSLerror(); +} template @@ -1091,9 +1091,9 @@ void gen_rungsl_venv(venv &ve) addGSLDOUBLE3Func(SYM(P),SYM(phi),SYM(k),SYM(n)); #if GSL_MAJOR_VERSION >= 2 addGSLDOUBLE2Func(SYM(D),SYM(phi),SYM(k)); -#else +#else addGSLDOUBLE3Func(SYM(D),SYM(phi),SYM(k),SYM(n)); -#endif +#endif addGSLDOUBLE2Func(SYM(RC),SYM(x),SYM(y)); addGSLDOUBLE3Func(SYM(RD),SYM(x),SYM(y),SYM(z)); addGSLDOUBLE3Func(SYM(RF),SYM(x),SYM(y),SYM(z)); @@ -1325,7 +1325,7 @@ void gen_rungsl_venv(venv &ve) (SYM(cdf_##NAME##_Pinv),SYM(P),SYM(ARG)); \ addGSLRealRealFunc \ (SYM(cdf_##NAME##_Qinv),SYM(Q),SYM(ARG)) - + // Exponential, Laplace, Cauchy, Rayleigh, Chi-squared, t, // and Logistic distribution addGSLrealdist1param(exponential,mu); @@ -1350,7 +1350,7 @@ void gen_rungsl_venv(venv &ve) (SYM(cdf_##NAME##_Pinv),SYM(P),SYM(ARG1),SYM(ARG2)); \ addGSLRealRealRealFunc \ (SYM(cdf_##NAME##_Qinv),SYM(Q),SYM(ARG1),SYM(ARG2)) - + // Uniform, log-normal, F, Beta, Pareto, Weibull, Type-1 Gumbel, // and Type-2 Gumbel distribution addGSLrealdist2param(flat,a,b); @@ -1362,7 +1362,7 @@ void gen_rungsl_venv(venv &ve) addGSLrealdist2param(gumbel1,a,b); addGSLrealdist2param(gumbel2,a,b); #undef addGSLrealdist2param - + // Exponential power distribution addGSLrngRealRealFunc (SYM(rng_exppow),SYM(a),SYM(b)); @@ -1411,7 +1411,7 @@ void gen_rungsl_venv(venv &ve) addFunc(GSLModule->e.ve,GSLrng_dir3d,primTriple(),SYM(rng_dir3d)); addFunc(GSLModule->e.ve,GSLrng_dir,realArray(),SYM(rng_dir), formal(primInt(),SYM(n))); - + // Elliptic functions (Jacobi) addFunc(GSLModule->e.ve,GSLsf_elljac_e,realArray(),SYM(sncndn), formal(primReal(),SYM(u)),formal(primReal(),SYM(m))); @@ -1435,7 +1435,7 @@ void gen_rungsl_venv(venv &ve) (SYM(cdf_##NAME##_P),SYM(k),SYM(ARG)); \ addGSLUInt##TYPE##Func \ (SYM(cdf_##NAME##_Q),SYM(k),SYM(ARG)) - + // Poisson, geometric distributions addGSLdiscdist1param(poisson,mu,Real); addGSLdiscdist1param(geometric,p,Real); @@ -1450,7 +1450,7 @@ void gen_rungsl_venv(venv &ve) (SYM(cdf_##NAME##_P),SYM(k),SYM(ARG1),SYM(ARG2)); \ addGSLUInt##TYPE1##TYPE2##Func \ (SYM(cdf_##NAME##_Q),SYM(k),SYM(ARG1),SYM(ARG2)) - + // Binomial, negative binomial distributions addGSLdiscdist2param(binomial,p,Real,n,UInt); addGSLdiscdist2param(negative_binomial,p,Real,n,Real); diff --git a/graphics/asymptote/guide.cc b/graphics/asymptote/guide.cc index 6479a00ba5..7c01da75e3 100644 --- a/graphics/asymptote/guide.cc +++ b/graphics/asymptote/guide.cc @@ -10,17 +10,17 @@ namespace camp { multiguide::multiguide(guidevector& v) { - // This constructor tests if the first subguide is also a multiguide and, - // if possible, uses the same base, extending it beyond what is used. - multiguide *rg = v.empty() ? 0 : dynamic_cast(v[0]); - if (rg && rg->base->size() == rg->length) { - base = rg->base; - base->insert(base->end(), v.begin()+1, v.end()); - } - else - base = new guidevector(v); + // This constructor tests if the first subguide is also a multiguide and, + // if possible, uses the same base, extending it beyond what is used. + multiguide *rg = v.empty() ? 0 : dynamic_cast(v[0]); + if (rg && rg->base->size() == rg->length) { + base = rg->base; + base->insert(base->end(), v.begin()+1, v.end()); + } + else + base = new guidevector(v); - length = base->size(); + length = base->size(); } void multiguide::flatten(flatguide& g, bool allowsolve) diff --git a/graphics/asymptote/guide.h b/graphics/asymptote/guide.h index a25e7ffa9e..64115930f1 100644 --- a/graphics/asymptote/guide.h +++ b/graphics/asymptote/guide.h @@ -19,7 +19,7 @@ class guide : public gc { protected: public: virtual ~guide() {} - + // Returns the path that the guide represents. virtual path solve() { return path(); @@ -27,20 +27,20 @@ public: // Add the information in the guide to the flatguide, so that it can be // solved via the knotlist solving routines. - // Returns true if guide has an interior cycle token. + // Returns true if guide has an interior cycle token. virtual void flatten(flatguide&, bool allowsolve=true)=0; - + virtual bool cyclic() {return false;} - + virtual void print(ostream& out) const { out << "nullpath"; } - + // Needed so that multiguide can know where to put in ".." symbols. virtual side printLocation() const { return END; } - + }; inline ostream& operator<< (ostream& out, const guide& g) @@ -78,7 +78,7 @@ public: void print(ostream& out) const { out << z; } - + side printLocation() const { return END; } @@ -106,7 +106,7 @@ public: void print(ostream& out) const { out << p; } - + side printLocation() const { return END; } @@ -148,7 +148,7 @@ public: out << (tout.atleast ? ".. tension atleast " : ".. tension ") << tout.val << " and " << tin.val << " .."; } - + side printLocation() const { return JOIN; } @@ -177,7 +177,7 @@ public: void flatten(flatguide& g, bool=true) { g.setSpec(p,s); } - + specguide(spec *p, side s) : p(p), s(s) {} @@ -187,7 +187,7 @@ public: void print(ostream& out) const { out << *p; } - + side printLocation() const { return s; } @@ -213,7 +213,7 @@ public: out << ".. controls " << zout << " and " << zin << " .."; } - + side printLocation() const { return JOIN; } @@ -224,39 +224,39 @@ public: // tensions in between. typedef mem::vector guidevector; -// A multiguide represents a guide given by the first "length" items of +// A multiguide represents a guide given by the first "length" items of // the vector pointed to by "base". // The constructor, if given another multiguide as a first argument, // will try to avoid allocating a new "base" array. class multiguide : public guide { - guidevector *base; - size_t length; - - guide *subguide(size_t i) const - { - assert(i < length); - assert(length <= base->size()); - return (*base)[i]; - } + guidevector *base; + size_t length; + + guide *subguide(size_t i) const + { + assert(i < length); + assert(length <= base->size()); + return (*base)[i]; + } public: multiguide(guidevector& v); void flatten(flatguide&, bool=true); - + bool cyclic() { size_t n=length; if(n < 1) return false; return subguide(n-1)->cyclic(); } - + path solve() { if (settings::verbose>3) { cerr << "solving guide:\n"; print(cerr); cerr << "\n\n"; } - + flatguide g; this->flatten(g); path p=g.solve(false); @@ -268,7 +268,7 @@ public: } void print(ostream& out) const; - + side printLocation() const { int n = length; return subguide(n-1)->printLocation(); @@ -291,7 +291,7 @@ public: } bool cyclic() {return true;} - + path solve() { // Just a cycle on it's own makes an empty guide. return path(); diff --git a/graphics/asymptote/guideflags.h b/graphics/asymptote/guideflags.h index dae2b7cc47..80c6cfc1c5 100644 --- a/graphics/asymptote/guideflags.h +++ b/graphics/asymptote/guideflags.h @@ -12,9 +12,9 @@ namespace camp { #undef OUT #undef IN - + enum side { OUT, IN, END, JOIN }; - + } #endif //GUIDEFLAGS_H diff --git a/graphics/asymptote/impdatum.cc b/graphics/asymptote/impdatum.cc index 9d0be54f15..af074c8540 100644 --- a/graphics/asymptote/impdatum.cc +++ b/graphics/asymptote/impdatum.cc @@ -47,7 +47,7 @@ public: types::ty *getType(coenv &) { return types::primError(); } types::ty *trans(coenv &e) { complain(); return getType(e); } - + void transAsType(coenv &e, types::ty *target) { complain(); } }; @@ -58,7 +58,7 @@ public: virtual int_typ toInt() { datumError("cannot convert to integer"); - + // Return a weird value that will hopefully be noticed. return -777777; } @@ -268,7 +268,7 @@ public: return new fieldExp(nullPos, parent->getExp(), id); } }; - + ImpDatum *ImpDatum::getField(const char *name) { coenv &e = coenvInOngoingProcess(); @@ -387,7 +387,7 @@ void imp_releaseArguments(arguments_typ args) } void imp_addArgument(arguments_typ args, const char *name, handle_typ handle, - arg_rest_option isRest) + arg_rest_option isRest) { unwrapArgs(args)->add(name, unwrap(handle), isRest); } @@ -406,7 +406,7 @@ ImpDatum *callDatum(ImpDatum *callee, ImpArguments *args) } assert(t->isNotOverloaded()); // Calls are never overloaded. - + if (t->kind == types::ty_void) { // Execute the call and return 0 to indicate void. runExp(&callex); @@ -451,7 +451,7 @@ public: int_typ numParams() { /*if (params) return params->val.size(); - else */ { + else */ { datumError("parameters accessed outside of function"); return 0; } @@ -459,12 +459,12 @@ public: ImpDatum *getParam(int_typ index) { /*if (params) { - if (index >= 0 && index < static_cast(params->val.size())) - return params->val[index]; + if (index >= 0 && index < static_cast(params->val.size())) + return params->val[index]; else - return datumError("invalid index for parameter"); - } - else */ { + return datumError("invalid index for parameter"); + } + else */ { return datumError("parameters accessed outside of function"); } } @@ -473,11 +473,11 @@ public: { /*if (params) { if (this->retval) - datumError("return value set more than once"); + datumError("return value set more than once"); else - this->retval = retval; - } - else */ { + this->retval = retval; + } + else */ { datumError("return value set outside of function"); } } @@ -547,7 +547,7 @@ public: #endif handle_typ imp_handleFromFunction(const char *signature, - function_typ f, void *data) + function_typ f, void *data) { // TODO: Re-implement. return 0; //wrap(new FunctionDatum(f, data)); @@ -592,24 +592,24 @@ void init(bool resetpath=true); extern "C" { -policy_typ *_asy_getPolicy() -{ - return &imp_policy; -} + policy_typ *_asy_getPolicy() + { + return &imp_policy; + } -state_typ _asy_getState() -{ - static state_typ state = cheatState(); + state_typ _asy_getState() + { + static state_typ state = cheatState(); - // TODO: Make sure this runs once. - char buf[] = "asymptote.so"; - char *argv [] = { buf }; - settings::setOptions(1,argv); + // TODO: Make sure this runs once. + char buf[] = "asymptote.so"; + char *argv [] = { buf }; + settings::setOptions(1,argv); - // Ensures uptodate is not used. - init(); + // Ensures uptodate is not used. + init(); - return state; -} + return state; + } } diff --git a/graphics/asymptote/inst.h b/graphics/asymptote/inst.h index fbbe6d873d..54879a6d77 100644 --- a/graphics/asymptote/inst.h +++ b/graphics/asymptote/inst.h @@ -1,7 +1,7 @@ /***** * inst.h * Andy Hammerlindl 2002/06/27 - * + * * Descibes the items and instructions that are used by the virtual machine. *****/ @@ -19,7 +19,7 @@ namespace vm { // Forward declarations struct inst; class stack; class program; - + // A function "lambda," that is, the code that runs a function. // It also needs the closure of the enclosing module or function to run. struct lambda : public gc { @@ -75,4 +75,4 @@ inline T get(const inst& it) } // namespace vm #endif - + diff --git a/graphics/asymptote/interact.cc b/graphics/asymptote/interact.cc index e7551fd72f..ad472942d5 100644 --- a/graphics/asymptote/interact.cc +++ b/graphics/asymptote/interact.cc @@ -50,10 +50,10 @@ namespace interact { bool interactive=false; bool uptodate=true; -int lines=0; +int lines=0; bool query=false; -bool tty=isatty(STDIN_FILENO); +bool tty=isatty(STDIN_FILENO); completer *currentCompleter=0; void setCompleter(completer *c) { @@ -77,15 +77,15 @@ void init_completion() { static char break_characters[128]; Int j=0; for (unsigned char c=9; c < 128; ++c) - if (!isalnum(c) && c != '_') { - break_characters[j]=c; - ++j; - } + if (!isalnum(c) && c != '_') { + break_characters[j]=c; + ++j; + } break_characters[j]='\0'; rl_completer_word_break_characters=break_characters; */ } -#endif +#endif char *(*Readline)(const char *prompt); @@ -97,7 +97,7 @@ char *readverbatimline(const char *prompt) getline(cin,s); return StrdupMalloc(s); } - + FILE *fin=NULL; char *readpipeline(const char *prompt) @@ -117,7 +117,7 @@ char *readpipeline(const char *prompt) return StrdupMalloc(s.str()); #endif } - + void pre_readline() { int fd=intcast(settings::getSetting("inpipe")); @@ -152,11 +152,11 @@ void init_interactive() } #endif } - + string simpleline(string prompt) { // Rebind tab key, as the setting tabcompletion may be changed at runtime. pre_readline(); - + Signal(SIGINT,SIG_IGN); // Get a line from the user. char *line=Readline(prompt.c_str()); @@ -165,7 +165,7 @@ string simpleline(string prompt) { // Reset scroll count. interact::lines=0; interact::query=tty; - + // Ignore keyboard interrupts while taking input. errorstream::interrupt=false; @@ -187,7 +187,7 @@ void addToHistory(string line) { if(tty && line.find_first_not_of('\n') != string::npos) { add_history(line.c_str()); } -#endif +#endif } string getLastHistoryLine() { @@ -198,7 +198,7 @@ string getLastHistoryLine() { em.compiler(); em << "cannot access last history line"; return ""; - } else + } else return entry->line; } else #endif diff --git a/graphics/asymptote/interact.h b/graphics/asymptote/interact.h index a6845ad75c..4b7550986e 100644 --- a/graphics/asymptote/interact.h +++ b/graphics/asymptote/interact.h @@ -19,7 +19,7 @@ extern int lines; // Interactive scroll count extern bool query; // Enable interactive scrolling; void init_interactive(); - + // Read a line from the input, without any processing. string simpleline(string prompt); @@ -48,7 +48,7 @@ public: void setCompleter(completer *c); #define YY_READ_BUF_SIZE YY_BUF_SIZE - + void init_readline(bool tabcompletion); } diff --git a/graphics/asymptote/item.h b/graphics/asymptote/item.h index 60fb89fe6e..70d4923445 100644 --- a/graphics/asymptote/item.h +++ b/graphics/asymptote/item.h @@ -29,7 +29,7 @@ T get(const item&); #if COMPACT // Identify a default argument. extern const Int DefaultValue; - + // Identify an undefined item. extern const Int Undefined; @@ -41,16 +41,16 @@ inline Int valueFromBool(bool b) { return b ? BoolTruthValue : BoolFalseValue; } #endif - + extern const item Default; class item : public gc { private: - + #if !COMPACT const std::type_info *kind; #endif - + union { Int i; double x; @@ -61,12 +61,12 @@ private: }; public: -#if COMPACT +#if COMPACT bool empty() const {return i >= Undefined;} - + item() : i(Undefined) {} - + item(Int i) : i(i) {} item(int i) @@ -75,7 +75,7 @@ public: : x(x) {} item(bool b) : i(valueFromBool(b)) {} - + item& operator= (int a) { i=a; return *this; } item& operator= (unsigned int a) @@ -86,33 +86,33 @@ public: { x=a; return *this; } item& operator= (bool b) { i=valueFromBool(b); return *this; } - + template item(T *p) : p((void *) p) { assert(!empty()); } - + template item(const T &p) : p(new(UseGC) T(p)) { assert(!empty()); } - + template item& operator= (T *a) { p=(void *) a; return *this; } - + template item& operator= (const T &it) { p=new(UseGC) T(it); return *this; } -#else +#else bool empty() const {return *kind == typeid(void);} - + item() : kind(&typeid(void)) {} - + item(Int i) : kind(&typeid(Int)), i(i) {} item(int i) @@ -121,7 +121,7 @@ public: : kind(&typeid(double)), x(x) {} item(bool b) : kind(&typeid(bool)), b(b) {} - + item& operator= (int a) { kind=&typeid(Int); i=a; return *this; } item& operator= (unsigned int a) @@ -132,69 +132,69 @@ public: { kind=&typeid(double); x=a; return *this; } item& operator= (bool a) { kind=&typeid(bool); b=a; return *this; } - + template item(T *p) : kind(&typeid(T)), p((void *) p) {} - + template item(const T &p) : kind(&typeid(T)), p(new(UseGC) T(p)) {} - + template item& operator= (T *a) { kind=&typeid(T); p=(void *) a; return *this; } - + template item& operator= (const T &it) { kind=&typeid(T); p=new(UseGC) T(it); return *this; } - + const std::type_info &type() const { return *kind; } -#endif - +#endif + template friend inline T get(const item&); friend inline bool isdefault(const item&); - + friend ostream& operator<< (ostream& out, const item& i); private: template struct help; - + template struct help { static T* unwrap(const item& it) { -#if COMPACT +#if COMPACT if(!it.empty()) return (T*) it.p; -#else +#else if(*it.kind == typeid(T)) return (T*) it.p; -#endif +#endif throw vm::bad_item_value(); } }; - + template struct help { static T& unwrap(const item& it) { -#if COMPACT +#if COMPACT if(!it.empty()) return *(T*) it.p; -#else +#else if(*it.kind == typeid(T)) return *(T*) it.p; -#endif +#endif throw vm::bad_item_value(); } }; }; - + #ifdef SIMPLE_FRAME // In the simple implementation, a frame is just an array of items. typedef item frame; @@ -231,7 +231,7 @@ public: size_t size() { return vars.size(); } - + // Extends vars to ensure it has a place for any variable indexed up to n. void extend(size_t n) { if(vars.size() < n) @@ -245,31 +245,31 @@ template inline T get(const item& it) { return item::help::unwrap(it); -} +} template <> inline int get(const item&) { throw vm::bad_item_value(); } - + template <> inline Int get(const item& it) { -#if COMPACT +#if COMPACT if(!it.empty()) return it.i; #else if(*it.kind == typeid(Int)) return it.i; -#endif +#endif throw vm::bad_item_value(); } - + template <> inline double get(const item& it) { -#if COMPACT +#if COMPACT if(!it.empty()) return it.x; #else @@ -282,15 +282,15 @@ inline double get(const item& it) template <> inline bool get(const item& it) { -#if COMPACT +#if COMPACT if(it.i == BoolTruthValue) return true; if(it.i == BoolFalseValue) return false; -#else +#else if(*it.kind == typeid(bool)) return it.b; -#endif +#endif throw vm::bad_item_value(); } @@ -301,12 +301,12 @@ struct default_t : public gc {}; inline bool isdefault(const item& it) { -#if COMPACT +#if COMPACT return it.i == DefaultValue; -#else +#else return *it.kind == typeid(default_t); -#endif -} +#endif +} ostream& operator<< (ostream& out, const item& i); diff --git a/graphics/asymptote/jsfile.cc b/graphics/asymptote/jsfile.cc index 4849940ba9..605d2108b4 100644 --- a/graphics/asymptote/jsfile.cc +++ b/graphics/asymptote/jsfile.cc @@ -4,8 +4,6 @@ #include "glrender.h" #include "drawelement.h" -#ifdef HAVE_LIBGLM - using namespace settings; namespace camp { @@ -25,18 +23,6 @@ void jsfile::header(string name) out << "" << newl << newl; } -void jsfile::comment(string name) -{ - out << "" << newl << newl; -} - void jsfile::meta(string name, bool svg) { out << "" << newl @@ -45,13 +31,22 @@ void jsfile::meta(string name, bool svg) << "" << stripExt(name) << "" << newl << newl << "" << newl; - if(svg) { - out << "" - << newl << ""; - } else { + if(svg) + out << ""; + else out << ""; - } - out << newl << newl; + out << newl << "" << newl; + if(svg) + out << "" << newl; + out << newl; } void jsfile::footer(string name) @@ -69,11 +64,26 @@ void jsfile::svgtohtml(string prefix) string name=buildname(prefix,"html"); header(name); meta(name); + out << "" << newl << newl; copy(locateFile(auxname(prefix,"svg")),true); footer(name); } +#ifdef HAVE_LIBGLM + +void jsfile::comment(string name) +{ + out << "" << newl << newl; +} + void jsfile::open(string name) { header(name); @@ -81,7 +91,7 @@ void jsfile::open(string name) meta(name,false); out.precision(getSetting("digits")); - + if(getSetting("offline")) { out << "" << newl; } - out << "